diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index a13037402f8..19c076242f8 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -115,12 +115,14 @@ Also, some code changes need a prior approbation:
 
 Once a PR has been submitted, you may need to wait for its integration. It is common that the project leader let the PR open for a long delay to allow every developer discuss about the PR.
 
+If the label of PR start with "WIP" (Work In Progress), it will not be analyzed (until you change the label of PR).
+
 If your PR has errors reported by the Continuous Integration Platform, it means your PR is not valid and nothing will be done with it. It will be kept open to allow developers to fix this, or it may be closed several month later. Don't expect anything on your PR if you have such errors, you MUST first fix the Continuous Integration error to have it taken into consideration. 
 
 If the PR is valid, and is kept open for a long time, a tag will also be added on the PR to describe the status of your PR and why the PR is kept open. By putting your mouse on the tag, you will get a full explanation of the tag/status that explain why your PR has not been integrated yet.
-In most cases, it give you information of things you have to do to have the PR taken into consideration (for example a change is requested, a conflict is expected to be solved, some questions were asked). If you have a yellow, red flag of purple flag, don't expect to have your PR validated. You must first provide the answer the flag ask you. The majority of PR are waiting a developer action.
+In most cases, it gives you information of things you have to do to have the PR taken into consideration (for example a change is requested, a conflict is expected to be solved, some questions were asked). If you have a yellow, red flag of purple flag, don't expect to have your PR validated. You must first provide the answer the flag ask you. The majority of PR are waiting an action of the developer/author.
 
-Around 95% of submitted PR are reviewed and tagged. Even if this is one of the most important ratio of answered PR in Open Source world, don't expect the core team to reach the 100%. With the increasing popularity of Dolibarr, this ratio will probably decrease in future.
+Statistics on Dolibarr project shows that around 95% of submitted PR are reviewed and tagged. This is one of the most important ratio of answered PR in Open Source world. Don't expect the core team to reach the 100%. With the increasing popularity of Dolibarr, this ratio will probably decrease in future.
 
 
 ### Resources
diff --git a/.travis.yml b/.travis.yml
index b710e17c773..1521035578b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -288,7 +288,7 @@ script:
   # Ensure we catch errors
   set -e
   #parallel-lint --exclude htdocs/includes --blame .
-  parallel-lint --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian --exclude htdocs/includes/squizlabs/php_codesniffer/tests --exclude htdocs/includes/jakub-onderka/php-parallel-lint/tests --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/phpunit/php-token-stream/tests --exclude htdocs/includes/composer/autoload_static.php --blame .
+  parallel-lint --exclude dev/namespacemig --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian --exclude htdocs/includes/squizlabs/php_codesniffer/tests --exclude htdocs/includes/jakub-onderka/php-parallel-lint/tests --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/phpunit/php-token-stream/tests --exclude htdocs/includes/composer/autoload_static.php --blame .
   set +e
   echo
 
diff --git a/ChangeLog b/ChangeLog
index 0839fd77e95..6ca4df10d38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,116 @@ Following changes may create regressions for some external modules, but were nec
 * Properties ->libelle_incoterms were renamed into ->label_incoterms
 * Removed the method liste_array() of project class. It was not used by core code.
 * The function show_theme() hase been renamed into showSkins()
+* Rename 'module_part' parameter into 'modulepart' into document APIs, for consistency.
+
+
+***** ChangeLog for 10.0.1 compared to 10.0.0 *****
+FIX: #10930
+FIX: #10984 
+FIX: reposition on "Build backup" button
+FIX: #11400
+FIX: #11412
+FIX: #11460 
+FIX: #11463
+FIX: #11466
+FIX: #11492 
+FIX: #11498
+FIX: #11505
+FIX: #11506
+FIX: #11507
+FIX: #11509
+FIX: #11537
+FIX: #11543
+FIX: #11553
+FIX: #11576 
+FIX: #11584
+FIX: #11590
+FIX: accounting mode must be taken from global conf, because there's no way to choose a mode with interface
+FIX: Add message from public interface
+FIX: add missing hook calls
+FIX: Add warning when setup is strange
+FIX: ajax call for line positioning when CSRFCHECK_WITH_TOKEN is on
+FIX: API return 404 sometimes even if API exists
+FIX: Attachment was lost when we validate an expense report
+FIX: avoid conflict with "$classname" in card.php
+FIX: Bad sql request
+FIX: better compatibility with multicompany transverse mode
+FIX: Better PHP compatibility
+FIX: Block to link with tickets
+FIX: Can't submit a ticket from public interface
+FIX: categories import: prevent mismatch between category type and object type
+FIX: Closing ticket from public interface
+FIX: Column 'paid' missing in expense report
+FIX: compatibility mysql 8. rank is reserved
+FIX: Computed field were not calculated into lists.
+FIX: Content of email for subscription
+FIX: correct error in files with multiple spaces
+FIX: CVE-2019-11199
+FIX: delete of links between objects
+FIX: div not balanced
+FIX: do not return formatted prices in json string
+FIX: duplicate on the check (TODO field $onetrtd not used ?)
+FIX: element name in update_price
+FIX: empty product_use_units in product configuration
+FIX: expedition card: infinite loop for printObjectLine hook if return > 0
+FIX: extrafield loading bug due to assumption that an object is a third party while it may be a contact if MAIN_USE_COMPANY_NAME_OF_CONTACT is set.
+FIX: Fatal error on dol_htmloutput_mesg with corrupted array
+FIX: Fatal situation if payment removed on expense report. Action
+FIX: FEC Format - Missing date_creation in general ledger when you add a new transaction
+FIX: FEC Format - Save translation of the journal label in database & nowrap on amount
+FIX: floating point precision errors in the triggers of the workflow module
+FIX: for #11232
+FIX: format of field with type timestamp
+FIX: fournrprice log for insert
+FIX: help text
+FIX: import filter error
+FIX: __INFOS__ tag not exists
+FIX: issue #9300: install error with PostgreSQL when using custom table prefix
+FIX: Language key
+FIX: Limit of uploaded files (max_post_size was not used)
+FIX: list of balance of leaves
+FIX: minor spelling issues
+FIX: missing "dropdown-icon" replacement
+FIX: Missing field "Conciliated" into bank transaction export
+FIX: missing filter by current contact
+FIX: missing token
+FIX: Missing where on entity
+FIX: move sql request in INNER JOIN
+FIX: name was able to be in field but went back to new line
+FIX: Nowrap on amount
+FIX: Online payment
+FIX: on shipment delete confirm dialog, a new checkbox allows the user to choose if they want their stock re-incremented after the deletion.
+FIX: option EXPORT_LABEL_FOR_SELECT to restore compatibility in export
+FIX: Option THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION
+FIX: outdated phpdoc
+FIX: Permission for BOM menu
+FIX: permission to delete a draft purchase order
+FIX: phpcs
+FIX: Position was lost when we edit the line of template invoice
+FIX: product_use_units was set to 0 each time a conf in block other was set
+FIX: propal createFrom hook: undefined parameter attached
+FIX: Responsive of public interface of ticket
+FIX: search by phone pro
+FIX: Setup of TakePos was not possible after a clean install
+FIX: Show list of events on tickets
+FIX: socpeople assigned list in action com list
+FIX: SQL problem on donation & nowrap on amount
+FIX: stock increase on shipment deletion if STOCK_CALCULATE_ON_SHIPMENT_NEW: is set
+FIX: stripe webhook ID constant set
+FIX: summary of time spent in preview tab of projects
+FIX: the feature to bill time spent was not enabled.
+FIX: The new feature to attach document on lines was not correclty
+FIX: The proposed new supplier code does not work
+FIX: this function can not be private
+FIX: tk9877 - PDF rouget requires product.lib.php (otherwise measuring_units_string() is not defined)
+FIX: Update the file index table when we validate/rename a ref.
+FIX: use rounding to compare the amounts
+FIX: We must save code instead of value in database for template invoice modelpdf
+FIX: we need to be able to add freeline with qty between 0 & 1 in supplierorder line
+FIX: We should remove property comments only for project and task api.
+FIX: When saving an action it didn't save the label based on the type of event if the label is empty and the type is customized
+FIX: when STOCK_CALCULATE_ON_SHIPMENT_NEW: is set, deleting a "closed" shipment now increases stock as expected
+FIX: wrong path sociales/index.php doesnt exist anymore
 
 
 ***** ChangeLog for 10.0.1 compared to 10.0.0 *****
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 00000000000..e5493805733
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,13 @@
+# Security Policy
+
+## Supported Versions
+
+| Version  | Supported          |
+| -------- | ------------------ |
+| <= 8.0.* | :x: |
+| >= 9.0.* | :white_check_mark: |
+
+## Reporting a Vulnerability
+
+To report a vulnerability, please send an email to security@dolibarr.org
+In most cases, after fixing the security, we make an answer by email to say the issue has been fixed.
diff --git a/build/exe/doliwamp/php.ini.install b/build/exe/doliwamp/php.ini.install
index 04191a71f5a..af8ef607112 100644
--- a/build/exe/doliwamp/php.ini.install
+++ b/build/exe/doliwamp/php.ini.install
@@ -458,16 +458,6 @@ variables_order = "GPCS"
 ; with user data.  This makes most sense when coupled with track_vars - in which
 ; case you can access all of the GPC variables through the $HTTP_*_VARS[],
 ; variables.
-;
-; You should do your best to write your scripts so that they do not require
-; register_globals to be on;  Using form variables as globals can easily lead
-; to possible security problems, if the code is not very well thought of.
-register_globals = Off
-
-; Whether or not to register the old-style input arrays, HTTP_GET_VARS
-; and friends.  If you're not using them, it's recommended to turn them off,
-; for performance reasons.
-register_long_arrays = Off
 
 ; This directive tells PHP whether to declare the argv&argc variables (that
 ; would contain the GET information).  If you don't use these variables, you
@@ -477,8 +467,7 @@ register_argc_argv = Off
 ; When enabled, the SERVER and ENV variables are created when they're first
 ; used (Just In Time) instead of when the script starts. If these variables
 ; are not used within a script, having this directive on will result in a
-; performance gain. The PHP directives register_globals, register_long_arrays,
-; and register_argc_argv must be disabled for this directive to have any affect.
+; performance gain.
 auto_globals_jit = On
 
 ; Maximum size of POST data that PHP will accept.
@@ -1101,14 +1090,6 @@ session.gc_maxlifetime = 1800
 ;       setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
 ;          cd /path/to/sessions; find -cmin +24 | xargs rm
 
-; PHP 4.2 and less have an undocumented feature/bug that allows you to
-; to initialize a session variable in the global scope, albeit register_globals
-; is disabled.  PHP 4.3 and later will warn you, if this feature is used.
-; You can disable the feature and the warning separately. At this time,
-; the warning is only displayed, if bug_compat_42 is enabled.
-
-session.bug_compat_42 = 0
-session.bug_compat_warn = 1
 
 ; Check HTTP Referer to invalidate externally stored URLs containing ids.
 ; HTTP_REFERER has to contain this substring for the session to be
diff --git a/build/rpm/httpd-dolibarr.conf b/build/rpm/httpd-dolibarr.conf
index 1126d4fe442..ebda2b3ddfc 100644
--- a/build/rpm/httpd-dolibarr.conf
+++ b/build/rpm/httpd-dolibarr.conf
@@ -29,16 +29,6 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
   ErrorDocument 401 /public/error-401.php
   ErrorDocument 404 /public/error-404.php
 
-  <IfModule mod_php4.c>
-    php_flag magic_quotes_gpc Off
-    php_flag register_globals Off
-  </IfModule>
-
-  <IfModule mod_php5.c>
-    php_flag magic_quotes_gpc Off
-    php_flag register_globals Off
-  </IfModule>
-
 
     # OPTIMIZE: To use gzip compressed files (for Dolibarr already compressed files).
     # Note that constant MAIN_OPTIMIZE_SPEED must have a value with bit 0 set. 
diff --git a/dev/namespacemig/README.md b/dev/namespacemig/README.md
new file mode 100644
index 00000000000..981292355ab
--- /dev/null
+++ b/dev/namespacemig/README.md
@@ -0,0 +1,4 @@
+Test to migrate Dolibarr to namespace "Dolibarr".
+
+Script bbb.php is a script of an external module with current code writing. 
+It must works after migration. 
\ No newline at end of file
diff --git a/dev/namespacemig/aaa.class.php b/dev/namespacemig/aaa.class.php
new file mode 100644
index 00000000000..1070e96f875
--- /dev/null
+++ b/dev/namespacemig/aaa.class.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Dolibarr;
+
+
+global $globalaaa;
+$globalaaa = 'globalaaa';
+
+function faaa()
+{
+	return 'faaa';
+}
+
+class Aaa
+{
+	const AAA='aaa';
+
+	public function do()
+	{
+		echo 'doaaa'."\n";
+	}
+}
+
diff --git a/dev/namespacemig/bbb.class.php b/dev/namespacemig/bbb.class.php
new file mode 100644
index 00000000000..cc53aa6517d
--- /dev/null
+++ b/dev/namespacemig/bbb.class.php
@@ -0,0 +1,25 @@
+<?php
+
+
+
+
+global $globalbbb;
+$globalbbb = 'globalbbb';
+
+function fbbb()
+{
+	return 'fbbb';
+}
+
+class Bbb
+{
+	const BBB='bbb';
+	public function do()
+	{
+		global $globalaaa, $globalbbb;
+		echo 'dobbb'."\n";
+		$globalaaa.='+bbb';
+		$globalbbb.='+bbb';
+	}
+}
+
diff --git a/dev/namespacemig/bbb.php b/dev/namespacemig/bbb.php
new file mode 100755
index 00000000000..f2889bae5d5
--- /dev/null
+++ b/dev/namespacemig/bbb.php
@@ -0,0 +1,31 @@
+<?php
+
+//use \Aaa as Aaa;
+
+use Dolibarr\Aaa as Aaa;
+use function Dolibarr\faaa as faaa;	// Need php 5.6+
+//use const Dolibarr\AAA;
+
+//use Bbb as Bbb;
+
+require './main.inc.php';
+require './aaa.class.php';
+require './bbb.class.php';
+
+$bbb = new Bbb();
+$bbb->do();
+
+$aaa = new Aaa();
+$aaa->do();
+
+echo $aaa::AAA."\n";
+echo $bbb::BBB."\n";
+
+echo Aaa::AAA."\n";
+echo Bbb::BBB."\n";
+
+echo faaa()."\n";
+echo fbbb()."\n";
+
+echo "globalaaa=$globalaaa\n";
+echo "globalbbb=$globalbbb\n";
diff --git a/dev/namespacemig/main.inc.php b/dev/namespacemig/main.inc.php
new file mode 100644
index 00000000000..5709a31f733
--- /dev/null
+++ b/dev/namespacemig/main.inc.php
@@ -0,0 +1,7 @@
+<?php
+
+/*spl_autoload_register(function ($class_name) {
+    var_dump('class='.$class_name);
+    require $class_name;
+});
+*/
\ No newline at end of file
diff --git a/dev/setup/codesniffer/php.ini b/dev/setup/codesniffer/php.ini
index 6f374340edd..00f3b2d4efa 100644
--- a/dev/setup/codesniffer/php.ini
+++ b/dev/setup/codesniffer/php.ini
@@ -658,20 +658,6 @@ html_errors = Off
 ; Example:
 ;arg_separator.input = ";&"
 
-; This directive determines which super global arrays are registered when PHP
-; starts up. If the register_globals directive is enabled, it also determines
-; what order variables are populated into the global space. G,P,C,E & S are
-; abbreviations for the following respective super globals: GET, POST, COOKIE,
-; ENV and SERVER. There is a performance penalty paid for the registration of
-; these arrays and because ENV is not as commonly used as the others, ENV is
-; is not recommended on productions servers. You can still get access to
-; the environment variables through getenv() should you need to.
-; Default Value: "EGPCS"
-; Development Value: "GPCS"
-; Production Value: "GPCS";
-; http://php.net/variables-order
-variables_order = "GPCS"
-
 ; This directive determines which super global data (G,P,C,E & S) should
 ; be registered into the super global array REQUEST. If so, it also determines
 ; the order in which that data is registered. The values for this directive are
@@ -685,15 +671,6 @@ variables_order = "GPCS"
 ; http://php.net/request-order
 request_order = "GP"
 
-; Whether or not to register the EGPCS variables as global variables.  You may
-; want to turn this off if you don't want to clutter your scripts' global scope
-; with user data.
-; You should do your best to write your scripts so that they do not require
-; register_globals to be on;  Using form variables as globals can easily lead
-; to possible security problems, if the code is not very well thought of.
-; http://php.net/register-globals
-register_globals = Off
-
 ; Determines whether the deprecated long $HTTP_*_VARS type predefined variables
 ; are registered by PHP or not. As they are deprecated, we obviously don't
 ; recommend you use them. They are on by default for compatibility reasons but
@@ -722,8 +699,7 @@ register_argc_argv = Off
 ; When enabled, the SERVER and ENV variables are created when they're first
 ; used (Just In Time) instead of when the script starts. If these variables
 ; are not used within a script, having this directive on will result in a
-; performance gain. The PHP directives register_globals, register_long_arrays,
-; and register_argc_argv must be disabled for this directive to have any affect.
+; performance gain.
 ; http://php.net/auto-globals-jit
 auto_globals_jit = On
 
@@ -1516,22 +1492,6 @@ session.gc_maxlifetime = 1440
 ;       setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
 ;          find /path/to/sessions -cmin +24 | xargs rm
 
-; PHP 4.2 and less have an undocumented feature/bug that allows you to
-; to initialize a session variable in the global scope, even when register_globals
-; is disabled.  PHP 4.3 and later will warn you, if this feature is used.
-; You can disable the feature and the warning separately. At this time,
-; the warning is only displayed, if bug_compat_42 is enabled. This feature
-; introduces some serious security problems if not handled correctly. It's
-; recommended that you do not use this feature on production servers. But you
-; should enable this on development servers and enable the warning as well. If you
-; do not enable the feature on development servers, you won't be warned when it's
-; used and debugging errors caused by this can be difficult to track down.
-; Default Value: On
-; Development Value: On
-; Production Value: Off
-; http://php.net/session.bug-compat-42
-session.bug_compat_42 = Off
-
 ; This setting controls whether or not you are warned by PHP when initializing a
 ; session value into the global space. session.bug_compat_42 must be enabled before
 ; these warnings can be issued by PHP. See the directive above for more information.
diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml
index daf73e5b2a7..c4f68812547 100644
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -5,7 +5,9 @@
 
 	<exclude-pattern type="relative">build/html</exclude-pattern>
 	<exclude-pattern type="relative">build/aps</exclude-pattern>
+	<exclude-pattern type="relative">dev/namespacemig</exclude-pattern>
 	<exclude-pattern type="relative">documents</exclude-pattern>
+	<exclude-pattern type="relative">htdocs/core/class/lessc.class.php</exclude-pattern>
 	<exclude-pattern type="relative">htdocs/custom</exclude-pattern>
 	<exclude-pattern type="relative">htdocs/includes</exclude-pattern>
 	<exclude-pattern type="relative">htdocs/install/doctemplates/websites</exclude-pattern>
diff --git a/htdocs/accountancy/bookkeeping/balancebymonth.php b/htdocs/accountancy/bookkeeping/balancebymonth.php
index b9568228a36..1141accd476 100644
--- a/htdocs/accountancy/bookkeeping/balancebymonth.php
+++ b/htdocs/accountancy/bookkeeping/balancebymonth.php
@@ -73,19 +73,11 @@ $y = $year_current;
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td width=150>' . $langs->trans("Label") . '</td>';
-print '<td class="center">' . $langs->trans("JanuaryMin") . '</td>';
-print '<td class="center">' . $langs->trans("FebruaryMin") . '</td>';
-print '<td class="center">' . $langs->trans("MarchMin") . '</td>';
-print '<td class="center">' . $langs->trans("AprilMin") . '</td>';
-print '<td class="center">' . $langs->trans("MayMin") . '</td>';
-print '<td class="center">' . $langs->trans("JuneMin") . '</td>';
-print '<td class="center">' . $langs->trans("JulyMin") . '</td>';
-print '<td class="center">' . $langs->trans("AugustMin") . '</td>';
-print '<td class="center">' . $langs->trans("SeptemberMin") . '</td>';
-print '<td class="center">' . $langs->trans("OctoberMin") . '</td>';
-print '<td class="center">' . $langs->trans("NovemberMin") . '</td>';
-print '<td class="center">' . $langs->trans("DecemberMin") . '</td>';
-print '<td class="center"><strong>Total</strong></td>';
+for($i = 1; $i <= 12; $i++)
+{
+	print '<td class="right">' . $langs->trans("MonthShort".sprintf("%02s", $i)) . '</td>';
+}
+print '<td class="center"><strong>'.$langs->trans("Total").'</strong></td>';
 print '</tr>';
 
 $sql = "SELECT bk.numero_compte AS 'compte',";
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index dc894663e4c..12825d9a780 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -2315,6 +2315,7 @@ class Adherent extends CommonObject
 			$response = new WorkboardResponse();
 			$response->warning_delay=$conf->adherent->subscription->warning_delay/60/60/24;
 			$response->label=$langs->trans("MembersWithSubscriptionToReceive");
+			$response->labelShort=$langs->trans("MembersWithSubscriptionToReceiveShort");
 			$response->url=DOL_URL_ROOT.'/adherents/list.php?mainmenu=members&amp;statut=1&amp;filter=outofdate';
 			$response->img=img_object('', "user");
 
diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index 6ac210c1ddb..032c4f07e56 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -35,7 +35,10 @@ if (!$user->admin)
 $action = GETPOST('action', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
+
+
 $arrayofparameters=array(
+	'DAV_RESTICT_ON_IP'=>array('css'=>'minwidth200', 'enabled'=>1),
     'DAV_ALLOW_PRIVATE_DIR'=>array('css'=>'minwidth200', 'enabled'=>2),
     'DAV_ALLOW_PUBLIC_DIR'=>array('css'=>'minwidth200', 'enabled'=>1),
 	'DAV_ALLOW_ECM_DIR'=>array('css'=>'minwidth200', 'enabled'=>$conf->ecm->enabled)
@@ -68,7 +71,6 @@ $head=dav_admin_prepare_head();
 
 dol_fiche_head($head, 'webdav', '', -1, 'action');
 
-
 if ($action == 'edit')
 {
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -76,14 +78,17 @@ if ($action == 'edit')
 	print '<input type="hidden" name="action" value="update">';
 
 	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="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	foreach($arrayofparameters as $key => $val)
 	{
 		if (isset($val['enabled']) && empty($val['enabled'])) continue;
 
 		print '<tr class="oddeven"><td>';
-		print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
+		$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
+		$label = $langs->trans($key);
+		if ($key == 'DAV_RESTICT_ON_IP') $label = $langs->trans("RESTRICT_ON_IP");
+		print $form->textwithpicto($label, $tooltiphelp);
 		print '</td><td>';
 		if ($key == 'DAV_ALLOW_PRIVATE_DIR')
 		{
@@ -112,12 +117,13 @@ if ($action == 'edit')
 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>';
+	print '<tr class="liste_titre"><td>'.$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'));
+		$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
+		print $form->textwithpicto($langs->trans($key), $tooltiphelp);
 		print '</td><td>';
 		if ($key == 'DAV_ALLOW_PRIVATE_DIR')
 		{
@@ -177,6 +183,13 @@ if (! empty($conf->global->DAV_ALLOW_PUBLIC_DIR))
 }
 print $message;
 
+print '<br><br><br>';
+
+require_once DOL_DOCUMENT_ROOT.'/includes/sabre/autoload.php';
+$version = Sabre\DAV\Version::VERSION;
+print '<span class="opacitymedium">'.$langs->trans("BaseOnSabeDavVersion").' : '.$version.'</span>';
+
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 6b46468b916..1fe8b2285c3 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -195,7 +195,6 @@ if ($action == 'edit')
     	{
     		foreach($delays as $delay)
     		{
-
 				$value=(! empty($conf->global->{$delay['code']})?$conf->global->{$delay['code']}:0);
     			print '<tr class="oddeven">';
     			print '<td width="20px">'.img_object('', $delay['img']).'</td>';
@@ -235,7 +234,6 @@ else
     	{
     		foreach($delays as $delay)
     		{
-
 				$value=(! empty($conf->global->{$delay['code']})?$conf->global->{$delay['code']}:0);
     			print '<tr class="oddeven">';
     			print '<td width="20px">'.img_object('', $delay['img']).'</td>';
@@ -264,7 +262,7 @@ else
 print '<br>';
 
 // Show logo for weather
-print $langs->trans("DescWeather").'<br>';
+print '<span class="opacitymedium">'.$langs->trans("DescWeather").'</span> ';
 
 if($action == 'edit') {
 
@@ -300,16 +298,16 @@ if ($action == 'edit') {
 
 	print '<div>';
 	print '<div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 'weather-clear.png', $options);
+	print img_weather($text, 0, $options);
 	print '= <input type="text" size="2" name="MAIN_METEO_LEVEL0" value="'.$level0.'"/></td>';
 	print '</div><div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 'weather-few-clouds.png', $options);
+	print img_weather($text, 1, $options);
 	print '&lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL1" value="'.$level1.'"/></td>';
 	print '</div><div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 'weather-clouds.png', $options);
+	print img_weather($text, 2, $options);
 	print '&lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL2" value="'.$level2.'"/></td>';
 	print '</div><div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 'weather-many-clouds.png', $options);
+	print img_weather($text, 3, $options);
 	print '&lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL3" value="'.$level3.'"/></td>';
 	print '</div>';
 	print '</div>';
@@ -320,16 +318,16 @@ if ($action == 'edit') {
 
 	print '<div>';
 	print '<div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 'weather-clear.png', $options);
-	print '= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL0" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'"/>&nbsp;%</td>';
+	print img_weather($text, 0, $options);
+	print '&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL0" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'"/>&nbsp;%</td>';
 	print '</div><div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 'weather-few-clouds.png', $options);
+	print img_weather($text, 1, $options);
 	print '&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL1" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'"/>&nbsp;%</td>';
 	print '</div><div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 'weather-clouds.png', $options);
+	print img_weather($text, 2, $options);
 	print '&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL2" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'"/>&nbsp;%</td>';
 	print '</div><div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 'weather-many-clouds.png', $options);
+	print img_weather($text, 3, $options);
 	print '&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL3" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'"/>&nbsp;%</td>';
 	print '</div>';
 	print '</div>';
@@ -371,19 +369,19 @@ if ($action == 'edit') {
 
 		print '<div>';
 		print '<div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 'weather-clear.png', $options);
+		print img_weather($text, 0, $options);
 		print '= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'&nbsp;%</td>';
 		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 'weather-few-clouds.png', $options);
+		print img_weather($text, 1, $options);
 		print '&lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'&nbsp;%</td>';
 		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 'weather-clouds.png', $options);
+		print img_weather($text, 2, $options);
 		print '&lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'&nbsp;%</td>';
 		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 'weather-many-clouds.png', $options);
+		print img_weather($text, 3, $options);
 		print '&lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'&nbsp;%</td>';
 		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 'weather-storm.png', $options);
+		print img_weather($text, 4, $options);
 		print '&gt; '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'&nbsp;%</td>';
 		print '</div>';
 		print '</div>';
@@ -391,19 +389,19 @@ if ($action == 'edit') {
 
 		print '<div>';
 		print '<div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 'weather-clear.png', $options);
+		print img_weather($text, 0, $options);
 		print '= '.$level0;
 		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 'weather-few-clouds.png', $options);
+		print img_weather($text, 1, $options);
 		print '&lt;= '.$level1;
 		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 'weather-clouds.png', $options);
+		print img_weather($text, 2, $options);
 		print '&lt;= '.$level2;
 		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 'weather-many-clouds.png', $options);
+		print img_weather($text, 3, $options);
 		print '&lt;= '.$level3;
 		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 'weather-storm.png', $options);
+		print img_weather($text, 4, $options);
 		print '&gt; '.$level3;
 		print '</div>';
 		print '</div>';
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index fc55b27d7e1..8f8cbf98607 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2009-2012	Laurent Destailleur	<eldy@users.sourceforge.org>
+/* Copyright (C) 2009-2019	Laurent Destailleur	<eldy@users.sourceforge.org>
  * Copyright (C) 2011-2013  Juanjo Menent		<jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -36,9 +36,11 @@ $langs->loadLangs(array("admin","errors"));
 
 $action = GETPOST('action', 'aZ09');
 
+
 /*
  * Actions
  */
+
 if ($action == 'set')
 {
 	$error=0;
@@ -53,8 +55,11 @@ if ($action == 'set')
 
 	if (! $error)
 	{
-		$res = dolibarr_set_const($db, "GEOIPMAXMIND_COUNTRY_DATAFILE", $gimcdf, 'chaine', 0, '', $conf->entity);
-		if (! $res > 0) $error++;
+		$res1 = dolibarr_set_const($db, "GEOIP_VERSION", GETPOST('geoipversion', 'aZ09'), 'chaine', 0, '', $conf->entity);
+		if (! $res1 > 0) $error++;
+
+		$res2 = dolibarr_set_const($db, "GEOIPMAXMIND_COUNTRY_DATAFILE", $gimcdf, 'chaine', 0, '', $conf->entity);
+		if (! $res2 > 0) $error++;
 
 		if (! $error)
 		{
@@ -67,6 +72,8 @@ if ($action == 'set')
 	}
 }
 
+if (! isset($conf->global->GEOIP_VERSION)) $conf->global->GEOIP_VERSION = '2';
+
 
 /*
  * View
@@ -85,13 +92,6 @@ $geoip='';
 if (! empty($conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE))
 {
 	$geoip=new DolGeoIP('country', $conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE);
-	//if ($geoip->error) print dol_htmloutput_errors($geoip->errorlabel,'',1);
-	if ($geoip->gi == 'NOGI') $geointernal=true;
-	else $geointernal=false;
-}
-else
-{
-	if (function_exists('geoip_country_code_by_name')) 	$geointernal=true;
 }
 
 // Mode
@@ -105,16 +105,30 @@ print '<td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td
 print '<td class="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>';
+// Lib version
+print '<tr class="oddeven"><td width="50%">'.$langs->trans("GeoIPLibVersion").'</td>';
+print '<td colspan="2">';
+$arrayofvalues = array('php' => 'Native PHP functions', '1' => 'Embedded GeoIP v1', '2' => 'Embedded GeoIP v2');
+print $form->selectarray('geoipversion', $arrayofvalues, (isset($conf->global->GEOIP_VERSION) ? $conf->global->GEOIP_VERSION : '2'));
+if ($conf->global->GEOIP_VERSION == 'php')
+{
+	if ($geoip) $version=$geoip->getVersion();
+	if ($version)
+	{
+		print '<br>'.$langs->trans("Version").': '.$version;
+	}
+}
+print '</td></tr>';
+
+// Path to database file
+print '<tr class="oddeven"><td>'.$langs->trans("PathToGeoIPMaxmindCountryDataFile").'</td>';
 print '<td colspan="2">';
 
-if ($geointernal) print 'Using geoip PHP internal functions. Value must be '.geoip_db_filename(GEOIP_COUNTRY_EDITION).' or '.geoip_db_filename(GEOIP_CITY_EDITION_REV1).'<br>';
-print '<input size="50" type="text" name="GEOIPMAXMIND_COUNTRY_DATAFILE" value="'.$conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE.'">';
-if ($geoip) $version=$geoip->getVersion();
-if ($version)
+if ($conf->global->GEOIP_VERSION == 'php')
 {
-	print '<br>'.$langs->trans("Version").': '.$version;
+	print 'Using geoip PHP internal functions. Value must be '.geoip_db_filename(GEOIP_COUNTRY_EDITION).' or '.geoip_db_filename(GEOIP_CITY_EDITION_REV1).' or /pathtodatafile/GeoLite2-Country.mmdb<br>';
 }
+print '<input size="50" type="text" name="GEOIPMAXMIND_COUNTRY_DATAFILE" value="'.$conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE.'">';
 print '</td></tr>';
 
 print '</table>';
@@ -144,6 +158,13 @@ if ($geoip)
 	if ($result) print $result;
 	else print $langs->trans("Error");
 
+	$ip='2a01:e0a:7e:4a60:429a:23ff:f7b8:dc8a';		// should be France
+	print '<br>'.$ip.' -> ';
+	$result=dol_print_ip($ip, 1);
+	if ($result) print $result;
+	else print $langs->trans("Error");
+
+
 	/* We disable this test because dol_print_ip need an ip as input
 	$ip='www.google.com';
 	print '<br>'.$ip.' -> ';
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 5fd40fb032a..07352921154 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -130,13 +130,13 @@ if ($action=='install')
     }
     else
     {
-        if (! preg_match('/\.zip$/i', $original_file))
+        if (! $error && ! preg_match('/\.zip$/i', $original_file))
         {
             $langs->load("errors");
             setEventMessages($langs->trans("ErrorFileMustBeADolibarrPackage", $original_file), null, 'errors');
             $error++;
         }
-    	if (! preg_match('/module_.*\-[\d]+\.[\d]+.*$/i', $original_file))
+    	if (! $error && ! preg_match('/^(module[a-zA-Z0-9]*|theme)_.*\-([0-9][0-9\.]*)\.zip$/i', $original_file))
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFilenameDosNotMatchDolibarrPackageRules", $original_file, 'module_*-x.y*.zip'), null, 'errors');
@@ -180,13 +180,13 @@ if ($action=='install')
             {
                 // Now we move the dir of the module
                 $modulename=preg_replace('/module_/', '', $original_file);
-                $modulename=preg_replace('/\-[\d]+\.[\d]+.*$/', '', $modulename);
+                $modulename=preg_replace('/\-([0-9][0-9\.]*)\.zip$/i', '', $modulename);
                 // Search dir $modulename
-                $modulenamedir=$conf->admin->dir_temp.'/'.$tmpdir.'/'.$modulename;
+                $modulenamedir=$conf->admin->dir_temp.'/'.$tmpdir.'/'.$modulename;		// Example .../mymodule
                 //var_dump($modulenamedir);
                 if (! dol_is_dir($modulenamedir))
                 {
-                    $modulenamedir=$conf->admin->dir_temp.'/'.$tmpdir.'/htdocs/'.$modulename;
+                	$modulenamedir=$conf->admin->dir_temp.'/'.$tmpdir.'/htdocs/'.$modulename;	// Example .../htdocs/mymodule
                     //var_dump($modulenamedir);
                     if (! dol_is_dir($modulenamedir))
                     {
@@ -195,10 +195,16 @@ if ($action=='install')
                     }
                 }
 
+                if (! $error)
+                {
+                	// TODO Make more test
+                }
+
+                // Now we install the module
                 if (! $error)
                 {
                     //var_dump($dirins);
-                    @dol_delete_dir_recursive($dirins.'/'.$modulename);
+                    @dol_delete_dir_recursive($dirins.'/'.$modulename);	// delete the zip file
                     dol_syslog("Uncompress of module file is a success. We copy it from ".$modulenamedir." into target dir ".$dirins.'/'.$modulename);
                     $result=dolCopyDir($modulenamedir, $dirins.'/'.$modulename, '0444', 1);
                     if ($result <= 0)
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index bd2d7782cef..56c6f977827 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2012-2107 Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2019	   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
@@ -279,6 +280,12 @@ if ($action == 'edit')	// Edit
     print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS', (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS))?$conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS:0, 1);
     print '</td></tr>';
 
+	//Invert sender and recipient
+
+	print '<tr class="oddeven"><td>'.$langs->trans("SwapSenderAndRecipientOnPDF").'</td><td>';
+	print $form->selectyesno('MAIN_INVERT_SENDER_RECIPIENT', (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT))?$conf->global->MAIN_INVERT_SENDER_RECIPIENT:0, 1);
+	print '</td></tr>';
+
  	// Place customer adress to the ISO location
 
     print '<tr class="oddeven"><td>'.$langs->trans("PlaceCustomerAddressToIsoLocation").'</td><td>';
diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php
index 61ae6bcf17f..b37e10ca2e7 100644
--- a/htdocs/admin/tools/eaccelerator.php
+++ b/htdocs/admin/tools/eaccelerator.php
@@ -118,14 +118,14 @@ function create_script_table($list)
 {
     global $sortby,$langs;
 
-    if (GETPOT('order') == "asc" || GETPOST('order') =="desc") {
-        $order = GETPOST('order');
+    if (GETPOT('order', 'alpha') == "asc" || GETPOST('order', 'alpha') == "desc") {
+        $order = GETPOST('order', 'alpha');
     } else {
         $order = "asc";
     }
 
-    if (GETPOST('order')) {
-        switch (GETPOST('order')) {
+    if (GETPOST('order', 'alpha')) {
+        switch (GETPOST('order', 'alpha')) {
             case "mtime":
             case "size":
             case "reloads":
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index 5096563ad76..8bcc6cc5417 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -618,14 +618,14 @@ if ($id)
 
                     // Active
                     print '<td align="center" class="nowrap">';
-                    print '<a href="'.$url.'action='.$acts[($obj->status?1:0)].'">'.$actl[($obj->status?1:0)].'</a>';
+                    print '<a class="reposition" href="'.$url.'action='.$acts[($obj->status?1:0)].'">'.$actl[($obj->status?1:0)].'</a>';
                     print "</td>";
 
                     // Modify link
                     print '<td align="center"><a class="reposition" href="'.$url.'action=edit">'.img_edit().'</a></td>';
 
                     // Delete link
-                    if ($iserasable) print '<td align="center"><a href="'.$url.'action=delete">'.img_delete().'</a></td>';
+                    if ($iserasable) print '<td align="center"><a class="reposition" href="'.$url.'action=delete">'.img_delete().'</a></td>';
                     else print '<td align="center">'.img_delete($langs->trans("DisableSiteFirst"), 'class="opacitymedium"').'</td>';
 
                     print "</tr>\n";
diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php
index ed23151d99b..cbf18f92222 100644
--- a/htdocs/api/admin/index.php
+++ b/htdocs/api/admin/index.php
@@ -78,6 +78,12 @@ if ($action == 'setproductionmode')
 	}
 }
 
+if ($action == 'save')
+{
+	dolibarr_set_const($db, 'API_RESTRICT_ON_IP', GETPOST('API_RESTRICT_ON_IP', 'alpha'));
+}
+
+
 dol_mkdir(DOL_DATA_ROOT.'/api/temp');		// May have been deleted by a purge
 
 
@@ -93,37 +99,50 @@ print load_fiche_titre($langs->trans("ApiSetup"), $linkback, 'title_setup');
 print $langs->trans("ApiDesc")."<br>\n";
 print "<br>\n";
 
-//print '<form name="apisetupform" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="save">';
+
 print '<table class="noborder" width="100%">';
 
 print '<tr class="liste_titre">';
 print "<td>".$langs->trans("Parameter")."</td>";
-print '<td align="center">'.$langs->trans("Value")."</td>";
+print '<td>'.$langs->trans("Value")."</td>";
 print "<td>&nbsp;</td>";
 print "</tr>";
 
-print '<tr class="impair">';
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ApiProductionMode").'</td>';
 $production_mode=(empty($conf->global->API_PRODUCTION_MODE)?false:true);
 if ($production_mode)
 {
-    print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&value='.($i+1).'&status=0">';
+    print '<td><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&value='.($i+1).'&status=0">';
     print img_picto($langs->trans("Activated"), 'switch_on');
     print '</a></td>';
 }
 else
 {
-    print '<td align="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&value='.($i+1).'&status=1">';
+    print '<td><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&value='.($i+1).'&status=1">';
     print img_picto($langs->trans("Disabled"), 'switch_off');
     print '</a></td>';
 }
 print '<td>&nbsp;</td>';
 print '</tr>';
 
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("RESTRICT_API_ON_IP").'</td>';
+print '<td><input type="text" name="API_RESTRICT_ON_IP" value="'.dol_escape_htmltag($conf->global->API_RESTRICT_ON_IP).'"></td>';
+print '<td>';
+print '<input type="submit" class="button" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></td>';
+print '</td>';
+print '</tr>';
+
 print '</table>';
 print '<br><br>';
 
+print '</form>';
+
+
 // 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
diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 223d62e248b..1b79f661dd6 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -32,7 +32,7 @@ class DolibarrApi
     /**
      * @var DoliDb        $db Database object
      */
-    static protected $db;
+    protected static $db;
 
     /**
      * @var Restler     $r	Restler object
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 48d6bf5b903..1b98ad5f2ec 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -56,7 +56,7 @@ class Documents extends DolibarrApi
 	 * Note that, this API is similar to using the wrapper link "documents.php" to download a file (used for
 	 * internal HTML links of documents into application), but with no need to have a session cookie (the token is used instead).
 	 *
-	 * @param   string  $module_part    Name of module or area concerned by file download ('facture', ...)
+	 * @param   string  $modulepart     Name of module or area concerned by file download ('facture', ...)
 	 * @param   string  $original_file  Relative path with filename, relative to modulepart (for example: IN201701-999/IN201701-999.pdf)
 	 * @return  array                   List of documents
 	 *
@@ -67,11 +67,11 @@ class Documents extends DolibarrApi
 	 *
 	 * @url GET /download
 	 */
-	public function index($module_part, $original_file = '')
+	public function index($modulepart, $original_file = '')
 	{
 		global $conf, $langs;
 
-		if (empty($module_part)) {
+		if (empty($modulepart)) {
 				throw new RestException(400, 'bad value for parameter modulepart');
 		}
 		if (empty($original_file)) {
@@ -81,7 +81,7 @@ class Documents extends DolibarrApi
 		//--- Finds and returns the document
 		$entity=$conf->entity;
 
-		$check_access = dol_check_secure_access_document($module_part, $original_file, $entity, DolibarrApiAccess::$user, '', 'read');
+		$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, DolibarrApiAccess::$user, '', 'read');
 		$accessallowed = $check_access['accessallowed'];
 		$sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 		$original_file = $check_access['original_file'];
@@ -98,6 +98,7 @@ class Documents extends DolibarrApi
 
 		if (! file_exists($original_file_osencoded))
 		{
+			dol_syslog("Try to download not found file ".$original_file_osencoded, LOG_WARNING);
 			throw new RestException(404, 'File not found');
 		}
 
@@ -111,7 +112,7 @@ class Documents extends DolibarrApi
 	 *
 	 * Test sample 1: { "module_part": "invoice", "original_file": "FA1701-001/FA1701-001.pdf", "doctemplate": "crabe", "langcode": "fr_FR" }.
 	 *
-	 * @param   string  $module_part    Name of module or area concerned by file download ('invoice', 'order', ...).
+	 * @param   string  $modulepart    Name of module or area concerned by file download ('invoice', 'order', ...).
 	 * @param   string  $original_file  Relative path with filename, relative to modulepart (for example: IN201701-999/IN201701-999.pdf).
 	 * @param	string	$doctemplate	Set here the doc template to use for document generation (If not set, use the default template).
 	 * @param	string	$langcode		Language code like 'en_US', 'fr_FR', 'es_ES', ... (If not set, use the default language).
@@ -126,11 +127,11 @@ class Documents extends DolibarrApi
 	 *
 	 * @url PUT /builddoc
 	 */
-	public function builddoc($module_part, $original_file = '', $doctemplate = '', $langcode = '')
+	public function builddoc($modulepart, $original_file = '', $doctemplate = '', $langcode = '')
 	{
 		global $conf, $langs;
 
-		if (empty($module_part)) {
+		if (empty($modulepart)) {
 			throw new RestException(400, 'bad value for parameter modulepart');
 		}
 		if (empty($original_file)) {
@@ -147,7 +148,7 @@ class Documents extends DolibarrApi
 		//--- Finds and returns the document
 		$entity=$conf->entity;
 
-		$check_access = dol_check_secure_access_document($module_part, $original_file, $entity, DolibarrApiAccess::$user, '', 'write');
+		$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, DolibarrApiAccess::$user, '', 'write');
 		$accessallowed              = $check_access['accessallowed'];
 		$sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 		$original_file              = $check_access['original_file'];
@@ -166,7 +167,7 @@ class Documents extends DolibarrApi
 
 		$templateused='';
 
-		if ($module_part == 'facture' || $module_part == 'invoice')
+		if ($modulepart == 'facture' || $modulepart == 'invoice')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 			$this->invoice = new Facture($this->db);
@@ -181,7 +182,7 @@ class Documents extends DolibarrApi
 				throw new RestException(500, 'Error generating document');
 			}
 		}
-		elseif ($module_part == 'commande' || $module_part == 'order')
+		elseif ($modulepart == 'commande' || $modulepart == 'order')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 			$this->order = new Commande($this->db);
@@ -195,7 +196,7 @@ class Documents extends DolibarrApi
 				throw new RestException(500, 'Error generating document');
 			}
 		}
-		elseif ($module_part == 'propal' || $module_part == 'proposal')
+		elseif ($modulepart == 'propal' || $modulepart == 'proposal')
 		{
 			require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 			$this->propal = new Propal($this->db);
diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index 2bf464f7296..9d8b90a0123 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -57,12 +57,13 @@ class Login
 	 */
     public function index($login, $password, $entity = '', $reset = 0)
     {
-
 	    global $conf, $dolibarr_main_authentication, $dolibarr_auto_user;
 
-		// Authentication mode
-		if (empty($dolibarr_main_authentication))
-			$dolibarr_main_authentication = 'http,dolibarr';
+	    // TODO Remove the API login. The token must be generated from backoffice only.
+
+	    // Authentication mode
+		if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'dolibarr';
+
 		// Authentication mode: forceuser
 		if ($dolibarr_main_authentication == 'forceuser')
 		{
@@ -73,6 +74,7 @@ class Login
 				throw new RestException(403, "Your instance is set to use the automatic login '".$dolibarr_auto_user."' that is not the requested login. API usage is forbidden in this mode.");
 			}
 		}
+
 		// Set authmode
 		$authmode = explode(',', $dolibarr_main_authentication);
 
@@ -83,7 +85,7 @@ class Login
 		if ($entity == '') $entity=1;
 
 		include_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';
-		$login = checkLoginPassEntity($login, $password, $entity, $authmode);
+		$login = checkLoginPassEntity($login, $password, $entity, $authmode, 'api');
 		if (empty($login))
 		{
 			throw new RestException(403, 'Access denied');
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index 9d42b9995f6..dd9ff7aadcb 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -24,6 +24,8 @@
  *  \file       htdocs/api/index.php
  */
 
+use Luracast\Restler\Format\UploadFormat;
+
 if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');			// Do not check anti CSRF attack test
 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
@@ -117,6 +119,21 @@ $api->r->addAuthenticationClass('DolibarrApiAccess', '');
 UploadFormat::$allowedMimeTypes = array('image/jpeg', 'image/png', 'text/plain', 'application/octet-stream');
 
 
+// Restrict API to some IPs
+if (! empty($conf->global->API_RESTRICT_ON_IP))
+{
+	$allowedip=explode(' ', $conf->global->API_RESTRICT_ON_IP);
+	$ipremote = getUserRemoteIP();
+	if (! in_array($ipremote, $allowedip))
+	{
+		dol_syslog('Remote ip is '.$ipremote.', not into list '.$conf->global->API_RESTRICT_ON_IP);
+		print 'APIs are not allowed from the IP '.$ipremote;
+		header('HTTP/1.1 503 API not allowed from your IP '.$ipremote);
+		//print $conf->global->API_RESTRICT_ON_IP;
+		exit(0);
+	}
+}
+
 
 // Call Explorer file for all APIs definitions (this part is slow)
 if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' || $reg[2] == '/swagger.json/root' || $reg[2] == '/resources.json' || $reg[2] == '/resources.json/root'))
@@ -136,6 +153,7 @@ if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' ||
         {
             while (($file = readdir($handle))!==false)
             {
+            	$regmod=array();
                 if (is_readable($dir.$file) && preg_match("/^mod(.*)\.class\.php$/i", $file, $regmod))
                 {
                     $module = strtolower($regmod[1]);
@@ -165,6 +183,7 @@ if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' ||
                             {
                                 if ($file_searched == 'api_access.class.php') continue;
 
+                                $regapi = array();
                                 if (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i", $file_searched, $regapi))
                                 {
                                     $classname = ucwords($regapi[1]);
@@ -204,6 +223,7 @@ if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' ||
 }
 
 // Call one APIs or one definition of an API
+$regbis = array();
 if (! empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' && $reg[2] != '/resources.json' && preg_match('/^\/(swagger|resources)\.json\/(.+)$/', $reg[2], $regbis) && $regbis[2] != 'root')))
 {
     $module = $reg[1];
@@ -253,7 +273,6 @@ if (! empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' &&
 		$api->r->addAPIClass($classname);
 }
 
-// TODO If not found, redirect to explorer
 //var_dump($api->r->apiVersionMap);
 //exit;
 
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 6e4e3fb941b..07db3b5a5d8 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1103,6 +1103,7 @@ class ActionComm extends CommonObject
 	    		$response = new WorkboardResponse();
 	    		$response->warning_delay = $conf->agenda->warning_delay/60/60/24;
 	    		$response->label = $langs->trans("ActionsToDo");
+	    		$response->labelShort = $langs->trans("ActionsToDoShort");
 	    		$response->url = DOL_URL_ROOT.'/comm/action/list.php?actioncode=0&amp;status=todo&amp;mainmenu=agenda';
 	    		if ($user->rights->agenda->allactions->read) $response->url.='&amp;filtert=-1';
 	    		$response->img = img_object('', "action", 'class="inline-block valigntextmiddle"');
@@ -1286,8 +1287,10 @@ class ActionComm extends CommonObject
 
         if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;   // Force disable tooltips
 
-        if ((!$user->rights->agenda->allactions->read && $this->authorid != $user->id) || (!$user->rights->agenda->myactions->read && $this->authorid == $user->id))
+		if ((!$user->rights->agenda->allactions->read && $this->authorid != $user->id) || (!$user->rights->agenda->myactions->read && $this->authorid == $user->id))
+		{
             $option = 'nolink';
+		}
 
         $label = $this->label;
 		if (empty($label)) $label=$this->libelle;   // For backward compatibility
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 8b52aedcaad..2ae67888658 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -380,7 +380,6 @@ if (empty($reshook))
 				}
 			} else {
 				$object->ref = GETPOST('ref');
-				$object->entity = (GETPOSTISSET('entity')?GETPOST('entity', 'int'):$conf->entity);
 				$object->ref_client = GETPOST('ref_client');
 				$object->datep = $datep;
 				$object->date_livraison = $date_delivery;
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 598d34f7093..49173eff5fd 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2005-2013 Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2006      Andre Cianfarani			<acianfa@free.fr>
  * Copyright (C) 2008      Raphael Bertrand			<raphael.bertrand@resultic.fr>
- * Copyright (C) 2010-2014 Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2010-2019 Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2010-2017 Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2012-2014 Christophe Battarel  	<christophe.battarel@altairis.fr>
  * Copyright (C) 2012      Cedric Salvador          <csalvador@gpcsolutions.fr>
@@ -890,7 +890,6 @@ class Propal extends CommonObject
 		$now=dol_now();
 
 		// Clean parameters
-		if (empty($this->entity)) $this->entity = $conf->entity;
 		if (empty($this->date)) $this->date=$this->datep;
 		$this->fin_validite = $this->date + ($this->duree_validite * 24 * 3600);
 		if (empty($this->availability_id)) $this->availability_id=0;
@@ -1000,7 +999,7 @@ class Propal extends CommonObject
 		$sql.= ", ".($this->fk_project?$this->fk_project:"null");
 		$sql.= ", ".(int) $this->fk_incoterms;
 		$sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-		$sql.= ", ".$this->entity;
+		$sql.= ", ".setEntity($this);
 		$sql.= ", ".(int) $this->fk_multicurrency;
 		$sql.= ", '".$this->db->escape($this->multicurrency_code)."'";
 		$sql.= ", ".(double) $this->multicurrency_tx;
@@ -1056,14 +1055,6 @@ class Propal extends CommonObject
                 	}
                 }
 
-                // Add linked object (deprecated, use ->linkedObjectsIds instead)
-                if (! $error && $this->origin && $this->origin_id)
-                {
-                    dol_syslog('Deprecated use of linked object, use ->linkedObjectsIds instead', LOG_WARNING);
-                	$ret = $this->add_object_linked();
-                	if (! $ret)	dol_print_error($this->db);
-                }
-
                 /*
                  *  Insertion du detail des produits dans la base
                  *  Insert products detail in database
@@ -1091,7 +1082,7 @@ class Propal extends CommonObject
 						$vatrate = $line->tva_tx;
 						if ($line->vat_src_code && ! preg_match('/\(.*\)/', $vatrate)) $vatrate.=' ('.$line->vat_src_code.')';
 
-    $result = $this->addline(
+						$result = $this->addline(
 							$line->desc,
 							$line->subprice,
 							$line->qty,
@@ -1138,7 +1129,7 @@ class Propal extends CommonObject
 					$sql = "UPDATE ".MAIN_DB_PREFIX."propal";
 					$sql.= " SET fk_delivery_address = ".$this->fk_delivery_address;
 					$sql.= " WHERE ref = '".$this->db->escape($this->ref)."'";
-					$sql.= " AND entity = ".$conf->entity;
+					$sql.= " AND entity = ".setEntity($this);
 
 					$result=$this->db->query($sql);
 				}
@@ -3277,21 +3268,24 @@ class Propal extends CommonObject
 
 			$delay_warning = 0;
 			$statut = 0;
-			$label = '';
+			$label = $labelShort = '';
 			if ($mode == 'opened') {
 				$delay_warning=$conf->propal->cloture->warning_delay;
 				$statut = self::STATUS_VALIDATED;
 				$label = $langs->trans("PropalsToClose");
+				$labelShort = $langs->trans("ToAcceptRefuse");
 			}
 			if ($mode == 'signed') {
 				$delay_warning=$conf->propal->facturation->warning_delay;
 				$statut = self::STATUS_SIGNED;
 				$label = $langs->trans("PropalsToBill");         // We set here bill but may be billed or ordered
+				$labelShort = $langs->trans("ToBill");
 			}
 
 			$response = new WorkboardResponse();
 			$response->warning_delay = $delay_warning/60/60/24;
 			$response->label = $label;
+			$response->labelShort = $labelShort;
 			$response->url = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut.'&mainmenu=commercial&leftmenu=propals';
 			$response->url_late = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut.'&mainmenu=commercial&leftmenu=propals&sortfield=p.datep&sortorder=asc';
 			$response->img = img_object('', "propal");
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index c6af61acab9..2964ff98690 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -1062,7 +1062,7 @@ if ($resql)
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i);
 		$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 0f875b68f22..a44054cdfd0 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -96,9 +96,17 @@ 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('ordercard','globalcard'));
 
-$permissionnote = $user->rights->commande->creer; 		// Used by the include of actions_setnotes.inc.php
-$permissiondellink = $user->rights->commande->creer; 	// Used by the include of actions_dellink.inc.php
-$permissionedit = $user->rights->commande->creer; 		// Used by the include of actions_lineupdown.inc.php
+$usercanread = $user->rights->commande->lire;
+$usercancreate = $user->rights->commande->creer;
+$usercanclose = $user->rights->commande->cloturer;
+$usercandelete = $user->rights->commande->supprimer;
+$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate)));
+$usercancancel = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->annuler)));
+$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send);
+
+$permissionnote = $usercancreate; 		// Used by the include of actions_setnotes.inc.php
+$permissiondellink = $usercancreate; 	// Used by the include of actions_dellink.inc.php
+$permissionedit = $usercancreate; 		// Used by the include of actions_lineupdown.inc.php
 
 
 /*
@@ -129,7 +137,7 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
 
 	// Action clone object
-	if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->commande->creer)
+	if ($action == 'confirm_clone' && $confirm == 'yes' && $usercancreate)
 	{
 		if (1==0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
 		{
@@ -159,7 +167,7 @@ if (empty($reshook))
 	}
 
 	// Reopen a closed order
-	elseif ($action == 'reopen' && $user->rights->commande->creer)
+	elseif ($action == 'reopen' && $usercancreate)
 	{
 		if ($object->statut == Commande::STATUS_CANCELED || $object->statut == Commande::STATUS_CLOSED)
 		{
@@ -176,7 +184,7 @@ if (empty($reshook))
 	}
 
 	// Remove order
-	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->commande->supprimer)
+	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete)
 	{
 		$result = $object->delete($user);
 		if ($result > 0)
@@ -191,7 +199,7 @@ if (empty($reshook))
 	}
 
 	// Remove a product line
-	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->commande->creer)
+	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate)
 	{
 		$result = $object->deleteline($user, $lineid);
 		if ($result > 0)
@@ -222,13 +230,13 @@ if (empty($reshook))
 	}
 
 	// Link to a project
-	elseif ($action == 'classin' && $user->rights->commande->creer)
+	elseif ($action == 'classin' && $usercancreate)
 	{
 		$object->setProject(GETPOST('projectid', 'int'));
 	}
 
 	// Add order
-	elseif ($action == 'add' && $user->rights->commande->creer)
+	elseif ($action == 'add' && $usercancreate)
 	{
 		$datecommande = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 		$datelivraison = dol_mktime(12, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));
@@ -481,7 +489,7 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'classifybilled' && $user->rights->commande->creer)
+	elseif ($action == 'classifybilled' && $usercancreate)
 	{
 		$ret=$object->classifyBilled($user);
 
@@ -489,7 +497,7 @@ if (empty($reshook))
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-	elseif ($action == 'classifyunbilled' && $user->rights->commande->creer)
+	elseif ($action == 'classifyunbilled' && $usercancreate)
 	{
 		$ret=$object->classifyUnBilled();
 		if ($ret < 0) {
@@ -498,7 +506,7 @@ if (empty($reshook))
 	}
 
 	// Positionne ref commande client
-	elseif ($action == 'setref_client' && $user->rights->commande->creer) {
+	elseif ($action == 'setref_client' && $usercancreate) {
 		$result = $object->set_ref_client($user, GETPOST('ref_client'));
 		if ($result < 0)
 		{
@@ -506,7 +514,7 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'setremise' && $user->rights->commande->creer) {
+	elseif ($action == 'setremise' && $usercancreate) {
 		$result = $object->set_remise($user, GETPOST('remise'));
 		if ($result < 0)
 		{
@@ -514,7 +522,7 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'setabsolutediscount' && $user->rights->commande->creer) {
+	elseif ($action == 'setabsolutediscount' && $usercancreate) {
 		if (GETPOST('remise_id')) {
 			if ($object->id > 0) {
 				$object->insert_discount(GETPOST('remise_id'));
@@ -524,7 +532,7 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'setdate' && $user->rights->commande->creer) {
+	elseif ($action == 'setdate' && $usercancreate) {
 		// print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
 		$date = dol_mktime(0, 0, 0, GETPOST('order_month'), GETPOST('order_day'), GETPOST('order_year'));
 
@@ -534,7 +542,7 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'setdate_livraison' && $user->rights->commande->creer) {
+	elseif ($action == 'setdate_livraison' && $usercancreate) {
 		// print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
 		$datelivraison = dol_mktime(0, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));
 
@@ -544,35 +552,35 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'setmode' && $user->rights->commande->creer) {
+	elseif ($action == 'setmode' && $usercancreate) {
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
 		if ($result < 0)
 			setEventMessages($object->error, $object->errors, 'errors');
 	}
 
 	// Multicurrency Code
-	elseif ($action == 'setmulticurrencycode' && $user->rights->commande->creer) {
+	elseif ($action == 'setmulticurrencycode' && $usercancreate) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
 	}
 
 	// Multicurrency rate
-	elseif ($action == 'setmulticurrencyrate' && $user->rights->commande->creer) {
+	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')));
 	}
 
-	elseif ($action == 'setavailability' && $user->rights->commande->creer) {
+	elseif ($action == 'setavailability' && $usercancreate) {
 		$result = $object->availability(GETPOST('availability_id'));
 		if ($result < 0)
 			setEventMessages($object->error, $object->errors, 'errors');
 	}
 
-	elseif ($action == 'setdemandreason' && $user->rights->commande->creer) {
+	elseif ($action == 'setdemandreason' && $usercancreate) {
 		$result = $object->demand_reason(GETPOST('demand_reason_id'));
 		if ($result < 0)
 			setEventMessages($object->error, $object->errors, 'errors');
 	}
 
-	elseif ($action == 'setconditions' && $user->rights->commande->creer) {
+	elseif ($action == 'setconditions' && $usercancreate) {
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
@@ -604,7 +612,7 @@ if (empty($reshook))
 	}
 
 	// bank account
-	elseif ($action == 'setbankaccount' && $user->rights->commande->creer) {
+	elseif ($action == 'setbankaccount' && $usercancreate) {
 		$result=$object->setBankAccount(GETPOST('fk_account', 'int'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -612,7 +620,7 @@ if (empty($reshook))
 	}
 
 	// shipping method
-	elseif ($action == 'setshippingmethod' && $user->rights->commande->creer) {
+	elseif ($action == 'setshippingmethod' && $usercancreate) {
 		$result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -620,23 +628,23 @@ if (empty($reshook))
 	}
 
 	// warehouse
-	elseif ($action == 'setwarehouse' && $user->rights->commande->creer) {
+	elseif ($action == 'setwarehouse' && $usercancreate) {
 		$result = $object->setWarehouse(GETPOST('warehouse_id', 'int'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 
-	elseif ($action == 'setremisepercent' && $user->rights->commande->creer) {
+	elseif ($action == 'setremisepercent' && $usercancreate) {
 		$result = $object->set_remise($user, GETPOST('remise_percent'));
 	}
 
-	elseif ($action == 'setremiseabsolue' && $user->rights->commande->creer) {
+	elseif ($action == 'setremiseabsolue' && $usercancreate) {
 		$result = $object->set_remise_absolue($user, GETPOST('remise_absolue'));
 	}
 
 	// Add a new line
-	elseif ($action == 'addline' && $user->rights->commande->creer)
+	elseif ($action == 'addline' && $usercancreate)
 	{
 		$langs->load('errors');
 		$error = 0;
@@ -999,7 +1007,7 @@ if (empty($reshook))
 	/*
 	 *  Update a line
 	 */
-	elseif ($action == 'updateline' && $user->rights->commande->creer && GETPOST('save'))
+	elseif ($action == 'updateline' && $usercancreate && GETPOST('save'))
 	{
 		// Clean parameters
 		$date_start='';
@@ -1133,15 +1141,12 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	} elseif ($action == 'updateline' && $user->rights->commande->creer && GETPOST('cancel', 'alpha') == $langs->trans('Cancel')) {
+	} elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha') == $langs->trans('Cancel')) {
 		header('Location: ' . $_SERVER['PHP_SELF'] . '?id=' . $object->id); // Pour reaffichage de la fiche en cours d'edition
 		exit();
 	}
 
-	elseif ($action == 'confirm_validate' && $confirm == 'yes' &&
-		((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->creer))
-	   	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate)))
-	)
+	elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate)
 	{
 		$idwarehouse = GETPOST('idwarehouse');
 
@@ -1195,7 +1200,7 @@ if (empty($reshook))
 	}
 
 	// Go back to draft status
-	elseif ($action == 'confirm_modif' && $user->rights->commande->creer) {
+	elseif ($action == 'confirm_modif' && $usercancreate) {
 		$idwarehouse = GETPOST('idwarehouse');
 
 		$qualified_for_stock_change=0;
@@ -1243,17 +1248,14 @@ if (empty($reshook))
 		}
 	}
 
-	elseif ($action == 'confirm_shipped' && $confirm == 'yes' && $user->rights->commande->cloturer) {
+	elseif ($action == 'confirm_shipped' && $confirm == 'yes' && $usercanclose) {
 		$result = $object->cloture($user);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 
-	elseif ($action == 'confirm_cancel' && $confirm == 'yes' &&
-		((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->creer))
-	   	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate)))
-	)
+	elseif ($action == 'confirm_cancel' && $confirm == 'yes' && $usercanvalidate)
 	{
 		$idwarehouse = GETPOST('idwarehouse');
 
@@ -1310,7 +1312,7 @@ if (empty($reshook))
 		if ($error) $action = 'edit_extras';
 	}
 
-	if ($action == 'set_thirdparty' && $user->rights->commande->creer)
+	if ($action == 'set_thirdparty' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->setValueFrom('fk_soc', $socid, '', '', 'date', '', $user, 'ORDER_MODIFY');
@@ -1321,7 +1323,7 @@ if (empty($reshook))
 
 	// add lines from objectlinked
 	if($action == 'import_lines_from_object'
-	    && $user->rights->commande->creer
+	    && $usercancreate
 	    && $object->statut == Commande::STATUS_DRAFT
 	  )
 	{
@@ -1405,8 +1407,8 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Actions to build doc
-	$upload_dir = $conf->commande->dir_output;
-	$permissioncreate = $user->rights->commande->creer;
+	$upload_dir = $conf->commande->multidir_output[$object->entity];
+	$permissioncreate = $usercancreate;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	// Actions to send emails
@@ -1417,7 +1419,7 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 
-	if (! $error && ! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->commande->creer)
+	if (! $error && ! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate)
 	{
 		if ($action == 'addcontact')
 		{
@@ -1478,7 +1480,7 @@ $formmargin = new FormMargin($db);
 if (! empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
 
 // Mode creation
-if ($action == 'create' && $user->rights->commande->creer)
+if ($action == 'create' && $usercancreate)
 {
 	print load_fiche_titre($langs->trans('CreateOrder'), '', 'title_commercial.png');
 
@@ -2069,8 +2071,8 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 		$morehtmlref='<div class="refidno">';
 		// Ref customer
-		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->commande->creer, 'string', '', null, null, '', 1);
+		$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', 0, 1);
+		$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', null, null, '', 1);
 		// Thirdparty
 		$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
 		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref.=' (<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherOrders").'</a>)';
@@ -2079,7 +2081,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 		{
 			$langs->load("projects");
 			$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-			if ($user->rights->commande->creer)
+			if ($usercancreate)
 			{
 				if ($action != 'classify')
 					$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
@@ -2159,7 +2161,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 		// Date
 		print '<tr><td>';
-		$editenable = $user->rights->commande->creer && $object->statut == Commande::STATUS_DRAFT;
+		$editenable = $usercancreate && $object->statut == Commande::STATUS_DRAFT;
 		print $form->editfieldkey("Date", 'date', '', $object, $editenable);
 		print '</td><td>';
 		if ($action == 'editdate') {
@@ -2180,7 +2182,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 		// Delivery date planed
 		print '<tr><td>';
-		$editenable = $user->rights->commande->creer;
+		$editenable = $usercancreate;
 		print $form->editfieldkey("DateDeliveryPlanned", 'date_livraison', '', $object, $editenable);
 		print '</td><td>';
 		if ($action == 'editdate_livraison') {
@@ -2202,7 +2204,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 		// Shipping Method
 		if (! empty($conf->expedition->enabled)) {
 			print '<tr><td>';
-			$editenable = $user->rights->commande->creer;
+			$editenable = $usercancreate;
 			print $form->editfieldkey("SendingMethod", 'shippingmethod', '', $object, $editenable);
 			print '</td><td>';
 			if ($action == 'editshippingmethod') {
@@ -2220,7 +2222,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 			$formproduct=new FormProduct($db);
 			print '<tr><td>';
-			$editenable = $user->rights->commande->creer;
+			$editenable = $usercancreate;
 			print $form->editfieldkey("Warehouse", 'warehouse', '', $object, $editenable);
 			print '</td><td>';
 			if ($action == 'editwarehouse') {
@@ -2234,7 +2236,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 		// Terms of payment
 		print '<tr><td>';
-		$editenable = $user->rights->commande->creer;
+		$editenable = $usercancreate;
 		print $form->editfieldkey("PaymentConditionsShort", 'conditions', '', $object, $editenable);
 		print '</td><td>';
 		if ($action == 'editconditions') {
@@ -2248,7 +2250,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 		// Mode of payment
 		print '<tr><td>';
-		$editenable = $user->rights->commande->creer;
+		$editenable = $usercancreate;
 		print $form->editfieldkey("PaymentMode", 'mode', '', $object, $editenable);
 		print '</td><td>';
 		if ($action == 'editmode') {
@@ -2264,7 +2266,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 			// Multicurrency code
 			print '<tr>';
 			print '<td>';
-			$editenable = $user->rights->commande->creer && $object->statut == Commande::STATUS_DRAFT;
+			$editenable = $usercancreate && $object->statut == Commande::STATUS_DRAFT;
 			print $form->editfieldkey("Currency", 'multicurrencycode', '', $object, $editenable);
 			print '</td><td>';
 			if ($action == 'editmulticurrencycode') {
@@ -2277,7 +2279,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 			// Multicurrency rate
 			print '<tr>';
 			print '<td>';
-			$editenable = $user->rights->commande->creer && $object->multicurrency_code && $object->multicurrency_code != $conf->currency && $object->statut == Commande::STATUS_DRAFT;
+			$editenable = $usercancreate && $object->multicurrency_code && $object->multicurrency_code != $conf->currency && $object->statut == Commande::STATUS_DRAFT;
 			print $form->editfieldkey("CurrencyRate", 'multicurrencyrate', '', $object, $editenable);
 			print '</td><td>';
 			if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
@@ -2298,7 +2300,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 		// Delivery delay
 		print '<tr class="fielddeliverydelay"><td>';
-		$editenable = $user->rights->commande->creer;
+		$editenable = $usercancreate;
 		print $form->editfieldkey("AvailabilityPeriod", 'availability', '', $object, $editenable);
 		print '</td><td>';
 		if ($action == 'editavailability') {
@@ -2310,7 +2312,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 
 		// Source reason (why we have an ordrer)
 		print '<tr><td>';
-		$editenable = $user->rights->commande->creer;
+		$editenable = $usercancreate;
 		print $form->editfieldkey("Channel", 'demandreason', '', $object, $editenable);
 		print '</td><td>';
 		if ($action == 'editdemandreason') {
@@ -2323,7 +2325,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 		// TODO Order mode (how we receive order). Not yet implemented
 		/*
 		print '<tr><td>';
-		$editenable = $user->rights->commande->creer;
+		$editenable = $usercancreate;
 		print $form->editfieldkey("SourceMode", 'inputmode', '', $object, $editenable);
 		print '</td><td>';
 		if ($action == 'editinputmode') {
@@ -2355,7 +2357,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 		// Incoterms
 		if (!empty($conf->incoterm->enabled)) {
 			print '<tr><td>';
-			$editenable = $user->rights->commande->creer;
+			$editenable = $usercancreate;
 			print $form->editfieldkey("IncotermLabel", 'incoterm', '', $object, $editenable);
 			print '</td>';
 			print '<td>';
@@ -2373,7 +2375,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 		// Bank Account
 		if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && ! empty($conf->banque->enabled)) {
 			print '<tr><td>';
-			$editenable = $user->rights->commande->creer;
+			$editenable = $usercancreate;
 			print $form->editfieldkey("BankAccount", 'bankaccount', '', $object, $editenable);
 			print '</td><td>';
 			if ($action == 'editbankaccount') {
@@ -2497,7 +2499,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 		/*
 		 * Form to add new line
 		 */
-		if ($object->statut == Commande::STATUS_DRAFT && $user->rights->commande->creer && $action != 'selectlines')
+		if ($object->statut == Commande::STATUS_DRAFT && $usercancreate && $action != 'selectlines')
 		{
 			if ($action != 'editline')
 			{
@@ -2528,22 +2530,19 @@ if ($action == 'create' && $user->rights->commande->creer)
 			if (empty($reshook)) {
 				// Send
 				if ($object->statut > Commande::STATUS_DRAFT) {
-					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send)) {
+					if ($usercansend) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a></div>';
 					} else
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">' . $langs->trans('SendMail') . '</a></div>';
 				}
 
 				// Valid
-				if ($object->statut == Commande::STATUS_DRAFT && $object->total_ttc >= 0 && $numlines > 0 &&
-					((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->creer))
-				   	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate)))
-				)
+				if ($object->statut == Commande::STATUS_DRAFT && $object->total_ttc >= 0 && $numlines > 0 && $usercanvalidate)
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=validate">' . $langs->trans('Validate') . '</a></div>';
 				}
 				// Edit
-				if ($object->statut == Commande::STATUS_VALIDATED && $user->rights->commande->creer) {
+				if ($object->statut == Commande::STATUS_VALIDATED && $usercancreate) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id=' . $object->id . '&amp;action=modif">' . $langs->trans('Modify') . '</a></div>';
 				}
 				// Create event
@@ -2597,12 +2596,12 @@ if ($action == 'create' && $user->rights->commande->creer)
 				}
 
 				// Reopen a closed order
-				if (($object->statut == Commande::STATUS_CLOSED || $object->statut == Commande::STATUS_CANCELED) && $user->rights->commande->creer) {
+				if (($object->statut == Commande::STATUS_CLOSED || $object->statut == Commande::STATUS_CANCELED) && $usercancreate) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;action=reopen">' . $langs->trans('ReOpen') . '</a></div>';
 				}
 
 				// Set to shipped
-				if (($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_SHIPMENTONPROCESS) && $user->rights->commande->cloturer) {
+				if (($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_SHIPMENTONPROCESS) && $usercanclose) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=shipped">' . $langs->trans('ClassifyShipped') . '</a></div>';
 				}
 
@@ -2612,31 +2611,28 @@ if ($action == 'create' && $user->rights->commande->creer)
 					if (! empty($conf->facture->enabled) && $user->rights->facture->creer && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER)) {
 						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->socid . '">' . $langs->trans("CreateBill") . '</a></div>';
 					}
-					if ($user->rights->commande->creer && $object->statut >= Commande::STATUS_VALIDATED && empty($conf->global->WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER) && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {
+					if ($usercancreate && $object->statut >= Commande::STATUS_VALIDATED && empty($conf->global->WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER) && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=classifybilled">' . $langs->trans("ClassifyBilled") . '</a></div>';
 					}
 				}
 				if ($object->statut > Commande::STATUS_DRAFT && $object->billed) {
-					if ($user->rights->commande->creer && $object->statut >= Commande::STATUS_VALIDATED && empty($conf->global->WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER) && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {
+					if ($usercancreate && $object->statut >= Commande::STATUS_VALIDATED && empty($conf->global->WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER) && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=classifyunbilled">' . $langs->trans("ClassifyUnBilled") . '</a></div>';
 					}
 				}
 				// Clone
-				if ($user->rights->commande->creer) {
+				if ($usercancreate) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;socid=' . $object->socid . '&amp;action=clone&amp;object=order">' . $langs->trans("ToClone") . '</a></div>';
 				}
 
 				// Cancel order
-				if ($object->statut == Commande::STATUS_VALIDATED &&
-					((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->cloturer))
-				   	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->annuler)))
-				)
+				if ($object->statut == Commande::STATUS_VALIDATED && (! empty($usercanclose) || ! empty($usercancancel)))
 				{
 					print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=cancel">' . $langs->trans('Cancel') . '</a></div>';
 				}
 
 				// Delete order
-				if ($user->rights->commande->supprimer) {
+				if ($usercandelete) {
 					if ($numshipping == 0) {
 						print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delete">' . $langs->trans('Delete') . '</a></div>';
 					} else {
@@ -2659,18 +2655,18 @@ if ($action == 'create' && $user->rights->commande->creer)
 			// Documents
 			$comref = dol_sanitizeFileName($object->ref);
 			$relativepath = $comref . '/' . $comref . '.pdf';
-			$filedir = $conf->commande->dir_output . '/' . $comref;
+			$filedir = $conf->commande->multidir_output[$object->entity] . '/' . $comref;
 			$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-			$genallowed = $user->rights->commande->lire;
-			$delallowed = $user->rights->commande->creer;
-			print $formfile->showdocuments('commande', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+			$genallowed = $usercanread;
+			$delallowed = $usercancreate;
+			print $formfile->showdocuments('commande', $comref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang, '', $object);
 
 
 			// Show links to link elements
 			$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
 
 			$compatibleImportElementsList = false;
-			if($user->rights->commande->creer
+			if($usercancreate
 			    && $object->statut == Commande::STATUS_DRAFT)
 			{
 			    $compatibleImportElementsList = array('commande','propal'); // import from linked elements
@@ -2707,7 +2703,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 		// Presend form
 		$modelmail='order_send';
 		$defaulttopic='SendOrderRef';
-		$diroutput = $conf->commande->dir_output;
+		$diroutput = $conf->commande->multidir_output[$object->entity];
 		$trackid = 'ord'.$object->id;
 
 		include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 23d9db8f246..de93ff778c4 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -433,8 +433,8 @@ class Commande extends CommonOrder
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
 				$oldref = dol_sanitizeFileName($this->ref);
 				$newref = dol_sanitizeFileName($num);
-				$dirsource = $conf->commande->dir_output.'/'.$oldref;
-				$dirdest = $conf->commande->dir_output.'/'.$newref;
+				$dirsource = $conf->commande->multidir_output[$this->entity].'/'.$oldref;
+				$dirdest = $conf->commande->multidir_output[$this->entity].'/'.$newref;
 				if (! $error && file_exists($dirsource))
 				{
 					dol_syslog(get_class($this)."::valid() rename dir ".$dirsource." into ".$dirdest);
@@ -443,7 +443,7 @@ class Commande extends CommonOrder
 					{
 						dol_syslog("Rename ok");
 						// Rename docs starting with $oldref with $newref
-						$listoffiles=dol_dir_list($conf->commande->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+						$listoffiles=dol_dir_list($conf->commande->multidir_output[$this->entity].'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
 						foreach($listoffiles as $fileentry)
 						{
 							$dirsource=$fileentry['name'];
@@ -865,7 +865,7 @@ class Commande extends CommonOrder
 		$sql.= ", ".($this->remise_percent>0?$this->db->escape($this->remise_percent):0);
 		$sql.= ", ".(int) $this->fk_incoterms;
 		$sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-		$sql.= ", ".$conf->entity;
+		$sql.= ", ".setEntity($this);
         $sql.= ", ".($this->module_source ? "'".$this->db->escape($this->module_source)."'" : "null");
 		$sql.= ", ".($this->pos_source != '' ? "'".$this->db->escape($this->pos_source)."'" : "null");
 		$sql.= ", ".(int) $this->fk_multicurrency;
@@ -1238,6 +1238,7 @@ class Commande extends CommonOrder
 				$this->lines[$i] = $line;
 		}
 
+		$this->entity               = $object->entity;
 		$this->socid                = $object->socid;
 		$this->fk_project           = $object->fk_project;
 		$this->cond_reglement_id    = $object->cond_reglement_id;
@@ -3335,10 +3336,10 @@ class Commande extends CommonOrder
 		{
 			// Remove directory with files
 			$comref = dol_sanitizeFileName($this->ref);
-			if ($conf->commande->dir_output && !empty($this->ref))
+			if ($conf->commande->multidir_output[$this->entity] && !empty($this->ref))
 			{
-				$dir = $conf->commande->dir_output . "/" . $comref ;
-				$file = $conf->commande->dir_output . "/" . $comref . "/" . $comref . ".pdf";
+				$dir = $conf->commande->multidir_output[$this->entity] . "/" . $comref ;
+				$file = $conf->commande->multidir_output[$this->entity] . "/" . $comref . "/" . $comref . ".pdf";
 				if (file_exists($file))	// We must delete all files before deleting directory
 				{
 					dol_delete_preview($this);
@@ -3411,6 +3412,7 @@ class Commande extends CommonOrder
 			$response = new WorkboardResponse();
 			$response->warning_delay=$conf->commande->client->warning_delay/60/60/24;
 			$response->label=$langs->trans("OrdersToProcess");
+			$response->labelShort = $langs->trans("Opened");
 			$response->url=DOL_URL_ROOT.'/commande/list.php?viewstatut=-3&mainmenu=commercial&leftmenu=orders';
 			$response->img=img_object('', "order");
 
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 37cbc70cd40..ec6ed2fd91b 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -72,7 +72,7 @@ $object = new Commande($db);
 if ($object->fetch($id))
 {
 	$object->fetch_thirdparty();
-	$upload_dir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($object->ref);
+	$upload_dir = $conf->commande->multidir_output[$object->entity] . "/" . dol_sanitizeFileName($object->ref);
 }
 
 include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
@@ -92,7 +92,7 @@ if ($id > 0 || ! empty($ref))
 	{
 		$object->fetch_thirdparty();
 
-		$upload_dir = $conf->commande->dir_output.'/'.dol_sanitizeFileName($object->ref);
+		$upload_dir = $conf->commande->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
 
 		$head = commande_prepare_head($object);
 		dol_fiche_head($head, 'documents', $langs->trans('CustomerOrder'), -1, 'order');
@@ -174,7 +174,7 @@ if ($id > 0 || ! empty($ref))
 		$modulepart = 'commande';
 		$permission = $user->rights->commande->creer;
 		$permtoedit = $user->rights->commande->creer;
-		$param = '&id=' . $object->id;
+		$param = '&id=' . $object->id.'&entity=' . (! empty($object->entity)?$object->entity:$conf->entity);
 		include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
 	}
 	else
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index a0e87bf63a3..160b6f70627 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -241,7 +241,7 @@ $max=5;
  * Last modified orders
  */
 
-$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, c.date_cloture as datec, c.tms as datem,";
+$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, c.date_cloture as datec, c.tms as datem,";
 $sql.= " s.nom as name, s.rowid as socid";
 $sql.= ", s.client";
 $sql.= ", s.code_client";
@@ -297,7 +297,7 @@ if ($resql)
 
 			print '<td width="16" class="nobordernopadding hideonsmartphone right">';
 			$filename=dol_sanitizeFileName($obj->ref);
-			$filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+			$filedir=$conf->commande->multidir_output[$obj->entity] . '/' . dol_sanitizeFileName($obj->ref);
 			$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
 			print $formfile->getDocumentsLink($commandestatic->element, $filename, $filedir);
 			print '</td></tr></table>';
@@ -323,7 +323,7 @@ else dol_print_error($db);
  */
 if (! empty($conf->commande->enabled))
 {
-	$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom as name, s.rowid as socid";
+	$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, s.nom as name, s.rowid as socid";
     $sql.= ", s.client";
     $sql.= ", s.code_client";
     $sql.= ", s.canvas";
@@ -377,7 +377,7 @@ if (! empty($conf->commande->enabled))
 
 				print '<td width="16" class="nobordernopadding hideonsmartphone right">';
 				$filename=dol_sanitizeFileName($obj->ref);
-				$filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+				$filedir=$conf->commande->multidir_output[$obj->entity] . '/' . dol_sanitizeFileName($obj->ref);
 				$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
 				print $formfile->getDocumentsLink($commandestatic->element, $filename, $filedir);
 				print '</td></tr></table>';
@@ -405,7 +405,7 @@ if (! empty($conf->commande->enabled))
  */
 if (! empty($conf->commande->enabled))
 {
-	$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom as name, s.rowid as socid";
+	$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, s.nom as name, s.rowid as socid";
     $sql.= ", s.client";
     $sql.= ", s.code_client";
     $sql.= ", s.canvas";
@@ -459,7 +459,7 @@ if (! empty($conf->commande->enabled))
 
 				print '<td width="16" class="nobordernopadding hideonsmartphone right">';
 				$filename=dol_sanitizeFileName($obj->ref);
-				$filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+				$filedir=$conf->commande->multidir_output[$obj->entity] . '/' . dol_sanitizeFileName($obj->ref);
 				$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
 				print $formfile->getDocumentsLink($commandestatic->element, $filename, $filedir);
 				print '</td></tr></table>';
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index a25d863176e..66a3862bd2c 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -91,7 +91,7 @@ $id = (GETPOST('orderid')?GETPOST('orderid', 'int'):GETPOST('id', 'int'));
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'commande', $id, '');
 
-$diroutputmassaction=$conf->commande->dir_output . '/temp/massgeneration/'.$user->id;
+$diroutputmassaction=$conf->commande->multidir_output[$conf->entity] . '/temp/massgeneration/'.$user->id;
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
@@ -218,7 +218,7 @@ if (empty($reshook))
 	$objectlabel='Orders';
 	$permtoread = $user->rights->commande->lire;
 	$permtodelete = $user->rights->commande->supprimer;
-	$uploaddir = $conf->commande->dir_output;
+	$uploaddir = $conf->commande->multidir_output[$conf->entity];
 	$trigger_name='ORDER_SENTBYMAIL';
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
@@ -934,7 +934,7 @@ if ($resql)
 
 			print '<td width="16" class="nobordernopadding hideonsmartphone right">';
 			$filename=dol_sanitizeFileName($obj->ref);
-			$filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+			$filedir=$conf->commande->multidir_output[$conf->entity] . '/' . dol_sanitizeFileName($obj->ref);
 			$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
 			print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);
 			print '</td>';
@@ -1081,7 +1081,7 @@ if ($resql)
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
-		$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i);
 		$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index 33acc2b4969..fa983e46f8e 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -548,7 +548,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
 	</script>
 	<?php
 
-	$sql = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_client,';
+	$sql = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.entity, c.ref, c.total_ht, c.ref_client,';
 	$sql.= ' c.date_valid, c.date_commande, c.date_livraison, c.fk_statut, c.facture as billed';
 	$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 	$sql.= ', '.MAIN_DB_PREFIX.'commande as c';
@@ -682,7 +682,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
 
 			print '<td width="16" class="nobordernopadding hideonsmartphone right">';
 			$filename=dol_sanitizeFileName($objp->ref);
-			$filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($objp->ref);
+			$filedir=$conf->commande->multidir_output[$objp->entity] . '/' . dol_sanitizeFileName($objp->ref);
 			$urlsource=$_SERVER['PHP_SELF'].'?id='.$objp->rowid;
 			print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);
 			print '</td></tr></table>';
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index f6633f279d5..883018b259b 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -236,8 +236,13 @@ if ($action == 'update')
 		$error++;
 	}
 
-	// Fill array 'array_options' with data from add form
-	$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
+	$db->begin();
+
+	if (! $error)
+	{
+		// Fill array 'array_options' with data from add form
+		$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
+	}
 
 	if (! $error)
 	{
@@ -252,10 +257,20 @@ if ($action == 'update')
 		}
 		else
 		{
+			$error++;
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action='edit';     // Force chargement page edition
 		}
 	}
+
+	if (! $error)
+	{
+		$db->commit();
+	}
+	else
+	{
+		$db->rollback();
+	}
 }
 
 if ($action == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->banque->configurer)
@@ -412,7 +427,7 @@ if ($action == 'create')
 	$doleditor->Create();
 	print '</td></tr>';
 
- 	// Other attributes
+	// 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;
@@ -639,12 +654,12 @@ else
 			print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 			print '<td>';
 
-            if ($object->fk_accountancy_journal > 0) {
-                $accountingjournal = new AccountingJournal($db);
-                $accountingjournal->fetch($object->fk_accountancy_journal);
+			if ($object->fk_accountancy_journal > 0) {
+				$accountingjournal = new AccountingJournal($db);
+				$accountingjournal->fetch($object->fk_accountancy_journal);
 
-                print $accountingjournal->getNomUrl(0, 1, 1, '', 1);
-            }
+				print $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+			}
 			print '</td></tr>';
 		}
 
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 5724178e9de..282a296a5f1 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -749,7 +749,6 @@ class Account extends CommonObject
 		$sql.= ",fk_pays = ".$this->country_id;
 
 		$sql.= " WHERE rowid = ".$this->id;
-		$sql.= " AND entity = ".$conf->entity;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -1225,6 +1224,7 @@ class Account extends CommonObject
 			$response = new WorkboardResponse();
 			$response->warning_delay=$conf->bank->rappro->warning_delay/60/60/24;
 			$response->label=$langs->trans("TransactionsToConciliate");
+			$response->labelShort = $langs->trans("TransactionsToConciliateShort");
 			$response->url=DOL_URL_ROOT.'/compta/bank/list.php?leftmenu=bank&amp;mainmenu=bank';
 			$response->img=img_object('', "payment");
 
@@ -1276,7 +1276,6 @@ class Account extends CommonObject
 				$this->nb["banklines"]=$obj->nb;
 			}
 			$this->db->free($resql);
-			return 1;
 		}
 		else
 		{
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 72ba4c82db1..ba21b6c09c1 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -23,6 +23,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 /**
  * API class for accounts
  *
+ * @property DoliDB db
  * @access protected
  * @class DolibarrApiAccess {@requires user,external}
  */
@@ -166,6 +167,142 @@ class BankAccounts extends DolibarrApi
         return $account->id;
     }
 
+    /**
+     * Create an internal wire transfer between two bank accounts
+     *
+     * @param int     $bankaccount_from_id  BankAccount ID to use as the source of the internal wire transfer		{@from body}{@required true}
+     * @param int     $bankaccount_to_id    BankAccount ID to use as the destination of the internal wire transfer  {@from body}{@required true}
+     * @param string  $date					Date of the internal wire transfer (UNIX timestamp)						{@from body}{@required true}{@type timestamp}
+     * @param string  $description			Description of the internal wire transfer								{@from body}{@required true}
+     * @param float	  $amount				Amount to transfer from the source to the destination BankAccount		{@from body}{@required true}
+     * @param float	  $amount_to			Amount to transfer to the destination BankAccount (only when accounts does not share the same currency)		{@from body}{@required false}
+     *
+     * @url POST    /transfer
+     *
+     * @return array
+     *
+     * @status 201
+     *
+     * @throws 401 Unauthorized: User does not have permission to configure bank accounts
+	 * @throws 404 Not Found: Either the source or the destination bankaccount for the provided id does not exist
+     * @throws 422 Unprocessable Entity: Refer to detailed exception message for the cause
+	 * @throws 500 Internal Server Error: Error(s) returned by the RDBMS
+     */
+    public function transfer($bankaccount_from_id = 0, $bankaccount_to_id = 0, $date = null, $description = "", $amount = 0.0, $amount_to = 0.0)
+    {
+        if (! DolibarrApiAccess::$user->rights->banque->configurer) {
+            throw new RestException(401);
+        }
+
+        if ($bankaccount_from_id === $bankaccount_to_id) {
+            throw new RestException(422, 'bankaccount_from_id and bankaccount_to_id must be different !');
+        }
+
+        require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+        $accountfrom = new Account($this->db);
+        $resultAccountFrom = $accountfrom->fetch($bankaccount_from_id);
+
+        if ($resultAccountFrom === 0) {
+            throw new RestException(404, 'The BankAccount for bankaccount_from_id provided does not exist.');
+        }
+
+        $accountto = new Account($this->db);
+        $resultAccountTo = $accountto->fetch($bankaccount_to_id);
+
+        if ($resultAccountTo === 0) {
+            throw new RestException(404, 'The BankAccount for bankaccount_to_id provided does not exist.');
+        }
+
+        if ($accountto->currency_code == $accountfrom->currency_code)
+        {
+            $amount_to = $amount;
+        }
+        else
+        {
+            if (!$amount_to || empty($amount_to))
+            {
+                throw new RestException(422, 'You must provide amount_to value since bankaccount_from and bankaccount_to does not share the same currency.');
+            }
+        }
+
+        $this->db->begin();
+
+        $error = 0;
+        $bank_line_id_from = 0;
+        $bank_line_id_to = 0;
+        $result = 0;
+        $user = DolibarrApiAccess::$user;
+
+        // By default, electronic transfert from bank to bank
+        $typefrom='PRE';
+        $typeto='VIR';
+
+        if ($accountto->courant == Account::TYPE_CASH || $accountfrom->courant == Account::TYPE_CASH)
+        {
+            // This is transfer of change
+            $typefrom='LIQ';
+            $typeto='LIQ';
+        }
+
+        /**
+         * Creating bank line records
+         */
+
+        if (!$error) {
+            $bank_line_id_from = $accountfrom->addline($date, $typefrom, $description, -1*price2num($amount), '', '', $user);
+        }
+        if (!($bank_line_id_from > 0)) {
+            $error++;
+        }
+
+        if (!$error) {
+            $bank_line_id_to = $accountto->addline($date, $typeto, $description, price2num($amount_to), '', '', $user);
+        }
+        if (!($bank_line_id_to > 0)) {
+            $error++;
+        }
+
+        /**
+         * Creating links between bank line record and its source
+         */
+
+        $url = DOL_URL_ROOT.'/compta/bank/line.php?rowid=';
+        $label = '(banktransfert)';
+        $type = 'banktransfert';
+
+        if (!$error) {
+            $result = $accountfrom->add_url_line($bank_line_id_from, $bank_line_id_to, $url, $label, $type);
+        }
+        if (!($result > 0)) {
+            $error++;
+        }
+
+        if (!$error) {
+            $result = $accountto->add_url_line($bank_line_id_to, $bank_line_id_from, $url, $label, $type);
+        }
+        if (!($result > 0)) {
+            $error++;
+        }
+
+        if (!$error)
+        {
+            $this->db->commit();
+
+            return array(
+                'success' => array(
+                    'code' => 201,
+                    'message' => 'Internal wire transfer created successfully.'
+                )
+            );
+        }
+        else
+        {
+            $this->db->rollback();
+            throw new RestException(500, $accountfrom->error.' '.$accountto->error);
+        }
+    }
+
     /**
      * Update account
      *
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index f17e622210e..d89eecfed1a 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -267,9 +267,9 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 			$parameters = array('obj' => $obj);
 			$reshook = $hookmanager->executeHooks('moreFamily', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 			if(empty($reshook)){
-				$ref = isset($hookmanager->resArray['ref']) ? $hookmanager->resArray['ref'] : '';
-				$refcomp = isset($hookmanager->resArray['refcomp']) ? $hookmanager->resArray['refcomp'] : '';
-				$paiement = isset($hookmanager->resArray['paiement']) ? $hookmanager->resArray['paiement'] : 0;
+				$ref = isset($hookmanager->resArray['ref']) ? $hookmanager->resArray['ref'] : $ref;
+				$refcomp = isset($hookmanager->resArray['refcomp']) ? $hookmanager->resArray['refcomp'] : $refcomp;
+				$paiement = isset($hookmanager->resArray['paiement']) ? $hookmanager->resArray['paiement'] : $paiement;
 			}
 
 			$total_ttc = $obj->total_ttc;
@@ -312,7 +312,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 	$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	if(empty($reshook)){
 		print $hookmanager->resPrint;
-    $solde = isset($hookmanager->resArray['solde']) ? $hookmanager->resArray['solde'] : $solde;
+        $solde = isset($hookmanager->resArray['solde']) ? $hookmanager->resArray['solde'] : $solde;
 	}
 
 	// solde
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index 378d6087cc7..3e433b460f1 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -88,7 +88,7 @@ if (empty($backtopage)) $backtopage = dol_buildpath('/compta/cashcontrol/cashcon
 $backurlforlist = dol_buildpath('/compta/cashcontrol/cashcontrol_list.php', 1);
 $triggermodname = 'CACHCONTROL_MODIFY';	// Name of trigger action code to execute when we modify record
 
-if (empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH))
+if (empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH) && empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH1))
 {
 	setEventMessages($langs->trans("CashDesk")." - ".$langs->trans("NotConfigured"), null, 'errors');
 }
@@ -132,16 +132,7 @@ elseif ($action=="add")
 	$error=0;
 	foreach($arrayofpaymentmode as $key=>$val)
 	{
-		if (GETPOST($key.'_amount', 'alpha') == '')
-		{
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val)), null, 'errors');
-			$action='start';
-			$error++;
-		}
-		else
-		{
-			$object->$key = price2num(GETPOST($key.'_amount', 'alpha'));
-		}
+		$object->$key = price2num(GETPOST($key.'_amount', 'alpha'));
 	}
 
 	if (! $error)
@@ -235,7 +226,14 @@ if ($action=="create" || $action=="start")
 		$posmodule = GETPOST('posmodule', 'alpha');
 		$terminalid = GETPOST('posnumber', 'alpha');
 		$terminaltouse = $terminalid;
-		if ($terminaltouse == '1') $terminaltouse = '';
+
+		if ($terminaltouse == '1' && $posmodule=='cashdesk') $terminaltouse = '';
+
+		if ($posmodule=='cashdesk' && $terminaltouse != '' && $terminaltouse != '1') {
+			$terminaltouse = '';
+			setEventMessages($langs->trans("OnlyTerminal1IsAvailableForCashDeskModule"), null, 'errors');
+			$error++;
+		}
 
 		// Calculate $initialbalanceforterminal for terminal 0
 		foreach($arrayofpaymentmode as $key => $val)
@@ -271,7 +269,7 @@ if ($action=="create" || $action=="start")
 			}
 			else
 			{
-			    setEventMessages($langs->trans("SetupOfTerminalNotComplete", $terminalid), null, 'errors');
+				setEventMessages($langs->trans("SetupOfTerminalNotComplete", $terminaltouse), null, 'errors');
 			    $error++;
 			}
 		}
diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index 6584af5db98..ce0cdeed9fb 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -196,10 +196,18 @@ if ($resql)
     	// Bank account
         print '<td class="nowrap right">';
 		print $bankaccount->getNomUrl(1);
-		if ($conf->global->CASHDESK_ID_BANKACCOUNT_CASH==$bankaccount->id) $cash+=$objp->amount;
-		elseif ($conf->global->CASHDESK_ID_BANKACCOUNT_CB==$bankaccount->id) $bank+=$objp->amount;
-		elseif ($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE==$bankaccount->id) $cheque+=$objp->amount;
-		else $other+=$objp->amount;
+		if ($cashcontrol->posmodule=="takepos"){
+			if ($conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$cashcontrol->posnumber}==$bankaccount->id) $cash+=$objp->amount;
+			elseif ($conf->global->{'CASHDESK_ID_BANKACCOUNT_CB'.$cashcontrol->posnumber}==$bankaccount->id) $bank+=$objp->amount;
+			elseif ($conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$cashcontrol->posnumber}==$bankaccount->id) $cheque+=$objp->amount;
+			else $other+=$objp->amount;
+		}
+		else{
+			if ($conf->global->CASHDESK_ID_BANKACCOUNT_CASH==$bankaccount->id) $cash+=$objp->amount;
+			elseif ($conf->global->CASHDESK_ID_BANKACCOUNT_CB==$bankaccount->id) $bank+=$objp->amount;
+			elseif ($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE==$bankaccount->id) $cheque+=$objp->amount;
+			else $other+=$objp->amount;
+		}
 		print "</td>\n";
         if (! $i) $totalarray['nbfield']++;
 
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index bfa21a9c759..54c339284a5 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -945,7 +945,6 @@ if (empty($reshook))
 				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
 				$object->multicurrency_tx   = GETPOST('originmulticurrency_tx', 'int');
-				$object->entity				= (GETPOSTISSET('entity')?GETPOST('entity', 'int'):$conf->entity);
 
 				// Proprietes particulieres a facture de remplacement
 				$object->fk_facture_source = $_POST['fac_replacement'];
@@ -979,7 +978,7 @@ if (empty($reshook))
 
 			if (! $error)
 			{
-				if(!empty($originentity)){
+				if (!empty($originentity)) {
 					$object->entity = $originentity;
 				}
 				$object->socid				= GETPOST('socid', 'int');
@@ -1001,7 +1000,6 @@ if (empty($reshook))
 				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
 				$object->multicurrency_tx   = GETPOST('originmulticurrency_tx', 'int');
-				$object->entity				= (GETPOSTISSET('entity')?GETPOST('entity', 'int'):$conf->entity);
 
 				// Proprietes particulieres a facture avoir
 				$object->fk_facture_source = $sourceinvoice > 0 ? $sourceinvoice : '';
@@ -1183,7 +1181,6 @@ if (empty($reshook))
 				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
 				$object->multicurrency_tx   = GETPOST('originmulticurrency_tx', 'int');
-				$object->entity				= (GETPOSTISSET('entity')?GETPOST('entity', 'int'):$conf->entity);
 
 				// Source facture
 				$object->fac_rec = GETPOST('fac_rec', 'int');
@@ -1234,7 +1231,6 @@ if (empty($reshook))
 				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
 				$object->multicurrency_tx   = GETPOST('originmulticurrency_tx', 'int');
-				$object->entity				= (GETPOSTISSET('entity')?GETPOST('entity', 'int'):$conf->entity);
 
 				if (GETPOST('type') == Facture::TYPE_SITUATION)
 				{
@@ -2491,7 +2487,7 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 	// Actions to build doc
-	$upload_dir = $conf->facture->dir_output;
+	$upload_dir = $conf->facture->multidir_output[$object->entity];
 	$permissioncreate=$usercancreate;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
@@ -3316,8 +3312,8 @@ if ($action == 'create')
 			'__INVOICE_PREVIOUS_MONTH_TEXT__' => $langs->trans("TextPreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'm'), '%B').')',
 			'__INVOICE_MONTH_TEXT__' =>  $langs->trans("TextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample, '%B').')',
 			'__INVOICE_NEXT_MONTH_TEXT__' => $langs->trans("TextNextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'm'), '%B').')',
-			'__INVOICE_PREVIOUS_YEAR__' => $langs->trans("YearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'y'), '%Y').')',
-			'__INVOICE_YEAR__' =>  $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample, '%Y').')',
+			'__INVOICE_PREVIOUS_YEAR__' => $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'y'), '%Y').')',
+			'__INVOICE_YEAR__' =>  $langs->trans("YearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample, '%Y').')',
 			'__INVOICE_NEXT_YEAR__' => $langs->trans("NextYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'y'), '%Y').')'
 		);
 
@@ -5136,12 +5132,12 @@ elseif ($id > 0 || ! empty($ref))
 
 		// Documents generes
 		$filename = dol_sanitizeFileName($object->ref);
-		$filedir = $conf->facture->dir_output . '/' . dol_sanitizeFileName($object->ref);
+		$filedir = $conf->facture->multidir_output[$object->entity] . '/' . dol_sanitizeFileName($object->ref);
 		$urlsource = $_SERVER['PHP_SELF'] . '?facid=' . $object->id;
 		$genallowed = $usercanread;
 		$delallowed = $usercancreate;
 
-		print $formfile->showdocuments('facture', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+		print $formfile->showdocuments('facture', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang, '', $object);
 		$somethingshown = $formfile->numoffiles;
 
 		// Show links to link elements
@@ -5188,7 +5184,7 @@ elseif ($id > 0 || ! empty($ref))
 	// Presend form
 	$modelmail='facture_send';
 	$defaulttopic='SendBillRef';
-	$diroutput = $conf->facture->dir_output;
+	$diroutput = $conf->facture->multidir_output[$object->entity];
 	$trackid = 'inv'.$object->id;
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 7f5dde15c59..33de9d47e18 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -318,7 +318,6 @@ class Facture extends CommonInvoice
 		if (! $this->cond_reglement_id) $this->cond_reglement_id = 0;
 		if (! $this->mode_reglement_id) $this->mode_reglement_id = 0;
 		$this->brouillon = 1;
-        if (empty($this->entity)) $this->entity = $conf->entity;
 
 		// Multicurrency (test on $this->multicurrency_tx because we should take the default rate only if not using origin rate)
 		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency,$this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
@@ -493,7 +492,7 @@ class Facture extends CommonInvoice
 		$sql.= ")";
 		$sql.= " VALUES (";
 		$sql.= "'(PROV)'";
-		$sql.= ", ".$this->entity;
+		$sql.= ", ".setEntity($this);
 		$sql.= ", ".($this->ref_ext?"'".$this->db->escape($this->ref_ext)."'":"null");
 		$sql.= ", '".$this->db->escape($this->type)."'";
 		$sql.= ", '".$socid."'";
@@ -936,8 +935,8 @@ class Facture extends CommonInvoice
 		$facture->remise_absolue    = $this->remise_absolue;
 		$facture->remise_percent    = $this->remise_percent;
 
-		$facture->origin                        = $this->origin;
-		$facture->origin_id                     = $this->origin_id;
+		$facture->origin            = $this->origin;
+		$facture->origin_id         = $this->origin_id;
 
 		$facture->lines		    	= $this->lines;	// Array of lines of invoice
 		$facture->products		    = $this->lines;	// Tant que products encore utilise
@@ -1624,7 +1623,11 @@ class Facture extends CommonInvoice
 		$this->tab_previous_situation_invoice = array();
 		$this->tab_next_situation_invoice = array();
 
-		$sql = 'SELECT rowid, situation_counter FROM '.MAIN_DB_PREFIX.'facture WHERE rowid <> '.$this->id.' AND entity = '.$conf->entity.' AND situation_cycle_ref = '.(int) $this->situation_cycle_ref.' ORDER BY situation_counter ASC';
+		$sql = 'SELECT rowid, situation_counter FROM '.MAIN_DB_PREFIX.'facture';
+		$sql.= ' WHERE rowid <> '.$this->id;
+		$sql.= ' AND entity = '.$this->entity;
+		$sql.= ' AND situation_cycle_ref = '.(int) $this->situation_cycle_ref;
+		$sql.= ' ORDER BY situation_counter ASC';
 
 		dol_syslog(get_class($this).'::fetchPreviousNextSituationInvoice ', LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -3700,11 +3703,11 @@ class Facture extends CommonInvoice
 		$sql.= " AND ff.type IS NULL";			// Renvoi vrai si pas facture de remplacement
 		$sql.= " AND f.type != ".self::TYPE_CREDIT_NOTE;				// Type non 2 si facture non avoir
 
-		if($conf->global->INVOICE_USE_SITUATION_CREDIT_NOTE){
+		if (! empty($conf->global->INVOICE_USE_SITUATION_CREDIT_NOTE)) {
 		    // Select the last situation invoice
 		    $sqlSit = 'SELECT MAX(fs.rowid)';
 		    $sqlSit.= " FROM ".MAIN_DB_PREFIX."facture as fs";
-		    $sqlSit.= " WHERE fs.entity = ".$conf->entity;
+		    $sqlSit.= " WHERE fs.entity IN (".getEntity('invoice').")";
 		    $sqlSit.= " AND fs.type = ".self::TYPE_SITUATION;
 		    $sqlSit.= " AND fs.fk_statut in (".self::STATUS_VALIDATED.",".self::STATUS_CLOSED.")";
 		    $sqlSit.= " GROUP BY fs.situation_cycle_ref";
@@ -3921,6 +3924,7 @@ class Facture extends CommonInvoice
 			$response = new WorkboardResponse();
 			$response->warning_delay=$conf->facture->client->warning_delay/60/60/24;
 			$response->label=$langs->trans("CustomerBillsUnpaid");
+			$response->labelShort=$langs->trans("Unpaid");
 			$response->url=DOL_URL_ROOT.'/compta/facture/list.php?search_status=1&mainmenu=billing&leftmenu=customers_bills';
 			$response->img=img_object('', "bill");
 
@@ -4230,7 +4234,7 @@ class Facture extends CommonInvoice
     public function newCycle()
 	{
 		$sql = 'SELECT max(situation_cycle_ref) FROM ' . MAIN_DB_PREFIX . 'facture as f';
-		$sql.= " WHERE f.entity in (".getEntity('invoice', 0).")";
+		$sql.= " WHERE f.entity IN (".getEntity('invoice', 0).")";
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($resql->num_rows > 0)
@@ -4274,8 +4278,8 @@ class Facture extends CommonInvoice
 		global $conf;
 
 		$sql = 'SELECT rowid FROM ' . MAIN_DB_PREFIX . 'facture';
-		$sql .= ' where situation_cycle_ref = ' . $this->situation_cycle_ref;
-		$sql .= ' and situation_counter < ' . $this->situation_counter;
+		$sql .= ' WHERE situation_cycle_ref = ' . $this->situation_cycle_ref;
+		$sql .= ' AND situation_counter < ' . $this->situation_counter;
 		$sql .= ' AND entity = '. ($this->entity > 0 ? $this->entity : $conf->entity);
 		$resql = $this->db->query($sql);
 		$res = array();
@@ -4356,7 +4360,9 @@ class Facture extends CommonInvoice
 
 		if (!empty($this->situation_cycle_ref)) {
 			// No point in testing anything if we're not inside a cycle
-			$sql = 'SELECT max(situation_counter) FROM ' . MAIN_DB_PREFIX . 'facture WHERE situation_cycle_ref = ' . $this->situation_cycle_ref . ' AND entity = ' . ($this->entity > 0 ? $this->entity : $conf->entity);
+			$sql = 'SELECT max(situation_counter) FROM ' . MAIN_DB_PREFIX . 'facture';
+			$sql.= ' WHERE situation_cycle_ref = ' . $this->situation_cycle_ref;
+			$sql.= ' AND entity = ' . ($this->entity > 0 ? $this->entity : $conf->entity);
 			$resql = $this->db->query($sql);
 
 			if ($resql && $resql->num_rows > 0) {
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 44f69f512bd..9a8f308a0d1 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -97,7 +97,7 @@ if ($id > 0 || ! empty($ref))
 	{
 		$object->fetch_thirdparty();
 
-		$upload_dir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($object->ref);
+		$upload_dir = $conf->facture->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
 
 		$head = facture_prepare_head($object);
 		dol_fiche_head($head, 'documents', $langs->trans('InvoiceCustomer'), -1, 'bill');
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index 25cf3f45fb1..aadedd3c5f7 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -1017,8 +1017,8 @@ if ($action == 'create')
 		$substitutionarray['__INVOICE_PREVIOUS_MONTH_TEXT__'] = $langs->trans("TextPreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, -1, 'm'), '%B').')';
 		$substitutionarray['__INVOICE_MONTH_TEXT__'] = $langs->trans("TextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($object->date, '%B').')';
 		$substitutionarray['__INVOICE_NEXT_MONTH_TEXT__'] = $langs->trans("TextNextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, 1, 'm'), '%B').')';
-		$substitutionarray['__INVOICE_PREVIOUS_YEAR__'] = $langs->trans("YearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, -1, 'y'), '%Y').')';
-		$substitutionarray['__INVOICE_YEAR__'] =  $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($object->date, '%Y').')';
+		$substitutionarray['__INVOICE_PREVIOUS_YEAR__'] = $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, -1, 'y'), '%Y').')';
+		$substitutionarray['__INVOICE_YEAR__'] =  $langs->trans("YearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($object->date, '%Y').')';
 		$substitutionarray['__INVOICE_NEXT_YEAR__'] = $langs->trans("NextYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($object->date, 1, 'y'), '%Y').')';
 		// Only on template invoices
 		$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__'] = $langs->trans("DateNextInvoiceBeforeGen").' ('.$langs->trans("Example").': '.dol_print_date($object->date_when, 'dayhour').')';
@@ -1359,8 +1359,8 @@ else
 		$substitutionarray['__INVOICE_PREVIOUS_MONTH_TEXT__'] = $langs->trans("TextPreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'm'), '%B').')';
 		$substitutionarray['__INVOICE_MONTH_TEXT__'] = $langs->trans("TextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample, '%B').')';
 		$substitutionarray['__INVOICE_NEXT_MONTH_TEXT__'] = $langs->trans("TextNextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'm'), '%B').')';
-		$substitutionarray['__INVOICE_PREVIOUS_YEAR__'] = $langs->trans("YearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'y'), '%Y').')';
-		$substitutionarray['__INVOICE_YEAR__'] =  $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample, '%Y').')';
+		$substitutionarray['__INVOICE_PREVIOUS_YEAR__'] = $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'y'), '%Y').')';
+		$substitutionarray['__INVOICE_YEAR__'] =  $langs->trans("YearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample, '%Y').')';
 		$substitutionarray['__INVOICE_NEXT_YEAR__'] = $langs->trans("NextYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'y'), '%Y').')';
 		// Only on template invoices
 		$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__'] = $langs->trans("DateNextInvoiceBeforeGen").' ('.$langs->trans("Example").': '.dol_print_date(($object->date_when?$object->date_when:dol_now()), 'dayhour').')';
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index eca39ade98c..71e0de738fa 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1231,7 +1231,7 @@ if ($resql)
 			// Extra fields
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 			// Fields from hook
-			$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+			$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i);
 			$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
 			// Date creation
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 920acd1c22f..30c31109224 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -744,6 +744,9 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                     }
                     print "</td>";
 
+                    $parameters=array();
+                    $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
+
                     // Warning
                     print '<td align="center" width="16">';
                     //print "xx".$amounts[$invoice->id]."-".$amountsresttopay[$invoice->id]."<br>";
@@ -754,9 +757,6 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                     }
                     print '</td>';
 
-					$parameters=array();
-					$reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
-
                     print "</tr>\n";
 
                     $total+=$objp->total;
@@ -893,12 +893,13 @@ if (! GETPOST('action', 'aZ09'))
             print '<td><a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$objp->facid.'">'.$objp->ref."</a></td>\n";
             print '<td>'.dol_print_date($db->jdate($objp->dp))."</td>\n";
             print '<td>'.$objp->paiement_type.' '.$objp->num_paiement."</td>\n";
-            print '<td class="right">'.price($objp->amount).'</td><td>&nbsp;</td>';
-
-			$parameters=array();
-			$reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
-
+            print '<td class="right">'.price($objp->amount).'</td>';
+            print '<td>&nbsp;</td>';
             print '</tr>';
+
+            $parameters=array();
+            $reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
+
             $i++;
         }
         print '</table>';
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 26e3f2792d6..316215a5caf 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -527,6 +527,7 @@ class RemiseCheque extends CommonObject
 			$response = new WorkboardResponse();
 			$response->warning_delay=$conf->bank->cheque->warning_delay/60/60/24;
 			$response->label=$langs->trans("BankChecksToReceipt");
+			$response->labelShort=$langs->trans("BankChecksToReceiptShort");
 			$response->url=DOL_URL_ROOT.'/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank';
 			$response->img=img_object('', "payment");
 
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 2182375ff1a..2adb0e445bd 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -130,21 +130,6 @@ $AccCat = new AccountancyCategory($db);
  * View
  */
 
-$months = array(
-	$langs->trans("JanuaryMin"),
-	$langs->trans("FebruaryMin"),
-	$langs->trans("MarchMin"),
-	$langs->trans("AprilMin"),
-	$langs->trans("MayMin"),
-	$langs->trans("JuneMin"),
-	$langs->trans("JulyMin"),
-	$langs->trans("AugustMin"),
-	$langs->trans("SeptemberMin"),
-	$langs->trans("OctoberMin"),
-	$langs->trans("NovemberMin"),
-	$langs->trans("DecemberMin"),
-);
-
 llxHeader();
 
 $form=new Form($db);
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 317531884c0..9bbf0501dbd 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -143,18 +143,18 @@ $AccCat = new AccountancyCategory($db);
  */
 
 $months = array(
-	$langs->trans("JanuaryMin"),
-	$langs->trans("FebruaryMin"),
-	$langs->trans("MarchMin"),
-	$langs->trans("AprilMin"),
-	$langs->trans("MayMin"),
-	$langs->trans("JuneMin"),
-	$langs->trans("JulyMin"),
-	$langs->trans("AugustMin"),
-	$langs->trans("SeptemberMin"),
-	$langs->trans("OctoberMin"),
-	$langs->trans("NovemberMin"),
-	$langs->trans("DecemberMin"),
+	$langs->trans("MonthShort01"),
+	$langs->trans("MonthShort02"),
+	$langs->trans("MonthShort03"),
+	$langs->trans("MonthShort04"),
+	$langs->trans("MonthShort05"),
+	$langs->trans("MonthShort06"),
+	$langs->trans("MonthShort07"),
+	$langs->trans("MonthShort08"),
+	$langs->trans("MonthShort09"),
+	$langs->trans("MonthShort10"),
+	$langs->trans("MonthShort11"),
+	$langs->trans("MonthShort12"),
 );
 
 llxheader('', $langs->trans('ReportInOut'));
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 41c9555ccfc..4fd157de9e6 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -317,7 +317,7 @@ class ChargeSociales extends CommonObject
         $sql.= ", date_ech='".$this->db->idate($this->date_ech)."'";
         $sql.= ", periode='".$this->db->idate($this->periode)."'";
         $sql.= ", amount='".price2num($this->amount, 'MT')."'";
-		$sql.= ", fk_projet='".$this->db->escape($this->fk_project)."'";
+		$sql.= ", fk_projet=".($this->fk_project > 0 ? $this->fk_project : null);
         $sql.= ", fk_user_modif=".$user->id;
         $sql.= " WHERE rowid=".$this->id;
 
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 19437fe1aee..e064b93504d 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -1217,11 +1217,12 @@ class Contact extends CommonObject
 	public function getCivilityLabel()
 	{
 		global $langs;
-		$langs->load("dict");
 
-		$code=(! empty($this->civility_id)?$this->civility:(! empty($this->civilite)?$this->civilite:''));
+		$code=($this->civility_code ? $this->civility_code : (! empty($this->civility_id)?$this->civility:(! empty($this->civilite)?$this->civilite:'')));
 		if (empty($code)) return '';
-        return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civility", "code", "label", $code);
+
+		$langs->load("dict");
+		return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civility", "code", "label", $code);
 	}
 
 	/**
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index e6e9b7f2e4d..2bb6ece49e6 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -96,6 +96,12 @@ class Contrat extends CommonObject
 	 */
 	public $ref_supplier;
 
+    /**
+     * Entity of the contract
+     * @var int
+     */
+    public $entity;
+
 	/**
 	 * Client id linked to the contract
 	 * @var int
@@ -617,13 +623,14 @@ class Contrat extends CommonObject
 	 *    @param	string	$ref			Ref
 	 *    @param	string	$ref_customer	Customer ref
 	 *    @param	string	$ref_supplier	Supplier ref
-	 *    @return   int     				<0 if KO, 0 if not found, Id of contract if OK
+	 *    @return   int     				<0 if KO, 0 if not found or if two records found for same ref, Id of contract if OK
 	 */
 	public function fetch($id, $ref = '', $ref_customer = '', $ref_supplier = '')
 	{
 		$sql = "SELECT rowid, statut, ref, fk_soc, mise_en_service as datemise,";
 		$sql.= " ref_supplier, ref_customer,";
 		$sql.= " ref_ext,";
+        $sql.= " entity,";
 		$sql.= " fk_user_mise_en_service, date_contrat as datecontrat,";
 		$sql.= " fk_user_author, fin_validite, date_cloture,";
 		$sql.= " fk_projet as fk_project,";
@@ -649,57 +656,67 @@ class Contrat extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$obj = $this->db->fetch_object($resql);
-
-			if ($obj)
+			$num=$this->db->num_rows($resql);
+			if ($num > 1)
 			{
-				$this->id						= $obj->rowid;
-				$this->ref						= (!isset($obj->ref) || !$obj->ref) ? $obj->rowid : $obj->ref;
-				$this->ref_customer				= $obj->ref_customer;
-				$this->ref_supplier				= $obj->ref_supplier;
-				$this->ref_ext					= $obj->ref_ext;
-				$this->statut					= $obj->statut;
-				$this->mise_en_service			= $this->db->jdate($obj->datemise);
-
-				$this->date_contrat				= $this->db->jdate($obj->datecontrat);
-				$this->date_creation			= $this->db->jdate($obj->datecontrat);
-
-				$this->fin_validite				= $this->db->jdate($obj->fin_validite);
-				$this->date_cloture				= $this->db->jdate($obj->date_cloture);
-
-
-				$this->user_author_id			= $obj->fk_user_author;
-
-				$this->commercial_signature_id = $obj->fk_commercial_signature;
-				$this->commercial_suivi_id		= $obj->fk_commercial_suivi;
-
-				$this->note_private				= $obj->note_private;
-				$this->note_public				= $obj->note_public;
-				$this->modelpdf					= $obj->model_pdf;
-
-				$this->fk_projet				= $obj->fk_project; // deprecated
-				$this->fk_project				= $obj->fk_project;
-
-				$this->socid					= $obj->fk_soc;
-				$this->fk_soc					= $obj->fk_soc;
-
-				$this->extraparams = (array) json_decode($obj->extraparams, true);
-
-				$this->db->free($resql);
-
-				// Retreive all extrafields
-				// fetch optionals attributes and labels
-				$this->fetch_optionals();
-
-				// Lines
-				$result=$this->fetch_lines();
-				if ($result < 0)
+				$this->error='Fetch found several records.';
+				dol_syslog($this->error, LOG_ERR);
+				$result = -2;
+			}
+			elseif ($num)   // $num = 1
+			{
+				$obj = $this->db->fetch_object($resql);
+				if ($obj)
 				{
-					$this->error=$this->db->lasterror();
-					return -3;
-				}
+					$this->id						= $obj->rowid;
+					$this->ref						= (!isset($obj->ref) || !$obj->ref) ? $obj->rowid : $obj->ref;
+					$this->ref_customer				= $obj->ref_customer;
+					$this->ref_supplier				= $obj->ref_supplier;
+					$this->ref_ext					= $obj->ref_ext;
+	                $this->entity                   = $obj->entity;
+					$this->statut					= $obj->statut;
+					$this->mise_en_service			= $this->db->jdate($obj->datemise);
 
-				return $this->id;
+					$this->date_contrat				= $this->db->jdate($obj->datecontrat);
+					$this->date_creation			= $this->db->jdate($obj->datecontrat);
+
+					$this->fin_validite				= $this->db->jdate($obj->fin_validite);
+					$this->date_cloture				= $this->db->jdate($obj->date_cloture);
+
+
+					$this->user_author_id			= $obj->fk_user_author;
+
+					$this->commercial_signature_id = $obj->fk_commercial_signature;
+					$this->commercial_suivi_id		= $obj->fk_commercial_suivi;
+
+					$this->note_private				= $obj->note_private;
+					$this->note_public				= $obj->note_public;
+					$this->modelpdf					= $obj->model_pdf;
+
+					$this->fk_projet				= $obj->fk_project; // deprecated
+					$this->fk_project				= $obj->fk_project;
+
+					$this->socid					= $obj->fk_soc;
+					$this->fk_soc					= $obj->fk_soc;
+
+					$this->extraparams = (array) json_decode($obj->extraparams, true);
+
+					$this->db->free($resql);
+
+					// Retreive all extrafields
+					// fetch optionals attributes and labels
+					$this->fetch_optionals();
+
+					// Lines
+					$result=$this->fetch_lines();
+					if ($result < 0)
+					{
+						$this->error=$this->db->lasterror();
+						return -3;
+					}
+
+					return $this->id;
+				}
 			}
 			else
 			{
@@ -2186,23 +2203,27 @@ class Contrat extends CommonObject
 			if ($mode == 'inactive') {
 				$warning_delay = $conf->contrat->services->inactifs->warning_delay;
 				$label = $langs->trans("BoardNotActivatedServices");
+				$labelShort = $langs->trans("BoardNotActivatedServicesShort");
 				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&mode=0&sortfield=cd.date_fin_validite&sortorder=asc';
 			}
 			elseif ($mode == 'expired') {
 			    $warning_delay = $conf->contrat->services->expires->warning_delay;
 			    $url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&mode=4&filter=expired&sortfield=cd.date_fin_validite&sortorder=asc';
 			    $label = $langs->trans("BoardExpiredServices");
+			    $labelShort = $langs->trans("BoardExpiredServicesShort");
 			} else {
 				$warning_delay = $conf->contrat->services->expires->warning_delay;
 				$url = DOL_URL_ROOT.'/contrat/services_list.php?mainmenu=commercial&leftmenu=contracts&mode=4&sortfield=cd.date_fin_validite&sortorder=asc';
 				//$url.= '&op2day='.$arraydatetouse['mday'].'&op2month='.$arraydatetouse['mon'].'&op2year='.$arraydatetouse['year'];
 				//if ($warning_delay >= 0) $url.='&amp;filter=expired';
 				$label = $langs->trans("BoardRunningServices");
+				$labelShort = $langs->trans("BoardRunningServicesShort");
 			}
 
 			$response = new WorkboardResponse();
 			$response->warning_delay = $warning_delay/60/60/24;
 			$response->label = $label;
+			$response->labelShort = $labelShort;
 			$response->url = $url;
 			$response->img = img_object('', "contract");
 
diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index 72c78cb8a4d..54243494de4 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -125,8 +125,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
         {
             require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
             $link = new Link($db);
-            $link->id = $linkid;
-            $link->fetch();
+            $link->fetch($linkid);
             $res = $link->delete($user);
 
             $langs->load('link');
@@ -160,8 +159,7 @@ elseif ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('
     require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
     $langs->load('link');
     $link = new Link($db);
-    $link->id = GETPOST('linkid', 'int');
-    $f = $link->fetch();
+    $f = $link->fetch(GETPOST('linkid', 'int'));
     if ($f)
     {
         $link->url = GETPOST('link', 'alpha');
@@ -169,7 +167,7 @@ elseif ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('
         {
             $link->url = 'http://' . $link->url;
         }
-        $link->label = GETPOST('label', 'alpha');
+        $link->label = GETPOST('label', 'alphanohtml');
         $res = $link->update($user);
         if (!$res)
         {
diff --git a/htdocs/core/ajax/pingresult.php b/htdocs/core/ajax/pingresult.php
index 3055942f89a..67608c24162 100644
--- a/htdocs/core/ajax/pingresult.php
+++ b/htdocs/core/ajax/pingresult.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 $action=GETPOST('action', 'alpha');
 $hash_unique_id=GETPOST('hash_unique_id', 'alpha');
-$hash_algo=GETPOST('hash', 'alpha');
+$hash_algo=GETPOST('hash_algo', 'alpha');
 
 
 // Security check
@@ -53,7 +53,7 @@ print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"])
 // If ok
 if ($action == 'firstpingok')
 {
-	// Note: pings are by entities
+	// Note: pings are by installation, done on entity 1.
 	dolibarr_set_const($db, 'MAIN_FIRST_PING_OK_DATE', dol_print_date($now, 'dayhourlog', 'gmt'));
 	dolibarr_set_const($db, 'MAIN_FIRST_PING_OK_ID', $hash_unique_id);
 
@@ -62,7 +62,7 @@ if ($action == 'firstpingok')
 // If ko
 elseif ($action == 'firstpingko')
 {
-	// Note: pings are by entities
+	// Note: pings are by installation, done on entity 1.
 	dolibarr_set_const($db, 'MAIN_LAST_PING_KO_DATE', dol_print_date($now, 'dayhourlog'), 'gmt');
 	print 'First ping KO saved for entity '.$conf->entity;
 }
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index d07792dc991..3a0b2c67af9 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -31,10 +31,10 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php";
  */
 class box_task extends ModeleBoxes
 {
-    public $boxcode="projet";
+    public $boxcode="projettask";
     public $boximg="object_projecttask";
     public $boxlabel;
-    //public $depends = array("projet");
+    public $depends = array("projet");
 
     /**
      * @var DoliDB Database handler.
@@ -42,7 +42,7 @@ class box_task extends ModeleBoxes
     public $db;
 
     public $param;
-    public $enabled = 0;		// Disabled because bugged.
+    public $enabled = 1;		// enable because fixed ;-).
 
     public $info_box_head = array();
     public $info_box_contents = array();
@@ -78,54 +78,110 @@ class box_task extends ModeleBoxes
 		global $conf, $user, $langs, $db;
 
 		$this->max=$max;
-
-		$totalMnt = 0;
-		$totalnb = 0;
-		$totalDuree=0;
-		$totalplannedtot=0;
-		$totaldurationtot=0;
-
 		include_once DOL_DOCUMENT_ROOT."/projet/class/task.class.php";
+		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+        require_once DOL_DOCUMENT_ROOT."/core/lib/project.lib.php";
+        $projectstatic = new Project($this->db);
 		$taskstatic=new Task($db);
+		$form= new Form($db);
+        $cookie_name='boxfilter_task';
+        $boxcontent='';
+
+        $textHead = $langs->trans("CurentlyOpenedTasks");
+
+        $filterValue='all';
+        if(in_array(GETPOST($cookie_name), array('all','im_project_contact','im_task_contact'))){
+            $filterValue = GETPOST($cookie_name);
+        }
+        elseif(!empty($_COOKIE[$cookie_name])){
+            $filterValue = $_COOKIE[$cookie_name];
+        }
 
 
-		$textHead = $langs->trans("Tasks")."&nbsp;".date("Y");
-		$this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
+        if($filterValue == 'im_task_contact'){
+            $textHead.= ' : '.$langs->trans("WhichIamLinkedTo");
+        }
+        elseif($filterValue == 'im_project_contact'){
+            $textHead.= ' : '.$langs->trans("WhichIamLinkedToProject");
+        }
+
+
+		$this->info_box_head = array(
+		    'text' => $textHead,
+            'limit'=> dol_strlen($textHead),
+            'sublink'=>'',
+            'subtext'=>$langs->trans("Filter"),
+            'subpicto'=>'filter.png',
+            'subclass'=>'linkobject boxfilter',
+            'target'=>'none'	// Set '' to get target="_blank"
+        );
 
 		// list the summary of the orders
 		if ($user->rights->projet->lire) {
-			// FIXME fk_statut on a task is not be used. We use the percent. This means this box is useless.
-			$sql = "SELECT pt.fk_statut, count(DISTINCT pt.rowid) as nb, sum(ptt.task_duration) as durationtot, sum(pt.planned_workload) as plannedtot";
-			$sql.= " FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt";
-			$sql.= " WHERE pt.datec BETWEEN '".$this->db->idate(dol_get_first_day(date("Y"), 1))."' AND '".$this->db->idate(dol_get_last_day(date("Y"), 12))."'";
-			$sql.= " AND pt.rowid = ptt.fk_task";
-			$sql.= " GROUP BY pt.fk_statut ";
-			$sql.= " ORDER BY pt.fk_statut DESC";
+            $boxcontent.= '<div id="ancor-idfilter'.$this->boxcode.'" style="display: block; position: absolute; margin-top: -100px"></div>'."\n";
+            $boxcontent.= '<div id="idfilter'.$this->boxcode.'" class="hideobject center" >'."\n";
+            $boxcontent.= '<form class="flat " method="POST" action="'.$_SERVER["PHP_SELF"].'#ancor-idfilter'.$this->boxcode.'">'."\n";
+            $boxcontent.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
+            $selectArray = array('all' => $langs->trans("NoFilter"), 'im_task_contact' => $langs->trans("WhichIamLinkedTo"), 'im_project_contact' => $langs->trans("WhichIamLinkedToProject"));
+            $boxcontent.= $form->selectArray($cookie_name, $selectArray, $filterValue);
+            $boxcontent.= '<button type="submit" >'.$langs->trans("Change").'</button>';
+            $boxcontent.= '</form>'."\n";
+            $boxcontent.= '</div>'."\n";
+            $boxcontent.= '<script type="text/javascript" language="javascript">
+					jQuery(document).ready(function() {
+						jQuery("#idsubimg'.$this->boxcode.'").click(function() {
+							jQuery("#idfilter'.$this->boxcode.'").toggle();
+						});
+					});
+					</script>';
+
+
+
+            $sql = "SELECT pt.rowid, pt.ref, pt.fk_projet, pt.fk_task_parent, pt.datec, pt.dateo, pt.datee, pt.datev, pt.label, pt.description, pt.duration_effective, pt.planned_workload, pt.progress";
+			$sql.= ", p.rowid project_id, p.ref project_ref, p.title project_title";
+
+			$sql.= " FROM ".MAIN_DB_PREFIX."projet_task as pt";
+			$sql.= " JOIN ".MAIN_DB_PREFIX."projet as p ON (pt.fk_projet = p.rowid)";
+
+            if($filterValue === 'im_task_contact') {
+                $sql .= " JOIN " . MAIN_DB_PREFIX . "element_contact as ec ON (ec.element_id = pt.rowid AND ec.fk_socpeople = '" . $user->id . "' )";
+                $sql .= " JOIN " . MAIN_DB_PREFIX . "c_type_contact  as tc ON (ec.fk_c_type_contact = tc.rowid AND tc.element = 'project_task' AND tc.source = 'internal' )";
+            }
+            elseif($filterValue === 'im_project_contact') {
+                $sql .= " JOIN " . MAIN_DB_PREFIX . "element_contact as ec ON (ec.element_id = p.rowid AND ec.fk_socpeople = '" . $user->id . "' )";
+                $sql .= " JOIN " . MAIN_DB_PREFIX . "c_type_contact  as tc ON (ec.fk_c_type_contact = tc.rowid AND tc.element = 'project' AND tc.source = 'internal' )";
+            }
+
+			$sql.= " WHERE ";
+			$sql.= " pt.entity = ".$conf->entity;
+			$sql.= " AND p.fk_statut = ".Project::STATUS_VALIDATED;
+			$sql.= " AND (pt.progress < 100 OR pt.progress IS NULL ) "; // 100% is done and not displayed
+
+			$sql.= " ORDER BY pt.datee ASC, pt.dateo ASC";
 			$sql.= $db->plimit($max, 0);
 
 			$result = $db->query($sql);
 			$i = 0;
 			if ($result) {
 				$num = $db->num_rows($result);
-                while ($i < $num) {
-                    $objp = $db->fetch_object($result);
-                    $this->info_box_contents[$i][] = array(
-                        'td' => '',
-                        'text' =>$langs->trans("Task")." ".$taskstatic->LibStatut($objp->fk_statut, 0),
-                    );
+                while ($objp = $db->fetch_object($result)) {
 
-                    $this->info_box_contents[$i][] = array(
-                        'td' => 'class="right"',
-                        'text' => $objp->nb."&nbsp;".$langs->trans("Tasks"),
-                        'url' => DOL_URL_ROOT."/projet/tasks/list.php?leftmenu=projects&viewstatut=".$objp->fk_statut,
-                    );
-					$totalnb += $objp->nb;
-					$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->plannedtot, 'all', 25200, 5));
-					$totalplannedtot += $objp->plannedtot;
-					$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => ConvertSecondToTime($objp->durationtot, 'all', 25200, 5));
-					$totaldurationtot += $objp->durationtot;
+                    $taskstatic->id=$objp->rowid;
+                    $taskstatic->ref=$objp->ref;
+                    $taskstatic->label=$objp->label;
+                    $taskstatic->progress = $objp->progress;
+                    $taskstatic->fk_statut = $objp->fk_statut;
+                    $taskstatic->date_end = $objp->datee;
+                    $taskstatic->planned_workload= $objp->planned_workload;
+                    $taskstatic->duration_effective= $objp->duration_effective;
 
-					$this->info_box_contents[$i][] = array('td' => 'class="right" width="18"', 'text' => $taskstatic->LibStatut($objp->fk_statut, 3));
+                    $projectstatic->id = $objp->project_id;
+                    $projectstatic->ref = $objp->project_ref;
+                    $projectstatic->title = $objp->project_title;
+
+                    $label = $projectstatic->getNomUrl(1).' '.$taskstatic->getNomUrl(1).' '.dol_htmlentities($taskstatic->label);
+
+                    $boxcontent.= getTaskProgressView($taskstatic, $label, true, false, true);
 
 					$i++;
 				}
@@ -134,12 +190,15 @@ class box_task extends ModeleBoxes
             }
 		}
 
-		// Add the sum at the bottom of the boxes
-		$this->info_box_contents[$i][] = array('tr' => 'class="liste_total"', 'td' => '', 'text' => $langs->trans("Total")."&nbsp;".$textHead);
-		$this->info_box_contents[$i][] = array('td' => 'class="right" ', 'text' => number_format($totalnb, 0, ',', ' ')."&nbsp;".$langs->trans("Tasks"));
-		$this->info_box_contents[$i][] = array('td' => 'class="right" ', 'text' => ConvertSecondToTime($totalplannedtot, 'all', 25200, 5));
-		$this->info_box_contents[$i][] = array('td' => 'class="right" ', 'text' => ConvertSecondToTime($totaldurationtot, 'all', 25200, 5));
-		$this->info_box_contents[$i][] = array('td' => '', 'text' => "");
+        // set cookie by js
+        if(empty($i)){
+            $boxcontent.='<script >date = new Date(); date.setTime(date.getTime()+(30*86400000)); document.cookie = "'.$cookie_name.'='.$filterValue.'; expires= " + date.toGMTString() + "; path=/ "; </script>';
+        }
+
+        $this->info_box_contents[0][] = array(
+            'td' => '',
+            'text' => $boxcontent,
+        );
 	}
 
 	/**
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e6d47c53d5f..458c6a2563b 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1913,7 +1913,7 @@ abstract class CommonObject
 	 *  Change the multicurrency rate
 	 *
 	 *  @param		double	$rate	multicurrency rate
-	 *  @param		int		$mode	mode 1 : amounts in company currency will be recalculated, mode 2 : amounts in foreign currency
+	 *  @param		int		$mode	mode 1 : amounts in company currency will be recalculated, mode 2 : amounts in foreign currency will be recalculated
 	 *  @return		int				>0 if OK, <0 if KO
 	 */
 	public function setMulticurrencyRate($rate, $mode = 1)
@@ -1936,10 +1936,16 @@ abstract class CommonObject
 				{
 					foreach ($this->lines as &$line)
 					{
+						// Amounts in company currency will be recalculated
 						if($mode == 1) {
 							$line->subprice = 0;
 						}
 
+						// Amounts in foreign currency will be recalculated
+						if($mode == 2) {
+							$line->multicurrency_subprice = 0;
+						}
+
 						switch ($this->element) {
 							case 'propal':
 								$this->updateline(
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 0d76b83cb8a..f94c95ff246 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -327,6 +327,9 @@ class Conf
 		}
 
 		// For mycompany storage
+		$this->mycompany->multidir_output	= array($this->entity => $rootfordata."/mycompany");
+		$this->mycompany->multidir_temp		= array($this->entity => $rootfordata."/mycompany/temp");
+		// For backward compatibility
 		$this->mycompany->dir_output=$rootfordata."/mycompany";
 		$this->mycompany->dir_temp=$rootfordata."/mycompany/temp";
 
@@ -566,6 +569,9 @@ class Conf
 		// By default, we show state code in combo list
 		if (! isset($this->global->MAIN_SHOW_STATE_CODE)) $this->global->MAIN_SHOW_STATE_CODE=1;
 
+		// Use a SCA ready workflow with Stripe module (STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION by default if nothing defined)
+		if (! isset($this->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) && empty($this->global->STRIPE_USE_NEW_CHECKOUT)) $this->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION=1;
+
 		// 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.
 		if (! empty($this->modules_parts['moduleforexternal']))		// Module part to include an external module into the MAIN_MODULES_FOR_EXTERNAL list
diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php
index 79515725aa1..a5200126737 100644
--- a/htdocs/core/class/dolgeoip.class.php
+++ b/htdocs/core/class/dolgeoip.class.php
@@ -43,15 +43,30 @@ class DolGeoIP
 	 */
 	public function __construct($type, $datfile)
 	{
+		global $conf;
+
+		$geoipversion = '2';							// 'php', '1' or '2'
+		if (! empty($conf->global->GEOIP_VERSION)) $geoipversion = $conf->global->GEOIP_VERSION;
+
 		if ($type == 'country')
 		{
 		    // geoip may have been already included with PEAR
-		    if (! function_exists('geoip_country_code_by_name')) $res=include_once GEOIP_PATH.'geoip.inc';
+			if ($geoipversion == '2' || ($geoipversion != 'php' && ! function_exists('geoip_country_code_by_name')))
+		    {
+		    	if ($geoipversion == '1') $res=include_once GEOIP_PATH.'geoip.inc';
+		    	//else $res=include_once DOL_DOCUMENT_ROOT.'/includes/geoip2/vendor/autoload.php';
+		    	else require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';
+		    }
 		}
 		elseif ($type == 'city')
 		{
 		    // geoip may have been already included with PEAR
-		    if (! function_exists('geoip_country_code_by_name')) $res=include_once GEOIP_PATH.'geoipcity.inc';
+			if ($geoipversion == '2' || ($geoipversion != 'php' && ! function_exists('geoip_country_code_by_name')))
+		    {
+		    	if ($geoipversion == '1') $res=include_once GEOIP_PATH.'geoipcity.inc';
+		    	//else $res=include_once DOL_DOCUMENT_ROOT.'/includes/geoip2/vendor/autoload.php';
+		    	else require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';
+		    }
 		}
 		else { print 'ErrorBadParameterInConstructor'; return 0; }
 
@@ -70,7 +85,19 @@ class DolGeoIP
 			return 0;
 		}
 
-		if (function_exists('geoip_open'))
+		if ($geoipversion == '2')
+		{
+			try {
+				$this->gi = new GeoIp2\Database\Reader($datfile);		// '/usr/local/share/GeoIP/GeoIP2-City.mmdb'
+			}
+			catch(Exception $e)
+			{
+				$this->error = $e->getMessage();
+				dol_syslog('DolGeoIP '.$this->errorlabel, LOG_ERR);
+				return 0;
+			}
+		}
+		elseif (function_exists('geoip_open'))
 		{
 			$this->gi = geoip_open($datfile, GEOIP_STANDARD);
 		}
@@ -90,6 +117,11 @@ class DolGeoIP
 	 */
 	public function getCountryCodeFromIP($ip)
 	{
+		global $conf;
+
+		$geoipversion = '2';							// 'php', '1' or '2'
+		if (! empty($conf->global->GEOIP_VERSION)) $geoipversion = $conf->global->GEOIP_VERSION;
+
 		if (empty($this->gi))
 		{
 			return '';
@@ -101,8 +133,44 @@ class DolGeoIP
 		}
 		else
 		{
-		    if (! function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));
-		    return strtolower(geoip_country_code_by_addr($this->gi, $ip));
+			if (preg_match('/^[0-9]+.[0-9]+\.[0-9]+\.[0-9]+/', $ip))
+			{
+				if ($geoipversion == '2')
+				{
+					try {
+						$record = $this->gi->country($ip);
+						return strtolower($record->country->isoCode);
+					}
+					catch(Exception $e) {
+						//return $e->getMessage();
+						return '';
+					}
+				}
+				else
+				{
+			    	if (! function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));
+			    	return strtolower(geoip_country_code_by_addr($this->gi, $ip));
+				}
+			}
+			else
+			{
+				if ($geoipversion == '2')
+				{
+					try {
+						$record = $this->gi->country($ip);
+						return strtolower($record->country->isoCode);
+					}
+					catch(Exception $e) {
+						//return $e->getMessage();
+						return '';
+					}
+				}
+				else
+				{
+					if (! function_exists('geoip_country_code_by_addr_v6')) return strtolower(geoip_country_code_by_name_v6($this->gi, $ip));
+					return strtolower(geoip_country_code_by_addr_v6($this->gi, $ip));
+				}
+			}
 		}
 	}
 
@@ -114,11 +182,31 @@ class DolGeoIP
 	 */
 	public function getCountryCodeFromName($name)
 	{
+		global $conf;
+
+		$geoipversion = '2';							// 'php', '1' or '2'
+		if (! empty($conf->global->GEOIP_VERSION)) $geoipversion = $conf->global->GEOIP_VERSION;
+
 		if (empty($this->gi))
 		{
 			return '';
 		}
-		return geoip_country_code_by_name($this->gi, $name);
+
+		if ($geoipversion == '2')
+		{
+			try {
+				$record = $this->gi->country($name);
+				return $record->country->isoCode;
+			}
+			catch(Exception $e) {
+				//return $e->getMessage();
+				return '';
+			}
+		}
+		else
+		{
+			return geoip_country_code_by_name($this->gi, $name);
+		}
 	}
 
     /**
@@ -128,8 +216,18 @@ class DolGeoIP
      */
     public function getVersion()
     {
-        if ($this->gi == 'NOGI') return geoip_database_info();
-        return 'Not available (not using PHP internal geo functions)';
+    	global $conf;
+
+    	$geoipversion = '2';							// 'php', '1' or '2'
+    	if (! empty($conf->global->GEOIP_VERSION)) $geoipversion = $conf->global->GEOIP_VERSION;
+
+    	if ($geoipversion == 'php')
+    	{
+        	if ($this->gi == 'NOGI') return geoip_database_info();
+        	else return 'geoip_database_info() function not available';
+    	}
+
+    	return 'Not available (not using PHP internal geo functions - We are using embedded Geoip v'.$geoipversion.')';
     }
 
     /**
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 09130bb130a..c92ae311141 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1628,7 +1628,7 @@ class ExtraFields
 		if ($hidden) return '';		// This is a protection. If field is hidden, we should just not call this method.
 
 		//if ($computed) $value =		// $value is already calculated into $value before calling this method
-		
+
 		$showsize=0;
 		if ($type == 'date')
 		{
@@ -1972,24 +1972,29 @@ class ExtraFields
             if (count($extrafield_param_list) > 0) {
                 $extrafield_collapse_display_value = intval($extrafield_param_list[0]);
                 if ($extrafield_collapse_display_value == 1 || $extrafield_collapse_display_value == 2) {
-                    $collapse_display = ($extrafield_collapse_display_value == 2 ? false : true);
+                	// Set the collapse_display status to cookie in priority or if ignorecollapsesetup is 1, if cookie and ignorecollapsesetup not defined, use the setup.
+                	$collapse_display = ((isset($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key]) || GETPOST('ignorecollapsesetup', 'int')) ? ($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key] ? true : false) : ($extrafield_collapse_display_value == 2 ? false : true));
                     $extrafields_collapse_num = $this->attributes[$object->table_element]['pos'][$key];
 
+                    $out .= '<!-- Add js script to manage the collpase/uncollapse of extrafields separators '.$key.' -->';
                     $out .= '<script type="text/javascript">';
                     $out .= 'jQuery(document).ready(function(){';
                     if ($collapse_display === false) {
-                        $out .= '   jQuery("#trextrafieldseparator' . $key . ' td").prepend("<span class=\"cursorpointer fa fa-plus-square\"></span>&nbsp;");';
-                        $out .= '   jQuery(".trextrafields_collapse' . $extrafields_collapse_num . '").hide();';
+                        $out .= '   jQuery("#trextrafieldseparator' . $key . ' td").prepend("<span class=\"cursorpointer fa fa-plus-square\"></span>&nbsp;");'."\n";
+                        $out .= '   jQuery(".trextrafields_collapse' . $extrafields_collapse_num . '").hide();'."\n";
                     } else {
-                        $out .= '   jQuery("#trextrafieldseparator' . $key . ' td").prepend("<span class=\"cursorpointer fa fa-minus-square\"></span>&nbsp;");';
+                    	$out .= '   jQuery("#trextrafieldseparator' . $key . ' td").prepend("<span class=\"cursorpointer fa fa-minus-square\"></span>&nbsp;");'."\n";
+                    	$out .= '   document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";
                     }
-                    $out .= '   jQuery("#trextrafieldseparator' . $key . '").click(function(){';
-                    $out .= '       jQuery(".trextrafields_collapse' . $extrafields_collapse_num . '").toggle("slow", function(){';
-                    $out .= '           if (jQuery(".trextrafields_collapse' . $extrafields_collapse_num . '").is(":hidden")) {';
-                    $out .= '               jQuery("#trextrafieldseparator' . $key . ' td span").addClass("fa-plus-square").removeClass("fa-minus-square");';
-                    $out .= '           } else {';
-                    $out .= '               jQuery("#trextrafieldseparator' . $key . ' td span").addClass("fa-minus-square").removeClass("fa-plus-square");';
-                    $out .= '           }';
+                    $out .= '   jQuery("#trextrafieldseparator' . $key . '").click(function(){'."\n";
+                    $out .= '       jQuery(".trextrafields_collapse' . $extrafields_collapse_num . '").toggle(300, function(){'."\n";
+                    $out .= '           if (jQuery(".trextrafields_collapse' . $extrafields_collapse_num . '").is(":hidden")) {'."\n";
+                    $out .= '               jQuery("#trextrafieldseparator' . $key . ' td span").addClass("fa-plus-square").removeClass("fa-minus-square");'."\n";
+                    $out .= '               document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=0; path='.$_SERVER["PHP_SELF"].'"'."\n";
+                    $out .= '           } else {'."\n";
+                    $out .= '               jQuery("#trextrafieldseparator' . $key . ' td span").addClass("fa-minus-square").removeClass("fa-plus-square");'."\n";
+                    $out .= '               document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";
+                    $out .= '           }'."\n";
                     $out .= '       });';
                     $out .= '   });';
                     $out .= '});';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index e829fdf6661..3a69d8e6d42 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -307,7 +307,7 @@ class Form
 	 * @param	mixed	$custommsg		String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage')
 	 * @return	string   		      	HTML edit in place
 	 */
-	private function editInPlace($object, $value, $htmlname, $condition, $inputType = 'textarea', $editvalue = null, $extObject = null, $custommsg = null)
+	protected function editInPlace($object, $value, $htmlname, $condition, $inputType = 'textarea', $editvalue = null, $extObject = null, $custommsg = null)
 	{
 		global $conf;
 
@@ -523,7 +523,7 @@ class Form
 	 *  @param  string	$extracss           Add a CSS style to td, div or span tag
 	 *  @param  int		$noencodehtmltext   Do not encode into html entity the htmltext
 	 *  @param	int		$notabs				0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
-	 *  @param  string  $tooltiptrigger     ''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key)
+	 *  @param  string  $tooltiptrigger     ''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key, clickable link is on image or on link if param $type='none')
 	 *  @param	int		$forcenowrap		Force no wrap between text and picto (works with notabs=2 only)
 	 * 	@return	string						HTML code of text, picto, tooltip
 	 */
@@ -2362,7 +2362,7 @@ class Form
 	 * @param   string      $filterkey          Filter key to highlight
 	 * @return	void
 	 */
-	private function constructProductListOption(&$objp, &$opt, &$optJson, $price_level, $selected, $hidepriceinlabel = 0, $filterkey = '')
+	protected function constructProductListOption(&$objp, &$opt, &$optJson, $price_level, $selected, $hidepriceinlabel = 0, $filterkey = '')
 	{
 		global $langs, $conf, $user, $db;
 
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 5f63d4db66c..1622ee88c2f 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1258,7 +1258,7 @@ class FormFile
 						print '</a>';
 					}
 					// Preview link
-					if (! $editline) print $this->showPreview($file, $modulepart, $filepath);
+					if (! $editline) print $this->showPreview($file, $modulepart, $filepath, 0, '&entity='.(! empty($object->entity)?$object->entity:$conf->entity));
 
 					print "</td>\n";
 
@@ -1839,7 +1839,7 @@ class FormFile
 				print $langs->trans('Link') . ': <input type="text" name="link" value="' . $link->url . '">';
 				print '</td>';
 				print '<td>';
-				print $langs->trans('Label') . ': <input type="text" name="label" value="' . $link->label . '">';
+				print $langs->trans('Label') . ': <input type="text" name="label" value="' . dol_escape_htmltag($link->label) . '">';
 				print '</td>';
 				print '<td class="center">' . dol_print_date(dol_now(), "dayhour", "tzuser") . '</td>';
 				print '<td class="right"></td>';
@@ -1853,7 +1853,7 @@ class FormFile
 				print '<td>';
 				print img_picto('', 'object_globe').' ';
 				print '<a data-ajax="false" href="' . $link->url . '" target="_blank">';
-				print $link->label;
+				print dol_escape_htmltag($link->label);
 				print '</a>';
 				print '</td>'."\n";
 				print '<td class="right"></td>';
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 8e01e93b66e..d47be50b3d0 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -153,7 +153,7 @@ class FormProjets
 		$outarray=array();
 
 		$hideunselectables = false;
-		if (! empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
 
 		$projectsListId = false;
 		if (empty($user->rights->projet->all->lire))
diff --git a/htdocs/core/class/html.formwebsite.class.php b/htdocs/core/class/html.formwebsite.class.php
index 3cefeaef99c..42c3b36025b 100644
--- a/htdocs/core/class/html.formwebsite.class.php
+++ b/htdocs/core/class/html.formwebsite.class.php
@@ -176,7 +176,21 @@ class FormWebsite
 
     	$langs->load("admin");
 
-    	$arrayofsamples=array('empty'=>'EmptyPage', 'corporatehome'=>'CorporateHomePage');
+    	$listofsamples = dol_dir_list(DOL_DOCUMENT_ROOT.'/website/samples', 'files', 0, '^page-sample-.*\.html$');
+
+    	$arrayofsamples = array();
+    	$arrayofsamples['empty']='EmptyPage';	// Always this one first
+    	foreach($listofsamples as $sample)
+    	{
+    		$reg = array();
+    		if (preg_match('/^page-sample-(.*)\.html$/', $sample['name'], $reg))
+    		{
+    			$key = $reg[1];
+	    		$labelkey = ucfirst($key);
+    			if ($key == 'empty') $labelkey = 'EmptyPage';
+    			$arrayofsamples[$key] = $labelkey;
+    		}
+    	}
 
     	$out = '';
     	$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
diff --git a/htdocs/core/class/lessc.class.php b/htdocs/core/class/lessc.class.php
new file mode 100644
index 00000000000..dcbd253c1cf
--- /dev/null
+++ b/htdocs/core/class/lessc.class.php
@@ -0,0 +1,3886 @@
+<?php
+
+/**
+ * lessphp v0.5.0
+ * http://leafo.net/lessphp
+ *
+ * LESS CSS compiler, adapted from http://lesscss.org
+ *
+ * Copyright 2013, Leaf Corcoran <leafot@gmail.com>
+ * Licensed under MIT or GPLv3, see LICENSE
+ */
+
+
+/**
+ * The LESS compiler and parser.
+ *
+ * Converting LESS to CSS is a three stage process. The incoming file is parsed
+ * by `lessc_parser` into a syntax tree, then it is compiled into another tree
+ * representing the CSS structure by `lessc`. The CSS tree is fed into a
+ * formatter, like `lessc_formatter` which then outputs CSS as a string.
+ *
+ * During the first compile, all values are *reduced*, which means that their
+ * types are brought to the lowest form before being dump as strings. This
+ * handles math equations, variable dereferences, and the like.
+ *
+ * The `parse` function of `lessc` is the entry point.
+ *
+ * In summary:
+ *
+ * The `lessc` class creates an instance of the parser, feeds it LESS code,
+ * then transforms the resulting tree to a CSS tree. This class also holds the
+ * evaluation context, such as all available mixins and variables at any given
+ * time.
+ *
+ * The `lessc_parser` class is only concerned with parsing its input.
+ *
+ * The `lessc_formatter` takes a CSS tree, and dumps it to a formatted string,
+ * handling things like indentation.
+ */
+class lessc {
+	public static $VERSION = "v0.5.0";
+
+	public static $TRUE = array("keyword", "true");
+	public static $FALSE = array("keyword", "false");
+
+	protected $libFunctions = array();
+	protected $registeredVars = array();
+	protected $preserveComments = false;
+
+	public $vPrefix = '@'; // prefix of abstract properties
+	public $mPrefix = '$'; // prefix of abstract blocks
+	public $parentSelector = '&';
+
+	public $importDisabled = false;
+	public $importDir = '';
+
+	protected $numberPrecision = null;
+
+	protected $allParsedFiles = array();
+
+	// set to the parser that generated the current line when compiling
+	// so we know how to create error messages
+	protected $sourceParser = null;
+	protected $sourceLoc = null;
+
+	protected static $nextImportId = 0; // uniquely identify imports
+
+	// attempts to find the path of an import url, returns null for css files
+	protected function findImport($url) {
+		foreach ((array)$this->importDir as $dir) {
+			$full = $dir.(substr($dir, -1) != '/' ? '/' : '').$url;
+			if ($this->fileExists($file = $full.'.less') || $this->fileExists($file = $full)) {
+				return $file;
+			}
+		}
+
+		return null;
+	}
+
+	protected function fileExists($name) {
+		return is_file($name);
+	}
+
+	public static function compressList($items, $delim) {
+		if (!isset($items[1]) && isset($items[0])) return $items[0];
+		else return array('list', $delim, $items);
+	}
+
+	public static function preg_quote($what) {
+		return preg_quote($what, '/');
+	}
+
+	protected function tryImport($importPath, $parentBlock, $out) {
+		if ($importPath[0] == "function" && $importPath[1] == "url") {
+			$importPath = $this->flattenList($importPath[2]);
+		}
+
+		$str = $this->coerceString($importPath);
+		if ($str === null) return false;
+
+		$url = $this->compileValue($this->lib_e($str));
+
+		// don't import if it ends in css
+		if (substr_compare($url, '.css', -4, 4) === 0) return false;
+
+		$realPath = $this->findImport($url);
+
+		if ($realPath === null) return false;
+
+		if ($this->importDisabled) {
+			return array(false, "/* import disabled */");
+		}
+
+		if (isset($this->allParsedFiles[realpath($realPath)])) {
+			return array(false, null);
+		}
+
+		$this->addParsedFile($realPath);
+		$parser = $this->makeParser($realPath);
+		$root = $parser->parse(file_get_contents($realPath));
+
+		// set the parents of all the block props
+		foreach ($root->props as $prop) {
+			if ($prop[0] == "block") {
+				$prop[1]->parent = $parentBlock;
+			}
+		}
+
+		// copy mixins into scope, set their parents
+		// bring blocks from import into current block
+		// TODO: need to mark the source parser these came from this file
+		foreach ($root->children as $childName => $child) {
+			if (isset($parentBlock->children[$childName])) {
+				$parentBlock->children[$childName] = array_merge(
+					$parentBlock->children[$childName],
+					$child);
+			} else {
+				$parentBlock->children[$childName] = $child;
+			}
+		}
+
+		$pi = pathinfo($realPath);
+		$dir = $pi["dirname"];
+
+		list($top, $bottom) = $this->sortProps($root->props, true);
+		$this->compileImportedProps($top, $parentBlock, $out, $parser, $dir);
+
+		return array(true, $bottom, $parser, $dir);
+	}
+
+	protected function compileImportedProps($props, $block, $out, $sourceParser, $importDir) {
+		$oldSourceParser = $this->sourceParser;
+
+		$oldImport = $this->importDir;
+
+		// TODO: this is because the importDir api is stupid
+		$this->importDir = (array)$this->importDir;
+		array_unshift($this->importDir, $importDir);
+
+		foreach ($props as $prop) {
+			$this->compileProp($prop, $block, $out);
+		}
+
+		$this->importDir = $oldImport;
+		$this->sourceParser = $oldSourceParser;
+	}
+
+	/**
+	 * Recursively compiles a block.
+	 *
+	 * A block is analogous to a CSS block in most cases. A single LESS document
+	 * is encapsulated in a block when parsed, but it does not have parent tags
+	 * so all of it's children appear on the root level when compiled.
+	 *
+	 * Blocks are made up of props and children.
+	 *
+	 * Props are property instructions, array tuples which describe an action
+	 * to be taken, eg. write a property, set a variable, mixin a block.
+	 *
+	 * The children of a block are just all the blocks that are defined within.
+	 * This is used to look up mixins when performing a mixin.
+	 *
+	 * Compiling the block involves pushing a fresh environment on the stack,
+	 * and iterating through the props, compiling each one.
+	 *
+	 * See lessc::compileProp()
+	 *
+	 */
+	protected function compileBlock($block) {
+		switch ($block->type) {
+			case "root":
+				$this->compileRoot($block);
+				break;
+			case null:
+				$this->compileCSSBlock($block);
+				break;
+			case "media":
+				$this->compileMedia($block);
+				break;
+			case "directive":
+				$name = "@" . $block->name;
+				if (!empty($block->value)) {
+					$name .= " " . $this->compileValue($this->reduce($block->value));
+				}
+
+				$this->compileNestedBlock($block, array($name));
+				break;
+			default:
+				$this->throwError("unknown block type: $block->type\n");
+		}
+	}
+
+	protected function compileCSSBlock($block) {
+		$env = $this->pushEnv();
+
+		$selectors = $this->compileSelectors($block->tags);
+		$env->selectors = $this->multiplySelectors($selectors);
+		$out = $this->makeOutputBlock(null, $env->selectors);
+
+		$this->scope->children[] = $out;
+		$this->compileProps($block, $out);
+
+		$block->scope = $env; // mixins carry scope with them!
+		$this->popEnv();
+	}
+
+	protected function compileMedia($media) {
+		$env = $this->pushEnv($media);
+		$parentScope = $this->mediaParent($this->scope);
+
+		$query = $this->compileMediaQuery($this->multiplyMedia($env));
+
+		$this->scope = $this->makeOutputBlock($media->type, array($query));
+		$parentScope->children[] = $this->scope;
+
+		$this->compileProps($media, $this->scope);
+
+		if (count($this->scope->lines) > 0) {
+			$orphanSelelectors = $this->findClosestSelectors();
+			if (!is_null($orphanSelelectors)) {
+				$orphan = $this->makeOutputBlock(null, $orphanSelelectors);
+				$orphan->lines = $this->scope->lines;
+				array_unshift($this->scope->children, $orphan);
+				$this->scope->lines = array();
+			}
+		}
+
+		$this->scope = $this->scope->parent;
+		$this->popEnv();
+	}
+
+	protected function mediaParent($scope) {
+		while (!empty($scope->parent)) {
+			if (!empty($scope->type) && $scope->type != "media") {
+				break;
+			}
+			$scope = $scope->parent;
+		}
+
+		return $scope;
+	}
+
+	protected function compileNestedBlock($block, $selectors) {
+		$this->pushEnv($block);
+		$this->scope = $this->makeOutputBlock($block->type, $selectors);
+		$this->scope->parent->children[] = $this->scope;
+
+		$this->compileProps($block, $this->scope);
+
+		$this->scope = $this->scope->parent;
+		$this->popEnv();
+	}
+
+	protected function compileRoot($root) {
+		$this->pushEnv();
+		$this->scope = $this->makeOutputBlock($root->type);
+		$this->compileProps($root, $this->scope);
+		$this->popEnv();
+	}
+
+	protected function compileProps($block, $out) {
+		foreach ($this->sortProps($block->props) as $prop) {
+			$this->compileProp($prop, $block, $out);
+		}
+		$out->lines = $this->deduplicate($out->lines);
+	}
+
+	/**
+	 * Deduplicate lines in a block. Comments are not deduplicated. If a
+	 * duplicate rule is detected, the comments immediately preceding each
+	 * occurence are consolidated.
+	 */
+	protected function deduplicate($lines) {
+		$unique = array();
+		$comments = array();
+
+		foreach ($lines as $line) {
+			if (strpos($line, '/*') === 0) {
+				$comments[] = $line;
+				continue;
+			}
+			if (!in_array($line, $unique)) {
+				$unique[] = $line;
+			}
+			array_splice($unique, array_search($line, $unique), 0, $comments);
+			$comments = array();
+		}
+		return array_merge($unique, $comments);
+	}
+
+	protected function sortProps($props, $split = false) {
+		$vars = array();
+		$imports = array();
+		$other = array();
+		$stack = array();
+
+		foreach ($props as $prop) {
+			switch ($prop[0]) {
+				case "comment":
+					$stack[] = $prop;
+					break;
+				case "assign":
+					$stack[] = $prop;
+					if (isset($prop[1][0]) && $prop[1][0] == $this->vPrefix) {
+						$vars = array_merge($vars, $stack);
+					} else {
+						$other = array_merge($other, $stack);
+					}
+					$stack = array();
+					break;
+				case "import":
+					$id = self::$nextImportId++;
+					$prop[] = $id;
+					$stack[] = $prop;
+					$imports = array_merge($imports, $stack);
+					$other[] = array("import_mixin", $id);
+					$stack = array();
+					break;
+				default:
+					$stack[] = $prop;
+					$other = array_merge($other, $stack);
+					$stack = array();
+					break;
+			}
+		}
+		$other = array_merge($other, $stack);
+
+		if ($split) {
+			return array(array_merge($imports, $vars), $other);
+		} else {
+			return array_merge($imports, $vars, $other);
+		}
+	}
+
+	protected function compileMediaQuery($queries) {
+		$compiledQueries = array();
+		foreach ($queries as $query) {
+			$parts = array();
+			foreach ($query as $q) {
+				switch ($q[0]) {
+					case "mediaType":
+						$parts[] = implode(" ", array_slice($q, 1));
+						break;
+					case "mediaExp":
+						if (isset($q[2])) {
+							$parts[] = "($q[1]: " .
+							$this->compileValue($this->reduce($q[2])) . ")";
+						} else {
+							$parts[] = "($q[1])";
+						}
+						break;
+					case "variable":
+						$parts[] = $this->compileValue($this->reduce($q));
+						break;
+				}
+			}
+
+			if (count($parts) > 0) {
+				$compiledQueries[] =  implode(" and ", $parts);
+			}
+		}
+
+		$out = "@media";
+		if (!empty($parts)) {
+			$out .= " " .
+				implode($this->formatter->selectorSeparator, $compiledQueries);
+		}
+		return $out;
+	}
+
+	protected function multiplyMedia($env, $childQueries = null) {
+		if (is_null($env) ||
+			!empty($env->block->type) && $env->block->type != "media"
+			) {
+				return $childQueries;
+			}
+
+			// plain old block, skip
+			if (empty($env->block->type)) {
+				return $this->multiplyMedia($env->parent, $childQueries);
+			}
+
+			$out = array();
+			$queries = $env->block->queries;
+			if (is_null($childQueries)) {
+				$out = $queries;
+			} else {
+				foreach ($queries as $parent) {
+					foreach ($childQueries as $child) {
+						$out[] = array_merge($parent, $child);
+					}
+				}
+			}
+
+			return $this->multiplyMedia($env->parent, $out);
+	}
+
+	protected function expandParentSelectors(&$tag, $replace) {
+		$parts = explode("$&$", $tag);
+		$count = 0;
+		foreach ($parts as &$part) {
+			$part = str_replace($this->parentSelector, $replace, $part, $c);
+			$count += $c;
+		}
+		$tag = implode($this->parentSelector, $parts);
+		return $count;
+	}
+
+	protected function findClosestSelectors() {
+		$env = $this->env;
+		$selectors = null;
+		while ($env !== null) {
+			if (isset($env->selectors)) {
+				$selectors = $env->selectors;
+				break;
+			}
+			$env = $env->parent;
+		}
+
+		return $selectors;
+	}
+
+
+	// multiply $selectors against the nearest selectors in env
+	protected function multiplySelectors($selectors) {
+		// find parent selectors
+
+		$parentSelectors = $this->findClosestSelectors();
+		if (is_null($parentSelectors)) {
+			// kill parent reference in top level selector
+			foreach ($selectors as &$s) {
+				$this->expandParentSelectors($s, "");
+			}
+
+			return $selectors;
+		}
+
+		$out = array();
+		foreach ($parentSelectors as $parent) {
+			foreach ($selectors as $child) {
+				$count = $this->expandParentSelectors($child, $parent);
+
+				// don't prepend the parent tag if & was used
+				if ($count > 0) {
+					$out[] = trim($child);
+				} else {
+					$out[] = trim($parent . ' ' . $child);
+				}
+			}
+		}
+
+		return $out;
+	}
+
+	// reduces selector expressions
+	protected function compileSelectors($selectors) {
+		$out = array();
+
+		foreach ($selectors as $s) {
+			if (is_array($s)) {
+				list(, $value) = $s;
+				$out[] = trim($this->compileValue($this->reduce($value)));
+			} else {
+				$out[] = $s;
+			}
+		}
+
+		return $out;
+	}
+
+	protected function eq($left, $right) {
+		return $left == $right;
+	}
+
+	protected function patternMatch($block, $orderedArgs, $keywordArgs) {
+		// match the guards if it has them
+		// any one of the groups must have all its guards pass for a match
+		if (!empty($block->guards)) {
+			$groupPassed = false;
+			foreach ($block->guards as $guardGroup) {
+				foreach ($guardGroup as $guard) {
+					$this->pushEnv();
+					$this->zipSetArgs($block->args, $orderedArgs, $keywordArgs);
+
+					$negate = false;
+					if ($guard[0] == "negate") {
+						$guard = $guard[1];
+						$negate = true;
+					}
+
+					$passed = $this->reduce($guard) == self::$TRUE;
+					if ($negate) $passed = !$passed;
+
+					$this->popEnv();
+
+					if ($passed) {
+						$groupPassed = true;
+					} else {
+						$groupPassed = false;
+						break;
+					}
+				}
+
+				if ($groupPassed) break;
+			}
+
+			if (!$groupPassed) {
+				return false;
+			}
+		}
+
+		if (empty($block->args)) {
+			return $block->isVararg || empty($orderedArgs) && empty($keywordArgs);
+		}
+
+		$remainingArgs = $block->args;
+		if ($keywordArgs) {
+			$remainingArgs = array();
+			foreach ($block->args as $arg) {
+				if ($arg[0] == "arg" && isset($keywordArgs[$arg[1]])) {
+					continue;
+				}
+
+				$remainingArgs[] = $arg;
+			}
+		}
+
+		$i = -1; // no args
+		// try to match by arity or by argument literal
+		foreach ($remainingArgs as $i => $arg) {
+			switch ($arg[0]) {
+				case "lit":
+					if (empty($orderedArgs[$i]) || !$this->eq($arg[1], $orderedArgs[$i])) {
+						return false;
+					}
+					break;
+				case "arg":
+					// no arg and no default value
+					if (!isset($orderedArgs[$i]) && !isset($arg[2])) {
+						return false;
+					}
+					break;
+				case "rest":
+					$i--; // rest can be empty
+					break 2;
+			}
+		}
+
+		if ($block->isVararg) {
+			return true; // not having enough is handled above
+		} else {
+			$numMatched = $i + 1;
+			// greater than because default values always match
+			return $numMatched >= count($orderedArgs);
+		}
+	}
+
+	protected function patternMatchAll($blocks, $orderedArgs, $keywordArgs, $skip=array()) {
+		$matches = null;
+		foreach ($blocks as $block) {
+			// skip seen blocks that don't have arguments
+			if (isset($skip[$block->id]) && !isset($block->args)) {
+				continue;
+			}
+
+			if ($this->patternMatch($block, $orderedArgs, $keywordArgs)) {
+				$matches[] = $block;
+			}
+		}
+
+		return $matches;
+	}
+
+	// attempt to find blocks matched by path and args
+	protected function findBlocks($searchIn, $path, $orderedArgs, $keywordArgs, $seen=array()) {
+		if ($searchIn == null) return null;
+		if (isset($seen[$searchIn->id])) return null;
+		$seen[$searchIn->id] = true;
+
+		$name = $path[0];
+
+		if (isset($searchIn->children[$name])) {
+			$blocks = $searchIn->children[$name];
+			if (count($path) == 1) {
+				$matches = $this->patternMatchAll($blocks, $orderedArgs, $keywordArgs, $seen);
+				if (!empty($matches)) {
+					// This will return all blocks that match in the closest
+					// scope that has any matching block, like lessjs
+					return $matches;
+				}
+			} else {
+				$matches = array();
+				foreach ($blocks as $subBlock) {
+					$subMatches = $this->findBlocks($subBlock,
+						array_slice($path, 1), $orderedArgs, $keywordArgs, $seen);
+
+					if (!is_null($subMatches)) {
+						foreach ($subMatches as $sm) {
+							$matches[] = $sm;
+						}
+					}
+				}
+
+				return count($matches) > 0 ? $matches : null;
+			}
+		}
+		if ($searchIn->parent === $searchIn) return null;
+		return $this->findBlocks($searchIn->parent, $path, $orderedArgs, $keywordArgs, $seen);
+	}
+
+	// sets all argument names in $args to either the default value
+	// or the one passed in through $values
+	protected function zipSetArgs($args, $orderedValues, $keywordValues) {
+		$assignedValues = array();
+
+		$i = 0;
+		foreach ($args as $a) {
+			if ($a[0] == "arg") {
+				if (isset($keywordValues[$a[1]])) {
+					// has keyword arg
+					$value = $keywordValues[$a[1]];
+				} elseif (isset($orderedValues[$i])) {
+					// has ordered arg
+					$value = $orderedValues[$i];
+					$i++;
+				} elseif (isset($a[2])) {
+					// has default value
+					$value = $a[2];
+				} else {
+					$this->throwError("Failed to assign arg " . $a[1]);
+					$value = null; // :(
+				}
+
+				$value = $this->reduce($value);
+				$this->set($a[1], $value);
+				$assignedValues[] = $value;
+			} else {
+				// a lit
+				$i++;
+			}
+		}
+
+		// check for a rest
+		$last = end($args);
+		if ($last[0] == "rest") {
+			$rest = array_slice($orderedValues, count($args) - 1);
+			$this->set($last[1], $this->reduce(array("list", " ", $rest)));
+		}
+
+		// wow is this the only true use of PHP's + operator for arrays?
+		$this->env->arguments = $assignedValues + $orderedValues;
+	}
+
+	// compile a prop and update $lines or $blocks appropriately
+	protected function compileProp($prop, $block, $out) {
+		// set error position context
+		$this->sourceLoc = isset($prop[-1]) ? $prop[-1] : -1;
+
+		switch ($prop[0]) {
+			case 'assign':
+				list(, $name, $value) = $prop;
+				if ($name[0] == $this->vPrefix) {
+					$this->set($name, $value);
+				} else {
+					$out->lines[] = $this->formatter->property($name,
+						$this->compileValue($this->reduce($value)));
+				}
+				break;
+			case 'block':
+				list(, $child) = $prop;
+				$this->compileBlock($child);
+				break;
+			case 'mixin':
+				list(, $path, $args, $suffix) = $prop;
+
+				$orderedArgs = array();
+				$keywordArgs = array();
+				foreach ((array)$args as $arg) {
+					$argval = null;
+					switch ($arg[0]) {
+						case "arg":
+							if (!isset($arg[2])) {
+								$orderedArgs[] = $this->reduce(array("variable", $arg[1]));
+							} else {
+								$keywordArgs[$arg[1]] = $this->reduce($arg[2]);
+							}
+							break;
+
+						case "lit":
+							$orderedArgs[] = $this->reduce($arg[1]);
+							break;
+						default:
+							$this->throwError("Unknown arg type: " . $arg[0]);
+					}
+				}
+
+				$mixins = $this->findBlocks($block, $path, $orderedArgs, $keywordArgs);
+
+				if ($mixins === null) {
+					$this->throwError("{$prop[1][0]} is undefined");
+				}
+
+				foreach ($mixins as $mixin) {
+					if ($mixin === $block && !$orderedArgs) {
+						continue;
+					}
+
+					$haveScope = false;
+					if (isset($mixin->parent->scope)) {
+						$haveScope = true;
+						$mixinParentEnv = $this->pushEnv();
+						$mixinParentEnv->storeParent = $mixin->parent->scope;
+					}
+
+					$haveArgs = false;
+					if (isset($mixin->args)) {
+						$haveArgs = true;
+						$this->pushEnv();
+						$this->zipSetArgs($mixin->args, $orderedArgs, $keywordArgs);
+					}
+
+					$oldParent = $mixin->parent;
+					if ($mixin != $block) $mixin->parent = $block;
+
+					foreach ($this->sortProps($mixin->props) as $subProp) {
+						if ($suffix !== null &&
+							$subProp[0] == "assign" &&
+							is_string($subProp[1]) &&
+							$subProp[1]{0} != $this->vPrefix
+							) {
+								$subProp[2] = array(
+									'list', ' ',
+									array($subProp[2], array('keyword', $suffix))
+								);
+							}
+
+							$this->compileProp($subProp, $mixin, $out);
+					}
+
+					$mixin->parent = $oldParent;
+
+					if ($haveArgs) $this->popEnv();
+					if ($haveScope) $this->popEnv();
+				}
+
+				break;
+			case 'raw':
+				$out->lines[] = $prop[1];
+				break;
+			case "directive":
+				list(, $name, $value) = $prop;
+				$out->lines[] = "@$name " . $this->compileValue($this->reduce($value)).';';
+				break;
+			case "comment":
+				$out->lines[] = $prop[1];
+				break;
+			case "import":
+				list(, $importPath, $importId) = $prop;
+				$importPath = $this->reduce($importPath);
+
+				if (!isset($this->env->imports)) {
+					$this->env->imports = array();
+				}
+
+				$result = $this->tryImport($importPath, $block, $out);
+
+				$this->env->imports[$importId] = $result === false ?
+				array(false, "@import " . $this->compileValue($importPath).";") :
+				$result;
+
+				break;
+			case "import_mixin":
+				list(,$importId) = $prop;
+				$import = $this->env->imports[$importId];
+				if ($import[0] === false) {
+					if (isset($import[1])) {
+						$out->lines[] = $import[1];
+					}
+				} else {
+					list(, $bottom, $parser, $importDir) = $import;
+					$this->compileImportedProps($bottom, $block, $out, $parser, $importDir);
+				}
+
+				break;
+			default:
+				$this->throwError("unknown op: {$prop[0]}\n");
+		}
+	}
+
+
+	/**
+	 * Compiles a primitive value into a CSS property value.
+	 *
+	 * Values in lessphp are typed by being wrapped in arrays, their format is
+	 * typically:
+	 *
+	 *     array(type, contents [, additional_contents]*)
+	 *
+	 * The input is expected to be reduced. This function will not work on
+	 * things like expressions and variables.
+	 */
+	public function compileValue($value) {
+		switch ($value[0]) {
+			case 'list':
+				// [1] - delimiter
+				// [2] - array of values
+				return implode($value[1], array_map(array($this, 'compileValue'), $value[2]));
+			case 'raw_color':
+				if (!empty($this->formatter->compressColors)) {
+					return $this->compileValue($this->coerceColor($value));
+				}
+				return $value[1];
+			case 'keyword':
+				// [1] - the keyword
+				return $value[1];
+			case 'number':
+				list(, $num, $unit) = $value;
+				// [1] - the number
+				// [2] - the unit
+				if ($this->numberPrecision !== null) {
+					$num = round($num, $this->numberPrecision);
+				}
+				return $num . $unit;
+			case 'string':
+				// [1] - contents of string (includes quotes)
+				list(, $delim, $content) = $value;
+				foreach ($content as &$part) {
+					if (is_array($part)) {
+						$part = $this->compileValue($part);
+					}
+				}
+				return $delim . implode($content) . $delim;
+			case 'color':
+				// [1] - red component (either number or a %)
+				// [2] - green component
+				// [3] - blue component
+				// [4] - optional alpha component
+				list(, $r, $g, $b) = $value;
+				$r = round($r);
+				$g = round($g);
+				$b = round($b);
+
+				if (count($value) == 5 && $value[4] != 1) { // rgba
+					return 'rgba('.$r.','.$g.','.$b.','.$value[4].')';
+				}
+
+				$h = sprintf("#%02x%02x%02x", $r, $g, $b);
+
+				if (!empty($this->formatter->compressColors)) {
+					// Converting hex color to short notation (e.g. #003399 to #039)
+					if ($h[1] === $h[2] && $h[3] === $h[4] && $h[5] === $h[6]) {
+						$h = '#' . $h[1] . $h[3] . $h[5];
+					}
+				}
+
+				return $h;
+
+			case 'function':
+				list(, $name, $args) = $value;
+				return $name.'('.$this->compileValue($args).')';
+			default: // assumed to be unit
+				$this->throwError("unknown value type: $value[0]");
+		}
+	}
+
+	protected function lib_pow($args) {
+		list($base, $exp) = $this->assertArgs($args, 2, "pow");
+		return pow($this->assertNumber($base), $this->assertNumber($exp));
+	}
+
+	protected function lib_pi() {
+		return pi();
+	}
+
+	protected function lib_mod($args) {
+		list($a, $b) = $this->assertArgs($args, 2, "mod");
+		return $this->assertNumber($a) % $this->assertNumber($b);
+	}
+
+	protected function lib_tan($num) {
+		return tan($this->assertNumber($num));
+	}
+
+	protected function lib_sin($num) {
+		return sin($this->assertNumber($num));
+	}
+
+	protected function lib_cos($num) {
+		return cos($this->assertNumber($num));
+	}
+
+	protected function lib_atan($num) {
+		$num = atan($this->assertNumber($num));
+		return array("number", $num, "rad");
+	}
+
+	protected function lib_asin($num) {
+		$num = asin($this->assertNumber($num));
+		return array("number", $num, "rad");
+	}
+
+	protected function lib_acos($num) {
+		$num = acos($this->assertNumber($num));
+		return array("number", $num, "rad");
+	}
+
+	protected function lib_sqrt($num) {
+		return sqrt($this->assertNumber($num));
+	}
+
+	protected function lib_extract($value) {
+		list($list, $idx) = $this->assertArgs($value, 2, "extract");
+		$idx = $this->assertNumber($idx);
+		// 1 indexed
+		if ($list[0] == "list" && isset($list[2][$idx - 1])) {
+			return $list[2][$idx - 1];
+		}
+	}
+
+	protected function lib_isnumber($value) {
+		return $this->toBool($value[0] == "number");
+	}
+
+	protected function lib_isstring($value) {
+		return $this->toBool($value[0] == "string");
+	}
+
+	protected function lib_iscolor($value) {
+		return $this->toBool($this->coerceColor($value));
+	}
+
+	protected function lib_iskeyword($value) {
+		return $this->toBool($value[0] == "keyword");
+	}
+
+	protected function lib_ispixel($value) {
+		return $this->toBool($value[0] == "number" && $value[2] == "px");
+	}
+
+	protected function lib_ispercentage($value) {
+		return $this->toBool($value[0] == "number" && $value[2] == "%");
+	}
+
+	protected function lib_isem($value) {
+		return $this->toBool($value[0] == "number" && $value[2] == "em");
+	}
+
+	protected function lib_isrem($value) {
+		return $this->toBool($value[0] == "number" && $value[2] == "rem");
+	}
+
+	protected function lib_rgbahex($color) {
+		$color = $this->coerceColor($color);
+		if (is_null($color)) {
+			$this->throwError("color expected for rgbahex");
+		}
+
+		return sprintf("#%02x%02x%02x%02x",
+			isset($color[4]) ? $color[4] * 255 : 255,
+			$color[1],
+			$color[2],
+			$color[3]
+			);
+	}
+
+	protected function lib_argb($color){
+		return $this->lib_rgbahex($color);
+	}
+
+	/**
+	 * Given an url, decide whether to output a regular link or the base64-encoded contents of the file
+	 *
+	 * @param  array  $value either an argument list (two strings) or a single string
+	 * @return string        formatted url(), either as a link or base64-encoded
+	 */
+	protected function lib_data_uri($value) {
+		$mime = ($value[0] === 'list') ? $value[2][0][2] : null;
+		$url = ($value[0] === 'list') ? $value[2][1][2][0] : $value[2][0];
+
+		$fullpath = $this->findImport($url);
+
+		if ($fullpath && ($fsize = filesize($fullpath)) !== false) {
+			// IE8 can't handle data uris larger than 32KB
+			if ($fsize/1024 < 32) {
+				if (is_null($mime)) {
+					if (class_exists('finfo')) { // php 5.3+
+						$finfo = new finfo(FILEINFO_MIME);
+						$mime = explode('; ', $finfo->file($fullpath));
+						$mime = $mime[0];
+					} elseif (function_exists('mime_content_type')) { // PHP 5.2
+						$mime = mime_content_type($fullpath);
+					}
+				}
+
+				if (!is_null($mime)) // fallback if the mime type is still unknown
+					$url = sprintf('data:%s;base64,%s', $mime, base64_encode(file_get_contents($fullpath)));
+			}
+		}
+
+		return 'url("'.$url.'")';
+	}
+
+	// utility func to unquote a string
+	protected function lib_e($arg) {
+		switch ($arg[0]) {
+			case "list":
+				$items = $arg[2];
+				if (isset($items[0])) {
+					return $this->lib_e($items[0]);
+				}
+				$this->throwError("unrecognised input");
+			case "string":
+				$arg[1] = "";
+				return $arg;
+			case "keyword":
+				return $arg;
+			default:
+				return array("keyword", $this->compileValue($arg));
+		}
+	}
+
+	protected function lib__sprintf($args) {
+		if ($args[0] != "list") return $args;
+		$values = $args[2];
+		$string = array_shift($values);
+		$template = $this->compileValue($this->lib_e($string));
+
+		$i = 0;
+		if (preg_match_all('/%[dsa]/', $template, $m)) {
+			foreach ($m[0] as $match) {
+				$val = isset($values[$i]) ?
+				$this->reduce($values[$i]) : array('keyword', '');
+
+				// lessjs compat, renders fully expanded color, not raw color
+				if ($color = $this->coerceColor($val)) {
+					$val = $color;
+				}
+
+				$i++;
+				$rep = $this->compileValue($this->lib_e($val));
+				$template = preg_replace('/'.self::preg_quote($match).'/',
+					$rep, $template, 1);
+			}
+		}
+
+		$d = $string[0] == "string" ? $string[1] : '"';
+		return array("string", $d, array($template));
+	}
+
+	protected function lib_floor($arg) {
+		$value = $this->assertNumber($arg);
+		return array("number", floor($value), $arg[2]);
+	}
+
+	protected function lib_ceil($arg) {
+		$value = $this->assertNumber($arg);
+		return array("number", ceil($value), $arg[2]);
+	}
+
+	protected function lib_round($arg) {
+		if ($arg[0] != "list") {
+			$value = $this->assertNumber($arg);
+			return array("number", round($value), $arg[2]);
+		} else {
+			$value = $this->assertNumber($arg[2][0]);
+			$precision = $this->assertNumber($arg[2][1]);
+			return array("number", round($value, $precision), $arg[2][0][2]);
+		}
+	}
+
+	protected function lib_unit($arg) {
+		if ($arg[0] == "list") {
+			list($number, $newUnit) = $arg[2];
+			return array("number", $this->assertNumber($number),
+				$this->compileValue($this->lib_e($newUnit)));
+		} else {
+			return array("number", $this->assertNumber($arg), "");
+		}
+	}
+
+	/**
+	 * Helper function to get arguments for color manipulation functions.
+	 * takes a list that contains a color like thing and a percentage
+	 */
+	public function colorArgs($args) {
+		if ($args[0] != 'list' || count($args[2]) < 2) {
+			return array(array('color', 0, 0, 0), 0);
+		}
+		list($color, $delta) = $args[2];
+		$color = $this->assertColor($color);
+		$delta = floatval($delta[1]);
+
+		return array($color, $delta);
+	}
+
+	protected function lib_darken($args) {
+		list($color, $delta) = $this->colorArgs($args);
+
+		$hsl = $this->toHSL($color);
+		$hsl[3] = $this->clamp($hsl[3] - $delta, 100);
+		return $this->toRGB($hsl);
+	}
+
+	protected function lib_lighten($args) {
+		list($color, $delta) = $this->colorArgs($args);
+
+		$hsl = $this->toHSL($color);
+		$hsl[3] = $this->clamp($hsl[3] + $delta, 100);
+		return $this->toRGB($hsl);
+	}
+
+	protected function lib_saturate($args) {
+		list($color, $delta) = $this->colorArgs($args);
+
+		$hsl = $this->toHSL($color);
+		$hsl[2] = $this->clamp($hsl[2] + $delta, 100);
+		return $this->toRGB($hsl);
+	}
+
+	protected function lib_desaturate($args) {
+		list($color, $delta) = $this->colorArgs($args);
+
+		$hsl = $this->toHSL($color);
+		$hsl[2] = $this->clamp($hsl[2] - $delta, 100);
+		return $this->toRGB($hsl);
+	}
+
+	protected function lib_spin($args) {
+		list($color, $delta) = $this->colorArgs($args);
+
+		$hsl = $this->toHSL($color);
+
+		$hsl[1] = $hsl[1] + $delta % 360;
+		if ($hsl[1] < 0) {
+			$hsl[1] += 360;
+		}
+
+		return $this->toRGB($hsl);
+	}
+
+	protected function lib_fadeout($args) {
+		list($color, $delta) = $this->colorArgs($args);
+		$color[4] = $this->clamp((isset($color[4]) ? $color[4] : 1) - $delta/100);
+		return $color;
+	}
+
+	protected function lib_fadein($args) {
+		list($color, $delta) = $this->colorArgs($args);
+		$color[4] = $this->clamp((isset($color[4]) ? $color[4] : 1) + $delta/100);
+		return $color;
+	}
+
+	protected function lib_hue($color) {
+		$hsl = $this->toHSL($this->assertColor($color));
+		return round($hsl[1]);
+	}
+
+	protected function lib_saturation($color) {
+		$hsl = $this->toHSL($this->assertColor($color));
+		return round($hsl[2]);
+	}
+
+	protected function lib_lightness($color) {
+		$hsl = $this->toHSL($this->assertColor($color));
+		return round($hsl[3]);
+	}
+
+	// get the alpha of a color
+	// defaults to 1 for non-colors or colors without an alpha
+	protected function lib_alpha($value) {
+		if (!is_null($color = $this->coerceColor($value))) {
+			return isset($color[4]) ? $color[4] : 1;
+		}
+	}
+
+	// set the alpha of the color
+	protected function lib_fade($args) {
+		list($color, $alpha) = $this->colorArgs($args);
+		$color[4] = $this->clamp($alpha / 100.0);
+		return $color;
+	}
+
+	protected function lib_percentage($arg) {
+		$num = $this->assertNumber($arg);
+		return array("number", $num*100, "%");
+	}
+
+	/**
+	 * Mix color with white in variable proportion.
+	 *
+	 * It is the same as calling `mix(#ffffff, @color, @weight)`.
+	 *
+	 *     tint(@color, [@weight: 50%]);
+	 *
+	 * http://lesscss.org/functions/#color-operations-tint
+	 *
+	 * @return array Color
+	 */
+	protected function lib_tint($args) {
+		$white = ['color', 255, 255, 255];
+		if ($args[0] == 'color') {
+			return $this->lib_mix([ 'list', ',', [$white, $args] ]);
+		} elseif ($args[0] == "list" && count($args[2]) == 2) {
+			return $this->lib_mix([ $args[0], $args[1], [$white, $args[2][0], $args[2][1]] ]);
+		} else {
+			$this->throwError("tint expects (color, weight)");
+		}
+	}
+
+	/**
+	 * Mix color with black in variable proportion.
+	 *
+	 * It is the same as calling `mix(#000000, @color, @weight)`
+	 *
+	 *     shade(@color, [@weight: 50%]);
+	 *
+	 * http://lesscss.org/functions/#color-operations-shade
+	 *
+	 * @return array Color
+	 */
+	protected function lib_shade($args) {
+		$black = ['color', 0, 0, 0];
+		if ($args[0] == 'color') {
+			return $this->lib_mix([ 'list', ',', [$black, $args] ]);
+		} elseif ($args[0] == "list" && count($args[2]) == 2) {
+			return $this->lib_mix([ $args[0], $args[1], [$black, $args[2][0], $args[2][1]] ]);
+		} else {
+			$this->throwError("shade expects (color, weight)");
+		}
+	}
+
+	// mixes two colors by weight
+	// mix(@color1, @color2, [@weight: 50%]);
+	// http://sass-lang.com/docs/yardoc/Sass/Script/Functions.html#mix-instance_method
+	protected function lib_mix($args) {
+		if ($args[0] != "list" || count($args[2]) < 2)
+			$this->throwError("mix expects (color1, color2, weight)");
+
+			list($first, $second) = $args[2];
+			$first = $this->assertColor($first);
+			$second = $this->assertColor($second);
+
+			$first_a = $this->lib_alpha($first);
+			$second_a = $this->lib_alpha($second);
+
+			if (isset($args[2][2])) {
+				$weight = $args[2][2][1] / 100.0;
+			} else {
+				$weight = 0.5;
+			}
+
+			$w = $weight * 2 - 1;
+			$a = $first_a - $second_a;
+
+			$w1 = (($w * $a == -1 ? $w : ($w + $a)/(1 + $w * $a)) + 1) / 2.0;
+			$w2 = 1.0 - $w1;
+
+			$new = array('color',
+				$w1 * $first[1] + $w2 * $second[1],
+				$w1 * $first[2] + $w2 * $second[2],
+				$w1 * $first[3] + $w2 * $second[3],
+			);
+
+			if ($first_a != 1.0 || $second_a != 1.0) {
+				$new[] = $first_a * $weight + $second_a * ($weight - 1);
+			}
+
+			return $this->fixColor($new);
+	}
+
+	protected function lib_contrast($args) {
+		$darkColor  = array('color', 0, 0, 0);
+		$lightColor = array('color', 255, 255, 255);
+		$threshold  = 0.43;
+
+		if ( $args[0] == 'list' ) {
+			$inputColor = ( isset($args[2][0]) ) ? $this->assertColor($args[2][0])  : $lightColor;
+			$darkColor  = ( isset($args[2][1]) ) ? $this->assertColor($args[2][1])  : $darkColor;
+			$lightColor = ( isset($args[2][2]) ) ? $this->assertColor($args[2][2])  : $lightColor;
+			$threshold  = ( isset($args[2][3]) ) ? $this->assertNumber($args[2][3]) : $threshold;
+		}
+		else {
+			$inputColor  = $this->assertColor($args);
+		}
+
+		$inputColor = $this->coerceColor($inputColor);
+		$darkColor  = $this->coerceColor($darkColor);
+		$lightColor = $this->coerceColor($lightColor);
+
+		//Figure out which is actually light and dark!
+		if ( $this->toLuma($darkColor) > $this->toLuma($lightColor) ) {
+			$t  = $lightColor;
+			$lightColor = $darkColor;
+			$darkColor  = $t;
+		}
+
+		$inputColor_alpha = $this->lib_alpha($inputColor);
+		if ( ( $this->toLuma($inputColor) * $inputColor_alpha) < $threshold) {
+			return $lightColor;
+		}
+		return $darkColor;
+	}
+
+	private function toLuma($color) {
+		list(, $r, $g, $b) = $this->coerceColor($color);
+
+		$r = $r / 255;
+		$g = $g / 255;
+		$b = $b / 255;
+
+		$r = ($r <= 0.03928) ? $r / 12.92 : pow((($r + 0.055) / 1.055), 2.4);
+		$g = ($g <= 0.03928) ? $g / 12.92 : pow((($g + 0.055) / 1.055), 2.4);
+		$b = ($b <= 0.03928) ? $b / 12.92 : pow((($b + 0.055) / 1.055), 2.4);
+
+		return (0.2126 * $r) + (0.7152 * $g) + (0.0722 * $b);
+	}
+
+	protected function lib_luma($color) {
+		return array("number", round($this->toLuma($color) * 100, 8), "%");
+	}
+
+
+	public function assertColor($value, $error = "expected color value") {
+		$color = $this->coerceColor($value);
+		if (is_null($color)) $this->throwError($error);
+		return $color;
+	}
+
+	public function assertNumber($value, $error = "expecting number") {
+		if ($value[0] == "number") return $value[1];
+		$this->throwError($error);
+	}
+
+	public function assertArgs($value, $expectedArgs, $name="") {
+		if ($expectedArgs == 1) {
+			return $value;
+		} else {
+			if ($value[0] !== "list" || $value[1] != ",") $this->throwError("expecting list");
+			$values = $value[2];
+			$numValues = count($values);
+			if ($expectedArgs != $numValues) {
+				if ($name) {
+					$name = $name . ": ";
+				}
+
+				$this->throwError("${name}expecting $expectedArgs arguments, got $numValues");
+			}
+
+			return $values;
+		}
+	}
+
+	protected function toHSL($color) {
+		if ($color[0] === 'hsl') {
+			return $color;
+		}
+
+		$r = $color[1] / 255;
+		$g = $color[2] / 255;
+		$b = $color[3] / 255;
+
+		$min = min($r, $g, $b);
+		$max = max($r, $g, $b);
+
+		$L = ($min + $max) / 2;
+		if ($min == $max) {
+			$S = $H = 0;
+		} else {
+			if ($L < 0.5) {
+				$S = ($max - $min) / ($max + $min);
+			} else {
+				$S = ($max - $min) / (2.0 - $max - $min);
+			}
+			if ($r == $max) {
+				$H = ($g - $b) / ($max - $min);
+			} elseif ($g == $max) {
+				$H = 2.0 + ($b - $r) / ($max - $min);
+			} elseif ($b == $max) {
+				$H = 4.0 + ($r - $g) / ($max - $min);
+			}
+
+		}
+
+		$out = array('hsl',
+			($H < 0 ? $H + 6 : $H)*60,
+			$S * 100,
+			$L * 100,
+		);
+
+		if (count($color) > 4) {
+			// copy alpha
+			$out[] = $color[4];
+		}
+		return $out;
+	}
+
+	protected function toRGB_helper($comp, $temp1, $temp2) {
+		if ($comp < 0) {
+			$comp += 1.0;
+		} elseif ($comp > 1) {
+			$comp -= 1.0;
+		}
+
+		if (6 * $comp < 1) {
+			return $temp1 + ($temp2 - $temp1) * 6 * $comp;
+		}
+		if (2 * $comp < 1) {
+			return $temp2;
+		}
+		if (3 * $comp < 2) {
+			return $temp1 + ($temp2 - $temp1)*((2/3) - $comp) * 6;
+		}
+
+		return $temp1;
+	}
+
+	/**
+	 * Converts a hsl array into a color value in rgb.
+	 * Expects H to be in range of 0 to 360, S and L in 0 to 100
+	 */
+	protected function toRGB($color) {
+		if ($color[0] === 'color') {
+			return $color;
+		}
+
+		$H = $color[1] / 360;
+		$S = $color[2] / 100;
+		$L = $color[3] / 100;
+
+		if ($S == 0) {
+			$r = $g = $b = $L;
+		} else {
+			$temp2 = $L < 0.5 ?
+			$L * (1.0 + $S) :
+			$L + $S - $L * $S;
+
+			$temp1 = 2.0 * $L - $temp2;
+
+			$r = $this->toRGB_helper($H + 1/3, $temp1, $temp2);
+			$g = $this->toRGB_helper($H, $temp1, $temp2);
+			$b = $this->toRGB_helper($H - 1/3, $temp1, $temp2);
+		}
+
+		// $out = array('color', round($r*255), round($g*255), round($b*255));
+		$out = array('color', $r*255, $g*255, $b*255);
+		if (count($color) > 4) {
+			// copy alpha
+			$out[] = $color[4];
+		}
+		return $out;
+	}
+
+	protected function clamp($v, $max = 1, $min = 0) {
+		return min($max, max($min, $v));
+	}
+
+	/**
+	 * Convert the rgb, rgba, hsl color literals of function type
+	 * as returned by the parser into values of color type.
+	 */
+	protected function funcToColor($func) {
+		$fname = $func[1];
+		if ($func[2][0] != 'list') {
+			// need a list of arguments
+			return false;
+		}
+		$rawComponents = $func[2][2];
+
+		if ($fname == 'hsl' || $fname == 'hsla') {
+			$hsl = array('hsl');
+			$i = 0;
+			foreach ($rawComponents as $c) {
+				$val = $this->reduce($c);
+				$val = isset($val[1]) ? floatval($val[1]) : 0;
+
+				if ($i == 0) {
+					$clamp = 360;
+				} elseif ($i < 3) {
+					$clamp = 100;
+				} else {
+					$clamp = 1;
+				}
+
+				$hsl[] = $this->clamp($val, $clamp);
+				$i++;
+			}
+
+			while (count($hsl) < 4) {
+				$hsl[] = 0;
+			}
+			return $this->toRGB($hsl);
+
+		} elseif ($fname == 'rgb' || $fname == 'rgba') {
+			$components = array();
+			$i = 1;
+			foreach ($rawComponents as $c) {
+				$c = $this->reduce($c);
+				if ($i < 4) {
+					if ($c[0] == "number" && $c[2] == "%") {
+						$components[] = 255 * ($c[1] / 100);
+					} else {
+						$components[] = floatval($c[1]);
+					}
+				} elseif ($i == 4) {
+					if ($c[0] == "number" && $c[2] == "%") {
+						$components[] = 1.0 * ($c[1] / 100);
+					} else {
+						$components[] = floatval($c[1]);
+					}
+				} else break;
+
+				$i++;
+			}
+			while (count($components) < 3) {
+				$components[] = 0;
+			}
+			array_unshift($components, 'color');
+			return $this->fixColor($components);
+		}
+
+		return false;
+	}
+
+	protected function reduce($value, $forExpression = false) {
+		switch ($value[0]) {
+			case "interpolate":
+				$reduced = $this->reduce($value[1]);
+				$var = $this->compileValue($reduced);
+				$res = $this->reduce(array("variable", $this->vPrefix . $var));
+
+				if ($res[0] == "raw_color") {
+					$res = $this->coerceColor($res);
+				}
+
+				if (empty($value[2])) $res = $this->lib_e($res);
+
+				return $res;
+			case "variable":
+				$key = $value[1];
+				if (is_array($key)) {
+					$key = $this->reduce($key);
+					$key = $this->vPrefix . $this->compileValue($this->lib_e($key));
+				}
+
+				$seen =& $this->env->seenNames;
+
+				if (!empty($seen[$key])) {
+					$this->throwError("infinite loop detected: $key");
+				}
+
+				$seen[$key] = true;
+				$out = $this->reduce($this->get($key));
+				$seen[$key] = false;
+				return $out;
+			case "list":
+				foreach ($value[2] as &$item) {
+					$item = $this->reduce($item, $forExpression);
+				}
+				return $value;
+			case "expression":
+				return $this->evaluate($value);
+			case "string":
+				foreach ($value[2] as &$part) {
+					if (is_array($part)) {
+						$strip = $part[0] == "variable";
+						$part = $this->reduce($part);
+						if ($strip) $part = $this->lib_e($part);
+					}
+				}
+				return $value;
+			case "escape":
+				list(,$inner) = $value;
+				return $this->lib_e($this->reduce($inner));
+			case "function":
+				$color = $this->funcToColor($value);
+				if ($color) return $color;
+
+				list(, $name, $args) = $value;
+				if ($name == "%") $name = "_sprintf";
+
+				$f = isset($this->libFunctions[$name]) ?
+				$this->libFunctions[$name] : array($this, 'lib_'.str_replace('-', '_', $name));
+
+				if (is_callable($f)) {
+					if ($args[0] == 'list')
+						$args = self::compressList($args[2], $args[1]);
+
+						$ret = call_user_func($f, $this->reduce($args, true), $this);
+
+						if (is_null($ret)) {
+							return array("string", "", array(
+								$name, "(", $args, ")"
+							));
+						}
+
+						// convert to a typed value if the result is a php primitive
+						if (is_numeric($ret)) {
+							$ret = array('number', $ret, "");
+						} elseif (!is_array($ret)) {
+							$ret = array('keyword', $ret);
+						}
+
+						return $ret;
+				}
+
+				// plain function, reduce args
+				$value[2] = $this->reduce($value[2]);
+				return $value;
+			case "unary":
+				list(, $op, $exp) = $value;
+				$exp = $this->reduce($exp);
+
+				if ($exp[0] == "number") {
+					switch ($op) {
+						case "+":
+							return $exp;
+						case "-":
+							$exp[1] *= -1;
+							return $exp;
+					}
+				}
+				return array("string", "", array($op, $exp));
+		}
+
+		if ($forExpression) {
+			switch ($value[0]) {
+				case "keyword":
+					if ($color = $this->coerceColor($value)) {
+						return $color;
+					}
+					break;
+				case "raw_color":
+					return $this->coerceColor($value);
+			}
+		}
+
+		return $value;
+	}
+
+
+	// coerce a value for use in color operation
+	protected function coerceColor($value) {
+		switch ($value[0]) {
+			case 'color': return $value;
+			case 'raw_color':
+				$c = array("color", 0, 0, 0);
+				$colorStr = substr($value[1], 1);
+				$num = hexdec($colorStr);
+				$width = strlen($colorStr) == 3 ? 16 : 256;
+
+				for ($i = 3; $i > 0; $i--) { // 3 2 1
+					$t = $num % $width;
+					$num /= $width;
+
+					$c[$i] = $t * (256/$width) + $t * floor(16/$width);
+				}
+
+				return $c;
+			case 'keyword':
+				$name = $value[1];
+				if (isset(self::$cssColors[$name])) {
+					$rgba = explode(',', self::$cssColors[$name]);
+
+					if (isset($rgba[3])) {
+						return array('color', $rgba[0], $rgba[1], $rgba[2], $rgba[3]);
+					}
+					return array('color', $rgba[0], $rgba[1], $rgba[2]);
+				}
+				return null;
+		}
+	}
+
+	// make something string like into a string
+	protected function coerceString($value) {
+		switch ($value[0]) {
+			case "string":
+				return $value;
+			case "keyword":
+				return array("string", "", array($value[1]));
+		}
+		return null;
+	}
+
+	// turn list of length 1 into value type
+	protected function flattenList($value) {
+		if ($value[0] == "list" && count($value[2]) == 1) {
+			return $this->flattenList($value[2][0]);
+		}
+		return $value;
+	}
+
+	public function toBool($a) {
+		return $a ? self::$TRUE : self::$FALSE;
+	}
+
+	// evaluate an expression
+	protected function evaluate($exp) {
+		list(, $op, $left, $right, $whiteBefore, $whiteAfter) = $exp;
+
+		$left = $this->reduce($left, true);
+		$right = $this->reduce($right, true);
+
+		if ($leftColor = $this->coerceColor($left)) {
+			$left = $leftColor;
+		}
+
+		if ($rightColor = $this->coerceColor($right)) {
+			$right = $rightColor;
+		}
+
+		$ltype = $left[0];
+		$rtype = $right[0];
+
+		// operators that work on all types
+		if ($op == "and") {
+			return $this->toBool($left == self::$TRUE && $right == self::$TRUE);
+		}
+
+		if ($op == "=") {
+			return $this->toBool($this->eq($left, $right) );
+		}
+
+		if ($op == "+" && !is_null($str = $this->stringConcatenate($left, $right))) {
+			return $str;
+		}
+
+		// type based operators
+		$fname = "op_${ltype}_${rtype}";
+		if (is_callable(array($this, $fname))) {
+			$out = $this->$fname($op, $left, $right);
+			if (!is_null($out)) return $out;
+		}
+
+		// make the expression look it did before being parsed
+		$paddedOp = $op;
+		if ($whiteBefore) {
+			$paddedOp = " " . $paddedOp;
+		}
+		if ($whiteAfter) {
+			$paddedOp .= " ";
+		}
+
+		return array("string", "", array($left, $paddedOp, $right));
+	}
+
+	protected function stringConcatenate($left, $right) {
+		if ($strLeft = $this->coerceString($left)) {
+			if ($right[0] == "string") {
+				$right[1] = "";
+			}
+			$strLeft[2][] = $right;
+			return $strLeft;
+		}
+
+		if ($strRight = $this->coerceString($right)) {
+			array_unshift($strRight[2], $left);
+			return $strRight;
+		}
+	}
+
+
+	// make sure a color's components don't go out of bounds
+	protected function fixColor($c) {
+		foreach (range(1, 3) as $i) {
+			if ($c[$i] < 0) $c[$i] = 0;
+			if ($c[$i] > 255) $c[$i] = 255;
+		}
+
+		return $c;
+	}
+
+	protected function op_number_color($op, $lft, $rgt) {
+		if ($op == '+' || $op == '*') {
+			return $this->op_color_number($op, $rgt, $lft);
+		}
+	}
+
+	protected function op_color_number($op, $lft, $rgt) {
+		if ($rgt[0] == '%') $rgt[1] /= 100;
+
+		return $this->op_color_color($op, $lft,
+			array_fill(1, count($lft) - 1, $rgt[1]));
+	}
+
+	protected function op_color_color($op, $left, $right) {
+		$out = array('color');
+		$max = count($left) > count($right) ? count($left) : count($right);
+		foreach (range(1, $max - 1) as $i) {
+			$lval = isset($left[$i]) ? $left[$i] : 0;
+			$rval = isset($right[$i]) ? $right[$i] : 0;
+			switch ($op) {
+				case '+':
+					$out[] = $lval + $rval;
+					break;
+				case '-':
+					$out[] = $lval - $rval;
+					break;
+				case '*':
+					$out[] = $lval * $rval;
+					break;
+				case '%':
+					$out[] = $lval % $rval;
+					break;
+				case '/':
+					if ($rval == 0) {
+						$this->throwError("evaluate error: can't divide by zero");
+					}
+					$out[] = $lval / $rval;
+					break;
+				default:
+					$this->throwError('evaluate error: color op number failed on op '.$op);
+			}
+		}
+		return $this->fixColor($out);
+	}
+
+	public function lib_red($color){
+		$color = $this->coerceColor($color);
+		if (is_null($color)) {
+			$this->throwError('color expected for red()');
+		}
+
+		return $color[1];
+	}
+
+	public function lib_green($color){
+		$color = $this->coerceColor($color);
+		if (is_null($color)) {
+			$this->throwError('color expected for green()');
+		}
+
+		return $color[2];
+	}
+
+	public function lib_blue($color){
+		$color = $this->coerceColor($color);
+		if (is_null($color)) {
+			$this->throwError('color expected for blue()');
+		}
+
+		return $color[3];
+	}
+
+
+	// operator on two numbers
+	protected function op_number_number($op, $left, $right) {
+		$unit = empty($left[2]) ? $right[2] : $left[2];
+
+		$value = 0;
+		switch ($op) {
+			case '+':
+				$value = $left[1] + $right[1];
+				break;
+			case '*':
+				$value = $left[1] * $right[1];
+				break;
+			case '-':
+				$value = $left[1] - $right[1];
+				break;
+			case '%':
+				$value = $left[1] % $right[1];
+				break;
+			case '/':
+				if ($right[1] == 0) $this->throwError('parse error: divide by zero');
+				$value = $left[1] / $right[1];
+				break;
+			case '<':
+				return $this->toBool($left[1] < $right[1]);
+			case '>':
+				return $this->toBool($left[1] > $right[1]);
+			case '>=':
+				return $this->toBool($left[1] >= $right[1]);
+			case '=<':
+				return $this->toBool($left[1] <= $right[1]);
+			default:
+				$this->throwError('parse error: unknown number operator: '.$op);
+		}
+
+		return array("number", $value, $unit);
+	}
+
+
+	/* environment functions */
+
+	protected function makeOutputBlock($type, $selectors = null) {
+		$b = new stdclass;
+		$b->lines = array();
+		$b->children = array();
+		$b->selectors = $selectors;
+		$b->type = $type;
+		$b->parent = $this->scope;
+		return $b;
+	}
+
+	// the state of execution
+	protected function pushEnv($block = null) {
+		$e = new stdclass;
+		$e->parent = $this->env;
+		$e->store = array();
+		$e->block = $block;
+
+		$this->env = $e;
+		return $e;
+	}
+
+	// pop something off the stack
+	protected function popEnv() {
+		$old = $this->env;
+		$this->env = $this->env->parent;
+		return $old;
+	}
+
+	// set something in the current env
+	protected function set($name, $value) {
+		$this->env->store[$name] = $value;
+	}
+
+
+	// get the highest occurrence entry for a name
+	protected function get($name) {
+		$current = $this->env;
+
+		$isArguments = $name == $this->vPrefix . 'arguments';
+		while ($current) {
+			if ($isArguments && isset($current->arguments)) {
+				return array('list', ' ', $current->arguments);
+			}
+
+			if (isset($current->store[$name])) {
+				return $current->store[$name];
+			}
+
+			$current = isset($current->storeParent) ?
+			$current->storeParent :
+			$current->parent;
+		}
+
+		$this->throwError("variable $name is undefined");
+	}
+
+	// inject array of unparsed strings into environment as variables
+	protected function injectVariables($args) {
+		$this->pushEnv();
+		$parser = new lessc_parser($this, __METHOD__);
+		foreach ($args as $name => $strValue) {
+			if ($name{0} !== '@') {
+				$name = '@' . $name;
+			}
+			$parser->count = 0;
+			$parser->buffer = (string)$strValue;
+			if (!$parser->propertyValue($value)) {
+				throw new Exception("failed to parse passed in variable $name: $strValue");
+			}
+
+			$this->set($name, $value);
+		}
+	}
+
+	/**
+	 * Initialize any static state, can initialize parser for a file
+	 * $opts isn't used yet
+	 */
+	public function __construct($fname = null) {
+		if ($fname !== null) {
+			// used for deprecated parse method
+			$this->_parseFile = $fname;
+		}
+	}
+
+	public function compile($string, $name = null) {
+		$locale = setlocale(LC_NUMERIC, 0);
+		setlocale(LC_NUMERIC, "C");
+
+		$this->parser = $this->makeParser($name);
+		$root = $this->parser->parse($string);
+
+		$this->env = null;
+		$this->scope = null;
+
+		$this->formatter = $this->newFormatter();
+
+		if (!empty($this->registeredVars)) {
+			$this->injectVariables($this->registeredVars);
+		}
+
+		$this->sourceParser = $this->parser; // used for error messages
+		$this->compileBlock($root);
+
+		ob_start();
+		$this->formatter->block($this->scope);
+		$out = ob_get_clean();
+		setlocale(LC_NUMERIC, $locale);
+		return $out;
+	}
+
+	public function compileFile($fname, $outFname = null) {
+		if (!is_readable($fname)) {
+			throw new Exception('load error: failed to find '.$fname);
+		}
+
+		$pi = pathinfo($fname);
+
+		$oldImport = $this->importDir;
+
+		$this->importDir = (array)$this->importDir;
+		$this->importDir[] = $pi['dirname'].'/';
+
+		$this->addParsedFile($fname);
+
+		$out = $this->compile(file_get_contents($fname), $fname);
+
+		$this->importDir = $oldImport;
+
+		if ($outFname !== null) {
+			return file_put_contents($outFname, $out);
+		}
+
+		return $out;
+	}
+
+	// compile only if changed input has changed or output doesn't exist
+	public function checkedCompile($in, $out) {
+		if (!is_file($out) || filemtime($in) > filemtime($out)) {
+			$this->compileFile($in, $out);
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Execute lessphp on a .less file or a lessphp cache structure
+	 *
+	 * The lessphp cache structure contains information about a specific
+	 * less file having been parsed. It can be used as a hint for future
+	 * calls to determine whether or not a rebuild is required.
+	 *
+	 * The cache structure contains two important keys that may be used
+	 * externally:
+	 *
+	 * compiled: The final compiled CSS
+	 * updated: The time (in seconds) the CSS was last compiled
+	 *
+	 * The cache structure is a plain-ol' PHP associative array and can
+	 * be serialized and unserialized without a hitch.
+	 *
+	 * @param mixed $in Input
+	 * @param bool $force Force rebuild?
+	 * @return array lessphp cache structure
+	 */
+	public function cachedCompile($in, $force = false) {
+		// assume no root
+		$root = null;
+
+		if (is_string($in)) {
+			$root = $in;
+		} elseif (is_array($in) && isset($in['root'])) {
+			if ($force || !isset($in['files'])) {
+				// If we are forcing a recompile or if for some reason the
+				// structure does not contain any file information we should
+				// specify the root to trigger a rebuild.
+				$root = $in['root'];
+			} elseif (isset($in['files']) && is_array($in['files'])) {
+				foreach ($in['files'] as $fname => $ftime) {
+					if (!file_exists($fname) || filemtime($fname) > $ftime) {
+						// One of the files we knew about previously has changed
+						// so we should look at our incoming root again.
+						$root = $in['root'];
+						break;
+					}
+				}
+			}
+		} else {
+			// TODO: Throw an exception? We got neither a string nor something
+			// that looks like a compatible lessphp cache structure.
+			return null;
+		}
+
+		if ($root !== null) {
+			// If we have a root value which means we should rebuild.
+			$out = array();
+			$out['root'] = $root;
+			$out['compiled'] = $this->compileFile($root);
+			$out['files'] = $this->allParsedFiles();
+			$out['updated'] = time();
+			return $out;
+		} else {
+			// No changes, pass back the structure
+			// we were given initially.
+			return $in;
+		}
+
+	}
+
+	// parse and compile buffer
+	// This is deprecated
+	public function parse($str = null, $initialVariables = null) {
+		if (is_array($str)) {
+			$initialVariables = $str;
+			$str = null;
+		}
+
+		$oldVars = $this->registeredVars;
+		if ($initialVariables !== null) {
+			$this->setVariables($initialVariables);
+		}
+
+		if ($str == null) {
+			if (empty($this->_parseFile)) {
+				throw new exception("nothing to parse");
+			}
+
+			$out = $this->compileFile($this->_parseFile);
+		} else {
+			$out = $this->compile($str);
+		}
+
+		$this->registeredVars = $oldVars;
+		return $out;
+	}
+
+	protected function makeParser($name) {
+		$parser = new lessc_parser($this, $name);
+		$parser->writeComments = $this->preserveComments;
+
+		return $parser;
+	}
+
+	public function setFormatter($name) {
+		$this->formatterName = $name;
+	}
+
+	protected function newFormatter() {
+		$className = "lessc_formatter_lessjs";
+		if (!empty($this->formatterName)) {
+			if (!is_string($this->formatterName))
+				return $this->formatterName;
+				$className = "lessc_formatter_$this->formatterName";
+		}
+
+		return new $className;
+	}
+
+	public function setPreserveComments($preserve) {
+		$this->preserveComments = $preserve;
+	}
+
+	public function registerFunction($name, $func) {
+		$this->libFunctions[$name] = $func;
+	}
+
+	public function unregisterFunction($name) {
+		unset($this->libFunctions[$name]);
+	}
+
+	public function setVariables($variables) {
+		$this->registeredVars = array_merge($this->registeredVars, $variables);
+	}
+
+	public function unsetVariable($name) {
+		unset($this->registeredVars[$name]);
+	}
+
+	public function setImportDir($dirs) {
+		$this->importDir = (array)$dirs;
+	}
+
+	public function addImportDir($dir) {
+		$this->importDir = (array)$this->importDir;
+		$this->importDir[] = $dir;
+	}
+
+	public function allParsedFiles() {
+		return $this->allParsedFiles;
+	}
+
+	public function addParsedFile($file) {
+		$this->allParsedFiles[realpath($file)] = filemtime($file);
+	}
+
+	/**
+	 * Uses the current value of $this->count to show line and line number
+	 */
+	public function throwError($msg = null) {
+		if ($this->sourceLoc >= 0) {
+			$this->sourceParser->throwError($msg, $this->sourceLoc);
+		}
+		throw new exception($msg);
+	}
+
+	// compile file $in to file $out if $in is newer than $out
+	// returns true when it compiles, false otherwise
+	public static function ccompile($in, $out, $less = null) {
+		if ($less === null) {
+			$less = new self;
+		}
+		return $less->checkedCompile($in, $out);
+	}
+
+	public static function cexecute($in, $force = false, $less = null) {
+		if ($less === null) {
+			$less = new self;
+		}
+		return $less->cachedCompile($in, $force);
+	}
+
+	protected static $cssColors = array(
+		'aliceblue' => '240,248,255',
+		'antiquewhite' => '250,235,215',
+		'aqua' => '0,255,255',
+		'aquamarine' => '127,255,212',
+		'azure' => '240,255,255',
+		'beige' => '245,245,220',
+		'bisque' => '255,228,196',
+		'black' => '0,0,0',
+		'blanchedalmond' => '255,235,205',
+		'blue' => '0,0,255',
+		'blueviolet' => '138,43,226',
+		'brown' => '165,42,42',
+		'burlywood' => '222,184,135',
+		'cadetblue' => '95,158,160',
+		'chartreuse' => '127,255,0',
+		'chocolate' => '210,105,30',
+		'coral' => '255,127,80',
+		'cornflowerblue' => '100,149,237',
+		'cornsilk' => '255,248,220',
+		'crimson' => '220,20,60',
+		'cyan' => '0,255,255',
+		'darkblue' => '0,0,139',
+		'darkcyan' => '0,139,139',
+		'darkgoldenrod' => '184,134,11',
+		'darkgray' => '169,169,169',
+		'darkgreen' => '0,100,0',
+		'darkgrey' => '169,169,169',
+		'darkkhaki' => '189,183,107',
+		'darkmagenta' => '139,0,139',
+		'darkolivegreen' => '85,107,47',
+		'darkorange' => '255,140,0',
+		'darkorchid' => '153,50,204',
+		'darkred' => '139,0,0',
+		'darksalmon' => '233,150,122',
+		'darkseagreen' => '143,188,143',
+		'darkslateblue' => '72,61,139',
+		'darkslategray' => '47,79,79',
+		'darkslategrey' => '47,79,79',
+		'darkturquoise' => '0,206,209',
+		'darkviolet' => '148,0,211',
+		'deeppink' => '255,20,147',
+		'deepskyblue' => '0,191,255',
+		'dimgray' => '105,105,105',
+		'dimgrey' => '105,105,105',
+		'dodgerblue' => '30,144,255',
+		'firebrick' => '178,34,34',
+		'floralwhite' => '255,250,240',
+		'forestgreen' => '34,139,34',
+		'fuchsia' => '255,0,255',
+		'gainsboro' => '220,220,220',
+		'ghostwhite' => '248,248,255',
+		'gold' => '255,215,0',
+		'goldenrod' => '218,165,32',
+		'gray' => '128,128,128',
+		'green' => '0,128,0',
+		'greenyellow' => '173,255,47',
+		'grey' => '128,128,128',
+		'honeydew' => '240,255,240',
+		'hotpink' => '255,105,180',
+		'indianred' => '205,92,92',
+		'indigo' => '75,0,130',
+		'ivory' => '255,255,240',
+		'khaki' => '240,230,140',
+		'lavender' => '230,230,250',
+		'lavenderblush' => '255,240,245',
+		'lawngreen' => '124,252,0',
+		'lemonchiffon' => '255,250,205',
+		'lightblue' => '173,216,230',
+		'lightcoral' => '240,128,128',
+		'lightcyan' => '224,255,255',
+		'lightgoldenrodyellow' => '250,250,210',
+		'lightgray' => '211,211,211',
+		'lightgreen' => '144,238,144',
+		'lightgrey' => '211,211,211',
+		'lightpink' => '255,182,193',
+		'lightsalmon' => '255,160,122',
+		'lightseagreen' => '32,178,170',
+		'lightskyblue' => '135,206,250',
+		'lightslategray' => '119,136,153',
+		'lightslategrey' => '119,136,153',
+		'lightsteelblue' => '176,196,222',
+		'lightyellow' => '255,255,224',
+		'lime' => '0,255,0',
+		'limegreen' => '50,205,50',
+		'linen' => '250,240,230',
+		'magenta' => '255,0,255',
+		'maroon' => '128,0,0',
+		'mediumaquamarine' => '102,205,170',
+		'mediumblue' => '0,0,205',
+		'mediumorchid' => '186,85,211',
+		'mediumpurple' => '147,112,219',
+		'mediumseagreen' => '60,179,113',
+		'mediumslateblue' => '123,104,238',
+		'mediumspringgreen' => '0,250,154',
+		'mediumturquoise' => '72,209,204',
+		'mediumvioletred' => '199,21,133',
+		'midnightblue' => '25,25,112',
+		'mintcream' => '245,255,250',
+		'mistyrose' => '255,228,225',
+		'moccasin' => '255,228,181',
+		'navajowhite' => '255,222,173',
+		'navy' => '0,0,128',
+		'oldlace' => '253,245,230',
+		'olive' => '128,128,0',
+		'olivedrab' => '107,142,35',
+		'orange' => '255,165,0',
+		'orangered' => '255,69,0',
+		'orchid' => '218,112,214',
+		'palegoldenrod' => '238,232,170',
+		'palegreen' => '152,251,152',
+		'paleturquoise' => '175,238,238',
+		'palevioletred' => '219,112,147',
+		'papayawhip' => '255,239,213',
+		'peachpuff' => '255,218,185',
+		'peru' => '205,133,63',
+		'pink' => '255,192,203',
+		'plum' => '221,160,221',
+		'powderblue' => '176,224,230',
+		'purple' => '128,0,128',
+		'red' => '255,0,0',
+		'rosybrown' => '188,143,143',
+		'royalblue' => '65,105,225',
+		'saddlebrown' => '139,69,19',
+		'salmon' => '250,128,114',
+		'sandybrown' => '244,164,96',
+		'seagreen' => '46,139,87',
+		'seashell' => '255,245,238',
+		'sienna' => '160,82,45',
+		'silver' => '192,192,192',
+		'skyblue' => '135,206,235',
+		'slateblue' => '106,90,205',
+		'slategray' => '112,128,144',
+		'slategrey' => '112,128,144',
+		'snow' => '255,250,250',
+		'springgreen' => '0,255,127',
+		'steelblue' => '70,130,180',
+		'tan' => '210,180,140',
+		'teal' => '0,128,128',
+		'thistle' => '216,191,216',
+		'tomato' => '255,99,71',
+		'transparent' => '0,0,0,0',
+		'turquoise' => '64,224,208',
+		'violet' => '238,130,238',
+		'wheat' => '245,222,179',
+		'white' => '255,255,255',
+		'whitesmoke' => '245,245,245',
+		'yellow' => '255,255,0',
+		'yellowgreen' => '154,205,50'
+	);
+}
+
+// responsible for taking a string of LESS code and converting it into a
+// syntax tree
+class lessc_parser {
+	protected static $nextBlockId = 0; // used to uniquely identify blocks
+
+	protected static $precedence = array(
+		'=<' => 0,
+		'>=' => 0,
+		'=' => 0,
+		'<' => 0,
+		'>' => 0,
+
+		'+' => 1,
+		'-' => 1,
+		'*' => 2,
+		'/' => 2,
+		'%' => 2,
+	);
+
+	protected static $whitePattern;
+	protected static $commentMulti;
+
+	protected static $commentSingle = "//";
+	protected static $commentMultiLeft = "/*";
+	protected static $commentMultiRight = "*/";
+
+	// regex string to match any of the operators
+	protected static $operatorString;
+
+	// these properties will supress division unless it's inside parenthases
+	protected static $supressDivisionProps =
+	array('/border-radius$/i', '/^font$/i');
+
+	protected $blockDirectives = array("font-face", "keyframes", "page", "-moz-document", "viewport", "-moz-viewport", "-o-viewport", "-ms-viewport");
+	protected $lineDirectives = array("charset");
+
+	/**
+	 * if we are in parens we can be more liberal with whitespace around
+	 * operators because it must evaluate to a single value and thus is less
+	 * ambiguous.
+	 *
+	 * Consider:
+	 *     property1: 10 -5; // is two numbers, 10 and -5
+	 *     property2: (10 -5); // should evaluate to 5
+	 */
+	protected $inParens = false;
+
+	// caches preg escaped literals
+	protected static $literalCache = array();
+
+	public function __construct($lessc, $sourceName = null) {
+		$this->eatWhiteDefault = true;
+		// reference to less needed for vPrefix, mPrefix, and parentSelector
+		$this->lessc = $lessc;
+
+		$this->sourceName = $sourceName; // name used for error messages
+
+		$this->writeComments = false;
+
+		if (!self::$operatorString) {
+			self::$operatorString =
+			'('.implode('|', array_map(array('lessc', 'preg_quote'),
+				array_keys(self::$precedence))).')';
+
+				$commentSingle = lessc::preg_quote(self::$commentSingle);
+				$commentMultiLeft = lessc::preg_quote(self::$commentMultiLeft);
+				$commentMultiRight = lessc::preg_quote(self::$commentMultiRight);
+
+				self::$commentMulti = $commentMultiLeft.'.*?'.$commentMultiRight;
+				self::$whitePattern = '/'.$commentSingle.'[^\n]*\s*|('.self::$commentMulti.')\s*|\s+/Ais';
+		}
+	}
+
+	public function parse($buffer) {
+		$this->count = 0;
+		$this->line = 1;
+
+		$this->env = null; // block stack
+		$this->buffer = $this->writeComments ? $buffer : $this->removeComments($buffer);
+		$this->pushSpecialBlock("root");
+		$this->eatWhiteDefault = true;
+		$this->seenComments = array();
+
+		// trim whitespace on head
+		// if (preg_match('/^\s+/', $this->buffer, $m)) {
+		//  $this->line += substr_count($m[0], "\n");
+			//  $this->buffer = ltrim($this->buffer);
+			// }
+			$this->whitespace();
+
+			// parse the entire file
+			while (false !== $this->parseChunk());
+
+			if ($this->count != strlen($this->buffer))
+				$this->throwError();
+
+				// TODO report where the block was opened
+				if ( !property_exists($this->env, 'parent') || !is_null($this->env->parent) )
+					throw new exception('parse error: unclosed block');
+
+					return $this->env;
+		}
+
+		/**
+		 * Parse a single chunk off the head of the buffer and append it to the
+		 * current parse environment.
+		 * Returns false when the buffer is empty, or when there is an error.
+		 *
+		 * This function is called repeatedly until the entire document is
+		 * parsed.
+		 *
+		 * This parser is most similar to a recursive descent parser. Single
+		 * functions represent discrete grammatical rules for the language, and
+		 * they are able to capture the text that represents those rules.
+		 *
+		 * Consider the function lessc::keyword(). (all parse functions are
+		 * structured the same)
+		 *
+		 * The function takes a single reference argument. When calling the
+		 * function it will attempt to match a keyword on the head of the buffer.
+		 * If it is successful, it will place the keyword in the referenced
+		 * argument, advance the position in the buffer, and return true. If it
+		 * fails then it won't advance the buffer and it will return false.
+		 *
+		 * All of these parse functions are powered by lessc::match(), which behaves
+		 * the same way, but takes a literal regular expression. Sometimes it is
+		 * more convenient to use match instead of creating a new function.
+		 *
+		 * Because of the format of the functions, to parse an entire string of
+		 * grammatical rules, you can chain them together using &&.
+		 *
+		 * But, if some of the rules in the chain succeed before one fails, then
+		 * the buffer position will be left at an invalid state. In order to
+		 * avoid this, lessc::seek() is used to remember and set buffer positions.
+		 *
+		 * Before parsing a chain, use $s = $this->seek() to remember the current
+		 * position into $s. Then if a chain fails, use $this->seek($s) to
+		 * go back where we started.
+		 */
+		protected function parseChunk() {
+			if (empty($this->buffer)) return false;
+			$s = $this->seek();
+
+			if ($this->whitespace()) {
+				return true;
+			}
+
+			// setting a property
+			if ($this->keyword($key) && $this->assign() &&
+				$this->propertyValue($value, $key) && $this->end()
+				) {
+					$this->append(array('assign', $key, $value), $s);
+					return true;
+				} else {
+					$this->seek($s);
+				}
+
+
+				// look for special css blocks
+				if ($this->literal('@', false)) {
+					$this->count--;
+
+					// media
+					if ($this->literal('@media')) {
+						if (($this->mediaQueryList($mediaQueries) || true)
+							&& $this->literal('{')
+							) {
+								$media = $this->pushSpecialBlock("media");
+								$media->queries = is_null($mediaQueries) ? array() : $mediaQueries;
+								return true;
+							} else {
+								$this->seek($s);
+								return false;
+							}
+					}
+
+					if ($this->literal("@", false) && $this->keyword($dirName)) {
+						if ($this->isDirective($dirName, $this->blockDirectives)) {
+							if (($this->openString("{", $dirValue, null, array(";")) || true) &&
+								$this->literal("{")
+								) {
+									$dir = $this->pushSpecialBlock("directive");
+									$dir->name = $dirName;
+									if (isset($dirValue)) $dir->value = $dirValue;
+									return true;
+								}
+						} elseif ($this->isDirective($dirName, $this->lineDirectives)) {
+							if ($this->propertyValue($dirValue) && $this->end()) {
+								$this->append(array("directive", $dirName, $dirValue));
+								return true;
+							}
+						}
+					}
+
+					$this->seek($s);
+				}
+
+				// setting a variable
+				if ($this->variable($var) && $this->assign() &&
+					$this->propertyValue($value) && $this->end()
+					) {
+						$this->append(array('assign', $var, $value), $s);
+						return true;
+					} else {
+						$this->seek($s);
+					}
+
+					if ($this->import($importValue)) {
+						$this->append($importValue, $s);
+						return true;
+					}
+
+					// opening parametric mixin
+					if ($this->tag($tag, true) && $this->argumentDef($args, $isVararg) &&
+						($this->guards($guards) || true) &&
+						$this->literal('{')
+						) {
+							$block = $this->pushBlock($this->fixTags(array($tag)));
+							$block->args = $args;
+							$block->isVararg = $isVararg;
+							if (!empty($guards)) $block->guards = $guards;
+							return true;
+						} else {
+							$this->seek($s);
+						}
+
+						// opening a simple block
+						if ($this->tags($tags) && $this->literal('{', false)) {
+							$tags = $this->fixTags($tags);
+							$this->pushBlock($tags);
+							return true;
+						} else {
+							$this->seek($s);
+						}
+
+						// closing a block
+						if ($this->literal('}', false)) {
+							try {
+								$block = $this->pop();
+							} catch (exception $e) {
+								$this->seek($s);
+								$this->throwError($e->getMessage());
+							}
+
+							$hidden = false;
+							if (is_null($block->type)) {
+								$hidden = true;
+								if (!isset($block->args)) {
+									foreach ($block->tags as $tag) {
+										if (!is_string($tag) || $tag{0} != $this->lessc->mPrefix) {
+											$hidden = false;
+											break;
+										}
+									}
+								}
+
+								foreach ($block->tags as $tag) {
+									if (is_string($tag)) {
+										$this->env->children[$tag][] = $block;
+									}
+								}
+							}
+
+							if (!$hidden) {
+								$this->append(array('block', $block), $s);
+							}
+
+							// this is done here so comments aren't bundled into he block that
+							// was just closed
+							$this->whitespace();
+							return true;
+						}
+
+						// mixin
+						if ($this->mixinTags($tags) &&
+							($this->argumentDef($argv, $isVararg) || true) &&
+							($this->keyword($suffix) || true) && $this->end()
+							) {
+								$tags = $this->fixTags($tags);
+								$this->append(array('mixin', $tags, $argv, $suffix), $s);
+								return true;
+							} else {
+								$this->seek($s);
+							}
+
+							// spare ;
+							if ($this->literal(';')) return true;
+
+							return false; // got nothing, throw error
+		}
+
+		protected function isDirective($dirname, $directives) {
+			// TODO: cache pattern in parser
+			$pattern = implode("|",
+				array_map(array("lessc", "preg_quote"), $directives));
+			$pattern = '/^(-[a-z-]+-)?(' . $pattern . ')$/i';
+
+			return preg_match($pattern, $dirname);
+		}
+
+		protected function fixTags($tags) {
+			// move @ tags out of variable namespace
+			foreach ($tags as &$tag) {
+				if ($tag{0} == $this->lessc->vPrefix)
+					$tag[0] = $this->lessc->mPrefix;
+			}
+			return $tags;
+		}
+
+		// a list of expressions
+		protected function expressionList(&$exps) {
+			$values = array();
+
+			while ($this->expression($exp)) {
+				$values[] = $exp;
+			}
+
+			if (count($values) == 0) return false;
+
+			$exps = lessc::compressList($values, ' ');
+			return true;
+		}
+
+		/**
+		 * Attempt to consume an expression.
+		 * @link http://en.wikipedia.org/wiki/Operator-precedence_parser#Pseudo-code
+		 */
+		protected function expression(&$out) {
+			if ($this->value($lhs)) {
+				$out = $this->expHelper($lhs, 0);
+
+				// look for / shorthand
+				if (!empty($this->env->supressedDivision)) {
+					unset($this->env->supressedDivision);
+					$s = $this->seek();
+					if ($this->literal("/") && $this->value($rhs)) {
+						$out = array("list", "",
+							array($out, array("keyword", "/"), $rhs));
+					} else {
+						$this->seek($s);
+					}
+				}
+
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * recursively parse infix equation with $lhs at precedence $minP
+		 */
+		protected function expHelper($lhs, $minP) {
+			$this->inExp = true;
+			$ss = $this->seek();
+
+			while (true) {
+				$whiteBefore = isset($this->buffer[$this->count - 1]) &&
+				ctype_space($this->buffer[$this->count - 1]);
+
+				// If there is whitespace before the operator, then we require
+				// whitespace after the operator for it to be an expression
+				$needWhite = $whiteBefore && !$this->inParens;
+
+				if ($this->match(self::$operatorString.($needWhite ? '\s' : ''), $m) && self::$precedence[$m[1]] >= $minP) {
+					if (!$this->inParens && isset($this->env->currentProperty) && $m[1] == "/" && empty($this->env->supressedDivision)) {
+						foreach (self::$supressDivisionProps as $pattern) {
+							if (preg_match($pattern, $this->env->currentProperty)) {
+								$this->env->supressedDivision = true;
+								break 2;
+							}
+						}
+					}
+
+
+					$whiteAfter = isset($this->buffer[$this->count - 1]) &&
+					ctype_space($this->buffer[$this->count - 1]);
+
+					if (!$this->value($rhs)) break;
+
+					// peek for next operator to see what to do with rhs
+					if ($this->peek(self::$operatorString, $next) && self::$precedence[$next[1]] > self::$precedence[$m[1]]) {
+						$rhs = $this->expHelper($rhs, self::$precedence[$next[1]]);
+					}
+
+					$lhs = array('expression', $m[1], $lhs, $rhs, $whiteBefore, $whiteAfter);
+					$ss = $this->seek();
+
+					continue;
+				}
+
+				break;
+			}
+
+			$this->seek($ss);
+
+			return $lhs;
+		}
+
+		// consume a list of values for a property
+		public function propertyValue(&$value, $keyName = null) {
+			$values = array();
+
+			if ($keyName !== null) $this->env->currentProperty = $keyName;
+
+			$s = null;
+			while ($this->expressionList($v)) {
+				$values[] = $v;
+				$s = $this->seek();
+				if (!$this->literal(',')) break;
+			}
+
+			if ($s) $this->seek($s);
+
+			if ($keyName !== null) unset($this->env->currentProperty);
+
+			if (count($values) == 0) return false;
+
+			$value = lessc::compressList($values, ', ');
+			return true;
+		}
+
+		protected function parenValue(&$out) {
+			$s = $this->seek();
+
+			// speed shortcut
+			if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "(") {
+				return false;
+			}
+
+			$inParens = $this->inParens;
+			if ($this->literal("(") &&
+				($this->inParens = true) && $this->expression($exp) &&
+				$this->literal(")")
+				) {
+					$out = $exp;
+					$this->inParens = $inParens;
+					return true;
+				} else {
+					$this->inParens = $inParens;
+					$this->seek($s);
+				}
+
+				return false;
+		}
+
+		// a single value
+		protected function value(&$value) {
+			$s = $this->seek();
+
+			// speed shortcut
+			if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "-") {
+				// negation
+				if ($this->literal("-", false) &&
+					(($this->variable($inner) && $inner = array("variable", $inner)) ||
+						$this->unit($inner) ||
+						$this->parenValue($inner))
+					) {
+						$value = array("unary", "-", $inner);
+						return true;
+					} else {
+						$this->seek($s);
+					}
+			}
+
+			if ($this->parenValue($value)) return true;
+			if ($this->unit($value)) return true;
+			if ($this->color($value)) return true;
+			if ($this->func($value)) return true;
+			if ($this->string($value)) return true;
+
+			if ($this->keyword($word)) {
+				$value = array('keyword', $word);
+				return true;
+			}
+
+			// try a variable
+			if ($this->variable($var)) {
+				$value = array('variable', $var);
+				return true;
+			}
+
+			// unquote string (should this work on any type?
+			if ($this->literal("~") && $this->string($str)) {
+				$value = array("escape", $str);
+				return true;
+			} else {
+				$this->seek($s);
+			}
+
+			// css hack: \0
+			if ($this->literal('\\') && $this->match('([0-9]+)', $m)) {
+				$value = array('keyword', '\\'.$m[1]);
+				return true;
+			} else {
+				$this->seek($s);
+			}
+
+			return false;
+		}
+
+		// an import statement
+		protected function import(&$out) {
+			if (!$this->literal('@import')) return false;
+
+			// @import "something.css" media;
+			// @import url("something.css") media;
+			// @import url(something.css) media;
+
+			if ($this->propertyValue($value)) {
+				$out = array("import", $value);
+				return true;
+			}
+		}
+
+		protected function mediaQueryList(&$out) {
+			if ($this->genericList($list, "mediaQuery", ",", false)) {
+				$out = $list[2];
+				return true;
+			}
+			return false;
+		}
+
+		protected function mediaQuery(&$out) {
+			$s = $this->seek();
+
+			$expressions = null;
+			$parts = array();
+
+			if (($this->literal("only") && ($only = true) || $this->literal("not") && ($not = true) || true) && $this->keyword($mediaType)) {
+				$prop = array("mediaType");
+				if (isset($only)) $prop[] = "only";
+				if (isset($not)) $prop[] = "not";
+				$prop[] = $mediaType;
+				$parts[] = $prop;
+			} else {
+				$this->seek($s);
+			}
+
+
+			if (!empty($mediaType) && !$this->literal("and")) {
+				// ~
+			} else {
+				$this->genericList($expressions, "mediaExpression", "and", false);
+				if (is_array($expressions)) $parts = array_merge($parts, $expressions[2]);
+			}
+
+			if (count($parts) == 0) {
+				$this->seek($s);
+				return false;
+			}
+
+			$out = $parts;
+			return true;
+		}
+
+		protected function mediaExpression(&$out) {
+			$s = $this->seek();
+			$value = null;
+			if ($this->literal("(") &&
+				$this->keyword($feature) &&
+				($this->literal(":") && $this->expression($value) || true) &&
+				$this->literal(")")
+				) {
+					$out = array("mediaExp", $feature);
+					if ($value) $out[] = $value;
+					return true;
+				} elseif ($this->variable($variable)) {
+					$out = array('variable', $variable);
+					return true;
+				}
+
+				$this->seek($s);
+				return false;
+		}
+
+		// an unbounded string stopped by $end
+		protected function openString($end, &$out, $nestingOpen=null, $rejectStrs = null) {
+			$oldWhite = $this->eatWhiteDefault;
+			$this->eatWhiteDefault = false;
+
+			$stop = array("'", '"', "@{", $end);
+			$stop = array_map(array("lessc", "preg_quote"), $stop);
+			// $stop[] = self::$commentMulti;
+
+			if (!is_null($rejectStrs)) {
+				$stop = array_merge($stop, $rejectStrs);
+			}
+
+			$patt = '(.*?)('.implode("|", $stop).')';
+
+			$nestingLevel = 0;
+
+			$content = array();
+			while ($this->match($patt, $m, false)) {
+				if (!empty($m[1])) {
+					$content[] = $m[1];
+					if ($nestingOpen) {
+						$nestingLevel += substr_count($m[1], $nestingOpen);
+					}
+				}
+
+				$tok = $m[2];
+
+				$this->count-= strlen($tok);
+				if ($tok == $end) {
+					if ($nestingLevel == 0) {
+						break;
+					} else {
+						$nestingLevel--;
+					}
+				}
+
+				if (($tok == "'" || $tok == '"') && $this->string($str)) {
+					$content[] = $str;
+					continue;
+				}
+
+				if ($tok == "@{" && $this->interpolation($inter)) {
+					$content[] = $inter;
+					continue;
+				}
+
+				if (!empty($rejectStrs) && in_array($tok, $rejectStrs)) {
+					break;
+				}
+
+				$content[] = $tok;
+				$this->count+= strlen($tok);
+			}
+
+			$this->eatWhiteDefault = $oldWhite;
+
+			if (count($content) == 0) return false;
+
+			// trim the end
+			if (is_string(end($content))) {
+				$content[count($content) - 1] = rtrim(end($content));
+			}
+
+			$out = array("string", "", $content);
+			return true;
+		}
+
+		protected function string(&$out) {
+			$s = $this->seek();
+			if ($this->literal('"', false)) {
+				$delim = '"';
+			} elseif ($this->literal("'", false)) {
+				$delim = "'";
+			} else {
+				return false;
+			}
+
+			$content = array();
+
+			// look for either ending delim , escape, or string interpolation
+			$patt = '([^\n]*?)(@\{|\\\\|' .
+				lessc::preg_quote($delim).')';
+
+				$oldWhite = $this->eatWhiteDefault;
+				$this->eatWhiteDefault = false;
+
+				while ($this->match($patt, $m, false)) {
+					$content[] = $m[1];
+					if ($m[2] == "@{") {
+						$this->count -= strlen($m[2]);
+						if ($this->interpolation($inter, false)) {
+							$content[] = $inter;
+						} else {
+							$this->count += strlen($m[2]);
+							$content[] = "@{"; // ignore it
+						}
+					} elseif ($m[2] == '\\') {
+						$content[] = $m[2];
+						if ($this->literal($delim, false)) {
+							$content[] = $delim;
+						}
+					} else {
+						$this->count -= strlen($delim);
+						break; // delim
+					}
+				}
+
+				$this->eatWhiteDefault = $oldWhite;
+
+				if ($this->literal($delim)) {
+					$out = array("string", $delim, $content);
+					return true;
+				}
+
+				$this->seek($s);
+				return false;
+		}
+
+		protected function interpolation(&$out) {
+			$oldWhite = $this->eatWhiteDefault;
+			$this->eatWhiteDefault = true;
+
+			$s = $this->seek();
+			if ($this->literal("@{") &&
+				$this->openString("}", $interp, null, array("'", '"', ";")) &&
+				$this->literal("}", false)
+				) {
+					$out = array("interpolate", $interp);
+					$this->eatWhiteDefault = $oldWhite;
+					if ($this->eatWhiteDefault) $this->whitespace();
+					return true;
+				}
+
+				$this->eatWhiteDefault = $oldWhite;
+				$this->seek($s);
+				return false;
+		}
+
+		protected function unit(&$unit) {
+			// speed shortcut
+			if (isset($this->buffer[$this->count])) {
+				$char = $this->buffer[$this->count];
+				if (!ctype_digit($char) && $char != ".") return false;
+			}
+
+			if ($this->match('([0-9]+(?:\.[0-9]*)?|\.[0-9]+)([%a-zA-Z]+)?', $m)) {
+				$unit = array("number", $m[1], empty($m[2]) ? "" : $m[2]);
+				return true;
+			}
+			return false;
+		}
+
+		// a # color
+		protected function color(&$out) {
+			if ($this->match('(#(?:[0-9a-f]{8}|[0-9a-f]{6}|[0-9a-f]{3}))', $m)) {
+				if (strlen($m[1]) > 7) {
+					$out = array("string", "", array($m[1]));
+				} else {
+					$out = array("raw_color", $m[1]);
+				}
+				return true;
+			}
+
+			return false;
+		}
+
+		// consume an argument definition list surrounded by ()
+		// each argument is a variable name with optional value
+		// or at the end a ... or a variable named followed by ...
+		// arguments are separated by , unless a ; is in the list, then ; is the
+		// delimiter.
+		protected function argumentDef(&$args, &$isVararg) {
+			$s = $this->seek();
+			if (!$this->literal('(')) {
+				return false;
+			}
+
+			$values = array();
+			$delim = ",";
+			$method = "expressionList";
+
+			$isVararg = false;
+			while (true) {
+				if ($this->literal("...")) {
+					$isVararg = true;
+					break;
+				}
+
+				if ($this->$method($value)) {
+					if ($value[0] == "variable") {
+						$arg = array("arg", $value[1]);
+						$ss = $this->seek();
+
+						if ($this->assign() && $this->$method($rhs)) {
+							$arg[] = $rhs;
+						} else {
+							$this->seek($ss);
+							if ($this->literal("...")) {
+								$arg[0] = "rest";
+								$isVararg = true;
+							}
+						}
+
+						$values[] = $arg;
+						if ($isVararg) {
+							break;
+						}
+						continue;
+					} else {
+						$values[] = array("lit", $value);
+					}
+				}
+
+
+				if (!$this->literal($delim)) {
+					if ($delim == "," && $this->literal(";")) {
+						// found new delim, convert existing args
+						$delim = ";";
+						$method = "propertyValue";
+
+						// transform arg list
+						if (isset($values[1])) { // 2 items
+							$newList = array();
+							foreach ($values as $i => $arg) {
+								switch ($arg[0]) {
+									case "arg":
+										if ($i) {
+											$this->throwError("Cannot mix ; and , as delimiter types");
+										}
+										$newList[] = $arg[2];
+										break;
+									case "lit":
+										$newList[] = $arg[1];
+										break;
+									case "rest":
+										$this->throwError("Unexpected rest before semicolon");
+								}
+							}
+
+							$newList = array("list", ", ", $newList);
+
+							switch ($values[0][0]) {
+								case "arg":
+									$newArg = array("arg", $values[0][1], $newList);
+									break;
+								case "lit":
+									$newArg = array("lit", $newList);
+									break;
+							}
+
+						} elseif ($values) { // 1 item
+							$newArg = $values[0];
+						}
+
+						if ($newArg) {
+							$values = array($newArg);
+						}
+					} else {
+						break;
+					}
+				}
+			}
+
+			if (!$this->literal(')')) {
+				$this->seek($s);
+				return false;
+			}
+
+			$args = $values;
+
+			return true;
+		}
+
+		// consume a list of tags
+		// this accepts a hanging delimiter
+		protected function tags(&$tags, $simple = false, $delim = ',') {
+			$tags = array();
+			while ($this->tag($tt, $simple)) {
+				$tags[] = $tt;
+				if (!$this->literal($delim)) break;
+			}
+			if (count($tags) == 0) return false;
+
+			return true;
+		}
+
+		// list of tags of specifying mixin path
+		// optionally separated by > (lazy, accepts extra >)
+		protected function mixinTags(&$tags) {
+			$tags = array();
+			while ($this->tag($tt, true)) {
+				$tags[] = $tt;
+				$this->literal(">");
+			}
+
+			if (!$tags) {
+				return false;
+			}
+
+			return true;
+		}
+
+		// a bracketed value (contained within in a tag definition)
+		protected function tagBracket(&$parts, &$hasExpression) {
+			// speed shortcut
+			if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "[") {
+				return false;
+			}
+
+			$s = $this->seek();
+
+			$hasInterpolation = false;
+
+			if ($this->literal("[", false)) {
+				$attrParts = array("[");
+				// keyword, string, operator
+				while (true) {
+					if ($this->literal("]", false)) {
+						$this->count--;
+						break; // get out early
+					}
+
+					if ($this->match('\s+', $m)) {
+						$attrParts[] = " ";
+						continue;
+					}
+					if ($this->string($str)) {
+						// escape parent selector, (yuck)
+						foreach ($str[2] as &$chunk) {
+							$chunk = str_replace($this->lessc->parentSelector, "$&$", $chunk);
+						}
+
+						$attrParts[] = $str;
+						$hasInterpolation = true;
+						continue;
+					}
+
+					if ($this->keyword($word)) {
+						$attrParts[] = $word;
+						continue;
+					}
+
+					if ($this->interpolation($inter, false)) {
+						$attrParts[] = $inter;
+						$hasInterpolation = true;
+						continue;
+					}
+
+					// operator, handles attr namespace too
+					if ($this->match('[|-~\$\*\^=]+', $m)) {
+						$attrParts[] = $m[0];
+						continue;
+					}
+
+					break;
+				}
+
+				if ($this->literal("]", false)) {
+					$attrParts[] = "]";
+					foreach ($attrParts as $part) {
+						$parts[] = $part;
+					}
+					$hasExpression = $hasExpression || $hasInterpolation;
+					return true;
+				}
+				$this->seek($s);
+			}
+
+			$this->seek($s);
+			return false;
+		}
+
+		// a space separated list of selectors
+		protected function tag(&$tag, $simple = false) {
+			if ($simple) {
+				$chars = '^@,:;{}\][>\(\) "\'';
+			} else {
+				$chars = '^@,;{}["\'';
+			}
+			$s = $this->seek();
+
+			$hasExpression = false;
+			$parts = array();
+			while ($this->tagBracket($parts, $hasExpression));
+
+			$oldWhite = $this->eatWhiteDefault;
+			$this->eatWhiteDefault = false;
+
+			while (true) {
+				if ($this->match('(['.$chars.'0-9]['.$chars.']*)', $m)) {
+					$parts[] = $m[1];
+					if ($simple) break;
+
+					while ($this->tagBracket($parts, $hasExpression));
+					continue;
+				}
+
+				if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "@") {
+					if ($this->interpolation($interp)) {
+						$hasExpression = true;
+						$interp[2] = true; // don't unescape
+						$parts[] = $interp;
+						continue;
+					}
+
+					if ($this->literal("@")) {
+						$parts[] = "@";
+						continue;
+					}
+				}
+
+				if ($this->unit($unit)) { // for keyframes
+					$parts[] = $unit[1];
+					$parts[] = $unit[2];
+					continue;
+				}
+
+				break;
+			}
+
+			$this->eatWhiteDefault = $oldWhite;
+			if (!$parts) {
+				$this->seek($s);
+				return false;
+			}
+
+			if ($hasExpression) {
+				$tag = array("exp", array("string", "", $parts));
+			} else {
+				$tag = trim(implode($parts));
+			}
+
+			$this->whitespace();
+			return true;
+		}
+
+		// a css function
+		protected function func(&$func) {
+			$s = $this->seek();
+
+			if ($this->match('(%|[\w\-_][\w\-_:\.]+|[\w_])', $m) && $this->literal('(')) {
+				$fname = $m[1];
+
+				$sPreArgs = $this->seek();
+
+				$args = array();
+				while (true) {
+					$ss = $this->seek();
+					// this ugly nonsense is for ie filter properties
+					if ($this->keyword($name) && $this->literal('=') && $this->expressionList($value)) {
+						$args[] = array("string", "", array($name, "=", $value));
+					} else {
+						$this->seek($ss);
+						if ($this->expressionList($value)) {
+							$args[] = $value;
+						}
+					}
+
+					if (!$this->literal(',')) break;
+				}
+				$args = array('list', ',', $args);
+
+				if ($this->literal(')')) {
+					$func = array('function', $fname, $args);
+					return true;
+				} elseif ($fname == 'url') {
+					// couldn't parse and in url? treat as string
+					$this->seek($sPreArgs);
+					if ($this->openString(")", $string) && $this->literal(")")) {
+						$func = array('function', $fname, $string);
+						return true;
+					}
+				}
+			}
+
+			$this->seek($s);
+			return false;
+		}
+
+		// consume a less variable
+		protected function variable(&$name) {
+			$s = $this->seek();
+			if ($this->literal($this->lessc->vPrefix, false) &&
+				($this->variable($sub) || $this->keyword($name))
+				) {
+					if (!empty($sub)) {
+						$name = array('variable', $sub);
+					} else {
+						$name = $this->lessc->vPrefix.$name;
+					}
+					return true;
+				}
+
+				$name = null;
+				$this->seek($s);
+				return false;
+		}
+
+		/**
+		 * Consume an assignment operator
+		 * Can optionally take a name that will be set to the current property name
+		 */
+		protected function assign($name = null) {
+			if ($name) $this->currentProperty = $name;
+			return $this->literal(':') || $this->literal('=');
+		}
+
+		// consume a keyword
+		protected function keyword(&$word) {
+			if ($this->match('([\w_\-\*!"][\w\-_"]*)', $m)) {
+				$word = $m[1];
+				return true;
+			}
+			return false;
+		}
+
+		// consume an end of statement delimiter
+		protected function end() {
+			if ($this->literal(';', false)) {
+				return true;
+			} elseif ($this->count == strlen($this->buffer) || $this->buffer[$this->count] == '}') {
+				// if there is end of file or a closing block next then we don't need a ;
+				return true;
+			}
+			return false;
+		}
+
+		protected function guards(&$guards) {
+			$s = $this->seek();
+
+			if (!$this->literal("when")) {
+				$this->seek($s);
+				return false;
+			}
+
+			$guards = array();
+
+			while ($this->guardGroup($g)) {
+				$guards[] = $g;
+				if (!$this->literal(",")) break;
+			}
+
+			if (count($guards) == 0) {
+				$guards = null;
+				$this->seek($s);
+				return false;
+			}
+
+			return true;
+		}
+
+		// a bunch of guards that are and'd together
+		// TODO rename to guardGroup
+		protected function guardGroup(&$guardGroup) {
+			$s = $this->seek();
+			$guardGroup = array();
+			while ($this->guard($guard)) {
+				$guardGroup[] = $guard;
+				if (!$this->literal("and")) break;
+			}
+
+			if (count($guardGroup) == 0) {
+				$guardGroup = null;
+				$this->seek($s);
+				return false;
+			}
+
+			return true;
+		}
+
+		protected function guard(&$guard) {
+			$s = $this->seek();
+			$negate = $this->literal("not");
+
+			if ($this->literal("(") && $this->expression($exp) && $this->literal(")")) {
+				$guard = $exp;
+				if ($negate) $guard = array("negate", $guard);
+				return true;
+			}
+
+			$this->seek($s);
+			return false;
+		}
+
+		/* raw parsing functions */
+
+		protected function literal($what, $eatWhitespace = null) {
+			if ($eatWhitespace === null) $eatWhitespace = $this->eatWhiteDefault;
+
+			// shortcut on single letter
+			if (!isset($what[1]) && isset($this->buffer[$this->count])) {
+				if ($this->buffer[$this->count] == $what) {
+					if (!$eatWhitespace) {
+						$this->count++;
+						return true;
+					}
+					// goes below...
+				} else {
+					return false;
+				}
+			}
+
+			if (!isset(self::$literalCache[$what])) {
+				self::$literalCache[$what] = lessc::preg_quote($what);
+			}
+
+			return $this->match(self::$literalCache[$what], $m, $eatWhitespace);
+		}
+
+		protected function genericList(&$out, $parseItem, $delim="", $flatten=true) {
+			$s = $this->seek();
+			$items = array();
+			while ($this->$parseItem($value)) {
+				$items[] = $value;
+				if ($delim) {
+					if (!$this->literal($delim)) break;
+				}
+			}
+
+			if (count($items) == 0) {
+				$this->seek($s);
+				return false;
+			}
+
+			if ($flatten && count($items) == 1) {
+				$out = $items[0];
+			} else {
+				$out = array("list", $delim, $items);
+			}
+
+			return true;
+		}
+
+
+		// advance counter to next occurrence of $what
+		// $until - don't include $what in advance
+		// $allowNewline, if string, will be used as valid char set
+		protected function to($what, &$out, $until = false, $allowNewline = false) {
+			if (is_string($allowNewline)) {
+				$validChars = $allowNewline;
+			} else {
+				$validChars = $allowNewline ? "." : "[^\n]";
+			}
+			if (!$this->match('('.$validChars.'*?)'.lessc::preg_quote($what), $m, !$until)) return false;
+			if ($until) $this->count -= strlen($what); // give back $what
+			$out = $m[1];
+			return true;
+		}
+
+		// try to match something on head of buffer
+		protected function match($regex, &$out, $eatWhitespace = null) {
+			if ($eatWhitespace === null) $eatWhitespace = $this->eatWhiteDefault;
+
+			$r = '/'.$regex.($eatWhitespace && !$this->writeComments ? '\s*' : '').'/Ais';
+			if (preg_match($r, $this->buffer, $out, null, $this->count)) {
+				$this->count += strlen($out[0]);
+				if ($eatWhitespace && $this->writeComments) $this->whitespace();
+				return true;
+			}
+			return false;
+		}
+
+		// match some whitespace
+		protected function whitespace() {
+			if ($this->writeComments) {
+				$gotWhite = false;
+				while (preg_match(self::$whitePattern, $this->buffer, $m, null, $this->count)) {
+					if (isset($m[1]) && empty($this->seenComments[$this->count])) {
+						$this->append(array("comment", $m[1]));
+						$this->seenComments[$this->count] = true;
+					}
+					$this->count += strlen($m[0]);
+					$gotWhite = true;
+				}
+				return $gotWhite;
+			} else {
+				$this->match("", $m);
+				return strlen($m[0]) > 0;
+			}
+		}
+
+		// match something without consuming it
+		protected function peek($regex, &$out = null, $from=null) {
+			if (is_null($from)) $from = $this->count;
+			$r = '/'.$regex.'/Ais';
+			$result = preg_match($r, $this->buffer, $out, null, $from);
+
+			return $result;
+		}
+
+		// seek to a spot in the buffer or return where we are on no argument
+		protected function seek($where = null) {
+			if ($where === null) return $this->count;
+			else $this->count = $where;
+			return true;
+		}
+
+		/* misc functions */
+
+		public function throwError($msg = "parse error", $count = null) {
+			$count = is_null($count) ? $this->count : $count;
+
+			$line = $this->line +
+			substr_count(substr($this->buffer, 0, $count), "\n");
+
+			if (!empty($this->sourceName)) {
+				$loc = "$this->sourceName on line $line";
+			} else {
+				$loc = "line: $line";
+			}
+
+			// TODO this depends on $this->count
+			if ($this->peek("(.*?)(\n|$)", $m, $count)) {
+				throw new exception("$msg: failed at `$m[1]` $loc");
+			} else {
+				throw new exception("$msg: $loc");
+			}
+		}
+
+		protected function pushBlock($selectors=null, $type=null) {
+			$b = new stdclass;
+			$b->parent = $this->env;
+
+			$b->type = $type;
+			$b->id = self::$nextBlockId++;
+
+			$b->isVararg = false; // TODO: kill me from here
+			$b->tags = $selectors;
+
+			$b->props = array();
+			$b->children = array();
+
+			$this->env = $b;
+			return $b;
+		}
+
+		// push a block that doesn't multiply tags
+		protected function pushSpecialBlock($type) {
+			return $this->pushBlock(null, $type);
+		}
+
+		// append a property to the current block
+		protected function append($prop, $pos = null) {
+			if ($pos !== null) $prop[-1] = $pos;
+			$this->env->props[] = $prop;
+		}
+
+		// pop something off the stack
+		protected function pop() {
+			$old = $this->env;
+			$this->env = $this->env->parent;
+			return $old;
+		}
+
+		// remove comments from $text
+		// todo: make it work for all functions, not just url
+		protected function removeComments($text) {
+			$look = array(
+				'url(', '//', '/*', '"', "'"
+			);
+
+			$out = '';
+			$min = null;
+			while (true) {
+				// find the next item
+				foreach ($look as $token) {
+					$pos = strpos($text, $token);
+					if ($pos !== false) {
+						if (!isset($min) || $pos < $min[1]) $min = array($token, $pos);
+					}
+				}
+
+				if (is_null($min)) break;
+
+				$count = $min[1];
+				$skip = 0;
+				$newlines = 0;
+				switch ($min[0]) {
+					case 'url(':
+						if (preg_match('/url\(.*?\)/', $text, $m, 0, $count))
+							$count += strlen($m[0]) - strlen($min[0]);
+							break;
+					case '"':
+					case "'":
+						if (preg_match('/'.$min[0].'.*?(?<!\\\\)'.$min[0].'/', $text, $m, 0, $count))
+							$count += strlen($m[0]) - 1;
+							break;
+					case '//':
+						$skip = strpos($text, "\n", $count);
+						if ($skip === false) $skip = strlen($text) - $count;
+						else $skip -= $count;
+						break;
+					case '/*':
+						if (preg_match('/\/\*.*?\*\//s', $text, $m, 0, $count)) {
+							$skip = strlen($m[0]);
+							$newlines = substr_count($m[0], "\n");
+						}
+						break;
+				}
+
+				if ($skip == 0) $count += strlen($min[0]);
+
+				$out .= substr($text, 0, $count).str_repeat("\n", $newlines);
+				$text = substr($text, $count + $skip);
+
+				$min = null;
+			}
+
+			return $out.$text;
+		}
+
+}
+
+class lessc_formatter_classic {
+	public $indentChar = "  ";
+
+	public $break = "\n";
+	public $open = " {";
+	public $close = "}";
+	public $selectorSeparator = ", ";
+	public $assignSeparator = ":";
+
+	public $openSingle = " { ";
+	public $closeSingle = " }";
+
+	public $disableSingle = false;
+	public $breakSelectors = false;
+
+	public $compressColors = false;
+
+	public function __construct() {
+		$this->indentLevel = 0;
+	}
+
+	public function indentStr($n = 0) {
+		return str_repeat($this->indentChar, max($this->indentLevel + $n, 0));
+	}
+
+	public function property($name, $value) {
+		return $name . $this->assignSeparator . $value . ";";
+	}
+
+	protected function isEmpty($block) {
+		if (empty($block->lines)) {
+			foreach ($block->children as $child) {
+				if (!$this->isEmpty($child)) return false;
+			}
+
+			return true;
+		}
+		return false;
+	}
+
+	public function block($block) {
+		if ($this->isEmpty($block)) return;
+
+		$inner = $pre = $this->indentStr();
+
+		$isSingle = !$this->disableSingle &&
+		is_null($block->type) && count($block->lines) == 1;
+
+		if (!empty($block->selectors)) {
+			$this->indentLevel++;
+
+			if ($this->breakSelectors) {
+				$selectorSeparator = $this->selectorSeparator . $this->break . $pre;
+			} else {
+				$selectorSeparator = $this->selectorSeparator;
+			}
+
+			echo $pre .
+			implode($selectorSeparator, $block->selectors);
+			if ($isSingle) {
+				echo $this->openSingle;
+				$inner = "";
+			} else {
+				echo $this->open . $this->break;
+				$inner = $this->indentStr();
+			}
+
+		}
+
+		if (!empty($block->lines)) {
+			$glue = $this->break.$inner;
+			echo $inner . implode($glue, $block->lines);
+			if (!$isSingle && !empty($block->children)) {
+				echo $this->break;
+			}
+		}
+
+		foreach ($block->children as $child) {
+			$this->block($child);
+		}
+
+		if (!empty($block->selectors)) {
+			if (!$isSingle && empty($block->children)) echo $this->break;
+
+			if ($isSingle) {
+				echo $this->closeSingle . $this->break;
+			} else {
+				echo $pre . $this->close . $this->break;
+			}
+
+			$this->indentLevel--;
+		}
+	}
+}
+
+/**
+ *	Class for compressed result
+ */
+class lessc_formatter_compressed extends lessc_formatter_classic {
+	public $disableSingle = true;
+	public $open = "{";
+	public $selectorSeparator = ",";
+	public $assignSeparator = ":";
+	public $break = "";
+	public $compressColors = true;
+
+	public function indentStr($n = 0) {
+		return "";
+	}
+}
+
+/**
+ *	Class for lessjs
+ */
+class lessc_formatter_lessjs extends lessc_formatter_classic {
+	public $disableSingle = true;
+	public $breakSelectors = true;
+	public $assignSeparator = ": ";
+	public $selectorSeparator = ",";
+}
\ No newline at end of file
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index f86d6570e5c..be220c90487 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -802,7 +802,7 @@ class Utils
 
 		dol_include_once('/core/lib/files.lib.php');
 
-		$nbSaves = ! empty($conf->global->SYSLOG_FILE_SAVES) ? intval($conf->global->SYSLOG_FILE_SAVES) : 14;
+		$nbSaves = empty($conf->global->SYSLOG_FILE_SAVES) ? 10 : intval($conf->global->SYSLOG_FILE_SAVES);
 
 		if (empty($conf->global->SYSLOG_FILE)) {
 			$mainlogdir = DOL_DATA_ROOT;
diff --git a/htdocs/core/class/workboardresponse.class.php b/htdocs/core/class/workboardresponse.class.php
index 35449693599..3af5feaecbc 100644
--- a/htdocs/core/class/workboardresponse.class.php
+++ b/htdocs/core/class/workboardresponse.class.php
@@ -37,6 +37,18 @@ class WorkboardResponse
 	 */
 	public $label;
 
+	/**
+	 * Short Label of the warning
+	 * @var string
+	 */
+	public $labelShort;
+
+	/**
+	 * infoKey of the warning
+	 * @var string
+	 */
+	public $infoKey = 'todo';
+
 	/**
 	 * URL to list to do items
 	 * @var string
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index cf8557de961..d177e7d99c1 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -856,7 +856,8 @@ function newpopup(url, title) {
 }
 
 /**
- * Function show document preview. Use the "dialog" function.
+ * Function show document preview. It uses the "dialog" function.
+ * The a tag around the img must have the src='', class='documentpreview', mime='image/xxx', target='_blank' from getAdvancedPreviewUrl().
  *
  * @param 	string file 		Url
  * @param 	string type 		Mime file type ("image/jpeg", "application/pdf", "text/html")
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 58e411a0bdf..2f6c474e632 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -172,7 +172,8 @@ function societe_prepare_head(Societe $object)
 	}
 
 	// Related items
-    if (! empty($conf->commande->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->ficheinter->enabled) || ! empty($conf->fournisseur->enabled))
+    if ((! empty($conf->commande->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->ficheinter->enabled) || ! empty($conf->fournisseur->enabled))
+        && empty($conf->global->THIRPARTIES_DISABLE_RELATED_OBJECT_TAB))
     {
         $head[$h][0] = DOL_URL_ROOT.'/societe/consumption.php?socid='.$object->id;
         $head[$h][1] = $langs->trans("Referers");
@@ -1241,7 +1242,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
     if (! empty($conf->agenda->enabled))
     {
         // Recherche histo sur actioncomm
-        if (is_object($objcon) && $objcon->id) {
+        if (is_object($objcon) && $objcon->id > 0) {
             $sql = "SELECT DISTINCT a.id, a.label as label,";
         }
         else
@@ -1267,7 +1268,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action = c.id";
 
         $force_filter_contact = false;
-        if (is_object($objcon) && $objcon->id) {
+        if (is_object($objcon) && $objcon->id > 0) {
             $force_filter_contact = true;
             $sql.= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as r ON a.id = r.fk_actioncomm";
             $sql.= " AND r.element_type = '" . $db->escape($objcon->table_element) . "' AND r.fk_element = " . $objcon->id;
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 92b739b3190..5861ad07a72 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -986,6 +986,7 @@ function dolCheckVirus($src_file)
  *  - This function can be used only into a HTML page context. Use dol_move if you are outside.
  *  - Test on antivirus is always done (if antivirus set).
  *  - Database of files is NOT updated (this is done by dol_add_file_process() that calls this function).
+ *  - Extension .noexe may be added if file is executable and MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED is not set.
  *
  *	@param	string	$src_file			Source full path filename ($_FILES['field']['tmp_name'])
  *	@param	string	$dest_file			Target full path filename  ($_FILES['field']['name'])
@@ -1064,15 +1065,15 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 
 		// Security:
 		// We refuse cache files/dirs, upload using .. and pipes into filenames.
-		if (preg_match('/^\./', $src_file) || preg_match('/\.\./', $src_file) || preg_match('/[<>|]/', $src_file))
+		if (preg_match('/^\./', basename($src_file)) || preg_match('/\.\./', $src_file) || preg_match('/[<>|]/', $src_file))
 		{
 			dol_syslog("Refused to deliver file ".$src_file, LOG_WARNING);
 			return -1;
 		}
 
 		// Security:
-		// On interdit fichiers caches, remontees de repertoire ainsi que les pipe dans les noms de fichiers.
-		if (preg_match('/^\./', $dest_file) || preg_match('/\.\./', $dest_file) || preg_match('/[<>|]/', $dest_file))
+		// We refuse cache files/dirs, upload using .. and pipes into filenames.
+		if (preg_match('/^\./', basename($dest_file)) || preg_match('/\.\./', $dest_file) || preg_match('/[<>|]/', $dest_file))
 		{
 			dol_syslog("Refused to deliver file ".$dest_file, LOG_WARNING);
 			return -2;
@@ -1889,24 +1890,87 @@ function dol_convert_file($fileinput, $ext = 'png', $fileoutput = '', $page = ''
  */
 function dol_compress_file($inputfile, $outputfile, $mode = "gz")
 {
+	global $conf;
+
 	$foundhandler=0;
 
 	try
 	{
+		dol_syslog("dol_compress_file mode=".$mode." inputfile=".$inputfile." outputfile=".$outputfile);
+
 		$data = implode("", file(dol_osencode($inputfile)));
 		if ($mode == 'gz')     { $foundhandler=1; $compressdata = gzencode($data, 9); }
 		elseif ($mode == 'bz') { $foundhandler=1; $compressdata = bzcompress($data, 9); }
 		elseif ($mode == 'zip')
 		{
+			if (class_exists('ZipArchive') && ! empty($conf->global->MAIN_USE_ZIPARCHIVE_FOR_ZIP_COMPRESS))
+			{
+				$foundhandler=1;
+
+				$rootPath = realpath($inputfile);
+
+				dol_syslog("Class ZipArchive is set so we zip using ZipArchive to zip into ".$outputfile.' rootPath='.$rootPath);
+				$zip = new ZipArchive;
+
+				if ($zip->open($outputfile, ZipArchive::CREATE) !== true) {
+					$errormsg="Failed to open file ".$outputfile."\n";
+					dol_syslog("dol_compress_file failure - ".$errormsg, LOG_ERR);
+					return -6;
+				}
+
+				// Create recursive directory iterator
+				/** @var SplFileInfo[] $files */
+				$files = new RecursiveIteratorIterator(
+					new RecursiveDirectoryIterator($rootPath),
+					RecursiveIteratorIterator::LEAVES_ONLY
+					);
+
+				foreach ($files as $name => $file)
+				{
+					// Skip directories (they would be added automatically)
+					if (!$file->isDir())
+					{
+						// Get real and relative path for current file
+						$filePath = $file->getRealPath();
+						$relativePath = substr($filePath, strlen($rootPath) + 1);
+
+						// Add current file to archive
+						$zip->addFile($filePath, $relativePath);
+					}
+				}
+
+				// Zip archive will be created only after closing object
+				$zip->close();
+
+				dol_syslog("dol_compress_file success - ".count($zip->numFiles)." files");
+				return 1;
+			}
+
 			if (defined('ODTPHP_PATHTOPCLZIP'))
 			{
 				$foundhandler=1;
 
 				include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
 				$archive = new PclZip($outputfile);
-				$archive->add($inputfile, PCLZIP_OPT_REMOVE_PATH, dirname($inputfile));
-				//$archive->add($inputfile);
-				return 1;
+				$result = $archive->add($inputfile, PCLZIP_OPT_REMOVE_PATH, dirname($inputfile));
+
+				if ($result === 0)
+				{
+					global $errormsg;
+					$errormsg=$archive->errorInfo(true);
+					dol_syslog("dol_compress_file failure - ".$errormsg, LOG_ERR);
+					if ($archive->errorCode() == PCLZIP_ERR_WRITE_OPEN_FAIL)
+					{
+						dol_syslog("dol_compress_file error PCLZIP_ERR_WRITE_OPEN_FAIL", LOG_ERR);
+						return -4;
+					}
+					return -3;
+				}
+				else
+				{
+					dol_syslog("dol_compress_file success - ".count($result)." files");
+					return 1;
+				}
 			}
 		}
 
@@ -1942,9 +2006,9 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz")
  */
 function dol_uncompress($inputfile, $outputdir)
 {
-	global $langs;
+	global $conf, $langs;
 
-	if (defined('ODTPHP_PATHTOPCLZIP'))
+	if (defined('ODTPHP_PATHTOPCLZIP') && empty($conf->global->MAIN_USE_ZIPARCHIVE_FOR_ZIP_UNCOMPRESS))
 	{
 		dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".ODTPHP_PATHTOPCLZIP.", so we use Pclzip to unzip into ".$outputdir);
 		include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
@@ -2200,10 +2264,10 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$original_file=$conf->adherent->dir_output.'/'.$original_file;
 	}
 	// Wrapping pour les apercu factures
-	elseif ($modulepart == 'apercufacture' && !empty($conf->facture->dir_output))
+	elseif ($modulepart == 'apercufacture' && !empty($conf->facture->multidir_output[$entity]))
 	{
 		if ($fuser->rights->facture->{$lire}) $accessallowed=1;
-		$original_file=$conf->facture->dir_output.'/'.$original_file;
+		$original_file=$conf->facture->multidir_output[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les apercu propal
 	elseif ($modulepart == 'apercupropal' && !empty($conf->propal->multidir_output[$entity]))
@@ -2212,10 +2276,10 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$original_file=$conf->propal->multidir_output[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les apercu commande
-	elseif ($modulepart == 'apercucommande' && !empty($conf->commande->dir_output))
+	elseif ($modulepart == 'apercucommande' && !empty($conf->commande->multidir_output[$entity]))
 	{
 		if ($fuser->rights->commande->{$lire}) $accessallowed=1;
-		$original_file=$conf->commande->dir_output.'/'.$original_file;
+		$original_file=$conf->commande->multidir_output[$entity].'/'.$original_file;
 	}
 	// Wrapping pour les apercu intervention
 	elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
@@ -2388,7 +2452,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	}
 
 	// Wrapping for third parties
-	elseif (($modulepart == 'company' || $modulepart == 'societe') && !empty($conf->societe->dir_output))
+	elseif (($modulepart == 'company' || $modulepart == 'societe' || $modulepart == 'thirdparty') && !empty($conf->societe->dir_output))
 	{
 		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
 		if ($fuser->rights->societe->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2411,13 +2475,13 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	}
 
 	// Wrapping for invoices
-	elseif (($modulepart == 'facture' || $modulepart == 'invoice') && !empty($conf->facture->dir_output))
+	elseif (($modulepart == 'facture' || $modulepart == 'invoice') && !empty($conf->facture->multidir_output[$entity]))
 	{
 		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed=1;
 		}
-		$original_file=$conf->facture->dir_output.'/'.$original_file;
+		$original_file=$conf->facture->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 	// Wrapping for mass actions
@@ -2435,15 +2499,23 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		{
 			$accessallowed=1;
 		}
-		$original_file=$conf->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		$original_file=$conf->commande->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
+    elseif ($modulepart == 'massfilesarea_sendings')
+    {
+        if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i', $original_file))
+        {
+            $accessallowed=1;
+        }
+        $original_file=$conf->expedition->dir_output.'/sending/temp/massgeneration/'.$user->id.'/'.$original_file;
+    }
 	elseif ($modulepart == 'massfilesarea_invoices')
 	{
 		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed=1;
 		}
-		$original_file=$conf->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+		$original_file=$conf->facture->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
 	elseif ($modulepart == 'massfilesarea_expensereport')
 	{
@@ -2527,13 +2599,13 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	}
 
 	// Wrapping pour les commandes
-	elseif (($modulepart == 'commande' || $modulepart == 'order') && !empty($conf->commande->dir_output))
+	elseif (($modulepart == 'commande' || $modulepart == 'order') && !empty($conf->commande->multidir_output[$entity]))
 	{
 		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed=1;
 		}
-		$original_file=$conf->commande->dir_output.'/'.$original_file;
+		$original_file=$conf->commande->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	}
 
@@ -2856,7 +2928,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		{
 			if (empty($conf->$modulepart->dir_output))	// modulepart not supported
 			{
-				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
+				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.'). The module for this modulepart value may not be activated.');
 				exit;
 			}
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e34c3e3b7b5..f267e572ee4 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5,7 +5,7 @@
  * 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@inodbox.com>
+ * Copyright (C) 2005-2019	Regis Houssin				<regis.houssin@inodbox.com>
  * Copyright (C) 2008		Raphael Bertrand (Resultic)	<raphael.bertrand@resultic.fr>
  * Copyright (C) 2010-2018	Juanjo Menent				<jmenent@2byte.es>
  * Copyright (C) 2013		Cédric Salvador				<csalvador@gpcsolutions.fr>
@@ -75,7 +75,7 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
  * 	@param	int		$shared			0=Return id of current entity only,
  * 									1=Return id of current entity + shared entities (default)
  *  @param	object	$currentobject	Current object if needed
- * 	@return	mixed				Entity id(s) to use
+ * 	@return	mixed					Entity id(s) to use ( eg. entity IN ('.getEntity(elementname).')' )
  */
 function getEntity($element, $shared = 1, $currentobject = null)
 {
@@ -95,6 +95,26 @@ function getEntity($element, $shared = 1, $currentobject = null)
 	}
 }
 
+/**
+ * 	Set entity id to use when to create an object
+ *
+ * 	@param	object	$currentobject	Current object
+ * 	@return	mixed					Entity id to use ( eg. entity = '.setEntity($object) )
+ */
+function setEntity($currentobject)
+{
+	global $conf, $mc;
+
+	if (is_object($mc))
+	{
+		return $mc->setEntity($currentobject);
+	}
+	else
+	{
+		return ((is_object($currentobject) && $currentobject->id > 0 && $currentobject->entity > 0) ? $currentobject->entity : $conf->entity);
+	}
+}
+
 /**
  * Return information about user browser
  *
@@ -796,7 +816,8 @@ function dol_size($size, $type = '')
  */
 function dol_sanitizeFileName($str, $newstr = '_', $unaccent = 1)
 {
-	$filesystem_forbidden_chars = array('<','>','/','\\','?','*','|','"','°');
+	// List of special chars for filenames are defined on page https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file
+	$filesystem_forbidden_chars = array('<', '>', '/', '\\', '?', '*', '|', '"', ':', '°');
 	return dol_string_nospecial($unaccent?dol_string_unaccent($str):$str, $newstr, $filesystem_forbidden_chars);
 }
 
@@ -974,10 +995,11 @@ function dol_strtoupper($utf8_string)
  *												On Linux   LOG_ERR=3, LOG_WARNING=4, LOG_INFO=6, LOG_DEBUG=7
  *  @param	int			$ident					1=Increase ident of 1, -1=Decrease ident of 1
  *  @param	string		$suffixinfilename		When output is a file, append this suffix into default log filename.
- *  @param	string		$restricttologhandler	Output log only for this log handler
+ *  @param	string		$restricttologhandler	Force output of log only to this log handler
+ *  @param	array|null	$logcontext				If defined, an array with extra informations (can be used by some log handlers)
  *  @return	void
  */
-function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename = '', $restricttologhandler = '')
+function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename = '', $restricttologhandler = '', $logcontext = null)
 {
     global $conf, $user, $debugbar;
 
@@ -1208,7 +1230,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 	}
 	if ($popuptab) $outmore.='</div>';
 
-	if ($displaytab > $limittoshow)
+	if ($popuptab)	// If there is some tabs not shown
 	{
 		$left=($langs->trans("DIRECTION") == 'rtl'?'right':'left');
 		$right=($langs->trans("DIRECTION") == 'rtl'?'left':'right');
@@ -2631,6 +2653,10 @@ function dol_print_ip($ip, $mode = 0)
 			}
 			else $ret.=' ('.$countrycode.')';
 		}
+		else
+		{
+			// Nothing
+		}
 	}
 
 	return $ret;
@@ -2666,12 +2692,10 @@ function dolGetCountryCodeFromIp($ip)
 	{
 		$datafile=$conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE;
 		//$ip='24.24.24.24';
-		//$datafile='E:\Mes Sites\Web\Admin1\awstats\maxmind\GeoIP.dat';    Note that this must be downloaded datafile (not same than datafile provided with ubuntu packages)
-
+		//$datafile='/usr/share/GeoIP/GeoIP.dat';    Note that this must be downloaded datafile (not same than datafile provided with ubuntu packages)
 		include_once DOL_DOCUMENT_ROOT.'/core/class/dolgeoip.class.php';
 		$geoip=new DolGeoIP('country', $datafile);
 		//print 'ip='.$ip.' databaseType='.$geoip->gi->databaseType." GEOIP_CITY_EDITION_REV1=".GEOIP_CITY_EDITION_REV1."\n";
-		//print "geoip_country_id_by_addr=".geoip_country_id_by_addr($geoip->gi,$ip)."\n";
 		$countrycode=$geoip->getCountryCodeFromIP($ip);
 	}
 
@@ -3204,7 +3228,7 @@ function img_object($titlealt, $picto, $moreatt = '', $pictoisfullpath = false,
  *	Show weather picto
  *
  *	@param      string		$titlealt         	Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
- *	@param      string		$picto       		Name of image file to show (If no extension provided, we use '.png'). Image must be stored into htdocs/theme/common directory.
+ *	@param      string|int	$picto       		Name of image file to show (If no extension provided, we use '.png'). Image must be stored into htdocs/theme/common directory. Or level of meteo image (0-4).
  *	@param		string		$moreatt			Add more attribute on img tag
  *	@param		int			$pictoisfullpath	If 1, image path is a full path
  *  @param      string      $morecss            More CSS
@@ -3215,7 +3239,13 @@ function img_weather($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $mo
 {
 	global $conf;
 
-	if (! preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';
+	if (is_numeric($picto))
+	{
+		$leveltopicto=array(0=>'weather-clear.png', 1=>'weather-few-clouds.png', 2=>'weather-clouds.png', 3=>'weather-many-clouds.png', 4=>'weather-storm.png');
+		//return '<i class="fa fa-weather-level'.$picto.'"></i>';
+		$picto = $leveltopicto[$picto];
+	}
+	elseif (! preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';
 
 	$path = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/weather/'.$picto;
 
@@ -6371,10 +6401,11 @@ function setEventMessage($mesgs, $style = 'mesgs')
  *	@param	string	$mesg			Message string
  *	@param	array	$mesgs			Message array
  *  @param  string	$style      	Which style to use ('mesgs' by default, 'warnings', 'errors')
+ *  @param	string	$messagekey		A key to be used to allow the feature "Never show this message again"
  *  @return	void
  *  @see	dol_htmloutput_events()
  */
-function setEventMessages($mesg, $mesgs, $style = 'mesgs')
+function setEventMessages($mesg, $mesgs, $style = 'mesgs', $messagekey = '')
 {
 	if (empty($mesg) && empty($mesgs))
 	{
@@ -6382,12 +6413,21 @@ function setEventMessages($mesg, $mesgs, $style = 'mesgs')
 	}
 	else
 	{
-		if (! in_array((string) $style, array('mesgs','warnings','errors'))) dol_print_error('', 'Bad parameter style='.$style.' for setEventMessages');
-		if (empty($mesgs)) setEventMessage($mesg, $style);
-		else
+		if ($messagekey)
 		{
-			if (! empty($mesg) && ! in_array($mesg, $mesgs)) setEventMessage($mesg, $style);	// Add message string if not already into array
-			setEventMessage($mesgs, $style);
+			// Complete message with a js link to set a cookie "DOLHIDEMESSAGE".$messagekey;
+			// TODO
+			$mesg.='';
+		}
+		if (empty($messagekey) || empty($_COOKIE["DOLHIDEMESSAGE".$messagekey]))
+		{
+			if (! in_array((string) $style, array('mesgs','warnings','errors'))) dol_print_error('', 'Bad parameter style='.$style.' for setEventMessages');
+			if (empty($mesgs)) setEventMessage($mesg, $style);
+			else
+			{
+				if (! empty($mesg) && ! in_array($mesg, $mesgs)) setEventMessage($mesg, $style);	// Add message string if not already into array
+				setEventMessage($mesgs, $style);
+			}
 		}
 	}
 }
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index b4c8f6bf011..c22a8da5cee 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -2199,7 +2199,7 @@ function fetchObjectByElement($element_id, $element_type, $element_ref = '')
  *  @param	array	$arraycolor			Array
  *  @param	string	$colorifnotfound	Color code to return if entry not defined or not a RGB format
  *  @return	string						RGB hex value (without # before). For example: 'FF00FF', '01FF02'
- *  @see	colorStringToArray()
+ *  @see	colorStringToArray(), colorHexToRgb()
  */
 function colorArrayToHex($arraycolor, $colorifnotfound = '888888')
 {
@@ -2216,7 +2216,7 @@ function colorArrayToHex($arraycolor, $colorifnotfound = '888888')
  *  @param	string	$stringcolor		String with hex (FFFFFF) or comma RGB ('255,255,255')
  *  @param	array	$colorifnotfound	Color code array to return if entry not defined
  *  @return	array   					RGB hex value (without # before). For example: FF00FF
- *  @see	colorArrayToHex()
+ *  @see	colorArrayToHex(), colorHexToRgb()
  */
 function colorStringToArray($stringcolor, $colorifnotfound = array(88,88,88))
 {
@@ -2233,13 +2233,12 @@ function colorStringToArray($stringcolor, $colorifnotfound = array(88,88,88))
 }
 
 /**
- * @param string $color the color you need to valid
- * @param boolean $allow_white in case of white isn't valid
+ * @param string 	$color 			the color you need to valid
+ * @param boolean 	$allow_white 	in case of white isn't valid
  * @return boolean
  */
 function colorValidateHex($color, $allow_white = true)
 {
-
     if(!$allow_white && ($color === '#fff' || $color === '#ffffff') ) return false;
 
     if(preg_match('/^#[a-f0-9]{6}$/i', $color)) //hex color is valid
@@ -2249,11 +2248,54 @@ function colorValidateHex($color, $allow_white = true)
     return false;
 }
 
+/**
+ * Change color to make it less aggressive (ratio is negative) or more aggressive (ratio is positive)
+ *
+ * @param string 		$hex		Color in hex ('#AA1122' or 'AA1122' or '#a12' or 'a12')
+ * @param integer		$ratio		Default=-50. Note: 0=Component color is unchanged, -100=Component color become 88, +100=Component color become 00 or FF
+ * @return string		New string of color
+ * @see colorAdjustBrightness()
+ */
+function colorAgressivity($hex, $ratio = -50)
+{
+	// Steps should be between -255 and 255. Negative = darker, positive = lighter
+	$ratio = max(-100, min(100, $ratio));
+
+	// Normalize into a six character long hex string
+	$hex = str_replace('#', '', $hex);
+	if (strlen($hex) == 3) {
+		$hex = str_repeat(substr($hex, 0, 1), 2).str_repeat(substr($hex, 1, 1), 2).str_repeat(substr($hex, 2, 1), 2);
+	}
+
+	// Split into three parts: R, G and B
+	$color_parts = str_split($hex, 2);
+	$return = '#';
+
+	foreach ($color_parts as $color) {
+		$color   = hexdec($color); // Convert to decimal
+		if ($ratio > 0)	// We increase aggressivity
+		{
+			if ($color > 127) $color += ((255 - $color) * ($ratio / 100));
+			if ($color < 128) $color -= ($color * ($ratio / 100));
+		}
+		else			// We decrease agressivity
+		{
+			if ($color > 128) $color -= (($color - 128) * (abs($ratio) / 100));
+			if ($color < 127) $color += ((128 - $color) * (abs($ratio) / 100));
+		}
+		$color   = max(0, min(255, $color)); // Adjust color
+		$return .= str_pad(dechex($color), 2, '0', STR_PAD_LEFT); // Make two char hex code
+	}
+
+	//var_dump($hex.' '.$ratio.' -> '.$return);
+	return $return;
+}
 
 /**
- * @param string $hex color in hex
- * @param integer $steps Steps should be between -255 and 255. Negative = darker, positive = lighter
- * @return string
+ * @param string 	$hex 		Color in hex ('#AA1122' or 'AA1122' or '#a12' or 'a12')
+ * @param integer 	$steps 		Step/offset added to each color component. It should be between -255 and 255. Negative = darker, positive = lighter
+ * @return string				New color with format '#AA1122'
+ * @see colorAgressivity()
  */
 function colorAdjustBrightness($hex, $steps)
 {
@@ -2303,10 +2345,10 @@ function colorLighten($hex, $percent)
 
 
 /**
- * @param string $hex color in hex
- * @param float $alpha 0 to 1
- * @param bool $returnArray set to 1 to return an array instead of string
- * @return string|array
+ * @param string 	$hex 			color in hex
+ * @param float 	$alpha 			0 to 1 to add alpha channel
+ * @param bool 		$returnArray	Array set to 1 to return an array instead of string
+ * @return string|array				String or array
  */
 function colorHexToRgb($hex, $alpha = false, $returnArray = false)
 {
diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index 6e276dcf8f4..5727ececb5e 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -96,7 +96,7 @@ function commande_prepare_head(Commande $object)
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($object->ref);
+	$upload_dir = $conf->commande->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.'/commande/document.php?id='.$object->id;
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index a1b93cb0280..91b2e27eeeb 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -457,6 +457,9 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				$taskstatic->progress = $lines[$i]->progress;
 				$taskstatic->fk_statut = $lines[$i]->status;
 				$taskstatic->datee = $lines[$i]->date_end;
+                $taskstatic->planned_workload= $lines[$i]->planned_workload;
+                $taskstatic->duration_effective= $lines[$i]->duration;
+
 
 				if ($showproject)
 				{
@@ -556,10 +559,15 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				print '<td class="right">';
 				if ($lines[$i]->progress != '')
 				{
-					print $lines[$i]->progress.' %';
+					print getTaskProgressBadge($taskstatic);
 				}
 				print '</td>';
 
+				// resume
+                print '<td class="right">';
+                print getTaskProgressView($taskstatic, false, false);
+                print '</td>';
+
 				if ($showbilltime)
 				{
     				// Time not billed
@@ -1943,3 +1951,164 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 		print '</table></form>';
 	}
 }
+
+/**
+ * @param   task                $task               Task            the task object
+ * @param   label               $label              bool|string     true = auto, false = dont display, string = replace output
+ * @param   progressNumber      $progressNumber     bool|string     true = auto, false = dont display, string = replace output
+ * @param   hideOnProgressNull  $hideOnProgressNull bool            hide if progress is null
+ * @param   spaced              $spaced             bool            used to add space at bottom (made by css)
+ * @return string
+ */
+function getTaskProgressView($task, $label = true, $progressNumber = true, $hideOnProgressNull = false, $spaced = false)
+{
+    global $langs, $conf;
+
+    $out = '';
+
+    $plannedworkloadoutputformat='allhourmin';
+    $timespentoutputformat='allhourmin';
+    if (! empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat=$conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
+    if (! empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat=$conf->global->PROJECT_TIME_SPENT_FORMAT;
+
+    if(empty($task->progress) && !empty($hideOnProgressNull)){
+        return '';
+    }
+
+    $spaced = !empty($spaced)?'spaced':'';
+
+    $diff = '';
+
+    // define progress color according to time spend vs workload
+    $progressBarClass = 'progress-bar-info';
+    if ($task->planned_workload){
+        $progressCalculated =  round(100 * doubleval($task->duration_effective) / doubleval($task->planned_workload), 2);
+
+        // this conf is actually hidden, by default we use 1% for "be carefull or warning"
+        $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.01;
+
+        $diffTitle = '<br/>'.$langs->trans('ProgressDeclared').' : '.$task->progress.'%';
+        $diffTitle.= '<br/>'.$langs->trans('ProgressCalculated').' : '.$progressCalculated.'%';
+
+        if($progressCalculated > doubleval($task->progress)){
+            $progressBarClass = 'progress-bar-danger';
+            $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress-$progressCalculated).'%');
+            $diff = '<span class="text-danger classfortooltip"" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-down"></i> '.($task->progress-$progressCalculated).'%</span>';
+        }
+        elseif($progressCalculated * $warningRatio >= doubleval($task->progress)){ // warning if close at 1%
+            $progressBarClass = 'progress-bar-warning';
+            $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress-$progressCalculated).'%');
+            $diff = '<span class="text-warning classfortooltip" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-left"></i> '.($task->progress-$progressCalculated).'%</span>';
+        }
+        else{
+            $progressBarClass = 'progress-bar-success';
+            $title = $langs->trans('TheReportedProgressIsMoreThanTheCalculatedProgressionByX', ($task->progress-$progressCalculated).'%');
+            $diff = '<span class="text-success classfortooltip" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-up"></i> '.($task->progress-$progressCalculated).'%</span>';
+        }
+    }
+
+    $out.= '<div class="progress-group">';
+
+    if($label !== false)
+    {
+        $out.= '    <span class="progress-text">';
+
+        if($label!==true){
+            $out.= $label; // replace label by param
+        }
+        else{
+            $out.= $task->getNomUrl(1).' '.dol_htmlentities($task->label);
+        }
+        $out.= '    </span>';
+    }
+
+
+    if($progressNumber !== false)
+    {
+        $out.= '    <span class="progress-number">';
+        if($progressNumber!==true){
+            $out.= $progressNumber; // replace label by param
+        }
+        else{
+            if ($task->hasDelay()) $out.= img_warning($langs->trans("Late")).' ';
+
+            $out.= !empty($diff) ? $diff.' ':'';
+
+            $out.= '<b title="'.$langs->trans('TimeSpent').'" >';
+            if ($task->duration_effective) $out.= convertSecondToTime($task->duration_effective, $timespentoutputformat);
+            else $out.= '--:--';
+            $out.= '</b>';
+
+            $out.= '/';
+
+            $out.= '<span title="'.$langs->trans('PlannedWorkload').'" >';
+            if ($task->planned_workload) $out.= convertSecondToTime($task->planned_workload, $plannedworkloadoutputformat);
+            else $out.= '--:--';
+        }
+        $out.= '    </span>';
+    }
+
+
+
+    $out.= '</span>';
+    $out.= '    <div class="progress sm '.$spaced.'" title="'.doubleval($task->progress).'%" >';
+    $out.= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.doubleval($task->progress).'%"></div>';
+    $out.= '    </div>';
+    $out.= '</div>';
+
+
+
+    return $out;
+}
+/**
+ * @param task      $task      Task     the task object
+ * @param label     $label     string   empty = auto (progress), string = replace output
+ * @param tooltip   $tooltip   string   empty = auto , string = replace output
+ * @return string
+ */
+function getTaskProgressBadge($task, $label = '', $tooltip = '')
+{
+    global $conf;
+
+    $out = '';
+    $badgeClass = '';
+    if ($task->progress != '')
+    {
+        // TODO : manage 100%
+
+        // define color according to time spend vs workload
+        $badgeClass = 'badge ';
+        if ($task->planned_workload){
+            $progressCalculated =  round(100 * doubleval($task->duration_effective) / doubleval($task->planned_workload), 2);
+
+            // this conf is actually hidden, by default we use 1% for "be carefull or warning"
+            $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.01;
+
+            if($progressCalculated > doubleval($task->progress)){
+                $badgeClass.= 'badge-danger';
+            }
+            elseif($progressCalculated * $warningRatio >= doubleval($task->progress)){ // warning if close at 1%
+                $badgeClass.= 'badge-warning';
+            }
+            else{
+                $badgeClass.= 'badge-success';
+            }
+        }
+    }
+
+    $title = '';
+    if(!empty($tooltip)){
+        $badgeClass.= ' classfortooltip';
+        $title = 'title="'.dol_htmlentities($tooltip).'"';
+    }
+
+    if(empty($label)){
+        $label = $task->progress.' %';
+    }
+
+    if(!empty($label)){
+        $out = '<span class="'.$badgeClass.'" '.$title.' >'.$label.'</span>';
+    }
+
+    return $out;
+}
diff --git a/htdocs/core/lib/report.lib.php b/htdocs/core/lib/report.lib.php
index 907524d5a97..ab7917362a1 100644
--- a/htdocs/core/lib/report.lib.php
+++ b/htdocs/core/lib/report.lib.php
@@ -61,7 +61,8 @@ function report_header($reportname, $notused, $period, $periodlink, $description
 	{
 		 print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 	}
-	print '<table width="100%" class="border">';
+
+	print '<table class="border tableforfield centpercent">';
 
 	$variante = ($periodlink || $exportlink);
 
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 0e0d4a37946..8520ae74cf9 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -47,9 +47,10 @@ function dol_getwebuser($mode)
  *	@param		string	$passwordtotest		Password value to test
  *	@param		string	$entitytotest		Instance of data we must check
  *	@param		array	$authmode			Array list of selected authentication mode array('http', 'dolibarr', 'xxx'...)
+ *	@param		string	$context			Context checkLoginPassEntity was created for ('api', 'dav', '')
  *  @return		string						Login or ''
  */
-function checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $authmode)
+function checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $authmode, $context = '')
 {
 	global $conf,$langs;
     //global $dolauthmode;    // To return authentication finally used
@@ -90,7 +91,7 @@ function checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $auth
     			{
     				// Call function to check user/password
     				$function='check_user_password_'.$mode;
-    				$login=call_user_func($function, $usertotest, $passwordtotest, $entitytotest);
+    				$login=call_user_func($function, $usertotest, $passwordtotest, $entitytotest, $context);
     				if ($login)	// Login is successfull
     				{
     					$test=false;            // To stop once at first login success
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 81e9c8dea73..7c97c38dd4f 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -956,6 +956,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 
 		$colorBlindOptions = array(
 			0 => $langs->trans('No'),
+			'flashy' => $langs->trans('Flashy'),
 			'protanopia' => $langs->trans('Protanopia'),
 			'deuteranopes' => $langs->trans('Deuteranopes'),
 			'tritanopes' => $langs->trans('Tritanopes'),
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 4d89210cd44..c1f3c6f9809 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -22,83 +22,6 @@
  */
 
 
-/**
- * Convert a page content to have correct links (based on DOL_URL_ROOT) into an html content.
- * Used to ouput the page on the Preview from backoffice.
- *
- * @param	Website		$website			Web site object
- * @param	string		$content			Content to replace
- * @param	int			$removephppart		0=Replace PHP sections with a PHP badge. 1=Remove completely PHP sections.
- * @param	string		$contenttype		Content type
- * @return	boolean							True if OK
- * @see dolWebsiteOutput() for function used to replace content in a web server context
- */
-function dolWebsiteReplacementOfLinks($website, $content, $removephppart = 0, $contenttype='html')
-{
-	$nbrep = 0;
-
-	dol_syslog('dolWebsiteReplacementOfLinks start (contenttype='.$contenttype." USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER')?'1':'')." USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR')?'1':'').')', LOG_DEBUG);
-
-	// Replace php code. Note $content may come from database and does not contains body tags.
-	$replacewith='...php...';
-	if ($removephppart) $replacewith='';
-	$content = preg_replace('/value="<\?php((?!\?>).)*\?>\n*/ims', 'value="'.$replacewith.'"', $content);
-
-	$replacewith='"callto=#';
-	if ($removephppart) $replacewith='';
-	$content = preg_replace('/"callto:<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
-
-	$replacewith='"mailto=#';
-	if ($removephppart) $replacewith='';
-	$content = preg_replace('/"mailto:<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
-
-	$replacewith='src="php';
-	if ($removephppart) $replacewith='';
-	$content = preg_replace('/src="<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
-
-	$replacewith='href="php';
-	if ($removephppart) $replacewith='';
-	$content = preg_replace('/href="<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
-
-	//$replacewith='<span class="phptag">...php...</span>';
-	$replacewith='<span class="phptag">...php...</span>';
-	if ($removephppart) $replacewith='';
-	//$content = preg_replace('/<\?php((?!\?toremove>).)*\?toremove>\n*/ims', $replacewith, $content);
-	/*if ($content === null) {
-		if (preg_last_error() == PREG_JIT_STACKLIMIT_ERROR) $content = 'preg_replace error (when removing php tags) PREG_JIT_STACKLIMIT_ERROR';
-	}*/
-	$content = dolStripPhpCode($content, $replacewith);
-	//var_dump($content);
-
-	// Replace relative link / with dolibarr URL
-	$content = preg_replace('/(href=")\/\"/', '\1'.DOL_URL_ROOT.'/website/index.php?website='.$website->ref.'&pageid='.$website->fk_default_home.'"', $content, -1, $nbrep);
-	// Replace relative link /xxx.php with dolibarr URL
-	$content = preg_replace('/(href=")\/?([^:\"]*)(\.php\")/', '\1'.DOL_URL_ROOT.'/website/index.php?website='.$website->ref.'&pageref=\2"', $content, -1, $nbrep);
-
-	// Fix relative link into medias with correct URL after the DOL_URL_ROOT: ../url("medias/
-	$content = preg_replace('/url\((["\']?)medias\//', 'url(\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
-	$content = preg_replace('/data-slide-bg=(["\']?)medias\//', 'data-slide-bg=\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
-
-	// <img src="medias/image.png... => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png...
-	$content = preg_replace('/(<img[^>]*src=")(medias\/)/', '\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
-	// <img src="image.png... => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png...
-	$content = preg_replace('/(<img[^>]*src=")(?!(http|\/?viewimage|'.preg_quote(DOL_URL_ROOT, '/').'\/viewimage))/', '\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
-	// <img src="viewimage.php/modulepart=medias&file=image.png" => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png"
-	$content = preg_replace('/(<img[^>]*src=")(\/?viewimage\.php)/', '\1'.DOL_URL_ROOT.'/viewimage.php', $content, -1, $nbrep);
-
-	// action="newpage.php" => action="dolibarr/website/index.php?website=...&pageref=newpage
-	$content = preg_replace('/(action=")\/?([^:\"]*)(\.php\")/', '\1'.DOL_URL_ROOT.'/website/index.php?website='.$website->ref.'&pageref=\2"', $content, -1, $nbrep);
-
-	// Fix relative link /document.php with correct URL after the DOL_URL_ROOT:  ...href="/document.php?modulepart="
-	$content=preg_replace('/(href=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
-	$content=preg_replace('/(src=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
-
-	dol_syslog('dolWebsiteReplacementOfLinks end', LOG_DEBUG);
-
-	return $content;
-}
-
-
 /**
  * Remove PHP code part from a string.
  *
@@ -124,14 +47,15 @@ function dolStripPhpCode($str, $replacewith = '')
 				$newstr .= $part;
 				continue;
 			}
-			//split on closing tag
+			// The second part is the php code. We split on closing tag
 			$partlings = explode('?>', $part);
 			if (!empty($partlings))
 			{
+				$phppart = $partlings[0];
 				//remove content before closing tag
-				if (count($partlings) > 1) $partlings[0] = '';
+				if (count($partlings) > 1) $partlings[0] = '';	// Todo why a count > 1 and not >= 1 ?
 				//append to out string
-				$newstr .= $replacewith.implode('', $partlings);
+				$newstr .= '<span class="phptag">'.$replacewith.'<!-- '.$phppart.' --></span>'.implode('', $partlings);
 			}
 		}
 	}
@@ -147,34 +71,136 @@ function dolStripPhpCode($str, $replacewith = '')
  */
 function dolKeepOnlyPhpCode($str)
 {
-    $newstr = '';
+	$newstr = '';
 
-    //split on each opening tag
-    $parts = explode('<?php', $str);
-    if (!empty($parts))
-    {
-        $i=0;
-        foreach($parts as $part)
-        {
-            if ($i == 0) 	// The first part is never php code
-            {
-                $i++;
-                continue;
-            }
-            $newstr.='<?php';
-            //split on closing tag
-            $partlings = explode('?>', $part, 2);
-            if (!empty($partlings))
-            {
-                $newstr .= $partlings[0].'?>';
-            }
-            else
-            {
-                $newstr .= $part.'?>';
-            }
-        }
-    }
-    return $newstr;
+	//split on each opening tag
+	$parts = explode('<?php', $str);
+	if (!empty($parts))
+	{
+		$i=0;
+		foreach($parts as $part)
+		{
+			if ($i == 0) 	// The first part is never php code
+			{
+				$i++;
+				continue;
+			}
+			$newstr.='<?php';
+			//split on closing tag
+			$partlings = explode('?>', $part, 2);
+			if (!empty($partlings))
+			{
+				$newstr .= $partlings[0].'?>';
+			}
+			else
+			{
+				$newstr .= $part.'?>';
+			}
+		}
+	}
+	return $newstr;
+}
+
+/**
+ * Convert a page content to have correct links (based on DOL_URL_ROOT) into an html content. It replaces also dynamic content with '...php...'
+ * Used to ouput the page on the Preview from backoffice.
+ *
+ * @param	Website		$website			Web site object
+ * @param	string		$content			Content to replace
+ * @param	int			$removephppart		0=Replace PHP sections with a PHP badge. 1=Remove completely PHP sections.
+ * @param	string		$contenttype		Content type
+ * @param	int			$containerid 		Contenair id
+ * @return	boolean							True if OK
+ * @see dolWebsiteOutput() for function used to replace content in a web server context
+ */
+function dolWebsiteReplacementOfLinks($website, $content, $removephppart = 0, $contenttype = 'html', $containerid = '')
+{
+	$nbrep = 0;
+
+	dol_syslog('dolWebsiteReplacementOfLinks start (contenttype='.$contenttype." containerid=".$containerid." USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR')?'1':'')." USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER')?'1':'').')', LOG_DEBUG);
+	//if ($contenttype == 'html') { print $content;exit; }
+
+	// Replace php code. Note $content may come from database and does not contains body tags.
+	$replacewith='...php...';
+	if ($removephppart) $replacewith='';
+	$content = preg_replace('/value="<\?php((?!\?>).)*\?>\n*/ims', 'value="'.$replacewith.'"', $content);
+
+	$replacewith='"callto=#';
+	if ($removephppart) $replacewith='';
+	$content = preg_replace('/"callto:<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
+
+	$replacewith='"mailto=#';
+	if ($removephppart) $replacewith='';
+	$content = preg_replace('/"mailto:<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
+
+	$replacewith='src="php';
+	if ($removephppart) $replacewith='';
+	$content = preg_replace('/src="<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
+
+	$replacewith='href="php';
+	if ($removephppart) $replacewith='';
+	$content = preg_replace('/href="<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
+
+	//$replacewith='<span class="phptag">...php...</span>';
+	$replacewith='...php...';
+	if ($removephppart) $replacewith='';
+	//$content = preg_replace('/<\?php((?!\?toremove>).)*\?toremove>\n*/ims', $replacewith, $content);
+	/*if ($content === null) {
+		if (preg_last_error() == PREG_JIT_STACKLIMIT_ERROR) $content = 'preg_replace error (when removing php tags) PREG_JIT_STACKLIMIT_ERROR';
+	}*/
+	$content = dolStripPhpCode($content, $replacewith);
+	//var_dump($content);
+
+	// Protect the link styles.css.php to any replacement that we make after.
+	$content = str_replace('href="styles.css.php', 'href="!~!~!~styles.css.php', $content);
+	$content = str_replace('href="http', 'href="!~!~!~http', $content);
+	$content = str_replace('href="//', 'href="!~!~!~//', $content);
+	$content = str_replace('src="viewimage.php', 'src="!~!~!~/viewimage.php', $content);
+	$content = str_replace('src="/viewimage.php', 'src="!~!~!~/viewimage.php', $content);
+	$content = str_replace('src="'.DOL_URL_ROOT.'/viewimage.php', 'src="!~!~!~'.DOL_URL_ROOT.'/viewimage.php', $content);
+	$content = str_replace('href="document.php', 'href="!~!~!~/document.php', $content);
+	$content = str_replace('href="/document.php', 'href="!~!~!~/document.php', $content);
+	$content = str_replace('href="'.DOL_URL_ROOT.'/document.php', 'href="!~!~!~'.DOL_URL_ROOT.'/document.php', $content);
+
+	// Replace relative link '/' with dolibarr URL
+	$content = preg_replace('/(href=")\/\"/', '\1!~!~!~'.DOL_URL_ROOT.'/website/index.php?website='.$website->ref.'&pageid='.$website->fk_default_home.'"', $content, -1, $nbrep);
+	// Replace relative link /xxx.php#aaa or /xxx.php with dolibarr URL (we discard param ?...)
+	$content = preg_replace('/(href=")\/?([^:\"\!]*)\.php(#[^\"<>]*)?\"/', '\1!~!~!~'.DOL_URL_ROOT.'/website/index.php?website='.$website->ref.'&pageref=\2\3"', $content, -1, $nbrep);
+	// Replace relative link /xxx.php?a=b&c=d#aaa or /xxx.php?a=b&c=d with dolibarr URL
+	$content = preg_replace('/(href=")\/?([^:\"\!]*)\.php\?([^#\"<>]*)(#[^\"<>]*)?\"/', '\1!~!~!~'.DOL_URL_ROOT.'/website/index.php?website='.$website->ref.'&pageref=\2&\3\4"', $content, -1, $nbrep);
+
+	// Fix relative link into medias with correct URL after the DOL_URL_ROOT: ../url("medias/
+	$content = preg_replace('/url\((["\']?)medias\//', 'url(\1!~!~!~'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
+	$content = preg_replace('/data-slide-bg=(["\']?)medias\//', 'data-slide-bg=\1!~!~!~'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
+
+	// <img src="medias/...image.png... => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png...
+	// <img src="...image.png... => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png...
+	$content = preg_replace('/(<img[^>]*src=")\/?medias\//', '\1!~!~!~'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
+	// <img src="image.png... => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png...
+	$content = preg_replace('/(<img[^>]*src=")\/?([^:\"\!]+)\"/', '\1!~!~!~'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=\2"', $content, -1, $nbrep);
+	// <img src="viewimage.php/modulepart=medias&file=image.png" => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png"
+	$content = preg_replace('/(<img[^>]*src=")(\/?viewimage\.php)/', '\1!~!~!~'.DOL_URL_ROOT.'/viewimage.php', $content, -1, $nbrep);
+
+	// action="newpage.php" => action="dolibarr/website/index.php?website=...&pageref=newpage
+	$content = preg_replace('/(action=")\/?([^:\"]*)(\.php\")/', '\1!~!~!~'.DOL_URL_ROOT.'/website/index.php?website='.$website->ref.'&pageref=\2"', $content, -1, $nbrep);
+
+	// Fix relative link /document.php with correct URL after the DOL_URL_ROOT:  ...href="/document.php?modulepart="
+	$content=preg_replace('/(href=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1!~!~!~'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
+	$content=preg_replace('/(src=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1!~!~!~'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
+
+	// Fix relative link /viewimage.php with correct URL after the DOL_URL_ROOT:  ...href="/viewimage.php?modulepart="
+	$content=preg_replace('/(url\(")(\/?viewimage\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1!~!~!~'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
+
+	// Fix relative URL
+	$content = str_replace('src="!~!~!~/viewimage.php', 'src="!~!~!~'.DOL_URL_ROOT.'/viewimage.php', $content);
+	$content = str_replace('href="!~!~!~/document.php', 'href="!~!~!~'.DOL_URL_ROOT.'/document.php', $content);
+	// Remove the protection tag !~!~!~
+	$content = str_replace('!~!~!~', '', $content);
+
+	dol_syslog('dolWebsiteReplacementOfLinks end', LOG_DEBUG);
+	//if ($contenttype == 'html') { print $content;exit; }
+
+	return $content;
 }
 
 /**
@@ -185,14 +211,14 @@ function dolKeepOnlyPhpCode($str)
  * @param	string	$contenttype	Content type
  * @param	int		$containerid 	Contenair id
  * @return  void
- * @see	dolWebsiteReplacementOfLinks()  for function used to replace content in the backoffice context when USEDOLIBARREDITOR is not on
+ * @see	dolWebsiteReplacementOfLinks()  for function used to replace content in the backoffice context.
  */
-function dolWebsiteOutput($content, $contenttype='html', $containerid='')
+function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
 {
 	global $db, $langs, $conf, $user;
 	global $dolibarr_main_url_root, $dolibarr_main_data_root;
 
-	dol_syslog("dolWebsiteOutput start (contenttype=".$contenttype." containerid=".$containerid." USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER')?'1':'')." USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR')?'1':'').')');
+	dol_syslog("dolWebsiteOutput start (contenttype=".$contenttype." containerid=".$containerid." USEDOLIBARREDITOR=".(defined('USEDOLIBARREDITOR')?'1':'')." USEDOLIBARRSERVER=".(defined('USEDOLIBARRSERVER')?'1':'').')');
 
 	// Define $urlwithroot
 	$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -213,35 +239,55 @@ function dolWebsiteOutput($content, $contenttype='html', $containerid='')
 	{
 		global $website;
 
+		// Protect the link styles.css.php to any replacement that we make after.
+		$content = str_replace('href="styles.css.php', 'href="!~!~!~styles.css.php', $content);
+		$content = str_replace('href="http', 'href="!~!~!~http', $content);
+		$content = str_replace('href="//', 'href="!~!~!~//', $content);
+		$content = str_replace('src="viewimage.php', 'src="!~!~!~/viewimage.php', $content);
+		$content = str_replace('src="/viewimage.php', 'src="!~!~!~/viewimage.php', $content);
+		$content = str_replace('src="'.DOL_URL_ROOT.'/viewimage.php', 'src="!~!~!~'.DOL_URL_ROOT.'/viewimage.php', $content);
+		$content = str_replace('href="document.php', 'href="!~!~!~/document.php', $content);
+		$content = str_replace('href="/document.php', 'href="!~!~!~/document.php', $content);
+		$content = str_replace('href="'.DOL_URL_ROOT.'/document.php', 'href="!~!~!~'.DOL_URL_ROOT.'/document.php', $content);
+
 		// Replace relative link / with dolibarr URL:  ...href="/"...
-		$content=preg_replace('/(href=")\/\"/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'"', $content, -1, $nbrep);
-		// Replace relative link /xxx.php with dolibarr URL:  ...href="....php"
-		$content=preg_replace('/(href=")\/?([^:\"]*)(\.php\")/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2"', $content, -1, $nbrep);
-		// Replace relative link /xxx with dolibarr URL:  ...href="....php"
-		$content=preg_replace('/(href=")\/?([a-zA-Z0-9\-]+)(\")/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2\3', $content, -1, $nbrep);
-		$content=preg_replace('/(href=")\/?([a-zA-Z0-9\-]+)(\?)/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2\3', $content, -1, $nbrep);
+		$content = preg_replace('/(href=")\/\"/', '\1!~!~!~'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'"', $content, -1, $nbrep);
+		// Replace relative link /xxx.php#aaa or /xxx.php with dolibarr URL:  ...href="....php" (we discard param ?...)
+		$content = preg_replace('/(href=")\/?([^:\"\!]*)\.php(#[^\"<>]*)?\"/', '\1!~!~!~'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2\3"', $content, -1, $nbrep);
+		// Replace relative link /xxx.php?a=b&c=d#aaa or /xxx.php?a=b&c=d with dolibarr URL
+		$content = preg_replace('/(href=")\/?([^:\"\!]*)\.php\?([^#\"<>]*)(#[^\"<>]*)?\"/', '\1!~!~!~'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2&\3\4"', $content, -1, $nbrep);
+		// Replace relative link without .php like /xxx#aaa or /xxx with dolibarr URL:  ...href="....php"
+		$content = preg_replace('/(href=")\/?([a-zA-Z0-9\-_#]+)(\"|\?)/', '\1!~!~!~'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2\3', $content, -1, $nbrep);
 
 		// Fix relative link /document.php with correct URL after the DOL_URL_ROOT:  href="/document.php?modulepart=" => href="/dolibarr/document.php?modulepart="
-		$content=preg_replace('/(href=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
-		$content=preg_replace('/(src=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
+		$content = preg_replace('/(href=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1!~!~!~'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
+		$content = preg_replace('/(src=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1!~!~!~'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
 
 		// Fix relative link /viewimage.php with correct URL after the DOL_URL_ROOT: href="/viewimage.php?modulepart=" => href="/dolibarr/viewimage.php?modulepart="
-		$content=preg_replace('/(href=")(\/?viewimage\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
-		$content=preg_replace('/(src=")(\/?viewimage\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
+		$content = preg_replace('/(href=")(\/?viewimage\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1!~!~!~'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
+		$content = preg_replace('/(src=")(\/?viewimage\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1!~!~!~'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
+		$content = preg_replace('/(url\(")(\/?viewimage\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1!~!~!~'.DOL_URL_ROOT.'\2\3', $content, -1, $nbrep);
 
 		// Fix relative link into medias with correct URL after the DOL_URL_ROOT: ../url("medias/
-		$content=preg_replace('/url\((["\']?)medias\//', 'url(\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
-		$content=preg_replace('/data-slide-bg=(["\']?)medias\//', 'data-slide-bg=\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
+		$content = preg_replace('/url\((["\']?)medias\//', 'url(\1!~!~!~'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
+		$content = preg_replace('/data-slide-bg=(["\']?)medias\//', 'data-slide-bg=\1!~!~!~'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
 
-		// <img src="medias/image.png... => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png...
-		$content = preg_replace('/(<img[^>]*src=")(medias\/)/', '\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
+		// <img src="medias/...image.png... => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png...
+		// <img src="...image.png... => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png...
+		$content = preg_replace('/(<img[^>]*src=")\/?medias\//', '\1!~!~!~'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
 		// <img src="image.png... => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png...
-		$content = preg_replace('/(<img[^>]*src=")(?!(http|\/?viewimage|'.preg_quote(DOL_URL_ROOT, '/').'\/viewimage))/', '\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $content, -1, $nbrep);
+		$content = preg_replace('/(<img[^>]*src=")\/?([^:\"\!]+)\"/', '\1!~!~!~'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=\2"', $content, -1, $nbrep);
 		// <img src="viewimage.php/modulepart=medias&file=image.png" => <img src="dolibarr/viewimage.php/modulepart=medias&file=image.png"
-		$content = preg_replace('/(<img[^>]*src=")(\/?viewimage\.php)/', '\1'.DOL_URL_ROOT.'/viewimage.php', $content, -1, $nbrep);
+		$content = preg_replace('/(<img[^>]*src=")(\/?viewimage\.php)/', '\1!~!~!~'.DOL_URL_ROOT.'/viewimage.php', $content, -1, $nbrep);
 
 		// action="newpage.php" => action="dolibarr/website/index.php?website=...&pageref=newpage
-		$content = preg_replace('/(action=")\/?([^:\"]*)(\.php\")/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2"', $content, -1, $nbrep);
+		$content = preg_replace('/(action=")\/?([^:\"]*)(\.php\")/', '\1!~!~!~'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2"', $content, -1, $nbrep);
+
+		// Fix relative URL
+		$content = str_replace('src="!~!~!~/viewimage.php', 'src="!~!~!~'.DOL_URL_ROOT.'/viewimage.php', $content);
+		$content = str_replace('href="!~!~!~/document.php', 'href="!~!~!~'.DOL_URL_ROOT.'/document.php', $content);
+		// Remove the protection tag !~!~!~
+		$content = str_replace('!~!~!~', '', $content);
 	}
 	else									// REPLACEMENT OF LINKS When page called from virtual host
 	{
@@ -254,7 +300,12 @@ function dolWebsiteOutput($content, $contenttype='html', $containerid='')
 		$nbrep=0;
 		if (! $symlinktomediaexists)
 		{
-			$content=preg_replace('/(<script[^>]*src=")[^\"]*document\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\wrapper.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
+			// <img src="image.png... => <img src="medias/image.png...
+			$content=preg_replace('/(<img[^>]*src=")\/?image\//', '\1/wrapper.php?modulepart=medias&file=medias/image/', $content, -1, $nbrep);
+			$content=preg_replace('/(url\(["\']?)\/?image\//', '\1/wrapper.php?modulepart=medias&file=medias/image/', $content, -1, $nbrep);
+
+			$content=preg_replace('/(<script[^>]*src=")[^\"]*document\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
+			$content=preg_replace('/(<a[^>]*href=")[^\"]*document\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
 
 			$content=preg_replace('/(<a[^>]*href=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
 			$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep);
@@ -265,20 +316,33 @@ function dolWebsiteOutput($content, $contenttype='html', $containerid='')
 			$content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)hashp=([^\)]*)(["\']?\))/', '\1/wrapper.php\2hashp\3\4', $content, -1, $nbrep);
 
 			$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=mycompany([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=mycompany\3file=\4\5', $content, -1, $nbrep);
+
+			// If some links to documents or viewimage remains, we replace with wrapper
+			$content=preg_replace('/(<img[^>]*src=")\/?viewimage\.php/', '\1/wrapper.php', $content, -1, $nbrep);
+			$content=preg_replace('/(<a[^>]*href=")\/?documents\.php/', '\1/wrapper.php', $content, -1, $nbrep);
 		}
 		else
 		{
-			$content=preg_replace('/(<script[^>]*src=")[^\"]*document\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1medias/\4\5', $content, -1, $nbrep);
+			// <img src="image.png... => <img src="medias/image.png...
+			$content=preg_replace('/(<img[^>]*src=")\/?image\//', '\1/medias/image/', $content, -1, $nbrep);
+			$content=preg_replace('/(url\(["\']?)\/?image\//', '\1/medias/image/', $content, -1, $nbrep);
 
-			$content=preg_replace('/(<a[^>]*href=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1medias/\4\5', $content, -1, $nbrep);
-			$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1medias/\4\5', $content, -1, $nbrep);
-			$content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)modulepart=medias([^\)]*)file=([^\)]*)(["\']?\))/', '\1medias/\4\5', $content, -1, $nbrep);
+			$content=preg_replace('/(<script[^>]*src=")[^\"]*document\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/medias/\4\5', $content, -1, $nbrep);
+			$content=preg_replace('/(<a[^>]*href=")[^\"]*document\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/medias/\4\5', $content, -1, $nbrep);
+
+			$content=preg_replace('/(<a[^>]*href=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/medias/\4\5', $content, -1, $nbrep);
+			$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/medias/\4\5', $content, -1, $nbrep);
+			$content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)modulepart=medias([^\)]*)file=([^\)]*)(["\']?\))/', '\1/medias/\4\5', $content, -1, $nbrep);
 
 			$content=preg_replace('/(<a[^>]*href=")[^\"]*viewimage\.php([^\"]*)hashp=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2hashp=\3\4', $content, -1, $nbrep);
 			$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)hashp=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2hashp=\3\4', $content, -1, $nbrep);
 			$content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)hashp=([^\)]*)(["\']?\))/', '\1/wrapper.php\2hashp=\3\4', $content, -1, $nbrep);
 
 			$content=preg_replace('/(<img[^>]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=mycompany([^\"]*)file=([^\"]*)("[^>]*>)/', '\1/wrapper.php\2modulepart=mycompany\3file=\4\5', $content, -1, $nbrep);
+
+			// If some links to documents or viewimage remains, we replace with wrapper
+			$content=preg_replace('/(<img[^>]*src=")\/?viewimage\.php/', '\1/wrapper.php', $content, -1, $nbrep);
+			$content=preg_replace('/(<a[^>]*href=")\/?document\.php/', '\1/wrapper.php', $content, -1, $nbrep);
 		}
 	}
 
@@ -351,9 +415,11 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 
 	if (defined('USEDOLIBARREDITOR'))
 	{
-		print '<div class="margintoponly marginleftonly">';
+		/*print '<div class="margintoponly marginleftonly">';
 		print "This page contains dynamic code that make a redirect to '".$containerref."' in your current context. Redirect has been canceled as it is not supported in edition mode.";
-		print '</div>';
+		print '</div>';*/
+		$text = "This page contains dynamic code that make a redirect to '".$containerref."' in your current context. Redirect has been canceled as it is not supported in edition mode.";
+		setEventMessages($text, null, 'warnings', 'WEBSITEREDIRECTDISABLED'.$containerref);
 		return;
 	}
 
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 53f9e5f11c9..1d4f1fdb37f 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -61,7 +61,7 @@ function dolSavePageAlias($filealias, $object, $objectpage)
 	global $conf;
 
 	// Now create the .tpl file (duplicate code with actions updatesource or updatecontent but we need this to save new header)
-	dol_syslog("We regenerate the alias page filealias=".$filealias);
+	dol_syslog("dolSavePageAlias We regenerate the alias page filealias=".$filealias);
 
 	$aliascontent = '<?php'."\n";
 	$aliascontent.= "// File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page\n";
@@ -113,7 +113,7 @@ function dolSavePageContent($filetpl, $object, $objectpage)
 	$tplcontent.= '<html'.($shortlangcode ? ' lang="'.$shortlangcode.'"':'').'>'."\n";
 	$tplcontent.= '<head>'."\n";
 	$tplcontent.= '<title>'.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').'</title>'."\n";
-	$tplcontent.= '<meta charset="UTF-8">'."\n";
+	$tplcontent.= '<meta charset="utf-8">'."\n";
 	$tplcontent.= '<meta http-equiv="content-type" content="text/html; charset=utf-8" />'."\n";
 	$tplcontent.= '<meta name="robots" content="index, follow" />'."\n";
 	$tplcontent.= '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";
@@ -214,13 +214,7 @@ function dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent)
 	if (! empty($conf->global->MAIN_UMASK))
 		@chmod($filehtmlheader, octdec($conf->global->MAIN_UMASK));
 
-		if (! $result)
-		{
-			setEventMessages('Failed to write file '.$filehtmlheader, null, 'errors');
-			return false;
-		}
-
-		return true;
+	return $result;
 }
 
 /**
@@ -241,13 +235,7 @@ function dolSaveCssFile($filecss, $csscontent)
 	if (! empty($conf->global->MAIN_UMASK))
 		@chmod($filecss, octdec($conf->global->MAIN_UMASK));
 
-		if (! $result)
-		{
-			setEventMessages('Failed to write file '.$filecss, null, 'errors');
-			return false;
-		}
-
-		return true;
+	return $result;
 }
 
 /**
@@ -268,13 +256,7 @@ function dolSaveJsFile($filejs, $jscontent)
 	if (! empty($conf->global->MAIN_UMASK))
 		@chmod($filejs, octdec($conf->global->MAIN_UMASK));
 
-		if (! $result)
-		{
-			setEventMessages('Failed to write file '.$filejs, null, 'errors');
-			return false;
-		}
-
-		return true;
+	return $result;
 }
 
 /**
@@ -295,13 +277,7 @@ function dolSaveRobotFile($filerobot, $robotcontent)
 	if (! empty($conf->global->MAIN_UMASK))
 		@chmod($filerobot, octdec($conf->global->MAIN_UMASK));
 
-		if (! $result)
-		{
-			setEventMessages('Failed to write file '.$filerobot, null, 'errors');
-			return false;
-		}
-
-		return true;
+	return $result;
 }
 
 /**
@@ -322,13 +298,7 @@ function dolSaveHtaccessFile($filehtaccess, $htaccess)
 	if (! empty($conf->global->MAIN_UMASK))
 		@chmod($filehtaccess, octdec($conf->global->MAIN_UMASK));
 
-		if (! $result)
-		{
-			setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
-			return false;
-		}
-
-		return true;
+	return $result;
 }
 
 /**
@@ -349,19 +319,33 @@ function dolSaveManifestJson($file, $content)
 	if (! empty($conf->global->MAIN_UMASK))
 		@chmod($file, octdec($conf->global->MAIN_UMASK));
 
-		if (! $result)
-		{
-			setEventMessages('Failed to write file '.$file, null, 'errors');
-			return false;
-		}
+	return $result;
+}
 
-		return true;
+/**
+ * Save content of a page on disk
+ *
+ * @param	string		$file				Full path of filename to generate
+ * @param	string		$content			Content of file
+ * @return	boolean							True if OK
+ */
+function dolSaveReadme($file, $content)
+{
+	global $conf, $pathofwebsite;
+
+	dol_syslog("Save README.md file into ".$file);
+
+	dol_mkdir($pathofwebsite);
+	$result = file_put_contents($file, $content);
+	if (! empty($conf->global->MAIN_UMASK))
+		@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+		return $result;
 }
 
 
-
 /**
- * 	Show list of themes. Show all thumbs of themes
+ * 	Show list of themes. Show all thumbs of themes/skins
  *
  *	@param	Website		$website		Object website to load the tempalte into
  * 	@return	void
@@ -433,11 +417,25 @@ function showWebsiteTemplates(Website $website)
 
 						print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
 
-						$file=$dirtheme."/".$subdirwithoutzip.".jpg";
+						$file = $dirtheme."/".$subdirwithoutzip.".jpg";
 						$url=DOL_URL_ROOT.'/viewimage.php?modulepart=doctemplateswebsite&file='.$subdirwithoutzip.".jpg";
 
 						if (! file_exists($file)) $url=DOL_URL_ROOT.'/public/theme/common/nophoto.png';
-						print '<img src="'.$url.'" border="0" width="80" height="60" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
+
+						$originalfile = basename($file);
+						$entity = $conf->entity;
+						$modulepart = 'doctemplateswebsite';
+						$cache = '';
+						$title = $file;
+
+						$ret='';
+						$urladvanced=getAdvancedPreviewUrl($modulepart, $originalfile, 1, '&entity='.$entity);
+						if (! empty($urladvanced)) $ret.='<a class="'.$urladvanced['css'].'" target="'.$urladvanced['target'].'" mime="'.$urladvanced['mime'].'" href="'.$urladvanced['url'].'">';
+						else $ret.='<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
+						print $ret;
+						print '<img class="websiteskinthumb shadow" src="'.$url.'" border="0" width="80" height="60" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
+						print '</a>';
+
 						print '<br>';
 						print $subdir.' ('.dol_print_size(dol_filesize($dirtheme."/".$subdir), 1, 1).')';
 						print '<br><a href="'.$_SERVER["PHP_SELF"].'?action=importsiteconfirm&website='.$website->ref.'&templateuserfile='.$subdir.'" class="button">'.$langs->trans("Load").'</a>';
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 4596afc0bcf..e2e977b1321 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1330,7 +1330,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
             if (! empty($conf->comptabilite->enabled))
             {
             	// Files
-            	if (! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 1)
+            	if ((! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 1) || ! empty($conf->global->ACCOUNTANCY_SHOW_EXPORT_FILES_MENU))
             	{
             		$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'files');
             	}
diff --git a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
index f2ef19ca19a..71866464084 100644
--- a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
+++ b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
@@ -376,7 +376,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		}
 	}
 
-
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show footer of page. Need this->emetteur object
      *
@@ -386,7 +386,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 	 *  @param	int			$hidefreetext		1=Hide free text
 	 *  @return	void
 	 */
-	private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 5685a839314..eced22d03d8 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -244,7 +244,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				}
 			}
 
-			$dir = $conf->commande->dir_output;
+			$dir = $conf->commande->multidir_output[$object->entity];
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (! preg_match('/specimen/i', $objectref)) $dir.= "/" . $objectref;
 			$file = $dir . "/" . $objectref . ".odt";
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 1dff7d5050b..f74291ecac9 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -239,13 +239,13 @@ class pdf_einstein extends ModelePDFCommandes
             // Definition of $dir and $file
 			if ($object->specimen)
 			{
-				$dir = $conf->commande->dir_output;
+				$dir = $conf->commande->multidir_output[$conf->entity];
 				$file = $dir . "/SPECIMEN.pdf";
 			}
 			else
 			{
 				$objectref = dol_sanitizeFileName($object->ref);
-				$dir = $conf->commande->dir_output . "/" . $objectref;
+				$dir = $conf->commande->multidir_output[$object->entity] . "/" . $objectref;
 				$file = $dir . "/" . $objectref . ".pdf";
 			}
 
@@ -290,7 +290,7 @@ class pdf_einstein extends ModelePDFCommandes
                 // Set path to the background PDF File
                 if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
-                    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+                	$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
                 }
 
@@ -648,6 +648,7 @@ class pdf_einstein extends ModelePDFCommandes
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Show payments table
@@ -658,12 +659,12 @@ class pdf_einstein extends ModelePDFCommandes
 	 *	@param	Translate	$outputlangs	Object langs for output
 	 *	@return int							<0 if KO, >0 if OK
 	 */
-	private function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
+	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
         // phpcs:enable
 	}
 
-
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *   Show miscellaneous information (payment mode, payment term, ...)
@@ -674,7 +675,7 @@ class pdf_einstein extends ModelePDFCommandes
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @return	void
 	 */
-	private function _tableau_info(&$pdf, $object, $posy, $outputlangs)
+	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
@@ -850,7 +851,7 @@ class pdf_einstein extends ModelePDFCommandes
 		return $posy;
 	}
 
-
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show total to pay
@@ -862,7 +863,7 @@ class pdf_einstein extends ModelePDFCommandes
 	 *	@param	Translate	$outputlangs	Objet langs
 	 *	@return int							Position pour suite
 	 */
-	private function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
         // phpcs:enable
 	    global $conf,$mysoc;
@@ -1112,6 +1113,7 @@ class pdf_einstein extends ModelePDFCommandes
 		return ($tab2_top + ($tab2_hl * $index));
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show table for lines
 	 *
@@ -1125,7 +1127,7 @@ class pdf_einstein extends ModelePDFCommandes
 	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
 		global $conf;
 
@@ -1258,7 +1260,7 @@ class pdf_einstein extends ModelePDFCommandes
 		// Logo
 		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
 		{
-			$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
+			$logo=$conf->mycompany->multidir_output[$object->entity].'/logos/'.$this->emetteur->logo;
 			if ($this->emetteur->logo)
 			{
 				if (is_readable($logo))
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 4ca0cf36391..afe1213fa23 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -281,13 +281,13 @@ class pdf_eratosthene extends ModelePDFCommandes
             // Definition of $dir and $file
 			if ($object->specimen)
 			{
-				$dir = $conf->commande->dir_output;
+				$dir = $conf->commande->multidir_output[$conf->entity];
 				$file = $dir . "/SPECIMEN.pdf";
 			}
 			else
 			{
 				$objectref = dol_sanitizeFileName($object->ref);
-				$dir = $conf->commande->dir_output . "/" . $objectref;
+				$dir = $conf->commande->multidir_output[$object->entity] . "/" . $objectref;
 				$file = $dir . "/" . $objectref . ".pdf";
 			}
 
@@ -331,7 +331,7 @@ class pdf_eratosthene extends ModelePDFCommandes
                 // Set path to the background PDF File
                 if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
-                    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+                	$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
                 }
 
@@ -855,7 +855,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 	 *	@param	Translate	$outputlangs	Object langs for output
 	 *	@return int							<0 if KO, >0 if OK
 	 */
-	private function drawPaymentsTable(&$pdf, $object, $posy, $outputlangs)
+	protected function drawPaymentsTable(&$pdf, $object, $posy, $outputlangs)
 	{
 	}
 
@@ -868,7 +868,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @return	void
 	 */
-	private function drawInfoTable(&$pdf, $object, $posy, $outputlangs)
+	protected function drawInfoTable(&$pdf, $object, $posy, $outputlangs)
 	{
 		global $conf;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1054,7 +1054,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 	 *	@param	Translate	$outputlangs	Objet langs
 	 *	@return int							Position pour suite
 	 */
-	private function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	protected function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
 	    global $conf,$mysoc;
 
@@ -1300,6 +1300,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		return ($tab2_top + ($tab2_hl * $index));
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show table for lines
 	 *
@@ -1313,7 +1314,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
 		global $conf;
 
@@ -1393,7 +1394,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		// Logo
 		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
 		{
-			$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
+			$logo=$conf->mycompany->multidir_output[$object->entity].'/logos/'.$this->emetteur->logo;
 			if ($this->emetteur->logo)
 			{
 				if (is_readable($logo))
diff --git a/htdocs/core/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php
index 28d488eb6fb..160a07635f4 100644
--- a/htdocs/core/modules/commande/mod_commande_marbre.php
+++ b/htdocs/core/modules/commande/mod_commande_marbre.php
@@ -121,7 +121,7 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql.= " FROM ".MAIN_DB_PREFIX."commande";
 		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql.= " AND entity IN (".getEntity('ordernumber', 1, $object).")";
 
 		$resql=$db->query($sql);
 		if ($resql)
diff --git a/htdocs/core/modules/commande/mod_commande_saphir.php b/htdocs/core/modules/commande/mod_commande_saphir.php
index 892a279cbe8..4f9931f35e9 100644
--- a/htdocs/core/modules/commande/mod_commande_saphir.php
+++ b/htdocs/core/modules/commande/mod_commande_saphir.php
@@ -137,9 +137,12 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 			return 0;
 		}
 
+		// Get entities
+		$entity = getEntity('ordernumber', 1, $object);
+
 		$date = ($object->date_commande ? $object->date_commande : $object->date);
 
-		$numFinal=get_next_value($db, $mask, 'commande', 'ref', '', $objsoc, $date);
+		$numFinal=get_next_value($db, $mask, 'commande', 'ref', '', $objsoc, $date, 'next', false, null, $entity);
 
 		return  $numFinal;
 	}
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index d358149d7cc..b04ce5890ab 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -507,6 +507,7 @@ class pdf_strato extends ModelePDFContract
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show table for lines
 	 *
@@ -519,7 +520,7 @@ class pdf_strato extends ModelePDFContract
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
 	{
 		global $conf;
 
@@ -566,7 +567,7 @@ class pdf_strato extends ModelePDFContract
      * @param   Translate   $outputlangs    Object language for output
      * @return void
      */
-    private function tabSignature(&$pdf, $tab_top, $tab_height, $outputlangs)
+	protected function tabSignature(&$pdf, $tab_top, $tab_height, $outputlangs)
     {
 		$pdf->SetDrawColor(128, 128, 128);
 		$posmiddle = $this->marge_gauche + round(($this->page_largeur - $this->marge_gauche - $this->marge_droite)/2);
@@ -585,6 +586,7 @@ class pdf_strato extends ModelePDFContract
 		$pdf->MultiCell($this->page_largeur-$this->marge_droite - $posmiddle - 5, 20, '', 1);
     }
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Show top header of page.
      *
@@ -594,7 +596,7 @@ class pdf_strato extends ModelePDFContract
      *  @param  Translate	$outputlangs	Object lang for output
      *  @return	void
      */
-    private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
     {
 		global $conf,$langs;
 
@@ -764,6 +766,7 @@ class pdf_strato extends ModelePDFContract
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
      *
@@ -773,7 +776,7 @@ class pdf_strato extends ModelePDFContract
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	integer
 	 */
-	private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 5bcd6d153d0..996e8035316 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -648,6 +648,7 @@ class pdf_espadon extends ModelePdfExpedition
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show total to pay
@@ -659,7 +660,7 @@ class pdf_espadon extends ModelePdfExpedition
 	 *	@param	Translate	$outputlangs	Objet langs
 	 *	@return int							Position pour suite
 	 */
-	private function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
 		// phpcs:enable
 		global $conf,$mysoc;
@@ -749,6 +750,7 @@ class pdf_espadon extends ModelePdfExpedition
 		return ($tab2_top + ($tab2_hl * $index));
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show table for lines
 	 *
@@ -761,7 +763,7 @@ class pdf_espadon extends ModelePdfExpedition
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
 	{
 		global $conf;
 
@@ -796,6 +798,7 @@ class pdf_espadon extends ModelePdfExpedition
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
@@ -805,7 +808,7 @@ class pdf_espadon extends ModelePdfExpedition
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
 	 */
-	private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $conf,$langs,$mysoc;
 
@@ -1044,6 +1047,7 @@ class pdf_espadon extends ModelePdfExpedition
 		$pdf->SetTextColor(0, 0, 0);
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
      *
@@ -1053,7 +1057,7 @@ class pdf_espadon extends ModelePdfExpedition
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
 	 */
-	private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index bd46fc5a75e..4293f29ed6d 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -448,6 +448,7 @@ class pdf_merou extends ModelePdfExpedition
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show table for lines
 	 *
@@ -460,7 +461,7 @@ class pdf_merou extends ModelePdfExpedition
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
 	{
 		global $langs;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -489,6 +490,7 @@ class pdf_merou extends ModelePdfExpedition
 		$pdf->Rect(10, $tab_top, 190, $tab_height);
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
      *
@@ -498,7 +500,7 @@ class pdf_merou extends ModelePdfExpedition
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	void
 	 */
-	private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 		$pdf->SetFont('', '', $default_font_size - 2);
@@ -517,7 +519,7 @@ class pdf_merou extends ModelePdfExpedition
         //}
 	}
 
-
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
@@ -527,7 +529,7 @@ class pdf_merou extends ModelePdfExpedition
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
 	 */
-	private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $conf, $langs,$hookmanager;
 
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 8929b86a938..18ba0ef9d44 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -664,6 +664,7 @@ class pdf_rouget extends ModelePdfExpedition
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show total to pay
@@ -675,7 +676,7 @@ class pdf_rouget extends ModelePdfExpedition
 	 *	@param	Translate	$outputlangs	Objet langs
 	 *	@return int							Position pour suite
 	 */
-	private function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
 		// phpcs:enable
 		global $conf,$mysoc;
@@ -771,6 +772,7 @@ class pdf_rouget extends ModelePdfExpedition
 		return ($tab2_top + ($tab2_hl * $index));
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show table for lines
 	 *
@@ -783,7 +785,7 @@ class pdf_rouget extends ModelePdfExpedition
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
 	{
 		global $conf;
 
@@ -859,6 +861,7 @@ class pdf_rouget extends ModelePdfExpedition
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
@@ -868,7 +871,7 @@ class pdf_rouget extends ModelePdfExpedition
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
 	 */
-	private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $conf,$langs,$mysoc;
 
@@ -1107,6 +1110,7 @@ class pdf_rouget extends ModelePdfExpedition
 		$pdf->SetTextColor(0, 0, 0);
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show footer of page. Need this->emetteur object
      *
@@ -1116,7 +1120,7 @@ class pdf_rouget extends ModelePdfExpedition
 	 *  @param	int			$hidefreetext		1=Hide free text
 	 *  @return	int								Return height of bottom margin including footer text
 	 */
-	private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index b85ca573188..fb977c19b63 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -550,7 +550,7 @@ class pdf_standard extends ModeleExpenseReport
 	 * @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
 	 * @return  void
 	 */
-	private function printLine(&$pdf, $object, $linenumber, $curY, $default_font_size, $outputlangs, $hidedetails = 0)
+	protected function printLine(&$pdf, $object, $linenumber, $curY, $default_font_size, $outputlangs, $hidedetails = 0)
 	{
         global $conf;
         $pdf->SetFont('', '', $default_font_size - 1);
@@ -620,6 +620,7 @@ class pdf_standard extends ModeleExpenseReport
         $pdf->writeHTMLCell($this->posxtva-$this->posxcomment-0.8, 4, $this->posxcomment-1, $curY, $comment, 0, 1);
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
 	 *  Show top header of page.
 	 *
@@ -629,7 +630,7 @@ class pdf_standard extends ModeleExpenseReport
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
 	 */
-	private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		// global $conf, $langs, $hookmanager;
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager;
@@ -848,6 +849,7 @@ class pdf_standard extends ModeleExpenseReport
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show table for lines
 	 *
@@ -861,7 +863,7 @@ class pdf_standard extends ModeleExpenseReport
 	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
 		global $conf;
 
@@ -971,7 +973,7 @@ class pdf_standard extends ModeleExpenseReport
 	 *  @param  Translate	$outputlangs    Object langs for output
 	 *  @return int             			<0 if KO, >0 if OK
 	 */
-	private function tablePayments(&$pdf, $object, $posy, $outputlangs)
+	protected function tablePayments(&$pdf, $object, $posy, $outputlangs)
 	{
 		global $conf;
 
@@ -1075,6 +1077,7 @@ class pdf_standard extends ModeleExpenseReport
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show footer of page. Need this->emetteur object
      *
@@ -1084,7 +1087,7 @@ class pdf_standard extends ModeleExpenseReport
 	 *  @param  int			$hidefreetext		1=Hide free text
 	 *  @return int								Return height of bottom margin including footer text
 	 */
-	private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
 		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index acc88a1e96a..8876137f877 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -342,7 +342,7 @@ class pdf_crabe extends ModelePDFFactures
                 // Set path to the background PDF File
                 if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
-				    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+                	$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 				    $tplidx = $pdf->importPage(1);
                 }
 
@@ -764,7 +764,8 @@ class pdf_crabe extends ModelePDFFactures
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show payments table
 	 *
@@ -775,7 +776,7 @@ class pdf_crabe extends ModelePDFFactures
      *  @param  int			$heightforfooter height for footer
      *  @return int             			<0 if KO, >0 if OK
 	 */
-	private function _tableau_versements(&$pdf, $object, $posy, $outputlangs, $heightforfooter = 0)
+	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs, $heightforfooter = 0)
 	{
         // phpcs:enable
 		global $conf;
@@ -911,6 +912,7 @@ class pdf_crabe extends ModelePDFFactures
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * Function _tableau_versements_header
 	 *
@@ -924,7 +926,7 @@ class pdf_crabe extends ModelePDFFactures
 	 * @param int 			$tab3_height		height
 	 * @return void
 	 */
-	private function _tableau_versements_header($pdf, $object, $outputlangs, $default_font_size, $tab3_posx, $tab3_top, $tab3_width, $tab3_height)
+	protected function _tableau_versements_header($pdf, $object, $outputlangs, $default_font_size, $tab3_posx, $tab3_top, $tab3_width, $tab3_height)
 	{
 	    // phpcs:enable
 	    $title=$outputlangs->transnoentities("PaymentsAlreadyDone");
@@ -949,7 +951,8 @@ class pdf_crabe extends ModelePDFFactures
 		$pdf->line($tab3_posx, $tab3_top-1+$tab3_height, $tab3_posx+$tab3_width, $tab3_top-1+$tab3_height);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show miscellaneous information (payment mode, payment term, ...)
 	 *
@@ -959,7 +962,7 @@ class pdf_crabe extends ModelePDFFactures
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @return	void
 	 */
-	private function _tableau_info(&$pdf, $object, $posy, $outputlangs)
+	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
@@ -1108,7 +1111,8 @@ class pdf_crabe extends ModelePDFFactures
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *	Show total to pay
 	 *
@@ -1119,7 +1123,7 @@ class pdf_crabe extends ModelePDFFactures
 	 *	@param	Translate	$outputlangs	Objet langs
 	 *	@return int							Position pour suite
 	 */
-	private function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
         // phpcs:enable
 		global $conf,$mysoc;
@@ -1451,6 +1455,7 @@ class pdf_crabe extends ModelePDFFactures
 		return ($tab2_top + ($tab2_hl * $index));
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show table for lines
 	 *
@@ -1464,7 +1469,7 @@ class pdf_crabe extends ModelePDFFactures
 	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
 		global $conf;
 
@@ -1572,6 +1577,7 @@ class pdf_crabe extends ModelePDFFactures
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
@@ -1581,7 +1587,7 @@ class pdf_crabe extends ModelePDFFactures
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
 	 */
-	private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $conf, $langs;
 
@@ -1611,7 +1617,7 @@ class pdf_crabe extends ModelePDFFactures
 		// Logo
 		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
 		{
-			$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
+			$logo=$conf->mycompany->multidir_output[$object->entity].'/logos/'.$this->emetteur->logo;
 			if ($this->emetteur->logo)
 			{
 				if (is_readable($logo))
@@ -1847,6 +1853,7 @@ class pdf_crabe extends ModelePDFFactures
 		return $top_shift;
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
      *
@@ -1856,7 +1863,7 @@ class pdf_crabe extends ModelePDFFactures
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
 	 */
-	private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 26e2b1824d8..10bea53032f 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -352,7 +352,7 @@ class pdf_sponge extends ModelePDFFactures
 	            // Set path to the background PDF File
                 if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
 	            {
-	                $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+	            	$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 	                $tplidx = $pdf->importPage(1);
 	            }
 
@@ -1043,7 +1043,7 @@ class pdf_sponge extends ModelePDFFactures
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @return	void
 	 */
-	private function drawInfoTable(&$pdf, $object, $posy, $outputlangs)
+	protected function drawInfoTable(&$pdf, $object, $posy, $outputlangs)
 	{
 		global $conf;
 
@@ -1201,7 +1201,7 @@ class pdf_sponge extends ModelePDFFactures
 	 *	@param	Translate	$outputlangs	Objet langs
 	 *	@return int							Position pour suite
 	 */
-	private function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	protected function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
 		global $conf,$mysoc;
 
@@ -1752,6 +1752,7 @@ class pdf_sponge extends ModelePDFFactures
 		return parent::liste_modeles($db, $maxfilenamelength); // TODO: Change the autogenerated stub
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show table for lines
 	 *
@@ -1765,7 +1766,7 @@ class pdf_sponge extends ModelePDFFactures
 	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
 		global $conf;
 
@@ -1804,6 +1805,7 @@ class pdf_sponge extends ModelePDFFactures
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
@@ -1813,7 +1815,7 @@ class pdf_sponge extends ModelePDFFactures
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
 	 */
-	private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $conf, $langs;
 
@@ -1843,7 +1845,7 @@ class pdf_sponge extends ModelePDFFactures
 		// Logo
 		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
 		{
-			$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
+			$logo=$conf->mycompany->multidir_output[$object->entity].'/logos/'.$this->emetteur->logo;
 			if ($this->emetteur->logo)
 			{
 				if (is_readable($logo))
@@ -2077,6 +2079,7 @@ class pdf_sponge extends ModelePDFFactures
 		return $top_shift;
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
      *
@@ -2086,7 +2089,7 @@ class pdf_sponge extends ModelePDFFactures
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
 	 */
-	private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 936eabeadda..847f1de7087 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -483,6 +483,7 @@ class pdf_soleil extends ModelePDFFicheinter
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show table for lines
 	 *
@@ -495,7 +496,7 @@ class pdf_soleil extends ModelePDFFicheinter
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
 	{
 		global $conf;
 
@@ -546,6 +547,7 @@ class pdf_soleil extends ModelePDFFicheinter
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
@@ -555,7 +557,7 @@ class pdf_soleil extends ModelePDFFicheinter
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
 	 */
-	private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $conf,$langs;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -722,6 +724,7 @@ class pdf_soleil extends ModelePDFFicheinter
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
 	 *
@@ -731,7 +734,7 @@ class pdf_soleil extends ModelePDFFicheinter
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	integer
 	 */
-	private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
diff --git a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
index fcb5ef8433e..963de1494a7 100644
--- a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
@@ -637,6 +637,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		return 0;
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *   Show miscellaneous information (payment mode, payment term, ...)
@@ -647,7 +648,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @return	void
 	 */
-	private function _tableau_info(&$pdf, $object, $posy, $outputlangs)
+	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
         // phpcs:enable
 		global $conf,$mysoc;
@@ -666,6 +667,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		$pdf->MultiCell($larg_sign, 2, $outputlangs->trans("ForCustomer").':', '', 'L');
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show table for lines
 	 *
@@ -678,7 +680,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
 	{
 		global $conf,$mysoc;
 
@@ -731,6 +733,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
@@ -740,7 +743,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
 	 */
-	private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $conf,$langs,$hookmanager;
 
@@ -909,6 +912,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		$pdf->SetTextColor(0, 0, 60);
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show footer of page. Need this->emetteur object
      *
@@ -918,7 +922,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	 *  @param	int			$hidefreetext		1=Hide free text
 	 *  @return	int								Return height of bottom margin including footer text
 	 */
-    private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
     {
         global $conf;
         $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
index cceacf3263c..44d97d2891d 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -313,7 +313,7 @@ class modResource extends DolibarrModules
 	 *
 	 * 	@return		int		<=0 if KO, >0 if OK
 	 */
-	private function loadTables()
+	protected function loadTables()
 	{
 		return $this->_load_tables('/resource/sql/');
 	}
diff --git a/htdocs/core/modules/modSyslog.class.php b/htdocs/core/modules/modSyslog.class.php
index b754eae2765..164d86522e6 100644
--- a/htdocs/core/modules/modSyslog.class.php
+++ b/htdocs/core/modules/modSyslog.class.php
@@ -92,7 +92,7 @@ class modSyslog extends DolibarrModules
 				'objectname' => 'Utils',
 				'method' => 'compressSyslogs',
 				'parameters' => '',
-				'comment' => 'Compress and archive log files. Warning: batch must be run with same account than your web server to avoid to get log files with different owner than required by web server. Another solution is to set web server Operating System group as the group of directory documents and set GROUP permission "rws" on this directory so log files will always have the group and permissions of the web server Operating System group',
+				'comment' => 'Compress and archive log files. The number of versions to keep is defined into the setup of module. Warning: Main application cron script must be run with same account than your web server to avoid to get log files with different owner than required by web server. Another solution is to set web server Operating System group as the group of directory documents and set GROUP permission "rws" on this directory so log files will always have the group and permissions of the web server Operating System group',
 				'frequency' => 1,
 				'unitfrequency' => 3600 * 24,
 				'priority' => 50,
diff --git a/htdocs/core/modules/modWebsite.class.php b/htdocs/core/modules/modWebsite.class.php
index 24a929c82a0..cf4623fdb3b 100644
--- a/htdocs/core/modules/modWebsite.class.php
+++ b/htdocs/core/modules/modWebsite.class.php
@@ -158,7 +158,7 @@ class modWebsite extends DolibarrModules
     	// Remove permissions and default values
     	$this->remove($options);
 
-    	// Copy flags and octicons directoru
+    	// Copy flags and octicons directory
     	$dirarray=array('common/flags', 'common/octicons');
     	foreach($dirarray as $dir)
     	{
@@ -179,6 +179,26 @@ class modWebsite extends DolibarrModules
 	    	}
     	}
 
+    	// Website templates
+    	$srcroot=DOL_DOCUMENT_ROOT.'/install/doctemplates/websites';
+    	$destroot=DOL_DATA_ROOT.'/doctemplates/websites';
+
+    	dol_mkdir($destroot);
+
+    	$docs=dol_dir_list($srcroot, 'files', 0, 'website_.*(\.zip|\.jpg)$');
+    	foreach($docs as $cursorfile)
+    	{
+	    		$src=$srcroot.'/'.$cursorfile['name'];
+	    		$dest=$destroot.'/'.$cursorfile['name'];
+
+	    		$result=dol_copy($src, $dest, 0, 0);
+	    		if ($result < 0)
+	    		{
+	    			$langs->load("errors");
+	    			$this->error=$langs->trans('ErrorFailToCopyFile', $src, $dest);
+	    		}
+    	}
+
     	$sql = array();
 
     	return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index a9bc06f1021..019d67518a4 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -587,7 +587,7 @@ class pdf_standard extends ModelePDFProduct
 		}
     }
 
-
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show table for lines
 	 *
@@ -601,7 +601,7 @@ class pdf_standard extends ModelePDFProduct
 	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
 	    global $conf;
 
@@ -694,6 +694,7 @@ class pdf_standard extends ModelePDFProduct
 	    }
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
@@ -704,7 +705,7 @@ class pdf_standard extends ModelePDFProduct
 	 *  @param	string		$titlekey		Translation key to show as title of document
 	 *  @return	void
 	 */
-	private function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "")
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "")
 	{
 	    global $conf,$langs,$hookmanager;
 
@@ -844,6 +845,7 @@ class pdf_standard extends ModelePDFProduct
         $pdf->SetTextColor(0, 0, 0);
     }
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Show footer of page. Need this->emetteur object
      *
@@ -853,7 +855,7 @@ class pdf_standard extends ModelePDFProduct
      *  @param	int			$hidefreetext		1=Hide free text
      *  @return	int								Return height of bottom margin including footer text
      */
-    private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
     {
         global $conf;
         $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
index 257b477a8df..154c8e067b0 100644
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -522,7 +522,7 @@ class pdf_baleine extends ModelePDFProjects
 		}
 	}
 
-
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show table for lines
 	 *
@@ -535,7 +535,7 @@ class pdf_baleine extends ModelePDFProjects
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
 	{
 		global $conf,$mysoc;
 
@@ -573,6 +573,7 @@ class pdf_baleine extends ModelePDFProjects
 		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxdatestart, 3, '', 0, 'C');
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
@@ -582,7 +583,7 @@ class pdf_baleine extends ModelePDFProjects
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
 	 */
-	private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $langs,$conf,$mysoc;
 
@@ -666,6 +667,7 @@ class pdf_baleine extends ModelePDFProjects
         */
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show footer of page. Need this->emetteur object
      *
@@ -675,7 +677,7 @@ class pdf_baleine extends ModelePDFProjects
 	 *  @param	int			$hidefreetext		1=Hide free text
 	 *  @return	integer
 	 */
-	private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 381d68c16d2..05100fbe8eb 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -695,7 +695,7 @@ class pdf_beluga extends ModelePDFProjects
 		}
 	}
 
-
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show table for lines
 	 *
@@ -708,7 +708,7 @@ class pdf_beluga extends ModelePDFProjects
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
 	{
 		global $conf,$mysoc;
 
@@ -746,6 +746,7 @@ class pdf_beluga extends ModelePDFProjects
 		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxdatestart, 3, '', 0, 'C');
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
@@ -755,7 +756,7 @@ class pdf_beluga extends ModelePDFProjects
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
 	 */
-	private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $langs,$conf,$mysoc;
 
@@ -815,6 +816,7 @@ class pdf_beluga extends ModelePDFProjects
 		$pdf->SetTextColor(0, 0, 60);
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show footer of page. Need this->emetteur object
      *
@@ -824,7 +826,7 @@ class pdf_beluga extends ModelePDFProjects
 	 *  @param	int			$hidefreetext		1=Hide free text
 	 *  @return	integer
 	 */
-	private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
diff --git a/htdocs/core/modules/project/doc/pdf_timespent.modules.php b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
index 14946ca5cf3..061ae7a0b58 100644
--- a/htdocs/core/modules/project/doc/pdf_timespent.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
@@ -453,7 +453,7 @@ class pdf_timespent extends ModelePDFProjects
 		}
 	}
 
-
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show table for lines
 	 *
@@ -466,7 +466,7 @@ class pdf_timespent extends ModelePDFProjects
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
 	{
 		global $conf,$mysoc;
 
@@ -504,6 +504,7 @@ class pdf_timespent extends ModelePDFProjects
 		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxdatestart, 3, '', 0, 'C');
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
@@ -513,7 +514,7 @@ class pdf_timespent extends ModelePDFProjects
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
 	 */
-	private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $langs,$conf,$mysoc;
 
@@ -597,6 +598,7 @@ class pdf_timespent extends ModelePDFProjects
         */
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Show footer of page. Need this->emetteur object
      *
@@ -606,7 +608,7 @@ class pdf_timespent extends ModelePDFProjects
      *  @param  int         $hidefreetext       1=Hide free text
      *  @return integer
      */
-    private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
     {
         global $conf;
         $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 4ad23a1704e..77c41d01927 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -344,7 +344,7 @@ class pdf_azur extends ModelePDFPropales
                 // Set path to the background PDF File
                 if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
-                    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+                	$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
                 }
 
@@ -833,6 +833,7 @@ class pdf_azur extends ModelePDFPropales
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Show payments table
@@ -843,12 +844,12 @@ class pdf_azur extends ModelePDFPropales
      *  @param  Translate	$outputlangs    Object langs for output
      *  @return int             			<0 if KO, >0 if OK
 	 */
-	private function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
+	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
         // phpcs:enable
 	}
 
-
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *   Show miscellaneous information (payment mode, payment term, ...)
@@ -859,7 +860,7 @@ class pdf_azur extends ModelePDFPropales
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @return	void
 	 */
-	private function _tableau_info(&$pdf, $object, $posy, $outputlangs)
+	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
@@ -1029,7 +1030,7 @@ class pdf_azur extends ModelePDFPropales
 		return $posy;
 	}
 
-
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show total to pay
@@ -1041,7 +1042,7 @@ class pdf_azur extends ModelePDFPropales
 	 *	@param	Translate	$outputlangs	Objet langs
 	 *	@return int							Position pour suite
 	 */
-	private function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
         // phpcs:enable
 		global $conf,$mysoc;
@@ -1306,6 +1307,7 @@ class pdf_azur extends ModelePDFPropales
 		return ($tab2_top + ($tab2_hl * $index));
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show table for lines
 	 *
@@ -1319,7 +1321,7 @@ class pdf_azur extends ModelePDFPropales
 	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
 		global $conf;
 
@@ -1422,6 +1424,7 @@ class pdf_azur extends ModelePDFPropales
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
@@ -1431,7 +1434,7 @@ class pdf_azur extends ModelePDFPropales
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
 	 */
-	private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $conf,$langs;
 
@@ -1459,7 +1462,7 @@ class pdf_azur extends ModelePDFPropales
 		// Logo
 		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
 		{
-			$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
+			$logo=$conf->mycompany->multidir_output[$object->entity].'/logos/'.$this->emetteur->logo;
 			if ($this->emetteur->logo)
 			{
 				if (is_readable($logo))
@@ -1645,6 +1648,7 @@ class pdf_azur extends ModelePDFPropales
 		return $top_shift;
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
      *
@@ -1654,13 +1658,14 @@ class pdf_azur extends ModelePDFPropales
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
 	 */
-	private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return pdf_pagefoot($pdf, $outputlangs, 'PROPOSAL_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show area for the customer to sign
@@ -1671,7 +1676,7 @@ class pdf_azur extends ModelePDFPropales
 	 *	@param	Translate	$outputlangs	Objet langs
 	 *	@return int							Position pour suite
 	 */
-	private function _signature_area(&$pdf, $object, $posy, $outputlangs)
+	protected function _signature_area(&$pdf, $object, $posy, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 3ddc8a45a52..f5784ab1b2b 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -330,7 +330,7 @@ class pdf_cyan extends ModelePDFPropales
                 // Set path to the background PDF File
                 if (! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
                 {
-                    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+                	$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
                     $tplidx = $pdf->importPage(1);
                 }
 
@@ -957,7 +957,7 @@ class pdf_cyan extends ModelePDFPropales
      *  @param  Translate	$outputlangs    Object langs for output
      *  @return int             			<0 if KO, >0 if OK
 	 */
-	private function drawPaymentsTable(&$pdf, $object, $posy, $outputlangs)
+	protected function drawPaymentsTable(&$pdf, $object, $posy, $outputlangs)
 	{
 	}
 
@@ -1150,7 +1150,7 @@ class pdf_cyan extends ModelePDFPropales
 	 *	@param	Translate	$outputlangs	Objet langs
 	 *	@return int							Position pour suite
 	 */
-	private function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	protected function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
 		global $conf,$mysoc;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1414,6 +1414,7 @@ class pdf_cyan extends ModelePDFPropales
 		return ($tab2_top + ($tab2_hl * $index));
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show table for lines
 	 *
@@ -1427,7 +1428,7 @@ class pdf_cyan extends ModelePDFPropales
 	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
 		global $conf;
 
@@ -1466,6 +1467,7 @@ class pdf_cyan extends ModelePDFPropales
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
@@ -1475,7 +1477,7 @@ class pdf_cyan extends ModelePDFPropales
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
 	 */
-	private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $conf,$langs;
 
@@ -1505,7 +1507,7 @@ class pdf_cyan extends ModelePDFPropales
 		// Logo
 		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
 		{
-			$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
+			$logo=$conf->mycompany->multidir_output[$object->entity].'/logos/'.$this->emetteur->logo;
 			if ($this->emetteur->logo)
 			{
 				if (is_readable($logo))
@@ -1691,6 +1693,7 @@ class pdf_cyan extends ModelePDFPropales
 		return $top_shift;
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
      *
@@ -1700,7 +1703,7 @@ class pdf_cyan extends ModelePDFPropales
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
 	 */
-	private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
@@ -1716,7 +1719,7 @@ class pdf_cyan extends ModelePDFPropales
 	 *	@param	Translate	$outputlangs	Objet langs
 	 *	@return int							Position pour suite
 	 */
-	private function drawSignatureArea(&$pdf, $object, $posy, $outputlangs)
+	protected function drawSignatureArea(&$pdf, $object, $posy, $outputlangs)
 	{
 		global $conf;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index 71e78368d9c..23d000308ef 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -592,6 +592,7 @@ class pdf_squille extends ModelePdfReception
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show total to pay
@@ -604,7 +605,7 @@ class pdf_squille extends ModelePdfReception
 	 *  @param	int			$totalOrdered	Total ordered
 	 *	@return int							Position pour suite
 	 */
-	private function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs, $totalOrdered)
+	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs, $totalOrdered)
 	{
 		// phpcs:enable
 		global $conf,$mysoc;
@@ -695,6 +696,7 @@ class pdf_squille extends ModelePdfReception
 		return ($tab2_top + ($tab2_hl * $index));
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show table for lines
 	 *
@@ -707,7 +709,7 @@ class pdf_squille extends ModelePdfReception
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
 	{
 		global $conf;
 
@@ -777,6 +779,7 @@ class pdf_squille extends ModelePdfReception
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
@@ -786,7 +789,7 @@ class pdf_squille extends ModelePdfReception
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
 	 */
-	private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $conf,$langs,$mysoc;
 
@@ -1028,6 +1031,7 @@ class pdf_squille extends ModelePdfReception
 		$pdf->SetTextColor(0, 0, 0);
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
      *
@@ -1037,7 +1041,7 @@ class pdf_squille extends ModelePdfReception
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
 	 */
-	private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index 6c222f96dca..e0c831732ba 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -753,7 +753,7 @@ class pdf_standard extends ModelePDFStock
 		}
 	}
 
-
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show table for lines
 	 *
@@ -767,7 +767,7 @@ class pdf_standard extends ModelePDFStock
 	 *   @param     string		$currency		Currency code
 	 *   @return    void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
 	    global $conf;
 
@@ -860,6 +860,7 @@ class pdf_standard extends ModelePDFStock
 		$pdf->SetLineStyle(array('dash'=>0));
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
@@ -870,7 +871,7 @@ class pdf_standard extends ModelePDFStock
 	 *  @param	string		$titlekey		Translation key to show as title of document
 	 *  @return	void
 	 */
-	private function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "")
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "")
 	{
 	    global $conf,$langs,$db,$hookmanager;
 
@@ -1089,6 +1090,7 @@ class pdf_standard extends ModelePDFStock
 	    $pdf->SetTextColor(0, 0, 0);
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
 	 *
@@ -1098,7 +1100,7 @@ class pdf_standard extends ModelePDFStock
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
 	 */
-	private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 	    global $conf;
 	    $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
diff --git a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
index 5efa1b0b312..380b9ceffa5 100644
--- a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
@@ -809,7 +809,7 @@ class pdf_stdmovement extends ModelePDFMovement
 		}
 	}
 
-
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show table for lines
 	 *
@@ -823,7 +823,7 @@ class pdf_stdmovement extends ModelePDFMovement
 	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
 	    global $conf;
 
@@ -939,6 +939,7 @@ class pdf_stdmovement extends ModelePDFMovement
 		$pdf->SetLineStyle(array('dash'=>0));
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
@@ -949,7 +950,7 @@ class pdf_stdmovement extends ModelePDFMovement
 	 *  @param	string		$titlekey		Translation key to show as title of document
 	 *  @return	void
 	 */
-	private function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "")
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "")
 	{
 	    global $conf,$langs,$db,$hookmanager;
 
@@ -1168,6 +1169,7 @@ class pdf_stdmovement extends ModelePDFMovement
 	    $pdf->SetTextColor(0, 0, 0);
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show footer of page. Need this->emetteur object
 	 *
@@ -1177,7 +1179,7 @@ class pdf_stdmovement extends ModelePDFMovement
 	 *  @param	int			$hidefreetext		1=Hide free text
 	 *  @return	int								Return height of bottom margin including footer text
 	 */
-	private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 	    global $conf;
 	    $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
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 4c4fe7106a7..00e981dfdd6 100644
--- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -605,6 +605,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		}
     }
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show total to pay
@@ -616,7 +617,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	 *	@param	Translate	$outputlangs	Objet langs
 	 *	@return int							Position pour suite
 	 */
-    private function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
         // phpcs:enable
 		global $conf,$mysoc;
@@ -814,6 +815,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		return ($tab2_top + ($tab2_hl * $index));
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show table for lines
 	 *
@@ -827,7 +829,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
 		global $conf;
 
@@ -920,6 +922,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Show payments table
@@ -930,7 +933,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	 *  @param  Translate           $outputlangs    Object langs for output
 	 *  @return int                                 <0 if KO, >0 if OK
 	 */
-	private function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
+	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
@@ -1013,6 +1016,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
@@ -1022,7 +1026,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	 *  @param  Translate           $outputlangs    Object lang for output
 	 *  @return void
 	 */
-	private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $langs, $conf, $mysoc;
 
@@ -1226,6 +1230,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		return $top_shift;
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Show footer of page. Need this->emetteur object
      *
@@ -1235,7 +1240,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
      *  @param  int                 $hidefreetext       1=Hide free text
      *  @return int                                     Return height of bottom margin including footer text
      */
-    private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+    protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
     {
         global $conf;
         $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
index e96f5ef4eab..02b11366816 100644
--- a/htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
@@ -800,7 +800,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		}
 	}
 
-
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Show payments table
@@ -811,12 +811,12 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	 *	@param	Translate	$outputlangs	Object langs for output
 	 *	@return int							<0 if KO, >0 if OK
 	 */
-	private function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
+	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
         // phpcs:enable
 	}
 
-
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *   Show miscellaneous information (payment mode, payment term, ...)
@@ -827,7 +827,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @return	integer
 	 */
-	private function _tableau_info(&$pdf, $object, $posy, $outputlangs)
+	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
         // phpcs:enable
 	    global $conf;
@@ -882,6 +882,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		return $posy;
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show total to pay
@@ -893,7 +894,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	 *	@param	Translate	$outputlangs	Objet langs
 	 *	@return int							Position pour suite
 	 */
-	private function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
         // phpcs:enable
 		global $conf,$mysoc;
@@ -1097,6 +1098,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		return ($tab2_top + ($tab2_hl * $index));
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
 	 *   Show table for lines
 	 *
@@ -1110,7 +1112,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
 		global $conf;
 
@@ -1167,6 +1169,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
@@ -1176,7 +1179,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
 	 */
-	private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $langs,$conf,$mysoc;
 
@@ -1412,6 +1415,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		return $top_shift;
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
      *
@@ -1421,7 +1425,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
 	 */
-	private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
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 9f9f0cfad38..116b77117e4 100644
--- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -702,7 +702,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		}
 	}
 
-
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Show payments table
@@ -713,12 +713,12 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	 *	@param	Translate	$outputlangs	Object langs for output
 	 *	@return int							<0 if KO, >0 if OK
 	 */
-	private function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
+	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
         // phpcs:enable
 	}
 
-
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *   Show miscellaneous information (payment mode, payment term, ...)
@@ -729,7 +729,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @return	integer
 	 */
-	private function _tableau_info(&$pdf, $object, $posy, $outputlangs)
+	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
         // phpcs:enable
 	    global $conf;
@@ -784,6 +784,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		return $posy;
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Show total to pay
@@ -795,7 +796,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	 *	@param	Translate	$outputlangs	Objet langs
 	 *	@return int							Position pour suite
 	 */
-	private function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
         // phpcs:enable
 		global $conf,$mysoc;
@@ -999,6 +1000,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		return ($tab2_top + ($tab2_hl * $index));
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
 	 *   Show table for lines
 	 *
@@ -1012,7 +1014,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
 		global $conf;
 
@@ -1104,6 +1106,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
@@ -1113,7 +1116,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
 	 */
-	private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $langs, $conf, $mysoc;
 
@@ -1348,6 +1351,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		return $top_shift;
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show footer of page. Need this->emetteur object
      *
@@ -1357,7 +1361,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	 *  @param	int			$hidefreetext		1=Hide free text
 	 *  @return	int								Return height of bottom margin including footer text
 	 */
-	private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
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 e4b6b73fbc1..81093d9adff 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -517,7 +517,8 @@ class pdf_standard extends ModelePDFSuppliersPayments
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *	Show total to pay
 	 *
@@ -527,7 +528,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 	 *	@param	Translate		$outputlangs	Objet langs
 	 *	@return int								Position pour suite
 	 */
-	private function _tableau_cheque(&$pdf, $object, $posy, $outputlangs)
+	protected function _tableau_cheque(&$pdf, $object, $posy, $outputlangs)
 	{
         // phpcs:enable
 		global $conf,$mysoc;
@@ -576,7 +577,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 		$pdf->MultiCell(150, 4, date("d").' '.$outputlangs->transnoentitiesnoconv(date("F")).' '.date("Y"), 0, 'L', 1);
 	}
 
-
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show table for lines
 	 *
@@ -590,7 +591,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
 		global $conf,$mysoc;
 
@@ -621,7 +622,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 		//$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
 	}
 
-
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
@@ -631,7 +632,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
 	 */
-	private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $langs, $conf, $mysoc;
 
@@ -801,6 +802,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
      *
@@ -810,7 +812,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	int								Return height of bottom margin including footer text
 	 */
-	private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
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 e486474d1d5..d243c209848 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -700,6 +700,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Show payments table
@@ -710,12 +711,12 @@ class pdf_aurore extends ModelePDFSupplierProposal
      *  @param  Translate	$outputlangs    Object langs for output
      *  @return int             			<0 if KO, >0 if OK
 	 */
-	private function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
+	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
         // phpcs:enable
 	}
 
-
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *   Show miscellaneous information (payment mode, payment term, ...)
@@ -726,7 +727,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @return	void
 	 */
-	private function _tableau_info(&$pdf, $object, $posy, $outputlangs)
+	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
@@ -883,7 +884,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		return $posy;
 	}
 
-
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show total to pay
@@ -895,7 +896,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	 *	@param	Translate	$outputlangs	Objet langs
 	 *	@return int							Position pour suite
 	 */
-	private function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
         // phpcs:enable
 		global $conf,$mysoc;
@@ -1157,6 +1158,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		return ($tab2_top + ($tab2_hl * $index));
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   Show table for lines
 	 *
@@ -1170,7 +1172,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	private function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
 		global $conf;
 
@@ -1262,6 +1264,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
@@ -1271,7 +1274,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @return	void
 	 */
-	private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $conf, $langs;
 
@@ -1479,6 +1482,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		return $top_shift;
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Show footer of page. Need this->emetteur object
      *
@@ -1488,7 +1492,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
      *  @param  int			$hidefreetext		1=Hide free text
      *  @return int								Return height of bottom margin including footer text
      */
-    private function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+    protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
 		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 10aff5637c8..ac54c531b69 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -49,6 +49,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 //var_dump($extrafields->attributes[$object->table_element]);
 if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]['label']))
 {
+	$lastseparatorkeyfound = '';
     $extrafields_collapse_num = '';
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
 	{
@@ -101,6 +102,8 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
             }
 
 			print $extrafields->showSeparator($key, $object);
+
+			$lastseparatorkeyfound=$key;
 		}
 		else
 		{
@@ -108,8 +111,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 			print '<td class="titlefield">';
 			print '<table width="100%" class="nobordernopadding">';
 			print '<tr>';
-			print '<td';
-			print ' class="';
+			print '<td class="';
 			//var_dump($action);exit;
 
 			if ((! empty($action) && ($action == 'create' || $action == 'edit')) && ! empty($extrafields->attributes[$object->table_element]['required'][$key])) print ' fieldrequired';
@@ -136,7 +138,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 			{
 			    $fieldid='id';
 			    if ($object->table_element == 'societe') $fieldid='socid';
-				print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?'.$fieldid.'=' . $object->id . '&action=edit_extras&attribute=' . $key . '">' . img_edit().'</a></td>';
+			    print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?'.$fieldid.'=' . $object->id . '&action=edit_extras&attribute=' . $key . '&ignorecollapsesetup=1">' . img_edit().'</a></td>';
 			}
 			print '</tr></table>';
 			print '</td>';
diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index c0eff19fa84..a178f6400b8 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -163,11 +163,12 @@ if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg
     	// Show the link to "Root"
     	if ($showroot)
     	{
-    		print '<tr><td><div style="padding-left: 5px; padding-right: 5px;"><a href="'.$_SERVER["PHP_SELF"].'?file_manager=1&pageid='.$pageid.'">'.$langs->trans("Root").'</a></div></td></tr>';
+    		print '<tr><td><div style="padding-left: 5px; padding-right: 5px;"><a href="'.$_SERVER["PHP_SELF"].'?file_manager=1&pageid='.$pageid.'">';
+    		if ($module == 'medias') print $langs->trans("RootOfMedias");
+    		else print $langs->trans("Root");
+    		print '</a></div></td></tr>';
     	}
 
-
-
     	print '<tr><td>';
 
     	// Show filemanager tree (will be filled by a call of ajax /ecm/tpl/enablefiletreeajax.tpl.php, later, that executes ajaxdirtree.php)
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index ddb737bbdd6..bac9ff997bc 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -116,7 +116,6 @@ $coldisplay=0;
 		$toolbarname='dolibarr_details';
 		if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname='dolibarr_notes';
 		$doleditor=new DolEditor('product_desc', $line->description, '', (empty($conf->global->MAIN_DOLEDITOR_HEIGHT)?164:$conf->global->MAIN_DOLEDITOR_HEIGHT), $toolbarname, '', false, true, $enable, $nbrows, '98%');
-		$doleditor=new DolEditor('product_desc', $line->description, '', (empty($conf->global->MAIN_DOLEDITOR_HEIGHT)?164:$conf->global->MAIN_DOLEDITOR_HEIGHT), $toolbarname, '', false, true, $enable, $nbrows, '98%');
 		$doleditor->Create();
 	} else {
 		print '<textarea id="product_desc" class="flat" name="product_desc" readonly style="width: 200px; height:80px;">' . $line->description . '</textarea>';
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 7273640e77e..ba868ed7b5d 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2012      Nicolas Villa aka Boyquotes http://informetic.fr
  * Copyright (C) 2013      Florian Henry       <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2016 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2013-2019 Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2019      Frédéric France     <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -553,7 +553,7 @@ if ($num > 0)
 		}
 		if ($user->rights->cron->delete)
 		{
-			print "<a href=\"".$_SERVER["PHP_SELF"]."?id=".$obj->rowid."&action=delete".($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'').$param;
+			print "<a href=\"".$_SERVER["PHP_SELF"]."?id=".$obj->rowid."&action=delete".($page?'&page='.$page:'').($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'').$param;
 			print "\" title=\"".dol_escape_htmltag($langs->trans('CronDelete'))."\">".img_picto($langs->trans('CronDelete'), 'delete')."</a> &nbsp;";
 		} else {
 			print "<a href=\"#\" title=\"".dol_escape_htmltag($langs->trans('NotEnoughPermissions'))."\">".img_picto($langs->trans('NotEnoughPermissions'), 'delete')."</a> &nbsp; ";
diff --git a/htdocs/dav/fileserver.php b/htdocs/dav/fileserver.php
index 4e99cf92613..24460a1e2c6 100644
--- a/htdocs/dav/fileserver.php
+++ b/htdocs/dav/fileserver.php
@@ -55,6 +55,22 @@ if (empty($conf->dav->enabled))
 	accessforbidden();
 
 
+// Restrict API to some IPs
+if (! empty($conf->global->DAV_RESTRICT_ON_IP))
+{
+	$allowedip=explode(' ', $conf->global->DAV_RESTRICT_ON_IP);
+	$ipremote = getUserRemoteIP();
+	if (! in_array($ipremote, $allowedip))
+	{
+		dol_syslog('Remote ip is '.$ipremote.', not into list '.$conf->global->DAV_RESTRICT_ON_IP);
+		print 'DAV not allowed from the IP '.$ipremote;
+		header('HTTP/1.1 503 DAV not allowed from your IP '.$ipremote);
+		//print $conf->global->DAV_RESTRICT_ON_IP;
+		exit(0);
+	}
+}
+
+
 $entity = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : (!empty($conf->entity) ? $conf->entity : 1));
 
 // settings
@@ -69,22 +85,42 @@ $tmpDir = $conf->dav->multidir_output[$entity];     // We need root dir, not a d
 $authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function ($username, $password) {
 	global $user;
 	global $conf;
-	global $dolibarr_main_authentication;
+	global $dolibarr_main_authentication, $dolibarr_auto_user;
 
 	if (empty($user->login))
+	{
+		dol_syslog("Failed to authenticate to DAV, login is not provided", LOG_WARNING);
 		return false;
+	}
 	if ($user->socid > 0)
+	{
+		dol_syslog("Failed to authenticate to DAV, use is an external user", LOG_WARNING);
 		return false;
+	}
 	if ($user->login != $username)
+	{
+		dol_syslog("Failed to authenticate to DAV, login does not match the login of loaded user", LOG_WARNING);
 		return false;
+	}
 
 	// Authentication mode
-	if (empty($dolibarr_main_authentication))
-		$dolibarr_main_authentication='http,dolibarr';
+	if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='dolibarr';
+
+	// Authentication mode: forceuser
+	if ($dolibarr_main_authentication == 'forceuser')
+	{
+		if (empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
+		if ($dolibarr_auto_user != $username)
+		{
+			dol_syslog("Warning: your instance is set to use the automatic forced login '".$dolibarr_auto_user."' that is not the requested login. DAV usage is forbidden in this mode.");
+			return false;
+		}
+	}
+
 	$authmode = explode(',', $dolibarr_main_authentication);
 	$entity = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : (!empty($conf->entity) ? $conf->entity : 1));
 
-	if (checkLoginPassEntity($username, $password, $entity, $authmode) != $username)
+	if (checkLoginPassEntity($username, $password, $entity, $authmode, 'dav') != $username)
 		return false;
 
 	return true;
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 8bd8c702d03..358ce2e7101 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -27,6 +27,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.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';
@@ -37,13 +38,17 @@ $langs->loadLangs(array("sendings","deliveries",'companies','bills'));
 $contextpage= GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'shipmentlist';   // To manage different context of search
 
 $socid=GETPOST('socid', 'int');
+
+$action     = GETPOST('action', 'alpha');
+$massaction = GETPOST('massaction', 'alpha');
+$show_files = GETPOST('show_files', 'int');
+$toselect   = GETPOST('toselect', 'array');
+
 // Security check
 $expeditionid = GETPOST('id', 'int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'expedition', $expeditionid, '');
 
-$diroutputmassaction=$conf->expedition->dir_output . '/temp/massgeneration/'.$user->id;
-
 $search_ref_exp = GETPOST("search_ref_exp", 'alpha');
 $search_ref_liv = GETPOST('search_ref_liv', 'alpha');
 $search_ref_customer = GETPOST('search_ref_customer', 'alpha');
@@ -63,13 +68,15 @@ $sortorder = GETPOST('sortorder', 'alpha');
 $page = GETPOST('page', 'int');
 if (! $sortfield) $sortfield="e.ref";
 if (! $sortorder) $sortorder="DESC";
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1 || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 $viewstatut=GETPOST('viewstatut');
 
+$diroutputmassaction = $conf->expedition->dir_output.'/sending/temp/massgeneration/'.$user->id;
+
 $object = new Expedition($db);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -120,9 +127,10 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
 /*
  * Actions
  */
+$error = 0;
 
 if (GETPOST('cancel', 'alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction', 'alpha')) { $massaction=''; }
+if (! GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
 
 $parameters=array('socid'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
@@ -145,34 +153,28 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_type_thirdparty='';
 	$search_billed='';
 	$viewstatut='';
+    $toselect = '';
 	$search_array_options=array();
 }
 
 if (empty($reshook))
 {
-	// Mass actions. Controls on number of lines checked
-	$maxformassaction=1000;
-	$numtoselect = (is_array($toselect)?count($toselect):0);
-	if (! empty($massaction) && $numtoselect < 1)
-	{
-		$error++;
-		setEventMessages($langs->trans("NoLineChecked"), null, "warnings");
-	}
-	if (! $error && $numtoselect > $maxformassaction)
-	{
-		setEventMessages($langs->trans('TooManyRecordForMassAction', $maxformassaction), null, 'errors');
-		$error++;
-	}
+    $objectclass  = 'Expedition';
+    $objectlabel  = 'Sendings';
+    $permtoread   = $user->rights->expedition->lire;
+    $permtocreate = $user->rights->expedition->creer;
+    $permtodelete = $user->rights->expedition->supprimer;
+    $uploaddir    = $conf->expedition->dir_output . '/sending';
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
-
-
 /*
  * View
  */
 
 $form=new Form($db);
+$formfile = new FormFile($db);
 $companystatic=new Societe($db);
 $shipment=new Expedition($db);
 $formcompany=new FormCompany($db);
@@ -258,6 +260,8 @@ if ($resql)
 {
 	$num = $db->num_rows($resql);
 
+    $arrayofselected = is_array($toselect) ? $toselect : array();
+
 	$expedition = new Expedition($db);
 
 	$param='';
@@ -275,13 +279,18 @@ if ($resql)
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
-	//$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
+    $arrayofmassactions =  array(
+        'builddoc' => $langs->trans("PDFMerge"),
+        'presend'  => $langs->trans("SendByMail"),
+    );
+    if (in_array($massaction, array('presend'))) $arrayofmassactions=array();
+    $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 	$newcardbutton='';
 	if ($user->rights->expedition->creer)
 	{
         $newcardbutton.= dolGetButtonTitle($langs->trans('NewSending'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/expedition/card.php?action=create2');
-    }
+	}
 
 	$i = 0;
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
@@ -293,7 +302,13 @@ if ($resql)
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-	print_barre_liste($langs->trans('ListOfSendings'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit);
+	print_barre_liste($langs->trans('ListOfSendings'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit);
+
+    $topicmail = "SendShippingRef";
+    $modelmail = "shipping_send";
+    $objecttmp = new Expedition($db);
+    $trackid = 'shi'.$object->id;
+    include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 	if ($sall)
 	{
@@ -313,7 +328,8 @@ if ($resql)
 	}
 
 	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-	$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+	$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);
+	if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);// This also change content of $arrayfields
 
 	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
@@ -460,6 +476,7 @@ if ($resql)
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 	print "</tr>\n";
 
+    $typenArray = $formcompany->typent_array(1);
 	$i=0;
 	$totalarray=array();
 	while ($i < min($num, $limit))
@@ -537,8 +554,7 @@ if ($resql)
 		if (! empty($arrayfields['typent.code']['checked']))
 		{
 			print '<td class="center">';
-			if (count($typenArray)==0) $typenArray = $formcompany->typent_array(1);
-			print $typenArray[$obj->typent_code];
+			if (isset($typenArray[$obj->typent_code]))  print $typenArray[$obj->typent_code];
 			print '</td>';
 			if (! $i) $totalarray['nbfield']++;
 		}
@@ -613,14 +629,22 @@ if ($resql)
 			if (! $i) $totalarray['nbfield']++;
 		}
 
-		// Action column
-		print '<td></td>';
+        // 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>\n";
 
 		$i++;
 	}
+    $db->free($resql);
 
     $parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
     $reshook=$hookmanager->executeHooks('printFieldListFooter', $parameters);    // Note that $action and $object may have been modified by hook
@@ -629,7 +653,20 @@ if ($resql)
 	print "</table>";
 	print "</div>";
 	print '</form>';
-	$db->free($resql);
+
+    $hidegeneratedfilelistifempty = 1;
+    if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)   $hidegeneratedfilelistifempty = 0;
+
+    // Show list of available documents
+    $urlsource  = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+    $urlsource .= str_replace('&amp;', '&', $param);
+
+    $filedir    = $diroutputmassaction;
+    $genallowed = $user->rights->expedition->lire;
+    $delallowed = $user->rights->expedition->creer;
+    $title      = '';
+
+    print $formfile->showdocuments('massfilesarea_sendings', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
 else
 {
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 07318bc0571..dd87485ac56 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -2058,8 +2058,11 @@ else
 				        $totalpaid += $objp->amount;
 				        $i++;
 				    }
-				    $totalpaid = price2num($totalpaid);		// Round $totalpaid to fix floating problem after addition into loop
-
+					if (! is_null($totalpaid))
+					{
+				        $totalpaid = price2num($totalpaid);		// Round $totalpaid to fix floating problem after addition into loop
+					}
+					
 				    $remaintopay = price2num($object->total_ttc - $totalpaid);
 				    $resteapayeraffiche = $remaintopay;
 
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index ae63a132965..9b1a62ed402 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -2333,12 +2333,14 @@ class ExpenseReport extends CommonObject
 	        {
 	           $response->warning_delay=$conf->expensereport->approve->warning_delay/60/60/24;
 	           $response->label=$langs->trans("ExpenseReportsToApprove");
+	           $response->labelShort=$langs->trans("ToApprove");
 	           $response->url=DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&amp;statut=2';
 	        }
 	        else
 	        {
 	            $response->warning_delay=$conf->expensereport->payment->warning_delay/60/60/24;
 	            $response->label=$langs->trans("ExpenseReportsToPay");
+	            $response->labelShort=$langs->trans("ToPay");
 	            $response->url=DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&amp;statut=5';
 	        }
 	        $response->img=img_object('', "trip");
diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php
index 2702ad6c55e..9e1d717d36a 100644
--- a/htdocs/fichinter/class/api_interventions.class.php
+++ b/htdocs/fichinter/class/api_interventions.class.php
@@ -80,7 +80,7 @@ class Interventions extends DolibarrApi
 
         $result = $this->fichinter->fetch($id);
         if( ! $result ) {
-            throw new RestException(404, 'Intervention report not found');
+            throw new RestException(404, 'Intervention not found');
         }
 
         if( ! DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
@@ -174,10 +174,10 @@ class Interventions extends DolibarrApi
             }
         }
         else {
-            throw new RestException(503, 'Error when retrieve fichinter list : '.$db->lasterror());
+            throw new RestException(503, 'Error when retrieve intervention list : '.$db->lasterror());
         }
         if( ! count($obj_ret)) {
-            throw new RestException(404, 'No finchinter found');
+            throw new RestException(404, 'No intervention found');
         }
         return $obj_ret;
     }
@@ -200,7 +200,7 @@ class Interventions extends DolibarrApi
         }
 
         if ($this->fichinter->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating fichinter", array_merge(array($this->fichinter->error), $this->fichinter->errors));
+            throw new RestException(500, "Error creating intervention", array_merge(array($this->fichinter->error), $this->fichinter->errors));
         }
 
         return $this->fichinter->id;
@@ -301,7 +301,7 @@ class Interventions extends DolibarrApi
             throw new RestException(404, 'Intervention not found');
         }
 
-        if( ! DolibarrApi::_checkAccessToResource('commande', $this->fichinter->id)) {
+        if( ! DolibarrApi::_checkAccessToResource('fichinter', $this->fichinter->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
 
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index d3aafe94f26..c035adbcd60 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -149,6 +149,7 @@ if (empty($dolibarr_strict_mode)) $dolibarr_strict_mode=0; // For debug in php s
 // This test check if referrer ($_SERVER['HTTP_REFERER']) is same web site than Dolibarr ($_SERVER['HTTP_HOST'])
 // when we post forms (we allow GET to allow direct link to access a particular page).
 // Note about $_SERVER[HTTP_HOST/SERVER_NAME]: http://shiflett.org/blog/2006/mar/server-name-versus-http-host
+// See also option $conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN for a stronger CSRF protection.
 if (! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck))
 {
 	if (! empty($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] != 'GET' && ! empty($_SERVER['HTTP_HOST']))
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 416f7e11e94..a2da7a77494 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -19,10 +19,12 @@
 use Luracast\Restler\RestException;
 
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT . '/fourn/class/paiementfourn.class.php';
 
 /**
  * API class for supplier invoices
  *
+ * @property DoliDB db
  * @access protected
  * @class  DolibarrApiAccess {@requires user,external}
  */
@@ -46,7 +48,7 @@ class SupplierInvoices extends DolibarrApi
      */
     public function __construct()
     {
-        global $db, $conf;
+        global $db;
         $this->db = $db;
         $this->invoice = new FactureFournisseur($this->db);
     }
@@ -98,25 +100,27 @@ class SupplierInvoices extends DolibarrApi
      */
     public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $status = '', $sqlfilters = '')
     {
-        global $db, $conf;
+        global $db;
 
         $obj_ret = array();
 
         // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
-        $socids = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : $thirdparty_ids;
+        $socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
 
         // If the internal user must only see his customers, force searching by him
         $search_sale = 0;
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
+        if (! DolibarrApiAccess::$user->rights->societe->client->voir) $search_sale = DolibarrApiAccess::$user->id;
 
         $sql = "SELECT t.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+        // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+        if (!DolibarrApiAccess::$user->rights->societe->client->voir || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user";
         $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as t";
 
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+        // We need this table joined to the select in order to filter by sale
+        if (!DolibarrApiAccess::$user->rights->societe->client->voir || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 
         $sql.= ' WHERE t.entity IN ('.getEntity('supplier_invoice').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
+        if (!DolibarrApiAccess::$user->rights->societe->client->voir || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
         if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
         if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
 
@@ -186,8 +190,12 @@ class SupplierInvoices extends DolibarrApi
     /**
      * Create supplier invoice object
      *
-     * @param array $request_data   Request datas
+     * @param array $request_data Request datas
+     *
      * @return int  ID of supplier invoice
+     *
+     * @throws 401
+     * @throws 500
      */
     public function post($request_data = null)
     {
@@ -203,14 +211,6 @@ class SupplierInvoices extends DolibarrApi
         if(! array_keys($request_data, 'date')) {
             $this->invoice->date = dol_now();
         }
-        /* We keep lines as an array
-         if (isset($request_data["lines"])) {
-            $lines = array();
-            foreach ($request_data["lines"] as $line) {
-                array_push($lines, (object) $line);
-            }
-            $this->invoice->lines = $lines;
-        }*/
 
         if ($this->invoice->create(DolibarrApiAccess::$user) < 0) {
             throw new RestException(500, "Error creating order", array_merge(array($this->invoice->error), $this->invoice->errors));
@@ -223,7 +223,11 @@ class SupplierInvoices extends DolibarrApi
      *
      * @param int   $id             Id of supplier invoice to update
      * @param array $request_data   Datas
+     *
      * @return int
+     *
+     * @throws 401
+     * @throws 404
      */
     public function put($id, $request_data = null)
     {
@@ -255,7 +259,12 @@ class SupplierInvoices extends DolibarrApi
      * Delete supplier invoice
      *
      * @param int   $id Supplier invoice ID
-     * @return type
+     *
+     * @return array
+     *
+     * @throws 401
+     * @throws 404
+     * @throws 500
      */
     public function delete($id)
     {
@@ -276,7 +285,7 @@ class SupplierInvoices extends DolibarrApi
             throw new RestException(500);
         }
 
-         return array(
+        return array(
             'success' => array(
                 'code' => 200,
                 'message' => 'Supplier invoice deleted'
@@ -284,7 +293,6 @@ class SupplierInvoices extends DolibarrApi
         );
     }
 
-
     /**
      * Validate an order
      *
@@ -295,13 +303,12 @@ class SupplierInvoices extends DolibarrApi
      * @url POST    {id}/validate
      *
      * @return  array
-     * FIXME An error 403 is returned if the request has an empty body.
-     * Error message: "Forbidden: Content type `text/plain` is not supported."
-     * Workaround: send this in the body
-     * {
-     *   "idwarehouse": 0,
-     *   "notrigger": 0
-     * }
+     *
+     * @throws 304
+     * @throws 401
+     * @throws 404
+     * @throws 405
+     * @throws 500
      */
     public function validate($id, $idwarehouse = 0, $notrigger = 0)
     {
@@ -333,6 +340,145 @@ class SupplierInvoices extends DolibarrApi
         );
     }
 
+    /**
+     * Get list of payments of a given supplier invoice
+     *
+     * @param int   $id             Id of SupplierInvoice
+     *
+     * @url     GET {id}/payments
+     *
+     * @return array
+     * @throws 400
+     * @throws 401
+     * @throws 404
+     * @throws 405
+     */
+    public function getPayments($id)
+    {
+        if(! DolibarrApiAccess::$user->rights->fournisseur->facture->lire) {
+            throw new RestException(401);
+        }
+        if(empty($id)) {
+            throw new RestException(400, 'Invoice ID is mandatory');
+        }
+
+		if( ! DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+        $result = $this->invoice->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Invoice not found');
+        }
+
+        $result = $this->invoice->getListOfPayments();
+        if( $result < 0) {
+            throw new RestException(405, $this->invoice->error);
+        }
+
+        return $result;
+    }
+
+
+    /**
+     * Add payment line to a specific supplier 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  $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 {id}/payments
+     *
+     * @return int  Payment ID
+     * @throws 400
+     * @throws 401
+     * @throws 404
+     */
+    public function addPayment($id, $datepaye, $paiementid, $closepaidinvoices, $accountid, $num_paiement = '', $comment = '', $chqemetteur = '', $chqbank = '')
+    {
+        global $conf;
+
+        if(! DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
+            throw new RestException(403);
+        }
+        if(empty($id)) {
+            throw new RestException(400, 'Invoice ID is mandatory');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
+            throw new RestException(401, '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();
+        $totaldeposits = $this->invoice->getSumDepositsUsed();
+        $resteapayer = price2num($this->invoice->total_ttc - $totalpaye - $totaldeposits, 'MT');
+
+        $this->db->begin();
+
+        $amounts = array();
+        $multicurrency_amounts = array();
+
+        $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 PaiementFourn($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_payment = $num_paiement;
+        $paiement->note_public = $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)) {
+            $result=$paiement->addPaymentToBank(DolibarrApiAccess::$user, 'payment_supplier', '(SupplierInvoicePayment)', $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;
+    }
+
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      * Clean sensible object datas
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 9d5bfce0189..2edd86d1c10 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2835,6 +2835,7 @@ class CommandeFournisseur extends CommonOrder
 	        $response = new WorkboardResponse();
 	        $response->warning_delay=$conf->commande->fournisseur->warning_delay/60/60/24;
 	        $response->label=$langs->trans("SuppliersOrdersToProcess");
+	        $response->labelShort=$langs->trans("Opened");
 	        $response->url=DOL_URL_ROOT.'/fourn/commande/list.php?statut=1,2,3&mainmenu=commercial&leftmenu=orders_suppliers';
 	        $response->img=img_object('', "order");
 
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 41ac2f126a7..b1c623bb0f0 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -36,6 +36,7 @@
 
 include_once DOL_DOCUMENT_ROOT.'/core/class/commoninvoice.class.php';
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 /**
  *	Class to manage suppliers invoices
@@ -412,17 +413,6 @@ class FactureFournisseur extends CommonInvoice
 				}
 			}
 
-			// Add linked object (deprecated, use ->linkedObjectsIds instead)
-            if (! $error && $this->id && ! empty($this->origin) && ! empty($this->origin_id))
-            {
-                $ret = $this->add_object_linked();
-                if (! $ret)
-                {
-                    dol_print_error($this->db);
-                    $error++;
-                }
-            }
-
 			if (count($this->lines) && is_object($this->lines[0]))	// If this->lines is array of InvoiceLines (preferred mode)
 			{
 				dol_syslog("There is ".count($this->lines)." lines that are invoice lines objects");
@@ -2213,6 +2203,7 @@ class FactureFournisseur extends CommonInvoice
 	        $response = new WorkboardResponse();
 	        $response->warning_delay=$conf->facture->fournisseur->warning_delay/60/60/24;
 	        $response->label=$langs->trans("SupplierBillsToPay");
+	        $response->labelShort=$langs->trans("ToPay");
 
 	        $response->url=DOL_URL_ROOT.'/fourn/facture/list.php?search_status=1&mainmenu=billing&leftmenu=suppliers_bills';
 	        $response->img=img_object($langs->trans("Bills"), "bill");
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 0245073a060..66c212ef4c7 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -2228,6 +2228,7 @@ class Holiday extends CommonObject
             $response = new WorkboardResponse();
             $response->warning_delay=$conf->holiday->approve->warning_delay/60/60/24;
             $response->label=$langs->trans("HolidaysToApprove");
+            $response->labelShort=$langs->trans("ToApprove");
             $response->url=DOL_URL_ROOT.'/holiday/list.php?search_statut=2&mainmenu=hrm&leftmenu=holiday';
             $response->img=img_object('', "holiday");
 
diff --git a/htdocs/includes/geoip/geoip.inc b/htdocs/includes/geoip/geoip.inc
index 3e9306652ce..301c7f266eb 100644
--- a/htdocs/includes/geoip/geoip.inc
+++ b/htdocs/includes/geoip/geoip.inc
@@ -28,15 +28,15 @@ define("GEOIP_MEMORY_CACHE", 1);
 define("GEOIP_SHARED_MEMORY", 2);
 define("STRUCTURE_INFO_MAX_SIZE", 20);
 define("DATABASE_INFO_MAX_SIZE", 100);
-define("GEOIP_COUNTRY_EDITION", 106);
+define("GEOIP_COUNTRY_EDITION", 1);
 define("GEOIP_PROXY_EDITION", 8);
 define("GEOIP_ASNUM_EDITION", 9);
 define("GEOIP_NETSPEED_EDITION", 10);
-define("GEOIP_REGION_EDITION_REV0", 112);
+define("GEOIP_REGION_EDITION_REV0", 7);
 define("GEOIP_REGION_EDITION_REV1", 3);
-define("GEOIP_CITY_EDITION_REV0", 111);
+define("GEOIP_CITY_EDITION_REV0", 6);
 define("GEOIP_CITY_EDITION_REV1", 2);
-define("GEOIP_ORG_EDITION", 110);
+define("GEOIP_ORG_EDITION", 5);
 define("GEOIP_ISP_EDITION", 4);
 define("SEGMENT_RECORD_LENGTH", 3);
 define("STANDARD_RECORD_LENGTH", 3);
@@ -52,450 +52,1839 @@ define("GEOIP_UNKNOWN_SPEED", 0);
 define("GEOIP_DIALUP_SPEED", 1);
 define("GEOIP_CABLEDSL_SPEED", 2);
 define("GEOIP_CORPORATE_SPEED", 3);
+define("GEOIP_DOMAIN_EDITION", 11);
+define("GEOIP_COUNTRY_EDITION_V6", 12);
+define("GEOIP_LOCATIONA_EDITION", 13);
+define("GEOIP_ACCURACYRADIUS_EDITION", 14);
+define("GEOIP_CITYCOMBINED_EDITION", 15);
+define("GEOIP_CITY_EDITION_REV1_V6", 30);
+define("GEOIP_CITY_EDITION_REV0_V6", 31);
+define("GEOIP_NETSPEED_EDITION_REV1", 32);
+define("GEOIP_NETSPEED_EDITION_REV1_V6", 33);
+define("GEOIP_USERTYPE_EDITION", 28);
+define("GEOIP_USERTYPE_EDITION_V6", 29);
+define("GEOIP_ASNUM_EDITION_V6", 21);
+define("GEOIP_ISP_EDITION_V6", 22);
+define("GEOIP_ORG_EDITION_V6", 23);
+define("GEOIP_DOMAIN_EDITION_V6", 24);
 
-class GeoIP {
-    var $flags;
-    var $filehandle;
-    var $memory_buffer;
-    var $databaseType;
-    var $databaseSegments;
-    var $record_length;
-    var $shmid;
-    var $GEOIP_COUNTRY_CODE_TO_NUMBER = array(
-"" => 0, "AP" => 1, "EU" => 2, "AD" => 3, "AE" => 4, "AF" => 5, 
-"AG" => 6, "AI" => 7, "AL" => 8, "AM" => 9, "AN" => 10, "AO" => 11, 
-"AQ" => 12, "AR" => 13, "AS" => 14, "AT" => 15, "AU" => 16, "AW" => 17, 
-"AZ" => 18, "BA" => 19, "BB" => 20, "BD" => 21, "BE" => 22, "BF" => 23, 
-"BG" => 24, "BH" => 25, "BI" => 26, "BJ" => 27, "BM" => 28, "BN" => 29, 
-"BO" => 30, "BR" => 31, "BS" => 32, "BT" => 33, "BV" => 34, "BW" => 35, 
-"BY" => 36, "BZ" => 37, "CA" => 38, "CC" => 39, "CD" => 40, "CF" => 41, 
-"CG" => 42, "CH" => 43, "CI" => 44, "CK" => 45, "CL" => 46, "CM" => 47, 
-"CN" => 48, "CO" => 49, "CR" => 50, "CU" => 51, "CV" => 52, "CX" => 53, 
-"CY" => 54, "CZ" => 55, "DE" => 56, "DJ" => 57, "DK" => 58, "DM" => 59, 
-"DO" => 60, "DZ" => 61, "EC" => 62, "EE" => 63, "EG" => 64, "EH" => 65, 
-"ER" => 66, "ES" => 67, "ET" => 68, "FI" => 69, "FJ" => 70, "FK" => 71, 
-"FM" => 72, "FO" => 73, "FR" => 74, "FX" => 75, "GA" => 76, "GB" => 77,
-"GD" => 78, "GE" => 79, "GF" => 80, "GH" => 81, "GI" => 82, "GL" => 83, 
-"GM" => 84, "GN" => 85, "GP" => 86, "GQ" => 87, "GR" => 88, "GS" => 89, 
-"GT" => 90, "GU" => 91, "GW" => 92, "GY" => 93, "HK" => 94, "HM" => 95, 
-"HN" => 96, "HR" => 97, "HT" => 98, "HU" => 99, "ID" => 100, "IE" => 101, 
-"IL" => 102, "IN" => 103, "IO" => 104, "IQ" => 105, "IR" => 106, "IS" => 107, 
-"IT" => 108, "JM" => 109, "JO" => 110, "JP" => 111, "KE" => 112, "KG" => 113, 
-"KH" => 114, "KI" => 115, "KM" => 116, "KN" => 117, "KP" => 118, "KR" => 119, 
-"KW" => 120, "KY" => 121, "KZ" => 122, "LA" => 123, "LB" => 124, "LC" => 125, 
-"LI" => 126, "LK" => 127, "LR" => 128, "LS" => 129, "LT" => 130, "LU" => 131, 
-"LV" => 132, "LY" => 133, "MA" => 134, "MC" => 135, "MD" => 136, "MG" => 137, 
-"MH" => 138, "MK" => 139, "ML" => 140, "MM" => 141, "MN" => 142, "MO" => 143, 
-"MP" => 144, "MQ" => 145, "MR" => 146, "MS" => 147, "MT" => 148, "MU" => 149, 
-"MV" => 150, "MW" => 151, "MX" => 152, "MY" => 153, "MZ" => 154, "NA" => 155,
-"NC" => 156, "NE" => 157, "NF" => 158, "NG" => 159, "NI" => 160, "NL" => 161, 
-"NO" => 162, "NP" => 163, "NR" => 164, "NU" => 165, "NZ" => 166, "OM" => 167, 
-"PA" => 168, "PE" => 169, "PF" => 170, "PG" => 171, "PH" => 172, "PK" => 173, 
-"PL" => 174, "PM" => 175, "PN" => 176, "PR" => 177, "PS" => 178, "PT" => 179, 
-"PW" => 180, "PY" => 181, "QA" => 182, "RE" => 183, "RO" => 184, "RU" => 185, 
-"RW" => 186, "SA" => 187, "SB" => 188, "SC" => 189, "SD" => 190, "SE" => 191, 
-"SG" => 192, "SH" => 193, "SI" => 194, "SJ" => 195, "SK" => 196, "SL" => 197, 
-"SM" => 198, "SN" => 199, "SO" => 200, "SR" => 201, "ST" => 202, "SV" => 203, 
-"SY" => 204, "SZ" => 205, "TC" => 206, "TD" => 207, "TF" => 208, "TG" => 209, 
-"TH" => 210, "TJ" => 211, "TK" => 212, "TM" => 213, "TN" => 214, "TO" => 215, 
-"TL" => 216, "TR" => 217, "TT" => 218, "TV" => 219, "TW" => 220, "TZ" => 221, 
-"UA" => 222, "UG" => 223, "UM" => 224, "US" => 225, "UY" => 226, "UZ" => 227, 
-"VA" => 228, "VC" => 229, "VE" => 230, "VG" => 231, "VI" => 232, "VN" => 233,
-"VU" => 234, "WF" => 235, "WS" => 236, "YE" => 237, "YT" => 238, "RS" => 239, 
-"ZA" => 240, "ZM" => 241, "ME" => 242, "ZW" => 243, "A1" => 244, "A2" => 245, 
-"O1" => 246, "AX" => 247, "GG" => 248, "IM" => 249, "JE" => 250, "BL" => 251,
-"MF" => 252
-);
-    var $GEOIP_COUNTRY_CODES = array(
-"", "AP", "EU", "AD", "AE", "AF", "AG", "AI", "AL", "AM", "AN", "AO", "AQ",
-"AR", "AS", "AT", "AU", "AW", "AZ", "BA", "BB", "BD", "BE", "BF", "BG", "BH",
-"BI", "BJ", "BM", "BN", "BO", "BR", "BS", "BT", "BV", "BW", "BY", "BZ", "CA",
-"CC", "CD", "CF", "CG", "CH", "CI", "CK", "CL", "CM", "CN", "CO", "CR", "CU",
-"CV", "CX", "CY", "CZ", "DE", "DJ", "DK", "DM", "DO", "DZ", "EC", "EE", "EG",
-"EH", "ER", "ES", "ET", "FI", "FJ", "FK", "FM", "FO", "FR", "FX", "GA", "GB",
-"GD", "GE", "GF", "GH", "GI", "GL", "GM", "GN", "GP", "GQ", "GR", "GS", "GT",
-"GU", "GW", "GY", "HK", "HM", "HN", "HR", "HT", "HU", "ID", "IE", "IL", "IN",
-"IO", "IQ", "IR", "IS", "IT", "JM", "JO", "JP", "KE", "KG", "KH", "KI", "KM",
-"KN", "KP", "KR", "KW", "KY", "KZ", "LA", "LB", "LC", "LI", "LK", "LR", "LS",
-"LT", "LU", "LV", "LY", "MA", "MC", "MD", "MG", "MH", "MK", "ML", "MM", "MN",
-"MO", "MP", "MQ", "MR", "MS", "MT", "MU", "MV", "MW", "MX", "MY", "MZ", "NA",
-"NC", "NE", "NF", "NG", "NI", "NL", "NO", "NP", "NR", "NU", "NZ", "OM", "PA",
-"PE", "PF", "PG", "PH", "PK", "PL", "PM", "PN", "PR", "PS", "PT", "PW", "PY",
-"QA", "RE", "RO", "RU", "RW", "SA", "SB", "SC", "SD", "SE", "SG", "SH", "SI",
-"SJ", "SK", "SL", "SM", "SN", "SO", "SR", "ST", "SV", "SY", "SZ", "TC", "TD",
-"TF", "TG", "TH", "TJ", "TK", "TM", "TN", "TO", "TL", "TR", "TT", "TV", "TW",
-"TZ", "UA", "UG", "UM", "US", "UY", "UZ", "VA", "VC", "VE", "VG", "VI", "VN",
-"VU", "WF", "WS", "YE", "YT", "RS", "ZA", "ZM", "ME", "ZW", "A1", "A2", "O1",
-"AX", "GG", "IM", "JE", "BL", "MF"
-);
-    var $GEOIP_COUNTRY_CODES3 = array(
-"","AP","EU","AND","ARE","AFG","ATG","AIA","ALB","ARM","ANT","AGO","AQ","ARG",
-"ASM","AUT","AUS","ABW","AZE","BIH","BRB","BGD","BEL","BFA","BGR","BHR","BDI",
-"BEN","BMU","BRN","BOL","BRA","BHS","BTN","BV","BWA","BLR","BLZ","CAN","CC",
-"COD","CAF","COG","CHE","CIV","COK","CHL","CMR","CHN","COL","CRI","CUB","CPV",
-"CX","CYP","CZE","DEU","DJI","DNK","DMA","DOM","DZA","ECU","EST","EGY","ESH",
-"ERI","ESP","ETH","FIN","FJI","FLK","FSM","FRO","FRA","FX","GAB","GBR","GRD",
-"GEO","GUF","GHA","GIB","GRL","GMB","GIN","GLP","GNQ","GRC","GS","GTM","GUM",
-"GNB","GUY","HKG","HM","HND","HRV","HTI","HUN","IDN","IRL","ISR","IND","IO",
-"IRQ","IRN","ISL","ITA","JAM","JOR","JPN","KEN","KGZ","KHM","KIR","COM","KNA",
-"PRK","KOR","KWT","CYM","KAZ","LAO","LBN","LCA","LIE","LKA","LBR","LSO","LTU",
-"LUX","LVA","LBY","MAR","MCO","MDA","MDG","MHL","MKD","MLI","MMR","MNG","MAC",
-"MNP","MTQ","MRT","MSR","MLT","MUS","MDV","MWI","MEX","MYS","MOZ","NAM","NCL",
-"NER","NFK","NGA","NIC","NLD","NOR","NPL","NRU","NIU","NZL","OMN","PAN","PER",
-"PYF","PNG","PHL","PAK","POL","SPM","PCN","PRI","PSE","PRT","PLW","PRY","QAT",
-"REU","ROU","RUS","RWA","SAU","SLB","SYC","SDN","SWE","SGP","SHN","SVN","SJM",
-"SVK","SLE","SMR","SEN","SOM","SUR","STP","SLV","SYR","SWZ","TCA","TCD","TF",
-"TGO","THA","TJK","TKL","TLS","TKM","TUN","TON","TUR","TTO","TUV","TWN","TZA",
-"UKR","UGA","UM","USA","URY","UZB","VAT","VCT","VEN","VGB","VIR","VNM","VUT",
-"WLF","WSM","YEM","YT","SRB","ZAF","ZMB","MNE","ZWE","A1","A2","O1",
-"ALA","GGY","IMN","JEY","BLM","MAF"
-    );
-    var $GEOIP_COUNTRY_NAMES = array(
-"", "Asia/Pacific Region", "Europe", "Andorra", "United Arab Emirates",
-"Afghanistan", "Antigua and Barbuda", "Anguilla", "Albania", "Armenia",
-"Netherlands Antilles", "Angola", "Antarctica", "Argentina", "American Samoa",
-"Austria", "Australia", "Aruba", "Azerbaijan", "Bosnia and Herzegovina",
-"Barbados", "Bangladesh", "Belgium", "Burkina Faso", "Bulgaria", "Bahrain",
-"Burundi", "Benin", "Bermuda", "Brunei Darussalam", "Bolivia", "Brazil",
-"Bahamas", "Bhutan", "Bouvet Island", "Botswana", "Belarus", "Belize",
-"Canada", "Cocos (Keeling) Islands", "Congo, The Democratic Republic of the",
-"Central African Republic", "Congo", "Switzerland", "Cote D'Ivoire", "Cook Islands",
-"Chile", "Cameroon", "China", "Colombia", "Costa Rica", "Cuba", "Cape Verde",
-"Christmas Island", "Cyprus", "Czech Republic", "Germany", "Djibouti",
-"Denmark", "Dominica", "Dominican Republic", "Algeria", "Ecuador", "Estonia",
-"Egypt", "Western Sahara", "Eritrea", "Spain", "Ethiopia", "Finland", "Fiji",
-"Falkland Islands (Malvinas)", "Micronesia, Federated States of", "Faroe Islands",
-"France", "France, Metropolitan", "Gabon", "United Kingdom",
-"Grenada", "Georgia", "French Guiana", "Ghana", "Gibraltar", "Greenland",
-"Gambia", "Guinea", "Guadeloupe", "Equatorial Guinea", "Greece", "South Georgia and the South Sandwich Islands",
-"Guatemala", "Guam", "Guinea-Bissau",
-"Guyana", "Hong Kong", "Heard Island and McDonald Islands", "Honduras",
-"Croatia", "Haiti", "Hungary", "Indonesia", "Ireland", "Israel", "India",
-"British Indian Ocean Territory", "Iraq", "Iran, Islamic Republic of",
-"Iceland", "Italy", "Jamaica", "Jordan", "Japan", "Kenya", "Kyrgyzstan",
-"Cambodia", "Kiribati", "Comoros", "Saint Kitts and Nevis", "Korea, Democratic People's Republic of",
-"Korea, Republic of", "Kuwait", "Cayman Islands",
-"Kazakhstan", "Lao People's Democratic Republic", "Lebanon", "Saint Lucia",
-"Liechtenstein", "Sri Lanka", "Liberia", "Lesotho", "Lithuania", "Luxembourg",
-"Latvia", "Libyan Arab Jamahiriya", "Morocco", "Monaco", "Moldova, Republic of",
-"Madagascar", "Marshall Islands", "Macedonia",
-"Mali", "Myanmar", "Mongolia", "Macau", "Northern Mariana Islands",
-"Martinique", "Mauritania", "Montserrat", "Malta", "Mauritius", "Maldives",
-"Malawi", "Mexico", "Malaysia", "Mozambique", "Namibia", "New Caledonia",
-"Niger", "Norfolk Island", "Nigeria", "Nicaragua", "Netherlands", "Norway",
-"Nepal", "Nauru", "Niue", "New Zealand", "Oman", "Panama", "Peru", "French Polynesia",
-"Papua New Guinea", "Philippines", "Pakistan", "Poland", "Saint Pierre and Miquelon",
-"Pitcairn Islands", "Puerto Rico", "Palestinian Territory",
-"Portugal", "Palau", "Paraguay", "Qatar", "Reunion", "Romania",
-"Russian Federation", "Rwanda", "Saudi Arabia", "Solomon Islands",
-"Seychelles", "Sudan", "Sweden", "Singapore", "Saint Helena", "Slovenia",
-"Svalbard and Jan Mayen", "Slovakia", "Sierra Leone", "San Marino", "Senegal",
-"Somalia", "Suriname", "Sao Tome and Principe", "El Salvador", "Syrian Arab Republic",
-"Swaziland", "Turks and Caicos Islands", "Chad", "French Southern Territories",
-"Togo", "Thailand", "Tajikistan", "Tokelau", "Turkmenistan",
-"Tunisia", "Tonga", "Timor-Leste", "Turkey", "Trinidad and Tobago", "Tuvalu",
-"Taiwan", "Tanzania, United Republic of", "Ukraine",
-"Uganda", "United States Minor Outlying Islands", "United States", "Uruguay",
-"Uzbekistan", "Holy See (Vatican City State)", "Saint Vincent and the Grenadines",
-"Venezuela", "Virgin Islands, British", "Virgin Islands, U.S.",
-"Vietnam", "Vanuatu", "Wallis and Futuna", "Samoa", "Yemen", "Mayotte",
-"Serbia", "South Africa", "Zambia", "Montenegro", "Zimbabwe",
-"Anonymous Proxy","Satellite Provider","Other",
-"Aland Islands","Guernsey","Isle of Man","Jersey","Saint Barthelemy","Saint Martin"
-);
-}
-function geoip_load_shared_mem ($file) {
+define("CITYCOMBINED_FIXED_RECORD", 7);
 
-  $fp = fopen($file, "rb");
-  if (!$fp) {
-    print "error opening $file: $php_errormsg\n";
-    exit;
-  }
-  $s_array = fstat($fp);
-  $size = $s_array['size'];
-  if ($shmid = @shmop_open (GEOIP_SHM_KEY, "w", 0, 0)) {
-    shmop_delete ($shmid);
-    shmop_close ($shmid);
-  }
-  $shmid = shmop_open (GEOIP_SHM_KEY, "c", 0644, $size);
-  shmop_write ($shmid, fread($fp, $size), 0);
-  shmop_close ($shmid);
+class GeoIP
+{
+	public $flags;
+	public $filehandle;
+	public $memory_buffer;
+	public $databaseType;
+	public $databaseSegments;
+	public $record_length;
+	public $shmid;
+	public $GEOIP_COUNTRY_CODE_TO_NUMBER = array(
+		"" => 0,
+		"AP" => 1,
+		"EU" => 2,
+		"AD" => 3,
+		"AE" => 4,
+		"AF" => 5,
+		"AG" => 6,
+		"AI" => 7,
+		"AL" => 8,
+		"AM" => 9,
+		"CW" => 10,
+		"AO" => 11,
+		"AQ" => 12,
+		"AR" => 13,
+		"AS" => 14,
+		"AT" => 15,
+		"AU" => 16,
+		"AW" => 17,
+		"AZ" => 18,
+		"BA" => 19,
+		"BB" => 20,
+		"BD" => 21,
+		"BE" => 22,
+		"BF" => 23,
+		"BG" => 24,
+		"BH" => 25,
+		"BI" => 26,
+		"BJ" => 27,
+		"BM" => 28,
+		"BN" => 29,
+		"BO" => 30,
+		"BR" => 31,
+		"BS" => 32,
+		"BT" => 33,
+		"BV" => 34,
+		"BW" => 35,
+		"BY" => 36,
+		"BZ" => 37,
+		"CA" => 38,
+		"CC" => 39,
+		"CD" => 40,
+		"CF" => 41,
+		"CG" => 42,
+		"CH" => 43,
+		"CI" => 44,
+		"CK" => 45,
+		"CL" => 46,
+		"CM" => 47,
+		"CN" => 48,
+		"CO" => 49,
+		"CR" => 50,
+		"CU" => 51,
+		"CV" => 52,
+		"CX" => 53,
+		"CY" => 54,
+		"CZ" => 55,
+		"DE" => 56,
+		"DJ" => 57,
+		"DK" => 58,
+		"DM" => 59,
+		"DO" => 60,
+		"DZ" => 61,
+		"EC" => 62,
+		"EE" => 63,
+		"EG" => 64,
+		"EH" => 65,
+		"ER" => 66,
+		"ES" => 67,
+		"ET" => 68,
+		"FI" => 69,
+		"FJ" => 70,
+		"FK" => 71,
+		"FM" => 72,
+		"FO" => 73,
+		"FR" => 74,
+		"SX" => 75,
+		"GA" => 76,
+		"GB" => 77,
+		"GD" => 78,
+		"GE" => 79,
+		"GF" => 80,
+		"GH" => 81,
+		"GI" => 82,
+		"GL" => 83,
+		"GM" => 84,
+		"GN" => 85,
+		"GP" => 86,
+		"GQ" => 87,
+		"GR" => 88,
+		"GS" => 89,
+		"GT" => 90,
+		"GU" => 91,
+		"GW" => 92,
+		"GY" => 93,
+		"HK" => 94,
+		"HM" => 95,
+		"HN" => 96,
+		"HR" => 97,
+		"HT" => 98,
+		"HU" => 99,
+		"ID" => 100,
+		"IE" => 101,
+		"IL" => 102,
+		"IN" => 103,
+		"IO" => 104,
+		"IQ" => 105,
+		"IR" => 106,
+		"IS" => 107,
+		"IT" => 108,
+		"JM" => 109,
+		"JO" => 110,
+		"JP" => 111,
+		"KE" => 112,
+		"KG" => 113,
+		"KH" => 114,
+		"KI" => 115,
+		"KM" => 116,
+		"KN" => 117,
+		"KP" => 118,
+		"KR" => 119,
+		"KW" => 120,
+		"KY" => 121,
+		"KZ" => 122,
+		"LA" => 123,
+		"LB" => 124,
+		"LC" => 125,
+		"LI" => 126,
+		"LK" => 127,
+		"LR" => 128,
+		"LS" => 129,
+		"LT" => 130,
+		"LU" => 131,
+		"LV" => 132,
+		"LY" => 133,
+		"MA" => 134,
+		"MC" => 135,
+		"MD" => 136,
+		"MG" => 137,
+		"MH" => 138,
+		"MK" => 139,
+		"ML" => 140,
+		"MM" => 141,
+		"MN" => 142,
+		"MO" => 143,
+		"MP" => 144,
+		"MQ" => 145,
+		"MR" => 146,
+		"MS" => 147,
+		"MT" => 148,
+		"MU" => 149,
+		"MV" => 150,
+		"MW" => 151,
+		"MX" => 152,
+		"MY" => 153,
+		"MZ" => 154,
+		"NA" => 155,
+		"NC" => 156,
+		"NE" => 157,
+		"NF" => 158,
+		"NG" => 159,
+		"NI" => 160,
+		"NL" => 161,
+		"NO" => 162,
+		"NP" => 163,
+		"NR" => 164,
+		"NU" => 165,
+		"NZ" => 166,
+		"OM" => 167,
+		"PA" => 168,
+		"PE" => 169,
+		"PF" => 170,
+		"PG" => 171,
+		"PH" => 172,
+		"PK" => 173,
+		"PL" => 174,
+		"PM" => 175,
+		"PN" => 176,
+		"PR" => 177,
+		"PS" => 178,
+		"PT" => 179,
+		"PW" => 180,
+		"PY" => 181,
+		"QA" => 182,
+		"RE" => 183,
+		"RO" => 184,
+		"RU" => 185,
+		"RW" => 186,
+		"SA" => 187,
+		"SB" => 188,
+		"SC" => 189,
+		"SD" => 190,
+		"SE" => 191,
+		"SG" => 192,
+		"SH" => 193,
+		"SI" => 194,
+		"SJ" => 195,
+		"SK" => 196,
+		"SL" => 197,
+		"SM" => 198,
+		"SN" => 199,
+		"SO" => 200,
+		"SR" => 201,
+		"ST" => 202,
+		"SV" => 203,
+		"SY" => 204,
+		"SZ" => 205,
+		"TC" => 206,
+		"TD" => 207,
+		"TF" => 208,
+		"TG" => 209,
+		"TH" => 210,
+		"TJ" => 211,
+		"TK" => 212,
+		"TM" => 213,
+		"TN" => 214,
+		"TO" => 215,
+		"TL" => 216,
+		"TR" => 217,
+		"TT" => 218,
+		"TV" => 219,
+		"TW" => 220,
+		"TZ" => 221,
+		"UA" => 222,
+		"UG" => 223,
+		"UM" => 224,
+		"US" => 225,
+		"UY" => 226,
+		"UZ" => 227,
+		"VA" => 228,
+		"VC" => 229,
+		"VE" => 230,
+		"VG" => 231,
+		"VI" => 232,
+		"VN" => 233,
+		"VU" => 234,
+		"WF" => 235,
+		"WS" => 236,
+		"YE" => 237,
+		"YT" => 238,
+		"RS" => 239,
+		"ZA" => 240,
+		"ZM" => 241,
+		"ME" => 242,
+		"ZW" => 243,
+		"A1" => 244,
+		"A2" => 245,
+		"O1" => 246,
+		"AX" => 247,
+		"GG" => 248,
+		"IM" => 249,
+		"JE" => 250,
+		"BL" => 251,
+		"MF" => 252,
+		"BQ" => 253,
+		"SS" => 254
+	);
+
+	public $GEOIP_COUNTRY_CODES = array(
+		"",
+		"AP",
+		"EU",
+		"AD",
+		"AE",
+		"AF",
+		"AG",
+		"AI",
+		"AL",
+		"AM",
+		"CW",
+		"AO",
+		"AQ",
+		"AR",
+		"AS",
+		"AT",
+		"AU",
+		"AW",
+		"AZ",
+		"BA",
+		"BB",
+		"BD",
+		"BE",
+		"BF",
+		"BG",
+		"BH",
+		"BI",
+		"BJ",
+		"BM",
+		"BN",
+		"BO",
+		"BR",
+		"BS",
+		"BT",
+		"BV",
+		"BW",
+		"BY",
+		"BZ",
+		"CA",
+		"CC",
+		"CD",
+		"CF",
+		"CG",
+		"CH",
+		"CI",
+		"CK",
+		"CL",
+		"CM",
+		"CN",
+		"CO",
+		"CR",
+		"CU",
+		"CV",
+		"CX",
+		"CY",
+		"CZ",
+		"DE",
+		"DJ",
+		"DK",
+		"DM",
+		"DO",
+		"DZ",
+		"EC",
+		"EE",
+		"EG",
+		"EH",
+		"ER",
+		"ES",
+		"ET",
+		"FI",
+		"FJ",
+		"FK",
+		"FM",
+		"FO",
+		"FR",
+		"SX",
+		"GA",
+		"GB",
+		"GD",
+		"GE",
+		"GF",
+		"GH",
+		"GI",
+		"GL",
+		"GM",
+		"GN",
+		"GP",
+		"GQ",
+		"GR",
+		"GS",
+		"GT",
+		"GU",
+		"GW",
+		"GY",
+		"HK",
+		"HM",
+		"HN",
+		"HR",
+		"HT",
+		"HU",
+		"ID",
+		"IE",
+		"IL",
+		"IN",
+		"IO",
+		"IQ",
+		"IR",
+		"IS",
+		"IT",
+		"JM",
+		"JO",
+		"JP",
+		"KE",
+		"KG",
+		"KH",
+		"KI",
+		"KM",
+		"KN",
+		"KP",
+		"KR",
+		"KW",
+		"KY",
+		"KZ",
+		"LA",
+		"LB",
+		"LC",
+		"LI",
+		"LK",
+		"LR",
+		"LS",
+		"LT",
+		"LU",
+		"LV",
+		"LY",
+		"MA",
+		"MC",
+		"MD",
+		"MG",
+		"MH",
+		"MK",
+		"ML",
+		"MM",
+		"MN",
+		"MO",
+		"MP",
+		"MQ",
+		"MR",
+		"MS",
+		"MT",
+		"MU",
+		"MV",
+		"MW",
+		"MX",
+		"MY",
+		"MZ",
+		"NA",
+		"NC",
+		"NE",
+		"NF",
+		"NG",
+		"NI",
+		"NL",
+		"NO",
+		"NP",
+		"NR",
+		"NU",
+		"NZ",
+		"OM",
+		"PA",
+		"PE",
+		"PF",
+		"PG",
+		"PH",
+		"PK",
+		"PL",
+		"PM",
+		"PN",
+		"PR",
+		"PS",
+		"PT",
+		"PW",
+		"PY",
+		"QA",
+		"RE",
+		"RO",
+		"RU",
+		"RW",
+		"SA",
+		"SB",
+		"SC",
+		"SD",
+		"SE",
+		"SG",
+		"SH",
+		"SI",
+		"SJ",
+		"SK",
+		"SL",
+		"SM",
+		"SN",
+		"SO",
+		"SR",
+		"ST",
+		"SV",
+		"SY",
+		"SZ",
+		"TC",
+		"TD",
+		"TF",
+		"TG",
+		"TH",
+		"TJ",
+		"TK",
+		"TM",
+		"TN",
+		"TO",
+		"TL",
+		"TR",
+		"TT",
+		"TV",
+		"TW",
+		"TZ",
+		"UA",
+		"UG",
+		"UM",
+		"US",
+		"UY",
+		"UZ",
+		"VA",
+		"VC",
+		"VE",
+		"VG",
+		"VI",
+		"VN",
+		"VU",
+		"WF",
+		"WS",
+		"YE",
+		"YT",
+		"RS",
+		"ZA",
+		"ZM",
+		"ME",
+		"ZW",
+		"A1",
+		"A2",
+		"O1",
+		"AX",
+		"GG",
+		"IM",
+		"JE",
+		"BL",
+		"MF",
+		"BQ",
+		"SS",
+		"O1"
+	);
+
+	public $GEOIP_COUNTRY_CODES3 = array(
+		"",
+		"AP",
+		"EU",
+		"AND",
+		"ARE",
+		"AFG",
+		"ATG",
+		"AIA",
+		"ALB",
+		"ARM",
+		"CUW",
+		"AGO",
+		"ATA",
+		"ARG",
+		"ASM",
+		"AUT",
+		"AUS",
+		"ABW",
+		"AZE",
+		"BIH",
+		"BRB",
+		"BGD",
+		"BEL",
+		"BFA",
+		"BGR",
+		"BHR",
+		"BDI",
+		"BEN",
+		"BMU",
+		"BRN",
+		"BOL",
+		"BRA",
+		"BHS",
+		"BTN",
+		"BVT",
+		"BWA",
+		"BLR",
+		"BLZ",
+		"CAN",
+		"CCK",
+		"COD",
+		"CAF",
+		"COG",
+		"CHE",
+		"CIV",
+		"COK",
+		"CHL",
+		"CMR",
+		"CHN",
+		"COL",
+		"CRI",
+		"CUB",
+		"CPV",
+		"CXR",
+		"CYP",
+		"CZE",
+		"DEU",
+		"DJI",
+		"DNK",
+		"DMA",
+		"DOM",
+		"DZA",
+		"ECU",
+		"EST",
+		"EGY",
+		"ESH",
+		"ERI",
+		"ESP",
+		"ETH",
+		"FIN",
+		"FJI",
+		"FLK",
+		"FSM",
+		"FRO",
+		"FRA",
+		"SXM",
+		"GAB",
+		"GBR",
+		"GRD",
+		"GEO",
+		"GUF",
+		"GHA",
+		"GIB",
+		"GRL",
+		"GMB",
+		"GIN",
+		"GLP",
+		"GNQ",
+		"GRC",
+		"SGS",
+		"GTM",
+		"GUM",
+		"GNB",
+		"GUY",
+		"HKG",
+		"HMD",
+		"HND",
+		"HRV",
+		"HTI",
+		"HUN",
+		"IDN",
+		"IRL",
+		"ISR",
+		"IND",
+		"IOT",
+		"IRQ",
+		"IRN",
+		"ISL",
+		"ITA",
+		"JAM",
+		"JOR",
+		"JPN",
+		"KEN",
+		"KGZ",
+		"KHM",
+		"KIR",
+		"COM",
+		"KNA",
+		"PRK",
+		"KOR",
+		"KWT",
+		"CYM",
+		"KAZ",
+		"LAO",
+		"LBN",
+		"LCA",
+		"LIE",
+		"LKA",
+		"LBR",
+		"LSO",
+		"LTU",
+		"LUX",
+		"LVA",
+		"LBY",
+		"MAR",
+		"MCO",
+		"MDA",
+		"MDG",
+		"MHL",
+		"MKD",
+		"MLI",
+		"MMR",
+		"MNG",
+		"MAC",
+		"MNP",
+		"MTQ",
+		"MRT",
+		"MSR",
+		"MLT",
+		"MUS",
+		"MDV",
+		"MWI",
+		"MEX",
+		"MYS",
+		"MOZ",
+		"NAM",
+		"NCL",
+		"NER",
+		"NFK",
+		"NGA",
+		"NIC",
+		"NLD",
+		"NOR",
+		"NPL",
+		"NRU",
+		"NIU",
+		"NZL",
+		"OMN",
+		"PAN",
+		"PER",
+		"PYF",
+		"PNG",
+		"PHL",
+		"PAK",
+		"POL",
+		"SPM",
+		"PCN",
+		"PRI",
+		"PSE",
+		"PRT",
+		"PLW",
+		"PRY",
+		"QAT",
+		"REU",
+		"ROU",
+		"RUS",
+		"RWA",
+		"SAU",
+		"SLB",
+		"SYC",
+		"SDN",
+		"SWE",
+		"SGP",
+		"SHN",
+		"SVN",
+		"SJM",
+		"SVK",
+		"SLE",
+		"SMR",
+		"SEN",
+		"SOM",
+		"SUR",
+		"STP",
+		"SLV",
+		"SYR",
+		"SWZ",
+		"TCA",
+		"TCD",
+		"ATF",
+		"TGO",
+		"THA",
+		"TJK",
+		"TKL",
+		"TKM",
+		"TUN",
+		"TON",
+		"TLS",
+		"TUR",
+		"TTO",
+		"TUV",
+		"TWN",
+		"TZA",
+		"UKR",
+		"UGA",
+		"UMI",
+		"USA",
+		"URY",
+		"UZB",
+		"VAT",
+		"VCT",
+		"VEN",
+		"VGB",
+		"VIR",
+		"VNM",
+		"VUT",
+		"WLF",
+		"WSM",
+		"YEM",
+		"MYT",
+		"SRB",
+		"ZAF",
+		"ZMB",
+		"MNE",
+		"ZWE",
+		"A1",
+		"A2",
+		"O1",
+		"ALA",
+		"GGY",
+		"IMN",
+		"JEY",
+		"BLM",
+		"MAF",
+		"BES",
+		"SSD",
+		"O1"
+	);
+
+	public $GEOIP_COUNTRY_NAMES = array(
+		"",
+		"Asia/Pacific Region",
+		"Europe",
+		"Andorra",
+		"United Arab Emirates",
+		"Afghanistan",
+		"Antigua and Barbuda",
+		"Anguilla",
+		"Albania",
+		"Armenia",
+		"Curacao",
+		"Angola",
+		"Antarctica",
+		"Argentina",
+		"American Samoa",
+		"Austria",
+		"Australia",
+		"Aruba",
+		"Azerbaijan",
+		"Bosnia and Herzegovina",
+		"Barbados",
+		"Bangladesh",
+		"Belgium",
+		"Burkina Faso",
+		"Bulgaria",
+		"Bahrain",
+		"Burundi",
+		"Benin",
+		"Bermuda",
+		"Brunei Darussalam",
+		"Bolivia",
+		"Brazil",
+		"Bahamas",
+		"Bhutan",
+		"Bouvet Island",
+		"Botswana",
+		"Belarus",
+		"Belize",
+		"Canada",
+		"Cocos (Keeling) Islands",
+		"Congo, The Democratic Republic of the",
+		"Central African Republic",
+		"Congo",
+		"Switzerland",
+		"Cote D'Ivoire",
+		"Cook Islands",
+		"Chile",
+		"Cameroon",
+		"China",
+		"Colombia",
+		"Costa Rica",
+		"Cuba",
+		"Cape Verde",
+		"Christmas Island",
+		"Cyprus",
+		"Czech Republic",
+		"Germany",
+		"Djibouti",
+		"Denmark",
+		"Dominica",
+		"Dominican Republic",
+		"Algeria",
+		"Ecuador",
+		"Estonia",
+		"Egypt",
+		"Western Sahara",
+		"Eritrea",
+		"Spain",
+		"Ethiopia",
+		"Finland",
+		"Fiji",
+		"Falkland Islands (Malvinas)",
+		"Micronesia, Federated States of",
+		"Faroe Islands",
+		"France",
+		"Sint Maarten (Dutch part)",
+		"Gabon",
+		"United Kingdom",
+		"Grenada",
+		"Georgia",
+		"French Guiana",
+		"Ghana",
+		"Gibraltar",
+		"Greenland",
+		"Gambia",
+		"Guinea",
+		"Guadeloupe",
+		"Equatorial Guinea",
+		"Greece",
+		"South Georgia and the South Sandwich Islands",
+		"Guatemala",
+		"Guam",
+		"Guinea-Bissau",
+		"Guyana",
+		"Hong Kong",
+		"Heard Island and McDonald Islands",
+		"Honduras",
+		"Croatia",
+		"Haiti",
+		"Hungary",
+		"Indonesia",
+		"Ireland",
+		"Israel",
+		"India",
+		"British Indian Ocean Territory",
+		"Iraq",
+		"Iran, Islamic Republic of",
+		"Iceland",
+		"Italy",
+		"Jamaica",
+		"Jordan",
+		"Japan",
+		"Kenya",
+		"Kyrgyzstan",
+		"Cambodia",
+		"Kiribati",
+		"Comoros",
+		"Saint Kitts and Nevis",
+		"Korea, Democratic People's Republic of",
+		"Korea, Republic of",
+		"Kuwait",
+		"Cayman Islands",
+		"Kazakhstan",
+		"Lao People's Democratic Republic",
+		"Lebanon",
+		"Saint Lucia",
+		"Liechtenstein",
+		"Sri Lanka",
+		"Liberia",
+		"Lesotho",
+		"Lithuania",
+		"Luxembourg",
+		"Latvia",
+		"Libya",
+		"Morocco",
+		"Monaco",
+		"Moldova, Republic of",
+		"Madagascar",
+		"Marshall Islands",
+		"Macedonia",
+		"Mali",
+		"Myanmar",
+		"Mongolia",
+		"Macau",
+		"Northern Mariana Islands",
+		"Martinique",
+		"Mauritania",
+		"Montserrat",
+		"Malta",
+		"Mauritius",
+		"Maldives",
+		"Malawi",
+		"Mexico",
+		"Malaysia",
+		"Mozambique",
+		"Namibia",
+		"New Caledonia",
+		"Niger",
+		"Norfolk Island",
+		"Nigeria",
+		"Nicaragua",
+		"Netherlands",
+		"Norway",
+		"Nepal",
+		"Nauru",
+		"Niue",
+		"New Zealand",
+		"Oman",
+		"Panama",
+		"Peru",
+		"French Polynesia",
+		"Papua New Guinea",
+		"Philippines",
+		"Pakistan",
+		"Poland",
+		"Saint Pierre and Miquelon",
+		"Pitcairn Islands",
+		"Puerto Rico",
+		"Palestinian Territory",
+		"Portugal",
+		"Palau",
+		"Paraguay",
+		"Qatar",
+		"Reunion",
+		"Romania",
+		"Russian Federation",
+		"Rwanda",
+		"Saudi Arabia",
+		"Solomon Islands",
+		"Seychelles",
+		"Sudan",
+		"Sweden",
+		"Singapore",
+		"Saint Helena",
+		"Slovenia",
+		"Svalbard and Jan Mayen",
+		"Slovakia",
+		"Sierra Leone",
+		"San Marino",
+		"Senegal",
+		"Somalia",
+		"Suriname",
+		"Sao Tome and Principe",
+		"El Salvador",
+		"Syrian Arab Republic",
+		"Swaziland",
+		"Turks and Caicos Islands",
+		"Chad",
+		"French Southern Territories",
+		"Togo",
+		"Thailand",
+		"Tajikistan",
+		"Tokelau",
+		"Turkmenistan",
+		"Tunisia",
+		"Tonga",
+		"Timor-Leste",
+		"Turkey",
+		"Trinidad and Tobago",
+		"Tuvalu",
+		"Taiwan",
+		"Tanzania, United Republic of",
+		"Ukraine",
+		"Uganda",
+		"United States Minor Outlying Islands",
+		"United States",
+		"Uruguay",
+		"Uzbekistan",
+		"Holy See (Vatican City State)",
+		"Saint Vincent and the Grenadines",
+		"Venezuela",
+		"Virgin Islands, British",
+		"Virgin Islands, U.S.",
+		"Vietnam",
+		"Vanuatu",
+		"Wallis and Futuna",
+		"Samoa",
+		"Yemen",
+		"Mayotte",
+		"Serbia",
+		"South Africa",
+		"Zambia",
+		"Montenegro",
+		"Zimbabwe",
+		"Anonymous Proxy",
+		"Satellite Provider",
+		"Other",
+		"Aland Islands",
+		"Guernsey",
+		"Isle of Man",
+		"Jersey",
+		"Saint Barthelemy",
+		"Saint Martin",
+		"Bonaire, Saint Eustatius and Saba",
+		"South Sudan",
+		"Other"
+	);
+
+	public $GEOIP_CONTINENT_CODES = array(
+		"--",
+		"AS",
+		"EU",
+		"EU",
+		"AS",
+		"AS",
+		"NA",
+		"NA",
+		"EU",
+		"AS",
+		"NA",
+		"AF",
+		"AN",
+		"SA",
+		"OC",
+		"EU",
+		"OC",
+		"NA",
+		"AS",
+		"EU",
+		"NA",
+		"AS",
+		"EU",
+		"AF",
+		"EU",
+		"AS",
+		"AF",
+		"AF",
+		"NA",
+		"AS",
+		"SA",
+		"SA",
+		"NA",
+		"AS",
+		"AN",
+		"AF",
+		"EU",
+		"NA",
+		"NA",
+		"AS",
+		"AF",
+		"AF",
+		"AF",
+		"EU",
+		"AF",
+		"OC",
+		"SA",
+		"AF",
+		"AS",
+		"SA",
+		"NA",
+		"NA",
+		"AF",
+		"AS",
+		"AS",
+		"EU",
+		"EU",
+		"AF",
+		"EU",
+		"NA",
+		"NA",
+		"AF",
+		"SA",
+		"EU",
+		"AF",
+		"AF",
+		"AF",
+		"EU",
+		"AF",
+		"EU",
+		"OC",
+		"SA",
+		"OC",
+		"EU",
+		"EU",
+		"NA",
+		"AF",
+		"EU",
+		"NA",
+		"AS",
+		"SA",
+		"AF",
+		"EU",
+		"NA",
+		"AF",
+		"AF",
+		"NA",
+		"AF",
+		"EU",
+		"AN",
+		"NA",
+		"OC",
+		"AF",
+		"SA",
+		"AS",
+		"AN",
+		"NA",
+		"EU",
+		"NA",
+		"EU",
+		"AS",
+		"EU",
+		"AS",
+		"AS",
+		"AS",
+		"AS",
+		"AS",
+		"EU",
+		"EU",
+		"NA",
+		"AS",
+		"AS",
+		"AF",
+		"AS",
+		"AS",
+		"OC",
+		"AF",
+		"NA",
+		"AS",
+		"AS",
+		"AS",
+		"NA",
+		"AS",
+		"AS",
+		"AS",
+		"NA",
+		"EU",
+		"AS",
+		"AF",
+		"AF",
+		"EU",
+		"EU",
+		"EU",
+		"AF",
+		"AF",
+		"EU",
+		"EU",
+		"AF",
+		"OC",
+		"EU",
+		"AF",
+		"AS",
+		"AS",
+		"AS",
+		"OC",
+		"NA",
+		"AF",
+		"NA",
+		"EU",
+		"AF",
+		"AS",
+		"AF",
+		"NA",
+		"AS",
+		"AF",
+		"AF",
+		"OC",
+		"AF",
+		"OC",
+		"AF",
+		"NA",
+		"EU",
+		"EU",
+		"AS",
+		"OC",
+		"OC",
+		"OC",
+		"AS",
+		"NA",
+		"SA",
+		"OC",
+		"OC",
+		"AS",
+		"AS",
+		"EU",
+		"NA",
+		"OC",
+		"NA",
+		"AS",
+		"EU",
+		"OC",
+		"SA",
+		"AS",
+		"AF",
+		"EU",
+		"EU",
+		"AF",
+		"AS",
+		"OC",
+		"AF",
+		"AF",
+		"EU",
+		"AS",
+		"AF",
+		"EU",
+		"EU",
+		"EU",
+		"AF",
+		"EU",
+		"AF",
+		"AF",
+		"SA",
+		"AF",
+		"NA",
+		"AS",
+		"AF",
+		"NA",
+		"AF",
+		"AN",
+		"AF",
+		"AS",
+		"AS",
+		"OC",
+		"AS",
+		"AF",
+		"OC",
+		"AS",
+		"EU",
+		"NA",
+		"OC",
+		"AS",
+		"AF",
+		"EU",
+		"AF",
+		"OC",
+		"NA",
+		"SA",
+		"AS",
+		"EU",
+		"NA",
+		"SA",
+		"NA",
+		"NA",
+		"AS",
+		"OC",
+		"OC",
+		"OC",
+		"AS",
+		"AF",
+		"EU",
+		"AF",
+		"AF",
+		"EU",
+		"AF",
+		"--",
+		"--",
+		"--",
+		"EU",
+		"EU",
+		"EU",
+		"EU",
+		"NA",
+		"NA",
+		"NA",
+		"AF",
+		"--"
+	);
 }
 
-function _setup_segments($gi){
-  $gi->databaseType = GEOIP_COUNTRY_EDITION;
-  $gi->record_length = STANDARD_RECORD_LENGTH;
-  if ($gi->flags & GEOIP_SHARED_MEMORY) {
-    $offset = @shmop_size ($gi->shmid) - 3;
-    for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) {
-        $delim = @shmop_read ($gi->shmid, $offset, 3);
-        $offset += 3;
-        if ($delim == (chr(255).chr(255).chr(255))) {
-            $gi->databaseType = ord(@shmop_read ($gi->shmid, $offset, 1));
-            $offset++;
-
-            if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
-                $gi->databaseSegments = GEOIP_STATE_BEGIN_REV0;
-            } else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1){
-                $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1;
-	    } else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0)||
-                     ($gi->databaseType == GEOIP_CITY_EDITION_REV1) 
-                    || ($gi->databaseType == GEOIP_ORG_EDITION)
-		    || ($gi->databaseType == GEOIP_ISP_EDITION)
-		    || ($gi->databaseType == GEOIP_ASNUM_EDITION)){
-                $gi->databaseSegments = 0;
-                $buf = @shmop_read ($gi->shmid, $offset, SEGMENT_RECORD_LENGTH);
-                for ($j = 0;$j < SEGMENT_RECORD_LENGTH;$j++){
-                    $gi->databaseSegments += (ord($buf[$j]) << ($j * 8));
-                }
-	            if (($gi->databaseType == GEOIP_ORG_EDITION)||
-			($gi->databaseType == GEOIP_ISP_EDITION)) {
-	                $gi->record_length = ORG_RECORD_LENGTH;
-                }
-            }
-            break;
-        } else {
-            $offset -= 4;
-        }
-    }
-    if (($gi->databaseType == GEOIP_COUNTRY_EDITION)||
-        ($gi->databaseType == GEOIP_PROXY_EDITION)||
-        ($gi->databaseType == GEOIP_NETSPEED_EDITION)){
-        $gi->databaseSegments = GEOIP_COUNTRY_BEGIN;
-    }
-  } else {
-    $filepos = ftell($gi->filehandle);
-    fseek($gi->filehandle, -3, SEEK_END);
-    for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) {
-        $delim = fread($gi->filehandle,3);
-        if ($delim == (chr(255).chr(255).chr(255))){
-        $gi->databaseType = ord(fread($gi->filehandle,1));
-        if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
-            $gi->databaseSegments = GEOIP_STATE_BEGIN_REV0;
-        }
-        else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1){
-	    $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1;
-                }  else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0) ||
-                 ($gi->databaseType == GEOIP_CITY_EDITION_REV1) || 
-                 ($gi->databaseType == GEOIP_ORG_EDITION) || 
-		 ($gi->databaseType == GEOIP_ISP_EDITION) || 
-                 ($gi->databaseType == GEOIP_ASNUM_EDITION)){
-            $gi->databaseSegments = 0;
-            $buf = fread($gi->filehandle,SEGMENT_RECORD_LENGTH);
-            for ($j = 0;$j < SEGMENT_RECORD_LENGTH;$j++){
-            $gi->databaseSegments += (ord($buf[$j]) << ($j * 8));
-            }
-	    if ($gi->databaseType == GEOIP_ORG_EDITION ||
-		$gi->databaseType == GEOIP_ISP_EDITION) {
-	    $gi->record_length = ORG_RECORD_LENGTH;
-            }
-        }
-        break;
-        } else {
-        fseek($gi->filehandle, -4, SEEK_CUR);
-        }
-    }
-    if (($gi->databaseType == GEOIP_COUNTRY_EDITION)||
-        ($gi->databaseType == GEOIP_PROXY_EDITION)||
-        ($gi->databaseType == GEOIP_NETSPEED_EDITION)){
-         $gi->databaseSegments = GEOIP_COUNTRY_BEGIN;
-    }
-    fseek($gi->filehandle,$filepos,SEEK_SET);
-  }
-  return $gi;
+function geoip_load_shared_mem($file)
+{
+	$fp = fopen($file, "rb");
+	if (!$fp) {
+		print "error opening $file: $php_errormsg\n";
+		exit;
+	}
+	$s_array = fstat($fp);
+	$size = $s_array['size'];
+	if (($shmid = @shmop_open(GEOIP_SHM_KEY, "w", 0, 0))) {
+		shmop_delete($shmid);
+		shmop_close($shmid);
+	}
+	$shmid = shmop_open(GEOIP_SHM_KEY, "c", 0644, $size);
+	shmop_write($shmid, fread($fp, $size), 0);
+	shmop_close($shmid);
 }
 
-function geoip_open($filename, $flags) {
-  $gi = new GeoIP;
-  $gi->flags = $flags;
-  if ($gi->flags & GEOIP_SHARED_MEMORY) {
-    $gi->shmid = @shmop_open (GEOIP_SHM_KEY, "a", 0, 0);
-    } else {
-    $gi->filehandle = fopen($filename,"rb") or die( "Can not open $filename\n" );
-    if ($gi->flags & GEOIP_MEMORY_CACHE) {
-        $s_array = fstat($gi->filehandle);
-        $gi->memory_buffer = fread($gi->filehandle, $s_array['size']);
-    }
-  }
+function _setup_segments($gi)
+{
+	$gi->databaseType = GEOIP_COUNTRY_EDITION;
+	$gi->record_length = STANDARD_RECORD_LENGTH;
+	if ($gi->flags & GEOIP_SHARED_MEMORY) {
+		$offset = shmop_size($gi->shmid) - 3;
+		for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) {
+			$delim = shmop_read($gi->shmid, $offset, 3);
+			$offset += 3;
+			if ($delim == (chr(255) . chr(255) . chr(255))) {
+				$gi->databaseType = ord(shmop_read($gi->shmid, $offset, 1));
+				if ($gi->databaseType >= 106) {
+					$gi->databaseType -= 105;
+				}
+				$offset++;
 
-  $gi = _setup_segments($gi);
-  return $gi;
+				if ($gi->databaseType == GEOIP_REGION_EDITION_REV0) {
+					$gi->databaseSegments = GEOIP_STATE_BEGIN_REV0;
+				} elseif ($gi->databaseType == GEOIP_REGION_EDITION_REV1) {
+					$gi->databaseSegments = GEOIP_STATE_BEGIN_REV1;
+				} elseif (($gi->databaseType == GEOIP_CITY_EDITION_REV0)
+					|| ($gi->databaseType == GEOIP_CITY_EDITION_REV1)
+					|| ($gi->databaseType == GEOIP_ORG_EDITION)
+					|| ($gi->databaseType == GEOIP_ORG_EDITION_V6)
+					|| ($gi->databaseType == GEOIP_DOMAIN_EDITION)
+					|| ($gi->databaseType == GEOIP_DOMAIN_EDITION_V6)
+					|| ($gi->databaseType == GEOIP_ISP_EDITION)
+					|| ($gi->databaseType == GEOIP_ISP_EDITION_V6)
+					|| ($gi->databaseType == GEOIP_USERTYPE_EDITION)
+					|| ($gi->databaseType == GEOIP_USERTYPE_EDITION_V6)
+					|| ($gi->databaseType == GEOIP_LOCATIONA_EDITION)
+					|| ($gi->databaseType == GEOIP_ACCURACYRADIUS_EDITION)
+					|| ($gi->databaseType == GEOIP_CITY_EDITION_REV0_V6)
+					|| ($gi->databaseType == GEOIP_CITY_EDITION_REV1_V6)
+					|| ($gi->databaseType == GEOIP_NETSPEED_EDITION_REV1)
+					|| ($gi->databaseType == GEOIP_NETSPEED_EDITION_REV1_V6)
+					|| ($gi->databaseType == GEOIP_ASNUM_EDITION)
+					|| ($gi->databaseType == GEOIP_ASNUM_EDITION_V6)
+					) {
+						$gi->databaseSegments = 0;
+						$buf = shmop_read($gi->shmid, $offset, SEGMENT_RECORD_LENGTH);
+						for ($j = 0; $j < SEGMENT_RECORD_LENGTH; $j++) {
+							$gi->databaseSegments += (ord($buf[$j]) << ($j * 8));
+						}
+						if (($gi->databaseType == GEOIP_ORG_EDITION)
+							|| ($gi->databaseType == GEOIP_ORG_EDITION_V6)
+							|| ($gi->databaseType == GEOIP_DOMAIN_EDITION)
+							|| ($gi->databaseType == GEOIP_DOMAIN_EDITION_V6)
+							|| ($gi->databaseType == GEOIP_ISP_EDITION)
+							|| ($gi->databaseType == GEOIP_ISP_EDITION_V6)
+							) {
+								$gi->record_length = ORG_RECORD_LENGTH;
+							}
+				}
+				break;
+			} else {
+				$offset -= 4;
+			}
+		}
+		if (($gi->databaseType == GEOIP_COUNTRY_EDITION) ||
+			($gi->databaseType == GEOIP_COUNTRY_EDITION_V6) ||
+			($gi->databaseType == GEOIP_PROXY_EDITION) ||
+			($gi->databaseType == GEOIP_NETSPEED_EDITION)
+			) {
+				$gi->databaseSegments = GEOIP_COUNTRY_BEGIN;
+			}
+	} else {
+		$filepos = ftell($gi->filehandle);
+		fseek($gi->filehandle, -3, SEEK_END);
+		for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) {
+			$delim = fread($gi->filehandle, 3);
+			if ($delim == (chr(255) . chr(255) . chr(255))) {
+				$gi->databaseType = ord(fread($gi->filehandle, 1));
+				if ($gi->databaseType >= 106) {
+					$gi->databaseType -= 105;
+				}
+				if ($gi->databaseType == GEOIP_REGION_EDITION_REV0) {
+					$gi->databaseSegments = GEOIP_STATE_BEGIN_REV0;
+				} elseif ($gi->databaseType == GEOIP_REGION_EDITION_REV1) {
+					$gi->databaseSegments = GEOIP_STATE_BEGIN_REV1;
+				} elseif (($gi->databaseType == GEOIP_CITY_EDITION_REV0)
+					|| ($gi->databaseType == GEOIP_CITY_EDITION_REV1)
+					|| ($gi->databaseType == GEOIP_CITY_EDITION_REV0_V6)
+					|| ($gi->databaseType == GEOIP_CITY_EDITION_REV1_V6)
+					|| ($gi->databaseType == GEOIP_ORG_EDITION)
+					|| ($gi->databaseType == GEOIP_DOMAIN_EDITION)
+					|| ($gi->databaseType == GEOIP_ISP_EDITION)
+					|| ($gi->databaseType == GEOIP_ORG_EDITION_V6)
+					|| ($gi->databaseType == GEOIP_DOMAIN_EDITION_V6)
+					|| ($gi->databaseType == GEOIP_ISP_EDITION_V6)
+					|| ($gi->databaseType == GEOIP_LOCATIONA_EDITION)
+					|| ($gi->databaseType == GEOIP_ACCURACYRADIUS_EDITION)
+					|| ($gi->databaseType == GEOIP_CITY_EDITION_REV0_V6)
+					|| ($gi->databaseType == GEOIP_CITY_EDITION_REV1_V6)
+					|| ($gi->databaseType == GEOIP_NETSPEED_EDITION_REV1)
+					|| ($gi->databaseType == GEOIP_NETSPEED_EDITION_REV1_V6)
+					|| ($gi->databaseType == GEOIP_USERTYPE_EDITION)
+					|| ($gi->databaseType == GEOIP_USERTYPE_EDITION_V6)
+					|| ($gi->databaseType == GEOIP_ASNUM_EDITION)
+					|| ($gi->databaseType == GEOIP_ASNUM_EDITION_V6)
+					) {
+						$gi->databaseSegments = 0;
+
+						$buf = fread($gi->filehandle, SEGMENT_RECORD_LENGTH);
+						for ($j = 0; $j < SEGMENT_RECORD_LENGTH; $j++) {
+							$gi->databaseSegments += (ord($buf[$j]) << ($j * 8));
+						}
+						if (($gi->databaseType == GEOIP_ORG_EDITION)
+							|| ($gi->databaseType == GEOIP_DOMAIN_EDITION)
+							|| ($gi->databaseType == GEOIP_ISP_EDITION)
+							|| ($gi->databaseType == GEOIP_ORG_EDITION_V6)
+							|| ($gi->databaseType == GEOIP_DOMAIN_EDITION_V6)
+							|| ($gi->databaseType == GEOIP_ISP_EDITION_V6)
+							) {
+								$gi->record_length = ORG_RECORD_LENGTH;
+							}
+				}
+				break;
+			} else {
+				fseek($gi->filehandle, -4, SEEK_CUR);
+			}
+		}
+		if (($gi->databaseType == GEOIP_COUNTRY_EDITION) ||
+			($gi->databaseType == GEOIP_COUNTRY_EDITION_V6) ||
+			($gi->databaseType == GEOIP_PROXY_EDITION) ||
+			($gi->databaseType == GEOIP_NETSPEED_EDITION)
+			) {
+				$gi->databaseSegments = GEOIP_COUNTRY_BEGIN;
+			}
+			fseek($gi->filehandle, $filepos, SEEK_SET);
+	}
+	return $gi;
 }
 
-function geoip_close($gi) {
-  if ($gi->flags & GEOIP_SHARED_MEMORY) {
-    return true;
-  }
-
-  return fclose($gi->filehandle);
+# This should be only used for variable-length records where
+# $start + $maxLength may be greater than the shared mem size
+function _sharedMemRead($gi, $start, $maxLength)
+{
+	$readLength = min(shmop_size($gi->shmid) - $start, $maxLength);
+	return shmop_read($gi->shmid, $start, $readLength);
 }
 
-function geoip_country_id_by_name($gi, $name) {
-  $addr = gethostbyname($name);
-  if (!$addr || $addr == $name) {
-    return false;
-  }
-  return geoip_country_id_by_addr($gi, $addr);
+function geoip_open($filename, $flags)
+{
+	$gi = new GeoIP;
+	$gi->flags = $flags;
+	if ($gi->flags & GEOIP_SHARED_MEMORY) {
+		$gi->shmid = shmop_open(GEOIP_SHM_KEY, "a", 0, 0);
+	} else {
+		$gi->filehandle = fopen($filename, "rb") or trigger_error("GeoIP API: Can not open $filename\n", E_USER_ERROR);
+		if ($gi->flags & GEOIP_MEMORY_CACHE) {
+			$s_array = fstat($gi->filehandle);
+			$gi->memory_buffer = fread($gi->filehandle, $s_array['size']);
+		}
+	}
+
+	$gi = _setup_segments($gi);
+	return $gi;
 }
 
-function geoip_country_code_by_name($gi, $name) {
-  $country_id = geoip_country_id_by_name($gi,$name);
-  if ($country_id !== false) {
-        return $gi->GEOIP_COUNTRY_CODES[$country_id];
-  }
-  return false;
+function geoip_close($gi)
+{
+	if ($gi->flags & GEOIP_SHARED_MEMORY) {
+		return true;
+	}
+
+	return fclose($gi->filehandle);
 }
 
-function geoip_country_name_by_name($gi, $name) {
-  $country_id = geoip_country_id_by_name($gi,$name);
-  if ($country_id !== false) {
-        return $gi->GEOIP_COUNTRY_NAMES[$country_id];
-  }
-  return false;
+function geoip_country_id_by_name_v6($gi, $name)
+{
+	$rec = dns_get_record($name, DNS_AAAA);
+	if (!$rec) {
+		return false;
+	}
+	$addr = $rec[0]["ipv6"];
+	if (!$addr || $addr == $name) {
+		return false;
+	}
+	return geoip_country_id_by_addr_v6($gi, $addr);
 }
 
-function geoip_country_id_by_addr($gi, $addr) {
-  $ipnum = ip2long($addr);
-  return _geoip_seek_country($gi, $ipnum) - GEOIP_COUNTRY_BEGIN;
+function geoip_country_id_by_name($gi, $name)
+{
+	$addr = gethostbyname($name);
+	if (!$addr || $addr == $name) {
+		return false;
+	}
+	return geoip_country_id_by_addr($gi, $addr);
 }
 
-function geoip_country_code_by_addr($gi, $addr) {
-  if ($gi->databaseType == GEOIP_CITY_EDITION_REV1) {
-    $record = geoip_record_by_addr($gi,$addr);
-    if ( $record !== false ) {
-      return $record->country_code;
-    }
-  } else {
-    $country_id = geoip_country_id_by_addr($gi,$addr);
-    if ($country_id !== false) {
-      return $gi->GEOIP_COUNTRY_CODES[$country_id];
-    }
-  }
-  return false;
+function geoip_country_code_by_name_v6($gi, $name)
+{
+	$country_id = geoip_country_id_by_name_v6($gi, $name);
+	if ($country_id !== false) {
+		return $gi->GEOIP_COUNTRY_CODES[$country_id];
+	}
+	return false;
 }
 
-function geoip_country_name_by_addr($gi, $addr) {
-  if ($gi->databaseType == GEOIP_CITY_EDITION_REV1) {
-    $record = geoip_record_by_addr($gi,$addr);
-    return $record->country_name;
-  } else {
-    $country_id = geoip_country_id_by_addr($gi,$addr);
-    if ($country_id !== false) {
-      return $gi->GEOIP_COUNTRY_NAMES[$country_id];
-    }
-  }
-  return false;
+function geoip_country_code_by_name($gi, $name)
+{
+	$country_id = geoip_country_id_by_name($gi, $name);
+	if ($country_id !== false) {
+		return $gi->GEOIP_COUNTRY_CODES[$country_id];
+	}
+	return false;
 }
 
-function _geoip_seek_country($gi, $ipnum) {
-  $offset = 0;
-  for ($depth = 31; $depth >= 0; --$depth) {
-    if ($gi->flags & GEOIP_MEMORY_CACHE) {
-      $buf = substr($gi->memory_buffer,
-                            2 * $gi->record_length * $offset,
-                            2 * $gi->record_length);
-        } elseif ($gi->flags & GEOIP_SHARED_MEMORY) {
-      $buf = @shmop_read ($gi->shmid, 
-                            2 * $gi->record_length * $offset,
-                            2 * $gi->record_length );
-        } else {
-      fseek($gi->filehandle, 2 * $gi->record_length * $offset, SEEK_SET) == 0
-        or die("fseek failed");
-      $buf = fread($gi->filehandle, 2 * $gi->record_length);
-    }
-    $x = array(0,0);
-    for ($i = 0; $i < 2; ++$i) {
-      for ($j = 0; $j < $gi->record_length; ++$j) {
-        $x[$i] += ord($buf[$gi->record_length * $i + $j]) << ($j * 8);
-      }
-    }
-    if ($ipnum & (1 << $depth)) {
-      if ($x[1] >= $gi->databaseSegments) {
-        return $x[1];
-      }
-      $offset = $x[1];
-        } else {
-      if ($x[0] >= $gi->databaseSegments) {
-        return $x[0];
-      }
-      $offset = $x[0];
-    }
-  }
-  trigger_error("error traversing database - perhaps it is corrupt?", E_USER_ERROR);
-  return false;
+function geoip_country_name_by_name_v6($gi, $name)
+{
+	$country_id = geoip_country_id_by_name_v6($gi, $name);
+	if ($country_id !== false) {
+		return $gi->GEOIP_COUNTRY_NAMES[$country_id];
+	}
+	return false;
 }
 
-function _get_org($gi,$ipnum){
-  $seek_org = _geoip_seek_country($gi,$ipnum);
-  if ($seek_org == $gi->databaseSegments) {
-    return NULL;
-  }
-  $record_pointer = $seek_org + (2 * $gi->record_length - 1) * $gi->databaseSegments;
-  if ($gi->flags & GEOIP_SHARED_MEMORY) {
-    $org_buf = @shmop_read ($gi->shmid, $record_pointer, MAX_ORG_RECORD_LENGTH);
-    } else {
-    fseek($gi->filehandle, $record_pointer, SEEK_SET);
-    $org_buf = fread($gi->filehandle,MAX_ORG_RECORD_LENGTH);
-  }
-  $org_buf = substr($org_buf, 0, strpos($org_buf, 0));
-  return $org_buf;
+function geoip_country_name_by_name($gi, $name)
+{
+	$country_id = geoip_country_id_by_name($gi, $name);
+	if ($country_id !== false) {
+		return $gi->GEOIP_COUNTRY_NAMES[$country_id];
+	}
+	return false;
 }
 
-function geoip_org_by_addr ($gi,$addr) {
-  if ($addr == NULL) {
-    return 0;
-  }
-  $ipnum = ip2long($addr);
-  return _get_org($gi, $ipnum);
+function geoip_country_id_by_addr_v6($gi, $addr)
+{
+	$ipnum = inet_pton($addr);
+	return _geoip_seek_country_v6($gi, $ipnum) - GEOIP_COUNTRY_BEGIN;
 }
 
-function _get_region($gi,$ipnum){
-  if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
-    $seek_region = _geoip_seek_country($gi,$ipnum) - GEOIP_STATE_BEGIN_REV0;
-    if ($seek_region >= 1000){
-      $country_code = "US";
-      $region = chr(($seek_region - 1000)/26 + 65) . chr(($seek_region - 1000)%26 + 65);
-    } else {
-            $country_code = $gi->GEOIP_COUNTRY_CODES[$seek_region];
-      $region = "";
-    }
-  return array ($country_code,$region);
-    }  else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1) {
-    $seek_region = _geoip_seek_country($gi,$ipnum) - GEOIP_STATE_BEGIN_REV1;
-    //print $seek_region;
-    if ($seek_region < US_OFFSET){
-      $country_code = "";
-      $region = "";  
-        } else if ($seek_region < CANADA_OFFSET) {
-      $country_code = "US";
-      $region = chr(($seek_region - US_OFFSET)/26 + 65) . chr(($seek_region - US_OFFSET)%26 + 65);
-        } else if ($seek_region < WORLD_OFFSET) {
-      $country_code = "CA";
-      $region = chr(($seek_region - CANADA_OFFSET)/26 + 65) . chr(($seek_region - CANADA_OFFSET)%26 + 65);
-    } else {
-            $country_code = $gi->GEOIP_COUNTRY_CODES[($seek_region - WORLD_OFFSET) / FIPS_RANGE];
-      $region = "";
-    }
-  return array ($country_code,$region);
-  }
+function geoip_country_id_by_addr($gi, $addr)
+{
+	$ipnum = ip2long($addr);
+	return _geoip_seek_country($gi, $ipnum) - GEOIP_COUNTRY_BEGIN;
 }
 
-function geoip_region_by_addr ($gi,$addr) {
-  if ($addr == NULL) {
-    return 0;
-  }
-  $ipnum = ip2long($addr);
-  return _get_region($gi, $ipnum);
+function geoip_country_code_by_addr_v6($gi, $addr)
+{
+	$country_id = geoip_country_id_by_addr_v6($gi, $addr);
+	if ($country_id !== false) {
+		return $gi->GEOIP_COUNTRY_CODES[$country_id];
+	}
+	return false;
 }
 
-function getdnsattributes ($l,$ip){
-  $r = new Net_DNS_Resolver();
-  $r->nameservers = array("ws1.maxmind.com");
-  $p = $r->search($l."." . $ip .".s.maxmind.com","TXT","IN");
-  $str = is_object($p->answer[0])?$p->answer[0]->string():'';
-  preg_match("/\"(.*)\"/",$str,$regs);
-  $str = $regs[1];
-  return $str;
+function geoip_country_code_by_addr($gi, $addr)
+{
+	if ($gi->databaseType == GEOIP_CITY_EDITION_REV1) {
+		$record = GeoIP_record_by_addr($gi, $addr);
+		if ($record) {
+			return $record->country_code;
+		}
+	} else {
+		$country_id = geoip_country_id_by_addr($gi, $addr);
+		if ($country_id !== false) {
+			return $gi->GEOIP_COUNTRY_CODES[$country_id];
+		}
+	}
+	return false;
 }
 
-?>
+function geoip_country_name_by_addr_v6($gi, $addr)
+{
+	$country_id = geoip_country_id_by_addr_v6($gi, $addr);
+	if ($country_id !== false) {
+		return $gi->GEOIP_COUNTRY_NAMES[$country_id];
+	}
+	return false;
+}
+
+function geoip_country_name_by_addr($gi, $addr)
+{
+	if ($gi->databaseType == GEOIP_CITY_EDITION_REV1) {
+		$record = GeoIP_record_by_addr($gi, $addr);
+		return $record->country_name;
+	} else {
+		$country_id = geoip_country_id_by_addr($gi, $addr);
+		if ($country_id !== false) {
+			return $gi->GEOIP_COUNTRY_NAMES[$country_id];
+		}
+	}
+	return false;
+}
+
+function _geoip_seek_country_v6($gi, $ipnum)
+{
+	# arrays from unpack start with offset 1
+	# yet another php mystery. array_merge work around
+	# this broken behaviour
+	$v6vec = array_merge(unpack("C16", $ipnum));
+
+	$offset = 0;
+	for ($depth = 127; $depth >= 0; --$depth) {
+		if ($gi->flags & GEOIP_MEMORY_CACHE) {
+			$buf = _safe_substr(
+				$gi->memory_buffer,
+				2 * $gi->record_length * $offset,
+				2 * $gi->record_length
+				);
+		} elseif ($gi->flags & GEOIP_SHARED_MEMORY) {
+			$buf = _sharedMemRead($gi,
+				2 * $gi->record_length * $offset,
+				2 * $gi->record_length
+				);
+		} else {
+			fseek($gi->filehandle, 2 * $gi->record_length * $offset, SEEK_SET) == 0
+			or trigger_error("GeoIP API: fseek failed", E_USER_ERROR);
+			$buf = fread($gi->filehandle, 2 * $gi->record_length);
+		}
+		$x = array(0, 0);
+		for ($i = 0; $i < 2; ++$i) {
+			for ($j = 0; $j < $gi->record_length; ++$j) {
+				$x[$i] += ord($buf[$gi->record_length * $i + $j]) << ($j * 8);
+			}
+		}
+
+		$bnum = 127 - $depth;
+		$idx = $bnum >> 3;
+		$b_mask = 1 << ($bnum & 7 ^ 7);
+		if (($v6vec[$idx] & $b_mask) > 0) {
+			if ($x[1] >= $gi->databaseSegments) {
+				return $x[1];
+			}
+			$offset = $x[1];
+		} else {
+			if ($x[0] >= $gi->databaseSegments) {
+				return $x[0];
+			}
+			$offset = $x[0];
+		}
+	}
+	trigger_error("GeoIP API: Error traversing database - perhaps it is corrupt?", E_USER_ERROR);
+	return false;
+}
+
+function _geoip_seek_country($gi, $ipnum)
+{
+	$offset = 0;
+	for ($depth = 31; $depth >= 0; --$depth) {
+		if ($gi->flags & GEOIP_MEMORY_CACHE) {
+			$buf = _safe_substr(
+				$gi->memory_buffer,
+				2 * $gi->record_length * $offset,
+				2 * $gi->record_length
+				);
+		} elseif ($gi->flags & GEOIP_SHARED_MEMORY) {
+			$buf = _sharedMemRead(
+				$gi,
+				2 * $gi->record_length * $offset,
+				2 * $gi->record_length
+				);
+		} else {
+			fseek($gi->filehandle, 2 * $gi->record_length * $offset, SEEK_SET) == 0
+			or trigger_error("GeoIP API: fseek failed", E_USER_ERROR);
+			$buf = fread($gi->filehandle, 2 * $gi->record_length);
+		}
+		$x = array(0, 0);
+		for ($i = 0; $i < 2; ++$i) {
+			for ($j = 0; $j < $gi->record_length; ++$j) {
+				$x[$i] += ord($buf[$gi->record_length * $i + $j]) << ($j * 8);
+			}
+		}
+		if ($ipnum & (1 << $depth)) {
+			if ($x[1] >= $gi->databaseSegments) {
+				return $x[1];
+			}
+			$offset = $x[1];
+		} else {
+			if ($x[0] >= $gi->databaseSegments) {
+				return $x[0];
+			}
+			$offset = $x[0];
+		}
+	}
+	trigger_error("GeoIP API: Error traversing database - perhaps it is corrupt?", E_USER_ERROR);
+	return false;
+}
+
+function _common_get_org($gi, $seek_org)
+{
+	$record_pointer = $seek_org + (2 * $gi->record_length - 1) * $gi->databaseSegments;
+	if ($gi->flags & GEOIP_SHARED_MEMORY) {
+		$org_buf = _sharedMemRead($gi, $record_pointer, MAX_ORG_RECORD_LENGTH);
+	} else {
+		fseek($gi->filehandle, $record_pointer, SEEK_SET);
+		$org_buf = fread($gi->filehandle, MAX_ORG_RECORD_LENGTH);
+	}
+	$org_buf = _safe_substr($org_buf, 0, strpos($org_buf, "\0"));
+	return $org_buf;
+}
+
+function _get_org_v6($gi, $ipnum)
+{
+	$seek_org = _geoip_seek_country_v6($gi, $ipnum);
+	if ($seek_org == $gi->databaseSegments) {
+		return null;
+	}
+	return _common_get_org($gi, $seek_org);
+}
+
+function _get_org($gi, $ipnum)
+{
+	$seek_org = _geoip_seek_country($gi, $ipnum);
+	if ($seek_org == $gi->databaseSegments) {
+		return null;
+	}
+	return _common_get_org($gi, $seek_org);
+}
+
+
+function geoip_name_by_addr_v6($gi, $addr)
+{
+	if ($addr == null) {
+		return 0;
+	}
+	$ipnum = inet_pton($addr);
+	return _get_org_v6($gi, $ipnum);
+}
+
+function geoip_name_by_addr($gi, $addr)
+{
+	if ($addr == null) {
+		return 0;
+	}
+	$ipnum = ip2long($addr);
+	return _get_org($gi, $ipnum);
+}
+
+function geoip_org_by_addr($gi, $addr)
+{
+	return geoip_name_by_addr($gi, $addr);
+}
+
+function _get_region($gi, $ipnum)
+{
+	if ($gi->databaseType == GEOIP_REGION_EDITION_REV0) {
+		$seek_region = _geoip_seek_country($gi, $ipnum) - GEOIP_STATE_BEGIN_REV0;
+		if ($seek_region >= 1000) {
+			$country_code = "US";
+			$region = chr(($seek_region - 1000) / 26 + 65) . chr(($seek_region - 1000) % 26 + 65);
+		} else {
+			$country_code = $gi->GEOIP_COUNTRY_CODES[$seek_region];
+			$region = "";
+		}
+		return array($country_code, $region);
+	} elseif ($gi->databaseType == GEOIP_REGION_EDITION_REV1) {
+		$seek_region = _geoip_seek_country($gi, $ipnum) - GEOIP_STATE_BEGIN_REV1;
+		if ($seek_region < US_OFFSET) {
+			$country_code = "";
+			$region = "";
+		} elseif ($seek_region < CANADA_OFFSET) {
+			$country_code = "US";
+			$region = chr(($seek_region - US_OFFSET) / 26 + 65) . chr(($seek_region - US_OFFSET) % 26 + 65);
+		} elseif ($seek_region < WORLD_OFFSET) {
+			$country_code = "CA";
+			$region = chr(($seek_region - CANADA_OFFSET) / 26 + 65) . chr(($seek_region - CANADA_OFFSET) % 26 + 65);
+		} else {
+			$country_code = $gi->GEOIP_COUNTRY_CODES[(int) (($seek_region - WORLD_OFFSET) / FIPS_RANGE)];
+			$region = "";
+		}
+		return array($country_code, $region);
+	}
+	return null;
+}
+
+function geoip_region_by_addr($gi, $addr)
+{
+	if ($addr == null) {
+		return 0;
+	}
+	$ipnum = ip2long($addr);
+	return _get_region($gi, $ipnum);
+}
+
+function _safe_substr($string, $start, $length)
+{
+	// workaround php's broken substr, strpos, etc handling with
+	// mbstring.func_overload and mbstring.internal_encoding
+	$mbExists = extension_loaded('mbstring');
+
+	if ($mbExists) {
+		$enc = mb_internal_encoding();
+		mb_internal_encoding('ISO-8859-1');
+	}
+
+	$buf = substr($string, $start, $length);
+
+	if ($mbExists) {
+		mb_internal_encoding($enc);
+	}
+
+	return $buf;
+}
diff --git a/htdocs/includes/geoip/geoipcity.inc b/htdocs/includes/geoip/geoipcity.inc
index 160757187c3..671f4e2c8e4 100644
--- a/htdocs/includes/geoip/geoipcity.inc
+++ b/htdocs/includes/geoip/geoipcity.inc
@@ -2,7 +2,7 @@
 
 /* geoipcity.inc
  *
- * Copyright (C) 2004 Maxmind LLC
+ * Copyright (C) 2013 MaxMind, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -11,198 +11,161 @@
  *
  * This library 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307    USA
  */
 
-/*
- * Changelog:
- *
- * 2005-01-13   Andrew Hill, Awarez Ltd. (http://www.awarez.net)
- *              Formatted file according to PEAR library standards.
- *              Changed inclusion of geoip.inc file to require_once, so that
- *                  this library can be used in the same script as geoip.inc.
- */
 
-define("FULL_RECORD_LENGTH",50);
+define("FULL_RECORD_LENGTH", 50);
 
 require_once 'geoip.inc';
 require_once 'geoipregionvars.php';
 
-class geoiprecord {
-  var $country_code;
-  var $country_code3;
-  var $country_name;
-  var $region;
-  var $city;
-  var $postal_code;
-  var $latitude;
-  var $longitude;
-  var $area_code;
-  var $dma_code;   # metro and dma code are the same. use metro_code
-  var $metro_code;
+class geoiprecord
+{
+	public $country_code;
+	public $country_code3;
+	public $country_name;
+	public $region;
+	public $city;
+	public $postal_code;
+	public $latitude;
+	public $longitude;
+	public $area_code;
+	public $dma_code; # metro and dma code are the same. use metro_code
+	public $metro_code;
+	public $continent_code;
 }
 
-class geoipdnsrecord {
-  var $country_code;
-  var $country_code3;
-  var $country_name;
-  var $region;
-  var $regionname;
-  var $city;
-  var $postal_code;
-  var $latitude;
-  var $longitude;
-  var $areacode;
-  var $dmacode;
-  var $isp;
-  var $org;
-  var $metrocode;
+function _get_record_v6($gi, $ipnum)
+{
+	$seek_country = _geoip_seek_country_v6($gi, $ipnum);
+	if ($seek_country == $gi->databaseSegments) {
+		return null;
+	}
+	return _common_get_record($gi, $seek_country);
 }
 
-function getrecordwithdnsservice($str){
-  $record = new geoipdnsrecord;
-  $keyvalue = explode(";",$str);
-  foreach ($keyvalue as $keyvalue2){
-    list($key,$value) = explode("=",$keyvalue2);
-    if ($key == "co"){
-      $record->country_code = $value;
-    }
-    if ($key == "ci"){
-      $record->city = $value;
-    }
-    if ($key == "re"){
-      $record->region = $value;
-    }
-    if ($key == "ac"){
-      $record->areacode = $value;
-    }
-    if ($key == "dm" || $key == "me" ){
-      $record->dmacode   = $value;
-      $record->metrocode = $value;
-    }
-    if ($key == "is"){
-      $record->isp = $value;
-    }
-    if ($key == "or"){
-      $record->org = $value;
-    }
-    if ($key == "zi"){
-      $record->postal_code = $value;
-    }
-    if ($key == "la"){
-      $record->latitude = $value;
-    }
-    if ($key == "lo"){
-      $record->longitude = $value;
-    }
-  }
-  $number = $GLOBALS['GEOIP_COUNTRY_CODE_TO_NUMBER'][$record->country_code];
-  $record->country_code3 = $GLOBALS['GEOIP_COUNTRY_CODES3'][$number];
-  $record->country_name = $GLOBALS['GEOIP_COUNTRY_NAMES'][$number];
-  if ($record->region != "") {
-    if (($record->country_code == "US") || ($record->country_code == "CA")){
-      $record->regionname = $GLOBALS['ISO'][$record->country_code][$record->region];
-    } else {
-      $record->regionname = $GLOBALS['FIPS'][$record->country_code][$record->region];
-    }
-  }
-  return $record;
+function _common_get_record($gi, $seek_country)
+{
+	// workaround php's broken substr, strpos, etc handling with
+	// mbstring.func_overload and mbstring.internal_encoding
+	$mbExists = extension_loaded('mbstring');
+	if ($mbExists) {
+		$enc = mb_internal_encoding();
+		mb_internal_encoding('ISO-8859-1');
+	}
+
+	$record_pointer = $seek_country + (2 * $gi->record_length - 1) * $gi->databaseSegments;
+
+	if ($gi->flags & GEOIP_MEMORY_CACHE) {
+		$record_buf = substr($gi->memory_buffer, $record_pointer, FULL_RECORD_LENGTH);
+	} elseif ($gi->flags & GEOIP_SHARED_MEMORY) {
+		$record_buf = _sharedMemRead($gi, $record_pointer, FULL_RECORD_LENGTH);
+	} else {
+		fseek($gi->filehandle, $record_pointer, SEEK_SET);
+		$record_buf = fread($gi->filehandle, FULL_RECORD_LENGTH);
+	}
+	$record = new geoiprecord;
+	$record_buf_pos = 0;
+	$char = ord(substr($record_buf, $record_buf_pos, 1));
+	$record->country_code = $gi->GEOIP_COUNTRY_CODES[$char];
+	$record->country_code3 = $gi->GEOIP_COUNTRY_CODES3[$char];
+	$record->country_name = $gi->GEOIP_COUNTRY_NAMES[$char];
+	$record->continent_code = $gi->GEOIP_CONTINENT_CODES[$char];
+	$record_buf_pos++;
+	$str_length = 0;
+
+	// Get region
+	$char = ord(substr($record_buf, $record_buf_pos + $str_length, 1));
+	while ($char != 0) {
+		$str_length++;
+		$char = ord(substr($record_buf, $record_buf_pos + $str_length, 1));
+	}
+	if ($str_length > 0) {
+		$record->region = substr($record_buf, $record_buf_pos, $str_length);
+	}
+	$record_buf_pos += $str_length + 1;
+	$str_length = 0;
+	// Get city
+	$char = ord(substr($record_buf, $record_buf_pos + $str_length, 1));
+	while ($char != 0) {
+		$str_length++;
+		$char = ord(substr($record_buf, $record_buf_pos + $str_length, 1));
+	}
+	if ($str_length > 0) {
+		$record->city = substr($record_buf, $record_buf_pos, $str_length);
+	}
+	$record_buf_pos += $str_length + 1;
+	$str_length = 0;
+	// Get postal code
+	$char = ord(substr($record_buf, $record_buf_pos + $str_length, 1));
+	while ($char != 0) {
+		$str_length++;
+		$char = ord(substr($record_buf, $record_buf_pos + $str_length, 1));
+	}
+	if ($str_length > 0) {
+		$record->postal_code = substr($record_buf, $record_buf_pos, $str_length);
+	}
+	$record_buf_pos += $str_length + 1;
+
+	// Get latitude and longitude
+	$latitude = 0;
+	$longitude = 0;
+	for ($j = 0; $j < 3; ++$j) {
+		$char = ord(substr($record_buf, $record_buf_pos++, 1));
+		$latitude += ($char << ($j * 8));
+	}
+	$record->latitude = ($latitude / 10000) - 180;
+	for ($j = 0; $j < 3; ++$j) {
+		$char = ord(substr($record_buf, $record_buf_pos++, 1));
+		$longitude += ($char << ($j * 8));
+	}
+	$record->longitude = ($longitude / 10000) - 180;
+	if (GEOIP_CITY_EDITION_REV1 == $gi->databaseType) {
+		$metroarea_combo = 0;
+		if ($record->country_code == "US") {
+			for ($j = 0; $j < 3; ++$j) {
+				$char = ord(substr($record_buf, $record_buf_pos++, 1));
+				$metroarea_combo += ($char << ($j * 8));
+			}
+			$record->metro_code = $record->dma_code = floor($metroarea_combo / 1000);
+			$record->area_code = $metroarea_combo % 1000;
+		}
+	}
+	if ($mbExists) {
+		mb_internal_encoding($enc);
+	}
+	return $record;
 }
 
-function _get_record($gi,$ipnum){
-  $seek_country = _geoip_seek_country($gi,$ipnum);
-  if ($seek_country == $gi->databaseSegments) {
-    return NULL;
-  }
-  $record_pointer = $seek_country + (2 * $gi->record_length - 1) * $gi->databaseSegments;
-  
-  if ($gi->flags & GEOIP_MEMORY_CACHE) {
-    $record_buf = substr($gi->memory_buffer,$record_pointer,FULL_RECORD_LENGTH);
-  } elseif ($gi->flags & GEOIP_SHARED_MEMORY){
-    $record_buf = @shmop_read($gi->shmid,$record_pointer,FULL_RECORD_LENGTH);
-  } else {
-    fseek($gi->filehandle, $record_pointer, SEEK_SET);
-    $record_buf = fread($gi->filehandle,FULL_RECORD_LENGTH);
-  }
-  $record = new geoiprecord;
-  $record_buf_pos = 0;
-  $char = ord(substr($record_buf,$record_buf_pos,1));
-    $record->country_code = $gi->GEOIP_COUNTRY_CODES[$char];
-    $record->country_code3 = $gi->GEOIP_COUNTRY_CODES3[$char];
-    $record->country_name = $gi->GEOIP_COUNTRY_NAMES[$char];
-  $record_buf_pos++;
-  $str_length = 0;
-    // Get region
-  $char = ord(substr($record_buf,$record_buf_pos+$str_length,1));
-  while ($char != 0){
-    $str_length++;
-    $char = ord(substr($record_buf,$record_buf_pos+$str_length,1));
-  }
-  if ($str_length > 0){
-    $record->region = substr($record_buf,$record_buf_pos,$str_length);
-  }
-  $record_buf_pos += $str_length + 1;
-  $str_length = 0;
-    // Get city
-  $char = ord(substr($record_buf,$record_buf_pos+$str_length,1));
-  while ($char != 0){
-    $str_length++;
-    $char = ord(substr($record_buf,$record_buf_pos+$str_length,1));
-  }
-  if ($str_length > 0){
-    $record->city = substr($record_buf,$record_buf_pos,$str_length);
-  }
-  $record_buf_pos += $str_length + 1;
-  $str_length = 0;
-    // Get postal code
-  $char = ord(substr($record_buf,$record_buf_pos+$str_length,1));
-  while ($char != 0){
-    $str_length++;
-    $char = ord(substr($record_buf,$record_buf_pos+$str_length,1));
-  }
-  if ($str_length > 0){
-    $record->postal_code = substr($record_buf,$record_buf_pos,$str_length);
-  }
-  $record_buf_pos += $str_length + 1;
-  $str_length = 0;
-    // Get latitude and longitude
-  $latitude = 0;
-  $longitude = 0;
-  for ($j = 0;$j < 3; ++$j){
-    $char = ord(substr($record_buf,$record_buf_pos++,1));
-    $latitude += ($char << ($j * 8));
-  }
-  $record->latitude = ($latitude/10000) - 180;
-  for ($j = 0;$j < 3; ++$j){
-    $char = ord(substr($record_buf,$record_buf_pos++,1));
-    $longitude += ($char << ($j * 8));
-  }
-  $record->longitude = ($longitude/10000) - 180;
-  if (GEOIP_CITY_EDITION_REV1 == $gi->databaseType){
-    $metroarea_combo = 0;
-    if ($record->country_code == "US"){
-      for ($j = 0;$j < 3;++$j){
-        $char = ord(substr($record_buf,$record_buf_pos++,1));
-        $metroarea_combo += ($char << ($j * 8));
-      }
-      $record->metro_code = $record->dma_code = floor($metroarea_combo/1000);
-      $record->area_code = $metroarea_combo%1000;
-    }
-  }
-  return $record;
+function GeoIP_record_by_addr_v6($gi, $addr)
+{
+	if ($addr == null) {
+		return 0;
+	}
+	$ipnum = inet_pton($addr);
+	return _get_record_v6($gi, $ipnum);
 }
 
-function GeoIP_record_by_addr ($gi,$addr){
-  if ($addr == NULL){
-     return 0;
-  }
-  $ipnum = ip2long($addr);
-  return _get_record($gi, $ipnum);
+function _get_record($gi, $ipnum)
+{
+	$seek_country = _geoip_seek_country($gi, $ipnum);
+	if ($seek_country == $gi->databaseSegments) {
+		return null;
+	}
+	return _common_get_record($gi, $seek_country);
 }
 
-?>
+function GeoIP_record_by_addr($gi, $addr)
+{
+	if ($addr == null) {
+		return 0;
+	}
+	$ipnum = ip2long($addr);
+	return _get_record($gi, $ipnum);
+}
\ No newline at end of file
diff --git a/htdocs/includes/geoip/geoipregionvars.php b/htdocs/includes/geoip/geoipregionvars.php
index 7747c668af9..2ba9e0b0653 100644
--- a/htdocs/includes/geoip/geoipregionvars.php
+++ b/htdocs/includes/geoip/geoipregionvars.php
@@ -1,4456 +1,4633 @@
 <?php
-# Copyright 2009 Maxmind LLC All Rights Reserved
-$GEOIP_REGION_NAME = array(
-"AD" => array(
-  "02" => "Canillo",
-  "03" => "Encamp",
-  "04" => "La Massana",
-  "05" => "Ordino",
-  "06" => "Sant Julia de Loria",
-  "07" => "Andorra la Vella",
-  "08" => "Escaldes-Engordany"),
-"AE" => array(
-  "01" => "Abu Dhabi",
-  "02" => "Ajman",
-  "03" => "Dubai",
-  "04" => "Fujairah",
-  "05" => "Ras Al Khaimah",
-  "06" => "Sharjah",
-  "07" => "Umm Al Quwain"),
-"AF" => array(
-  "01" => "Badakhshan",
-  "02" => "Badghis",
-  "03" => "Baghlan",
-  "05" => "Bamian",
-  "06" => "Farah",
-  "07" => "Faryab",
-  "08" => "Ghazni",
-  "09" => "Ghowr",
-  "10" => "Helmand",
-  "11" => "Herat",
-  "13" => "Kabol",
-  "14" => "Kapisa",
-  "15" => "Konar",
-  "16" => "Laghman",
-  "17" => "Lowgar",
-  "18" => "Nangarhar",
-  "19" => "Nimruz",
-  "21" => "Paktia",
-  "22" => "Parvan",
-  "23" => "Kandahar",
-  "24" => "Kondoz",
-  "26" => "Takhar",
-  "27" => "Vardak",
-  "28" => "Zabol",
-  "29" => "Paktika",
-  "30" => "Balkh",
-  "31" => "Jowzjan",
-  "32" => "Samangan",
-  "33" => "Sar-e Pol",
-  "34" => "Konar",
-  "35" => "Laghman",
-  "36" => "Paktia",
-  "37" => "Khowst",
-  "38" => "Nurestan",
-  "39" => "Oruzgan",
-  "40" => "Parvan",
-  "41" => "Daykondi",
-  "42" => "Panjshir"),
-"AG" => array(
-  "01" => "Barbuda",
-  "03" => "Saint George",
-  "04" => "Saint John",
-  "05" => "Saint Mary",
-  "06" => "Saint Paul",
-  "07" => "Saint Peter",
-  "08" => "Saint Philip"),
-"AL" => array(
-  "40" => "Berat",
-  "41" => "Diber",
-  "42" => "Durres",
-  "43" => "Elbasan",
-  "44" => "Fier",
-  "45" => "Gjirokaster",
-  "46" => "Korce",
-  "47" => "Kukes",
-  "48" => "Lezhe",
-  "49" => "Shkoder",
-  "50" => "Tirane",
-  "51" => "Vlore"),
-"AM" => array(
-  "01" => "Aragatsotn",
-  "02" => "Ararat",
-  "03" => "Armavir",
-  "04" => "Geghark'unik'",
-  "05" => "Kotayk'",
-  "06" => "Lorri",
-  "07" => "Shirak",
-  "08" => "Syunik'",
-  "09" => "Tavush",
-  "10" => "Vayots' Dzor",
-  "11" => "Yerevan"),
-"AO" => array(
-  "01" => "Benguela",
-  "02" => "Bie",
-  "03" => "Cabinda",
-  "04" => "Cuando Cubango",
-  "05" => "Cuanza Norte",
-  "06" => "Cuanza Sul",
-  "07" => "Cunene",
-  "08" => "Huambo",
-  "09" => "Huila",
-  "10" => "Luanda",
-  "12" => "Malanje",
-  "13" => "Namibe",
-  "14" => "Moxico",
-  "15" => "Uige",
-  "16" => "Zaire",
-  "17" => "Lunda Norte",
-  "18" => "Lunda Sul",
-  "19" => "Bengo",
-  "20" => "Luanda"),
-"AR" => array(
-  "01" => "Buenos Aires",
-  "02" => "Catamarca",
-  "03" => "Chaco",
-  "04" => "Chubut",
-  "05" => "Cordoba",
-  "06" => "Corrientes",
-  "07" => "Distrito Federal",
-  "08" => "Entre Rios",
-  "09" => "Formosa",
-  "10" => "Jujuy",
-  "11" => "La Pampa",
-  "12" => "La Rioja",
-  "13" => "Mendoza",
-  "14" => "Misiones",
-  "15" => "Neuquen",
-  "16" => "Rio Negro",
-  "17" => "Salta",
-  "18" => "San Juan",
-  "19" => "San Luis",
-  "20" => "Santa Cruz",
-  "21" => "Santa Fe",
-  "22" => "Santiago del Estero",
-  "23" => "Tierra del Fuego",
-  "24" => "Tucuman"),
-"AT" => array(
-  "01" => "Burgenland",
-  "02" => "Karnten",
-  "03" => "Niederosterreich",
-  "04" => "Oberosterreich",
-  "05" => "Salzburg",
-  "06" => "Steiermark",
-  "07" => "Tirol",
-  "08" => "Vorarlberg",
-  "09" => "Wien"),
-"AU" => array(
-  "01" => "Australian Capital Territory",
-  "02" => "New South Wales",
-  "03" => "Northern Territory",
-  "04" => "Queensland",
-  "05" => "South Australia",
-  "06" => "Tasmania",
-  "07" => "Victoria",
-  "08" => "Western Australia"),
-"AZ" => array(
-  "01" => "Abseron",
-  "02" => "Agcabadi",
-  "03" => "Agdam",
-  "04" => "Agdas",
-  "05" => "Agstafa",
-  "06" => "Agsu",
-  "07" => "Ali Bayramli",
-  "08" => "Astara",
-  "09" => "Baki",
-  "10" => "Balakan",
-  "11" => "Barda",
-  "12" => "Beylaqan",
-  "13" => "Bilasuvar",
-  "14" => "Cabrayil",
-  "15" => "Calilabad",
-  "16" => "Daskasan",
-  "17" => "Davaci",
-  "18" => "Fuzuli",
-  "19" => "Gadabay",
-  "20" => "Ganca",
-  "21" => "Goranboy",
-  "22" => "Goycay",
-  "23" => "Haciqabul",
-  "24" => "Imisli",
-  "25" => "Ismayilli",
-  "26" => "Kalbacar",
-  "27" => "Kurdamir",
-  "28" => "Lacin",
-  "29" => "Lankaran",
-  "30" => "Lankaran",
-  "31" => "Lerik",
-  "32" => "Masalli",
-  "33" => "Mingacevir",
-  "34" => "Naftalan",
-  "35" => "Naxcivan",
-  "36" => "Neftcala",
-  "37" => "Oguz",
-  "38" => "Qabala",
-  "39" => "Qax",
-  "40" => "Qazax",
-  "41" => "Qobustan",
-  "42" => "Quba",
-  "43" => "Qubadli",
-  "44" => "Qusar",
-  "45" => "Saatli",
-  "46" => "Sabirabad",
-  "47" => "Saki",
-  "48" => "Saki",
-  "49" => "Salyan",
-  "50" => "Samaxi",
-  "51" => "Samkir",
-  "52" => "Samux",
-  "53" => "Siyazan",
-  "54" => "Sumqayit",
-  "55" => "Susa",
-  "56" => "Susa",
-  "57" => "Tartar",
-  "58" => "Tovuz",
-  "59" => "Ucar",
-  "60" => "Xacmaz",
-  "61" => "Xankandi",
-  "62" => "Xanlar",
-  "63" => "Xizi",
-  "64" => "Xocali",
-  "65" => "Xocavand",
-  "66" => "Yardimli",
-  "67" => "Yevlax",
-  "68" => "Yevlax",
-  "69" => "Zangilan",
-  "70" => "Zaqatala",
-  "71" => "Zardab"),
-"BA" => array(
-  "01" => "Federation of Bosnia and Herzegovina",
-  "02" => "Republika Srpska"),
-"BB" => array(
-  "01" => "Christ Church",
-  "02" => "Saint Andrew",
-  "03" => "Saint George",
-  "04" => "Saint James",
-  "05" => "Saint John",
-  "06" => "Saint Joseph",
-  "07" => "Saint Lucy",
-  "08" => "Saint Michael",
-  "09" => "Saint Peter",
-  "10" => "Saint Philip",
-  "11" => "Saint Thomas"),
-"BD" => array(
-  "01" => "Barisal",
-  "04" => "Bandarban",
-  "05" => "Comilla",
-  "12" => "Mymensingh",
-  "13" => "Noakhali",
-  "15" => "Patuakhali",
-  "22" => "Bagerhat",
-  "23" => "Bhola",
-  "24" => "Bogra",
-  "25" => "Barguna",
-  "26" => "Brahmanbaria",
-  "27" => "Chandpur",
-  "28" => "Chapai Nawabganj",
-  "29" => "Chattagram",
-  "30" => "Chuadanga",
-  "31" => "Cox's Bazar",
-  "32" => "Dhaka",
-  "33" => "Dinajpur",
-  "34" => "Faridpur",
-  "35" => "Feni",
-  "36" => "Gaibandha",
-  "37" => "Gazipur",
-  "38" => "Gopalganj",
-  "39" => "Habiganj",
-  "40" => "Jaipurhat",
-  "41" => "Jamalpur",
-  "42" => "Jessore",
-  "43" => "Jhalakati",
-  "44" => "Jhenaidah",
-  "45" => "Khagrachari",
-  "46" => "Khulna",
-  "47" => "Kishorganj",
-  "48" => "Kurigram",
-  "49" => "Kushtia",
-  "50" => "Laksmipur",
-  "51" => "Lalmonirhat",
-  "52" => "Madaripur",
-  "53" => "Magura",
-  "54" => "Manikganj",
-  "55" => "Meherpur",
-  "56" => "Moulavibazar",
-  "57" => "Munshiganj",
-  "58" => "Naogaon",
-  "59" => "Narail",
-  "60" => "Narayanganj",
-  "61" => "Narsingdi",
-  "62" => "Nator",
-  "63" => "Netrakona",
-  "64" => "Nilphamari",
-  "65" => "Pabna",
-  "66" => "Panchagar",
-  "67" => "Parbattya Chattagram",
-  "68" => "Pirojpur",
-  "69" => "Rajbari",
-  "70" => "Rajshahi",
-  "71" => "Rangpur",
-  "72" => "Satkhira",
-  "73" => "Shariyatpur",
-  "74" => "Sherpur",
-  "75" => "Sirajganj",
-  "76" => "Sunamganj",
-  "77" => "Sylhet",
-  "78" => "Tangail",
-  "79" => "Thakurgaon",
-  "81" => "Dhaka",
-  "82" => "Khulna",
-  "83" => "Rajshahi",
-  "84" => "Chittagong",
-  "85" => "Barisal",
-  "86" => "Sylhet"),
-"BE" => array(
-  "01" => "Antwerpen",
-  "02" => "Brabant",
-  "03" => "Hainaut",
-  "04" => "Liege",
-  "05" => "Limburg",
-  "06" => "Luxembourg",
-  "07" => "Namur",
-  "08" => "Oost-Vlaanderen",
-  "09" => "West-Vlaanderen",
-  "10" => "Brabant Wallon",
-  "11" => "Brussels Hoofdstedelijk Gewest",
-  "12" => "Vlaams-Brabant"),
-"BF" => array(
-  "15" => "Bam",
-  "19" => "Boulkiemde",
-  "20" => "Ganzourgou",
-  "21" => "Gnagna",
-  "28" => "Kouritenga",
-  "33" => "Oudalan",
-  "34" => "Passore",
-  "36" => "Sanguie",
-  "40" => "Soum",
-  "42" => "Tapoa",
-  "44" => "Zoundweogo",
-  "45" => "Bale",
-  "46" => "Banwa",
-  "47" => "Bazega",
-  "48" => "Bougouriba",
-  "49" => "Boulgou",
-  "50" => "Gourma",
-  "51" => "Houet",
-  "52" => "Ioba",
-  "53" => "Kadiogo",
-  "54" => "Kenedougou",
-  "55" => "Komoe",
-  "56" => "Komondjari",
-  "57" => "Kompienga",
-  "58" => "Kossi",
-  "59" => "Koulpelogo",
-  "60" => "Kourweogo",
-  "61" => "Leraba",
-  "62" => "Loroum",
-  "63" => "Mouhoun",
-  "64" => "Namentenga",
-  "65" => "Naouri",
-  "66" => "Nayala",
-  "67" => "Noumbiel",
-  "68" => "Oubritenga",
-  "69" => "Poni",
-  "70" => "Sanmatenga",
-  "71" => "Seno",
-  "72" => "Sissili",
-  "73" => "Sourou",
-  "74" => "Tuy",
-  "75" => "Yagha",
-  "76" => "Yatenga",
-  "77" => "Ziro",
-  "78" => "Zondoma"),
-"BG" => array(
-  "33" => "Mikhaylovgrad",
-  "38" => "Blagoevgrad",
-  "39" => "Burgas",
-  "40" => "Dobrich",
-  "41" => "Gabrovo",
-  "42" => "Grad Sofiya",
-  "43" => "Khaskovo",
-  "44" => "Kurdzhali",
-  "45" => "Kyustendil",
-  "46" => "Lovech",
-  "47" => "Montana",
-  "48" => "Pazardzhik",
-  "49" => "Pernik",
-  "50" => "Pleven",
-  "51" => "Plovdiv",
-  "52" => "Razgrad",
-  "53" => "Ruse",
-  "54" => "Shumen",
-  "55" => "Silistra",
-  "56" => "Sliven",
-  "57" => "Smolyan",
-  "58" => "Sofiya",
-  "59" => "Stara Zagora",
-  "60" => "Turgovishte",
-  "61" => "Varna",
-  "62" => "Veliko Turnovo",
-  "63" => "Vidin",
-  "64" => "Vratsa",
-  "65" => "Yambol"),
-"BH" => array(
-  "01" => "Al Hadd",
-  "02" => "Al Manamah",
-  "03" => "Al Muharraq",
-  "05" => "Jidd Hafs",
-  "06" => "Sitrah",
-  "07" => "Ar Rifa' wa al Mintaqah al Janubiyah",
-  "08" => "Al Mintaqah al Gharbiyah",
-  "09" => "Mintaqat Juzur Hawar",
-  "10" => "Al Mintaqah ash Shamaliyah",
-  "11" => "Al Mintaqah al Wusta",
-  "12" => "Madinat",
-  "13" => "Ar Rifa",
-  "14" => "Madinat Hamad",
-  "15" => "Al Muharraq",
-  "16" => "Al Asimah",
-  "17" => "Al Janubiyah",
-  "18" => "Ash Shamaliyah",
-  "19" => "Al Wusta"),
-"BI" => array(
-  "02" => "Bujumbura",
-  "09" => "Bubanza",
-  "10" => "Bururi",
-  "11" => "Cankuzo",
-  "12" => "Cibitoke",
-  "13" => "Gitega",
-  "14" => "Karuzi",
-  "15" => "Kayanza",
-  "16" => "Kirundo",
-  "17" => "Makamba",
-  "18" => "Muyinga",
-  "19" => "Ngozi",
-  "20" => "Rutana",
-  "21" => "Ruyigi",
-  "22" => "Muramvya",
-  "23" => "Mwaro"),
-"BJ" => array(
-  "01" => "Atakora",
-  "02" => "Atlantique",
-  "03" => "Borgou",
-  "04" => "Mono",
-  "05" => "Oueme",
-  "06" => "Zou",
-  "07" => "Alibori",
-  "08" => "Atakora",
-  "09" => "Atlanyique",
-  "10" => "Borgou",
-  "11" => "Collines",
-  "12" => "Kouffo",
-  "13" => "Donga",
-  "14" => "Littoral",
-  "15" => "Mono",
-  "16" => "Oueme",
-  "17" => "Plateau",
-  "18" => "Zou"),
-"BM" => array(
-  "01" => "Devonshire",
-  "02" => "Hamilton",
-  "03" => "Hamilton",
-  "04" => "Paget",
-  "05" => "Pembroke",
-  "06" => "Saint George",
-  "07" => "Saint George's",
-  "08" => "Sandys",
-  "09" => "Smiths",
-  "10" => "Southampton",
-  "11" => "Warwick"),
-"BN" => array(
-  "07" => "Alibori",
-  "08" => "Belait",
-  "09" => "Brunei and Muara",
-  "10" => "Temburong",
-  "11" => "Collines",
-  "12" => "Kouffo",
-  "13" => "Donga",
-  "14" => "Littoral",
-  "15" => "Tutong",
-  "16" => "Oueme",
-  "17" => "Plateau",
-  "18" => "Zou"),
-"BO" => array(
-  "01" => "Chuquisaca",
-  "02" => "Cochabamba",
-  "03" => "El Beni",
-  "04" => "La Paz",
-  "05" => "Oruro",
-  "06" => "Pando",
-  "07" => "Potosi",
-  "08" => "Santa Cruz",
-  "09" => "Tarija"),
-"BR" => array(
-  "01" => "Acre",
-  "02" => "Alagoas",
-  "03" => "Amapa",
-  "04" => "Amazonas",
-  "05" => "Bahia",
-  "06" => "Ceara",
-  "07" => "Distrito Federal",
-  "08" => "Espirito Santo",
-  "11" => "Mato Grosso do Sul",
-  "13" => "Maranhao",
-  "14" => "Mato Grosso",
-  "15" => "Minas Gerais",
-  "16" => "Para",
-  "17" => "Paraiba",
-  "18" => "Parana",
-  "20" => "Piaui",
-  "21" => "Rio de Janeiro",
-  "22" => "Rio Grande do Norte",
-  "23" => "Rio Grande do Sul",
-  "24" => "Rondonia",
-  "25" => "Roraima",
-  "26" => "Santa Catarina",
-  "27" => "Sao Paulo",
-  "28" => "Sergipe",
-  "29" => "Goias",
-  "30" => "Pernambuco",
-  "31" => "Tocantins"),
-"BS" => array(
-  "05" => "Bimini",
-  "06" => "Cat Island",
-  "10" => "Exuma",
-  "13" => "Inagua",
-  "15" => "Long Island",
-  "16" => "Mayaguana",
-  "18" => "Ragged Island",
-  "22" => "Harbour Island",
-  "23" => "New Providence",
-  "24" => "Acklins and Crooked Islands",
-  "25" => "Freeport",
-  "26" => "Fresh Creek",
-  "27" => "Governor's Harbour",
-  "28" => "Green Turtle Cay",
-  "29" => "High Rock",
-  "30" => "Kemps Bay",
-  "31" => "Marsh Harbour",
-  "32" => "Nichollstown and Berry Islands",
-  "33" => "Rock Sound",
-  "34" => "Sandy Point",
-  "35" => "San Salvador and Rum Cay"),
-"BT" => array(
-  "05" => "Bumthang",
-  "06" => "Chhukha",
-  "07" => "Chirang",
-  "08" => "Daga",
-  "09" => "Geylegphug",
-  "10" => "Ha",
-  "11" => "Lhuntshi",
-  "12" => "Mongar",
-  "13" => "Paro",
-  "14" => "Pemagatsel",
-  "15" => "Punakha",
-  "16" => "Samchi",
-  "17" => "Samdrup",
-  "18" => "Shemgang",
-  "19" => "Tashigang",
-  "20" => "Thimphu",
-  "21" => "Tongsa",
-  "22" => "Wangdi Phodrang"),
-"BW" => array(
-  "01" => "Central",
-  "03" => "Ghanzi",
-  "04" => "Kgalagadi",
-  "05" => "Kgatleng",
-  "06" => "Kweneng",
-  "08" => "North-East",
-  "09" => "South-East",
-  "10" => "Southern",
-  "11" => "North-West"),
-"BY" => array(
-  "01" => "Brestskaya Voblasts'",
-  "02" => "Homyel'skaya Voblasts'",
-  "03" => "Hrodzyenskaya Voblasts'",
-  "04" => "Minsk",
-  "05" => "Minskaya Voblasts'",
-  "06" => "Mahilyowskaya Voblasts'",
-  "07" => "Vitsyebskaya Voblasts'"),
-"BZ" => array(
-  "01" => "Belize",
-  "02" => "Cayo",
-  "03" => "Corozal",
-  "04" => "Orange Walk",
-  "05" => "Stann Creek",
-  "06" => "Toledo"),
-"CA" => array(
-  "AB" => "Alberta",
-  "BC" => "British Columbia",
-  "MB" => "Manitoba",
-  "NB" => "New Brunswick",
-  "NL" => "Newfoundland",
-  "NS" => "Nova Scotia",
-  "NT" => "Northwest Territories",
-  "NU" => "Nunavut",
-  "ON" => "Ontario",
-  "PE" => "Prince Edward Island",
-  "QC" => "Quebec",
-  "SK" => "Saskatchewan",
-  "YT" => "Yukon Territory"),
-"CD" => array(
-  "01" => "Bandundu",
-  "02" => "Equateur",
-  "04" => "Kasai-Oriental",
-  "05" => "Katanga",
-  "06" => "Kinshasa",
-  "07" => "Kivu",
-  "08" => "Bas-Congo",
-  "09" => "Orientale",
-  "10" => "Maniema",
-  "11" => "Nord-Kivu",
-  "12" => "Sud-Kivu",
-  "13" => "Cuvette"),
-"CF" => array(
-  "01" => "Bamingui-Bangoran",
-  "02" => "Basse-Kotto",
-  "03" => "Haute-Kotto",
-  "04" => "Mambere-Kadei",
-  "05" => "Haut-Mbomou",
-  "06" => "Kemo",
-  "07" => "Lobaye",
-  "08" => "Mbomou",
-  "09" => "Nana-Mambere",
-  "11" => "Ouaka",
-  "12" => "Ouham",
-  "13" => "Ouham-Pende",
-  "14" => "Cuvette-Ouest",
-  "15" => "Nana-Grebizi",
-  "16" => "Sangha-Mbaere",
-  "17" => "Ombella-Mpoko",
-  "18" => "Bangui"),
-"CG" => array(
-  "01" => "Bouenza",
-  "03" => "Cuvette",
-  "04" => "Kouilou",
-  "05" => "Lekoumou",
-  "06" => "Likouala",
-  "07" => "Niari",
-  "08" => "Plateaux",
-  "10" => "Sangha",
-  "11" => "Pool",
-  "12" => "Brazzaville"),
-"CH" => array(
-  "01" => "Aargau",
-  "02" => "Ausser-Rhoden",
-  "03" => "Basel-Landschaft",
-  "04" => "Basel-Stadt",
-  "05" => "Bern",
-  "06" => "Fribourg",
-  "07" => "Geneve",
-  "08" => "Glarus",
-  "09" => "Graubunden",
-  "10" => "Inner-Rhoden",
-  "11" => "Luzern",
-  "12" => "Neuchatel",
-  "13" => "Nidwalden",
-  "14" => "Obwalden",
-  "15" => "Sankt Gallen",
-  "16" => "Schaffhausen",
-  "17" => "Schwyz",
-  "18" => "Solothurn",
-  "19" => "Thurgau",
-  "20" => "Ticino",
-  "21" => "Uri",
-  "22" => "Valais",
-  "23" => "Vaud",
-  "24" => "Zug",
-  "25" => "Zurich",
-  "26" => "Jura"),
-"CI" => array(
-  "05" => "Atacama",
-  "06" => "Biobio",
-  "51" => "Sassandra",
-  "61" => "Abidjan",
-  "74" => "Agneby",
-  "75" => "Bafing",
-  "76" => "Bas-Sassandra",
-  "77" => "Denguele",
-  "78" => "Dix-Huit Montagnes",
-  "79" => "Fromager",
-  "80" => "Haut-Sassandra",
-  "81" => "Lacs",
-  "82" => "Lagunes",
-  "83" => "Marahoue",
-  "84" => "Moyen-Cavally",
-  "85" => "Moyen-Comoe",
-  "86" => "N'zi-Comoe",
-  "87" => "Savanes",
-  "88" => "Sud-Bandama",
-  "89" => "Sud-Comoe",
-  "90" => "Vallee du Bandama",
-  "91" => "Worodougou",
-  "92" => "Zanzan"),
-"CL" => array(
-  "01" => "Valparaiso",
-  "02" => "Aisen del General Carlos Ibanez del Campo",
-  "03" => "Antofagasta",
-  "04" => "Araucania",
-  "05" => "Atacama",
-  "06" => "Bio-Bio",
-  "07" => "Coquimbo",
-  "08" => "Libertador General Bernardo O'Higgins",
-  "09" => "Los Lagos",
-  "10" => "Magallanes y de la Antartica Chilena",
-  "11" => "Maule",
-  "12" => "Region Metropolitana",
-  "13" => "Tarapaca"),
-"CM" => array(
-  "04" => "Est",
-  "05" => "Littoral",
-  "07" => "Nord-Ouest",
-  "08" => "Ouest",
-  "09" => "Sud-Ouest",
-  "10" => "Adamaoua",
-  "11" => "Centre",
-  "12" => "Extreme-Nord",
-  "13" => "Nord",
-  "14" => "Sud"),
-"CN" => array(
-  "01" => "Anhui",
-  "02" => "Zhejiang",
-  "03" => "Jiangxi",
-  "04" => "Jiangsu",
-  "05" => "Jilin",
-  "06" => "Qinghai",
-  "07" => "Fujian",
-  "08" => "Heilongjiang",
-  "09" => "Henan",
-  "10" => "Hebei",
-  "11" => "Hunan",
-  "12" => "Hubei",
-  "13" => "Xinjiang",
-  "14" => "Xizang",
-  "15" => "Gansu",
-  "16" => "Guangxi",
-  "18" => "Guizhou",
-  "19" => "Liaoning",
-  "20" => "Nei Mongol",
-  "21" => "Ningxia",
-  "22" => "Beijing",
-  "23" => "Shanghai",
-  "24" => "Shanxi",
-  "25" => "Shandong",
-  "26" => "Shaanxi",
-  "28" => "Tianjin",
-  "29" => "Yunnan",
-  "30" => "Guangdong",
-  "31" => "Hainan",
-  "32" => "Sichuan",
-  "33" => "Chongqing"),
-"CO" => array(
-  "01" => "Amazonas",
-  "02" => "Antioquia",
-  "03" => "Arauca",
-  "04" => "Atlantico",
-  "05" => "Bolivar Department",
-  "06" => "Boyaca Department",
-  "07" => "Caldas Department",
-  "08" => "Caqueta",
-  "09" => "Cauca",
-  "10" => "Cesar",
-  "11" => "Choco",
-  "12" => "Cordoba",
-  "14" => "Guaviare",
-  "15" => "Guainia",
-  "16" => "Huila",
-  "17" => "La Guajira",
-  "18" => "Magdalena Department",
-  "19" => "Meta",
-  "20" => "Narino",
-  "21" => "Norte de Santander",
-  "22" => "Putumayo",
-  "23" => "Quindio",
-  "24" => "Risaralda",
-  "25" => "San Andres y Providencia",
-  "26" => "Santander",
-  "27" => "Sucre",
-  "28" => "Tolima",
-  "29" => "Valle del Cauca",
-  "30" => "Vaupes",
-  "31" => "Vichada",
-  "32" => "Casanare",
-  "33" => "Cundinamarca",
-  "34" => "Distrito Especial",
-  "35" => "Bolivar",
-  "36" => "Boyaca",
-  "37" => "Caldas",
-  "38" => "Magdalena"),
-"CR" => array(
-  "01" => "Alajuela",
-  "02" => "Cartago",
-  "03" => "Guanacaste",
-  "04" => "Heredia",
-  "06" => "Limon",
-  "07" => "Puntarenas",
-  "08" => "San Jose"),
-"CU" => array(
-  "01" => "Pinar del Rio",
-  "02" => "Ciudad de la Habana",
-  "03" => "Matanzas",
-  "04" => "Isla de la Juventud",
-  "05" => "Camaguey",
-  "07" => "Ciego de Avila",
-  "08" => "Cienfuegos",
-  "09" => "Granma",
-  "10" => "Guantanamo",
-  "11" => "La Habana",
-  "12" => "Holguin",
-  "13" => "Las Tunas",
-  "14" => "Sancti Spiritus",
-  "15" => "Santiago de Cuba",
-  "16" => "Villa Clara"),
-"CV" => array(
-  "01" => "Boa Vista",
-  "02" => "Brava",
-  "04" => "Maio",
-  "05" => "Paul",
-  "07" => "Ribeira Grande",
-  "08" => "Sal",
-  "10" => "Sao Nicolau",
-  "11" => "Sao Vicente",
-  "13" => "Mosteiros",
-  "14" => "Praia",
-  "15" => "Santa Catarina",
-  "16" => "Santa Cruz",
-  "17" => "Sao Domingos",
-  "18" => "Sao Filipe",
-  "19" => "Sao Miguel",
-  "20" => "Tarrafal"),
-"CY" => array(
-  "01" => "Famagusta",
-  "02" => "Kyrenia",
-  "03" => "Larnaca",
-  "04" => "Nicosia",
-  "05" => "Limassol",
-  "06" => "Paphos"),
-"CZ" => array(
-  "03" => "Blansko",
-  "04" => "Breclav",
-  "20" => "Hradec Kralove",
-  "21" => "Jablonec nad Nisou",
-  "23" => "Jicin",
-  "24" => "Jihlava",
-  "30" => "Kolin",
-  "33" => "Liberec",
-  "36" => "Melnik",
-  "37" => "Mlada Boleslav",
-  "39" => "Nachod",
-  "41" => "Nymburk",
-  "45" => "Pardubice",
-  "52" => "Hlavni mesto Praha",
-  "61" => "Semily",
-  "70" => "Trutnov",
-  "78" => "Jihomoravsky kraj",
-  "79" => "Jihocesky kraj",
-  "80" => "Vysocina",
-  "81" => "Karlovarsky kraj",
-  "82" => "Kralovehradecky kraj",
-  "83" => "Liberecky kraj",
-  "84" => "Olomoucky kraj",
-  "85" => "Moravskoslezsky kraj",
-  "86" => "Pardubicky kraj",
-  "87" => "Plzensky kraj",
-  "88" => "Stredocesky kraj",
-  "89" => "Ustecky kraj",
-  "90" => "Zlinsky kraj"),
-"DE" => array(
-  "01" => "Baden-Wurttemberg",
-  "02" => "Bayern",
-  "03" => "Bremen",
-  "04" => "Hamburg",
-  "05" => "Hessen",
-  "06" => "Niedersachsen",
-  "07" => "Nordrhein-Westfalen",
-  "08" => "Rheinland-Pfalz",
-  "09" => "Saarland",
-  "10" => "Schleswig-Holstein",
-  "11" => "Brandenburg",
-  "12" => "Mecklenburg-Vorpommern",
-  "13" => "Sachsen",
-  "14" => "Sachsen-Anhalt",
-  "15" => "Thuringen",
-  "16" => "Berlin"),
-"DJ" => array(
-  "01" => "Ali Sabieh",
-  "04" => "Obock",
-  "05" => "Tadjoura",
-  "06" => "Dikhil",
-  "07" => "Djibouti",
-  "08" => "Arta"),
-"DK" => array(
-  "01" => "Arhus",
-  "02" => "Bornholm",
-  "03" => "Frederiksborg",
-  "04" => "Fyn",
-  "05" => "Kobenhavn",
-  "06" => "Staden Kobenhavn",
-  "07" => "Nordjylland",
-  "08" => "Ribe",
-  "09" => "Ringkobing",
-  "10" => "Roskilde",
-  "11" => "Sonderjylland",
-  "12" => "Storstrom",
-  "13" => "Vejle",
-  "14" => "Vestsjalland",
-  "15" => "Viborg",
-  "17" => "Hovedstaden",
-  "18" => "Midtjyllen",
-  "19" => "Nordjylland",
-  "20" => "Sjelland",
-  "21" => "Syddanmark"),
-"DM" => array(
-  "02" => "Saint Andrew",
-  "03" => "Saint David",
-  "04" => "Saint George",
-  "05" => "Saint John",
-  "06" => "Saint Joseph",
-  "07" => "Saint Luke",
-  "08" => "Saint Mark",
-  "09" => "Saint Patrick",
-  "10" => "Saint Paul",
-  "11" => "Saint Peter"),
-"DO" => array(
-  "01" => "Azua",
-  "02" => "Baoruco",
-  "03" => "Barahona",
-  "04" => "Dajabon",
-  "05" => "Distrito Nacional",
-  "06" => "Duarte",
-  "08" => "Espaillat",
-  "09" => "Independencia",
-  "10" => "La Altagracia",
-  "11" => "Elias Pina",
-  "12" => "La Romana",
-  "14" => "Maria Trinidad Sanchez",
-  "15" => "Monte Cristi",
-  "16" => "Pedernales",
-  "17" => "Peravia",
-  "18" => "Puerto Plata",
-  "19" => "Salcedo",
-  "20" => "Samana",
-  "21" => "Sanchez Ramirez",
-  "23" => "San Juan",
-  "24" => "San Pedro De Macoris",
-  "25" => "Santiago",
-  "26" => "Santiago Rodriguez",
-  "27" => "Valverde",
-  "28" => "El Seibo",
-  "29" => "Hato Mayor",
-  "30" => "La Vega",
-  "31" => "Monsenor Nouel",
-  "32" => "Monte Plata",
-  "33" => "San Cristobal",
-  "34" => "Distrito Nacional",
-  "35" => "Peravia",
-  "36" => "San Jose de Ocoa",
-  "37" => "Santo Domingo"),
-"DZ" => array(
-  "01" => "Alger",
-  "03" => "Batna",
-  "04" => "Constantine",
-  "06" => "Medea",
-  "07" => "Mostaganem",
-  "09" => "Oran",
-  "10" => "Saida",
-  "12" => "Setif",
-  "13" => "Tiaret",
-  "14" => "Tizi Ouzou",
-  "15" => "Tlemcen",
-  "18" => "Bejaia",
-  "19" => "Biskra",
-  "20" => "Blida",
-  "21" => "Bouira",
-  "22" => "Djelfa",
-  "23" => "Guelma",
-  "24" => "Jijel",
-  "25" => "Laghouat",
-  "26" => "Mascara",
-  "27" => "M'sila",
-  "29" => "Oum el Bouaghi",
-  "30" => "Sidi Bel Abbes",
-  "31" => "Skikda",
-  "33" => "Tebessa",
-  "34" => "Adrar",
-  "35" => "Ain Defla",
-  "36" => "Ain Temouchent",
-  "37" => "Annaba",
-  "38" => "Bechar",
-  "39" => "Bordj Bou Arreridj",
-  "40" => "Boumerdes",
-  "41" => "Chlef",
-  "42" => "El Bayadh",
-  "43" => "El Oued",
-  "44" => "El Tarf",
-  "45" => "Ghardaia",
-  "46" => "Illizi",
-  "47" => "Khenchela",
-  "48" => "Mila",
-  "49" => "Naama",
-  "50" => "Ouargla",
-  "51" => "Relizane",
-  "52" => "Souk Ahras",
-  "53" => "Tamanghasset",
-  "54" => "Tindouf",
-  "55" => "Tipaza",
-  "56" => "Tissemsilt"),
-"EC" => array(
-  "01" => "Galapagos",
-  "02" => "Azuay",
-  "03" => "Bolivar",
-  "04" => "Canar",
-  "05" => "Carchi",
-  "06" => "Chimborazo",
-  "07" => "Cotopaxi",
-  "08" => "El Oro",
-  "09" => "Esmeraldas",
-  "10" => "Guayas",
-  "11" => "Imbabura",
-  "12" => "Loja",
-  "13" => "Los Rios",
-  "14" => "Manabi",
-  "15" => "Morona-Santiago",
-  "17" => "Pastaza",
-  "18" => "Pichincha",
-  "19" => "Tungurahua",
-  "20" => "Zamora-Chinchipe",
-  "22" => "Sucumbios",
-  "23" => "Napo",
-  "24" => "Orellana"),
-"EE" => array(
-  "01" => "Harjumaa",
-  "02" => "Hiiumaa",
-  "03" => "Ida-Virumaa",
-  "04" => "Jarvamaa",
-  "05" => "Jogevamaa",
-  "06" => "Kohtla-Jarve",
-  "07" => "Laanemaa",
-  "08" => "Laane-Virumaa",
-  "09" => "Narva",
-  "10" => "Parnu",
-  "11" => "Parnumaa",
-  "12" => "Polvamaa",
-  "13" => "Raplamaa",
-  "14" => "Saaremaa",
-  "15" => "Sillamae",
-  "16" => "Tallinn",
-  "17" => "Tartu",
-  "18" => "Tartumaa",
-  "19" => "Valgamaa",
-  "20" => "Viljandimaa",
-  "21" => "Vorumaa"),
-"EG" => array(
-  "01" => "Ad Daqahliyah",
-  "02" => "Al Bahr al Ahmar",
-  "03" => "Al Buhayrah",
-  "04" => "Al Fayyum",
-  "05" => "Al Gharbiyah",
-  "06" => "Al Iskandariyah",
-  "07" => "Al Isma'iliyah",
-  "08" => "Al Jizah",
-  "09" => "Al Minufiyah",
-  "10" => "Al Minya",
-  "11" => "Al Qahirah",
-  "12" => "Al Qalyubiyah",
-  "13" => "Al Wadi al Jadid",
-  "14" => "Ash Sharqiyah",
-  "15" => "As Suways",
-  "16" => "Aswan",
-  "17" => "Asyut",
-  "18" => "Bani Suwayf",
-  "19" => "Bur Sa'id",
-  "20" => "Dumyat",
-  "21" => "Kafr ash Shaykh",
-  "22" => "Matruh",
-  "23" => "Qina",
-  "24" => "Suhaj",
-  "26" => "Janub Sina'",
-  "27" => "Shamal Sina'"),
-"ER" => array(
-  "01" => "Anseba",
-  "02" => "Debub",
-  "03" => "Debubawi K'eyih Bahri",
-  "04" => "Gash Barka",
-  "05" => "Ma'akel",
-  "06" => "Semenawi K'eyih Bahri"),
-"ES" => array(
-  "07" => "Islas Baleares",
-  "27" => "La Rioja",
-  "29" => "Madrid",
-  "31" => "Murcia",
-  "32" => "Navarra",
-  "34" => "Asturias",
-  "39" => "Cantabria",
-  "51" => "Andalucia",
-  "52" => "Aragon",
-  "53" => "Canarias",
-  "54" => "Castilla-La Mancha",
-  "55" => "Castilla y Leon",
-  "56" => "Catalonia",
-  "57" => "Extremadura",
-  "58" => "Galicia",
-  "59" => "Pais Vasco",
-  "60" => "Comunidad Valenciana"),
-"ET" => array(
-  "02" => "Amhara",
-  "07" => "Somali",
-  "08" => "Gambella",
-  "10" => "Addis Abeba",
-  "11" => "Southern",
-  "12" => "Tigray",
-  "13" => "Benishangul",
-  "14" => "Afar",
-  "44" => "Adis Abeba",
-  "45" => "Afar",
-  "46" => "Amara",
-  "47" => "Binshangul Gumuz",
-  "48" => "Dire Dawa",
-  "49" => "Gambela Hizboch",
-  "50" => "Hareri Hizb",
-  "51" => "Oromiya",
-  "52" => "Sumale",
-  "53" => "Tigray",
-  "54" => "YeDebub Biheroch Bihereseboch na Hizboch"),
-"FI" => array(
-  "01" => "Aland",
-  "06" => "Lapland",
-  "08" => "Oulu",
-  "13" => "Southern Finland",
-  "14" => "Eastern Finland",
-  "15" => "Western Finland"),
-"FJ" => array(
-  "01" => "Central",
-  "02" => "Eastern",
-  "03" => "Northern",
-  "04" => "Rotuma",
-  "05" => "Western"),
-"FM" => array(
-  "01" => "Kosrae",
-  "02" => "Pohnpei",
-  "03" => "Chuuk",
-  "04" => "Yap"),
-"FR" => array(
-  "97" => "Aquitaine",
-  "98" => "Auvergne",
-  "99" => "Basse-Normandie",
-  "A1" => "Bourgogne",
-  "A2" => "Bretagne",
-  "A3" => "Centre",
-  "A4" => "Champagne-Ardenne",
-  "A5" => "Corse",
-  "A6" => "Franche-Comte",
-  "A7" => "Haute-Normandie",
-  "A8" => "Ile-de-France",
-  "A9" => "Languedoc-Roussillon",
-  "B1" => "Limousin",
-  "B2" => "Lorraine",
-  "B3" => "Midi-Pyrenees",
-  "B4" => "Nord-Pas-de-Calais",
-  "B5" => "Pays de la Loire",
-  "B6" => "Picardie",
-  "B7" => "Poitou-Charentes",
-  "B8" => "Provence-Alpes-Cote d'Azur",
-  "B9" => "Rhone-Alpes",
-  "C1" => "Alsace"),
-"GA" => array(
-  "01" => "Estuaire",
-  "02" => "Haut-Ogooue",
-  "03" => "Moyen-Ogooue",
-  "04" => "Ngounie",
-  "05" => "Nyanga",
-  "06" => "Ogooue-Ivindo",
-  "07" => "Ogooue-Lolo",
-  "08" => "Ogooue-Maritime",
-  "09" => "Woleu-Ntem"),
-"GB" => array(
-  "01" => "Avon",
-  "03" => "Berkshire",
-  "07" => "Cleveland",
-  "17" => "Greater London",
-  "18" => "Greater Manchester",
-  "20" => "Hereford and Worcester",
-  "22" => "Humberside",
-  "28" => "Merseyside",
-  "37" => "South Yorkshire",
-  "41" => "Tyne and Wear",
-  "43" => "West Midlands",
-  "45" => "West Yorkshire",
-  "79" => "Central",
-  "82" => "Grampian",
-  "84" => "Lothian",
-  "87" => "Strathclyde",
-  "88" => "Tayside",
-  "90" => "Clwyd",
-  "91" => "Dyfed",
-  "92" => "Gwent",
-  "94" => "Mid Glamorgan",
-  "96" => "South Glamorgan",
-  "97" => "West Glamorgan",
-  "A1" => "Barking and Dagenham",
-  "A2" => "Barnet",
-  "A3" => "Barnsley",
-  "A4" => "Bath and North East Somerset",
-  "A5" => "Bedfordshire",
-  "A6" => "Bexley",
-  "A7" => "Birmingham",
-  "A8" => "Blackburn with Darwen",
-  "A9" => "Blackpool",
-  "B1" => "Bolton",
-  "B2" => "Bournemouth",
-  "B3" => "Bracknell Forest",
-  "B4" => "Bradford",
-  "B5" => "Brent",
-  "B6" => "Brighton and Hove",
-  "B7" => "Bristol, City of",
-  "B8" => "Bromley",
-  "B9" => "Buckinghamshire",
-  "C1" => "Bury",
-  "C2" => "Calderdale",
-  "C3" => "Cambridgeshire",
-  "C4" => "Camden",
-  "C5" => "Cheshire",
-  "C6" => "Cornwall",
-  "C7" => "Coventry",
-  "C8" => "Croydon",
-  "C9" => "Cumbria",
-  "D1" => "Darlington",
-  "D2" => "Derby",
-  "D3" => "Derbyshire",
-  "D4" => "Devon",
-  "D5" => "Doncaster",
-  "D6" => "Dorset",
-  "D7" => "Dudley",
-  "D8" => "Durham",
-  "D9" => "Ealing",
-  "E1" => "East Riding of Yorkshire",
-  "E2" => "East Sussex",
-  "E3" => "Enfield",
-  "E4" => "Essex",
-  "E5" => "Gateshead",
-  "E6" => "Gloucestershire",
-  "E7" => "Greenwich",
-  "E8" => "Hackney",
-  "E9" => "Halton",
-  "F1" => "Hammersmith and Fulham",
-  "F2" => "Hampshire",
-  "F3" => "Haringey",
-  "F4" => "Harrow",
-  "F5" => "Hartlepool",
-  "F6" => "Havering",
-  "F7" => "Herefordshire",
-  "F8" => "Hertford",
-  "F9" => "Hillingdon",
-  "G1" => "Hounslow",
-  "G2" => "Isle of Wight",
-  "G3" => "Islington",
-  "G4" => "Kensington and Chelsea",
-  "G5" => "Kent",
-  "G6" => "Kingston upon Hull, City of",
-  "G7" => "Kingston upon Thames",
-  "G8" => "Kirklees",
-  "G9" => "Knowsley",
-  "H1" => "Lambeth",
-  "H2" => "Lancashire",
-  "H3" => "Leeds",
-  "H4" => "Leicester",
-  "H5" => "Leicestershire",
-  "H6" => "Lewisham",
-  "H7" => "Lincolnshire",
-  "H8" => "Liverpool",
-  "H9" => "London, City of",
-  "I1" => "Luton",
-  "I2" => "Manchester",
-  "I3" => "Medway",
-  "I4" => "Merton",
-  "I5" => "Middlesbrough",
-  "I6" => "Milton Keynes",
-  "I7" => "Newcastle upon Tyne",
-  "I8" => "Newham",
-  "I9" => "Norfolk",
-  "J1" => "Northamptonshire",
-  "J2" => "North East Lincolnshire",
-  "J3" => "North Lincolnshire",
-  "J4" => "North Somerset",
-  "J5" => "North Tyneside",
-  "J6" => "Northumberland",
-  "J7" => "North Yorkshire",
-  "J8" => "Nottingham",
-  "J9" => "Nottinghamshire",
-  "K1" => "Oldham",
-  "K2" => "Oxfordshire",
-  "K3" => "Peterborough",
-  "K4" => "Plymouth",
-  "K5" => "Poole",
-  "K6" => "Portsmouth",
-  "K7" => "Reading",
-  "K8" => "Redbridge",
-  "K9" => "Redcar and Cleveland",
-  "L1" => "Richmond upon Thames",
-  "L2" => "Rochdale",
-  "L3" => "Rotherham",
-  "L4" => "Rutland",
-  "L5" => "Salford",
-  "L6" => "Shropshire",
-  "L7" => "Sandwell",
-  "L8" => "Sefton",
-  "L9" => "Sheffield",
-  "M1" => "Slough",
-  "M2" => "Solihull",
-  "M3" => "Somerset",
-  "M4" => "Southampton",
-  "M5" => "Southend-on-Sea",
-  "M6" => "South Gloucestershire",
-  "M7" => "South Tyneside",
-  "M8" => "Southwark",
-  "M9" => "Staffordshire",
-  "N1" => "St. Helens",
-  "N2" => "Stockport",
-  "N3" => "Stockton-on-Tees",
-  "N4" => "Stoke-on-Trent",
-  "N5" => "Suffolk",
-  "N6" => "Sunderland",
-  "N7" => "Surrey",
-  "N8" => "Sutton",
-  "N9" => "Swindon",
-  "O1" => "Tameside",
-  "O2" => "Telford and Wrekin",
-  "O3" => "Thurrock",
-  "O4" => "Torbay",
-  "O5" => "Tower Hamlets",
-  "O6" => "Trafford",
-  "O7" => "Wakefield",
-  "O8" => "Walsall",
-  "O9" => "Waltham Forest",
-  "P1" => "Wandsworth",
-  "P2" => "Warrington",
-  "P3" => "Warwickshire",
-  "P4" => "West Berkshire",
-  "P5" => "Westminster",
-  "P6" => "West Sussex",
-  "P7" => "Wigan",
-  "P8" => "Wiltshire",
-  "P9" => "Windsor and Maidenhead",
-  "Q1" => "Wirral",
-  "Q2" => "Wokingham",
-  "Q3" => "Wolverhampton",
-  "Q4" => "Worcestershire",
-  "Q5" => "York",
-  "Q6" => "Antrim",
-  "Q7" => "Ards",
-  "Q8" => "Armagh",
-  "Q9" => "Ballymena",
-  "R1" => "Ballymoney",
-  "R2" => "Banbridge",
-  "R3" => "Belfast",
-  "R4" => "Carrickfergus",
-  "R5" => "Castlereagh",
-  "R6" => "Coleraine",
-  "R7" => "Cookstown",
-  "R8" => "Craigavon",
-  "R9" => "Down",
-  "S1" => "Dungannon",
-  "S2" => "Fermanagh",
-  "S3" => "Larne",
-  "S4" => "Limavady",
-  "S5" => "Lisburn",
-  "S6" => "Derry",
-  "S7" => "Magherafelt",
-  "S8" => "Moyle",
-  "S9" => "Newry and Mourne",
-  "T1" => "Newtownabbey",
-  "T2" => "North Down",
-  "T3" => "Omagh",
-  "T4" => "Strabane",
-  "T5" => "Aberdeen City",
-  "T6" => "Aberdeenshire",
-  "T7" => "Angus",
-  "T8" => "Argyll and Bute",
-  "T9" => "Scottish Borders, The",
-  "U1" => "Clackmannanshire",
-  "U2" => "Dumfries and Galloway",
-  "U3" => "Dundee City",
-  "U4" => "East Ayrshire",
-  "U5" => "East Dunbartonshire",
-  "U6" => "East Lothian",
-  "U7" => "East Renfrewshire",
-  "U8" => "Edinburgh, City of",
-  "U9" => "Falkirk",
-  "V1" => "Fife",
-  "V2" => "Glasgow City",
-  "V3" => "Highland",
-  "V4" => "Inverclyde",
-  "V5" => "Midlothian",
-  "V6" => "Moray",
-  "V7" => "North Ayrshire",
-  "V8" => "North Lanarkshire",
-  "V9" => "Orkney",
-  "W1" => "Perth and Kinross",
-  "W2" => "Renfrewshire",
-  "W3" => "Shetland Islands",
-  "W4" => "South Ayrshire",
-  "W5" => "South Lanarkshire",
-  "W6" => "Stirling",
-  "W7" => "West Dunbartonshire",
-  "W8" => "Eilean Siar",
-  "W9" => "West Lothian",
-  "X1" => "Isle of Anglesey",
-  "X2" => "Blaenau Gwent",
-  "X3" => "Bridgend",
-  "X4" => "Caerphilly",
-  "X5" => "Cardiff",
-  "X6" => "Ceredigion",
-  "X7" => "Carmarthenshire",
-  "X8" => "Conwy",
-  "X9" => "Denbighshire",
-  "Y1" => "Flintshire",
-  "Y2" => "Gwynedd",
-  "Y3" => "Merthyr Tydfil",
-  "Y4" => "Monmouthshire",
-  "Y5" => "Neath Port Talbot",
-  "Y6" => "Newport",
-  "Y7" => "Pembrokeshire",
-  "Y8" => "Powys",
-  "Y9" => "Rhondda Cynon Taff",
-  "Z1" => "Swansea",
-  "Z2" => "Torfaen",
-  "Z3" => "Vale of Glamorgan, The",
-  "Z4" => "Wrexham"),
-"GD" => array(
-  "01" => "Saint Andrew",
-  "02" => "Saint David",
-  "03" => "Saint George",
-  "04" => "Saint John",
-  "05" => "Saint Mark",
-  "06" => "Saint Patrick"),
-"GE" => array(
-  "01" => "Abashis Raioni",
-  "02" => "Abkhazia",
-  "03" => "Adigenis Raioni",
-  "04" => "Ajaria",
-  "05" => "Akhalgoris Raioni",
-  "06" => "Akhalk'alak'is Raioni",
-  "07" => "Akhalts'ikhis Raioni",
-  "08" => "Akhmetis Raioni",
-  "09" => "Ambrolauris Raioni",
-  "10" => "Aspindzis Raioni",
-  "11" => "Baghdat'is Raioni",
-  "12" => "Bolnisis Raioni",
-  "13" => "Borjomis Raioni",
-  "14" => "Chiat'ura",
-  "15" => "Ch'khorotsqus Raioni",
-  "16" => "Ch'okhatauris Raioni",
-  "17" => "Dedop'listsqaros Raioni",
-  "18" => "Dmanisis Raioni",
-  "19" => "Dushet'is Raioni",
-  "20" => "Gardabanis Raioni",
-  "21" => "Gori",
-  "22" => "Goris Raioni",
-  "23" => "Gurjaanis Raioni",
-  "24" => "Javis Raioni",
-  "25" => "K'arelis Raioni",
-  "26" => "Kaspis Raioni",
-  "27" => "Kharagaulis Raioni",
-  "28" => "Khashuris Raioni",
-  "29" => "Khobis Raioni",
-  "30" => "Khonis Raioni",
-  "31" => "K'ut'aisi",
-  "32" => "Lagodekhis Raioni",
-  "33" => "Lanch'khut'is Raioni",
-  "34" => "Lentekhis Raioni",
-  "35" => "Marneulis Raioni",
-  "36" => "Martvilis Raioni",
-  "37" => "Mestiis Raioni",
-  "38" => "Mts'khet'is Raioni",
-  "39" => "Ninotsmindis Raioni",
-  "40" => "Onis Raioni",
-  "41" => "Ozurget'is Raioni",
-  "42" => "P'ot'i",
-  "43" => "Qazbegis Raioni",
-  "44" => "Qvarlis Raioni",
-  "45" => "Rust'avi",
-  "46" => "Sach'kheris Raioni",
-  "47" => "Sagarejos Raioni",
-  "48" => "Samtrediis Raioni",
-  "49" => "Senakis Raioni",
-  "50" => "Sighnaghis Raioni",
-  "51" => "T'bilisi",
-  "52" => "T'elavis Raioni",
-  "53" => "T'erjolis Raioni",
-  "54" => "T'et'ritsqaros Raioni",
-  "55" => "T'ianet'is Raioni",
-  "56" => "Tqibuli",
-  "57" => "Ts'ageris Raioni",
-  "58" => "Tsalenjikhis Raioni",
-  "59" => "Tsalkis Raioni",
-  "60" => "Tsqaltubo",
-  "61" => "Vanis Raioni",
-  "62" => "Zestap'onis Raioni",
-  "63" => "Zugdidi",
-  "64" => "Zugdidis Raioni"),
-"GH" => array(
-  "01" => "Greater Accra",
-  "02" => "Ashanti",
-  "03" => "Brong-Ahafo",
-  "04" => "Central",
-  "05" => "Eastern",
-  "06" => "Northern",
-  "08" => "Volta",
-  "09" => "Western",
-  "10" => "Upper East",
-  "11" => "Upper West"),
-"GL" => array(
-  "01" => "Nordgronland",
-  "02" => "Ostgronland",
-  "03" => "Vestgronland"),
-"GM" => array(
-  "01" => "Banjul",
-  "02" => "Lower River",
-  "03" => "Central River",
-  "04" => "Upper River",
-  "05" => "Western",
-  "07" => "North Bank"),
-"GN" => array(
-  "01" => "Beyla",
-  "02" => "Boffa",
-  "03" => "Boke",
-  "04" => "Conakry",
-  "05" => "Dabola",
-  "06" => "Dalaba",
-  "07" => "Dinguiraye",
-  "09" => "Faranah",
-  "10" => "Forecariah",
-  "11" => "Fria",
-  "12" => "Gaoual",
-  "13" => "Gueckedou",
-  "15" => "Kerouane",
-  "16" => "Kindia",
-  "17" => "Kissidougou",
-  "18" => "Koundara",
-  "19" => "Kouroussa",
-  "21" => "Macenta",
-  "22" => "Mali",
-  "23" => "Mamou",
-  "25" => "Pita",
-  "27" => "Telimele",
-  "28" => "Tougue",
-  "29" => "Yomou",
-  "30" => "Coyah",
-  "31" => "Dubreka",
-  "32" => "Kankan",
-  "33" => "Koubia",
-  "34" => "Labe",
-  "35" => "Lelouma",
-  "36" => "Lola",
-  "37" => "Mandiana",
-  "38" => "Nzerekore",
-  "39" => "Siguiri"),
-"GQ" => array(
-  "03" => "Annobon",
-  "04" => "Bioko Norte",
-  "05" => "Bioko Sur",
-  "06" => "Centro Sur",
-  "07" => "Kie-Ntem",
-  "08" => "Litoral",
-  "09" => "Wele-Nzas"),
-"GR" => array(
-  "01" => "Evros",
-  "02" => "Rodhopi",
-  "03" => "Xanthi",
-  "04" => "Drama",
-  "05" => "Serrai",
-  "06" => "Kilkis",
-  "07" => "Pella",
-  "08" => "Florina",
-  "09" => "Kastoria",
-  "10" => "Grevena",
-  "11" => "Kozani",
-  "12" => "Imathia",
-  "13" => "Thessaloniki",
-  "14" => "Kavala",
-  "15" => "Khalkidhiki",
-  "16" => "Pieria",
-  "17" => "Ioannina",
-  "18" => "Thesprotia",
-  "19" => "Preveza",
-  "20" => "Arta",
-  "21" => "Larisa",
-  "22" => "Trikala",
-  "23" => "Kardhitsa",
-  "24" => "Magnisia",
-  "25" => "Kerkira",
-  "26" => "Levkas",
-  "27" => "Kefallinia",
-  "28" => "Zakinthos",
-  "29" => "Fthiotis",
-  "30" => "Evritania",
-  "31" => "Aitolia kai Akarnania",
-  "32" => "Fokis",
-  "33" => "Voiotia",
-  "34" => "Evvoia",
-  "35" => "Attiki",
-  "36" => "Argolis",
-  "37" => "Korinthia",
-  "38" => "Akhaia",
-  "39" => "Ilia",
-  "40" => "Messinia",
-  "41" => "Arkadhia",
-  "42" => "Lakonia",
-  "43" => "Khania",
-  "44" => "Rethimni",
-  "45" => "Iraklion",
-  "46" => "Lasithi",
-  "47" => "Dhodhekanisos",
-  "48" => "Samos",
-  "49" => "Kikladhes",
-  "50" => "Khios",
-  "51" => "Lesvos"),
-"GT" => array(
-  "01" => "Alta Verapaz",
-  "02" => "Baja Verapaz",
-  "03" => "Chimaltenango",
-  "04" => "Chiquimula",
-  "05" => "El Progreso",
-  "06" => "Escuintla",
-  "07" => "Guatemala",
-  "08" => "Huehuetenango",
-  "09" => "Izabal",
-  "10" => "Jalapa",
-  "11" => "Jutiapa",
-  "12" => "Peten",
-  "13" => "Quetzaltenango",
-  "14" => "Quiche",
-  "15" => "Retalhuleu",
-  "16" => "Sacatepequez",
-  "17" => "San Marcos",
-  "18" => "Santa Rosa",
-  "19" => "Solola",
-  "20" => "Suchitepequez",
-  "21" => "Totonicapan",
-  "22" => "Zacapa"),
-"GW" => array(
-  "01" => "Bafata",
-  "02" => "Quinara",
-  "04" => "Oio",
-  "05" => "Bolama",
-  "06" => "Cacheu",
-  "07" => "Tombali",
-  "10" => "Gabu",
-  "11" => "Bissau",
-  "12" => "Biombo"),
-"GY" => array(
-  "10" => "Barima-Waini",
-  "11" => "Cuyuni-Mazaruni",
-  "12" => "Demerara-Mahaica",
-  "13" => "East Berbice-Corentyne",
-  "14" => "Essequibo Islands-West Demerara",
-  "15" => "Mahaica-Berbice",
-  "16" => "Pomeroon-Supenaam",
-  "17" => "Potaro-Siparuni",
-  "18" => "Upper Demerara-Berbice",
-  "19" => "Upper Takutu-Upper Essequibo"),
-"HN" => array(
-  "01" => "Atlantida",
-  "02" => "Choluteca",
-  "03" => "Colon",
-  "04" => "Comayagua",
-  "05" => "Copan",
-  "06" => "Cortes",
-  "07" => "El Paraiso",
-  "08" => "Francisco Morazan",
-  "09" => "Gracias a Dios",
-  "10" => "Intibuca",
-  "11" => "Islas de la Bahia",
-  "12" => "La Paz",
-  "13" => "Lempira",
-  "14" => "Ocotepeque",
-  "15" => "Olancho",
-  "16" => "Santa Barbara",
-  "17" => "Valle",
-  "18" => "Yoro"),
-"HR" => array(
-  "01" => "Bjelovarsko-Bilogorska",
-  "02" => "Brodsko-Posavska",
-  "03" => "Dubrovacko-Neretvanska",
-  "04" => "Istarska",
-  "05" => "Karlovacka",
-  "06" => "Koprivnicko-Krizevacka",
-  "07" => "Krapinsko-Zagorska",
-  "08" => "Licko-Senjska",
-  "09" => "Medimurska",
-  "10" => "Osjecko-Baranjska",
-  "11" => "Pozesko-Slavonska",
-  "12" => "Primorsko-Goranska",
-  "13" => "Sibensko-Kninska",
-  "14" => "Sisacko-Moslavacka",
-  "15" => "Splitsko-Dalmatinska",
-  "16" => "Varazdinska",
-  "17" => "Viroviticko-Podravska",
-  "18" => "Vukovarsko-Srijemska",
-  "19" => "Zadarska",
-  "20" => "Zagrebacka",
-  "21" => "Grad Zagreb"),
-"HT" => array(
-  "03" => "Nord-Ouest",
-  "06" => "Artibonite",
-  "07" => "Centre",
-  "09" => "Nord",
-  "10" => "Nord-Est",
-  "11" => "Ouest",
-  "12" => "Sud",
-  "13" => "Sud-Est",
-  "14" => "Grand' Anse",
-  "15" => "Nippes"),
-"HU" => array(
-  "01" => "Bacs-Kiskun",
-  "02" => "Baranya",
-  "03" => "Bekes",
-  "04" => "Borsod-Abauj-Zemplen",
-  "05" => "Budapest",
-  "06" => "Csongrad",
-  "07" => "Debrecen",
-  "08" => "Fejer",
-  "09" => "Gyor-Moson-Sopron",
-  "10" => "Hajdu-Bihar",
-  "11" => "Heves",
-  "12" => "Komarom-Esztergom",
-  "13" => "Miskolc",
-  "14" => "Nograd",
-  "15" => "Pecs",
-  "16" => "Pest",
-  "17" => "Somogy",
-  "18" => "Szabolcs-Szatmar-Bereg",
-  "19" => "Szeged",
-  "20" => "Jasz-Nagykun-Szolnok",
-  "21" => "Tolna",
-  "22" => "Vas",
-  "23" => "Veszprem",
-  "24" => "Zala",
-  "25" => "Gyor",
-  "26" => "Bekescsaba",
-  "27" => "Dunaujvaros",
-  "28" => "Eger",
-  "29" => "Hodmezovasarhely",
-  "30" => "Kaposvar",
-  "31" => "Kecskemet",
-  "32" => "Nagykanizsa",
-  "33" => "Nyiregyhaza",
-  "34" => "Sopron",
-  "35" => "Szekesfehervar",
-  "36" => "Szolnok",
-  "37" => "Szombathely",
-  "38" => "Tatabanya",
-  "39" => "Veszprem",
-  "40" => "Zalaegerszeg",
-  "41" => "Salgotarjan",
-  "42" => "Szekszard"),
-"ID" => array(
-  "01" => "Aceh",
-  "02" => "Bali",
-  "03" => "Bengkulu",
-  "04" => "Jakarta Raya",
-  "05" => "Jambi",
-  "06" => "Jawa Barat",
-  "07" => "Jawa Tengah",
-  "08" => "Jawa Timur",
-  "09" => "Papua",
-  "10" => "Yogyakarta",
-  "11" => "Kalimantan Barat",
-  "12" => "Kalimantan Selatan",
-  "13" => "Kalimantan Tengah",
-  "14" => "Kalimantan Timur",
-  "15" => "Lampung",
-  "16" => "Maluku",
-  "17" => "Nusa Tenggara Barat",
-  "18" => "Nusa Tenggara Timur",
-  "19" => "Riau",
-  "20" => "Sulawesi Selatan",
-  "21" => "Sulawesi Tengah",
-  "22" => "Sulawesi Tenggara",
-  "23" => "Sulawesi Utara",
-  "24" => "Sumatera Barat",
-  "25" => "Sumatera Selatan",
-  "26" => "Sumatera Utara",
-  "28" => "Maluku",
-  "29" => "Maluku Utara",
-  "30" => "Jawa Barat",
-  "31" => "Sulawesi Utara",
-  "32" => "Sumatera Selatan",
-  "33" => "Banten",
-  "34" => "Gorontalo",
-  "35" => "Kepulauan Bangka Belitung",
-  "36" => "Papua",
-  "37" => "Riau",
-  "38" => "Sulawesi Selatan",
-  "39" => "Irian Jaya Barat",
-  "40" => "Kepulauan Riau",
-  "41" => "Sulawesi Barat"),
-"IE" => array(
-  "01" => "Carlow",
-  "02" => "Cavan",
-  "03" => "Clare",
-  "04" => "Cork",
-  "06" => "Donegal",
-  "07" => "Dublin",
-  "10" => "Galway",
-  "11" => "Kerry",
-  "12" => "Kildare",
-  "13" => "Kilkenny",
-  "14" => "Leitrim",
-  "15" => "Laois",
-  "16" => "Limerick",
-  "18" => "Longford",
-  "19" => "Louth",
-  "20" => "Mayo",
-  "21" => "Meath",
-  "22" => "Monaghan",
-  "23" => "Offaly",
-  "24" => "Roscommon",
-  "25" => "Sligo",
-  "26" => "Tipperary",
-  "27" => "Waterford",
-  "29" => "Westmeath",
-  "30" => "Wexford",
-  "31" => "Wicklow"),
-"IL" => array(
-  "01" => "HaDarom",
-  "02" => "HaMerkaz",
-  "03" => "HaZafon",
-  "04" => "Hefa",
-  "05" => "Tel Aviv",
-  "06" => "Yerushalayim"),
-"IN" => array(
-  "01" => "Andaman and Nicobar Islands",
-  "02" => "Andhra Pradesh",
-  "03" => "Assam",
-  "05" => "Chandigarh",
-  "06" => "Dadra and Nagar Haveli",
-  "07" => "Delhi",
-  "09" => "Gujarat",
-  "10" => "Haryana",
-  "11" => "Himachal Pradesh",
-  "12" => "Jammu and Kashmir",
-  "13" => "Kerala",
-  "14" => "Lakshadweep",
-  "16" => "Maharashtra",
-  "17" => "Manipur",
-  "18" => "Meghalaya",
-  "19" => "Karnataka",
-  "20" => "Nagaland",
-  "21" => "Orissa",
-  "22" => "Puducherry",
-  "23" => "Punjab",
-  "24" => "Rajasthan",
-  "25" => "Tamil Nadu",
-  "26" => "Tripura",
-  "28" => "West Bengal",
-  "29" => "Sikkim",
-  "30" => "Arunachal Pradesh",
-  "31" => "Mizoram",
-  "32" => "Daman and Diu",
-  "33" => "Goa",
-  "34" => "Bihar",
-  "35" => "Madhya Pradesh",
-  "36" => "Uttar Pradesh",
-  "37" => "Chhattisgarh",
-  "38" => "Jharkhand",
-  "39" => "Uttarakhand"),
-"IQ" => array(
-  "01" => "Al Anbar",
-  "02" => "Al Basrah",
-  "03" => "Al Muthanna",
-  "04" => "Al Qadisiyah",
-  "05" => "As Sulaymaniyah",
-  "06" => "Babil",
-  "07" => "Baghdad",
-  "08" => "Dahuk",
-  "09" => "Dhi Qar",
-  "10" => "Diyala",
-  "11" => "Arbil",
-  "12" => "Karbala'",
-  "13" => "At Ta'mim",
-  "14" => "Maysan",
-  "15" => "Ninawa",
-  "16" => "Wasit",
-  "17" => "An Najaf",
-  "18" => "Salah ad Din"),
-"IR" => array(
-  "01" => "Azarbayjan-e Bakhtari",
-  "02" => "Azarbayjan-e Khavari",
-  "03" => "Chahar Mahall va Bakhtiari",
-  "04" => "Sistan va Baluchestan",
-  "05" => "Kohkiluyeh va Buyer Ahmadi",
-  "07" => "Fars",
-  "08" => "Gilan",
-  "09" => "Hamadan",
-  "10" => "Ilam",
-  "11" => "Hormozgan",
-  "12" => "Kerman",
-  "13" => "Bakhtaran",
-  "15" => "Khuzestan",
-  "16" => "Kordestan",
-  "17" => "Mazandaran",
-  "18" => "Semnan Province",
-  "19" => "Markazi",
-  "21" => "Zanjan",
-  "22" => "Bushehr",
-  "23" => "Lorestan",
-  "24" => "Markazi",
-  "25" => "Semnan",
-  "26" => "Tehran",
-  "27" => "Zanjan",
-  "28" => "Esfahan",
-  "29" => "Kerman",
-  "30" => "Khorasan",
-  "31" => "Yazd",
-  "32" => "Ardabil",
-  "33" => "East Azarbaijan",
-  "34" => "Markazi",
-  "35" => "Mazandaran",
-  "36" => "Zanjan",
-  "37" => "Golestan",
-  "38" => "Qazvin",
-  "39" => "Qom",
-  "40" => "Yazd",
-  "41" => "Khorasan-e Janubi",
-  "42" => "Khorasan-e Razavi",
-  "43" => "Khorasan-e Shemali"),
-"IS" => array(
-  "03" => "Arnessysla",
-  "05" => "Austur-Hunavatnssysla",
-  "06" => "Austur-Skaftafellssysla",
-  "07" => "Borgarfjardarsysla",
-  "09" => "Eyjafjardarsysla",
-  "10" => "Gullbringusysla",
-  "15" => "Kjosarsysla",
-  "17" => "Myrasysla",
-  "20" => "Nordur-Mulasysla",
-  "21" => "Nordur-Tingeyjarsysla",
-  "23" => "Rangarvallasysla",
-  "28" => "Skagafjardarsysla",
-  "29" => "Snafellsnes- og Hnappadalssysla",
-  "30" => "Strandasysla",
-  "31" => "Sudur-Mulasysla",
-  "32" => "Sudur-Tingeyjarsysla",
-  "34" => "Vestur-Bardastrandarsysla",
-  "35" => "Vestur-Hunavatnssysla",
-  "36" => "Vestur-Isafjardarsysla",
-  "37" => "Vestur-Skaftafellssysla",
-  "40" => "Norourland Eystra",
-  "41" => "Norourland Vestra",
-  "42" => "Suourland",
-  "43" => "Suournes",
-  "44" => "Vestfiroir",
-  "45" => "Vesturland"),
-"IT" => array(
-  "01" => "Abruzzi",
-  "02" => "Basilicata",
-  "03" => "Calabria",
-  "04" => "Campania",
-  "05" => "Emilia-Romagna",
-  "06" => "Friuli-Venezia Giulia",
-  "07" => "Lazio",
-  "08" => "Liguria",
-  "09" => "Lombardia",
-  "10" => "Marche",
-  "11" => "Molise",
-  "12" => "Piemonte",
-  "13" => "Puglia",
-  "14" => "Sardegna",
-  "15" => "Sicilia",
-  "16" => "Toscana",
-  "17" => "Trentino-Alto Adige",
-  "18" => "Umbria",
-  "19" => "Valle d'Aosta",
-  "20" => "Veneto"),
-"JM" => array(
-  "01" => "Clarendon",
-  "02" => "Hanover",
-  "04" => "Manchester",
-  "07" => "Portland",
-  "08" => "Saint Andrew",
-  "09" => "Saint Ann",
-  "10" => "Saint Catherine",
-  "11" => "Saint Elizabeth",
-  "12" => "Saint James",
-  "13" => "Saint Mary",
-  "14" => "Saint Thomas",
-  "15" => "Trelawny",
-  "16" => "Westmoreland",
-  "17" => "Kingston"),
-"JO" => array(
-  "02" => "Al Balqa'",
-  "07" => "Ma",
-  "09" => "Al Karak",
-  "10" => "Al Mafraq",
-  "11" => "Amman Governorate",
-  "12" => "At Tafilah",
-  "13" => "Az Zarqa",
-  "14" => "Irbid",
-  "16" => "Amman"),
-"JP" => array(
-  "01" => "Aichi",
-  "02" => "Akita",
-  "03" => "Aomori",
-  "04" => "Chiba",
-  "05" => "Ehime",
-  "06" => "Fukui",
-  "07" => "Fukuoka",
-  "08" => "Fukushima",
-  "09" => "Gifu",
-  "10" => "Gumma",
-  "11" => "Hiroshima",
-  "12" => "Hokkaido",
-  "13" => "Hyogo",
-  "14" => "Ibaraki",
-  "15" => "Ishikawa",
-  "16" => "Iwate",
-  "17" => "Kagawa",
-  "18" => "Kagoshima",
-  "19" => "Kanagawa",
-  "20" => "Kochi",
-  "21" => "Kumamoto",
-  "22" => "Kyoto",
-  "23" => "Mie",
-  "24" => "Miyagi",
-  "25" => "Miyazaki",
-  "26" => "Nagano",
-  "27" => "Nagasaki",
-  "28" => "Nara",
-  "29" => "Niigata",
-  "30" => "Oita",
-  "31" => "Okayama",
-  "32" => "Osaka",
-  "33" => "Saga",
-  "34" => "Saitama",
-  "35" => "Shiga",
-  "36" => "Shimane",
-  "37" => "Shizuoka",
-  "38" => "Tochigi",
-  "39" => "Tokushima",
-  "40" => "Tokyo",
-  "41" => "Tottori",
-  "42" => "Toyama",
-  "43" => "Wakayama",
-  "44" => "Yamagata",
-  "45" => "Yamaguchi",
-  "46" => "Yamanashi",
-  "47" => "Okinawa"),
-"KE" => array(
-  "01" => "Central",
-  "02" => "Coast",
-  "03" => "Eastern",
-  "05" => "Nairobi Area",
-  "06" => "North-Eastern",
-  "07" => "Nyanza",
-  "08" => "Rift Valley",
-  "09" => "Western"),
-"KG" => array(
-  "01" => "Bishkek",
-  "02" => "Chuy",
-  "03" => "Jalal-Abad",
-  "04" => "Naryn",
-  "05" => "Osh",
-  "06" => "Talas",
-  "07" => "Ysyk-Kol",
-  "08" => "Osh",
-  "09" => "Batken"),
-"KH" => array(
-  "00" => "Banteay Meanchey",
-  "01" => "Batdambang",
-  "02" => "Kampong Cham",
-  "03" => "Kampong Chhnang",
-  "04" => "Kampong Speu",
-  "05" => "Kampong Thum",
-  "06" => "Kampot",
-  "07" => "Kandal",
-  "08" => "Koh Kong",
-  "09" => "Kracheh",
-  "10" => "Mondulkiri",
-  "11" => "Phnum Penh",
-  "12" => "Pursat",
-  "13" => "Preah Vihear",
-  "14" => "Prey Veng",
-  "15" => "Ratanakiri Kiri",
-  "16" => "Siem Reap",
-  "17" => "Stung Treng",
-  "18" => "Svay Rieng",
-  "19" => "Takeo",
-  "29" => "Batdambang",
-  "30" => "Pailin"),
-"KI" => array(
-  "01" => "Gilbert Islands",
-  "02" => "Line Islands",
-  "03" => "Phoenix Islands"),
-"KM" => array(
-  "01" => "Anjouan",
-  "02" => "Grande Comore",
-  "03" => "Moheli"),
-"KN" => array(
-  "01" => "Christ Church Nichola Town",
-  "02" => "Saint Anne Sandy Point",
-  "03" => "Saint George Basseterre",
-  "04" => "Saint George Gingerland",
-  "05" => "Saint James Windward",
-  "06" => "Saint John Capisterre",
-  "07" => "Saint John Figtree",
-  "08" => "Saint Mary Cayon",
-  "09" => "Saint Paul Capisterre",
-  "10" => "Saint Paul Charlestown",
-  "11" => "Saint Peter Basseterre",
-  "12" => "Saint Thomas Lowland",
-  "13" => "Saint Thomas Middle Island",
-  "15" => "Trinity Palmetto Point"),
-"KP" => array(
-  "01" => "Chagang-do",
-  "03" => "Hamgyong-namdo",
-  "06" => "Hwanghae-namdo",
-  "07" => "Hwanghae-bukto",
-  "08" => "Kaesong-si",
-  "09" => "Kangwon-do",
-  "11" => "P'yongan-bukto",
-  "12" => "P'yongyang-si",
-  "13" => "Yanggang-do",
-  "14" => "Namp'o-si",
-  "15" => "P'yongan-namdo",
-  "17" => "Hamgyong-bukto",
-  "18" => "Najin Sonbong-si"),
-"KR" => array(
-  "01" => "Cheju-do",
-  "03" => "Cholla-bukto",
-  "05" => "Ch'ungch'ong-bukto",
-  "06" => "Kangwon-do",
-  "10" => "Pusan-jikhalsi",
-  "11" => "Seoul-t'ukpyolsi",
-  "12" => "Inch'on-jikhalsi",
-  "13" => "Kyonggi-do",
-  "14" => "Kyongsang-bukto",
-  "15" => "Taegu-jikhalsi",
-  "16" => "Cholla-namdo",
-  "17" => "Ch'ungch'ong-namdo",
-  "18" => "Kwangju-jikhalsi",
-  "19" => "Taejon-jikhalsi",
-  "20" => "Kyongsang-namdo",
-  "21" => "Ulsan-gwangyoksi"),
-"KW" => array(
-  "01" => "Al Ahmadi",
-  "02" => "Al Kuwayt",
-  "05" => "Al Jahra",
-  "07" => "Al Farwaniyah",
-  "08" => "Hawalli",
-  "09" => "Mubarak al Kabir"),
-"KY" => array(
-  "01" => "Creek",
-  "02" => "Eastern",
-  "03" => "Midland",
-  "04" => "South Town",
-  "05" => "Spot Bay",
-  "06" => "Stake Bay",
-  "07" => "West End",
-  "08" => "Western"),
-"KZ" => array(
-  "01" => "Almaty",
-  "02" => "Almaty City",
-  "03" => "Aqmola",
-  "04" => "Aqtobe",
-  "05" => "Astana",
-  "06" => "Atyrau",
-  "07" => "West Kazakhstan",
-  "08" => "Bayqonyr",
-  "09" => "Mangghystau",
-  "10" => "South Kazakhstan",
-  "11" => "Pavlodar",
-  "12" => "Qaraghandy",
-  "13" => "Qostanay",
-  "14" => "Qyzylorda",
-  "15" => "East Kazakhstan",
-  "16" => "North Kazakhstan",
-  "17" => "Zhambyl"),
-"LA" => array(
-  "01" => "Attapu",
-  "02" => "Champasak",
-  "03" => "Houaphan",
-  "04" => "Khammouan",
-  "05" => "Louang Namtha",
-  "07" => "Oudomxai",
-  "08" => "Phongsali",
-  "09" => "Saravan",
-  "10" => "Savannakhet",
-  "11" => "Vientiane",
-  "13" => "Xaignabouri",
-  "14" => "Xiangkhoang",
-  "17" => "Louangphrabang"),
-"LB" => array(
-  "01" => "Beqaa",
-  "02" => "Al Janub",
-  "03" => "Liban-Nord",
-  "04" => "Beyrouth",
-  "05" => "Mont-Liban",
-  "06" => "Liban-Sud",
-  "07" => "Nabatiye",
-  "08" => "Beqaa",
-  "09" => "Liban-Nord",
-  "10" => "Aakk,r",
-  "11" => "Baalbek-Hermel"),
-"LC" => array(
-  "01" => "Anse-la-Raye",
-  "02" => "Dauphin",
-  "03" => "Castries",
-  "04" => "Choiseul",
-  "05" => "Dennery",
-  "06" => "Gros-Islet",
-  "07" => "Laborie",
-  "08" => "Micoud",
-  "09" => "Soufriere",
-  "10" => "Vieux-Fort",
-  "11" => "Praslin"),
-"LI" => array(
-  "01" => "Balzers",
-  "02" => "Eschen",
-  "03" => "Gamprin",
-  "04" => "Mauren",
-  "05" => "Planken",
-  "06" => "Ruggell",
-  "07" => "Schaan",
-  "08" => "Schellenberg",
-  "09" => "Triesen",
-  "10" => "Triesenberg",
-  "11" => "Vaduz",
-  "21" => "Gbarpolu",
-  "22" => "River Gee"),
-"LK" => array(
-  "01" => "Amparai",
-  "02" => "Anuradhapura",
-  "03" => "Badulla",
-  "04" => "Batticaloa",
-  "06" => "Galle",
-  "07" => "Hambantota",
-  "09" => "Kalutara",
-  "10" => "Kandy",
-  "11" => "Kegalla",
-  "12" => "Kurunegala",
-  "14" => "Matale",
-  "15" => "Matara",
-  "16" => "Moneragala",
-  "17" => "Nuwara Eliya",
-  "18" => "Polonnaruwa",
-  "19" => "Puttalam",
-  "20" => "Ratnapura",
-  "21" => "Trincomalee",
-  "23" => "Colombo",
-  "24" => "Gampaha",
-  "25" => "Jaffna",
-  "26" => "Mannar",
-  "27" => "Mullaittivu",
-  "28" => "Vavuniya",
-  "29" => "Central",
-  "30" => "North Central",
-  "31" => "Northern",
-  "32" => "North Western",
-  "33" => "Sabaragamuwa",
-  "34" => "Southern",
-  "35" => "Uva",
-  "36" => "Western"),
-"LR" => array(
-  "01" => "Bong",
-  "04" => "Grand Cape Mount",
-  "05" => "Lofa",
-  "06" => "Maryland",
-  "07" => "Monrovia",
-  "09" => "Nimba",
-  "10" => "Sino",
-  "11" => "Grand Bassa",
-  "12" => "Grand Cape Mount",
-  "13" => "Maryland",
-  "14" => "Montserrado",
-  "17" => "Margibi",
-  "18" => "River Cess",
-  "19" => "Grand Gedeh",
-  "20" => "Lofa",
-  "21" => "Gbarpolu",
-  "22" => "River Gee"),
-"LS" => array(
-  "10" => "Berea",
-  "11" => "Butha-Buthe",
-  "12" => "Leribe",
-  "13" => "Mafeteng",
-  "14" => "Maseru",
-  "15" => "Mohales Hoek",
-  "16" => "Mokhotlong",
-  "17" => "Qachas Nek",
-  "18" => "Quthing",
-  "19" => "Thaba-Tseka"),
-"LT" => array(
-  "56" => "Alytaus Apskritis",
-  "57" => "Kauno Apskritis",
-  "58" => "Klaipedos Apskritis",
-  "59" => "Marijampoles Apskritis",
-  "60" => "Panevezio Apskritis",
-  "61" => "Siauliu Apskritis",
-  "62" => "Taurages Apskritis",
-  "63" => "Telsiu Apskritis",
-  "64" => "Utenos Apskritis",
-  "65" => "Vilniaus Apskritis"),
-"LU" => array(
-  "01" => "Diekirch",
-  "02" => "Grevenmacher",
-  "03" => "Luxembourg"),
-"LV" => array(
-  "01" => "Aizkraukles",
-  "02" => "Aluksnes",
-  "03" => "Balvu",
-  "04" => "Bauskas",
-  "05" => "Cesu",
-  "06" => "Daugavpils",
-  "07" => "Daugavpils",
-  "08" => "Dobeles",
-  "09" => "Gulbenes",
-  "10" => "Jekabpils",
-  "11" => "Jelgava",
-  "12" => "Jelgavas",
-  "13" => "Jurmala",
-  "14" => "Kraslavas",
-  "15" => "Kuldigas",
-  "16" => "Liepaja",
-  "17" => "Liepajas",
-  "18" => "Limbazu",
-  "19" => "Ludzas",
-  "20" => "Madonas",
-  "21" => "Ogres",
-  "22" => "Preilu",
-  "23" => "Rezekne",
-  "24" => "Rezeknes",
-  "25" => "Riga",
-  "26" => "Rigas",
-  "27" => "Saldus",
-  "28" => "Talsu",
-  "29" => "Tukuma",
-  "30" => "Valkas",
-  "31" => "Valmieras",
-  "32" => "Ventspils",
-  "33" => "Ventspils"),
-"LY" => array(
-  "03" => "Al Aziziyah",
-  "05" => "Al Jufrah",
-  "08" => "Al Kufrah",
-  "13" => "Ash Shati'",
-  "30" => "Murzuq",
-  "34" => "Sabha",
-  "41" => "Tarhunah",
-  "42" => "Tubruq",
-  "45" => "Zlitan",
-  "47" => "Ajdabiya",
-  "48" => "Al Fatih",
-  "49" => "Al Jabal al Akhdar",
-  "50" => "Al Khums",
-  "51" => "An Nuqat al Khams",
-  "52" => "Awbari",
-  "53" => "Az Zawiyah",
-  "54" => "Banghazi",
-  "55" => "Darnah",
-  "56" => "Ghadamis",
-  "57" => "Gharyan",
-  "58" => "Misratah",
-  "59" => "Sawfajjin",
-  "60" => "Surt",
-  "61" => "Tarabulus",
-  "62" => "Yafran"),
-"MA" => array(
-  "01" => "Agadir",
-  "02" => "Al Hoceima",
-  "03" => "Azilal",
-  "04" => "Ben Slimane",
-  "05" => "Beni Mellal",
-  "06" => "Boulemane",
-  "07" => "Casablanca",
-  "08" => "Chaouen",
-  "09" => "El Jadida",
-  "10" => "El Kelaa des Srarhna",
-  "11" => "Er Rachidia",
-  "12" => "Essaouira",
-  "13" => "Fes",
-  "14" => "Figuig",
-  "15" => "Kenitra",
-  "16" => "Khemisset",
-  "17" => "Khenifra",
-  "18" => "Khouribga",
-  "19" => "Marrakech",
-  "20" => "Meknes",
-  "21" => "Nador",
-  "22" => "Ouarzazate",
-  "23" => "Oujda",
-  "24" => "Rabat-Sale",
-  "25" => "Safi",
-  "26" => "Settat",
-  "27" => "Tanger",
-  "29" => "Tata",
-  "30" => "Taza",
-  "32" => "Tiznit",
-  "33" => "Guelmim",
-  "34" => "Ifrane",
-  "35" => "Laayoune",
-  "36" => "Tan-Tan",
-  "37" => "Taounate",
-  "38" => "Sidi Kacem",
-  "39" => "Taroudannt",
-  "40" => "Tetouan",
-  "41" => "Larache",
-  "45" => "Grand Casablanca",
-  "46" => "Fes-Boulemane",
-  "47" => "Marrakech-Tensift-Al Haouz",
-  "48" => "Meknes-Tafilalet",
-  "49" => "Rabat-Sale-Zemmour-Zaer",
-  "50" => "Chaouia-Ouardigha",
-  "51" => "Doukkala-Abda",
-  "52" => "Gharb-Chrarda-Beni Hssen",
-  "53" => "Guelmim-Es Smara",
-  "54" => "Oriental",
-  "55" => "Souss-Massa-Dr,a",
-  "56" => "Tadla-Azilal",
-  "57" => "Tanger-Tetouan",
-  "58" => "Taza-Al Hoceima-Taounate",
-  "59" => "La,youne-Boujdour-Sakia El Hamra"),
-"MC" => array(
-  "01" => "La Condamine",
-  "02" => "Monaco",
-  "03" => "Monte-Carlo"),
-"MD" => array(
-  "46" => "Balti",
-  "47" => "Cahul",
-  "48" => "Chisinau",
-  "49" => "Stinga Nistrului",
-  "50" => "Edinet",
-  "51" => "Gagauzia",
-  "52" => "Lapusna",
-  "53" => "Orhei",
-  "54" => "Soroca",
-  "55" => "Tighina",
-  "56" => "Ungheni",
-  "58" => "Stinga Nistrului",
-  "59" => "Anenii Noi",
-  "60" => "Balti",
-  "61" => "Basarabeasca",
-  "62" => "Bender",
-  "63" => "Briceni",
-  "64" => "Cahul",
-  "65" => "Cantemir",
-  "66" => "Calarasi",
-  "67" => "Causeni",
-  "68" => "Cimislia",
-  "69" => "Criuleni",
-  "70" => "Donduseni",
-  "71" => "Drochia",
-  "72" => "Dubasari",
-  "73" => "Edinet",
-  "74" => "Falesti",
-  "75" => "Floresti",
-  "76" => "Glodeni",
-  "77" => "Hincesti",
-  "78" => "Ialoveni",
-  "79" => "Leova",
-  "80" => "Nisporeni",
-  "81" => "Ocnita",
-  "83" => "Rezina",
-  "84" => "Riscani",
-  "85" => "Singerei",
-  "86" => "Soldanesti",
-  "87" => "Soroca",
-  "88" => "Stefan-Voda",
-  "89" => "Straseni",
-  "90" => "Taraclia",
-  "91" => "Telenesti",
-  "92" => "Ungheni"),
-"MG" => array(
-  "01" => "Antsiranana",
-  "02" => "Fianarantsoa",
-  "03" => "Mahajanga",
-  "04" => "Toamasina",
-  "05" => "Antananarivo",
-  "06" => "Toliara"),
-"MK" => array(
-  "01" => "Aracinovo",
-  "02" => "Bac",
-  "03" => "Belcista",
-  "04" => "Berovo",
-  "05" => "Bistrica",
-  "06" => "Bitola",
-  "07" => "Blatec",
-  "08" => "Bogdanci",
-  "09" => "Bogomila",
-  "10" => "Bogovinje",
-  "11" => "Bosilovo",
-  "12" => "Brvenica",
-  "13" => "Cair",
-  "14" => "Capari",
-  "15" => "Caska",
-  "16" => "Cegrane",
-  "17" => "Centar",
-  "18" => "Centar Zupa",
-  "19" => "Cesinovo",
-  "20" => "Cucer-Sandevo",
-  "21" => "Debar",
-  "22" => "Delcevo",
-  "23" => "Delogozdi",
-  "24" => "Demir Hisar",
-  "25" => "Demir Kapija",
-  "26" => "Dobrusevo",
-  "27" => "Dolna Banjica",
-  "28" => "Dolneni",
-  "29" => "Dorce Petrov",
-  "30" => "Drugovo",
-  "31" => "Dzepciste",
-  "32" => "Gazi Baba",
-  "33" => "Gevgelija",
-  "34" => "Gostivar",
-  "35" => "Gradsko",
-  "36" => "Ilinden",
-  "37" => "Izvor",
-  "38" => "Jegunovce",
-  "39" => "Kamenjane",
-  "40" => "Karbinci",
-  "41" => "Karpos",
-  "42" => "Kavadarci",
-  "43" => "Kicevo",
-  "44" => "Kisela Voda",
-  "45" => "Klecevce",
-  "46" => "Kocani",
-  "47" => "Konce",
-  "48" => "Kondovo",
-  "49" => "Konopiste",
-  "50" => "Kosel",
-  "51" => "Kratovo",
-  "52" => "Kriva Palanka",
-  "53" => "Krivogastani",
-  "54" => "Krusevo",
-  "55" => "Kuklis",
-  "56" => "Kukurecani",
-  "57" => "Kumanovo",
-  "58" => "Labunista",
-  "59" => "Lipkovo",
-  "60" => "Lozovo",
-  "61" => "Lukovo",
-  "62" => "Makedonska Kamenica",
-  "63" => "Makedonski Brod",
-  "64" => "Mavrovi Anovi",
-  "65" => "Meseista",
-  "66" => "Miravci",
-  "67" => "Mogila",
-  "68" => "Murtino",
-  "69" => "Negotino",
-  "70" => "Negotino-Polosko",
-  "71" => "Novaci",
-  "72" => "Novo Selo",
-  "73" => "Oblesevo",
-  "74" => "Ohrid",
-  "75" => "Orasac",
-  "76" => "Orizari",
-  "77" => "Oslomej",
-  "78" => "Pehcevo",
-  "79" => "Petrovec",
-  "80" => "Plasnica",
-  "81" => "Podares",
-  "82" => "Prilep",
-  "83" => "Probistip",
-  "84" => "Radovis",
-  "85" => "Rankovce",
-  "86" => "Resen",
-  "87" => "Rosoman",
-  "88" => "Rostusa",
-  "89" => "Samokov",
-  "90" => "Saraj",
-  "91" => "Sipkovica",
-  "92" => "Sopiste",
-  "93" => "Sopotnica",
-  "94" => "Srbinovo",
-  "95" => "Staravina",
-  "96" => "Star Dojran",
-  "97" => "Staro Nagoricane",
-  "98" => "Stip",
-  "99" => "Struga",
-  "A1" => "Strumica",
-  "A2" => "Studenicani",
-  "A3" => "Suto Orizari",
-  "A4" => "Sveti Nikole",
-  "A5" => "Tearce",
-  "A6" => "Tetovo",
-  "A7" => "Topolcani",
-  "A8" => "Valandovo",
-  "A9" => "Vasilevo",
-  "B1" => "Veles",
-  "B2" => "Velesta",
-  "B3" => "Vevcani",
-  "B4" => "Vinica",
-  "B5" => "Vitoliste",
-  "B6" => "Vranestica",
-  "B7" => "Vrapciste",
-  "B8" => "Vratnica",
-  "B9" => "Vrutok",
-  "C1" => "Zajas",
-  "C2" => "Zelenikovo",
-  "C3" => "Zelino",
-  "C4" => "Zitose",
-  "C5" => "Zletovo",
-  "C6" => "Zrnovci"),
-"ML" => array(
-  "01" => "Bamako",
-  "03" => "Kayes",
-  "04" => "Mopti",
-  "05" => "Segou",
-  "06" => "Sikasso",
-  "07" => "Koulikoro",
-  "08" => "Tombouctou",
-  "09" => "Gao",
-  "10" => "Kidal"),
-"MM" => array(
-  "01" => "Rakhine State",
-  "02" => "Chin State",
-  "03" => "Irrawaddy",
-  "04" => "Kachin State",
-  "05" => "Karan State",
-  "06" => "Kayah State",
-  "07" => "Magwe",
-  "08" => "Mandalay",
-  "09" => "Pegu",
-  "10" => "Sagaing",
-  "11" => "Shan State",
-  "12" => "Tenasserim",
-  "13" => "Mon State",
-  "14" => "Rangoon",
-  "17" => "Yangon"),
-"MN" => array(
-  "01" => "Arhangay",
-  "02" => "Bayanhongor",
-  "03" => "Bayan-Olgiy",
-  "05" => "Darhan",
-  "06" => "Dornod",
-  "07" => "Dornogovi",
-  "08" => "Dundgovi",
-  "09" => "Dzavhan",
-  "10" => "Govi-Altay",
-  "11" => "Hentiy",
-  "12" => "Hovd",
-  "13" => "Hovsgol",
-  "14" => "Omnogovi",
-  "15" => "Ovorhangay",
-  "16" => "Selenge",
-  "17" => "Suhbaatar",
-  "18" => "Tov",
-  "19" => "Uvs",
-  "20" => "Ulaanbaatar",
-  "21" => "Bulgan",
-  "22" => "Erdenet",
-  "23" => "Darhan-Uul",
-  "24" => "Govisumber",
-  "25" => "Orhon"),
-"MO" => array(
-  "01" => "Ilhas",
-  "02" => "Macau"),
-"MR" => array(
-  "01" => "Hodh Ech Chargui",
-  "02" => "Hodh El Gharbi",
-  "03" => "Assaba",
-  "04" => "Gorgol",
-  "05" => "Brakna",
-  "06" => "Trarza",
-  "07" => "Adrar",
-  "08" => "Dakhlet Nouadhibou",
-  "09" => "Tagant",
-  "10" => "Guidimaka",
-  "11" => "Tiris Zemmour",
-  "12" => "Inchiri"),
-"MS" => array(
-  "01" => "Saint Anthony",
-  "02" => "Saint Georges",
-  "03" => "Saint Peter"),
-"MU" => array(
-  "12" => "Black River",
-  "13" => "Flacq",
-  "14" => "Grand Port",
-  "15" => "Moka",
-  "16" => "Pamplemousses",
-  "17" => "Plaines Wilhems",
-  "18" => "Port Louis",
-  "19" => "Riviere du Rempart",
-  "20" => "Savanne",
-  "21" => "Agalega Islands",
-  "22" => "Cargados Carajos",
-  "23" => "Rodrigues"),
-"MV" => array(
-  "01" => "Seenu",
-  "02" => "Aliff",
-  "03" => "Laviyani",
-  "04" => "Waavu",
-  "05" => "Laamu",
-  "07" => "Haa Aliff",
-  "08" => "Thaa",
-  "12" => "Meemu",
-  "13" => "Raa",
-  "14" => "Faafu",
-  "17" => "Daalu",
-  "20" => "Baa",
-  "23" => "Haa Daalu",
-  "24" => "Shaviyani",
-  "25" => "Noonu",
-  "26" => "Kaafu",
-  "27" => "Gaafu Aliff",
-  "28" => "Gaafu Daalu",
-  "29" => "Naviyani",
-  "40" => "Male"),
-"MW" => array(
-  "02" => "Chikwawa",
-  "03" => "Chiradzulu",
-  "04" => "Chitipa",
-  "05" => "Thyolo",
-  "06" => "Dedza",
-  "07" => "Dowa",
-  "08" => "Karonga",
-  "09" => "Kasungu",
-  "11" => "Lilongwe",
-  "12" => "Mangochi",
-  "13" => "Mchinji",
-  "15" => "Mzimba",
-  "16" => "Ntcheu",
-  "17" => "Nkhata Bay",
-  "18" => "Nkhotakota",
-  "19" => "Nsanje",
-  "20" => "Ntchisi",
-  "21" => "Rumphi",
-  "22" => "Salima",
-  "23" => "Zomba",
-  "24" => "Blantyre",
-  "25" => "Mwanza",
-  "26" => "Balaka",
-  "27" => "Likoma",
-  "28" => "Machinga",
-  "29" => "Mulanje",
-  "30" => "Phalombe"),
-"MX" => array(
-  "01" => "Aguascalientes",
-  "02" => "Baja California",
-  "03" => "Baja California Sur",
-  "04" => "Campeche",
-  "05" => "Chiapas",
-  "06" => "Chihuahua",
-  "07" => "Coahuila de Zaragoza",
-  "08" => "Colima",
-  "09" => "Distrito Federal",
-  "10" => "Durango",
-  "11" => "Guanajuato",
-  "12" => "Guerrero",
-  "13" => "Hidalgo",
-  "14" => "Jalisco",
-  "15" => "Mexico",
-  "16" => "Michoacan de Ocampo",
-  "17" => "Morelos",
-  "18" => "Nayarit",
-  "19" => "Nuevo Leon",
-  "20" => "Oaxaca",
-  "21" => "Puebla",
-  "22" => "Queretaro de Arteaga",
-  "23" => "Quintana Roo",
-  "24" => "San Luis Potosi",
-  "25" => "Sinaloa",
-  "26" => "Sonora",
-  "27" => "Tabasco",
-  "28" => "Tamaulipas",
-  "29" => "Tlaxcala",
-  "30" => "Veracruz-Llave",
-  "31" => "Yucatan",
-  "32" => "Zacatecas"),
-"MY" => array(
-  "01" => "Johor",
-  "02" => "Kedah",
-  "03" => "Kelantan",
-  "04" => "Melaka",
-  "05" => "Negeri Sembilan",
-  "06" => "Pahang",
-  "07" => "Perak",
-  "08" => "Perlis",
-  "09" => "Pulau Pinang",
-  "11" => "Sarawak",
-  "12" => "Selangor",
-  "13" => "Terengganu",
-  "14" => "Kuala Lumpur",
-  "15" => "Labuan",
-  "16" => "Sabah",
-  "17" => "Putrajaya"),
-"MZ" => array(
-  "01" => "Cabo Delgado",
-  "02" => "Gaza",
-  "03" => "Inhambane",
-  "04" => "Maputo",
-  "05" => "Sofala",
-  "06" => "Nampula",
-  "07" => "Niassa",
-  "08" => "Tete",
-  "09" => "Zambezia",
-  "10" => "Manica",
-  "11" => "Maputo"),
-"NA" => array(
-  "01" => "Bethanien",
-  "02" => "Caprivi Oos",
-  "03" => "Boesmanland",
-  "04" => "Gobabis",
-  "05" => "Grootfontein",
-  "06" => "Kaokoland",
-  "07" => "Karibib",
-  "08" => "Keetmanshoop",
-  "09" => "Luderitz",
-  "10" => "Maltahohe",
-  "11" => "Okahandja",
-  "12" => "Omaruru",
-  "13" => "Otjiwarongo",
-  "14" => "Outjo",
-  "15" => "Owambo",
-  "16" => "Rehoboth",
-  "17" => "Swakopmund",
-  "18" => "Tsumeb",
-  "20" => "Karasburg",
-  "21" => "Windhoek",
-  "22" => "Damaraland",
-  "23" => "Hereroland Oos",
-  "24" => "Hereroland Wes",
-  "25" => "Kavango",
-  "26" => "Mariental",
-  "27" => "Namaland",
-  "28" => "Caprivi",
-  "29" => "Erongo",
-  "30" => "Hardap",
-  "31" => "Karas",
-  "32" => "Kunene",
-  "33" => "Ohangwena",
-  "34" => "Okavango",
-  "35" => "Omaheke",
-  "36" => "Omusati",
-  "37" => "Oshana",
-  "38" => "Oshikoto",
-  "39" => "Otjozondjupa"),
-"NE" => array(
-  "01" => "Agadez",
-  "02" => "Diffa",
-  "03" => "Dosso",
-  "04" => "Maradi",
-  "05" => "Niamey",
-  "06" => "Tahoua",
-  "07" => "Zinder",
-  "08" => "Niamey"),
-"NG" => array(
-  "05" => "Lagos",
-  "10" => "Rivers",
-  "11" => "Federal Capital Territory",
-  "12" => "Gongola",
-  "16" => "Ogun",
-  "17" => "Ondo",
-  "18" => "Oyo",
-  "21" => "Akwa Ibom",
-  "22" => "Cross River",
-  "23" => "Kaduna",
-  "24" => "Katsina",
-  "25" => "Anambra",
-  "26" => "Benue",
-  "27" => "Borno",
-  "28" => "Imo",
-  "29" => "Kano",
-  "30" => "Kwara",
-  "31" => "Niger",
-  "32" => "Oyo",
-  "35" => "Adamawa",
-  "36" => "Delta",
-  "37" => "Edo",
-  "39" => "Jigawa",
-  "40" => "Kebbi",
-  "41" => "Kogi",
-  "42" => "Osun",
-  "43" => "Taraba",
-  "44" => "Yobe",
-  "45" => "Abia",
-  "46" => "Bauchi",
-  "47" => "Enugu",
-  "48" => "Ondo",
-  "49" => "Plateau",
-  "50" => "Rivers",
-  "51" => "Sokoto",
-  "52" => "Bayelsa",
-  "53" => "Ebonyi",
-  "54" => "Ekiti",
-  "55" => "Gombe",
-  "56" => "Nassarawa",
-  "57" => "Zamfara"),
-"NI" => array(
-  "01" => "Boaco",
-  "02" => "Carazo",
-  "03" => "Chinandega",
-  "04" => "Chontales",
-  "05" => "Esteli",
-  "06" => "Granada",
-  "07" => "Jinotega",
-  "08" => "Leon",
-  "09" => "Madriz",
-  "10" => "Managua",
-  "11" => "Masaya",
-  "12" => "Matagalpa",
-  "13" => "Nueva Segovia",
-  "14" => "Rio San Juan",
-  "15" => "Rivas",
-  "16" => "Zelaya",
-  "17" => "Autonoma Atlantico Norte",
-  "18" => "Region Autonoma Atlantico Sur"),
-"NL" => array(
-  "01" => "Drenthe",
-  "02" => "Friesland",
-  "03" => "Gelderland",
-  "04" => "Groningen",
-  "05" => "Limburg",
-  "06" => "Noord-Brabant",
-  "07" => "Noord-Holland",
-  "08" => "Overijssel",
-  "09" => "Utrecht",
-  "10" => "Zeeland",
-  "11" => "Zuid-Holland",
-  "12" => "Dronten",
-  "13" => "Zuidelijke IJsselmeerpolders",
-  "14" => "Lelystad",
-  "15" => "Overijssel",
-  "16" => "Flevoland"),
-"NO" => array(
-  "01" => "Akershus",
-  "02" => "Aust-Agder",
-  "04" => "Buskerud",
-  "05" => "Finnmark",
-  "06" => "Hedmark",
-  "07" => "Hordaland",
-  "08" => "More og Romsdal",
-  "09" => "Nordland",
-  "10" => "Nord-Trondelag",
-  "11" => "Oppland",
-  "12" => "Oslo",
-  "13" => "Ostfold",
-  "14" => "Rogaland",
-  "15" => "Sogn og Fjordane",
-  "16" => "Sor-Trondelag",
-  "17" => "Telemark",
-  "18" => "Troms",
-  "19" => "Vest-Agder",
-  "20" => "Vestfold"),
-"NP" => array(
-  "01" => "Bagmati",
-  "02" => "Bheri",
-  "03" => "Dhawalagiri",
-  "04" => "Gandaki",
-  "05" => "Janakpur",
-  "06" => "Karnali",
-  "07" => "Kosi",
-  "08" => "Lumbini",
-  "09" => "Mahakali",
-  "10" => "Mechi",
-  "11" => "Narayani",
-  "12" => "Rapti",
-  "13" => "Sagarmatha",
-  "14" => "Seti"),
-"NR" => array(
-  "01" => "Aiwo",
-  "02" => "Anabar",
-  "03" => "Anetan",
-  "04" => "Anibare",
-  "05" => "Baiti",
-  "06" => "Boe",
-  "07" => "Buada",
-  "08" => "Denigomodu",
-  "09" => "Ewa",
-  "10" => "Ijuw",
-  "11" => "Meneng",
-  "12" => "Nibok",
-  "13" => "Uaboe",
-  "14" => "Yaren"),
-"NZ" => array(
-  "10" => "Chatham Islands",
-  "85" => "Waikato",
-  "E7" => "Auckland",
-  "E8" => "Bay of Plenty",
-  "E9" => "Canterbury",
-  "F1" => "Gisborne",
-  "F2" => "Hawke's Bay",
-  "F3" => "Manawatu-Wanganui",
-  "F4" => "Marlborough",
-  "F5" => "Nelson",
-  "F6" => "Northland",
-  "F7" => "Otago",
-  "F8" => "Southland",
-  "F9" => "Taranaki",
-  "G1" => "Waikato",
-  "G2" => "Wellington",
-  "G3" => "West Coast"),
-"OM" => array(
-  "01" => "Ad Dakhiliyah",
-  "02" => "Al Batinah",
-  "03" => "Al Wusta",
-  "04" => "Ash Sharqiyah",
-  "05" => "Az Zahirah",
-  "06" => "Masqat",
-  "07" => "Musandam",
-  "08" => "Zufar"),
-"PA" => array(
-  "01" => "Bocas del Toro",
-  "02" => "Chiriqui",
-  "03" => "Cocle",
-  "04" => "Colon",
-  "05" => "Darien",
-  "06" => "Herrera",
-  "07" => "Los Santos",
-  "08" => "Panama",
-  "09" => "San Blas",
-  "10" => "Veraguas"),
-"PE" => array(
-  "01" => "Amazonas",
-  "02" => "Ancash",
-  "03" => "Apurimac",
-  "04" => "Arequipa",
-  "05" => "Ayacucho",
-  "06" => "Cajamarca",
-  "07" => "Callao",
-  "08" => "Cusco",
-  "09" => "Huancavelica",
-  "10" => "Huanuco",
-  "11" => "Ica",
-  "12" => "Junin",
-  "13" => "La Libertad",
-  "14" => "Lambayeque",
-  "15" => "Lima",
-  "16" => "Loreto",
-  "17" => "Madre de Dios",
-  "18" => "Moquegua",
-  "19" => "Pasco",
-  "20" => "Piura",
-  "21" => "Puno",
-  "22" => "San Martin",
-  "23" => "Tacna",
-  "24" => "Tumbes",
-  "25" => "Ucayali"),
-"PG" => array(
-  "01" => "Central",
-  "02" => "Gulf",
-  "03" => "Milne Bay",
-  "04" => "Northern",
-  "05" => "Southern Highlands",
-  "06" => "Western",
-  "07" => "North Solomons",
-  "08" => "Chimbu",
-  "09" => "Eastern Highlands",
-  "10" => "East New Britain",
-  "11" => "East Sepik",
-  "12" => "Madang",
-  "13" => "Manus",
-  "14" => "Morobe",
-  "15" => "New Ireland",
-  "16" => "Western Highlands",
-  "17" => "West New Britain",
-  "18" => "Sandaun",
-  "19" => "Enga",
-  "20" => "National Capital"),
-"PH" => array(
-  "01" => "Abra",
-  "02" => "Agusan del Norte",
-  "03" => "Agusan del Sur",
-  "04" => "Aklan",
-  "05" => "Albay",
-  "06" => "Antique",
-  "07" => "Bataan",
-  "08" => "Batanes",
-  "09" => "Batangas",
-  "10" => "Benguet",
-  "11" => "Bohol",
-  "12" => "Bukidnon",
-  "13" => "Bulacan",
-  "14" => "Cagayan",
-  "15" => "Camarines Norte",
-  "16" => "Camarines Sur",
-  "17" => "Camiguin",
-  "18" => "Capiz",
-  "19" => "Catanduanes",
-  "20" => "Cavite",
-  "21" => "Cebu",
-  "22" => "Basilan",
-  "23" => "Eastern Samar",
-  "24" => "Davao",
-  "25" => "Davao del Sur",
-  "26" => "Davao Oriental",
-  "27" => "Ifugao",
-  "28" => "Ilocos Norte",
-  "29" => "Ilocos Sur",
-  "30" => "Iloilo",
-  "31" => "Isabela",
-  "32" => "Kalinga-Apayao",
-  "33" => "Laguna",
-  "34" => "Lanao del Norte",
-  "35" => "Lanao del Sur",
-  "36" => "La Union",
-  "37" => "Leyte",
-  "38" => "Marinduque",
-  "39" => "Masbate",
-  "40" => "Mindoro Occidental",
-  "41" => "Mindoro Oriental",
-  "42" => "Misamis Occidental",
-  "43" => "Misamis Oriental",
-  "44" => "Mountain",
-  "45" => "Negros Occidental",
-  "46" => "Negros Oriental",
-  "47" => "Nueva Ecija",
-  "48" => "Nueva Vizcaya",
-  "49" => "Palawan",
-  "50" => "Pampanga",
-  "51" => "Pangasinan",
-  "53" => "Rizal",
-  "54" => "Romblon",
-  "55" => "Samar",
-  "56" => "Maguindanao",
-  "57" => "North Cotabato",
-  "58" => "Sorsogon",
-  "59" => "Southern Leyte",
-  "60" => "Sulu",
-  "61" => "Surigao del Norte",
-  "62" => "Surigao del Sur",
-  "63" => "Tarlac",
-  "64" => "Zambales",
-  "65" => "Zamboanga del Norte",
-  "66" => "Zamboanga del Sur",
-  "67" => "Northern Samar",
-  "68" => "Quirino",
-  "69" => "Siquijor",
-  "70" => "South Cotabato",
-  "71" => "Sultan Kudarat",
-  "72" => "Tawitawi",
-  "A1" => "Angeles",
-  "A2" => "Bacolod",
-  "A3" => "Bago",
-  "A4" => "Baguio",
-  "A5" => "Bais",
-  "A6" => "Basilan City",
-  "A7" => "Batangas City",
-  "A8" => "Butuan",
-  "A9" => "Cabanatuan",
-  "B1" => "Cadiz",
-  "B2" => "Cagayan de Oro",
-  "B3" => "Calbayog",
-  "B4" => "Caloocan",
-  "B5" => "Canlaon",
-  "B6" => "Cavite City",
-  "B7" => "Cebu City",
-  "B8" => "Cotabato",
-  "B9" => "Dagupan",
-  "C1" => "Danao",
-  "C2" => "Dapitan",
-  "C3" => "Davao City",
-  "C4" => "Dipolog",
-  "C5" => "Dumaguete",
-  "C6" => "General Santos",
-  "C7" => "Gingoog",
-  "C8" => "Iligan",
-  "C9" => "Iloilo City",
-  "D1" => "Iriga",
-  "D2" => "La Carlota",
-  "D3" => "Laoag",
-  "D4" => "Lapu-Lapu",
-  "D5" => "Legaspi",
-  "D6" => "Lipa",
-  "D7" => "Lucena",
-  "D8" => "Mandaue",
-  "D9" => "Manila",
-  "E1" => "Marawi",
-  "E2" => "Naga",
-  "E3" => "Olongapo",
-  "E4" => "Ormoc",
-  "E5" => "Oroquieta",
-  "E6" => "Ozamis",
-  "E7" => "Pagadian",
-  "E8" => "Palayan",
-  "E9" => "Pasay",
-  "F1" => "Puerto Princesa",
-  "F2" => "Quezon City",
-  "F3" => "Roxas",
-  "F4" => "San Carlos",
-  "F5" => "San Carlos",
-  "F6" => "San Jose",
-  "F7" => "San Pablo",
-  "F8" => "Silay",
-  "F9" => "Surigao",
-  "G1" => "Tacloban",
-  "G2" => "Tagaytay",
-  "G3" => "Tagbilaran",
-  "G4" => "Tangub",
-  "G5" => "Toledo",
-  "G6" => "Trece Martires",
-  "G7" => "Zamboanga",
-  "G8" => "Aurora",
-  "H2" => "Quezon",
-  "H3" => "Negros Occidental"),
-"PK" => array(
-  "01" => "Federally Administered Tribal Areas",
-  "02" => "Balochistan",
-  "03" => "North-West Frontier",
-  "04" => "Punjab",
-  "05" => "Sindh",
-  "06" => "Azad Kashmir",
-  "07" => "Northern Areas",
-  "08" => "Islamabad"),
-"PL" => array(
-  "23" => "Biala Podlaska",
-  "24" => "Bialystok",
-  "25" => "Bielsko",
-  "26" => "Bydgoszcz",
-  "27" => "Chelm",
-  "28" => "Ciechanow",
-  "29" => "Czestochowa",
-  "30" => "Elblag",
-  "31" => "Gdansk",
-  "32" => "Gorzow",
-  "33" => "Jelenia Gora",
-  "34" => "Kalisz",
-  "35" => "Katowice",
-  "36" => "Kielce",
-  "37" => "Konin",
-  "38" => "Koszalin",
-  "39" => "Krakow",
-  "40" => "Krosno",
-  "41" => "Legnica",
-  "42" => "Leszno",
-  "43" => "Lodz",
-  "44" => "Lomza",
-  "45" => "Lublin",
-  "46" => "Nowy Sacz",
-  "47" => "Olsztyn",
-  "48" => "Opole",
-  "49" => "Ostroleka",
-  "50" => "Pila",
-  "51" => "Piotrkow",
-  "52" => "Plock",
-  "53" => "Poznan",
-  "54" => "Przemysl",
-  "55" => "Radom",
-  "56" => "Rzeszow",
-  "57" => "Siedlce",
-  "58" => "Sieradz",
-  "59" => "Skierniewice",
-  "60" => "Slupsk",
-  "61" => "Suwalki",
-  "62" => "Szczecin",
-  "63" => "Tarnobrzeg",
-  "64" => "Tarnow",
-  "65" => "Torun",
-  "66" => "Walbrzych",
-  "67" => "Warszawa",
-  "68" => "Wloclawek",
-  "69" => "Wroclaw",
-  "70" => "Zamosc",
-  "71" => "Zielona Gora",
-  "72" => "Dolnoslaskie",
-  "73" => "Kujawsko-Pomorskie",
-  "74" => "Lodzkie",
-  "75" => "Lubelskie",
-  "76" => "Lubuskie",
-  "77" => "Malopolskie",
-  "78" => "Mazowieckie",
-  "79" => "Opolskie",
-  "80" => "Podkarpackie",
-  "81" => "Podlaskie",
-  "82" => "Pomorskie",
-  "83" => "Slaskie",
-  "84" => "Swietokrzyskie",
-  "85" => "Warminsko-Mazurskie",
-  "86" => "Wielkopolskie",
-  "87" => "Zachodniopomorskie"),
-"PS" => array(
-  "GZ" => "Gaza",
-  "WE" => "West Bank"),
-"PT" => array(
-  "02" => "Aveiro",
-  "03" => "Beja",
-  "04" => "Braga",
-  "05" => "Braganca",
-  "06" => "Castelo Branco",
-  "07" => "Coimbra",
-  "08" => "Evora",
-  "09" => "Faro",
-  "10" => "Madeira",
-  "11" => "Guarda",
-  "13" => "Leiria",
-  "14" => "Lisboa",
-  "16" => "Portalegre",
-  "17" => "Porto",
-  "18" => "Santarem",
-  "19" => "Setubal",
-  "20" => "Viana do Castelo",
-  "21" => "Vila Real",
-  "22" => "Viseu",
-  "23" => "Azores"),
-"PY" => array(
-  "01" => "Alto Parana",
-  "02" => "Amambay",
-  "03" => "Boqueron",
-  "04" => "Caaguazu",
-  "05" => "Caazapa",
-  "06" => "Central",
-  "07" => "Concepcion",
-  "08" => "Cordillera",
-  "10" => "Guaira",
-  "11" => "Itapua",
-  "12" => "Misiones",
-  "13" => "Neembucu",
-  "15" => "Paraguari",
-  "16" => "Presidente Hayes",
-  "17" => "San Pedro",
-  "19" => "Canindeyu",
-  "20" => "Chaco",
-  "21" => "Nueva Asuncion",
-  "23" => "Alto Paraguay"),
-"QA" => array(
-  "01" => "Ad Dawhah",
-  "02" => "Al Ghuwariyah",
-  "03" => "Al Jumaliyah",
-  "04" => "Al Khawr",
-  "05" => "Al Wakrah Municipality",
-  "06" => "Ar Rayyan",
-  "08" => "Madinat ach Shamal",
-  "09" => "Umm Salal",
-  "10" => "Al Wakrah",
-  "11" => "Jariyan al Batnah",
-  "12" => "Umm Sa'id"),
-"RO" => array(
-  "01" => "Alba",
-  "02" => "Arad",
-  "03" => "Arges",
-  "04" => "Bacau",
-  "05" => "Bihor",
-  "06" => "Bistrita-Nasaud",
-  "07" => "Botosani",
-  "08" => "Braila",
-  "09" => "Brasov",
-  "10" => "Bucuresti",
-  "11" => "Buzau",
-  "12" => "Caras-Severin",
-  "13" => "Cluj",
-  "14" => "Constanta",
-  "15" => "Covasna",
-  "16" => "Dambovita",
-  "17" => "Dolj",
-  "18" => "Galati",
-  "19" => "Gorj",
-  "20" => "Harghita",
-  "21" => "Hunedoara",
-  "22" => "Ialomita",
-  "23" => "Iasi",
-  "25" => "Maramures",
-  "26" => "Mehedinti",
-  "27" => "Mures",
-  "28" => "Neamt",
-  "29" => "Olt",
-  "30" => "Prahova",
-  "31" => "Salaj",
-  "32" => "Satu Mare",
-  "33" => "Sibiu",
-  "34" => "Suceava",
-  "35" => "Teleorman",
-  "36" => "Timis",
-  "37" => "Tulcea",
-  "38" => "Vaslui",
-  "39" => "Valcea",
-  "40" => "Vrancea",
-  "41" => "Calarasi",
-  "42" => "Giurgiu",
-  "43" => "Ilfov"),
-"RS" => array(
-  "01" => "Kosovo",
-  "02" => "Vojvodina"),
-"RU" => array(
-  "01" => "Adygeya, Republic of",
-  "02" => "Aginsky Buryatsky AO",
-  "03" => "Gorno-Altay",
-  "04" => "Altaisky krai",
-  "05" => "Amur",
-  "06" => "Arkhangel'sk",
-  "07" => "Astrakhan'",
-  "08" => "Bashkortostan",
-  "09" => "Belgorod",
-  "10" => "Bryansk",
-  "11" => "Buryat",
-  "12" => "Chechnya",
-  "13" => "Chelyabinsk",
-  "14" => "Chita",
-  "15" => "Chukot",
-  "16" => "Chuvashia",
-  "17" => "Dagestan",
-  "18" => "Evenk",
-  "19" => "Ingush",
-  "20" => "Irkutsk",
-  "21" => "Ivanovo",
-  "22" => "Kabardin-Balkar",
-  "23" => "Kaliningrad",
-  "24" => "Kalmyk",
-  "25" => "Kaluga",
-  "26" => "Kamchatka",
-  "27" => "Karachay-Cherkess",
-  "28" => "Karelia",
-  "29" => "Kemerovo",
-  "30" => "Khabarovsk",
-  "31" => "Khakass",
-  "32" => "Khanty-Mansiy",
-  "33" => "Kirov",
-  "34" => "Komi",
-  "35" => "Komi-Permyak",
-  "36" => "Koryak",
-  "37" => "Kostroma",
-  "38" => "Krasnodar",
-  "39" => "Krasnoyarsk",
-  "40" => "Kurgan",
-  "41" => "Kursk",
-  "42" => "Leningrad",
-  "43" => "Lipetsk",
-  "44" => "Magadan",
-  "45" => "Mariy-El",
-  "46" => "Mordovia",
-  "47" => "Moskva",
-  "48" => "Moscow City",
-  "49" => "Murmansk",
-  "50" => "Nenets",
-  "51" => "Nizhegorod",
-  "52" => "Novgorod",
-  "53" => "Novosibirsk",
-  "54" => "Omsk",
-  "55" => "Orenburg",
-  "56" => "Orel",
-  "57" => "Penza",
-  "58" => "Perm'",
-  "59" => "Primor'ye",
-  "60" => "Pskov",
-  "61" => "Rostov",
-  "62" => "Ryazan'",
-  "63" => "Sakha",
-  "64" => "Sakhalin",
-  "65" => "Samara",
-  "66" => "Saint Petersburg City",
-  "67" => "Saratov",
-  "68" => "North Ossetia",
-  "69" => "Smolensk",
-  "70" => "Stavropol'",
-  "71" => "Sverdlovsk",
-  "72" => "Tambovskaya oblast",
-  "73" => "Tatarstan",
-  "74" => "Taymyr",
-  "75" => "Tomsk",
-  "76" => "Tula",
-  "77" => "Tver'",
-  "78" => "Tyumen'",
-  "79" => "Tuva",
-  "80" => "Udmurt",
-  "81" => "Ul'yanovsk",
-  "82" => "Ust-Orda Buryat",
-  "83" => "Vladimir",
-  "84" => "Volgograd",
-  "85" => "Vologda",
-  "86" => "Voronezh",
-  "87" => "Yamal-Nenets",
-  "88" => "Yaroslavl'",
-  "89" => "Yevrey",
-  "90" => "Permskiy Kray",
-  "91" => "Krasnoyarskiy Kray",
-  "CI" => "Chechnya Republic"),
-"RW" => array(
-  "01" => "Butare",
-  "06" => "Gitarama",
-  "07" => "Kibungo",
-  "09" => "Kigali",
-  "11" => "Est",
-  "12" => "Kigali",
-  "13" => "Nord",
-  "14" => "Ouest",
-  "15" => "Sud"),
-"SA" => array(
-  "02" => "Al Bahah",
-  "03" => "Al Jawf",
-  "05" => "Al Madinah",
-  "06" => "Ash Sharqiyah",
-  "08" => "Al Qasim",
-  "09" => "Al Qurayyat",
-  "10" => "Ar Riyad",
-  "13" => "Ha'il",
-  "14" => "Makkah",
-  "15" => "Al Hudud ash Shamaliyah",
-  "16" => "Najran",
-  "17" => "Jizan",
-  "19" => "Tabuk",
-  "20" => "Al Jawf"),
-"SB" => array(
-  "03" => "Malaita",
-  "06" => "Guadalcanal",
-  "07" => "Isabel",
-  "08" => "Makira",
-  "09" => "Temotu",
-  "10" => "Central",
-  "11" => "Western",
-  "12" => "Choiseul",
-  "13" => "Rennell and Bellona"),
-"SC" => array(
-  "01" => "Anse aux Pins",
-  "02" => "Anse Boileau",
-  "03" => "Anse Etoile",
-  "04" => "Anse Louis",
-  "05" => "Anse Royale",
-  "06" => "Baie Lazare",
-  "07" => "Baie Sainte Anne",
-  "08" => "Beau Vallon",
-  "09" => "Bel Air",
-  "10" => "Bel Ombre",
-  "11" => "Cascade",
-  "12" => "Glacis",
-  "13" => "Grand' Anse",
-  "14" => "Grand' Anse",
-  "15" => "La Digue",
-  "16" => "La Riviere Anglaise",
-  "17" => "Mont Buxton",
-  "18" => "Mont Fleuri",
-  "19" => "Plaisance",
-  "20" => "Pointe La Rue",
-  "21" => "Port Glaud",
-  "22" => "Saint Louis",
-  "23" => "Takamaka"),
-"SD" => array(
-  "27" => "Al Wusta",
-  "28" => "Al Istiwa'iyah",
-  "29" => "Al Khartum",
-  "30" => "Ash Shamaliyah",
-  "31" => "Ash Sharqiyah",
-  "32" => "Bahr al Ghazal",
-  "33" => "Darfur",
-  "34" => "Kurdufan",
-  "35" => "Upper Nile",
-  "40" => "Al Wahadah State",
-  "44" => "Central Equatoria State"),
-"SE" => array(
-  "01" => "Alvsborgs Lan",
-  "02" => "Blekinge Lan",
-  "03" => "Gavleborgs Lan",
-  "04" => "Goteborgs och Bohus Lan",
-  "05" => "Gotlands Lan",
-  "06" => "Hallands Lan",
-  "07" => "Jamtlands Lan",
-  "08" => "Jonkopings Lan",
-  "09" => "Kalmar Lan",
-  "10" => "Dalarnas Lan",
-  "11" => "Kristianstads Lan",
-  "12" => "Kronobergs Lan",
-  "13" => "Malmohus Lan",
-  "14" => "Norrbottens Lan",
-  "15" => "Orebro Lan",
-  "16" => "Ostergotlands Lan",
-  "17" => "Skaraborgs Lan",
-  "18" => "Sodermanlands Lan",
-  "21" => "Uppsala Lan",
-  "22" => "Varmlands Lan",
-  "23" => "Vasterbottens Lan",
-  "24" => "Vasternorrlands Lan",
-  "25" => "Vastmanlands Lan",
-  "26" => "Stockholms Lan",
-  "27" => "Skane Lan",
-  "28" => "Vastra Gotaland"),
-"SH" => array(
-  "01" => "Ascension",
-  "02" => "Saint Helena",
-  "03" => "Tristan da Cunha"),
-"SI" => array(
-  "01" => "Ajdovscina",
-  "02" => "Beltinci",
-  "03" => "Bled",
-  "04" => "Bohinj",
-  "05" => "Borovnica",
-  "06" => "Bovec",
-  "07" => "Brda",
-  "08" => "Brezice",
-  "09" => "Brezovica",
-  "11" => "Celje",
-  "12" => "Cerklje na Gorenjskem",
-  "13" => "Cerknica",
-  "14" => "Cerkno",
-  "15" => "Crensovci",
-  "16" => "Crna na Koroskem",
-  "17" => "Crnomelj",
-  "19" => "Divaca",
-  "20" => "Dobrepolje",
-  "22" => "Dol pri Ljubljani",
-  "24" => "Dornava",
-  "25" => "Dravograd",
-  "26" => "Duplek",
-  "27" => "Gorenja Vas-Poljane",
-  "28" => "Gorisnica",
-  "29" => "Gornja Radgona",
-  "30" => "Gornji Grad",
-  "31" => "Gornji Petrovci",
-  "32" => "Grosuplje",
-  "34" => "Hrastnik",
-  "35" => "Hrpelje-Kozina",
-  "36" => "Idrija",
-  "37" => "Ig",
-  "38" => "Ilirska Bistrica",
-  "39" => "Ivancna Gorica",
-  "40" => "Izola-Isola",
-  "42" => "Jursinci",
-  "44" => "Kanal",
-  "45" => "Kidricevo",
-  "46" => "Kobarid",
-  "47" => "Kobilje",
-  "49" => "Komen",
-  "50" => "Koper-Capodistria",
-  "51" => "Kozje",
-  "52" => "Kranj",
-  "53" => "Kranjska Gora",
-  "54" => "Krsko",
-  "55" => "Kungota",
-  "57" => "Lasko",
-  "61" => "Ljubljana",
-  "62" => "Ljubno",
-  "64" => "Logatec",
-  "66" => "Loski Potok",
-  "68" => "Lukovica",
-  "71" => "Medvode",
-  "72" => "Menges",
-  "73" => "Metlika",
-  "74" => "Mezica",
-  "76" => "Mislinja",
-  "77" => "Moravce",
-  "78" => "Moravske Toplice",
-  "79" => "Mozirje",
-  "80" => "Murska Sobota",
-  "81" => "Muta",
-  "82" => "Naklo",
-  "83" => "Nazarje",
-  "84" => "Nova Gorica",
-  "86" => "Odranci",
-  "87" => "Ormoz",
-  "88" => "Osilnica",
-  "89" => "Pesnica",
-  "91" => "Pivka",
-  "92" => "Podcetrtek",
-  "94" => "Postojna",
-  "97" => "Puconci",
-  "98" => "Racam",
-  "99" => "Radece",
-  "A1" => "Radenci",
-  "A2" => "Radlje ob Dravi",
-  "A3" => "Radovljica",
-  "A6" => "Rogasovci",
-  "A7" => "Rogaska Slatina",
-  "A8" => "Rogatec",
-  "B1" => "Semic",
-  "B2" => "Sencur",
-  "B3" => "Sentilj",
-  "B4" => "Sentjernej",
-  "B6" => "Sevnica",
-  "B7" => "Sezana",
-  "B8" => "Skocjan",
-  "B9" => "Skofja Loka",
-  "C1" => "Skofljica",
-  "C2" => "Slovenj Gradec",
-  "C4" => "Slovenske Konjice",
-  "C5" => "Smarje pri Jelsah",
-  "C6" => "Smartno ob Paki",
-  "C7" => "Sostanj",
-  "C8" => "Starse",
-  "C9" => "Store",
-  "D1" => "Sveti Jurij",
-  "D2" => "Tolmin",
-  "D3" => "Trbovlje",
-  "D4" => "Trebnje",
-  "D5" => "Trzic",
-  "D6" => "Turnisce",
-  "D7" => "Velenje",
-  "D8" => "Velike Lasce",
-  "E1" => "Vipava",
-  "E2" => "Vitanje",
-  "E3" => "Vodice",
-  "E5" => "Vrhnika",
-  "E6" => "Vuzenica",
-  "E7" => "Zagorje ob Savi",
-  "E9" => "Zavrc",
-  "F1" => "Zelezniki",
-  "F2" => "Ziri",
-  "F3" => "Zrece",
-  "G4" => "Dobrova-Horjul-Polhov Gradec",
-  "G7" => "Domzale",
-  "H4" => "Jesenice",
-  "H6" => "Kamnik",
-  "H7" => "Kocevje",
-  "I2" => "Kuzma",
-  "I3" => "Lenart",
-  "I5" => "Litija",
-  "I6" => "Ljutomer",
-  "I7" => "Loska Dolina",
-  "I9" => "Luce",
-  "J1" => "Majsperk",
-  "J2" => "Maribor",
-  "J5" => "Miren-Kostanjevica",
-  "J7" => "Novo Mesto",
-  "J9" => "Piran",
-  "K5" => "Preddvor",
-  "K7" => "Ptuj",
-  "L1" => "Ribnica",
-  "L3" => "Ruse",
-  "L7" => "Sentjur pri Celju",
-  "L8" => "Slovenska Bistrica",
-  "N2" => "Videm",
-  "N3" => "Vojnik",
-  "N5" => "Zalec"),
-"SK" => array(
-  "01" => "Banska Bystrica",
-  "02" => "Bratislava",
-  "03" => "Kosice",
-  "04" => "Nitra",
-  "05" => "Presov",
-  "06" => "Trencin",
-  "07" => "Trnava",
-  "08" => "Zilina"),
-"SL" => array(
-  "01" => "Eastern",
-  "02" => "Northern",
-  "03" => "Southern",
-  "04" => "Western Area"),
-"SM" => array(
-  "01" => "Acquaviva",
-  "02" => "Chiesanuova",
-  "03" => "Domagnano",
-  "04" => "Faetano",
-  "05" => "Fiorentino",
-  "06" => "Borgo Maggiore",
-  "07" => "San Marino",
-  "08" => "Monte Giardino",
-  "09" => "Serravalle"),
-"SN" => array(
-  "01" => "Dakar",
-  "03" => "Diourbel",
-  "04" => "Saint-Louis",
-  "05" => "Tambacounda",
-  "07" => "Thies",
-  "08" => "Louga",
-  "09" => "Fatick",
-  "10" => "Kaolack",
-  "11" => "Kolda",
-  "12" => "Ziguinchor",
-  "13" => "Louga",
-  "14" => "Saint-Louis",
-  "15" => "Matam"),
-"SO" => array(
-  "01" => "Bakool",
-  "02" => "Banaadir",
-  "03" => "Bari",
-  "04" => "Bay",
-  "05" => "Galguduud",
-  "06" => "Gedo",
-  "07" => "Hiiraan",
-  "08" => "Jubbada Dhexe",
-  "09" => "Jubbada Hoose",
-  "10" => "Mudug",
-  "11" => "Nugaal",
-  "12" => "Sanaag",
-  "13" => "Shabeellaha Dhexe",
-  "14" => "Shabeellaha Hoose",
-  "16" => "Woqooyi Galbeed",
-  "18" => "Nugaal",
-  "19" => "Togdheer",
-  "20" => "Woqooyi Galbeed",
-  "21" => "Awdal",
-  "22" => "Sool"),
-"SR" => array(
-  "10" => "Brokopondo",
-  "11" => "Commewijne",
-  "12" => "Coronie",
-  "13" => "Marowijne",
-  "14" => "Nickerie",
-  "15" => "Para",
-  "16" => "Paramaribo",
-  "17" => "Saramacca",
-  "18" => "Sipaliwini",
-  "19" => "Wanica"),
-"ST" => array(
-  "01" => "Principe",
-  "02" => "Sao Tome"),
-"SV" => array(
-  "01" => "Ahuachapan",
-  "02" => "Cabanas",
-  "03" => "Chalatenango",
-  "04" => "Cuscatlan",
-  "05" => "La Libertad",
-  "06" => "La Paz",
-  "07" => "La Union",
-  "08" => "Morazan",
-  "09" => "San Miguel",
-  "10" => "San Salvador",
-  "11" => "Santa Ana",
-  "12" => "San Vicente",
-  "13" => "Sonsonate",
-  "14" => "Usulutan"),
-"SY" => array(
-  "01" => "Al Hasakah",
-  "02" => "Al Ladhiqiyah",
-  "03" => "Al Qunaytirah",
-  "04" => "Ar Raqqah",
-  "05" => "As Suwayda'",
-  "06" => "Dar",
-  "07" => "Dayr az Zawr",
-  "08" => "Rif Dimashq",
-  "09" => "Halab",
-  "10" => "Hamah",
-  "11" => "Hims",
-  "12" => "Idlib",
-  "13" => "Dimashq",
-  "14" => "Tartus"),
-"SZ" => array(
-  "01" => "Hhohho",
-  "02" => "Lubombo",
-  "03" => "Manzini",
-  "04" => "Shiselweni",
-  "05" => "Praslin"),
-"TD" => array(
-  "01" => "Batha",
-  "02" => "Biltine",
-  "03" => "Borkou-Ennedi-Tibesti",
-  "04" => "Chari-Baguirmi",
-  "05" => "Guera",
-  "06" => "Kanem",
-  "07" => "Lac",
-  "08" => "Logone Occidental",
-  "09" => "Logone Oriental",
-  "10" => "Mayo-Kebbi",
-  "11" => "Moyen-Chari",
-  "12" => "Ouaddai",
-  "13" => "Salamat",
-  "14" => "Tandjile"),
-"TG" => array(
-  "09" => "Lama-Kara",
-  "18" => "Tsevie",
-  "22" => "Centrale",
-  "23" => "Kara",
-  "24" => "Maritime",
-  "25" => "Plateaux",
-  "26" => "Savanes"),
-"TH" => array(
-  "01" => "Mae Hong Son",
-  "02" => "Chiang Mai",
-  "03" => "Chiang Rai",
-  "04" => "Nan",
-  "05" => "Lamphun",
-  "06" => "Lampang",
-  "07" => "Phrae",
-  "08" => "Tak",
-  "09" => "Sukhothai",
-  "10" => "Uttaradit",
-  "11" => "Kamphaeng Phet",
-  "12" => "Phitsanulok",
-  "13" => "Phichit",
-  "14" => "Phetchabun",
-  "15" => "Uthai Thani",
-  "16" => "Nakhon Sawan",
-  "17" => "Nong Khai",
-  "18" => "Loei",
-  "20" => "Sakon Nakhon",
-  "21" => "Nakhon Phanom",
-  "22" => "Khon Kaen",
-  "23" => "Kalasin",
-  "24" => "Maha Sarakham",
-  "25" => "Roi Et",
-  "26" => "Chaiyaphum",
-  "27" => "Nakhon Ratchasima",
-  "28" => "Buriram",
-  "29" => "Surin",
-  "30" => "Sisaket",
-  "31" => "Narathiwat",
-  "32" => "Chai Nat",
-  "33" => "Sing Buri",
-  "34" => "Lop Buri",
-  "35" => "Ang Thong",
-  "36" => "Phra Nakhon Si Ayutthaya",
-  "37" => "Saraburi",
-  "38" => "Nonthaburi",
-  "39" => "Pathum Thani",
-  "40" => "Krung Thep",
-  "41" => "Phayao",
-  "42" => "Samut Prakan",
-  "43" => "Nakhon Nayok",
-  "44" => "Chachoengsao",
-  "45" => "Prachin Buri",
-  "46" => "Chon Buri",
-  "47" => "Rayong",
-  "48" => "Chanthaburi",
-  "49" => "Trat",
-  "50" => "Kanchanaburi",
-  "51" => "Suphan Buri",
-  "52" => "Ratchaburi",
-  "53" => "Nakhon Pathom",
-  "54" => "Samut Songkhram",
-  "55" => "Samut Sakhon",
-  "56" => "Phetchaburi",
-  "57" => "Prachuap Khiri Khan",
-  "58" => "Chumphon",
-  "59" => "Ranong",
-  "60" => "Surat Thani",
-  "61" => "Phangnga",
-  "62" => "Phuket",
-  "63" => "Krabi",
-  "64" => "Nakhon Si Thammarat",
-  "65" => "Trang",
-  "66" => "Phatthalung",
-  "67" => "Satun",
-  "68" => "Songkhla",
-  "69" => "Pattani",
-  "70" => "Yala",
-  "71" => "Ubon Ratchathani",
-  "72" => "Yasothon",
-  "73" => "Nakhon Phanom",
-  "75" => "Ubon Ratchathani",
-  "76" => "Udon Thani",
-  "77" => "Amnat Charoen",
-  "78" => "Mukdahan",
-  "79" => "Nong Bua Lamphu",
-  "80" => "Sa Kaeo"),
-"TJ" => array(
-  "01" => "Kuhistoni Badakhshon",
-  "02" => "Khatlon",
-  "03" => "Sughd"),
-"TM" => array(
-  "01" => "Ahal",
-  "02" => "Balkan",
-  "03" => "Dashoguz",
-  "04" => "Lebap",
-  "05" => "Mary"),
-"TN" => array(
-  "02" => "Kasserine",
-  "03" => "Kairouan",
-  "06" => "Jendouba",
-  "14" => "El Kef",
-  "15" => "Al Mahdia",
-  "16" => "Al Munastir",
-  "17" => "Bajah",
-  "18" => "Bizerte",
-  "19" => "Nabeul",
-  "22" => "Siliana",
-  "23" => "Sousse",
-  "26" => "Ariana",
-  "27" => "Ben Arous",
-  "28" => "Madanin",
-  "29" => "Gabes",
-  "30" => "Gafsa",
-  "31" => "Kebili",
-  "32" => "Sfax",
-  "33" => "Sidi Bou Zid",
-  "34" => "Tataouine",
-  "35" => "Tozeur",
-  "36" => "Tunis",
-  "37" => "Zaghouan"),
-"TO" => array(
-  "01" => "Ha",
-  "02" => "Tongatapu",
-  "03" => "Vava"),
-"TR" => array(
-  "02" => "Adiyaman",
-  "03" => "Afyonkarahisar",
-  "04" => "Agri",
-  "05" => "Amasya",
-  "07" => "Antalya",
-  "08" => "Artvin",
-  "09" => "Aydin",
-  "10" => "Balikesir",
-  "11" => "Bilecik",
-  "12" => "Bingol",
-  "13" => "Bitlis",
-  "14" => "Bolu",
-  "15" => "Burdur",
-  "16" => "Bursa",
-  "17" => "Canakkale",
-  "19" => "Corum",
-  "20" => "Denizli",
-  "21" => "Diyarbakir",
-  "22" => "Edirne",
-  "23" => "Elazig",
-  "24" => "Erzincan",
-  "25" => "Erzurum",
-  "26" => "Eskisehir",
-  "28" => "Giresun",
-  "31" => "Hatay",
-  "32" => "Icel",
-  "33" => "Isparta",
-  "34" => "Istanbul",
-  "35" => "Izmir",
-  "37" => "Kastamonu",
-  "38" => "Kayseri",
-  "39" => "Kirklareli",
-  "40" => "Kirsehir",
-  "41" => "Kocaeli",
-  "43" => "Kutahya",
-  "44" => "Malatya",
-  "45" => "Manisa",
-  "46" => "Kahramanmaras",
-  "48" => "Mugla",
-  "49" => "Mus",
-  "50" => "Nevsehir",
-  "52" => "Ordu",
-  "53" => "Rize",
-  "54" => "Sakarya",
-  "55" => "Samsun",
-  "57" => "Sinop",
-  "58" => "Sivas",
-  "59" => "Tekirdag",
-  "60" => "Tokat",
-  "61" => "Trabzon",
-  "62" => "Tunceli",
-  "63" => "Sanliurfa",
-  "64" => "Usak",
-  "65" => "Van",
-  "66" => "Yozgat",
-  "68" => "Ankara",
-  "69" => "Gumushane",
-  "70" => "Hakkari",
-  "71" => "Konya",
-  "72" => "Mardin",
-  "73" => "Nigde",
-  "74" => "Siirt",
-  "75" => "Aksaray",
-  "76" => "Batman",
-  "77" => "Bayburt",
-  "78" => "Karaman",
-  "79" => "Kirikkale",
-  "80" => "Sirnak",
-  "81" => "Adana",
-  "82" => "Cankiri",
-  "83" => "Gaziantep",
-  "84" => "Kars",
-  "85" => "Zonguldak",
-  "86" => "Ardahan",
-  "87" => "Bartin",
-  "88" => "Igdir",
-  "89" => "Karabuk",
-  "90" => "Kilis",
-  "91" => "Osmaniye",
-  "92" => "Yalova",
-  "93" => "Duzce"),
-"TT" => array(
-  "01" => "Arima",
-  "02" => "Caroni",
-  "03" => "Mayaro",
-  "04" => "Nariva",
-  "05" => "Port-of-Spain",
-  "06" => "Saint Andrew",
-  "07" => "Saint David",
-  "08" => "Saint George",
-  "09" => "Saint Patrick",
-  "10" => "San Fernando",
-  "11" => "Tobago",
-  "12" => "Victoria"),
-"TW" => array(
-  "01" => "Fu-chien",
-  "02" => "Kao-hsiung",
-  "03" => "T'ai-pei",
-  "04" => "T'ai-wan"),
-"TZ" => array(
-  "02" => "Pwani",
-  "03" => "Dodoma",
-  "04" => "Iringa",
-  "05" => "Kigoma",
-  "06" => "Kilimanjaro",
-  "07" => "Lindi",
-  "08" => "Mara",
-  "09" => "Mbeya",
-  "10" => "Morogoro",
-  "11" => "Mtwara",
-  "12" => "Mwanza",
-  "13" => "Pemba North",
-  "14" => "Ruvuma",
-  "15" => "Shinyanga",
-  "16" => "Singida",
-  "17" => "Tabora",
-  "18" => "Tanga",
-  "19" => "Kagera",
-  "20" => "Pemba South",
-  "21" => "Zanzibar Central",
-  "22" => "Zanzibar North",
-  "23" => "Dar es Salaam",
-  "24" => "Rukwa",
-  "25" => "Zanzibar Urban",
-  "26" => "Arusha",
-  "27" => "Manyara"),
-"UA" => array(
-  "01" => "Cherkas'ka Oblast'",
-  "02" => "Chernihivs'ka Oblast'",
-  "03" => "Chernivets'ka Oblast'",
-  "04" => "Dnipropetrovs'ka Oblast'",
-  "05" => "Donets'ka Oblast'",
-  "06" => "Ivano-Frankivs'ka Oblast'",
-  "07" => "Kharkivs'ka Oblast'",
-  "08" => "Khersons'ka Oblast'",
-  "09" => "Khmel'nyts'ka Oblast'",
-  "10" => "Kirovohrads'ka Oblast'",
-  "11" => "Krym",
-  "12" => "Kyyiv",
-  "13" => "Kyyivs'ka Oblast'",
-  "14" => "Luhans'ka Oblast'",
-  "15" => "L'vivs'ka Oblast'",
-  "16" => "Mykolayivs'ka Oblast'",
-  "17" => "Odes'ka Oblast'",
-  "18" => "Poltavs'ka Oblast'",
-  "19" => "Rivnens'ka Oblast'",
-  "20" => "Sevastopol'",
-  "21" => "Sums'ka Oblast'",
-  "22" => "Ternopil's'ka Oblast'",
-  "23" => "Vinnyts'ka Oblast'",
-  "24" => "Volyns'ka Oblast'",
-  "25" => "Zakarpats'ka Oblast'",
-  "26" => "Zaporiz'ka Oblast'",
-  "27" => "Zhytomyrs'ka Oblast'"),
-"UG" => array(
-  "05" => "Busoga",
-  "08" => "Karamoja",
-  "12" => "South Buganda",
-  "18" => "Central",
-  "20" => "Eastern",
-  "21" => "Nile",
-  "22" => "North Buganda",
-  "23" => "Northern",
-  "24" => "Southern",
-  "25" => "Western",
-  "33" => "Jinja",
-  "36" => "Kalangala",
-  "37" => "Kampala",
-  "42" => "Kiboga",
-  "52" => "Mbarara",
-  "56" => "Mubende",
-  "65" => "Adjumani",
-  "66" => "Bugiri",
-  "67" => "Busia",
-  "69" => "Katakwi",
-  "71" => "Masaka",
-  "73" => "Nakasongola",
-  "74" => "Sembabule",
-  "77" => "Arua",
-  "78" => "Iganga",
-  "79" => "Kabarole",
-  "80" => "Kaberamaido",
-  "81" => "Kamwenge",
-  "82" => "Kanungu",
-  "83" => "Kayunga",
-  "84" => "Kitgum",
-  "85" => "Kyenjojo",
-  "86" => "Mayuge",
-  "87" => "Mbale",
-  "88" => "Moroto",
-  "89" => "Mpigi",
-  "90" => "Mukono",
-  "91" => "Nakapiripirit",
-  "92" => "Pader",
-  "93" => "Rukungiri",
-  "94" => "Sironko",
-  "95" => "Soroti",
-  "96" => "Wakiso",
-  "97" => "Yumbe"),
-"US" => array(
-  "AA" => "Armed Forces Americas",
-  "AE" => "Armed Forces Europe, Middle East, & Canada",
-  "AK" => "Alaska",
-  "AL" => "Alabama",
-  "AP" => "Armed Forces Pacific",
-  "AR" => "Arkansas",
-  "AS" => "American Samoa",
-  "AZ" => "Arizona",
-  "CA" => "California",
-  "CO" => "Colorado",
-  "CT" => "Connecticut",
-  "DC" => "District of Columbia",
-  "DE" => "Delaware",
-  "FL" => "Florida",
-  "FM" => "Federated States of Micronesia",
-  "GA" => "Georgia",
-  "GU" => "Guam",
-  "HI" => "Hawaii",
-  "IA" => "Iowa",
-  "ID" => "Idaho",
-  "IL" => "Illinois",
-  "IN" => "Indiana",
-  "KS" => "Kansas",
-  "KY" => "Kentucky",
-  "LA" => "Louisiana",
-  "MA" => "Massachusetts",
-  "MD" => "Maryland",
-  "ME" => "Maine",
-  "MH" => "Marshall Islands",
-  "MI" => "Michigan",
-  "MN" => "Minnesota",
-  "MO" => "Missouri",
-  "MP" => "Northern Mariana Islands",
-  "MS" => "Mississippi",
-  "MT" => "Montana",
-  "NC" => "North Carolina",
-  "ND" => "North Dakota",
-  "NE" => "Nebraska",
-  "NH" => "New Hampshire",
-  "NJ" => "New Jersey",
-  "NM" => "New Mexico",
-  "NV" => "Nevada",
-  "NY" => "New York",
-  "OH" => "Ohio",
-  "OK" => "Oklahoma",
-  "OR" => "Oregon",
-  "PA" => "Pennsylvania",
-  "PR" => "Puerto Rico",
-  "PW" => "Palau",
-  "RI" => "Rhode Island",
-  "SC" => "South Carolina",
-  "SD" => "South Dakota",
-  "TN" => "Tennessee",
-  "TX" => "Texas",
-  "UT" => "Utah",
-  "VA" => "Virginia",
-  "VI" => "Virgin Islands",
-  "VT" => "Vermont",
-  "WA" => "Washington",
-  "WI" => "Wisconsin",
-  "WV" => "West Virginia",
-  "WY" => "Wyoming"),
-"UY" => array(
-  "01" => "Artigas",
-  "02" => "Canelones",
-  "03" => "Cerro Largo",
-  "04" => "Colonia",
-  "05" => "Durazno",
-  "06" => "Flores",
-  "07" => "Florida",
-  "08" => "Lavalleja",
-  "09" => "Maldonado",
-  "10" => "Montevideo",
-  "11" => "Paysandu",
-  "12" => "Rio Negro",
-  "13" => "Rivera",
-  "14" => "Rocha",
-  "15" => "Salto",
-  "16" => "San Jose",
-  "17" => "Soriano",
-  "18" => "Tacuarembo",
-  "19" => "Treinta y Tres"),
-"UZ" => array(
-  "01" => "Andijon",
-  "02" => "Bukhoro",
-  "03" => "Farghona",
-  "04" => "Jizzakh",
-  "05" => "Khorazm",
-  "06" => "Namangan",
-  "07" => "Nawoiy",
-  "08" => "Qashqadaryo",
-  "09" => "Qoraqalpoghiston",
-  "10" => "Samarqand",
-  "11" => "Sirdaryo",
-  "12" => "Surkhondaryo",
-  "13" => "Toshkent",
-  "14" => "Toshkent"),
-"VC" => array(
-  "01" => "Charlotte",
-  "02" => "Saint Andrew",
-  "03" => "Saint David",
-  "04" => "Saint George",
-  "05" => "Saint Patrick",
-  "06" => "Grenadines"),
-"VE" => array(
-  "01" => "Amazonas",
-  "02" => "Anzoategui",
-  "03" => "Apure",
-  "04" => "Aragua",
-  "05" => "Barinas",
-  "06" => "Bolivar",
-  "07" => "Carabobo",
-  "08" => "Cojedes",
-  "09" => "Delta Amacuro",
-  "11" => "Falcon",
-  "12" => "Guarico",
-  "13" => "Lara",
-  "14" => "Merida",
-  "15" => "Miranda",
-  "16" => "Monagas",
-  "17" => "Nueva Esparta",
-  "18" => "Portuguesa",
-  "19" => "Sucre",
-  "20" => "Tachira",
-  "21" => "Trujillo",
-  "22" => "Yaracuy",
-  "23" => "Zulia",
-  "24" => "Dependencias Federales",
-  "25" => "Distrito Federal",
-  "26" => "Vargas"),
-"VN" => array(
-  "01" => "An Giang",
-  "02" => "Bac Thai",
-  "03" => "Ben Tre",
-  "04" => "Binh Tri Thien",
-  "05" => "Cao Bang",
-  "06" => "Cuu Long",
-  "07" => "Dac Lac",
-  "09" => "Dong Thap",
-  "11" => "Ha Bac",
-  "12" => "Hai Hung",
-  "13" => "Hai Phong",
-  "14" => "Ha Nam Ninh",
-  "15" => "Ha Noi",
-  "16" => "Ha Son Binh",
-  "17" => "Ha Tuyen",
-  "19" => "Hoang Lien Son",
-  "20" => "Ho Chi Minh",
-  "21" => "Kien Giang",
-  "22" => "Lai Chau",
-  "23" => "Lam Dong",
-  "24" => "Long An",
-  "25" => "Minh Hai",
-  "26" => "Nghe Tinh",
-  "27" => "Nghia Binh",
-  "28" => "Phu Khanh",
-  "29" => "Quang Nam-Da Nang",
-  "30" => "Quang Ninh",
-  "31" => "Song Be",
-  "32" => "Son La",
-  "33" => "Tay Ninh",
-  "34" => "Thanh Hoa",
-  "35" => "Thai Binh",
-  "36" => "Thuan Hai",
-  "37" => "Tien Giang",
-  "38" => "Vinh Phu",
-  "39" => "Lang Son",
-  "40" => "Dong Nai",
-  "43" => "An Giang",
-  "44" => "Dac Lac",
-  "45" => "Dong Nai",
-  "46" => "Dong Thap",
-  "47" => "Kien Giang",
-  "48" => "Minh Hai",
-  "49" => "Song Be",
-  "50" => "Vinh Phu",
-  "51" => "Ha Noi",
-  "52" => "Ho Chi Minh",
-  "53" => "Ba Ria-Vung Tau",
-  "54" => "Binh Dinh",
-  "55" => "Binh Thuan",
-  "56" => "Can Tho",
-  "57" => "Gia Lai",
-  "58" => "Ha Giang",
-  "59" => "Ha Tay",
-  "60" => "Ha Tinh",
-  "61" => "Hoa Binh",
-  "62" => "Khanh Hoa",
-  "63" => "Kon Tum",
-  "64" => "Quang Tri",
-  "65" => "Nam Ha",
-  "66" => "Nghe An",
-  "67" => "Ninh Binh",
-  "68" => "Ninh Thuan",
-  "69" => "Phu Yen",
-  "70" => "Quang Binh",
-  "71" => "Quang Ngai",
-  "72" => "Quang Tri",
-  "73" => "Soc Trang",
-  "74" => "Thua Thien",
-  "75" => "Tra Vinh",
-  "76" => "Tuyen Quang",
-  "77" => "Vinh Long",
-  "78" => "Da Nang",
-  "79" => "Hai Duong",
-  "80" => "Ha Nam",
-  "81" => "Hung Yen",
-  "82" => "Nam Dinh",
-  "83" => "Phu Tho",
-  "84" => "Quang Nam",
-  "85" => "Thai Nguyen",
-  "86" => "Vinh Puc Province",
-  "87" => "Can Tho",
-  "88" => "Dak Lak",
-  "89" => "Lai Chau",
-  "90" => "Lao Cai",
-  "91" => "Dak Nong",
-  "92" => "Dien Bien",
-  "93" => "Hau Giang"),
-"VU" => array(
-  "05" => "Ambrym",
-  "06" => "Aoba",
-  "07" => "Torba",
-  "08" => "Efate",
-  "09" => "Epi",
-  "10" => "Malakula",
-  "11" => "Paama",
-  "12" => "Pentecote",
-  "13" => "Sanma",
-  "14" => "Shepherd",
-  "15" => "Tafea",
-  "16" => "Malampa",
-  "17" => "Penama",
-  "18" => "Shefa"),
-"WS" => array(
-  "02" => "Aiga-i-le-Tai",
-  "03" => "Atua",
-  "04" => "Fa",
-  "05" => "Gaga",
-  "06" => "Va",
-  "07" => "Gagaifomauga",
-  "08" => "Palauli",
-  "09" => "Satupa",
-  "10" => "Tuamasaga",
-  "11" => "Vaisigano"),
-"YE" => array(
-  "01" => "Abyan",
-  "02" => "Adan",
-  "03" => "Al Mahrah",
-  "04" => "Hadramawt",
-  "05" => "Shabwah",
-  "06" => "Al Ghaydah",
-  "08" => "Al Hudaydah",
-  "10" => "Al Mahwit",
-  "11" => "Dhamar",
-  "14" => "Ma'rib",
-  "15" => "Sa",
-  "16" => "San",
-  "20" => "Al Bayda'",
-  "21" => "Al Jawf",
-  "22" => "Hajjah",
-  "23" => "Ibb",
-  "24" => "Lahij",
-  "25" => "Ta"),
-"ZA" => array(
-  "01" => "North-Western Province",
-  "02" => "KwaZulu-Natal",
-  "03" => "Free State",
-  "05" => "Eastern Cape",
-  "06" => "Gauteng",
-  "07" => "Mpumalanga",
-  "08" => "Northern Cape",
-  "09" => "Limpopo",
-  "10" => "North-West",
-  "11" => "Western Cape"),
-"ZM" => array(
-  "01" => "Western",
-  "02" => "Central",
-  "03" => "Eastern",
-  "04" => "Luapula",
-  "05" => "Northern",
-  "06" => "North-Western",
-  "07" => "Southern",
-  "08" => "Copperbelt",
-  "09" => "Lusaka"),
-"ZW" => array(
-  "01" => "Manicaland",
-  "02" => "Midlands",
-  "03" => "Mashonaland Central",
-  "04" => "Mashonaland East",
-  "05" => "Mashonaland West",
-  "06" => "Matabeleland North",
-  "07" => "Matabeleland South",
-  "08" => "Masvingo",
-  "09" => "Bulawayo",
-  "10" => "Harare")
-);
-?>
+// Copyright 2016 MaxMind, Inc. All Rights Reserved
+global $GEOIP_REGION_NAME;
+$GEOIP_REGION_NAME = array (
+	'AD' =>
+	array (
+		'02' => 'Canillo',
+		'03' => 'Encamp',
+		'04' => 'La Massana',
+		'05' => 'Ordino',
+		'06' => 'Sant Julia de Loria',
+		'07' => 'Andorra la Vella',
+		'08' => 'Escaldes-Engordany',
+	),
+	'AE' =>
+	array (
+		'01' => 'Abu Dhabi',
+		'02' => 'Ajman',
+		'03' => 'Dubai',
+		'04' => 'Fujairah',
+		'05' => 'Ras Al Khaimah',
+		'06' => 'Sharjah',
+		'07' => 'Umm Al Quwain',
+	),
+	'AF' =>
+	array (
+		'01' => 'Badakhshan',
+		'02' => 'Badghis',
+		'03' => 'Baghlan',
+		'05' => 'Bamian',
+		'06' => 'Farah',
+		'07' => 'Faryab',
+		'08' => 'Ghazni',
+		'09' => 'Ghowr',
+		10 => 'Helmand',
+		11 => 'Herat',
+		13 => 'Kabol',
+		14 => 'Kapisa',
+		17 => 'Lowgar',
+		18 => 'Nangarhar',
+		19 => 'Nimruz',
+		23 => 'Kandahar',
+		24 => 'Kondoz',
+		26 => 'Takhar',
+		27 => 'Vardak',
+		28 => 'Zabol',
+		29 => 'Paktika',
+		30 => 'Balkh',
+		31 => 'Jowzjan',
+		32 => 'Samangan',
+		33 => 'Sar-e Pol',
+		34 => 'Konar',
+		35 => 'Laghman',
+		36 => 'Paktia',
+		37 => 'Khowst',
+		38 => 'Nurestan',
+		39 => 'Oruzgan',
+		40 => 'Parvan',
+		41 => 'Daykondi',
+		42 => 'Panjshir',
+	),
+	'AG' =>
+	array (
+		'01' => 'Barbuda',
+		'03' => 'Saint George',
+		'04' => 'Saint John',
+		'05' => 'Saint Mary',
+		'06' => 'Saint Paul',
+		'07' => 'Saint Peter',
+		'08' => 'Saint Philip',
+		'09' => 'Redonda',
+	),
+	'AL' =>
+	array (
+		40 => 'Berat',
+		41 => 'Diber',
+		42 => 'Durres',
+		43 => 'Elbasan',
+		44 => 'Fier',
+		45 => 'Gjirokaster',
+		46 => 'Korce',
+		47 => 'Kukes',
+		48 => 'Lezhe',
+		49 => 'Shkoder',
+		50 => 'Tirane',
+		51 => 'Vlore',
+	),
+	'AM' =>
+	array (
+		'01' => 'Aragatsotn',
+		'02' => 'Ararat',
+		'03' => 'Armavir',
+		'04' => 'Geghark\'unik\'',
+		'05' => 'Kotayk\'',
+		'06' => 'Lorri',
+		'07' => 'Shirak',
+		'08' => 'Syunik\'',
+		'09' => 'Tavush',
+		10 => 'Vayots\' Dzor',
+		11 => 'Yerevan',
+	),
+	'AO' =>
+	array (
+		'01' => 'Benguela',
+		'02' => 'Bie',
+		'03' => 'Cabinda',
+		'04' => 'Cuando Cubango',
+		'05' => 'Cuanza Norte',
+		'06' => 'Cuanza Sul',
+		'07' => 'Cunene',
+		'08' => 'Huambo',
+		'09' => 'Huila',
+		12 => 'Malanje',
+		13 => 'Namibe',
+		14 => 'Moxico',
+		15 => 'Uige',
+		16 => 'Zaire',
+		17 => 'Lunda Norte',
+		18 => 'Lunda Sul',
+		19 => 'Bengo',
+		20 => 'Luanda',
+	),
+	'AR' =>
+	array (
+		'01' => 'Buenos Aires',
+		'02' => 'Catamarca',
+		'03' => 'Chaco',
+		'04' => 'Chubut',
+		'05' => 'Cordoba',
+		'06' => 'Corrientes',
+		'07' => 'Distrito Federal',
+		'08' => 'Entre Rios',
+		'09' => 'Formosa',
+		10 => 'Jujuy',
+		11 => 'La Pampa',
+		12 => 'La Rioja',
+		13 => 'Mendoza',
+		14 => 'Misiones',
+		15 => 'Neuquen',
+		16 => 'Rio Negro',
+		17 => 'Salta',
+		18 => 'San Juan',
+		19 => 'San Luis',
+		20 => 'Santa Cruz',
+		21 => 'Santa Fe',
+		22 => 'Santiago del Estero',
+		23 => 'Tierra del Fuego',
+		24 => 'Tucuman',
+	),
+	'AT' =>
+	array (
+		'01' => 'Burgenland',
+		'02' => 'Karnten',
+		'03' => 'Niederosterreich',
+		'04' => 'Oberosterreich',
+		'05' => 'Salzburg',
+		'06' => 'Steiermark',
+		'07' => 'Tirol',
+		'08' => 'Vorarlberg',
+		'09' => 'Wien',
+	),
+	'AU' =>
+	array (
+		'01' => 'Australian Capital Territory',
+		'02' => 'New South Wales',
+		'03' => 'Northern Territory',
+		'04' => 'Queensland',
+		'05' => 'South Australia',
+		'06' => 'Tasmania',
+		'07' => 'Victoria',
+		'08' => 'Western Australia',
+	),
+	'AZ' =>
+	array (
+		'01' => 'Abseron',
+		'02' => 'Agcabadi',
+		'03' => 'Agdam',
+		'04' => 'Agdas',
+		'05' => 'Agstafa',
+		'06' => 'Agsu',
+		'07' => 'Ali Bayramli',
+		'08' => 'Astara',
+		'09' => 'Baki',
+		10 => 'Balakan',
+		11 => 'Barda',
+		12 => 'Beylaqan',
+		13 => 'Bilasuvar',
+		14 => 'Cabrayil',
+		15 => 'Calilabad',
+		16 => 'Daskasan',
+		17 => 'Davaci',
+		18 => 'Fuzuli',
+		19 => 'Gadabay',
+		20 => 'Ganca',
+		21 => 'Goranboy',
+		22 => 'Goycay',
+		23 => 'Haciqabul',
+		24 => 'Imisli',
+		25 => 'Ismayilli',
+		26 => 'Kalbacar',
+		27 => 'Kurdamir',
+		28 => 'Lacin',
+		30 => 'Lankaran',
+		31 => 'Lerik',
+		32 => 'Masalli',
+		33 => 'Mingacevir',
+		34 => 'Naftalan',
+		35 => 'Naxcivan',
+		36 => 'Neftcala',
+		37 => 'Oguz',
+		38 => 'Qabala',
+		39 => 'Qax',
+		40 => 'Qazax',
+		41 => 'Qobustan',
+		42 => 'Quba',
+		43 => 'Qubadli',
+		44 => 'Qusar',
+		45 => 'Saatli',
+		46 => 'Sabirabad',
+		48 => 'Saki',
+		49 => 'Salyan',
+		50 => 'Samaxi',
+		51 => 'Samkir',
+		52 => 'Samux',
+		53 => 'Siyazan',
+		54 => 'Sumqayit',
+		56 => 'Susa',
+		57 => 'Tartar',
+		58 => 'Tovuz',
+		59 => 'Ucar',
+		60 => 'Xacmaz',
+		61 => 'Xankandi',
+		62 => 'Xanlar',
+		63 => 'Xizi',
+		64 => 'Xocali',
+		65 => 'Xocavand',
+		66 => 'Yardimli',
+		68 => 'Yevlax',
+		69 => 'Zangilan',
+		70 => 'Zaqatala',
+		71 => 'Zardab',
+	),
+	'BA' =>
+	array (
+		'01' => 'Federation of Bosnia and Herzegovina',
+		'03' => 'Brcko District',
+		'02' => 'Republika Srpska',
+	),
+	'BB' =>
+	array (
+		'01' => 'Christ Church',
+		'02' => 'Saint Andrew',
+		'03' => 'Saint George',
+		'04' => 'Saint James',
+		'05' => 'Saint John',
+		'06' => 'Saint Joseph',
+		'07' => 'Saint Lucy',
+		'08' => 'Saint Michael',
+		'09' => 'Saint Peter',
+		10 => 'Saint Philip',
+		11 => 'Saint Thomas',
+	),
+	'BD' =>
+	array (
+		81 => 'Dhaka',
+		82 => 'Khulna',
+		83 => 'Rajshahi',
+		84 => 'Chittagong',
+		85 => 'Barisal',
+		86 => 'Sylhet',
+		87 => 'Rangpur',
+	),
+	'BE' =>
+	array (
+		'01' => 'Antwerpen',
+		'03' => 'Hainaut',
+		'04' => 'Liege',
+		'05' => 'Limburg',
+		'06' => 'Luxembourg',
+		'07' => 'Namur',
+		'08' => 'Oost-Vlaanderen',
+		'09' => 'West-Vlaanderen',
+		10 => 'Brabant Wallon',
+		11 => 'Brussels Hoofdstedelijk Gewest',
+		12 => 'Vlaams-Brabant',
+		13 => 'Flanders',
+		14 => 'Wallonia',
+	),
+	'BF' =>
+	array (
+		15 => 'Bam',
+		19 => 'Boulkiemde',
+		20 => 'Ganzourgou',
+		21 => 'Gnagna',
+		28 => 'Kouritenga',
+		33 => 'Oudalan',
+		34 => 'Passore',
+		36 => 'Sanguie',
+		40 => 'Soum',
+		42 => 'Tapoa',
+		44 => 'Zoundweogo',
+		45 => 'Bale',
+		46 => 'Banwa',
+		47 => 'Bazega',
+		48 => 'Bougouriba',
+		49 => 'Boulgou',
+		50 => 'Gourma',
+		51 => 'Houet',
+		52 => 'Ioba',
+		53 => 'Kadiogo',
+		54 => 'Kenedougou',
+		55 => 'Komoe',
+		56 => 'Komondjari',
+		57 => 'Kompienga',
+		58 => 'Kossi',
+		59 => 'Koulpelogo',
+		60 => 'Kourweogo',
+		61 => 'Leraba',
+		62 => 'Loroum',
+		63 => 'Mouhoun',
+		64 => 'Namentenga',
+		65 => 'Naouri',
+		66 => 'Nayala',
+		67 => 'Noumbiel',
+		68 => 'Oubritenga',
+		69 => 'Poni',
+		70 => 'Sanmatenga',
+		71 => 'Seno',
+		72 => 'Sissili',
+		73 => 'Sourou',
+		74 => 'Tuy',
+		75 => 'Yagha',
+		76 => 'Yatenga',
+		77 => 'Ziro',
+		78 => 'Zondoma',
+	),
+	'BG' =>
+	array (
+		33 => 'Mikhaylovgrad',
+		38 => 'Blagoevgrad',
+		39 => 'Burgas',
+		40 => 'Dobrich',
+		41 => 'Gabrovo',
+		42 => 'Grad Sofiya',
+		43 => 'Khaskovo',
+		44 => 'Kurdzhali',
+		45 => 'Kyustendil',
+		46 => 'Lovech',
+		47 => 'Montana',
+		48 => 'Pazardzhik',
+		49 => 'Pernik',
+		50 => 'Pleven',
+		51 => 'Plovdiv',
+		52 => 'Razgrad',
+		53 => 'Ruse',
+		54 => 'Shumen',
+		55 => 'Silistra',
+		56 => 'Sliven',
+		57 => 'Smolyan',
+		58 => 'Sofiya',
+		59 => 'Stara Zagora',
+		60 => 'Turgovishte',
+		61 => 'Varna',
+		62 => 'Veliko Turnovo',
+		63 => 'Vidin',
+		64 => 'Vratsa',
+		65 => 'Yambol',
+	),
+	'BH' =>
+	array (
+		'01' => 'Al Hadd',
+		'02' => 'Al Manamah',
+		'05' => 'Jidd Hafs',
+		'06' => 'Sitrah',
+		'08' => 'Al Mintaqah al Gharbiyah',
+		'09' => 'Mintaqat Juzur Hawar',
+		10 => 'Al Mintaqah ash Shamaliyah',
+		11 => 'Al Mintaqah al Wusta',
+		12 => 'Madinat',
+		13 => 'Ar Rifa',
+		14 => 'Madinat Hamad',
+		15 => 'Al Muharraq',
+		16 => 'Al Asimah',
+		17 => 'Al Janubiyah',
+		18 => 'Ash Shamaliyah',
+		19 => 'Al Wusta',
+	),
+	'BI' =>
+	array (
+		'02' => 'Bujumbura',
+		'09' => 'Bubanza',
+		10 => 'Bururi',
+		11 => 'Cankuzo',
+		12 => 'Cibitoke',
+		13 => 'Gitega',
+		14 => 'Karuzi',
+		15 => 'Kayanza',
+		16 => 'Kirundo',
+		17 => 'Makamba',
+		18 => 'Muyinga',
+		19 => 'Ngozi',
+		20 => 'Rutana',
+		21 => 'Ruyigi',
+		22 => 'Muramvya',
+		23 => 'Mwaro',
+	),
+	'BJ' =>
+	array (
+		'07' => 'Alibori',
+		'08' => 'Atakora',
+		'09' => 'Atlanyique',
+		10 => 'Borgou',
+		11 => 'Collines',
+		12 => 'Kouffo',
+		13 => 'Donga',
+		14 => 'Littoral',
+		15 => 'Mono',
+		16 => 'Oueme',
+		17 => 'Plateau',
+		18 => 'Zou',
+	),
+	'BM' =>
+	array (
+		'01' => 'Devonshire',
+		'03' => 'Hamilton',
+		'04' => 'Paget',
+		'05' => 'Pembroke',
+		'06' => 'Saint George',
+		'07' => 'Saint George\'s',
+		'08' => 'Sandys',
+		'09' => 'Smiths',
+		10 => 'Southampton',
+		11 => 'Warwick',
+	),
+	'BN' =>
+	array (
+		'07' => 'Alibori',
+		'08' => 'Belait',
+		'09' => 'Brunei and Muara',
+		10 => 'Temburong',
+		11 => 'Collines',
+		12 => 'Kouffo',
+		13 => 'Donga',
+		14 => 'Littoral',
+		15 => 'Tutong',
+		16 => 'Oueme',
+		17 => 'Plateau',
+		18 => 'Zou',
+	),
+	'BO' =>
+	array (
+		'01' => 'Chuquisaca',
+		'02' => 'Cochabamba',
+		'03' => 'El Beni',
+		'04' => 'La Paz',
+		'05' => 'Oruro',
+		'06' => 'Pando',
+		'07' => 'Potosi',
+		'08' => 'Santa Cruz',
+		'09' => 'Tarija',
+	),
+	'BR' =>
+	array (
+		'01' => 'Acre',
+		'02' => 'Alagoas',
+		'03' => 'Amapa',
+		'04' => 'Amazonas',
+		'05' => 'Bahia',
+		'06' => 'Ceara',
+		'07' => 'Distrito Federal',
+		'08' => 'Espirito Santo',
+		11 => 'Mato Grosso do Sul',
+		13 => 'Maranhao',
+		14 => 'Mato Grosso',
+		15 => 'Minas Gerais',
+		16 => 'Para',
+		17 => 'Paraiba',
+		18 => 'Parana',
+		20 => 'Piaui',
+		21 => 'Rio de Janeiro',
+		22 => 'Rio Grande do Norte',
+		23 => 'Rio Grande do Sul',
+		24 => 'Rondonia',
+		25 => 'Roraima',
+		26 => 'Santa Catarina',
+		27 => 'Sao Paulo',
+		28 => 'Sergipe',
+		29 => 'Goias',
+		30 => 'Pernambuco',
+		31 => 'Tocantins',
+	),
+	'BS' =>
+	array (
+		'05' => 'Bimini',
+		'06' => 'Cat Island',
+		10 => 'Exuma',
+		13 => 'Inagua',
+		15 => 'Long Island',
+		16 => 'Mayaguana',
+		18 => 'Ragged Island',
+		22 => 'Harbour Island',
+		23 => 'New Providence',
+		24 => 'Acklins and Crooked Islands',
+		25 => 'Freeport',
+		26 => 'Fresh Creek',
+		27 => 'Governor\'s Harbour',
+		28 => 'Green Turtle Cay',
+		29 => 'High Rock',
+		30 => 'Kemps Bay',
+		31 => 'Marsh Harbour',
+		32 => 'Nichollstown and Berry Islands',
+		33 => 'Rock Sound',
+		34 => 'Sandy Point',
+		35 => 'San Salvador and Rum Cay',
+	),
+	'BT' =>
+	array (
+		'05' => 'Bumthang',
+		'06' => 'Chhukha',
+		'07' => 'Chirang',
+		'08' => 'Daga',
+		'09' => 'Geylegphug',
+		10 => 'Ha',
+		11 => 'Lhuntshi',
+		12 => 'Mongar',
+		13 => 'Paro',
+		14 => 'Pemagatsel',
+		15 => 'Punakha',
+		16 => 'Samchi',
+		17 => 'Samdrup',
+		18 => 'Shemgang',
+		19 => 'Tashigang',
+		20 => 'Thimphu',
+		21 => 'Tongsa',
+		22 => 'Wangdi Phodrang',
+	),
+	'BW' =>
+	array (
+		'01' => 'Central',
+		'03' => 'Ghanzi',
+		'04' => 'Kgalagadi',
+		'05' => 'Kgatleng',
+		'06' => 'Kweneng',
+		'08' => 'North-East',
+		'09' => 'South-East',
+		10 => 'Southern',
+		11 => 'North-West',
+	),
+	'BY' =>
+	array (
+		'01' => 'Brestskaya Voblasts\'',
+		'02' => 'Homyel\'skaya Voblasts\'',
+		'03' => 'Hrodzyenskaya Voblasts\'',
+		'04' => 'Minsk',
+		'05' => 'Minskaya Voblasts\'',
+		'06' => 'Mahilyowskaya Voblasts\'',
+		'07' => 'Vitsyebskaya Voblasts\'',
+	),
+	'BZ' =>
+	array (
+		'01' => 'Belize',
+		'02' => 'Cayo',
+		'03' => 'Corozal',
+		'04' => 'Orange Walk',
+		'05' => 'Stann Creek',
+		'06' => 'Toledo',
+	),
+	'CA' =>
+	array (
+		'AB' => 'Alberta',
+		'BC' => 'British Columbia',
+		'MB' => 'Manitoba',
+		'NB' => 'New Brunswick',
+		'NL' => 'Newfoundland',
+		'NS' => 'Nova Scotia',
+		'NT' => 'Northwest Territories',
+		'NU' => 'Nunavut',
+		'ON' => 'Ontario',
+		'PE' => 'Prince Edward Island',
+		'QC' => 'Quebec',
+		'SK' => 'Saskatchewan',
+		'YT' => 'Yukon Territory',
+	),
+	'CD' =>
+	array (
+		'01' => 'Bandundu',
+		'02' => 'Equateur',
+		'04' => 'Kasai-Oriental',
+		'05' => 'Katanga',
+		'06' => 'Kinshasa',
+		'08' => 'Bas-Congo',
+		'09' => 'Orientale',
+		10 => 'Maniema',
+		11 => 'Nord-Kivu',
+		12 => 'Sud-Kivu',
+	),
+	'CF' =>
+	array (
+		'01' => 'Bamingui-Bangoran',
+		'02' => 'Basse-Kotto',
+		'03' => 'Haute-Kotto',
+		'04' => 'Mambere-Kadei',
+		'05' => 'Haut-Mbomou',
+		'06' => 'Kemo',
+		'07' => 'Lobaye',
+		'08' => 'Mbomou',
+		'09' => 'Nana-Mambere',
+		11 => 'Ouaka',
+		12 => 'Ouham',
+		13 => 'Ouham-Pende',
+		14 => 'Cuvette-Ouest',
+		15 => 'Nana-Grebizi',
+		16 => 'Sangha-Mbaere',
+		17 => 'Ombella-Mpoko',
+		18 => 'Bangui',
+	),
+	'CG' =>
+	array (
+		'01' => 'Bouenza',
+		'04' => 'Kouilou',
+		'05' => 'Lekoumou',
+		'06' => 'Likouala',
+		'07' => 'Niari',
+		'08' => 'Plateaux',
+		10 => 'Sangha',
+		11 => 'Pool',
+		12 => 'Brazzaville',
+		13 => 'Cuvette',
+		14 => 'Cuvette-Ouest',
+	),
+	'CH' =>
+	array (
+		'01' => 'Aargau',
+		'02' => 'Ausser-Rhoden',
+		'03' => 'Basel-Landschaft',
+		'04' => 'Basel-Stadt',
+		'05' => 'Bern',
+		'06' => 'Fribourg',
+		'07' => 'Geneve',
+		'08' => 'Glarus',
+		'09' => 'Graubunden',
+		10 => 'Inner-Rhoden',
+		11 => 'Luzern',
+		12 => 'Neuchatel',
+		13 => 'Nidwalden',
+		14 => 'Obwalden',
+		15 => 'Sankt Gallen',
+		16 => 'Schaffhausen',
+		17 => 'Schwyz',
+		18 => 'Solothurn',
+		19 => 'Thurgau',
+		20 => 'Ticino',
+		21 => 'Uri',
+		22 => 'Valais',
+		23 => 'Vaud',
+		24 => 'Zug',
+		25 => 'Zurich',
+		26 => 'Jura',
+	),
+	'CI' =>
+	array (
+		74 => 'Agneby',
+		75 => 'Bafing',
+		76 => 'Bas-Sassandra',
+		77 => 'Denguele',
+		78 => 'Dix-Huit Montagnes',
+		79 => 'Fromager',
+		80 => 'Haut-Sassandra',
+		81 => 'Lacs',
+		82 => 'Lagunes',
+		83 => 'Marahoue',
+		84 => 'Moyen-Cavally',
+		85 => 'Moyen-Comoe',
+		86 => 'N\'zi-Comoe',
+		87 => 'Savanes',
+		88 => 'Sud-Bandama',
+		89 => 'Sud-Comoe',
+		90 => 'Vallee du Bandama',
+		91 => 'Worodougou',
+		92 => 'Zanzan',
+	),
+	'CL' =>
+	array (
+		'01' => 'Valparaiso',
+		'02' => 'Aisen del General Carlos Ibanez del Campo',
+		'03' => 'Antofagasta',
+		'04' => 'Araucania',
+		'05' => 'Atacama',
+		'06' => 'Bio-Bio',
+		'07' => 'Coquimbo',
+		'08' => 'Libertador General Bernardo O\'Higgins',
+		14 => 'Los Lagos',
+		10 => 'Magallanes y de la Antartica Chilena',
+		11 => 'Maule',
+		12 => 'Region Metropolitana',
+		15 => 'Tarapaca',
+		16 => 'Arica y Parinacota',
+		17 => 'Los Rios',
+	),
+	'CM' =>
+	array (
+		'04' => 'Est',
+		'05' => 'Littoral',
+		'07' => 'Nord-Ouest',
+		'08' => 'Ouest',
+		'09' => 'Sud-Ouest',
+		10 => 'Adamaoua',
+		11 => 'Centre',
+		12 => 'Extreme-Nord',
+		13 => 'Nord',
+		14 => 'Sud',
+	),
+	'CN' =>
+	array (
+		'01' => 'Anhui',
+		'02' => 'Zhejiang',
+		'03' => 'Jiangxi',
+		'04' => 'Jiangsu',
+		'05' => 'Jilin',
+		'06' => 'Qinghai',
+		'07' => 'Fujian',
+		'08' => 'Heilongjiang',
+		'09' => 'Henan',
+		10 => 'Hebei',
+		11 => 'Hunan',
+		12 => 'Hubei',
+		13 => 'Xinjiang',
+		14 => 'Xizang',
+		15 => 'Gansu',
+		16 => 'Guangxi',
+		18 => 'Guizhou',
+		19 => 'Liaoning',
+		20 => 'Nei Mongol',
+		21 => 'Ningxia',
+		22 => 'Beijing',
+		23 => 'Shanghai',
+		24 => 'Shanxi',
+		25 => 'Shandong',
+		26 => 'Shaanxi',
+		28 => 'Tianjin',
+		29 => 'Yunnan',
+		30 => 'Guangdong',
+		31 => 'Hainan',
+		32 => 'Sichuan',
+		33 => 'Chongqing',
+	),
+	'CO' =>
+	array (
+		'01' => 'Amazonas',
+		'02' => 'Antioquia',
+		'03' => 'Arauca',
+		'04' => 'Atlantico',
+		'08' => 'Caqueta',
+		'09' => 'Cauca',
+		10 => 'Cesar',
+		11 => 'Choco',
+		12 => 'Cordoba',
+		14 => 'Guaviare',
+		15 => 'Guainia',
+		16 => 'Huila',
+		17 => 'La Guajira',
+		19 => 'Meta',
+		20 => 'Narino',
+		21 => 'Norte de Santander',
+		22 => 'Putumayo',
+		23 => 'Quindio',
+		24 => 'Risaralda',
+		25 => 'San Andres y Providencia',
+		26 => 'Santander',
+		27 => 'Sucre',
+		28 => 'Tolima',
+		29 => 'Valle del Cauca',
+		30 => 'Vaupes',
+		31 => 'Vichada',
+		32 => 'Casanare',
+		33 => 'Cundinamarca',
+		34 => 'Distrito Especial',
+		35 => 'Bolivar',
+		36 => 'Boyaca',
+		37 => 'Caldas',
+		38 => 'Magdalena',
+	),
+	'CR' =>
+	array (
+		'01' => 'Alajuela',
+		'02' => 'Cartago',
+		'03' => 'Guanacaste',
+		'04' => 'Heredia',
+		'06' => 'Limon',
+		'07' => 'Puntarenas',
+		'08' => 'San Jose',
+	),
+	'CU' =>
+	array (
+		'01' => 'Pinar del Rio',
+		'02' => 'Ciudad de la Habana',
+		'03' => 'Matanzas',
+		'04' => 'Isla de la Juventud',
+		'05' => 'Camaguey',
+		'07' => 'Ciego de Avila',
+		'08' => 'Cienfuegos',
+		'09' => 'Granma',
+		10 => 'Guantanamo',
+		11 => 'La Habana',
+		12 => 'Holguin',
+		13 => 'Las Tunas',
+		14 => 'Sancti Spiritus',
+		15 => 'Santiago de Cuba',
+		16 => 'Villa Clara',
+	),
+	'CV' =>
+	array (
+		'01' => 'Boa Vista',
+		'02' => 'Brava',
+		'04' => 'Maio',
+		'05' => 'Paul',
+		'07' => 'Ribeira Grande',
+		'08' => 'Sal',
+		10 => 'Sao Nicolau',
+		11 => 'Sao Vicente',
+		13 => 'Mosteiros',
+		14 => 'Praia',
+		15 => 'Santa Catarina',
+		16 => 'Santa Cruz',
+		17 => 'Sao Domingos',
+		18 => 'Sao Filipe',
+		19 => 'Sao Miguel',
+		20 => 'Tarrafal',
+	),
+	'CY' =>
+	array (
+		'01' => 'Famagusta',
+		'02' => 'Kyrenia',
+		'03' => 'Larnaca',
+		'04' => 'Nicosia',
+		'05' => 'Limassol',
+		'06' => 'Paphos',
+	),
+	'CZ' =>
+	array (
+		52 => 'Hlavni mesto Praha',
+		78 => 'Jihomoravsky kraj',
+		79 => 'Jihocesky kraj',
+		80 => 'Vysocina',
+		81 => 'Karlovarsky kraj',
+		82 => 'Kralovehradecky kraj',
+		83 => 'Liberecky kraj',
+		84 => 'Olomoucky kraj',
+		85 => 'Moravskoslezsky kraj',
+		86 => 'Pardubicky kraj',
+		87 => 'Plzensky kraj',
+		88 => 'Stredocesky kraj',
+		89 => 'Ustecky kraj',
+		90 => 'Zlinsky kraj',
+	),
+	'DE' =>
+	array (
+		'01' => 'Baden-Wurttemberg',
+		'02' => 'Bayern',
+		'03' => 'Bremen',
+		'04' => 'Hamburg',
+		'05' => 'Hessen',
+		'06' => 'Niedersachsen',
+		'07' => 'Nordrhein-Westfalen',
+		'08' => 'Rheinland-Pfalz',
+		'09' => 'Saarland',
+		10 => 'Schleswig-Holstein',
+		11 => 'Brandenburg',
+		12 => 'Mecklenburg-Vorpommern',
+		13 => 'Sachsen',
+		14 => 'Sachsen-Anhalt',
+		15 => 'Thuringen',
+		16 => 'Berlin',
+	),
+	'DJ' =>
+	array (
+		'01' => 'Ali Sabieh',
+		'04' => 'Obock',
+		'05' => 'Tadjoura',
+		'06' => 'Dikhil',
+		'07' => 'Djibouti',
+		'08' => 'Arta',
+	),
+	'DK' =>
+	array (
+		17 => 'Hovedstaden',
+		18 => 'Midtjylland',
+		19 => 'Nordjylland',
+		20 => 'Sjelland',
+		21 => 'Syddanmark',
+	),
+	'DM' =>
+	array (
+		'02' => 'Saint Andrew',
+		'03' => 'Saint David',
+		'04' => 'Saint George',
+		'05' => 'Saint John',
+		'06' => 'Saint Joseph',
+		'07' => 'Saint Luke',
+		'08' => 'Saint Mark',
+		'09' => 'Saint Patrick',
+		10 => 'Saint Paul',
+		11 => 'Saint Peter',
+	),
+	'DO' =>
+	array (
+		'01' => 'Azua',
+		'02' => 'Baoruco',
+		'03' => 'Barahona',
+		'04' => 'Dajabon',
+		34 => 'Distrito Nacional',
+		'06' => 'Duarte',
+		'08' => 'Espaillat',
+		'09' => 'Independencia',
+		10 => 'La Altagracia',
+		11 => 'Elias Pina',
+		12 => 'La Romana',
+		14 => 'Maria Trinidad Sanchez',
+		15 => 'Monte Cristi',
+		16 => 'Pedernales',
+		35 => 'Peravia',
+		18 => 'Puerto Plata',
+		19 => 'Salcedo',
+		20 => 'Samana',
+		21 => 'Sanchez Ramirez',
+		23 => 'San Juan',
+		24 => 'San Pedro De Macoris',
+		25 => 'Santiago',
+		26 => 'Santiago Rodriguez',
+		27 => 'Valverde',
+		28 => 'El Seibo',
+		29 => 'Hato Mayor',
+		30 => 'La Vega',
+		31 => 'Monsenor Nouel',
+		32 => 'Monte Plata',
+		33 => 'San Cristobal',
+		36 => 'San Jose de Ocoa',
+		37 => 'Santo Domingo',
+	),
+	'DZ' =>
+	array (
+		'01' => 'Alger',
+		'03' => 'Batna',
+		'04' => 'Constantine',
+		'06' => 'Medea',
+		'07' => 'Mostaganem',
+		'09' => 'Oran',
+		10 => 'Saida',
+		12 => 'Setif',
+		13 => 'Tiaret',
+		14 => 'Tizi Ouzou',
+		15 => 'Tlemcen',
+		18 => 'Bejaia',
+		19 => 'Biskra',
+		20 => 'Blida',
+		21 => 'Bouira',
+		22 => 'Djelfa',
+		23 => 'Guelma',
+		24 => 'Jijel',
+		25 => 'Laghouat',
+		26 => 'Mascara',
+		27 => 'M\'sila',
+		29 => 'Oum el Bouaghi',
+		30 => 'Sidi Bel Abbes',
+		31 => 'Skikda',
+		33 => 'Tebessa',
+		34 => 'Adrar',
+		35 => 'Ain Defla',
+		36 => 'Ain Temouchent',
+		37 => 'Annaba',
+		38 => 'Bechar',
+		39 => 'Bordj Bou Arreridj',
+		40 => 'Boumerdes',
+		41 => 'Chlef',
+		42 => 'El Bayadh',
+		43 => 'El Oued',
+		44 => 'El Tarf',
+		45 => 'Ghardaia',
+		46 => 'Illizi',
+		47 => 'Khenchela',
+		48 => 'Mila',
+		49 => 'Naama',
+		50 => 'Ouargla',
+		51 => 'Relizane',
+		52 => 'Souk Ahras',
+		53 => 'Tamanghasset',
+		54 => 'Tindouf',
+		55 => 'Tipaza',
+		56 => 'Tissemsilt',
+	),
+	'EC' =>
+	array (
+		'01' => 'Galapagos',
+		'02' => 'Azuay',
+		'03' => 'Bolivar',
+		'04' => 'Canar',
+		'05' => 'Carchi',
+		'06' => 'Chimborazo',
+		'07' => 'Cotopaxi',
+		'08' => 'El Oro',
+		'09' => 'Esmeraldas',
+		10 => 'Guayas',
+		11 => 'Imbabura',
+		12 => 'Loja',
+		13 => 'Los Rios',
+		14 => 'Manabi',
+		15 => 'Morona-Santiago',
+		17 => 'Pastaza',
+		18 => 'Pichincha',
+		19 => 'Tungurahua',
+		20 => 'Zamora-Chinchipe',
+		22 => 'Sucumbios',
+		23 => 'Napo',
+		24 => 'Orellana',
+	),
+	'EE' =>
+	array (
+		'01' => 'Harjumaa',
+		'02' => 'Hiiumaa',
+		'03' => 'Ida-Virumaa',
+		'04' => 'Jarvamaa',
+		'05' => 'Jogevamaa',
+		'06' => 'Kohtla-Jarve',
+		'07' => 'Laanemaa',
+		'08' => 'Laane-Virumaa',
+		'09' => 'Narva',
+		10 => 'Parnu',
+		11 => 'Parnumaa',
+		12 => 'Polvamaa',
+		13 => 'Raplamaa',
+		14 => 'Saaremaa',
+		15 => 'Sillamae',
+		16 => 'Tallinn',
+		17 => 'Tartu',
+		18 => 'Tartumaa',
+		19 => 'Valgamaa',
+		20 => 'Viljandimaa',
+		21 => 'Vorumaa',
+	),
+	'EG' =>
+	array (
+		'01' => 'Ad Daqahliyah',
+		'02' => 'Al Bahr al Ahmar',
+		'03' => 'Al Buhayrah',
+		'04' => 'Al Fayyum',
+		'05' => 'Al Gharbiyah',
+		'06' => 'Al Iskandariyah',
+		'07' => 'Al Isma\'iliyah',
+		'08' => 'Al Jizah',
+		'09' => 'Al Minufiyah',
+		10 => 'Al Minya',
+		11 => 'Al Qahirah',
+		12 => 'Al Qalyubiyah',
+		13 => 'Al Wadi al Jadid',
+		14 => 'Ash Sharqiyah',
+		15 => 'As Suways',
+		16 => 'Aswan',
+		17 => 'Asyut',
+		18 => 'Bani Suwayf',
+		19 => 'Bur Sa\'id',
+		20 => 'Dumyat',
+		21 => 'Kafr ash Shaykh',
+		22 => 'Matruh',
+		23 => 'Qina',
+		24 => 'Suhaj',
+		26 => 'Janub Sina\'',
+		27 => 'Shamal Sina\'',
+		28 => 'Al Uqsur',
+	),
+	'ER' =>
+	array (
+		'01' => 'Anseba',
+		'02' => 'Debub',
+		'03' => 'Debubawi K\'eyih Bahri',
+		'04' => 'Gash Barka',
+		'05' => 'Ma\'akel',
+		'06' => 'Semenawi K\'eyih Bahri',
+	),
+	'ES' =>
+	array (
+		'07' => 'Islas Baleares',
+		27 => 'La Rioja',
+		29 => 'Madrid',
+		31 => 'Murcia',
+		32 => 'Navarra',
+		34 => 'Asturias',
+		39 => 'Cantabria',
+		51 => 'Andalucia',
+		52 => 'Aragon',
+		53 => 'Canarias',
+		54 => 'Castilla-La Mancha',
+		55 => 'Castilla y Leon',
+		56 => 'Catalonia',
+		57 => 'Extremadura',
+		58 => 'Galicia',
+		59 => 'Pais Vasco',
+		60 => 'Comunidad Valenciana',
+	),
+	'ET' =>
+	array (
+		44 => 'Adis Abeba',
+		45 => 'Afar',
+		46 => 'Amara',
+		47 => 'Binshangul Gumuz',
+		48 => 'Dire Dawa',
+		49 => 'Gambela Hizboch',
+		50 => 'Hareri Hizb',
+		51 => 'Oromiya',
+		52 => 'Sumale',
+		53 => 'Tigray',
+		54 => 'YeDebub Biheroch Bihereseboch na Hizboch',
+	),
+	'FI' =>
+	array (
+		'01' => 'Aland',
+		'06' => 'Lapland',
+		'08' => 'Oulu',
+		13 => 'Southern Finland',
+		14 => 'Eastern Finland',
+		15 => 'Western Finland',
+	),
+	'FJ' =>
+	array (
+		'01' => 'Central',
+		'02' => 'Eastern',
+		'03' => 'Northern',
+		'04' => 'Rotuma',
+		'05' => 'Western',
+	),
+	'FM' =>
+	array (
+		'01' => 'Kosrae',
+		'02' => 'Pohnpei',
+		'03' => 'Chuuk',
+		'04' => 'Yap',
+	),
+	'FR' =>
+	array (
+		97 => 'Aquitaine',
+		98 => 'Auvergne',
+		99 => 'Basse-Normandie',
+		'A1' => 'Bourgogne',
+		'A2' => 'Bretagne',
+		'A3' => 'Centre',
+		'A4' => 'Champagne-Ardenne',
+		'A5' => 'Corse',
+		'A6' => 'Franche-Comte',
+		'A7' => 'Haute-Normandie',
+		'A8' => 'Ile-de-France',
+		'A9' => 'Languedoc-Roussillon',
+		'B1' => 'Limousin',
+		'B2' => 'Lorraine',
+		'B3' => 'Midi-Pyrenees',
+		'B4' => 'Nord-Pas-de-Calais',
+		'B5' => 'Pays de la Loire',
+		'B6' => 'Picardie',
+		'B7' => 'Poitou-Charentes',
+		'B8' => 'Provence-Alpes-Cote d\'Azur',
+		'B9' => 'Rhone-Alpes',
+		'C1' => 'Alsace',
+	),
+	'GA' =>
+	array (
+		'01' => 'Estuaire',
+		'02' => 'Haut-Ogooue',
+		'03' => 'Moyen-Ogooue',
+		'04' => 'Ngounie',
+		'05' => 'Nyanga',
+		'06' => 'Ogooue-Ivindo',
+		'07' => 'Ogooue-Lolo',
+		'08' => 'Ogooue-Maritime',
+		'09' => 'Woleu-Ntem',
+	),
+	'GB' =>
+	array (
+		'A1' => 'Barking and Dagenham',
+		'A2' => 'Barnet',
+		'A3' => 'Barnsley',
+		'A4' => 'Bath and North East Somerset',
+		'Z5' => 'Bedfordshire',
+		'A6' => 'Bexley',
+		'A7' => 'Birmingham',
+		'A8' => 'Blackburn with Darwen',
+		'A9' => 'Blackpool',
+		'B1' => 'Bolton',
+		'B2' => 'Bournemouth',
+		'B3' => 'Bracknell Forest',
+		'B4' => 'Bradford',
+		'B5' => 'Brent',
+		'B6' => 'Brighton and Hove',
+		'B7' => 'Bristol',
+		'B8' => 'Bromley',
+		'B9' => 'Buckinghamshire',
+		'C1' => 'Bury',
+		'C2' => 'Calderdale',
+		'C3' => 'Cambridgeshire',
+		'C4' => 'Camden',
+		'C5' => 'Cheshire',
+		'C6' => 'Cornwall',
+		'C7' => 'Coventry',
+		'C8' => 'Croydon',
+		'C9' => 'Cumbria',
+		'D1' => 'Darlington',
+		'D2' => 'Derby',
+		'D3' => 'Derbyshire',
+		'D4' => 'Devon',
+		'D5' => 'Doncaster',
+		'D6' => 'Dorset',
+		'D7' => 'Dudley',
+		'D8' => 'Durham',
+		'D9' => 'Ealing',
+		'E1' => 'East Riding of Yorkshire',
+		'E2' => 'East Sussex',
+		'E3' => 'Enfield',
+		'E4' => 'Essex',
+		'E5' => 'Gateshead',
+		'E6' => 'Gloucestershire',
+		'E7' => 'Greenwich',
+		'E8' => 'Hackney',
+		'E9' => 'Halton',
+		'F1' => 'Hammersmith and Fulham',
+		'F2' => 'Hampshire',
+		'F3' => 'Haringey',
+		'F4' => 'Harrow',
+		'F5' => 'Hartlepool',
+		'F6' => 'Havering',
+		'F7' => 'Herefordshire',
+		'F8' => 'Hertford',
+		'F9' => 'Hillingdon',
+		'G1' => 'Hounslow',
+		'G2' => 'Isle of Wight',
+		'G3' => 'Islington',
+		'G4' => 'Kensington and Chelsea',
+		'G5' => 'Kent',
+		'G6' => 'Kingston upon Hull',
+		'G7' => 'Kingston upon Thames',
+		'G8' => 'Kirklees',
+		'G9' => 'Knowsley',
+		'H1' => 'Lambeth',
+		'H2' => 'Lancashire',
+		'H3' => 'Leeds',
+		'H4' => 'Leicester',
+		'H5' => 'Leicestershire',
+		'H6' => 'Lewisham',
+		'H7' => 'Lincolnshire',
+		'H8' => 'Liverpool',
+		'H9' => 'London',
+		'I1' => 'Luton',
+		'I2' => 'Manchester',
+		'I3' => 'Medway',
+		'I4' => 'Merton',
+		'I5' => 'Middlesbrough',
+		'I6' => 'Milton Keynes',
+		'I7' => 'Newcastle upon Tyne',
+		'I8' => 'Newham',
+		'I9' => 'Norfolk',
+		'J1' => 'Northamptonshire',
+		'J2' => 'North East Lincolnshire',
+		'J3' => 'North Lincolnshire',
+		'J4' => 'North Somerset',
+		'J5' => 'North Tyneside',
+		'J6' => 'Northumberland',
+		'J7' => 'North Yorkshire',
+		'J8' => 'Nottingham',
+		'J9' => 'Nottinghamshire',
+		'K1' => 'Oldham',
+		'K2' => 'Oxfordshire',
+		'K3' => 'Peterborough',
+		'K4' => 'Plymouth',
+		'K5' => 'Poole',
+		'K6' => 'Portsmouth',
+		'K7' => 'Reading',
+		'K8' => 'Redbridge',
+		'K9' => 'Redcar and Cleveland',
+		'L1' => 'Richmond upon Thames',
+		'L2' => 'Rochdale',
+		'L3' => 'Rotherham',
+		'L4' => 'Rutland',
+		'L5' => 'Salford',
+		'L6' => 'Shropshire',
+		'L7' => 'Sandwell',
+		'L8' => 'Sefton',
+		'L9' => 'Sheffield',
+		'M1' => 'Slough',
+		'M2' => 'Solihull',
+		'M3' => 'Somerset',
+		'M4' => 'Southampton',
+		'M5' => 'Southend-on-Sea',
+		'M6' => 'South Gloucestershire',
+		'M7' => 'South Tyneside',
+		'M8' => 'Southwark',
+		'M9' => 'Staffordshire',
+		'N1' => 'St. Helens',
+		'N2' => 'Stockport',
+		'N3' => 'Stockton-on-Tees',
+		'N4' => 'Stoke-on-Trent',
+		'N5' => 'Suffolk',
+		'N6' => 'Sunderland',
+		'N7' => 'Surrey',
+		'N8' => 'Sutton',
+		'N9' => 'Swindon',
+		'O1' => 'Tameside',
+		'O2' => 'Telford and Wrekin',
+		'O3' => 'Thurrock',
+		'O4' => 'Torbay',
+		'O5' => 'Tower Hamlets',
+		'O6' => 'Trafford',
+		'O7' => 'Wakefield',
+		'O8' => 'Walsall',
+		'O9' => 'Waltham Forest',
+		'P1' => 'Wandsworth',
+		'P2' => 'Warrington',
+		'P3' => 'Warwickshire',
+		'P4' => 'West Berkshire',
+		'P5' => 'Westminster',
+		'P6' => 'West Sussex',
+		'P7' => 'Wigan',
+		'P8' => 'Wiltshire',
+		'P9' => 'Windsor and Maidenhead',
+		'Q1' => 'Wirral',
+		'Q2' => 'Wokingham',
+		'Q3' => 'Wolverhampton',
+		'Q4' => 'Worcestershire',
+		'Q5' => 'York',
+		'Q6' => 'Antrim',
+		'Q7' => 'Ards',
+		'Q8' => 'Armagh',
+		'Q9' => 'Ballymena',
+		'R1' => 'Ballymoney',
+		'R2' => 'Banbridge',
+		'R3' => 'Belfast',
+		'R4' => 'Carrickfergus',
+		'R5' => 'Castlereagh',
+		'R6' => 'Coleraine',
+		'R7' => 'Cookstown',
+		'R8' => 'Craigavon',
+		'R9' => 'Down',
+		'S1' => 'Dungannon',
+		'S2' => 'Fermanagh',
+		'S3' => 'Larne',
+		'S4' => 'Limavady',
+		'S5' => 'Lisburn',
+		'S6' => 'Derry',
+		'S7' => 'Magherafelt',
+		'S8' => 'Moyle',
+		'S9' => 'Newry and Mourne',
+		'T1' => 'Newtownabbey',
+		'T2' => 'North Down',
+		'T3' => 'Omagh',
+		'T4' => 'Strabane',
+		'T5' => 'Aberdeen City',
+		'T6' => 'Aberdeenshire',
+		'T7' => 'Angus',
+		'T8' => 'Argyll and Bute',
+		'T9' => 'Scottish Borders',
+		'U1' => 'Clackmannanshire',
+		'U2' => 'Dumfries and Galloway',
+		'U3' => 'Dundee City',
+		'U4' => 'East Ayrshire',
+		'U5' => 'East Dunbartonshire',
+		'U6' => 'East Lothian',
+		'U7' => 'East Renfrewshire',
+		'U8' => 'Edinburgh',
+		'U9' => 'Falkirk',
+		'V1' => 'Fife',
+		'V2' => 'Glasgow City',
+		'V3' => 'Highland',
+		'V4' => 'Inverclyde',
+		'V5' => 'Midlothian',
+		'V6' => 'Moray',
+		'V7' => 'North Ayrshire',
+		'V8' => 'North Lanarkshire',
+		'V9' => 'Orkney',
+		'W1' => 'Perth and Kinross',
+		'W2' => 'Renfrewshire',
+		'W3' => 'Shetland Islands',
+		'W4' => 'South Ayrshire',
+		'W5' => 'South Lanarkshire',
+		'W6' => 'Stirling',
+		'W7' => 'West Dunbartonshire',
+		'W8' => 'Eilean Siar',
+		'W9' => 'West Lothian',
+		'X1' => 'Isle of Anglesey',
+		'X2' => 'Blaenau Gwent',
+		'X3' => 'Bridgend',
+		'X4' => 'Caerphilly',
+		'X5' => 'Cardiff',
+		'X6' => 'Ceredigion',
+		'X7' => 'Carmarthenshire',
+		'X8' => 'Conwy',
+		'X9' => 'Denbighshire',
+		'Y1' => 'Flintshire',
+		'Y2' => 'Gwynedd',
+		'Y3' => 'Merthyr Tydfil',
+		'Y4' => 'Monmouthshire',
+		'Y5' => 'Neath Port Talbot',
+		'Y6' => 'Newport',
+		'Y7' => 'Pembrokeshire',
+		'Y8' => 'Powys',
+		'Y9' => 'Rhondda Cynon Taff',
+		'Z1' => 'Swansea',
+		'Z2' => 'Torfaen',
+		'Z3' => 'Vale of Glamorgan',
+		'Z4' => 'Wrexham',
+		'Z6' => 'Central Bedfordshire',
+		'Z7' => 'Cheshire East',
+		'Z8' => 'Cheshire West and Chester',
+		'Z9' => 'Isles of Scilly',
+	),
+	'GD' =>
+	array (
+		'01' => 'Saint Andrew',
+		'02' => 'Saint David',
+		'03' => 'Saint George',
+		'04' => 'Saint John',
+		'05' => 'Saint Mark',
+		'06' => 'Saint Patrick',
+	),
+	'GE' =>
+	array (
+		'01' => 'Abashis Raioni',
+		'02' => 'Abkhazia',
+		'03' => 'Adigenis Raioni',
+		'04' => 'Ajaria',
+		'05' => 'Akhalgoris Raioni',
+		'06' => 'Akhalk\'alak\'is Raioni',
+		'07' => 'Akhalts\'ikhis Raioni',
+		'08' => 'Akhmetis Raioni',
+		'09' => 'Ambrolauris Raioni',
+		10 => 'Aspindzis Raioni',
+		11 => 'Baghdat\'is Raioni',
+		12 => 'Bolnisis Raioni',
+		13 => 'Borjomis Raioni',
+		14 => 'Chiat\'ura',
+		15 => 'Ch\'khorotsqus Raioni',
+		16 => 'Ch\'okhatauris Raioni',
+		17 => 'Dedop\'listsqaros Raioni',
+		18 => 'Dmanisis Raioni',
+		19 => 'Dushet\'is Raioni',
+		20 => 'Gardabanis Raioni',
+		21 => 'Gori',
+		22 => 'Goris Raioni',
+		23 => 'Gurjaanis Raioni',
+		24 => 'Javis Raioni',
+		25 => 'K\'arelis Raioni',
+		26 => 'Kaspis Raioni',
+		27 => 'Kharagaulis Raioni',
+		28 => 'Khashuris Raioni',
+		29 => 'Khobis Raioni',
+		30 => 'Khonis Raioni',
+		31 => 'K\'ut\'aisi',
+		32 => 'Lagodekhis Raioni',
+		33 => 'Lanch\'khut\'is Raioni',
+		34 => 'Lentekhis Raioni',
+		35 => 'Marneulis Raioni',
+		36 => 'Martvilis Raioni',
+		37 => 'Mestiis Raioni',
+		38 => 'Mts\'khet\'is Raioni',
+		39 => 'Ninotsmindis Raioni',
+		40 => 'Onis Raioni',
+		41 => 'Ozurget\'is Raioni',
+		42 => 'P\'ot\'i',
+		43 => 'Qazbegis Raioni',
+		44 => 'Qvarlis Raioni',
+		45 => 'Rust\'avi',
+		46 => 'Sach\'kheris Raioni',
+		47 => 'Sagarejos Raioni',
+		48 => 'Samtrediis Raioni',
+		49 => 'Senakis Raioni',
+		50 => 'Sighnaghis Raioni',
+		51 => 'T\'bilisi',
+		52 => 'T\'elavis Raioni',
+		53 => 'T\'erjolis Raioni',
+		54 => 'T\'et\'ritsqaros Raioni',
+		55 => 'T\'ianet\'is Raioni',
+		56 => 'Tqibuli',
+		57 => 'Ts\'ageris Raioni',
+		58 => 'Tsalenjikhis Raioni',
+		59 => 'Tsalkis Raioni',
+		60 => 'Tsqaltubo',
+		61 => 'Vanis Raioni',
+		62 => 'Zestap\'onis Raioni',
+		63 => 'Zugdidi',
+		64 => 'Zugdidis Raioni',
+	),
+	'GH' =>
+	array (
+		'01' => 'Greater Accra',
+		'02' => 'Ashanti',
+		'03' => 'Brong-Ahafo',
+		'04' => 'Central',
+		'05' => 'Eastern',
+		'06' => 'Northern',
+		'08' => 'Volta',
+		'09' => 'Western',
+		10 => 'Upper East',
+		11 => 'Upper West',
+	),
+	'GL' =>
+	array (
+		'01' => 'Nordgronland',
+		'02' => 'Ostgronland',
+		'03' => 'Vestgronland',
+	),
+	'GM' =>
+	array (
+		'01' => 'Banjul',
+		'02' => 'Lower River',
+		'03' => 'Central River',
+		'04' => 'Upper River',
+		'05' => 'Western',
+		'07' => 'North Bank',
+	),
+	'GN' =>
+	array (
+		'01' => 'Beyla',
+		'02' => 'Boffa',
+		'03' => 'Boke',
+		'04' => 'Conakry',
+		'05' => 'Dabola',
+		'06' => 'Dalaba',
+		'07' => 'Dinguiraye',
+		'09' => 'Faranah',
+		10 => 'Forecariah',
+		11 => 'Fria',
+		12 => 'Gaoual',
+		13 => 'Gueckedou',
+		15 => 'Kerouane',
+		16 => 'Kindia',
+		17 => 'Kissidougou',
+		18 => 'Koundara',
+		19 => 'Kouroussa',
+		21 => 'Macenta',
+		22 => 'Mali',
+		23 => 'Mamou',
+		25 => 'Pita',
+		27 => 'Telimele',
+		28 => 'Tougue',
+		29 => 'Yomou',
+		30 => 'Coyah',
+		31 => 'Dubreka',
+		32 => 'Kankan',
+		33 => 'Koubia',
+		34 => 'Labe',
+		35 => 'Lelouma',
+		36 => 'Lola',
+		37 => 'Mandiana',
+		38 => 'Nzerekore',
+		39 => 'Siguiri',
+	),
+	'GQ' =>
+	array (
+		'03' => 'Annobon',
+		'04' => 'Bioko Norte',
+		'05' => 'Bioko Sur',
+		'06' => 'Centro Sur',
+		'07' => 'Kie-Ntem',
+		'08' => 'Litoral',
+		'09' => 'Wele-Nzas',
+	),
+	'GR' =>
+	array (
+		'01' => 'Evros',
+		'02' => 'Rodhopi',
+		'03' => 'Xanthi',
+		'04' => 'Drama',
+		'05' => 'Serrai',
+		'06' => 'Kilkis',
+		'07' => 'Pella',
+		'08' => 'Florina',
+		'09' => 'Kastoria',
+		10 => 'Grevena',
+		11 => 'Kozani',
+		12 => 'Imathia',
+		13 => 'Thessaloniki',
+		14 => 'Kavala',
+		15 => 'Khalkidhiki',
+		16 => 'Pieria',
+		17 => 'Ioannina',
+		18 => 'Thesprotia',
+		19 => 'Preveza',
+		20 => 'Arta',
+		21 => 'Larisa',
+		22 => 'Trikala',
+		23 => 'Kardhitsa',
+		24 => 'Magnisia',
+		25 => 'Kerkira',
+		26 => 'Levkas',
+		27 => 'Kefallinia',
+		28 => 'Zakinthos',
+		29 => 'Fthiotis',
+		30 => 'Evritania',
+		31 => 'Aitolia kai Akarnania',
+		32 => 'Fokis',
+		33 => 'Voiotia',
+		34 => 'Evvoia',
+		35 => 'Attiki',
+		36 => 'Argolis',
+		37 => 'Korinthia',
+		38 => 'Akhaia',
+		39 => 'Ilia',
+		40 => 'Messinia',
+		41 => 'Arkadhia',
+		42 => 'Lakonia',
+		43 => 'Khania',
+		44 => 'Rethimni',
+		45 => 'Iraklion',
+		46 => 'Lasithi',
+		47 => 'Dhodhekanisos',
+		48 => 'Samos',
+		49 => 'Kikladhes',
+		50 => 'Khios',
+		51 => 'Lesvos',
+	),
+	'GT' =>
+	array (
+		'01' => 'Alta Verapaz',
+		'02' => 'Baja Verapaz',
+		'03' => 'Chimaltenango',
+		'04' => 'Chiquimula',
+		'05' => 'El Progreso',
+		'06' => 'Escuintla',
+		'07' => 'Guatemala',
+		'08' => 'Huehuetenango',
+		'09' => 'Izabal',
+		10 => 'Jalapa',
+		11 => 'Jutiapa',
+		12 => 'Peten',
+		13 => 'Quetzaltenango',
+		14 => 'Quiche',
+		15 => 'Retalhuleu',
+		16 => 'Sacatepequez',
+		17 => 'San Marcos',
+		18 => 'Santa Rosa',
+		19 => 'Solola',
+		20 => 'Suchitepequez',
+		21 => 'Totonicapan',
+		22 => 'Zacapa',
+	),
+	'GW' =>
+	array (
+		'01' => 'Bafata',
+		'02' => 'Quinara',
+		'04' => 'Oio',
+		'05' => 'Bolama',
+		'06' => 'Cacheu',
+		'07' => 'Tombali',
+		10 => 'Gabu',
+		11 => 'Bissau',
+		12 => 'Biombo',
+	),
+	'GY' =>
+	array (
+		10 => 'Barima-Waini',
+		11 => 'Cuyuni-Mazaruni',
+		12 => 'Demerara-Mahaica',
+		13 => 'East Berbice-Corentyne',
+		14 => 'Essequibo Islands-West Demerara',
+		15 => 'Mahaica-Berbice',
+		16 => 'Pomeroon-Supenaam',
+		17 => 'Potaro-Siparuni',
+		18 => 'Upper Demerara-Berbice',
+		19 => 'Upper Takutu-Upper Essequibo',
+	),
+	'HN' =>
+	array (
+		'01' => 'Atlantida',
+		'02' => 'Choluteca',
+		'03' => 'Colon',
+		'04' => 'Comayagua',
+		'05' => 'Copan',
+		'06' => 'Cortes',
+		'07' => 'El Paraiso',
+		'08' => 'Francisco Morazan',
+		'09' => 'Gracias a Dios',
+		10 => 'Intibuca',
+		11 => 'Islas de la Bahia',
+		12 => 'La Paz',
+		13 => 'Lempira',
+		14 => 'Ocotepeque',
+		15 => 'Olancho',
+		16 => 'Santa Barbara',
+		17 => 'Valle',
+		18 => 'Yoro',
+	),
+	'HR' =>
+	array (
+		'01' => 'Bjelovarsko-Bilogorska',
+		'02' => 'Brodsko-Posavska',
+		'03' => 'Dubrovacko-Neretvanska',
+		'04' => 'Istarska',
+		'05' => 'Karlovacka',
+		'06' => 'Koprivnicko-Krizevacka',
+		'07' => 'Krapinsko-Zagorska',
+		'08' => 'Licko-Senjska',
+		'09' => 'Medimurska',
+		10 => 'Osjecko-Baranjska',
+		11 => 'Pozesko-Slavonska',
+		12 => 'Primorsko-Goranska',
+		13 => 'Sibensko-Kninska',
+		14 => 'Sisacko-Moslavacka',
+		15 => 'Splitsko-Dalmatinska',
+		16 => 'Varazdinska',
+		17 => 'Viroviticko-Podravska',
+		18 => 'Vukovarsko-Srijemska',
+		19 => 'Zadarska',
+		20 => 'Zagrebacka',
+		21 => 'Grad Zagreb',
+	),
+	'HT' =>
+	array (
+		'03' => 'Nord-Ouest',
+		'06' => 'Artibonite',
+		'07' => 'Centre',
+		'09' => 'Nord',
+		10 => 'Nord-Est',
+		11 => 'Ouest',
+		12 => 'Sud',
+		13 => 'Sud-Est',
+		14 => 'Grand\' Anse',
+		15 => 'Nippes',
+	),
+	'HU' =>
+	array (
+		'01' => 'Bacs-Kiskun',
+		'02' => 'Baranya',
+		'03' => 'Bekes',
+		'04' => 'Borsod-Abauj-Zemplen',
+		'05' => 'Budapest',
+		'06' => 'Csongrad',
+		'07' => 'Debrecen',
+		'08' => 'Fejer',
+		'09' => 'Gyor-Moson-Sopron',
+		10 => 'Hajdu-Bihar',
+		11 => 'Heves',
+		12 => 'Komarom-Esztergom',
+		13 => 'Miskolc',
+		14 => 'Nograd',
+		15 => 'Pecs',
+		16 => 'Pest',
+		17 => 'Somogy',
+		18 => 'Szabolcs-Szatmar-Bereg',
+		19 => 'Szeged',
+		20 => 'Jasz-Nagykun-Szolnok',
+		21 => 'Tolna',
+		22 => 'Vas',
+		39 => 'Veszprem',
+		24 => 'Zala',
+		25 => 'Gyor',
+		26 => 'Bekescsaba',
+		27 => 'Dunaujvaros',
+		28 => 'Eger',
+		29 => 'Hodmezovasarhely',
+		30 => 'Kaposvar',
+		31 => 'Kecskemet',
+		32 => 'Nagykanizsa',
+		33 => 'Nyiregyhaza',
+		34 => 'Sopron',
+		35 => 'Szekesfehervar',
+		36 => 'Szolnok',
+		37 => 'Szombathely',
+		38 => 'Tatabanya',
+		40 => 'Zalaegerszeg',
+		41 => 'Salgotarjan',
+		42 => 'Szekszard',
+		43 => 'Erd',
+	),
+	'ID' =>
+	array (
+		'01' => 'Aceh',
+		'02' => 'Bali',
+		'03' => 'Bengkulu',
+		'04' => 'Jakarta Raya',
+		'05' => 'Jambi',
+		'07' => 'Jawa Tengah',
+		'08' => 'Jawa Timur',
+		10 => 'Yogyakarta',
+		11 => 'Kalimantan Barat',
+		12 => 'Kalimantan Selatan',
+		13 => 'Kalimantan Tengah',
+		14 => 'Kalimantan Timur',
+		15 => 'Lampung',
+		17 => 'Nusa Tenggara Barat',
+		18 => 'Nusa Tenggara Timur',
+		21 => 'Sulawesi Tengah',
+		22 => 'Sulawesi Tenggara',
+		24 => 'Sumatera Barat',
+		26 => 'Sumatera Utara',
+		28 => 'Maluku',
+		29 => 'Maluku Utara',
+		30 => 'Jawa Barat',
+		31 => 'Sulawesi Utara',
+		32 => 'Sumatera Selatan',
+		33 => 'Banten',
+		34 => 'Gorontalo',
+		35 => 'Kepulauan Bangka Belitung',
+		36 => 'Papua',
+		37 => 'Riau',
+		38 => 'Sulawesi Selatan',
+		39 => 'Irian Jaya Barat',
+		40 => 'Kepulauan Riau',
+		41 => 'Sulawesi Barat',
+	),
+	'IE' =>
+	array (
+		'01' => 'Carlow',
+		'02' => 'Cavan',
+		'03' => 'Clare',
+		'04' => 'Cork',
+		'06' => 'Donegal',
+		'07' => 'Dublin',
+		10 => 'Galway',
+		11 => 'Kerry',
+		12 => 'Kildare',
+		13 => 'Kilkenny',
+		14 => 'Leitrim',
+		15 => 'Laois',
+		16 => 'Limerick',
+		18 => 'Longford',
+		19 => 'Louth',
+		20 => 'Mayo',
+		21 => 'Meath',
+		22 => 'Monaghan',
+		23 => 'Offaly',
+		24 => 'Roscommon',
+		25 => 'Sligo',
+		26 => 'Tipperary',
+		27 => 'Waterford',
+		29 => 'Westmeath',
+		30 => 'Wexford',
+		31 => 'Wicklow',
+	),
+	'IL' =>
+	array (
+		'01' => 'HaDarom',
+		'02' => 'HaMerkaz',
+		'03' => 'HaZafon',
+		'04' => 'Hefa',
+		'05' => 'Tel Aviv',
+		'06' => 'Yerushalayim',
+	),
+	'IN' =>
+	array (
+		'01' => 'Andaman and Nicobar Islands',
+		'02' => 'Andhra Pradesh',
+		'03' => 'Assam',
+		'05' => 'Chandigarh',
+		'06' => 'Dadra and Nagar Haveli',
+		'07' => 'Delhi',
+		'09' => 'Gujarat',
+		10 => 'Haryana',
+		11 => 'Himachal Pradesh',
+		12 => 'Jammu and Kashmir',
+		13 => 'Kerala',
+		14 => 'Lakshadweep',
+		16 => 'Maharashtra',
+		17 => 'Manipur',
+		18 => 'Meghalaya',
+		19 => 'Karnataka',
+		20 => 'Nagaland',
+		21 => 'Orissa',
+		22 => 'Puducherry',
+		23 => 'Punjab',
+		24 => 'Rajasthan',
+		25 => 'Tamil Nadu',
+		26 => 'Tripura',
+		28 => 'West Bengal',
+		29 => 'Sikkim',
+		30 => 'Arunachal Pradesh',
+		31 => 'Mizoram',
+		32 => 'Daman and Diu',
+		33 => 'Goa',
+		34 => 'Bihar',
+		35 => 'Madhya Pradesh',
+		36 => 'Uttar Pradesh',
+		37 => 'Chhattisgarh',
+		38 => 'Jharkhand',
+		39 => 'Uttarakhand',
+	),
+	'IQ' =>
+	array (
+		'01' => 'Al Anbar',
+		'02' => 'Al Basrah',
+		'03' => 'Al Muthanna',
+		'04' => 'Al Qadisiyah',
+		'05' => 'As Sulaymaniyah',
+		'06' => 'Babil',
+		'07' => 'Baghdad',
+		'08' => 'Dahuk',
+		'09' => 'Dhi Qar',
+		10 => 'Diyala',
+		11 => 'Arbil',
+		12 => 'Karbala\'',
+		13 => 'At Ta\'mim',
+		14 => 'Maysan',
+		15 => 'Ninawa',
+		16 => 'Wasit',
+		17 => 'An Najaf',
+		18 => 'Salah ad Din',
+	),
+	'IR' =>
+	array (
+		'01' => 'Azarbayjan-e Bakhtari',
+		'03' => 'Chahar Mahall va Bakhtiari',
+		'04' => 'Sistan va Baluchestan',
+		'05' => 'Kohkiluyeh va Buyer Ahmadi',
+		'07' => 'Fars',
+		'08' => 'Gilan',
+		'09' => 'Hamadan',
+		10 => 'Ilam',
+		11 => 'Hormozgan',
+		29 => 'Kerman',
+		13 => 'Bakhtaran',
+		15 => 'Khuzestan',
+		16 => 'Kordestan',
+		35 => 'Mazandaran',
+		18 => 'Semnan Province',
+		34 => 'Markazi',
+		36 => 'Zanjan',
+		22 => 'Bushehr',
+		23 => 'Lorestan',
+		25 => 'Semnan',
+		26 => 'Tehran',
+		28 => 'Esfahan',
+		30 => 'Khorasan',
+		40 => 'Yazd',
+		32 => 'Ardabil',
+		33 => 'East Azarbaijan',
+		37 => 'Golestan',
+		38 => 'Qazvin',
+		39 => 'Qom',
+		41 => 'Khorasan-e Janubi',
+		42 => 'Khorasan-e Razavi',
+		43 => 'Khorasan-e Shemali',
+		44 => 'Alborz',
+	),
+	'IS' =>
+	array (
+		'03' => 'Arnessysla',
+		'05' => 'Austur-Hunavatnssysla',
+		'06' => 'Austur-Skaftafellssysla',
+		'07' => 'Borgarfjardarsysla',
+		'09' => 'Eyjafjardarsysla',
+		10 => 'Gullbringusysla',
+		15 => 'Kjosarsysla',
+		17 => 'Myrasysla',
+		20 => 'Nordur-Mulasysla',
+		21 => 'Nordur-Tingeyjarsysla',
+		23 => 'Rangarvallasysla',
+		28 => 'Skagafjardarsysla',
+		29 => 'Snafellsnes- og Hnappadalssysla',
+		30 => 'Strandasysla',
+		31 => 'Sudur-Mulasysla',
+		32 => 'Sudur-Tingeyjarsysla',
+		34 => 'Vestur-Bardastrandarsysla',
+		35 => 'Vestur-Hunavatnssysla',
+		36 => 'Vestur-Isafjardarsysla',
+		37 => 'Vestur-Skaftafellssysla',
+		38 => 'Austurland',
+		39 => 'Hofuoborgarsvaoio',
+		40 => 'Norourland Eystra',
+		41 => 'Norourland Vestra',
+		42 => 'Suourland',
+		43 => 'Suournes',
+		44 => 'Vestfiroir',
+		45 => 'Vesturland',
+	),
+	'IT' =>
+	array (
+		'01' => 'Abruzzi',
+		'02' => 'Basilicata',
+		'03' => 'Calabria',
+		'04' => 'Campania',
+		'05' => 'Emilia-Romagna',
+		'06' => 'Friuli-Venezia Giulia',
+		'07' => 'Lazio',
+		'08' => 'Liguria',
+		'09' => 'Lombardia',
+		10 => 'Marche',
+		11 => 'Molise',
+		12 => 'Piemonte',
+		13 => 'Puglia',
+		14 => 'Sardegna',
+		15 => 'Sicilia',
+		16 => 'Toscana',
+		17 => 'Trentino-Alto Adige',
+		18 => 'Umbria',
+		19 => 'Valle d\'Aosta',
+		20 => 'Veneto',
+	),
+	'JM' =>
+	array (
+		'01' => 'Clarendon',
+		'02' => 'Hanover',
+		'04' => 'Manchester',
+		'07' => 'Portland',
+		'08' => 'Saint Andrew',
+		'09' => 'Saint Ann',
+		10 => 'Saint Catherine',
+		11 => 'Saint Elizabeth',
+		12 => 'Saint James',
+		13 => 'Saint Mary',
+		14 => 'Saint Thomas',
+		15 => 'Trelawny',
+		16 => 'Westmoreland',
+		17 => 'Kingston',
+	),
+	'JO' =>
+	array (
+		'02' => 'Al Balqa\'',
+		'09' => 'Al Karak',
+		12 => 'At Tafilah',
+		15 => 'Al Mafraq',
+		16 => 'Amman',
+		17 => 'Az Zaraqa',
+		18 => 'Irbid',
+		19 => 'Ma\'an',
+		20 => 'Ajlun',
+		21 => 'Al Aqabah',
+		22 => 'Jarash',
+		23 => 'Madaba',
+	),
+	'JP' =>
+	array (
+		'01' => 'Aichi',
+		'02' => 'Akita',
+		'03' => 'Aomori',
+		'04' => 'Chiba',
+		'05' => 'Ehime',
+		'06' => 'Fukui',
+		'07' => 'Fukuoka',
+		'08' => 'Fukushima',
+		'09' => 'Gifu',
+		10 => 'Gumma',
+		11 => 'Hiroshima',
+		12 => 'Hokkaido',
+		13 => 'Hyogo',
+		14 => 'Ibaraki',
+		15 => 'Ishikawa',
+		16 => 'Iwate',
+		17 => 'Kagawa',
+		18 => 'Kagoshima',
+		19 => 'Kanagawa',
+		20 => 'Kochi',
+		21 => 'Kumamoto',
+		22 => 'Kyoto',
+		23 => 'Mie',
+		24 => 'Miyagi',
+		25 => 'Miyazaki',
+		26 => 'Nagano',
+		27 => 'Nagasaki',
+		28 => 'Nara',
+		29 => 'Niigata',
+		30 => 'Oita',
+		31 => 'Okayama',
+		32 => 'Osaka',
+		33 => 'Saga',
+		34 => 'Saitama',
+		35 => 'Shiga',
+		36 => 'Shimane',
+		37 => 'Shizuoka',
+		38 => 'Tochigi',
+		39 => 'Tokushima',
+		40 => 'Tokyo',
+		41 => 'Tottori',
+		42 => 'Toyama',
+		43 => 'Wakayama',
+		44 => 'Yamagata',
+		45 => 'Yamaguchi',
+		46 => 'Yamanashi',
+		47 => 'Okinawa',
+	),
+	'KE' =>
+	array (
+		'01' => 'Central',
+		'02' => 'Coast',
+		'03' => 'Eastern',
+		'05' => 'Nairobi Area',
+		'06' => 'North-Eastern',
+		'07' => 'Nyanza',
+		'08' => 'Rift Valley',
+		'09' => 'Western',
+	),
+	'KG' =>
+	array (
+		'01' => 'Bishkek',
+		'02' => 'Chuy',
+		'03' => 'Jalal-Abad',
+		'04' => 'Naryn',
+		'08' => 'Osh',
+		'06' => 'Talas',
+		'07' => 'Ysyk-Kol',
+		'09' => 'Batken',
+	),
+	'KH' =>
+	array (
+		29 => 'Batdambang',
+		'02' => 'Kampong Cham',
+		'03' => 'Kampong Chhnang',
+		'04' => 'Kampong Speu',
+		'05' => 'Kampong Thum',
+		'06' => 'Kampot',
+		'07' => 'Kandal',
+		'08' => 'Koh Kong',
+		'09' => 'Kracheh',
+		10 => 'Mondulkiri',
+		22 => 'Phnum Penh',
+		12 => 'Pursat',
+		13 => 'Preah Vihear',
+		14 => 'Prey Veng',
+		15 => 'Ratanakiri Kiri',
+		16 => 'Siem Reap',
+		17 => 'Stung Treng',
+		18 => 'Svay Rieng',
+		19 => 'Takeo',
+		23 => 'Ratanakiri',
+		25 => 'Banteay Meanchey',
+		28 => 'Preah Seihanu',
+		30 => 'Pailin',
+	),
+	'KI' =>
+	array (
+		'01' => 'Gilbert Islands',
+		'02' => 'Line Islands',
+		'03' => 'Phoenix Islands',
+	),
+	'KM' =>
+	array (
+		'01' => 'Anjouan',
+		'02' => 'Grande Comore',
+		'03' => 'Moheli',
+	),
+	'KN' =>
+	array (
+		'01' => 'Christ Church Nichola Town',
+		'02' => 'Saint Anne Sandy Point',
+		'03' => 'Saint George Basseterre',
+		'04' => 'Saint George Gingerland',
+		'05' => 'Saint James Windward',
+		'06' => 'Saint John Capisterre',
+		'07' => 'Saint John Figtree',
+		'08' => 'Saint Mary Cayon',
+		'09' => 'Saint Paul Capisterre',
+		10 => 'Saint Paul Charlestown',
+		11 => 'Saint Peter Basseterre',
+		12 => 'Saint Thomas Lowland',
+		13 => 'Saint Thomas Middle Island',
+		15 => 'Trinity Palmetto Point',
+	),
+	'KP' =>
+	array (
+		'01' => 'Chagang-do',
+		'03' => 'Hamgyong-namdo',
+		'06' => 'Hwanghae-namdo',
+		'07' => 'Hwanghae-bukto',
+		'08' => 'Kaesong-si',
+		'09' => 'Kangwon-do',
+		11 => 'P\'yongan-bukto',
+		12 => 'P\'yongyang-si',
+		13 => 'Yanggang-do',
+		14 => 'Namp\'o-si',
+		15 => 'P\'yongan-namdo',
+		17 => 'Hamgyong-bukto',
+		18 => 'Najin Sonbong-si',
+	),
+	'KR' =>
+	array (
+		'01' => 'Cheju-do',
+		'03' => 'Cholla-bukto',
+		'05' => 'Ch\'ungch\'ong-bukto',
+		'06' => 'Kangwon-do',
+		10 => 'Pusan-jikhalsi',
+		11 => 'Seoul-t\'ukpyolsi',
+		12 => 'Inch\'on-jikhalsi',
+		13 => 'Kyonggi-do',
+		14 => 'Kyongsang-bukto',
+		15 => 'Taegu-jikhalsi',
+		16 => 'Cholla-namdo',
+		17 => 'Ch\'ungch\'ong-namdo',
+		18 => 'Kwangju-jikhalsi',
+		19 => 'Taejon-jikhalsi',
+		20 => 'Kyongsang-namdo',
+		21 => 'Ulsan-gwangyoksi',
+	),
+	'KW' =>
+	array (
+		'01' => 'Al Ahmadi',
+		'02' => 'Al Kuwayt',
+		'05' => 'Al Jahra',
+		'07' => 'Al Farwaniyah',
+		'08' => 'Hawalli',
+		'09' => 'Mubarak al Kabir',
+	),
+	'KY' =>
+	array (
+		'01' => 'Creek',
+		'02' => 'Eastern',
+		'03' => 'Midland',
+		'04' => 'South Town',
+		'05' => 'Spot Bay',
+		'06' => 'Stake Bay',
+		'07' => 'West End',
+		'08' => 'Western',
+	),
+	'KZ' =>
+	array (
+		'01' => 'Almaty',
+		'02' => 'Almaty City',
+		'03' => 'Aqmola',
+		'04' => 'Aqtobe',
+		'05' => 'Astana',
+		'06' => 'Atyrau',
+		'07' => 'West Kazakhstan',
+		'08' => 'Bayqonyr',
+		'09' => 'Mangghystau',
+		10 => 'South Kazakhstan',
+		11 => 'Pavlodar',
+		12 => 'Qaraghandy',
+		13 => 'Qostanay',
+		14 => 'Qyzylorda',
+		15 => 'East Kazakhstan',
+		16 => 'North Kazakhstan',
+		17 => 'Zhambyl',
+	),
+	'LA' =>
+	array (
+		'01' => 'Attapu',
+		'02' => 'Champasak',
+		'03' => 'Houaphan',
+		'04' => 'Khammouan',
+		'05' => 'Louang Namtha',
+		'07' => 'Oudomxai',
+		'08' => 'Phongsali',
+		'09' => 'Saravan',
+		10 => 'Savannakhet',
+		11 => 'Vientiane',
+		13 => 'Xaignabouri',
+		14 => 'Xiangkhoang',
+		17 => 'Louangphrabang',
+	),
+	'LB' =>
+	array (
+		'08' => 'Beqaa',
+		'02' => 'Al Janub',
+		'09' => 'Liban-Nord',
+		'04' => 'Beyrouth',
+		'05' => 'Mont-Liban',
+		'06' => 'Liban-Sud',
+		'07' => 'Nabatiye',
+		10 => 'Aakk',
+		11 => 'Baalbek-Hermel',
+	),
+	'LC' =>
+	array (
+		'01' => 'Anse-la-Raye',
+		'02' => 'Dauphin',
+		'03' => 'Castries',
+		'04' => 'Choiseul',
+		'05' => 'Dennery',
+		'06' => 'Gros-Islet',
+		'07' => 'Laborie',
+		'08' => 'Micoud',
+		'09' => 'Soufriere',
+		10 => 'Vieux-Fort',
+		11 => 'Praslin',
+	),
+	'LI' =>
+	array (
+		'01' => 'Balzers',
+		'02' => 'Eschen',
+		'03' => 'Gamprin',
+		'04' => 'Mauren',
+		'05' => 'Planken',
+		'06' => 'Ruggell',
+		'07' => 'Schaan',
+		'08' => 'Schellenberg',
+		'09' => 'Triesen',
+		10 => 'Triesenberg',
+		11 => 'Vaduz',
+		21 => 'Gbarpolu',
+		22 => 'River Gee',
+	),
+	'LK' =>
+	array (
+		29 => 'Central',
+		30 => 'North Central',
+		32 => 'North Western',
+		33 => 'Sabaragamuwa',
+		34 => 'Southern',
+		35 => 'Uva',
+		36 => 'Western',
+		37 => 'Eastern',
+		38 => 'Northern',
+	),
+	'LR' =>
+	array (
+		'01' => 'Bong',
+		12 => 'Grand Cape Mount',
+		20 => 'Lofa',
+		13 => 'Maryland',
+		'07' => 'Monrovia',
+		'09' => 'Nimba',
+		10 => 'Sino',
+		11 => 'Grand Bassa',
+		14 => 'Montserrado',
+		17 => 'Margibi',
+		18 => 'River Cess',
+		19 => 'Grand Gedeh',
+		21 => 'Gbarpolu',
+		22 => 'River Gee',
+	),
+	'LS' =>
+	array (
+		10 => 'Berea',
+		11 => 'Butha-Buthe',
+		12 => 'Leribe',
+		13 => 'Mafeteng',
+		14 => 'Maseru',
+		15 => 'Mohales Hoek',
+		16 => 'Mokhotlong',
+		17 => 'Qachas Nek',
+		18 => 'Quthing',
+		19 => 'Thaba-Tseka',
+	),
+	'LT' =>
+	array (
+		56 => 'Alytaus Apskritis',
+		57 => 'Kauno Apskritis',
+		58 => 'Klaipedos Apskritis',
+		59 => 'Marijampoles Apskritis',
+		60 => 'Panevezio Apskritis',
+		61 => 'Siauliu Apskritis',
+		62 => 'Taurages Apskritis',
+		63 => 'Telsiu Apskritis',
+		64 => 'Utenos Apskritis',
+		65 => 'Vilniaus Apskritis',
+	),
+	'LU' =>
+	array (
+		'01' => 'Diekirch',
+		'02' => 'Grevenmacher',
+		'03' => 'Luxembourg',
+	),
+	'LV' =>
+	array (
+		'01' => 'Aizkraukles',
+		'02' => 'Aluksnes',
+		'03' => 'Balvu',
+		'04' => 'Bauskas',
+		'05' => 'Cesu',
+		'07' => 'Daugavpils',
+		'08' => 'Dobeles',
+		'09' => 'Gulbenes',
+		10 => 'Jekabpils',
+		11 => 'Jelgava',
+		12 => 'Jelgavas',
+		13 => 'Jurmala',
+		14 => 'Kraslavas',
+		15 => 'Kuldigas',
+		16 => 'Liepaja',
+		17 => 'Liepajas',
+		18 => 'Limbazu',
+		19 => 'Ludzas',
+		20 => 'Madonas',
+		21 => 'Ogres',
+		22 => 'Preilu',
+		23 => 'Rezekne',
+		24 => 'Rezeknes',
+		25 => 'Riga',
+		26 => 'Rigas',
+		27 => 'Saldus',
+		28 => 'Talsu',
+		29 => 'Tukuma',
+		30 => 'Valkas',
+		31 => 'Valmieras',
+		33 => 'Ventspils',
+	),
+	'LY' =>
+	array (
+		'03' => 'Al Aziziyah',
+		'05' => 'Al Jufrah',
+		'08' => 'Al Kufrah',
+		13 => 'Ash Shati\'',
+		30 => 'Murzuq',
+		34 => 'Sabha',
+		41 => 'Tarhunah',
+		42 => 'Tubruq',
+		45 => 'Zlitan',
+		47 => 'Ajdabiya',
+		48 => 'Al Fatih',
+		49 => 'Al Jabal al Akhdar',
+		50 => 'Al Khums',
+		51 => 'An Nuqat al Khams',
+		52 => 'Awbari',
+		53 => 'Az Zawiyah',
+		54 => 'Banghazi',
+		55 => 'Darnah',
+		56 => 'Ghadamis',
+		57 => 'Gharyan',
+		58 => 'Misratah',
+		59 => 'Sawfajjin',
+		60 => 'Surt',
+		61 => 'Tarabulus',
+		62 => 'Yafran',
+	),
+	'MA' =>
+	array (
+		45 => 'Grand Casablanca',
+		46 => 'Fes-Boulemane',
+		47 => 'Marrakech-Tensift-Al Haouz',
+		48 => 'Meknes-Tafilalet',
+		49 => 'Rabat-Sale-Zemmour-Zaer',
+		50 => 'Chaouia-Ouardigha',
+		51 => 'Doukkala-Abda',
+		52 => 'Gharb-Chrarda-Beni Hssen',
+		53 => 'Guelmim-Es Smara',
+		54 => 'Oriental',
+		55 => 'Souss-Massa-Dr',
+		56 => 'Tadla-Azilal',
+		57 => 'Tanger-Tetouan',
+		58 => 'Taza-Al Hoceima-Taounate',
+		59 => 'La',
+	),
+	'MC' =>
+	array (
+		'01' => 'La Condamine',
+		'02' => 'Monaco',
+		'03' => 'Monte-Carlo',
+	),
+	'MD' =>
+	array (
+		51 => 'Gagauzia',
+		57 => 'Chisinau',
+		58 => 'Stinga Nistrului',
+		59 => 'Anenii Noi',
+		60 => 'Balti',
+		61 => 'Basarabeasca',
+		62 => 'Bender',
+		63 => 'Briceni',
+		64 => 'Cahul',
+		65 => 'Cantemir',
+		66 => 'Calarasi',
+		67 => 'Causeni',
+		68 => 'Cimislia',
+		69 => 'Criuleni',
+		70 => 'Donduseni',
+		71 => 'Drochia',
+		72 => 'Dubasari',
+		73 => 'Edinet',
+		74 => 'Falesti',
+		75 => 'Floresti',
+		76 => 'Glodeni',
+		77 => 'Hincesti',
+		78 => 'Ialoveni',
+		79 => 'Leova',
+		80 => 'Nisporeni',
+		81 => 'Ocnita',
+		82 => 'Orhei',
+		83 => 'Rezina',
+		84 => 'Riscani',
+		85 => 'Singerei',
+		86 => 'Soldanesti',
+		87 => 'Soroca',
+		88 => 'Stefan-Voda',
+		89 => 'Straseni',
+		90 => 'Taraclia',
+		91 => 'Telenesti',
+		92 => 'Ungheni',
+	),
+	'MG' =>
+	array (
+		'01' => 'Antsiranana',
+		'02' => 'Fianarantsoa',
+		'03' => 'Mahajanga',
+		'04' => 'Toamasina',
+		'05' => 'Antananarivo',
+		'06' => 'Toliara',
+	),
+	'MK' =>
+	array (
+		'01' => 'Aracinovo',
+		'02' => 'Bac',
+		'03' => 'Belcista',
+		'04' => 'Berovo',
+		'05' => 'Bistrica',
+		'06' => 'Bitola',
+		'07' => 'Blatec',
+		'08' => 'Bogdanci',
+		'09' => 'Bogomila',
+		10 => 'Bogovinje',
+		11 => 'Bosilovo',
+		12 => 'Brvenica',
+		'C8' => 'Cair',
+		14 => 'Capari',
+		'C9' => 'Caska',
+		16 => 'Cegrane',
+		17 => 'Centar',
+		18 => 'Centar Zupa',
+		19 => 'Cesinovo',
+		20 => 'Cucer-Sandevo',
+		'D2' => 'Debar',
+		22 => 'Delcevo',
+		23 => 'Delogozdi',
+		'D3' => 'Demir Hisar',
+		25 => 'Demir Kapija',
+		26 => 'Dobrusevo',
+		27 => 'Dolna Banjica',
+		28 => 'Dolneni',
+		29 => 'Dorce Petrov',
+		30 => 'Drugovo',
+		31 => 'Dzepciste',
+		32 => 'Gazi Baba',
+		33 => 'Gevgelija',
+		'D4' => 'Gostivar',
+		35 => 'Gradsko',
+		36 => 'Ilinden',
+		37 => 'Izvor',
+		'D5' => 'Jegunovce',
+		39 => 'Kamenjane',
+		40 => 'Karbinci',
+		41 => 'Karpos',
+		'D6' => 'Kavadarci',
+		43 => 'Kicevo',
+		44 => 'Kisela Voda',
+		45 => 'Klecevce',
+		46 => 'Kocani',
+		47 => 'Konce',
+		48 => 'Kondovo',
+		49 => 'Konopiste',
+		50 => 'Kosel',
+		51 => 'Kratovo',
+		52 => 'Kriva Palanka',
+		53 => 'Krivogastani',
+		54 => 'Krusevo',
+		55 => 'Kuklis',
+		56 => 'Kukurecani',
+		'D7' => 'Kumanovo',
+		58 => 'Labunista',
+		59 => 'Lipkovo',
+		60 => 'Lozovo',
+		61 => 'Lukovo',
+		62 => 'Makedonska Kamenica',
+		'D8' => 'Makedonski Brod',
+		64 => 'Mavrovi Anovi',
+		65 => 'Meseista',
+		66 => 'Miravci',
+		67 => 'Mogila',
+		68 => 'Murtino',
+		69 => 'Negotino',
+		70 => 'Negotino-Polosko',
+		71 => 'Novaci',
+		72 => 'Novo Selo',
+		73 => 'Oblesevo',
+		'E2' => 'Ohrid',
+		75 => 'Orasac',
+		76 => 'Orizari',
+		77 => 'Oslomej',
+		78 => 'Pehcevo',
+		79 => 'Petrovec',
+		80 => 'Plasnica',
+		81 => 'Podares',
+		'E3' => 'Prilep',
+		83 => 'Probistip',
+		84 => 'Radovis',
+		85 => 'Rankovce',
+		86 => 'Resen',
+		87 => 'Rosoman',
+		88 => 'Rostusa',
+		89 => 'Samokov',
+		90 => 'Saraj',
+		91 => 'Sipkovica',
+		92 => 'Sopiste',
+		93 => 'Sopotnica',
+		94 => 'Srbinovo',
+		95 => 'Staravina',
+		96 => 'Star Dojran',
+		97 => 'Staro Nagoricane',
+		98 => 'Stip',
+		'E6' => 'Struga',
+		'E7' => 'Strumica',
+		'A2' => 'Studenicani',
+		'A3' => 'Suto Orizari',
+		'A4' => 'Sveti Nikole',
+		'A5' => 'Tearce',
+		'E8' => 'Tetovo',
+		'A7' => 'Topolcani',
+		'E9' => 'Valandovo',
+		'A9' => 'Vasilevo',
+		'F1' => 'Veles',
+		'B2' => 'Velesta',
+		'B3' => 'Vevcani',
+		'B4' => 'Vinica',
+		'B5' => 'Vitoliste',
+		'B6' => 'Vranestica',
+		'B7' => 'Vrapciste',
+		'B8' => 'Vratnica',
+		'B9' => 'Vrutok',
+		'C1' => 'Zajas',
+		'C2' => 'Zelenikovo',
+		'C3' => 'Zelino',
+		'C4' => 'Zitose',
+		'C5' => 'Zletovo',
+		'C6' => 'Zrnovci',
+		'E5' => 'Dojran',
+		'F2' => 'Aerodrom',
+	),
+	'ML' =>
+	array (
+		'01' => 'Bamako',
+		'03' => 'Kayes',
+		'04' => 'Mopti',
+		'05' => 'Segou',
+		'06' => 'Sikasso',
+		'07' => 'Koulikoro',
+		'08' => 'Tombouctou',
+		'09' => 'Gao',
+		10 => 'Kidal',
+	),
+	'MM' =>
+	array (
+		'01' => 'Rakhine State',
+		'02' => 'Chin State',
+		'03' => 'Irrawaddy',
+		'04' => 'Kachin State',
+		'05' => 'Karan State',
+		'06' => 'Kayah State',
+		'07' => 'Magwe',
+		'08' => 'Mandalay',
+		'09' => 'Pegu',
+		10 => 'Sagaing',
+		11 => 'Shan State',
+		12 => 'Tenasserim',
+		13 => 'Mon State',
+		14 => 'Rangoon',
+		17 => 'Yangon',
+	),
+	'MN' =>
+	array (
+		'01' => 'Arhangay',
+		'02' => 'Bayanhongor',
+		'03' => 'Bayan-Olgiy',
+		'05' => 'Darhan',
+		'06' => 'Dornod',
+		'07' => 'Dornogovi',
+		'08' => 'Dundgovi',
+		'09' => 'Dzavhan',
+		10 => 'Govi-Altay',
+		11 => 'Hentiy',
+		12 => 'Hovd',
+		13 => 'Hovsgol',
+		14 => 'Omnogovi',
+		15 => 'Ovorhangay',
+		16 => 'Selenge',
+		17 => 'Suhbaatar',
+		18 => 'Tov',
+		19 => 'Uvs',
+		20 => 'Ulaanbaatar',
+		21 => 'Bulgan',
+		22 => 'Erdenet',
+		23 => 'Darhan-Uul',
+		24 => 'Govisumber',
+		25 => 'Orhon',
+	),
+	'MO' =>
+	array (
+		'01' => 'Ilhas',
+		'02' => 'Macau',
+	),
+	'MR' =>
+	array (
+		'01' => 'Hodh Ech Chargui',
+		'02' => 'Hodh El Gharbi',
+		'03' => 'Assaba',
+		'04' => 'Gorgol',
+		'05' => 'Brakna',
+		'06' => 'Trarza',
+		'07' => 'Adrar',
+		'08' => 'Dakhlet Nouadhibou',
+		'09' => 'Tagant',
+		10 => 'Guidimaka',
+		11 => 'Tiris Zemmour',
+		12 => 'Inchiri',
+	),
+	'MS' =>
+	array (
+		'01' => 'Saint Anthony',
+		'02' => 'Saint Georges',
+		'03' => 'Saint Peter',
+	),
+	'MU' =>
+	array (
+		12 => 'Black River',
+		13 => 'Flacq',
+		14 => 'Grand Port',
+		15 => 'Moka',
+		16 => 'Pamplemousses',
+		17 => 'Plaines Wilhems',
+		18 => 'Port Louis',
+		19 => 'Riviere du Rempart',
+		20 => 'Savanne',
+		21 => 'Agalega Islands',
+		22 => 'Cargados Carajos',
+		23 => 'Rodrigues',
+	),
+	'MV' =>
+	array (
+		'01' => 'Seenu',
+		'05' => 'Laamu',
+		30 => 'Alifu',
+		31 => 'Baa',
+		32 => 'Dhaalu',
+		33 => 'Faafu',
+		34 => 'Gaafu Alifu',
+		35 => 'Gaafu Dhaalu',
+		36 => 'Haa Alifu',
+		37 => 'Haa Dhaalu',
+		38 => 'Kaafu',
+		39 => 'Lhaviyani',
+		40 => 'Maale',
+		41 => 'Meemu',
+		42 => 'Gnaviyani',
+		43 => 'Noonu',
+		44 => 'Raa',
+		45 => 'Shaviyani',
+		46 => 'Thaa',
+		47 => 'Vaavu',
+	),
+	'MW' =>
+	array (
+		'02' => 'Chikwawa',
+		'03' => 'Chiradzulu',
+		'04' => 'Chitipa',
+		'05' => 'Thyolo',
+		'06' => 'Dedza',
+		'07' => 'Dowa',
+		'08' => 'Karonga',
+		'09' => 'Kasungu',
+		11 => 'Lilongwe',
+		12 => 'Mangochi',
+		13 => 'Mchinji',
+		15 => 'Mzimba',
+		16 => 'Ntcheu',
+		17 => 'Nkhata Bay',
+		18 => 'Nkhotakota',
+		19 => 'Nsanje',
+		20 => 'Ntchisi',
+		21 => 'Rumphi',
+		22 => 'Salima',
+		23 => 'Zomba',
+		24 => 'Blantyre',
+		25 => 'Mwanza',
+		26 => 'Balaka',
+		27 => 'Likoma',
+		28 => 'Machinga',
+		29 => 'Mulanje',
+		30 => 'Phalombe',
+	),
+	'MX' =>
+	array (
+		'01' => 'Aguascalientes',
+		'02' => 'Baja California',
+		'03' => 'Baja California Sur',
+		'04' => 'Campeche',
+		'05' => 'Chiapas',
+		'06' => 'Chihuahua',
+		'07' => 'Coahuila de Zaragoza',
+		'08' => 'Colima',
+		'09' => 'Distrito Federal',
+		10 => 'Durango',
+		11 => 'Guanajuato',
+		12 => 'Guerrero',
+		13 => 'Hidalgo',
+		14 => 'Jalisco',
+		15 => 'Mexico',
+		16 => 'Michoacan de Ocampo',
+		17 => 'Morelos',
+		18 => 'Nayarit',
+		19 => 'Nuevo Leon',
+		20 => 'Oaxaca',
+		21 => 'Puebla',
+		22 => 'Queretaro de Arteaga',
+		23 => 'Quintana Roo',
+		24 => 'San Luis Potosi',
+		25 => 'Sinaloa',
+		26 => 'Sonora',
+		27 => 'Tabasco',
+		28 => 'Tamaulipas',
+		29 => 'Tlaxcala',
+		30 => 'Veracruz-Llave',
+		31 => 'Yucatan',
+		32 => 'Zacatecas',
+	),
+	'MY' =>
+	array (
+		'01' => 'Johor',
+		'02' => 'Kedah',
+		'03' => 'Kelantan',
+		'04' => 'Melaka',
+		'05' => 'Negeri Sembilan',
+		'06' => 'Pahang',
+		'07' => 'Perak',
+		'08' => 'Perlis',
+		'09' => 'Pulau Pinang',
+		11 => 'Sarawak',
+		12 => 'Selangor',
+		13 => 'Terengganu',
+		14 => 'Kuala Lumpur',
+		15 => 'Labuan',
+		16 => 'Sabah',
+		17 => 'Putrajaya',
+	),
+	'MZ' =>
+	array (
+		'01' => 'Cabo Delgado',
+		'02' => 'Gaza',
+		'03' => 'Inhambane',
+		11 => 'Maputo',
+		'05' => 'Sofala',
+		'06' => 'Nampula',
+		'07' => 'Niassa',
+		'08' => 'Tete',
+		'09' => 'Zambezia',
+		10 => 'Manica',
+	),
+	'NA' =>
+	array (
+		'01' => 'Bethanien',
+		'02' => 'Caprivi Oos',
+		'03' => 'Boesmanland',
+		'04' => 'Gobabis',
+		'05' => 'Grootfontein',
+		'06' => 'Kaokoland',
+		'07' => 'Karibib',
+		'08' => 'Keetmanshoop',
+		'09' => 'Luderitz',
+		10 => 'Maltahohe',
+		11 => 'Okahandja',
+		12 => 'Omaruru',
+		13 => 'Otjiwarongo',
+		14 => 'Outjo',
+		15 => 'Owambo',
+		16 => 'Rehoboth',
+		17 => 'Swakopmund',
+		18 => 'Tsumeb',
+		20 => 'Karasburg',
+		21 => 'Windhoek',
+		22 => 'Damaraland',
+		23 => 'Hereroland Oos',
+		24 => 'Hereroland Wes',
+		25 => 'Kavango',
+		26 => 'Mariental',
+		27 => 'Namaland',
+		28 => 'Caprivi',
+		29 => 'Erongo',
+		30 => 'Hardap',
+		31 => 'Karas',
+		32 => 'Kunene',
+		33 => 'Ohangwena',
+		34 => 'Okavango',
+		35 => 'Omaheke',
+		36 => 'Omusati',
+		37 => 'Oshana',
+		38 => 'Oshikoto',
+		39 => 'Otjozondjupa',
+	),
+	'NE' =>
+	array (
+		'01' => 'Agadez',
+		'02' => 'Diffa',
+		'03' => 'Dosso',
+		'04' => 'Maradi',
+		'08' => 'Niamey',
+		'06' => 'Tahoua',
+		'07' => 'Zinder',
+	),
+	'NG' =>
+	array (
+		'05' => 'Lagos',
+		11 => 'Federal Capital Territory',
+		16 => 'Ogun',
+		21 => 'Akwa Ibom',
+		22 => 'Cross River',
+		23 => 'Kaduna',
+		24 => 'Katsina',
+		25 => 'Anambra',
+		26 => 'Benue',
+		27 => 'Borno',
+		28 => 'Imo',
+		29 => 'Kano',
+		30 => 'Kwara',
+		31 => 'Niger',
+		32 => 'Oyo',
+		35 => 'Adamawa',
+		36 => 'Delta',
+		37 => 'Edo',
+		39 => 'Jigawa',
+		40 => 'Kebbi',
+		41 => 'Kogi',
+		42 => 'Osun',
+		43 => 'Taraba',
+		44 => 'Yobe',
+		45 => 'Abia',
+		46 => 'Bauchi',
+		47 => 'Enugu',
+		48 => 'Ondo',
+		49 => 'Plateau',
+		50 => 'Rivers',
+		51 => 'Sokoto',
+		52 => 'Bayelsa',
+		53 => 'Ebonyi',
+		54 => 'Ekiti',
+		55 => 'Gombe',
+		56 => 'Nassarawa',
+		57 => 'Zamfara',
+	),
+	'NI' =>
+	array (
+		'01' => 'Boaco',
+		'02' => 'Carazo',
+		'03' => 'Chinandega',
+		'04' => 'Chontales',
+		'05' => 'Esteli',
+		'06' => 'Granada',
+		'07' => 'Jinotega',
+		'08' => 'Leon',
+		'09' => 'Madriz',
+		10 => 'Managua',
+		11 => 'Masaya',
+		12 => 'Matagalpa',
+		13 => 'Nueva Segovia',
+		14 => 'Rio San Juan',
+		15 => 'Rivas',
+		16 => 'Zelaya',
+		17 => 'Autonoma Atlantico Norte',
+		18 => 'Region Autonoma Atlantico Sur',
+	),
+	'NL' =>
+	array (
+		'01' => 'Drenthe',
+		'02' => 'Friesland',
+		'03' => 'Gelderland',
+		'04' => 'Groningen',
+		'05' => 'Limburg',
+		'06' => 'Noord-Brabant',
+		'07' => 'Noord-Holland',
+		'09' => 'Utrecht',
+		10 => 'Zeeland',
+		11 => 'Zuid-Holland',
+		15 => 'Overijssel',
+		16 => 'Flevoland',
+	),
+	'NO' =>
+	array (
+		'01' => 'Akershus',
+		'02' => 'Aust-Agder',
+		'04' => 'Buskerud',
+		'05' => 'Finnmark',
+		'06' => 'Hedmark',
+		'07' => 'Hordaland',
+		'08' => 'More og Romsdal',
+		'09' => 'Nordland',
+		10 => 'Nord-Trondelag',
+		11 => 'Oppland',
+		12 => 'Oslo',
+		13 => 'Ostfold',
+		14 => 'Rogaland',
+		15 => 'Sogn og Fjordane',
+		16 => 'Sor-Trondelag',
+		17 => 'Telemark',
+		18 => 'Troms',
+		19 => 'Vest-Agder',
+		20 => 'Vestfold',
+	),
+	'NP' =>
+	array (
+		'01' => 'Bagmati',
+		'02' => 'Bheri',
+		'03' => 'Dhawalagiri',
+		'04' => 'Gandaki',
+		'05' => 'Janakpur',
+		'06' => 'Karnali',
+		'07' => 'Kosi',
+		'08' => 'Lumbini',
+		'09' => 'Mahakali',
+		10 => 'Mechi',
+		11 => 'Narayani',
+		12 => 'Rapti',
+		13 => 'Sagarmatha',
+		14 => 'Seti',
+	),
+	'NR' =>
+	array (
+		'01' => 'Aiwo',
+		'02' => 'Anabar',
+		'03' => 'Anetan',
+		'04' => 'Anibare',
+		'05' => 'Baiti',
+		'06' => 'Boe',
+		'07' => 'Buada',
+		'08' => 'Denigomodu',
+		'09' => 'Ewa',
+		10 => 'Ijuw',
+		11 => 'Meneng',
+		12 => 'Nibok',
+		13 => 'Uaboe',
+		14 => 'Yaren',
+	),
+	'NZ' =>
+	array (
+		10 => 'Chatham Islands',
+		'E7' => 'Auckland',
+		'E8' => 'Bay of Plenty',
+		'E9' => 'Canterbury',
+		'F1' => 'Gisborne',
+		'F2' => 'Hawke\'s Bay',
+		'F3' => 'Manawatu-Wanganui',
+		'F4' => 'Marlborough',
+		'F5' => 'Nelson',
+		'F6' => 'Northland',
+		'F7' => 'Otago',
+		'F8' => 'Southland',
+		'F9' => 'Taranaki',
+		'G1' => 'Waikato',
+		'G2' => 'Wellington',
+		'G3' => 'West Coast',
+	),
+	'OM' =>
+	array (
+		'01' => 'Ad Dakhiliyah',
+		'02' => 'Al Batinah',
+		'03' => 'Al Wusta',
+		'04' => 'Ash Sharqiyah',
+		'05' => 'Az Zahirah',
+		'06' => 'Masqat',
+		'07' => 'Musandam',
+		'08' => 'Zufar',
+	),
+	'PA' =>
+	array (
+		'01' => 'Bocas del Toro',
+		'02' => 'Chiriqui',
+		'03' => 'Cocle',
+		'04' => 'Colon',
+		'05' => 'Darien',
+		'06' => 'Herrera',
+		'07' => 'Los Santos',
+		'08' => 'Panama',
+		'09' => 'San Blas',
+		10 => 'Veraguas',
+	),
+	'PE' =>
+	array (
+		'01' => 'Amazonas',
+		'02' => 'Ancash',
+		'03' => 'Apurimac',
+		'04' => 'Arequipa',
+		'05' => 'Ayacucho',
+		'06' => 'Cajamarca',
+		'07' => 'Callao',
+		'08' => 'Cusco',
+		'09' => 'Huancavelica',
+		10 => 'Huanuco',
+		11 => 'Ica',
+		12 => 'Junin',
+		13 => 'La Libertad',
+		14 => 'Lambayeque',
+		15 => 'Lima',
+		16 => 'Loreto',
+		17 => 'Madre de Dios',
+		18 => 'Moquegua',
+		19 => 'Pasco',
+		20 => 'Piura',
+		21 => 'Puno',
+		22 => 'San Martin',
+		23 => 'Tacna',
+		24 => 'Tumbes',
+		25 => 'Ucayali',
+	),
+	'PG' =>
+	array (
+		'01' => 'Central',
+		'02' => 'Gulf',
+		'03' => 'Milne Bay',
+		'04' => 'Northern',
+		'05' => 'Southern Highlands',
+		'06' => 'Western',
+		'07' => 'North Solomons',
+		'08' => 'Chimbu',
+		'09' => 'Eastern Highlands',
+		10 => 'East New Britain',
+		11 => 'East Sepik',
+		12 => 'Madang',
+		13 => 'Manus',
+		14 => 'Morobe',
+		15 => 'New Ireland',
+		16 => 'Western Highlands',
+		17 => 'West New Britain',
+		18 => 'Sandaun',
+		19 => 'Enga',
+		20 => 'National Capital',
+	),
+	'PH' =>
+	array (
+		'01' => 'Abra',
+		'02' => 'Agusan del Norte',
+		'03' => 'Agusan del Sur',
+		'04' => 'Aklan',
+		'05' => 'Albay',
+		'06' => 'Antique',
+		'07' => 'Bataan',
+		'08' => 'Batanes',
+		'09' => 'Batangas',
+		10 => 'Benguet',
+		11 => 'Bohol',
+		12 => 'Bukidnon',
+		13 => 'Bulacan',
+		14 => 'Cagayan',
+		15 => 'Camarines Norte',
+		16 => 'Camarines Sur',
+		17 => 'Camiguin',
+		18 => 'Capiz',
+		19 => 'Catanduanes',
+		20 => 'Cavite',
+		21 => 'Cebu',
+		22 => 'Basilan',
+		23 => 'Eastern Samar',
+		24 => 'Davao',
+		25 => 'Davao del Sur',
+		26 => 'Davao Oriental',
+		27 => 'Ifugao',
+		28 => 'Ilocos Norte',
+		29 => 'Ilocos Sur',
+		30 => 'Iloilo',
+		31 => 'Isabela',
+		32 => 'Kalinga-Apayao',
+		33 => 'Laguna',
+		34 => 'Lanao del Norte',
+		35 => 'Lanao del Sur',
+		36 => 'La Union',
+		37 => 'Leyte',
+		38 => 'Marinduque',
+		39 => 'Masbate',
+		40 => 'Mindoro Occidental',
+		41 => 'Mindoro Oriental',
+		42 => 'Misamis Occidental',
+		43 => 'Misamis Oriental',
+		44 => 'Mountain',
+		'H3' => 'Negros Occidental',
+		46 => 'Negros Oriental',
+		47 => 'Nueva Ecija',
+		48 => 'Nueva Vizcaya',
+		49 => 'Palawan',
+		50 => 'Pampanga',
+		51 => 'Pangasinan',
+		53 => 'Rizal',
+		54 => 'Romblon',
+		55 => 'Samar',
+		56 => 'Maguindanao',
+		57 => 'North Cotabato',
+		58 => 'Sorsogon',
+		59 => 'Southern Leyte',
+		60 => 'Sulu',
+		'N3' => 'Surigao del Norte',
+		62 => 'Surigao del Sur',
+		63 => 'Tarlac',
+		'P1' => 'Zambales',
+		65 => 'Zamboanga del Norte',
+		66 => 'Zamboanga del Sur',
+		67 => 'Northern Samar',
+		68 => 'Quirino',
+		69 => 'Siquijor',
+		70 => 'South Cotabato',
+		71 => 'Sultan Kudarat',
+		72 => 'Tawitawi',
+		'A1' => 'Angeles',
+		'A2' => 'Bacolod',
+		'A3' => 'Bago',
+		'A4' => 'Baguio',
+		'A5' => 'Bais',
+		'A6' => 'Basilan City',
+		'A7' => 'Batangas City',
+		'A8' => 'Butuan',
+		'A9' => 'Cabanatuan',
+		'B1' => 'Cadiz',
+		'B2' => 'Cagayan de Oro',
+		'B3' => 'Calbayog',
+		'B4' => 'Caloocan',
+		'B5' => 'Canlaon',
+		'B6' => 'Cavite City',
+		'B7' => 'Cebu City',
+		'B8' => 'Cotabato',
+		'B9' => 'Dagupan',
+		'C1' => 'Danao',
+		'C2' => 'Dapitan',
+		'C3' => 'Davao City',
+		'C4' => 'Dipolog',
+		'C5' => 'Dumaguete',
+		'C6' => 'General Santos',
+		'C7' => 'Gingoog',
+		'C8' => 'Iligan',
+		'C9' => 'Iloilo City',
+		'D1' => 'Iriga',
+		'D2' => 'La Carlota',
+		'D3' => 'Laoag',
+		'D4' => 'Lapu-Lapu',
+		'D5' => 'Legaspi',
+		'D6' => 'Lipa',
+		'D7' => 'Lucena',
+		'D8' => 'Mandaue',
+		'D9' => 'Manila',
+		'E1' => 'Marawi',
+		'E2' => 'Naga',
+		'E3' => 'Olongapo',
+		'E4' => 'Ormoc',
+		'E5' => 'Oroquieta',
+		'E6' => 'Ozamis',
+		'E7' => 'Pagadian',
+		'E8' => 'Palayan',
+		'E9' => 'Pasay',
+		'F1' => 'Puerto Princesa',
+		'F2' => 'Quezon City',
+		'F3' => 'Roxas',
+		'F5' => 'San Carlos',
+		'F6' => 'San Jose',
+		'F7' => 'San Pablo',
+		'F8' => 'Silay',
+		'F9' => 'Surigao',
+		'G1' => 'Tacloban',
+		'G2' => 'Tagaytay',
+		'G3' => 'Tagbilaran',
+		'G4' => 'Tangub',
+		'G5' => 'Toledo',
+		'G6' => 'Trece Martires',
+		'P2' => 'Zamboanga',
+		'G8' => 'Aurora',
+		'H2' => 'Quezon',
+		'H9' => 'Biliran',
+		'I6' => 'Compostela Valley',
+		'I7' => 'Davao del Norte',
+		'J3' => 'Guimaras',
+		'J4' => 'Himamaylan',
+		'J7' => 'Kalinga',
+		'K1' => 'Las Pinas',
+		'K5' => 'Malabon',
+		'K6' => 'Malaybalay',
+		'L4' => 'Muntinlupa',
+		'L5' => 'Navotas',
+		'L7' => 'Paranaque',
+		'L9' => 'Passi',
+		'M5' => 'San Jose del Monte',
+		'M6' => 'San Juan',
+		'M8' => 'Santiago',
+		'M9' => 'Sarangani',
+		'N1' => 'Sipalay',
+	),
+	'PK' =>
+	array (
+		'01' => 'Federally Administered Tribal Areas',
+		'02' => 'Balochistan',
+		'03' => 'North-West Frontier',
+		'04' => 'Punjab',
+		'05' => 'Sindh',
+		'06' => 'Azad Kashmir',
+		'07' => 'Northern Areas',
+		'08' => 'Islamabad',
+	),
+	'PL' =>
+	array (
+		72 => 'Dolnoslaskie',
+		73 => 'Kujawsko-Pomorskie',
+		74 => 'Lodzkie',
+		75 => 'Lubelskie',
+		76 => 'Lubuskie',
+		77 => 'Malopolskie',
+		78 => 'Mazowieckie',
+		79 => 'Opolskie',
+		80 => 'Podkarpackie',
+		81 => 'Podlaskie',
+		82 => 'Pomorskie',
+		83 => 'Slaskie',
+		84 => 'Swietokrzyskie',
+		85 => 'Warminsko-Mazurskie',
+		86 => 'Wielkopolskie',
+		87 => 'Zachodniopomorskie',
+	),
+	'PS' =>
+	array (
+		'GZ' => 'Gaza',
+		'WE' => 'West Bank',
+	),
+	'PT' =>
+	array (
+		'02' => 'Aveiro',
+		'03' => 'Beja',
+		'04' => 'Braga',
+		'05' => 'Braganca',
+		'06' => 'Castelo Branco',
+		'07' => 'Coimbra',
+		'08' => 'Evora',
+		'09' => 'Faro',
+		10 => 'Madeira',
+		11 => 'Guarda',
+		13 => 'Leiria',
+		14 => 'Lisboa',
+		16 => 'Portalegre',
+		17 => 'Porto',
+		18 => 'Santarem',
+		19 => 'Setubal',
+		20 => 'Viana do Castelo',
+		21 => 'Vila Real',
+		22 => 'Viseu',
+		23 => 'Azores',
+	),
+	'PY' =>
+	array (
+		'01' => 'Alto Parana',
+		'02' => 'Amambay',
+		'04' => 'Caaguazu',
+		'05' => 'Caazapa',
+		'06' => 'Central',
+		'07' => 'Concepcion',
+		'08' => 'Cordillera',
+		10 => 'Guaira',
+		11 => 'Itapua',
+		12 => 'Misiones',
+		13 => 'Neembucu',
+		15 => 'Paraguari',
+		16 => 'Presidente Hayes',
+		17 => 'San Pedro',
+		19 => 'Canindeyu',
+		22 => 'Asuncion',
+		23 => 'Alto Paraguay',
+		24 => 'Boqueron',
+	),
+	'QA' =>
+	array (
+		'01' => 'Ad Dawhah',
+		'02' => 'Al Ghuwariyah',
+		'03' => 'Al Jumaliyah',
+		'04' => 'Al Khawr',
+		'05' => 'Al Wakrah Municipality',
+		'06' => 'Ar Rayyan',
+		'08' => 'Madinat ach Shamal',
+		'09' => 'Umm Salal',
+		10 => 'Al Wakrah',
+		11 => 'Jariyan al Batnah',
+		12 => 'Umm Sa\'id',
+	),
+	'RO' =>
+	array (
+		'01' => 'Alba',
+		'02' => 'Arad',
+		'03' => 'Arges',
+		'04' => 'Bacau',
+		'05' => 'Bihor',
+		'06' => 'Bistrita-Nasaud',
+		'07' => 'Botosani',
+		'08' => 'Braila',
+		'09' => 'Brasov',
+		10 => 'Bucuresti',
+		11 => 'Buzau',
+		12 => 'Caras-Severin',
+		13 => 'Cluj',
+		14 => 'Constanta',
+		15 => 'Covasna',
+		16 => 'Dambovita',
+		17 => 'Dolj',
+		18 => 'Galati',
+		19 => 'Gorj',
+		20 => 'Harghita',
+		21 => 'Hunedoara',
+		22 => 'Ialomita',
+		23 => 'Iasi',
+		25 => 'Maramures',
+		26 => 'Mehedinti',
+		27 => 'Mures',
+		28 => 'Neamt',
+		29 => 'Olt',
+		30 => 'Prahova',
+		31 => 'Salaj',
+		32 => 'Satu Mare',
+		33 => 'Sibiu',
+		34 => 'Suceava',
+		35 => 'Teleorman',
+		36 => 'Timis',
+		37 => 'Tulcea',
+		38 => 'Vaslui',
+		39 => 'Valcea',
+		40 => 'Vrancea',
+		41 => 'Calarasi',
+		42 => 'Giurgiu',
+		43 => 'Ilfov',
+	),
+	'RS' =>
+	array (
+		'01' => 'Kosovo',
+		'02' => 'Vojvodina',
+	),
+	'RU' =>
+	array (
+		'01' => 'Adygeya',
+		'02' => 'Aginsky Buryatsky AO',
+		'03' => 'Gorno-Altay',
+		'04' => 'Altaisky krai',
+		'05' => 'Amur',
+		'06' => 'Arkhangel\'sk',
+		'07' => 'Astrakhan\'',
+		'08' => 'Bashkortostan',
+		'09' => 'Belgorod',
+		10 => 'Bryansk',
+		11 => 'Buryat',
+		12 => 'Chechnya',
+		13 => 'Chelyabinsk',
+		14 => 'Chita',
+		15 => 'Chukot',
+		16 => 'Chuvashia',
+		17 => 'Dagestan',
+		18 => 'Evenk',
+		19 => 'Ingush',
+		20 => 'Irkutsk',
+		21 => 'Ivanovo',
+		22 => 'Kabardin-Balkar',
+		23 => 'Kaliningrad',
+		24 => 'Kalmyk',
+		25 => 'Kaluga',
+		26 => 'Kamchatka',
+		27 => 'Karachay-Cherkess',
+		28 => 'Karelia',
+		29 => 'Kemerovo',
+		30 => 'Khabarovsk',
+		31 => 'Khakass',
+		32 => 'Khanty-Mansiy',
+		33 => 'Kirov',
+		34 => 'Komi',
+		36 => 'Koryak',
+		37 => 'Kostroma',
+		38 => 'Krasnodar',
+		39 => 'Krasnoyarsk',
+		40 => 'Kurgan',
+		41 => 'Kursk',
+		42 => 'Leningrad',
+		43 => 'Lipetsk',
+		44 => 'Magadan',
+		45 => 'Mariy-El',
+		46 => 'Mordovia',
+		47 => 'Moskva',
+		48 => 'Moscow City',
+		49 => 'Murmansk',
+		50 => 'Nenets',
+		51 => 'Nizhegorod',
+		52 => 'Novgorod',
+		53 => 'Novosibirsk',
+		54 => 'Omsk',
+		55 => 'Orenburg',
+		56 => 'Orel',
+		57 => 'Penza',
+		58 => 'Perm\'',
+		59 => 'Primor\'ye',
+		60 => 'Pskov',
+		61 => 'Rostov',
+		62 => 'Ryazan\'',
+		63 => 'Sakha',
+		64 => 'Sakhalin',
+		65 => 'Samara',
+		66 => 'Saint Petersburg City',
+		67 => 'Saratov',
+		68 => 'North Ossetia',
+		69 => 'Smolensk',
+		70 => 'Stavropol\'',
+		71 => 'Sverdlovsk',
+		72 => 'Tambovskaya oblast',
+		73 => 'Tatarstan',
+		74 => 'Taymyr',
+		75 => 'Tomsk',
+		76 => 'Tula',
+		77 => 'Tver\'',
+		78 => 'Tyumen\'',
+		79 => 'Tuva',
+		80 => 'Udmurt',
+		81 => 'Ul\'yanovsk',
+		83 => 'Vladimir',
+		84 => 'Volgograd',
+		85 => 'Vologda',
+		86 => 'Voronezh',
+		87 => 'Yamal-Nenets',
+		88 => 'Yaroslavl\'',
+		89 => 'Yevrey',
+		90 => 'Permskiy Kray',
+		91 => 'Krasnoyarskiy Kray',
+		92 => 'Kamchatskiy Kray',
+		93 => 'Zabaykal\'skiy Kray',
+	),
+	'RW' =>
+	array (
+		'01' => 'Butare',
+		'06' => 'Gitarama',
+		'07' => 'Kibungo',
+		12 => 'Kigali',
+		11 => 'Est',
+		13 => 'Nord',
+		14 => 'Ouest',
+		15 => 'Sud',
+	),
+	'SA' =>
+	array (
+		'02' => 'Al Bahah',
+		'05' => 'Al Madinah',
+		'06' => 'Ash Sharqiyah',
+		'08' => 'Al Qasim',
+		10 => 'Ar Riyad',
+		11 => 'Asir Province',
+		13 => 'Ha\'il',
+		14 => 'Makkah',
+		15 => 'Al Hudud ash Shamaliyah',
+		16 => 'Najran',
+		17 => 'Jizan',
+		19 => 'Tabuk',
+		20 => 'Al Jawf',
+	),
+	'SB' =>
+	array (
+		'03' => 'Malaita',
+		'06' => 'Guadalcanal',
+		'07' => 'Isabel',
+		'08' => 'Makira',
+		'09' => 'Temotu',
+		10 => 'Central',
+		11 => 'Western',
+		12 => 'Choiseul',
+		13 => 'Rennell and Bellona',
+	),
+	'SC' =>
+	array (
+		'01' => 'Anse aux Pins',
+		'02' => 'Anse Boileau',
+		'03' => 'Anse Etoile',
+		'04' => 'Anse Louis',
+		'05' => 'Anse Royale',
+		'06' => 'Baie Lazare',
+		'07' => 'Baie Sainte Anne',
+		'08' => 'Beau Vallon',
+		'09' => 'Bel Air',
+		10 => 'Bel Ombre',
+		11 => 'Cascade',
+		12 => 'Glacis',
+		14 => 'Grand\' Anse',
+		15 => 'La Digue',
+		16 => 'La Riviere Anglaise',
+		17 => 'Mont Buxton',
+		18 => 'Mont Fleuri',
+		19 => 'Plaisance',
+		20 => 'Pointe La Rue',
+		21 => 'Port Glaud',
+		22 => 'Saint Louis',
+		23 => 'Takamaka',
+	),
+	'SD' =>
+	array (
+		27 => 'Al Wusta',
+		28 => 'Al Istiwa\'iyah',
+		29 => 'Al Khartum',
+		30 => 'Ash Shamaliyah',
+		31 => 'Ash Sharqiyah',
+		32 => 'Bahr al Ghazal',
+		33 => 'Darfur',
+		34 => 'Kurdufan',
+		35 => 'Upper Nile',
+		40 => 'Al Wahadah State',
+		44 => 'Central Equatoria State',
+		49 => 'Southern Darfur',
+		50 => 'Southern Kordofan',
+		52 => 'Kassala',
+		53 => 'River Nile',
+		55 => 'Northern Darfur',
+	),
+	'SE' =>
+	array (
+		'02' => 'Blekinge Lan',
+		'03' => 'Gavleborgs Lan',
+		'05' => 'Gotlands Lan',
+		'06' => 'Hallands Lan',
+		'07' => 'Jamtlands Lan',
+		'08' => 'Jonkopings Lan',
+		'09' => 'Kalmar Lan',
+		10 => 'Dalarnas Lan',
+		12 => 'Kronobergs Lan',
+		14 => 'Norrbottens Lan',
+		15 => 'Orebro Lan',
+		16 => 'Ostergotlands Lan',
+		18 => 'Sodermanlands Lan',
+		21 => 'Uppsala Lan',
+		22 => 'Varmlands Lan',
+		23 => 'Vasterbottens Lan',
+		24 => 'Vasternorrlands Lan',
+		25 => 'Vastmanlands Lan',
+		26 => 'Stockholms Lan',
+		27 => 'Skane Lan',
+		28 => 'Vastra Gotaland',
+	),
+	'SH' =>
+	array (
+		'01' => 'Ascension',
+		'02' => 'Saint Helena',
+		'03' => 'Tristan da Cunha',
+	),
+	'SI' =>
+	array (
+		'01' => 'Ajdovscina Commune',
+		'02' => 'Beltinci Commune',
+		'03' => 'Bled Commune',
+		'04' => 'Bohinj Commune',
+		'05' => 'Borovnica Commune',
+		'06' => 'Bovec Commune',
+		'07' => 'Brda Commune',
+		'08' => 'Brezice Commune',
+		'09' => 'Brezovica Commune',
+		11 => 'Celje Commune',
+		12 => 'Cerklje na Gorenjskem Commune',
+		13 => 'Cerknica Commune',
+		14 => 'Cerkno Commune',
+		15 => 'Crensovci Commune',
+		16 => 'Crna na Koroskem Commune',
+		17 => 'Crnomelj Commune',
+		19 => 'Divaca Commune',
+		20 => 'Dobrepolje Commune',
+		22 => 'Dol pri Ljubljani Commune',
+		24 => 'Dornava Commune',
+		25 => 'Dravograd Commune',
+		26 => 'Duplek Commune',
+		27 => 'Gorenja vas-Poljane Commune',
+		28 => 'Gorisnica Commune',
+		29 => 'Gornja Radgona Commune',
+		30 => 'Gornji Grad Commune',
+		31 => 'Gornji Petrovci Commune',
+		32 => 'Grosuplje Commune',
+		34 => 'Hrastnik Commune',
+		35 => 'Hrpelje-Kozina Commune',
+		36 => 'Idrija Commune',
+		37 => 'Ig Commune',
+		38 => 'Ilirska Bistrica Commune',
+		39 => 'Ivancna Gorica Commune',
+		40 => 'Izola-Isola Commune',
+		42 => 'Jursinci Commune',
+		44 => 'Kanal Commune',
+		45 => 'Kidricevo Commune',
+		46 => 'Kobarid Commune',
+		47 => 'Kobilje Commune',
+		49 => 'Komen Commune',
+		50 => 'Koper-Capodistria Urban Commune',
+		51 => 'Kozje Commune',
+		52 => 'Kranj Commune',
+		53 => 'Kranjska Gora Commune',
+		54 => 'Krsko Commune',
+		55 => 'Kungota Commune',
+		57 => 'Lasko Commune',
+		61 => 'Ljubljana Urban Commune',
+		62 => 'Ljubno Commune',
+		64 => 'Logatec Commune',
+		66 => 'Loski Potok Commune',
+		68 => 'Lukovica Commune',
+		71 => 'Medvode Commune',
+		72 => 'Menges Commune',
+		73 => 'Metlika Commune',
+		74 => 'Mezica Commune',
+		76 => 'Mislinja Commune',
+		77 => 'Moravce Commune',
+		78 => 'Moravske Toplice Commune',
+		79 => 'Mozirje Commune',
+		80 => 'Murska Sobota Urban Commune',
+		81 => 'Muta Commune',
+		82 => 'Naklo Commune',
+		83 => 'Nazarje Commune',
+		84 => 'Nova Gorica Urban Commune',
+		86 => 'Odranci Commune',
+		87 => 'Ormoz Commune',
+		88 => 'Osilnica Commune',
+		89 => 'Pesnica Commune',
+		91 => 'Pivka Commune',
+		92 => 'Podcetrtek Commune',
+		94 => 'Postojna Commune',
+		97 => 'Puconci Commune',
+		98 => 'Race-Fram Commune',
+		99 => 'Radece Commune',
+		'A1' => 'Radenci Commune',
+		'A2' => 'Radlje ob Dravi Commune',
+		'A3' => 'Radovljica Commune',
+		'A6' => 'Rogasovci Commune',
+		'A7' => 'Rogaska Slatina Commune',
+		'A8' => 'Rogatec Commune',
+		'B1' => 'Semic Commune',
+		'B2' => 'Sencur Commune',
+		'B3' => 'Sentilj Commune',
+		'B4' => 'Sentjernej Commune',
+		'B6' => 'Sevnica Commune',
+		'B7' => 'Sezana Commune',
+		'B8' => 'Skocjan Commune',
+		'B9' => 'Skofja Loka Commune',
+		'C1' => 'Skofljica Commune',
+		'C2' => 'Slovenj Gradec Urban Commune',
+		'C4' => 'Slovenske Konjice Commune',
+		'C5' => 'Smarje pri Jelsah Commune',
+		'C6' => 'Smartno ob Paki Commune',
+		'C7' => 'Sostanj Commune',
+		'C8' => 'Starse Commune',
+		'C9' => 'Store Commune',
+		'D1' => 'Sveti Jurij Commune',
+		'D2' => 'Tolmin Commune',
+		'D3' => 'Trbovlje Commune',
+		'D4' => 'Trebnje Commune',
+		'D5' => 'Trzic Commune',
+		'D6' => 'Turnisce Commune',
+		'D7' => 'Velenje Urban Commune',
+		'D8' => 'Velike Lasce Commune',
+		'E1' => 'Vipava Commune',
+		'E2' => 'Vitanje Commune',
+		'E3' => 'Vodice Commune',
+		'E5' => 'Vrhnika Commune',
+		'E6' => 'Vuzenica Commune',
+		'E7' => 'Zagorje ob Savi Commune',
+		'E9' => 'Zavrc Commune',
+		'F1' => 'Zelezniki Commune',
+		'F2' => 'Ziri Commune',
+		'F3' => 'Zrece Commune',
+		'F4' => 'Benedikt Commune',
+		'F5' => 'Bistrica ob Sotli Commune',
+		'F6' => 'Bloke Commune',
+		'F7' => 'Braslovce Commune',
+		'F8' => 'Cankova Commune',
+		'F9' => 'Cerkvenjak Commune',
+		'G1' => 'Destrnik Commune',
+		'G2' => 'Dobje Commune',
+		'G3' => 'Dobrna Commune',
+		'G4' => 'Dobrova-Horjul-Polhov Gradec Commune',
+		'G5' => 'Dobrovnik-Dobronak Commune',
+		'G6' => 'Dolenjske Toplice Commune',
+		'G7' => 'Domzale Commune',
+		'G8' => 'Grad Commune',
+		'G9' => 'Hajdina Commune',
+		'H1' => 'Hoce-Slivnica Commune',
+		'H2' => 'Hodos-Hodos Commune',
+		'H3' => 'Horjul Commune',
+		'H4' => 'Jesenice Commune',
+		'H5' => 'Jezersko Commune',
+		'H6' => 'Kamnik Commune',
+		'H7' => 'Kocevje Commune',
+		'H8' => 'Komenda Commune',
+		'H9' => 'Kostel Commune',
+		'I1' => 'Krizevci Commune',
+		'I2' => 'Kuzma Commune',
+		'I3' => 'Lenart Commune',
+		'I4' => 'Lendava-Lendva Commune',
+		'I5' => 'Litija Commune',
+		'I6' => 'Ljutomer Commune',
+		'I7' => 'Loska Dolina Commune',
+		'I8' => 'Lovrenc na Pohorju Commune',
+		'I9' => 'Luce Commune',
+		'J1' => 'Majsperk Commune',
+		'J2' => 'Maribor Commune',
+		'J3' => 'Markovci Commune',
+		'J4' => 'Miklavz na Dravskem polju Commune',
+		'J5' => 'Miren-Kostanjevica Commune',
+		'J6' => 'Mirna Pec Commune',
+		'J7' => 'Novo mesto Urban Commune',
+		'J8' => 'Oplotnica Commune',
+		'J9' => 'Piran-Pirano Commune',
+		'K1' => 'Podlehnik Commune',
+		'K2' => 'Podvelka Commune',
+		'K3' => 'Polzela Commune',
+		'K4' => 'Prebold Commune',
+		'K5' => 'Preddvor Commune',
+		'K6' => 'Prevalje Commune',
+		'K7' => 'Ptuj Urban Commune',
+		'K8' => 'Ravne na Koroskem Commune',
+		'K9' => 'Razkrizje Commune',
+		'L1' => 'Ribnica Commune',
+		'L2' => 'Ribnica na Pohorju Commune',
+		'L3' => 'Ruse Commune',
+		'L4' => 'Salovci Commune',
+		'L5' => 'Selnica ob Dravi Commune',
+		'L6' => 'Sempeter-Vrtojba Commune',
+		'L7' => 'Sentjur pri Celju Commune',
+		'L8' => 'Slovenska Bistrica Commune',
+		'L9' => 'Smartno pri Litiji Commune',
+		'M1' => 'Sodrazica Commune',
+		'M2' => 'Solcava Commune',
+		'M3' => 'Sveta Ana Commune',
+		'M4' => 'Sveti Andraz v Slovenskih goricah Commune',
+		'M5' => 'Tabor Commune',
+		'M6' => 'Tisina Commune',
+		'M7' => 'Trnovska vas Commune',
+		'M8' => 'Trzin Commune',
+		'M9' => 'Velika Polana Commune',
+		'N1' => 'Verzej Commune',
+		'N2' => 'Videm Commune',
+		'N3' => 'Vojnik Commune',
+		'N4' => 'Vransko Commune',
+		'N5' => 'Zalec Commune',
+		'N6' => 'Zetale Commune',
+		'N7' => 'Zirovnica Commune',
+		'N8' => 'Zuzemberk Commune',
+		'N9' => 'Apace Commune',
+		'O1' => 'Cirkulane Commune',
+		'O2' => 'Gorje',
+		'O3' => 'Kostanjevica na Krki',
+		'O4' => 'Log-Dragomer',
+		'O5' => 'Makole',
+		'O6' => 'Mirna',
+		'O7' => 'Mokronog-Trebelno',
+		'O8' => 'Poljcane',
+		'O9' => 'Recica ob Savinji',
+		'P1' => 'Rence-Vogrsko',
+		'P2' => 'Sentrupert',
+		'P3' => 'Smarjesk Toplice',
+		'P4' => 'Sredisce ob Dravi',
+		'P5' => 'Straza',
+		'P7' => 'Sveti Jurij v Slovenskih Goricah',
+	),
+	'SK' =>
+	array (
+		'01' => 'Banska Bystrica',
+		'02' => 'Bratislava',
+		'03' => 'Kosice',
+		'04' => 'Nitra',
+		'05' => 'Presov',
+		'06' => 'Trencin',
+		'07' => 'Trnava',
+		'08' => 'Zilina',
+	),
+	'SL' =>
+	array (
+		'01' => 'Eastern',
+		'02' => 'Northern',
+		'03' => 'Southern',
+		'04' => 'Western Area',
+	),
+	'SM' =>
+	array (
+		'01' => 'Acquaviva',
+		'02' => 'Chiesanuova',
+		'03' => 'Domagnano',
+		'04' => 'Faetano',
+		'05' => 'Fiorentino',
+		'06' => 'Borgo Maggiore',
+		'07' => 'San Marino',
+		'08' => 'Monte Giardino',
+		'09' => 'Serravalle',
+	),
+	'SN' =>
+	array (
+		'01' => 'Dakar',
+		'03' => 'Diourbel',
+		'05' => 'Tambacounda',
+		'07' => 'Thies',
+		'09' => 'Fatick',
+		10 => 'Kaolack',
+		11 => 'Kolda',
+		12 => 'Ziguinchor',
+		13 => 'Louga',
+		14 => 'Saint-Louis',
+		15 => 'Matam',
+	),
+	'SO' =>
+	array (
+		'01' => 'Bakool',
+		'02' => 'Banaadir',
+		'03' => 'Bari',
+		'04' => 'Bay',
+		'05' => 'Galguduud',
+		'06' => 'Gedo',
+		'07' => 'Hiiraan',
+		'08' => 'Jubbada Dhexe',
+		'09' => 'Jubbada Hoose',
+		10 => 'Mudug',
+		18 => 'Nugaal',
+		12 => 'Sanaag',
+		13 => 'Shabeellaha Dhexe',
+		14 => 'Shabeellaha Hoose',
+		20 => 'Woqooyi Galbeed',
+		19 => 'Togdheer',
+		21 => 'Awdal',
+		22 => 'Sool',
+	),
+	'SR' =>
+	array (
+		10 => 'Brokopondo',
+		11 => 'Commewijne',
+		12 => 'Coronie',
+		13 => 'Marowijne',
+		14 => 'Nickerie',
+		15 => 'Para',
+		16 => 'Paramaribo',
+		17 => 'Saramacca',
+		18 => 'Sipaliwini',
+		19 => 'Wanica',
+	),
+	'SS' =>
+	array (
+		'01' => 'Central Equatoria',
+		'02' => 'Eastern Equatoria',
+		'03' => 'Jonglei',
+		'04' => 'Lakes',
+		'05' => 'Northern Bahr el Ghazal',
+		'06' => 'Unity',
+		'07' => 'Upper Nile',
+		'08' => 'Warrap',
+		'09' => 'Western Bahr el Ghazal',
+		10 => 'Western Equatoria',
+	),
+	'ST' =>
+	array (
+		'01' => 'Principe',
+		'02' => 'Sao Tome',
+	),
+	'SV' =>
+	array (
+		'01' => 'Ahuachapan',
+		'02' => 'Cabanas',
+		'03' => 'Chalatenango',
+		'04' => 'Cuscatlan',
+		'05' => 'La Libertad',
+		'06' => 'La Paz',
+		'07' => 'La Union',
+		'08' => 'Morazan',
+		'09' => 'San Miguel',
+		10 => 'San Salvador',
+		11 => 'Santa Ana',
+		12 => 'San Vicente',
+		13 => 'Sonsonate',
+		14 => 'Usulutan',
+	),
+	'SY' =>
+	array (
+		'01' => 'Al Hasakah',
+		'02' => 'Al Ladhiqiyah',
+		'03' => 'Al Qunaytirah',
+		'04' => 'Ar Raqqah',
+		'05' => 'As Suwayda\'',
+		'06' => 'Dar',
+		'07' => 'Dayr az Zawr',
+		'08' => 'Rif Dimashq',
+		'09' => 'Halab',
+		10 => 'Hamah',
+		11 => 'Hims',
+		12 => 'Idlib',
+		13 => 'Dimashq',
+		14 => 'Tartus',
+	),
+	'SZ' =>
+	array (
+		'01' => 'Hhohho',
+		'02' => 'Lubombo',
+		'03' => 'Manzini',
+		'04' => 'Shiselweni',
+		'05' => 'Praslin',
+	),
+	'TD' =>
+	array (
+		'01' => 'Batha',
+		'02' => 'Biltine',
+		'03' => 'Borkou-Ennedi-Tibesti',
+		'04' => 'Chari-Baguirmi',
+		'05' => 'Guera',
+		'06' => 'Kanem',
+		'07' => 'Lac',
+		'08' => 'Logone Occidental',
+		'09' => 'Logone Oriental',
+		10 => 'Mayo-Kebbi',
+		11 => 'Moyen-Chari',
+		12 => 'Ouaddai',
+		13 => 'Salamat',
+		14 => 'Tandjile',
+	),
+	'TG' =>
+	array (
+		22 => 'Centrale',
+		23 => 'Kara',
+		24 => 'Maritime',
+		25 => 'Plateaux',
+		26 => 'Savanes',
+	),
+	'TH' =>
+	array (
+		'01' => 'Mae Hong Son',
+		'02' => 'Chiang Mai',
+		'03' => 'Chiang Rai',
+		'04' => 'Nan',
+		'05' => 'Lamphun',
+		'06' => 'Lampang',
+		'07' => 'Phrae',
+		'08' => 'Tak',
+		'09' => 'Sukhothai',
+		10 => 'Uttaradit',
+		11 => 'Kamphaeng Phet',
+		12 => 'Phitsanulok',
+		13 => 'Phichit',
+		14 => 'Phetchabun',
+		15 => 'Uthai Thani',
+		16 => 'Nakhon Sawan',
+		17 => 'Nong Khai',
+		18 => 'Loei',
+		20 => 'Sakon Nakhon',
+		73 => 'Nakhon Phanom',
+		22 => 'Khon Kaen',
+		23 => 'Kalasin',
+		24 => 'Maha Sarakham',
+		25 => 'Roi Et',
+		26 => 'Chaiyaphum',
+		27 => 'Nakhon Ratchasima',
+		28 => 'Buriram',
+		29 => 'Surin',
+		30 => 'Sisaket',
+		31 => 'Narathiwat',
+		32 => 'Chai Nat',
+		33 => 'Sing Buri',
+		34 => 'Lop Buri',
+		35 => 'Ang Thong',
+		36 => 'Phra Nakhon Si Ayutthaya',
+		37 => 'Saraburi',
+		38 => 'Nonthaburi',
+		39 => 'Pathum Thani',
+		40 => 'Krung Thep',
+		41 => 'Phayao',
+		42 => 'Samut Prakan',
+		43 => 'Nakhon Nayok',
+		44 => 'Chachoengsao',
+		74 => 'Prachin Buri',
+		46 => 'Chon Buri',
+		47 => 'Rayong',
+		48 => 'Chanthaburi',
+		49 => 'Trat',
+		50 => 'Kanchanaburi',
+		51 => 'Suphan Buri',
+		52 => 'Ratchaburi',
+		53 => 'Nakhon Pathom',
+		54 => 'Samut Songkhram',
+		55 => 'Samut Sakhon',
+		56 => 'Phetchaburi',
+		57 => 'Prachuap Khiri Khan',
+		58 => 'Chumphon',
+		59 => 'Ranong',
+		60 => 'Surat Thani',
+		61 => 'Phangnga',
+		62 => 'Phuket',
+		63 => 'Krabi',
+		64 => 'Nakhon Si Thammarat',
+		65 => 'Trang',
+		66 => 'Phatthalung',
+		67 => 'Satun',
+		68 => 'Songkhla',
+		69 => 'Pattani',
+		70 => 'Yala',
+		75 => 'Ubon Ratchathani',
+		72 => 'Yasothon',
+		76 => 'Udon Thani',
+		77 => 'Amnat Charoen',
+		78 => 'Mukdahan',
+		79 => 'Nong Bua Lamphu',
+		80 => 'Sa Kaeo',
+		81 => 'Bueng Kan',
+	),
+	'TJ' =>
+	array (
+		'01' => 'Kuhistoni Badakhshon',
+		'02' => 'Khatlon',
+		'03' => 'Sughd',
+		'04' => 'Dushanbe',
+		'05' => 'Nohiyahoi Tobei Jumhuri',
+	),
+	'TL' =>
+	array (
+		'06' => 'Dili',
+	),
+	'TM' =>
+	array (
+		'01' => 'Ahal',
+		'02' => 'Balkan',
+		'03' => 'Dashoguz',
+		'04' => 'Lebap',
+		'05' => 'Mary',
+	),
+	'TN' =>
+	array (
+		'02' => 'Kasserine',
+		'03' => 'Kairouan',
+		'06' => 'Jendouba',
+		10 => 'Qafsah',
+		14 => 'El Kef',
+		15 => 'Al Mahdia',
+		16 => 'Al Munastir',
+		17 => 'Bajah',
+		18 => 'Bizerte',
+		19 => 'Nabeul',
+		22 => 'Siliana',
+		23 => 'Sousse',
+		27 => 'Ben Arous',
+		28 => 'Madanin',
+		29 => 'Gabes',
+		31 => 'Kebili',
+		32 => 'Sfax',
+		33 => 'Sidi Bou Zid',
+		34 => 'Tataouine',
+		35 => 'Tozeur',
+		36 => 'Tunis',
+		37 => 'Zaghouan',
+		38 => 'Aiana',
+		39 => 'Manouba',
+	),
+	'TO' =>
+	array (
+		'01' => 'Ha',
+		'02' => 'Tongatapu',
+		'03' => 'Vava',
+	),
+	'TR' =>
+	array (
+		'02' => 'Adiyaman',
+		'03' => 'Afyonkarahisar',
+		'04' => 'Agri',
+		'05' => 'Amasya',
+		'07' => 'Antalya',
+		'08' => 'Artvin',
+		'09' => 'Aydin',
+		10 => 'Balikesir',
+		11 => 'Bilecik',
+		12 => 'Bingol',
+		13 => 'Bitlis',
+		14 => 'Bolu',
+		15 => 'Burdur',
+		16 => 'Bursa',
+		17 => 'Canakkale',
+		19 => 'Corum',
+		20 => 'Denizli',
+		21 => 'Diyarbakir',
+		22 => 'Edirne',
+		23 => 'Elazig',
+		24 => 'Erzincan',
+		25 => 'Erzurum',
+		26 => 'Eskisehir',
+		28 => 'Giresun',
+		31 => 'Hatay',
+		32 => 'Mersin',
+		33 => 'Isparta',
+		34 => 'Istanbul',
+		35 => 'Izmir',
+		37 => 'Kastamonu',
+		38 => 'Kayseri',
+		39 => 'Kirklareli',
+		40 => 'Kirsehir',
+		41 => 'Kocaeli',
+		43 => 'Kutahya',
+		44 => 'Malatya',
+		45 => 'Manisa',
+		46 => 'Kahramanmaras',
+		48 => 'Mugla',
+		49 => 'Mus',
+		50 => 'Nevsehir',
+		52 => 'Ordu',
+		53 => 'Rize',
+		54 => 'Sakarya',
+		55 => 'Samsun',
+		57 => 'Sinop',
+		58 => 'Sivas',
+		59 => 'Tekirdag',
+		60 => 'Tokat',
+		61 => 'Trabzon',
+		62 => 'Tunceli',
+		63 => 'Sanliurfa',
+		64 => 'Usak',
+		65 => 'Van',
+		66 => 'Yozgat',
+		68 => 'Ankara',
+		69 => 'Gumushane',
+		70 => 'Hakkari',
+		71 => 'Konya',
+		72 => 'Mardin',
+		73 => 'Nigde',
+		74 => 'Siirt',
+		75 => 'Aksaray',
+		76 => 'Batman',
+		77 => 'Bayburt',
+		78 => 'Karaman',
+		79 => 'Kirikkale',
+		80 => 'Sirnak',
+		81 => 'Adana',
+		82 => 'Cankiri',
+		83 => 'Gaziantep',
+		84 => 'Kars',
+		85 => 'Zonguldak',
+		86 => 'Ardahan',
+		87 => 'Bartin',
+		88 => 'Igdir',
+		89 => 'Karabuk',
+		90 => 'Kilis',
+		91 => 'Osmaniye',
+		92 => 'Yalova',
+		93 => 'Duzce',
+	),
+	'TT' =>
+	array (
+		'01' => 'Arima',
+		'02' => 'Caroni',
+		'03' => 'Mayaro',
+		'04' => 'Nariva',
+		'05' => 'Port-of-Spain',
+		'06' => 'Saint Andrew',
+		'07' => 'Saint David',
+		'08' => 'Saint George',
+		'09' => 'Saint Patrick',
+		10 => 'San Fernando',
+		11 => 'Tobago',
+		12 => 'Victoria',
+	),
+	'TW' =>
+	array (
+		'01' => 'Fu-chien',
+		'02' => 'Kao-hsiung',
+		'03' => 'T\'ai-pei',
+		'04' => 'T\'ai-wan',
+	),
+	'TZ' =>
+	array (
+		'02' => 'Pwani',
+		'03' => 'Dodoma',
+		'04' => 'Iringa',
+		'05' => 'Kigoma',
+		'06' => 'Kilimanjaro',
+		'07' => 'Lindi',
+		'08' => 'Mara',
+		'09' => 'Mbeya',
+		10 => 'Morogoro',
+		11 => 'Mtwara',
+		12 => 'Mwanza',
+		13 => 'Pemba North',
+		14 => 'Ruvuma',
+		15 => 'Shinyanga',
+		16 => 'Singida',
+		17 => 'Tabora',
+		18 => 'Tanga',
+		19 => 'Kagera',
+		20 => 'Pemba South',
+		21 => 'Zanzibar Central',
+		22 => 'Zanzibar North',
+		23 => 'Dar es Salaam',
+		24 => 'Rukwa',
+		25 => 'Zanzibar Urban',
+		26 => 'Arusha',
+		27 => 'Manyara',
+	),
+	'UA' =>
+	array (
+		'01' => 'Cherkas\'ka Oblast\'',
+		'02' => 'Chernihivs\'ka Oblast\'',
+		'03' => 'Chernivets\'ka Oblast\'',
+		'04' => 'Dnipropetrovs\'ka Oblast\'',
+		'05' => 'Donets\'ka Oblast\'',
+		'06' => 'Ivano-Frankivs\'ka Oblast\'',
+		'07' => 'Kharkivs\'ka Oblast\'',
+		'08' => 'Khersons\'ka Oblast\'',
+		'09' => 'Khmel\'nyts\'ka Oblast\'',
+		10 => 'Kirovohrads\'ka Oblast\'',
+		11 => 'Krym',
+		12 => 'Kyyiv',
+		13 => 'Kyyivs\'ka Oblast\'',
+		14 => 'Luhans\'ka Oblast\'',
+		15 => 'L\'vivs\'ka Oblast\'',
+		16 => 'Mykolayivs\'ka Oblast\'',
+		17 => 'Odes\'ka Oblast\'',
+		18 => 'Poltavs\'ka Oblast\'',
+		19 => 'Rivnens\'ka Oblast\'',
+		20 => 'Sevastopol\'',
+		21 => 'Sums\'ka Oblast\'',
+		22 => 'Ternopil\'s\'ka Oblast\'',
+		23 => 'Vinnyts\'ka Oblast\'',
+		24 => 'Volyns\'ka Oblast\'',
+		25 => 'Zakarpats\'ka Oblast\'',
+		26 => 'Zaporiz\'ka Oblast\'',
+		27 => 'Zhytomyrs\'ka Oblast\'',
+	),
+	'UG' =>
+	array (
+		26 => 'Apac',
+		28 => 'Bundibugyo',
+		29 => 'Bushenyi',
+		30 => 'Gulu',
+		31 => 'Hoima',
+		33 => 'Jinja',
+		36 => 'Kalangala',
+		37 => 'Kampala',
+		38 => 'Kamuli',
+		39 => 'Kapchorwa',
+		40 => 'Kasese',
+		41 => 'Kibale',
+		42 => 'Kiboga',
+		43 => 'Kisoro',
+		45 => 'Kotido',
+		46 => 'Kumi',
+		47 => 'Lira',
+		50 => 'Masindi',
+		52 => 'Mbarara',
+		56 => 'Mubende',
+		58 => 'Nebbi',
+		59 => 'Ntungamo',
+		60 => 'Pallisa',
+		61 => 'Rakai',
+		65 => 'Adjumani',
+		66 => 'Bugiri',
+		67 => 'Busia',
+		69 => 'Katakwi',
+		70 => 'Luwero',
+		71 => 'Masaka',
+		72 => 'Moyo',
+		73 => 'Nakasongola',
+		74 => 'Sembabule',
+		76 => 'Tororo',
+		77 => 'Arua',
+		78 => 'Iganga',
+		79 => 'Kabarole',
+		80 => 'Kaberamaido',
+		81 => 'Kamwenge',
+		82 => 'Kanungu',
+		83 => 'Kayunga',
+		84 => 'Kitgum',
+		85 => 'Kyenjojo',
+		86 => 'Mayuge',
+		87 => 'Mbale',
+		88 => 'Moroto',
+		89 => 'Mpigi',
+		90 => 'Mukono',
+		91 => 'Nakapiripirit',
+		92 => 'Pader',
+		93 => 'Rukungiri',
+		94 => 'Sironko',
+		95 => 'Soroti',
+		96 => 'Wakiso',
+		97 => 'Yumbe',
+	),
+	'US' =>
+	array (
+		'AA' => 'Armed Forces Americas',
+		'AE' => 'Armed Forces Europe',
+		'AK' => 'Alaska',
+		'AL' => 'Alabama',
+		'AP' => 'Armed Forces Pacific',
+		'AR' => 'Arkansas',
+		'AS' => 'American Samoa',
+		'AZ' => 'Arizona',
+		'CA' => 'California',
+		'CO' => 'Colorado',
+		'CT' => 'Connecticut',
+		'DC' => 'District of Columbia',
+		'DE' => 'Delaware',
+		'FL' => 'Florida',
+		'FM' => 'Federated States of Micronesia',
+		'GA' => 'Georgia',
+		'GU' => 'Guam',
+		'HI' => 'Hawaii',
+		'IA' => 'Iowa',
+		'ID' => 'Idaho',
+		'IL' => 'Illinois',
+		'IN' => 'Indiana',
+		'KS' => 'Kansas',
+		'KY' => 'Kentucky',
+		'LA' => 'Louisiana',
+		'MA' => 'Massachusetts',
+		'MD' => 'Maryland',
+		'ME' => 'Maine',
+		'MH' => 'Marshall Islands',
+		'MI' => 'Michigan',
+		'MN' => 'Minnesota',
+		'MO' => 'Missouri',
+		'MP' => 'Northern Mariana Islands',
+		'MS' => 'Mississippi',
+		'MT' => 'Montana',
+		'NC' => 'North Carolina',
+		'ND' => 'North Dakota',
+		'NE' => 'Nebraska',
+		'NH' => 'New Hampshire',
+		'NJ' => 'New Jersey',
+		'NM' => 'New Mexico',
+		'NV' => 'Nevada',
+		'NY' => 'New York',
+		'OH' => 'Ohio',
+		'OK' => 'Oklahoma',
+		'OR' => 'Oregon',
+		'PA' => 'Pennsylvania',
+		'PW' => 'Palau',
+		'RI' => 'Rhode Island',
+		'SC' => 'South Carolina',
+		'SD' => 'South Dakota',
+		'TN' => 'Tennessee',
+		'TX' => 'Texas',
+		'UT' => 'Utah',
+		'VA' => 'Virginia',
+		'VI' => 'Virgin Islands',
+		'VT' => 'Vermont',
+		'WA' => 'Washington',
+		'WI' => 'Wisconsin',
+		'WV' => 'West Virginia',
+		'WY' => 'Wyoming',
+	),
+	'UY' =>
+	array (
+		'01' => 'Artigas',
+		'02' => 'Canelones',
+		'03' => 'Cerro Largo',
+		'04' => 'Colonia',
+		'05' => 'Durazno',
+		'06' => 'Flores',
+		'07' => 'Florida',
+		'08' => 'Lavalleja',
+		'09' => 'Maldonado',
+		10 => 'Montevideo',
+		11 => 'Paysandu',
+		12 => 'Rio Negro',
+		13 => 'Rivera',
+		14 => 'Rocha',
+		15 => 'Salto',
+		16 => 'San Jose',
+		17 => 'Soriano',
+		18 => 'Tacuarembo',
+		19 => 'Treinta y Tres',
+	),
+	'UZ' =>
+	array (
+		'01' => 'Andijon',
+		'02' => 'Bukhoro',
+		'03' => 'Farghona',
+		'04' => 'Jizzakh',
+		'05' => 'Khorazm',
+		'06' => 'Namangan',
+		'07' => 'Nawoiy',
+		'08' => 'Qashqadaryo',
+		'09' => 'Qoraqalpoghiston',
+		10 => 'Samarqand',
+		11 => 'Sirdaryo',
+		12 => 'Surkhondaryo',
+		14 => 'Toshkent',
+		15 => 'Jizzax',
+	),
+	'VC' =>
+	array (
+		'01' => 'Charlotte',
+		'02' => 'Saint Andrew',
+		'03' => 'Saint David',
+		'04' => 'Saint George',
+		'05' => 'Saint Patrick',
+		'06' => 'Grenadines',
+	),
+	'VE' =>
+	array (
+		'01' => 'Amazonas',
+		'02' => 'Anzoategui',
+		'03' => 'Apure',
+		'04' => 'Aragua',
+		'05' => 'Barinas',
+		'06' => 'Bolivar',
+		'07' => 'Carabobo',
+		'08' => 'Cojedes',
+		'09' => 'Delta Amacuro',
+		11 => 'Falcon',
+		12 => 'Guarico',
+		13 => 'Lara',
+		14 => 'Merida',
+		15 => 'Miranda',
+		16 => 'Monagas',
+		17 => 'Nueva Esparta',
+		18 => 'Portuguesa',
+		19 => 'Sucre',
+		20 => 'Tachira',
+		21 => 'Trujillo',
+		22 => 'Yaracuy',
+		23 => 'Zulia',
+		24 => 'Dependencias Federales',
+		25 => 'Distrito Federal',
+		26 => 'Vargas',
+	),
+	'VN' =>
+	array (
+		'01' => 'An Giang',
+		'03' => 'Ben Tre',
+		'05' => 'Cao Bang',
+		'09' => 'Dong Thap',
+		13 => 'Hai Phong',
+		20 => 'Ho Chi Minh',
+		21 => 'Kien Giang',
+		23 => 'Lam Dong',
+		24 => 'Long An',
+		30 => 'Quang Ninh',
+		32 => 'Son La',
+		33 => 'Tay Ninh',
+		34 => 'Thanh Hoa',
+		35 => 'Thai Binh',
+		37 => 'Tien Giang',
+		39 => 'Lang Son',
+		43 => 'Dong Nai',
+		44 => 'Ha Noi',
+		45 => 'Ba Ria-Vung Tau',
+		46 => 'Binh Dinh',
+		47 => 'Binh Thuan',
+		49 => 'Gia Lai',
+		50 => 'Ha Giang',
+		52 => 'Ha Tinh',
+		53 => 'Hoa Binh',
+		54 => 'Khanh Hoa',
+		55 => 'Kon Tum',
+		58 => 'Nghe An',
+		59 => 'Ninh Binh',
+		60 => 'Ninh Thuan',
+		61 => 'Phu Yen',
+		62 => 'Quang Binh',
+		63 => 'Quang Ngai',
+		64 => 'Quang Tri',
+		65 => 'Soc Trang',
+		66 => 'Thua Thien-Hue',
+		67 => 'Tra Vinh',
+		68 => 'Tuyen Quang',
+		69 => 'Vinh Long',
+		70 => 'Yen Bai',
+		71 => 'Bac Giang',
+		72 => 'Bac Kan',
+		73 => 'Bac Lieu',
+		74 => 'Bac Ninh',
+		75 => 'Binh Duong',
+		76 => 'Binh Phuoc',
+		77 => 'Ca Mau',
+		78 => 'Da Nang',
+		79 => 'Hai Duong',
+		80 => 'Ha Nam',
+		81 => 'Hung Yen',
+		82 => 'Nam Dinh',
+		83 => 'Phu Tho',
+		84 => 'Quang Nam',
+		85 => 'Thai Nguyen',
+		86 => 'Vinh Phuc',
+		87 => 'Can Tho',
+		88 => 'Dac Lak',
+		89 => 'Lai Chau',
+		90 => 'Lao Cai',
+		91 => 'Dak Nong',
+		92 => 'Dien Bien',
+		93 => 'Hau Giang',
+	),
+	'VU' =>
+	array (
+		'05' => 'Ambrym',
+		'06' => 'Aoba',
+		'07' => 'Torba',
+		'08' => 'Efate',
+		'09' => 'Epi',
+		10 => 'Malakula',
+		11 => 'Paama',
+		12 => 'Pentecote',
+		13 => 'Sanma',
+		14 => 'Shepherd',
+		15 => 'Tafea',
+		16 => 'Malampa',
+		17 => 'Penama',
+		18 => 'Shefa',
+	),
+	'WS' =>
+	array (
+		'02' => 'Aiga-i-le-Tai',
+		'03' => 'Atua',
+		'04' => 'Fa',
+		'05' => 'Gaga',
+		'06' => 'Va',
+		'07' => 'Gagaifomauga',
+		'08' => 'Palauli',
+		'09' => 'Satupa',
+		10 => 'Tuamasaga',
+		11 => 'Vaisigano',
+	),
+	'YE' =>
+	array (
+		'01' => 'Abyan',
+		'02' => 'Adan',
+		'03' => 'Al Mahrah',
+		'04' => 'Hadramawt',
+		'05' => 'Shabwah',
+		24 => 'Lahij',
+		20 => 'Al Bayda\'',
+		'08' => 'Al Hudaydah',
+		21 => 'Al Jawf',
+		10 => 'Al Mahwit',
+		11 => 'Dhamar',
+		22 => 'Hajjah',
+		23 => 'Ibb',
+		14 => 'Ma\'rib',
+		15 => 'Sa\'dah',
+		16 => 'San\'a\'',
+		25 => 'Taizz',
+		18 => 'Ad Dali',
+		19 => 'Amran',
+	),
+	'ZA' =>
+	array (
+		'01' => 'North-Western Province',
+		'02' => 'KwaZulu-Natal',
+		'03' => 'Free State',
+		'05' => 'Eastern Cape',
+		'06' => 'Gauteng',
+		'07' => 'Mpumalanga',
+		'08' => 'Northern Cape',
+		'09' => 'Limpopo',
+		10 => 'North-West',
+		11 => 'Western Cape',
+	),
+	'ZM' =>
+	array (
+		'01' => 'Western',
+		'02' => 'Central',
+		'03' => 'Eastern',
+		'04' => 'Luapula',
+		'05' => 'Northern',
+		'06' => 'North-Western',
+		'07' => 'Southern',
+		'08' => 'Copperbelt',
+		'09' => 'Lusaka',
+	),
+	'ZW' =>
+	array (
+		'01' => 'Manicaland',
+		'02' => 'Midlands',
+		'03' => 'Mashonaland Central',
+		'04' => 'Mashonaland East',
+		'05' => 'Mashonaland West',
+		'06' => 'Matabeleland North',
+		'07' => 'Matabeleland South',
+		'08' => 'Masvingo',
+		'09' => 'Bulawayo',
+		10 => 'Harare',
+	),
+);
\ No newline at end of file
diff --git a/htdocs/includes/geoip/timezone.php b/htdocs/includes/geoip/timezone.php
new file mode 100644
index 00000000000..e5d991d8133
--- /dev/null
+++ b/htdocs/includes/geoip/timezone.php
@@ -0,0 +1,2243 @@
+<?php
+
+/**
+ * Get time zone
+ * @param string $country
+ * @param string $region
+ * @return string If the timezone is not found, returns null`
+ */
+function get_time_zone($country, $region)
+{
+    $timezone = null;
+    switch ($country) {
+        case "AD":
+            $timezone = "Europe/Andorra";
+            break;
+        case "AE":
+            $timezone = "Asia/Dubai";
+            break;
+        case "AF":
+            $timezone = "Asia/Kabul";
+            break;
+        case "AG":
+            $timezone = "America/Antigua";
+            break;
+        case "AI":
+            $timezone = "America/Anguilla";
+            break;
+        case "AL":
+            $timezone = "Europe/Tirane";
+            break;
+        case "AM":
+            $timezone = "Asia/Yerevan";
+            break;
+        case "AN":
+            $timezone = "America/Curacao";
+            break;
+        case "AO":
+            $timezone = "Africa/Luanda";
+            break;
+        case "AQ":
+            $timezone = "Antarctica/South_Pole";
+            break;
+        case "AR":
+            switch ($region) {
+                case "01":
+                    $timezone = "America/Argentina/Buenos_Aires";
+                    break;
+                case "02":
+                    $timezone = "America/Argentina/Catamarca";
+                    break;
+                case "03":
+                    $timezone = "America/Argentina/Tucuman";
+                    break;
+                case "04":
+                    $timezone = "America/Argentina/Rio_Gallegos";
+                    break;
+                case "05":
+                    $timezone = "America/Argentina/Cordoba";
+                    break;
+                case "06":
+                    $timezone = "America/Argentina/Tucuman";
+                    break;
+                case "07":
+                    $timezone = "America/Argentina/Buenos_Aires";
+                    break;
+                case "08":
+                    $timezone = "America/Argentina/Buenos_Aires";
+                    break;
+                case "09":
+                    $timezone = "America/Argentina/Tucuman";
+                    break;
+                case "10":
+                    $timezone = "America/Argentina/Jujuy";
+                    break;
+                case "11":
+                    $timezone = "America/Argentina/San_Luis";
+                    break;
+                case "12":
+                    $timezone = "America/Argentina/La_Rioja";
+                    break;
+                case "13":
+                    $timezone = "America/Argentina/Mendoza";
+                    break;
+                case "14":
+                    $timezone = "America/Argentina/Buenos_Aires";
+                    break;
+                case "15":
+                    $timezone = "America/Argentina/San_Luis";
+                    break;
+                case "16":
+                    $timezone = "America/Argentina/Buenos_Aires";
+                    break;
+                case "17":
+                    $timezone = "America/Argentina/Salta";
+                    break;
+                case "18":
+                    $timezone = "America/Argentina/San_Juan";
+                    break;
+                case "19":
+                    $timezone = "America/Argentina/San_Luis";
+                    break;
+                case "20":
+                    $timezone = "America/Argentina/Rio_Gallegos";
+                    break;
+                case "21":
+                    $timezone = "America/Argentina/Buenos_Aires";
+                    break;
+                case "22":
+                    $timezone = "America/Argentina/Catamarca";
+                    break;
+                case "23":
+                    $timezone = "America/Argentina/Ushuaia";
+                    break;
+                case "24":
+                    $timezone = "America/Argentina/Tucuman";
+                    break;
+        }
+        break;
+        case "AS":
+            $timezone = "Pacific/Pago_Pago";
+            break;
+        case "AT":
+            $timezone = "Europe/Vienna";
+            break;
+        case "AU":
+            switch ($region) {
+                case "01":
+                    $timezone = "Australia/Sydney";
+                    break;
+                case "02":
+                    $timezone = "Australia/Sydney";
+                    break;
+                case "03":
+                    $timezone = "Australia/Darwin";
+                    break;
+                case "04":
+                    $timezone = "Australia/Brisbane";
+                    break;
+                case "05":
+                    $timezone = "Australia/Adelaide";
+                    break;
+                case "06":
+                    $timezone = "Australia/Hobart";
+                    break;
+                case "07":
+                    $timezone = "Australia/Melbourne";
+                    break;
+                case "08":
+                    $timezone = "Australia/Perth";
+                    break;
+        }
+        break;
+        case "AW":
+            $timezone = "America/Aruba";
+            break;
+        case "AX":
+            $timezone = "Europe/Mariehamn";
+            break;
+        case "AZ":
+            $timezone = "Asia/Baku";
+            break;
+        case "BA":
+            $timezone = "Europe/Sarajevo";
+            break;
+        case "BB":
+            $timezone = "America/Barbados";
+            break;
+        case "BD":
+            $timezone = "Asia/Dhaka";
+            break;
+        case "BE":
+            $timezone = "Europe/Brussels";
+            break;
+        case "BF":
+            $timezone = "Africa/Ouagadougou";
+            break;
+        case "BG":
+            $timezone = "Europe/Sofia";
+            break;
+        case "BH":
+            $timezone = "Asia/Bahrain";
+            break;
+        case "BI":
+            $timezone = "Africa/Bujumbura";
+            break;
+        case "BJ":
+            $timezone = "Africa/Porto-Novo";
+            break;
+        case "BL":
+            $timezone = "America/St_Barthelemy";
+            break;
+        case "BM":
+            $timezone = "Atlantic/Bermuda";
+            break;
+        case "BN":
+            $timezone = "Asia/Brunei";
+            break;
+        case "BO":
+            $timezone = "America/La_Paz";
+            break;
+        case "BQ":
+            $timezone = "America/Curacao";
+            break;
+        case "BR":
+            switch ($region) {
+                case "01":
+                    $timezone = "America/Rio_Branco";
+                    break;
+                case "02":
+                    $timezone = "America/Maceio";
+                    break;
+                case "03":
+                    $timezone = "America/Sao_Paulo";
+                    break;
+                case "04":
+                    $timezone = "America/Manaus";
+                    break;
+                case "05":
+                    $timezone = "America/Bahia";
+                    break;
+                case "06":
+                    $timezone = "America/Fortaleza";
+                    break;
+                case "07":
+                    $timezone = "America/Sao_Paulo";
+                    break;
+                case "08":
+                    $timezone = "America/Sao_Paulo";
+                    break;
+                case "11":
+                    $timezone = "America/Campo_Grande";
+                    break;
+                case "13":
+                    $timezone = "America/Belem";
+                    break;
+                case "14":
+                    $timezone = "America/Cuiaba";
+                    break;
+                case "15":
+                    $timezone = "America/Sao_Paulo";
+                    break;
+                case "16":
+                    $timezone = "America/Belem";
+                    break;
+                case "17":
+                    $timezone = "America/Recife";
+                    break;
+                case "18":
+                    $timezone = "America/Sao_Paulo";
+                    break;
+                case "20":
+                    $timezone = "America/Fortaleza";
+                    break;
+                case "21":
+                    $timezone = "America/Sao_Paulo";
+                    break;
+                case "22":
+                    $timezone = "America/Recife";
+                    break;
+                case "23":
+                    $timezone = "America/Sao_Paulo";
+                    break;
+                case "24":
+                    $timezone = "America/Porto_Velho";
+                    break;
+                case "25":
+                    $timezone = "America/Boa_Vista";
+                    break;
+                case "26":
+                    $timezone = "America/Sao_Paulo";
+                    break;
+                case "27":
+                    $timezone = "America/Sao_Paulo";
+                    break;
+                case "28":
+                    $timezone = "America/Maceio";
+                    break;
+                case "29":
+                    $timezone = "America/Sao_Paulo";
+                    break;
+                case "30":
+                    $timezone = "America/Recife";
+                    break;
+                case "31":
+                    $timezone = "America/Araguaina";
+                    break;
+        }
+        break;
+        case "BS":
+            $timezone = "America/Nassau";
+            break;
+        case "BT":
+            $timezone = "Asia/Thimphu";
+            break;
+        case "BV":
+            $timezone = "Antarctica/Syowa";
+            break;
+        case "BW":
+            $timezone = "Africa/Gaborone";
+            break;
+        case "BY":
+            $timezone = "Europe/Minsk";
+            break;
+        case "BZ":
+            $timezone = "America/Belize";
+            break;
+        case "CA":
+            switch ($region) {
+                case "AB":
+                    $timezone = "America/Edmonton";
+                    break;
+                case "BC":
+                    $timezone = "America/Vancouver";
+                    break;
+                case "MB":
+                    $timezone = "America/Winnipeg";
+                    break;
+                case "NB":
+                    $timezone = "America/Halifax";
+                    break;
+                case "NL":
+                    $timezone = "America/St_Johns";
+                    break;
+                case "NS":
+                    $timezone = "America/Halifax";
+                    break;
+                case "NT":
+                    $timezone = "America/Yellowknife";
+                    break;
+                case "NU":
+                    $timezone = "America/Rankin_Inlet";
+                    break;
+                case "ON":
+                    $timezone = "America/Toronto";
+                    break;
+                case "PE":
+                    $timezone = "America/Halifax";
+                    break;
+                case "QC":
+                    $timezone = "America/Montreal";
+                    break;
+                case "SK":
+                    $timezone = "America/Regina";
+                    break;
+                case "YT":
+                    $timezone = "America/Whitehorse";
+                    break;
+        }
+        break;
+        case "CC":
+            $timezone = "Indian/Cocos";
+            break;
+        case "CD":
+            switch ($region) {
+                case "01":
+                    $timezone = "Africa/Kinshasa";
+                    break;
+                case "02":
+                    $timezone = "Africa/Kinshasa";
+                    break;
+                case "03":
+                    $timezone = "Africa/Kinshasa";
+                    break;
+                case "04":
+                    $timezone = "Africa/Lubumbashi";
+                    break;
+                case "05":
+                    $timezone = "Africa/Lubumbashi";
+                    break;
+                case "06":
+                    $timezone = "Africa/Kinshasa";
+                    break;
+                case "07":
+                    $timezone = "Africa/Lubumbashi";
+                    break;
+                case "08":
+                    $timezone = "Africa/Kinshasa";
+                    break;
+                case "09":
+                    $timezone = "Africa/Lubumbashi";
+                    break;
+                case "10":
+                    $timezone = "Africa/Lubumbashi";
+                    break;
+                case "11":
+                    $timezone = "Africa/Lubumbashi";
+                    break;
+                case "12":
+                    $timezone = "Africa/Lubumbashi";
+                    break;
+        }
+        break;
+        case "CF":
+            $timezone = "Africa/Bangui";
+            break;
+        case "CG":
+            $timezone = "Africa/Brazzaville";
+            break;
+        case "CH":
+            $timezone = "Europe/Zurich";
+            break;
+        case "CI":
+            $timezone = "Africa/Abidjan";
+            break;
+        case "CK":
+            $timezone = "Pacific/Rarotonga";
+            break;
+        case "CL":
+            $timezone = "America/Santiago";
+            break;
+        case "CM":
+            $timezone = "Africa/Lagos";
+            break;
+        case "CN":
+            switch ($region) {
+                case "01":
+                    $timezone = "Asia/Shanghai";
+                    break;
+                case "02":
+                    $timezone = "Asia/Shanghai";
+                    break;
+                case "03":
+                    $timezone = "Asia/Shanghai";
+                    break;
+                case "04":
+                    $timezone = "Asia/Shanghai";
+                    break;
+                case "05":
+                    $timezone = "Asia/Harbin";
+                    break;
+                case "06":
+                    $timezone = "Asia/Chongqing";
+                    break;
+                case "07":
+                    $timezone = "Asia/Shanghai";
+                    break;
+                case "08":
+                    $timezone = "Asia/Harbin";
+                    break;
+                case "09":
+                    $timezone = "Asia/Shanghai";
+                    break;
+                case "10":
+                    $timezone = "Asia/Shanghai";
+                    break;
+                case "11":
+                    $timezone = "Asia/Chongqing";
+                    break;
+                case "12":
+                    $timezone = "Asia/Shanghai";
+                    break;
+                case "13":
+                    $timezone = "Asia/Urumqi";
+                    break;
+                case "14":
+                    $timezone = "Asia/Chongqing";
+                    break;
+                case "15":
+                    $timezone = "Asia/Chongqing";
+                    break;
+                case "16":
+                    $timezone = "Asia/Chongqing";
+                    break;
+                case "18":
+                    $timezone = "Asia/Chongqing";
+                    break;
+                case "19":
+                    $timezone = "Asia/Harbin";
+                    break;
+                case "20":
+                    $timezone = "Asia/Harbin";
+                    break;
+                case "21":
+                    $timezone = "Asia/Chongqing";
+                    break;
+                case "22":
+                    $timezone = "Asia/Harbin";
+                    break;
+                case "23":
+                    $timezone = "Asia/Shanghai";
+                    break;
+                case "24":
+                    $timezone = "Asia/Chongqing";
+                    break;
+                case "25":
+                    $timezone = "Asia/Shanghai";
+                    break;
+                case "26":
+                    $timezone = "Asia/Chongqing";
+                    break;
+                case "28":
+                    $timezone = "Asia/Shanghai";
+                    break;
+                case "29":
+                    $timezone = "Asia/Chongqing";
+                    break;
+                case "30":
+                    $timezone = "Asia/Chongqing";
+                    break;
+                case "31":
+                    $timezone = "Asia/Chongqing";
+                    break;
+                case "32":
+                    $timezone = "Asia/Chongqing";
+                    break;
+                case "33":
+                    $timezone = "Asia/Chongqing";
+                    break;
+        }
+        break;
+        case "CO":
+            $timezone = "America/Bogota";
+            break;
+        case "CR":
+            $timezone = "America/Costa_Rica";
+            break;
+        case "CU":
+            $timezone = "America/Havana";
+            break;
+        case "CV":
+            $timezone = "Atlantic/Cape_Verde";
+            break;
+        case "CW":
+            $timezone = "America/Curacao";
+            break;
+        case "CX":
+            $timezone = "Indian/Christmas";
+            break;
+        case "CY":
+            $timezone = "Asia/Nicosia";
+            break;
+        case "CZ":
+            $timezone = "Europe/Prague";
+            break;
+        case "DE":
+            $timezone = "Europe/Berlin";
+            break;
+        case "DJ":
+            $timezone = "Africa/Djibouti";
+            break;
+        case "DK":
+            $timezone = "Europe/Copenhagen";
+            break;
+        case "DM":
+            $timezone = "America/Dominica";
+            break;
+        case "DO":
+            $timezone = "America/Santo_Domingo";
+            break;
+        case "DZ":
+            $timezone = "Africa/Algiers";
+            break;
+        case "EC":
+            switch ($region) {
+                case "01":
+                    $timezone = "Pacific/Galapagos";
+                    break;
+                case "02":
+                    $timezone = "America/Guayaquil";
+                    break;
+                case "03":
+                    $timezone = "America/Guayaquil";
+                    break;
+                case "04":
+                    $timezone = "America/Guayaquil";
+                    break;
+                case "05":
+                    $timezone = "America/Guayaquil";
+                    break;
+                case "06":
+                    $timezone = "America/Guayaquil";
+                    break;
+                case "07":
+                    $timezone = "America/Guayaquil";
+                    break;
+                case "08":
+                    $timezone = "America/Guayaquil";
+                    break;
+                case "09":
+                    $timezone = "America/Guayaquil";
+                    break;
+                case "10":
+                    $timezone = "America/Guayaquil";
+                    break;
+                case "11":
+                    $timezone = "America/Guayaquil";
+                    break;
+                case "12":
+                    $timezone = "America/Guayaquil";
+                    break;
+                case "13":
+                    $timezone = "America/Guayaquil";
+                    break;
+                case "14":
+                    $timezone = "America/Guayaquil";
+                    break;
+                case "15":
+                    $timezone = "America/Guayaquil";
+                    break;
+                case "17":
+                    $timezone = "America/Guayaquil";
+                    break;
+                case "18":
+                    $timezone = "America/Guayaquil";
+                    break;
+                case "19":
+                    $timezone = "America/Guayaquil";
+                    break;
+                case "20":
+                    $timezone = "America/Guayaquil";
+                    break;
+                case "22":
+                    $timezone = "America/Guayaquil";
+                    break;
+                case "24":
+                    $timezone = "America/Guayaquil";
+                    break;
+        }
+        break;
+        case "EE":
+            $timezone = "Europe/Tallinn";
+            break;
+        case "EG":
+            $timezone = "Africa/Cairo";
+            break;
+        case "EH":
+            $timezone = "Africa/El_Aaiun";
+            break;
+        case "ER":
+            $timezone = "Africa/Asmara";
+            break;
+        case "ES":
+            switch ($region) {
+                case "07":
+                    $timezone = "Europe/Madrid";
+                    break;
+                case "27":
+                    $timezone = "Europe/Madrid";
+                    break;
+                case "29":
+                    $timezone = "Europe/Madrid";
+                    break;
+                case "31":
+                    $timezone = "Europe/Madrid";
+                    break;
+                case "32":
+                    $timezone = "Europe/Madrid";
+                    break;
+                case "34":
+                    $timezone = "Europe/Madrid";
+                    break;
+                case "39":
+                    $timezone = "Europe/Madrid";
+                    break;
+                case "51":
+                    $timezone = "Africa/Ceuta";
+                    break;
+                case "52":
+                    $timezone = "Europe/Madrid";
+                    break;
+                case "53":
+                    $timezone = "Atlantic/Canary";
+                    break;
+                case "54":
+                    $timezone = "Europe/Madrid";
+                    break;
+                case "55":
+                    $timezone = "Europe/Madrid";
+                    break;
+                case "56":
+                    $timezone = "Europe/Madrid";
+                    break;
+                case "57":
+                    $timezone = "Europe/Madrid";
+                    break;
+                case "58":
+                    $timezone = "Europe/Madrid";
+                    break;
+                case "59":
+                    $timezone = "Europe/Madrid";
+                    break;
+                case "60":
+                    $timezone = "Europe/Madrid";
+                    break;
+        }
+        break;
+        case "ET":
+            $timezone = "Africa/Addis_Ababa";
+            break;
+        case "FI":
+            $timezone = "Europe/Helsinki";
+            break;
+        case "FJ":
+            $timezone = "Pacific/Fiji";
+            break;
+        case "FK":
+            $timezone = "Atlantic/Stanley";
+            break;
+        case "FM":
+            $timezone = "Pacific/Pohnpei";
+            break;
+        case "FO":
+            $timezone = "Atlantic/Faroe";
+            break;
+        case "FR":
+            $timezone = "Europe/Paris";
+            break;
+        case "FX":
+            $timezone = "Europe/Paris";
+            break;
+        case "GA":
+            $timezone = "Africa/Libreville";
+            break;
+        case "GB":
+            $timezone = "Europe/London";
+            break;
+        case "GD":
+            $timezone = "America/Grenada";
+            break;
+        case "GE":
+            $timezone = "Asia/Tbilisi";
+            break;
+        case "GF":
+            $timezone = "America/Cayenne";
+            break;
+        case "GG":
+            $timezone = "Europe/Guernsey";
+            break;
+        case "GH":
+            $timezone = "Africa/Accra";
+            break;
+        case "GI":
+            $timezone = "Europe/Gibraltar";
+            break;
+        case "GL":
+            switch ($region) {
+                case "01":
+                    $timezone = "America/Thule";
+                    break;
+                case "02":
+                    $timezone = "America/Godthab";
+                    break;
+                case "03":
+                    $timezone = "America/Godthab";
+                    break;
+        }
+        break;
+        case "GM":
+            $timezone = "Africa/Banjul";
+            break;
+        case "GN":
+            $timezone = "Africa/Conakry";
+            break;
+        case "GP":
+            $timezone = "America/Guadeloupe";
+            break;
+        case "GQ":
+            $timezone = "Africa/Malabo";
+            break;
+        case "GR":
+            $timezone = "Europe/Athens";
+            break;
+        case "GS":
+            $timezone = "Atlantic/South_Georgia";
+            break;
+        case "GT":
+            $timezone = "America/Guatemala";
+            break;
+        case "GU":
+            $timezone = "Pacific/Guam";
+            break;
+        case "GW":
+            $timezone = "Africa/Bissau";
+            break;
+        case "GY":
+            $timezone = "America/Guyana";
+            break;
+        case "HK":
+            $timezone = "Asia/Hong_Kong";
+            break;
+        case "HN":
+            $timezone = "America/Tegucigalpa";
+            break;
+        case "HR":
+            $timezone = "Europe/Zagreb";
+            break;
+        case "HT":
+            $timezone = "America/Port-au-Prince";
+            break;
+        case "HU":
+            $timezone = "Europe/Budapest";
+            break;
+        case "ID":
+            switch ($region) {
+                case "01":
+                    $timezone = "Asia/Pontianak";
+                    break;
+                case "02":
+                    $timezone = "Asia/Makassar";
+                    break;
+                case "03":
+                    $timezone = "Asia/Jakarta";
+                    break;
+                case "04":
+                    $timezone = "Asia/Jakarta";
+                    break;
+                case "05":
+                    $timezone = "Asia/Jakarta";
+                    break;
+                case "06":
+                    $timezone = "Asia/Jakarta";
+                    break;
+                case "07":
+                    $timezone = "Asia/Jakarta";
+                    break;
+                case "08":
+                    $timezone = "Asia/Jakarta";
+                    break;
+                case "09":
+                    $timezone = "Asia/Jayapura";
+                    break;
+                case "10":
+                    $timezone = "Asia/Jakarta";
+                    break;
+                case "11":
+                    $timezone = "Asia/Pontianak";
+                    break;
+                case "12":
+                    $timezone = "Asia/Makassar";
+                    break;
+                case "13":
+                    $timezone = "Asia/Makassar";
+                    break;
+                case "14":
+                    $timezone = "Asia/Makassar";
+                    break;
+                case "15":
+                    $timezone = "Asia/Jakarta";
+                    break;
+                case "16":
+                    $timezone = "Asia/Makassar";
+                    break;
+                case "17":
+                    $timezone = "Asia/Makassar";
+                    break;
+                case "18":
+                    $timezone = "Asia/Makassar";
+                    break;
+                case "19":
+                    $timezone = "Asia/Pontianak";
+                    break;
+                case "20":
+                    $timezone = "Asia/Makassar";
+                    break;
+                case "21":
+                    $timezone = "Asia/Makassar";
+                    break;
+                case "22":
+                    $timezone = "Asia/Makassar";
+                    break;
+                case "23":
+                    $timezone = "Asia/Makassar";
+                    break;
+                case "24":
+                    $timezone = "Asia/Jakarta";
+                    break;
+                case "25":
+                    $timezone = "Asia/Pontianak";
+                    break;
+                case "26":
+                    $timezone = "Asia/Pontianak";
+                    break;
+                case "28":
+                    $timezone = "Asia/Jayapura";
+                    break;
+                case "29":
+                    $timezone = "Asia/Makassar";
+                    break;
+                case "30":
+                    $timezone = "Asia/Jakarta";
+                    break;
+                case "31":
+                    $timezone = "Asia/Makassar";
+                    break;
+                case "32":
+                    $timezone = "Asia/Jakarta";
+                    break;
+                case "33":
+                    $timezone = "Asia/Jakarta";
+                    break;
+                case "34":
+                    $timezone = "Asia/Makassar";
+                    break;
+                case "35":
+                    $timezone = "Asia/Pontianak";
+                    break;
+                case "36":
+                    $timezone = "Asia/Jayapura";
+                    break;
+                case "37":
+                    $timezone = "Asia/Pontianak";
+                    break;
+                case "38":
+                    $timezone = "Asia/Makassar";
+                    break;
+                case "39":
+                    $timezone = "Asia/Jayapura";
+                    break;
+                case "40":
+                    $timezone = "Asia/Pontianak";
+                    break;
+                case "41":
+                    $timezone = "Asia/Makassar";
+                    break;
+        }
+        break;
+        case "IE":
+            $timezone = "Europe/Dublin";
+            break;
+        case "IL":
+            $timezone = "Asia/Jerusalem";
+            break;
+        case "IM":
+            $timezone = "Europe/Isle_of_Man";
+            break;
+        case "IN":
+            $timezone = "Asia/Kolkata";
+            break;
+        case "IO":
+            $timezone = "Indian/Chagos";
+            break;
+        case "IQ":
+            $timezone = "Asia/Baghdad";
+            break;
+        case "IR":
+            $timezone = "Asia/Tehran";
+            break;
+        case "IS":
+            $timezone = "Atlantic/Reykjavik";
+            break;
+        case "IT":
+            $timezone = "Europe/Rome";
+            break;
+        case "JE":
+            $timezone = "Europe/Jersey";
+            break;
+        case "JM":
+            $timezone = "America/Jamaica";
+            break;
+        case "JO":
+            $timezone = "Asia/Amman";
+            break;
+        case "JP":
+            $timezone = "Asia/Tokyo";
+            break;
+        case "KE":
+            $timezone = "Africa/Nairobi";
+            break;
+        case "KG":
+            $timezone = "Asia/Bishkek";
+            break;
+        case "KH":
+            $timezone = "Asia/Phnom_Penh";
+            break;
+        case "KI":
+            $timezone = "Pacific/Tarawa";
+            break;
+        case "KM":
+            $timezone = "Indian/Comoro";
+            break;
+        case "KN":
+            $timezone = "America/St_Kitts";
+            break;
+        case "KP":
+            $timezone = "Asia/Pyongyang";
+            break;
+        case "KR":
+            $timezone = "Asia/Seoul";
+            break;
+        case "KW":
+            $timezone = "Asia/Kuwait";
+            break;
+        case "KY":
+            $timezone = "America/Cayman";
+            break;
+        case "KZ":
+            switch ($region) {
+                case "01":
+                    $timezone = "Asia/Almaty";
+                    break;
+                case "02":
+                    $timezone = "Asia/Almaty";
+                    break;
+                case "03":
+                    $timezone = "Asia/Qyzylorda";
+                    break;
+                case "04":
+                    $timezone = "Asia/Aqtobe";
+                    break;
+                case "05":
+                    $timezone = "Asia/Qyzylorda";
+                    break;
+                case "06":
+                    $timezone = "Asia/Aqtau";
+                    break;
+                case "07":
+                    $timezone = "Asia/Oral";
+                    break;
+                case "08":
+                    $timezone = "Asia/Qyzylorda";
+                    break;
+                case "09":
+                    $timezone = "Asia/Aqtau";
+                    break;
+                case "10":
+                    $timezone = "Asia/Qyzylorda";
+                    break;
+                case "11":
+                    $timezone = "Asia/Almaty";
+                    break;
+                case "12":
+                    $timezone = "Asia/Qyzylorda";
+                    break;
+                case "13":
+                    $timezone = "Asia/Aqtobe";
+                    break;
+                case "14":
+                    $timezone = "Asia/Qyzylorda";
+                    break;
+                case "15":
+                    $timezone = "Asia/Almaty";
+                    break;
+                case "16":
+                    $timezone = "Asia/Aqtobe";
+                    break;
+                case "17":
+                    $timezone = "Asia/Almaty";
+                    break;
+        }
+        break;
+        case "LA":
+            $timezone = "Asia/Vientiane";
+            break;
+        case "LB":
+            $timezone = "Asia/Beirut";
+            break;
+        case "LC":
+            $timezone = "America/St_Lucia";
+            break;
+        case "LI":
+            $timezone = "Europe/Vaduz";
+            break;
+        case "LK":
+            $timezone = "Asia/Colombo";
+            break;
+        case "LR":
+            $timezone = "Africa/Monrovia";
+            break;
+        case "LS":
+            $timezone = "Africa/Maseru";
+            break;
+        case "LT":
+            $timezone = "Europe/Vilnius";
+            break;
+        case "LU":
+            $timezone = "Europe/Luxembourg";
+            break;
+        case "LV":
+            $timezone = "Europe/Riga";
+            break;
+        case "LY":
+            $timezone = "Africa/Tripoli";
+            break;
+        case "MA":
+            $timezone = "Africa/Casablanca";
+            break;
+        case "MC":
+            $timezone = "Europe/Monaco";
+            break;
+        case "MD":
+            $timezone = "Europe/Chisinau";
+            break;
+        case "ME":
+            $timezone = "Europe/Podgorica";
+            break;
+        case "MF":
+            $timezone = "America/Marigot";
+            break;
+        case "MG":
+            $timezone = "Indian/Antananarivo";
+            break;
+        case "MH":
+            $timezone = "Pacific/Kwajalein";
+            break;
+        case "MK":
+            $timezone = "Europe/Skopje";
+            break;
+        case "ML":
+            $timezone = "Africa/Bamako";
+            break;
+        case "MM":
+            $timezone = "Asia/Rangoon";
+            break;
+        case "MN":
+            switch ($region) {
+                case "06":
+                    $timezone = "Asia/Choibalsan";
+                    break;
+                case "11":
+                    $timezone = "Asia/Ulaanbaatar";
+                    break;
+                case "17":
+                    $timezone = "Asia/Choibalsan";
+                    break;
+                case "19":
+                    $timezone = "Asia/Hovd";
+                    break;
+                case "20":
+                    $timezone = "Asia/Ulaanbaatar";
+                    break;
+                case "21":
+                    $timezone = "Asia/Ulaanbaatar";
+                    break;
+                case "25":
+                    $timezone = "Asia/Ulaanbaatar";
+                    break;
+        }
+        break;
+        case "MO":
+            $timezone = "Asia/Macau";
+            break;
+        case "MP":
+            $timezone = "Pacific/Saipan";
+            break;
+        case "MQ":
+            $timezone = "America/Martinique";
+            break;
+        case "MR":
+            $timezone = "Africa/Nouakchott";
+            break;
+        case "MS":
+            $timezone = "America/Montserrat";
+            break;
+        case "MT":
+            $timezone = "Europe/Malta";
+            break;
+        case "MU":
+            $timezone = "Indian/Mauritius";
+            break;
+        case "MV":
+            $timezone = "Indian/Maldives";
+            break;
+        case "MW":
+            $timezone = "Africa/Blantyre";
+            break;
+        case "MX":
+            switch ($region) {
+                case "01":
+                    $timezone = "America/Mexico_City";
+                    break;
+                case "02":
+                    $timezone = "America/Tijuana";
+                    break;
+                case "03":
+                    $timezone = "America/Hermosillo";
+                    break;
+                case "04":
+                    $timezone = "America/Merida";
+                    break;
+                case "05":
+                    $timezone = "America/Mexico_City";
+                    break;
+                case "06":
+                    $timezone = "America/Chihuahua";
+                    break;
+                case "07":
+                    $timezone = "America/Monterrey";
+                    break;
+                case "08":
+                    $timezone = "America/Mexico_City";
+                    break;
+                case "09":
+                    $timezone = "America/Mexico_City";
+                    break;
+                case "10":
+                    $timezone = "America/Mazatlan";
+                    break;
+                case "11":
+                    $timezone = "America/Mexico_City";
+                    break;
+                case "12":
+                    $timezone = "America/Mexico_City";
+                    break;
+                case "13":
+                    $timezone = "America/Mexico_City";
+                    break;
+                case "14":
+                    $timezone = "America/Mazatlan";
+                    break;
+                case "15":
+                    $timezone = "America/Chihuahua";
+                    break;
+                case "16":
+                    $timezone = "America/Mexico_City";
+                    break;
+                case "17":
+                    $timezone = "America/Mexico_City";
+                    break;
+                case "18":
+                    $timezone = "America/Mazatlan";
+                    break;
+                case "19":
+                    $timezone = "America/Monterrey";
+                    break;
+                case "20":
+                    $timezone = "America/Mexico_City";
+                    break;
+                case "21":
+                    $timezone = "America/Mexico_City";
+                    break;
+                case "22":
+                    $timezone = "America/Mexico_City";
+                    break;
+                case "23":
+                    $timezone = "America/Cancun";
+                    break;
+                case "24":
+                    $timezone = "America/Mexico_City";
+                    break;
+                case "25":
+                    $timezone = "America/Mazatlan";
+                    break;
+                case "26":
+                    $timezone = "America/Hermosillo";
+                    break;
+                case "27":
+                    $timezone = "America/Merida";
+                    break;
+                case "28":
+                    $timezone = "America/Monterrey";
+                    break;
+                case "29":
+                    $timezone = "America/Mexico_City";
+                    break;
+                case "30":
+                    $timezone = "America/Mexico_City";
+                    break;
+                case "31":
+                    $timezone = "America/Merida";
+                    break;
+                case "32":
+                    $timezone = "America/Monterrey";
+                    break;
+        }
+        break;
+        case "MY":
+            switch ($region) {
+                case "01":
+                    $timezone = "Asia/Kuala_Lumpur";
+                    break;
+                case "02":
+                    $timezone = "Asia/Kuala_Lumpur";
+                    break;
+                case "03":
+                    $timezone = "Asia/Kuala_Lumpur";
+                    break;
+                case "04":
+                    $timezone = "Asia/Kuala_Lumpur";
+                    break;
+                case "05":
+                    $timezone = "Asia/Kuala_Lumpur";
+                    break;
+                case "06":
+                    $timezone = "Asia/Kuala_Lumpur";
+                    break;
+                case "07":
+                    $timezone = "Asia/Kuala_Lumpur";
+                    break;
+                case "08":
+                    $timezone = "Asia/Kuala_Lumpur";
+                    break;
+                case "09":
+                    $timezone = "Asia/Kuala_Lumpur";
+                    break;
+                case "11":
+                    $timezone = "Asia/Kuching";
+                    break;
+                case "12":
+                    $timezone = "Asia/Kuala_Lumpur";
+                    break;
+                case "13":
+                    $timezone = "Asia/Kuala_Lumpur";
+                    break;
+                case "14":
+                    $timezone = "Asia/Kuala_Lumpur";
+                    break;
+                case "15":
+                    $timezone = "Asia/Kuching";
+                    break;
+                case "16":
+                    $timezone = "Asia/Kuching";
+                    break;
+        }
+        break;
+        case "MZ":
+            $timezone = "Africa/Maputo";
+            break;
+        case "NA":
+            $timezone = "Africa/Windhoek";
+            break;
+        case "NC":
+            $timezone = "Pacific/Noumea";
+            break;
+        case "NE":
+            $timezone = "Africa/Niamey";
+            break;
+        case "NF":
+            $timezone = "Pacific/Norfolk";
+            break;
+        case "NG":
+            $timezone = "Africa/Lagos";
+            break;
+        case "NI":
+            $timezone = "America/Managua";
+            break;
+        case "NL":
+            $timezone = "Europe/Amsterdam";
+            break;
+        case "NO":
+            $timezone = "Europe/Oslo";
+            break;
+        case "NP":
+            $timezone = "Asia/Kathmandu";
+            break;
+        case "NR":
+            $timezone = "Pacific/Nauru";
+            break;
+        case "NU":
+            $timezone = "Pacific/Niue";
+            break;
+        case "NZ":
+            switch ($region) {
+                case "85":
+                    $timezone = "Pacific/Auckland";
+                    break;
+                case "E7":
+                    $timezone = "Pacific/Auckland";
+                    break;
+                case "E8":
+                    $timezone = "Pacific/Auckland";
+                    break;
+                case "E9":
+                    $timezone = "Pacific/Auckland";
+                    break;
+                case "F1":
+                    $timezone = "Pacific/Auckland";
+                    break;
+                case "F2":
+                    $timezone = "Pacific/Auckland";
+                    break;
+                case "F3":
+                    $timezone = "Pacific/Auckland";
+                    break;
+                case "F4":
+                    $timezone = "Pacific/Auckland";
+                    break;
+                case "F5":
+                    $timezone = "Pacific/Auckland";
+                    break;
+                case "F6":
+                    $timezone = "Pacific/Auckland";
+                    break;
+                case "F7":
+                    $timezone = "Pacific/Chatham";
+                    break;
+                case "F8":
+                    $timezone = "Pacific/Auckland";
+                    break;
+                case "F9":
+                    $timezone = "Pacific/Auckland";
+                    break;
+                case "G1":
+                    $timezone = "Pacific/Auckland";
+                    break;
+                case "G2":
+                    $timezone = "Pacific/Auckland";
+                    break;
+                case "G3":
+                    $timezone = "Pacific/Auckland";
+                    break;
+        }
+        break;
+        case "OM":
+            $timezone = "Asia/Muscat";
+            break;
+        case "PA":
+            $timezone = "America/Panama";
+            break;
+        case "PE":
+            $timezone = "America/Lima";
+            break;
+        case "PF":
+            $timezone = "Pacific/Marquesas";
+            break;
+        case "PG":
+            $timezone = "Pacific/Port_Moresby";
+            break;
+        case "PH":
+            $timezone = "Asia/Manila";
+            break;
+        case "PK":
+            $timezone = "Asia/Karachi";
+            break;
+        case "PL":
+            $timezone = "Europe/Warsaw";
+            break;
+        case "PM":
+            $timezone = "America/Miquelon";
+            break;
+        case "PN":
+            $timezone = "Pacific/Pitcairn";
+            break;
+        case "PR":
+            $timezone = "America/Puerto_Rico";
+            break;
+        case "PS":
+            $timezone = "Asia/Gaza";
+            break;
+        case "PT":
+            switch ($region) {
+                case "02":
+                    $timezone = "Europe/Lisbon";
+                    break;
+                case "03":
+                    $timezone = "Europe/Lisbon";
+                    break;
+                case "04":
+                    $timezone = "Europe/Lisbon";
+                    break;
+                case "05":
+                    $timezone = "Europe/Lisbon";
+                    break;
+                case "06":
+                    $timezone = "Europe/Lisbon";
+                    break;
+                case "07":
+                    $timezone = "Europe/Lisbon";
+                    break;
+                case "08":
+                    $timezone = "Europe/Lisbon";
+                    break;
+                case "09":
+                    $timezone = "Europe/Lisbon";
+                    break;
+                case "10":
+                    $timezone = "Atlantic/Madeira";
+                    break;
+                case "11":
+                    $timezone = "Europe/Lisbon";
+                    break;
+                case "13":
+                    $timezone = "Europe/Lisbon";
+                    break;
+                case "14":
+                    $timezone = "Europe/Lisbon";
+                    break;
+                case "16":
+                    $timezone = "Europe/Lisbon";
+                    break;
+                case "17":
+                    $timezone = "Europe/Lisbon";
+                    break;
+                case "18":
+                    $timezone = "Europe/Lisbon";
+                    break;
+                case "19":
+                    $timezone = "Europe/Lisbon";
+                    break;
+                case "20":
+                    $timezone = "Europe/Lisbon";
+                    break;
+                case "21":
+                    $timezone = "Europe/Lisbon";
+                    break;
+                case "22":
+                    $timezone = "Europe/Lisbon";
+                    break;
+                case "23":
+                    $timezone = "Atlantic/Azores";
+                    break;
+        }
+        break;
+        case "PW":
+            $timezone = "Pacific/Palau";
+            break;
+        case "PY":
+            $timezone = "America/Asuncion";
+            break;
+        case "QA":
+            $timezone = "Asia/Qatar";
+            break;
+        case "RE":
+            $timezone = "Indian/Reunion";
+            break;
+        case "RO":
+            $timezone = "Europe/Bucharest";
+            break;
+        case "RS":
+            $timezone = "Europe/Belgrade";
+            break;
+        case "RU":
+            switch ($region) {
+                case "01":
+                    $timezone = "Europe/Volgograd";
+                    break;
+                case "02":
+                    $timezone = "Asia/Irkutsk";
+                    break;
+                case "03":
+                    $timezone = "Asia/Novokuznetsk";
+                    break;
+                case "04":
+                    $timezone = "Asia/Novosibirsk";
+                    break;
+                case "05":
+                    $timezone = "Asia/Vladivostok";
+                    break;
+                case "06":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "07":
+                    $timezone = "Europe/Volgograd";
+                    break;
+                case "08":
+                    $timezone = "Europe/Samara";
+                    break;
+                case "09":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "10":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "11":
+                    $timezone = "Asia/Irkutsk";
+                    break;
+                case "12":
+                    $timezone = "Europe/Volgograd";
+                    break;
+                case "13":
+                    $timezone = "Asia/Yekaterinburg";
+                    break;
+                case "14":
+                    $timezone = "Asia/Irkutsk";
+                    break;
+                case "15":
+                    $timezone = "Asia/Anadyr";
+                    break;
+                case "16":
+                    $timezone = "Europe/Samara";
+                    break;
+                case "17":
+                    $timezone = "Europe/Volgograd";
+                    break;
+                case "18":
+                    $timezone = "Asia/Krasnoyarsk";
+                    break;
+                case "20":
+                    $timezone = "Asia/Irkutsk";
+                    break;
+                case "21":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "22":
+                    $timezone = "Europe/Volgograd";
+                    break;
+                case "23":
+                    $timezone = "Europe/Kaliningrad";
+                    break;
+                case "24":
+                    $timezone = "Europe/Volgograd";
+                    break;
+                case "25":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "26":
+                    $timezone = "Asia/Kamchatka";
+                    break;
+                case "27":
+                    $timezone = "Europe/Volgograd";
+                    break;
+                case "28":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "29":
+                    $timezone = "Asia/Novokuznetsk";
+                    break;
+                case "30":
+                    $timezone = "Asia/Vladivostok";
+                    break;
+                case "31":
+                    $timezone = "Asia/Krasnoyarsk";
+                    break;
+                case "32":
+                    $timezone = "Asia/Omsk";
+                    break;
+                case "33":
+                    $timezone = "Asia/Yekaterinburg";
+                    break;
+                case "34":
+                    $timezone = "Asia/Yekaterinburg";
+                    break;
+                case "35":
+                    $timezone = "Asia/Yekaterinburg";
+                    break;
+                case "36":
+                    $timezone = "Asia/Anadyr";
+                    break;
+                case "37":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "38":
+                    $timezone = "Europe/Volgograd";
+                    break;
+                case "39":
+                    $timezone = "Asia/Krasnoyarsk";
+                    break;
+                case "40":
+                    $timezone = "Asia/Yekaterinburg";
+                    break;
+                case "41":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "42":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "43":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "44":
+                    $timezone = "Asia/Magadan";
+                    break;
+                case "45":
+                    $timezone = "Europe/Samara";
+                    break;
+                case "46":
+                    $timezone = "Europe/Samara";
+                    break;
+                case "47":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "48":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "49":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "50":
+                    $timezone = "Asia/Yekaterinburg";
+                    break;
+                case "51":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "52":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "53":
+                    $timezone = "Asia/Novosibirsk";
+                    break;
+                case "54":
+                    $timezone = "Asia/Omsk";
+                    break;
+                case "55":
+                    $timezone = "Europe/Samara";
+                    break;
+                case "56":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "57":
+                    $timezone = "Europe/Samara";
+                    break;
+                case "58":
+                    $timezone = "Asia/Yekaterinburg";
+                    break;
+                case "59":
+                    $timezone = "Asia/Vladivostok";
+                    break;
+                case "60":
+                    $timezone = "Europe/Kaliningrad";
+                    break;
+                case "61":
+                    $timezone = "Europe/Volgograd";
+                    break;
+                case "62":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "63":
+                    $timezone = "Asia/Yakutsk";
+                    break;
+                case "64":
+                    $timezone = "Asia/Sakhalin";
+                    break;
+                case "65":
+                    $timezone = "Europe/Samara";
+                    break;
+                case "66":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "67":
+                    $timezone = "Europe/Samara";
+                    break;
+                case "68":
+                    $timezone = "Europe/Volgograd";
+                    break;
+                case "69":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "70":
+                    $timezone = "Europe/Volgograd";
+                    break;
+                case "71":
+                    $timezone = "Asia/Yekaterinburg";
+                    break;
+                case "72":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "73":
+                    $timezone = "Europe/Samara";
+                    break;
+                case "74":
+                    $timezone = "Asia/Krasnoyarsk";
+                    break;
+                case "75":
+                    $timezone = "Asia/Novosibirsk";
+                    break;
+                case "76":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "77":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "78":
+                    $timezone = "Asia/Yekaterinburg";
+                    break;
+                case "79":
+                    $timezone = "Asia/Irkutsk";
+                    break;
+                case "80":
+                    $timezone = "Asia/Yekaterinburg";
+                    break;
+                case "81":
+                    $timezone = "Europe/Samara";
+                    break;
+                case "82":
+                    $timezone = "Asia/Irkutsk";
+                    break;
+                case "83":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "84":
+                    $timezone = "Europe/Volgograd";
+                    break;
+                case "85":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "86":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "87":
+                    $timezone = "Asia/Novosibirsk";
+                    break;
+                case "88":
+                    $timezone = "Europe/Moscow";
+                    break;
+                case "89":
+                    $timezone = "Asia/Vladivostok";
+                    break;
+                case "90":
+                    $timezone = "Asia/Yekaterinburg";
+                    break;
+                case "91":
+                    $timezone = "Asia/Krasnoyarsk";
+                    break;
+                case "92":
+                    $timezone = "Asia/Anadyr";
+                    break;
+                case "93":
+                    $timezone = "Asia/Irkutsk";
+                    break;
+        }
+        break;
+        case "RW":
+            $timezone = "Africa/Kigali";
+            break;
+        case "SA":
+            $timezone = "Asia/Riyadh";
+            break;
+        case "SB":
+            $timezone = "Pacific/Guadalcanal";
+            break;
+        case "SC":
+            $timezone = "Indian/Mahe";
+            break;
+        case "SD":
+            $timezone = "Africa/Khartoum";
+            break;
+        case "SE":
+            $timezone = "Europe/Stockholm";
+            break;
+        case "SG":
+            $timezone = "Asia/Singapore";
+            break;
+        case "SH":
+            $timezone = "Atlantic/St_Helena";
+            break;
+        case "SI":
+            $timezone = "Europe/Ljubljana";
+            break;
+        case "SJ":
+            $timezone = "Arctic/Longyearbyen";
+            break;
+        case "SK":
+            $timezone = "Europe/Bratislava";
+            break;
+        case "SL":
+            $timezone = "Africa/Freetown";
+            break;
+        case "SM":
+            $timezone = "Europe/San_Marino";
+            break;
+        case "SN":
+            $timezone = "Africa/Dakar";
+            break;
+        case "SO":
+            $timezone = "Africa/Mogadishu";
+            break;
+        case "SR":
+            $timezone = "America/Paramaribo";
+            break;
+        case "SS":
+            $timezone = "Africa/Juba";
+            break;
+        case "ST":
+            $timezone = "Africa/Sao_Tome";
+            break;
+        case "SV":
+            $timezone = "America/El_Salvador";
+            break;
+        case "SX":
+            $timezone = "America/Curacao";
+            break;
+        case "SY":
+            $timezone = "Asia/Damascus";
+            break;
+        case "SZ":
+            $timezone = "Africa/Mbabane";
+            break;
+        case "TC":
+            $timezone = "America/Grand_Turk";
+            break;
+        case "TD":
+            $timezone = "Africa/Ndjamena";
+            break;
+        case "TF":
+            $timezone = "Indian/Kerguelen";
+            break;
+        case "TG":
+            $timezone = "Africa/Lome";
+            break;
+        case "TH":
+            $timezone = "Asia/Bangkok";
+            break;
+        case "TJ":
+            $timezone = "Asia/Dushanbe";
+            break;
+        case "TK":
+            $timezone = "Pacific/Fakaofo";
+            break;
+        case "TL":
+            $timezone = "Asia/Dili";
+            break;
+        case "TM":
+            $timezone = "Asia/Ashgabat";
+            break;
+        case "TN":
+            $timezone = "Africa/Tunis";
+            break;
+        case "TO":
+            $timezone = "Pacific/Tongatapu";
+            break;
+        case "TR":
+            $timezone = "Asia/Istanbul";
+            break;
+        case "TT":
+            $timezone = "America/Port_of_Spain";
+            break;
+        case "TV":
+            $timezone = "Pacific/Funafuti";
+            break;
+        case "TW":
+            $timezone = "Asia/Taipei";
+            break;
+        case "TZ":
+            $timezone = "Africa/Dar_es_Salaam";
+            break;
+        case "UA":
+            switch ($region) {
+                case "01":
+                    $timezone = "Europe/Kiev";
+                    break;
+                case "02":
+                    $timezone = "Europe/Kiev";
+                    break;
+                case "03":
+                    $timezone = "Europe/Uzhgorod";
+                    break;
+                case "04":
+                    $timezone = "Europe/Zaporozhye";
+                    break;
+                case "05":
+                    $timezone = "Europe/Zaporozhye";
+                    break;
+                case "06":
+                    $timezone = "Europe/Uzhgorod";
+                    break;
+                case "07":
+                    $timezone = "Europe/Zaporozhye";
+                    break;
+                case "08":
+                    $timezone = "Europe/Simferopol";
+                    break;
+                case "09":
+                    $timezone = "Europe/Kiev";
+                    break;
+                case "10":
+                    $timezone = "Europe/Zaporozhye";
+                    break;
+                case "11":
+                    $timezone = "Europe/Simferopol";
+                    break;
+                case "12":
+                    $timezone = "Europe/Kiev";
+                    break;
+                case "13":
+                    $timezone = "Europe/Kiev";
+                    break;
+                case "14":
+                    $timezone = "Europe/Zaporozhye";
+                    break;
+                case "15":
+                    $timezone = "Europe/Uzhgorod";
+                    break;
+                case "16":
+                    $timezone = "Europe/Zaporozhye";
+                    break;
+                case "17":
+                    $timezone = "Europe/Simferopol";
+                    break;
+                case "18":
+                    $timezone = "Europe/Zaporozhye";
+                    break;
+                case "19":
+                    $timezone = "Europe/Kiev";
+                    break;
+                case "20":
+                    $timezone = "Europe/Simferopol";
+                    break;
+                case "21":
+                    $timezone = "Europe/Kiev";
+                    break;
+                case "22":
+                    $timezone = "Europe/Uzhgorod";
+                    break;
+                case "23":
+                    $timezone = "Europe/Kiev";
+                    break;
+                case "24":
+                    $timezone = "Europe/Uzhgorod";
+                    break;
+                case "25":
+                    $timezone = "Europe/Uzhgorod";
+                    break;
+                case "26":
+                    $timezone = "Europe/Zaporozhye";
+                    break;
+                case "27":
+                    $timezone = "Europe/Kiev";
+                    break;
+        }
+        break;
+        case "UG":
+            $timezone = "Africa/Kampala";
+            break;
+        case "UM":
+            $timezone = "Pacific/Wake";
+            break;
+        case "US":
+            switch ($region) {
+                case "AK":
+                    $timezone = "America/Anchorage";
+                    break;
+                case "AL":
+                    $timezone = "America/Chicago";
+                    break;
+                case "AR":
+                    $timezone = "America/Chicago";
+                    break;
+                case "AZ":
+                    $timezone = "America/Phoenix";
+                    break;
+                case "CA":
+                    $timezone = "America/Los_Angeles";
+                    break;
+                case "CO":
+                    $timezone = "America/Denver";
+                    break;
+                case "CT":
+                    $timezone = "America/New_York";
+                    break;
+                case "DC":
+                    $timezone = "America/New_York";
+                    break;
+                case "DE":
+                    $timezone = "America/New_York";
+                    break;
+                case "FL":
+                    $timezone = "America/New_York";
+                    break;
+                case "GA":
+                    $timezone = "America/New_York";
+                    break;
+                case "HI":
+                    $timezone = "Pacific/Honolulu";
+                    break;
+                case "IA":
+                    $timezone = "America/Chicago";
+                    break;
+                case "ID":
+                    $timezone = "America/Denver";
+                    break;
+                case "IL":
+                    $timezone = "America/Chicago";
+                    break;
+                case "IN":
+                    $timezone = "America/Indiana/Indianapolis";
+                    break;
+                case "KS":
+                    $timezone = "America/Chicago";
+                    break;
+                case "KY":
+                    $timezone = "America/New_York";
+                    break;
+                case "LA":
+                    $timezone = "America/Chicago";
+                    break;
+                case "MA":
+                    $timezone = "America/New_York";
+                    break;
+                case "MD":
+                    $timezone = "America/New_York";
+                    break;
+                case "ME":
+                    $timezone = "America/New_York";
+                    break;
+                case "MI":
+                    $timezone = "America/New_York";
+                    break;
+                case "MN":
+                    $timezone = "America/Chicago";
+                    break;
+                case "MO":
+                    $timezone = "America/Chicago";
+                    break;
+                case "MS":
+                    $timezone = "America/Chicago";
+                    break;
+                case "MT":
+                    $timezone = "America/Denver";
+                    break;
+                case "NC":
+                    $timezone = "America/New_York";
+                    break;
+                case "ND":
+                    $timezone = "America/Chicago";
+                    break;
+                case "NE":
+                    $timezone = "America/Chicago";
+                    break;
+                case "NH":
+                    $timezone = "America/New_York";
+                    break;
+                case "NJ":
+                    $timezone = "America/New_York";
+                    break;
+                case "NM":
+                    $timezone = "America/Denver";
+                    break;
+                case "NV":
+                    $timezone = "America/Los_Angeles";
+                    break;
+                case "NY":
+                    $timezone = "America/New_York";
+                    break;
+                case "OH":
+                    $timezone = "America/New_York";
+                    break;
+                case "OK":
+                    $timezone = "America/Chicago";
+                    break;
+                case "OR":
+                    $timezone = "America/Los_Angeles";
+                    break;
+                case "PA":
+                    $timezone = "America/New_York";
+                    break;
+                case "RI":
+                    $timezone = "America/New_York";
+                    break;
+                case "SC":
+                    $timezone = "America/New_York";
+                    break;
+                case "SD":
+                    $timezone = "America/Chicago";
+                    break;
+                case "TN":
+                    $timezone = "America/Chicago";
+                    break;
+                case "TX":
+                    $timezone = "America/Chicago";
+                    break;
+                case "UT":
+                    $timezone = "America/Denver";
+                    break;
+                case "VA":
+                    $timezone = "America/New_York";
+                    break;
+                case "VT":
+                    $timezone = "America/New_York";
+                    break;
+                case "WA":
+                    $timezone = "America/Los_Angeles";
+                    break;
+                case "WI":
+                    $timezone = "America/Chicago";
+                    break;
+                case "WV":
+                    $timezone = "America/New_York";
+                    break;
+                case "WY":
+                    $timezone = "America/Denver";
+                    break;
+        }
+        break;
+        case "UY":
+            $timezone = "America/Montevideo";
+            break;
+        case "UZ":
+            switch ($region) {
+                case "01":
+                    $timezone = "Asia/Tashkent";
+                    break;
+                case "02":
+                    $timezone = "Asia/Samarkand";
+                    break;
+                case "03":
+                    $timezone = "Asia/Tashkent";
+                    break;
+                case "05":
+                    $timezone = "Asia/Samarkand";
+                    break;
+                case "06":
+                    $timezone = "Asia/Tashkent";
+                    break;
+                case "07":
+                    $timezone = "Asia/Samarkand";
+                    break;
+                case "08":
+                    $timezone = "Asia/Samarkand";
+                    break;
+                case "09":
+                    $timezone = "Asia/Samarkand";
+                    break;
+                case "10":
+                    $timezone = "Asia/Samarkand";
+                    break;
+                case "12":
+                    $timezone = "Asia/Samarkand";
+                    break;
+                case "13":
+                    $timezone = "Asia/Tashkent";
+                    break;
+                case "14":
+                    $timezone = "Asia/Tashkent";
+                    break;
+        }
+        break;
+        case "VA":
+            $timezone = "Europe/Vatican";
+            break;
+        case "VC":
+            $timezone = "America/St_Vincent";
+            break;
+        case "VE":
+            $timezone = "America/Caracas";
+            break;
+        case "VG":
+            $timezone = "America/Tortola";
+            break;
+        case "VI":
+            $timezone = "America/St_Thomas";
+            break;
+        case "VN":
+            $timezone = "Asia/Phnom_Penh";
+            break;
+        case "VU":
+            $timezone = "Pacific/Efate";
+            break;
+        case "WF":
+            $timezone = "Pacific/Wallis";
+            break;
+        case "WS":
+            $timezone = "Pacific/Pago_Pago";
+            break;
+        case "YE":
+            $timezone = "Asia/Aden";
+            break;
+        case "YT":
+            $timezone = "Indian/Mayotte";
+            break;
+        case "YU":
+            $timezone = "Europe/Belgrade";
+            break;
+        case "ZA":
+            $timezone = "Africa/Johannesburg";
+            break;
+        case "ZM":
+            $timezone = "Africa/Lusaka";
+            break;
+        case "ZW":
+            $timezone = "Africa/Harare";
+            break;
+    }
+    return $timezone;
+}
\ No newline at end of file
diff --git a/htdocs/includes/geoip2/geoip2.phar b/htdocs/includes/geoip2/geoip2.phar
new file mode 100644
index 00000000000..05104ff2737
Binary files /dev/null and b/htdocs/includes/geoip2/geoip2.phar differ
diff --git a/htdocs/index.php b/htdocs/index.php
index d6ce8c90067..bf99db80d21 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -100,7 +100,7 @@ if (! empty($conf->global->MAIN_MOTD))
 }
 
 
-print '<div class="fichecenter"><div class="fichethirdleft">';
+
 
 
 /*
@@ -112,7 +112,7 @@ $boxstat='';
 // Load translation files required by page
 $langs->loadLangs(array('commercial', 'bills', 'orders', 'contracts'));
 
-if (empty($user->societe_id))
+if (empty($user->societe_id) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))
 {
     $boxstat.='<div class="box">';
     $boxstat.='<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom nohover" width="100%">';
@@ -313,6 +313,7 @@ if (empty($user->societe_id))
 
 
 	    // Loop and displays each line of table
+		$boardloaded=array();
 	    foreach ($keys as $key=>$val)
 	    {
 	        if ($conditions[$key])
@@ -359,9 +360,8 @@ if (empty($user->societe_id))
     $boxstat.='</table>';
     $boxstat.='</div>';
 }
-//print $boxstat;
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+
 
 
 /*
@@ -380,8 +380,7 @@ if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read)
 {
 	include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 	$board=new ActionComm($db);
-
-	$dashboardlines[] = $board->load_board($user);
+	$dashboardlines[$board->element] = $board->load_board($user);
 }
 
 // Number of project opened
@@ -389,7 +388,7 @@ if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
 {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	$board=new Project($db);
-	$dashboardlines[] = $board->load_board($user);
+	$dashboardlines[$board->element] = $board->load_board($user);
 }
 
 // Number of tasks to do (late)
@@ -397,7 +396,7 @@ if (! empty($conf->projet->enabled) && empty($conf->global->PROJECT_HIDE_TASKS)
 {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 	$board=new Task($db);
-	$dashboardlines[] = $board->load_board($user);
+	$dashboardlines[$board->element] = $board->load_board($user);
 }
 
 // Number of commercial proposals opened (expired)
@@ -405,9 +404,9 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 {
 	include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 	$board=new Propal($db);
-	$dashboardlines[] = $board->load_board($user, "opened");
+	$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
 	// Number of commercial proposals CLOSED signed (billed)
-	$dashboardlines[] = $board->load_board($user, "signed");
+	$dashboardlines[$board->element.'_signed'] = $board->load_board($user, "signed");
 }
 
 // Number of commercial proposals opened (expired)
@@ -415,9 +414,9 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
 {
 	include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 	$board=new SupplierProposal($db);
-	$dashboardlines[] = $board->load_board($user, "opened");
+	$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
 	// Number of commercial proposals CLOSED signed (billed)
-	$dashboardlines[] = $board->load_board($user, "signed");
+	$dashboardlines[$board->element.'_signed'] = $board->load_board($user, "signed");
 }
 
 // Number of customer orders a deal
@@ -425,7 +424,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 {
 	include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 	$board=new Commande($db);
-	$dashboardlines[] = $board->load_board($user);
+	$dashboardlines[$board->element] = $board->load_board($user);
 }
 
 // Number of suppliers orders a deal
@@ -433,7 +432,7 @@ if (! empty($conf->supplier_order->enabled) && $user->rights->fournisseur->comma
 {
 	include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 	$board=new CommandeFournisseur($db);
-	$dashboardlines[] = $board->load_board($user);
+	$dashboardlines[$board->element] = $board->load_board($user);
 }
 
 // Number of services enabled (delayed)
@@ -441,16 +440,16 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 {
 	include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 	$board=new Contrat($db);
-	$dashboardlines[] = $board->load_board($user, "inactive");
+	$dashboardlines[$board->element.'_inactive'] = $board->load_board($user, "inactive");
 	// Number of active services (expired)
-	$dashboardlines[] = $board->load_board($user, "active");
+	$dashboardlines[$board->element.'_active'] = $board->load_board($user, "active");
 }
 // Number of invoices customers (has paid)
 if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 {
 	include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	$board=new Facture($db);
-	$dashboardlines[] = $board->load_board($user);
+	$dashboardlines[$board->element] = $board->load_board($user);
 }
 
 // Number of supplier invoices (has paid)
@@ -458,7 +457,7 @@ if (! empty($conf->supplier_invoice->enabled) && ! empty($user->rights->fourniss
 {
 	include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 	$board=new FactureFournisseur($db);
-	$dashboardlines[] = $board->load_board($user);
+	$dashboardlines[$board->element] = $board->load_board($user);
 }
 
 // Number of transactions to conciliate
@@ -469,7 +468,7 @@ if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->s
 	$nb = $board::countAccountToReconcile();    // Get nb of account to reconciliate
 	if ($nb > 0)
 	{
-		$dashboardlines[] = $board->load_board($user);
+		$dashboardlines[$board->element] = $board->load_board($user);
 	}
 }
 
@@ -478,7 +477,7 @@ if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->s
 {
 	include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
 	$board=new RemiseCheque($db);
-	$dashboardlines[] = $board->load_board($user);
+	$dashboardlines['RemiseCheque'] = $board->load_board($user);
 }
 
 // Number of foundation members
@@ -486,7 +485,7 @@ if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire && ! $use
 {
 	include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 	$board=new Adherent($db);
-	$dashboardlines[] = $board->load_board($user);
+	$dashboardlines['Adherent'] = $board->load_board($user);
 }
 
 // Number of expense reports to approve
@@ -494,7 +493,7 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->appr
 {
 	include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 	$board=new ExpenseReport($db);
-	$dashboardlines[] = $board->load_board($user, 'toapprove');
+	$dashboardlines['ExpenseReport'] = $board->load_board($user, 'toapprove');
 }
 
 // Number of expense reports to pay
@@ -502,7 +501,7 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->to_p
 {
 	include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 	$board=new ExpenseReport($db);
-	$dashboardlines[] = $board->load_board($user, 'topay');
+	$dashboardlines['ExpenseReport'] = $board->load_board($user, 'topay');
 }
 
 // Number of holidays to approve
@@ -510,7 +509,7 @@ if (! empty($conf->holiday->enabled) && $user->rights->holiday->approve)
 {
     include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
     $board=new Holiday($db);
-    $dashboardlines[] = $board->load_board($user);
+    $dashboardlines['Holiday'] = $board->load_board($user);
 }
 
 $object=new stdClass();
@@ -521,28 +520,128 @@ if ($reshook == 0) {
 	$dashboardlines = array_merge($dashboardlines, $hookmanager->resArray);
 }
 
+/* grouping dashboard stats */
+$dashboardgroup = array (
+	'action' =>
+		array (
+			'groupName' => 'Agenda',
+			'stats' => array ('action'),
+		),
+	'project' =>
+		array (
+			'groupName' => 'Projects',
+			'stats' => array ('project','project_task'),
+		),
+	'propal' =>
+		array (
+			'groupName' => 'Proposals',
+			'stats' =>
+				array ('propal_opened','propal_signed'),
+		),
+	'commande' =>
+		array (
+			'groupName' => 'Orders',
+			'stats' =>
+				array ('commande'),
+		),
+	'facture' =>
+		array (
+			'groupName' => 'Invoices',
+			'stats' =>
+				array ('facture'),
+		),
+	'contrat' =>
+		array (
+			'groupName' => 'Contracts',
+			'stats' =>
+			array ('contrat_inactive','contrat_active'),
+		),
+	'supplier_proposal' =>
+		array (
+			'groupName' => 'SupplierProposals',
+			'stats' =>
+			array ('supplier_proposal_opened','supplier_proposal_signed'),
+		),
+	'order_supplier' =>
+		array (
+			'groupName' => 'SuppliersOrders',
+			'stats' =>
+			array ('order_supplier'),
+		),
+	'invoice_supplier' =>
+		array (
+			'groupName' => 'BillsSuppliers',
+			'stats' =>
+				array ('invoice_supplier'),
+		),
+	'bank_account' =>
+		array (
+			'groupName' => 'BankAccount',
+			'stats' =>
+				array ('bank_account','RemiseCheque'),
+		),
+	'Adherent' =>
+		array (
+			'groupName' => 'Members',
+			'stats' =>
+				array ('Adherent'),
+		),
+	'ExpenseReport' =>
+		array (
+			'groupName' => 'ExpenseReport',
+			'stats' =>
+				array ('ExpenseReport'),
+		),
+	'Holiday' =>
+		array (
+			'groupName' => 'Holidays',
+			'stats' =>
+				array ('Holiday'),
+		),
+);
+
+$object=new stdClass();
+$parameters=array(
+	'dashboardgroup' => $dashboardgroup
+);
+$reshook=$hookmanager->executeHooks('addOpenElementsDashboardGroup', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook == 0) {
+	$dashboardgroup = array_merge($dashboardgroup, $hookmanager->resArray);
+}
+
+
 // Calculate total nb of late
 $totallate=$totaltodo=0;
 
 //Remove any invalid response
 //load_board can return an integer if failed or WorkboardResponse if OK
 $valid_dashboardlines=array();
-foreach($dashboardlines as $tmp)
+foreach($dashboardlines as $infoKey => $tmp)
 {
-	if ($tmp instanceof WorkboardResponse) $valid_dashboardlines[] = $tmp;
+	if ($tmp instanceof WorkboardResponse) $valid_dashboardlines[$infoKey] = $tmp;
 }
 
 // We calculate $totallate. Must be defined before start of next loop because it is show in first fetch on next loop
 foreach($valid_dashboardlines as $board)
 {
     if ($board->nbtodolate > 0) {
-    	if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $totaltodo += $board->nbtodo;
+    	$totaltodo += $board->nbtodo;
 	    $totallate += $board->nbtodolate;
     }
 }
-//var_dump($totallate, $totaltodo);
-if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) && !empty($totaltodo)) $totallate = round($totallate / $totaltodo * 100, 2);
-//var_dump($totallate);
+
+$openedDashBoardSize = 'info-box-sm'; // use sm by default
+foreach ($dashboardgroup as $dashbordelement){
+    if(is_array($dashbordelement['stats']) && count($dashbordelement['stats'])>2){
+        $openedDashBoardSize = ''; // use default info box size : big
+        break;
+    }
+}
+
+$totalLateNumber = $totallate;
+$totallatePercentage = !empty($totaltodo) ? round($totallate / $totaltodo * 100, 2) : 0;
+if(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $totallate = $totallatePercentage;
+
 $boxwork='';
 $boxwork.='<div class="box">';
 $boxwork.='<table summary="'.dol_escape_htmltag($langs->trans("WorkingBoard")).'" class="noborder boxtable boxtablenobottom boxworkingboard" width="100%">'."\n";
@@ -560,40 +659,145 @@ if ($showweather)
 $boxwork.='</th>';
 $boxwork.='</tr>'."\n";
 
-/*if ($showweather)
-{
-    $boxwork.='<tr class="nohover">';
-    $boxwork.='<td class="nohover'.($conf->global->MAIN_DISABLE_METEO == 2 ?' hideonsmartphone' : '').' center valignmiddle">';
-    $text='';
-    if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate", $totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')).')';
-    else $text=$langs->transnoentitiesnoconv("NoItemLate");
-    $text.='. '.$langs->transnoentitiesnoconv("LateDesc");
-    //$text.=$form->textwithpicto('',$langs->trans("LateDesc"));
-    $options='height="64px"';
-    $boxwork.=showWeather($totallate, $text, $options);
-    $boxwork.='</td>';
-    $boxwork.='</tr>';
-}*/
-
 // Show dashboard
 $nbworkboardempty=0;
-if (! empty($valid_dashboardlines))
+$isIntopOpenedDashBoard = array();
+if (!empty($valid_dashboardlines))
 {
+	$openedDashBoard = '';
+
     $boxwork.='<tr class="nobottom nohover"><td class="tdboxstats nohover flexcontainer centpercent"><div style="display: flex: flex-wrap: wrap">';
 
-    foreach($valid_dashboardlines as $board)
+	foreach($dashboardgroup as $groupKey => $groupElement) {
+		$boards = array();
+
+		if(!empty($conf->global->MAIN_DISPLAY_NEW_OPENED_DASH_BOARD) || !empty($conf->global->MAIN_FEATURES_LEVEL))
+		{
+			foreach ($groupElement['stats'] as $infoKey)
+			{
+				if(!empty($valid_dashboardlines[$infoKey]))
+				{
+					$boards[] = $valid_dashboardlines[$infoKey];
+					$isIntopOpenedDashBoard[]=$infoKey;
+				}
+			}
+		}
+
+		if(!empty($boards))
+		{
+			$groupName = $langs->trans($groupElement['groupName']);
+			$groupKeyLowerCase = strtolower($groupKey);
+
+			$openedDashBoard.= '<div class="box-flex-item">'."\n";
+			$openedDashBoard.= '	<div class="info-box '.$openedDashBoardSize.'">'."\n";
+			$openedDashBoard.= '		<span class="info-box-icon bg-infoxbox-'.$groupKeyLowerCase.'"><i class="fa fa-dol-'.$groupKeyLowerCase.'"></i></span>'."\n";
+			$openedDashBoard.= '		<div class="info-box-content">'."\n";
+			$openedDashBoard .= '			<span class="info-box-title" title="'.dol_escape_htmltag($groupName).'">'.$groupName.'</span>' . "\n";
+
+			foreach($boards as $board) {
+				if(!empty($board->labelShort)){
+					$infoName = '<span title="'.$board->label.'">'.$board->labelShort.'</span>';
+				}
+				else{
+					$infoName = $board->label ;
+				}
+
+				$textLateTitle = $langs->trans("NActionsLate", $board->nbtodolate);
+				$textLateTitle.= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
+
+				$textLate = '';
+				if($board->nbtodolate>0)
+				{
+					$textLate .= ' <span title="'.dol_htmlentities($textLateTitle).'" class="classfortooltip badge badge-danger">';
+					$textLate .= '<i class="fa fa-exclamation-triangle"></i> '.$board->nbtodolate;
+					$textLate .= '</span>';
+				}
+
+				$nbtodClass = '';
+				if($board->nbtodo>0){
+					$nbtodClass = 'badge badge-info';
+				}
+
+				$openedDashBoard .= '			<a href="'.$board->url.'" class="info-box-text">'.$infoName.' : <span class="'.$nbtodClass.' classfortooltip" title="'.$board->label.'" >'.$board->nbtodo.'</span>'.$textLate.'</a>' . "\n";
+
+				if ($board->total > 0 && ! empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)){
+					$openedDashBoard .=  '<a href="'.$board->url.'" class="info-box-text">'.$langs->trans('Total').' : '.price($board->total)	.'</a>';
+				}
+			}
+
+			$openedDashBoard.= '		</div><!-- /.info-box-content -->'."\n";
+			$openedDashBoard.= '	</div><!-- /.info-box -->'."\n";
+			$openedDashBoard.= '</div><!-- /.box-flex-item -->'."\n";
+			$openedDashBoard.="\n";
+		}
+	}
+
+	if ($showweather && !empty($isIntopOpenedDashBoard))
+	{
+		$appendClass = $conf->global->MAIN_DISABLE_METEO == 2 ?' hideonsmartphone' : '';
+		$weather = getWeatherStatus($totallate);
+
+		$text='';
+		if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate", $totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')).')';
+		else $text=$langs->transnoentitiesnoconv("NoItemLate");
+		$text.='. '.$langs->transnoentitiesnoconv("LateDesc");
+
+		$weatherDashBoard= '<div class="box-flex-item '.$appendClass.'">'."\n";
+		$weatherDashBoard.= '	<div class="info-box '.$openedDashBoardSize.' info-box-weather info-box-weather-level'.$weather->level.'">'."\n";
+		$weatherDashBoard.= '		<span class="info-box-icon">';
+		$weatherDashBoard.= img_weather('', $weather->level, '', 0, 'valignmiddle width50');
+		$weatherDashBoard.= '       </span>'."\n";
+		$weatherDashBoard.= '		<div class="info-box-content">'."\n";
+		$weatherDashBoard.= '			<span class="info-box-title">'.$langs->trans('GlobalOpenedElemView').'</span>' . "\n";
+
+		if($totallatePercentage>0 && !empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+			$weatherDashBoard.= '			<span class="info-box-number">'.$langs->transnoentitiesnoconv("NActionsLate", price($totallatePercentage).'%').'</span>' . "\n";
+			$weatherDashBoard.= '			<span class="progress-description">'.$langs->trans('NActionsLate', $totalLateNumber).'</span>' . "\n";
+		}
+		else{
+			$weatherDashBoard.= '			<span class="info-box-number">'.$langs->transnoentitiesnoconv("NActionsLate", $totalLateNumber).'</span>' . "\n";
+			if($totallatePercentage>0) {
+				$weatherDashBoard.= '			<span class="progress-description">'.$langs->trans('NActionsLate', price($totallatePercentage).'%').'</span>' . "\n";
+			}
+		}
+
+		$weatherDashBoard.= '		</div><!-- /.info-box-content -->'."\n";
+		$weatherDashBoard.= '	</div><!-- /.info-box -->'."\n";
+		$weatherDashBoard.= '</div><!-- /.box-flex-item -->'."\n";
+		$weatherDashBoard.="\n";
+
+		$openedDashBoard=$weatherDashBoard.$openedDashBoard;
+	}
+
+	if(!empty($isIntopOpenedDashBoard))
+	{
+		for ($i = 1; $i <= 10; $i++) {
+			$openedDashBoard .= '<div class="box-flex-item filler"></div>';
+		}
+	}
+
+	$nbworkboardcount=0;
+    foreach($valid_dashboardlines as $infoKey => $board)
     {
-        if (empty($board->nbtodo)) $nbworkboardempty++;
+    	if(in_array($infoKey, $isIntopOpenedDashBoard)) {
+    		// skip if info is present on top
+			continue;
+    	}
 
-        $textlate = $langs->trans("NActionsLate", $board->nbtodolate);
-        $textlate.= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
+		if (empty($board->nbtodo)) $nbworkboardempty++;
+		$nbworkboardcount++;
 
-        $boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats130 boxstatsborder">';
+
+		$textlate = $langs->trans("NActionsLate", $board->nbtodolate);
+		$textlate.= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
+
+
+		$boxwork .='<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats130 boxstatsborder">';
         $boxwork .= '<div class="boxstatscontent">';
         $sep=($conf->dol_use_jmobile?'<br>':' ');
         $boxwork .= '<span class="boxstatstext" title="'.dol_escape_htmltag($board->label).'">'.$board->img.' '.$board->label.'</span><br>';
         $boxwork .= '<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0)?' dashboardlineok':'').'">'.$board->nbtodo.'</span></a>';
-        if ($board->total > 0 && ! empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX))
+        if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX))
         {
             $boxwork .= '&nbsp;/&nbsp;<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0)?' dashboardlineok':'').'">'.price($board->total)	.'</span></a>';
         }
@@ -636,7 +840,14 @@ $boxwork.='</td></tr>';
 $boxwork.='</table>';   // End table array of working board
 $boxwork.='</div>';
 
-print '</div></div></div><div class="clearboth"></div>';
+
+if(!empty($isIntopOpenedDashBoard)) {
+	print '<div class="fichecenter">';
+	print '<div class="opened-dash-board-wrap"><div class="box-flex-container">' . $openedDashBoard . '</div></div>';
+	print '</div>';
+}
+
+print '<div class="clearboth"></div>';
 
 print '<div class="fichecenter fichecenterbis">';
 
@@ -648,8 +859,11 @@ print '<div class="fichecenter fichecenterbis">';
 $boxlist.='<div class="twocolumns">';
 
 $boxlist.='<div class="firstcolumn fichehalfleft boxhalfleft" id="boxhalfleft">';
+if(!empty($nbworkboardcount))
+{
+	$boxlist.=$boxwork;
+}
 
-$boxlist.=$boxwork;
 $boxlist.=$resultboxes['boxlista'];
 
 $boxlist.= '</div>';
@@ -726,33 +940,68 @@ function showWeather($totallate, $text, $options, $morecss = '')
 {
     global $conf;
 
-    $out='';
-    $offset=0;
-    $factor=10; // By default
-
-    $used_conf = !empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'MAIN_METEO_PERCENTAGE_LEVEL' : 'MAIN_METEO_LEVEL';
-
-    $level0=$offset;
-    if (! empty($conf->global->{$used_conf.'0'})) {
-        $level0=$conf->global->{$used_conf.'0'};
-    }
-    $level1=$offset+1*$factor;
-    if (! empty($conf->global->{$used_conf.'1'})) {
-        $level1=$conf->global->{$used_conf.'1'};
-    }
-    $level2=$offset+2*$factor;
-    if (! empty($conf->global->{$used_conf.'2'})) {
-        $level2=$conf->global->{$used_conf.'2'};
-    }
-    $level3=$offset+3*$factor;
-    if (! empty($conf->global->{$used_conf.'3'})) {
-        $level3=$conf->global->{$used_conf.'3'};
-    }
-
-    if ($totallate <= $level0) $out.=img_weather($text, 'weather-clear.png', $options, 0, $morecss);
-    elseif ($totallate > $level0 && $totallate <= $level1) $out.=img_weather($text, 'weather-few-clouds.png', $options, 0, $morecss);
-    elseif ($totallate > $level1 && $totallate <= $level2) $out.=img_weather($text, 'weather-clouds.png', $options, 0, $morecss);
-    elseif ($totallate > $level2 && $totallate <= $level3) $out.=img_weather($text, 'weather-many-clouds.png', $options, 0, $morecss);
-    elseif ($totallate > $level3) $out.=img_weather($text, 'weather-storm.png', $options, 0, $morecss);
-    return $out;
+	$weather = getWeatherStatus($totallate);
+    return img_weather($text, $weather->picto, $options, 0, $morecss);
+}
+
+
+/**
+ *  get weather level
+ *  $conf->global->MAIN_METEO_LEVELx
+ *
+ *  @param      int     $totallate      Nb of element late
+ *  @return     string                  Return img tag of weather
+ */
+function getWeatherStatus($totallate)
+{
+	global $conf;
+
+	$weather = new stdClass();
+	$weather->picto = '';
+
+	$offset=0;
+	$factor=10; // By default
+
+	$used_conf = !empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'MAIN_METEO_PERCENTAGE_LEVEL' : 'MAIN_METEO_LEVEL';
+
+	$level0=$offset;
+	$weather->level=0;
+	if (! empty($conf->global->{$used_conf.'0'})) {
+		$level0=$conf->global->{$used_conf.'0'};
+	}
+	$level1=$offset+1*$factor;
+	if (! empty($conf->global->{$used_conf.'1'})) {
+		$level1=$conf->global->{$used_conf.'1'};
+	}
+	$level2=$offset+2*$factor;
+	if (! empty($conf->global->{$used_conf.'2'})) {
+		$level2=$conf->global->{$used_conf.'2'};
+	}
+	$level3=$offset+3*$factor;
+	if (! empty($conf->global->{$used_conf.'3'})) {
+		$level3=$conf->global->{$used_conf.'3'};
+	}
+
+	if ($totallate <= $level0){
+		$weather->picto = 'weather-clear.png';
+		$weather->level=0;
+	}
+	elseif ($totallate <= $level1){
+		$weather->picto = 'weather-few-clouds.png';
+		$weather->level=1;
+	}
+	elseif ($totallate <= $level2){
+		$weather->picto = 'weather-clouds.png';
+		$weather->level=2;
+	}
+	elseif ($totallate <= $level3){
+		$weather->picto = 'weather-many-clouds.png';
+		$weather->level=3;
+	}
+	else{
+		$weather->picto = 'weather-storm.png';
+		$weather->level=4;
+	}
+
+	return $weather;
 }
diff --git a/htdocs/install/doctemplates/websites/website-template-corporate.jpg b/htdocs/install/doctemplates/websites/website_template-corporate.jpg
similarity index 100%
rename from htdocs/install/doctemplates/websites/website-template-corporate.jpg
rename to htdocs/install/doctemplates/websites/website_template-corporate.jpg
diff --git a/htdocs/install/doctemplates/websites/website_template-corporate.zip b/htdocs/install/doctemplates/websites/website_template-corporate.zip
index f4b25d9a69e..e86e11df288 100644
Binary files a/htdocs/install/doctemplates/websites/website_template-corporate.zip and b/htdocs/install/doctemplates/websites/website_template-corporate.zip differ
diff --git a/htdocs/install/doctemplates/websites/website_template-stellar.jpg b/htdocs/install/doctemplates/websites/website_template-stellar.jpg
new file mode 100644
index 00000000000..66867384b58
Binary files /dev/null and b/htdocs/install/doctemplates/websites/website_template-stellar.jpg differ
diff --git a/htdocs/install/doctemplates/websites/website_template-stellar.zip b/htdocs/install/doctemplates/websites/website_template-stellar.zip
new file mode 100644
index 00000000000..b4d55a83e73
Binary files /dev/null and b/htdocs/install/doctemplates/websites/website_template-stellar.zip differ
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 96348c2e272..2e7099d84b8 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -412,7 +412,9 @@ function pHeader($subtitle, $next, $action = 'set', $param = '', $forcejqueryurl
     }
     print '</span>'."\n";
 
-    print '<form name="forminstall" style="width: 100%" action="'.$next.'.php'.($param?'?'.$param:'').'" method="POST">'."\n";
+    print '<form name="forminstall" style="width: 100%" action="'.$next.'.php'.($param?'?'.$param:'').'" method="POST"';
+    if ($next == 'step5') print ' autocomplete="off"';
+    print '>'."\n";
     print '<input type="hidden" name="testpost" value="ok">'."\n";
     print '<input type="hidden" name="action" value="'.$action.'">'."\n";
 
diff --git a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
index 63a71d59f44..9ffda1e9132 100644
--- a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
+++ b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
@@ -74,3 +74,7 @@ ALTER TABLE llx_payment_salary_extrafields ADD INDEX idx_payment_salary_extrafie
 ALTER TABLE llx_c_price_expression MODIFY COLUMN expression varchar(255) NOT NULL;
 
 UPDATE llx_bank_url set url = REPLACE( url, 'compta/salaries/', 'salaries/');
+
+ALTER TABLE llx_stock_mouvement ADD COLUMN fk_projet INTEGER NOT NULL DEFAULT 0 AFTER model_pdf;
+
+ALTER TABLE llx_oauth_token ADD COLUMN fk_soc integer DEFAULT NULL after token;
diff --git a/htdocs/install/mysql/tables/llx_oauth_token.sql b/htdocs/install/mysql/tables/llx_oauth_token.sql
index 81ae99c6ce6..6698335c07e 100644
--- a/htdocs/install/mysql/tables/llx_oauth_token.sql
+++ b/htdocs/install/mysql/tables/llx_oauth_token.sql
@@ -20,6 +20,7 @@ CREATE TABLE llx_oauth_token (
     service varchar(36),
     token text,						-- token in serialize() format, of an object StdOAuth2Token of library phpoauth2
     tokenstring text,				-- token in json format '{"access_token": "sk_test_cccc", "refresh_token": "rt_aaa", "token_type": "bearer", ..., "scope": "read_write"}
+    fk_soc integer,
     fk_user integer,
     fk_adherent integer,
     entity integer DEFAULT 1
diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql
index fdeab913268..29f263bc520 100644
--- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql
+++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql
@@ -36,5 +36,6 @@ create table llx_stock_mouvement
   fk_project	  integer,
   fk_origin       integer,
   origintype      varchar(32),
-  model_pdf       varchar(255)
+  model_pdf       varchar(255),
+  fk_projet       integer NOT NULL DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index 6ddd999ea59..46c84a01351 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -632,6 +632,25 @@ dolibarr_install_syslog("Exit ".$ret);
 
 dolibarr_install_syslog("- step2: end");
 
+
+$out  = '<input type="checkbox" name="dolibarrpingno" id="dolibarrpingno" value="checked" checked="true"> ';
+$out .= $langs->trans("MakeAnonymousPing");
+
+$out .= '<!-- Add js script to manage the uncheck of option to not send the ping -->';
+$out .= '<script type="text/javascript">';
+$out .= 'jQuery(document).ready(function(){';
+$out .= '  document.cookie = "DOLINSTALLNOPING_'.md5($dolibarr_main_instance_unique_id).'=0; path=/"'."\n";
+$out .= '  jQuery("#dolibarrpingno").click(function() {';
+$out .= '    if (! $(this).is(\':checked\')) {';
+$out .= '      console.log("We uncheck anonymous ping");';
+$out .= '      document.cookie = "DOLINSTALLNOPING_'.md5($dolibarr_main_instance_unique_id).'=1; path=/"'."\n";
+$out .= '    }';
+$out .= '  });';
+$out .= '});';
+$out .= '</script>';
+
+print $out;
+
 pFooter($ok?0:1, $setuplang);
 
 if (isset($db) && is_object($db)) $db->close();
diff --git a/htdocs/install/step4.php b/htdocs/install/step4.php
index dceb32a3d3a..342ec82d0fd 100644
--- a/htdocs/install/step4.php
+++ b/htdocs/install/step4.php
@@ -80,11 +80,11 @@ $db=getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->
 if ($db->ok)
 {
     print '<tr><td><label for="login">'.$langs->trans("Login").' :</label></td><td>';
-	print '<input id="login" name="login" type="text" value="' . (!empty($_GET["login"]) ? GETPOST("login") : (isset($force_install_dolibarrlogin) ? $force_install_dolibarrlogin : '')) . '"' . (@$force_install_noedit == 2 && $force_install_dolibarrlogin !== null ? ' disabled' : '') . '></td></tr>';
+	print '<input id="login" name="login" type="text" value="' . (!empty($_GET["login"]) ? GETPOST("login", 'alpha') : (isset($force_install_dolibarrlogin) ? $force_install_dolibarrlogin : '')) . '"' . (@$force_install_noedit == 2 && $force_install_dolibarrlogin !== null ? ' disabled' : '') . '></td></tr>';
     print '<tr><td><label for="pass">'.$langs->trans("Password").' :</label></td><td>';
-    print '<input type="password" id="pass" name="pass"></td></tr>';
+    print '<input type="password" id="pass" name="pass" autocomplete="new-password"></td></tr>';
     print '<tr><td><label for="pass_verif">'.$langs->trans("PasswordAgain").' :</label></td><td>';
-    print '<input type="password" id="pass_verif" name="pass_verif"></td></tr>';
+    print '<input type="password" id="pass_verif" name="pass_verif" autocomplete="new-password"></td></tr>';
     print '</table>';
 
     if (isset($_GET["error"]) && $_GET["error"] == 1)
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index d408cddc5c8..1b4badc39b5 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -432,7 +432,7 @@ ExtrafieldParamHelpradio=List of values must be lines with format key,value (whe
 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
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default)<br>Set this to 2 for a collapsing separator (collapsed by default)
+ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the 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
@@ -1696,7 +1696,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+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<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
 YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
@@ -1932,3 +1932,8 @@ DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
+RESTRICT_API_ON_IP=Allow available APIs to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can use the available APIs.
+RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+BaseOnSabeDavVersion=Based on the library SabreDAV version
+NotAPublicIp=Not a public IP
+MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
\ No newline at end of file
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index c77158e07b7..47295ec7e31 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -73,6 +73,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
+TransactionsToConciliateShort=To reconcile
 Conciliable=Can be reconciled
 Conciliate=Reconcile
 Conciliation=Reconciliation
@@ -116,6 +117,7 @@ DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Bank checks
 BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=Show check deposit receipt
 NumberOfCheques=No. of check
 DeleteTransaction=Delete entry
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 83c217b06f7..628de17efcc 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -68,4 +68,7 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
-BasicPhoneLayout=Use basic layout for phones
\ No newline at end of file
+BasicPhoneLayout=Use basic layout for phones
+SetupOfTerminalNotComplete=Setup of terminal %s is not complete
+DirectPayment=Direct payment
+DirectPaymentButton=Direct cash payment button
diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang
index 129b7d8416a..47572c355ab 100644
--- a/htdocs/langs/en_US/contracts.lang
+++ b/htdocs/langs/en_US/contracts.lang
@@ -51,6 +51,7 @@ ListOfClosedServices=List of closed services
 ListOfRunningServices=List of running services
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Services to activate among validated contracts
+BoardNotActivatedServicesShort=Services to activate
 LastContracts=Latest %s contracts
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Start date
@@ -65,7 +66,9 @@ DateEndReal=Real end date
 DateEndRealShort=Real end date
 CloseService=Close service
 BoardRunningServices=Services running
+BoardRunningServicesShort=Services running
 BoardExpiredServices=Services expired
+BoardExpiredServicesShort=Services expired
 ServiceStatus=Status of service
 DraftContracts=Drafts contracts
 CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 880978a13e5..5c3e30967de 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -705,6 +705,7 @@ DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
+RootOfMedias=Root of public medias (/medias)
 Informations=Information
 Page=Page
 Notes=Notes
@@ -982,3 +983,10 @@ PaymentInformation=Payment information
 ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
+ToClose=To close
+ToProcess=To process
+ToApprove=To approve
+GlobalOpenedElemView=Global view
+NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=No article found for the category
+ToAcceptRefuse=To accept | refuse
\ No newline at end of file
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 9993e05428f..5886c598d52 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -29,6 +29,7 @@ MenuMembersUpToDate=Up to date members
 MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
+MembersWithSubscriptionToReceiveShort=Subscription to receive
 DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 36ca0ede002..73e672284de 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -340,4 +340,4 @@ ErrorCopyProductCombinations=There was an error while copying the product varian
 ErrorDestinationProductNotFound=Destination product not found
 ErrorProductCombinationNotFound=Product variant not found
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
-ProductsPricePerCustomer=Product prices per customers
\ No newline at end of file
+ProductsPricePerCustomer=Product prices per customers
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index ca9a1e2452f..4b4a787b6ad 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -76,7 +76,13 @@ MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 ProgressDeclared=Declared progress
+TaskProgressSummary=Task progress
+CurentlyOpenedTasks=Curently opened tasks
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
 ProgressCalculated=Calculated progress
+WhichIamLinkedTo=which I'm linked to
+WhichIamLinkedToProject=which I'm linked to project
 Time=Time
 ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index f01494fcdac..6b5c0a300e8 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -2,7 +2,7 @@
 Shortname=Code
 WebsiteSetupDesc=Create here the websites you wish to use. 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.
+ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain. 
 WEBSITE_TYPE_CONTAINER=Type of page/container
 WEBSITE_PAGE_EXAMPLE=Web page to use as example
 WEBSITE_PAGENAME=Page name/alias
@@ -15,6 +15,8 @@ WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
 WEBSITE_MANIFEST_JSON=Website manifest.json file
+WEBSITE_README=README.md file
+EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 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.
@@ -42,6 +44,7 @@ RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
 SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>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 set the name of the virtual host you have created in the properties of web site, so the preview can be done also using this dedicated web server access instead of the internal Dolibarr server.
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>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>
+YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
 ReadPerm=Read
 WritePerm=Write
@@ -76,7 +79,7 @@ AddWebsiteAccount=Create web site account
 BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
-AnotherContainer=Another container
+AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
 SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
 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 / third party
@@ -106,4 +109,8 @@ DeleteAlsoJs=Delete also all javascript files specific to this website?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
 MyWebsitePages=My website pages
 SearchReplaceInto=Search | Replace into
-ReplaceString=New string
\ No newline at end of file
+ReplaceString=New string
+CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
+LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
+Dynamiccontent=Sample of a page with dynamic content
+ImportSite=Import site
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 097e2e3fc8d..6ad580cfcd9 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -340,4 +340,4 @@ ErrorCopyProductCombinations=Une erreur s'est produite lors de la copie des vari
 ErrorDestinationProductNotFound=Produit destination non trouvé
 ErrorProductCombinationNotFound=Variante du produit non trouvé
 ActionAvailableOnVariantProductOnly=Action disponible uniquement sur la variante du produit
-ProductsPricePerCustomer=Prix produit par clients
+ProductsPricePerCustomer=Prix produit par clients
\ No newline at end of file
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 2ba5e3b484a..620a4b4e7f6 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -624,7 +624,7 @@ if (! defined('NOLOGIN'))
 			session_destroy();
 			session_name($sessionname);
 			session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-			session_start();    // Fixing the bug of register_globals here is useless since session is empty
+			session_start();
 
 			if ($resultFetchUser == 0)
 			{
@@ -681,7 +681,7 @@ if (! defined('NOLOGIN'))
 			session_destroy();
 			session_name($sessionname);
 			session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-			session_start();    // Fixing the bug of register_globals here is useless since session is empty
+			session_start();
 
 			if ($resultFetchUser == 0)
 			{
@@ -1217,7 +1217,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		if (GETPOST('dol_basehref', 'alpha')) print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref', 'alpha')).'">'."\n";
 
 		// Displays meta
-		print '<meta charset="UTF-8">'."\n";
+		print '<meta charset="utf-8">'."\n";
 		print '<meta name="robots" content="noindex'.($disablenofollow?'':',nofollow').'">'."\n";	// Do not index
 		print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";		// Scale for mobile device
 		print '<meta name="author" content="Dolibarr Development Team">'."\n";
@@ -1258,11 +1258,12 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		$themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss', 'aZ09')?'&amp;optioncss='.GETPOST('optioncss', 'aZ09', 1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
 		$themeparam.=($ext?'&amp;'.$ext:'').'&amp;revision='.$conf->global->MAIN_IHM_PARAMS_REV;
 		if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
-		if (GETPOST('dol_hide_topmenu', 'int'))           { $themeparam.='&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu', 'int'); }
-		if (GETPOST('dol_hide_leftmenu', 'int'))          { $themeparam.='&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu', 'int'); }
-		if (GETPOST('dol_optimize_smallscreen', 'int'))   { $themeparam.='&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen', 'int'); }
-		if (GETPOST('dol_no_mouse_hover', 'int'))         { $themeparam.='&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover', 'int'); }
-		if (GETPOST('dol_use_jmobile', 'int'))            { $themeparam.='&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile', 'int'); $conf->dol_use_jmobile=GETPOST('dol_use_jmobile', 'int'); }
+		if (GETPOSTISSET('dol_hide_topmenu'))           { $themeparam.='&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu', 'int'); }
+		if (GETPOSTISSET('dol_hide_leftmenu'))          { $themeparam.='&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu', 'int'); }
+		if (GETPOSTISSET('dol_optimize_smallscreen'))   { $themeparam.='&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen', 'int'); }
+		if (GETPOSTISSET('dol_no_mouse_hover'))         { $themeparam.='&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover', 'int'); }
+		if (GETPOSTISSET('dol_use_jmobile'))            { $themeparam.='&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile', 'int'); $conf->dol_use_jmobile=GETPOST('dol_use_jmobile', 'int'); }
+		if (GETPOSTISSET('THEME_AGRESSIVITY_RATIO'))    { $themeparam.='&amp;THEME_AGRESSIVITY_RATIO='.GETPOST('THEME_AGRESSIVITY_RATIO', 'int'); }
 
 		if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax)
 		{
@@ -1441,6 +1442,9 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
                 print 'var ckeditorFilebrowserImageBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
                 print '</script>'."\n";
                 print '<script src="'.$pathckeditor.$jsckeditor.($ext?'?'.$ext:'').'"></script>'."\n";
+                print '<script>';
+                print 'CKEDITOR.disableAutoInline = true;'."\n";
+                print '</script>'."\n";
             }
 
             // Browser notifications
@@ -1814,11 +1818,11 @@ function top_menu_user(User $user, Translate $langs)
     }
     else $appli.=" ".DOL_VERSION;
 
-    $btnUser = '
+    $btnUser = '<!-- div for user link -->
     <div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu">
         <a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="dropdown-toggle login-dropdown-a" data-toggle="dropdown">
             '.$userImage.'
-            <span class="hidden-xs maxwidth200 atoploginusername">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 10).'</span>
+            <span class="hidden-xs maxwidth200 atoploginusername hideonsmartphone">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 10).'</span>
             <span class="fa fa-chevron-down login-dropdown-btn" id="dropdown-icon-down"></span>
             <span class="fa fa-chevron-up login-dropdown-btn hidden" id="dropdown-icon-up"></span>
         </a>
@@ -2201,7 +2205,7 @@ if (! function_exists("llxFooter"))
 	 */
 	function llxFooter($comment = '', $zone = 'private', $disabledoutputofmessages = 0)
 	{
-		global $conf, $langs, $user, $object;
+		global $conf, $db, $langs, $user, $object;
 		global $delayedhtmlcontent;
 		global $contextpage, $page, $limit;
 
@@ -2330,65 +2334,62 @@ if (! function_exists("llxFooter"))
 		// Add code for the asynchronous anonymous first ping (for telemetry)
 		if (($_SERVER["PHP_SELF"] == DOL_URL_ROOT.'/index.php') || GETPOST('forceping', 'alpha'))
 		{
+			//print '<!-- instance_unique_id='.$conf->file->instance_unique_id.' MAIN_FIRST_PING_OK_ID='.$conf->global->MAIN_FIRST_PING_OK_ID.' -->';
 			if (empty($conf->global->MAIN_FIRST_PING_OK_DATE)
-			|| (! empty($conf->file->instance_unique_id) && (md5($conf->file->instance_unique_id) != $conf->global->MAIN_FIRST_PING_OK_ID))
+			|| (! empty($conf->file->instance_unique_id) && (md5($conf->file->instance_unique_id) != $conf->global->MAIN_FIRST_PING_OK_ID) && ($conf->global->MAIN_FIRST_PING_OK_ID != 'disabled'))
 			|| GETPOST('forceping', 'alpha'))
 			{
-				print "\n".'<!-- Includes JS for Ping of Dolibarr MAIN_FIRST_PING_OK_DATE = '.$conf->global->MAIN_FIRST_PING_OK_DATE.' MAIN_FIRST_PING_OK_ID = '.$conf->global->MAIN_FIRST_PING_OK_ID.' -->'."\n";
-				print "\n<!-- JS CODE TO ENABLE the anonymous Ontime Ping -->\n";
-				?>
-	    			<script>
-	    			jQuery(document).ready(function (tmp) {
-	    				$.ajax({
-	    					  method: "POST",
-	    					  url: "https://ping.dolibarr.org/",
-	    					  timeout: 500,     // timeout milliseconds
-	    					  cache: false,
-	    					  data: { hash_algo: "md5", hash_unique_id: "<?php echo md5('dolibarr'.$conf->file->instance_unique_id); ?>", action: "dolibarrping", version: "<?php echo (float) DOL_VERSION; ?>", entity: <?php echo (int) $conf->entity; ?> },
-	    					  success: function (data, status, xhr) {   // success callback function (data contains body of response)
-	      					    	console.log("Ping ok");
-	        	    				$.ajax({
-	      	    					  method: "GET",
-	      	    					  url: "<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>",
-	      	    					  timeout: 500,     // timeout milliseconds
-	      	    					  cache: false,
-	      	        				  data: { hash_algo: "md5", hash_unique_id: "<?php echo md5($conf->file->instance_unique_id); ?>", action: "firstpingok" },
-	    					  		});
-	    					  },
-	    					  error: function (data,status,xhr) {   // success callback function
-	        					    console.log("Ping ko: " + data);
-	        	    				$.ajax({
-	        	    					  method: "GET",
-	        	    					  url: "<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>",
-	        	    					  timeout: 500,     // timeout milliseconds
-	        	    					  cache: false,
-	        	        				  data: { hash_algo: "md5", hash_unique_id: "<?php echo md5($conf->file->instance_unique_id); ?>", action: "firstpingko", version: "<?php echo (float) DOL_VERSION; ?>" },
-	      					  		});
-	    					  }
-	    				});
-	    			});
-	    			</script>
-				<?php
+				if (empty($_COOKIE['DOLINSTALLNOPING_'.md5($conf->file->instance_unique_id)]))
+				{
+					print "\n".'<!-- Includes JS for Ping of Dolibarr MAIN_FIRST_PING_OK_DATE = '.$conf->global->MAIN_FIRST_PING_OK_DATE.' MAIN_FIRST_PING_OK_ID = '.$conf->global->MAIN_FIRST_PING_OK_ID.' -->'."\n";
+					print "\n<!-- JS CODE TO ENABLE the anonymous Ontime Ping -->\n";
+					$hash_unique_id = md5('dolibarr'.$conf->file->instance_unique_id);
+					?>
+		    			<script>
+		    			jQuery(document).ready(function (tmp) {
+		    				$.ajax({
+		    					  method: "POST",
+		    					  url: "https://ping.dolibarr.org/",
+		    					  timeout: 500,     // timeout milliseconds
+		    					  cache: false,
+		    					  data: { hash_algo: "md5", hash_unique_id: "<?php echo $hash_unique_id; ?>", action: "dolibarrping", version: "<?php echo (float) DOL_VERSION; ?>", entity: <?php echo (int) $conf->entity; ?> },
+		    					  success: function (data, status, xhr) {   // success callback function (data contains body of response)
+		      					    	console.log("Ping ok");
+		        	    				$.ajax({
+		      	    					  method: "GET",
+		      	    					  url: "<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>",
+		      	    					  timeout: 500,     // timeout milliseconds
+		      	    					  cache: false,
+		      	        				  data: { hash_algo: "md5", hash_unique_id: "<?php echo $hash_unique_id; ?>", action: "firstpingok" },
+		    					  		});
+		    					  },
+		    					  error: function (data,status,xhr) {   // success callback function
+		        					    console.log("Ping ko: " + data);
+		        	    				$.ajax({
+		        	    					  method: "GET",
+		        	    					  url: "<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>",
+		        	    					  timeout: 500,     // timeout milliseconds
+		        	    					  cache: false,
+		        	        				  data: { hash_algo: "md5", hash_unique_id: "<?php echo $hash_unique_id; ?>", action: "firstpingko", version: "<?php echo (float) DOL_VERSION; ?>" },
+		      					  		});
+		    					  }
+		    				});
+		    			});
+		    			</script>
+					<?php
+				}
+				else
+				{
+					$now = dol_now();
+					print "\n<!-- NO JS CODE TO ENABLE the anonymous One time Ping. It was disabled -->\n";
+					include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+					dolibarr_set_const($db, 'MAIN_FIRST_PING_OK_DATE', dol_print_date($now, 'dayhourlog', 'gmt'));
+					dolibarr_set_const($db, 'MAIN_FIRST_PING_OK_ID', 'disabled');
+				}
 			}
 		}
 
 		print "</body>\n";
 		print "</html>\n";
-
-        ?>
-
-		<!-- Disabled. This creates a lot of regression. A better solution is to add a protection on submitted page to avoid action to be done twice.
-        <script type="text/javascript">
-            //Prevent from multiple form sending
-            $(function() {
-                $('input[type=submit]').click(function(e) {
-                    e.preventDefault();
-                    $(this).prop('disabled', true);
-                    $(this).closest('form').submit();
-                });
-            });
-        </script>
-        -->
-        <?php
     }
 }
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 6ddb439f074..fcf68096e6b 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -121,6 +121,25 @@ if (! defined('NOREQUIREDB'))
 
 	if ($db->error)
 	{
+		// If we were into a website context
+		if (! defined('USEDOLIBARREDITOR') && ! defined('USEDOLIBARRSERVER') && ! empty($_SERVER['SCRIPT_FILENAME']) && (strpos($_SERVER['SCRIPT_FILENAME'], DOL_DATA_ROOT.'/website') === 0))
+		{
+			$sapi_type = php_sapi_name();
+			if (substr($sapi_type, 0, 3) != 'cgi') http_response_code(503);				// To tel search engine this is a temporary error
+			print '<div class="center" style="text-align: center; margin: 100px;">';
+			if (is_object($langs))
+			{
+				$langs->setDefaultLang('auto');
+				$langs->load("website");
+				print $langs->trans("SorryWebsiteIsCurrentlyOffLine");
+			}
+			else
+			{
+				print "SorryWebsiteIsCurrentlyOffLine";
+			}
+			print '</div>';
+			exit;
+		}
 		dol_print_error($db, "host=".$conf->db->host.", port=".$conf->db->port.", user=".$conf->db->user.", databasename=".$conf->db->name.", ".$db->error);
 		exit;
 	}
@@ -245,3 +264,4 @@ $hookmanager=new HookManager($db);
 
 
 if (! defined('MAIN_LABEL_MENTION_NPR') ) define('MAIN_LABEL_MENTION_NPR', 'NPR');
+//if (! defined('PCLZIP_TEMPORARY_DIR')) define('PCLZIP_TEMPORARY_DIR', $conf->user->dir_temp);
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index fea88479abf..fd3ff41c799 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -103,7 +103,8 @@ if ($action == 'edit')
 	foreach($arrayofparameters as $key => $val)
 	{
 		print '<tr class="oddeven"><td>';
-		print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
+		$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
+		print $form->textwithpicto($langs->trans($key), $tooltiphelp);
 		print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css'])?'minwidth200':$val['css']).'" value="' . $conf->global->$key . '"></td></tr>';
 	}
 	print '</table>';
@@ -125,7 +126,8 @@ else
 		foreach($arrayofparameters as $key => $val)
 		{
 			print '<tr class="oddeven"><td>';
-			print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
+			$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
+			print $form->textwithpicto($langs->trans($key), $tooltiphelp);
 			print '</td><td>' . $conf->global->$key . '</td></tr>';
 		}
 
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 83e5936f092..97823bfc861 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -146,6 +146,7 @@ if ($action == 'other')
 
 	$value = GETPOST('activate_useProdFournDesc', 'alpha');
 	$res = dolibarr_set_const($db, "PRODUIT_FOURN_TEXTS", $value, 'chaine', 0, '', $conf->entity);
+
 	if ($value) {
 	    $sql_test = "SELECT count(desc_fourn) as cpt FROM ".MAIN_DB_PREFIX."product_fournisseur_price WHERE 1";
 	    $resql = $db->query($sql_test);
@@ -678,6 +679,7 @@ if (! empty($conf->fournisseur->enabled))
     print '</tr>';
 }
 
+
 if (! empty($conf->global->PRODUCT_CANVAS_ABILITY))
 {
 	// Add canvas feature
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 11cbfa9ff14..8d65a88acad 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2788,11 +2788,10 @@ class Product extends CommonObject
     public function load_stats_facture($socid = 0)
     {
         // phpcs:enable
-        global $conf;
-        global $user;
+        global $db, $conf, $user;
 
         $sql = "SELECT COUNT(DISTINCT f.fk_soc) as nb_customers, COUNT(DISTINCT f.rowid) as nb,";
-        $sql.= " COUNT(fd.rowid) as nb_rows, SUM(fd.qty) as qty";
+        $sql.= " COUNT(fd.rowid) as nb_rows, SUM(".$db->ifsql('f.type != 2', 'fd.qty', 'fd.qty * -1').") as qty";
         $sql.= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
         $sql.= ", ".MAIN_DB_PREFIX."facture as f";
         $sql.= ", ".MAIN_DB_PREFIX."societe as s";
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 283d81f2713..587d494a51f 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -810,12 +810,16 @@ SCRIPT;
                     print_liste_field_titre("BarcodeType", $_SERVER["PHP_SELF"], "pfp.fk_barcode_type", "", $param, '', $sortfield, $sortorder, 'center ');
                 }
 				print_liste_field_titre("DateModification", $_SERVER["PHP_SELF"], "pfp.tms", "", $param, '', $sortfield, $sortorder, 'right ');
+				if (is_object($hookmanager))
+				{
+				    $parameters=array('id_fourn'=>$id_fourn, 'prod_id'=>$object->id);
+				    $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action);
+				}
 				print_liste_field_titre('');
 				print "</tr>\n";
 
 				if (is_array($product_fourn_list))
 				{
-
 					foreach($product_fourn_list as $productfourn)
 					{
 						print '<tr class="oddeven">';
@@ -923,7 +927,7 @@ SCRIPT;
 						if (is_object($hookmanager))
 						{
 							$parameters=array('id_pfp'=>$productfourn->product_fourn_price_id,'id_fourn'=>$id_fourn,'prod_id'=>$object->id);
-						    $reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $object, $action);
+						    $reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action);
 						}
 
 						// Modify-Remove
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 1a9b5fa1f6f..e7e8f1e4999 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -136,6 +136,7 @@ $fieldstosearchall = array(
 	'p.label'=>"ProductLabel",
 	'p.description'=>"Description",
 	"p.note"=>"Note",
+
 );
 // multilang
 if (! empty($conf->global->MAIN_MULTILANGS))
@@ -148,6 +149,8 @@ if (! empty($conf->barcode->enabled)) {
 	$fieldstosearchall['p.barcode']='Gencod';
     $fieldstosearchall['pfp.barcode']='GencodBuyPrice';
 }
+// Personalized search criterias. Example: $conf->global->PRODUCT_QUICKSEARCH_ON_FIELDS = 'p.ref=ProductRef;p.label=ProductLabel'
+if (! empty($conf->global->PRODUCT_QUICKSEARCH_ON_FIELDS)) $fieldstosearchall=dolExplodeIntoArray($conf->global->PRODUCT_QUICKSEARCH_ON_FIELDS);
 
 if (empty($conf->global->PRODUIT_MULTIPRICES))
 {
@@ -455,6 +458,10 @@ if ($resql)
 	if($type == Product::TYPE_SERVICE) $rightskey='service';
 	if($user->rights->{$rightskey}->creer)
 	{
+		if ($type === "") {
+			$newcardbutton.= dolGetButtonTitle($langs->trans('NewProduct'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&amp;type=0');
+			$type = Product::TYPE_SERVICE;
+		}
 		$label='NewProduct';
 		if($type == Product::TYPE_SERVICE) $label='NewService';
         $newcardbutton.= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&amp;type='.$type);
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 89d7258e3cc..958f03dff2f 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -56,6 +56,9 @@ $backtopage=GETPOST('backtopage', 'alpha');
 //$result=restrictedArea($user,'stock', $id, 'entrepot&stock');
 $result=restrictedArea($user, 'stock');
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('warehousecard', 'globalcard'));
+
 $object = new Entrepot($db);
 $extrafields = new ExtraFields($db);
 
@@ -73,8 +76,6 @@ if ($id > 0 || ! empty($ref)) {
     }
 }
 
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('warehousecard','globalcard'));
 
 /*
  * Actions
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index c6db985f515..1ddf58cde2b 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -344,17 +344,31 @@ class MouvementStock extends CommonObject
 
 		if ($movestock && $entrepot_id > 0)	// Change stock for current product, change for subproduct is done after
 		{
+			$fk_project = 0;
 			if(!empty($this->origin)) {			// This is set by caller for tracking reason
 				$origintype = $this->origin->element;
 				$fk_origin = $this->origin->id;
+				if($origintype == 'project') $fk_project = $fk_origin;
+				else
+				{
+					$res = $this->origin->fetch($fk_origin);
+					if ($res > 0)
+					{
+						if (!empty($this->origin->fk_project))
+						{
+							$fk_project = $this->origin->fk_project;
+						}
+					}
+				}
 			} else {
 				$origintype = '';
 				$fk_origin = 0;
+				$fk_project = 0;
 			}
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."stock_mouvement(";
 			$sql.= " datem, fk_product, batch, eatby, sellby,";
-			$sql.= " fk_entrepot, value, type_mouvement, fk_user_author, label, inventorycode, price, fk_origin, origintype";
+			$sql.= " fk_entrepot, value, type_mouvement, fk_user_author, label, inventorycode, price, fk_origin, origintype, fk_projet";
 			$sql.= ")";
 			$sql.= " VALUES ('".$this->db->idate($now)."', ".$this->product_id.", ";
 			$sql.= " ".($batch?"'".$batch."'":"null").", ";
@@ -366,7 +380,8 @@ class MouvementStock extends CommonObject
 			$sql.= " ".($inventorycode?"'".$this->db->escape($inventorycode)."'":"null").",";
 			$sql.= " '".price2num($price)."',";
 			$sql.= " '".$fk_origin."',";
-			$sql.= " '".$origintype."'";
+			$sql.= " '".$origintype."',";
+			$sql.= " ". $fk_project;
 			$sql.= ")";
 
 			dol_syslog(get_class($this)."::_create insert record into stock_mouvement", LOG_DEBUG);
@@ -569,7 +584,8 @@ class MouvementStock extends CommonObject
 	    $sql .= " t.inventorycode,";
 	    $sql .= " t.batch,";
 	    $sql .= " t.eatby,";
-	    $sql .= " t.sellby";
+	    $sql .= " t.sellby,";
+	    $sql .= " t.fk_projet";
 	    $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 	    $sql.= ' WHERE 1 = 1';
 	    //if (null !== $ref) {
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index efcbc534c08..f62b732cf7e 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -112,6 +112,7 @@ $arrayfields=array(
     'origin'=>array('label'=>$langs->trans("Origin"), 'checked'=>1),
 	'm.value'=>array('label'=>$langs->trans("Qty"), 'checked'=>1),
 	'm.price'=>array('label'=>$langs->trans("UnitPurchaseValue"), 'checked'=>0),
+	'm.fk_projet'=>array('label'=>$langs->trans('Project'), 'checked'=>0)
 		//'m.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
     //'m.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500)
 );
@@ -423,6 +424,7 @@ $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.= " m.fk_projet,";
 $sql.= " pl.rowid as lotid, pl.eatby, pl.sellby,";
 $sql.= " u.login, u.photo, u.lastname, u.firstname";
 // Add fields from extrafields
@@ -854,7 +856,14 @@ if ($resql)
     if (! empty($arrayfields['m.price']['checked']))
     {
     	// Price
-    	print '<td class="liste_titre left">';
+    	print '<td class="liste_titre" align="left">';
+    	print '&nbsp; ';
+    	print '</td>';
+    }
+    if (! empty($arrayfields['m.fk_projet']['checked']))
+    {
+    	// fk_projet
+    	print '<td class="liste_titre" align="left">';
     	print '&nbsp; ';
     	print '</td>';
     }
@@ -933,6 +942,9 @@ if ($resql)
     if (! empty($arrayfields['m.price']['checked'])) {
         print_liste_field_titre($arrayfields['m.price']['label'], $_SERVER["PHP_SELF"], "m.price", "", $param, '', $sortfield, $sortorder, 'right ');
     }
+    if (! empty($arrayfields['m.fk_projet']['checked'])) {
+        print_liste_field_titre($arrayfields['m.fk_projet']['label'], $_SERVER["PHP_SELF"], "m.fk_projet", "", $param, 'align="right"', $sortfield, $sortorder);
+    }
 
     // Extra fields
     include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -1100,6 +1112,13 @@ if ($resql)
         	if ($objp->price != 0) print price($objp->price);
         	print '</td>';
         }
+        if (! empty($arrayfields['m.fk_projet']['checked']))
+        {
+        	// fk_projet
+        	print '<td align="right">';
+        	if ($objp->fk_projet != 0) print $movement->get_origin($objp->fk_projet, 'project');
+        	print '</td>';
+        }
         // Action column
         print '<td class="nowrap center">';
         if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index eecf314dbf6..6e2b0a73a5e 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1796,6 +1796,7 @@ class Project extends CommonObject
             $response = new WorkboardResponse();
             $response->warning_delay = $conf->projet->warning_delay/60/60/24;
             $response->label = $langs->trans("OpenedProjects");
+            $response->labelShort = $langs->trans("Opened");
             if ($user->rights->projet->all->lire) $response->url = DOL_URL_ROOT.'/projet/list.php?search_status=1&mainmenu=project';
             else $response->url = DOL_URL_ROOT.'/projet/list.php?search_project_user=-1&search_status=1&mainmenu=project';
             $response->img = img_object('', "projectpub");
diff --git a/htdocs/projet/jsgantt_language.js.php b/htdocs/projet/jsgantt_language.js.php
index 99123cc45ef..322b1c03c28 100644
--- a/htdocs/projet/jsgantt_language.js.php
+++ b/htdocs/projet/jsgantt_language.js.php
@@ -48,8 +48,8 @@ var vLangs={'<?php print $langs->getDefaultLang(1);?>':
     'notes':'<?php print $langs->transnoentities('NotePublic'); ?>',
     'january':'<?php print $langs->transnoentities('January'); ?>','february':'<?php print $langs->transnoentities('February'); ?>','march':'<?php print $langs->transnoentities('March'); ?>','april':'<?php print $langs->transnoentities('April'); ?>','maylong':'<?php print $langs->transnoentities('May'); ?>','june':'<?php print $langs->transnoentities('June'); ?>','july':'<?php print $langs->transnoentities('July'); ?>',
     'august':'<?php print $langs->transnoentities('August'); ?>','september':'<?php print $langs->transnoentities('September'); ?>','october':'<?php print $langs->transnoentities('October'); ?>','november':'<?php print $langs->transnoentities('November'); ?>','december':'<?php print $langs->transnoentities('December'); ?>',
-    'jan':'<?php print $langs->transnoentities('JanuaryMin'); ?>','feb':'<?php print $langs->transnoentities('FebruaryMin'); ?>','mar':'<?php print $langs->transnoentities('MarchMin'); ?>','apr':'<?php print $langs->transnoentities('AprilMin'); ?>','may':'<?php print $langs->transnoentities('MayMin'); ?>','jun':'<?php print $langs->transnoentities('JuneMin'); ?>','jul':'<?php print $langs->transnoentities('JulyMin'); ?>',
-    'aug':'<?php print $langs->transnoentities('AugustMin'); ?>','sep':'<?php print $langs->transnoentities('SeptemberMin'); ?>','oct':'<?php print $langs->transnoentities('OctoberMin'); ?>','nov':'<?php print $langs->transnoentities('NovemberMin'); ?>','dec':'<?php print $langs->transnoentities('DecemberMin'); ?>',
+    'jan':'<?php print $langs->transnoentities('MonthShort01'); ?>','feb':'<?php print $langs->transnoentities('MonthShort02'); ?>','mar':'<?php print $langs->transnoentities('MonthShort03'); ?>','apr':'<?php print $langs->transnoentities('MonthShort04'); ?>','may':'<?php print $langs->transnoentities('MonthShort05'); ?>','jun':'<?php print $langs->transnoentities('MonthShort06'); ?>','jul':'<?php print $langs->transnoentities('MonthShort07'); ?>',
+    'aug':'<?php print $langs->transnoentities('MonthShort08'); ?>','sep':'<?php print $langs->transnoentities('MonthShort09'); ?>','oct':'<?php print $langs->transnoentities('MonthShort10'); ?>','nov':'<?php print $langs->transnoentities('MonthShort11'); ?>','dec':'<?php print $langs->transnoentities('MonthShort12'); ?>',
     'sunday':'<?php print $langs->transnoentities('Sunday'); ?>','monday':'<?php print $langs->transnoentities('Monday'); ?>','tuesday':'<?php print $langs->transnoentities('Tuesday'); ?>','wednesday':'<?php print $langs->transnoentities('Wednesday'); ?>','thursday':'<?php print $langs->transnoentities('Thursday'); ?>','friday':'<?php print $langs->transnoentities('Friday'); ?>','saturday':'<?php print $langs->transnoentities('Saturday'); ?>',
     'sun':'<?php print $langs->transnoentities('SundayMin'); ?>','mon':'<?php print $langs->transnoentities('MondayMin'); ?>','tue':'<?php print $langs->transnoentities('TuesdayMin'); ?>','wed':'<?php print $langs->transnoentities('WednesdayMin'); ?>','thu':'<?php print $langs->transnoentities('ThursdayMin'); ?>','fri':'<?php print $langs->transnoentities('FridayMin'); ?>','sat':'<?php print $langs->transnoentities('SaturdayMin'); ?>'
     }
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index b8ac9fb7e02..12842b1751c 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2018 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2019 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2017 Regis Houssin        <regis.houssin@inodbox.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -96,8 +96,6 @@ $planned_workloadhour=(GETPOST('planned_workloadhour', 'int')?GETPOST('planned_w
 $planned_workloadmin=(GETPOST('planned_workloadmin', 'int')?GETPOST('planned_workloadmin', 'int'):0);
 $planned_workload=$planned_workloadhour*3600+$planned_workloadmin*60;
 
-$userAccess=0;
-
 $arrayfields=array(
     't.ref'=>array('label'=>$langs->trans("RefTask"), 'checked'=>1, 'position'=>80),
     't.label'=>array('label'=>$langs->trans("LabelTask"), 'checked'=>1, 'position'=>80),
@@ -481,7 +479,7 @@ if ($id > 0 || ! empty($ref))
     }
 
     // Categories
-    if($conf->categorie->enabled) {
+    if ($conf->categorie->enabled) {
         print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td>';
         print $form->showCategories($object->id, 'project', 1);
         print "</td></tr>";
@@ -523,7 +521,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 		dol_fiche_head('');
 
-		print '<table class="border" width="100%">';
+		print '<table class="border centpercent">';
 
 		$defaultref='';
 		$obj = empty($conf->global->PROJECT_TASK_ADDON)?'mod_task_simple':$conf->global->PROJECT_TASK_ADDON;
@@ -709,7 +707,7 @@ elseif ($id > 0 || ! empty($ref))
 	$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
 
 	print '<div class="div-table-responsive">';
-	print '<table id="tablelines" class="tagtable nobottomiftotal liste'.($moreforfilter?" listwithfilterbefore":"").'"">';
+	print '<table id="tablelines" class="tagtable nobottomiftotal liste'.($moreforfilter?" listwithfilterbefore":"").'">';
 
 	// Fields title search
 	print '<tr class="liste_titre_filter">';
@@ -746,9 +744,12 @@ elseif ($id > 0 || ! empty($ref))
 	print '<input class="flat" type="text" size="4" name="search_progresscalc" value="'.$search_progresscalc.'">';
 	print '</td>';
 
-	print '<td class="liste_titre right">';
-	print '<input class="flat" type="text" size="4" name="search_progressdeclare" value="'.$search_progressdeclare.'">';
-	print '</td>';
+    print '<td class="liste_titre right">';
+    print '<input class="flat" type="text" size="4" name="search_progressdeclare" value="'.$search_progressdeclare.'">';
+    print '</td>';
+
+    // progress resume not searchable
+    print '<td class="liste_titre right"></td>';
 
 	if ($object->bill_time)
 	{
@@ -778,6 +779,7 @@ elseif ($id > 0 || ! empty($ref))
 	print_liste_field_titre("TimeSpent", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("ProgressCalculated", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("ProgressDeclared", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre("TaskProgressSummary", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center ');
 	if ($object->bill_time)
 	{
 	   print_liste_field_titre("TimeToBill", $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'right ');
@@ -797,7 +799,7 @@ elseif ($id > 0 || ! empty($ref))
 	{
 	    $colspan=10;
 	    if ($object->bill_time) $colspan+=2;
-		print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoTasks").'</td></tr>';
+		print '<tr class="oddeven nobottom"><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoTasks").'</span></td></tr>';
 	}
 
 	print "</table>";
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 8501ae3c88c..a8178282676 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1693,7 +1693,19 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		    print '</tr>';
 		}
 
-		print '</tr>';
+
+		if (! count($tasks))
+		{
+			$totalnboffields = 1;
+			foreach($arrayfields as $value)
+			{
+				if ($value['checked']) $totalnboffields++;
+			}
+			print '<tr class="oddeven"><td colspan="'.$totalnboffields.'">';
+			print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
+			print '</td></tr>';
+		}
+
 
 		print "</table>";
 		print '</div>';
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index daf77674190..db37b15345b 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1834,7 +1834,8 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 
 		print '<br>';
 
-        print '<form action="'.$_SERVER['REQUEST_URI'].'" method="POST" id="payment-form">';
+		print '<!-- STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = '.$conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION.' STRIPE_USE_NEW_CHECKOUT = '.$conf->global->STRIPE_USE_NEW_CHECKOUT.' -->'."\n";
+		print '<form action="'.$_SERVER['REQUEST_URI'].'" method="POST" id="payment-form">'."\n";
 
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
 		print '<input type="hidden" name="dopayment_stripe" value="1">'."\n";
@@ -1852,7 +1853,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 		print '<input type="hidden" name="email" value="'.GETPOST('email', 'alpha').'" />';
 		print '<input type="hidden" name="thirdparty_id" value="'.GETPOST('thirdparty_id', 'int').'" />';
 
-		if (! empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) || ! empty($conf->global->STRIPE_USE_NEW_CHECKOUT))
+		if (! empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) || ! empty($conf->global->STRIPE_USE_NEW_CHECKOUT))	// Use a SCA ready method
 		{
 			require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 
@@ -1876,8 +1877,8 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 			}
 		}
 
-		if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) || ! empty($paymentintent))
-		{
+		//if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) || ! empty($paymentintent))
+		//{
     		print '
             <table id="dolpaymenttable" summary="Payment form" class="center">
     	    <tbody><tr><td class="textpublicpayment">';
@@ -1914,7 +1915,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
     	    print '
     	    </td></tr></tbody>
             </table>';
-		}
+		//}
 
 		if (! empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
 		{
@@ -1942,6 +1943,8 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 		{
 			print '<!-- JS Code for Stripe components -->';
     		print '<script src="https://js.stripe.com/v3/"></script>'."\n";
+    		$urllogofull = 'http://home.destailleur.fr:805/dolibarr_dev/htdocs/viewimage.php?modulepart=mycompany&entity=1&file=logos%2Fthumbs%2Ffbm+logo_small.png';
+    		print '<!-- urllogofull = '.$urllogofull.' -->'."\n";
 
     	    // Code to ask the credit card. This use the default "API version". No way to force API version when using JS code.
     		print '<script type="text/javascript" language="javascript">'."\n";
@@ -1961,11 +1964,13 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
     			{
     				$metadata['dol_type'] = $object->element;
     				$metadata['dol_id'] = $object->id;
+
+    				$ref = $object->ref;
     			}
 
     			try {
     				$arrayforpaymentintent = array(
-    					'description'=>'Stripe payment: '.$FULLTAG.(is_object($object)?' ref='.$object->ref:''),
+    					'description'=>'Stripe payment: '.$FULLTAG.($ref?' ref='.$ref:''),
     					"metadata" => $metadata
     				);
     				if ($TAG) $arrayforpaymentintent["statement_descriptor"] = dol_trunc($TAG, 10, 'right', 'UTF-8', 1);     // 22 chars that appears on bank receipt (company + description)
@@ -1973,11 +1978,11 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
     				$arrayforcheckout = array(
     					'payment_method_types' => array('card'),
     					'line_items' => array(array(
-    						'name' => $langs->transnoentitiesnoconv("Payment").' '.$FULLTAG.' ref='.$ref,
-    						'description' => 'Stripe payment: '.$FULLTAG.' ref='.$ref,
+    						'name' => $langs->transnoentitiesnoconv("Payment").' '.$TAG,			// Label of product line
+    						'description' => 'Stripe payment: '.$FULLTAG.($ref?' ref='.$ref:''),
     						'amount' => $amountstripe,
     						'currency' => $currency,
-    						'images' => array($urllogofull),
+    						//'images' => array($urllogofull),
     						'quantity' => 1,
     					)),
     					'client_reference_id' => $FULLTAG,
@@ -2033,6 +2038,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 
     		var cardElement = elements.create('card', {style: style});
 
+			// Comment this to avoid the redirect
 			stripe.redirectToCheckout({
 			  // Make the id field from the Checkout Session creation API response
 			  // available to this file, so you can provide it as parameter here
@@ -2116,14 +2122,14 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
                     	payment_method_data: {
         			        billing_details: {
         			        	name: cardholderName.value
-        			        	<?php if (GETPOST('email', 'alpha')) { ?>, email: '<?php echo GETPOST('email', 'alpha'); ?>'<?php } ?>
-        			        	<?php if (is_object($object) && is_object($object->thirdparty) && is_object($object->thirdparty->phone)) { ?>, phone: '<?php echo $object->thirdparty->phone; ?>'<?php } ?>
+        			        	<?php if (GETPOST('email', 'alpha') || (is_object($object) && is_object($object->thirdparty) && ! empty($object->thirdparty->email))) { ?>, email: '<?php echo (GETPOST('email', 'alpha') ? GETPOST('email', 'alpha') : $object->thirdparty->email); ?>'<?php } ?>
+        			        	<?php if (is_object($object) && is_object($object->thirdparty) && ! empty($object->thirdparty->phone)) { ?>, phone: '<?php echo $object->thirdparty->phone; ?>'<?php } ?>
         			        	<?php if (is_object($object) && is_object($object->thirdparty)) { ?>, address: {
         			        	    city: '<?php echo $object->thirdparty->town; ?>',
         			        	    country: '<?php echo $object->thirdparty->country_code; ?>',
         			        	    line1: '<?php echo $object->thirdparty->address; ?>',
         			        	    postal_code: '<?php echo $object->thirdparty->zip; ?>'}<?php } ?>
-        			        }	/* TODO Add all other known data like emails, ... to be SCA compliant */
+        			        }
               			},
               			save_payment_method: <?php if ($stripecu) { print 'true'; } else { print 'false'; } ?>	/* true when a customer was provided when creating payment intent. true ask to save the card */
                     }
@@ -2151,7 +2157,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 
     		<?php
     		}
-    		else
+    		else		// Old method (not SCA ready)
     		{
     		?>
     		// Old code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION off and STRIPE_USE_NEW_CHECKOUT off
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 2ee5f5bedf5..2ab86d454f0 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -596,6 +596,7 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 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, $newcardbutton, '', $limit);
 
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 62013f1956d..9310ede87c5 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -788,10 +788,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			$permissiontowrite = $user->rights->societe->creer;
 			// Stripe customer key 'cu_....' stored into llx_societe_account
 			print '<tr><td class="titlefield">';
-			//print $langs->trans('StripeCustomerId');
 			print $form->editfieldkey("StripeCustomerId", 'key_account', $stripecu, $object, $permissiontowrite, 'string', '', 0, 2, 'socid');
 			print '</td><td>';
-			//print $stripecu;
 			print $form->editfieldval("StripeCustomerId", 'key_account', $stripecu, $object, $permissiontowrite, 'string', '', null, null, '', 2, '', 'socid');
 			if (! empty($conf->stripe->enabled) && $stripecu && $action != 'editkey_account')
 			{
@@ -817,6 +815,60 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			print '</td></tr>';
 		}
     }
+    
+	if ($object->fournisseur)
+	{
+		print '<tr><td class="titlefield">';
+		print $langs->trans('SupplierCode').'</td><td colspan="2">';
+		print $object->code_fournisseur;
+		if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		print '</td></tr>';
+		$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."facture where fk_soc = ".$socid;
+		$resql=$db->query($sql);
+		if (!$resql) dol_print_error($db);
+		$obj = $db->fetch_object($resql);
+		$nbFactsClient = $obj->nb;
+		$thirdTypeArray['customer']=$langs->trans("customer");
+		if ($conf->propal->enabled && $user->rights->propal->lire) $elementTypeArray['propal']=$langs->transnoentitiesnoconv('Proposals');
+		if ($conf->commande->enabled && $user->rights->commande->lire) $elementTypeArray['order']=$langs->transnoentitiesnoconv('Orders');
+		if ($conf->facture->enabled && $user->rights->facture->lire) $elementTypeArray['invoice']=$langs->transnoentitiesnoconv('Invoices');
+		if ($conf->contrat->enabled && $user->rights->contrat->lire) $elementTypeArray['contract']=$langs->transnoentitiesnoconv('Contracts');
+	}
+	
+	if (! empty($conf->stripe->enabled) && ! empty($conf->stripeconnect->enabled) && $conf->global->MAIN_FEATURES_LEVEL >= 2)
+	{
+		$permissiontowrite = $user->rights->societe->creer;
+		$stripesupplieracc = $stripe->getStripeAccount($service, $object->id);								// Get Stripe OAuth connect account (no network access here)
+    
+		// Stripe customer key 'cu_....' stored into llx_societe_account
+		print '<tr><td class="titlefield">';
+		print $form->editfieldkey("StripeConnectAccount", 'key_account_supplier', $stripesupplieracc, $object, $permissiontowrite, 'string', '', 0, 2, 'socid');
+		print '</td><td>';
+		print $form->editfieldval("StripeConnectAccount", 'key_account_supplier', $stripesupplieracc, $object, $permissiontowrite, 'string', '', null, null, '', 2, '', 'socid');
+		if (! empty($conf->stripe->enabled) && $stripesupplieracc && $action != 'editkey_account')
+		{
+		    $connect='';
+			
+			$url='https://dashboard.stripe.com/test/connect/accounts/'.$stripesupplieracc;
+			if ($servicestatus)
+			{
+				$url='https://dashboard.stripe.com/connect/accounts/'.$stripesupplieracc;
+			}
+			print ' <a href="'.$url.'" target="_stripe">'.img_picto($langs->trans('ShowInStripe'), 'object_globe').'</a>';
+		}
+		print '</td><td class="right">';
+		if (empty($stripesupplieracc))
+		{
+			print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+			print '<input type="hidden" name="action" value="syncsuppliertostripe">';
+			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden" name="socid" value="'.$object->id.'">';
+			print '<input type="hidden" name="companybankid" value="'.$rib->id.'">';
+			//print '<input type="submit" class="button" name="syncstripecustomer" value="'.$langs->trans("CreateSupplierOnStripe").'">';
+			print '</form>';
+		}
+		print '</td></tr>';
+	}
 
 	print '</table>';
 	print '</div>';
@@ -1188,7 +1240,38 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		}
 		print "</table>";
 		print "</div>";
-		print '<br>';
+   	print '<br>';
+	}
+  
+  	// List of Stripe payment modes
+	if (! empty($conf->stripe->enabled) && ! empty($conf->stripeconnect->enabled) && $object->fournisseur && ! empty($stripesupplieracc))
+	{
+  print load_fiche_titre($langs->trans('StripeBalance').($stripesupplieracc?' (Stripe connection with StripeConnect account '.$stripesupplieracc.')':' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, '');
+  $balance = \Stripe\Balance::retrieve(array("stripe_account" => $stripesupplieracc));
+		print '<table class="liste" width="100%">'."\n";
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans('Status').'</td>';
+		print '<td>'.$langs->trans('Amount').'</td>';
+		print '<td>'.$langs->trans('Currency').'</td>';
+    print '</tr>';
+  
+		if (is_array($balance->available) && count($balance->available))
+		{
+			foreach ($balance->available as $cpt)
+			{
+      print '<tr><td>'.$langs->trans("Available").'</td><td>'.price($cpt->amount, 0, '', 1, - 1, - 1, strtoupper($cpt->currency)).' </td><td>'.$langs->trans("Currency".strtoupper($cpt->currency)).'</td></tr>';
+			}
+		}
+    
+    if (is_array($balance->pending) && count($balance->pending))
+		{
+			foreach ($balance->pending as $cpt)
+			{
+      print '<tr><td>'.$langs->trans("Pending").'</td><td>'.price($cpt->amount, 0, '', 1, - 1, - 1, strtoupper($cpt->currency)).' </td><td>'.$langs->trans("Currency".strtoupper($cpt->currency)).'</td></tr>';
+			}
+    }
+    print '</table>';
+    print '<br>';
 	}
 
 	// List of bank accounts
@@ -1374,7 +1457,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 
 		if (count($rib_list) == 0)
 		{
-			$colspan=8;
+			$colspan=9;
 			if (! empty($conf->prelevement->enabled)) $colspan+=2;
 			print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoBANRecord").'</td></tr>';
 		}
diff --git a/htdocs/stripe/payment.php b/htdocs/stripe/payment.php
index be9f74b7bd7..6811df8d589 100644
--- a/htdocs/stripe/payment.php
+++ b/htdocs/stripe/payment.php
@@ -817,9 +817,11 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 				if ($facture->type == 2) { $remaindertopay=$langs->trans("RemainderToPayBack"); $multicurrencyremaindertopay=$langs->trans("MulticurrencyRemainderToPayBack"); }
 
                 $i = 0;
-                //print '<tr><td colspan="3">';
+
                 print '<br>';
+
                 print_barre_liste($langs->trans('StripeInvoiceList').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
+
                 print '<table class="noborder" width="100%">';
                 print '<tr class="liste_titre">';
                 print '<td>'.$arraytitle.'</td>';
@@ -837,7 +839,12 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                 if (!empty($conf->multicurrency->enabled)) {
                     print '<td class="right">'.$langs->trans('MulticurrencyPaymentAmount').'</td>';
                 }
-                print '<td class="right">&nbsp;</td>';
+
+                $tmpinvoice =new Facture($db);
+                $parameters=array();
+                $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $tmpinvoice, $action); // Note that $action and $object may have been modified by hook
+
+                print '<td align="right">&nbsp;</td>';
                 print "</tr>\n";
 
                 $total=0;
@@ -967,6 +974,9 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                    print "</td>";
 					}
 
+					$parameters=array();
+					$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
+
                     // Warning
                     print '<td class="center" width="16">';
                     //print "xx".$amounts[$invoice->id]."-".$amountsresttopay[$invoice->id]."<br>";
@@ -977,9 +987,6 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                     }
                     print '</td>';
 
-					$parameters=array();
-					$reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
-
                     print "</tr>\n";
 
                     $total+=$objp->total;
@@ -991,7 +998,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                 }
                 if ($i > 1)
                 {
-                $amount=round(price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT'))*100);
+            	    $amount=round(price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT'))*100);
+
                     // Print total
                     print '<tr class="liste_total">';
                     print '<td colspan="2" class="left">'.$langs->trans('TotalTTC').'</td>';
@@ -1010,6 +1018,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                     if (!empty($conf->multicurrency->enabled)) {
                         print '<td class="right" id="multicurrency_result" style="font-weight: bold;"></td>';
                     }
+                    print '<td></td>';
                     print "</tr>\n";
                 }
                 print "</table>";
@@ -1106,22 +1115,29 @@ if (! GETPOST('action'))
         print_liste_field_titre('Date', $_SERVER["PHP_SELF"], 'dp', '', '', '', $sortfield, $sortorder);
         print_liste_field_titre('Type', $_SERVER["PHP_SELF"], 'libelle', '', '', '', $sortfield, $sortorder);
         print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], 'fa_amount', '', '', '', $sortfield, $sortorder, 'right ');
+
+		$tmpobject = new Paiement($db);
+		$parameters=array();
+		$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $tmpobject, $action); // Note that $action and $object may have been modified by hook
+
 		print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
-        print "</tr>\n";
+		print "</tr>\n";
 
         while ($i < min($num, $limit))
         {
             $objp = $db->fetch_object($resql);
+
             print '<tr class="oddeven">';
             print '<td><a href="'.DOL_URL_ROOT.'compta/facture/card.php?facid='.$objp->facid.'">'.$objp->ref."</a></td>\n";
             print '<td>'.dol_print_date($db->jdate($objp->dp))."</td>\n";
             print '<td>'.$objp->paiement_type.' '.$objp->num_paiement."</td>\n";
-            print '<td class="right">'.price($objp->amount).'</td><td>&nbsp;</td>';
+            print '<td class="right">'.price($objp->amount).'</td>';
 
 			$parameters=array();
-			$reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
+			$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
 
-            print '</tr>';
+			print '<td>&nbsp;</td>';
+			print '</tr>';
             $i++;
         }
         print '</table>';
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 546a93763a6..3748aede1c7 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -986,13 +986,6 @@ class SupplierProposal extends CommonObject
                     }
                 }
 
-                // Add linked object (deprecated, use ->linkedObjectsIds instead)
-                if (! $error && $this->origin && $this->origin_id)
-                {
-                    $ret = $this->add_object_linked();
-                    if (! $ret)	dol_print_error($this->db);
-                }
-
                 /*
                  *  Insertion du detail des produits dans la base
                  */
@@ -2281,20 +2274,24 @@ class SupplierProposal extends CommonObject
         $resql=$this->db->query($sql);
         if ($resql)
         {
+			$label = $labelShort = '';
             if ($mode == 'opened') {
                 $delay_warning=$conf->supplier_proposal->cloture->warning_delay;
                 $statut = self::STATUS_VALIDATED;
                 $label = $langs->trans("SupplierProposalsToClose");
+                $labelShort = $langs->trans("ToAcceptRefuse");
             }
             if ($mode == 'signed') {
                 $delay_warning=$conf->supplier_proposal->facturation->warning_delay;
                 $statut = self::STATUS_SIGNED;
                 $label = $langs->trans("SupplierProposalsToProcess");      // May be billed or ordered
+				$labelShort = $langs->trans("ToClose");
             }
 
             $response = new WorkboardResponse();
             $response->warning_delay = $delay_warning/60/60/24;
             $response->label = $label;
+            $response->labelShort = $labelShort;
             $response->url = DOL_URL_ROOT.'/supplier_proposal/list.php?viewstatut='.$statut;
             $response->img = img_object('', "propal");
 
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 3fb9d869cd0..6d33b8a19c2 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -79,6 +79,7 @@ if (GETPOST('action', 'alpha') == 'set')
 	$res = dolibarr_set_const($db, "TAKEPOS_FOOTER", GETPOST('TAKEPOS_FOOTER', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_NUMPAD", GETPOST('TAKEPOS_NUMPAD', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_NUM_TERMINALS", GETPOST('TAKEPOS_NUM_TERMINALS', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_DIRECT_PAYMENT", GETPOST('TAKEPOS_DIRECT_PAYMENT', 'int'), 'int', 0, '', $conf->entity);
 
 	if ($conf->global->TAKEPOS_ORDER_NOTES==1)
 	{
@@ -223,6 +224,13 @@ $array=array(0=>$langs->trans("Numberspad"), 1=>$langs->trans("BillsCoinsPad"));
 print $form->selectarray('TAKEPOS_NUMPAD', $array, (empty($conf->global->TAKEPOS_NUMPAD)?'0':$conf->global->TAKEPOS_NUMPAD), 0);
 print "</td></tr>\n";
 
+// Direct Payment
+print '<tr class="oddeven"><td>';
+print $langs->trans('DirectPaymentButton');
+print '<td colspan="2">';
+print $form->selectyesno("TAKEPOS_DIRECT_PAYMENT", $conf->global->TAKEPOS_DIRECT_PAYMENT, 1);
+print "</td></tr>\n";
+
 $substitutionarray=pdf_getSubstitutionArray($langs, null, null, 2);
 $substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
 $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index dfa058068ad..17805a6b060 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -175,6 +175,9 @@ if ($action == 'valid' && $user->rights->facture->creer)
 	$payment->datepaye = $now;
 	$payment->fk_account = $bankaccount;
 	$payment->amounts[$invoice->id] = $amountofpayment;
+	
+	// If user has not used change control, add total invoice payment
+	if ($amountofpayment == 0) $payment->amounts[$invoice->id] = $invoice->total_ttc;
 
 	$payment->paiementid=$paiementid;
 	$payment->num_payment=$invoice->ref;
diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php
index 7260bc81a58..4dc481a98cf 100644
--- a/htdocs/takepos/takepos.php
+++ b/htdocs/takepos/takepos.php
@@ -575,6 +575,12 @@ function TerminalsDialog()
 	});
 }
 
+function DirectPayment(){
+	console.log("DirectPayment");
+	$("#poslines").load("invoice.php?place"+place+"&action=valid&pay=<?php echo $langs->trans("cash");?>", function() {
+	});
+}
+
 $( document ).ready(function() {
     PrintCategories(0);
 	LoadProducts(0);
@@ -666,6 +672,10 @@ $menus[$r++]=array('title'=>'<span class="fa fa-history paddingrightonly"></span
 $menus[$r++]=array('title'=>'<span class="fa fa-cube paddingrightonly"></span><div class="trunc">'.$langs->trans("FreeZone").'</div>', 'action'=>'FreeZone();');
 $menus[$r++]=array('title'=>'<span class="far fa-money-bill-alt paddingrightonly"></span><div class="trunc">'.$langs->trans("Payment").'</div>', 'action'=>'CloseBill();');
 
+if ($conf->global->TAKEPOS_DIRECT_PAYMENT){
+	$menus[$r++]=array('title'=>'<span class="far fa-money-bill-alt paddingrightonly"></span><div class="trunc">'.$langs->trans("DirectPayment").'</div>', 'action'=>'DirectPayment();');
+}
+
 // BAR RESTAURANT specific menu
 if ($conf->global->TAKEPOS_BAR_RESTAURANT)
 {
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index d0a0c5958ef..810c27051c8 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -405,6 +405,16 @@ textarea.centpercent {
 .small, small {
     font-size: 85%;
 }
+
+.h1 .small, .h1 small, .h2 .small, .h2 small, .h3 .small, .h3 small, h1 .small, h1 small, h2 .small, h2 small, h3 .small, h3 small {
+    font-size: 65%;
+}
+.h1 .small, .h1 small, .h2 .small, .h2 small, .h3 .small, .h3 small, .h4 .small, .h4 small, .h5 .small, .h5 small, .h6 .small, .h6 small, h1 .small, h1 small, h2 .small, h2 small, h3 .small, h3 small, h4 .small, h4 small, h5 .small, h5 small, h6 .small, h6 small {
+    font-weight: 400;
+    line-height: 1;
+    color: #777;
+}
+
 .center {
     text-align: center;
     margin: 0px auto;
@@ -483,6 +493,24 @@ textarea.centpercent {
     opacity: 0.7;
 }
 
+.text-warning{
+    color : <?php print $textWarning ; ?>
+}
+body[class*="colorblind-"] .text-warning{
+    color : <?php print $colorblind_deuteranopes_textWarning ; ?>
+}
+.text-success{
+    color : <?php print $textSuccess ; ?>
+}
+body[class*="colorblind-"] .text-success{
+    color : <?php print $colorblind_deuteranopes_textSuccess ; ?>
+}
+
+.text-danger{
+    color : <?php print $textDanger ; ?>
+}
+
+
 /* Themes for badges */
 <?php include dol_buildpath($path.'/theme/'.$theme.'/badges.inc.php', 0); ?>
 
@@ -3020,11 +3048,15 @@ table.noborder.paymenttable {
 	height: 22px;
 }
 
-/* Disable shadows */
+/* Disable-Enable shadows */
 .noshadow {
 	-webkit-box-shadow: 0px 0px 0px #DDD !important;
 	box-shadow: 0px 0px 0px #DDD !important;
 }
+.shadow {
+	-webkit-box-shadow: 2px 2px 5px #CCC !important;
+	box-shadow: 2px 2px 5px #CCC !important;
+}
 
 div.tabBar .noborder {
 	-webkit-box-shadow: 0px 0px 0px #DDD !important;
@@ -3084,6 +3116,10 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 .box {
     overflow-x: auto;
     min-height: 40px;
+    padding-right: 0px;
+    padding-left: 0px;
+    /*padding-bottom: 25px;*/
+    padding-bottom: 10px;
 }
 .ficheaddleft div.boxstats, .ficheaddright div.boxstats {
     border: none;
@@ -3198,6 +3234,8 @@ span.boxstatsindicator {
 	font-size: 130%;
 	font-weight: normal;
 	line-height: 29px;
+	flex-grow: 1;
+
 }
 span.dashboardlineindicator, span.dashboardlineindicatorlate {
 	font-size: 130%;
@@ -3241,7 +3279,7 @@ span.dashboardlineko {
 	vertical-align: middle;
 }
 .boxtable {
-    margin-bottom: 8px !important;
+    margin-bottom: 25px !important;
     border-bottom-width: 1px;
 
     border-top: <?php echo $borderwidth ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
@@ -3270,12 +3308,6 @@ a.valignmiddle.dashboardlineindicator {
     line-height: 30px;
 }
 
-.box {
-    padding-right: 0px;
-    padding-left: 0px;
-    padding-bottom: 25px;
-}
-
 tr.box_titre {
     height: 26px;
 
@@ -3406,6 +3438,10 @@ a.impayee:hover { font-weight: bold; color: #550000; }
  *  Other
  */
 
+.opened-dash-board-wrap {
+    margin-bottom: 25px;
+}
+
 div.boximport {
     min-height: unset;
 }
@@ -3735,6 +3771,12 @@ tr.visible {
     background-color: transparent;
     background-image: none;
 }
+.bordertransp {
+    background-color: transparent;
+    background-image: none;
+    border: 1px solid #aaa;
+	font-weight: normal;
+}
 .websitebar {
 	border-bottom: 1px solid #ccc;
 	background: #e6e6e6;
@@ -5236,7 +5278,6 @@ div.tabsElem a.tab {
 }
 
 
-
 /* ============================================================================== */
 /*  Public                                                                        */
 /* ============================================================================== */
@@ -5569,6 +5610,11 @@ div.tabsElem a.tab {
         border-right: none;
         border-left: none;
     }
+
+	.box-flex-container {
+	    margin: 0 0 0 -8px !important;
+	}
+
 }
 
 @media only screen and (max-width: 1024px)
@@ -5750,3 +5796,5 @@ div.tabsElem a.tab {
 
 <?php
 include dol_buildpath($path.'/theme/'.$theme.'/dropdown.inc.php', 0);
+include dol_buildpath($path.'/theme/'.$theme.'/info-box.inc.php', 0);
+include dol_buildpath($path.'/theme/'.$theme.'/progress.inc.php', 0);
diff --git a/htdocs/theme/eldy/img/title_bank.png b/htdocs/theme/eldy/img/title_bank.png
index c916e89d8f6..5bd5d25a1ea 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 6671810c5de..cbfe44fa539 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_document.png b/htdocs/theme/eldy/img/title_document.png
new file mode 100644
index 00000000000..65019c1faf2
Binary files /dev/null and b/htdocs/theme/eldy/img/title_document.png differ
diff --git a/htdocs/theme/eldy/img/title_home.png b/htdocs/theme/eldy/img/title_home.png
index 505d18ab403..e89613dcd75 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 100edf445f1..c608a2c7a86 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/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
new file mode 100644
index 00000000000..395a3909b96
--- /dev/null
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -0,0 +1,277 @@
+<?php
+if (! defined('ISLOADEDBYSTEELSHEET'))  die('Must be call by steelsheet'); ?>
+/* <style type="text/css" > */
+
+/*
+ * Component: Info Box
+ * -------------------
+ */
+.info-box {
+	display: block;
+	min-height: 90px;
+	background: #fff;
+	width: 100%;
+	box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.2), 0px 0px 2px rgba(0, 0, 0, 0.1);
+	border-radius: 2px;
+	margin-bottom: 15px;
+}
+.info-box.info-box-sm{
+    min-height: 80px;
+    margin-bottom: 10px;
+}
+
+.info-box small {
+	font-size: 14px;
+}
+.info-box .progress {
+	background: rgba(0, 0, 0, 0.2);
+	margin: 5px -10px 5px -10px;
+	height: 2px;
+}
+.info-box .progress,
+.info-box .progress .progress-bar {
+	border-radius: 0;
+}
+
+.info-box .progress .progress-bar {
+		float: left;
+		width: 0;
+		height: 100%;
+		font-size: 12px;
+		line-height: 20px;
+		color: #fff;
+		text-align: center;
+		background-color: #337ab7;
+		-webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
+		box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
+		-webkit-transition: width .6s ease;
+		-o-transition: width .6s ease;
+		transition: width .6s ease;
+}
+.info-box-icon {
+	border-top-left-radius: 2px;
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0;
+	border-bottom-left-radius: 2px;
+	display: block;
+	float: left;
+	height: 90px;
+	width: 90px;
+	text-align: center;
+	font-size: 45px;
+	line-height: 90px;
+	background: rgba(0, 0, 0, 0.2);
+}
+.info-box-sm .info-box-icon{
+    height: 80px;
+    width: 80px;
+    font-size: 25px;
+    line-height: 80px;
+}
+.info-box-icon > img {
+	max-width: 100%;
+}
+.info-box-content {
+	padding: 5px 10px;
+	margin-left: 90px;
+}
+
+.info-box-sm .info-box-content{
+    margin-left: 80px;
+}
+.info-box-number {
+	display: block;
+	font-weight: bold;
+	font-size: 18px;
+}
+.progress-description,
+.info-box-text,
+.info-box-title{
+	display: block;
+	font-size: 12px;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+.info-box-title{
+	text-transform: uppercase;
+	font-weight: bold;
+}
+.info-box-text{
+	font-size: 0.92em;
+}
+.info-box-text:first-letter{text-transform: uppercase}
+a.info-box-text{ text-decoration: none;}
+
+
+.info-box-more {
+	display: block;
+}
+.progress-description {
+	margin: 0;
+}
+
+
+
+/* ICONS */
+.info-box-icon {
+	color: #fff !important;
+}
+
+<?php
+include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+if (! isset($conf->global->THEME_AGRESSIVITY_RATIO)) $conf->global->THEME_AGRESSIVITY_RATIO=-75;
+if (GETPOSTISSET('THEME_AGRESSIVITY_RATIO')) $conf->global->THEME_AGRESSIVITY_RATIO=GETPOST('THEME_AGRESSIVITY_RATIO', 'int');
+?>
+.bg-infoxbox-project{
+	background-color: <?php print colorAgressivity('#605ca8', $conf->global->THEME_AGRESSIVITY_RATIO); ?> !important;
+}
+.bg-infoxbox-action{
+	background-color: <?php print colorAgressivity('#d84b80', $conf->global->THEME_AGRESSIVITY_RATIO); ?>  !important;
+}
+.bg-infoxbox-propal,
+.bg-infoxbox-facture,
+.bg-infoxbox-commande{
+	background-color: <?php print colorAgressivity('#abb87b', $conf->global->THEME_AGRESSIVITY_RATIO); ?>  !important;
+}
+.bg-infoxbox-supplier_proposal,
+.bg-infoxbox-invoice_supplier,
+.bg-infoxbox-order_supplier{
+	background-color: <?php print colorAgressivity('#40b0cf', $conf->global->THEME_AGRESSIVITY_RATIO); ?>  !important;
+}
+.bg-infoxbox-contrat{
+	background-color: <?php print colorAgressivity('#20a68a', $conf->global->THEME_AGRESSIVITY_RATIO); ?>  !important;
+}
+.bg-infoxbox-bank_account{
+	background-color: <?php print colorAgressivity('#e39c42', $conf->global->THEME_AGRESSIVITY_RATIO); ?>  !important;
+}
+.bg-infoxbox-adherent{
+	background-color: <?php print colorAgressivity('#f39c12', $conf->global->THEME_AGRESSIVITY_RATIO); ?>  !important;
+}
+.bg-infoxbox-expensereport{
+	background-color: <?php print colorAgressivity('#755114', $conf->global->THEME_AGRESSIVITY_RATIO); ?>  !important;
+}
+.bg-infoxbox-holiday{
+	background-color: <?php print colorAgressivity('#755114', $conf->global->THEME_AGRESSIVITY_RATIO); ?>  !important;
+}
+
+
+.fa-dol-action:before {
+	content: "\f073";
+}
+.fa-dol-propal:before,
+.fa-dol-supplier_proposal:before {
+	content: "\f2b5";
+}
+.fa-dol-facture:before,
+.fa-dol-invoice_supplier:before {
+	content: "\f571";
+}
+.fa-dol-project:before {
+	content: "\f0e8";
+}
+.fa-dol-commande:before,
+.fa-dol-order_supplier:before {
+	content: "\f570";
+}
+.fa-dol-contrat:before {
+	content: "\f1e6";
+}
+.fa-dol-bank_account:before {
+	content: "\f19c";
+}
+.fa-dol-adherent:before {
+	content: "\f0c0";
+}
+.fa-dol-expensereport:before {
+	content: "\f555";
+}
+.fa-dol-holiday:before {
+	content: "\f5ca";
+}
+
+
+/* USING FONTAWESOME FOR WEATHER */
+.info-box-weather .info-box-icon{
+	background: rgba(0, 0, 0, 0.08) !important;
+}
+.fa-weather-level0:before{
+	content: "\f185";
+	color : #cccccc;
+}
+.fa-weather-level1:before{
+	content: "\f6c4";
+	color : #cccccc;
+}
+.fa-weather-level2:before{
+	content: "\f0c2";
+	color : #cccccc;
+}
+.fa-weather-level3:before{
+	content: "\f740";
+	color : #cccccc;
+}
+.fa-weather-level4:before{
+	content: "\f0e7";
+	color : #b91f1f;
+}
+
+/* USING IMAGES FOR WEATHER INTEAD OF FONT AWESOME */
+/* For other themes just uncomment this part */
+/*.info-box-weather-level0,
+.info-box-weather-level1,
+.info-box-weather-level2,
+.info-box-weather-level3,
+.info-box-weather-level4 {
+	background-position: 15px 50%;
+	background-repeat: no-repeat;
+}
+
+.info-box-weather .info-box-icon{
+	display: none !important;
+}
+.info-box-weather-level0 {
+	background-image: url("img/weather/weather-clear.png");
+}
+.info-box-weather-level1 {
+	background-image: url("img/weather/weather-few-clouds.png");
+}
+.info-box-weather-level2 {
+	background-image: url("img/weather/weather-clouds.png");
+}
+.info-box-weather-level3 {
+	background-image: url("img/weather/weather-many-clouds.png");
+}
+.info-box-weather-level4 {
+	background-image: url("img/weather/weather-storm.png");
+}*/
+
+
+
+.box-flex-container{
+	display: flex; /* or inline-flex */
+	flex-direction: row;
+	flex-wrap: wrap;
+	width: 100%;
+	margin: 0 0 0 -15px;
+	/*justify-content: space-between;*/
+}
+
+.box-flex-item{
+	flex-grow : 1;
+	flex-shrink: 1;
+	flex-basis: auto;
+
+	width: 280px;
+	margin: 5px 0px 0px 15px;
+}
+.box-flex-item.filler{
+	margin: 0px 0px 0px 15px !important;
+	height: 0;
+}
+
+/* Disabled. This break the responsive on smartphone
+.box{
+	overflow: visible;
+}
+*/
diff --git a/htdocs/theme/eldy/progress.inc.php b/htdocs/theme/eldy/progress.inc.php
new file mode 100644
index 00000000000..3e330745440
--- /dev/null
+++ b/htdocs/theme/eldy/progress.inc.php
@@ -0,0 +1,187 @@
+<?php
+if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
+/* <style type="text/css" > */
+/*
+ progress style is based on boostrap and admin lte framework
+ */
+
+
+/*
+ * Component: Progress Bar
+ * -----------------------
+ */
+
+.progress * {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+}
+
+.progress {
+    height: 20px;
+    overflow: hidden;
+    background-color: #f5f5f5;
+    background-color: rgba(0,0,0,0.1);
+    border-radius: 4px;
+    -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1);
+    box-shadow: inset 0 1px 2px rgba(0,0,0,.1);
+}
+
+.progress.spaced{
+    margin-bottom: 20px;
+}
+
+.progress-bar {
+    float: left;
+    width: 0;
+    height: 100%;
+    font-size: 12px;
+    line-height: 20px;
+    color: #fff;
+    text-align: center;
+    background-color: #337ab7;
+    -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
+    box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
+    -webkit-transition: width .6s ease;
+    -o-transition: width .6s ease;
+    transition: width .6s ease;
+}
+
+
+
+.progress-group > .progress{
+    clear: both;
+}
+
+.progress,
+.progress > .progress-bar {
+    -webkit-box-shadow: none;
+    box-shadow: none;
+}
+.progress,
+.progress > .progress-bar,
+.progress .progress-bar,
+.progress > .progress-bar .progress-bar {
+    border-radius: 1px;
+}
+/* size variation */
+.progress.sm,
+.progress-sm {
+    height: 10px;
+}
+.progress.sm,
+.progress-sm,
+.progress.sm .progress-bar,
+.progress-sm .progress-bar {
+    border-radius: 1px;
+}
+.progress.xs,
+.progress-xs {
+    height: 7px;
+}
+.progress.xs,
+.progress-xs,
+.progress.xs .progress-bar,
+.progress-xs .progress-bar {
+    border-radius: 1px;
+}
+.progress.xxs,
+.progress-xxs {
+    height: 3px;
+}
+.progress.xxs,
+.progress-xxs,
+.progress.xxs .progress-bar,
+.progress-xxs .progress-bar {
+    border-radius: 1px;
+}
+
+
+/* Vertical bars */
+.progress.vertical {
+    position: relative;
+    width: 30px;
+    height: 200px;
+    display: inline-block;
+    margin-right: 10px;
+}
+.progress.vertical > .progress-bar {
+    width: 100%;
+    position: absolute;
+    bottom: 0;
+}
+.progress.vertical.sm,
+.progress.vertical.progress-sm {
+    width: 20px;
+}
+.progress.vertical.xs,
+.progress.vertical.progress-xs {
+    width: 10px;
+}
+.progress.vertical.xxs,
+.progress.vertical.progress-xxs {
+    width: 3px;
+}
+.progress-group .progress-text {
+    font-weight: 600;
+}
+.progress-group .progress-number {
+    float: right;
+}
+
+
+
+/* Remove margins from progress bars when put in a table */
+.table tr > td .progress {
+    margin: 0;
+}
+.progress-bar-light-blue,
+.progress-bar-primary {
+    background-color: #3c8dbc;
+}
+.progress-striped .progress-bar-light-blue,
+.progress-striped .progress-bar-primary {
+    background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+    background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+    background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress-bar-green,
+.progress-bar-success {
+    background-color: #00a65a;
+}
+.progress-striped .progress-bar-green,
+.progress-striped .progress-bar-success {
+    background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+    background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+    background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress-bar-aqua,
+.progress-bar-info {
+    background-color: #00c0ef;
+}
+.progress-striped .progress-bar-aqua,
+.progress-striped .progress-bar-info {
+    background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+    background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+    background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress-bar-yellow,
+.progress-bar-warning {
+    background-color: #f39c12;
+}
+.progress-striped .progress-bar-yellow,
+.progress-striped .progress-bar-warning {
+    background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+    background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+    background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress-bar-red,
+.progress-bar-danger {
+    background-color: #dd4b39;
+}
+.progress-striped .progress-bar-red,
+.progress-striped .progress-bar-danger {
+    background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+    background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+    background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
\ No newline at end of file
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 712730678d3..84749f70a13 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -32,11 +32,21 @@
 
 global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
 $theme_bordercolor = array(235,235,224);
-$theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250,190,30), array(221, 75, 57), array(0,166,90), array(140,140,220), array(190,120,120), array(190,190,100), array(115,125,150), array(100,170,20), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
-if(!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)) // user is loaded by dolgraph.class.php
+$theme_datacolor = array(array(137, 86, 161), array(60, 147, 183), array(250, 190, 80), array(191, 75, 57), array(80, 166, 90), array(140,140,220), array(190,120,120), array(190,190,100), array(115,125,150), array(100,170,20), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
+if (! defined('ISLOADEDBYSTEELSHEET'))	// File is run after an include of a php page, not by the style sheet, if the constant is not defined.
 {
-	// for now we use the same configuration for all types of color blind
-	$theme_datacolor = array(array(248, 220, 1), array(9, 85, 187), array(42, 208, 255), array(0, 0, 0), array(169, 169, 169), array(253, 102, 136), array(120, 154, 190), array(146, 146, 55), array(0, 52, 251), array(196, 226, 161), array(222, 160, 41), array(85,135,150), array(150,135,80), array(150,80,150));
+	if (!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)) // user is loaded by dolgraph.class.php
+	{
+		if ($conf->global->MAIN_OPTIMIZEFORCOLORBLIND == 'flashy')
+		{
+			$theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250, 190, 30), array(221, 75, 57), array(0,166,90), array(140,140,220), array(190,120,120), array(190,190,100), array(115,125,150), array(100,170,20), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
+		}
+		else
+		{
+			// for now we use the same configuration for all types of color blind
+			$theme_datacolor = array(array(248, 220, 1), array(9, 85, 187), array(42, 208, 255), array(0, 0, 0), array(169, 169, 169), array(253, 102, 136), array(120, 154, 190), array(146, 146, 55), array(0, 52, 251), array(196, 226, 161), array(222, 160, 41), array(85,135,150), array(150,135,80), array(150,80,150));
+		}
+	}
 }
 
 $theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4'));
@@ -44,9 +54,9 @@ $theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC'));
 
 // Colors
 $colorbackhmenu1='60,70,100';      // topmenu
-$colorbackvmenu1='248,248,248';      // vmenu
+$colorbackvmenu1='250,250,250';      // vmenu
 $colortopbordertitle1='200,200,200';    // top border of title
-$colorbacktitle1='220,220,223';      // title of tables,list
+$colorbacktitle1='233,234,237';      // title of tables,list
 $colorbacktabcard1='255,255,255';  // card
 $colorbacktabactive='234,234,234';
 $colorbacklineimpair1='255,255,255';    // line impair
@@ -67,13 +77,21 @@ $topMenuFontSize='1.2em';
 $toolTipBgColor='rgba(255, 255, 255, 0.96);';
 $toolTipFontColor='#333';
 
+// text color
+$textSuccess   ='#28a745';
+$colorblind_deuteranopes_textSuccess   ='#37de5d';
+$textDanger    ='#dc3545';
+$textWarning   ='#f39c12';
+$colorblind_deuteranopes_textWarning = $textWarning; // currently not tested with a color blind people so use default color
+
+
 // Badges colors
 $badgePrimary   ='#007bff';
 $badgeSecondary ='#999999';
 $badgeSuccess   ='#28a745';
-$badgeDanger    ='#dc3545';
+$badgeDanger    ='#9f4705';
 $badgeWarning   ='#ffc107';
-$badgeInfo      ='#17a2b8';
+$badgeInfo      ='#aaaabb';
 $badgeDark      ='#343a40';
 $badgeLight     ='#f8f9fa';
 
@@ -84,7 +102,7 @@ $colorblind_deuteranopes_badgeWarning   ='#e4e411';
 
 /* default color for status : After a quick check, somme status can have oposite function according to objects
 *  So this badges status uses default value according to theme eldy status img
-*  TODO: use color definition vars above for define badges color status X -> expemple $badgeStatusValidate, $badgeStatusClosed, $badgeStatusActive ....
+*  TODO: use color definition vars above for define badges color status X -> exemple $badgeStatusValidate, $badgeStatusClosed, $badgeStatusActive ....
 */
 $badgeStatus0='#cbd3d3';
 $badgeStatus1='#bc9526';
diff --git a/htdocs/theme/md/badges.inc.php b/htdocs/theme/md/badges.inc.php
new file mode 100644
index 00000000000..390348e2919
--- /dev/null
+++ b/htdocs/theme/md/badges.inc.php
@@ -0,0 +1,204 @@
+<?php
+if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
+/* <style type="text/css" > */
+/*
+ Badge style is based on boostrap framework
+ */
+
+.badge {
+    display: inline-block;
+    padding: .1em .35em;
+    font-size: 80%;
+    font-weight: 700 !important;
+    line-height: 1;
+    text-align: center;
+    white-space: nowrap;
+    vertical-align: baseline;
+    border-radius: .25rem;
+    transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;
+    border-width: 2px;
+    border-style: solid;
+    border-color: rgba(255,255,255,0);
+    box-sizing: border-box;
+}
+/* Themes for badges */
+
+.badge-pill, .tabs .badge {
+    padding-right: .5em;
+    padding-left: .5em;
+    border-radius: 0.25rem;
+}
+
+.badge-dot {
+    padding: 0;
+    border-radius: 50%;
+    padding: 0.25rem;
+    vertical-align: middle;
+}
+
+a.badge:focus, a.badge:hover {
+    text-decoration: none;
+}
+
+.liste_titre .badge {
+    background-color: <?php print $badgeSecondary; ?>;
+    color: #fff;
+}
+
+
+/* PRIMARY */
+.badge-primary{
+    color: #fff !important;
+    background-color: <?php print $badgePrimary; ?>;
+}
+a.badge-primary.focus, a.badge-primary:focus {
+    outline: 0;
+    box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgePrimary, 0.5); ?>;
+}
+a.badge-primary:focus, a.badge-primary:hover {
+    color: #fff !important;
+    background-color: <?php print colorDarker($badgePrimary, 10); ?>;
+}
+
+/* SECONDARY */
+.badge-secondary, .tabs .badge {
+    color: #fff !important;
+    background-color: <?php print $badgeSecondary; ?>;
+}
+a.badge-secondary.focus, a.badge-secondary:focus {
+    outline: 0;
+    box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgeSecondary, 0.5); ?>;
+}
+a.badge-secondary:focus, a.badge-secondary:hover {
+    color: #fff !important;
+    background-color: <?php print colorDarker($badgeSecondary, 10); ?>;
+}
+
+/* SUCCESS */
+.badge-success {
+    color: #fff !important;
+    background-color: <?php print $badgeSuccess; ?>;
+}
+a.badge-success.focus, a.badge-success:focus {
+    outline: 0;
+    box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgeSuccess, 0.5); ?>;
+}
+a.badge-success:focus, a.badge-success:hover {
+    color: #fff !important;
+    background-color: <?php print colorDarker($badgeSuccess, 10); ?>;
+}
+
+/* DANGER */
+.badge-danger {
+    color: #fff !important;
+    background-color:  <?php print $badgeDanger; ?>;
+}
+a.badge-danger.focus, a.badge-danger:focus {
+    outline: 0;
+    box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgeDanger, 0.5); ?>;
+}
+a.badge-danger:focus, a.badge-danger:hover {
+    color: #fff !important;
+    background-color: <?php print colorDarker($badgeDanger, 10); ?>;
+}
+
+/* WARNING */
+.badge-warning {
+    color: #212529 !important;
+    background-color: <?php print $badgeWarning; ?>;
+}
+a.badge-warning.focus, a.badge-warning:focus {
+    outline: 0;
+    box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgeWarning, 0.5); ?>;
+}
+a.badge-warning:focus, a.badge-warning:hover {
+    color: #212529 !important;
+    background-color: <?php print colorDarker($badgeWarning, 10); ?>;
+}
+
+/* INFO */
+.badge-info {
+    color: #fff !important;
+    background-color: <?php print $badgeInfo; ?>;
+}
+a.badge-info.focus, a.badge-info:focus {
+    outline: 0;
+    box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgeInfo, 0.5); ?>;
+}
+a.badge-info:focus, a.badge-info:hover {
+    color: #fff !important;
+    background-color: <?php print colorDarker($badgeInfo, 10); ?>;
+}
+
+/* LIGHT */
+.badge-light {
+    color: #212529 !important;
+    background-color: <?php print $badgeLight; ?>;
+}
+a.badge-light.focus, a.badge-light:focus {
+    outline: 0;
+    box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgeLight, 0.5); ?>;
+}
+a.badge-light:focus, a.badge-light:hover {
+    color: #212529 !important;
+    background-color: <?php print colorDarker($badgeLight, 10); ?>;
+}
+
+/* DARK */
+.badge-dark {
+    color: #fff !important;
+    background-color: <?php print $badgeDark; ?>;
+}
+a.badge-dark.focus, a.badge-dark:focus {
+    outline: 0;
+    box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($badgeDark, 0.5); ?>;
+}
+a.badge-dark:focus, a.badge-dark:hover {
+    color: #fff !important;
+    background-color: <?php print colorDarker($badgeDark, 10); ?>;
+}
+
+/*
+* STATUS BADGES
+*/
+
+/* Default Status */
+
+<?php for ($i = 0; $i <= 9; $i++){
+
+    print "\n/* STATUS".$i." */\n";
+
+    $thisBadgeBackgroundColor = $thisBadgeBorderColor = ${'badgeStatus'.$i};
+
+
+    $TBadgeBorderOnly = array(0,3,5,7);
+    $thisBadgeTextColor = colorIsLight(${'badgeStatus'.$i})?'#212529':'#ffffff';
+    if(in_array($i, $TBadgeBorderOnly)){
+        $thisBadgeTextColor = '#212529';
+        $thisBadgeBackgroundColor = "#fff";
+    }
+
+    print ".badge-status".$i." {\n";
+    print "        color: ".$thisBadgeTextColor." !important;\n";
+
+    if(in_array($i, $TBadgeBorderOnly)){
+        print "        border-color: ".$thisBadgeBorderColor.";\n";
+    }
+
+    print "        background-color: ".$thisBadgeBackgroundColor.";\n";
+    print "}\n";
+
+    print ".badge-status".$i.".focus, .badge-status".$i.":focus {\n";
+    print "    outline: 0;\n";
+    print "    box-shadow: 0 0 0 0.2rem ".colorHexToRgb($thisBadgeBackgroundColor, 0.5).";\n";
+    print "}\n";
+
+    print ".badge-status".$i.":focus, .badge-status".$i.":hover {\n";
+    print "    color: ".$thisBadgeTextColor." !important;\n";
+    print "    background-color: ".colorDarker($thisBadgeBackgroundColor, 10).";\n";
+    if(in_array($i, $TBadgeBorderOnly)){
+        print "        border-color: ".colorDarker($thisBadgeBorderColor, 10).";\n";
+    }
+    print "}\n";
+}
+
diff --git a/htdocs/theme/md/btn.inc.php b/htdocs/theme/md/btn.inc.php
new file mode 100644
index 00000000000..384b968d220
--- /dev/null
+++ b/htdocs/theme/md/btn.inc.php
@@ -0,0 +1,235 @@
+<?php
+if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
+/* <style type="text/css" > */
+
+
+
+/* ============================================================================== */
+/* Buttons for actions                                                            */
+/* ============================================================================== */
+
+
+div.divButAction {
+	margin-bottom: 1.4em;
+	vertical-align: top;
+}
+div.tabsAction > a.butAction, div.tabsAction > a.butActionRefused {
+	margin-bottom: 1.4em !important;
+}
+
+span.butAction, span.butActionDelete {
+	cursor: pointer;
+}
+
+
+.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;
+	margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em;
+	line-height: 20px;
+	text-align: center;
+	vertical-align: middle;
+	cursor: pointer;
+	color: #333333 !important;
+	text-decoration: none !important;
+	text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+	background-color: #f5f5f5;
+	background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+	background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+	background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+	background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
+	background-repeat: repeat-x;
+	border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+	border: 1px solid #bbbbbb;
+	border-bottom-color: #a2a2a2;
+	-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);
+}
+.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;  New button are on right of screen */
+	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;
+	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+	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;
+	border-color: #0044cc #0044cc #002a80;
+	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+.button:disabled, .butAction:disabled {
+	color: #666 !important;
+	text-shadow: none;
+	border-color: #555;
+	cursor: not-allowed;
+
+	background-color: #f5f5f5;
+	background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+	background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+	background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+	background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
+	background-repeat: repeat-x
+}
+
+button.ui-button {
+	padding-top: 5px;
+}
+
+.butActionDelete, .buttonDelete {
+	color: #ffffff !important;
+	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+	background-color: #cc6d00;
+	background-image: -moz-linear-gradient(top, #cc8800, #cc4400);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cc8800), to(#cc4400));
+	background-image: -webkit-linear-gradient(top, #cc8800, #cc4400);
+	background-image: -o-linear-gradient(top, #cc8800, #cc4400);
+	background-image: linear-gradient(to bottom, #cc8800, #cc4400);
+	background-repeat: repeat-x;
+	border-color: #cc4400 #cc4400 #802a00;
+	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+a.butAction:link, a.butAction:visited, a.butAction:hover, a.butAction:active {
+	color: #FFFFFF;
+}
+
+.butActionRefused, .butActionNewRefused {
+	color: #AAAAAA !important;
+	cursor: not-allowed !important;
+}
+
+a.butAction:hover, a.butActionDelete:hover, a.butActionRefused:hover {
+	text-decoration: none;
+}
+a.butActionNewRefused:hover {
+	border-color: unset !important;
+	border: 1px solid #bbbbbb;
+}
+a.butAction:hover, a.butActionNew:hover, a.butActionDelete:hover {
+	opacity: 0.9;
+}
+
+.butActionTransparent {
+	color: #222 ! important;
+	background-color: transparent ! important;
+}
+
+
+/*
+TITLE BUTTON
+ */
+
+.btnTitle, a.btnTitle {
+    display: inline-block;
+    padding: 6px 12px;
+    font-size: 14px
+    font-weight: 400;
+    line-height: 1.4;
+    text-align: center;
+    white-space: nowrap;
+    vertical-align: middle;
+    -ms-touch-action: manipulation;
+    touch-action: manipulation;
+    cursor: pointer;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    box-shadow: none;
+    text-decoration: none;
+    position: relative;
+    margin: 0 0 0 10px;
+    min-width: 80px;
+    text-align: center;
+    color: rgb(<?php print $colortextlink; ?>);
+    border: none;
+    font-size: 12px;
+    font-weight: 300;
+    background-color: #fbfbfb;
+}
+
+.btnTitle > .btnTitle-icon{
+
+}
+
+.btnTitle > .btnTitle-label{
+    color: #666666;
+}
+
+.btnTitle:hover, a.btnTitle:hover {
+    border-radius: 3px;
+    position: relative;
+    margin: 0 0 0 10px;
+    text-align: center;
+    color: #ffffff;
+    background-color: rgb(<?php print $colortextlink; ?>);
+    font-size: 12px;
+    text-decoration: none;
+    box-shadow: none;
+}
+
+.btnTitle.refused, a.btnTitle.refused, .btnTitle.refused:hover, a.btnTitle.refused:hover {
+        color: #8a8a8a;
+        cursor: not-allowed;
+        background-color: #fbfbfb;
+        background: repeating-linear-gradient( 45deg, #ffffff, #f1f1f1 4px, #f1f1f1 4px, #f1f1f1 4px );
+}
+
+.btnTitle:hover .btnTitle-label{
+    color: #ffffff;
+}
+div.pagination .btnTitle:hover .btnTitle-label{
+	color: rgb(<?php print $colortextlink; ?>);
+}
+
+.btnTitle.refused .btnTitle-label, .btnTitle.refused:hover .btnTitle-label{
+    color: #8a8a8a;
+}
+
+.btnTitle>.fa {
+    font-size: 20px;
+    display: block;
+}
+
+
+
+
+
+<?php if (! empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (! $user->admin)) { ?>
+.butActionRefused, .butActionNewRefused, .btnTitle.refused {
+    display: none !important;
+}
+<?php }
diff --git a/htdocs/theme/md/img/title_document.png b/htdocs/theme/md/img/title_document.png
new file mode 100644
index 00000000000..65019c1faf2
Binary files /dev/null and b/htdocs/theme/md/img/title_document.png differ
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
new file mode 100644
index 00000000000..c58079b9b65
--- /dev/null
+++ b/htdocs/theme/md/info-box.inc.php
@@ -0,0 +1,251 @@
+<?php
+if (! defined('ISLOADEDBYSTEELSHEET'))  die('Must be call by steelsheet'); ?>
+/* <style type="text/css" > */
+
+/*
+ * Component: Info Box
+ * -------------------
+ */
+.info-box {
+	display: block;
+	min-height: 90px;
+	background: #fff;
+	width: 100%;
+	margin-bottom: 15px;
+	border: 1px solid #ddd;
+}
+.info-box small {
+	font-size: 14px;
+}
+.info-box .progress {
+	background: rgba(0, 0, 0, 0.2);
+	margin: 5px -10px 5px -10px;
+	height: 2px;
+}
+.info-box .progress,
+.info-box .progress .progress-bar {
+	border-radius: 0;
+}
+
+.info-box .progress .progress-bar {
+		float: left;
+		width: 0;
+		height: 100%;
+		font-size: 12px;
+		line-height: 20px;
+		color: #fff;
+		text-align: center;
+		background-color: #337ab7;
+		-webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
+		box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
+		-webkit-transition: width .6s ease;
+		-o-transition: width .6s ease;
+		transition: width .6s ease;
+}
+.info-box-icon {
+	display: block;
+	float: left;
+	height: 90px;
+	width: 90px;
+	text-align: center;
+	font-size: 45px;
+	line-height: 90px;
+	background: #eee;
+}
+.info-box-icon > img {
+	max-width: 100%;
+}
+.info-box-content {
+	padding: 5px 10px;
+	margin-left: 90px;
+}
+.info-box-number {
+	display: block;
+	font-weight: bold;
+	font-size: 18px;
+}
+.progress-description,
+.info-box-text,
+.info-box-title{
+	display: block;
+	font-size: 12px;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+.info-box-title{
+	text-transform: uppercase;
+	font-weight: bold;
+}
+.info-box-text{
+	font-size: 12px;
+}
+.info-box-text:first-letter{text-transform: uppercase}
+a.info-box-text{ text-decoration: none;}
+
+
+.info-box-more {
+	display: block;
+}
+.progress-description {
+	margin: 0;
+}
+
+
+
+/* ICONS */
+.info-box-icon {
+	color: #000 !important;
+}
+<?php
+include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+if (! isset($conf->global->THEME_AGRESSIVITY_RATIO)) $conf->global->THEME_AGRESSIVITY_RATIO=-100;
+if (GETPOSTISSET('THEME_AGRESSIVITY_RATIO')) $conf->global->THEME_AGRESSIVITY_RATIO=GETPOST('THEME_AGRESSIVITY_RATIO', 'int');
+?>
+.bg-infoxbox-project i.fa{
+	color: <?php print colorAgressivity('#605ca8', $conf->global->THEME_AGRESSIVITY_RATIO); ?> !important;
+}
+.bg-infoxbox-action i.fa{
+	color: <?php print colorAgressivity('#d84b80', $conf->global->THEME_AGRESSIVITY_RATIO); ?>  !important;
+}
+.bg-infoxbox-propal i.fa,
+.bg-infoxbox-facture i.fa,
+.bg-infoxbox-commande i.fa{
+	color: <?php print colorAgressivity('#abb87b', $conf->global->THEME_AGRESSIVITY_RATIO); ?>  !important;
+}
+.bg-infoxbox-supplier_proposal i.fa,
+.bg-infoxbox-invoice_supplier i.fa,
+.bg-infoxbox-order_supplier i.fa{
+	color: <?php print colorAgressivity('#40b0cf', $conf->global->THEME_AGRESSIVITY_RATIO); ?>  !important;
+}
+.bg-infoxbox-contrat i.fa{
+	color: <?php print colorAgressivity('#20a68a', $conf->global->THEME_AGRESSIVITY_RATIO); ?>  !important;
+}
+.bg-infoxbox-bank_account i.fa{
+	color: <?php print colorAgressivity('#e39c42', $conf->global->THEME_AGRESSIVITY_RATIO); ?>  !important;
+}
+.bg-infoxbox-adherent i.fa{
+	color: <?php print colorAgressivity('#f39c12', $conf->global->THEME_AGRESSIVITY_RATIO); ?>  !important;
+}
+.bg-infoxbox-expensereport i.fa{
+	color: <?php print colorAgressivity('#755114', $conf->global->THEME_AGRESSIVITY_RATIO); ?>  !important;
+}
+.bg-infoxbox-holiday i.fa{
+	color: <?php print colorAgressivity('#755114', $conf->global->THEME_AGRESSIVITY_RATIO); ?>  !important;
+}
+
+
+.fa-dol-action:before {
+	content: "\f073";
+}
+.fa-dol-propal:before,
+.fa-dol-supplier_proposal:before {
+	content: "\f2b5";
+}
+.fa-dol-facture:before,
+.fa-dol-invoice_supplier:before {
+	content: "\f571";
+}
+.fa-dol-project:before {
+	content: "\f0e8";
+}
+.fa-dol-commande:before,
+.fa-dol-order_supplier:before {
+	content: "\f570";
+}
+.fa-dol-contrat:before {
+	content: "\f1e6";
+}
+.fa-dol-bank_account:before {
+	content: "\f19c";
+}
+.fa-dol-adherent:before {
+	content: "\f0c0";
+}
+.fa-dol-expensereport:before {
+	content: "\f555";
+}
+.fa-dol-holiday:before {
+	content: "\f5ca";
+}
+
+
+/* USING FONTAWESOME FOR WEATHER */
+.info-box-weather .info-box-icon{
+	background: #eee !important;
+}
+.fa-weather-level0:before{
+	content: "\f185";
+	color : #000000;
+}
+.fa-weather-level1:before{
+	content: "\f6c4";
+	color : #000000;
+}
+.fa-weather-level2:before{
+	content: "\f0c2";
+	color : #000000;
+}
+.fa-weather-level3:before{
+	content: "\f740";
+	color : #000000;
+}
+.fa-weather-level4:before{
+	content: "\f0e7";
+	color : #000000;
+}
+
+/* USING IMAGES FOR WEATHER INTEAD OF FONT AWESOME */
+/* For other themes just uncomment this part */
+/*.info-box-weather-level0,
+.info-box-weather-level1,
+.info-box-weather-level2,
+.info-box-weather-level3,
+.info-box-weather-level4 {
+	background-position: 15px 50%;
+	background-repeat: no-repeat;
+}
+
+.info-box-weather .info-box-icon{
+	display: none !important;
+}
+.info-box-weather-level0 {
+	background-image: url("img/weather/weather-clear.png");
+}
+.info-box-weather-level1 {
+	background-image: url("img/weather/weather-few-clouds.png");
+}
+.info-box-weather-level2 {
+	background-image: url("img/weather/weather-clouds.png");
+}
+.info-box-weather-level3 {
+	background-image: url("img/weather/weather-many-clouds.png");
+}
+.info-box-weather-level4 {
+	background-image: url("img/weather/weather-storm.png");
+}*/
+
+
+
+.box-flex-container{
+	display: flex; /* or inline-flex */
+	flex-direction: row;
+	flex-wrap: wrap;
+	width: 100%;
+	margin: 0 0 0 -15px;
+	/*justify-content: space-between;*/
+}
+
+.box-flex-item{
+	flex-grow : 1;
+	flex-shrink: 1;
+	flex-basis: auto;
+
+	width: 280px;
+	margin: 5px 0px 0px 15px;
+}
+.box-flex-item.filler{
+	margin: 0px 0px 0px 15px !important;
+	height: 0;
+}
+
diff --git a/htdocs/theme/md/progress.inc.php b/htdocs/theme/md/progress.inc.php
new file mode 100644
index 00000000000..ae200107c75
--- /dev/null
+++ b/htdocs/theme/md/progress.inc.php
@@ -0,0 +1,7 @@
+<?php
+if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet');
+
+include dol_buildpath($path.'/theme/eldy/progress.inc.php', 0); // actually md use same style as eldy theme
+
+?>
+/* <style type="text/css" > */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 8999a73aaea..d403a14f7b5 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -690,21 +690,25 @@ textarea.centpercent {
     opacity: 0.7;
 }
 
-/* Themes for badges */
-.badge {
-	display: inline-block;
-	min-width: 10px;
-	padding: 2px 5px;
-	font-size: 10px;
-	font-weight: 700;
-	line-height: 1em;
-	color: #fff;
-	text-align: center;
-	white-space: nowrap;
-	vertical-align: baseline;
-	background-color: #777;
-	border-radius: 10px;
+.text-warning{
+    color : <?php print $textWarning ; ?>
 }
+body[class*="colorblind-"] .text-warning{
+    color : <?php print $colorblind_deuteranopes_textWarning ; ?>
+}
+.text-success{
+    color : <?php print $textSuccess ; ?>
+}
+body[class*="colorblind-"] .text-success{
+    color : <?php print $colorblind_deuteranopes_textSuccess ; ?>
+}
+
+.text-danger{
+    color : <?php print $textDanger ; ?>
+}
+
+/* Themes for badges */
+<?php include dol_buildpath($path.'/theme/'.$theme.'/badges.inc.php', 0); ?>
 
 .borderrightlight
 {
@@ -1759,6 +1763,9 @@ div.mainmenu {
 
 /* Do not load menu img if hidden to save bandwidth */
 <?php if (empty($dol_hide_topmenu)) { ?>
+    <?php if (! defined('DISABLE_FONT_AWSOME') && empty($conf->global->MAIN_DISABLE_FONT_AWESOME_5)) { ?>
+        <?php include dol_buildpath($path.'/theme/'.$theme.'/main_menu_fa_icons.inc.php', 0); ?>
+    <?php } ?>
 
 div.mainmenu.home{
 	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home.png', 1) ?>);
@@ -2512,150 +2519,7 @@ span.tabspan {
 /* ============================================================================== */
 /* Buttons for actions                                                            */
 /* ============================================================================== */
-
-div.divButAction {
-	margin-bottom: 1.4em;
-	vertical-align: top;
-}
-div.tabsAction > a.butAction, div.tabsAction > a.butActionRefused {
-	margin-bottom: 1.4em !important;
-}
-
-span.butAction, span.butActionDelete {
-	cursor: pointer;
-}
-
-
-.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;
-    margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em;
-	line-height: 20px;
-	text-align: center;
-	vertical-align: middle;
-	cursor: pointer;
-	color: #333333 !important;
-	text-decoration: none !important;
-	text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
-	background-color: #f5f5f5;
-	background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
-	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
-	background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
-	background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
-	background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
-	background-repeat: repeat-x;
-	border-color: #e6e6e6 #e6e6e6 #bfbfbf;
-	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-	border: 1px solid #bbbbbb;
-	border-bottom-color: #a2a2a2;
-	-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);
-}
-.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;  New button are on right of screen */
-	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;
-	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-	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;
-	border-color: #0044cc #0044cc #002a80;
-	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-}
-.button:disabled, .butAction:disabled {
-    color: #666 !important;
-    text-shadow: none;
-    border-color: #555;
-    cursor: not-allowed;
-
-    background-color: #f5f5f5;
-    background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
-    background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
-    background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
-    background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
-    background-repeat: repeat-x
-}
-
-button.ui-button {
-    padding-top: 5px;
-}
-
-.butActionDelete, .buttonDelete {
-	color: #ffffff !important;
-	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-	background-color: #cc6d00;
-	background-image: -moz-linear-gradient(top, #cc8800, #cc4400);
-	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cc8800), to(#cc4400));
-	background-image: -webkit-linear-gradient(top, #cc8800, #cc4400);
-	background-image: -o-linear-gradient(top, #cc8800, #cc4400);
-	background-image: linear-gradient(to bottom, #cc8800, #cc4400);
-	background-repeat: repeat-x;
-	border-color: #cc4400 #cc4400 #802a00;
-	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-}
-a.butAction:link, a.butAction:visited, a.butAction:hover, a.butAction:active {
-	color: #FFFFFF;
-}
-
-.butActionRefused, .butActionNewRefused {
-	color: #AAAAAA !important;
-	cursor: not-allowed !important;
-}
-
-a.butAction:hover, a.butActionDelete:hover, a.butActionRefused:hover {
-    text-decoration: none;
-}
-a.butActionNewRefused:hover {
-	border-color: unset !important;
-	border: 1px solid #bbbbbb;
-}
-a.butAction:hover, a.butActionNew:hover, a.butActionDelete:hover {
-	opacity: 0.9;
-}
-
-.butActionTransparent {
-	color: #222 ! important;
-	background-color: transparent ! important;
-}
-
-<?php if (! empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) { ?>
-.butActionRefused, .butActionNewRefused {
-	display: none;
-}
-<?php } ?>
+<?php include dol_buildpath($path.'/theme/'.$theme.'/btn.inc.php', 0); ?>
 
 
 
@@ -3344,6 +3208,9 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 .box {
     overflow-x: auto;
     min-height: 40px;
+    padding-right: 0px;
+    padding-left: 0px;
+    padding-bottom: 12px;
 }
 .ficheaddleft div.boxstats, .ficheaddright div.boxstats {
     border: none;
@@ -3470,12 +3337,6 @@ a.valignmiddle.dashboardlineindicator {
     line-height: 30px;
 }
 
-.box {
-    padding-right: 0px;
-    padding-left: 0px;
-    padding-bottom: 12px;
-}
-
 tr.box_titre {
     height: 26px !important;
 
@@ -3608,6 +3469,10 @@ a.impayee:hover { font-weight: bold; color: #550000; }
  *  Other
  */
 
+.opened-dash-board-wrap {
+    margin-bottom: 25px;
+}
+
 div.boximport {
     min-height: unset;
 }
@@ -3935,6 +3800,12 @@ tr.visible {
     color: #000 !important;
     text-shadow: none;
 }
+.bordertransp {
+    background-color: transparent;
+    background-image: none;
+    border: 1px solid #aaa;
+	font-weight: normal;
+}
 .websitebar {
 	border-bottom: 1px solid #ccc;
 	background: #eee;
@@ -5719,6 +5590,10 @@ border-top-right-radius: 6px;
         border-left: none;
     }
 
+	.box-flex-container {
+	    margin: 0 0 0 -8px !important;
+	}
+
 }
 
 @media only screen and (max-width: 1024px)
@@ -5859,6 +5734,8 @@ border-top-right-radius: 6px;
 <?php }
 
 include dol_buildpath($path.'/theme/'.$theme.'/dropdown.inc.php', 0);
+include dol_buildpath($path.'/theme/'.$theme.'/info-box.inc.php', 0);
+include dol_buildpath($path.'/theme/'.$theme.'/progress.inc.php', 0);
 
 
 
diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php
index 95ac3abdd34..73653bab7b7 100644
--- a/htdocs/theme/md/theme_vars.inc.php
+++ b/htdocs/theme/md/theme_vars.inc.php
@@ -28,7 +28,22 @@
 
 global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
 $theme_bordercolor = array(235,235,224);
-$theme_datacolor = array(array(136,102,136), array(0,130,110), array(140,140,220), array(190,120,120), array(190,190,100), array(115,125,150), array(100,170,20), array(250,190,30), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
+$theme_datacolor = array(array(137, 86, 161), array(60, 147, 183), array(250, 190, 80), array(191, 75, 57), array(80, 166, 90), array(140,140,220), array(190,120,120), array(190,190,100), array(115,125,150), array(100,170,20), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
+if (! defined('ISLOADEDBYSTEELSHEET'))	// File is run after an include of a php page, not by the style sheet, if the constant is not defined.
+{
+	if (!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)) // user is loaded by dolgraph.class.php
+	{
+		if ($conf->global->MAIN_OPTIMIZEFORCOLORBLIND == 'flashy')
+		{
+			$theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250,190,30), array(221, 75, 57), array(0, 166, 90), array(140,140,220), array(190,120,120), array(190,190,100), array(115,125,150), array(100,170,20), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
+		}
+		else
+		{
+			// for now we use the same configuration for all types of color blind
+			$theme_datacolor = array(array(248, 220, 1), array(9, 85, 187), array(42, 208, 255), array(0, 0, 0), array(169, 169, 169), array(253, 102, 136), array(120, 154, 190), array(146, 146, 55), array(0, 52, 251), array(196, 226, 161), array(222, 160, 41), array(85,135,150), array(150,135,80), array(150,80,150));
+		}
+	}
+}
 $theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4'));
 $theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC'));
 
@@ -54,3 +69,35 @@ $colortext='0,0,0';
 $colortextlink='0,0,120';
 $fontsize='14';
 $fontsizesmaller='11';
+
+// text color
+$textSuccess   ='#28a745';
+$colorblind_deuteranopes_textSuccess   ='#37de5d';
+$textDanger    ='#dc3545';
+$textWarning   ='#f39c12';
+$colorblind_deuteranopes_textWarning = $textWarning; // currently not tested with a color blind people so use default color
+
+// Badges colors
+$badgePrimary   ='#007bff';
+$badgeSecondary ='#999999';
+$badgeSuccess   ='#28a745';
+$badgeDanger    ='#8c4446';
+$badgeWarning   ='#ffc107';
+$badgeInfo      ='#17a2b8';
+$badgeDark      ='#343a40';
+$badgeLight     ='#f8f9fa';
+
+/* default color for status : After a quick check, somme status can have oposite function according to objects
+*  So this badges status uses default value according to theme eldy status img
+*  TODO: use color definition vars above for define badges color status X -> expemple $badgeStatusValidate, $badgeStatusClosed, $badgeStatusActive ....
+*/
+$badgeStatus0='#cbd3d3';
+$badgeStatus1='#bc9526';
+$badgeStatus2='#e6f0f0';
+$badgeStatus3='#bca52b';
+$badgeStatus4='#277d1e';
+$badgeStatus5='#cad2d2';
+$badgeStatus6='#cad2d2';
+$badgeStatus7='#baa32b';
+$badgeStatus8='#be3013';
+$badgeStatus9='#e7f0f0';
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 36514aafd8e..13035d1fb0e 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -329,12 +329,12 @@ if (empty($reshook)) {
 		{
 			$error = 0;
 
-			if (!$_POST["lastname"]) {
+			if (! GETPOST("lastname", 'alpha')) {
 				setEventMessages($langs->trans("NameNotDefined"), null, 'errors');
 				$action = "edit";       // Go back to create page
 				$error ++;
 			}
-			if (!$_POST["login"]) {
+			if (! GETPOST("login", 'alpha')) {
 				setEventMessages($langs->trans("LoginNotDefined"), null, 'errors');
 				$action = "edit";       // Go back to create page
 				$error ++;
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index bc766f4dc4b..e74973fd6b1 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -125,8 +125,9 @@ if ($resql)
 {
 	$num = $db->num_rows($resql);
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("LastUsersCreated", min($num, $max)).'</td>';
+	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("LastUsersCreated", min($num, $max)).'</td>';
 	print '<td class="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/user/list.php?sortfield=u.datec&sortorder=DESC">'.$langs->trans("FullList").'</td>';
+	print '<td></td>';
 	print '</tr>';
 	$i = 0;
 
@@ -195,7 +196,7 @@ if ($resql)
         print ($entitystring?' ('.$entitystring.')':'');
 
 		print '</td>';
-		print '<td class="right">'.dol_print_date($db->jdate($obj->datec), 'dayhour').'</td>';
+		print '<td class="center nowrap">'.dol_print_date($db->jdate($obj->datec), 'dayhour').'</td>';
         print '<td class="right">';
         print $fuserstatic->getLibStatut(3);
         print '</td>';
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index fffa25cf728..337f054c7c9 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -790,7 +790,7 @@ class Website extends CommonObject
 	/**
 	 * Generate a zip with all data of web site.
 	 *
-	 * @return  string						Path to file with zip
+	 * @return  string						Path to file with zip or '' if error
 	 */
 	public function exportWebSite()
 	{
@@ -823,30 +823,47 @@ class Website extends CommonObject
 			return '';
 		}
 
-		$arrayreplacement=array();
+		$arrayreplacementinfilename=array();
+		$arrayreplacementincss=array();
+		$arrayreplacementincss['file=image/'.$website->ref.'/'] = "file=image/__WEBSITE_KEY__/";
+		$arrayreplacementincss['file=js/'.$website->ref.'/'] = "file=js/__WEBSITE_KEY__/";
+		$arrayreplacementincss['medias/image/'.$website->ref.'/'] = "medias/image/__WEBSITE_KEY__/";
+		$arrayreplacementincss['medias/js/'.$website->ref.'/'] = "medias/js/__WEBSITE_KEY__/";
+		$arrayreplacementincss['file=logos%2Fthumbs%2F'.$mysoc->logo_small] = "file=logos%2Fthumbs%2F__LOGO_SMALL_KEY__";
+		$arrayreplacementincss['file=logos%2Fthumbs%2F'.$mysoc->logo_mini] = "file=logos%2Fthumbs%2F__LOGO_MINI_KEY__";
+		$arrayreplacementincss['file=logos%2Fthumbs%2F'.$mysoc->logo] = "file=logos%2Fthumbs%2F__LOGO_KEY__";
 
 		$srcdir = $conf->website->dir_output.'/'.$website->ref;
 		$destdir = $conf->website->dir_temp.'/'.$website->ref.'/containers';
 
+		// Create containers dir
+		dol_syslog("Create containers dir");
+		dol_mkdir($conf->website->dir_temp.'/'.$website->ref.'/containers');
+
+		// Copy files into medias
 		dol_syslog("Copy content from ".$srcdir." into ".$destdir);
-		dolCopyDir($srcdir, $destdir, 0, 1, $arrayreplacement);
+		dolCopyDir($srcdir, $destdir, 0, 1, $arrayreplacementinfilename);
 
 		$srcdir = DOL_DATA_ROOT.'/medias/image/'.$website->ref;
 		$destdir = $conf->website->dir_temp.'/'.$website->ref.'/medias/image/websitekey';
 
 		dol_syslog("Copy content from ".$srcdir." into ".$destdir);
-		dolCopyDir($srcdir, $destdir, 0, 1, $arrayreplacement);
+		dolCopyDir($srcdir, $destdir, 0, 1, $arrayreplacementinfilename);
 
 		$srcdir = DOL_DATA_ROOT.'/medias/js/'.$website->ref;
 		$destdir = $conf->website->dir_temp.'/'.$website->ref.'/medias/js/websitekey';
 
+		// Copy containers files
 		dol_syslog("Copy content from ".$srcdir." into ".$destdir);
-		dolCopyDir($srcdir, $destdir, 0, 1, $arrayreplacement);
+		dolCopyDir($srcdir, $destdir, 0, 1, $arrayreplacementinfilename);
+
+		$cssindestdir = $conf->website->dir_temp.'/'.$website->ref.'/containers/styles.css.php';
+		dolReplaceInFile($cssindestdir, $arrayreplacementincss);
+
+		$htmldeaderindestdir = $conf->website->dir_temp.'/'.$website->ref.'/containers/htmlheader.html';
+		dolReplaceInFile($htmldeaderindestdir, $arrayreplacementincss);
 
 		// Build sql file
-		dol_syslog("Create containers dir");
-		dol_mkdir($conf->website->dir_temp.'/'.$website->ref.'/containers');
-
 		$filesql = $conf->website->dir_temp.'/'.$website->ref.'/website_pages.sql';
 		$fp = fopen($filesql, "w");
 		if (empty($fp))
@@ -931,6 +948,10 @@ class Website extends CommonObject
 			$stringtoexport = str_replace('file=logos%2Fthumbs%2F'.$mysoc->logo_small, "file=logos%2Fthumbs%2F__LOGO_SMALL_KEY__", $stringtoexport);
 			$stringtoexport = str_replace('file=logos%2Fthumbs%2F'.$mysoc->logo_mini, "file=logos%2Fthumbs%2F__LOGO_MINI_KEY__", $stringtoexport);
 			$stringtoexport = str_replace('file=logos%2Fthumbs%2F'.$mysoc->logo, "file=logos%2Fthumbs%2F__LOGO_KEY__", $stringtoexport);
+
+			// When we have a link src="image/websiteref/file.png" into html content
+			$stringtoexport = str_replace('="image/'.$website->ref.'/', '="image/__WEBSITE_KEY__/', $stringtoexport);
+
 			$line.= "'".$this->db->escape($stringtoexport)."'";		// Replace \r \n to have record on 1 line
 			$line.= ");";
 			$line.= "\n";
@@ -957,9 +978,18 @@ class Website extends CommonObject
 		$filename = $conf->website->dir_temp.'/'.$website->ref.'/website_'.$website->ref.'-'.dol_print_date(dol_now(), 'dayhourlog').'.zip';
 
 		dol_delete_file($fileglob, 0);
-		dol_compress_file($filedir, $filename, 'zip');
+		$result = dol_compress_file($filedir, $filename, 'zip');
 
-		return $filename;
+		if ($result > 0)
+		{
+			return $filename;
+		}
+		else
+		{
+			global $errormsg;
+			$this->error = $errormsg;
+			return '';
+		}
 	}
 
 
@@ -999,9 +1029,24 @@ class Website extends CommonObject
 			return -1;
 		}
 
+		$arrayreplacement = array();
+		$arrayreplacement['__WEBSITE_ID__'] = $object->id;
+		$arrayreplacement['__WEBSITE_KEY__'] = $object->ref;
+		$arrayreplacement['__N__'] = $this->db->escape("\n");			// Restore \n
+		$arrayreplacement['__LOGO_SMALL_KEY__'] = $this->db->escape($mysoc->logo_small);
+		$arrayreplacement['__LOGO_MINI_KEY__'] = $this->db->escape($mysoc->logo_mini);
+		$arrayreplacement['__LOGO_KEY__'] = $this->db->escape($mysoc->logo);
 
+		// Copy containers
 		dolCopyDir($conf->website->dir_temp.'/'.$object->ref.'/containers', $conf->website->dir_output.'/'.$object->ref, 0, 1);	// Overwrite if exists
 
+		// Make replacement into css and htmlheader file
+		$cssindestdir = $conf->website->dir_output.'/'.$object->ref.'/styles.css.php';
+		$result=dolReplaceInFile($cssindestdir, $arrayreplacement);
+
+		$htmldeaderindestdir = $conf->website->dir_output.'/'.$object->ref.'/htmlheader.html';
+		$result = dolReplaceInFile($htmldeaderindestdir, $arrayreplacement);
+
 		// Now generate the master.inc.php page
 		$filemaster=$conf->website->dir_output.'/'.$object->ref.'/master.inc.php';
 		$result = dolSaveMasterFile($filemaster);
@@ -1016,13 +1061,6 @@ class Website extends CommonObject
 
 		$sqlfile = $conf->website->dir_temp.'/'.$object->ref.'/website_pages.sql';
 
-		$arrayreplacement = array();
-		$arrayreplacement['__WEBSITE_ID__'] = $object->id;
-		$arrayreplacement['__WEBSITE_KEY__'] = $object->ref;
-		$arrayreplacement['__N__'] = $this->db->escape("\n");			// Restore \n
-		$arrayreplacement['__LOGO_SMALL_KEY__'] = $this->db->escape($mysoc->logo_small);
-		$arrayreplacement['__LOGO_MINI_KEY__'] = $this->db->escape($mysoc->logo_mini);
-		$arrayreplacement['__LOGO_KEY__'] = $this->db->escape($mysoc->logo);
 		$result = dolReplaceInFile($sqlfile, $arrayreplacement);
 
 		$this->db->begin();
@@ -1052,6 +1090,8 @@ class Website extends CommonObject
 		{
 			while (! feof($fp))
 			{
+				$reg = array();
+
 				// Warning fgets with second parameter that is null or 0 hang.
 				$buf = fgets($fp, 65000);
 				if (preg_match('/^-- Page ID (\d+)\s[^\s]+\s(\d+).*Aliases\s(.*)\s--;/i', $buf, $reg))
@@ -1071,10 +1111,16 @@ class Website extends CommonObject
 					dolSavePageContent($filetpl, $object, $objectpagestatic);
 
 					// Regenerate alternative aliases pages
-					foreach($aliasesarray as $aliasshortcuttocreate)
+					if (is_array($aliasesarray))
 					{
-						$filealias=$conf->website->dir_output.'/'.$object->ref.'/'.$aliasshortcuttocreate.'.php';
-						dolSavePageAlias($filealias, $object, $objectpagestatic);
+						foreach($aliasesarray as $aliasshortcuttocreate)
+						{
+							if (trim($aliasshortcuttocreate))
+							{
+								$filealias=$conf->website->dir_output.'/'.$object->ref.'/'.trim($aliasshortcuttocreate).'.php';
+								dolSavePageAlias($filealias, $object, $objectpagestatic);
+							}
+						}
 					}
 				}
 			}
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 417a1bfc305..23fd1842c89 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -340,7 +340,8 @@ class WebsitePage extends CommonObject
 
 			return $records;
 		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
+			$this->error = 'Error ' . $this->db->lasterror();
+			$this->errors[] = $this->error;
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 
 			return -1;
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 35b5444e0b2..2dbc3bb3574 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -184,6 +184,7 @@ $filetpl=$pathofwebsite.'/page'.$pageid.'.tpl.php';
 $fileindex=$pathofwebsite.'/index.php';
 $filewrapper=$pathofwebsite.'/wrapper.php';
 $filemanifestjson=$pathofwebsite.'/manifest.json.php';
+$filereadme=$pathofwebsite.'/README.md';
 
 // Define $urlwithroot
 $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -338,7 +339,7 @@ if ($action == 'addsite')
 {
 	$db->begin();
 
-    if (GETPOST('virtualhost', 'alpha') && ! preg_match('/^http/', GETPOST('virtualhost', 'alpha')))
+	if (GETPOST('virtualhost', 'alpha') && ! preg_match('/^http/', GETPOST('virtualhost', 'alpha')))
     {
         $error++;
         setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
@@ -414,6 +415,7 @@ if ($action == 'addcontainer')
 	{
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
+		//if (! preg_match('/^http/', $urltograb) && ! preg_match('/^file/', $urltograb))
 		if (! preg_match('/^http/', $urltograb))
 		{
 			$error++;
@@ -427,6 +429,7 @@ if ($action == 'addcontainer')
 			// Clean url to grab, so url can be
 			// http://www.example.com/ or http://www.example.com/dir1/ or http://www.example.com/dir1/aaa
 			$urltograbwithoutdomainandparam = preg_replace('/^https?:\/\/[^\/]+\/?/i', '', $urltograb);
+			//$urltograbwithoutdomainandparam = preg_replace('/^file:\/\/[^\/]+\/?/i', '', $urltograb);
 			$urltograbwithoutdomainandparam = preg_replace('/\?.*$/', '', $urltograbwithoutdomainandparam);
 			if (empty($urltograbwithoutdomainandparam) && ! preg_match('/\/$/', $urltograb))
 			{
@@ -653,7 +656,7 @@ if ($action == 'addcontainer')
 					elseif ($tmpgeturl['http_code'] != '200')
 					{
 						$errorforsubresource++;
-						setEventMessages('Error getting link tag url'.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
+						setEventMessages('Error getting link tag url '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
 						dol_syslog('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg']);
 						$action='createcontainer';
 					}
@@ -770,7 +773,10 @@ if ($action == 'addcontainer')
 
 			// Save page alias
 			$result=dolSavePageAlias($filealias, $object, $objectpage);
-			if (! $result) setEventMessages('Failed to write file '.$filealias, null, 'errors');
+			if (! $result)
+			{
+				setEventMessages('Failed to write file '.$filealias, null, 'errors');
+			}
 
 			// Save page of content
 			$result=dolSavePageContent($filetpl, $object, $objectpage);
@@ -850,6 +856,11 @@ if ($action == 'addcontainer')
 			$result=dolSaveManifestJson($filemanifestjson, $manifestjsoncontent);
 		}
 
+		if (! dol_is_file($filereadme))
+		{
+			$readmecontent = "Website generated by Dolibarr ERP CRM";
+			$result=dolSaveReadme($filereadme, $readmecontent);
+		}
 
 		$action = 'preview';
 	}
@@ -988,7 +999,11 @@ if ($action == 'updatecss')
 
     		// Now generate the master.inc.php page
     		$result = dolSaveMasterFile($filemaster);
-    		if (! $result) setEventMessages('Failed to write file '.$filemaster, null, 'errors');
+    		if (! $result)
+    		{
+    			$error++;
+    			setEventMessages('Failed to write file '.$filemaster, null, 'errors');
+    		}
 
 
     		// Html header file
@@ -1012,7 +1027,12 @@ if ($action == 'updatecss')
 
     		$htmlheadercontent = trim($htmlheadercontent)."\n";
 
-    		dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent);
+    		$result = dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent);
+    		if (! $result)
+    		{
+    			$error++;
+    			setEventMessages('Failed to write file '.$filehtmlheader, null, 'errors');
+    		}
 
 
     		// Css file
@@ -1024,23 +1044,21 @@ if ($action == 'updatecss')
     		$csscontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
     		$csscontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
     		$csscontent.= "ob_start();\n";
+    		$csscontent.= "if (! headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */ \n";
     		$csscontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
     		$csscontent.= "header('Content-type: text/css');\n";
+    		$csscontent.= "}\n";
     		$csscontent.= "// END PHP ?>\n";
 
-    		$csscontent.= GETPOST('WEBSITE_CSS_INLINE', 'none');
+    		$csscontent.= trim(GETPOST('WEBSITE_CSS_INLINE', 'none'))."\n";
 
-    		$csscontent.= "\n".'<?php // BEGIN PHP'."\n";
+    		$csscontent.= '<?php // BEGIN PHP'."\n";
     		$csscontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "css");'."\n";
     		$csscontent.= "// END PHP ?>"."\n";
 
     		dol_syslog("Save css content into ".$filecss);
 
-    		dol_mkdir($pathofwebsite);
-    		$result = file_put_contents($filecss, $csscontent);
-    		if (! empty($conf->global->MAIN_UMASK))
-    			@chmod($filecss, octdec($conf->global->MAIN_UMASK));
-
+    		$result = dolSaveCssFile($filecss, $csscontent);
     		if (! $result)
     		{
     			$error++;
@@ -1061,19 +1079,13 @@ if ($action == 'updatecss')
     		$jscontent.= "header('Content-type: application/javascript');\n";
     		$jscontent.= "// END PHP ?>\n";
 
-    		$jscontent.= GETPOST('WEBSITE_JS_INLINE', 'none');
+    		$jscontent.= trim(GETPOST('WEBSITE_JS_INLINE', 'none'))."\n";
 
-    		$jscontent.= "\n".'<?php // BEGIN PHP'."\n";
+    		$jscontent.= '<?php // BEGIN PHP'."\n";
     		$jscontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "js");'."\n";
     		$jscontent.= "// END PHP ?>"."\n";
 
-    		dol_syslog("Save js content into ".$filejs);
-
-    		dol_mkdir($pathofwebsite);
-    		$result = file_put_contents($filejs, $jscontent);
-    		if (! empty($conf->global->MAIN_UMASK))
-    			@chmod($filejs, octdec($conf->global->MAIN_UMASK));
-
+    		$result = dolSaveJsFile($filejs, $jscontent);
     		if (! $result)
     		{
     			$error++;
@@ -1094,19 +1106,13 @@ if ($action == 'updatecss')
     	    $robotcontent.= "header('Content-type: text/css');\n";
     	    $robotcontent.= "// END PHP ?>\n";*/
 
-    		$robotcontent.= GETPOST('WEBSITE_ROBOT', 'none');
+    		$robotcontent.= trim(GETPOST('WEBSITE_ROBOT', 'none'))."\n";
 
     		/*$robotcontent.= "\n".'<?php // BEGIN PHP'."\n";
     	    $robotcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "robot");'."\n";
     	    $robotcontent.= "// END PHP ?>"."\n";*/
 
-    		dol_syslog("Save file robot into ".$filerobot);
-
-    		dol_mkdir($pathofwebsite);
-    		$result = file_put_contents($filerobot, $robotcontent);
-    		if (! empty($conf->global->MAIN_UMASK))
-    			@chmod($filerobot, octdec($conf->global->MAIN_UMASK));
-
+    		$result = dolSaveRobotFile($filerobot, $robotcontent);
     		if (! $result)
     		{
     			$error++;
@@ -1116,20 +1122,15 @@ if ($action == 'updatecss')
 
     		// Htaccess file
     		$htaccesscontent ='';
-    		$htaccesscontent.= GETPOST('WEBSITE_HTACCESS', 'none');
+    		$htaccesscontent.= trim(GETPOST('WEBSITE_HTACCESS', 'none'))."\n";
 
-    		dol_syslog("Save file htaccess into ".$filehtaccess);
+    		$result = dolSaveHtaccessFile($filehtaccess, $htaccesscontent);
+    		if (! $result)
+    		{
+    			$error++;
+    			setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
+    		}
 
-    		dol_mkdir($pathofwebsite);
-    		$result = file_put_contents($filehtaccess, $htaccesscontent);
-    		if (! empty($conf->global->MAIN_UMASK))
-    			@chmod($filehtaccess, octdec($conf->global->MAIN_UMASK));
-
-       		if (! $result)
-       		{
-       			$error++;
-       			setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
-       		}
 
        		// manifest.json file
        		$manifestjsoncontent ='';
@@ -1144,24 +1145,45 @@ if ($action == 'updatecss')
        		$manifestjsoncontent.= "header('Content-type: application/manifest+json');\n";
        		$manifestjsoncontent.= "// END PHP ?>\n";
 
-       		$manifestjsoncontent.= GETPOST('WEBSITE_MANIFEST_JSON', 'none');
+       		$manifestjsoncontent.= trim(GETPOST('WEBSITE_MANIFEST_JSON', 'none'))."\n";
 
-       		$manifestjsoncontent.= "\n".'<?php // BEGIN PHP'."\n";
+       		$manifestjsoncontent.= '<?php // BEGIN PHP'."\n";
        		$manifestjsoncontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
        		$manifestjsoncontent.= "// END PHP ?>"."\n";
 
-       		dol_syslog("Save file manifest.json.php into ".$manifestjsoncontent);
+       		$result = dolSaveManifestJson($filemanifestjson, $manifestjsoncontent);
+       		if (! $result)
+       		{
+       			$error++;
+       			setEventMessages('Failed to write file '.$filemanifestjson, null, 'errors');
+       		}
 
-       		dol_mkdir($pathofwebsite);
-       		$result = file_put_contents($filemanifestjson, $manifestjsoncontent);
-       		if (! empty($conf->global->MAIN_UMASK))
-       			@chmod($filemanifestjson, octdec($conf->global->MAIN_UMASK));
 
-   			if ($result === false)
-   			{
-  				$error++;
-  				setEventMessages('Failed to write file '.$filemanifestjson, null, 'errors');
-  			}
+       		// README.md file
+       		$readmecontent ='';
+
+       		/*$readmecontent.= "<?php // BEGIN PHP\n";
+       		$readmecontent.= '$websitekey=basename(__DIR__);'."\n";
+       		$readmecontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
+       		$readmecontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+       		$readmecontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+       		$readmecontent.= "ob_start();\n";
+       		$readmecontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+       		$readmecontent.= "header('Content-type: application/manifest+json');\n";
+       		$readmecontent.= "// END PHP ?>\n";*/
+
+       		$readmecontent.= trim(GETPOST('WEBSITE_README', 'none'))."\n";
+
+       		/*$readmecontent.= '<?php // BEGIN PHP'."\n";
+       		$readmecontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
+       		$readmecontent.= "// END PHP ?>"."\n";*/
+
+       		$result = dolSaveReadme($filereadme, $readmecontent);
+       		if (! $result)
+       		{
+       			$error++;
+       			setEventMessages('Failed to write file '.$filereadme, null, 'errors');
+       		}
 
 
     		// Message if no error
@@ -1371,8 +1393,11 @@ if ($action == 'updatemeta')
 			{
 				foreach($tmpaltaliases as $tmpaliasalt)
 				{
-					$result=dolSavePageAlias($pathofwebsite.'/'.trim($tmpaliasalt).'.php', $object, $objectpage);
-					if (! $result) setEventMessages('Failed to write file '.$pathofwebsite.'/'.trim($tmpaliasalt).'.php', null, 'errors');
+					if (trim($tmpaliasalt))
+					{
+						$result=dolSavePageAlias($pathofwebsite.'/'.trim($tmpaliasalt).'.php', $object, $objectpage);
+						if (! $result) setEventMessages('Failed to write file '.$pathofwebsite.'/'.trim($tmpaliasalt).'.php', null, 'errors');
+					}
 				}
 			}
 		}
@@ -1674,6 +1699,11 @@ if ($action == 'exportsite')
 		readfile($fileofzip);
 		exit;
 	}
+	else
+	{
+		setEventMessages($object->error, $object->errors, 'errors');
+		$action = '';
+	}
 }
 
 // Import site
@@ -1927,27 +1957,27 @@ if (! GETPOST('hide_websitemenu'))
 
 		print ' &nbsp; ';
 
-		print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditCss")).'" name="editcss">';
+		print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditCss")).'" name="editcss">';
 
 		if (! $atleastonepage)
 		{
-			print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("ImportSite")).'" name="importsite">';
+			print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("ImportSite")).'" name="importsite">';
 		}
 		else
 		{
-			print '<input type="submit" class="button nobordertransp" disabled="disabled" value="'.dol_escape_htmltag($langs->trans("ImportSite")).'" name="importsite">';
+			print '<input type="submit" class="button bordertransp" disabled="disabled" value="'.dol_escape_htmltag($langs->trans("ImportSite")).'" name="importsite">';
 		}
 
 		//print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditMenu")).'" name="editmenu">';
-		print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("CloneSite")).'" name="createfromclone">';
-		print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("ExportSite")).'" name="exportsite">';
+		print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("ExportSite")).'" name="exportsite">';
+		print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("CloneSite")).'" name="createfromclone">';
 
-		print '<input type="submit" class="buttonDelete" name="deletesite" value="'.$langs->trans("Delete").'"'.($atleastonepage?' disabled="disabled"':'').'>';
+		print '<input type="submit" class="buttonDelete bordertransp" name="deletesite" value="'.$langs->trans("Delete").'"'.($atleastonepage?' disabled="disabled"':'').'>';
 
 		print ' &nbsp; ';
 
-		print '<a href="'.$_SERVER["PHP_SEFL"].'?action=file_manager&website='.$website->ref.'" class="button nobordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("MediaFiles")).'"><span class="fa fa-image"><span></a>';
-		//print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("MediaFiles")).'" name="file_manager">';
+		print '<a href="'.$_SERVER["PHP_SEFL"].'?action=file_manager&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("MediaFiles")).'"><span class="fa fa-image"><span></a>';
+		//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("MediaFiles")).'" name="file_manager">';
 		/*print '<a class="button button_file_manager"'.$disabled.'>'.dol_escape_htmltag($langs->trans("MediaFiles")).'</a>';
 		print '<script language="javascript">
 			jQuery(document).ready(function () {
@@ -1966,7 +1996,7 @@ if (! GETPOST('hide_websitemenu'))
 			</script>';
 		*/
 
-		print '<a href="'.$_SERVER["PHP_SEFL"].'?action=replacesite&website='.$website->ref.'" class="button nobordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("ReplaceWebsiteContent")).'"><span class="fa fa-file-code"><span></a>';
+		print '<a href="'.$_SERVER["PHP_SEFL"].'?action=replacesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("ReplaceWebsiteContent")).'"><span class="fa fa-file-code"><span></a>';
 	}
 
 	print '</div>';
@@ -2011,6 +2041,9 @@ if (! GETPOST('hide_websitemenu'))
     		$htmltext.='<br>';
     		$htmltext.='<br>';
     		$htmltext.=$langs->trans("YouCanAlsoTestWithPHPS", $dataroot);
+    		$htmltext.='<br>';
+    		$htmltext.='<br>';
+    		$htmltext.=$langs->trans("YouCanAlsoDeployToAnotherWHP");
 		}
 		print $form->textwithpicto($linktotestonwebserver, $htmltext, 1, 'none', 'valignmiddle', 0, 2, 'helpvirtualhost');
 		print '</div>';
@@ -2198,17 +2231,63 @@ if (! GETPOST('hide_websitemenu'))
 
 				print ' &nbsp; ';
 
-				print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditPageMeta")).'" name="editmeta">';
+				print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditPageMeta")).'" name="editmeta">';
 
-				print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditHTMLSource")).'" name="editsource">';
+				print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditHTMLSource")).'" name="editsource">';
 
 				print '<!-- button EditInLine and ShowSubcontainers -->'."\n";
 				print '<div class="websiteselectionsection inline-block">';
 				print '<div class="inline-block">';
+
+				print '<span id="switchckeditorinline">';
+				print '<script type="text/javascript">
+						$(document).ready(function() {
+							var isEditingEnabled = '.($conf->global->WEBSITE_EDITINLINE?'true':'false').';
+							if (isEditingEnabled)
+							{
+								switchEditorOnline(true);
+							}
+
+							$( "#switchckeditorinline" ).click(function() {
+								switchEditorOnline();
+							});
+
+							function switchEditorOnline(forceenable)
+							{
+								if (! isEditingEnabled || forceenable)
+								{
+									console.log("Enable inline edit");
+									jQuery(\'section[contenteditable="true"]\').each(function(idx){
+										var idtouse = $(this).attr(\'id\');
+										console.log("Enable inline edit for "+idtouse);
+										CKEDITOR.inline(idtouse, {
+											// Allow some non-standard markup that we used in the introduction.
+											extraAllowedContent: \'span(*);cite(*);q(*);dl(*);dt(*);dd(*);ul(*);li(*);header(*);button(*);h1(*);h2(*);\',
+											removePlugins: \'stylescombo\',
+											// Show toolbar on startup (optional).
+											// startupFocus: true
+										});
+									})
+
+									isEditingEnabled = true;
+								}
+								else {
+									console.log("Disable inline edit");
+									for(name in CKEDITOR.instances)
+									{
+									    CKEDITOR.instances[name].destroy(true);
+									}
+									isEditingEnabled = false;
+								}
+							};
+						});
+						</script>';
 				print $langs->trans("EditInLine");
+				print '</span>';
+
 				if ($websitepage->grabbed_from)
 				{
-					//print '<input type="submit" class="button nobordertransp" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("OnlyEditionOfSourceForGrabbedContent")).'" value="'.dol_escape_htmltag($langs->trans("EditWithEditor")).'" name="editcontent">';
+					//print '<input type="submit" class="button bordertransp" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("OnlyEditionOfSourceForGrabbedContent")).'" value="'.dol_escape_htmltag($langs->trans("EditWithEditor")).'" name="editcontent">';
 					print '<a class="button nobordertransp opacitymedium nohoverborder"'.$disabled.' href="#" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("OnlyEditionOfSourceForGrabbedContent")).'">'.img_picto($langs->trans("OnlyEditionOfSourceForGrabbedContent"), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
 				}
 				else
@@ -2223,6 +2302,7 @@ if (! GETPOST('hide_websitemenu'))
 						print '<a class="button nobordertransp nohoverborder"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=unseteditinline">'.img_picto($langs->trans("EditInLineOn"), 'switch_on', '', false, 0, 0, '', 'nomarginleft').'</a>';
 					}
 				}
+
 				print '</div>';
 				print '<div class="inline-block">';
 				print $langs->trans("ShowSubcontainers");
@@ -2248,17 +2328,17 @@ if (! GETPOST('hide_websitemenu'))
 				if ($object->fk_default_home > 0 && $pageid == $object->fk_default_home)
 				{
 					//$disabled=' disabled="disabled"';
-					//print '<span class="button nobordertransp disabled"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home"></span></span>';
-					print '<input type="submit" class="button nobordertransp" disabled="disabled" value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
+					//print '<span class="button bordertransp disabled"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home"></span></span>';
+					print '<input type="submit" class="button bordertransp" disabled="disabled" value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
 				}
 				else
 				{
 					//$disabled='';
-					//print '<a href="'.$_SERVER["PHP_SEFL"].'?action=setashome&website='.$website->ref.'" class="button nobordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home"><span></a>';
-					print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
+					//print '<a href="'.$_SERVER["PHP_SEFL"].'?action=setashome&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home"><span></a>';
+					print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
 				}
-				print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("ClonePage")).'" name="createpagefromclone">';
-				print '<input type="submit" class="buttonDelete" name="delete" value="'.$langs->trans("Delete").'"'.($atleastonepage?'':' disabled="disabled"').'>';
+				print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("ClonePage")).'" name="createpagefromclone">';
+				print '<input type="submit" class="buttonDelete bordertransp" name="delete" value="'.$langs->trans("Delete").'"'.($atleastonepage?'':' disabled="disabled"').'>';
 			}
 		}
 
@@ -2316,7 +2396,8 @@ if (! GETPOST('hide_websitemenu'))
             }
             else
             {
-                print $form->textwithpicto($langs->trans("SyntaxHelp"), $htmltext, 1, 'help', 'inline-block', 1, 2, 'tooltipsubstitution');
+            	//img_help(($tooltiptrigger != '' ? 2 : 1), $alt)
+            	print $form->textwithpicto($langs->trans("SyntaxHelp").' '.img_help(2, $langs->trans("SyntaxHelp")), $htmltext, 1, 'none', 'inline-block', 1, 2, 'tooltipsubstitution');
             }
 		}
 		print '</div>';	// end websitehelp
@@ -2488,6 +2569,21 @@ if ($action == 'editcss')
 		//$manifestjsoncontent.="";
 	}
 
+	if (GETPOST('editcss', 'alpha') || GETPOST('refreshpage', 'alpha'))
+	{
+		$readmecontent = @file_get_contents($filereadme);
+		// Clean the readme file to remove php code and get only html part
+		$readmecontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $readmecontent);
+	}
+	else
+	{
+		$readmecontent = GETPOST('WEBSITE_README');
+	}
+	if (! trim($readmecontent))
+	{
+		//$readmecontent.="";
+	}
+
 	dol_fiche_head();
 
 	print '<!-- Edit CSS -->'."\n";
@@ -2516,7 +2612,8 @@ if ($action == 'editcss')
 
 	// CSS file
 	print '<tr><td class="tdtop">';
-	print $langs->trans('WEBSITE_CSS_INLINE');
+	$htmlhelp=$langs->trans("CSSContentTooltipHelp");
+	print $form->textwithpicto($langs->trans('WEBSITE_CSS_INLINE'), $htmlhelp, 1, 'help', '', 0, 2, 'csstooltip');
 	print '</td><td>';
 
 	$doleditor=new DolEditor('WEBSITE_CSS_INLINE', $csscontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
@@ -2536,9 +2633,12 @@ if ($action == 'editcss')
 
 	// Common HTML header
 	print '<tr><td class="tdtop">';
+	print $langs->trans('WEBSITE_HTML_HEADER');
 	$htmlhelp=$langs->trans("Example").' :<br>';
 	$htmlhelp.=dol_htmlentitiesbr($htmlheadercontentdefault);
-	print $form->textwithpicto($langs->trans('WEBSITE_HTML_HEADER'), $htmlhelp, 1, 'help', '', 0, 2, 'htmlheadertooltip');
+	$textwithhelp = $form->textwithpicto('', $htmlhelp, 1, 'help', '', 0, 2, 'htmlheadertooltip');
+	$htmlhelp2=$langs->trans("LinkAndScriptsHereAreNotLoadedInEditor").'<br>';
+	print $form->textwithpicto($textwithhelp, $htmlhelp2, 1, 'warning', '', 0, 2, 'htmlheadertooltip2');
 	print '</td><td>';
 
 	$doleditor=new DolEditor('WEBSITE_HTML_HEADER', $htmlheadercontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
@@ -2578,6 +2678,17 @@ if ($action == 'editcss')
 
 	print '</td></tr>';
 
+	// README.md
+	print '<tr><td class="tdtop">';
+	$htmlhelp=$langs->trans("EnterHereLicenseInformation");
+	print $form->textwithpicto($langs->trans('WEBSITE_README'), $htmlhelp, 1, 'help', '', 0, 2, 'readmetooltip');
+	print '</td><td>';
+
+	$doleditor=new DolEditor('WEBSITE_README', $readmecontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
+	print $doleditor->Create(1, '', true, $langs->trans("File").' README.md', 'text');
+
+	print '</td></tr>';
+
 	print '</table>';
 
 	dol_fiche_end();
@@ -2819,7 +2930,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 		print '<tr><td class="titlefield fieldrequired">';
 		print $langs->trans('WEBSITE_PAGE_EXAMPLE');
 		print '</td><td>';
-		print $formwebsite->selectSampleOfContainer('sample', (GETPOST('sample', 'alpha')?GETPOST('sample', 'alpha'):'corporatehomepage'));
+		print $formwebsite->selectSampleOfContainer('sample', (GETPOSTISSET('sample')?GETPOST('sample', 'alpha'):'empty'));
 		print '</td></tr>';
 	}
 
@@ -2924,7 +3035,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	if ($action != 'createcontainer')
 	{
 	    print '<tr><td>';
-	    print $langs->trans('LastModificationAuthor');
+	    print $langs->trans('UserModif');
 	    print '</td><td>';
 	    if ($pageusermodifid > 0)
 	    {
@@ -2969,7 +3080,10 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 				jQuery("#WEBSITE_TITLE").keyup(function() {
 					if (disableautofillofalias == 0)
 					{
-						var valnospecial = jQuery("#WEBSITE_TITLE").val().replace(/[^\w]/gi, \'-\').toLowerCase();
+						var valnospecial = jQuery("#WEBSITE_TITLE").val();
+						valnospecial = valnospecial.replace(/[éèê]/g, \'e\').replace(/[à]/g, \'a\').replace(/[ù]/g, \'u\').replace(/[î]/g, \'i\');
+						valnospecial = valnospecial.replace(/[ç]/g, \'c\').replace(/[ö]/g, \'o\');
+						valnospecial = valnospecial.replace(/[^\w]/gi, \'-\').toLowerCase();
 						valnospecial = valnospecial.replace(/\-+/g, \'-\').replace(/\-$/, \'\');
 						console.log("disableautofillofalias=0 so we replace WEBSITE_TITLE with "+valnospecial);
 						jQuery("#WEBSITE_PAGENAME").val(valnospecial);
@@ -3057,9 +3171,10 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm')
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="replacesiteconfirm">';
+	print '<input type="hidden" name="website" value="'.$website->ref.'">';
 
 
-	print '<!-- Edit Media -->'."\n";
+	print '<!-- Replace string -->'."\n";
 	print '<div class="fiche"><br>';
 
 	print load_fiche_titre($langs->trans("ReplaceWebsiteContent"));
@@ -3141,6 +3256,7 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
 
 		// Ouput page under the Dolibarr top menu
 		$objectpage->fetch($pageid);
+
 		$jscontent = @file_get_contents($filejs);
 
 		$out = '<!-- Page content '.$filetpl.' : Div with (Htmlheader/Style of page from database + CSS Of website from file + Page content from database or by include if WEBSITE_SUBCONTAINERSINLINE is on) -->'."\n";
@@ -3155,6 +3271,25 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
 		$out.="\n<html><head>\n";
 		$out.="<!-- htmlheader/style of page from database -->\n";
 		$out.=dolWebsiteReplacementOfLinks($object, $objectpage->htmlheader, 1, 'htmlheader');
+
+		$out.="<!-- htmlheader/style of website from files -->\n";
+		// TODO Keep only the <link> or the <script> tags
+		/*
+		$htmlheadercontent = @file_get_contents($filehtmlheader);
+		$dom = new DOMDocument;
+		@$dom->loadHTML($htmlheadercontent);
+		$styles = $dom->getElementsByTagName('link');
+		$scripts = $dom->getElementsByTagName('script');
+		foreach($styles as $stylescursor)
+		{
+			$out.=$stylescursor;
+		}
+		foreach($scripts as $scriptscursor)
+		{
+			$out.=$scriptscursor;
+		}
+		*/
+
 		$out.="</head>\n";
 		$out.="\n<body>";
 
@@ -3219,7 +3354,7 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
 		{
 			// Keep the contenteditable="true" when mode Edit Inline is on
 		}
-		$out.=dolWebsiteReplacementOfLinks($object, $newcontent)."\n";
+		$out.=dolWebsiteReplacementOfLinks($object, $newcontent, 0, 'html', $objectpage->id)."\n";
 		//$out.=$newcontent;
 
 		$out.='</div>';
diff --git a/htdocs/website/samples/page-sample-corporatehome.html b/htdocs/website/samples/page-sample-corporatehome.html
deleted file mode 100644
index a6e4e64c871..00000000000
--- a/htdocs/website/samples/page-sample-corporatehome.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="dolcontenteditable" contenteditable="true">
-<div style="text-align: center"><h1>__[MAIN_INFO_SOCIETE_NOM]__</h1><br>
-__(MyContainerTitle)__
-</div>
-</div>
-<div class="dolcontenteditable" contenteditable="true">
-<br>
-<div style="text-align: center">__(AnotherContainer)__</div>
-<br>
-</div>
-<div class="dolcontenteditable" contenteditable="true">
-<br>
-<div style="text-align: center">__WEBSITE_CREATE_BY__</div>
-<br>
-</div>
\ No newline at end of file
diff --git a/htdocs/website/samples/page-sample-dynamiccontent.html b/htdocs/website/samples/page-sample-dynamiccontent.html
new file mode 100644
index 00000000000..b2dd5acaea4
--- /dev/null
+++ b/htdocs/website/samples/page-sample-dynamiccontent.html
@@ -0,0 +1,98 @@
+<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable="true" if you want to use the inline editor for the content  -->
+<section id="div1" class="dolcontenteditable" style="text-align: center" contenteditable="true">
+<br>
+__(MyContainerTitle)__
+<br><br>
+</section>
+
+
+<section id="divmycompany" style="text-align: center" contenteditable="true">
+This is example of dynamic content to get the name of your company (see source of page to see code):<br>
+</section>
+<h1 style="text-align: center" >
+<?php echo $mysoc->name; ?>
+<br>
+</h1>
+
+
+<section id="divmetadata" style="text-align: center" contenteditable="true">
+This is another example of dynamic content to get meta data of a container/page (see source of page to see code):<br>
+</section>
+<div style="text-align: center">
+__(Title)__ : <?php echo $websitepage->title; ?><br>
+__(Description)__ : <?php echo $websitepage->description; ?><br>
+__(Keywords)__ : <?php echo $websitepage->keywords; ?><br>
+__(DateCreation)__ : <?php echo dol_print_date($websitepage->date_creation, 'dayhour', $weblangs); ?><br>
+<br>
+</div>
+
+
+<section id="divinclude" style="text-align: center" contenteditable="true">
+__(AnotherContainer)__
+</section>
+<div style="text-align: center">
+<?php includeContainer('alias_of_container_to_include'); ?>
+</div>
+
+
+<section id="div5" style="text-align: center" contenteditable="true">
+<br><br>
+__(YouCanEditHtmlSource)__
+<br><br>
+Page created by __WEBSITE_CREATE_BY__
+<br>
+</section>
+
+
+
+<!-- Blog list -->
+<section id="sectionnews" contenteditable="true" class="main section-50 section-md-50 section-md-bottom-50">
+This is an example of a section to show the list of latest 5 articles (container with type "blogpost"), that contains the keyword "mykeyword"...<br>
+
+	<h2>Latest Blog posts</h2>
+    <div class="center">
+    <?php 
+            $keyword = 'mykeyword';
+            $weblangs->loadLangs(array("main"));
+            $websitepage = new WebsitePage($db);
+            $fuser = new User($db);
+            $arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', 5, 0, array('type_container'=>'blogpost', 'keywords'=>$keyword));
+            if (is_numeric($arrayofblogs) && $arrayofblogs < 0)
+            {
+                print '<div class="error">'.$weblangs->trans($websitepage->error).'</div>';
+            }
+            elseif (is_array($arrayofblogs) && ! empty($arrayofblogs))
+            {
+                foreach($arrayofblogs as $blog)
+                {
+                    print '<div class="row justify-content-sm-center row-40">';
+                    print '<div class="container blog-box centpercent" style="padding: 20px; transition: .3s all ease;">';
+                                print '<a href="'.$blog->pageurl.'.php">';
+                                print '<div class="post-boxed-img-wrap"><img src="'.($blog->image ? 'viewimage.php?modulepart=medias&file='.$blog->image : 'medias/image/'.$website->ref.'/calendar.svg"').'" alt="" width="120"></div>';
+                                print '<div class="post-boxed-caption">';
+                                print '<div class="post-boxed-title font-weight-bold">'.$blog->title.'</div>';
+                                print '<ul class="list-inline list-inline-dashed text-uppercase">';
+                                print '<li>'.dol_print_date($blog->date_creation, 'daytext', 'tzserver', $weblangs).'</li>';
+                                $fuser->fetch($blog->fk_user_creat);
+                                print '<li><span>by<span> <span class="text-primary">'.($fuser->firstname?$fuser->firstname:$fuser->login).'</span></span></li>';
+                                print '</ul>';
+                                print '</div>';
+                                //includeContainer($blog->pageurl);
+                                print '<span class="nohover">'.$blog->description.'</span>';
+                                print '</a>';
+                    print '</div>';
+                    print '</div>';
+                }
+            }
+            else
+            {
+                    print '<div class="row justify-content-sm-center row-40">';
+                    print '<div class="container blog-box centpercent" style="padding: 20px; transition: .3s all ease;">';
+                    print $weblangs->trans("NoArticlesFoundForTheKeyword", $keyword);
+                    print '</div>';
+                    print '</div>';
+                
+            }
+    ?>
+    </div>
+</section>
\ No newline at end of file
diff --git a/htdocs/website/samples/page-sample-empty.html b/htdocs/website/samples/page-sample-empty.html
index f8dac27cdb2..d68e73870d9 100644
--- a/htdocs/website/samples/page-sample-empty.html
+++ b/htdocs/website/samples/page-sample-empty.html
@@ -1,3 +1,3 @@
-<!-- At least 2 div required to avoid ckeditor to insert a p -->
-<div class="dolcontenteditable" contenteditable="true"><div>
-</div></div>
+<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable="true" if you want to use the inline editor for the content  -->
+<section id="mysection1" contenteditable="true">
+</section>