From 7f5933adbc9f839d7f5be7a7df002743fed3357c Mon Sep 17 00:00:00 2001
From: atm-quentin <quentin.vial-gouteyron@atm-consulting.fr>
Date: Wed, 23 Oct 2019 15:57:56 +0200
Subject: [PATCH 01/38] FIX shipping extrafields line

---
 htdocs/expedition/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index e24198b9920..be5ed4c757a 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -306,7 +306,7 @@ if (empty($reshook))
 
 			// Extrafields
 			$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-            $array_options[$i] = $extrafieldsline->getOptionalsFromPost($extralabelsline, $i);
+            $array_options[$i] = $extrafieldsline->getOptionalsFromPost($object->table_element_line, $i);
 			// Unset extrafield
 			if (is_array($extralabelsline)) {
 				// Get extra fields
@@ -632,7 +632,7 @@ if (empty($reshook))
 				// Extrafields Lines
 				$extrafieldsline = new ExtraFields($db);
 				$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
-				$line->array_options = $extrafieldsline->getOptionalsFromPost($extralabelsline);
+				$line->array_options = $extrafieldsline->getOptionalsFromPost($object->table_element_line);
 				// Unset extrafield POST Data
 				if (is_array($extralabelsline)) {
 					foreach ($extralabelsline as $key => $value) {

From dae475bac1164e09882664c6b1596c0e16121c95 Mon Sep 17 00:00:00 2001
From: com4WEB <42214196+com4WEB@users.noreply.github.com>
Date: Tue, 29 Oct 2019 12:37:08 +0100
Subject: [PATCH 02/38] Update ChangeLog

some text erros in changelog
---
 ChangeLog | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c430b258cda..9cb2225cd08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,7 +22,6 @@ FIX: Clean the + of categories on the product view only in POS module
 FIX: access to public interface when origin email has an alias.
 FIX: Alias name is not into the email recipient label.
 FIX: allow standalone credit note even if no invoice
-FIX: an admin can not access his own permissions after enabling advanced
 FIX: an admin can not access his own permissions after enabling advanced permissions
 FIX: Attachement of linked files on ticket when sending a message
 FIX: avoid non numeric warning
@@ -91,17 +90,17 @@ FIX: #11752
 FIX: #11789 FIX: #11790
 FIX: #11804 list of tickets from a customer card display ALL tickets
 FIX: #11834
-FIX: Add char $ and ; in sanitizing of filenames.
-FIX: Add comment before protected functions
-FIX: Add log and type of content in dolWebsiteOutput and
-FIX: Add repair.php option 'restore' to restore user picture after v10
+FIX: add char $ and ; in sanitizing of filenames
+FIX: add comment before protected functions
+FIX: add log and type of content in dolWebsiteOutput and
+FIX: add repair.php option 'restore' to restore user picture after v10
 FIX: amount opened on thirdparty card dont care of credit note not converted
-FIX: Api of documents work with value 'thirdparty'
+FIX: API of documents work with value 'thirdparty'
 FIX: author in message / ticket API
-FIX: avoid sql error if fk_project is empty during update
+FIX: avoid SQL error if fk_project is empty during update
 FIX: avoid Warning: A non-numeric value encountered
-FIX: bad consistency in list of invoice for direct debit order.
-FIX: Bad error management in zip compress and web site export
+FIX: bad consistency in list of invoice for direct debit order
+FIX: bad error management in zip compress and web site export
 FIX: bad substitution for extrafields type checkbox
 FIX: better help message with multicompany
 FIX: calculation of $products_dispatched
@@ -110,11 +109,11 @@ FIX: Can't delete a draft leave even if it should
 FIX: Can't save setup of mailman module
 FIX: column jabberid missing
 FIX: Confirmation of deletion
-FIX: Consistency in direct debit order lists.
+FIX: Consistency in direct debit order lists
 FIX: Content send before header warning
 FIX: credit note can be split
 FIX: credit note used on list
-FIX: Css was saved on wrong website.
+FIX: CSS was saved on wrong website
 FIX: delivery extrafields
 FIX: Disabling a website does not put it offline
 FIX: display only stripe sources for customer
@@ -131,13 +130,13 @@ FIX: Fatal situation if payment removed on expense report. Action
 FIX: filepath of generated documents doesn't handle products with special characters
 FIX: for MAIN_MAXTABS_IN_CARD = $i card
 FIX: gzip and bzip2 must use option -f
-FIX: It was possible to create cashfence without entering data.
+FIX: it was possible to create cashfence without entering data
 FIX: javascript error when using dol_use_jmobile=1
 FIX: logout redirect to takepos.php
 FIX: Look and feel v10
 FIX: Make protected all pfd models functions
 FIX: management of extrafields in modulebuilder
-FIX: Missing div for buttons in tax, loan, various payment modules
+FIX: missing div for buttons in tax, loan, various payment modules
 FIX: missing include (dol_convert_file not found)
 FIX: Missing some replacements in website module
 FIX: missing test on permission on button to delete ledger record
@@ -161,13 +160,13 @@ FIX: Return code of pdf_einstein.modules.php and proformat
 FIX: round for application fee in stripe
 FIX: Sens of the balance (Debit - Credit in accountancy not contrary)
 FIX: Several pb in export of documents
-FIX: SQL syntax error and CSRF check on vat reports
+FIX: SQL syntax error and CSRF check on VAT reports
 FIX: takepos layout clear or focus search
-FIX: too many record in sql request. Whena criteria is a filter, we must
+FIX: too many record in sql request. When a criteria is a filter, we must
 FIX: Translation of month
 FIX: USEDOLIBARREDITOR not always set
 FIX: VAT number for Monaco (it uses FR)
-FIX: vulenrability in uploading file found by 美创科技安全实验室
+FIX: vulnerability in uploading file found by 美创科技安全实验室
 FIX: wrong display (and hidden input) for already dispatched quantity
 FIX: wrong parameters (same error in branch 9, 10, develop)
 FIX: Wrong variable. Must be PROJECT_HIDE_UNSELECTABLES

From db86dff7d16bd7d03ae92ae8dff0e0dfd08af55e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 29 Oct 2019 17:10:10 +0100
Subject: [PATCH 03/38] Fix sign for VAT repaid in report

---
 htdocs/compta/resultat/clientfourn.php | 10 +++++-----
 htdocs/compta/resultat/index.php       |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index efeffeb9b8c..2b74c167d83 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -1132,11 +1132,11 @@ else
 		            while ($i < $num) {
 		                $obj = $db->fetch_object($result);
 
-		                $amount += $obj->amount;
-		                $total_ht += $obj->amount;
-		                $total_ttc += $obj->amount;
-		                $subtotal_ht += $obj->amount;
-		                $subtotal_ttc += $obj->amount;
+		                $amount += -$obj->amount;
+		                $total_ht += -$obj->amount;
+		                $total_ttc += -$obj->amount;
+		                $subtotal_ht += -$obj->amount;
+		                $subtotal_ttc += -$obj->amount;
 
 		                $i++;
 		            }
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 70129e80403..d12587eea6e 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -480,10 +480,10 @@ if (! empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modeco
 					$obj = $db->fetch_object($result);
 
 					if (! isset($encaiss[$obj->dm])) $encaiss[$obj->dm]=0;
-					$encaiss[$obj->dm] += $obj->amount;
+					$encaiss[$obj->dm] += -$obj->amount;
 
 					if (! isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm]=0;
-					$encaiss_ttc[$obj->dm] += $obj->amount;
+					$encaiss_ttc[$obj->dm] +=-$obj->amount;
 
 					$i++;
 				}

From 8849cd9897a0cface1198a6108c12820b75b3ad0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Oct 2019 02:19:32 +0100
Subject: [PATCH 04/38] Update index.php

---
 htdocs/compta/resultat/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index d12587eea6e..d40f00a9c42 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -483,7 +483,7 @@ if (! empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modeco
 					$encaiss[$obj->dm] += -$obj->amount;
 
 					if (! isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm]=0;
-					$encaiss_ttc[$obj->dm] +=-$obj->amount;
+					$encaiss_ttc[$obj->dm] += -$obj->amount;
 
 					$i++;
 				}

From 15d0d6e2717006575d14a70bad970725eb50dea0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 30 Oct 2019 02:39:51 +0100
Subject: [PATCH 05/38] FIX #12258

---
 htdocs/contact/card.php                | 12 ++++++------
 htdocs/contact/class/contact.class.php |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index aaf1cd0a2b9..12e7db0f2b4 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -179,7 +179,7 @@ if (empty($reshook))
         $object->socid			= GETPOST("socid", 'int');
         $object->lastname		= GETPOST("lastname", 'alpha');
         $object->firstname		= GETPOST("firstname", 'alpha');
-		$object->civility_id	= GETPOST("civility_id", 'alpha');
+		$object->civility_code	= GETPOST("civility_code", 'alpha');
         $object->poste			= GETPOST("poste", 'alpha');
         $object->address		= GETPOST("address", 'alpha');
         $object->zip			= GETPOST("zipcode", 'alpha');
@@ -366,7 +366,7 @@ if (empty($reshook))
             $object->socid			= GETPOST("socid", 'int');
             $object->lastname		= GETPOST("lastname", 'alpha');
             $object->firstname		= GETPOST("firstname", 'alpha');
-            $object->civility_id	= GETPOST("civility_id", 'alpha');
+            $object->civility_code	= GETPOST("civility_code", 'alpha');
             $object->poste			= GETPOST("poste", 'alpha');
 
             $object->address		= GETPOST("address", 'alpha');
@@ -619,8 +619,8 @@ else
             }
 
             // Civility
-            print '<tr><td><label for="civility_id">'.$langs->trans("UserTitle").'</label></td><td colspan="3">';
-            print $formcompany->select_civility(GETPOST("civility", 'alpha')?GETPOST("civility", 'alpha'):$object->civility_code);
+            print '<tr><td><label for="civility_code">'.$langs->trans("UserTitle").'</label></td><td colspan="3">';
+            print $formcompany->select_civility(GETPOSTISSET("civility_code")?GETPOST("civility_code", 'alpha'):$object->civility_code, 'civility_code');
             print '</td></tr>';
 
             print '<tr><td><label for="title">'.$langs->trans("PostOrFunction").'</label></td>';
@@ -918,8 +918,8 @@ else
             }
 
             // Civility
-            print '<tr><td><label for="civility_id">'.$langs->trans("UserTitle").'</label></td><td colspan="3">';
-            print $formcompany->select_civility(isset($_POST["civility"])?GETPOST("civility"):$object->civility_code);
+            print '<tr><td><label for="civility_code">'.$langs->trans("UserTitle").'</label></td><td colspan="3">';
+            print $formcompany->select_civility(GETPOSTISSET("civility_code")?GETPOST("civility", "aZ09"):$object->civility_code, 'civility_code');
             print '</td></tr>';
 
             print '<tr><td><label for="title">'.$langs->trans("PostOrFunction").'</label></td>';
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index eb25d0ad712..109b6298499 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -325,13 +325,13 @@ class Contact extends CommonObject
 		$this->town=(empty($this->town)?'':$this->town);
 		$this->country_id=($this->country_id > 0?$this->country_id:$this->country_id);
 		if (empty($this->statut)) $this->statut = 0;
-
+		if (empty($this->civility_code) && ! is_numeric($this->civility_id)) $this->civility_code = $this->civility_id;   // For backward compatibility
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET ";
 		if ($this->socid > 0) $sql .= " fk_soc='".$this->db->escape($this->socid)."',";
 		elseif ($this->socid == -1) $sql .= " fk_soc=null,";
-		$sql .= "  civility='".$this->db->escape($this->civility_id)."'";
+		$sql .= "  civility='".$this->db->escape($this->civility_code)."'";
 		$sql .= ", lastname='".$this->db->escape($this->lastname)."'";
 		$sql .= ", firstname='".$this->db->escape($this->firstname)."'";
 		$sql .= ", address='".$this->db->escape($this->address)."'";

From bc2a949bab5aae13a21eb915772c23f17017dbc3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Oct 2019 16:47:27 +0100
Subject: [PATCH 06/38] New Add option to disable idempotency when using Stripe
 payments.

---
 htdocs/public/payment/newpayment.php |  8 ++++++--
 htdocs/stripe/class/stripe.class.php | 25 ++++++++++++++-----------
 htdocs/stripe/config.php             |  2 +-
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 067c371bf67..4a3d08f6602 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1725,6 +1725,7 @@ if ($action != 'dopayment')
 			{
 				// If STRIPE_PICTO_FOR_PAYMENT is 'cb' we show a picto of a crdit card instead of stripe
 				print '<br><div class="button buttonpayment" id="div_dopayment_stripe"><span class="fa fa-credit-card"></span> <input class="" type="submit" id="dopayment_stripe" name="dopayment_stripe" value="'.$langs->trans("StripeDoPayment").'">';
+				print '<input type="hidden" name="noidempotency" value="'.GETPOST('noidempotency', 'int').'">';
 				print '<br>';
 				print '<span class="buttonpaymentsmall">'.$langs->trans("CreditOrDebitCard").'</span>';
 				print '</div>';
@@ -1858,12 +1859,12 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 
 			$service = 'StripeLive';
 			$servicestatus = 1;
-
 			if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))
 			{
 				$service = 'StripeTest';
 				$servicestatus = 0;
 			}
+
 			$stripe = new Stripe($db);
 			$stripeacc = $stripe->getStripeAccount($service);
 			$stripecu = null;
@@ -1871,7 +1872,10 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 
 			if (! empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
 			{
-				$paymentintent=$stripe->getPaymentIntent($amount, $currency, $tag, 'Stripe payment: '.$fulltag.(is_object($object)?' ref='.$object->ref:''), $object, $stripecu, $stripeacc, $servicestatus);
+				$noidempotency_key = (GETPOSTISSET('noidempotency') ? GETPOST('noidempotency', 'int') : 0);	// By default noidempotency is unset, so we must use a different tag/ref for each payment. If set, we can pay several times the same tag/ref.
+				$paymentintent=$stripe->getPaymentIntent($amount, $currency, $tag, 'Stripe payment: '.$fulltag.(is_object($object)?' ref='.$object->ref:''), $object, $stripecu, $stripeacc, $servicestatus, 0, 'automatic', false, null, 0, $noidempotency_key);
+				// The paymentintnent has status 'requires_payment_method' (even if paymentintent was already payed)
+				//var_dump($paymentintent);
 				if ($stripe->error) setEventMessages($stripe->error, null, 'errors');
 			}
 		}
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 021a9fac1f9..c30e3169ee5 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -318,9 +318,10 @@ class Stripe extends CommonObject
 	 * @param   boolean $confirmnow                         false=default, true=try to confirm immediatly after create (if conditions are ok)
 	 * @param   string  $payment_method                     'pm_....' (if known)
 	 * @param   string  $off_session                        If we use an already known payment method to pay off line.
+	 * @param	string	$noidempotency_key					Do not use the idempotency_key when creating the PaymentIntent
 	 * @return 	\Stripe\PaymentIntent|null 			        Stripe PaymentIntent or null if not found and failed to create
 	 */
-	public function getPaymentIntent($amount, $currency_code, $tag, $description = '', $object = null, $customer = null, $key = null, $status = 0, $usethirdpartyemailforreceiptemail = 0, $mode = 'automatic', $confirmnow = false, $payment_method = null, $off_session = 0)
+	public function getPaymentIntent($amount, $currency_code, $tag, $description = '', $object = null, $customer = null, $key = null, $status = 0, $usethirdpartyemailforreceiptemail = 0, $mode = 'automatic', $confirmnow = false, $payment_method = null, $off_session = 0, $noidempotency_key = 0)
 	{
 		global $conf;
 
@@ -352,9 +353,10 @@ class Stripe extends CommonObject
 		if (is_object($object))
 		{
 			// Warning. If a payment was tried and failed, a payment intent was created.
-			// But if we change someting on object to pay (amount or other), reusing same payment intent is not allowed.
-			// Recommanded solution is to recreate a new payment intent each time we need one (old one will be automatically closed after a delay),
-			// that's why i comment the part of code to retreive a payment intent with object id (never mind if we cumulate payment intent with old that will not be used)
+			// But if we change someting on object to pay (amount or other that does not change the idempotency key), reusing same payment intent is not allowed.
+			// Recommanded solution is to recreate a new payment intent each time we need one (old one will be automatically closed after a delay), Stripe will
+			// automatically return the existing payment intent if idempotency is provided when we try to create the new one.
+			// That's why we can comment the part of code to retreive a payment intent with object id (never mind if we cumulate payment intent with old ones that will not be used)
 			/*
 			$sql = "SELECT pi.ext_payment_id, pi.entity, pi.fk_facture, pi.sourcetype, pi.ext_payment_site";
     		$sql.= " FROM " . MAIN_DB_PREFIX . "prelevement_facture_demande as pi";
@@ -445,14 +447,15 @@ class Stripe extends CommonObject
     			global $stripearrayofkeysbyenv;
     			\Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$status]['secret_key']);
 
-    			// Note: If all data for payment intent are same than a previous on, even if we use 'create', Stripe will return ID of the old existing payment intent.
-    			if (empty($key)) {				// If the Stripe connect account not set, we use common API usage
-    				$paymentintent = \Stripe\PaymentIntent::create($dataforintent, array("idempotency_key" => "$description"));
-    			    //$paymentintent = \Stripe\PaymentIntent::create($dataforintent, array());
-    			} else {
-    				$paymentintent = \Stripe\PaymentIntent::create($dataforintent, array("idempotency_key" => "$description", "stripe_account" => $key));
-    			    //$paymentintent = \Stripe\PaymentIntent::create($dataforintent, array("stripe_account" => $key));
+    			$arrayofoptions = array();
+    			if (empty($noidempotency_key)) {
+    				$arrayofoptions["idempotency_key"] = $description;
     			}
+    			// Note: If all data for payment intent are same than a previous on, even if we use 'create', Stripe will return ID of the old existing payment intent.
+    			if (! empty($key)) {				// If the Stripe connect account not set, we use common API usage
+    				$arrayofoptions["stripe_account"] = $key;
+    			}
+    			$paymentintent = \Stripe\PaymentIntent::create($dataforintent, $arrayofoptions);
 
     			// Store the payment intent
     			if (is_object($object))
diff --git a/htdocs/stripe/config.php b/htdocs/stripe/config.php
index 0030bdb5535..1070f605eb8 100644
--- a/htdocs/stripe/config.php
+++ b/htdocs/stripe/config.php
@@ -28,7 +28,7 @@
 require_once DOL_DOCUMENT_ROOT.'/includes/stripe/init.php';
 require_once DOL_DOCUMENT_ROOT.'/includes/stripe/lib/Stripe.php';
 
-global $stripe;
+//global $stripe;
 global $conf;
 global $stripearrayofkeysbyenv;
 

From 349175580a9a33c724c16ee1576cf64c0a0d591b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Oct 2019 16:53:55 +0100
Subject: [PATCH 07/38] Can force Stripe API version from setup

---
 htdocs/stripe/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/stripe/config.php b/htdocs/stripe/config.php
index 1070f605eb8..84766f8e206 100644
--- a/htdocs/stripe/config.php
+++ b/htdocs/stripe/config.php
@@ -55,4 +55,4 @@ else
 
 \Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']);
 \Stripe\Stripe::setAppInfo("Dolibarr Stripe", DOL_VERSION, "https://www.dolibarr.org"); // add dolibarr version
-\Stripe\Stripe::setApiVersion("2019-05-16"); // force version API
+\Stripe\Stripe::setApiVersion(empty($conf->global->STRIPE_FORCE_VERSION)?"2019-05-16":$conf->global->STRIPE_FORCE_VERSION); // force version API

From 628018ca2b8948e0d5398f806a0c98931cf6b351 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Oct 2019 17:31:45 +0100
Subject: [PATCH 08/38] css

---
 htdocs/theme/eldy/global.inc.php | 1 +
 htdocs/theme/md/style.css.php    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index ad0f68bee43..aeb1cbf70c9 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -2756,6 +2756,7 @@ table.listwithfilterbefore {
 .tagtable, .table-border { display: table; }
 .tagtr, .table-border-row  { display: table-row; }
 .tagtd, .table-border-col, .table-key-border-col, .table-val-border-col { display: table-cell; }
+.confirmquestions .tagtr .tagtd:not(:first-child)  { padding-left: 10px; }
 
 
 /* Pagination */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index df88a655280..d1a1c2025c0 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2840,6 +2840,8 @@ table.listwithfilterbefore {
 .tagtable, .table-border { display: table; }
 .tagtr, .table-border-row  { display: table-row; }
 .tagtd, .table-border-col, .table-key-border-col, .table-val-border-col { display: table-cell; }
+.confirmquestions .tagtr .tagtd:not(:first-child)  { padding-left: 10px; }
+
 
 /* Pagination */
 div.refidpadding  {

From f98df3c8077b8aeacf1e69862d4bbb029e13a0fa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Oct 2019 21:09:33 +0100
Subject: [PATCH 09/38] NEW Can edit link to the translation page in website
 module

---
 htdocs/admin/website.php                     |   2 +-
 htdocs/core/class/html.formwebsite.class.php |  74 ++++++-
 htdocs/core/lib/functions.lib.php            |   5 +-
 htdocs/langs/en_US/website.lang              |   3 +-
 htdocs/theme/eldy/global.inc.php             |   5 +
 htdocs/theme/md/style.css.php                |   6 +
 htdocs/ticket/css/styles.css.php             |   2 +-
 htdocs/website/class/website.class.php       |  54 +++---
 htdocs/website/class/websitepage.class.php   |  87 +++++----
 htdocs/website/index.php                     | 194 +++++++++----------
 10 files changed, 253 insertions(+), 179 deletions(-)

diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index 0343fecf69d..5ea6ee66dd9 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -421,7 +421,7 @@ $h++;
 dol_fiche_head($head, 'website', '', -1);
 
 
-print $langs->trans("WebsiteSetupDesc").'<br>';
+print '<span class="opacitymedium">'.$langs->trans("WebsiteSetupDesc").'</span><br>';
 print "<br>\n";
 
 
diff --git a/htdocs/core/class/html.formwebsite.class.php b/htdocs/core/class/html.formwebsite.class.php
index 6fc00605d77..12ec3e7f5ad 100644
--- a/htdocs/core/class/html.formwebsite.class.php
+++ b/htdocs/core/class/html.formwebsite.class.php
@@ -47,7 +47,7 @@ class FormWebsite
 
 
     /**
-     *    Return HTML select list of export models
+     *    Return HTML select list of websites
      *
      *    @param    string	$selected          Id modele pre-selectionne
      *    @param    string	$htmlname          Name of HTML select
@@ -99,7 +99,7 @@ class FormWebsite
 
 
     /**
-     *  Return a HTML select list of a dictionary
+     *  Return a HTML select list of type of containers from the dictionary
      *
      *  @param  string	$htmlname          	Name of select zone
      *  @param	string	$selected			Selected value
@@ -162,7 +162,7 @@ class FormWebsite
 
 
     /**
-     *  Return a HTML select list of type of containers
+     *  Return a HTML select list of samples of containers content
      *
      *  @param  string	$htmlname          	Name of select zone
      *  @param	string	$selected			Selected value
@@ -217,4 +217,72 @@ class FormWebsite
 
     	return $out;
     }
+
+
+    /**
+     *  Return a HTML select list of containers of a website.
+     *  Note: $website->lines must have been loaded.
+     *
+     *  @param  Website		$website       	Object Website
+     *  @param	string		$htmlname		Name of select zone
+     *  @param	int			$pageid			Preselected container ID
+     *  @param	int			$showempty		Show empty record
+     *  @param	string		$action			Action on page that use this select list
+     * 	@return	string						HTML select component with list of type of containers
+     */
+    public function selectContainer($website, $htmlname = 'pageid', $pageid = 0, $showempty = 0, $action = '')
+    {
+    	global $langs;
+
+    	$atleastonepage = (is_array($website->lines) && count($website->lines) > 0);
+
+	    $out='';
+	    if ($atleastonepage && $action != 'editsource')
+	    {
+	    	$out.='<select name="'.$htmlname.'" id="'.$htmlname.'" class="minwidth200 maxwidth300">';
+	    }
+	    else
+	    {
+	    	$out.='<select name="pageidbis" id="pageid" class="minwidth200 maxwidth300" disabled="disabled">';
+	    }
+
+	    if ($showempty || ! $atleastonepage) $out.='<option value="-1">&nbsp;</option>';
+
+	    if ($atleastonepage)
+	    {
+	    	if (empty($pageid) && $action != 'createcontainer')      // Page id is not defined, we try to take one
+	    	{
+	    		$firstpageid=0;$homepageid=0;
+	    		foreach($website->lines as $key => $valpage)
+	    		{
+	    			if (empty($firstpageid)) $firstpageid=$valpage->id;
+	    			if ($website->fk_default_home && $key == $website->fk_default_home) $homepageid=$valpage->id;
+	    		}
+	    		$pageid=$homepageid?$homepageid:$firstpageid;   // We choose home page and if not defined yet, we take first page
+	    	}
+
+	    	foreach($website->lines as $key => $valpage)
+	    	{
+	    		$out.='<option value="'.$key.'"';
+	    		if ($pageid > 0 && $pageid == $key) $out.=' selected';		// To preselect a value
+	    		$out.='>';
+	    		$out.='['.$valpage->type_container.' '.sprintf("%03d", $valpage->id).'] ';
+	    		$out.=$valpage->pageurl.' - '.$valpage->title;
+	    		if ($website->fk_default_home && $key == $website->fk_default_home) $out.=' ('.$langs->trans("HomePage").')';
+	    		$out.='</option>';
+	    	}
+	    }
+	    $out.='</select>';
+
+	    if ($atleastonepage && $action != 'editsource')
+	    {
+	    	$out.=ajax_combobox($htmlname);
+	    }
+	    else
+	    {
+	    	$out.='<input type="hidden" name="'.$htmlname.'" value="'.$pageid.'">';
+	    	$out.=ajax_combobox($htmlname);
+	    }
+	    return $out;
+	}
 }
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ca6a4a93e4e..4d4a20f3a5c 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3028,7 +3028,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		//if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on')))
         if (empty($srconly) && in_array($pictowithouttext, array(
         		'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
-        		'address', 'bank', 'building', 'cash-register', 'close_title', 'cubes', 'delete', 'dolly', 'edit', 'ellipsis-h', 'bookmark', 'filter', 'grip', 'grip_title', 'list', 'listlight', 'note',
+        		'address', 'bank', 'bookmark', 'building', 'cash-register', 'close_title', 'cubes', 'delete', 'dolly', 'edit', 'ellipsis-h',
+        		'filter', 'file-code', 'grip', 'grip_title', 'list', 'listlight', 'note',
         		'object_list','object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
         		'off', 'on', 'play', 'playdisabled', 'printer', 'resize', 'stats',
 				'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'wrench', 'globe',
@@ -3058,12 +3059,10 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		    	$morecss .= ($morecss ? ' ' : '').('picto'.$pictowithouttext);
 		    } elseif ($pictowithouttext == 'switch_off') {
 				$facolor = '#999';
-				$fasize = '2em';
 				$fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext];
 			}
 			elseif ($pictowithouttext == 'switch_on') {
 				$facolor = '#227722';
-				$fasize = '2em';
 				$fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext];
 			}
 			elseif ($pictowithouttext == 'off') {
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index be758c04890..62ce5a23531 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -117,4 +117,5 @@ ImportSite=Import site
 EditInLineOnOff=Mode 'Edit inline' is %s
 ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
 GlobalCSSorJS=Global CSS/JS/Header file of web site
-BackToHomePage=Back to home page...
\ No newline at end of file
+BackToHomePage=Back to home page...
+TranslationLinks=Translation links
\ No newline at end of file
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index aeb1cbf70c9..c3bbc92af9c 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -488,6 +488,9 @@ textarea.centpercent {
 .backgroundblank {
     background-color: #fff;
 }
+.nobackground, .nobackground tr {
+	background: unset !important;
+}
 .checkboxattachfilelabel {
     font-size: 0.85em;
     opacity: 0.7;
@@ -517,6 +520,8 @@ body[class*="colorblind-"] .text-success{
     color: rgb(<?php echo $colortexttitle; ?>) !important;
 }
 
+.fa-toggle-on, .fa-toggle-off { font-size: 2em; }
+.websiteselectionsection .fa-toggle-on, .websiteselectionsection .fa-toggle-off { font-size: 1.5em; vertical-align: text-bottom; }
 
 /* Themes for badges */
 <?php include dol_buildpath($path.'/theme/'.$theme.'/badges.inc.php', 0); ?>
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index d1a1c2025c0..320a03c2775 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -691,6 +691,9 @@ textarea.centpercent {
 .backgroundblank {
     background-color: #fff;
 }
+.nobackground, .nobackground tr {
+	background: unset !important;
+}
 .checkboxattachfilelabel {
     font-size: 0.85em;
     opacity: 0.7;
@@ -720,6 +723,9 @@ body[class*="colorblind-"] .text-success{
     color: rgb(<?php echo $colortexttitle; ?>) !important;
 }
 
+.fa-toggle-on, .fa-toggle-off { font-size: 2em; }
+.websiteselectionsection .fa-toggle-on, .websiteselectionsection .fa-toggle-off { font-size: 1.5em; vertical-align: text-bottom; }
+
 
 /* Themes for badges */
 <?php include dol_buildpath($path.'/theme/'.$theme.'/badges.inc.php', 0); ?>
diff --git a/htdocs/ticket/css/styles.css.php b/htdocs/ticket/css/styles.css.php
index 1d0626d190b..906d50602a1 100644
--- a/htdocs/ticket/css/styles.css.php
+++ b/htdocs/ticket/css/styles.css.php
@@ -31,7 +31,7 @@ if (! defined('NOLOGIN'))         define('NOLOGIN', 1);          // File must be
 if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML', 1);
 if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
 
-session_cache_limiter(false);
+session_cache_limiter('public');
 
 require_once '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index bd54b93438f..ac99001bf4b 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -92,6 +92,17 @@ class Website extends CommonObject
 	 */
 	public $virtualhost;
 
+	/**
+	 * List of containers
+	 *
+	 * @var array
+	 */
+	public $lines;
+
+
+	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+
 
 	/**
 	 * Constructor
@@ -229,10 +240,10 @@ class Website extends CommonObject
 		$sql .= " t.tms as date_modification";
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 		$sql .= ' WHERE t.entity IN ('.getEntity('website').')';
-		if (null !== $ref) {
+		if (! empty($ref)) {
 			$sql .= " AND t.ref = '" . $this->db->escape($ref) . "'";
 		} else {
-			$sql .= ' AND t.rowid = ' . $id;
+			$sql .= ' AND t.rowid = ' . (int) $id;
 		}
 
 		$resql = $this->db->query($sql);
@@ -691,8 +702,8 @@ class Website extends CommonObject
         $companylink = '';
 
         $label = '<u>' . $langs->trans("WebSite") . '</u>';
-        $label.= '<div width="100%">';
-        $label.= '<b>' . $langs->trans('Nom') . ':</b> ' . $this->ref;
+        $label.= '<br>';
+        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
 
         $linkstart = '<a href="'.DOL_URL_ROOT.'/website/card.php?id='.$this->id.'"';
         $linkstart.= ($notooltip?'':' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss?' '.$morecss:'').'"');
@@ -734,31 +745,20 @@ class Website extends CommonObject
         // phpcs:enable
 		global $langs;
 
-		if ($mode == 0 || $mode == 1)
+		if (empty($this->labelstatus) || empty($this->labelstatusshort))
 		{
-			if ($status == 1) return $langs->trans('Enabled');
-			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 4)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
-			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
+			global $langs;
+			//$langs->load("mymodule");
+			$this->labelstatus[self::STATUS_DRAFT] = $langs->trans('Disabled');
+			$this->labelstatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelstatusshort[self::STATUS_DRAFT] = $langs->trans('Disabled');
+			$this->labelstatusshort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
 		}
+
+		$statusType = 'status5';
+		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
+
+		return dolGetStatus($this->labelstatus[$status], $this->labelstatusshort[$status], '', $statusType, $mode);
 	}
 
 
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 870e300e650..e85af6244e3 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -47,7 +47,7 @@ class WebsitePage extends CommonObject
 	/**
 	 * @var string String with name of icon for websitepage. Must be the part after the 'object_' into object_myobject.png
 	 */
-	public $picto = 'label';
+	public $picto = 'file-code';
 
 	/**
      * @var int ID
@@ -88,6 +88,11 @@ class WebsitePage extends CommonObject
 	public $date_modification;
 
 
+	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+
+
+
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
      * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
@@ -480,25 +485,39 @@ class WebsitePage extends CommonObject
         global $menumanager;
 
         $result = '';
-        $companylink = '';
 
         $label = '<u>' . $langs->trans("Page") . '</u>';
-        $label.= '<div width="100%">';
-        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+        $label.= '<br>';
+        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref.'<br>';
+        $label.= '<b>' . $langs->trans('ID') . ':</b> ' . $this->id.'<br>';
+        $label.= '<b>' . $langs->trans('Title') . ':</b> ' . $this->title;
 
-        $linkstart = '<a href="'.DOL_URL_ROOT.'/website/card.php?id='.$this->id.'"';
-        $linkstart.= ($notooltip?'':' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss?' '.$morecss:'').'"');
-        $linkstart.= '>';
+        $url = DOL_URL_ROOT.'/website/index.php?websiteid='.$this->fk_website.'&pageid='.$this->id;
+
+        $linkclose='';
+        if (empty($notooltip))
+        {
+        	if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+        	{
+        		$label=$langs->trans("ShowMyObject");
+        		$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+        	}
+        	$linkclose.=' title="'.dol_escape_htmltag($label, 1).'"';
+        	$linkclose.=' class="classfortooltip'.($morecss?' '.$morecss:'').'"';
+        }
+        else $linkclose = ($morecss?' class="'.$morecss.'"':'');
+
+        $linkstart = '<a href="'.$url.'"';
+        $linkstart.=$linkclose.'>';
 		$linkend='</a>';
 
-		$linkstart = $linkend = '';
+		//$linkstart = $linkend = '';
+
+		$result .= $linkstart;
+		if ($withpicto) $result.=img_picto(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+		if ($withpicto != 2) $result.= $this->ref;
+		$result .= $linkend;
 
-        if ($withpicto)
-        {
-            $result.=($linkstart.img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?'':'class="classfortooltip"')).$linkend);
-        	if ($withpicto != 2) $result.=' ';
-		}
-		$result.= $linkstart . $this->ref . $linkend;
 		return $result;
 	}
 
@@ -526,36 +545,20 @@ class WebsitePage extends CommonObject
         // phpcs:enable
 		global $langs;
 
-		if ($mode == 0)
+		if (empty($this->labelstatus) || empty($this->labelstatusshort))
 		{
-			if ($status == 1) return $langs->trans('Enabled');
-			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 1)
-		{
-			if ($status == 1) return $langs->trans('Enabled');
-			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 4)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
-			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
+			global $langs;
+			//$langs->load("mymodule");
+			$this->labelstatus[self::STATUS_DRAFT] = $langs->trans('Disabled');
+			$this->labelstatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelstatusshort[self::STATUS_DRAFT] = $langs->trans('Disabled');
+			$this->labelstatusshort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
 		}
+
+		$statusType = 'status5';
+		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
+
+		return dolGetStatus($this->labelstatus[$status], $this->labelstatusshort[$status], '', $statusType, $mode);
 	}
 
 
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 56b3a0c8cb3..afc85a9c213 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -46,6 +46,7 @@ if (! $user->rights->website->read) accessforbidden();
 $conf->dol_hide_leftmenu = 1;   // Force hide of left menu.
 
 $error=0;
+$websiteid=GETPOST('websiteid', 'int');
 $websitekey=GETPOST('website', 'alpha');
 $page=GETPOST('page', 'alpha');
 $pageid=GETPOST('pageid', 'int');
@@ -101,7 +102,7 @@ $objectpage=new WebsitePage($db);
 $object->fetchAll();    // Init $object->records with list of websites
 
 // If website not defined, we take first found
-if (empty($websitekey))
+if (! ($websiteid > 0) && empty($websitekey))
 {
 	foreach($object->records as $key => $valwebsite)
 	{
@@ -109,10 +110,12 @@ if (empty($websitekey))
 		break;
 	}
 }
-if ($websitekey)
+if ($websiteid > 0 || $websitekey)
 {
-	$res = $object->fetch(0, $websitekey);
+	$res = $object->fetch($websiteid, $websitekey);
+	$websitekey = $object->ref;
 }
+
 $website = $object;
 
 // Check pageid received as aprameter
@@ -418,7 +421,7 @@ if ($action == 'addcontainer')
 	$db->begin();
 
 	$objectpage->fk_website = $object->id;
-	if (GETPOST('fetchexternalurl', 'alpha'))
+	if (GETPOSTISSET('fetchexternalurl'))
 	{
 		$urltograb=GETPOST('externalurl', 'alpha');
 		$grabimages=GETPOST('grabimages', 'alpha');
@@ -426,12 +429,18 @@ if ($action == 'addcontainer')
 		//var_dump($grabimages);exit;
 	}
 
-	if ($urltograb)
+	if (GETPOSTISSET('fetchexternalurl'))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
-		//if (! preg_match('/^http/', $urltograb) && ! preg_match('/^file/', $urltograb))
-		if (! preg_match('/^http/', $urltograb))
+		if (empty($urltograb))
+		{
+			$error++;
+			$langs->load("errors");
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("URL")), null, 'errors');
+			$action = 'createcontainer';
+		}
+		elseif (! preg_match('/^http/', $urltograb))
 		{
 			$error++;
 			$langs->load("errors");
@@ -1372,6 +1381,8 @@ if ($action == 'updatemeta')
 		$objectpage->keywords = GETPOST('WEBSITE_KEYWORDS', 'alpha');
 		$objectpage->lang = GETPOST('WEBSITE_LANG', 'aZ09');
 		$objectpage->htmlheader = trim(GETPOST('htmlheader', 'none'));
+		$objectpage->fk_page = GETPOST('pageidfortranslation', 'int');
+
 		$newdatecreation=dol_mktime(GETPOST('datecreationhour', 'int'), GETPOST('datecreationmin', 'int'), GETPOST('datecreationsec', 'int'), GETPOST('datecreationmonth', 'int'), GETPOST('datecreationday', 'int'), GETPOST('datecreationyear', 'int'));
 		if ($newdatecreation) $objectpage->date_creation = $newdatecreation;
 
@@ -2006,6 +2017,7 @@ if (! GETPOST('hide_websitemenu'))
 	if ($object->id > 0)
 	{
 		$array=$objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
+		$object->lines = $array;
 	}
 	if (! is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
 	$atleastonepage=(is_array($array) && count($array) > 0);
@@ -2019,13 +2031,13 @@ if (! GETPOST('hide_websitemenu'))
 
 		print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditCss")).'" name="editcss">';
 
-		if (! $atleastonepage)
+		if ($atleastonepage)
 		{
-			print '<input type="submit" class="button bordertransp"'.$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">';
 		}
 		else
 		{
-			print '<input type="submit" class="button bordertransp" disabled="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">';
 		}
 
 		//print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditMenu")).'" name="editmenu">';
@@ -2137,55 +2149,11 @@ if (! GETPOST('hide_websitemenu'))
 		print '<input type="submit"'.$disabled.' class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'" name="createcontainer">';
 		print '</span>';
 
-		print '<span class="websiteselection">';
+		//print '<span class="websiteselection">';
 
 		if ($action != 'addcontainer')
 		{
-			$out='';
-			if ($atleastonepage && $action != 'editsource')
-			{
-			    $out.='<select name="pageid" id="pageid" class="minwidth200 maxwidth300">';
-			}
-			else
-			{
-			    $out.='<select name="pageidbis" id="pageid" class="minwidth200 maxwidth300" disabled="disabled">';
-			}
-			if ($atleastonepage)
-			{
-				if (empty($pageid) && $action != 'createcontainer')      // Page id is not defined, we try to take one
-				{
-					$firstpageid=0;$homepageid=0;
-					foreach($array as $key => $valpage)
-					{
-						if (empty($firstpageid)) $firstpageid=$valpage->id;
-						if ($object->fk_default_home && $key == $object->fk_default_home) $homepageid=$valpage->id;
-					}
-					$pageid=$homepageid?$homepageid:$firstpageid;   // We choose home page and if not defined yet, we take first page
-				}
-
-				foreach($array as $key => $valpage)
-				{
-					$out.='<option value="'.$key.'"';
-					if ($pageid > 0 && $pageid == $key) $out.=' selected';		// To preselect a value
-					$out.='>';
-					$out.='['.$valpage->type_container.' '.sprintf("%03d", $valpage->id).'] ';
-					$out.=$valpage->pageurl.' - '.$valpage->title;
-					if ($object->fk_default_home && $key == $object->fk_default_home) $out.=' ('.$langs->trans("HomePage").')';
-					$out.='</option>';
-				}
-			}
-			else $out.='<option value="-1">&nbsp;</option>';
-			$out.='</select>';
-			if ($atleastonepage && $action != 'editsource')
-			{
-			    $out.=ajax_combobox('pageid');
-			}
-			else
-			{
-    			$out.='<input type="hidden" name="pageid" value="'.$pageid.'">';
-    			$out.=ajax_combobox('pageid');
-			}
-			print $out;
+			print $formwebsite->selectContainer($website, 'pageid', $pageid, 0, $action);
 		}
 		else
 		{
@@ -2298,7 +2266,7 @@ if (! GETPOST('hide_websitemenu'))
 
 				print '<!-- button EditInLine and ShowSubcontainers -->'."\n";
 				print '<div class="websiteselectionsection inline-block">';
-				print '<div class="inline-block">';
+				print '<div class="inline-block marginrightonly">';
 
 				print '<span id="switchckeditorinline">'."\n";
 				print '<!-- Code to enabled edit inline ckeditor -->'."\n";
@@ -2351,23 +2319,23 @@ if (! GETPOST('hide_websitemenu'))
 				if ($websitepage->grabbed_from)
 				{
 					//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>';
+					print '<a class="nobordertransp opacitymedium nohoverborder marginleftonlyshort"'.$disabled.' href="#" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("OnlyEditionOfSourceForGrabbedContent")).'">'.img_picto($langs->trans("OnlyEditionOfSourceForGrabbedContent"), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
 				}
 				else
 				{
 					//print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditWithEditor")).'" name="editcontent">';
 					if (empty($conf->global->WEBSITE_EDITINLINE))
 					{
-						print '<a class="button nobordertransp nohoverborder"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=seteditinline">'.img_picto($langs->trans("EditInLineOnOff", $langs->transnoentitiesnoconv("Off")), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
+						print '<a class="nobordertransp nohoverborder marginleftonlyshort"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=seteditinline">'.img_picto($langs->trans("EditInLineOnOff", $langs->transnoentitiesnoconv("Off")), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
 					}
 					else
 					{
-						print '<a class="button nobordertransp nohoverborder"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=unseteditinline">'.img_picto($langs->trans("EditInLineOnOff", $langs->transnoentitiesnoconv("On")), 'switch_on', '', false, 0, 0, '', 'nomarginleft').'</a>';
+						print '<a class="nobordertransp nohoverborder marginleftonlyshort"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=unseteditinline">'.img_picto($langs->trans("EditInLineOnOff", $langs->transnoentitiesnoconv("On")), 'switch_on', '', false, 0, 0, '', 'nomarginleft').'</a>';
 					}
 				}
 
 				print '</div>';
-				print '<div class="inline-block">';
+				print '<div class="inline-block marginrightonly">';
 				print $langs->trans("ShowSubcontainers");
 				/*if ($websitepage->grabbed_from)
 				{
@@ -2377,11 +2345,11 @@ if (! GETPOST('hide_websitemenu'))
 				{*/
 				if (empty($conf->global->WEBSITE_SUBCONTAINERSINLINE))
 				{
-					print '<a class="button nobordertransp nohoverborder"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=setshowsubcontainers">'.img_picto($langs->trans("ShowSubContainersOnOff", $langs->transnoentitiesnoconv("Off")), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
+					print '<a class="nobordertransp nohoverborder marginleftonlyshort"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=setshowsubcontainers">'.img_picto($langs->trans("ShowSubContainersOnOff", $langs->transnoentitiesnoconv("Off")), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
 				}
 				else
 				{
-					print '<a class="button nobordertransp nohoverborder"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=unsetshowsubcontainers">'.img_picto($langs->trans("ShowSubContainersOnOff", $langs->transnoentitiesnoconv("On")), 'switch_on', '', false, 0, 0, '', 'nomarginleft').'</a>';
+					print '<a class="nobordertransp nohoverborder marginleftonlyshort"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=unsetshowsubcontainers">'.img_picto($langs->trans("ShowSubContainersOnOff", $langs->transnoentitiesnoconv("On")), 'switch_on', '', false, 0, 0, '', 'nomarginleft').'</a>';
 				}
 				/*}*/
 				print '</div>';
@@ -2405,7 +2373,7 @@ if (! GETPOST('hide_websitemenu'))
 			}
 		}
 
-		print '</span>';	// end website selection
+		//print '</span>';	// end website selection
 
 		print '<span class="websitetools">';
 
@@ -2888,12 +2856,24 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	print '<!-- Edit or create page/container -->'."\n";
 	//print '<div class="fichecenter">';
 
+	$hiddenfromfetchingafterload = ' hideobject';
+	$hiddenmanuallyafterload = ' hideobject';
+	if (GETPOST('radiocreatefrom') == 'checkboxcreatefromfetching') $hiddenfromfetchingafterload = '';
+	if (GETPOST('radiocreatefrom') == 'checkboxcreatemanually') $hiddenmanuallyafterload = '';
+
+	if ($action == 'editmeta' || empty($conf->use_javascript_ajax)) {	// No autohide/show in such case
+		$hiddenfromfetchingafterload='';
+		$hiddenmanuallyafterload='';
+	}
+
 	if ($action == 'createcontainer')
 	{
 		print '<br>';
 
-		print ' * '.$langs->trans("CreateByFetchingExternalPage").'<br><hr>';
-		print '<table class="border" width="100%">';
+		if (! empty($conf->use_javascript_ajax)) print '<input type="radio" name="radiocreatefrom" id="checkboxcreatefromfetching" value="checkboxcreatefromfetching"'.(GETPOST('radiocreatefrom') == 'checkboxcreatefromfetching' ? ' checked' : '').'> ';
+		print '<label for="checkboxcreatefromfetching"><span class="opacitymedium">'.$langs->trans("CreateByFetchingExternalPage").'</span></label><br>';
+		print '<hr class="tablecheckboxcreatefromfetching'.$hiddenfromfetchingafterload.'">';
+		print '<table class="tableforfield centpercent tablecheckboxcreatefromfetching'.$hiddenfromfetchingafterload.'">';
 		print '<tr><td class="titlefield">';
 		print $langs->trans("URL");
 		print '</td><td>';
@@ -2911,10 +2891,12 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 
 		print '<br>';
 
-		print ' * '.$langs->trans("OrEnterPageInfoManually").'<br><hr>';
+		if (! empty($conf->use_javascript_ajax)) print '<input type="radio" name="radiocreatefrom" id="checkboxcreatemanually" value="checkboxcreatemanually"'.(GETPOST('radiocreatefrom') == 'checkboxcreatemanually' ? ' checked' : '').'> ';
+		print '<label for="checkboxcreatemanually"><span class="opacitymedium">'.$langs->trans("OrEnterPageInfoManually").'</span></label><br>';
+		print '<hr class="tablecheckboxcreatemanually'.$hiddenmanuallyafterload.'">';
 	}
 
-	print '<table class="border" width="100%">';
+	print '<table class="border tableforfield nobackground centpercent tablecheckboxcreatemanually'.$hiddenmanuallyafterload.'">';
 
 	if ($action != 'createcontainer')
 	{
@@ -2928,16 +2910,9 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 		print $langs->trans('InternalURLOfPage');
 		print '</td><td>';
 		print '/public/website/index.php?website='.urlencode($websitekey).'&pageid='.urlencode($pageid);
+		//if ($objectpage->grabbed_from) print ' - <span class="opacitymedium">'.$langs->trans('InitiallyGrabbedFrom').' '.$objectpage->grabbed_from.'</span>';
 		print '</td></tr>';
 
-		/*
-        print '<tr><td class="titlefield">';
-        print $langs->trans('InitiallyGrabbedFrom');
-        print '</td><td>';
-        print $objectpage->grabbed_from;
-        print '</td></tr>';
-        */
-
 		$type_container=$objectpage->type_container;
 		$pageurl=$objectpage->pageurl;
 		$pagealiasalt=$objectpage->aliasalt;
@@ -2972,7 +2947,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	print '<tr><td class="fieldrequired">';
 	print $langs->trans('WEBSITE_TITLE');
 	print '</td><td>';
-	print '<input type="text" class="flat quatrevingtpercent" name="WEBSITE_TITLE" id="WEBSITE_TITLE" value="'.dol_escape_htmltag($pagetitle).'">';
+	print '<input type="text" class="flat quatrevingtpercent" name="WEBSITE_TITLE" id="WEBSITE_TITLE" value="'.dol_escape_htmltag($pagetitle).'" autofocus>';
 	print '</td></tr>';
 
 	// Alias
@@ -3023,26 +2998,28 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	print $formadmin->select_language($pagelang?$pagelang:$langs->defaultlang, 'WEBSITE_LANG', 0, null, '1');
 	print '</td></tr>';
 
+	// Translation of
+	$translationof=0;
+	print '<!-- Translation of --><tr><td>';
+	print $langs->trans('TranslationLinks');
+	print '</td><td>';
+	if ($action == 'editmeta' || $action == 'createcontainer' || $objectpage->fk_page > 0)
+	{
+		$sourcepage=new WebsitePage($db);
+		$result = $sourcepage->fetch($objectpage->fk_page);
+		if ($result == 0)
+		{
+			// not found, we can reset value to clean database
+		}
+		elseif ($result > 0)
+		{
+			$translationof = $sourcepage->id;
+			print '<span class="opacitymedium">'.$langs->trans('ThisPageIsTranslationOf').'</span> ';
+			print $formwebsite->selectContainer($website, 'pageidfortranslation', $sourcepage->id, 1, $action);
+		}
+	}
 	if ($action != 'createcontainer')
 	{
-		// Translation of
-		if ($objectpage->fk_page > 0)
-		{
-			print '<tr><td>';
-			print $langs->trans('ThisPageIsTranslationOf');
-			print '</td><td>';
-			$sourcepage=new WebsitePage($db);
-			$result = $sourcepage->fetch($objectpage->fk_page);
-			if ($result == 0)	// not found, we can reset value
-			{
-			}
-			elseif ($result > 0)
-			{
-				print $sourcepage->getNomUrl(1);
-			}
-			print '</td></tr>';
-		}
-
 		// Has translation pages
 		$sql='SELECT rowid, lang from '.MAIN_DB_PREFIX.'website_page where fk_page = '.$objectpage->id;
 		$resql = $db->query($sql);
@@ -3051,9 +3028,8 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 			$num_rows = $db->num_rows($resql);
 			if ($num_rows > 0)
 			{
-				print '<tr><td>';
-				print $langs->trans('ThisPageHasTranslationPages');
-				print '</td><td>';
+				if ($translationof) print '<br>';
+				print '<span class="opacitymedium">'.$langs->trans('ThisPageHasTranslationPages').':</span><br>';
 				$i=0;
 				while ($obj = $db->fetch_object($resql))
 				{
@@ -3063,11 +3039,11 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 					print $tmppage->getNomUrl(1).' ('.$tmppage->lang.')';
 					$i++;
 				}
-				print '</td></tr>';
 			}
 		}
 		else dol_print_error($db);
 	}
+	print '</td></tr>';
 
 	print '<tr><td class="titlefieldcreate">';
 	$htmlhelp=$langs->trans("WEBSITE_ALIASALTDesc");
@@ -3127,7 +3103,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	print '</table>';
 	if ($action == 'createcontainer')
 	{
-		print '<div class="center">';
+		print '<div class="center tablecheckboxcreatemanually'.$hiddenmanuallyafterload.'">';
 
 		print '<input class="button" type="submit" name="addcontainer" value="'.$langs->trans("Create").'">';
 		print '<input class="button" type="submit" name="preview" value="'.$langs->trans("Cancel").'">';
@@ -3155,6 +3131,20 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 				jQuery("#WEBSITE_PAGENAME").keyup(function() {
 					disableautofillofalias = 1;
 				});
+
+				jQuery("#checkboxcreatefromfetching,#checkboxcreatemanually").change(function() {
+					console.log("we select a method to create a new container"+jQuery("#checkboxcreatefromfetching:checked").val())
+					if (typeof(jQuery("#checkboxcreatefromfetching:checked").val()) != \'undefined\')
+					{
+						jQuery(".tablecheckboxcreatefromfetching").show();
+						jQuery(".tablecheckboxcreatemanually").hide();
+					}
+					if (typeof(jQuery("#checkboxcreatemanually:checked").val()) != \'undefined\')
+					{
+						jQuery(".tablecheckboxcreatefromfetching").hide();
+						jQuery(".tablecheckboxcreatemanually").show();
+					}
+				});
 			});
 			</script>';
 	}
@@ -3286,6 +3276,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm')
 
 		if ($listofpages['code'] == 'OK')
 		{
+			print '<!-- List of search result -->'."\n";
 			print '<div class="rowsearchresult">';
 
 			if ($action == 'replacesiteconfirm')
@@ -3317,7 +3308,8 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm')
 					print '<tr>';
 					print '<td>'.$langs->trans("Container").'</td>';
 					print '<td>';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$website->ref.'&pageid='.$answerrecord->id.'">'.($answerrecord->title ? $answerrecord->title : $langs->trans("NoTitle")).'</a>';
+					print $answerrecord->getNomUrl(1);
+					print ' <span class="opacitymedium">('.($answerrecord->title ? $answerrecord->title : $langs->trans("NoTitle")).')</span>';
 					print '</td>';
 					print '<td class="tdoverflow100">'.$answerrecord->description;
 					print '</td>';

From c215d534fc7a64f25acb9a17b6ce45e3188a3f28 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Oct 2019 21:16:41 +0100
Subject: [PATCH 10/38] Fix phpcs

---
 htdocs/comm/action/index.php                                | 2 +-
 htdocs/core/lib/files.lib.php                               | 2 +-
 htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php | 2 +-
 htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php  | 2 +-
 htdocs/don/payment/payment.php                              | 2 +-
 htdocs/societe/canvas/company/tpl/card_edit.tpl.php         | 1 -
 htdocs/societe/canvas/individual/tpl/card_edit.tpl.php      | 4 ++--
 htdocs/ticket/class/api_tickets.class.php                   | 2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 9ad3ef80dde..569b57ca552 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -1735,7 +1735,7 @@ function sort_events_by_date($a, $b)
     }
 
     // If both events have the same start time, longest first
-    
+
     if(! is_numeric($b->datef))
     {
         // when event B have no end timestamp, event B should sort be before event A (All day events on top)
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 07d51105ca8..711e65edaaa 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1851,7 +1851,7 @@ function dol_convert_file($fileinput, $ext = 'png', $fileoutput = '', $page = ''
 				if (! dol_is_file($fileoutput) || is_writeable($fileoutput))
 				{
 				    try {
-					   $ret = $image->writeImages($fileoutput, true);
+						$ret = $image->writeImages($fileoutput, true);
 				    }
 				    catch(Exception $e)
 				    {
diff --git a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
index 3c371c39491..acbb2ae0b36 100644
--- a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
+++ b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
@@ -479,7 +479,7 @@ class doc_generic_bom_odt extends ModelePDFBOMs
 				}
 				else {
 					try {
-					$odfHandler->saveToDisk($file);
+						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
                         $this->error=$e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
index 6d85bfd3553..9beb300ebb0 100644
--- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
+++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
@@ -486,7 +486,7 @@ class doc_generic_mo_odt extends ModelePDFMOs
 				}
 				else {
 					try {
-					$odfHandler->saveToDisk($file);
+						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
                         $this->error=$e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index 71895a7d2c3..612ea5a553b 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -240,7 +240,7 @@ if (GETPOST('action', 'aZ09') == 'create')
 	/*
  	 * List of payments on donation
 	 */
-	
+
 	$num = 1;
 	$i = 0;
 
diff --git a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
index 11100c79d75..b26f19204bb 100644
--- a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
@@ -23,7 +23,6 @@ if (empty($conf) || ! is_object($conf))
 	exit;
 }
 
-
 $contact = $GLOBALS['objcanvas']->control->object;
 
 ?>
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
index 6f3628d93b7..b69e9e8370b 100644
--- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
@@ -75,7 +75,7 @@ if (empty($conf) || ! is_object($conf))
 				<?php if ($this->control->tpl['ismodifiable_customercode']) { ?>
 				<input type="text" name="code_client" size="16" value="<?php echo $this->control->tpl['customercode']; ?>" maxlength="15">
 				<?php } else { ?>
-				<?php  echo $this->control->tpl['customercode']; ?>
+				<?php echo $this->control->tpl['customercode']; ?>
 				<input type="hidden" name="code_client" value="<?php echo $this->control->tpl['customercode']; ?>">
 				<?php } ?>
 				</td>
@@ -96,7 +96,7 @@ if (empty($conf) || ! is_object($conf))
 				<?php if ($this->control->tpl['ismodifiable_suppliercode']) { ?>
 				<input type="text" name="code_fournisseur" size="16" value="<?php echo $this->control->tpl['suppliercode']; ?>" maxlength="15">
 				<?php } else { ?>
-				<?php  echo $this->control->tpl['suppliercode']; ?>
+				<?php echo $this->control->tpl['suppliercode']; ?>
 				<input type="hidden" name="code_fournisseur" value="<?php echo $this->control->tpl['suppliercode']; ?>">
 				<?php } ?>
 				</td>
diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index 4289fab99dc..c95b092cf2e 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -435,7 +435,7 @@ class Tickets extends DolibarrApi
             throw new RestException(500);
         }
 
-         return array(
+        return array(
             'success' => array(
                 'code' => 200,
                 'message' => 'Ticket deleted'

From a1700e71be3a1fc48a418926001003c438cd87bb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Oct 2019 21:18:38 +0100
Subject: [PATCH 11/38] Fix phpcs

---
 htdocs/compta/facture/class/api_invoices.class.php         | 2 +-
 htdocs/fourn/class/api_supplier_orders.class.php           | 2 +-
 htdocs/modulebuilder/template/class/api_mymodule.class.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 25d92fad92a..da5ad40002b 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -565,7 +565,7 @@ class Invoices extends DolibarrApi
             throw new RestException(500);
         }
 
-         return array(
+        return array(
             'success' => array(
                 'code' => 200,
                 'message' => 'Invoice deleted'
diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index c09c62a4714..2ab90bcd73b 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -273,7 +273,7 @@ class SupplierOrders extends DolibarrApi
             throw new RestException(500);
         }
 
-         return array(
+        return array(
             'success' => array(
                 'code' => 200,
                 'message' => 'Supplier order deleted'
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index bc3b6c4050c..2cfcd269b62 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -271,7 +271,7 @@ class MyModuleApi extends DolibarrApi
             throw new RestException(500, 'Error when deleting MyObject : '.$this->myobject->error);
         }
 
-         return array(
+        return array(
             'success' => array(
                 'code' => 200,
                 'message' => 'MyObject deleted'

From 0e7a8680870cb3d374bbbe3c794dcb4d3d793279 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Oct 2019 21:27:25 +0100
Subject: [PATCH 12/38] translation og pages

---
 htdocs/website/index.php | 53 ++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index afc85a9c213..e0e3378bf26 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -3000,10 +3000,36 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 
 	// Translation of
 	$translationof=0;
+	$translatedby=0;
 	print '<!-- Translation of --><tr><td>';
 	print $langs->trans('TranslationLinks');
 	print '</td><td>';
-	if ($action == 'editmeta' || $action == 'createcontainer' || $objectpage->fk_page > 0)
+	if ($action != 'createcontainer')
+	{
+		// Has translation pages
+		$sql='SELECT rowid, lang from '.MAIN_DB_PREFIX.'website_page where fk_page = '.$objectpage->id;
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$num_rows = $db->num_rows($resql);
+			if ($num_rows > 0)
+			{
+				print '<span class="opacitymedium">'.$langs->trans('ThisPageHasTranslationPages').':</span><br>';
+				$i=0;
+				while ($obj = $db->fetch_object($resql))
+				{
+					$tmppage=new WebsitePage($db);
+					$tmppage->fetch($obj->rowid);
+					if ($i > 0) print ' - ';
+					print $tmppage->getNomUrl(1).' ('.$tmppage->lang.')<br>';
+					$translatedby++;
+					$i++;
+				}
+			}
+		}
+		else dol_print_error($db);
+	}
+	if (empty($translatedby) && ($action == 'editmeta' || $action == 'createcontainer' || $objectpage->fk_page > 0))
 	{
 		$sourcepage=new WebsitePage($db);
 		$result = $sourcepage->fetch($objectpage->fk_page);
@@ -3018,31 +3044,6 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 			print $formwebsite->selectContainer($website, 'pageidfortranslation', $sourcepage->id, 1, $action);
 		}
 	}
-	if ($action != 'createcontainer')
-	{
-		// Has translation pages
-		$sql='SELECT rowid, lang from '.MAIN_DB_PREFIX.'website_page where fk_page = '.$objectpage->id;
-		$resql = $db->query($sql);
-		if ($resql)
-		{
-			$num_rows = $db->num_rows($resql);
-			if ($num_rows > 0)
-			{
-				if ($translationof) print '<br>';
-				print '<span class="opacitymedium">'.$langs->trans('ThisPageHasTranslationPages').':</span><br>';
-				$i=0;
-				while ($obj = $db->fetch_object($resql))
-				{
-					$tmppage=new WebsitePage($db);
-					$tmppage->fetch($obj->rowid);
-					if ($i > 0) print ' - ';
-					print $tmppage->getNomUrl(1).' ('.$tmppage->lang.')';
-					$i++;
-				}
-			}
-		}
-		else dol_print_error($db);
-	}
 	print '</td></tr>';
 
 	print '<tr><td class="titlefieldcreate">';

From a0e377feb3b7e978fce9bfc09bc32d35c6ed0599 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Oct 2019 22:11:26 +0100
Subject: [PATCH 13/38] Look and feel v11

---
 .../compta/cashcontrol/cashcontrol_list.php   | 72 +++++++++----------
 .../cashcontrol/class/cashcontrol.class.php   | 41 ++---------
 2 files changed, 42 insertions(+), 71 deletions(-)

diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index 6b767bc3949..dce1c13bc40 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -322,7 +322,7 @@ $arrayofmassactions =  array(
 //'presend'=>$langs->trans("SendByMail"),
 //'builddoc'=>$langs->trans("PDFMerge"),
 );
-if ($user->rights->monmodule->delete) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+//if ($user->rights->monmodule->delete) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
@@ -336,13 +336,9 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-$newcardbutton='';
-//if ($user->rights->monmodule->creer)
-	//{
-$newcardbutton='<a class="butActionNew" href="cashcontrol_card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']).'"><span class="valignmiddle text-plus-circle">'.$langs->trans('New').'</span>';
-$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-$newcardbutton.= '</a>';
-//}
+$permforcashfence = 1;
+
+$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/cashcontrol/cashcontrol_card?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permforcashfence);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'cash-register', 0, $newcardbutton, '', $limit);
 
@@ -389,12 +385,18 @@ print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"")
 print '<tr class="liste_titre">';
 foreach($object->fields as $key => $val)
 {
-    $cssforfield='';
-    if (in_array($val['type'], array('date','datetime','timestamp'))) $cssforfield.=($cssforfield?' ':'').'center';
-    if (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap';
-    if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price'))) $cssforfield.=($cssforfield?' ':'').'right';
-    if ($key == 'status') $cssforfield.=($cssforfield?' ':'').'center';
-	if (! empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($cssforfield?' '.$cssforfield:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
+	$cssforfield=(empty($val['css'])?'':$val['css']);
+	if ($key == 'status') $cssforfield.=($cssforfield?' ':'').'center';
+	elseif (in_array($val['type'], array('date','datetime','timestamp'))) $cssforfield.=($cssforfield?' ':'').'center';
+	elseif (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap';
+	elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield.=($cssforfield?' ':'').'right';
+	if (! empty($arrayfields['t.'.$key]['checked']))
+	{
+		print '<td class="liste_titre'.($cssforfield?' '.$cssforfield:'').'">';
+		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		else print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		print '</td>';
+	}
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -416,15 +418,15 @@ print '</tr>'."\n";
 print '<tr class="liste_titre">';
 foreach($object->fields as $key => $val)
 {
-    $cssforfield='';
-    if (in_array($val['type'], array('date','datetime','timestamp'))) $cssforfield.=($cssforfield?' ':'').'center';
-    if (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap';
-    if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price'))) $cssforfield.=($cssforfield?' ':'').'right';
-    if ($key == 'status') $cssforfield.=($cssforfield?' ':'').'center';
-    if (! empty($arrayfields['t.'.$key]['checked']))
-    {
-        print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield?'class="'.$cssforfield.'"':''), $sortfield, $sortorder, ($cssforfield?$cssforfield.' ':''))."\n";
-    }
+	$cssforfield=(empty($val['css'])?'':$val['css']);
+	if ($key == 'status') $cssforfield.=($cssforfield?' ':'').'center';
+	elseif (in_array($val['type'], array('date','datetime','timestamp'))) $cssforfield.=($cssforfield?' ':'').'center';
+	elseif (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap';
+	elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield.=($cssforfield?' ':'').'right';
+	if (! empty($arrayfields['t.'.$key]['checked']))
+	{
+		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield?'class="'.$cssforfield.'"':''), $sortfield, $sortorder, ($cssforfield?$cssforfield.' ':''))."\n";
+	}
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -467,25 +469,21 @@ while ($i < min($num, $limit))
 	print '<tr class="oddeven">';
 	foreach($object->fields as $key => $val)
 	{
-	    $cssforfield='';
-	    if (in_array($val['type'], array('date','datetime','timestamp'))) $cssforfield.=($cssforfield?' ':'').'center';
-	    elseif ($key == 'status') $cssforfield.=($cssforfield?' ':'').'center';
+		$cssforfield=(empty($val['css'])?'':$val['css']);
+		if (in_array($val['type'], array('date','datetime','timestamp'))) $cssforfield.=($cssforfield?' ':'').'center';
+		elseif ($key == 'status') $cssforfield.=($cssforfield?' ':'').'center';
 
-	    if (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap';
-	    elseif ($key == 'ref') $cssforfield.=($cssforfield?' ':'').'nowrap';
+		if (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap';
+		elseif ($key == 'ref') $cssforfield.=($cssforfield?' ':'').'nowrap';
 
-	    if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price'))) $cssforfield.=($cssforfield?' ':'').'right';
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') $cssforfield.=($cssforfield?' ':'').'right';
 
 		if (! empty($arrayfields['t.'.$key]['checked']))
 		{
-			print '<td';
-			if ($cssforfield || $val['css']) print ' class="';
-			print $cssforfield;
-			if ($cssforfield && $val['css']) print ' ';
-			print $val['css'];
-			if ($cssforfield || $val['css']) print '"';
-			print '>';
-			print $object->showOutputField($val, $key, $obj->$key, '');
+			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
+			if ($key == 'status') print $object->getLibStatut(5);
+			elseif (in_array($val['type'], array('date','datetime','timestamp'))) print $object->showOutputField($val, $key, $db->jdate($obj->$key), '');
+			else print $object->showOutputField($val, $key, $obj->$key, '');
 			print '</td>';
 			if (! $i) $totalarray['nbfield']++;
 			if (! empty($val['isameasure']))
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index 87db81bf98d..354b50365ca 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -311,47 +311,20 @@ class CashControl extends CommonObject
 	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		if (empty($this->labelstatus))
+		if (empty($this->labelstatus) || empty($this->labelstatusshort))
 		{
 			global $langs;
 			//$langs->load("mymodule");
 			$this->labelstatus[0] = $langs->trans('Draft');
 			$this->labelstatus[1] = $langs->trans('Closed');
+			$this->labelstatusshort[0] = $langs->trans('Draft');
+			$this->labelstatusshort[1] = $langs->trans('Closed');
 		}
 
-		if ($mode == 0)
-		{
-			return $this->labelstatus[$status];
-		}
-		elseif ($mode == 1)
-		{
-			return $this->labelstatus[$status];
-		}
-		elseif ($mode == 2)
-		{
-			if ($status == 1) return img_picto($this->labelstatus[$status], 'statut6', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
-			elseif ($status == 0) return img_picto($this->labelstatus[$status], 'statut0', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
-		}
-		elseif ($mode == 3)
-		{
-			if ($status == 1) return img_picto($this->labelstatus[$status], 'statut6', '', false, 0, 0, '', 'valignmiddle');
-			elseif ($status == 0) return img_picto($this->labelstatus[$status], 'statut0', '', false, 0, 0, '', 'valignmiddle');
-		}
-		elseif ($mode == 4)
-		{
-			if ($status == 1) return img_picto($this->labelstatus[$status], 'statut6', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
-			elseif ($status == 0) return img_picto($this->labelstatus[$status], 'statut0', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
-		}
-		elseif ($mode == 5)
-		{
-			if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut6', '', false, 0, 0, '', 'valignmiddle');
-			elseif ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut0', '', false, 0, 0, '', 'valignmiddle');
-		}
-		elseif ($mode == 6)
-		{
-			if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut6', '', false, 0, 0, '', 'valignmiddle');
-			elseif ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut0', '', false, 0, 0, '', 'valignmiddle');
-		}
+		$statusType = 'status0';
+		if ($status == self::STATUS_VALIDATED) $statusType = 'status6';
+
+		return dolGetStatus($this->labelstatus[$status], $this->labelstatusshort[$status], '', $statusType, $mode);
 	}
 
 	/**

From af09c77a0c6ddc24f3acbe8ab1ae7ed69607ddbc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Oct 2019 22:15:18 +0100
Subject: [PATCH 14/38] Fix phpcs

---
 htdocs/bom/class/api_boms.class.php                           | 2 +-
 htdocs/core/modules/modStripe.class.php                       | 2 +-
 .../modules/myobject/doc/doc_generic_myobject_odt.modules.php | 2 +-
 htdocs/societe/canvas/company/tpl/card_edit.tpl.php           | 4 ++--
 htdocs/societe/canvas/individual/tpl/card_edit.tpl.php        | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/bom/class/api_boms.class.php b/htdocs/bom/class/api_boms.class.php
index 471fb4f2cce..40d53bff787 100644
--- a/htdocs/bom/class/api_boms.class.php
+++ b/htdocs/bom/class/api_boms.class.php
@@ -260,7 +260,7 @@ class Boms extends DolibarrApi
             throw new RestException(500, 'Error when deleting BOM : '.$this->bom->error);
         }
 
-         return array(
+        return array(
             'success' => array(
                 'code' => 200,
                 'message' => 'BOM deleted'
diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
index 30d90b8a0c6..cfa45cb6a4b 100644
--- a/htdocs/core/modules/modStripe.class.php
+++ b/htdocs/core/modules/modStripe.class.php
@@ -150,7 +150,7 @@ class modStripe extends DolibarrModules
 			'target' => '',
 			'user' => 0
 		);
-	    		$this->menu[$r] = array(
+	    $this->menu[$r] = array(
 			'fk_menu' => 'fk_mainmenu=bank,fk_leftmenu=stripe',
 			'type' => 'left',
 			'titre' => 'StripePayoutList',
diff --git a/htdocs/modulebuilder/template/core/modules/myobject/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/myobject/doc/doc_generic_myobject_odt.modules.php
index bffc0d5c470..822d6110c4b 100644
--- a/htdocs/modulebuilder/template/core/modules/myobject/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/myobject/doc/doc_generic_myobject_odt.modules.php
@@ -486,7 +486,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				}
 				else {
 					try {
-					$odfHandler->saveToDisk($file);
+						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
                         $this->error=$e->getMessage();
                         dol_syslog($e->getMessage(), LOG_INFO);
diff --git a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
index b26f19204bb..5f513fa886a 100644
--- a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
@@ -77,7 +77,7 @@ $contact = $GLOBALS['objcanvas']->control->object;
 				<?php if ($this->control->tpl['ismodifiable_customercode']) { ?>
 				<input type="text" name="code_client" size="16" value="<?php echo $this->control->tpl['customercode']; ?>" maxlength="15">
 				<?php } else { ?>
-				<?php  echo $this->control->tpl['customercode']; ?>
+				<?php 	echo $this->control->tpl['customercode']; ?>
 				<input type="hidden" name="code_client" value="<?php echo $this->control->tpl['customercode']; ?>">
 				<?php } ?>
 				</td>
@@ -98,7 +98,7 @@ $contact = $GLOBALS['objcanvas']->control->object;
 				<?php if ($this->control->tpl['ismodifiable_suppliercode']) { ?>
 				<input type="text" name="code_fournisseur" size="16" value="<?php echo $this->control->tpl['suppliercode']; ?>" maxlength="15">
 				<?php } else { ?>
-				<?php  echo $this->control->tpl['suppliercode']; ?>
+				<?php 	echo $this->control->tpl['suppliercode']; ?>
 				<input type="hidden" name="code_fournisseur" value="<?php echo $this->control->tpl['suppliercode']; ?>">
 				<?php } ?>
 				</td>
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
index b69e9e8370b..d25a9f36121 100644
--- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
@@ -75,7 +75,7 @@ if (empty($conf) || ! is_object($conf))
 				<?php if ($this->control->tpl['ismodifiable_customercode']) { ?>
 				<input type="text" name="code_client" size="16" value="<?php echo $this->control->tpl['customercode']; ?>" maxlength="15">
 				<?php } else { ?>
-				<?php echo $this->control->tpl['customercode']; ?>
+				<?php 	echo $this->control->tpl['customercode']; ?>
 				<input type="hidden" name="code_client" value="<?php echo $this->control->tpl['customercode']; ?>">
 				<?php } ?>
 				</td>
@@ -96,7 +96,7 @@ if (empty($conf) || ! is_object($conf))
 				<?php if ($this->control->tpl['ismodifiable_suppliercode']) { ?>
 				<input type="text" name="code_fournisseur" size="16" value="<?php echo $this->control->tpl['suppliercode']; ?>" maxlength="15">
 				<?php } else { ?>
-				<?php echo $this->control->tpl['suppliercode']; ?>
+				<?php 	echo $this->control->tpl['suppliercode']; ?>
 				<input type="hidden" name="code_fournisseur" value="<?php echo $this->control->tpl['suppliercode']; ?>">
 				<?php } ?>
 				</td>

From 716c2bb531b790afccec28da9365964224ad1af7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Oct 2019 22:46:34 +0100
Subject: [PATCH 15/38] Work on MO

---
 htdocs/admin/mrp.php                          | 522 ++++++++++++++++++
 .../bom/doc/doc_generic_bom_odt.modules.php   |   2 +-
 htdocs/core/modules/bom/modules_bom.php       |   2 +-
 htdocs/core/modules/modBom.class.php          |  15 +-
 htdocs/core/modules/modMrp.class.php          |  37 +-
 .../mrp/doc/doc_generic_mo_odt.modules.php    |   4 +-
 .../doctemplates/boms/template_bom.odt        | Bin 17591 -> 18723 bytes
 .../install/doctemplates/mrps/template_mo.odt | Bin 0 -> 18089 bytes
 htdocs/langs/en_US/mrp.lang                   |   8 +-
 htdocs/mrp/admin/setup.php                    | 151 -----
 10 files changed, 573 insertions(+), 168 deletions(-)
 create mode 100644 htdocs/admin/mrp.php
 create mode 100644 htdocs/install/doctemplates/mrps/template_mo.odt
 delete mode 100644 htdocs/mrp/admin/setup.php

diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
new file mode 100644
index 00000000000..f3121faa70d
--- /dev/null
+++ b/htdocs/admin/mrp.php
@@ -0,0 +1,522 @@
+<?php
+/* Copyright (C) 2019 Laurent Destailleur          <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/admin/mrp.php
+ *	\ingroup    mrp
+ *	\brief      Setup page of module MRP
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
+require_once DOL_DOCUMENT_ROOT.'/mrp/lib/mrp_mo.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/mrp/lib/mrp.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'errors', 'mrp', 'other'));
+
+if (! $user->admin) accessforbidden();
+
+$action = GETPOST('action', 'alpha');
+$value = GETPOST('value', 'alpha');
+$label = GETPOST('label', 'alpha');
+$scandir = GETPOST('scan_dir', 'alpha');
+$type = 'mrp';
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
+if ($action == 'updateMask')
+{
+	$maskconstmrp=GETPOST('maskconstMo', 'alpha');
+	$maskmrp=GETPOST('maskMo', 'alpha');
+
+	if ($maskconstmrp) $res = dolibarr_set_const($db, $maskconstmrp, $maskmrp, 'chaine', 0, '', $conf->entity);
+
+	if (! $res > 0) $error++;
+
+ 	if (! $error)
+    {
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+    else
+    {
+        setEventMessages($langs->trans("Error"), null, 'errors');
+    }
+}
+
+elseif ($action == 'specimen')
+{
+	$modele=GETPOST('module', 'alpha');
+
+	$mo = new MO($db);
+	$mrp->initAsSpecimen();
+
+	// Search template files
+	$file=''; $classname=''; $filefound=0;
+	$dirmodels=array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach($dirmodels as $reldir)
+	{
+	    $file=dol_buildpath($reldir."core/modules/mrp/doc/pdf_".$modele.".modules.php", 0);
+		if (file_exists($file))
+		{
+			$filefound=1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
+
+	if ($filefound)
+	{
+		require_once $file;
+
+		$module = new $classname($db);
+
+		if ($module->write_file($mrp, $langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=mrp&file=SPECIMEN.pdf");
+			return;
+		}
+		else
+		{
+			setEventMessages($module->error, null, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	}
+	else
+	{
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
+}
+
+// Activate a model
+elseif ($action == 'set')
+{
+	$ret = addDocumentModel($value, $type, $label, $scandir);
+}
+
+elseif ($action == 'del')
+{
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+        if ($conf->global->MRP_MO_ADDON_PDF == "$value") dolibarr_del_const($db, 'MRP_MO_ADDON_PDF', $conf->entity);
+	}
+}
+
+// Set default model
+elseif ($action == 'setdoc')
+{
+	if (dolibarr_set_const($db, "MRP_MO_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
+	{
+		// The constant that was read before the new set
+		// We therefore requires a variable to have a coherent view
+		$conf->global->MRP_MO_ADDON_PDF = $value;
+	}
+
+	// On active le modele
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$ret = addDocumentModel($value, $type, $label, $scandir);
+	}
+}
+
+elseif ($action == 'setmod')
+{
+	// TODO Check if numbering module chosen can be activated
+	// by calling method canBeActivated
+
+	dolibarr_set_const($db, "MRP_MO_ADDON", $value, 'chaine', 0, '', $conf->entity);
+}
+
+elseif ($action == 'set_MRP_MO_DRAFT_WATERMARK')
+{
+	$draft = GETPOST("MRP_MO_DRAFT_WATERMARK");
+	$res = dolibarr_set_const($db, "MRP_MO_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
+
+	if (! $res > 0) $error++;
+
+ 	if (! $error)
+    {
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+    else
+    {
+        setEventMessages($langs->trans("Error"), null, 'errors');
+    }
+}
+
+elseif ($action == 'set_MRP_MO_FREE_TEXT')
+{
+	$freetext = GETPOST("MRP_MO_FREE_TEXT", 'none');	// No alpha here, we want exact string
+
+	$res = dolibarr_set_const($db, "MRP_MO_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
+
+	if (! $res > 0) $error++;
+
+ 	if (! $error)
+    {
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+    else
+    {
+        setEventMessages($langs->trans("Error"), null, 'errors');
+    }
+}
+
+
+/*
+ * View
+ */
+
+$form=new Form($db);
+
+$dirmodels=array_merge(array('/'), (array) $conf->modules_parts['models']);
+
+llxHeader("", $langs->trans("MrpSetupPage"));
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("MrpSetupPage"), $linkback, 'title_setup');
+
+$head = mrpAdminPrepareHead();
+
+dol_fiche_head($head, 'settings', $langs->trans("MOs"), -1, 'mrp');
+
+/*
+ * MOs Numbering model
+ */
+
+print load_fiche_titre($langs->trans("MOsNumberingModules"), '', '');
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Name").'</td>';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td class="nowrap">'.$langs->trans("Example").'</td>';
+print '<td class="center" width="60">'.$langs->trans("Status").'</td>';
+print '<td class="center" width="16">'.$langs->trans("ShortInfo").'</td>';
+print '</tr>'."\n";
+
+clearstatcache();
+
+foreach ($dirmodels as $reldir)
+{
+	$dir = dol_buildpath($reldir."core/modules/mrp/");
+
+	if (is_dir($dir))
+	{
+		$handle = opendir($dir);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle))!==false)
+			{
+			    if (substr($file, 0, 8) == 'mod_mo_' && substr($file, dol_strlen($file)-3, 3) == 'php')
+				{
+					$file = substr($file, 0, dol_strlen($file)-4);
+
+					require_once $dir.$file.'.php';
+
+					$module = new $file($db);
+
+					// Show modules according to features level
+					if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+
+					if ($module->isEnabled())
+					{
+						print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
+						print $module->info();
+						print '</td>';
+
+                        // Show example of numbering model
+                        print '<td class="nowrap">';
+                        $tmp=$module->getExample();
+                        if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
+                        elseif ($tmp=='NotConfigured') print $langs->trans($tmp);
+                        else print $tmp;
+                        print '</td>'."\n";
+
+						print '<td class="center">';
+						if ($conf->global->MRP_MO_ADDON == $file)
+						{
+							print img_picto($langs->trans("Activated"), 'switch_on');
+						}
+						else
+						{
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
+							print img_picto($langs->trans("Disabled"), 'switch_off');
+							print '</a>';
+						}
+						print '</td>';
+
+						$mrp=new MO($db);
+						$mrp->initAsSpecimen();
+
+						// Info
+						$htmltooltip='';
+						$htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+						$mrp->type=0;
+						$nextval=$module->getNextValue($mysoc, $mrp);
+                        if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+                            $htmltooltip.=''.$langs->trans("NextValue").': ';
+                            if ($nextval) {
+                                if (preg_match('/^Error/', $nextval) || $nextval=='NotConfigured')
+                                    $nextval = $langs->trans($nextval);
+                                $htmltooltip.=$nextval.'<br>';
+                            } else {
+                                $htmltooltip.=$langs->trans($module->error).'<br>';
+                            }
+                        }
+
+						print '<td class="center">';
+						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print '</td>';
+
+						print "</tr>\n";
+					}
+				}
+			}
+			closedir($handle);
+		}
+	}
+}
+print "</table><br>\n";
+
+
+/*
+ * Document templates generators
+ */
+
+print load_fiche_titre($langs->trans("MOsModelModule"), '', '');
+
+// Load array def with activated templates
+$def = array();
+$sql = "SELECT nom";
+$sql.= " FROM ".MAIN_DB_PREFIX."document_model";
+$sql.= " WHERE type = '".$type."'";
+$sql.= " AND entity = ".$conf->entity;
+$resql=$db->query($sql);
+if ($resql)
+{
+	$i = 0;
+	$num_rows=$db->num_rows($resql);
+	while ($i < $num_rows)
+	{
+		$array = $db->fetch_array($resql);
+		array_push($def, $array[0]);
+		$i++;
+	}
+}
+else
+{
+	dol_print_error($db);
+}
+
+
+print "<table class=\"noborder\" width=\"100%\">\n";
+print "<tr class=\"liste_titre\">\n";
+print '<td>'.$langs->trans("Name").'</td>';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td class="center" width="60">'.$langs->trans("Status")."</td>\n";
+print '<td class="center" width="60">'.$langs->trans("Default")."</td>\n";
+print '<td class="center" width="38">'.$langs->trans("ShortInfo").'</td>';
+print '<td class="center" width="38">'.$langs->trans("Preview").'</td>';
+print "</tr>\n";
+
+clearstatcache();
+
+foreach ($dirmodels as $reldir)
+{
+    foreach (array('','/doc') as $valdir)
+    {
+    	$dir = dol_buildpath($reldir."core/modules/mrp".$valdir);
+
+        if (is_dir($dir))
+        {
+            $handle=opendir($dir);
+            if (is_resource($handle))
+            {
+                while (($file = readdir($handle))!==false)
+                {
+                    $filelist[]=$file;
+                }
+                closedir($handle);
+                arsort($filelist);
+
+                foreach($filelist as $file)
+                {
+                    if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
+                    {
+                    	if (file_exists($dir.'/'.$file))
+                    	{
+                    		$name = substr($file, 4, dol_strlen($file) -16);
+	                        $classname = substr($file, 0, dol_strlen($file) -12);
+
+	                        require_once $dir.'/'.$file;
+	                        $module = new $classname($db);
+
+	                        $modulequalified=1;
+	                        if ($module->version == 'development'  && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified=0;
+	                        if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified=0;
+
+	                        if ($modulequalified)
+	                        {
+	                            $var = !$var;
+	                            print '<tr class="oddeven"><td width="100">';
+	                            print (empty($module->name)?$name:$module->name);
+	                            print "</td><td>\n";
+	                            if (method_exists($module, 'info')) print $module->info($langs);
+	                            else print $module->description;
+	                            print '</td>';
+
+	                            // Active
+	                            if (in_array($name, $def))
+	                            {
+	                            	print '<td class="center">'."\n";
+	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';
+	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
+	                            	print '</a>';
+	                            	print '</td>';
+	                            }
+	                            else
+	                            {
+	                                print '<td class="center">'."\n";
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+	                                print "</td>";
+	                            }
+
+	                            // Default
+	                            print '<td class="center">';
+	                            if ($conf->global->MRP_MO_ADDON_PDF == $name)
+	                            {
+	                                print img_picto($langs->trans("Default"), 'on');
+	                            }
+	                            else
+	                            {
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+	                            }
+	                            print '</td>';
+
+	                            // Info
+		    					$htmltooltip =    ''.$langs->trans("Name").': '.$module->name;
+					    		$htmltooltip.='<br>'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+			                    if ($module->type == 'pdf')
+			                    {
+			                        $htmltooltip.='<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+			                    }
+					    		$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+					    		$htmltooltip.='<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+					    		$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraftMOs").': '.yn($module->option_draft_watermark, 1, 1);
+
+
+	                            print '<td class="center">';
+	                            print $form->textwithpicto('', $htmltooltip, 1, 0);
+	                            print '</td>';
+
+	                            // Preview
+	                            print '<td class="center">';
+	                            if ($module->type == 'pdf')
+	                            {
+	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
+	                            }
+	                            else
+	                            {
+	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+	                            }
+	                            print '</td>';
+
+	                            print "</tr>\n";
+	                        }
+                    	}
+                    }
+                }
+            }
+        }
+    }
+}
+
+print '</table>';
+print "<br>";
+
+/*
+ * Other options
+ */
+
+print load_fiche_titre($langs->trans("OtherOptions"), '', '');
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Parameter").'</td>';
+print '<td class="center" width="60">'.$langs->trans("Value").'</td>';
+print "<td>&nbsp;</td>\n";
+print "</tr>\n";
+
+$substitutionarray=pdf_getSubstitutionArray($langs, null, null, 2);
+$substitutionarray['__(AnyTranslationKey)__']=$langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+foreach($substitutionarray as $key => $val)	$htmltext.=$key.'<br>';
+$htmltext.='</i>';
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="set_MRP_MO_FREE_TEXT">';
+print '<tr class="oddeven"><td colspan="2">';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnMOs"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
+$variablename='MRP_MO_FREE_TEXT';
+if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
+{
+    print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+}
+else
+{
+    include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+    $doleditor=new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+    print $doleditor->Create();
+}
+print '</td><td class="right">';
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print "</td></tr>\n";
+print '</form>';
+
+//Use draft Watermark
+
+print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print "<input type=\"hidden\" name=\"action\" value=\"set_MRP_MO_DRAFT_WATERMARK\">";
+print '<tr class="oddeven"><td>';
+print $form->textwithpicto($langs->trans("WatermarkOnDraftMOs"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';
+print '</td><td>';
+print '<input class="flat minwidth200" type="text" name="MRP_MO_DRAFT_WATERMARK" value="'.$conf->global->MRP_MO_DRAFT_WATERMARK.'">';
+print '</td><td class="right">';
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print "</td></tr>\n";
+print '</form>';
+
+print '</table>';
+print '<br>';
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
index acbb2ae0b36..38358222282 100644
--- a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
+++ b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
 /**
  *	Class to build documents using ODF templates generator
  */
-class doc_generic_bom_odt extends ModelePDFBOMs
+class doc_generic_bom_odt extends ModelePDFBoms
 {
 	/**
 	 * Issuer
diff --git a/htdocs/core/modules/bom/modules_bom.php b/htdocs/core/modules/bom/modules_bom.php
index 45bca8a38b3..f8f29fec2e6 100644
--- a/htdocs/core/modules/bom/modules_bom.php
+++ b/htdocs/core/modules/bom/modules_bom.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';	// requir
 /**
  *	Parent class for boms models
  */
-abstract class ModelePDFBom extends CommonDocGenerator
+abstract class ModelePDFBoms extends CommonDocGenerator
 {
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/core/modules/modBom.class.php b/htdocs/core/modules/modBom.class.php
index 1700f15afd7..47daf430873 100644
--- a/htdocs/core/modules/modBom.class.php
+++ b/htdocs/core/modules/modBom.class.php
@@ -189,7 +189,7 @@ class modBom extends DolibarrModules
         // Boxes/Widgets
 		// Add here list of php file(s) stored in bom/core/boxes that contains class to show a widget.
         $this->boxes = array(
-        	0=>array('file'=>'box_boms.php','note'=>'','enabledbydefaulton'=>'Home')
+        	0=>array('file' => 'box_boms.php', 'note' => '', 'enabledbydefaulton' => 'Home')
         );
 
 
@@ -203,7 +203,7 @@ class modBom extends DolibarrModules
 		// );
 
 
-		// Permissions
+		// Permissions provided by this module
 		$this->rights = array();		// Permission array used by this module
 
 		$r=0;
@@ -228,7 +228,7 @@ class modBom extends DolibarrModules
 		$this->rights[$r][5] = '';				    // In php code, permission will be checked by test if ($user->rights->bom->level1->level2)
 
 
-		// Main menu entries
+		// Main menu entries to add
 		$this->menu = array();			// List of menus to add
 		$r=0;
 
@@ -323,9 +323,8 @@ class modBom extends DolibarrModules
 		if ($result < 0) return -1; // Do not activate module if not allowed errors found on module SQL queries (the _load_table run sql with run_sql with error allowed parameter to 'default')
 
 		// Create extrafields
-		include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-		$extrafields = new ExtraFields($this->db);
-
+		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+		//$extrafields = new ExtraFields($this->db);
 		//$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->bom->enabled');
 		//$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->bom->enabled');
 		//$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->bom->enabled');
@@ -357,8 +356,8 @@ class modBom extends DolibarrModules
 		}
 
 		$sql = array(
-		    "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape('alpha')."' AND type = 'bom' AND entity = ".$conf->entity,
-		    "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape('alpha')."', 'bom', ".$conf->entity.")"
+		    "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape('standard')."' AND type = 'bom' AND entity = ".$conf->entity,
+		    "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape('standard')."', 'bom', ".$conf->entity.")"
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modMrp.class.php b/htdocs/core/modules/modMrp.class.php
index 53f778d063f..248179b5447 100644
--- a/htdocs/core/modules/modMrp.class.php
+++ b/htdocs/core/modules/modMrp.class.php
@@ -58,7 +58,7 @@ class modMrp extends DolibarrModules
         // Module label (no space allowed), used if translation string 'ModuleMrpName' not found (Mrp is name of module).
         $this->name = preg_replace('/^mod/i', '', get_class($this));
         // Module description, used if translation string 'ModuleMrpDesc' not found (Mrp is name of module).
-        $this->description = "MRPDescription";
+        $this->description = "Module to Manage Manufacturing Orders (MO)";
         // Used only if file README.md and README-LL.md not found.
         $this->descriptionlong = "Module to Manage Manufacturing Orders (MO)";
         // Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
@@ -113,7 +113,7 @@ class modMrp extends DolibarrModules
         // Example: this->dirs = array("/mrp/temp","/mrp/subdir");
         $this->dirs = array("/mrp/temp");
         // Config pages. Put here list of php page, stored into mrp/admin directory, to use to setup module.
-        $this->config_page_url = array("setup.php@mrp");
+        $this->config_page_url = array("mrp.php");
         // Dependencies
         // A condition to hide module
         $this->hidden = false;
@@ -135,7 +135,9 @@ class modMrp extends DolibarrModules
         //                             2 => array('MRP_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
         // );
         $this->const = array(
-            // 1 => array('MRP_MYCONSTANT', 'chaine', 'avalue', 'This is a constant to add', 1, 'allentities', 1)
+        	1=>array('MRP_MO_ADDON_PDF', 'chaine', 'alpha', 'Name of PDF model of BOM', 0),
+        	2=>array('MRP_MO_ADDON', 'chaine', 'mod_bom_standard', 'Name of numbering rules of BOM', 0),
+        	3=>array('MRP_MO_ADDON_PDF_ODT_PATH', 'chaine', 'DOL_DATA_ROOT/doctemplates/boms', '', 0)
         );
 
         // Some keys to add into the overwriting translation tables
@@ -312,6 +314,8 @@ class modMrp extends DolibarrModules
      */
     public function init($options = '')
     {
+    	global $conf, $langs;
+
         $result=$this->_load_tables('/mrp/sql/');
         if ($result < 0) return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
 
@@ -324,7 +328,34 @@ class modMrp extends DolibarrModules
         //$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
         //$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
 
+        // Permissions
+        $this->remove($options);
+
         $sql = array();
+
+        // ODT template
+        $src=DOL_DOCUMENT_ROOT.'/install/doctemplates/mrps/template_mo.odt';
+        $dirodt=DOL_DATA_ROOT.'/doctemplates/mrps';
+        $dest=$dirodt.'/template_mo.odt';
+
+        if (file_exists($src) && ! file_exists($dest))
+        {
+        	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+        	dol_mkdir($dirodt);
+        	$result=dol_copy($src, $dest, 0, 0);
+        	if ($result < 0)
+        	{
+        		$langs->load("errors");
+        		$this->error=$langs->trans('ErrorFailToCopyFile', $src, $dest);
+        		return 0;
+        	}
+        }
+
+        $sql = array(
+        	"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape('standard')."' AND type = 'mo' AND entity = ".$conf->entity,
+        	"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape('standard')."', 'mo', ".$conf->entity.")"
+        );
+
         return $this->_init($sql, $options);
     }
 
diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
index 9beb300ebb0..0447694465f 100644
--- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
+++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
@@ -27,7 +27,7 @@
  *	\brief      File of class to build ODT documents for MOs
  */
 
-require_once DOL_DOCUMENT_ROOT.'/core/modules/bom/modules_bom.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/mrp/modules_mrp.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
 /**
  *	Class to build documents using ODF templates generator
  */
-class doc_generic_mo_odt extends ModelePDFMOs
+class doc_generic_mo_odt extends ModelePDFMos
 {
 	/**
 	 * Issuer
diff --git a/htdocs/install/doctemplates/boms/template_bom.odt b/htdocs/install/doctemplates/boms/template_bom.odt
index 344fcfa391aefbfef2b4ae85c5436e6c707adaa2..9eea32e4197b0c004fb2526d014698dec8ff194d 100644
GIT binary patch
literal 18723
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

literal 17591
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

diff --git a/htdocs/install/doctemplates/mrps/template_mo.odt b/htdocs/install/doctemplates/mrps/template_mo.odt
new file mode 100644
index 0000000000000000000000000000000000000000..7545fe73a34c2f77834937222d35bf07729281c4
GIT binary patch
literal 18089
zcmb8X1$f-Zwk>Ro84`2i*fBFRGc(6_%*@Qp%*@Qp%*@ObGgF(fUo!X2n>pvsIp6<p
zeUhrB-b<xjt<u)g>XMZJhd>1Zfd&DYEZ36J9HfUQ0RaK|J^$JSVqs!oVDDmWpkr-q
zZlb4SZ(?Oh<7lZ*ZKY#pVn=OdZD6TyrRQK_U};ZnZ{Tb%`!8UNUfCS#-#|cq&zQf!
z6pbA$bS-sE%<X9G|145lTN;JPN{b-Ceun+^6$CL+LHS?n1`rTX5NPmUrQWxpV-OIq
zXIV)_AvIlVBTXGgQ*{G93u9{+M@v&j2PZR^P-hQ6GrJC3iw1svpq3U;%>byY0d)50
z)z<^+n*vRZfM#YuBWIwg9niuRXl(?vH3zy_0PXF84lY0!d!U;$(9Ji*B{<p5cfc!p
z%F!R_>I-xa2L?J@`g?c;cm_mxw)!~${oR0J9>8E9x0pbWkig)O@VKa$$k5o-_^{xF
zh}h(qh?Jz{(B#69jGE-oj->S5xUA~Tob>d(;?$zrteV!m#L)co<l3x=yo}tE-1O?~
zsQRLm`s%FWqN1Ymx{B)Z^18;_@}k<xnugl4x?k4V($L&c-_q97P}kDf+SXFv-rgP*
zG7uR%6cIBLm^c$3*`Jg+8W;!+2m^-s14F}r{xQJNIACxxFwqwn7Y<Af1IEVyV^e`?
zvB1=HU`F<MM&5jKHZZFcSdclE8xPFO1eT`*^KvGOi|0!l`^sup8!Bd++WQ(Bm-F+0
zxfQ_DJYZ=VFt-+1UJtBj1J)J*Ys-PH1;CanU|ZME`g&kPJFu+|*wPAY@9wDTnQ!kM
zY8#lX=moY89@X{&+xvi>W5AyJqQ3U#>GrbT&hEbUm6@)^p(bE&J8-5QIMmxdKh)mW
z*Vj8RGB`XiFfuke&^tUdJU%ioHa0dqK07%*F+Q^}J3c%&y0ADqJ~uZ%x3IFXys)sc
zwz4p{ytKTwys)~uIx@Q3*9RQy0ZxnqN0$!zXMkg~z_AtJ^yI<90B~jkxHbe_odC|v
z?$68|&9CjwZk((v9ItL{udScW%mU}uf$MX?wau%IHQ>_r#^m<Z_%?8T`(SPdu(12O
zz7JU218$t$te-w@UIF))Mt3%ruQo?^SNHbTfJgJdqb=b6_WJG7>dW=k;o;%l{`KA=
zaPJhbd+~C7aDBQ1JUzQPJ$u`|zT3HeJiod*zkNP`dIOvvU+n<_7l7*{-~-_7=H>=)
z|8)O&fA{qAbbs@5_xkd5_x}F=>k<G0fuvZXMj#+xvBd=W6rESkGd!Zd>}MR>wK-8b
zskDvYNRW%%i`q7Qv4VEy?5nq{W%Scsxw(ZiRpmz-pm$kYg@FDMlT>2@Mu@GVQ?sGq
zAHFEt={WZ3#F6D~_>(EeY4s0sT7CJn^1420cNYAX*+)5lf+EIay@lGrw^utEGfmDw
zJRR`w_+`|2$~-a;S4yW#S%)uf&n{}0_?P|r8XgP(JXsk(^%PyS8D92Kc)9KuS+<??
z0Sc_JyG$>YkmAfPfCpcZxEx<L%{&_)xQw=L0;)EESr6QR_g&yA!w`=b@XhObYZ&AG
z#BS^Hh-dTqCjs!dsA=PU+{^2#?cuA}-doo5;HFt8;Jl3cd7>i=xER%ScXhtxew|Wg
z`LalY>j|{*x@pMjSU7yP176L%czP}vRXz?|Xt_tbUp$PU?IA_RJ-oe+KD=*v0hIuq
zi`QN5m$;tW_m}JUBK13Mmt2n|z?)E>S9rF^%qaJ}R35g+A+3%b;KsF<X6Nn$5P&=U
zL;)OPi3ASuysuFpYF<y{zWq#zdd+%x3o3iR7^U%e@0fb+LGuE3T6HaycHK5PaXMZ-
z>SeX>4nbYE0f(}<UykdtSRcoxxL?P?qd0F8I-)pVAELNkM`*Ynr=xHmi)5O*+_s*e
za9sDwni`NUJdW-MWX`zS9&&<kU9O6Nk1Lm))~{LIZ*@~VH!ZtbFMFF=JdQwtt@j=+
zuB#P4t(Sh4PP-QZuj_#hC}1V-((ksqbY5so&TvEzQPJ4!FN_%#%avZ=w}^<o2bfx1
z51S@PFq3Ll47`^;tqSA-g^k066rE8HKU30r&!vIMh;RR_uZHHOAf<F&0%L{-p^*ed
zrz8ip35BX51zDFBeVoC={IskAiWDr5LQ4q+;e!S;mI=O%OcGjSJ^ho{T>OJ%b_U3Z
zF{S<7XwI2FLo_n48;O^LH^i2|siDsXHm<5RxWzWR<?ML%b~vhu^HL-<w)W!{GIX^C
z-7pNnw{Fnxv%O{vL`V^yaX36AXq!WNLlz7j+chYV==Ptq$mW4x(Ytv;AnYVbm%(z1
zL7Eo?3ZjREd<3<>r3>1;oQIelFI{Z!0ZzeqFSH_lhoh^-wCP+{ya`5)D%pdin49sc
zYMGz>^D?2eJZrI?0DPK$gQkiFecGUOI9(Fb>+wQ>8BN>k$+nlBi}km;8!Gm7jBtVC
zvo)xPg8X>+hp*n%hf_=k@h0o|5@XzgW%lDjizbvy%ntmCuPg>qH{ncCHaY=cFu3tL
z*lq6?#vr>o;6a0uW$j%v({8hu_Zo-018Bb^3W1WG(A4x1c$e|1e%-zALR}wq<%@wE
z<i#(R@9IgTO9AIw{0OcKFMLqkqb-PO$Pd=;13BU&J4)IvRhkA$#Fi^bZqkXh(qT>T
z^N|=%@5Xy&^xNiMtRLtM6W@007cEXyIO(iR)OcCuPuSB<>OFdJF=9S#WWpNp!$O3g
zBH*ywWCF#ISMYtm^VU1RoU<=|NeMG~mUqvPu=TuHAS!rXB}?v9Y<El#JZ+VpFk!8n
zGj=&{J!G{gYOn^I`#j`PaG=;>*l_%*PT0wMuEUy%yc`*Mz?qT0JHUloo}f=x@~3q1
z!c!b0uieW49xeJNF3xAV;T$;~@1%G~8d}1r`cN)~Mn1kV48<RUPm0iT(Ug*DE_c}E
zdA^WWAN4ccTg}x4hN>6g4pUoq_TvsUomEH5uf#+5nUu|f>wauHEGTmp7%FOrU6~M7
zlrqWirXmN`DQAk3@zu_f4vC3T#eG819YLec+|hcLd+-p&t|cQaD*PZwOblZo104be
zcQO%JR0tuLIIpiCulI<$H<Gh4lG9w>2BoO*V}YGw>(+%K!NI>^Tf52(GQ-`XpnU_p
zR14+sN!(%~-#i<MN}y%^g!&2phot`ubRT#O#(}W_1|;YzeO<B{nPD(EodmRvKs#H%
zNKuK9ex5*jw;up*Ls4TKJ4SMXc7az~(rmgUSXN@dj&+wMq6MF-_6k%LNyhXC@j^En
zVkt{5Ke1Wo`hK&fWi*AS^?Yi?0<&Gk`H#Zvu86b+9GlYpaKkm@LHP#v8R6m!6RfgO
z3ot3AAtJ^!1qY6-vg`pOsWGK}9Jz`s1-#W<k^oT4<OuL37VFw7b}Z1iT<AECMp$q;
z6Ao3dn&R@?;FALM%<J{W)578qTV!fh>RXPF6qV{f?B8II*u$iA%$JVaR&eCr)KHqy
zIVvK`M#DOOKH-;NKJ~)mZo9~GO<YC8_1oCX(Sc+Cq|!;N4*0648p>ru&iUy8L)u=;
zL5>4oRR&9$I-7_-)t63EPf6hGnE~VX{*rL?%vUqjpvm&W6>+sJo&~s%wO|})O@5tE
zTDZ4$r`3n8Uqs|phMm3(K%V3%F=<ia@FDohLYgR3a-8P~vsE0(mE^BrNewjm)Ao>B
zVGunV#NS=S%0TGm3UubkeQcg+PKN)GE9pZtFxWmkSZF*s2GEl<K6`$IiOr_P)?04=
zIlQ6hv3VYCH6lgTDnU(@C85R`WnY7fJyGf=U8LIU;-pjSu-SmUSFbTu#k{VDbYD^_
zT+wi#>xD-6k*tBn!rvP@_-XIU9s#Au2uX+-GBT!4{CDA4oxVA;ycC=-n~AYM=MO%D
zUd3E_#x~?ha*hY*aEk4-Iwm(9P*XkG3pCp6@As<7v!I$Qv={7QmwzS2D565cxtGZ;
zC0p_JocE<CG5IWSVWzCGke;tPN75j!rT}kO<F<EWx@qcnRG%KUD%{>`T4~U8`e{c(
znw#k`Zt8X<DDqp-H?)!gwH9&h3vbOC3K1P*qqUVY#vX%~=+W`6Wt7aQSebB#;UR!_
z4U923PNlLT7gGy3Z-}j>e;arF?Jg%fw4=GYa}JbZ9Fb9==fq*+e4s??Q>awS5+G5%
z-_a&Ucx2W^)Tz7qdx5`s6M2QEYzOF+vTnmVAK-(9ww?o0*_*4Zdm8~EDrh@0MlZPg
zGD#Mc|F__DRw_O`>}jfyZV1dxD&nW%>BbswQV2Cf3R(Ka_O#rXb3B2Q(39LqeK;&p
zI9wm@C-IaYl1tKw49xrKS#qU9VTDEp8}j^x`rjJlXVFGRWd%PIOR~&gxN(bj-rH(z
zKHXVti8n<cb&2aWv{kkJI#HS}JY4?y(*@21CdP?sQ?%DvnBv?}OA}jZ+wx=|F)<AL
z{3FPgH5I*50dAWBcmA<3THk7=a77vALpaG`3b7qzj=^yHr6Ksxkt0J-^El6tmui;K
z=*Tt#%S8*62jhX+wKA>FEl}fU0h`GTZei8$=6Qle8<tupFI`sN?yEv&4q+{Zplws9
zilm=DvB_zFU={BiP9F;Bv8TIu2wJE89AK{RT*lg{1idJxZzi7PD(H}+#u}y>MLbRV
zWSp7cXWR<TDb7}>`yF<e;uGX%Iap23eeg-x$YFWnQ<C}<*j3^Q#=X<J^21a^6laHa
zp?)8Ks`5>3YAEHlkU5H~m>fqjS}kpa{lFr6(kyxf+!B4h$Z(Uy^0>wQ$Pzr^V@}Vu
zNhy1S*%09uv|WYm3OyAOB3|^ykevpf)Ay!z@Q*u`c9askJyhjgeS8AoG>7$`tQ-vc
zDN0GpewkJQt_2ac<aHHyuuouL0W&|m_4<n1X}{<^hAzuWet=MggZGsp;1IyuhWI%2
zq0*?$+RQ1hEC#IdD9(!G&K=dd(E|54{2SAGcuu1AB5zE1t{ic0sGQ*7wkBRy+pk!0
zTLsui8_lWKxl^oM%<h;r%t<W>DJ{e#P8H}QsA7q8YvTso&fBR?RDKfku~n_3lAD|~
z9rZD>W%thsq$f>e&^pUC4afo<3v*>vOLBLE3?iq12y~Q^kT_LavtYM*`lmg2C$ox6
zGx$hd3uvn|E-NjV?TtNI=z(f+x&{soh-)Py@wgX$cXNOea~g57+<0Mjgzh*&*Syu_
zLQl8kP|{t5<>KYe-1Pv^VUH=MwS(}3;qIY%yzd==fC%5V^6DGgn=6Qti~zLtlcf-W
z{1-3)w9t6>P?^p=HD)qg7xCHS7Uuf!(4w$Zn_wo{#dKk1p`CGlVkL%Fna)Ku@inZj
zoitvf0FSZxoAlL_`)6xMYQkPC8YmY0tlTf3NBNACTQ8q-*+bQJu*_@}$gf3;Cn~$_
z`Qs}{VnX#HC$qnQKxxqT<&@aSl|?QqaRyCkkdWk#$q1#|+SYc0v8W|LM#+=RX6y#L
z-}UpwtkyUsWWeV|d1PS+14H59i`U@5%>2YqE3}D^2)RslJzo$R4Y$XkQvCgke>o4g
zc8gK@@ls;y5t9l*XTQz4tLNv<<8`yA>@q|3TMw~2tqS3>D94?Q(=%SDlGLv3GRT%f
zha`9Hm74%4WzH?yp8-<lx?A|tl;rr$I;gOWHqD6}Eli`7u~9)H{a?I`JF^?xBs%ks
zb!)WMwNu<3sWVth@xDB<(joZI?ibxKhhmC<D6kocZN@qsspTqiOmUaE2$<yDx^e&{
z?YjpMcTC)?Ss00|V=c?yrB{|xU*sLAGT71<rmgCTcS02H_e-8!=_^>3eU?11kYah*
zh_BiE;Tn_gC@vCLN>4VXp;U1N!#vZ{^yTa42sjHX=Qd1)TG?c76=GOa6iUfZ+Ln~A
zZ9OsG;mDuNE>KCj2n8D(&^A}%;-Y%p_gq<x#KR^Z+p%HMCqASyJRUbxGOlkl-w&-J
z1DWmILYfalRFu>#9^9|1y_yC~+dQ)j+(sOZao%M;+>cPXa`6w_B)Jza55t7|Jb7?&
zD_#2LK`ajh)g5)Il=euU1U2`VYdClg;;clvNwjt#&gh?zXG0x(guAmF`72P}0bB<0
zH{2AI1W}Ax?gPO#!L}a>B=!wMT?djU9Maq?;3_AA81KmrnU$TJ__@6nR%!&er%aqu
z++|0OQe&hB=~ErQSGd7M&yYUFj}#un(daCv7V^>QjRq-YxwpxQE9r~<N`iF7m}C68
zp8{30+~JX(AXgOay-=FaFlDaDF#V=UaBoL2Fy+Xe9_0$w-rN_M05Q^yZlFk~!%Kh(
zJYlm2qt?>Z8zbvSKZGQVo$YuYyFAiGll-)JcPcOA$U6DcxXbiY>T0_d>NqRPY6(;i
zfY5ht{*j^3bwh3)W6a8E8ob%q$V0Q3jGh?GJNLMhi^hn3u+jK4tTyQAR37mWBY6Ox
zqHt$WEdWxSo5O1DV`>%}L%ciGck|<f-tt8YKm$$ml#|0Djc=-(&H~nT?W)VUqmn~_
z>oJzw;;d{BH9?y+V~*@JENn3|oCT!GDrKXEI>SvpTdjJ3dTKh;jiGj9+q+r_iFdMp
zbZpf2Tg<qCIp=6FvZ$0Gm)4K$%qoG-C@=Ux4?slk*B`d(?QJ&a?2bJSCsHEiIzuxQ
zjec=VMF*^&NmeZf@rLXTC2T*+_ULSBPZz%~nXG6;o+6lQ7a?f1z$t7V<vU7xA3of#
zY=j_34tkS{@bRMRw#(kIGWB?SY)^j&@!deHDd0u)Wu5raobx!(%*HN|3#I!}I92z1
zG<?kl7Vgf}Y__m~g0CrKh7W>B9!zritd}g$36B6?+M>O&>3jigoI+bv{t-@K={g~a
zUahVi?sA1^=d&82v(h2|)Y5DKSE7l^@%mN8((niUGq5M~EO&N|9QnSn$wd3TgcCU1
z4>SJoO7x@}3<zs@L}~12;#T9Mdnh^kG2?Px-nM;V5V;}IW=n^9=A7kf*kh4G!rbFV
z2w+aW7QF>HK{xDsb`+3Xm~0{Jjx~HEhg17UwEZRcQ#R|aLX{j2Wr3uK8^U&t7>Zpe
ziCgFk&5D;<r=2Iir>*Y|CP&nR7HH~trqxC@3Sw9Y;p!a~&s8Krft8)@J?8HjNWjyv
zBF_iF_E=-Pnf6V?Tt~&~Dk?mpxsQ5ar2(_mM`nx7c7r)yZRfc?4x-App88WjqQl0?
zBY(}|t?-YbIC<iNuo~e3Zvd*>Cs=oYKAV)b_)nvH2wl7so|x2humum^)YLdP{yRJ|
z9R=TEf!c2$n)8vtz4cBHe}JLk84|XT(#*&ZU+Jyw>TSzSCb$vuE6-xQC^@O6HwZR0
zQ<HNxktni|onaS6mKb{1L>w=gBcQB*XVp>3FwHw=Rf?Tptz&jHLpx)f*OaZe;wPoH
z#+%0H5FGB7jfaepB~VG@!9s+=u7ckq1j7rzni2fw+PBy~4_8{FF>B7KkX}>6<`<J8
zQqb-(9~BKoUK|<uu@P=KlWKA`p<ZL0Mb;{2D(Z5-XrjC!{KA$dVlAL(^z}2~T>Nn_
z3{U~7IvQ#^E;T_$gu_pTP?T?yyQj?w`PtU0q;PLnL5_|%23C?5q}C#dR7mdAsCoRv
zyYFzx@K03M1-;UxVU<EY*&i1T>ZTPFf;6Ax=~g#DH>+f&EN}ue5cHB1-z)>>;iM$z
zLp3aB`JrAsDj6npnVm|D6e(W6lOi^sQ_?-<Bd?;l<mgh4jAZzX=<A1}5`?C&)3K+s
zyXF=t>a8tO46MXz)EZGR*M_}IX_T2CN+*zAk_$a=%>{;3B)L&mzF>Xt!YIPU`#Yc2
zbyq6q(kl3h)5%#<z9}KtQR!NA&7p!si_P&9!D1B~Y{?4C5X;ayd?nrFq59;>SzlXW
zI2`=4l?oIY?4#k$!c5QbmG|u!j<SUWEc}I^yeY1~^%gg&K=Cv_DVa1<*<j2b%sT$2
zZ7!lsQP&6gfgtu943#3Z$2a{9EJfn>X)JRp+`Xwv;sL<(8r-BBTZgE!tG8mU<&IKg
z%FO2Y0yH8WJgsDR9I3Hw(oObAC?5q3H7+W69}^y`xL_kCtfXi-L_4jv<(?N7jBvg{
zj!rjxD4(Vd7-(;ZLXuC9n!KLX@}NKX&iuPeA_AB)<|e+|83HA8)tYekmGvX|E2=;g
zxTQPUWbD=}i%ep3d9V62o`Bk?d`L_``M5w)tU_Vb@3SFbf{`E9$*^F134N|n{RwkI
z5bE$@YDvLtJmr55<82}i#yf(M1h6TkL>LxzIKzt0h{BH)JzPRu4+jet#>%6IiVzLR
z?iVt8`MUM>;cjA9rD1TzQ@*f!y+(NU8GOb(DZ40fSsuJd3yCJ$z$LmsK1|<?nPog`
zR4H0ZovBmF`vfWZjr@`r7MErKMv}14=Ub6D;ec4lrUCRQ5&bgn@cipX1JjYkqeh@U
zZbkI5>Vnygf$~fvXS4M_0h6nugAn)#{OoLg@d2@okLbXsV6)+Q7;&<|^}N!$Tx3L2
z`iR}^5)K9k;<#_9{-3F!4>i3zP8Hv<AaT@=eF1#~xE`0!3XmOYRi&Dvva=3_UCk6I
znM|vXJCpiYRX2F`n+hHL+#!SziE=5axo!&D(YSh#C2aWSh=h>bP0MzrbhC*gB$$qf
z4mg8FsV-km_S-E*m^Ory>;dyUN$wb56o60Pq+c441Rp+g<)p^a@Qsk5#LJ<yt^z*A
zmXB)-5=ulP9=b!2i!@<G3#PJ+Vi^dZ;{giDj&kL{Bh+_5YsbYhNPHZw7DvWOA)G<&
zOT)8G#X>8hJ|16U;pJWi9S$HNsh9<?f``|V4oEub$Z1WnL4P}Z;drli0Um3=?>!Y>
zFtP_AOl5t)H0coUBus+;D6xJX9478giTy=VoN~n1!)MXNl5p*W4zNGrf8o|%B)wCw
zA=r6c2is^k!n6T^YQyDy6uZ^GjJZ^DSNC*{wX-=`)hiu~cQ2LUmXP3WnC8ob)D33m
z)jbdtOG$K<Wg^ldjLzeg2m$e*tsn6jK?O07_l%yeq#Y|v*t~UD4swS&GIM0YcQ>TO
z15z4^HDD;Q7@Re}71ir4l{AswAF$7ztWDOZIn<o)*!fph^YE!TOts~cc;<zE_<)j}
zYmrBvjc~rhYr);$XN|Vw(r*y~3(Bp;!G%v-Lr4&}hsmIOJ9z1{VklmPr$}icS~n*u
zGEDwhvE5s*N-8!?{-s!Zq_Kc2BHE*yeSx40O1Z<CP}vC4gCykoM55|q?qoc9FzIvP
zmuMQO!aV|1Od?Q`Iki@cf$DDwO~72%n^~BIv0^$ZC9}^XjEp)7f(~e@-K^6V3v6_-
z{A{0>7D2EBL35a=Li=)HlO0VNYXz)BJLuHSYB`{GXU^v_Vg2ani0``Xe3Q7eYzD>?
zsQbgV1evpL&NoLPq%c}EOsH98&xf05ER{o=rtUc4HJY|t1_Ia2Y2-#*;Nt3|8=opq
zb_%uBNf1q$(hFxa078)Bonp`XVcRjow<csgXK;Zo%F$<%MN3xd$qo8o0ep0vP1RnZ
zK03scaJH>wr5U~nw5CU-{A!b=PXh9CLUV=yNFJDJ@$X^k&G90`k{IRkFf-2tD=Yjn
zlMm=mi*}R1b10|2P|G-(g1tH0`I{0|<rE@uSO6qi;Q?jZaN)O-P)3JP(%27VAVRA1
z=1ia4`n$-RL7!s5h_r<9S4f#WnDB)ai|OfpPVY%b1-g(<GiMN{U_wO9^~fcYA_+Tc
z?PxVTqWwyzxS<MYMv+7hi+rwU_T86UEj3<NG#0*B&ab_D&kNfH;!hV$PNok=u4N-Q
z<@u!Tv(26x<e4Ys?ajRzMtupFR1Zv&MzrIErWEyW%RKBWobfCD`lY~ri1eGF&7#Rm
zeQiX3ZiGW<pRWda)(PLjm!>J|<AVJr1NUGByDgv6q||e#>=P$L|68SpKPKRq!uig#
z*=tbKPL_&mrm^Pc>p}+1#o*dSnFRJwhQ&{Dz1_YahYqh(AM%i$)B}|r;Pv^K;>55R
z+bXEc8!SS;ACS_`VSZ8Fgx42r`zdCKr&0OQ93w_roMDB3ZqcHGHG%-LwNXNr3R4_3
zHJ4p)4_+Q?*P@R)q+eKVbu|8VE-$EmLx*FpJC>|uB^-Z^F6>}pK-J*G)K69`qcfIb
zc8GXB{GX52q?Y2glGqRt0iewkj%uqlU2N!>GayZNhfomA_-?(CNd57wHO>dCk8GJJ
zPms*4sGp>T6z~kJHS@;|Y%+HXJ&^+CL1T)&O5Zho_rHINfKb&$&Yx>LY<Y|MAki$U
zh{^-sBG(OxXZ^~vfc<%|*QVzB!^WIBLzE~=!kIiCr)rIbznb*(v8wBbGpyK(o!Y?Z
zxK;}lL$1@2?&*5@K1Ub=T|Ip_wh7Ns$FFF4agNkpj8Oohmy-05(EwkmE=ur2iqH7N
z^A?KQVExoPBt~2j%Z(W{fd=Wq14Y$*!1+1mp5@EUZs2R#^-^0G3&Yg)f(PnmTJz^D
z*6Xvnh1HcyE)@bJ9Ix9IA=|0-6t^g;`ck7(C3%OkyAu?iXC1Sh1lNYUQKYO#!;0q)
zw=AG%g<2Jlmet1x^9E_nmWR!2J(PztHi^lzoS^xWg{*c-ByQnhyE}$0piYM?%|^@f
zBK=+nmlro3ogCNo*~YEcThGwpMax5F2v_}HCKC7cQ4Pt3>+MB|-YyDmE@V^Z>-^GX
z=HpF>o>L4-CwJ#zWyp0^+#zvid(i9NOwneC^O6h>k%Zg(+4Z%a+tG|uRF|8sZ*&L;
z@U*`lisYWti{x$Bs^ny7h=<YhCc|m#<t~H+x9e^(?eZBgvFj8WwZ(38(?)V19_8gS
z)#diE%M!KaezW0r(Rn(>ZU2w~bbQ?m3AuK&YH@IPf1NQJI_{jpeE~dHI7zMBE!|9Q
zy53}<>^80QBNa6?VY_*{zh2n5_GkQtp?^p$wOr6*vpXAKaeb4_=zJVoVR%1HQ8~%*
z)!VA-nq8?}>Ut1pZFzk+KfFtjrrTguud2fKaBL~=RJJ~NGBw&bY5L<G&EHe9e=l1(
zKLM{EPy)$_@&$gqF$ED5k`}Dw*Y^EaLBj7nf7<6?1pzBdLlYwh+dp&-cJws%R#xWL
zI+h0JH2>M}w~*oA{eI~m9CUST|BKf@9nH>O$KJv2FF$B#=sz?Vf7bB#`nL|_-;buF
zr)OYp@T<~RwlsPUwzj{;7tR*u;2^RRP`@=BAYi{2zwAGs1op4J{|;+yYh`3>VE4BQ
z{V59h1ML4U{^>-lt*jlaf5+gz1mK^-W@v7uV{h=^!iM_~^)#{2F*2~D;Wx3j(6P4r
z|9QyYE&Sgj4)^PjdRCV9|2L}V>K0aOte@UHyZEQU!qk824>-n3xl5r7&26HIrs6xG
zKTKp3jT%yfu*cS(X`Fd&;oa$uCSs3H7FyZ}&1fJP;UFGH2#9;$ozlZrKpLh`KaO5J
zNSnhA;oOOFw$<VeU8cjmES=(N&V2iZgYz^mL4XZ6lvm>oRQvYzMvmLnpokJjt{(<>
zfV9`0u>GTy^$+m~`-_-ViX!V8*oXnNI%=vb`D9p$%~Z<N)T#1h2a~LvamDWdUpa?s
z?^IYCmm>(&avUPjXauT6ypXORD|UFXF{g&Ai(`RYqlT710AN-rFQHd+ASs_x@ki(3
z4)WMY^V;RzMl4G&Sjq{Bi$lT=W2&y9`DeoEM3pC9L+p=Xs$nMWY`TLrImxFNU!M<t
z&8_DC{p|xJ7#CmROT8{EmukB4=UND@CKPc9LayoUEHyIa)k?@A0T4<jh|<#18?UOn
zla94U;n3rZj#eaXLHt#<tP!c<AKX1KSh3rqb<`j`86m7bVm3cn4~)Ml9|1QvJOKx+
z{APv##ySCAYT5Qi_&8}}jpLLtYyOmCc$8!e$*aZeSqtjiYOala;}Lef&aGkC6L<|#
z4^d7dKI{8Djk3Kq@Eu!%Z;Gn!;(~O?4t7Pn!2SeIrOyJv<zbv@N-wg!bC~F$ZYnyw
z?UJ+vw$K6M=86K-dEEJKyy$L8fwB}w5J3h5#fkIK0wpLm(BDK+Q^OgLpWnN43$W59
z5l^7fg1-dx?z)qv?&!S!9HkSnjH(7jWiYYm>F%U<^KSRFZo-F{hGPW<RPXB1>@8IR
z)HGu%UR6&#45IjqEIqnY?sy4M*U(WfW0~-`Pe$Kih~j}}el#Sj$_Q!z4hC#LyzKsJ
zFsq3e<ZZr>n%{&KZ(G`w+z`xl{P>AFJWMk`P9mi|Cw4oQ_)b3i>u#DRAaH}1VVAEW
zyoY;AIF%J#Cl}Z6fQdk*P}~Ja&ATt^NoH#doD;7dczpaiWGuZOSX-dXWPNmIss4^;
z9}k->iaaI9s-#=$W!CC>recRCP8^(rB{0&C4dQ$Dvf!s6EbKk|i@PU@qnk%)>rWEu
z7t4m#A%-TbX@upP*@I;aa5QFdmOdv})fn(TP|J%R&)#%lRsJeTea*J-3qcVi@Pc@S
zWgxo?j%rKwfq4nu8wY``zMChrJL_9@(?qorET1TXQS$hKY*7*8t(onUH#h=#=vt5g
z1@?|XkGAE(cG!oWgOiCn&bLxmWleI#3J7NHorTxvDRt)(hjv?q9vw^XIs!V7r>}u8
zBq7CBh{O9kX;5VeWjZ$wS-4xRWuB^K6w{1+KHlXIMM;?t{EbihU+Sc+nY(EW(!zG@
zCJalWaukxJh^LE&U+DD!s5_|Y!P?X9d*rF=<((?=k8M(|W(;J=;}xDR?#fHm-R;Q%
zgo6fO4;cwP;Ut9JUD61?l%hxWDwqo20Y9|4Ks_*xrE*m1kxcVEbzOdTe{do?lyG}6
zXnXVP_%estq%v+*h;yHHhk4U5@&469@vX}3itYrdvkJ_flBD^ApGr?w(01K@wJDw3
zkPEdZZ!+$7P0hfGNc9p=k^+)My<rxQ5joCMifgrz?Aa1NJR)F!4r@JpYaneS&b`Xb
zyQW<}aq|^P7%&#49Avtbnv~=hHs^Y0=GLc|Djt-6{o?i&zypK&68yBaWAWXq3fyu3
zgyji?^VPcmcLH+i=V_)22dS&SNY!OmAFh?EMtgYIkh(}`21?aU$$0L&H7h62R_3&Y
z$AAjFWJy;k&K~FLnk)JU|0KQ?d$#82Sd!X+cC0_e&`|ogE=ex;;-*VU)e-BvR_N}X
z`jAC#fhhO3Sg<mpRKRMjKzlbH<>X|LokRyxUwqi>g5wSR*Y3gnFSC8J`DKWZEhAme
z3OMFXYO!HQY(N`rt*EU{k9H3(PqU5nE|+$<7ajACHm_>ffKRAa5`5hnTOIFLj~91o
z*Smc$NWjJmT+2;vcXAS_9Qhdiq4hq~4XM0o2F<8LfAuSj_~tGwaFl%FPs`+8xi#{U
z9ul$=9dn5U$b0F7r2dKz6wGMBGF3;NOE#cyHyaeJ;L{00x>(0gP23-{i&kqZqOCz;
z%wQOI6O##a3<%*X$Qm&}C^%OShX=Pb<dV&i><}~fxXy@s%wSd#<7LR5jy~r}Kh;r$
z=P&3G7BIjAJObIO2+;Z`wY%c-5h461zxf*4d=-*s?{lu6fN3lxKodlvHRf%aAqLpR
z35zn#eocZ)kznE#T16@0>tgDtgNb9q?mICKoyQ{O9b<<_X7~FE9aD{%Cz|0y&sot2
zlEW~JT4SM((SK1B`srzgm#flN&8U2ejDY)E+YD+*03}<`GTdR1nA@I(udDOOx0z%)
z8^*kvWVsr~{8!loW!dDRe;jfub$aq%h{KAX<Fb7k^3zk&n?rNxx`#q;+JdA!ypC(f
zW>3d>fydi0-RUaq?Tani^lr6SaP#-e3Z~eYrbSUu9d%i>3Ig<cXu?IM*r~5{^<b@@
z%)OY&?1#EVc8FMzLz^-@dNQ06Ng@N-zI!E_Q+eSdSQw;|+pG^r13UxxeXNb|k2gkR
z)em{%HpB8JuO~gU6tJFw;8LG6TSG|TCqqAbyKaK(e%jY*7CZewgl>$V_*q)|s8}Zc
zC{?g9!w@gp$|ugGbyjw<|E)Xv>Hxtyb{%0_Me0l6Q`5Ft|L2Y``Q`nyI$^oH=HHy4
z)<Nh&n`x<ti#XtVFFdr3wYvP`j6DY+OcO(*&}DD-9DK#!z0|Pv;NU4wbsT~xEFudT
z6NWTd&zB<me*ld3;OJIW&UBGgPn_HcYQ*<AXz&+m;a0J0UET-~c`u$A38y9K@6-`L
zy*RH(9E7|GKYx{x<pd2NE@+LDXK+*Zc>uH>VwRN+zB>7Z8t}1xT&~g(e@~nvETVRx
zC>WK9J3!&01X%BXp@xWdWcayQ*}1-2k-P@bTRiRhBQvxy1mzt3l^-H-{Fxd4Q^NU&
z=-0qr=XXY#5I+%_MvEHoaDzIWLACq}4}(rCkD){%wID84aDhMM7_43$V-a}U@(k@!
z^BEfcrp_3h(tXOwW3qt?@M5Rn7WLyxjy`BF2xyc<X>zm@Xy+yOqq?=$=H7`jYP?>d
z@shR4TcG+*i?YcTAzJp_CkkEvo><0pZHXGwmUQ*2)WN(NMYbjWck=F$Rdj*n2ao9?
zpIJ2cI!eDh_PlWFA8W_1`IrIi2Y!A&I>@~#Uq8KD75iw2$cs}6gL4Pqoa6g{Vy!T0
zoef{GLio9i+3Mf_2`G2<{`HD_w+fLHY~Q_AARI6_hBZ(bl=Kmnfk)62`yv;5$cc5*
z_l$a?vE;>;RqqKii$Q0j;HiABzqMnms%=j%-CcUR3A<B@(<;BqWI`$>7vr&jy9X_4
z-GM@bJJ|0)Yw#y6f^0R+&KeY6+s*qB^F~of6WD!)G7nn=a?Xd1&P&0G*GJu(`rW;1
zPC7jeaXrYp!B(Q6)E7mES@iCW`R}L*C7NgpI#;f$7ApG9^Nb~oCNg!_EEFBH<~emP
zNUpXB^R{n<0d>R)w=Z$k>-GNZMJh*zC}7T5wG7hQucU-VNsbSka93hD36{{mq=%xH
z;+(CBQB{3$ph2fWt>u|-sH0xLpBA>wyNNbIK|tgo{@ZT?{#QzDp<`)cXkcegZL4oM
z5jSD!M~m!#$r)fUxy(xg3293@+G3j3%@p_@k_M3aX|ppjPFXI$^dxJ3w^Ep4E3!WA
zTnBqNthTsEkx`F~XjIg=;h2KGjk={^jeT{wkpegM>$Rz0K^A$dlO;KuR$>4Z3%vPM
zT`s9}>J6t%JATgstBol9V0|Ps3{C{U$=#m&XST^57(*2~`_t@bmxpg$VH@lv*|o4b
zjq)8qjo)H?cq3pWNB!;nuv?`i1{e}=<k)(0&Uc2iJLddyIkm4SBBz!&gW(JJHGg(g
zU;Oafa!)XJz0h-Ym>am>B8b;cr@xRnY2$DK9==mg0kL+f>Kz5mc_;IXo}&-z0k}#c
zRlmbm|6n`|`73;Wzl7@l^RV?#m(=g@*%{c|n^+pz{l2U^)VAzCv%!0Ib>a89i9?f#
zB@<=@_$MYp1QtyE*cz_{!PPVyy8rNaDRU1t@lo{H_cBD^OEj@u=9%zvqR0hbT9el#
z640plWUb5&ilsBY|JZozG0omV?$P>k`ay&MhmUKJRDw5E0by{O;Mrd@sWo$}lgdDR
zF~+3wG?pm)l(<w6*7i>A?QYJYh_Z_w<A=1B1d86QYYS)E1owC;u583u!s+R0ZCjfw
zBR|{Du7}dTOqX&%u$j<(fIFS^%G1h<5F4<|zV^o+#Zr3Gg|g@O6fdVb#b{u<EqKV?
z#0a2PW7Q%=aZ!tPd{L9a!tJu_@-_Pq9Mas|#Kd8UQofZyHd4Z=VQlO~>Zv0BjmSw`
zzcG}XL-K+lYC^y4XV|HDg>CW`P4`gT`51SVrV@3i7!nEVseq);hY6TCz3DHX1B1bm
zDK{dLr)4F@)R|Ey898;~MLv3^R^P^tVICm=qBico*<B)Y&g=4IHSI<enC3O#HAWoX
z?6|csJaQ|SLG^D@*DF>|(U=Jhm~x|9yVtYUaQ{4qcyQY3&%LS^VwuL2Y=o`K^k^qP
zI?4(j@fNiBunv*HMoQ+e48|}g7(-->vOE;K$(xRYux#}<s~f}D;BlT%=UZlViVPw6
zVJ9&c4kr<3ICv5I8swl*BEg<8I-19DCfB=`3Pa1NPNOLa#`XnVG5UdK`zb(@PQd@C
zjHyeMeBp5os-lF>C*KifJ}-D94k{{UFW0uDv3!k91yNBXxW`ZdTmxFCK>iH*qdTat
zTjcH|mwp9-)vCBr#9O+BB;O%WQ0dHdfzGCwM7J3)=8DR)k6he2PpKw-B4LQv<Zt5>
zdod&7As?=rOQOsP9>2$O<@D4CrK%_6Y|$PvjeT%E`<nUvho>7QnL%Uo?BH{S)UiZr
zqx)zq9xJLFEQG8&3d)>po3ZuCyl&PjpOSL5VxK^4st}6*5#2!KWj>KAN%$9E*7F+{
zX9f9p>-{Yzd!csw0Rq{<aQFPK9}!a<@H>w>(#)d7?A<#~@u&|#?{DptC~Q@>$%yp>
z{xr^BGJ1yH%G02PCD~nE-ZD<h$o+4&!9ROKI}dDdZ4?-VG>$JyT|Hb>qsN)#V)bPk
z%{eI&9Sxiwkqr2dh?`?)hE`ZWa5)3}Pr0Yx0T`xHfLEv248#?<*I^?LjTO{lk1H)O
zH#jALnTkA5w3T!+J)a@%(C~GK5ZeH;ZPSg;C_X&_Z4O=qjy=rDryn@PA6E70!LGY7
z_d>|mDVXg%d}+QUj^SoA3@-jaYF&&mXB)A?cI5r$#GrTT8r0nInC2JUFeNV5C~4Pk
zZnB}WaR++agfvgMN(CD(m-;F)SU)YH3Nx!nX&g7t#enmuY>Yln#JSBC{+-wz^NM#3
zdkA^$PW{AD7Gv$xaCnWibFY61ofpFc+hFV$%G5|S!`YtcNfytbyFRvOK1)@<<YLg7
z1Er`vs2}kW<q|j<FI>Y-kgs*!c<Oaba7MV5R)*p+k4pNhTgVJ(Xj{RJ@4~N~)9E9c
z!~}6Q53UQ~A)sNTmZ{14u=NETB3U(oFetfV8d^xhWV5nJvSnX+pnefcs`0cfyUw~<
z(hg<KRFgLI?b&8(je$>uhEMg~@&~+w2tClC5H{-hX_A5|S7_hA>f2<sO2p?5Q#w@v
z#PAI0A(>0$duKIF+9YtledI*A{Y+k#b61xuq9j4NZojTBT_hD&n27c`Z9Uac;kz+2
z{5)yZiv%Ovh*|0SH3{9FQOQ;s52r^)_K}vQE5!y|xd)8pc+5>!-t_b}Su*XY@yz<%
zs?i+jl5+y%97I<=uq<6miN*{PX&N^rg^@H&4RA47omof{^^B!t9=5_uC%ro8GI?YB
zL*{INQS>XR7eZ8CN9T0cUO2P+c@kYBeoNozSCMCw&{hR}7*hH)BE(#e`~0aSp)4w}
zt&~Ze*=oJ#(jEkoQTfq3%1sISFRL~sW=hH#l~J<LJFn46<e+!?n&0V_W>9x<qReOR
zb9!`$ei*lI!_ienXd1bkXcRW;=o)%+A0q28GbXwrFHKY2e{2S}!$)|^YVLkS$pqJR
zVb%M3M1j(*KrG`hOJ*#ePIgNtYq!&Nm0Vj(B-zP{DjG7#1llI@1JW&RUj;$$kqPR_
zj^+H7H1G95Vhm7eC42b}`TGu)<Q@kw{s00pK>pwEP{03qWoPeVZt%zb>0JFZYOVPr
zaI>pdcG@$JYUJgrbp?ABXO+U*WJY4P3Q8^4LX%MLTS-GkS7%?6AeTyGomkruWOIKi
zmhEF2l!(B|Inoei2A9qt%mi+SHI6ew`Vb@D)5Xlo?RC}r=*#xT<>u^pV!w07bo011
zwL7&m*#QIc<dYf-Zb$6CSt#rFDYij!l~8*j<YdM4>b_=K$t?=gvZBqvnK+y~szLyf
zl>oX$;V-sJ<Jdo^Pf=$CF1d9_on7g1Siwu;E!hzAQ+~k!9nsUFh!u@sjV2{xP~U5H
zx<aG6KN1oWoKOX7Bt>Vge#wsb4y1HVdN@t5OLKKQ7P@h%XY7&^8BHC6VO$O$m_zw!
zmSY^(jtL8hRJ(|Itrh7(p-a+;{S7sW3bTMNk9OR`4j1wQa1;3B1#GNvlE~$Y>_9kb
zTvADkhKsmKK`H7qXz6@}?@z-VFOKyfxqEN|Foqy59D^vi&nm%l<w%S_;V`<lcS(*5
z6Vpb7kRsjNw41Xf6+_L7NJx1}N_)*{YVBFu2^VTFzQ^9y`m&Ef`hR9^1qxnmM=TAe
z?|yJL#^No=ITS>VODhtF?A69|DXj*Ln-@zsFRkw?FhC6RuIL2`j)F84jFm0zUyS(p
zgGS;QQXsXX7b_=*7e?B`Us>YhYoI*OF84?eok@*j{+AWsn}Q>TtsyP+*n_bRa6n$l
z&<Z2LWyS_x6RP77RcKAtPuBg*&69CuuFT^t`4N#z0@7h4V0X|84WmE{i=U#QDno20
zP6to6FMy}<@m9cU5mOED!jaxriuW@atLlI>I2ezJ3r{%SigHlt1*N)x3wGtOPvHi9
z`!%)1i@4f_G%4AGmkn32V1NZQp-k!JBQWq?BeHD&N>c8)A9AwNw=7)Dciz2DhRtUc
z0ZCwS|Baa4Q_#(N7^i`}x1o+EaA%5h39@W~zDHfLurR!V;7fudJeu1lx5TB_dpOar
z$uM9sq)9!Hd0BL*IAj6hhf>+^H-_|4{H9`ap@1vop|uK@wb?t+K!6FJ;_7e-jn|it
zogy$?kJ(g1y*%8mJ?>aW9sLSnq}i6&IpclYG_vqQg<VDA?m6^#VvEL1qpyS*Xilm+
zTIuYjK@CQd;I^=*tjIMF4lC5(k6C4WFy*aTx|In>F7o7M*&v-!#b_7GNvZA=pvb70
z;R%X^d-w^_5r*(weD?!sv~+$1;C4`nvsIcSu8}-`plZG?*V!O<EJ@F!Pi{TOi2MZJ
zg6of(5=X;}n8#miL^kR~wAw>Zo}#-<2MJE{c$>pejx>NU8f42qL2+2!?n(@vl`=kS
z-4K+lN|j^v>-JIfxcp__v^O-zX*6^-qaMGfzCq|SA16^Q1&XWI)OIL+lu(Hy9@?ZV
zPq%M(LFR*~D(RT^NH@EDO9l!I@Szw86E$nl7{?@krY7YC&m2#bOvWI<zxSOzgYk6%
z<s}?PEv_#vam{_O`3iDFrzWXtZ#FM0Z8<}>Z4t^RTihsw1yc@v3)Kek#OGyka{cS2
z2-kU)+|{Ybh-om)wos_Fr=Q7z?GKJ?8B8L;{%y+4PrikHfQS<FO)pB|;9Tel*YRZV
zs$27hJ)_V*%o;09D~H^R&qBOy?rF%v>w%8aW&Mt#_aa^5C8x9|RxIM>!4>x!x{-bp
zMr0f7YPe+>928JTPZXOd)2nbq?EMYY7k}Vw@|%lMtj*$H>!5$$f$#JPvY#Yk54b8<
z^z{4`vm*3Lxi^3~oKUPQeK0!Z=jEq@^HE(oEL5x^`GKzC8pXCe45Sfevzv6kLDpxg
zuEnuavVbyI74&*G95U~rvi1;b86UM#3)xqfA$_Z!Qqa@kmcX7iW^|fL*o|{m(tb!y
zJd|VwjaxRMuzkubOxw<56GY__iK6&306A!ijweOSw>1>rZypmo-IL3Lp0!eg<U|1g
z(6RNqBMakHMp!7RYJ(x<7II|NK6{Ro>{VXb2txWK_ehV`m+H1tj|_81J07O~c)t4&
z`?Rp0JYNgE5)_MLpK|+|KzvX7r6KSJ)JyD9APo~|-Pt3TA~qR{eimRS6g$Z<WGgEv
z>wEe+A4J*+wKwIA7ku_e^FOV|;MjO2R?}>WP)4gb!P_eh@}31}zupd?c9A<_#I%@n
zetOq+Lun>UMSy)sC|fZ<8#is9v|?8q$r(&7SQ2m2YCCh&th!e^a2E!KUizXb*7}(h
zvj(cjb#ZQ{H=v=|s6MTP&e`cwZRYV?=F!yNaJMCxYDFj)deL@vv?AsT6<&5o)xnEt
zH8XjUvg~v%+fPVheQ?skQ|Qd+@V7W+q!*y6L2O=N12yVSdJKGHO4v>g*cxqYwBVP>
z8O=uJ8QGLxu6=V_!7p01f<aqz*)A8NMmWSfhU;6o4mDn<$h|y6o4M1hX@67J{J5EU
zjwZgRTZI|jxk-_@t6B3p`D@Q6#rW7N%T?$%&NYho;Q>v$Zyq@+uNsyfY|4c*58Kb2
zeYO)n5=*x)QV&z+Qk16Ijh<{dnUU1&%f_+F{Z)7hWeE2LNX<>eV?h(a#rDqW7e+4+
zX;(>)=DUI-_2LZ&k<t$7DnmC=5^!2V3kgZq4y;;>mX9GMf5piIFMh~v)P1AMQSZ^D
ziF*~p;_;#6dbT3!WSwc1zzlbjt9!lv2ss&kO**kyW}rd8Zql}x>Kc*Pl!;l)-sZWe
z(3wg&K?=U@BCbI^rhVMqMGu*;Us=1*AC6#kaE>Tt4itAkWE6WjU8&F*Twm$?=oe*=
zzQ*t4%O~53g=Abm`?tKM@`HK5Or@+hs=htj<0o%z2@x+bsS$Nbm@qm~<_xwt&G3Hh
zwZosCDdT5PhuYSlnWZjR5oYkm5OIAPjgGv4@{YWCu~DAV!ahh-`EX-l&){t*Wdd3O
zLlb#>P9gC8?#bkBFJ*%F$A*nxAgNGe@8{D6jM0t1FrMEN@V-_&Hwh%o@~fd}VjnO3
za%tp|;_yeGY}z6e<7uZ)zQhf*t|X(%X4)QzLG)9BytBnwzr75iE&y#H`T_0`x3`m}
z;KSBlbf{iSF)?B&bR~srDp3;M^&<H(741}gPllALradeNSB>w2H=DYlmHrtlsQr$7
zs16r&<W71C`EVrKH(!g7qg^n6G21G&=al66qQh>FCp;1>Uzl%oaat6I;jX5D@;!YD
zect$P3AVNYTrYOH31SUn-KSv&rhLs9v7M%N`c%i1sRVVvJ}S3c^RW)XEs4N2c`KrP
zMiLAeHj5s=tD1hWP?A<q@bF%+>|2e-=sSDCgS7CTqvg8#9NEo4p`}6z(<Nq!rAJ2y
z_)}3-A12!gktK2!D9pjbGi&A8(CEa-HiO4Ab=G3zih@}Ln5wX+s!4j~SUxgtPMV=%
zSf6k~R*qf;DXFSgwH_vGV-tTw5X6<{<qy(;YsgW&3`<&PznvwL1RW%#Raj^rZuF*+
z;~k$*F2p4Q0#M<eli%u8lPaQM)snV1;9NW=tuWeDmb~t6;V?iCb)2%<CEILFps{uq
zFc-`Za<EHWK5eu*?4F$U*Tvze_0c@@40%1^{!UzT&f&X!e&wZ;JpV0mMf;VwN(m|Q
zQHe<l)BHb*>KDgS5ie!gON$)vkd6;%4Be<Lr38b^&-BLWb{Oo5<!XHO`+4tx4^~26
zDrj&x62A3vAT(m=)L6*Q7rd$?uz5sL0#abc<cRRZ={|p{-=twt&Rg+~m>Z|m7HPM_
zToiFQBbeP56&+tDmIG;-J%vhphv)F=r+pbQh?#8yGvZ{P<<TQ){*OWBe0mQi-@2ge
zmqglivI3&3klvs58cGjn@yxPG*VZlI#paUdLhQ``TzjoSAQk8it<J{5SDVIcAT=nB
z_QT%NDn%vQ$c_Hn*5mhZ0n9N4*P>jGNSO6#U#mO2h7B%dkEw$|xhqqmKf%Y(LK53S
zbGeBDe2#(bhJ{!R_t1=H<VCP!<6{fA5A<&ox*l#Zl>vmAG_D@P0%eBziiMi!Zi1pE
z?%UVLS9BWi;|UwpT3rd}EWhKgjZ?S7^^4ky`GXk*1w#e-&x1t#YJ|VppF>8-O8l$W
zzmEp-my6V|;(r<&;@?sJ@&W<*tws3DHoyIEO~c;>9sgRJzx@7ZY>K}=qvQQ=oWBGf
z{~6_9Ya{s&D1R4x{149G>B2u%8^0wVf0_S3;QR*x$bSpfZ^6f3w)PL8|0@6Z|9YBe
z`2Ratf0u*&XPn=HkiSgoA8`JXhx})h-vW`p%<msi{+C?jKZE^imAd}{>@WGq|DgQY
zet&<r@>@Xim)-wD`J0^N&o=tg@$UruAKIP&=Xpo*i**0LFJk`P>+ihtZ+7`FgQ5Oc
zs{Y?S|IP>etEVW<zp~W-?)mo)`8Qwimz^;Eojv$>zrS}Rzq{+dERXj;bl$QOkiRGk
S5Ri|*ChK4Q4*~!0PyYwa2<o~3

literal 0
HcmV?d00001

diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index 6bf86dac102..4fc51f5a114 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -2,7 +2,7 @@ Mrp=Manufacturing Orders
 MO=Manufacturing Order
 MRPDescription=Module to manage Manufacturing Orders (MO).
 MRPArea=MRP Area
-MrpSetupPage=Setup of module MO
+MrpSetupPage=Setup of module MRP
 MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Latest %s Manufacturing Orders modified 
@@ -14,9 +14,13 @@ ListOfManufacturingOrders=List of Manufacturing Orders
 NewBOM=New bill of material
 ProductBOMHelp=Product to create with this BOM
 BOMsNumberingModules=BOM numbering templates
-BOMsModelModule=BOMS document templates
+BOMsModelModule=BOM document templates
+MOsNumberingModules=MO numbering templates
+MOsModelModule=MO document templates
 FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
+FreeLegalTextOnMOs=Free text on document of MO
+WatermarkOnDraftMOs=Watermark on draft MO
 ConfirmCloneBillOfMaterials=Are you sure you want to clone this bill of material ?
 ManufacturingEfficiency=Manufacturing efficiency
 ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
diff --git a/htdocs/mrp/admin/setup.php b/htdocs/mrp/admin/setup.php
deleted file mode 100644
index 8d7df29b383..00000000000
--- a/htdocs/mrp/admin/setup.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2019 Alicealalalamdskfldmjgdfgdfhfghgfh Adminson <testldr9@dolicloud.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file    mrp/admin/setup.php
- * \ingroup mrp
- * \brief   Mrp setup page.
- */
-
-// Load Dolibarr environment
-$res=0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1;
-while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; }
-if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include substr($tmp, 0, ($i+1))."/main.inc.php";
-if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) $res=@include dirname(substr($tmp, 0, ($i+1)))."/main.inc.php";
-// Try main.inc.php using relative path
-if (! $res && file_exists("../../main.inc.php")) $res=@include "../../main.inc.php";
-if (! $res && file_exists("../../../main.inc.php")) $res=@include "../../../main.inc.php";
-if (! $res) die("Include of main fails");
-
-global $langs, $user;
-
-// Libraries
-require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
-require_once '../lib/mrp.lib.php';
-//require_once "../class/myclass.class.php";
-
-// Translations
-$langs->loadLangs(array("admin", "mrp"));
-
-// Access control
-if (! $user->admin) accessforbidden();
-
-// Parameters
-$action = GETPOST('action', 'alpha');
-$backtopage = GETPOST('backtopage', 'alpha');
-
-$arrayofparameters=array(
-	'MRP_MYPARAM1'=>array('css'=>'minwidth200','enabled'=>1),
-	'MRP_MYPARAM2'=>array('css'=>'minwidth500','enabled'=>1)
-);
-
-
-
-/*
- * Actions
- */
-
-if ((float) DOL_VERSION >= 6)
-{
-	include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
-}
-
-
-
-/*
- * View
- */
-
-$page_name = "MrpSetup";
-llxHeader('', $langs->trans($page_name));
-
-// Subheader
-$linkback = '<a href="'.($backtopage?$backtopage:DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
-
-print load_fiche_titre($langs->trans($page_name), $linkback, 'object_mrp');
-
-// Configuration header
-$head = mrpAdminPrepareHead();
-dol_fiche_head($head, 'settings', '', -1, "mrp");
-
-// Setup page goes here
-echo '<span class="opacitymedium">'.$langs->trans("MrpSetupPage").'</span><br><br>';
-
-
-if ($action == 'edit')
-{
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="update">';
-
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
-
-	foreach($arrayofparameters as $key => $val)
-	{
-		print '<tr class="oddeven"><td>';
-		$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>';
-
-	print '<br><div class="center">';
-	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
-	print '</div>';
-
-	print '</form>';
-	print '<br>';
-}
-else
-{
-	if (! empty($arrayofparameters))
-	{
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
-
-		foreach($arrayofparameters as $key => $val)
-		{
-			print '<tr class="oddeven"><td>';
-			$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>';
-		}
-
-		print '</table>';
-
-		print '<div class="tabsAction">';
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
-		print '</div>';
-	}
-	else
-	{
-		print '<br>'.$langs->trans("NothingToSetup");
-	}
-}
-
-
-// Page end
-dol_fiche_end();
-
-llxFooter();
-$db->close();

From b8803fa8dfdc28e363769239bc28a4bc97ed2f9a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Oct 2019 22:56:08 +0100
Subject: [PATCH 16/38] Work on MO

---
 htdocs/admin/mrp.php                               |  2 +-
 htdocs/core/modules/modMrp.class.php               |  6 +++---
 .../{mod_mrp_advanced.php => mod_mo_advanced.php}  | 12 ++++++------
 .../{mod_mrp_standard.php => mod_mo_standard.php}  | 14 +++++++-------
 htdocs/mrp/class/mo.class.php                      |  6 +++---
 htdocs/mrp/lib/mrp.lib.php                         |  2 +-
 6 files changed, 21 insertions(+), 21 deletions(-)
 rename htdocs/core/modules/mrp/{mod_mrp_advanced.php => mod_mo_advanced.php} (93%)
 rename htdocs/core/modules/mrp/{mod_mrp_standard.php => mod_mo_standard.php} (90%)

diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index f3121faa70d..06c59338e58 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -232,7 +232,7 @@ foreach ($dirmodels as $reldir)
 		{
 			while (($file = readdir($handle))!==false)
 			{
-			    if (substr($file, 0, 8) == 'mod_mo_' && substr($file, dol_strlen($file)-3, 3) == 'php')
+			    if (substr($file, 0, 7) == 'mod_mo_' && substr($file, dol_strlen($file)-3, 3) == 'php')
 				{
 					$file = substr($file, 0, dol_strlen($file)-4);
 
diff --git a/htdocs/core/modules/modMrp.class.php b/htdocs/core/modules/modMrp.class.php
index 248179b5447..bc85111ebd2 100644
--- a/htdocs/core/modules/modMrp.class.php
+++ b/htdocs/core/modules/modMrp.class.php
@@ -135,9 +135,9 @@ class modMrp extends DolibarrModules
         //                             2 => array('MRP_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
         // );
         $this->const = array(
-        	1=>array('MRP_MO_ADDON_PDF', 'chaine', 'alpha', 'Name of PDF model of BOM', 0),
-        	2=>array('MRP_MO_ADDON', 'chaine', 'mod_bom_standard', 'Name of numbering rules of BOM', 0),
-        	3=>array('MRP_MO_ADDON_PDF_ODT_PATH', 'chaine', 'DOL_DATA_ROOT/doctemplates/boms', '', 0)
+        	1=>array('MRP_MO_ADDON_PDF', 'chaine', 'alpha', 'Name of PDF model of MO', 0),
+        	2=>array('MRP_MO_ADDON', 'chaine', 'mod_mo_standard', 'Name of numbering rules of MO', 0),
+        	3=>array('MRP_MO_ADDON_PDF_ODT_PATH', 'chaine', 'DOL_DATA_ROOT/doctemplates/mrps', '', 0)
         );
 
         // Some keys to add into the overwriting translation tables
diff --git a/htdocs/core/modules/mrp/mod_mrp_advanced.php b/htdocs/core/modules/mrp/mod_mo_advanced.php
similarity index 93%
rename from htdocs/core/modules/mrp/mod_mrp_advanced.php
rename to htdocs/core/modules/mrp/mod_mo_advanced.php
index 1c24b4010ba..42c506194f3 100644
--- a/htdocs/core/modules/mrp/mod_mrp_advanced.php
+++ b/htdocs/core/modules/mrp/mod_mo_advanced.php
@@ -21,7 +21,7 @@
  */
 
 /**
- * \file       htdocs/core/modules/mrp/mod_mrp_advanced.php
+ * \file       htdocs/core/modules/mrp/mod_mo_advanced.php
  * \ingroup    mrp
  * \brief      File containing class for numbering model of MOs advanced
  */
@@ -30,9 +30,9 @@ require_once DOL_DOCUMENT_ROOT .'/core/modules/mrp/modules_mrp.php';
 
 
 /**
- *	Class to manage customer Bom numbering rules advanced
+ *	Class to manage MO numbering rules advanced
  */
-class mod_mrp_advanced extends ModeleNumRefMos
+class mod_mo_advanced extends ModeleNumRefMos
 {
 	/**
      * Dolibarr version of the loaded document
@@ -68,7 +68,7 @@ class mod_mrp_advanced extends ModeleNumRefMos
 		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		$texte.= '<input type="hidden" name="action" value="updateMask">';
-		$texte.= '<input type="hidden" name="maskconstBom" value="MRP_ADVANCED_MASK">';
+		$texte.= '<input type="hidden" name="maskconstBom" value="MRP_MO_ADVANCED_MASK">';
 		$texte.= '<table class="nobordernopadding" width="100%">';
 
 		$tooltip=$langs->trans("GenericMaskCodes", $langs->transnoentities("Mo"), $langs->transnoentities("Mo"));
@@ -79,7 +79,7 @@ class mod_mrp_advanced extends ModeleNumRefMos
 
 		// Parametrage du prefix
 		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskMo" value="'.$conf->global->MRP_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte.= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskMo" value="'.$conf->global->MRP_MO_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
 
 		$texte.= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
@@ -129,7 +129,7 @@ class mod_mrp_advanced extends ModeleNumRefMos
 		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask=$conf->global->MRP_ADVANCED_MASK;
+		$mask=$conf->global->MRP_MO_ADVANCED_MASK;
 
 		if (! $mask)
 		{
diff --git a/htdocs/core/modules/mrp/mod_mrp_standard.php b/htdocs/core/modules/mrp/mod_mo_standard.php
similarity index 90%
rename from htdocs/core/modules/mrp/mod_mrp_standard.php
rename to htdocs/core/modules/mrp/mod_mo_standard.php
index 24f1b0a1f69..6d392a6b74c 100644
--- a/htdocs/core/modules/mrp/mod_mrp_standard.php
+++ b/htdocs/core/modules/mrp/mod_mo_standard.php
@@ -18,16 +18,16 @@
  */
 
 /**
- *  \file       htdocs/core/modules/mrp/mod_mrp_standard.php
+ *  \file       htdocs/core/modules/mrp/mod_mo_standard.php
  *  \ingroup    mrp
  *  \brief      File of class to manage MO numbering rules standard
  */
 require_once DOL_DOCUMENT_ROOT .'/core/modules/mrp/modules_mrp.php';
 
 /**
- *	Class to manage customer order numbering rules standard
+ *	Class to manage MO numbering rules standard
  */
-class mod_mrp_standard extends ModeleNumRefMos
+class mod_mo_standard extends ModeleNumRefMos
 {
 	/**
      * Dolibarr version of the loaded document
@@ -85,7 +85,7 @@ class mod_mrp_standard extends ModeleNumRefMos
 
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."bom";
+		$sql.= " FROM ".MAIN_DB_PREFIX."mrp_mo";
 		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
@@ -119,7 +119,7 @@ class mod_mrp_standard extends ModeleNumRefMos
 		// D'abord on recupere la valeur max
 		$posindice=9;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."bom_bom";
+		$sql.= " FROM ".MAIN_DB_PREFIX."mrp_mo";
 		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
@@ -132,7 +132,7 @@ class mod_mrp_standard extends ModeleNumRefMos
 		}
 		else
 		{
-			dol_syslog("mod_mrp_standard::getNextValue", LOG_DEBUG);
+			dol_syslog("mod_mo_standard::getNextValue", LOG_DEBUG);
 			return -1;
 		}
 
@@ -143,7 +143,7 @@ class mod_mrp_standard extends ModeleNumRefMos
     	if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
     	else $num = sprintf("%04s", $max+1);
 
-		dol_syslog("mod_mrp_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
+		dol_syslog("mod_mo_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
 	}
 }
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 0525f71ab5f..d19807c03c6 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -94,8 +94,10 @@ class Mo extends CommonObject
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>4, 'position'=>10, 'notnull'=>1, 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'showoncombobox'=>'1',),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'position'=>20, 'notnull'=>1, 'default'=>'1', 'index'=>1,),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'notnull'=>-1, 'searchall'=>1, 'showoncombobox'=>'1',),
+		'fk_bom' => array('type'=>'integer:Bom:bom/class/bom.class.php:0:t.status=1', 'filter'=>'active=1', 'label'=>'BOM', 'enabled'=>1, 'visible'=>1, 'position'=>33, 'notnull'=>-1, 'index'=>1, 'comment'=>"Original BOM",),
+		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:1', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'comment'=>"Product to produce",),
 		'qty' => array('type'=>'real', 'label'=>'QtyToProduce', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'notnull'=>1, 'comment'=>"Qty to produce",),
+		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>42, 'notnull'=>-1, 'searchall'=>1, 'showoncombobox'=>'1',),
 		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>-1, 'position'=>50, 'notnull'=>-1, 'index'=>1),
 	    'fk_warehouse' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label'=>'WarehouseForProduction', 'enabled'=>1, 'visible'=>-1, 'position'=>52),
 	    'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61, 'notnull'=>-1,),
@@ -105,10 +107,8 @@ class Mo extends CommonObject
 		'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'user.rowid',),
 		'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'position'=>511, 'notnull'=>-1,),
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000, 'notnull'=>-1,),
-		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:1', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'comment'=>"Product to produce",),
 		'date_start_planned' => array('type'=>'datetime', 'label'=>'DateStartPlannedMo', 'enabled'=>1, 'visible'=>1, 'position'=>55, 'notnull'=>-1, 'index'=>1, 'help'=>'KeepEmptyForAsap'),
 		'date_end_planned' => array('type'=>'datetime', 'label'=>'DateEndPlannedMo', 'enabled'=>1, 'visible'=>1, 'position'=>56, 'notnull'=>-1, 'index'=>1,),
-		'fk_bom' => array('type'=>'integer:Bom:bom/class/bom.class.php:0:t.status=1', 'filter'=>'active=1', 'label'=>'BOM', 'enabled'=>1, 'visible'=>1, 'position'=>33, 'notnull'=>-1, 'index'=>1, 'comment'=>"Original BOM",),
 		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>1, 'visible'=>-1, 'position'=>52, 'notnull'=>-1, 'index'=>1,),
 		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>4, 'position'=>1000, 'default'=>0, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Brouillon', '1'=>'Validated', '2'=>'InProgress', '3'=>'StatusMOProduced', '-1'=>'Canceled')),
 	);
diff --git a/htdocs/mrp/lib/mrp.lib.php b/htdocs/mrp/lib/mrp.lib.php
index 7ee1fcd04c7..4fdfa25342e 100644
--- a/htdocs/mrp/lib/mrp.lib.php
+++ b/htdocs/mrp/lib/mrp.lib.php
@@ -35,7 +35,7 @@ function mrpAdminPrepareHead()
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dol_buildpath("/mrp/admin/setup.php", 1);
+	$head[$h][0] = dol_buildpath("/admin/mrp.php", 1);
 	$head[$h][1] = $langs->trans("Settings");
 	$head[$h][2] = 'settings';
 	$h++;

From fb95d14aebd07964351f4d1fdbe2e22e29945b36 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Oct 2019 23:02:51 +0100
Subject: [PATCH 17/38] Work on MO

---
 htdocs/langs/en_US/mrp.lang   | 5 ++++-
 htdocs/mrp/class/mo.class.php | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index 4fc51f5a114..bc71a65f72a 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -21,11 +21,14 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Free text on document of MO
 WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone this bill of material ?
+ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
+ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
 DeleteBillOfMaterials=Delete Bill Of Materials
+DeleteMo=Delete Manufacturing Order
 ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
+ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
 MenuMRP=Manufacturing Orders
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index d19807c03c6..71a743eb071 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -110,7 +110,7 @@ class Mo extends CommonObject
 		'date_start_planned' => array('type'=>'datetime', 'label'=>'DateStartPlannedMo', 'enabled'=>1, 'visible'=>1, 'position'=>55, 'notnull'=>-1, 'index'=>1, 'help'=>'KeepEmptyForAsap'),
 		'date_end_planned' => array('type'=>'datetime', 'label'=>'DateEndPlannedMo', 'enabled'=>1, 'visible'=>1, 'position'=>56, 'notnull'=>-1, 'index'=>1,),
 		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>1, 'visible'=>-1, 'position'=>52, 'notnull'=>-1, 'index'=>1,),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>4, 'position'=>1000, 'default'=>0, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Brouillon', '1'=>'Validated', '2'=>'InProgress', '3'=>'StatusMOProduced', '-1'=>'Canceled')),
+		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>2, 'position'=>1000, 'default'=>0, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Brouillon', '1'=>'Validated', '2'=>'InProgress', '3'=>'StatusMOProduced', '-1'=>'Canceled')),
 	);
 	public $rowid;
 	public $ref;

From c9fc17efaea936e2c0ef10140bccd5d44d12dc4a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Oct 2019 23:06:34 +0100
Subject: [PATCH 18/38] Fix phpcs

---
 htdocs/societe/canvas/company/tpl/card_edit.tpl.php    | 4 ++--
 htdocs/societe/canvas/individual/tpl/card_edit.tpl.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
index 5f513fa886a..474d97d07c2 100644
--- a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
@@ -77,7 +77,7 @@ $contact = $GLOBALS['objcanvas']->control->object;
 				<?php if ($this->control->tpl['ismodifiable_customercode']) { ?>
 				<input type="text" name="code_client" size="16" value="<?php echo $this->control->tpl['customercode']; ?>" maxlength="15">
 				<?php } else { ?>
-				<?php 	echo $this->control->tpl['customercode']; ?>
+				<?php 	 echo $this->control->tpl['customercode']; ?>
 				<input type="hidden" name="code_client" value="<?php echo $this->control->tpl['customercode']; ?>">
 				<?php } ?>
 				</td>
@@ -98,7 +98,7 @@ $contact = $GLOBALS['objcanvas']->control->object;
 				<?php if ($this->control->tpl['ismodifiable_suppliercode']) { ?>
 				<input type="text" name="code_fournisseur" size="16" value="<?php echo $this->control->tpl['suppliercode']; ?>" maxlength="15">
 				<?php } else { ?>
-				<?php 	echo $this->control->tpl['suppliercode']; ?>
+				<?php 	 echo $this->control->tpl['suppliercode']; ?>
 				<input type="hidden" name="code_fournisseur" value="<?php echo $this->control->tpl['suppliercode']; ?>">
 				<?php } ?>
 				</td>
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
index d25a9f36121..98ef1dcea18 100644
--- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
@@ -75,7 +75,7 @@ if (empty($conf) || ! is_object($conf))
 				<?php if ($this->control->tpl['ismodifiable_customercode']) { ?>
 				<input type="text" name="code_client" size="16" value="<?php echo $this->control->tpl['customercode']; ?>" maxlength="15">
 				<?php } else { ?>
-				<?php 	echo $this->control->tpl['customercode']; ?>
+				<?php 	 echo $this->control->tpl['customercode']; ?>
 				<input type="hidden" name="code_client" value="<?php echo $this->control->tpl['customercode']; ?>">
 				<?php } ?>
 				</td>
@@ -96,7 +96,7 @@ if (empty($conf) || ! is_object($conf))
 				<?php if ($this->control->tpl['ismodifiable_suppliercode']) { ?>
 				<input type="text" name="code_fournisseur" size="16" value="<?php echo $this->control->tpl['suppliercode']; ?>" maxlength="15">
 				<?php } else { ?>
-				<?php 	echo $this->control->tpl['suppliercode']; ?>
+				<?php 	 echo $this->control->tpl['suppliercode']; ?>
 				<input type="hidden" name="code_fournisseur" value="<?php echo $this->control->tpl['suppliercode']; ?>">
 				<?php } ?>
 				</td>

From 036c1410c79703ec25893ef4fb36bca8994c16aa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Oct 2019 23:17:08 +0100
Subject: [PATCH 19/38] NEW Save user of last modification in donation record

---
 htdocs/don/card.php                           |  2 +-
 htdocs/don/class/don.class.php                | 59 ++++---------------
 .../install/mysql/migration/10.0.0-11.0.0.sql |  2 +
 htdocs/install/mysql/tables/llx_don.sql       |  1 +
 4 files changed, 15 insertions(+), 49 deletions(-)

diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 54d4e392f61..b804f3c7a46 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -741,7 +741,7 @@ if (! empty($id) && $action != 'edit')
 	{
 		$num = $db->num_rows($resql);
 		$i = 0; $total = 0;
-		print '<table class="noborder" width="100%">';
+		print '<table class="noborder paymenttable centpercent">';
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("RefPayment").'</td>';
 		print '<td>'.$langs->trans("Date").'</td>';
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 43bdcead36f..b24213d5c70 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -123,10 +123,11 @@ class Don extends CommonObject
 	 */
 	public $labelstatutshort;
 
-	/**
-	 * Draft
-	 */
+
 	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+	const STATUS_PAID = 2;
+	const STATUS_CANCELED = -1;
 
 
     /**
@@ -155,11 +156,11 @@ class Don extends CommonObject
     /**
      *  Return the label of a given status
      *
-     *  @param	int		$statut        	Id statut
+     *  @param	int		$status        	Id statut
      *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
      *  @return string 			       	Libelle du statut
      */
-    public function LibStatut($statut, $mode = 0)
+    public function LibStatut($status, $mode = 0)
     {
         // phpcs:enable
     	if (empty($this->labelstatut) || empty($this->labelstatutshort))
@@ -176,49 +177,11 @@ class Don extends CommonObject
 	    	$this->labelstatutshort[2]=$langs->trans("DonationStatusPaidShort");
     	}
 
-        if ($mode == 0)
-        {
-            return $this->labelstatut[$statut];
-        }
-        elseif ($mode == 1)
-        {
-            return $this->labelstatutshort[$statut];
-        }
-        elseif ($mode == 2)
-        {
-            if ($statut == -1) return img_picto($this->labelstatut[$statut], 'statut5').' '.$this->labelstatutshort[$statut];
-            elseif ($statut == 0)  return img_picto($this->labelstatut[$statut], 'statut0').' '.$this->labelstatutshort[$statut];
-            elseif ($statut == 1)  return img_picto($this->labelstatut[$statut], 'statut1').' '.$this->labelstatutshort[$statut];
-            elseif ($statut == 2)  return img_picto($this->labelstatut[$statut], 'statut6').' '.$this->labelstatutshort[$statut];
-        }
-        elseif ($mode == 3)
-        {
-            if ($statut == -1) return img_picto($this->labelstatut[$statut], 'statut5');
-            elseif ($statut == 0)  return img_picto($this->labelstatut[$statut], 'statut0');
-            elseif ($statut == 1)  return img_picto($this->labelstatut[$statut], 'statut1');
-            elseif ($statut == 2)  return img_picto($this->labelstatut[$statut], 'statut6');
-        }
-        elseif ($mode == 4)
-        {
-            if ($statut == -1) return img_picto($this->labelstatut[$statut], 'statut5').' '.$this->labelstatut[$statut];
-            elseif ($statut == 0)  return img_picto($this->labelstatut[$statut], 'statut0').' '.$this->labelstatut[$statut];
-            elseif ($statut == 1)  return img_picto($this->labelstatut[$statut], 'statut1').' '.$this->labelstatut[$statut];
-            elseif ($statut == 2)  return img_picto($this->labelstatut[$statut], 'statut6').' '.$this->labelstatut[$statut];
-        }
-        elseif ($mode == 5)
-        {
-            if ($statut == -1) return $this->labelstatutshort[$statut].' '.img_picto($this->labelstatut[$statut], 'statut5');
-            elseif ($statut == 0)  return $this->labelstatutshort[$statut].' '.img_picto($this->labelstatut[$statut], 'statut0');
-            elseif ($statut == 1)  return $this->labelstatutshort[$statut].' '.img_picto($this->labelstatut[$statut], 'statut1');
-            elseif ($statut == 2)  return $this->labelstatutshort[$statut].' '.img_picto($this->labelstatut[$statut], 'statut6');
-        }
-        elseif ($mode == 6)
-        {
-            if ($statut == -1) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut], 'statut5');
-            elseif ($statut == 0)  return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut], 'statut0');
-            elseif ($statut == 1)  return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut], 'statut1');
-            elseif ($statut == 2)  return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut], 'statut6');
-        }
+    	$statusType = 'status'.$status;
+    	if ($status == self::STATUS_CANCELED) $statusType = 'status5';
+    	if ($status == self::STATUS_PAID) $statusType = 'status6';
+
+    	return dolGetStatus($this->labelstatut[$status], $this->labelstatutshort[$status], '', $statusType, $mode);
     }
 
 
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 064db3be207..d599f1b40ed 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
@@ -49,6 +49,8 @@ UPDATE llx_c_units SET label = 'SurfaceUnitm2' WHERE code IN ('M2');
 
 -- For v11
 
+ALTER TABLE llx_don ADD COLUMN fk_user_modif integer;
+
 ALTER TABLE llx_expeditiondet ADD INDEX idx_expeditiondet_fk_origin_line (fk_origin_line);
 
 ALTER TABLE llx_rights_def ADD COLUMN module_position INTEGER NOT NULL DEFAULT 0;
diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql
index ee17fdd1e67..f03e82d6143 100644
--- a/htdocs/install/mysql/tables/llx_don.sql
+++ b/htdocs/install/mysql/tables/llx_don.sql
@@ -47,6 +47,7 @@ create table llx_don
   fk_projet       integer NULL,                 -- Donation is given for a project ?
   datec           datetime,                     -- Create date
   fk_user_author  integer NOT NULL,
+  fk_user_modif   integer,
   date_valid      datetime,						-- date de validation
   fk_user_valid   integer NULL,
   note_private    text,

From 68a4ddceed20849a06a610cf6d4ca9c44af21bea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Oct 2019 23:29:17 +0100
Subject: [PATCH 20/38] Look and feel v11

---
 htdocs/product/class/product.class.php | 29 +++++++-------
 htdocs/product/index.php               |  4 +-
 htdocs/societe/class/societe.class.php |  4 +-
 htdocs/societe/index.php               |  2 +-
 htdocs/user/class/user.class.php       | 55 +++++++++++---------------
 htdocs/user/list.php                   |  2 +-
 6 files changed, 42 insertions(+), 54 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 2ba78b32945..bf2b3a0e410 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4380,10 +4380,10 @@ class Product extends CommonObject
     /**
      *    Return label of a given status
      *
-     * @param  int $status Statut
-     * @param  int $mode   0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
-     * @param  int $type   0=Status "to sell", 1=Status "to buy", 2=Status "to Batch"
-     * @return string              Label of status
+     * @param  int 		$status 	Statut
+     * @param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+     * @param  int 		$type   	0=Status "to sell", 1=Status "to buy", 2=Status "to Batch"
+     * @return string              	Label of status
      */
     public function LibStatut($status, $mode = 0, $type = 0)
     {
@@ -4420,42 +4420,41 @@ class Product extends CommonObject
 
         $statuttrans=empty($status)?'status5':'status4';
 
-        if($status == 0){
+        if ($status == 0) {
             // $type   0=Status "to sell", 1=Status "to buy", 2=Status "to Batch"
-            if($type==0){
+            if($type==0) {
                 $labelstatut = $langs->trans('ProductStatusNotOnSellShort');
                 $labelstatutShort = $langs->trans('ProductStatusNotOnSell');
             }
-            elseif($type == 1){
+            elseif($type == 1) {
                 $labelstatut = $langs->trans('ProductStatusNotOnBuyShort');
                 $labelstatutShort = $langs->trans('ProductStatusNotOnBuy');
             }
-            elseif($type == 2){
+            elseif($type == 2) {
                 $labelstatut = $langs->trans('ProductStatusNotOnBatch');
                 $labelstatutShort = $langs->trans('ProductStatusNotOnBatchShort');
             }
         }
-        elseif($status == 1){
+        elseif ($status == 1) {
             // $type   0=Status "to sell", 1=Status "to buy", 2=Status "to Batch"
-            if($type==0){
+            if ($type==0) {
                 $labelstatut = $langs->trans('ProductStatusOnSellShort');
                 $labelstatutShort = $langs->trans('ProductStatusOnSell');
             }
-            elseif($type == 1){
+            elseif ($type == 1) {
                 $labelstatut = $langs->trans('ProductStatusOnBuyShort');
                 $labelstatutShort = $langs->trans('ProductStatusOnBuy');
             }
-            elseif($type == 2){
+            elseif ($type == 2) {
                 $labelstatut = $langs->trans('ProductStatusOnBatch');
                 $labelstatutShort = $langs->trans('ProductStatusOnBatchShort');
             }
         }
 
 
-        if($mode>6){
+        if ($mode > 6) {
             return dolGetStatus($langs->trans('Unknown'), '', '', 'status0', 0);
-        }
-        else{
+        } else {
             return dolGetStatus($labelstatut, $labelstatutShort, '', $statuttrans, $mode);
         }
     }
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index a92d2cd071a..477dcc20b0c 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -360,10 +360,10 @@ if ($result)
     			print '</td>';
 			}
 			print '<td class="right nowrap"><span class="statusrefsell">';
-			print $product_static->LibStatut($objp->tosell, 3, 0);
+			print $product_static->LibStatut($objp->tosell, 5, 0);
 			print "</span></td>";
             print '<td class="right nowrap"><span class="statusrefbuy">';
-            print $product_static->LibStatut($objp->tobuy, 3, 1);
+            print $product_static->LibStatut($objp->tobuy, 5, 1);
             print "</span></td>";
 			print "</tr>\n";
 			$i++;
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index b20f80f5439..fe8c78c7aa2 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2258,8 +2258,8 @@ class Societe extends CommonObject
 	/**
 	 *    Return label of status (activity, closed)
 	 *
-	 *    @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *    @return   string        		Libelle
+	 *    @param  	int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *    @return   string     	   		Label of status
 	 */
     public function getLibStatut($mode = 0)
 	{
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 5bd493fdeba..b2962478b17 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -316,7 +316,7 @@ if ($result)
             print dol_print_date($thirdparty_static->datem, 'day');
             print "</td>";
             print '<td class="right nowrap">';
-            print $thirdparty_static->getLibStatut(3);
+            print $thirdparty_static->getLibStatut(5);
             print "</td>";
             print "</tr>\n";
             $i++;
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index db919c9bf0a..6e7d2540d32 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -201,6 +201,12 @@ class User extends CommonObject
         'firstname'=>array('type'=>'varchar(50)', 'label'=>'Name','enabled'=>1, 'visible'=>1,  'notnull'=>1,  'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
     );
 
+
+	const STATUS_DISABLED = 0;
+	const STATUS_ENABLED = 1;
+
+
+
 	/**
 	 *    Constructor of the class
 	 *
@@ -2478,48 +2484,31 @@ class User extends CommonObject
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
-     *  Renvoi le libelle d'un statut donne
+     *  Return label of a status of user (active, inactive)
      *
-     *  @param  int     $statut         Id statut
-     *  @param  int     $mode           0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+     *  @param  int     $status         Id status
+	 *  @param  int		$mode           0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
      *  @return string                  Label of status
      */
-    public function LibStatut($statut, $mode = 0)
+    public function LibStatut($status, $mode = 0)
     {
         // phpcs:enable
 		global $langs;
-		$langs->load('users');
 
-		if ($mode == 0)
+		if (empty($this->labelstatus) || empty($this->labelstatusshort))
 		{
-			if ($statut == 1) return $langs->trans('Enabled');
-			elseif ($statut == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 1)
-		{
-			if ($statut == 1) return $langs->trans('Enabled');
-			elseif ($statut == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
-		{
-			if ($statut == 1) return img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"').' '.$langs->trans('Enabled');
-			elseif ($statut == 0) return img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
-		{
-			if ($statut == 1) return img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"');
-			elseif ($statut == 0) return img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"');
-		}
-		elseif ($mode == 4)
-		{
-			if ($statut == 1) return img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"').' '.$langs->trans('Enabled');
-			elseif ($statut == 0) return img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
-		{
-			if ($statut == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4', 'class="pictostatus"');
-			elseif ($statut == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5', 'class="pictostatus"');
+			global $langs;
+			//$langs->load("mymodule");
+			$this->labelstatus[self::STATUS_ENABLED] = $langs->trans('Enabled');
+			$this->labelstatus[self::STATUS_DISABLED] = $langs->trans('Disabled');
+			$this->labelstatusshort[self::STATUS_ENABLED] = $langs->trans('Enabled');
+			$this->labelstatusshort[self::STATUS_DISABLED] = $langs->trans('Disabled');
 		}
+
+		$statusType = 'status5';
+		if ($status == self::STATUS_ENABLED) $statusType = 'status4';
+
+		return dolGetStatus($this->labelstatus[$status], $this->labelstatusshort[$status], '', $statusType, $mode);
 	}
 
 
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 3b334871c06..668f05fa6c2 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -677,7 +677,7 @@ while ($i < min($num, $limit))
 	if (! empty($arrayfields['u.statut']['checked']))
 	{
 	    $userstatic->statut=$obj->statut;
-	    print '<td class="center">'.$userstatic->getLibStatut(3).'</td>';
+	    print '<td class="center">'.$userstatic->getLibStatut(5).'</td>';
 	    if (! $i) $totalarray['nbfield']++;
 	}
 	// Action column

From 6a39ecc3c00a22c2411e2be0c5aa3afe63f3301d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Oct 2019 23:33:11 +0100
Subject: [PATCH 21/38] Fix phpcs

---
 htdocs/societe/canvas/individual/tpl/card_edit.tpl.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
index 98ef1dcea18..61fd7bdefdf 100644
--- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
@@ -75,7 +75,7 @@ if (empty($conf) || ! is_object($conf))
 				<?php if ($this->control->tpl['ismodifiable_customercode']) { ?>
 				<input type="text" name="code_client" size="16" value="<?php echo $this->control->tpl['customercode']; ?>" maxlength="15">
 				<?php } else { ?>
-				<?php 	 echo $this->control->tpl['customercode']; ?>
+				<?php	echo $this->control->tpl['customercode']; ?>
 				<input type="hidden" name="code_client" value="<?php echo $this->control->tpl['customercode']; ?>">
 				<?php } ?>
 				</td>
@@ -96,7 +96,7 @@ if (empty($conf) || ! is_object($conf))
 				<?php if ($this->control->tpl['ismodifiable_suppliercode']) { ?>
 				<input type="text" name="code_fournisseur" size="16" value="<?php echo $this->control->tpl['suppliercode']; ?>" maxlength="15">
 				<?php } else { ?>
-				<?php 	 echo $this->control->tpl['suppliercode']; ?>
+				<?php 	  echo $this->control->tpl['suppliercode']; ?>
 				<input type="hidden" name="code_fournisseur" value="<?php echo $this->control->tpl['suppliercode']; ?>">
 				<?php } ?>
 				</td>

From aa306bf5d427f9d179fc28bbe817b6ce7027b9e3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Oct 2019 23:50:36 +0100
Subject: [PATCH 22/38] Debug widgets

---
 htdocs/core/boxes/box_ficheinter.php |  2 +-
 htdocs/core/boxes/box_task.php       | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index a646d6556ba..ed3569cc3e4 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -138,7 +138,7 @@ class box_ficheinter extends ModeleBoxes
 
 					$this->info_box_contents[$i][] = array(
                         'td' => 'class="nowrap right"',
-                        'text' => $ficheinterstatic->getLibStatut(6),
+                        'text' => $ficheinterstatic->getLibStatut(3),
                         'asis' => 1,
 					);
 
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index e285cc34289..1039ea74385 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -119,25 +119,25 @@ class box_task extends ModeleBoxes
 		// list the summary of the orders
 		if ($user->rights->projet->lire) {
             $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.= '<div id="idfilter'.$this->boxcode.'" class="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.= '<button type="submit" class="button">'.$langs->trans("Refresh").'</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();
+							jQuery(".showiffilter'.$this->boxcode.'").toggle();
 						});
 					});
 					</script>';
             // set cookie by js
             $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(
-                'tr'=>'class="nohover"',
+                'tr'=>'class="nohover showiffilter'.$this->boxcode.' hideobject"',
                 'td' => 'class="nohover"',
                 'textnoformat' => $boxcontent,
             );
@@ -188,7 +188,7 @@ class box_task extends ModeleBoxes
 
                     $label = $projectstatic->getNomUrl(1).' '.$taskstatic->getNomUrl(1).' '.dol_htmlentities($taskstatic->label);
 
-                    $boxcontent = getTaskProgressView($taskstatic, $label, true, false, true);
+                    $boxcontent = getTaskProgressView($taskstatic, $label, true, false, false);
 
                     $this->info_box_contents[$i][] = array(
                         'td' => '',

From 01ac313a8750201b85d285b81ea57a11cb49617a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Oct 2019 23:52:05 +0100
Subject: [PATCH 23/38] Fix phpcs

---
 htdocs/societe/canvas/company/tpl/card_edit.tpl.php    | 4 ++--
 htdocs/societe/canvas/individual/tpl/card_edit.tpl.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
index 474d97d07c2..3f1740d395c 100644
--- a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
@@ -77,7 +77,7 @@ $contact = $GLOBALS['objcanvas']->control->object;
 				<?php if ($this->control->tpl['ismodifiable_customercode']) { ?>
 				<input type="text" name="code_client" size="16" value="<?php echo $this->control->tpl['customercode']; ?>" maxlength="15">
 				<?php } else { ?>
-				<?php 	 echo $this->control->tpl['customercode']; ?>
+					<?php echo $this->control->tpl['customercode']; ?>
 				<input type="hidden" name="code_client" value="<?php echo $this->control->tpl['customercode']; ?>">
 				<?php } ?>
 				</td>
@@ -98,7 +98,7 @@ $contact = $GLOBALS['objcanvas']->control->object;
 				<?php if ($this->control->tpl['ismodifiable_suppliercode']) { ?>
 				<input type="text" name="code_fournisseur" size="16" value="<?php echo $this->control->tpl['suppliercode']; ?>" maxlength="15">
 				<?php } else { ?>
-				<?php 	 echo $this->control->tpl['suppliercode']; ?>
+					<?php echo $this->control->tpl['suppliercode']; ?>
 				<input type="hidden" name="code_fournisseur" value="<?php echo $this->control->tpl['suppliercode']; ?>">
 				<?php } ?>
 				</td>
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
index 61fd7bdefdf..976b00962d8 100644
--- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
@@ -75,7 +75,7 @@ if (empty($conf) || ! is_object($conf))
 				<?php if ($this->control->tpl['ismodifiable_customercode']) { ?>
 				<input type="text" name="code_client" size="16" value="<?php echo $this->control->tpl['customercode']; ?>" maxlength="15">
 				<?php } else { ?>
-				<?php	echo $this->control->tpl['customercode']; ?>
+					<?php echo $this->control->tpl['customercode']; ?>
 				<input type="hidden" name="code_client" value="<?php echo $this->control->tpl['customercode']; ?>">
 				<?php } ?>
 				</td>
@@ -96,7 +96,7 @@ if (empty($conf) || ! is_object($conf))
 				<?php if ($this->control->tpl['ismodifiable_suppliercode']) { ?>
 				<input type="text" name="code_fournisseur" size="16" value="<?php echo $this->control->tpl['suppliercode']; ?>" maxlength="15">
 				<?php } else { ?>
-				<?php 	  echo $this->control->tpl['suppliercode']; ?>
+					<?php echo $this->control->tpl['suppliercode']; ?>
 				<input type="hidden" name="code_fournisseur" value="<?php echo $this->control->tpl['suppliercode']; ?>">
 				<?php } ?>
 				</td>

From 70530b558de3ee64b872ed0524e8b70c5e6b4422 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 1 Nov 2019 03:10:48 +0100
Subject: [PATCH 24/38] Enable / Disable js css in modulebuilder

---
 htdocs/modulebuilder/index.php | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 0bb48af3b46..3c9b23c7638 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -480,10 +480,15 @@ if ($dirins && $action == 'initcss' && !empty($module))
 			'Mon module'=>$modulename,
 			'mon module'=>$modulename,
 			'htdocs/modulebuilder/template'=>strtolower($modulename),
-			'---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email?' <'.$user->email.'>':'')
+			'---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email?' <'.$user->email.'>':''),
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
+
+		// Update descriptor file to uncomment file
+	    $srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
+	    $arrayreplacement = array('/\/\/\s*\''.preg_quote('/'.strtolower($module).'/css/'.strtolower($module).'.css.php', '/').'\'/' => '\'/'.strtolower($module).'/css/'.strtolower($module).'.css.php\'');
+	    dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
 	}
 	else
 	{
@@ -518,6 +523,11 @@ if ($dirins && $action == 'initjs' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
+
+		// Update descriptor file to uncomment file
+		$srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
+		$arrayreplacement = array('/\/\/\s*\''.preg_quote('/'.strtolower($module).'/js/'.strtolower($module).'.js.php', '/').'\'/' => '\'/'.strtolower($module).'/js/'.strtolower($module).'.js.php\'');
+		dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
 	}
 	else
 	{
@@ -635,6 +645,14 @@ if ($dirins && $action == 'confirm_removefile' && !empty($module))
 
         $result = dol_delete_file($filetodelete);
         if (dol_is_dir_empty($dirtodelete)) dol_delete_dir($dirtodelete);
+
+        // Update descriptor file to comment file
+        if (in_array($tab, array('css', 'js')))
+        {
+            $srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
+            $arrayreplacement = array('/^\s*\''.preg_quote('/'.$relativefilename, '/').'\',*/m'=>'                // \'/'.$relativefilename.'\',');
+            dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
+        }
     }
 }
 
@@ -1967,7 +1985,10 @@ elseif (! empty($module))
 				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>';
 				print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 				print '<br>';
-				print '<span class="fa fa-file-o"></span> '.$langs->trans("LanguageFile").' :</span> <strong>'.$dicts['langs'].'</strong><br>';
+				print '<span class="fa fa-file-o"></span> '.$langs->trans("LanguageFile").' :</span> ';
+				if (! is_array($dicts) || empty($dicts)) print '<span class="opacitymedium">'.$langs->trans("NoDictionaries").'</span>';
+				else print '<strong>'.$dicts['langs'].'</strong>';
+				print '<br>';
 
 				print load_fiche_titre($langs->trans("ListOfDictionariesEntries"), '', '');
 

From 5b5a2e98048892919937019660027488f0cac1c3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 1 Nov 2019 03:25:09 +0100
Subject: [PATCH 25/38] Clean code

---
 htdocs/core/lib/functions.lib.php | 2 +-
 htdocs/modulebuilder/index.php    | 8 ++++----
 htdocs/theme/eldy/global.inc.php  | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4d4a20f3a5c..943afe69a1a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2997,7 +2997,7 @@ function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF
  *  @param		int			$notitle				1=Disable tag title. Use it if you add js tooltip, to avoid duplicate tooltip.
  *  @param		string		$alt					Force alt for bind people
  *  @param		string		$morecss				Add more class css on img tag (For example 'myclascss'). Work only if $moreatt is empty.
- *  @param		string		$marginleftonlyshort	1 = Add a short left margin on picto, 2 = Add a larger left maring on picto, 0 = No margin left. Works for fontawesome picto only.
+ *  @param		string		$marginleftonlyshort	1 = Add a short left margin on picto, 2 = Add a larger left margin on picto, 0 = No margin left. Works for fontawesome picto only.
  *  @return     string       				    	Return img tag
  *  @see        img_object(), img_picto_common()
  */
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 3c9b23c7638..234746a0d83 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -1641,14 +1641,14 @@ elseif (! empty($module))
 		$linktoenabledisable='';
 		if (! empty($conf->global->$const_name))	// If module is already activated
 		{
-			$linktoenabledisable.='<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$moduleobj->numero.'&action=reset&value=mod' . $module . $param . '">';
-			$linktoenabledisable.=img_picto($langs->trans("Activated"), 'switch_on');
+			$linktoenabledisable.='<a class="reposition asetresetmodule" href="'.$_SERVER["PHP_SELF"].'?id='.$moduleobj->numero.'&action=reset&value=mod' . $module . $param . '">';
+			$linktoenabledisable.=img_picto($langs->trans("Activated"), 'switch_on', '', false, 0, 0, '', '', 1);
 			$linktoenabledisable.='</a>';
 		}
 		else
 		{
-			$linktoenabledisable.='<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$moduleobj->numero.'&action=set&value=mod' . $module . $param . '">';
-			$linktoenabledisable.=img_picto($langs->trans("Disabled"), 'switch_off');
+			$linktoenabledisable.='<a class="reposition asetresetmodule" href="'.$_SERVER["PHP_SELF"].'?id='.$moduleobj->numero.'&action=set&value=mod' . $module . $param . '">';
+			$linktoenabledisable.=img_picto($langs->trans("Disabled"), 'switch_off', '', false, 0, 0, '', '', 1);
 			$linktoenabledisable.="</a>\n";
 		}
 		if (! empty($conf->$modulelowercase->enabled))
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index c3bbc92af9c..cf5c4f9703a 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -521,7 +521,8 @@ body[class*="colorblind-"] .text-success{
 }
 
 .fa-toggle-on, .fa-toggle-off { font-size: 2em; }
-.websiteselectionsection .fa-toggle-on, .websiteselectionsection .fa-toggle-off { font-size: 1.5em; vertical-align: text-bottom; }
+.websiteselectionsection .fa-toggle-on, .websiteselectionsection .fa-toggle-off,
+.asetresetmodule .fa-toggle-on, .asetresetmodule .fa-toggle-off { font-size: 1.5em; vertical-align: text-bottom; }
 
 /* Themes for badges */
 <?php include dol_buildpath($path.'/theme/'.$theme.'/badges.inc.php', 0); ?>

From e684c1c4504d920b4db4f3b8c668bd2b102ff534 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Nov 2019 12:11:29 +0100
Subject: [PATCH 26/38] Look and feel v11

---
 .../class/expensereport.class.php             | 31 ++------
 htdocs/holiday/class/holiday.class.php        | 78 ++++++-------------
 htdocs/hrm/index.php                          | 76 +-----------------
 3 files changed, 34 insertions(+), 151 deletions(-)

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 485373c5840..52072b63578 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -101,9 +101,6 @@ class ExpenseReport extends CommonObject
     // Paiement
     public $user_paid_infos;
 
-    /*
-        END ACTIONS
-    */
 
     /**
 	 * Draft status
@@ -198,7 +195,7 @@ class ExpenseReport extends CommonObject
         // List of language codes for status
         $this->statuts_short = array(0 => 'Draft', 2 => 'Validated', 4 => 'Canceled', 5 => 'Approved', 6 => 'Paid', 99 => 'Refused');
         $this->statuts = array(0 => 'Draft', 2 => 'ValidatedWaitingApproval', 4 => 'Canceled', 5 => 'Approved', 6 => 'Paid', 99 => 'Refused');
-        $this->statuts_logo = array(0 => 'statut0', 2 => 'statut1', 4 => 'statut5', 5 => 'statut3', 6 => 'statut6', 99 => 'statut5');
+        $this->statuts_logo = array(0 => 'status0', 2 => 'status1', 4 => 'status6', 5 => 'status4', 6 => 'status6', 99 => 'status5');
     }
 
     /**
@@ -683,29 +680,15 @@ class ExpenseReport extends CommonObject
      */
     public function LibStatut($status, $mode = 0)
     {
-        // phpcs:enable
-        global $langs;
+    	// phpcs:enable
+    	global $langs;
 
-        if ($mode == 0)
-            return $langs->transnoentities($this->statuts[$status]);
+    	$labelstatus = $langs->trans($this->statuts[$status]);
+    	$labelstatusshort = $langs->trans($this->statuts_short[$status]);
 
-        elseif ($mode == 1)
-            return $langs->transnoentities($this->statuts_short[$status]);
+    	$statusType = $this->statuts_logo[$status];
 
-        elseif ($mode == 2)
-            return img_picto($langs->transnoentities($this->statuts_short[$status]), $this->statuts_logo[$status]).' '.$langs->transnoentities($this->statuts_short[$status]);
-
-        elseif ($mode == 3)
-            return img_picto($langs->transnoentities($this->statuts_short[$status]), $this->statuts_logo[$status]);
-
-        elseif ($mode == 4)
-            return img_picto($langs->transnoentities($this->statuts_short[$status]), $this->statuts_logo[$status]).' '.$langs->transnoentities($this->statuts[$status]);
-
-        elseif ($mode == 5)
-            return '<span class="hideonsmartphone">'.$langs->transnoentities($this->statuts_short[$status]).' </span>'.img_picto($langs->transnoentities($this->statuts_short[$status]), $this->statuts_logo[$status]);
-
-        elseif ($mode == 6)
-            return $langs->transnoentities($this->statuts[$status]).' '.img_picto($langs->transnoentities($this->statuts_short[$status]), $this->statuts_logo[$status]);
+    	return dolGetStatus($labelstatus, $labelstatusshort, '', $statusType, $mode);
     }
 
 
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 0eb02e006e5..8fe5f0570fe 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1217,68 +1217,40 @@ class Holiday extends CommonObject
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	Returns the label of a statut
+	 *	Returns the label of a status
 	 *
-	 *	@param      int		$statut     id statut
+	 *	@param      int		$status     Id status
 	 *	@param      int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
 	 *  @param		integer	$startdate	Date holiday should start
 	 *	@return     string      		Label
 	 */
-	public function LibStatut($statut, $mode = 0, $startdate = '')
+	public function LibStatut($status, $mode = 0, $startdate = '')
 	{
-        // phpcs:enable
-		global $langs;
-
-		if ($mode == 0)
+		// phpcs:enable
+		if (empty($this->labelstatus) || empty($this->labelstatusshort))
 		{
-			if ($statut == 1) return $langs->trans('DraftCP');
-			elseif ($statut == 2) return $langs->trans('ToReviewCP');
-			elseif ($statut == 3) return $langs->trans('ApprovedCP');
-			elseif ($statut == 4) return $langs->trans('CancelCP');
-			elseif ($statut == 5) return $langs->trans('RefuseCP');
-		}
-		elseif ($mode == 2)
-		{
-			$pictoapproved='statut6';
-			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
-			if ($statut == 1) return img_picto($langs->trans('DraftCP'), 'statut0').' '.$langs->trans('DraftCP');				// Draft
-			elseif ($statut == 2) return img_picto($langs->trans('ToReviewCP'), 'statut1').' '.$langs->trans('ToReviewCP');		// Waiting approval
-			elseif ($statut == 3) return img_picto($langs->trans('ApprovedCP'), $pictoapproved).' '.$langs->trans('ApprovedCP');
-			elseif ($statut == 4) return img_picto($langs->trans('CancelCP'), 'statut5').' '.$langs->trans('CancelCP');
-			elseif ($statut == 5) return img_picto($langs->trans('RefuseCP'), 'statut5').' '.$langs->trans('RefuseCP');
-		}
-		elseif ($mode == 3)
-		{
-			$pictoapproved='statut6';
-			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
-			if ($statut == 1) return img_picto($langs->trans('DraftCP'), 'statut0');
-			elseif ($statut == 2) return img_picto($langs->trans('ToReviewCP'), 'statut1');
-			elseif ($statut == 3) return img_picto($langs->trans('ApprovedCP'), $pictoapproved);
-			elseif ($statut == 4) return img_picto($langs->trans('CancelCP'), 'statut5');
-			elseif ($statut == 5) return img_picto($langs->trans('RefuseCP'), 'statut5');
-		}
-		elseif ($mode == 5)
-		{
-			$pictoapproved='statut6';
-			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
-			if ($statut == 1) return $langs->trans('DraftCP').' '.img_picto($langs->trans('DraftCP'), 'statut0');				// Draft
-			elseif ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'), 'statut1');		// Waiting approval
-			elseif ($statut == 3) return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'), $pictoapproved);
-			elseif ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'), 'statut5');
-			elseif ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'), 'statut5');
-		}
-		elseif ($mode == 6)
-		{
-			$pictoapproved='statut6';
-			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
-			if ($statut == 1) return $langs->trans('DraftCP').' '.img_picto($langs->trans('DraftCP'), 'statut0');				// Draft
-			elseif ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'), 'statut1');		// Waiting approval
-			elseif ($statut == 3) return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'), $pictoapproved);
-			elseif ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'), 'statut5');
-			elseif ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'), 'statut5');
+			global $langs;
+			//$langs->load("mymodule");
+			$this->labelstatus[self::STATUS_DRAFT] = $langs->trans('DraftCP');
+			$this->labelstatus[self::STATUS_VALIDATED] = $langs->trans('ToReviewCP');
+			$this->labelstatus[self::STATUS_APPROVED] = $langs->trans('ApprovedCP');
+			$this->labelstatus[self::STATUS_CANCELED] = $langs->trans('CancelCP');
+			$this->labelstatus[self::STATUS_REFUSED] = $langs->trans('RefuseCP');
+			$this->labelstatusshort[self::STATUS_DRAFT] = $langs->trans('DraftCP');
+			$this->labelstatusshort[self::STATUS_VALIDATED] = $langs->trans('ToReviewCP');
+			$this->labelstatusshort[self::STATUS_APPROVED] = $langs->trans('ApprovedCP');
+			$this->labelstatusshort[self::STATUS_CANCELED] = $langs->trans('CancelCP');
+			$this->labelstatusshort[self::STATUS_REFUSED] = $langs->trans('RefuseCP');
 		}
 
-		else return $statut;
+		$statusType = 'status6';
+		if (! empty($startdate) && $startdate > dol_now()) $statusType = 'status4';
+		if ($status == self::STATUS_DRAFT) $statusType = 'status0';
+		if ($status == self::STATUS_VALIDATED) $statusType = 'status1';
+		if ($status == self::STATUS_CANCELED) $statusType = 'status5';
+		if ($status == self::STATUS_REFUSED) $statusType = 'status5';
+
+		return dolGetStatus($this->labelstatus[$status], $this->labelstatusshort[$status], '', $statusType, $mode);
 	}
 
 
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 9d9d2fcd632..9fa758f8338 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -248,84 +248,13 @@ if (! empty($conf->holiday->enabled) && $user->rights->holiday->read)
         }
         print '</table>';
         print '</div>';
+        print '<br>';
     }
     else dol_print_error($db);
 }
 
 
-// Last expense report (old module)
-if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
-{
-	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.statut, u.photo, d.rowid, d.dated as date, d.tms as dm, d.km, d.fk_statut";
-	$sql.= " FROM ".MAIN_DB_PREFIX."deplacement as d, ".MAIN_DB_PREFIX."user as u";
-	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE u.rowid = d.fk_user";
-	$sql.= " AND d.entity = ".$conf->entity;
-	if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql.=' AND d.fk_user IN ('.join(',', $childids).')';
-	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND d.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-	if (!empty($socid)) $sql.= " AND d.fk_soc = ".$socid;
-	$sql.= $db->order("d.tms", "DESC");
-	$sql.= $db->plimit($max, 0);
-
-	$result = $db->query($sql);
-	if ($result)
-	{
-		$var=false;
-		$num = $db->num_rows($result);
-
-		$i = 0;
-
-		print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre">';
-		print '<th colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses", min($max, $num)).'</th>';
-		print '<th class="right">'.$langs->trans("FeesKilometersOrAmout").'</th>';
-		print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
-		print '<th width="16">&nbsp;</th>';
-		print '</tr>';
-		if ($num)
-		{
-			$total_ttc = $totalam = $total = 0;
-
-			$deplacementstatic=new Deplacement($db);
-			$userstatic=new User($db);
-			while ($i < $num && $i < $max)
-			{
-				$obj = $db->fetch_object($result);
-
-				$deplacementstatic->ref=$obj->rowid;
-				$deplacementstatic->id=$obj->rowid;
-
-				$userstatic->id=$obj->uid;
-				$userstatic->lastname=$obj->lastname;
-				$userstatic->firstname=$obj->firstname;
-				$userstatic->login=$obj->login;
-                $userstatic->email=$obj->email;
-				$userstatic->statut=$obj->statut;
-				$userstatic->photo=$obj->photo;
-
-				print '<tr class="oddeven">';
-				print '<td class="nowraponall">'.$deplacementstatic->getNomUrl(1).'</td>';
-				print '<td class="tdoverflowmax150">'.$userstatic->getNomUrl(-1).'</td>';
-				print '<td class="right">'.$obj->km.'</td>';
-				print '<td class="right">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>';
-				print '<td>'.$deplacementstatic->LibStatut($obj->fk_statut, 3).'</td>';
-				print '</tr>';
-
-				$i++;
-			}
-		}
-		else
-		{
-			print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-		}
-		print '</table>';
-		print '</div>';
-	}
-	else dol_print_error($db);
-}
-
-// Last expense report (new module)
+// Latest expense report
 if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
 {
 	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.statut, u.photo, x.rowid, x.ref, x.date_debut as date, x.tms as dm, x.total_ttc, x.fk_statut as status";
@@ -342,7 +271,6 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire
 	$result = $db->query($sql);
 	if ($result)
 	{
-		$var=false;
 		$num = $db->num_rows($result);
 
 		$i = 0;

From 1821fa6317c200dac86693ed23a18e62f90722ac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Nov 2019 12:48:09 +0100
Subject: [PATCH 27/38] Fix translation of "Terminal"

---
 htdocs/takepos/takepos.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php
index dd65469ec05..001fd842165 100644
--- a/htdocs/takepos/takepos.php
+++ b/htdocs/takepos/takepos.php
@@ -562,23 +562,23 @@ function MoreActions(totalactions){
 	}
 }
 
+// Popup to select the terminal to use
 function TerminalsDialog()
 {
     jQuery("#dialog-info").dialog({
 	    resizable: false,
-	    height:220,
-	    width:400,
+	    height: <?php echo 180+round($conf->global->TAKEPOS_NUM_TERMINALS / 3 * 20); ?>,
+	    width: <?php echo ($conf->dol_optimize_smallscreen ? 316 : 400); ?>,
 	    modal: true,
 	    buttons: {
-			Terminal1: function() {
+			'<?php echo dol_escape_js($langs->trans("Terminal")) ?> 1': function() {
 				location.href='takepos.php?setterminal=1';
 			}
 			<?php
 			for ($i = 2; $i <= $conf->global->TAKEPOS_NUM_TERMINALS; $i++)
 			{
-				print "
-				,
-				Terminal".$i.": function() {
+				print ",
+				'".dol_escape_js($langs->trans("Terminal"))." ".$i."': function() {
 					location.href='takepos.php?setterminal=".$i."';
 				}
 				";

From e3b5be7475467f680247859b93e834ba3398b280 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Nov 2019 12:52:03 +0100
Subject: [PATCH 28/38] All properties 'libstatut', 'labelstatut',
 'labelstatus' were renamed into 'labelStatus'. All properties
 'labelstatusshort' and 'labelstatut_short' were renamed into
 'labelStatusShort'.

---
 ChangeLog                                     |  3 +-
 htdocs/adherents/class/adherent.class.php     | 30 ++++++-------
 htdocs/adherents/index.php                    |  8 ++--
 htdocs/api/class/api.class.php                |  4 +-
 htdocs/bom/class/bom.class.php                | 10 ++---
 htdocs/comm/propal/class/propal.class.php     | 28 ++++++-------
 htdocs/commande/class/commande.class.php      | 34 +++++++--------
 .../cashcontrol/class/cashcontrol.class.php   | 12 +++---
 .../class/bonprelevement.class.php            | 42 +++++++++----------
 htdocs/contact/class/contact.class.php        |  8 ++--
 htdocs/core/class/commoninvoice.class.php     | 34 +++++++--------
 htdocs/core/lib/functions.lib.php             |  3 +-
 htdocs/don/class/don.class.php                | 24 +++++------
 .../class/emailcollector.class.php            | 30 ++++++-------
 .../class/emailcollectoraction.class.php      | 30 ++++++-------
 .../class/emailcollectorfilter.class.php      | 30 ++++++-------
 .../class/expensereport.class.php             |  6 +--
 htdocs/holiday/class/holiday.class.php        | 24 +++++------
 .../template/class/myobject.class.php         | 16 +++----
 htdocs/mrp/class/mo.class.php                 | 14 +++----
 htdocs/product/class/product.class.php        | 28 ++++++-------
 htdocs/product/index.php                      | 14 +++----
 .../inventory/class/inventory.class.php       | 10 ++---
 htdocs/projet/graph_opportunities.inc.php     | 14 +++----
 htdocs/societe/class/societe.class.php        | 12 +++---
 htdocs/societe/index.php                      |  4 +-
 .../class/supplier_proposal.class.php         | 28 ++++++-------
 htdocs/user/class/user.class.php              | 12 +++---
 htdocs/website/class/website.class.php        | 12 +++---
 htdocs/website/class/websitepage.class.php    | 12 +++---
 htdocs/zapier/class/hook.class.php            | 30 ++++++-------
 31 files changed, 284 insertions(+), 282 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f6a1c949bf5..ab23a79d299 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,7 +25,8 @@ Following changes may create regressions for some external modules, but were nec
 * The trigger BON_PRELEVEMENT_CREATE has been renamed into DIRECT_DEBIT_ORDER_CREATE.
 * The constant INVOICE_SHOW_POS_IN_EXPORT has been renamed into INVOICE_SHOW_POS.
 * If your logo was visible on the menu bar, you must upload a new logo into 'Home-Setup-Company/Organization' to have it visible agin in menu. 
-
+* All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed into 'labelStatus'. 
+* All properties 'labelstatusshort' and 'labelstatut_short' were renamed into 'labelStatusShort'. 
 
 ***** ChangeLog for 10.0.3 compared to 10.0.2 *****
 IMPORTANT : This version fixes a serious bug in saving the units of weight, size, surface and volume on product card.
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 8f546b3d3c2..9d0e0fa47dc 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -2181,48 +2181,48 @@ class Adherent extends CommonObject
 		$langs->load("members");
 
         $statusType = '';
-        $labelstatut = '';
-        $labelstatutShort = '';
+        $labelStatus = '';
+        $labelStatusShort = '';
 
 		if ($statut == -1)
 		{
 			$statusType = 'status0';
-			$labelstatut = $langs->trans("MemberStatusDraft");
-			$labelstatutShort = $langs->trans("MemberStatusDraftShort");
+			$labelStatus = $langs->trans("MemberStatusDraft");
+			$labelStatusShort = $langs->trans("MemberStatusDraftShort");
 		}
 		elseif ($statut >= 1) {
 			if ($need_subscription == 0)
 			{
 				$statusType = 'status4';
-				$labelstatut = $langs->trans("MemberStatusNoSubscription");
-				$labelstatutShort = $langs->trans("MemberStatusNoSubscriptionShort");
+				$labelStatus = $langs->trans("MemberStatusNoSubscription");
+				$labelStatusShort = $langs->trans("MemberStatusNoSubscriptionShort");
 			}
 			elseif (! $date_end_subscription)
 			{
 				$statusType = 'status1';
-				$labelstatut = $langs->trans("MemberStatusActive");
-				$labelstatutShort = $langs->trans("MemberStatusActiveShort");
+				$labelStatus = $langs->trans("MemberStatusActive");
+				$labelStatusShort = $langs->trans("MemberStatusActiveShort");
 			}
 			elseif ($date_end_subscription < time())
 			{
 				$statusType = 'status3';
-				$labelstatut = $langs->trans("MemberStatusActiveLate");
-				$labelstatutShort = $langs->trans("MemberStatusActiveLateShort");
+				$labelStatus = $langs->trans("MemberStatusActiveLate");
+				$labelStatusShort = $langs->trans("MemberStatusActiveLateShort");
 			}
 			else {
 				$statusType = 'status4';
-				$labelstatut = $langs->trans("MemberStatusPaid");
-				$labelstatutShort = $langs->trans("MemberStatusPaidShort");
+				$labelStatus = $langs->trans("MemberStatusPaid");
+				$labelStatusShort = $langs->trans("MemberStatusPaidShort");
 			}
 		}
 		elseif ($statut == 0)
 		{
 			$statusType = 'status6';
-			$labelstatut = $langs->trans("MemberStatusResiliated");
-			$labelstatutShort = $langs->trans("MemberStatusResiliatedShort");
+			$labelStatus = $langs->trans("MemberStatusResiliated");
+			$labelStatusShort = $langs->trans("MemberStatusResiliatedShort");
 		}
 
-		return dolGetStatus($labelstatut, $labelstatutShort, '', $statusType, $mode);
+		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
 	}
 
 
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 3f3c77568c2..a0dc9b81a86 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -61,7 +61,7 @@ $AdherentsResilies=array();
 
 $AdherentType=array();
 
-// Members list
+// Type of membership
 $sql = "SELECT t.rowid, t.libelle as label, t.subscription,";
 $sql.= " d.statut, count(d.rowid) as somme";
 $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t";
@@ -71,7 +71,7 @@ $sql.= " AND d.entity IN (".getEntity('adherent').")";
 $sql.= " WHERE t.entity IN (".getEntity('member_type').")";
 $sql.= " GROUP BY t.rowid, t.libelle, t.subscription, d.statut";
 
-dol_syslog("index.php::select nb of members by type", LOG_DEBUG);
+dol_syslog("index.php::select nb of members per type", LOG_DEBUG);
 $result = $db->query($sql);
 if ($result)
 {
@@ -294,7 +294,7 @@ print "<br>\n";
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 /*
- * Last modified members
+ * Latest modified members
  */
 $max=5;
 
@@ -342,7 +342,7 @@ if ($resql)
 			print '<td>'.$staticmember->getNomUrl(1, 32).'</td>';
 			print '<td>'.$statictype->getNomUrl(1, 32).'</td>';
 			print '<td>'.dol_print_date($db->jdate($obj->datem), 'dayhour').'</td>';
-			print '<td class="right">'.$staticmember->LibStatut($obj->statut, ($obj->subscription=='yes'?1:0), $db->jdate($obj->date_end_subscription), 5).'</td>';
+			print '<td class="right">'.$staticmember->LibStatut($obj->statut, ($obj->subscription=='yes'?1:0), $db->jdate($obj->date_end_subscription), 3).'</td>';
 			print '</tr>';
 			$i++;
 		}
diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 074216dee3e..0d054402b7a 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -132,8 +132,8 @@ class DolibarrApi
         unset($object->statuts_short);
         unset($object->statuts_logo);
         unset($object->statuts_long);
-        unset($object->labelstatut);
-        unset($object->labelstatut_short);
+        unset($object->labelStatus);
+        unset($object->labelStatusShort);
 
         unset($object->element);
         unset($object->fk_element);
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 444caa2a4da..bd5eb4513d2 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -809,19 +809,19 @@ class BOM extends CommonObject
 	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		if (empty($this->labelstatus))
+		if (empty($this->labelStatus))
 		{
 			global $langs;
 			//$langs->load("mrp");
-			$this->labelstatus[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelstatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
-			$this->labelstatus[self::STATUS_CANCELED] = $langs->trans('Disabled');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Disabled');
 		}
 
 		$statusType = 'status'.$status;
 		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
 
-		return dolGetStatus($this->labelstatus[$status], $this->labelstatus[$status], '', $statusType, $mode);
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatus[$status], '', $statusType, $mode);
 	}
 
 	/**
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index a2b89dedb11..8d84d1f4820 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -192,8 +192,8 @@ class Propal extends CommonObject
 	public $lines = array();
 	public $line;
 
-	public $labelstatut=array();
-	public $labelstatut_short=array();
+	public $labelStatus=array();
+	public $labelStatusShort=array();
 
 	public $specimen;
 
@@ -3210,20 +3210,20 @@ class Propal extends CommonObject
 		global $conf;
 
 		// Init/load array of translation of status
-		if (empty($this->labelstatut) || empty($this->labelstatut_short))
+		if (empty($this->labelStatus) || empty($this->labelStatusShort))
 		{
 			global $langs;
 			$langs->load("propal");
-			$this->labelstatut[0]=$langs->trans("PropalStatusDraft");
-			$this->labelstatut[1]=$langs->trans("PropalStatusValidated");
-			$this->labelstatut[2]=$langs->trans("PropalStatusSigned");
-			$this->labelstatut[3]=$langs->trans("PropalStatusNotSigned");
-			$this->labelstatut[4]=$langs->trans("PropalStatusBilled");
-			$this->labelstatut_short[0]=$langs->trans("PropalStatusDraftShort");
-			$this->labelstatut_short[1]=$langs->trans("PropalStatusValidatedShort");
-			$this->labelstatut_short[2]=$langs->trans("PropalStatusSignedShort");
-			$this->labelstatut_short[3]=$langs->trans("PropalStatusNotSignedShort");
-			$this->labelstatut_short[4]=$langs->trans("PropalStatusBilledShort");
+			$this->labelStatus[0]=$langs->trans("PropalStatusDraft");
+			$this->labelStatus[1]=$langs->trans("PropalStatusValidated");
+			$this->labelStatus[2]=$langs->trans("PropalStatusSigned");
+			$this->labelStatus[3]=$langs->trans("PropalStatusNotSigned");
+			$this->labelStatus[4]=$langs->trans("PropalStatusBilled");
+			$this->labelStatusShort[0]=$langs->trans("PropalStatusDraftShort");
+			$this->labelStatusShort[1]=$langs->trans("PropalStatusValidatedShort");
+			$this->labelStatusShort[2]=$langs->trans("PropalStatusSignedShort");
+			$this->labelStatusShort[3]=$langs->trans("PropalStatusNotSignedShort");
+			$this->labelStatusShort[4]=$langs->trans("PropalStatusBilledShort");
 		}
 
 		$statusType='';
@@ -3233,7 +3233,7 @@ class Propal extends CommonObject
 		elseif ($statut==self::STATUS_NOTSIGNED) $statusType='status5';
 		elseif ($statut==self::STATUS_BILLED) $statusType='status6';
 
-		return dolGetStatus($this->labelstatut[$statut], $this->labelstatut_short[$statut], '', $statusType, $mode);
+		return dolGetStatus($this->labelStatus[$statut], $this->labelStatusShort[$statut], '', $statusType, $mode);
 	}
 
 
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 4cc922a8cbf..261190a747e 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3484,48 +3484,48 @@ class Commande extends CommonOrder
 		if (empty($donotshowbilled)) $billedtext .= ($billed?' - '.$langs->trans("Billed"):'');
 
 		if ($statut==self::STATUS_CANCELED){
-		    $labelstatut = $langs->trans('StatusOrderCanceled');
-		    $labelstatutShort = $langs->trans('StatusOrderCanceledShort');
+		    $labelStatus = $langs->trans('StatusOrderCanceled');
+		    $labelStatusShort = $langs->trans('StatusOrderCanceledShort');
 		    $statusType='status5';
 		}
 		elseif ($statut==self::STATUS_DRAFT){
-		    $labelstatut = $langs->trans('StatusOrderDraft');
-		    $labelstatutShort = $langs->trans('StatusOrderDraftShort');
+		    $labelStatus = $langs->trans('StatusOrderDraft');
+		    $labelStatusShort = $langs->trans('StatusOrderDraftShort');
 		    $statusType='status0';
 		}
 		elseif ($statut==self::STATUS_VALIDATED){
-		    $labelstatut = $langs->trans('StatusOrderValidated').$billedtext;
-		    $labelstatutShort = $langs->trans('StatusOrderValidatedShort').$billedtext;
+		    $labelStatus = $langs->trans('StatusOrderValidated').$billedtext;
+		    $labelStatusShort = $langs->trans('StatusOrderValidatedShort').$billedtext;
 		    $statusType='status1';
 		}
 		elseif ($statut==self::STATUS_SHIPMENTONPROCESS){
-		    $labelstatut = $langs->trans('StatusOrderSentShort').$billedtext;
-		    $labelstatutShort = $langs->trans('StatusOrderSentShort').$billedtext;
+		    $labelStatus = $langs->trans('StatusOrderSentShort').$billedtext;
+		    $labelStatusShort = $langs->trans('StatusOrderSentShort').$billedtext;
 		    $statusType='status3';
 		}
 		elseif ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))){
-		    $labelstatut = $langs->trans('StatusOrderToBill');
-		    $labelstatutShort = $langs->trans('StatusOrderToBillShort');
+		    $labelStatus = $langs->trans('StatusOrderToBill');
+		    $labelStatusShort = $langs->trans('StatusOrderToBillShort');
 		    $statusType='status4';
 		}
 		elseif ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))){
-		    $labelstatut = $langs->trans('StatusOrderProcessed').$billedtext;
-		    $labelstatutShort = $langs->trans('StatusOrderProcessed').$billedtext;
+		    $labelStatus = $langs->trans('StatusOrderProcessed').$billedtext;
+		    $labelStatusShort = $langs->trans('StatusOrderProcessed').$billedtext;
 		    $statusType='status6';
 		}
 		elseif ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))){
-		    $labelstatut = $langs->trans('StatusOrderDelivered');
-		    $labelstatutShort = $langs->trans('StatusOrderDelivered');
+		    $labelStatus = $langs->trans('StatusOrderDelivered');
+		    $labelStatusShort = $langs->trans('StatusOrderDelivered');
 		    $statusType='status6';
 		}
 		else{
-		    $labelstatut = $langs->trans('Unknown');
-		    $labelstatutShort = '';
+		    $labelStatus = $langs->trans('Unknown');
+		    $labelStatusShort = '';
 		    $statusType='';
 		    $mode = 0;
 		}
 
-		return dolGetStatus($labelstatut, $labelstatutShort, '', $statusType, $mode);
+		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
 	}
 
 
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index 354b50365ca..06331dc0f2b 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -311,20 +311,20 @@ class CashControl extends CommonObject
 	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		if (empty($this->labelstatus) || empty($this->labelstatusshort))
+		if (empty($this->labelStatus) || empty($this->labelStatusShort))
 		{
 			global $langs;
 			//$langs->load("mymodule");
-			$this->labelstatus[0] = $langs->trans('Draft');
-			$this->labelstatus[1] = $langs->trans('Closed');
-			$this->labelstatusshort[0] = $langs->trans('Draft');
-			$this->labelstatusshort[1] = $langs->trans('Closed');
+			$this->labelStatus[0] = $langs->trans('Draft');
+			$this->labelStatus[1] = $langs->trans('Closed');
+			$this->labelStatusShort[0] = $langs->trans('Draft');
+			$this->labelStatusShort[1] = $langs->trans('Closed');
 		}
 
 		$statusType = 'status0';
 		if ($status == self::STATUS_VALIDATED) $statusType = 'status6';
 
-		return dolGetStatus($this->labelstatus[$status], $this->labelstatusshort[$status], '', $statusType, $mode);
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
 
 	/**
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 4016ebdc813..3058d418237 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -69,7 +69,7 @@ class BonPrelevement extends CommonObject
 	public $total;
 	public $fetched;
 	public $statut;    // 0-Wait, 1-Trans, 2-Done
-	public $labelstatut=array();
+	public $labelStatus=array();
 
 	public $invoice_in_error=array();
 	public $thirdparty_in_error=array();
@@ -2002,48 +2002,48 @@ class BonPrelevement extends CommonObject
 	public function LibStatut($statut, $mode = 0)
 	{
         // phpcs:enable
-		if (empty($this->labelstatut))
+		if (empty($this->labelStatus))
 		{
 			global $langs;
 			$langs->load("withdrawals");
-			$this->labelstatut[0]=$langs->trans("StatusWaiting");
-			$this->labelstatut[1]=$langs->trans("StatusTrans");
-			$this->labelstatut[2]=$langs->trans("StatusCredited");
+			$this->labelStatus[0]=$langs->trans("StatusWaiting");
+			$this->labelStatus[1]=$langs->trans("StatusTrans");
+			$this->labelStatus[2]=$langs->trans("StatusCredited");
 		}
 
 		if ($mode == 0 || $mode == 1)
 		{
-			return $this->labelstatut[$statut];
+			return $this->labelStatus[$statut];
 		}
 		elseif ($mode == 2)
 		{
-			if ($statut==0) return img_picto($this->labelstatut[$statut], 'statut1').' '.$this->labelstatut[$statut];
-			elseif ($statut==1) return img_picto($this->labelstatut[$statut], 'statut3').' '.$this->labelstatut[$statut];
-			elseif ($statut==2) return img_picto($this->labelstatut[$statut], 'statut6').' '.$this->labelstatut[$statut];
+			if ($statut==0) return img_picto($this->labelStatus[$statut], 'statut1').' '.$this->labelStatus[$statut];
+			elseif ($statut==1) return img_picto($this->labelStatus[$statut], 'statut3').' '.$this->labelStatus[$statut];
+			elseif ($statut==2) return img_picto($this->labelStatus[$statut], 'statut6').' '.$this->labelStatus[$statut];
 		}
 		elseif ($mode == 3)
 		{
-			if ($statut==0) return img_picto($this->labelstatut[$statut], 'statut1');
-			elseif ($statut==1) return img_picto($this->labelstatut[$statut], 'statut3');
-			elseif ($statut==2) return img_picto($this->labelstatut[$statut], 'statut6');
+			if ($statut==0) return img_picto($this->labelStatus[$statut], 'statut1');
+			elseif ($statut==1) return img_picto($this->labelStatus[$statut], 'statut3');
+			elseif ($statut==2) return img_picto($this->labelStatus[$statut], 'statut6');
 		}
 		elseif ($mode == 4)
 		{
-			if ($statut==0) return img_picto($this->labelstatut[$statut], 'statut1').' '.$this->labelstatut[$statut];
-			elseif ($statut==1) return img_picto($this->labelstatut[$statut], 'statut3').' '.$this->labelstatut[$statut];
-			elseif ($statut==2) return img_picto($this->labelstatut[$statut], 'statut6').' '.$this->labelstatut[$statut];
+			if ($statut==0) return img_picto($this->labelStatus[$statut], 'statut1').' '.$this->labelStatus[$statut];
+			elseif ($statut==1) return img_picto($this->labelStatus[$statut], 'statut3').' '.$this->labelStatus[$statut];
+			elseif ($statut==2) return img_picto($this->labelStatus[$statut], 'statut6').' '.$this->labelStatus[$statut];
 		}
 		elseif ($mode == 5)
 		{
-			if ($statut==0) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut], 'statut1');
-			elseif ($statut==1) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut], 'statut3');
-			elseif ($statut==2) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut], 'statut6');
+			if ($statut==0) return $this->labelStatus[$statut].' '.img_picto($this->labelStatus[$statut], 'statut1');
+			elseif ($statut==1) return $this->labelStatus[$statut].' '.img_picto($this->labelStatus[$statut], 'statut3');
+			elseif ($statut==2) return $this->labelStatus[$statut].' '.img_picto($this->labelStatus[$statut], 'statut6');
 		}
 		elseif ($mode == 6)
 		{
-			if ($statut==0) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut], 'statut1');
-			elseif ($statut==1) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut], 'statut3');
-			elseif ($statut==2) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut], 'statut6');
+			if ($statut==0) return $this->labelStatus[$statut].' '.img_picto($this->labelStatus[$statut], 'statut1');
+			elseif ($statut==1) return $this->labelStatus[$statut].' '.img_picto($this->labelStatus[$statut], 'statut3');
+			elseif ($statut==2) return $this->labelStatus[$statut].' '.img_picto($this->labelStatus[$statut], 'statut6');
 		}
 	}
 }
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 895293efaf7..6b738719cf5 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -1264,13 +1264,13 @@ class Contact extends CommonObject
         // phpcs:enable
 		global $langs;
 
-		$labelstatus = array(
+		$labelStatus = array(
 			0 => 'ActivityCeased',
 			1 => 'InActivity',
 			4 => 'InActivity',
 			5 => 'ActivityCeased',
 		);
-		$labelstatusshort = array(
+		$labelStatusShort = array(
 			0 => 'ActivityCeased',
 			1 => 'InActivity',
 			4 => 'InActivity',
@@ -1280,8 +1280,8 @@ class Contact extends CommonObject
 		$statusType = 'status4';
 		if ($status==0 || $status==5) $statusType = 'status5';
 
-		$label = $langs->trans($labelstatus[$status]);
-		$labelshort = $langs->trans($labelstatusshort[$status]);
+		$label = $langs->trans($labelStatus[$status]);
+		$labelshort = $langs->trans($labelStatusShort[$status]);
 
 		return dolGetStatus($label, $labelshort, '', $statusType, $mode);
 	}
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index ec27b83e0a0..b6381ccc7ca 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -496,27 +496,27 @@ abstract class CommonInvoice extends CommonObject
 		$prefix='Short';
 		if (! $paye){
 		    if ($status == 0) {
-		        $labelstatut = $langs->trans('BillStatusDraft');
-		        $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusDraft');
+		        $labelStatus = $langs->trans('BillStatusDraft');
+		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusDraft');
 		    }
 		    elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) {
-		        $labelstatut = $langs->trans('BillStatusClosedUnpaid');
-		        $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusClosedUnpaid');
+		        $labelStatus = $langs->trans('BillStatusClosedUnpaid');
+		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusClosedUnpaid');
 		        $statusType='status5';
 		    }
 		    elseif (($status == 3 || $status == 2) && $alreadypaid > 0) {
-		        $labelstatut = $langs->trans('BillStatusClosedPaidPartially');
-		        $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+		        $labelStatus = $langs->trans('BillStatusClosedPaidPartially');
+		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
 		        $statusType='status9';
 		    }
 		    elseif ($alreadypaid <= 0) {
-		        $labelstatut = $langs->trans('BillStatusNotPaid');
-		        $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusNotPaid');
+		        $labelStatus = $langs->trans('BillStatusNotPaid');
+		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusNotPaid');
 		        $statusType='status1';
 		    }
 		    else {
-		        $labelstatut = $langs->trans('BillStatusStarted');
-		        $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusStarted');
+		        $labelStatus = $langs->trans('BillStatusStarted');
+		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusStarted');
 		        $statusType='status3';
 		    }
 		}
@@ -525,20 +525,20 @@ abstract class CommonInvoice extends CommonObject
 		    $statusType='status6';
 
 		    if ($type == self::TYPE_CREDIT_NOTE){
-		        $labelstatut = $langs->trans('BillStatusPaidBackOrConverted');       // credit note
-		        $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');       // credit note
+		        $labelStatus = $langs->trans('BillStatusPaidBackOrConverted');       // credit note
+		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');       // credit note
 		    }
 		    elseif ($type == self::TYPE_DEPOSIT){
-		        $labelstatut = $langs->trans('BillStatusConverted');             // deposit invoice
-		        $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusConverted');             // deposit invoice
+		        $labelStatus = $langs->trans('BillStatusConverted');             // deposit invoice
+		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusConverted');             // deposit invoice
 		    }
 		    else{
-		        $labelstatut = $langs->trans('BillStatusPaid');
-		        $labelstatutShort = $langs->trans('Bill'.$prefix.'StatusPaid');
+		        $labelStatus = $langs->trans('BillStatusPaid');
+		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusPaid');
 		    }
 		}
 
-		return dolGetStatus($labelstatut, $labelstatutShort, '', $statusType, $mode);
+		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 943afe69a1a..56b0dc93c35 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8182,7 +8182,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
         	elseif ($displayMode == 6) $displayMode = 5;
         }
 
-        // image's filename are still in French, so we use this array to convert
+        // For backward compatibility. Image's filename are still in French, so we use this array to convert
         $statusImg=array(
         	'status0' => 'statut0'
         	,'status1' => 'statut1'
@@ -8212,6 +8212,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
             $return =  $htmlImg .' '. $htmlLabel;
         }
         elseif ($displayMode === 5) {
+        	// Add here a span class="hideonsmartphone ?
             $return = $htmlLabelShort .' '. $htmlImg;
         }
         else { // $displayMode >= 6
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index b24213d5c70..4c8c5f73d9b 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -116,12 +116,12 @@ class Don extends CommonObject
     /**
 	 * @var array Array of status label
 	 */
-	public $labelstatut;
+	public $labelStatus;
 
     /**
 	 * @var array Array of status label short
 	 */
-	public $labelstatutshort;
+	public $labelStatusShort;
 
 
 	const STATUS_DRAFT = 0;
@@ -163,25 +163,25 @@ class Don extends CommonObject
     public function LibStatut($status, $mode = 0)
     {
         // phpcs:enable
-    	if (empty($this->labelstatut) || empty($this->labelstatutshort))
+    	if (empty($this->labelStatus) || empty($this->labelStatusShort))
     	{
 	    	global $langs;
 	    	$langs->load("donations");
-	    	$this->labelstatut[-1]=$langs->trans("Canceled");
-	    	$this->labelstatut[0]=$langs->trans("DonationStatusPromiseNotValidated");
-	    	$this->labelstatut[1]=$langs->trans("DonationStatusPromiseValidated");
-	    	$this->labelstatut[2]=$langs->trans("DonationStatusPaid");
-	    	$this->labelstatutshort[-1]=$langs->trans("Canceled");
-	    	$this->labelstatutshort[0]=$langs->trans("DonationStatusPromiseNotValidatedShort");
-	    	$this->labelstatutshort[1]=$langs->trans("DonationStatusPromiseValidatedShort");
-	    	$this->labelstatutshort[2]=$langs->trans("DonationStatusPaidShort");
+	    	$this->labelStatus[-1]=$langs->trans("Canceled");
+	    	$this->labelStatus[0]=$langs->trans("DonationStatusPromiseNotValidated");
+	    	$this->labelStatus[1]=$langs->trans("DonationStatusPromiseValidated");
+	    	$this->labelStatus[2]=$langs->trans("DonationStatusPaid");
+	    	$this->labelStatusShort[-1]=$langs->trans("Canceled");
+	    	$this->labelStatusShort[0]=$langs->trans("DonationStatusPromiseNotValidatedShort");
+	    	$this->labelStatusShort[1]=$langs->trans("DonationStatusPromiseValidatedShort");
+	    	$this->labelStatusShort[2]=$langs->trans("DonationStatusPaidShort");
     	}
 
     	$statusType = 'status'.$status;
     	if ($status == self::STATUS_CANCELED) $statusType = 'status5';
     	if ($status == self::STATUS_PAID) $statusType = 'status6';
 
-    	return dolGetStatus($this->labelstatut[$status], $this->labelstatutshort[$status], '', $statusType, $mode);
+    	return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
     }
 
 
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 7469faaa356..6717b42609b 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -506,46 +506,46 @@ class EmailCollector extends CommonObject
     public function LibStatut($status, $mode = 0)
     {
         // phpcs:enable
-        if (empty($this->labelstatus))
+        if (empty($this->labelStatus))
         {
             global $langs;
             //$langs->load("mymodule");
-            $this->labelstatus[1] = $langs->trans('Enabled');
-            $this->labelstatus[0] = $langs->trans('Disabled');
+            $this->labelStatus[1] = $langs->trans('Enabled');
+            $this->labelStatus[0] = $langs->trans('Disabled');
         }
 
         if ($mode == 0)
         {
-            return $this->labelstatus[$status];
+            return $this->labelStatus[$status];
         }
         elseif ($mode == 1)
         {
-            return $this->labelstatus[$status];
+            return $this->labelStatus[$status];
         }
         elseif ($mode == 2)
         {
-            if ($status == 1) return img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
-            elseif ($status == 0) return img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
+            if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+            elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
         }
         elseif ($mode == 3)
         {
-            if ($status == 1) return img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-            elseif ($status == 0) return img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+            if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+            elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
         }
         elseif ($mode == 4)
         {
-            if ($status == 1) return img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
-            elseif ($status == 0) return img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
+            if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+            elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
         }
         elseif ($mode == 5)
         {
-            if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-            elseif ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+            if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+            elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
         }
         elseif ($mode == 6)
         {
-            if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-            elseif ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+            if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+            elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
         }
     }
 
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index 0033b615f8a..7f7360b49f1 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -408,46 +408,46 @@ class EmailCollectorAction extends CommonObject
     public function LibStatut($status, $mode = 0)
     {
         // phpcs:enable
-        if (empty($this->labelstatus))
+        if (empty($this->labelStatus))
         {
             global $langs;
             //$langs->load("emailcollector");
-            $this->labelstatus[1] = $langs->trans('Enabled');
-            $this->labelstatus[0] = $langs->trans('Disabled');
+            $this->labelStatus[1] = $langs->trans('Enabled');
+            $this->labelStatus[0] = $langs->trans('Disabled');
         }
 
         if ($mode == 0)
         {
-            return $this->labelstatus[$status];
+            return $this->labelStatus[$status];
         }
         elseif ($mode == 1)
         {
-            return $this->labelstatus[$status];
+            return $this->labelStatus[$status];
         }
         elseif ($mode == 2)
         {
-            if ($status == 1) return img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
-            elseif ($status == 0) return img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
+            if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+            elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
         }
         elseif ($mode == 3)
         {
-            if ($status == 1) return img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-            elseif ($status == 0) return img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+            if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+            elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
         }
         elseif ($mode == 4)
         {
-            if ($status == 1) return img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
-            elseif ($status == 0) return img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
+            if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+            elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
         }
         elseif ($mode == 5)
         {
-            if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-            elseif ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+            if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+            elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
         }
         elseif ($mode == 6)
         {
-            if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-            elseif ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+            if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+            elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
         }
     }
 
diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index 5a8f3003c84..43eb9d1cb65 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -383,46 +383,46 @@ class EmailCollectorFilter extends CommonObject
 	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		if (empty($this->labelstatus))
+		if (empty($this->labelStatus))
 		{
 			global $langs;
 			//$langs->load("emailcollector");
-			$this->labelstatus[1] = $langs->trans('Enabled');
-			$this->labelstatus[0] = $langs->trans('Disabled');
+			$this->labelStatus[1] = $langs->trans('Enabled');
+			$this->labelStatus[0] = $langs->trans('Disabled');
 		}
 
 		if ($mode == 0)
 		{
-			return $this->labelstatus[$status];
+			return $this->labelStatus[$status];
 		}
 		elseif ($mode == 1)
 		{
-			return $this->labelstatus[$status];
+			return $this->labelStatus[$status];
 		}
 		elseif ($mode == 2)
 		{
-			if ($status == 1) return img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
-			elseif ($status == 0) return img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
+			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
 		}
 		elseif ($mode == 3)
 		{
-			if ($status == 1) return img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-			elseif ($status == 0) return img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
 		}
 		elseif ($mode == 4)
 		{
-			if ($status == 1) return img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
-			elseif ($status == 0) return img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
+			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
 		}
 		elseif ($mode == 5)
 		{
-			if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-			elseif ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+			if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+			elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
 		}
 		elseif ($mode == 6)
 		{
-			if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-			elseif ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+			if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+			elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
 		}
 	}
 
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 52072b63578..fffde04ac3d 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -683,12 +683,12 @@ class ExpenseReport extends CommonObject
     	// phpcs:enable
     	global $langs;
 
-    	$labelstatus = $langs->trans($this->statuts[$status]);
-    	$labelstatusshort = $langs->trans($this->statuts_short[$status]);
+    	$labelStatus = $langs->trans($this->statuts[$status]);
+    	$labelStatusShort = $langs->trans($this->statuts_short[$status]);
 
     	$statusType = $this->statuts_logo[$status];
 
-    	return dolGetStatus($labelstatus, $labelstatusshort, '', $statusType, $mode);
+    	return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
     }
 
 
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 8fe5f0570fe..b75eec43eac 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1227,20 +1227,20 @@ class Holiday extends CommonObject
 	public function LibStatut($status, $mode = 0, $startdate = '')
 	{
 		// phpcs:enable
-		if (empty($this->labelstatus) || empty($this->labelstatusshort))
+		if (empty($this->labelStatus) || empty($this->labelStatusShort))
 		{
 			global $langs;
 			//$langs->load("mymodule");
-			$this->labelstatus[self::STATUS_DRAFT] = $langs->trans('DraftCP');
-			$this->labelstatus[self::STATUS_VALIDATED] = $langs->trans('ToReviewCP');
-			$this->labelstatus[self::STATUS_APPROVED] = $langs->trans('ApprovedCP');
-			$this->labelstatus[self::STATUS_CANCELED] = $langs->trans('CancelCP');
-			$this->labelstatus[self::STATUS_REFUSED] = $langs->trans('RefuseCP');
-			$this->labelstatusshort[self::STATUS_DRAFT] = $langs->trans('DraftCP');
-			$this->labelstatusshort[self::STATUS_VALIDATED] = $langs->trans('ToReviewCP');
-			$this->labelstatusshort[self::STATUS_APPROVED] = $langs->trans('ApprovedCP');
-			$this->labelstatusshort[self::STATUS_CANCELED] = $langs->trans('CancelCP');
-			$this->labelstatusshort[self::STATUS_REFUSED] = $langs->trans('RefuseCP');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('DraftCP');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('ToReviewCP');
+			$this->labelStatus[self::STATUS_APPROVED] = $langs->trans('ApprovedCP');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('CancelCP');
+			$this->labelStatus[self::STATUS_REFUSED] = $langs->trans('RefuseCP');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('DraftCP');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('ToReviewCP');
+			$this->labelStatusShort[self::STATUS_APPROVED] = $langs->trans('ApprovedCP');
+			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('CancelCP');
+			$this->labelStatusShort[self::STATUS_REFUSED] = $langs->trans('RefuseCP');
 		}
 
 		$statusType = 'status6';
@@ -1250,7 +1250,7 @@ class Holiday extends CommonObject
 		if ($status == self::STATUS_CANCELED) $statusType = 'status5';
 		if ($status == self::STATUS_REFUSED) $statusType = 'status5';
 
-		return dolGetStatus($this->labelstatus[$status], $this->labelstatusshort[$status], '', $statusType, $mode);
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
 
 
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 41d0af33d46..43488429807 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -656,22 +656,22 @@ class MyObject extends CommonObject
 	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		if (empty($this->labelstatus) || empty($this->labelstatusshort))
+		if (empty($this->labelStatus) || empty($this->labelStatusShort))
 		{
 			global $langs;
 			//$langs->load("mymodule");
-			$this->labelstatus[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelstatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
-			$this->labelstatus[self::STATUS_CANCELED] = $langs->trans('Disabled');
-			$this->labelstatusshort[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelstatusshort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
-			$this->labelstatusshort[self::STATUS_CANCELED] = $langs->trans('Disabled');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Disabled');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Disabled');
 		}
 
 		$statusType = 'status'.$status;
 		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
 
-		return dolGetStatus($this->labelstatus[$status], $this->labelstatusshort[$status], '', $statusType, $mode);
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
 
 	/**
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 71a743eb071..49160092b63 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -546,21 +546,21 @@ class Mo extends CommonObject
 	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		if (empty($this->labelstatus))
+		if (empty($this->labelStatus))
 		{
 			global $langs;
 			//$langs->load("mrp");
-			$this->labelstatus[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelstatus[self::STATUS_VALIDATED] = $langs->trans('Validated');
-			$this->labelstatus[self::STATUS_INPROGRESS] = $langs->trans('InProgress');
-			$this->labelstatus[self::STATUS_PRODUCED] = $langs->trans('StatusMOProduced');
-			$this->labelstatus[self::STATUS_CANCELED] = $langs->trans('Canceled');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Validated');
+			$this->labelStatus[self::STATUS_INPROGRESS] = $langs->trans('InProgress');
+			$this->labelStatus[self::STATUS_PRODUCED] = $langs->trans('StatusMOProduced');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Canceled');
 		}
 
 		$statusType = 'status'.$status;
 		//if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
 
-		return dolGetStatus($this->labelstatus[$status], $this->labelstatus[$status], '', $statusType, $mode);
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatus[$status], '', $statusType, $mode);
 	}
 
 	/**
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index bf2b3a0e410..5243e84e4de 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4390,7 +4390,7 @@ class Product extends CommonObject
         // phpcs:enable
         global $conf, $langs;
 
-        $labelstatut = $labelstatutShort = '';
+        $labelStatus = $labelStatusShort = '';
 
         $langs->load('products');
         if (! empty($conf->productbatch->enabled)) { $langs->load("productbatch");
@@ -4423,31 +4423,31 @@ class Product extends CommonObject
         if ($status == 0) {
             // $type   0=Status "to sell", 1=Status "to buy", 2=Status "to Batch"
             if($type==0) {
-                $labelstatut = $langs->trans('ProductStatusNotOnSellShort');
-                $labelstatutShort = $langs->trans('ProductStatusNotOnSell');
+                $labelStatus = $langs->trans('ProductStatusNotOnSellShort');
+                $labelStatusShort = $langs->trans('ProductStatusNotOnSell');
             }
             elseif($type == 1) {
-                $labelstatut = $langs->trans('ProductStatusNotOnBuyShort');
-                $labelstatutShort = $langs->trans('ProductStatusNotOnBuy');
+                $labelStatus = $langs->trans('ProductStatusNotOnBuyShort');
+                $labelStatusShort = $langs->trans('ProductStatusNotOnBuy');
             }
             elseif($type == 2) {
-                $labelstatut = $langs->trans('ProductStatusNotOnBatch');
-                $labelstatutShort = $langs->trans('ProductStatusNotOnBatchShort');
+                $labelStatus = $langs->trans('ProductStatusNotOnBatch');
+                $labelStatusShort = $langs->trans('ProductStatusNotOnBatchShort');
             }
         }
         elseif ($status == 1) {
             // $type   0=Status "to sell", 1=Status "to buy", 2=Status "to Batch"
             if ($type==0) {
-                $labelstatut = $langs->trans('ProductStatusOnSellShort');
-                $labelstatutShort = $langs->trans('ProductStatusOnSell');
+                $labelStatus = $langs->trans('ProductStatusOnSellShort');
+                $labelStatusShort = $langs->trans('ProductStatusOnSell');
             }
             elseif ($type == 1) {
-                $labelstatut = $langs->trans('ProductStatusOnBuyShort');
-                $labelstatutShort = $langs->trans('ProductStatusOnBuy');
+                $labelStatus = $langs->trans('ProductStatusOnBuyShort');
+                $labelStatusShort = $langs->trans('ProductStatusOnBuy');
             }
             elseif ($type == 2) {
-                $labelstatut = $langs->trans('ProductStatusOnBatch');
-                $labelstatutShort = $langs->trans('ProductStatusOnBatchShort');
+                $labelStatus = $langs->trans('ProductStatusOnBatch');
+                $labelStatusShort = $langs->trans('ProductStatusOnBatchShort');
             }
         }
 
@@ -4455,7 +4455,7 @@ class Product extends CommonObject
         if ($mode > 6) {
             return dolGetStatus($langs->trans('Unknown'), '', '', 'status0', 0);
         } else {
-            return dolGetStatus($labelstatut, $labelstatutShort, '', $statuttrans, $mode);
+            return dolGetStatus($labelStatus, $labelStatusShort, '', $statuttrans, $mode);
         }
     }
 
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 477dcc20b0c..ff5e83b9410 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -266,7 +266,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
 /*
- * Last modified products
+ * Latest modified products
  */
 $max=15;
 $sql = "SELECT p.rowid, p.label, p.price, p.ref, p.fk_product_type, p.tosell, p.tobuy, p.tobatch, p.fk_price_expression,";
@@ -299,11 +299,11 @@ if ($result)
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder" width="100%">';
 
-		$colnb=4;
+		$colnb=2;
 		if (empty($conf->global->PRODUIT_MULTIPRICES)) $colnb++;
 
 		print '<tr class="liste_titre"><th colspan="'.$colnb.'">'.$transRecordedType.'</th>';
-		print '<th class="right"><a href="'.DOL_URL_ROOT.'/product/list.php?sortfield=p.tms&sortorder=DESC">'.$langs->trans("FullList").'</td>';
+		print '<th class="right" colspan="3"><a href="'.DOL_URL_ROOT.'/product/list.php?sortfield=p.tms&sortorder=DESC">'.$langs->trans("FullList").'</td>';
 		print '</tr>';
 
 		while ($i < $num)
@@ -359,11 +359,11 @@ if ($result)
     			else print price($objp->price).' '.$langs->trans("HT");
     			print '</td>';
 			}
-			print '<td class="right nowrap"><span class="statusrefsell">';
-			print $product_static->LibStatut($objp->tosell, 5, 0);
+			print '<td class="right nowrap width25"><span class="statusrefsell">';
+			print $product_static->LibStatut($objp->tosell, 3, 0);
 			print "</span></td>";
-            print '<td class="right nowrap"><span class="statusrefbuy">';
-            print $product_static->LibStatut($objp->tobuy, 5, 1);
+            print '<td class="right nowrap width25"><span class="statusrefbuy">';
+            print $product_static->LibStatut($objp->tobuy, 3, 1);
             print "</span></td>";
 			print "</tr>\n";
 			$i++;
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 775ffcf3e5c..4434f82fbcf 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -396,16 +396,16 @@ class Inventory extends CommonObject
         // phpcs:enable
 		global $langs;
 
-		if (empty($this->labelstatus))
+		if (empty($this->labelStatus))
 		{
 			global $langs;
 			//$langs->load("mrp");
-			$this->labelstatus[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelstatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
-			$this->labelstatus[self::STATUS_CANCELED] = $langs->trans('Canceled');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Canceled');
 		}
 
-		return dolGetStatus($this->labelstatus[$status], $this->labelstatus[$status], '', 'status'.$status, $mode);
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatus[$status], '', 'status'.$status, $mode);
 	}
 
 	/**
diff --git a/htdocs/projet/graph_opportunities.inc.php b/htdocs/projet/graph_opportunities.inc.php
index 7d75544ef93..0987a47e507 100644
--- a/htdocs/projet/graph_opportunities.inc.php
+++ b/htdocs/projet/graph_opportunities.inc.php
@@ -55,20 +55,20 @@ if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 	    $listofstatus=array_keys($listofoppstatus);
 	    foreach ($listofstatus as $status)
 	    {
-	    	$labelstatus = '';
+	    	$labelStatus = '';
 
 			$code = dol_getIdFromCode($db, $status, 'c_lead_status', 'rowid', 'code');
-	        if ($code) $labelstatus = $langs->trans("OppStatus".$code);
-	        if (empty($labelstatus)) $labelstatus=$listofopplabel[$status];
+	        if ($code) $labelStatus = $langs->trans("OppStatus".$code);
+	        if (empty($labelStatus)) $labelStatus=$listofopplabel[$status];
 
-	        //$labelstatus .= ' ('.$langs->trans("Coeff").': '.price2num($listofoppstatus[$status]).')';
-	        //$labelstatus .= ' - '.price2num($listofoppstatus[$status]).'%';
+	        //$labelStatus .= ' ('.$langs->trans("Coeff").': '.price2num($listofoppstatus[$status]).')';
+	        //$labelStatus .= ' - '.price2num($listofoppstatus[$status]).'%';
 
-	        $dataseries[]=array($labelstatus, (isset($valsamount[$status])?(float) $valsamount[$status]:0));
+	        $dataseries[]=array($labelStatus, (isset($valsamount[$status])?(float) $valsamount[$status]:0));
 	        if (! $conf->use_javascript_ajax)
 	        {
 	            print '<tr class="oddeven">';
-	            print '<td>'.$labelstatus.'</td>';
+	            print '<td>'.$labelStatus.'</td>';
 	            print '<td class="right"><a href="list.php?statut='.$status.'">'.price((isset($valsamount[$status])?(float) $valsamount[$status]:0), 0, '', 1, -1, -1, $conf->currency).'</a></td>';
 	            print "</tr>\n";
 	        }
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index fe8c78c7aa2..ca17077a47b 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2283,15 +2283,15 @@ class Societe extends CommonObject
 		$statusType = 'status4';
 		if ($status == 0) $statusType = 'status5';
 
-		if (empty($this->labelstatus) || empty($this->labelstatusshort))
+		if (empty($this->labelStatus) || empty($this->labelStatusShort))
 		{
-			$this->labelstatus[0] = $langs->trans("ActivityCeased");
-			$this->labelstatus[1] = $langs->trans("InActivity");
-			$this->labelstatusshort[0] = $langs->trans("ActivityCeased");
-			$this->labelstatusshort[1] = $langs->trans("InActivity");
+			$this->labelStatus[0] = $langs->trans("ActivityCeased");
+			$this->labelStatus[1] = $langs->trans("InActivity");
+			$this->labelStatusShort[0] = $langs->trans("ActivityCeased");
+			$this->labelStatusShort[1] = $langs->trans("InActivity");
 		}
 
-		return dolGetStatus($this->labelstatus[$status], $this->labelstatusshort[$status], '', $statusType, $mode);
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index b2962478b17..a422e199e55 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -232,7 +232,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
 /*
- * Last third parties modified
+ * Latest modified third parties
  */
 $max=15;
 $sql = "SELECT s.rowid, s.nom as name, s.email, s.client, s.fournisseur";
@@ -316,7 +316,7 @@ if ($result)
             print dol_print_date($thirdparty_static->datem, 'day');
             print "</td>";
             print '<td class="right nowrap">';
-            print $thirdparty_static->getLibStatut(5);
+            print $thirdparty_static->getLibStatut(3);
             print "</td>";
             print "</tr>\n";
             $i++;
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index be272ee2d36..aa78324ad37 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -158,8 +158,8 @@ class SupplierProposal extends CommonObject
     public $lines = array();
     public $line;
 
-    public $labelstatut=array();
-    public $labelstatut_short=array();
+    public $labelStatus=array();
+    public $labelStatusShort=array();
 
     public $nbtodo;
     public $nbtodolate;
@@ -2196,20 +2196,20 @@ class SupplierProposal extends CommonObject
         // phpcs:enable
 
     	// Init/load array of translation of status
-    	if (empty($this->labelstatut) || empty($this->labelstatut_short))
+    	if (empty($this->labelStatus) || empty($this->labelStatusShort))
     	{
     		global $langs;
     		$langs->load("supplier_proposal");
-    		$this->labelstatut[self::STATUS_DRAFT]=$langs->trans("SupplierProposalStatusDraft");
-    		$this->labelstatut[self::STATUS_VALIDATED]=$langs->trans("SupplierProposalStatusValidated");
-    		$this->labelstatut[self::STATUS_SIGNED]=$langs->trans("SupplierProposalStatusSigned");
-    		$this->labelstatut[self::STATUS_NOTSIGNED]=$langs->trans("SupplierProposalStatusNotSigned");
-    		$this->labelstatut[self::STATUS_CLOSE]=$langs->trans("SupplierProposalStatusClosed");
-    		$this->labelstatut_short[self::STATUS_DRAFT]=$langs->trans("SupplierProposalStatusDraftShort");
-    		$this->labelstatut_short[self::STATUS_VALIDATED]=$langs->trans("Opened");
-    		$this->labelstatut_short[self::STATUS_SIGNED]=$langs->trans("SupplierProposalStatusSignedShort");
-    		$this->labelstatut_short[self::STATUS_NOTSIGNED]=$langs->trans("SupplierProposalStatusNotSignedShort");
-    		$this->labelstatut_short[self::STATUS_CLOSE]=$langs->trans("SupplierProposalStatusClosedShort");
+    		$this->labelStatus[self::STATUS_DRAFT]=$langs->trans("SupplierProposalStatusDraft");
+    		$this->labelStatus[self::STATUS_VALIDATED]=$langs->trans("SupplierProposalStatusValidated");
+    		$this->labelStatus[self::STATUS_SIGNED]=$langs->trans("SupplierProposalStatusSigned");
+    		$this->labelStatus[self::STATUS_NOTSIGNED]=$langs->trans("SupplierProposalStatusNotSigned");
+    		$this->labelStatus[self::STATUS_CLOSE]=$langs->trans("SupplierProposalStatusClosed");
+    		$this->labelStatusShort[self::STATUS_DRAFT]=$langs->trans("SupplierProposalStatusDraftShort");
+    		$this->labelStatusShort[self::STATUS_VALIDATED]=$langs->trans("Opened");
+    		$this->labelStatusShort[self::STATUS_SIGNED]=$langs->trans("SupplierProposalStatusSignedShort");
+    		$this->labelStatusShort[self::STATUS_NOTSIGNED]=$langs->trans("SupplierProposalStatusNotSignedShort");
+    		$this->labelStatusShort[self::STATUS_CLOSE]=$langs->trans("SupplierProposalStatusClosedShort");
     	}
 
     	$statusnew='';
@@ -2219,7 +2219,7 @@ class SupplierProposal extends CommonObject
     	elseif ($status==self::STATUS_NOTSIGNED) $statusnew='status5';
     	elseif ($status==self::STATUS_CLOSE) $statusnew='status6';
 
-    	return dolGetStatus($this->labelstatut[$status], $this->labelstatut_short[$status], '', $statusnew, $mode);
+    	return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusnew, $mode);
     }
 
 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 6e7d2540d32..6baffc74a73 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2495,20 +2495,20 @@ class User extends CommonObject
         // phpcs:enable
 		global $langs;
 
-		if (empty($this->labelstatus) || empty($this->labelstatusshort))
+		if (empty($this->labelStatus) || empty($this->labelStatusShort))
 		{
 			global $langs;
 			//$langs->load("mymodule");
-			$this->labelstatus[self::STATUS_ENABLED] = $langs->trans('Enabled');
-			$this->labelstatus[self::STATUS_DISABLED] = $langs->trans('Disabled');
-			$this->labelstatusshort[self::STATUS_ENABLED] = $langs->trans('Enabled');
-			$this->labelstatusshort[self::STATUS_DISABLED] = $langs->trans('Disabled');
+			$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled');
+			$this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Disabled');
+			$this->labelStatusShort[self::STATUS_ENABLED] = $langs->trans('Enabled');
+			$this->labelStatusShort[self::STATUS_DISABLED] = $langs->trans('Disabled');
 		}
 
 		$statusType = 'status5';
 		if ($status == self::STATUS_ENABLED) $statusType = 'status4';
 
-		return dolGetStatus($this->labelstatus[$status], $this->labelstatusshort[$status], '', $statusType, $mode);
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
 
 
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index ac99001bf4b..d84b5232773 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -745,20 +745,20 @@ class Website extends CommonObject
         // phpcs:enable
 		global $langs;
 
-		if (empty($this->labelstatus) || empty($this->labelstatusshort))
+		if (empty($this->labelStatus) || empty($this->labelStatusShort))
 		{
 			global $langs;
 			//$langs->load("mymodule");
-			$this->labelstatus[self::STATUS_DRAFT] = $langs->trans('Disabled');
-			$this->labelstatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
-			$this->labelstatusshort[self::STATUS_DRAFT] = $langs->trans('Disabled');
-			$this->labelstatusshort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Disabled');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
 		}
 
 		$statusType = 'status5';
 		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
 
-		return dolGetStatus($this->labelstatus[$status], $this->labelstatusshort[$status], '', $statusType, $mode);
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
 
 
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index e85af6244e3..0258198ba10 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -545,20 +545,20 @@ class WebsitePage extends CommonObject
         // phpcs:enable
 		global $langs;
 
-		if (empty($this->labelstatus) || empty($this->labelstatusshort))
+		if (empty($this->labelStatus) || empty($this->labelStatusShort))
 		{
 			global $langs;
 			//$langs->load("mymodule");
-			$this->labelstatus[self::STATUS_DRAFT] = $langs->trans('Disabled');
-			$this->labelstatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
-			$this->labelstatusshort[self::STATUS_DRAFT] = $langs->trans('Disabled');
-			$this->labelstatusshort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Disabled');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
 		}
 
 		$statusType = 'status5';
 		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
 
-		return dolGetStatus($this->labelstatus[$status], $this->labelstatusshort[$status], '', $statusType, $mode);
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
 
 
diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index 81b76b1c81f..5c79d68aefe 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -633,37 +633,37 @@ class Hook extends CommonObject
     public function LibStatut($status, $mode = 0)
     {
         // phpcs:enable
-        if (empty($this->labelstatus)) {
+        if (empty($this->labelStatus)) {
             global $langs;
             //$langs->load("zapier@zapier");
-            $this->labelstatus[1] = $langs->trans('Enabled');
-            $this->labelstatus[0] = $langs->trans('Disabled');
+            $this->labelStatus[1] = $langs->trans('Enabled');
+            $this->labelStatus[0] = $langs->trans('Disabled');
         }
 
         if ($mode == 0) {
-            return $this->labelstatus[$status];
+            return $this->labelStatus[$status];
         } elseif ($mode == 1) {
-            return $this->labelstatus[$status];
+            return $this->labelStatus[$status];
         } elseif ($mode == 2) {
             if ($status == 1) {
-                return img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
+                return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
             } elseif ($status == 0) {
-                return img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
+                return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
             }
         } elseif ($mode == 3) {
-            if ($status == 1) return img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-            elseif ($status == 0) return img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+            if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+            elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
         } elseif ($mode == 4) {
-            if ($status == 1) return img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
-            elseif ($status == 0) return img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
+            if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+            elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
         } elseif ($mode == 5) {
-            if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-            elseif ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+            if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+            elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
         } elseif ($mode == 6) {
             if ($status == 1) {
-                return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+                return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
             } elseif ($status == 0) {
-                return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+                return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
             }
         }
     }

From 135e65c4aaae3e75ba1de48e4c1549bfa59bbdca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Nov 2019 15:53:57 +0100
Subject: [PATCH 29/38] Look and feel v11 Enhance the progress bar of tasks

---
 htdocs/admin/emailcollector_card.php          |   6 +-
 htdocs/contrat/class/contrat.class.php        | 140 ++++++----------
 htdocs/core/lib/functions.lib.php             |  24 ++-
 htdocs/core/lib/project.lib.php               |  39 +++--
 .../class/emailcollector.class.php            |  49 ++----
 htdocs/langs/en_US/modulebuilder.lang         |  12 +-
 htdocs/modulebuilder/index.php                | 155 ++++++++++--------
 htdocs/mrp/ChangeLog.md                       |   5 -
 htdocs/takepos/ChangeLog.md                   |   5 -
 htdocs/theme/eldy/badges.inc.php              |   2 +-
 htdocs/theme/eldy/global.inc.php              |   6 +
 htdocs/theme/eldy/progress.inc.php            |   9 +-
 htdocs/theme/md/badges.inc.php                |   4 +-
 htdocs/theme/md/style.css.php                 |   6 +
 14 files changed, 223 insertions(+), 239 deletions(-)
 delete mode 100644 htdocs/mrp/ChangeLog.md
 delete mode 100644 htdocs/takepos/ChangeLog.md

diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index daa0c896809..cb0288b44ba 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -260,7 +260,7 @@ if ($action == 'create') {
 
 	dol_fiche_head(array(), '');
 
-	print '<table class="border centpercent">'."\n";
+	print '<table class="border centpercent tableforfield">'."\n";
 
 	//unset($fields[]);
 
@@ -296,7 +296,7 @@ if (($id || $ref) && $action == 'edit')
 
 	dol_fiche_head();
 
-	print '<table class="border centpercent">' . "\n";
+	print '<table class="border centpercent tableforfield">' . "\n";
 
 	// Common attributes
 	include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_edit.tpl.php';
@@ -448,7 +448,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<div class="fichecenter">';
 	print '<div class="fichehalfleft">';
 	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">'."\n";
+	print '<table class="border centpercent tableforfield">'."\n";
 
 	// Common attributes
 	//$keyforbreak='fieldkeytoswithonsecondcolumn';
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index a6ccd9f7cf1..038de071863 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -189,6 +189,12 @@ class Contrat extends CommonObject
 	protected $lines_id_index_mapper=array();
 
 
+	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+	const STATUS_CLOSED = 2;
+
+
+
 	/**
 	 *	Constructor
 	 *
@@ -1881,40 +1887,31 @@ class Contrat extends CommonObject
 	/**
 	 *  Renvoi label of a given contrat status
 	 *
-	 *  @param	int		$statut      	Status id
+	 *  @param	int		$status      	Id status
 	 *  @param  int		$mode          	0=Long label, 1=Short label, 2=Picto + Libelle court, 3=Picto, 4=Picto + Long label of all services, 5=Libelle court + Picto, 6=Picto of all services, 7=Same than 6 with fixed length
 	 *	@return string      			Label
 	 */
-	public function LibStatut($statut, $mode)
+	public function LibStatut($status, $mode)
 	{
         // phpcs:enable
-		global $langs;
-		$langs->load("contracts");
-		if ($mode == 0)
+
+		if (empty($this->labelStatus) || empty($this->labelStatusShort))
 		{
-			if ($statut == 0) { return $langs->trans("ContractStatusDraft"); }
-			elseif ($statut == 1) { return $langs->trans("ContractStatusValidated"); }
-			elseif ($statut == 2) { return $langs->trans("ContractStatusClosed"); }
+			global $langs;
+			$langs->load("contracts");
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('ContractStatusDraft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('ContractStatusValidated');
+			$this->labelStatus[self::STATUS_CLOSED] = $langs->trans('ContractStatusClosed');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('ContractStatusDraft');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('ContractStatusValidated');
+			$this->labelStatusShort[self::STATUS_CLOSED] = $langs->trans('ContractStatusClosed');
 		}
-		elseif ($mode == 1)
-		{
-			if ($statut == 0) { return $langs->trans("ContractStatusDraft"); }
-			elseif ($statut == 1) { return $langs->trans("ContractStatusValidated"); }
-			elseif ($statut == 2) { return $langs->trans("ContractStatusClosed"); }
-		}
-		elseif ($mode == 2)
-		{
-			if ($statut == 0) { return img_picto($langs->trans('ContractStatusDraft'), 'statut0').' '.$langs->trans("ContractStatusDraft"); }
-			elseif ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'), 'statut4').' '.$langs->trans("ContractStatusValidated"); }
-			elseif ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'), 'statut6').' '.$langs->trans("ContractStatusClosed"); }
-		}
-		elseif ($mode == 3)
-		{
-			if ($statut == 0) { return img_picto($langs->trans('ContractStatusDraft'), 'statut0'); }
-			elseif ($statut == 1) { return img_picto($langs->trans('ContractStatusValidated'), 'statut4'); }
-			elseif ($statut == 2) { return img_picto($langs->trans('ContractStatusClosed'), 'statut6'); }
-		}
-		elseif ($mode == 4 || $mode == 6 || $mode == 7)
+
+		$statusType = 'status'.$status;
+		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
+		if ($status == self::STATUS_VALIDATED) $statusType = 'status6';
+
+		if ($mode == 4 || $mode == 6 || $mode == 7)
 		{
 			$text='';
 			if ($mode == 4) {
@@ -1924,22 +1921,20 @@ class Contrat extends CommonObject
 				$text.=': &nbsp; &nbsp; ';
 				$text.='</span>';
 			}
-			$text.=($mode == 7?'<div class="inline-block">':'');
-			$text.=($mode != 7 || $this->nbofserviceswait > 0) ? ($this->nbofserviceswait.ContratLigne::LibStatut(0, 3, -1, 'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesopened || $this->nbofservicesexpired || $this->nbofservicesclosed)?' &nbsp; ':'') : '';
-			$text.=($mode == 7?'</div><div class="inline-block">':'');
-			$text.=($mode != 7 || $this->nbofservicesopened > 0) ? ($this->nbofservicesopened.ContratLigne::LibStatut(4, 3, 0, 'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesexpired || $this->nbofservicesclosed)?' &nbsp; ':'') : '';
-			$text.=($mode == 7?'</div><div class="inline-block">':'');
-			$text.=($mode != 7 || $this->nbofservicesexpired > 0) ? ($this->nbofservicesexpired.ContratLigne::LibStatut(4, 3, 1, 'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesclosed)?' &nbsp; ':'') : '';
-			$text.=($mode == 7?'</div><div class="inline-block">':'');
-			$text.=($mode != 7 || $this->nbofservicesclosed > 0) ? ($this->nbofservicesclosed.ContratLigne::LibStatut(5, 3, -1, 'class="paddingleft2 inline-block valigntextbottom"')) : '';
-			$text.=($mode == 7?'</div>':'');
+			$text.=($mode == 7?'<span class="nowrap">':'');
+			$text.=($mode != 7 || $this->nbofserviceswait > 0) ? ($this->nbofserviceswait.ContratLigne::LibStatut(0, 3, -1, 'class="marginleft2"')).(($mode != 7 || $this->nbofservicesopened || $this->nbofservicesexpired || $this->nbofservicesclosed)?' &nbsp; ':'') : '';
+			$text.=($mode == 7?'</span><span class="nowrap">':'');
+			$text.=($mode != 7 || $this->nbofservicesopened > 0) ? ($this->nbofservicesopened.ContratLigne::LibStatut(4, 3, 0, 'class="marginleft2"')).(($mode != 7 || $this->nbofservicesexpired || $this->nbofservicesclosed)?' &nbsp; ':'') : '';
+			$text.=($mode == 7?'</span><span class="nowrap">':'');
+			$text.=($mode != 7 || $this->nbofservicesexpired > 0) ? ($this->nbofservicesexpired.ContratLigne::LibStatut(4, 3, 1, 'class="marginleft2"')).(($mode != 7 || $this->nbofservicesclosed)?' &nbsp; ':'') : '';
+			$text.=($mode == 7?'</span><span class="nowrap">':'');
+			$text.=($mode != 7 || $this->nbofservicesclosed > 0) ? ($this->nbofservicesclosed.ContratLigne::LibStatut(5, 3, -1, 'class="marginleft2"')) : '';
+			$text.=($mode == 7?'</span>':'');
 			return $text;
 		}
-		elseif ($mode == 5)
+		else
 		{
-			if ($statut == 0) { return $langs->trans("ContractStatusDraft").' '.img_picto($langs->trans('ContractStatusDraft'), 'statut0'); }
-			elseif ($statut == 1) { return $langs->trans("ContractStatusValidated").' '.img_picto($langs->trans('ContractStatusValidated'), 'statut4'); }
-			elseif ($statut == 2) { return $langs->trans("ContractStatusClosed").' '.img_picto($langs->trans('ContractStatusClosed'), 'statut6'); }
+			return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 		}
 	}
 
@@ -2728,65 +2723,34 @@ class ContratLigne extends CommonObjectLine
 	/**
 	 *  Return label of a contract line status
 	 *
-	 *  @param	int		$statut     Id statut
+	 *  @param	int		$status     Id status
 	 *	@param  int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *	@param	int		$expired	0=Not expired, 1=Expired, -1=Both or unknown
 	 *  @param	string	$moreatt	More attribute
 	 *  @return string      		Libelle
 	 */
-	public static function LibStatut($statut, $mode, $expired = -1, $moreatt = '')
+	public static function LibStatut($status, $mode, $expired = -1, $moreatt = '')
 	{
         // phpcs:enable
 		global $langs;
 		$langs->load("contracts");
-		if ($mode == 0)
+
+		if ($status == self::STATUS_INITIAL) { $labelStatus = $langs->trans("ServiceStatusInitial"); $labelStatusShort = $langs->trans("ServiceStatusInitial"); }
+		elseif ($status == self::STATUS_OPEN && $expired == -1) { $labelStatus = $langs->trans("ServiceStatusRunning"); $labelStatusShort = $langs->trans("ServiceStatusRunning"); }
+		elseif ($status == self::STATUS_OPEN && $expired == 0)  { $labelStatus = $langs->trans("ServiceStatusNotLate"); $labelStatusShort = $langs->trans("ServiceStatusNotLateShort"); }
+		elseif ($status == self::STATUS_OPEN && $expired == 1)  { $labelStatus = $langs->trans("ServiceStatusLate"); $labelStatusShort = $langs->trans("ServiceStatusLateShort"); }
+		elseif ($status == self::STATUS_CLOSED) { $labelStatus = $langs->trans("ServiceStatusClosed"); $labelStatusShort = $langs->trans("ServiceStatusClosed"); }
+
+		$statusType = 'status'.$status;
+		if ($status == self::STATUS_OPEN && $expired == 1) $statusType = 'status3';
+		if ($status == self::STATUS_CLOSED) $statusType = 'status6';
+
+		$params = array(); $reg = array();
+		if (preg_match('/class="(.*)"/', $moreatt, $reg))
 		{
-			if ($statut == self::STATUS_INITIAL) { return $langs->trans("ServiceStatusInitial"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return $langs->trans("ServiceStatusRunning"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return $langs->trans("ServiceStatusNotLate"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return $langs->trans("ServiceStatusLate"); }
-			elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed");  }
-		}
-		elseif ($mode == 1)
-		{
-			if ($statut == self::STATUS_INITIAL) { return $langs->trans("ServiceStatusInitial"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return $langs->trans("ServiceStatusRunning"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return $langs->trans("ServiceStatusNotLateShort"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return $langs->trans("ServiceStatusLateShort"); }
-			elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed");  }
-		}
-		elseif ($mode == 2)
-		{
-			if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'), 'statut0').' '.$langs->trans("ServiceStatusInitial"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'), 'statut4').' '.$langs->trans("ServiceStatusRunning"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return img_picto($langs->trans('ServiceStatusNotLate'), 'statut4').' '.$langs->trans("ServiceStatusNotLateShort"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return img_picto($langs->trans('ServiceStatusLate'), 'statut3').' '.$langs->trans("ServiceStatusLateShort"); }
-			elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'), 'statut6') .' '.$langs->trans("ServiceStatusClosed"); }
-		}
-		elseif ($mode == 3)
-		{
-			if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'), 'statut0', $moreatt); }
-			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'), 'statut4', $moreatt); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return img_picto($langs->trans('ServiceStatusNotLate'), 'statut4', $moreatt); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return img_picto($langs->trans('ServiceStatusLate'), 'statut3', $moreatt); }
-			elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'), 'statut6', $moreatt); }
-		}
-		elseif ($mode == 4)
-		{
-			if ($statut == self::STATUS_INITIAL) { return img_picto($langs->trans('ServiceStatusInitial'), 'statut0').' '.$langs->trans("ServiceStatusInitial"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return img_picto($langs->trans('ServiceStatusRunning'), 'statut4').' '.$langs->trans("ServiceStatusRunning"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return img_picto($langs->trans('ServiceStatusNotLate'), 'statut4').' '.$langs->trans("ServiceStatusNotLate"); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return img_picto($langs->trans('ServiceStatusLate'), 'statut3').' '.$langs->trans("ServiceStatusLate"); }
-			elseif ($statut == self::STATUS_CLOSED) { return img_picto($langs->trans('ServiceStatusClosed'), 'statut6') .' '.$langs->trans("ServiceStatusClosed"); }
-		}
-		elseif ($mode == 5)
-		{
-			if ($statut == self::STATUS_INITIAL) { return $langs->trans("ServiceStatusInitial").' '.img_picto($langs->trans('ServiceStatusInitial'), 'statut0'); }
-			elseif ($statut == self::STATUS_OPEN && $expired == -1) { return $langs->trans("ServiceStatusRunning").' '.img_picto($langs->trans('ServiceStatusRunning'), 'statut4'); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 0)  { return $langs->trans("ServiceStatusNotLateShort").' '.img_picto($langs->trans('ServiceStatusNotLateShort'), 'statut4'); }
-			elseif ($statut == self::STATUS_OPEN && $expired == 1)  { return $langs->trans("ServiceStatusLateShort").' '.img_picto($langs->trans('ServiceStatusLate'), 'statut3'); }
-			elseif ($statut == self::STATUS_CLOSED) { return $langs->trans("ServiceStatusClosed").' '.img_picto($langs->trans('ServiceStatusClosed'), 'statut6'); }
+			$params = array('badgeParams'=>array('css' => $reg[1]));
 		}
+		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode, '', $params);
 	}
 
 	/**
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 56b0dc93c35..7750e62c506 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8093,19 +8093,18 @@ function roundUpToNextMultiple($n, $x = 5)
 function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '', $params = array())
 {
     $attr=array(
-        'class'=>'badge badge-status'.(!empty($mode)?' badge-'.$mode:'').(!empty($type)?' badge-'.$type:'')
+    	'class'=>'badge badge-status'.(!empty($mode)?' badge-'.$mode:'').(!empty($type)?' badge-'.$type:'').(empty($params['css'])?'':' '.$params['css'])
     );
 
-    if(empty($html)){
+    if (empty($html)) {
         $html = $label;
     }
 
-    if(!empty($url)){
+    if (!empty($url)) {
         $attr['href'] = $url;
     }
 
-    if($mode==='dot')
-    {
+    if ($mode==='dot') {
         $attr['class'].= ' classfortooltip';
         $attr['title'] = $html;
         $attr['aria-label'] = $label;
@@ -8113,8 +8112,8 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '
     }
 
     // Override attr
-    if(!empty($params['attr']) && is_array($params['attr'])){
-        foreach($params['attr']as $key => $value){
+    if (!empty($params['attr']) && is_array($params['attr'])) {
+        foreach($params['attr']as $key => $value) {
             $attr[$key] = $value;
         }
     }
@@ -8125,7 +8124,7 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '
     $attr = array_map('dol_escape_htmltag', $attr);
 
     $TCompiledAttr = array();
-    foreach($attr as $key => $value){
+    foreach($attr as $key => $value) {
         $TCompiledAttr[] = $key.'="'.$value.'"';
     }
 
@@ -8168,13 +8167,13 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
     elseif ($displayMode == 1) {
         $return = !empty($html)?$html:(!empty($statusLabelShort)?$statusLabelShort:$statusLabel);
     }
-    // use status with images
-    elseif (empty($conf->global->MAIN_STATUS_USES_CSS)) {
+    // Use status with images (for backward compatibility)
+    elseif (! empty($conf->global->MAIN_STATUS_USES_IMAGES)) {
         $return = '';
         $htmlLabel      = (in_array($displayMode, array(1,2,5))?'<span class="hideonsmartphone">':'').(!empty($html)?$html:$statusLabel).(in_array($displayMode, array(1,2,5))?'</span>':'');
         $htmlLabelShort = (in_array($displayMode, array(1,2,5))?'<span class="hideonsmartphone">':'').(!empty($html)?$html:(!empty($statusLabelShort)?$statusLabelShort:$statusLabel)).(in_array($displayMode, array(1,2,5))?'</span>':'');
 
-        // For small screen, we use the short label instead of long label.
+        // For small screen, we always use the short label instead of long label.
         if (! empty($conf->dol_optimize_smallscreen))
         {
         	if ($displayMode == 0) $displayMode = 1;
@@ -8212,7 +8211,6 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
             $return =  $htmlImg .' '. $htmlLabel;
         }
         elseif ($displayMode === 5) {
-        	// Add here a span class="hideonsmartphone ?
             $return = $htmlLabelShort .' '. $htmlImg;
         }
         else { // $displayMode >= 6
@@ -8220,7 +8218,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
         }
     }
     // Use new badge
-    elseif (!empty($conf->global->MAIN_STATUS_USES_CSS) && !empty($displayMode)) {
+    elseif (empty($conf->global->MAIN_STATUS_USES_IMAGES) && !empty($displayMode)) {
         $statusLabelShort = !empty($statusLabelShort)?$statusLabelShort:$statusLabel;
 
         if ($displayMode == 3) {
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 0c80b05c9cd..ecadec1b5a8 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -2023,23 +2023,23 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
         // 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.'%';
+        $diffTitle = '<br/>'.$langs->trans('ProgressDeclared').' : '.$task->progress.($task->progress ? '%' : '');
+        $diffTitle.= '<br/>'.$langs->trans('ProgressCalculated').' : '.$progressCalculated.($progressCalculated ? '%' : '');
 
-        if($progressCalculated > doubleval($task->progress)){
+        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>';
+            $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress-$progressCalculated).' '.$langs->trans("point"));
+            $diff = '<span class="text-danger classfortooltip paddingrightonly" 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%
+        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>';
+            $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress-$progressCalculated).' '.$langs->trans("point"));
+            $diff = '<span class="text-warning classfortooltip paddingrightonly" 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>';
+            $title = $langs->trans('TheReportedProgressIsMoreThanTheCalculatedProgressionByX', ($task->progress-$progressCalculated).' '.$langs->trans("point"));
+            $diff = '<span class="text-success classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-up"></i> '.($task->progress-$progressCalculated).'%</span>';
         }
     }
 
@@ -2062,7 +2062,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
     if($progressNumber !== false)
     {
         $out.= '    <span class="progress-number">';
-        if($progressNumber!==true){
+        if ($progressNumber!==true) {
             $out.= $progressNumber; // replace label by param
         }
         else{
@@ -2087,8 +2087,21 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 
 
     $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 class="progress sm '.$spaced.'">';
+    $diffval = doubleval($task->progress) - doubleval($progressCalculated);
+    if ($diffval >= 0) {
+    	// good
+    	$out.= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.doubleval($task->progress).'%" title="'.doubleval($task->progress).'%">';
+    	$out.= '        <div class="progress-bar progress-bar-consumed" style="width: '.doubleval($progressCalculated / $task->progress * 100).'%" title="'.doubleval($progressCalculated).'%"></div>';
+    	$out.= '        </div>';
+    }
+    else
+    {
+    	// bad
+    	$out.= '        <div class="progress-bar progress-bar-consumed" style="width: '.doubleval($progressCalculated).'%" title="'.doubleval($progressCalculated).'%">';
+    	$out.= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.($task->progress ? doubleval($task->progress / $progressCalculated * 100).'%' : '1px').'" title="'.doubleval($task->progress).'%"></div>';
+    	$out.= '        </div>';
+    }
     $out.= '    </div>';
     $out.= '</div>';
 
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 6717b42609b..0b67fcb621f 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -183,6 +183,10 @@ class EmailCollector extends CommonObject
     public $debuginfo;
 
 
+    const STATUS_DISABLED = 0;
+    const STATUS_ENABLED = 1;
+
+
     /**
      * Constructor
      *
@@ -506,47 +510,20 @@ class EmailCollector extends CommonObject
     public function LibStatut($status, $mode = 0)
     {
         // phpcs:enable
-        if (empty($this->labelStatus))
+    	if (empty($this->labelStatus) || empty($this->labelStatusShort))
         {
             global $langs;
             //$langs->load("mymodule");
-            $this->labelStatus[1] = $langs->trans('Enabled');
-            $this->labelStatus[0] = $langs->trans('Disabled');
+            $this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled');
+            $this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Disabled');
+            $this->labelStatusShort[self::STATUS_ENABLED] = $langs->trans('Enabled');
+            $this->labelStatusShort[self::STATUS_DISABLED] = $langs->trans('Disabled');
         }
 
-        if ($mode == 0)
-        {
-            return $this->labelStatus[$status];
-        }
-        elseif ($mode == 1)
-        {
-            return $this->labelStatus[$status];
-        }
-        elseif ($mode == 2)
-        {
-            if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-            elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-        }
-        elseif ($mode == 3)
-        {
-            if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-            elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-        }
-        elseif ($mode == 4)
-        {
-            if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-            elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-        }
-        elseif ($mode == 5)
-        {
-            if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-            elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-        }
-        elseif ($mode == 6)
-        {
-            if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-            elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-        }
+        $statusType = 'status5';
+        if ($status == self::STATUS_ENABLED) $statusType = 'status4';
+
+        return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
     }
 
     /**
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 1f8399d939a..59d16eba2fc 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -6,7 +6,7 @@ ModuleBuilderDesc2=Path where modules are generated/edited (first directory for
 ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
 ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
 NewModule=New module
-NewObject=New object
+NewObjectInModulebuilder=New object
 ModuleKey=Module key
 ObjectKey=Object key
 ModuleInitialized=Module initialized
@@ -66,8 +66,8 @@ ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
 SqlFile=Sql file
-PageForLib=File for PHP library
-PageForObjLib=File for PHP library dedicated to object 
+PageForLib=File for the common PHP library
+PageForObjLib=File for the PHP library dedicated to object 
 SqlFileExtraFields=Sql file for complementary attributes
 SqlFileKey=Sql file for keys
 SqlFileKeyExtraFields=Sql file for keys of complementary attributes
@@ -124,4 +124,8 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
\ No newline at end of file
+ModuleMustBeEnabled=The module/application must be enabled first
+IncludeRefGeneration=The reference of object must be generated automatically
+IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
+IncludeDocGeneration=I want to generate some documents from the object
+IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 234746a0d83..a6df5f9db43 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2019 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2018-2019	   Nicolas ZABOURI	<info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -810,6 +810,21 @@ if ($dirins && $action == 'initobject' && $module && $objectname)
 			//'class/api_mymodule.class.php'=>'class/api_'.strtolower($module).'.class.php',
 		);
 
+		if (GETPOST('includerefgeneration', 'int'))
+		{
+			$filetogenerate += array(
+				'core/modules/myobject/mod_myobject_advanced.php'=>'core/modules/'.strtolower($objectname).'/mod_'.strtolower($objectname).'_advanced.php',
+				'core/modules/myobject/mod_myobject_standard.php'=>'core/modules/'.strtolower($objectname).'/mod_'.strtolower($objectname).'_standard.php',
+				'core/modules/myobject/modules_myobject.php'=>'core/modules/'.strtolower($objectname).'/mod_'.strtolower($objectname).'_advanced.php',
+			);
+		}
+		if (GETPOST('includedocgeneration', 'int'))
+		{
+			$filetogenerate += array(
+				'core/modules/myobject/doc/doc_generic_myobject_odt.modules.php'=>'core/modules/'.strtolower($objectname).'/doc/doc_generic_'.strtolower($objectname).'_odt.modules.php'
+			);
+		}
+
 		foreach($filetogenerate as $srcfile => $destfile)
 		{
 			$result = dol_copy($srcdir.'/'.$srcfile, $destdir.'/'.$destfile, $newmask, 0);
@@ -1123,7 +1138,7 @@ if ($dirins && $action == 'confirm_deleteproperty' && $propertykey)
 	}
 }
 
-if ($dirins && $action == 'confirm_delete')
+if ($dirins && $action == 'confirm_deletemodule')
 {
 	if (preg_match('/[^a-z0-9_]/i', $module))
 	{
@@ -1150,8 +1165,6 @@ if ($dirins && $action == 'confirm_delete')
 		}
 	}
 
-	//header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?module=initmodule');
-	//exit;
 	$action = '';
 	$module = 'deletemodule';
 }
@@ -1173,26 +1186,30 @@ if ($dirins && $action == 'confirm_deleteobject' && $objectname)
 		$dir = $dirins.'/'.$modulelowercase;
 
 		// Delete some files
-		$filetogenerate = array(
-		'myobject_card.php'=>strtolower($objectname).'_card.php',
-		'myobject_note.php'=>strtolower($objectname).'_note.php',
-		'myobject_document.php'=>strtolower($objectname).'_document.php',
-		'myobject_agenda.php'=>strtolower($objectname).'_agenda.php',
-		'myobject_list.php'=>strtolower($objectname).'_list.php',
-		'lib/mymodule.lib.php'=>'lib/'.strtolower($module).'.lib.php',
-		'lib/mymodule_myobject.lib.php'=>'lib/'.strtolower($module).'_'.strtolower($objectname).'.lib.php',
-		'test/phpunit/MyObjectTest.php'=>'test/phpunit/'.strtolower($objectname).'Test.php',
-		'sql/llx_mymodule_myobject.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql',
-		'sql/llx_mymodule_myobject_extrafields.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'_extrafields.sql',
-		'sql/llx_mymodule_myobject.key.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql',
-		'scripts/myobject.php'=>'scripts/'.strtolower($objectname).'.php',
-		'img/object_myobject.png'=>'img/object_'.strtolower($objectname).'.png',
-		'class/myobject.class.php'=>'class/'.strtolower($objectname).'.class.php',
-		'class/api_myobject.class.php'=>'class/api_'.strtolower($module).'.class.php'
+		$filetodelete = array(
+			'myobject_card.php'=>strtolower($objectname).'_card.php',
+			'myobject_note.php'=>strtolower($objectname).'_note.php',
+			'myobject_document.php'=>strtolower($objectname).'_document.php',
+			'myobject_agenda.php'=>strtolower($objectname).'_agenda.php',
+			'myobject_list.php'=>strtolower($objectname).'_list.php',
+			'lib/mymodule.lib.php'=>'lib/'.strtolower($module).'.lib.php',
+			'lib/mymodule_myobject.lib.php'=>'lib/'.strtolower($module).'_'.strtolower($objectname).'.lib.php',
+			'test/phpunit/MyObjectTest.php'=>'test/phpunit/'.strtolower($objectname).'Test.php',
+			'sql/llx_mymodule_myobject.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql',
+			'sql/llx_mymodule_myobject_extrafields.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'_extrafields.sql',
+			'sql/llx_mymodule_myobject.key.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql',
+			'scripts/myobject.php'=>'scripts/'.strtolower($objectname).'.php',
+			'img/object_myobject.png'=>'img/object_'.strtolower($objectname).'.png',
+			'class/myobject.class.php'=>'class/'.strtolower($objectname).'.class.php',
+			'class/api_myobject.class.php'=>'class/api_'.strtolower($module).'.class.php',
+			'core/modules/myobject/mod_myobject_advanced.php'=>'core/modules/'.strtolower($objectname).'/mod_'.strtolower($objectname).'_advanced.php',
+			'core/modules/myobject/mod_myobject_standard.php'=>'core/modules/'.strtolower($objectname).'/mod_'.strtolower($objectname).'_standard.php',
+			'core/modules/myobject/modules_myobject.php'=>'core/modules/'.strtolower($objectname).'/mod_'.strtolower($objectname).'_advanced.php',
+			'core/modules/myobject/doc/doc_generic_myobject_odt.modules.php'=>'core/modules/'.strtolower($objectname).'/doc/doc_generic_'.strtolower($objectname).'_odt.modules.php'
 		);
 
 		$resultko = 0;
-		foreach($filetogenerate as $filetodelete)
+		foreach($filetodelete as $filetodelete)
 		{
 			$resulttmp = dol_delete_file($dir.'/'.$filetodelete, 0, 0, 1);
 			if (! $resulttmp) $resultko++;
@@ -1208,8 +1225,6 @@ if ($dirins && $action == 'confirm_deleteobject' && $objectname)
 		}
 	}
 
-	//header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?module=initmodule');
-	//exit;
 	$action = '';
 	$tabobj = 'deleteobject';
 }
@@ -1436,6 +1451,7 @@ if ($dirread != DOL_DOCUMENT_ROOT && ($conf->global->MAIN_FEATURES_LEVEL >=2 ||
 // Search modules to edit
 print '<!-- Scanned dir -->'."\n";
 $listofmodules=array();
+$i=0;
 foreach($dirsrootforscan as $dirread)
 {
     $dirsincustom=dol_dir_list($dirread, 'directories');
@@ -1493,8 +1509,12 @@ foreach($dirsrootforscan as $dirread)
     if (empty($newdircustom)) $newdircustom=img_warning();
     // If dirread was forced to somewhere else, by using URL
     // htdocs/modulebuilder/index.php?module=Inventory@/home/ldestailleur/git/dolibarr/htdocs/product
-    print $langs->trans("DirScanned").' : <strong class="wordbreakimp">'.$dirread.'</strong><br>';
+    if (empty($i)) print $langs->trans("DirScanned").' : ';
+    else print ', ';
+    print '<strong class="wordbreakimp">'.$dirread.'</strong>';
+    $i++;
 }
+print '<br>';
 //var_dump($listofmodules);
 
 $message='';
@@ -1526,7 +1546,7 @@ if ($message)
 }
 
 //print $langs->trans("ModuleBuilderDesc3", count($listofmodules), $FILEFLAG).'<br>';
-$infomodulesfound = '<div style="padding: 12px 9px 12px">'.$form->textwithpicto($langs->trans("ModuleBuilderDesc3", count($listofmodules)), $langs->trans("ModuleBuilderDesc4", $FILEFLAG)).'</div>';
+$infomodulesfound = '<div style="padding: 12px 9px 12px">'.$form->textwithpicto('<span class="opacitymedium">'.$langs->trans("ModuleBuilderDesc3", count($listofmodules)).'</span>', $langs->trans("ModuleBuilderDesc4", $FILEFLAG)).'</div>';
 
 
 // Load module descriptor
@@ -1601,16 +1621,17 @@ if ($module == 'initmodule')
 	print $langs->trans("EnterNameOfModuleDesc").'<br>';
 	print '<br>';
 
-	print '<input type="text" name="modulename" value="'.dol_escape_htmltag($modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ModuleKey")).'">';
+	print '<input type="text" name="modulename" value="'.dol_escape_htmltag($modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ModuleKey")).'"><br>';
 
-	print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'"'.($dirins?'':' disabled="disabled"').'>';
+	print '<br><input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'"'.($dirins?'':' disabled="disabled"').'>';
 	print '</form>';
 }
 elseif ($module == 'deletemodule')
 {
+	print '<!-- Form to init a module -->'."\n";
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="delete">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="confirm_delete">';
+	print '<input type="hidden" name="action" value="confirm_deletemodule">';
 	print '<input type="hidden" name="module" value="deletemodule">';
 
 	print $langs->trans("EnterNameOfModuleToDeleteDesc").'<br><br>';
@@ -1651,13 +1672,13 @@ elseif (! empty($module))
 			$linktoenabledisable.=img_picto($langs->trans("Disabled"), 'switch_off', '', false, 0, 0, '', '', 1);
 			$linktoenabledisable.="</a>\n";
 		}
-		if (! empty($conf->$modulelowercase->enabled))
+		if (empty($conf->$modulelowercase->enabled))
 		{
-			$modulestatusinfo=img_warning().' '.$langs->trans("ModuleIsLive");
+			$modulestatusinfo=$form->textwithpicto($langs->trans("ModuleIsNotActive", $urltomodulesetup), '', -1, 'help');
 		}
 		else
 		{
-			$modulestatusinfo=img_info('').' '.$langs->trans("ModuleIsNotActive", $urltomodulesetup);
+			$modulestatusinfo=$form->textwithpicto($langs->trans("ModuleIsLive"), $langs->trans("Warning"), -1, 'warning');
 		}
 
 		$head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=description&module='.$module.($forceddirread?'@'.$dirread:'');
@@ -1737,13 +1758,8 @@ elseif (! empty($module))
 
 		// Link to enable / disable
 		print $modulestatusinfo;
-		print ' '.$linktoenabledisable;
-		print '<br>';
+		print ' '.$linktoenabledisable.'<br>';
 
-		if (realpath($dirread.'/'.$modulelowercase) != $dirread.'/'.$modulelowercase)
-		{
-			print '<span class="opacitymedium">'.$langs->trans("RealPathOfModule").' :</span> <strong>'.realpath($dirread.'/'.$modulelowercase).'</strong><br>';
-		}
 		print '<br>';
 
 		if ($tab == 'description')
@@ -1756,21 +1772,28 @@ elseif (! empty($module))
 			{
 				dol_fiche_head($head2, $tab, '', -1, '');	// Description - level 2
 
-				print '<span class="opacitymedium">'.$langs->trans("ModuleBuilderDesc".$tab).'</span><br><br>';
+				print '<span class="opacitymedium">'.$langs->trans("ModuleBuilderDesc".$tab).'</span>';
+				$infoonmodulepath = '';
+				if (realpath($dirread.'/'.$modulelowercase) != $dirread.'/'.$modulelowercase)
+				{
+					$infoonmodulepath = '<span class="opacitymedium">'.$langs->trans("RealPathOfModule").' :</span> <strong>'.realpath($dirread.'/'.$modulelowercase).'</strong><br>';
+					print ' '.$infoonmodulepath;
+				}
+				print '<br>';
 
 				print '<table>';
 
 				print '<tr><td>';
 				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>';
-				print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+				print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 				print '</td></tr>';
 
 				print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("ReadmeFile").' : <strong>'.$pathtofilereadme.'</strong>';
-				print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=markdown&file='.urlencode($pathtofilereadme).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+				print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=markdown&file='.urlencode($pathtofilereadme).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 				print '</td></tr>';
 
 				print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("ChangeLog").' : <strong>'.$pathtochangelog.'</strong>';
-				print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=markdown&file='.urlencode($pathtochangelog).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+				print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=markdown&file='.urlencode($pathtochangelog).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 				print '</td></tr>';
 
 				print '</table>';
@@ -1931,8 +1954,8 @@ elseif (! empty($module))
 				{
 					$pathtofile = $modulelowercase.'/langs/'.$langfile['relativename'];
 					print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("LanguageFile").' '.basename(dirname($pathtofile)).' : <strong>'.$pathtofile.'</strong>';
-					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=txt&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
-					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=confirm_removefile&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
+					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=txt&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=confirm_removefile&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 					print '</td>';
 				}
 				print '</table>';
@@ -1983,7 +2006,7 @@ elseif (! empty($module))
 				print '<br>';
 
 				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>';
-				print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+				print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 				print '<br>';
 				print '<span class="fa fa-file-o"></span> '.$langs->trans("LanguageFile").' :</span> ';
 				if (! is_array($dicts) || empty($dicts)) print '<span class="opacitymedium">'.$langs->trans("NoDictionaries").'</span>';
@@ -2113,7 +2136,7 @@ elseif (! empty($module))
 			$dir = $dirread.'/'.$modulelowercase.'/class';
 
 			$head3[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module.($forceddirread?'@'.$dirread:'').'&tabobj=newobject';
-			$head3[$h][1] = $langs->trans("NewObject");
+			$head3[$h][1] = '<span class="valignmiddle text-plus-circle">'.$langs->trans("NewObjectInModulebuilder").'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span>';
 			$head3[$h][2] = 'newobject';
 			$h++;
 
@@ -2165,7 +2188,9 @@ elseif (! empty($module))
 
 				print '<span class="opacitymedium">'.$langs->trans("EnterNameOfObjectDesc").'</span><br><br>';
 
-				print '<input type="text" name="objectname" value="'.dol_escape_htmltag(GETPOST('objectname', 'alpha')?GETPOST('objectname', 'alpha'):$modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ObjectKey")).'">';
+				print '<input type="text" name="objectname" value="'.dol_escape_htmltag(GETPOST('objectname', 'alpha')?GETPOST('objectname', 'alpha'):$modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ObjectKey")).'"><br>';
+				print '<input type="checkbox" name="includerefgeneration" value="includerefgeneration"> '.$form->textwithpicto($langs->trans("IncludeRefGeneration"), $langs->trans("IncludeRefGenerationHelp")).'<br>';
+				print '<input type="checkbox" name="includedocgeneration" value="includedocgeneration"> '.$form->textwithpicto($langs->trans("IncludeDocGeneration"), $langs->trans("IncludeDocGenerationHelp")).'<br>';
 				print '<input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Generate")).'"'.($dirins?'':' disabled="disabled"').'>';
 				print '<br>';
 				print '<br>';
@@ -2173,7 +2198,6 @@ elseif (! empty($module))
 				print $langs->trans("or");
 				print '<br>';
 				print '<br>';
-				print '<br>';
 				//print '<input type="checkbox" name="initfromtablecheck"> ';
 				print $langs->trans("InitStructureFromExistingTable");
 				print '<input type="text" name="initfromtablename" value="" placeholder="'.$langs->trans("TableName").'">';
@@ -2687,7 +2711,7 @@ elseif (! empty($module))
 				print '<br>';
 
 				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>';
-				print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+				print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 				print '<br>';
 
 				print '<br>';
@@ -2827,7 +2851,7 @@ elseif (! empty($module))
 				print '<br>';
 
 				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>';
-				print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+				print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 				print '<br>';
 
 				print '<br>';
@@ -2924,7 +2948,7 @@ elseif (! empty($module))
 				$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
 				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong class="">'.$pathtofile.'</strong>';
 				print '</td><td>';
-				print '<a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+				print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 				print '</td></tr>';
 
 				print '<tr><td>';
@@ -2933,8 +2957,8 @@ elseif (! empty($module))
 				if (dol_is_file($dirins.'/'.$pathtohook))
 				{
 				    print '<strong>'.$pathtohook.'</strong>';
-				    print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
-				    print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
+				    print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
+				    print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 				}
 				else
 				{
@@ -2991,8 +3015,8 @@ elseif (! empty($module))
 
 						print '<tr><td>';
 						print '<span class="fa fa-file-o"></span> '.$langs->trans("TriggersFile").' : <strong>'.$pathtofile.'</strong>';
-						print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
-						print '<td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
+						print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
+						print '<td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
                         print '</tr>';
 					}
 				}
@@ -3047,8 +3071,8 @@ elseif (! empty($module))
 				if (dol_is_file($dirins.'/'.$pathtohook))
 				{
 					print '<strong>'.$pathtohook.'</strong>';
-					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
-					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
+					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
+					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 				}
 				else
 				{
@@ -3099,8 +3123,8 @@ elseif (! empty($module))
 				if (dol_is_file($dirins.'/'.$pathtohook))
 				{
 					print '<strong>'.$pathtohook.'</strong>';
-					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
-					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
+					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
+					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 				}
 				else
 				{
@@ -3155,9 +3179,8 @@ elseif (! empty($module))
 						$pathtofile = $widget['relpath'];
 
 						print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("WidgetFile").' : <strong>'.$pathtofile.'</strong>';
-						print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
-						print '</td>';
-						print '<td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
+						print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+						print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 						print '</tr>';
 					}
 				}
@@ -3242,8 +3265,8 @@ elseif (! empty($module))
 		                $pathtofile = $clifile['relpath'];
 
 		                print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("CLIFile").' : <strong>'.$pathtofile.'</strong>';
-		                print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
-		                print '<td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
+		                print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
+		                print '<td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 		                print '</tr>';
 		            }
 		        }
@@ -3294,7 +3317,7 @@ elseif (! empty($module))
 				print '<br>';
 
 				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>';
-				print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+				print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 				print '<br>';
 
 				print '<br>';
@@ -3423,8 +3446,8 @@ elseif (! empty($module))
     		            if (preg_match('/\.md$/i', $spec['name'])) $format='markdown';
     		            print '<tr><td>';
     		            print '<span class="fa fa-file-o"></span> '.$langs->trans("SpecificationFile").' : <strong>'.$pathtofile.'</strong>';
-    		            print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
-    		            print '<td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
+    		            print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
+    		            print '<td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
     		            print '</tr>';
     		        }
 		        }
diff --git a/htdocs/mrp/ChangeLog.md b/htdocs/mrp/ChangeLog.md
deleted file mode 100644
index 416bad1d559..00000000000
--- a/htdocs/mrp/ChangeLog.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# CHANGELOG MRP FOR <a href="https://www.dolibarr.org">DOLIBARR ERP CRM</a>
-
-## 1.0
-Initial version
-
diff --git a/htdocs/takepos/ChangeLog.md b/htdocs/takepos/ChangeLog.md
deleted file mode 100644
index 7b623eaa252..00000000000
--- a/htdocs/takepos/ChangeLog.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# CHANGELOG TAKEPOS FOR <a href="https://www.dolibarr.org">DOLIBARR ERP CRM</a>
-
-## 1.0
-Initial version
-
diff --git a/htdocs/theme/eldy/badges.inc.php b/htdocs/theme/eldy/badges.inc.php
index 975f2eb311f..27fc142d991 100644
--- a/htdocs/theme/eldy/badges.inc.php
+++ b/htdocs/theme/eldy/badges.inc.php
@@ -37,7 +37,7 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
     padding: 0;
     border-radius: 50%;
     padding: 0.45em;
-    vertical-align: middle;
+    vertical-align: text-top;
 }
 
 a.badge:focus, a.badge:hover {
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index cf5c4f9703a..4a3b73b1d20 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -473,6 +473,12 @@ textarea.centpercent {
 .paddingright2 {
 	padding-<?php print $right; ?>: 2px;
 }
+.marginleft2 {
+	margin-<?php print $left; ?>: 2px;
+}
+.marginright2 {
+	margin-<?php print $right; ?>: 2px;
+}
 .cursordefault {
 	cursor: default;
 }
diff --git a/htdocs/theme/eldy/progress.inc.php b/htdocs/theme/eldy/progress.inc.php
index 3e330745440..c6b48205360 100644
--- a/htdocs/theme/eldy/progress.inc.php
+++ b/htdocs/theme/eldy/progress.inc.php
@@ -21,10 +21,10 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
     height: 20px;
     overflow: hidden;
     background-color: #f5f5f5;
-    background-color: rgba(0,0,0,0.1);
+    background-color: rgba(128, 128, 128, 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);
+    -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+    box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
 }
 
 .progress.spaced{
@@ -184,4 +184,7 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
     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-consumed {
+	background-color: rgb(0, 0, 0, 0.15);
 }
\ No newline at end of file
diff --git a/htdocs/theme/md/badges.inc.php b/htdocs/theme/md/badges.inc.php
index 2a1b9ffd24b..11536240ee0 100644
--- a/htdocs/theme/md/badges.inc.php
+++ b/htdocs/theme/md/badges.inc.php
@@ -36,8 +36,8 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 .badge-dot {
     padding: 0;
     border-radius: 50%;
-    padding: 0.25rem;
-    vertical-align: middle;
+    padding: 0.35em;
+    vertical-align: unset;
 }
 
 a.badge:focus, a.badge:hover {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 320a03c2775..04fe7e85d77 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -676,6 +676,12 @@ textarea.centpercent {
 .paddingright2 {
 	padding-<?php print $right; ?>: 2px;
 }
+.marginleft2 {
+	margin-<?php print $left; ?>: 2px;
+}
+.marginright2 {
+	margin-<?php print $right; ?>: 2px;
+}
 .cursordefault {
 	cursor: default;
 }

From a1b2130247cef3920d3195235c6fb9ee950eb5a5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Nov 2019 16:09:31 +0100
Subject: [PATCH 30/38] Enhance the progress bar of tasks

---
 htdocs/core/lib/project.lib.php      | 18 ++++++++++--------
 htdocs/theme/eldy/progress.inc.php   |  2 +-
 htdocs/theme/eldy/theme_vars.inc.php |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index ecadec1b5a8..06cd96ab995 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -670,8 +670,9 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
         if ($total_projectlinesa_planned) {
             $totalAverageDeclaredProgress = round(100 * $total_projectlinesa_declared_if_planned / $total_projectlinesa_planned, 2);
             $totalCalculatedProgress = round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned, 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;
+
+            // this conf is actually hidden, by default we use 10% for "be carefull or warning"
+            $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
 
             // define progress color according to time spend vs workload
             $progressBarClass = 'progress-bar-info';
@@ -2020,18 +2021,19 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
     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;
+        // this conf is actually hidden, by default we use 10% for "be carefull or warning"
+        $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
 
         $diffTitle = '<br/>'.$langs->trans('ProgressDeclared').' : '.$task->progress.($task->progress ? '%' : '');
         $diffTitle.= '<br/>'.$langs->trans('ProgressCalculated').' : '.$progressCalculated.($progressCalculated ? '%' : '');
 
-        if($progressCalculated > doubleval($task->progress)) {
+        //var_dump($progressCalculated.' '.$warningRatio.' '.$task->progress.' '.doubleval($task->progress * $warningRatio));
+        if (doubleval($progressCalculated) > doubleval($task->progress * $warningRatio)) {
             $progressBarClass = 'progress-bar-danger';
             $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress-$progressCalculated).' '.$langs->trans("point"));
             $diff = '<span class="text-danger classfortooltip paddingrightonly" 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%
+        elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 1%
             $progressBarClass = 'progress-bar-warning';
             $title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress-$progressCalculated).' '.$langs->trans("point"));
             $diff = '<span class="text-warning classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-left"></i> '.($task->progress-$progressCalculated).'%</span>';
@@ -2130,8 +2132,8 @@ function getTaskProgressBadge($task, $label = '', $tooltip = '')
         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;
+            // this conf is actually hidden, by default we use 10% for "be carefull or warning"
+            $warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
 
             if($progressCalculated > doubleval($task->progress)){
                 $badgeClass.= 'badge-danger';
diff --git a/htdocs/theme/eldy/progress.inc.php b/htdocs/theme/eldy/progress.inc.php
index c6b48205360..a211c40efb4 100644
--- a/htdocs/theme/eldy/progress.inc.php
+++ b/htdocs/theme/eldy/progress.inc.php
@@ -167,7 +167,7 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 }
 .progress-bar-yellow,
 .progress-bar-warning {
-    background-color: #f39c12;
+    background-color: #bc9526;
 }
 .progress-striped .progress-bar-yellow,
 .progress-striped .progress-bar-warning {
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 386a81f0afd..24e7e6f7d41 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -81,7 +81,7 @@ $toolTipFontColor='#333';
 $textSuccess   ='#28a745';
 $colorblind_deuteranopes_textSuccess   ='#37de5d';
 $textDanger    ='#dc3545';
-$textWarning   ='#f39c12';
+$textWarning   ='#bc9526';
 $colorblind_deuteranopes_textWarning = $textWarning; // currently not tested with a color blind people so use default color
 
 

From 2af23aa65828617af5c60e3fdb0df17d557846c3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Nov 2019 17:54:17 +0100
Subject: [PATCH 31/38] Enhance modulebuilder

---
 htdocs/core/lib/modulebuilder.lib.php         |  14 ++-
 htdocs/langs/en_US/modulebuilder.lang         |   6 +
 htdocs/modulebuilder/index.php                | 104 ++++++++++++++----
 .../template/class/myobject.class.php         |  12 +-
 .../doc/doc_generic_myobject_odt.modules.php  |   0
 .../mod_myobject_advanced.php                 |   0
 .../mod_myobject_standard.php                 |   0
 .../modules_myobject.php                      |   0
 .../tpl/linkedobjectblock_myobject.tpl.php    |  58 ++++++++++
 .../template/core/tpl/mytemplate.tpl.php      |  35 ------
 10 files changed, 159 insertions(+), 70 deletions(-)
 rename htdocs/modulebuilder/template/core/modules/{myobject => mymodule}/doc/doc_generic_myobject_odt.modules.php (100%)
 rename htdocs/modulebuilder/template/core/modules/{myobject => mymodule}/mod_myobject_advanced.php (100%)
 rename htdocs/modulebuilder/template/core/modules/{myobject => mymodule}/mod_myobject_standard.php (100%)
 rename htdocs/modulebuilder/template/core/modules/{myobject => mymodule}/modules_myobject.php (100%)
 create mode 100644 htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php
 delete mode 100644 htdocs/modulebuilder/template/core/tpl/mytemplate.tpl.php

diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index e6f36b25d47..4e5cbb92c02 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -128,17 +128,19 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
                 $i++;
                 $texttoinsert.= "\t\t'".$key."' => array('type'=>'".$val['type']."', 'label'=>'".$val['label']."',";
                 $texttoinsert.= " 'enabled'=>".($val['enabled']!=''?$val['enabled']:1).",";
-                $texttoinsert.= " 'visible'=>".($val['visible']!=''?$val['visible']:-1).",";
                 $texttoinsert.= " 'position'=>".($val['position']!=''?$val['position']:50).",";
-                $texttoinsert.= " 'notnull'=>".($val['notnull']!=''?$val['notnull']:-1).",";
+                $texttoinsert.= " 'notnull'=>".(empty($val['notnull'])?0:$val['notnull']).",";
+                $texttoinsert.= " 'visible'=>".($val['visible']!=''?$val['visible']:-1).",";
+                if ($val['noteditable'])    $texttoinsert.= " 'noteditable'=>'".$val['noteditable']."',";
                 if ($val['default'])        $texttoinsert.= " 'default'=>'".$val['default']."',";
                 if ($val['index'])          $texttoinsert.= " 'index'=>".$val['index'].",";
+                if ($val['foreignkey'])     $texttoinsert.= " 'foreignkey'=>'".$val['foreignkey']."',";
                 if ($val['searchall'])      $texttoinsert.= " 'searchall'=>".$val['searchall'].",";
                 if ($val['isameasure'])     $texttoinsert.= " 'isameasure'=>'".$val['isameasure']."',";
-                if ($val['foreignkey'])     $texttoinsert.= " 'foreignkey'=>'".$val['foreignkey']."',";
+                if ($val['css'])            $texttoinsert.= " 'css'=>'".$val['css']."',";
                 if ($val['help'])           $texttoinsert.= " 'help'=>\"".preg_replace('/"/', '', $val['help'])."\",";
-                if ($val['comment'])        $texttoinsert.= " 'comment'=>\"".preg_replace('/"/', '', $val['comment'])."\",";
                 if ($val['showoncombobox']) $texttoinsert.= " 'showoncombobox'=>'".$val['showoncombobox']."',";
+                if ($val['disabled'])       $texttoinsert.= " 'disabled'=>'".$val['disabled']."',";
                 if ($val['arrayofkeyval'])
                 {
                 	$texttoinsert.= " 'arrayofkeyval'=>array(";
@@ -149,8 +151,10 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
                 		$texttoinsert.="'".$key2."'=>'".$val2."'";
                 		$i++;
                 	}
-                	$texttoinsert.= ")";
+                	$texttoinsert.= "),";
                 }
+                if ($val['comment'])        $texttoinsert.= " 'comment'=>\"".preg_replace('/"/', '', $val['comment'])."\"";
+
                 $texttoinsert.= "),\n";
             }
         }
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 59d16eba2fc..4a0e0daf5c1 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -129,3 +129,9 @@ IncludeRefGeneration=The reference of object must be generated automatically
 IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
 IncludeDocGeneration=I want to generate some documents from the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
+ShowOnCombobox=Show value into combobox
+KeyForTooltip=Key for tooltip
+CSSClass=CSS Class
+NotEditable=Not editable
+ForeignKey=Foreign key
+TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php:1 (1 means we add a + button after the combo to create the record)
\ No newline at end of file
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index a6df5f9db43..7fffdfcd50d 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -810,18 +810,23 @@ if ($dirins && $action == 'initobject' && $module && $objectname)
 			//'class/api_mymodule.class.php'=>'class/api_'.strtolower($module).'.class.php',
 		);
 
-		if (GETPOST('includerefgeneration', 'int'))
+		if (GETPOST('includerefgeneration', 'aZ09'))
 		{
+			dol_mkdir($destdir.'/core/modules/'.strtolower($module));
+
 			$filetogenerate += array(
-				'core/modules/myobject/mod_myobject_advanced.php'=>'core/modules/'.strtolower($objectname).'/mod_'.strtolower($objectname).'_advanced.php',
-				'core/modules/myobject/mod_myobject_standard.php'=>'core/modules/'.strtolower($objectname).'/mod_'.strtolower($objectname).'_standard.php',
-				'core/modules/myobject/modules_myobject.php'=>'core/modules/'.strtolower($objectname).'/mod_'.strtolower($objectname).'_advanced.php',
+				'core/modules/mymodule/mod_myobject_advanced.php'=>'core/modules/'.strtolower($module).'/mod_'.strtolower($objectname).'_advanced.php',
+				'core/modules/mymodule/mod_myobject_standard.php'=>'core/modules/'.strtolower($module).'/mod_'.strtolower($objectname).'_standard.php',
+				'core/modules/mymodule/modules_myobject.php'=>'core/modules/'.strtolower($module).'/modules_'.strtolower($objectname).'.php',
 			);
 		}
-		if (GETPOST('includedocgeneration', 'int'))
+		if (GETPOST('includedocgeneration', 'aZ09'))
 		{
+			dol_mkdir($destdir.'/core/modules/'.strtolower($module));
+			dol_mkdir($destdir.'/core/modules/'.strtolower($module).'/doc');
+
 			$filetogenerate += array(
-				'core/modules/myobject/doc/doc_generic_myobject_odt.modules.php'=>'core/modules/'.strtolower($objectname).'/doc/doc_generic_'.strtolower($objectname).'_odt.modules.php'
+				'core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php'=>'core/modules/'.strtolower($module).'/doc/doc_generic_'.strtolower($objectname).'_odt.modules.php'
 			);
 		}
 
@@ -843,8 +848,21 @@ if ($dirins && $action == 'initobject' && $module && $objectname)
 			}
 		}
 
-		//if (! $error)     // If there is error copying 1 file, we still have to make the replacement
-		//{
+		// Edit the class 'class/'.strtolower($objectname).'.class.php'
+		if (GETPOST('includerefgeneration', 'aZ09')) {
+			// Replace 'visible'=>1,  'noteditable'=>0, 'default'=>''
+			$arrayreplacement = array('/\'visible\'=>1,\s*\'noteditable\'=>0,\s*\'default\'=>\'\'/' => "'visible'=>4, 'noteditable'=>1, 'default'=>'(PROV)'");
+			//var_dump($arrayreplacement);exit;
+			//var_dump($destdir.'/class/'.strtolower($objectname).'.class.php');exit;
+			dolReplaceInFile($destdir.'/class/'.strtolower($objectname).'.class.php', $arrayreplacement, '', 0, 0, 1);
+		}
+
+		// Edit the setup file and the card page
+		if (GETPOST('includedocgeneration', 'aZ09')) {
+			// TODO
+			// dolReplaceInFile();
+		}
+
 		// Scan for object class files
 		$listofobject = dol_dir_list($destdir.'/class', 'files', 0, '\.class\.php$');
 
@@ -917,15 +935,12 @@ if ($dirins && $action == 'initobject' && $module && $objectname)
 
 			// Add module descriptor to list of files to replace "MyObject' string with real name of object.
 			$filetogenerate[]='core/modules/mod'.$module.'.class.php';
-
-			// TODO
 		}
-		//}
 	}
 
 	if (! $error)
 	{
-		// Edit PHP files
+		// Edit PHP files to make replacement
 		foreach($filetogenerate as $destfile)
 		{
 			$phpfileval['fullname'] = $destdir.'/'.$destfile;
@@ -970,6 +985,7 @@ if ($dirins && $action == 'initobject' && $module && $objectname)
 	if (! $error)
 	{
 		setEventMessages($langs->trans('FilesForObjectInitialized', $objectname), null);
+		$tabobj = $objectname;
 	}
 }
 
@@ -1198,14 +1214,15 @@ if ($dirins && $action == 'confirm_deleteobject' && $objectname)
 			'sql/llx_mymodule_myobject.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql',
 			'sql/llx_mymodule_myobject_extrafields.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'_extrafields.sql',
 			'sql/llx_mymodule_myobject.key.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql',
+			'sql/llx_mymodule_myobject_extrafields.key.sql'=>'sql/llx_'.strtolower($module).'_'.strtolower($objectname).'_extrafields.key.sql',
 			'scripts/myobject.php'=>'scripts/'.strtolower($objectname).'.php',
 			'img/object_myobject.png'=>'img/object_'.strtolower($objectname).'.png',
 			'class/myobject.class.php'=>'class/'.strtolower($objectname).'.class.php',
 			'class/api_myobject.class.php'=>'class/api_'.strtolower($module).'.class.php',
-			'core/modules/myobject/mod_myobject_advanced.php'=>'core/modules/'.strtolower($objectname).'/mod_'.strtolower($objectname).'_advanced.php',
-			'core/modules/myobject/mod_myobject_standard.php'=>'core/modules/'.strtolower($objectname).'/mod_'.strtolower($objectname).'_standard.php',
-			'core/modules/myobject/modules_myobject.php'=>'core/modules/'.strtolower($objectname).'/mod_'.strtolower($objectname).'_advanced.php',
-			'core/modules/myobject/doc/doc_generic_myobject_odt.modules.php'=>'core/modules/'.strtolower($objectname).'/doc/doc_generic_'.strtolower($objectname).'_odt.modules.php'
+			'core/modules/mymodule/mod_myobject_advanced.php'=>'core/modules/'.strtolower($module).'/mod_'.strtolower($objectname).'_advanced.php',
+			'core/modules/mymodule/mod_myobject_standard.php'=>'core/modules/'.strtolower($module).'/mod_'.strtolower($objectname).'_standard.php',
+			'core/modules/mymodule/modules_myobject.php'=>'core/modules/'.strtolower($module).'/modules_'.strtolower($objectname).'.php',
+			'core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php'=>'core/modules/'.strtolower($module).'/doc/doc_generic_'.strtolower($objectname).'_odt.modules.php'
 		);
 
 		$resultko = 0;
@@ -2460,7 +2477,7 @@ elseif (! empty($module))
 
 							print load_fiche_titre($langs->trans("ObjectProperties"), '', '');
 
-
+							print '<!-- Table with properties of object -->'."\n";
 							print '<div class="div-table-responsive">';
 							print '<table class="noborder">';
 							print '<tr class="liste_titre">';
@@ -2470,16 +2487,22 @@ elseif (! empty($module))
 							print '<th>';
 							print $form->textwithpicto($langs->trans("Label"), $langs->trans("YouCanUseTranslationKey"));
 							print '</th>';
-							print '<th>'.$langs->trans("Type").'</td>';
+							print '<th>'.$form->textwithpicto($langs->trans("Type"), $langs->trans("TypeOfFieldsHelp")).'</th>';
 							print '<th>'.$form->textwithpicto($langs->trans("ArrayOfKeyValues"), $langs->trans("ArrayOfKeyValuesDesc")).'</th>';
 							print '<th class="center">'.$form->textwithpicto($langs->trans("NotNull"), $langs->trans("NotNullDesc")).'</th>';
 							print '<th class="center">'.$langs->trans("DefaultValue").'</th>';
 							print '<th class="center">'.$langs->trans("DatabaseIndex").'</th>';
+							print '<th class="center">'.$langs->trans("ForeignKey").'</th>';
 							print '<th class="right">'.$langs->trans("Position").'</th>';
 							print '<th class="center">'.$form->textwithpicto($langs->trans("Enabled"), $langs->trans("EnabledDesc")).'</th>';
 							print '<th class="center">'.$form->textwithpicto($langs->trans("Visible"), $langs->trans("VisibleDesc")).'</th>';
-							print '<th class="center">'.$form->textwithpicto($langs->trans("IsAMeasure"), $langs->trans("IsAMeasureDesc")).'</th>';
+							print '<th class="center">'.$langs->trans("NotEditable").'</th>';
 							print '<th class="center">'.$form->textwithpicto($langs->trans("SearchAll"), $langs->trans("SearchAllDesc")).'</th>';
+							print '<th class="center">'.$form->textwithpicto($langs->trans("IsAMeasure"), $langs->trans("IsAMeasureDesc")).'</th>';
+							print '<th class="center">'.$langs->trans("CSSClass").'</th>';
+							print '<th class="center">'.$langs->trans("KeyForTooltip").'</th>';
+							print '<th class="center">'.$langs->trans("ShowOnCombobox").'</th>';
+							//print '<th class="center">'.$langs->trans("Disabled").'</th>';
 							print '<th>'.$langs->trans("Comment").'</th>';
 							print '<th></th>';
 							print '</tr>';
@@ -2500,11 +2523,17 @@ elseif (! empty($module))
 								print '<td class="center"><input class="text" size="2" name="propnotnull" value="'.dol_escape_htmltag(GETPOST('propnotnull', 'alpha')).'"></td>';
 								print '<td><input class="text maxwidth50" name="propdefault" value="'.dol_escape_htmltag(GETPOST('propdefault', 'alpha')).'"></td>';
 								print '<td class="center"><input class="text" size="2" name="propindex" value="'.dol_escape_htmltag(GETPOST('propindex', 'alpha')).'"></td>';
+								print '<td class="center"><input class="text" size="2" name="propforeignkey" value="'.dol_escape_htmltag(GETPOST('propforeignkey', 'alpha')).'"></td>';
 								print '<td class="right"><input class="text right" size="2" name="propposition" value="'.dol_escape_htmltag(GETPOST('propposition', 'alpha')).'"></td>';
 								print '<td class="center"><input class="text" size="2" name="propenabled" value="'.dol_escape_htmltag(GETPOST('propenabled', 'alpha')).'"></td>';
 								print '<td class="center"><input class="text" size="2" name="propvisible" value="'.dol_escape_htmltag(GETPOST('propvisible', 'alpha')).'"></td>';
-								print '<td class="center"><input class="text" size="2" name="propisameasure" value="'.dol_escape_htmltag(GETPOST('propisameasure', 'alpha')).'"></td>';
+								print '<td class="center"><input class="text" size="2" name="propnoteditable" value="'.dol_escape_htmltag(GETPOST('propnoteditable', 'alpha')).'"></td>';
 								print '<td class="center"><input class="text" size="2" name="propsearchall" value="'.dol_escape_htmltag(GETPOST('propsearchall', 'alpha')).'"></td>';
+								print '<td class="center"><input class="text" size="2" name="propisameasure" value="'.dol_escape_htmltag(GETPOST('propisameasure', 'alpha')).'"></td>';
+								print '<td class="center"><input class="text" size="2" name="propcss" value="'.dol_escape_htmltag(GETPOST('propcss', 'alpha')).'"></td>';
+								print '<td class="center"><input class="text" size="2" name="prophelp" value="'.dol_escape_htmltag(GETPOST('prophelp', 'alpha')).'"></td>';
+								print '<td class="center"><input class="text" size="2" name="propshowoncombobox" value="'.dol_escape_htmltag(GETPOST('propshowoncombobox', 'alpha')).'"></td>';
+								//print '<td class="center"><input class="text" size="2" name="propdisabled" value="'.dol_escape_htmltag(GETPOST('propdisabled', 'alpha')).'"></td>';
 								print '<td><input class="text maxwidth100" name="propcomment" value="'.dol_escape_htmltag(GETPOST('propcomment', 'alpha')).'"></td>';
 								print '<td class="center">';
 								print '<input class="button" type="submit" name="add" value="'.$langs->trans("Add").'">';
@@ -2531,13 +2560,19 @@ elseif (! empty($module))
 									$proptype=$propval['type'];
 									$proparrayofkeyval=$propval['arrayofkeyval'];
 									$propnotnull=$propval['notnull'];
-									$propsearchall=$propval['searchall'];
 									$propdefault=$propval['default'];
 									$propindex=$propval['index'];
+									$propforeignkey=$propval['foreignkey'];
 									$propposition=$propval['position'];
 									$propenabled=$propval['enabled'];
 									$propvisible=$propval['visible'];
+									$propnoteditable=$propval['noteditable'];
+									$propsearchall=$propval['searchall'];
 									$propisameasure=$propval['isameasure'];
+									$propcss=$propval['css'];
+									$prophelp=$propval['help'];
+									$propshowoncombobox=$propval['showoncombobox'];
+									//$propdisabled=$propval['disabled'];
 									$propcomment=$propval['comment'];
 
 									print '<tr class="oddeven">';
@@ -2548,7 +2583,7 @@ elseif (! empty($module))
 									print '<td>';
 									print $proplabel;
 									print '</td>';
-									print '<td>';
+									print '<td class="wordbreak">';
 									print $proptype;
 									print '</td>';
 									print '<td class="wordbreak">';
@@ -2565,6 +2600,9 @@ elseif (! empty($module))
 									print '<td class="center">';
 									print $propindex?'1':'';
 									print '</td>';
+									print '<td class="center">';
+									print $propforeignkey?$propforeignkey:'';
+									print '</td>';
 									print '<td class="right">';
 									print $propposition;
 									print '</td>';
@@ -2575,16 +2613,34 @@ elseif (! empty($module))
 									print $propvisible?$propvisible:'';
 									print '</td>';
 									print '<td class="center">';
-									print $propisameasure?$propisameasure:'';
+									print $propnoteditable?$propnoteditable:'';
 									print '</td>';
 									print '<td class="center">';
 									print $propsearchall?'1':'';
 									print '</td>';
+									print '<td class="center">';
+									print $propisameasure?$propisameasure:'';
+									print '</td>';
+									print '<td class="center">';
+									print $propcss?$propcss:'';
+									print '</td>';
+									print '<td class="center">';
+									print $prophelp?$prophelp:'';
+									print '</td>';
+									print '<td class="center">';
+									print $propshowoncombobox?$propshowoncombobox:'';
+									print '</td>';
+									/*print '<td class="center">';
+									print $propdisabled?$propdisabled:'';
+									print '</td>';*/
 									print '<td>';
 									print $propcomment;
 									print '</td>';
 									print '<td class="center">';
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=deleteproperty&propertykey='.urlencode($propname).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj).'">'.img_delete().'</a>';
+									if ($propname != 'rowid')
+									{
+										print '<a href="'.$_SERVER["PHP_SELF"].'?action=deleteproperty&propertykey='.urlencode($propname).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj).'">'.img_delete().'</a>';
+									}
 									print '</td>';
 
 									print '</tr>';
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 43488429807..7d3de98e4df 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -68,21 +68,21 @@ class MyObject extends CommonObject
 	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
 	 *  'label' the translation key.
 	 *  'enabled' is a condition when the field must be managed.
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
 	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing)
 	 *  'noteditable' says if field is not editable (1 or 0)
-	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
 	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
 	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
-	 *  'position' is the sort order of field.
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
 	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
 	 *  'help' is a string visible as a tooltip on field
-	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
-	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
 	 */
 
 	// BEGIN MODULEBUILDER PROPERTIES
@@ -91,13 +91,13 @@ class MyObject extends CommonObject
      */
 	public $fields=array(
 	    'rowid'         =>array('type'=>'integer',      'label'=>'TechnicalID',      'enabled'=>1, 'visible'=>-2, 'noteditable'=>1, 'notnull'=> 1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
-		'ref'           =>array('type'=>'varchar(128)', 'label'=>'Ref',              'enabled'=>1, 'visible'=>1,  'noteditable'=>0, 'notnull'=> 1, 'default'=>'(PROV)', 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
+		'ref'           =>array('type'=>'varchar(128)', 'label'=>'Ref',              'enabled'=>1, 'visible'=>1,  'noteditable'=>0, 'default'=>'', 'notnull'=> 1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
 	    'entity'        =>array('type'=>'integer',      'label'=>'Entity',           'enabled'=>1, 'visible'=>0,  'notnull'=> 1, 'default'=>1, 'index'=>1, 'position'=>20),
 	    'label'         =>array('type'=>'varchar(255)', 'label'=>'Label',            'enabled'=>1, 'visible'=>1,  'position'=>30, 'searchall'=>1, 'css'=>'minwidth200', 'help'=>'Help text', 'showoncombobox'=>1),
 	    'amount'        =>array('type'=>'double(24,8)', 'label'=>'Amount',           'enabled'=>1, 'visible'=>1,  'default'=>'null', 'position'=>40,  'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for amount'),
 	    'qty'           =>array('type'=>'real',         'label'=>'Qty',              'enabled'=>1, 'visible'=>1,  'default'=>'0', 'position'=>45,  'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for quantity', 'css'=>'maxwidth75imp'),
 	    'fk_soc' 		=>array('type'=>'integer:Societe:societe/class/societe.class.php:1', 'label'=>'ThirdParty', 'visible'=> 1, 'enabled'=>1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'help'=>'LinkToThirparty'),
-		'fk_project'    =>array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>1, 'visible'=>-1, 'position'=>52, 'notnull'=>-1, 'index'=>1,),
+		'fk_project'    =>array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>1, 'visible'=>-1, 'position'=>52, 'notnull'=>-1, 'index'=>1),
 		'description'   =>array('type'=>'text',			'label'=>'Description',		 'enabled'=>1, 'visible'=>3,  'position'=>60),
 		'note_public'   =>array('type'=>'html',			'label'=>'NotePublic',		 'enabled'=>1, 'visible'=>0,  'position'=>61),
 		'note_private'  =>array('type'=>'html',			'label'=>'NotePrivate',		 'enabled'=>1, 'visible'=>0,  'position'=>62),
diff --git a/htdocs/modulebuilder/template/core/modules/myobject/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
similarity index 100%
rename from htdocs/modulebuilder/template/core/modules/myobject/doc/doc_generic_myobject_odt.modules.php
rename to htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
diff --git a/htdocs/modulebuilder/template/core/modules/myobject/mod_myobject_advanced.php b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
similarity index 100%
rename from htdocs/modulebuilder/template/core/modules/myobject/mod_myobject_advanced.php
rename to htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
diff --git a/htdocs/modulebuilder/template/core/modules/myobject/mod_myobject_standard.php b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
similarity index 100%
rename from htdocs/modulebuilder/template/core/modules/myobject/mod_myobject_standard.php
rename to htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
diff --git a/htdocs/modulebuilder/template/core/modules/myobject/modules_myobject.php b/htdocs/modulebuilder/template/core/modules/mymodule/modules_myobject.php
similarity index 100%
rename from htdocs/modulebuilder/template/core/modules/myobject/modules_myobject.php
rename to htdocs/modulebuilder/template/core/modules/mymodule/modules_myobject.php
diff --git a/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php b/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php
new file mode 100644
index 00000000000..c0b2e073ad0
--- /dev/null
+++ b/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php
@@ -0,0 +1,58 @@
+<?php
+/* Copyright (C) 2019 Laurent Destailleur <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+// Protection to avoid direct call of template
+if (empty($conf) || ! is_object($conf))
+{
+	print "Error, template page can't be called as URL";
+	exit;
+}
+
+
+print "<!-- BEGIN PHP TEMPLATE -->\n";
+
+
+global $user;
+global $noMoreLinkedObjectBlockAfter;
+
+$langs = $GLOBALS['langs'];
+$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
+
+// Load translation files required by the page
+$langs->load("mymodule");
+
+$total=0; $ilink=0;
+foreach($linkedObjectBlock as $key => $objectlink)
+{
+    $ilink++;
+
+    $trclass='oddeven';
+    if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
+	?>
+<tr class="<?php echo $trclass; ?>">
+    <td><?php echo $langs->trans("MyObject"); ?></td>
+    <td><?php echo $objectlink->getNomUrl(1); ?></td>
+    <td></td>
+	<td class="center"><?php echo dol_print_date($objectlink->date, 'day'); ?></td>
+    <td class="right"><?php echo ''; ?></td>
+	<td class="right"><?php echo $objectlink->getLibStatut(7); ?></td>
+	<td class="right"><a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+</tr>
+	<?php
+}
+
+print "<!-- END PHP TEMPLATE -->\n";
diff --git a/htdocs/modulebuilder/template/core/tpl/mytemplate.tpl.php b/htdocs/modulebuilder/template/core/tpl/mytemplate.tpl.php
deleted file mode 100644
index 8e871e7f416..00000000000
--- a/htdocs/modulebuilder/template/core/tpl/mytemplate.tpl.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/* Copyright (C) ---Put here your own copyright and developer email---
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- * \file    core/tpl/mytemplate.tpl.php
- * \ingroup mymodule
- * \brief   Example template.
- *
- * Put detailed description here.
- */
-
-// Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
-{
-	print "Error, template page can't be called as URL";
-	exit;
-}
-
-
-/** Your code here. */
-echo "Hello world!";

From 012c5ef0c4c47b24e7a0107c086449a9f6005d9e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Nov 2019 18:35:48 +0100
Subject: [PATCH 32/38] Can use substitution variables into filter of fields
 link

---
 htdocs/core/class/commonobject.class.php        |  4 ++--
 htdocs/core/class/html.form.class.php           |  6 +++++-
 htdocs/langs/en_US/modulebuilder.lang           |  2 +-
 htdocs/modulebuilder/template/myobject_list.php | 13 +++++++------
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 7707be211f3..deb27817be9 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -5624,7 +5624,7 @@ abstract class CommonObject
 			{
 				$morecss = 'minwidth100imp';
 			}
-			elseif ($type == 'datetime')
+			elseif ($type == 'datetime' || $type == 'link')
 			{
 				$morecss = 'minwidth200imp';
 			}
@@ -6093,7 +6093,7 @@ abstract class CommonObject
 			$param_list_array = explode(':', $param_list[0]);
 			$showempty=(($required && $default != '')?0:1);
 
-			$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', '', '', 0, empty($val['disabled'])?0:1);
+			$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, '', 0, empty($val['disabled'])?0:1);
 
 			if (! empty($param_list_array[2]))		// If we set to add a create button
 			{
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 72c1e589233..4be775ea038 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5865,7 +5865,11 @@ class Form
 			if ($classname && class_exists($classname))
 			{
 				$objecttmp = new $classname($this->db);
-				$objecttmp->filter = $filter;
+				// Make some replacement
+				$objecttmp->filter = str_replace(
+					array('__ENTITY__', '__USER_ID__'),
+					array($conf->entity, $user->id),
+					$filter);
 			}
 		}
 		if (! is_object($objecttmp))
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 4a0e0daf5c1..d26f58fd00e 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -134,4 +134,4 @@ KeyForTooltip=Key for tooltip
 CSSClass=CSS Class
 NotEditable=Not editable
 ForeignKey=Foreign key
-TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php:1 (1 means we add a + button after the combo to create the record)
\ No newline at end of file
+TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1;entity=$conf->entity' for example)
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 525fa879562..bf9b73e0f53 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -153,6 +153,9 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
+$permtoread = $user->rights->mymodule->myobject->read;
+$permtowrite = $user->rights->mymodule->myobject->write;
+$permtodelete = $user->rights->mymodule->myobject->delete;
 
 
 /*
@@ -190,8 +193,6 @@ if (empty($reshook))
 	// Mass actions
 	$objectclass='MyObject';
 	$objectlabel='MyObject';
-	$permtoread = $user->rights->mymodule->read;
-	$permtodelete = $user->rights->mymodule->delete;
 	$uploaddir = $conf->mymodule->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
@@ -346,7 +347,7 @@ $arrayofmassactions =  array(
     //'builddoc'=>$langs->trans("PDFMerge"),
     //'presend'=>$langs->trans("SendByMail"),
 );
-if ($user->rights->mymodule->delete) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+if ($permtodelete) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
@@ -360,7 +361,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/mymodule/myobject_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $user->rights->mymodule->write);
+$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/mymodule/myobject_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permtowrite);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, $newcardbutton, '', $limit);
 
@@ -593,8 +594,8 @@ if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $n
 	$urlsource.=str_replace('&amp;', '&', $param);
 
 	$filedir=$diroutputmassaction;
-	$genallowed=$user->rights->mymodule->read;
-	$delallowed=$user->rights->mymodule->write;
+	$genallowed=$permtoread;
+	$delallowed=$permtowrite;
 
 	print $formfile->showdocuments('massfilesarea_mymodule', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }

From f74833cfe11d916bfe162359e27d416d533144cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Nov 2019 18:44:32 +0100
Subject: [PATCH 33/38] Make modulebuilder more compatible with multicompany

---
 htdocs/core/class/html.form.class.php                  | 6 ++++--
 htdocs/modulebuilder/template/class/myobject.class.php | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 4be775ea038..6790ec43cae 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5866,9 +5866,10 @@ class Form
 			{
 				$objecttmp = new $classname($this->db);
 				// Make some replacement
+				$sharedentities = getEntity(strtolower($classname));
 				$objecttmp->filter = str_replace(
-					array('__ENTITY__', '__USER_ID__'),
-					array($conf->entity, $user->id),
+					array('__ENTITY__', '__SHARED_ENTITIES__', '__USER_ID__'),
+					array($conf->entity, $sharedentities, $user->id),
 					$filter);
 			}
 		}
@@ -5878,6 +5879,7 @@ class Form
 			return 'Error bad setup of type for field '.join(',', $InfoFieldList);
 		}
 
+		//var_dump($objecttmp->filter);
 		$prefixforautocompletemode=$objecttmp->element;
 		if ($prefixforautocompletemode == 'societe') $prefixforautocompletemode='company';
 		$confkeyforautocompletemode=strtoupper($prefixforautocompletemode).'_USE_SEARCH_TO_SELECT';	// For example COMPANY_USE_SEARCH_TO_SELECT
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 7d3de98e4df..4cefbc159a0 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -96,7 +96,7 @@ class MyObject extends CommonObject
 	    'label'         =>array('type'=>'varchar(255)', 'label'=>'Label',            'enabled'=>1, 'visible'=>1,  'position'=>30, 'searchall'=>1, 'css'=>'minwidth200', 'help'=>'Help text', 'showoncombobox'=>1),
 	    'amount'        =>array('type'=>'double(24,8)', 'label'=>'Amount',           'enabled'=>1, 'visible'=>1,  'default'=>'null', 'position'=>40,  'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for amount'),
 	    'qty'           =>array('type'=>'real',         'label'=>'Qty',              'enabled'=>1, 'visible'=>1,  'default'=>'0', 'position'=>45,  'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for quantity', 'css'=>'maxwidth75imp'),
-	    'fk_soc' 		=>array('type'=>'integer:Societe:societe/class/societe.class.php:1', 'label'=>'ThirdParty', 'visible'=> 1, 'enabled'=>1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'help'=>'LinkToThirparty'),
+	    'fk_soc' 		=>array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'visible'=> 1, 'enabled'=>1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'help'=>'LinkToThirparty'),
 		'fk_project'    =>array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>1, 'visible'=>-1, 'position'=>52, 'notnull'=>-1, 'index'=>1),
 		'description'   =>array('type'=>'text',			'label'=>'Description',		 'enabled'=>1, 'visible'=>3,  'position'=>60),
 		'note_public'   =>array('type'=>'html',			'label'=>'NotePublic',		 'enabled'=>1, 'visible'=>0,  'position'=>61),

From a95a10b8f03c6dd9e724c42091537353f0197f8e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Nov 2019 18:45:44 +0100
Subject: [PATCH 34/38] Update doc

---
 htdocs/langs/en_US/modulebuilder.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index d26f58fd00e..d14aa8a3c71 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -134,4 +134,4 @@ KeyForTooltip=Key for tooltip
 CSSClass=CSS Class
 NotEditable=Not editable
 ForeignKey=Foreign key
-TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1;entity=$conf->entity' for example)
\ No newline at end of file
+TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
\ No newline at end of file

From 83cc9ea643783e27ba863d673fb4f699eb68ff0f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Nov 2019 20:48:46 +0100
Subject: [PATCH 35/38] FIX Search on leave request ref

---
 htdocs/holiday/list.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 1c03e3801b6..4256ecd13f9 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -197,10 +197,7 @@ llxHeader('', $langs->trans('CPTitreMenu'));
 $order = $db->order($sortfield, $sortorder).$db->plimit($limit + 1, $offset);
 
 // Ref
-if(!empty($search_ref))
-{
-    $filter.= " AND cp.rowid = ".(int) $db->escape($search_ref);
-}
+if (!empty($search_ref)) $filter.= natural_search("cp.ref", $search_ref);
 // Start date
 $filter.= dolSqlDateFilter("cp.date_debut", $search_day_start, $search_month_start, $search_year_start);
 // End date
@@ -231,7 +228,6 @@ if (!empty($sall))
 
 if (empty($user->rights->holiday->read_all)) $filter.=' AND cp.fk_user IN ('.join(',', $childids).')';
 
-
 // Récupération de l'ID de l'utilisateur
 $user_id = $user->id;
 

From a3a326b25ef076a3619655e0938cfad200ffcbbf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Nov 2019 20:52:11 +0100
Subject: [PATCH 36/38] FIX Search on leave request ref

---
 htdocs/holiday/list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 4256ecd13f9..1ead5872f78 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -116,6 +116,7 @@ $search_type         = GETPOST('search_type', 'int');
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
+	'cp.ref'=>'Ref',
     'cp.description'=>'Description',
     'uu.lastname'=>'EmployeeLastname',
     'uu.firstname'=>'EmployeeFirstname'

From 4616519dcfeee162a9710478fd8612a0af4d677e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Nov 2019 20:52:30 +0100
Subject: [PATCH 37/38] FIX Search on leave request ref

---
 htdocs/holiday/list.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index b86dd2864b5..e4137199060 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -121,6 +121,7 @@ $search_array_options=$extrafields->getOptionalsFromPost($object->table_element,
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
+	'cp.ref'=>'Ref',
     'cp.description'=>'Description',
     'uu.lastname'=>'EmployeeLastname',
     'uu.firstname'=>'EmployeeFirstname',
@@ -287,7 +288,7 @@ $sql.= ", ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
 $sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
 $sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
 // Search all
-if (!empty($sall)) $sql.= natural_search(array_keys($fieldstosearchall), $sall);
+//if (!empty($sall)) $sql.= natural_search(array_keys($fieldstosearchall), $sall);
 // Ref
 if(!empty($search_ref))
 {

From cf2ee892ee1842065dfe1b02a3d54b5526fa261e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Nov 2019 21:27:19 +0100
Subject: [PATCH 38/38] FIX security check. A user can see holiday with link
 without permissions

---
 htdocs/holiday/card.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 1f597f2ddc2..6518258b508 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -44,10 +44,6 @@ $id=GETPOST('id', 'int');
 $ref=GETPOST('ref', 'alpha');
 $fuserid = (GETPOST('fuserid', 'int')?GETPOST('fuserid', 'int'):$user->id);
 
-// Protection if external user
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'holiday', $id, 'holiday');
-
 $now=dol_now();
 
 // Load translation files required by the page
@@ -61,9 +57,9 @@ if (! empty($conf->global->HOLIDAY_FOR_NON_SALARIES_TOO)) $morefilter = '';
 $error = 0;
 
 $object = new Holiday($db);
-if ($id > 0)
+if (($id > 0) || $ref)
 {
-    $object->fetch($id);
+    $object->fetch($id, $ref);
 
     // Check current user can read this leave request
     $canread = 0;
@@ -83,6 +79,12 @@ $candelete = 0;
 if (! empty($user->rights->holiday->delete)) $candelete=1;
 if ($object->statut == Holiday::STATUS_DRAFT && $user->rights->holiday->write && in_array($object->fk_user, $childids)) $candelete=1;
 
+// Protection if external user
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'holiday', $object->id, 'holiday');
+
+
+
 /*
  * Actions
  */