From d428f79d46157ca3e474e860f4e262902339d109 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <marc.delimalucio@atm-consulting.fr>
Date: Wed, 15 May 2019 12:26:39 +0200
Subject: [PATCH 01/62] NEW: new line template: hidden conf to fill service
 dates from the last service line

---
 htdocs/core/tpl/objectline_create.tpl.php | 47 +++++++++++++++++++++++
 htdocs/langs/en_US/products.lang          |  1 +
 2 files changed, 48 insertions(+)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 4a4febe65d3..b76a2f55219 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -464,6 +464,27 @@ if ((! empty($conf->service->enabled) || ($object->element == 'contrat')) && $da
 	<?php
 	$date_start=dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
 	$date_end=dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
+
+	$prefillDates = false;
+
+	if(! empty($conf->global->MAIN_FILL_SERVICE_DATES_FROM_LAST_SERVICE_LINE) && ! empty($object->lines))
+    {
+	    for($i = count($object->lines) - 1; $i >= 0; $i--)
+	    {
+		    $lastline = $object->lines[$i];
+
+		    if($lastline->product_type == Product::TYPE_SERVICE && (! empty($lastline->date_start) || ! empty($lastline->date_end)))
+		    {
+			    $date_start_prefill = $lastline->date_start;
+			    $date_end_prefill = $lastline->date_end;
+
+			    $prefillDates = true;
+			    break;
+		    }
+	    }
+    }
+
+
 	if (! empty($object->element) && $object->element == 'contrat')
 	{
 		print $langs->trans("DateStartPlanned").' ';
@@ -478,7 +499,33 @@ if ((! empty($conf->service->enabled) || ($object->element == 'contrat')) && $da
 		echo ' '.$langs->trans('to').' ';
 		print $form->selectDate($date_end, 'date_end', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?0:1, 1, "addproduct", 1, 0);
 	};
+
+	if($prefillDates)
+    {
+        echo ' <span class="small"><a href="#" id="prefill_service_dates">' . $langs->trans('FillWithLastServiceDates') .  '</a></span>';
+    }
+
 	print '<script>';
+
+	if($prefillDates)
+	{
+?>
+        function prefill_service_dates()
+        {
+            $('#date_start').val("<?php echo dol_escape_js(dol_print_date($date_start_prefill, '%d/%m/%Y')); ?>").trigger('change');
+            $('#date_end').val("<?php echo dol_escape_js(dol_print_date($date_end_prefill, '%d/%m/%Y')); ?>").trigger('change');
+
+            return false; // Prevent default link behaviour (which is go to href URL)
+        }
+
+        $(document).ready(function()
+        {
+            $('#prefill_service_dates').click(prefill_service_dates);
+        });
+
+<?php
+	}
+
 	if (!$date_start) {
 		if (isset($conf->global->MAIN_DEFAULT_DATE_START_HOUR)) {
 			print 'jQuery("#date_starthour").val("'.$conf->global->MAIN_DEFAULT_DATE_START_HOUR.'");';
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 5f07a7f2eb0..7c059fcc32e 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -97,6 +97,7 @@ SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 AssociatedProductsAbility=Activate virtual products (kits)

From 11f14b8fe5c155dbb706a54e21a4933d8d02000c Mon Sep 17 00:00:00 2001
From: John Botella <john.botella@atm-consulting.fr>
Date: Tue, 4 Aug 2020 14:13:52 +0200
Subject: [PATCH 02/62] Fix bad usage of moreparam

---
 htdocs/core/class/html.form.class.php |  2 +-
 htdocs/core/lib/ajax.lib.php          | 23 ++++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1e1bbdf58d2..718b9fecdfc 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5953,7 +5953,7 @@ class Form
 			$urlforajaxcall = DOL_URL_ROOT.'/core/ajax/selectobject.php';
 
 			// No immediate load of all database
-			$urloption = 'htmlname='.$htmlname.'&outjson=1&objectdesc='.$objectdesc.'&filter='.urlencode($objecttmp->filter).($moreparams ? $moreparams : '');
+			$urloption = 'htmlname='.$htmlname.'&outjson=1&objectdesc='.$objectdesc.'&filter='.urlencode($objecttmp->filter);
 			// Activate the auto complete using ajax call.
 			$out .= ajax_autocompleter($preselectedvalue, $htmlname, $urlforajaxcall, $urloption, $conf->global->$confkeyforautocompletemode, 0, array());
 			$out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index a430a1612af..72bdc413795 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -25,25 +25,26 @@
 
 
 /**
- *	Generic function that return javascript to add to a page to transform a common input field into an autocomplete field by calling an Ajax page (ex: /societe/ajaxcompanies.php).
+ *    Generic function that return javascript to add to a page to transform a common input field into an autocomplete field by calling an Ajax page (ex: /societe/ajaxcompanies.php).
  *  The HTML field must be an input text with id=search_$htmlname.
  *  This use the jQuery "autocomplete" function. If we want to use the select2, we must also convert the input into select on funcntions that call this method.
  *
- *  @param	string	$selected           Preselected value
- *	@param	string	$htmlname           HTML name of input field
- *	@param	string	$url                Ajax Url to call for request: /path/page.php. Must return a json array ('key'=>id, 'value'=>String shown into input field once selected, 'label'=>String shown into combo list)
- *  @param	string	$urloption			More parameters on URL request
- *  @param	int		$minLength			Minimum number of chars to trigger that Ajax search
- *  @param	int		$autoselect			Automatic selection if just one value
- *  @param	array   $ajaxoptions		Multiple options array
+ * @param string $selected Preselected value
+ * @param string $htmlname HTML name of input field
+ * @param string $url Ajax Url to call for request: /path/page.php. Must return a json array ('key'=>id, 'value'=>String shown into input field once selected, 'label'=>String shown into combo list)
+ * @param string $urloption More parameters on URL request
+ * @param int $minLength Minimum number of chars to trigger that Ajax search
+ * @param int $autoselect Automatic selection if just one value
+ * @param array $ajaxoptions Multiple options array
  *                                      - Ex: array('update'=>array('field1','field2'...)) will reset field1 and field2 once select done
  *                                      - Ex: array('disabled'=> )
  *                                      - Ex: array('show'=> )
  *                                      - Ex: array('update_textarea'=> )
  *                                      - Ex: array('option_disabled'=> id to disable and warning to show if we select a disabled value (this is possible when using autocomplete ajax)
- *	@return string              		Script
+ * @param string	$moreparams			More params provided to ajax call
+ * @return string                    Script
  */
-function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLength = 2, $autoselect = 0, $ajaxoptions = array())
+function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLength = 2, $autoselect = 0, $ajaxoptions = array(), $moreparams = '')
 {
     if (empty($minLength)) $minLength=1;
 
@@ -55,7 +56,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
 
     // Input search_htmlname is original field
     // Input htmlname is a second input field used when using ajax autocomplete.
-	$script = '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.$selected.'" />';
+	$script = '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.$selected.'" '.($moreparams ? $moreparams : '').' />';
 
 	$script.= '<!-- Javascript code for autocomplete of field '.$htmlname.' -->'."\n";
 	$script.= '<script>'."\n";

From 587ca48312f709275fd495504700bed2f76e2672 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Tue, 4 Aug 2020 17:25:35 +0200
Subject: [PATCH 03/62] Fix filter warehouse list on status

---
 htdocs/product/stock/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index f0b94f99bdb..820572dc601 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -50,7 +50,7 @@ $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_ref = GETPOST("sref", "alpha") ?GETPOST("sref", "alpha") : GETPOST("search_ref", "alpha");
 $search_label = GETPOST("snom", "alpha") ?GETPOST("snom", "alpha") : GETPOST("search_label", "alpha");
-$search_status = GETPOST("search_status", "int");
+$search_status = GETPOST("search_statut", "int");
 
 if (!empty($conf->categorie->enabled))
 {
@@ -232,7 +232,7 @@ foreach ($search as $key => $val)
 		if ($search[$key] == '-1') $search[$key] = '';
 		$mode_search = 2;
 	}
-	if ($search[$key] != '') $sql .= natural_search((($key == 'ref') ? 't.ref' : 't.' . $key), $search[$key], (($key == 'status') ? 2 : $mode_search));
+	if ($search[$key] != '') $sql .= natural_search((($key == 'ref') ? 't.ref' : 't.' . $key), $search[$key], (($key == 'statut') ? 2 : $mode_search));
 }
 if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 // Add where from extra fields
@@ -449,7 +449,7 @@ print $hookmanager->resPrint;
 // Status
 if (!empty($arrayfields['t.statut']['checked'])) {
 	print '<td class="liste_titre right">';
-	print $form->selectarray('search_status', $warehouse->statuts, $search_status, 1, 0, 0, '', 1);
+	print $form->selectarray('search_statut', $warehouse->statuts, $search_status, 1, 0, 0, '', 1);
 	print '</td>';
 }
 

From b9513255fd67a9402ed7fb4ff44d90cd15c63f44 Mon Sep 17 00:00:00 2001
From: spooky360 <spooky.l2n@gmail.com>
Date: Wed, 5 Aug 2020 17:02:59 +0200
Subject: [PATCH 04/62] Fix for self XSS vuln (See
 https://www.huntr.dev/bounties/2-packagist-dolibarr).

---
 htdocs/core/lib/functions.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index eba330e5621..1ca594d58d8 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3911,7 +3911,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
 		{
 			$out .= "<b>".$langs->trans("OS").":</b> ".php_uname()."<br>\n";
 		}
-		$out .= "<b>".$langs->trans("UserAgent").":</b> ".$_SERVER["HTTP_USER_AGENT"]."<br>\n";
+		$out .= "<b>".$langs->trans("UserAgent").":</b> ".dol_htmlentities($_SERVER["HTTP_USER_AGENT"], ENT_COMPAT, 'UTF-8)."<br>\n";
 		$out .= "<br>\n";
 		$out .= "<b>".$langs->trans("RequestedUrl").":</b> ".dol_htmlentities($_SERVER["REQUEST_URI"], ENT_COMPAT, 'UTF-8')."<br>\n";
 		$out .= "<b>".$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"]) ?dol_htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8') : '')."<br>\n";

From a94fa9397358a514fc96d318ba4beb1744c72994 Mon Sep 17 00:00:00 2001
From: spooky360 <spooky.l2n@gmail.com>
Date: Wed, 5 Aug 2020 17:11:19 +0200
Subject: [PATCH 05/62] Fixed missing quote... => Fix for self XSS vuln (See
 https://www.huntr.dev/bounties/2-packagist-dolibarr)

---
 htdocs/core/lib/functions.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 1ca594d58d8..0ac2dcdbd56 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3911,7 +3911,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
 		{
 			$out .= "<b>".$langs->trans("OS").":</b> ".php_uname()."<br>\n";
 		}
-		$out .= "<b>".$langs->trans("UserAgent").":</b> ".dol_htmlentities($_SERVER["HTTP_USER_AGENT"], ENT_COMPAT, 'UTF-8)."<br>\n";
+		$out .= "<b>".$langs->trans("UserAgent").":</b> ".dol_htmlentities($_SERVER["HTTP_USER_AGENT"], ENT_COMPAT, 'UTF-8')."<br>\n";
 		$out .= "<br>\n";
 		$out .= "<b>".$langs->trans("RequestedUrl").":</b> ".dol_htmlentities($_SERVER["REQUEST_URI"], ENT_COMPAT, 'UTF-8')."<br>\n";
 		$out .= "<b>".$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"]) ?dol_htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8') : '')."<br>\n";

From 215242a4a1dc63809ffa0dd3de3d246ad49f3ce0 Mon Sep 17 00:00:00 2001
From: quentin <quentin.vial-gouteyron@atm-consulting.fr>
Date: Thu, 6 Aug 2020 14:11:26 +0200
Subject: [PATCH 06/62] fix right project info.php

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

diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index d2b95726aea..b08f3ab737a 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -63,7 +63,7 @@ $search_agenda_label=GETPOST('search_agenda_label');
 $id = GETPOST("id", 'int');
 $socid=0;
 //if ($user->societe_id > 0) $socid = $user->societe_id;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
-$result=restrictedArea($user, 'projet', $id, '');
+$result=restrictedArea($user, 'projet', $id, 'projet&project');
 
 if (!$user->rights->projet->lire)	accessforbidden();
 

From 2cdb17a1106d6faebff73d83d531ffd2bb8fc1c4 Mon Sep 17 00:00:00 2001
From: bahfir abbes <bafbes@gmail.com>
Date: Wed, 5 Aug 2020 08:35:49 +0100
Subject: [PATCH 07/62] fix: fetch reception on supplier order dispatch fetch

---
 htdocs/fourn/class/fournisseur.commande.dispatch.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index 19ea5880346..808b217caed 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -292,7 +292,9 @@ class CommandeFournisseurDispatch extends CommonObject
 				$this->batch = $obj->batch;
 				$this->eatby = $this->db->jdate($obj->eatby);
 				$this->sellby = $this->db->jdate($obj->sellby);
-                                $this->fetch_optionals();
+				$this->fk_reception = $obj->fk_reception;
+
+				$this->fetch_optionals();
             }
             $this->db->free($resql);
 

From 4376ca4c94830a44ba481dbe58c305388a85f5e5 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Fri, 7 Aug 2020 14:16:49 +0200
Subject: [PATCH 08/62] Revert "Fix filter warehouse list on status"

This reverts commit 587ca48312f709275fd495504700bed2f76e2672.
---
 htdocs/product/stock/list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 820572dc601..f0b94f99bdb 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -50,7 +50,7 @@ $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_ref = GETPOST("sref", "alpha") ?GETPOST("sref", "alpha") : GETPOST("search_ref", "alpha");
 $search_label = GETPOST("snom", "alpha") ?GETPOST("snom", "alpha") : GETPOST("search_label", "alpha");
-$search_status = GETPOST("search_statut", "int");
+$search_status = GETPOST("search_status", "int");
 
 if (!empty($conf->categorie->enabled))
 {
@@ -232,7 +232,7 @@ foreach ($search as $key => $val)
 		if ($search[$key] == '-1') $search[$key] = '';
 		$mode_search = 2;
 	}
-	if ($search[$key] != '') $sql .= natural_search((($key == 'ref') ? 't.ref' : 't.' . $key), $search[$key], (($key == 'statut') ? 2 : $mode_search));
+	if ($search[$key] != '') $sql .= natural_search((($key == 'ref') ? 't.ref' : 't.' . $key), $search[$key], (($key == 'status') ? 2 : $mode_search));
 }
 if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 // Add where from extra fields
@@ -449,7 +449,7 @@ print $hookmanager->resPrint;
 // Status
 if (!empty($arrayfields['t.statut']['checked'])) {
 	print '<td class="liste_titre right">';
-	print $form->selectarray('search_statut', $warehouse->statuts, $search_status, 1, 0, 0, '', 1);
+	print $form->selectarray('search_status', $warehouse->statuts, $search_status, 1, 0, 0, '', 1);
 	print '</td>';
 }
 

From f132f272f26c636ae6230748dd65ab7baa6f7be3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Aug 2020 14:34:21 +0200
Subject: [PATCH 09/62] Fix missing translation

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

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index bd957f0ca02..90b95883673 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1846,6 +1846,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Contracts
+MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users

From 71a6cf120747d3d7f4b0f3496e3a0e8ff66bbf24 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Aug 2020 14:38:03 +0200
Subject: [PATCH 10/62] Fix permission on type of email templates must depends
 on user perms.

Conflicts:
	htdocs/admin/mails_templates.php
---
 htdocs/admin/mails_templates.php | 43 +++++++++++++++++---------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 320d2e1d8a1..a26e0801238 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -155,20 +155,20 @@ $sourceList = array();
 
 // We save list of template email Dolibarr can manage. This list can found by a grep into code on "->param['models']"
 $elementList = array();
-if ($conf->propal->enabled)            $elementList['propal_send'] = $langs->trans('MailToSendProposal');
-if ($conf->commande->enabled)          $elementList['order_send'] = $langs->trans('MailToSendOrder');
-if ($conf->facture->enabled)           $elementList['facture_send'] = $langs->trans('MailToSendInvoice');
+if ($conf->propal->enabled && $user->rights->propal->lire)     $elementList['propal_send'] = $langs->trans('MailToSendProposal');
+if ($conf->commande->enabled && $user->rights->commande->lire) $elementList['order_send'] = $langs->trans('MailToSendOrder');
+if ($conf->facture->enabled && $user->rights->facture->lire)   $elementList['facture_send'] = $langs->trans('MailToSendInvoice');
 if ($conf->expedition->enabled)        $elementList['shipping_send'] = $langs->trans('MailToSendShipment');
 if ($conf->reception->enabled) 		   $elementList['reception_send'] = $langs->trans('MailToSendReception');
 if ($conf->ficheinter->enabled)        $elementList['fichinter_send'] = $langs->trans('MailToSendIntervention');
 if ($conf->supplier_proposal->enabled) $elementList['supplier_proposal_send'] = $langs->trans('MailToSendSupplierRequestForQuotation');
-if ($conf->fournisseur->enabled && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || $conf->supplier_order->enabled)	$elementList['order_supplier_send'] = $langs->trans('MailToSendSupplierOrder');
-if ($conf->fournisseur->enabled && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || $conf->supplier_invoice->enabled)	$elementList['invoice_supplier_send'] = $langs->trans('MailToSendSupplierInvoice');
-if ($conf->societe->enabled)           $elementList['thirdparty'] = $langs->trans('MailToThirdparty');
-if ($conf->adherent->enabled)          $elementList['member'] = $langs->trans('MailToMember');
-if ($conf->contrat->enabled)           $elementList['contract'] = $langs->trans('MailToSendContract');
+if (($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || ($conf->supplier_order->enabled && $user->rights->supplier_order->lire))	$elementList['order_supplier_send'] = $langs->trans('MailToSendSupplierOrder');
+if (($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || ($conf->supplier_invoice->enabled && $user->rights->supplier_invoice->lire))	$elementList['invoice_supplier_send'] = $langs->trans('MailToSendSupplierInvoice');
+if ($conf->societe->enabled && $user->rights->societe->lire)           $elementList['thirdparty'] = $langs->trans('MailToThirdparty');
+if ($conf->adherent->enabled && $user->rights->adherent->lire)          $elementList['member'] = $langs->trans('MailToMember');
+if ($conf->contrat->enabled && $user->rights->contrat->lire)           $elementList['contract'] = $langs->trans('MailToSendContract');
 if ($conf->projet->enabled)            $elementList['project'] = $langs->trans('MailToProject');
-if ($conf->ticket->enabled)            $elementList['ticket_send'] = $langs->trans('MailToTicket');
+if ($conf->ticket->enabled && $user->rights->ticket->read)            $elementList['ticket_send'] = $langs->trans('MailToTicket');
 $elementList['user'] = $langs->trans('MailToUser');
 
 $parameters = array('elementList'=>$elementList);
@@ -558,6 +558,7 @@ if (!empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) { $fieldsforco
 foreach ($fieldsforcontent as $tmpfieldlist)
 {
 	print '<tr class="impair nodrag nodrop nohover"><td colspan="6" class="nobottom">';
+
 	// Label
 	if ($tmpfieldlist == 'topic')
 	{
@@ -571,6 +572,7 @@ foreach ($fieldsforcontent as $tmpfieldlist)
 		print $form->textwithpicto($langs->trans("Content"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'<br>';
 	if ($tmpfieldlist == 'content_lines')
 		print $form->textwithpicto($langs->trans("ContentForLines"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'<br>';
+
 	// Input field
 	if ($tmpfieldlist == 'topic') {
 		print '<input type="text" class="flat minwidth500" name="'.$tmpfieldlist.'" value="'.(!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '').'">';
@@ -652,33 +654,34 @@ if ($resql)
 
     // Title line with search boxes
     print '<tr class="liste_titre">';
+
     $filterfound = 0;
     foreach ($fieldlist as $field => $value)
     {
-        if ($value == 'label') print '<td class="liste_titre"><input type="text" name="search_label" class="maxwidth100" value="'.dol_escape_htmltag($search_label).'"></td>';
-        elseif ($value == 'lang')
-        {
+    	if ($value == 'label') {
+    		print '<td class="liste_titre"><input type="text" name="search_label" class="maxwidth100" value="'.dol_escape_htmltag($search_label).'"></td>';
+    	} elseif ($value == 'lang') {
         	print '<td class="liste_titre">';
         	print $formadmin->select_language($search_lang, 'search_lang', 0, null, 1, 0, 0, 'maxwidth100');
         	print '</td>';
-        }
-        elseif ($value == 'fk_user')
-        {
+        } elseif ($value == 'fk_user') {
         	print '<td class="liste_titre">';
         	$restrictid = array();
         	if (!$user->admin) $restrictid = array($user->id);
         	//var_dump($restrictid);
         	print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, 'hierarchyme', null, 0, 0, 1, '', 0, '', 'maxwidth100');
         	print '</td>';
-        }
-        elseif ($value == 'topic') print '<td class="liste_titre"><input type="text" name="search_topic" value="'.dol_escape_htmltag($search_topic).'"></td>';
-        elseif ($value == 'type_template')
-        {
+        } elseif ($value == 'topic') {
+        	print '<td class="liste_titre"><input type="text" name="search_topic" value="'.dol_escape_htmltag($search_topic).'"></td>';
+        } elseif ($value == 'type_template') {
         	print '<td class="liste_titre">'.$form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100 maxwidth100onsmartphone').'</td>';
+        } elseif (!in_array($value, array('content', 'content_lines'))) {
+        	print '<td class="liste_titre"></td>';
         }
-        elseif (!in_array($value, array('content', 'content_lines'))) print '<td class="liste_titre"></td>';
     }
+
     if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) print '<td class="liste_titre"></td>';
+
     // Action column
     print '<td class="liste_titre right" width="64">';
     $searchpicto = $form->showFilterButtons();

From 7e629d7ef4d2d7b27e57f609ad68ef8e19e9ad87 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Aug 2020 14:05:05 +0200
Subject: [PATCH 11/62] FIX Language visible just after login does not match
 user choice.

---
 htdocs/main.inc.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 396e377e7b5..2887b4b1f77 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -655,6 +655,11 @@ if (!defined('NOLOGIN'))
 			if (GETPOST('lang', 'aZ09'))       $paramsurl[] = 'lang='.GETPOST('lang', 'aZ09');
 			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
 			exit;
+		} else {
+			// User is loaded, we may need to change language for him according to its choice
+			if (! empty($user->conf->MAIN_LANG_DEFAULT)) {
+				$langs->setDefaultLang($user->conf->MAIN_LANG_DEFAULT);
+			}
 		}
 	}
 	else

From ac48576b88debf1e243dfa2e12ca75ef324ec3ee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Aug 2020 14:49:07 +0200
Subject: [PATCH 12/62] Add missing dependency in debian package #12785

---
 build/debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/debian/control b/build/debian/control
index 970f192f094..0c010b6a478 100755
--- a/build/debian/control
+++ b/build/debian/control
@@ -14,7 +14,7 @@ Architecture: all
 Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5 | libapache2-mod-php | libapache2-mod-phpfilter | php-cgi | php-fpm | php,
     php5-cli | php-cli,
 # Required PHP extensions
-    php5-mysql | php5-mysqli | php-mysql | php-mysqli, php5-curl | php-curl, php5-gd | php-gd, php5-ldap | php-gd,
+    php5-mysql | php5-mysqli | php-mysql | php-mysqli, php5-curl | php-curl, php5-gd | php-gd, php5-ldap | php-gd, php5-zip | php-zip
 # Required PHP libraries
     php-pear, php-mail-mime,
 #    php-tcpdf,

From ada7b74ba1fd183b8735c8d651eac9b947d20c14 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Aug 2020 14:56:30 +0200
Subject: [PATCH 13/62] Fix phpcs

---
 htdocs/core/lib/ajax.lib.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 72bdc413795..4018d20aee5 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -25,24 +25,24 @@
 
 
 /**
- *    Generic function that return javascript to add to a page to transform a common input field into an autocomplete field by calling an Ajax page (ex: /societe/ajaxcompanies.php).
- *  The HTML field must be an input text with id=search_$htmlname.
- *  This use the jQuery "autocomplete" function. If we want to use the select2, we must also convert the input into select on funcntions that call this method.
+ * Generic function that return javascript to add to a page to transform a common input field into an autocomplete field by calling an Ajax page (ex: /societe/ajaxcompanies.php).
+ * The HTML field must be an input text with id=search_$htmlname.
+ * This use the jQuery "autocomplete" function. If we want to use the select2, we must also convert the input into select on funcntions that call this method.
  *
- * @param string $selected Preselected value
- * @param string $htmlname HTML name of input field
- * @param string $url Ajax Url to call for request: /path/page.php. Must return a json array ('key'=>id, 'value'=>String shown into input field once selected, 'label'=>String shown into combo list)
- * @param string $urloption More parameters on URL request
- * @param int $minLength Minimum number of chars to trigger that Ajax search
- * @param int $autoselect Automatic selection if just one value
- * @param array $ajaxoptions Multiple options array
+ * @param string	$selected 			Preselected value
+ * @param string	$htmlname 			HTML name of input field
+ * @param string	$url 				Ajax Url to call for request: /path/page.php. Must return a json array ('key'=>id, 'value'=>String shown into input field once selected, 'label'=>String shown into combo list)
+ * @param string	$urloption			More parameters on URL request
+ * @param int		$minLength			Minimum number of chars to trigger that Ajax search
+ * @param int		$autoselect			Automatic selection if just one value
+ * @param array		$ajaxoptions		Multiple options array
  *                                      - Ex: array('update'=>array('field1','field2'...)) will reset field1 and field2 once select done
  *                                      - Ex: array('disabled'=> )
  *                                      - Ex: array('show'=> )
  *                                      - Ex: array('update_textarea'=> )
  *                                      - Ex: array('option_disabled'=> id to disable and warning to show if we select a disabled value (this is possible when using autocomplete ajax)
  * @param string	$moreparams			More params provided to ajax call
- * @return string                    Script
+ * @return string   					Script
  */
 function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLength = 2, $autoselect = 0, $ajaxoptions = array(), $moreparams = '')
 {

From dd773d33fd41f7dd737618caf2ea6ae85abe43b6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Aug 2020 14:57:52 +0200
Subject: [PATCH 14/62] Fix phpcs

---
 htdocs/product/composition/card.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 1fbbe2ecefa..7693ef9a4de 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -66,12 +66,13 @@ if ($id > 0 || ! empty($ref))
 
 if ($cancel) $action ='';
 
-// Action association d'un sousproduit
+// Add subproduct to product
 if ($action == 'add_prod' && ($user->rights->produit->creer || $user->rights->service->creer))
 {
 	$error=0;
 
-	for ($i=0; $i < GETPOST("max_prod", 'int'); $i++)
+	$maxprod = GETPOST("max_prod", 'int');
+	for ($i=0; $i < $maxprod; $i++)
 	{
 		$qty = price2num(GETPOST("prod_qty_".$i, 'alpha'), 'MS');
 		if ($qty > 0)

From dec0e418e32a964273365a678a02301e622b7e32 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Fri, 7 Aug 2020 15:11:36 +0200
Subject: [PATCH 15/62] Convert search key status to class key statut. Add
 comment to refactor class statut to class status

---
 htdocs/product/stock/list.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index f0b94f99bdb..036fba2be76 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -101,7 +101,9 @@ $search_all = trim(GETPOST("search_all", 'alpha'));
 $search = array();
 foreach ($object->fields as $key => $val)
 {
-	if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha');
+	$search_key = $key;
+	if  ($search_key == 'statut') $search_key = 'status'; // remove this after refactor entrepot.class property statut to status
+	if (GETPOST('search_'.$search_key, 'alpha') !== '') $search[$search_key] = GETPOST('search_'.$search_key, 'alpha');
 }
 
 // Definition of fields for list
@@ -226,13 +228,15 @@ if (!empty($conf->categorie->enabled))
 }
 foreach ($search as $key => $val)
 {
+	$class_key = $key;
+	if  ($class_key == 'status') $class_key = 'statut'; // remove this after refactor entrepot.class property statut to status
 	if (($key == 'status' && $search[$key] == -1) || $key=='entity') continue;
 	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
 	if (strpos($object->fields[$key]['type'], 'integer:') === 0) {
 		if ($search[$key] == '-1') $search[$key] = '';
 		$mode_search = 2;
 	}
-	if ($search[$key] != '') $sql .= natural_search((($key == 'ref') ? 't.ref' : 't.' . $key), $search[$key], (($key == 'status') ? 2 : $mode_search));
+	if ($search[$key] != '') $sql .= natural_search((($key == 'ref') ? 't.ref' : 't.' . $class_key), $search[$key], (($key == 'status') ? 2 : $mode_search));
 }
 if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 // Add where from extra fields

From 00804c10204b11987b5dc6fb1570a3d8ec14f13c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Aug 2020 15:19:26 +0200
Subject: [PATCH 16/62] Complete fix for #14146

---
 htdocs/contact/list.php                         | 8 +++++++-
 htdocs/core/class/html.form.class.php           | 6 +++++-
 htdocs/modulebuilder/template/myobject_list.php | 3 ++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 39c588ace15..843a894a0fd 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -200,7 +200,13 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
 	{
 		if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
-			$arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+			$arrayfields["ef.".$key] = array(
+				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
+				'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
+				'position'=>$extrafields->attributes[$object->table_element]['pos'][$key],
+				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]),
+				'langfile'=>$extrafields->attributes[$object->table_element]['langfile'][$key],
+			);
 	}
 }
 $object->fields = dol_sort_array($object->fields, 'position');
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 14db0028606..90efe26e1ca 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6744,7 +6744,7 @@ class Form
 	 */
 	public static function multiSelectArrayWithCheckbox($htmlname, &$array, $varpage)
 	{
-		global $conf, $langs, $user;
+		global $conf, $langs, $user, $extrafields;
 
 		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) return '';
 
@@ -6776,6 +6776,10 @@ class Form
 		    }
 		    if ($val['label'])
 		    {
+		    	if (! empty($val['langfile']) && is_object($langs)) {
+		    		$langs->load($val['langfile']);
+		    	}
+
 		        $lis .= '<li><input type="checkbox" id="checkbox'.$key.'" value="'.$key.'"'.(empty($val['checked']) ? '' : ' checked="checked"').'/><label for="checkbox'.$key.'">'.dol_escape_htmltag($langs->trans($val['label'])).'</label></li>';
 			    $listcheckedstring .= (empty($val['checked']) ? '' : $key.',');
 		    }
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 0059570d314..809f7ffb107 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -139,7 +139,8 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
 				'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
 				'position'=>$extrafields->attributes[$object->table_element]['pos'][$key],
-				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key])
+				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]),
+				'langfile'=>$extrafields->attributes[$object->table_element]['langfile'][$key]
 			);
 		}
 	}

From 0dda5ca4d6df39400d20e2fd959fd8f7c6c61843 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Aug 2020 16:27:09 +0200
Subject: [PATCH 17/62] Fix experimental

---
 htdocs/core/modules/modPaymentByBankTransfer.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/modPaymentByBankTransfer.class.php b/htdocs/core/modules/modPaymentByBankTransfer.class.php
index d68274e2dee..2a1686bd1c3 100644
--- a/htdocs/core/modules/modPaymentByBankTransfer.class.php
+++ b/htdocs/core/modules/modPaymentByBankTransfer.class.php
@@ -54,7 +54,7 @@ class modPaymentByBankTransfer extends DolibarrModules
 		$this->description = "Management of payment by bank transfer";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'development';
+		$this->version = 'experimental';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		// Name of png file (without png) used for this module

From e69616110ddd4055b63b1e45c0d41a23b054a024 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Aug 2020 16:59:27 +0200
Subject: [PATCH 18/62] Fix permission on page

---
 htdocs/compta/facture/prelevement.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index b24723330a0..cfe6cd51a22 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -38,8 +38,6 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 
-if (!$user->rights->facture->lire) accessforbidden();
-
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'banks', 'withdrawals', 'companies'));
 
@@ -51,7 +49,6 @@ $type = GETPOST('type', 'aZ09');
 
 $fieldid = (!empty($ref) ? 'ref' : 'rowid');
 if ($user->socid) $socid = $user->socid;
-$result = restrictedArea($user, 'facture', $id, '', '', 'fk_soc', $fieldid);
 
 if ($type == 'bank-transfer') {
 	$object = new FactureFournisseur($db);
@@ -63,6 +60,7 @@ if ($type == 'bank-transfer') {
 if ($id > 0 || !empty($ref))
 {
 	$ret = $object->fetch($id, $ref);
+	$isdraft = (($object->statut == FactureFournisseur::STATUS_DRAFT) ? 1 : 0);
 	if ($ret > 0)
 	{
 		$object->fetch_thirdparty();
@@ -71,6 +69,13 @@ if ($id > 0 || !empty($ref))
 
 $hookmanager->initHooks(array('directdebitcard', 'globalcard'));
 
+if ($type == 'bank-transfer') {
+	$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture', 'fk_soc', $fieldid, $isdraft);
+	if (!$user->rights->fournisseur->facture->lire) accessforbidden();
+} else {
+	$result = restrictedArea($user, 'facture', $id, '', '', 'fk_soc', $fieldid, $isdraft);
+	if (!$user->rights->facture->lire) accessforbidden();
+}
 
 
 /*

From bd5c4603e315bf90d5412dea1b9bd589ed0bbd81 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Aug 2020 17:06:12 +0200
Subject: [PATCH 19/62] Fix regression in sending emails

---
 htdocs/core/class/CMailFile.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 50418604c07..bc80d48d412 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -357,7 +357,7 @@ class CMailFile
 
 			$smtps->setSubject($subjecttouse);
 			$smtps->setTO($this->getValidAddress($this->to, 0, 1));
-			$smtps->setFrom($this->getValidAddress($this->from, 0, 1));
+			$smtps->setFrom($this->getValidAddress($this->addr_from, 0, 1));
 			$smtps->setTrackId($this->trackid);
 			$smtps->setReplyTo($this->getValidAddress($this->replyto, 0, 1));
 
@@ -781,14 +781,14 @@ class CMailFile
 				$from = $this->smtps->getFrom('org');
 				if ($res && !$from)
 				{
-					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Sender address '$from' invalid";
+					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport." - Sender address '$from' invalid";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					$res = false;
 				}
 				$dest = $this->smtps->getTo();
 				if ($res && !$dest)
 				{
-					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Recipient address '$dest' invalid";
+					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport." - Recipient address '$dest' invalid";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					$res = false;
 				}
@@ -811,7 +811,7 @@ class CMailFile
 					else
 					{
 						if (empty($this->error)) $this->error = $result;
-						dol_syslog("CMailFile::sendfile: mail end error with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>".$this->error, LOG_ERR);
+						dol_syslog("CMailFile::sendfile: mail end error with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport." - ".$this->error, LOG_ERR);
 						$res = false;
 					}
 				}

From 795754273e18b5b2e6fbd35eb182908b628570d1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Aug 2020 17:06:57 +0200
Subject: [PATCH 20/62] Fix regression in sending emails

---
 htdocs/core/class/CMailFile.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index bc80d48d412..0b28be50f7e 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -356,7 +356,7 @@ class CMailFile
 			}
 
 			$smtps->setSubject($subjecttouse);
-			$smtps->setTO($this->getValidAddress($this->to, 0, 1));
+			$smtps->setTO($this->getValidAddress($this->addr_to, 0, 1));
 			$smtps->setFrom($this->getValidAddress($this->addr_from, 0, 1));
 			$smtps->setTrackId($this->trackid);
 			$smtps->setReplyTo($this->getValidAddress($this->replyto, 0, 1));

From 030df58fea7ab8a7eac92f17b971c496e2d082e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Aug 2020 17:11:23 +0200
Subject: [PATCH 21/62] Fix regression in sending emails

---
 htdocs/core/class/CMailFile.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 0b28be50f7e..5ac114cfa69 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -403,7 +403,7 @@ class CMailFile
 			$smtps->setDeliveryReceipt($this->deliveryreceipt);
 
 			$host = dol_getprefix('email');
-			$this->msgid = time().'.SMTPs-dolibarr-'.$trackid.'@'.$host;
+			$this->msgid = time().'.SMTPs-dolibarr-'.$this->trackid.'@'.$host;
 
 			$this->smtps = $smtps;
 		}

From 4855b496983264326ff29ec6db5b87b650c693e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 Aug 2020 19:44:49 +0200
Subject: [PATCH 22/62] css

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

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index c5554a40fb1..692b9639805 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -1348,7 +1348,7 @@ else
 	                print '</tr>';
                 }
 
-                // Validator
+                // Approver
                 if (!$edit && $action != 'editvalidator') {
                     print '<tr>';
                     print '<td class="titlefield">';
@@ -1359,7 +1359,7 @@ else
                     $include_users = $object->fetch_users_approver_holiday();
                     if (is_array($include_users) && in_array($user->id, $include_users) && $object->statut == Holiday::STATUS_VALIDATED)
                     {
-                        print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editvalidator">'.img_edit($langs->trans("Edit")).'</a>';
+                        print '<a class="editfielda paddingleft" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editvalidator">'.img_edit($langs->trans("Edit")).'</a>';
                     }
                     print '</td>';
                     print '</tr>';

From 537b58b44659e1a2b87b27601583ceab275e781d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 8 Aug 2020 02:34:22 +0200
Subject: [PATCH 23/62] Introduce workaround to allow integrator to suggest
 list of modules in old style by default instead of kanban style #14075

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

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 18b9afe31ba..af689b1165d 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/admin/dolistore/class/dolistore.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("errors", "admin", "modulebuilder"));
 
-$mode = GETPOSTISSET('mode') ? GETPOST('mode', 'alpha') : 'commonkanban';
+$mode = GETPOSTISSET('mode') ? GETPOST('mode', 'alpha') : (empty($conf->global->MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT) ? 'commonkanban' : 'common');
 if (empty($mode)) $mode = 'common';
 $action = GETPOST('action', 'alpha');
 //var_dump($_POST);exit;

From dde83c8fcc03bbb1f5ee09181197dd7fd88f8010 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 8 Aug 2020 10:17:52 +0200
Subject: [PATCH 24/62] Fix debian package

---
 build/debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/debian/control b/build/debian/control
index 0c010b6a478..0ef5367072f 100755
--- a/build/debian/control
+++ b/build/debian/control
@@ -14,7 +14,7 @@ Architecture: all
 Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5 | libapache2-mod-php | libapache2-mod-phpfilter | php-cgi | php-fpm | php,
     php5-cli | php-cli,
 # Required PHP extensions
-    php5-mysql | php5-mysqli | php-mysql | php-mysqli, php5-curl | php-curl, php5-gd | php-gd, php5-ldap | php-gd, php5-zip | php-zip
+    php5-mysql | php5-mysqli | php-mysql | php-mysqli, php5-curl | php-curl, php5-gd | php-gd, php5-ldap | php-gd, php5-zip | php-zip,
 # Required PHP libraries
     php-pear, php-mail-mime,
 #    php-tcpdf,

From 6e01ffd5ac0ebfbbf0c47febfbe92bc2f1430592 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 8 Aug 2020 13:00:57 +0200
Subject: [PATCH 25/62] Prepare for 12.0.3

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

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 9d76057b367..94ecf930724 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -31,7 +31,7 @@
  */
 
 if (!defined('DOL_APPLICATION_TITLE')) define('DOL_APPLICATION_TITLE', 'Dolibarr');
-if (!defined('DOL_VERSION')) define('DOL_VERSION', '12.0.2'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+if (!defined('DOL_VERSION')) define('DOL_VERSION', '12.0.3'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 
 if (!defined('EURO')) define('EURO', chr(128));
 

From bb16564b982636ae5e54ddcf579702441661804b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric?= <35066297+c3do@users.noreply.github.com>
Date: Sat, 8 Aug 2020 22:08:46 +0200
Subject: [PATCH 26/62] NEW triggers create, modify, delete

Also modified deleteByFkAttribute() to use the function delete()
---
 .../class/ProductAttributeValue.class.php     | 99 ++++++++++++++-----
 1 file changed, 75 insertions(+), 24 deletions(-)

diff --git a/htdocs/variants/class/ProductAttributeValue.class.php b/htdocs/variants/class/ProductAttributeValue.class.php
index 0a26b3eace2..2c48a6ce7ce 100644
--- a/htdocs/variants/class/ProductAttributeValue.class.php
+++ b/htdocs/variants/class/ProductAttributeValue.class.php
@@ -16,17 +16,18 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 /**
  * Class ProductAttributeValue
  * Used to represent a product attribute value
  */
-class ProductAttributeValue
+class ProductAttributeValue extends CommonObject
 {
 	/**
 	 * Database handler
 	 * @var DoliDB
 	 */
-	private $db;
+	public $db;
 
 	/**
 	 * Attribute value id
@@ -144,14 +145,24 @@ class ProductAttributeValue
 	/**
 	 * Creates a value for a product attribute
 	 *
-	 * @param	User	$user		Object user
-	 * @return 	int 				<0 KO >0 OK
+	 * @param  User $user      Object user
+     * @param  int  $notrigger Do not execute trigger
+	 * @return int <0 KO >0 OK
 	 */
-	public function create(User $user)
+	public function create(User $user, $notrigger = 0)
 	{
 		if (!$this->fk_product_attribute) {
 			return -1;
 		}
+		
+		if (empty($notrigger)) {
+		    // Call trigger
+		    $result = $this->call_trigger('PRODUCT_ATTRIBUTE_VALUE_CREATE', $user);
+		    if ($result < 0) {
+		        return -1;
+		    }
+		    // End call triggers
+		}
 
 		// Ref must be uppercase
 		$this->ref = strtoupper($this->ref);
@@ -173,11 +184,21 @@ class ProductAttributeValue
 	/**
 	 * Updates a product attribute value
 	 *
-	 * @param	User	$user	Object user
-	 * @return 	int				<0 if KO, >0 if OK
+	 * @param  User	$user	   Object user
+     * @param  int  $notrigger Do not execute trigger
+	 * @return int <0 if KO, >0 if OK
 	 */
-	public function update(User $user)
+	public function update(User $user, $notrigger = 0)
 	{
+	    if (empty($notrigger)) {
+	        // Call trigger
+	        $result = $this->call_trigger('PRODUCT_ATTRIBUTE_VALUE_MODIFY', $user);
+	        if ($result < 0) {
+	            return -1;
+	        }
+	        // End call triggers
+	    }
+	    
 		//Ref must be uppercase
 		$this->ref = trim(strtoupper($this->ref));
 		$this->value = trim($this->value);
@@ -196,33 +217,63 @@ class ProductAttributeValue
 	/**
 	 * Deletes a product attribute value
 	 *
+	 * @param  User $user      Object user
+     * @param  int  $notrigger Do not execute trigger
 	 * @return int <0 KO, >0 OK
 	 */
-	public function delete()
+	public function delete(User $user, $notrigger = 0)
 	{
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $this->id;
-
-		if ($this->db->query($sql)) {
-			return 1;
-		}
-
-		return -1;
+	    if (empty($notrigger)) {
+	        // Call trigger
+	        $result = $this->call_trigger('PRODUCT_ATTRIBUTE_VALUE_DELETE', $user);
+	        if ($result < 0) {
+	            return -1;
+	        }
+	        // End call triggers
+	    }
+	    
+	    $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $this->id;
+	    
+	    if ($this->db->query($sql)) {
+	        return 1;
+	    }
+	    
+	    return -1;
 	}
 
 	/**
 	 * Deletes all product attribute values by a product attribute id
 	 *
 	 * @param int $fk_attribute Product attribute id
+     * @param  int  $notrigger Do not execute trigger
 	 * @return int <0 KO, >0 OK
 	 */
-	public function deleteByFkAttribute($fk_attribute)
+	public function deleteByFkAttribute($fk_attribute, User $user)
 	{
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE fk_product_attribute = ".(int) $fk_attribute;
-
-		if ($this->db->query($sql)) {
-			return 1;
-		}
-
-		return -1;
+	    $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE fk_product_attribute = ".(int) $fk_attribute;
+	    
+	    $query = $this->db->query($sql);
+	    
+	    if (!$query) {
+	        return -1;
+	    }
+	    
+	    if (!$this->db->num_rows($query)) {
+	        return 1;
+	    }
+	    
+	    while ($obj = $this->db->fetch_object($query)) {
+	        $tmp = new ProductAttributeValue($this->db);
+	        if ($tmp->fetch($obj->rowid) > 0) {
+    	        $result = $tmp->delete($user);
+    	        if ($result < 0) {
+    	            return -1;
+    	        }
+	        } else {
+	            return -1;
+	        }
+	    }
+	    
+	    return 1;
 	}
 }

From e73a7c78f768c64ec0d46bfcae86349e96ab07f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric?= <35066297+c3do@users.noreply.github.com>
Date: Sat, 8 Aug 2020 22:10:50 +0200
Subject: [PATCH 27/62] NEW triggers create, modify, delete

---
 .../variants/class/ProductAttribute.class.php | 52 +++++++++++++++----
 1 file changed, 42 insertions(+), 10 deletions(-)

diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index 36b4823b51b..6d9fadf0101 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -16,17 +16,18 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 /**
  * Class ProductAttribute
  * Used to represent a product attribute
  */
-class ProductAttribute
+class ProductAttribute extends CommonObject
 {
 	/**
 	 * Database handler
 	 * @var DoliDB
 	 */
-	private $db;
+	public $db;
 
 	/**
 	 * Id of the product attribute
@@ -119,7 +120,8 @@ class ProductAttribute
 
     			$return[] = $tmp;
     		}
-		} else dol_print_error($this->db);
+		}
+		else dol_print_error($this->db);
 
 		return $return;
 	}
@@ -127,11 +129,21 @@ class ProductAttribute
 	/**
 	 * Creates a product attribute
 	 *
-	 * @param	User	$user	Object user that create
+	 * @param   User    $user      Object user
+     * @param   int     $notrigger Do not execute trigger
 	 * @return 					int <0 KO, Id of new variant if OK
 	 */
-	public function create(User $user)
+	public function create(User $user, $notrigger = 0)
 	{
+	    if (empty($notrigger)) {
+	        // Call trigger
+	        $result = $this->call_trigger('PRODUCT_ATTRIBUTE_CREATE', $user);
+	        if ($result < 0) {
+	            return -1;
+	        }
+	        // End call triggers
+	    }
+	    
 		//Ref must be uppercase
 		$this->ref = strtoupper($this->ref);
 
@@ -152,11 +164,21 @@ class ProductAttribute
 	/**
 	 * Updates a product attribute
 	 *
-	 * @param	User	$user		Object user
+	 * @param   User    $user      Object user
+     * @param   int     $notrigger Do not execute trigger
 	 * @return 	int 				<0 KO, >0 OK
 	 */
-	public function update(User $user)
+	public function update(User $user, $notrigger = 0)
 	{
+	    if (empty($notrigger)) {
+	        // Call trigger
+	        $result = $this->call_trigger('PRODUCT_ATTRIBUTE_MODIFY', $user);
+	        if ($result < 0) {
+	            return -1;
+	        }
+	        // End call triggers
+	    }
+	    
 		//Ref must be uppercase
 		$this->ref = trim(strtoupper($this->ref));
 		$this->label = trim($this->label);
@@ -173,11 +195,21 @@ class ProductAttribute
 	/**
 	 * Deletes a product attribute
 	 *
-	 * @param	User	$user		Object user
-	 * @return 	int 				<0 KO, >0 OK
+	 * @param   User    $user      Object user
+     * @param   int     $notrigger Do not execute trigger
+	 * @return 	int <0 KO, >0 OK
 	 */
-	public function delete($user = null)
+	public function delete(User $user, $notrigger = 0)
 	{
+	    if (empty($notrigger)) {
+	        // Call trigger
+	        $result = $this->call_trigger('PRODUCT_ATTRIBUTE_DELETE', $user);
+	        if ($result < 0) {
+	            return -1;
+	        }
+	        // End call triggers
+	    }
+	    
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute WHERE rowid = ".(int) $this->id;
 
 		if ($this->db->query($sql)) {

From ef57bb7e842d804c66052eca42388f9498d8a25c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric?= <35066297+c3do@users.noreply.github.com>
Date: Sat, 8 Aug 2020 22:14:53 +0200
Subject: [PATCH 28/62] pass $user to delete functions

---
 htdocs/variants/card.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index 0669964ba57..6d077e85ad1 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -90,9 +90,9 @@ if ($confirm == 'yes') {
 	if ($action == 'confirm_delete') {
 		$db->begin();
 
-		$res = $objectval->deleteByFkAttribute($object->id);
+		$res = $objectval->deleteByFkAttribute($object->id, $user);
 
-		if ($res < 1 || ($object->delete() < 1)) {
+		if ($res < 1 || ($object->delete($user) < 1)) {
 			$db->rollback();
 			setEventMessages($langs->trans('CoreErrorMessage'), $object->errors, 'errors');
 			header('Location: '.dol_buildpath('/variants/card.php?id='.$object->id, 2));
@@ -105,7 +105,7 @@ if ($confirm == 'yes') {
 	} elseif ($action == 'confirm_deletevalue')
 	{
 		if ($objectval->fetch($valueid) > 0) {
-			if ($objectval->delete() < 1) {
+			if ($objectval->delete($user) < 1) {
 				setEventMessages($langs->trans('CoreErrorMessage'), $objectval->errors, 'errors');
 			} else {
 				setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');

From ed1a2cd917e8c9722889fabd7f3c0483344d7031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric?= <35066297+c3do@users.noreply.github.com>
Date: Sat, 8 Aug 2020 22:45:51 +0200
Subject: [PATCH 29/62] Update 1

---
 .../class/ProductAttributeValue.class.php     | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/variants/class/ProductAttributeValue.class.php b/htdocs/variants/class/ProductAttributeValue.class.php
index 2c48a6ce7ce..c655e188c5d 100644
--- a/htdocs/variants/class/ProductAttributeValue.class.php
+++ b/htdocs/variants/class/ProductAttributeValue.class.php
@@ -154,27 +154,28 @@ class ProductAttributeValue extends CommonObject
 		if (!$this->fk_product_attribute) {
 			return -1;
 		}
-		
-		if (empty($notrigger)) {
-		    // Call trigger
-		    $result = $this->call_trigger('PRODUCT_ATTRIBUTE_VALUE_CREATE', $user);
-		    if ($result < 0) {
-		        return -1;
-		    }
-		    // End call triggers
-		}
 
 		// Ref must be uppercase
 		$this->ref = strtoupper($this->ref);
+	    $this->value = $this->db->escape($this->value);
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_attribute_value (fk_product_attribute, ref, value, entity)
 		VALUES ('".(int) $this->fk_product_attribute."', '".$this->db->escape($this->ref)."',
-		'".$this->db->escape($this->value)."', ".(int) $this->entity.")";
+		'".$this->value."', ".(int) $this->entity.")";
 
 		$query = $this->db->query($sql);
 
 		if ($query) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'product_attribute_value');
+    		if (empty($notrigger)) {
+    		    // Call trigger
+    		    $result = $this->call_trigger('PRODUCT_ATTRIBUTE_VALUE_CREATE', $user);
+    		    if ($result < 0) {
+    		        return -1;
+    		    }
+    		    // End call triggers
+    		}
+    		
 			return 1;
 		}
 
@@ -223,6 +224,7 @@ class ProductAttributeValue extends CommonObject
 	 */
 	public function delete(User $user, $notrigger = 0)
 	{
+	    
 	    if (empty($notrigger)) {
 	        // Call trigger
 	        $result = $this->call_trigger('PRODUCT_ATTRIBUTE_VALUE_DELETE', $user);
@@ -231,9 +233,7 @@ class ProductAttributeValue extends CommonObject
 	        }
 	        // End call triggers
 	    }
-	    
 	    $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $this->id;
-	    
 	    if ($this->db->query($sql)) {
 	        return 1;
 	    }

From 9b00a1f61a873438eab5e91c3587fdc85e6c6e9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric?= <35066297+c3do@users.noreply.github.com>
Date: Sat, 8 Aug 2020 22:48:21 +0200
Subject: [PATCH 30/62] Some updates for attributes triggers

---
 htdocs/product/class/api_products.class.php | 630 ++++++++++----------
 1 file changed, 322 insertions(+), 308 deletions(-)

diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 89c9a78ddaa..a63709b5c4b 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -41,17 +41,17 @@ class Products extends DolibarrApi
         'ref',
         'label'
     );
-
+    
     /**
      * @var Product $product {@type Product}
      */
     public $product;
-
+    
     /**
      * @var ProductFournisseur $productsupplier {@type ProductFournisseur}
      */
     public $productsupplier;
-
+    
     /**
      * Constructor
      */
@@ -62,7 +62,7 @@ class Products extends DolibarrApi
         $this->product = new Product($this->db);
         $this->productsupplier = new ProductFournisseur($this->db);
     }
-
+    
     /**
      * Get properties of a product object by id
      *
@@ -81,7 +81,7 @@ class Products extends DolibarrApi
     {
         return $this->_fetch($id, '', '', '', $includestockdata, $includesubproducts);
     }
-
+    
     /**
      * Get properties of a product object by ref
      *
@@ -103,7 +103,7 @@ class Products extends DolibarrApi
     {
         return $this->_fetch('', $ref, '', '', $includestockdata, $includesubproducts);
     }
-
+    
     /**
      * Get properties of a product object by ref_ext
      *
@@ -125,7 +125,7 @@ class Products extends DolibarrApi
     {
         return $this->_fetch('', '', $ref_ext, '', $includestockdata, $includesubproducts);
     }
-
+    
     /**
      * Get properties of a product object by barcode
      *
@@ -147,7 +147,7 @@ class Products extends DolibarrApi
     {
         return $this->_fetch('', '', '', $barcode, $includestockdata, $includesubproducts);
     }
-
+    
     /**
      * List products
      *
@@ -165,11 +165,11 @@ class Products extends DolibarrApi
     public function index($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '')
     {
         global $db, $conf;
-
+        
         $obj_ret = array();
-
+        
         $socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
-
+        
         $sql = "SELECT t.rowid, t.ref, t.ref_ext";
         $sql .= " FROM ".MAIN_DB_PREFIX."product as t";
         if ($category > 0) {
@@ -196,17 +196,17 @@ class Products extends DolibarrApi
             $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
             $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
-
+        
         $sql .= $db->order($sortfield, $sortorder);
         if ($limit) {
             if ($page < 0) {
                 $page = 0;
             }
             $offset = $limit * $page;
-
+            
             $sql .= $db->plimit($limit + 1, $offset);
         }
-
+        
         $result = $db->query($sql);
         if ($result) {
             $num = $db->num_rows($result);
@@ -229,7 +229,7 @@ class Products extends DolibarrApi
         }
         return $obj_ret;
     }
-
+    
     /**
      * Create product object
      *
@@ -243,17 +243,17 @@ class Products extends DolibarrApi
         }
         // Check mandatory fields
         $result = $this->_validate($request_data);
-
+        
         foreach ($request_data as $field => $value) {
             $this->product->$field = $value;
         }
         if ($this->product->create(DolibarrApiAccess::$user) < 0) {
             throw new RestException(500, "Error creating product", array_merge(array($this->product->error), $this->product->errors));
         }
-
+        
         return $this->product->id;
     }
-
+    
     /**
      * Update product.
      * Price will be updated by this API only if option is set on "One price per product". See other APIs for other price modes.
@@ -268,38 +268,38 @@ class Products extends DolibarrApi
     public function put($id, $request_data = null)
     {
         global $conf;
-
+        
         if (!DolibarrApiAccess::$user->rights->produit->creer) {
             throw new RestException(401);
         }
-
+        
         $result = $this->product->fetch($id);
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-
+        
         if (!DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
-
+        
         $oldproduct = dol_clone($this->product, 0);
-
+        
         foreach ($request_data as $field => $value) {
             if ($field == 'id') { continue;
             }
-			if ($field == 'stock_reel') {
-				throw new RestException(400, 'Stock reel cannot be updated here. Use the /stockmovements endpoint instead');
+            if ($field == 'stock_reel') {
+                throw new RestException(400, 'Stock reel cannot be updated here. Use the /stockmovements endpoint instead');
             }
             $this->product->$field = $value;
         }
-
+        
         $updatetype = false;
         if ($this->product->type != $oldproduct->type && ($this->product->isProduct() || $this->product->isService())) {
             $updatetype = true;
         }
-
+        
         $result = $this->product->update($id, DolibarrApiAccess::$user, 1, 'update', $updatetype);
-
+        
         // If price mode is 1 price per product
         if ($result > 0 && !empty($conf->global->PRODUCT_PRICE_UNIQ)) {
             // We update price only if it was changed
@@ -312,7 +312,7 @@ class Products extends DolibarrApi
                 }
                 if ($this->product->default_vat_code != $oldproduct->default_vat_code) { $pricemodified = true;
                 }
-
+                
                 if ($this->product->price_base_type == 'TTC') {
                     if ($this->product->price_ttc != $oldproduct->price_ttc) { $pricemodified = true;
                     }
@@ -325,30 +325,30 @@ class Products extends DolibarrApi
                     }
                 }
             }
-
+            
             if ($pricemodified) {
                 $newvat = $this->product->tva_tx;
                 $newnpr = $this->product->tva_npr;
                 $newvatsrccode = $this->product->default_vat_code;
-
+                
                 $newprice = $this->product->price;
                 $newpricemin = $this->product->price_min;
                 if ($this->product->price_base_type == 'TTC') {
                     $newprice = $this->product->price_ttc;
                     $newpricemin = $this->product->price_min_ttc;
                 }
-
+                
                 $result = $this->product->updatePrice($newprice, $this->product->price_base_type, DolibarrApiAccess::$user, $newvat, $newpricemin, 0, $newnpr, 0, 0, array(), $newvatsrccode);
             }
         }
-
+        
         if ($result <= 0) {
             throw new RestException(500, "Error updating product", array_merge(array($this->product->error), $this->product->errors));
         }
-
+        
         return $this->get($id);
     }
-
+    
     /**
      * Delete product
      *
@@ -364,18 +364,18 @@ class Products extends DolibarrApi
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-
+        
         if (!DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
-
+        
         // The Product::delete() method uses the global variable $user.
         global $user;
         $user = DolibarrApiAccess::$user;
-
+        
         return $this->product->delete(DolibarrApiAccess::$user);
     }
-
+    
     /**
      * Get the list of subproducts of the product.
      *
@@ -393,22 +393,22 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-
+        
         if (!DolibarrApi::_checkAccessToResource('product', $id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
-
+        
         $childsArbo = $this->product->getChildsArbo($id, 1);
-
+        
         $keys = ['rowid', 'qty', 'fk_product_type', 'label', 'incdec'];
         $childs = [];
         foreach ($childsArbo as $values) {
             $childs[] = array_combine($keys, $values);
         }
-
+        
         return $childs;
     }
-
+    
     /**
      * Add subproduct.
      *
@@ -431,18 +431,18 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->creer) {
             throw new RestException(401);
         }
-
+        
         if (!DolibarrApi::_checkAccessToResource('product', $id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
-
+        
         $result = $this->product->add_sousproduit($id, $subproduct_id, $qty, $incdec);
         if ($result <= 0) {
             throw new RestException(500, "Error adding product child");
         }
         return $result;
     }
-
+    
     /**
      * Remove subproduct.
      *
@@ -462,19 +462,19 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->creer) {
             throw new RestException(401);
         }
-
+        
         if (!DolibarrApi::_checkAccessToResource('product', $id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
-
+        
         $result = $this->product->del_sousproduit($id, $subproduct_id);
         if ($result <= 0) {
             throw new RestException(500, "Error while removing product child");
         }
         return $result;
     }
-
-
+    
+    
     /**
      * Get categories for a product
      *
@@ -493,22 +493,22 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->categorie->lire) {
             throw new RestException(401);
         }
-
+        
         $categories = new Categorie($this->db);
-
+        
         $result = $categories->getListForItem($id, 'product', $sortfield, $sortorder, $limit, $page);
-
+        
         if (empty($result)) {
             throw new RestException(404, 'No category found');
         }
-
+        
         if ($result < 0) {
             throw new RestException(503, 'Error when retrieve category list : '.array_merge(array($categories->error), $categories->errors));
         }
-
+        
         return $result;
     }
-
+    
     /**
      * Get prices per segment for a product
      *
@@ -521,24 +521,24 @@ class Products extends DolibarrApi
     public function getCustomerPricesPerSegment($id)
     {
         global $conf;
-
+        
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-
+        
         if (empty($conf->global->PRODUIT_MULTIPRICES)) {
             throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
         }
-
+        
         $result = $this->product->fetch($id);
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-
+        
         if ($result < 0) {
             throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
         }
-
+        
         return array(
             'multiprices'=>$this->product->multiprices,
             'multiprices_inc_tax'=>$this->product->multiprices_ttc,
@@ -549,7 +549,7 @@ class Products extends DolibarrApi
             //'multiprices_default_vat_code'=>$this->product->multiprices_default_vat_code
         );
     }
-
+    
     /**
      * Get prices per customer for a product
      *
@@ -563,36 +563,36 @@ class Products extends DolibarrApi
     public function getCustomerPricesPerCustomer($id, $thirdparty_id = '')
     {
         global $conf;
-
+        
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-
+        
         if (empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
             throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
         }
-
+        
         $result = $this->product->fetch($id);
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-
+        
         if ($result > 0) {
-			require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
-			$prodcustprice = new Productcustomerprice($this->db);
-			$filter = array();
-			$filter['t.fk_product'] .= $id;
-			if ($thirdparty_id) $filter['t.fk_soc'] .= $thirdparty_id;
-			$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
+            require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
+            $prodcustprice = new Productcustomerprice($this->db);
+            $filter = array();
+            $filter['t.fk_product'] .= $id;
+            if ($thirdparty_id) $filter['t.fk_soc'] .= $thirdparty_id;
+            $result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
         }
-
+        
         if (empty($prodcustprice->lines)) {
             throw new RestException(404, 'Prices not found');
         }
-
+        
         return $prodcustprice->lines;
     }
-
+    
     /**
      * Get prices per quantity for a product
      *
@@ -605,30 +605,30 @@ class Products extends DolibarrApi
     public function getCustomerPricesPerQuantity($id)
     {
         global $conf;
-
+        
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-
+        
         if (empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
             throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
         }
-
+        
         $result = $this->product->fetch($id);
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-
+        
         if ($result < 0) {
             throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
         }
-
+        
         return array(
-        'prices_by_qty'=>$this->product->prices_by_qty[0], // 1 if price by quantity was activated for the product
-        'prices_by_qty_list'=>$this->product->prices_by_qty_list[0]
+            'prices_by_qty'=>$this->product->prices_by_qty[0], // 1 if price by quantity was activated for the product
+            'prices_by_qty_list'=>$this->product->prices_by_qty_list[0]
         );
     }
-
+    
     /**
      * Add/Update purchase prices for a product.
      *
@@ -641,11 +641,11 @@ class Products extends DolibarrApi
      * @param	string		$ref_fourn			            Supplier ref
      * @param	float		$tva_tx				            New VAT Rate (For example 8.5. Should not be a string)
      * @param  	string		$charges			            costs affering to product
-	 * @param  	float		$remise_percent		            Discount  regarding qty (percent)
-	 * @param  	float		$remise				            Discount  regarding qty (amount)
-	 * @param  	int			$newnpr				            Set NPR or not
-	 * @param	int			$delivery_time_days	            Delay in days for delivery (max). May be '' if not defined.
-	 * @param   string      $supplier_reputation            Reputation with this product to the defined supplier (empty, FAVORITE, DONOTORDER)
+     * @param  	float		$remise_percent		            Discount  regarding qty (percent)
+     * @param  	float		$remise				            Discount  regarding qty (amount)
+     * @param  	int			$newnpr				            Set NPR or not
+     * @param	int			$delivery_time_days	            Delay in days for delivery (max). May be '' if not defined.
+     * @param   string      $supplier_reputation            Reputation with this product to the defined supplier (empty, FAVORITE, DONOTORDER)
      * @param   array		$localtaxes_array	            Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function).
      * @param   string  	$newdefaultvatcode              Default vat code
      * @param  	float		$multicurrency_buyprice 	    Purchase price for the quantity min in currency
@@ -667,35 +667,35 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->creer) {
             throw new RestException(401);
         }
-
+        
         $result = $this->productsupplier->fetch($id);
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-
+        
         if (!DolibarrApi::_checkAccessToResource('product', $this->productsupplier->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
-
+        
         $result = $this->productsupplier->add_fournisseur(DolibarrApiAccess::$user, $fourn_id, $ref_fourn, $qty);
         if ($result < 0) {
             throw new RestException(500, "Error adding supplier to product : ".$this->db->lasterror());
         }
-
+        
         $fourn = new Fournisseur($this->db);
         $result = $fourn->fetch($fourn_id);
         if ($result <= 0) {
             throw new RestException(404, 'Supplier not found');
         }
-
+        
         $result = $this->productsupplier->update_buyprice($qty, $buyprice, DolibarrApiAccess::$user, $price_base_type, $fourn, $availability, $ref_fourn, $tva_tx, $charges, $remise_percent, $remise, $newnpr, $delivery_time_days, $supplier_reputation, $localtaxes_array, $newdefaultvatcode, $multicurrency_buyprice, $multicurrency_price_base_type, $multicurrency_tx, $multicurrency_code, $desc_fourn, $barcode, $fk_barcode_type);
-
+        
         if ($result <= 0) {
             throw new RestException(500, "Error updating buy price : ".$this->db->lasterror());
         }
         return (int) $this->productsupplier->product_fourn_price_id;
     }
-
+    
     /**
      * Delete purchase price for a product
      *
@@ -719,19 +719,19 @@ class Products extends DolibarrApi
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-
+        
         if (!DolibarrApi::_checkAccessToResource('product', $this->productsupplier->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
-
+        
         $resultsupplier = 0;
         if ($result > 0) {
             $resultsupplier = $this->productsupplier->remove_product_fournisseur_price($priceid);
         }
-
+        
         return $resultsupplier;
     }
-
+    
     /**
      * Get a list of all purchase prices of products
      *
@@ -749,79 +749,79 @@ class Products extends DolibarrApi
      */
     public function getSupplierProducts($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $supplier = 0, $sqlfilters = '')
     {
-    	global $db, $conf;
-    	$obj_ret = array();
-    	$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
-    	$sql = "SELECT t.rowid, t.ref, t.ref_ext";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."product as t";
-    	if ($category > 0) {
-    		$sql .= ", ".MAIN_DB_PREFIX."categorie_product as c";
-    	}
-    	$sql .= ", ".MAIN_DB_PREFIX."product_fournisseur_price as s";
-
-    	$sql .= ' WHERE t.entity IN ('.getEntity('product').')';
-
-    	if ($supplier > 0) {
-    		$sql .= " AND s.fk_soc = ".$db->escape($supplier);
-    	}
-    	$sql .= " AND s.fk_product = t.rowid";
-    	// Select products of given category
-    	if ($category > 0) {
-    		$sql .= " AND c.fk_categorie = ".$db->escape($category);
-    		$sql .= " AND c.fk_product = t.rowid";
-    	}
-    	if ($mode == 1) {
-    		// Show only products
-    		$sql .= " AND t.fk_product_type = 0";
-    	} elseif ($mode == 2) {
-    		// Show only services
-    		$sql .= " AND t.fk_product_type = 1";
-    	}
-    	// Add sql filters
-    	if ($sqlfilters) {
-    		if (!DolibarrApi::_checkFilters($sqlfilters)) {
-    			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-    		}
-    		$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-    		$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-    	}
-    	$sql .= $db->order($sortfield, $sortorder);
-    	if ($limit) {
-    		if ($page < 0) {
-    			$page = 0;
-    		}
-    		$offset = $limit * $page;
-    		$sql .= $db->plimit($limit + 1, $offset);
-    	}
-    	$result = $db->query($sql);
-    	if ($result) {
-    		$num = $db->num_rows($result);
-    		$min = min($num, ($limit <= 0 ? $num : $limit));
-    		$i = 0;
-    		while ($i < $min)
-    		{
-    			$obj = $db->fetch_object($result);
-
-    			$product_fourn = new ProductFournisseur($this->db);
-    			$product_fourn_list = $product_fourn->list_product_fournisseur_price($obj->rowid, '', '', 0, 0);
-    			foreach ($product_fourn_list as $tmpobj) {
-    				$this->_cleanObjectDatas($tmpobj);
-    			}
-
-   				//var_dump($product_fourn_list->db);exit;
-    			$obj_ret[$obj->rowid] = $product_fourn_list;
-
-    			$i++;
-    		}
-    	} else {
-    		throw new RestException(503, 'Error when retrieve product list : '.$db->lasterror());
-    	}
-    	if (!count($obj_ret)) {
-    		throw new RestException(404, 'No product found');
-    	}
-    	return $obj_ret;
+        global $db, $conf;
+        $obj_ret = array();
+        $socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
+        $sql = "SELECT t.rowid, t.ref, t.ref_ext";
+        $sql .= " FROM ".MAIN_DB_PREFIX."product as t";
+        if ($category > 0) {
+            $sql .= ", ".MAIN_DB_PREFIX."categorie_product as c";
+        }
+        $sql .= ", ".MAIN_DB_PREFIX."product_fournisseur_price as s";
+        
+        $sql .= ' WHERE t.entity IN ('.getEntity('product').')';
+        
+        if ($supplier > 0) {
+            $sql .= " AND s.fk_soc = ".$db->escape($supplier);
+        }
+        $sql .= " AND s.fk_product = t.rowid";
+        // Select products of given category
+        if ($category > 0) {
+            $sql .= " AND c.fk_categorie = ".$db->escape($category);
+            $sql .= " AND c.fk_product = t.rowid";
+        }
+        if ($mode == 1) {
+            // Show only products
+            $sql .= " AND t.fk_product_type = 0";
+        } elseif ($mode == 2) {
+            // Show only services
+            $sql .= " AND t.fk_product_type = 1";
+        }
+        // Add sql filters
+        if ($sqlfilters) {
+            if (!DolibarrApi::_checkFilters($sqlfilters)) {
+                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+            }
+            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        }
+        $sql .= $db->order($sortfield, $sortorder);
+        if ($limit) {
+            if ($page < 0) {
+                $page = 0;
+            }
+            $offset = $limit * $page;
+            $sql .= $db->plimit($limit + 1, $offset);
+        }
+        $result = $db->query($sql);
+        if ($result) {
+            $num = $db->num_rows($result);
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            $i = 0;
+            while ($i < $min)
+            {
+                $obj = $db->fetch_object($result);
+                
+                $product_fourn = new ProductFournisseur($this->db);
+                $product_fourn_list = $product_fourn->list_product_fournisseur_price($obj->rowid, '', '', 0, 0);
+                foreach ($product_fourn_list as $tmpobj) {
+                    $this->_cleanObjectDatas($tmpobj);
+                }
+                
+                //var_dump($product_fourn_list->db);exit;
+                $obj_ret[$obj->rowid] = $product_fourn_list;
+                
+                $i++;
+            }
+        } else {
+            throw new RestException(503, 'Error when retrieve product list : '.$db->lasterror());
+        }
+        if (!count($obj_ret)) {
+            throw new RestException(404, 'No product found');
+        }
+        return $obj_ret;
     }
-
+    
     /**
      * Get purchase prices for a product
      *
@@ -846,36 +846,36 @@ class Products extends DolibarrApi
         if (empty($id) && empty($ref) && empty($ref_ext) && empty($barcode)) {
             throw new RestException(400, 'bad value for parameter id, ref, ref_ext or barcode');
         }
-
+        
         $id = (empty($id) ? 0 : $id);
-
+        
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(403);
         }
-
+        
         $result = $this->product->fetch($id, $ref, $ref_ext, $barcode);
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-
+        
         if (!DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
-
+        
         $product_fourn_list = array();
-
+        
         if ($result) {
             $product_fourn = new ProductFournisseur($this->db);
             $product_fourn_list = $product_fourn->list_product_fournisseur_price($this->product->id, '', '', 0, 0);
         }
-
+        
         foreach ($product_fourn_list as $tmpobj) {
             $this->_cleanObjectDatas($tmpobj);
         }
-
+        
         return $this->_cleanObjectDatas($product_fourn_list);
     }
-
+    
     /**
      * Get attributes.
      *
@@ -890,11 +890,11 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-
+        
         $prodattr = new ProductAttribute($this->db);
         return $prodattr->fetchAll();
     }
-
+    
     /**
      * Get attribute by ID.
      *
@@ -912,17 +912,17 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-
+        
         $prodattr = new ProductAttribute($this->db);
         $result = $prodattr->fetch((int) $id);
-
+        
         if ($result < 0) {
             throw new RestException(404, "Attribute not found");
         }
-
+        
         return $prodattr;
     }
-
+    
     /**
      * Get attributes by ref.
      *
@@ -939,26 +939,26 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-
+        
         $sql = "SELECT rowid, ref, label, rang FROM ".MAIN_DB_PREFIX."product_attribute WHERE ref LIKE '".trim($ref)."' AND entity IN (".getEntity('product').")";
-
+        
         $query = $this->db->query($sql);
-
+        
         if (!$this->db->num_rows($query)) {
             throw new RestException(404);
         }
-
+        
         $result = $this->db->fetch_object($query);
-
+        
         $attr = [];
         $attr['id'] = $result->rowid;
         $attr['ref'] = $result->ref;
         $attr['label'] = $result->label;
         $attr['rang'] = $result->rang;
-
+        
         return $attr;
     }
-
+    
     /**
      * Add attributes.
      *
@@ -976,18 +976,18 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->creer) {
             throw new RestException(401);
         }
-
+        
         $prodattr = new ProductAttribute($this->db);
         $prodattr->label = $label;
         $prodattr->ref = $ref;
-
+        
         $resid = $prodattr->create(DolibarrApiAccess::$user);
         if ($resid <= 0) {
             throw new RestException(500, "Error creating new attribute");
         }
         return $resid;
     }
-
+    
     /**
      * Update attributes by id.
      *
@@ -1006,22 +1006,22 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->creer) {
             throw new RestException(401);
         }
-
+        
         $prodattr = new ProductAttribute($this->db);
-
+        
         $result = $prodattr->fetch((int) $id);
         if ($result == 0) {
             throw new RestException(404, 'Attribute not found');
         } elseif ($result < 0) {
             throw new RestException(500, "Error fetching attribute");
         }
-
+        
         foreach ($request_data as $field => $value) {
             if ($field == 'rowid') { continue;
             }
             $prodattr->$field = $value;
         }
-
+        
         if ($prodattr->update(DolibarrApiAccess::$user) > 0) {
             $result = $prodattr->fetch((int) $id);
             if ($result == 0) {
@@ -1034,7 +1034,7 @@ class Products extends DolibarrApi
         }
         throw new RestException(500, "Error updating attribute");
     }
-
+    
     /**
      * Delete attributes by id.
      *
@@ -1051,18 +1051,18 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
             throw new RestException(401);
         }
-
+        
         $prodattr = new ProductAttribute($this->db);
         $prodattr->id = (int) $id;
         $result = $prodattr->delete(DolibarrApiAccess::$user);
-
+        
         if ($result <= 0) {
-        	throw new RestException(500, "Error deleting attribute");
+            throw new RestException(500, "Error deleting attribute");
         }
-
+        
         return $result;
     }
-
+    
     /**
      * Get attribute value by id.
      *
@@ -1079,30 +1079,30 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-
+        
         $sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $id." AND entity IN (".getEntity('product').")";
-
+        
         $query = $this->db->query($sql);
-
+        
         if (!$query) {
             throw new RestException(401);
         }
-
+        
         if (!$this->db->num_rows($query)) {
             throw new RestException(404, 'Attribute value not found');
         }
-
+        
         $result = $this->db->fetch_object($query);
-
+        
         $attrval = [];
         $attrval['id'] = $result->rowid;
         $attrval['fk_product_attribute'] = $result->fk_product_attribute;
         $attrval['ref'] = $result->ref;
         $attrval['value'] = $result->value;
-
+        
         return $attrval;
     }
-
+    
     /**
      * Get attribute value by ref.
      *
@@ -1120,30 +1120,30 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-
+        
         $sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE ref LIKE '".trim($ref)."' AND fk_product_attribute = ".(int) $id." AND entity IN (".getEntity('product').")";
-
+        
         $query = $this->db->query($sql);
-
+        
         if (!$query) {
             throw new RestException(401);
         }
-
+        
         if (!$this->db->num_rows($query)) {
             throw new RestException(404, 'Attribute value not found');
         }
-
+        
         $result = $this->db->fetch_object($query);
-
+        
         $attrval = [];
         $attrval['id'] = $result->rowid;
         $attrval['fk_product_attribute'] = $result->fk_product_attribute;
         $attrval['ref'] = $result->ref;
         $attrval['value'] = $result->value;
-
+        
         return $attrval;
     }
-
+    
     /**
      * Delete attribute value by ref.
      *
@@ -1160,16 +1160,30 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
             throw new RestException(401);
         }
-
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE ref LIKE '".trim($ref)."' AND fk_product_attribute = ".(int) $id;
-
-        if ($this->db->query($sql)) {
+        
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE ref LIKE '".trim($ref)."' AND fk_product_attribute = ".(int) $id." AND entity IN (".getEntity('product').")";
+        $query = $this->db->query($sql);
+        
+        if (!$query) {
+            throw new RestException(401);
+        }
+        
+        if (!$this->db->num_rows($query)) {
+            throw new RestException(404, 'Attribute value not found');
+        }
+        
+        $result = $this->db->fetch_object($query);
+        
+        $attrval = new ProductAttributeValue($this->db);
+        $attrval->id = $result->rowid;
+        $result = $attrval->delete(DolibarrApiAccess::$user);
+        if ($result > 0) {
             return 1;
         }
-
+        
         throw new RestException(500, "Error deleting attribute value");
     }
-
+    
     /**
      * Get all values for an attribute id.
      *
@@ -1186,11 +1200,11 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-
+        
         $objectval = new ProductAttributeValue($this->db);
         return $objectval->fetchAllByProductAttribute((int) $id);
     }
-
+    
     /**
      * Get all values for an attribute ref.
      *
@@ -1206,28 +1220,28 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-
+        
         $return = array();
-
+        
         $sql = 'SELECT ';
         $sql .= 'v.fk_product_attribute, v.rowid, v.ref, v.value FROM '.MAIN_DB_PREFIX.'product_attribute_value v ';
         $sql .= "WHERE v.fk_product_attribute = ( SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute WHERE ref LIKE '".strtoupper(trim($ref))."' LIMIT 1)";
-
+        
         $query = $this->db->query($sql);
-
+        
         while ($result = $this->db->fetch_object($query)) {
             $tmp = new ProductAttributeValue($this->db);
             $tmp->fk_product_attribute = $result->fk_product_attribute;
             $tmp->id = $result->rowid;
             $tmp->ref = $result->ref;
             $tmp->value = $result->value;
-
+            
             $return[] = $tmp;
         }
-
+        
         return $return;
     }
-
+    
     /**
      * Add attribute value.
      *
@@ -1246,22 +1260,22 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->creer) {
             throw new RestException(401);
         }
-
+        
         if (empty($ref) || empty($value)) {
             throw new RestException(401);
         }
-
+        
         $objectval = new ProductAttributeValue($this->db);
         $objectval->fk_product_attribute = $id;
         $objectval->ref = $ref;
         $objectval->value = $value;
-
+        
         if ($objectval->create(DolibarrApiAccess::$user) > 0) {
             return $objectval->id;
         }
         throw new RestException(500, "Error creating new attribute value");
     }
-
+    
     /**
      * Update attribute value.
      *
@@ -1279,22 +1293,22 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->creer) {
             throw new RestException(401);
         }
-
+        
         $objectval = new ProductAttributeValue($this->db);
         $result = $objectval->fetch((int) $id);
-
+        
         if ($result == 0) {
             throw new RestException(404, 'Attribute value not found');
         } elseif ($result < 0) {
             throw new RestException(500, "Error fetching attribute value");
         }
-
+        
         foreach ($request_data as $field => $value) {
             if ($field == 'rowid') { continue;
             }
             $objectval->$field = $value;
         }
-
+        
         if ($objectval->update(DolibarrApiAccess::$user) > 0) {
             $result = $objectval->fetch((int) $id);
             if ($result == 0) {
@@ -1307,7 +1321,7 @@ class Products extends DolibarrApi
         }
         throw new RestException(500, "Error updating attribute");
     }
-
+    
     /**
      * Delete attribute value by id.
      *
@@ -1324,16 +1338,16 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
             throw new RestException(401);
         }
-
+        
         $objectval = new ProductAttributeValue($this->db);
         $objectval->id = (int) $id;
-
-        if ($objectval->delete() > 0) {
+        
+        if ($objectval->delete(DolibarrApiAccess::$user) > 0) {
             return 1;
         }
         throw new RestException(500, "Error deleting attribute value");
     }
-
+    
     /**
      * Get product variants.
      *
@@ -1350,18 +1364,18 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-
+        
         $prodcomb = new ProductCombination($this->db);
         $combinations = $prodcomb->fetchAllByFkProductParent((int) $id);
-
+        
         foreach ($combinations as $key => $combination) {
             $prodc2vp = new ProductCombination2ValuePair($this->db);
             $combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id);
         }
-
+        
         return $combinations;
     }
-
+    
     /**
      * Get product variants by Product ref.
      *
@@ -1378,23 +1392,23 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-
+        
         $result = $this->product->fetch('', $ref);
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-
+        
         $prodcomb = new ProductCombination($this->db);
         $combinations = $prodcomb->fetchAllByFkProductParent((int) $this->product->id);
-
+        
         foreach ($combinations as $key => $combination) {
             $prodc2vp = new ProductCombination2ValuePair($this->db);
             $combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id);
         }
-
+        
         return $combinations;
     }
-
+    
     /**
      * Add variant.
      *
@@ -1419,14 +1433,14 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->creer) {
             throw new RestException(401);
         }
-
+        
         if (empty($id) || empty($features) || !is_array($features)) {
             throw new RestException(401);
         }
-
+        
         $weight_impact = price2num($weight_impact);
         $price_impact = price2num($price_impact);
-
+        
         $prodattr = new ProductAttribute($this->db);
         $prodattr_val = new ProductAttributeValue($this->db);
         foreach ($features as $id_attr => $id_value) {
@@ -1437,23 +1451,23 @@ class Products extends DolibarrApi
                 throw new RestException(401);
             }
         }
-
+        
         $result = $this->product->fetch((int) $id);
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-
+        
         $prodcomb = new ProductCombination($this->db);
-
+        
         $result = $prodcomb->createProductCombination(DolibarrApiAccess::$user, $this->product, $features, array(), $price_impact_is_percent, $price_impact, $weight_impact, $reference);
         if ($result > 0)
         {
-			return $result;
+            return $result;
         } else {
-			throw new RestException(500, "Error creating new product variant");
+            throw new RestException(500, "Error creating new product variant");
         }
     }
-
+    
     /**
      * Add variant by product ref.
      *
@@ -1477,14 +1491,14 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->creer) {
             throw new RestException(401);
         }
-
+        
         if (empty($ref) || empty($features) || !is_array($features)) {
             throw new RestException(401);
         }
-
+        
         $weight_impact = price2num($weight_impact);
         $price_impact = price2num($price_impact);
-
+        
         $prodattr = new ProductAttribute($this->db);
         $prodattr_val = new ProductAttributeValue($this->db);
         foreach ($features as $id_attr => $id_value) {
@@ -1495,12 +1509,12 @@ class Products extends DolibarrApi
                 throw new RestException(404);
             }
         }
-
+        
         $result = $this->product->fetch('', trim($ref));
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-
+        
         $prodcomb = new ProductCombination($this->db);
         if (!$prodcomb->fetchByProductCombination2ValuePairs($this->product->id, $features))
         {
@@ -1515,7 +1529,7 @@ class Products extends DolibarrApi
             return $prodcomb->id;
         }
     }
-
+    
     /**
      * Put product variants.
      *
@@ -1533,16 +1547,16 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->creer) {
             throw new RestException(401);
         }
-
+        
         $prodcomb = new ProductCombination($this->db);
         $prodcomb->fetch((int) $id);
-
+        
         foreach ($request_data as $field => $value) {
             if ($field == 'rowid') { continue;
             }
             $prodcomb->$field = $value;
         }
-
+        
         $result = $prodcomb->update(DolibarrApiAccess::$user);
         if ($result > 0)
         {
@@ -1550,7 +1564,7 @@ class Products extends DolibarrApi
         }
         throw new RestException(500, "Error editing variant");
     }
-
+    
     /**
      * Delete product variants.
      *
@@ -1567,17 +1581,17 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
             throw new RestException(401);
         }
-
+        
         $prodcomb = new ProductCombination($this->db);
         $prodcomb->id = (int) $id;
         $result = $prodcomb->delete(DolibarrApiAccess::$user);
         if ($result <= 0)
         {
-        	throw new RestException(500, "Error deleting variant");
+            throw new RestException(500, "Error deleting variant");
         }
         return $result;
     }
-
+    
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      * Clean sensible object datas
@@ -1589,24 +1603,24 @@ class Products extends DolibarrApi
     {
         // phpcs:enable
         $object = parent::_cleanObjectDatas($object);
-
+        
         unset($object->regeximgext);
         unset($object->price_by_qty);
         unset($object->prices_by_qty_id);
         unset($object->libelle);
         unset($object->product_id_already_linked);
         unset($object->reputations);
-
+        
         unset($object->name);
         unset($object->firstname);
         unset($object->lastname);
         unset($object->civility_id);
-
+        
         unset($object->recuperableonly);
-
+        
         return $object;
     }
-
+    
     /**
      * Validate fields before create or update object
      *
@@ -1625,7 +1639,7 @@ class Products extends DolibarrApi
         }
         return $product;
     }
-
+    
     /**
      * Get properties of a product object
      *
@@ -1648,48 +1662,48 @@ class Products extends DolibarrApi
         if (empty($id) && empty($ref) && empty($ref_ext) && empty($barcode)) {
             throw new RestException(400, 'bad value for parameter id, ref, ref_ext or barcode');
         }
-
+        
         $id = (empty($id) ? 0 : $id);
-
+        
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(403);
         }
-
+        
         $result = $this->product->fetch($id, $ref, $ref_ext, $barcode);
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-
+        
         if (!DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
-
+        
         if ($includestockdata) {
-        	$this->product->load_stock();
-
-        	if (is_array($this->product->stock_warehouse)) {
-        		foreach ($this->product->stock_warehouse as $keytmp => $valtmp) {
-        			if (is_array($this->product->stock_warehouse[$keytmp]->detail_batch)) {
-        				foreach ($this->product->stock_warehouse[$keytmp]->detail_batch as $keytmp2 => $valtmp2) {
-        					unset($this->product->stock_warehouse[$keytmp]->detail_batch[$keytmp2]->db);
-        				}
-        			}
-        		}
-        	}
+            $this->product->load_stock();
+            
+            if (is_array($this->product->stock_warehouse)) {
+                foreach ($this->product->stock_warehouse as $keytmp => $valtmp) {
+                    if (is_array($this->product->stock_warehouse[$keytmp]->detail_batch)) {
+                        foreach ($this->product->stock_warehouse[$keytmp]->detail_batch as $keytmp2 => $valtmp2) {
+                            unset($this->product->stock_warehouse[$keytmp]->detail_batch[$keytmp2]->db);
+                        }
+                    }
+                }
+            }
         }
-
+        
         if ($includesubproducts) {
             $childsArbo = $this->product->getChildsArbo($id, 1);
-
+            
             $keys = ['rowid', 'qty', 'fk_product_type', 'label', 'incdec'];
             $childs = [];
             foreach ($childsArbo as $values) {
                 $childs[] = array_combine($keys, $values);
             }
-
+            
             $this->product->sousprods = $childs;
         }
-
+        
         return $this->_cleanObjectDatas($this->product);
     }
 }

From d7a65a540e47a88517d7d342a9f5823ac3878599 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 8 Aug 2020 20:58:51 +0000
Subject: [PATCH 31/62] Fixing style errors.

---
 htdocs/product/class/api_products.class.php   | 426 +++++++++---------
 .../variants/class/ProductAttribute.class.php |   6 +-
 .../class/ProductAttributeValue.class.php     |  18 +-
 3 files changed, 225 insertions(+), 225 deletions(-)

diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index a63709b5c4b..f1b3e91617b 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -41,17 +41,17 @@ class Products extends DolibarrApi
         'ref',
         'label'
     );
-    
+
     /**
      * @var Product $product {@type Product}
      */
     public $product;
-    
+
     /**
      * @var ProductFournisseur $productsupplier {@type ProductFournisseur}
      */
     public $productsupplier;
-    
+
     /**
      * Constructor
      */
@@ -62,7 +62,7 @@ class Products extends DolibarrApi
         $this->product = new Product($this->db);
         $this->productsupplier = new ProductFournisseur($this->db);
     }
-    
+
     /**
      * Get properties of a product object by id
      *
@@ -81,7 +81,7 @@ class Products extends DolibarrApi
     {
         return $this->_fetch($id, '', '', '', $includestockdata, $includesubproducts);
     }
-    
+
     /**
      * Get properties of a product object by ref
      *
@@ -103,7 +103,7 @@ class Products extends DolibarrApi
     {
         return $this->_fetch('', $ref, '', '', $includestockdata, $includesubproducts);
     }
-    
+
     /**
      * Get properties of a product object by ref_ext
      *
@@ -125,7 +125,7 @@ class Products extends DolibarrApi
     {
         return $this->_fetch('', '', $ref_ext, '', $includestockdata, $includesubproducts);
     }
-    
+
     /**
      * Get properties of a product object by barcode
      *
@@ -147,7 +147,7 @@ class Products extends DolibarrApi
     {
         return $this->_fetch('', '', '', $barcode, $includestockdata, $includesubproducts);
     }
-    
+
     /**
      * List products
      *
@@ -165,11 +165,11 @@ class Products extends DolibarrApi
     public function index($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $category = 0, $sqlfilters = '')
     {
         global $db, $conf;
-        
+
         $obj_ret = array();
-        
+
         $socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
-        
+
         $sql = "SELECT t.rowid, t.ref, t.ref_ext";
         $sql .= " FROM ".MAIN_DB_PREFIX."product as t";
         if ($category > 0) {
@@ -196,17 +196,17 @@ class Products extends DolibarrApi
             $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
             $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
-        
+
         $sql .= $db->order($sortfield, $sortorder);
         if ($limit) {
             if ($page < 0) {
                 $page = 0;
             }
             $offset = $limit * $page;
-            
+
             $sql .= $db->plimit($limit + 1, $offset);
         }
-        
+
         $result = $db->query($sql);
         if ($result) {
             $num = $db->num_rows($result);
@@ -229,7 +229,7 @@ class Products extends DolibarrApi
         }
         return $obj_ret;
     }
-    
+
     /**
      * Create product object
      *
@@ -243,17 +243,17 @@ class Products extends DolibarrApi
         }
         // Check mandatory fields
         $result = $this->_validate($request_data);
-        
+
         foreach ($request_data as $field => $value) {
             $this->product->$field = $value;
         }
         if ($this->product->create(DolibarrApiAccess::$user) < 0) {
             throw new RestException(500, "Error creating product", array_merge(array($this->product->error), $this->product->errors));
         }
-        
+
         return $this->product->id;
     }
-    
+
     /**
      * Update product.
      * Price will be updated by this API only if option is set on "One price per product". See other APIs for other price modes.
@@ -268,22 +268,22 @@ class Products extends DolibarrApi
     public function put($id, $request_data = null)
     {
         global $conf;
-        
+
         if (!DolibarrApiAccess::$user->rights->produit->creer) {
             throw new RestException(401);
         }
-        
+
         $result = $this->product->fetch($id);
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-        
+
         if (!DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
-        
+
         $oldproduct = dol_clone($this->product, 0);
-        
+
         foreach ($request_data as $field => $value) {
             if ($field == 'id') { continue;
             }
@@ -292,14 +292,14 @@ class Products extends DolibarrApi
             }
             $this->product->$field = $value;
         }
-        
+
         $updatetype = false;
         if ($this->product->type != $oldproduct->type && ($this->product->isProduct() || $this->product->isService())) {
             $updatetype = true;
         }
-        
+
         $result = $this->product->update($id, DolibarrApiAccess::$user, 1, 'update', $updatetype);
-        
+
         // If price mode is 1 price per product
         if ($result > 0 && !empty($conf->global->PRODUCT_PRICE_UNIQ)) {
             // We update price only if it was changed
@@ -312,7 +312,7 @@ class Products extends DolibarrApi
                 }
                 if ($this->product->default_vat_code != $oldproduct->default_vat_code) { $pricemodified = true;
                 }
-                
+
                 if ($this->product->price_base_type == 'TTC') {
                     if ($this->product->price_ttc != $oldproduct->price_ttc) { $pricemodified = true;
                     }
@@ -325,30 +325,30 @@ class Products extends DolibarrApi
                     }
                 }
             }
-            
+
             if ($pricemodified) {
                 $newvat = $this->product->tva_tx;
                 $newnpr = $this->product->tva_npr;
                 $newvatsrccode = $this->product->default_vat_code;
-                
+
                 $newprice = $this->product->price;
                 $newpricemin = $this->product->price_min;
                 if ($this->product->price_base_type == 'TTC') {
                     $newprice = $this->product->price_ttc;
                     $newpricemin = $this->product->price_min_ttc;
                 }
-                
+
                 $result = $this->product->updatePrice($newprice, $this->product->price_base_type, DolibarrApiAccess::$user, $newvat, $newpricemin, 0, $newnpr, 0, 0, array(), $newvatsrccode);
             }
         }
-        
+
         if ($result <= 0) {
             throw new RestException(500, "Error updating product", array_merge(array($this->product->error), $this->product->errors));
         }
-        
+
         return $this->get($id);
     }
-    
+
     /**
      * Delete product
      *
@@ -364,18 +364,18 @@ class Products extends DolibarrApi
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-        
+
         if (!DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
-        
+
         // The Product::delete() method uses the global variable $user.
         global $user;
         $user = DolibarrApiAccess::$user;
-        
+
         return $this->product->delete(DolibarrApiAccess::$user);
     }
-    
+
     /**
      * Get the list of subproducts of the product.
      *
@@ -393,22 +393,22 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-        
+
         if (!DolibarrApi::_checkAccessToResource('product', $id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
-        
+
         $childsArbo = $this->product->getChildsArbo($id, 1);
-        
+
         $keys = ['rowid', 'qty', 'fk_product_type', 'label', 'incdec'];
         $childs = [];
         foreach ($childsArbo as $values) {
             $childs[] = array_combine($keys, $values);
         }
-        
+
         return $childs;
     }
-    
+
     /**
      * Add subproduct.
      *
@@ -431,18 +431,18 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->creer) {
             throw new RestException(401);
         }
-        
+
         if (!DolibarrApi::_checkAccessToResource('product', $id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
-        
+
         $result = $this->product->add_sousproduit($id, $subproduct_id, $qty, $incdec);
         if ($result <= 0) {
             throw new RestException(500, "Error adding product child");
         }
         return $result;
     }
-    
+
     /**
      * Remove subproduct.
      *
@@ -462,19 +462,19 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->creer) {
             throw new RestException(401);
         }
-        
+
         if (!DolibarrApi::_checkAccessToResource('product', $id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
-        
+
         $result = $this->product->del_sousproduit($id, $subproduct_id);
         if ($result <= 0) {
             throw new RestException(500, "Error while removing product child");
         }
         return $result;
     }
-    
-    
+
+
     /**
      * Get categories for a product
      *
@@ -493,22 +493,22 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->categorie->lire) {
             throw new RestException(401);
         }
-        
+
         $categories = new Categorie($this->db);
-        
+
         $result = $categories->getListForItem($id, 'product', $sortfield, $sortorder, $limit, $page);
-        
+
         if (empty($result)) {
             throw new RestException(404, 'No category found');
         }
-        
+
         if ($result < 0) {
             throw new RestException(503, 'Error when retrieve category list : '.array_merge(array($categories->error), $categories->errors));
         }
-        
+
         return $result;
     }
-    
+
     /**
      * Get prices per segment for a product
      *
@@ -521,24 +521,24 @@ class Products extends DolibarrApi
     public function getCustomerPricesPerSegment($id)
     {
         global $conf;
-        
+
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-        
+
         if (empty($conf->global->PRODUIT_MULTIPRICES)) {
             throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
         }
-        
+
         $result = $this->product->fetch($id);
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-        
+
         if ($result < 0) {
             throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
         }
-        
+
         return array(
             'multiprices'=>$this->product->multiprices,
             'multiprices_inc_tax'=>$this->product->multiprices_ttc,
@@ -549,7 +549,7 @@ class Products extends DolibarrApi
             //'multiprices_default_vat_code'=>$this->product->multiprices_default_vat_code
         );
     }
-    
+
     /**
      * Get prices per customer for a product
      *
@@ -563,20 +563,20 @@ class Products extends DolibarrApi
     public function getCustomerPricesPerCustomer($id, $thirdparty_id = '')
     {
         global $conf;
-        
+
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-        
+
         if (empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
             throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
         }
-        
+
         $result = $this->product->fetch($id);
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-        
+
         if ($result > 0) {
             require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
             $prodcustprice = new Productcustomerprice($this->db);
@@ -585,14 +585,14 @@ class Products extends DolibarrApi
             if ($thirdparty_id) $filter['t.fk_soc'] .= $thirdparty_id;
             $result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
         }
-        
+
         if (empty($prodcustprice->lines)) {
             throw new RestException(404, 'Prices not found');
         }
-        
+
         return $prodcustprice->lines;
     }
-    
+
     /**
      * Get prices per quantity for a product
      *
@@ -605,30 +605,30 @@ class Products extends DolibarrApi
     public function getCustomerPricesPerQuantity($id)
     {
         global $conf;
-        
+
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-        
+
         if (empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
             throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
         }
-        
+
         $result = $this->product->fetch($id);
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-        
+
         if ($result < 0) {
             throw new RestException(503, 'Error when retrieve prices list : '.array_merge(array($this->product->error), $this->product->errors));
         }
-        
+
         return array(
             'prices_by_qty'=>$this->product->prices_by_qty[0], // 1 if price by quantity was activated for the product
             'prices_by_qty_list'=>$this->product->prices_by_qty_list[0]
         );
     }
-    
+
     /**
      * Add/Update purchase prices for a product.
      *
@@ -667,35 +667,35 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->creer) {
             throw new RestException(401);
         }
-        
+
         $result = $this->productsupplier->fetch($id);
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-        
+
         if (!DolibarrApi::_checkAccessToResource('product', $this->productsupplier->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
-        
+
         $result = $this->productsupplier->add_fournisseur(DolibarrApiAccess::$user, $fourn_id, $ref_fourn, $qty);
         if ($result < 0) {
             throw new RestException(500, "Error adding supplier to product : ".$this->db->lasterror());
         }
-        
+
         $fourn = new Fournisseur($this->db);
         $result = $fourn->fetch($fourn_id);
         if ($result <= 0) {
             throw new RestException(404, 'Supplier not found');
         }
-        
+
         $result = $this->productsupplier->update_buyprice($qty, $buyprice, DolibarrApiAccess::$user, $price_base_type, $fourn, $availability, $ref_fourn, $tva_tx, $charges, $remise_percent, $remise, $newnpr, $delivery_time_days, $supplier_reputation, $localtaxes_array, $newdefaultvatcode, $multicurrency_buyprice, $multicurrency_price_base_type, $multicurrency_tx, $multicurrency_code, $desc_fourn, $barcode, $fk_barcode_type);
-        
+
         if ($result <= 0) {
             throw new RestException(500, "Error updating buy price : ".$this->db->lasterror());
         }
         return (int) $this->productsupplier->product_fourn_price_id;
     }
-    
+
     /**
      * Delete purchase price for a product
      *
@@ -719,19 +719,19 @@ class Products extends DolibarrApi
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-        
+
         if (!DolibarrApi::_checkAccessToResource('product', $this->productsupplier->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
-        
+
         $resultsupplier = 0;
         if ($result > 0) {
             $resultsupplier = $this->productsupplier->remove_product_fournisseur_price($priceid);
         }
-        
+
         return $resultsupplier;
     }
-    
+
     /**
      * Get a list of all purchase prices of products
      *
@@ -758,9 +758,9 @@ class Products extends DolibarrApi
             $sql .= ", ".MAIN_DB_PREFIX."categorie_product as c";
         }
         $sql .= ", ".MAIN_DB_PREFIX."product_fournisseur_price as s";
-        
+
         $sql .= ' WHERE t.entity IN ('.getEntity('product').')';
-        
+
         if ($supplier > 0) {
             $sql .= " AND s.fk_soc = ".$db->escape($supplier);
         }
@@ -801,16 +801,16 @@ class Products extends DolibarrApi
             while ($i < $min)
             {
                 $obj = $db->fetch_object($result);
-                
+
                 $product_fourn = new ProductFournisseur($this->db);
                 $product_fourn_list = $product_fourn->list_product_fournisseur_price($obj->rowid, '', '', 0, 0);
                 foreach ($product_fourn_list as $tmpobj) {
                     $this->_cleanObjectDatas($tmpobj);
                 }
-                
+
                 //var_dump($product_fourn_list->db);exit;
                 $obj_ret[$obj->rowid] = $product_fourn_list;
-                
+
                 $i++;
             }
         } else {
@@ -821,7 +821,7 @@ class Products extends DolibarrApi
         }
         return $obj_ret;
     }
-    
+
     /**
      * Get purchase prices for a product
      *
@@ -846,36 +846,36 @@ class Products extends DolibarrApi
         if (empty($id) && empty($ref) && empty($ref_ext) && empty($barcode)) {
             throw new RestException(400, 'bad value for parameter id, ref, ref_ext or barcode');
         }
-        
+
         $id = (empty($id) ? 0 : $id);
-        
+
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(403);
         }
-        
+
         $result = $this->product->fetch($id, $ref, $ref_ext, $barcode);
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-        
+
         if (!DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
-        
+
         $product_fourn_list = array();
-        
+
         if ($result) {
             $product_fourn = new ProductFournisseur($this->db);
             $product_fourn_list = $product_fourn->list_product_fournisseur_price($this->product->id, '', '', 0, 0);
         }
-        
+
         foreach ($product_fourn_list as $tmpobj) {
             $this->_cleanObjectDatas($tmpobj);
         }
-        
+
         return $this->_cleanObjectDatas($product_fourn_list);
     }
-    
+
     /**
      * Get attributes.
      *
@@ -890,11 +890,11 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-        
+
         $prodattr = new ProductAttribute($this->db);
         return $prodattr->fetchAll();
     }
-    
+
     /**
      * Get attribute by ID.
      *
@@ -912,17 +912,17 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-        
+
         $prodattr = new ProductAttribute($this->db);
         $result = $prodattr->fetch((int) $id);
-        
+
         if ($result < 0) {
             throw new RestException(404, "Attribute not found");
         }
-        
+
         return $prodattr;
     }
-    
+
     /**
      * Get attributes by ref.
      *
@@ -939,26 +939,26 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-        
+
         $sql = "SELECT rowid, ref, label, rang FROM ".MAIN_DB_PREFIX."product_attribute WHERE ref LIKE '".trim($ref)."' AND entity IN (".getEntity('product').")";
-        
+
         $query = $this->db->query($sql);
-        
+
         if (!$this->db->num_rows($query)) {
             throw new RestException(404);
         }
-        
+
         $result = $this->db->fetch_object($query);
-        
+
         $attr = [];
         $attr['id'] = $result->rowid;
         $attr['ref'] = $result->ref;
         $attr['label'] = $result->label;
         $attr['rang'] = $result->rang;
-        
+
         return $attr;
     }
-    
+
     /**
      * Add attributes.
      *
@@ -976,18 +976,18 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->creer) {
             throw new RestException(401);
         }
-        
+
         $prodattr = new ProductAttribute($this->db);
         $prodattr->label = $label;
         $prodattr->ref = $ref;
-        
+
         $resid = $prodattr->create(DolibarrApiAccess::$user);
         if ($resid <= 0) {
             throw new RestException(500, "Error creating new attribute");
         }
         return $resid;
     }
-    
+
     /**
      * Update attributes by id.
      *
@@ -1006,22 +1006,22 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->creer) {
             throw new RestException(401);
         }
-        
+
         $prodattr = new ProductAttribute($this->db);
-        
+
         $result = $prodattr->fetch((int) $id);
         if ($result == 0) {
             throw new RestException(404, 'Attribute not found');
         } elseif ($result < 0) {
             throw new RestException(500, "Error fetching attribute");
         }
-        
+
         foreach ($request_data as $field => $value) {
             if ($field == 'rowid') { continue;
             }
             $prodattr->$field = $value;
         }
-        
+
         if ($prodattr->update(DolibarrApiAccess::$user) > 0) {
             $result = $prodattr->fetch((int) $id);
             if ($result == 0) {
@@ -1034,7 +1034,7 @@ class Products extends DolibarrApi
         }
         throw new RestException(500, "Error updating attribute");
     }
-    
+
     /**
      * Delete attributes by id.
      *
@@ -1051,18 +1051,18 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
             throw new RestException(401);
         }
-        
+
         $prodattr = new ProductAttribute($this->db);
         $prodattr->id = (int) $id;
         $result = $prodattr->delete(DolibarrApiAccess::$user);
-        
+
         if ($result <= 0) {
             throw new RestException(500, "Error deleting attribute");
         }
-        
+
         return $result;
     }
-    
+
     /**
      * Get attribute value by id.
      *
@@ -1079,30 +1079,30 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-        
+
         $sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $id." AND entity IN (".getEntity('product').")";
-        
+
         $query = $this->db->query($sql);
-        
+
         if (!$query) {
             throw new RestException(401);
         }
-        
+
         if (!$this->db->num_rows($query)) {
             throw new RestException(404, 'Attribute value not found');
         }
-        
+
         $result = $this->db->fetch_object($query);
-        
+
         $attrval = [];
         $attrval['id'] = $result->rowid;
         $attrval['fk_product_attribute'] = $result->fk_product_attribute;
         $attrval['ref'] = $result->ref;
         $attrval['value'] = $result->value;
-        
+
         return $attrval;
     }
-    
+
     /**
      * Get attribute value by ref.
      *
@@ -1120,30 +1120,30 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-        
+
         $sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE ref LIKE '".trim($ref)."' AND fk_product_attribute = ".(int) $id." AND entity IN (".getEntity('product').")";
-        
+
         $query = $this->db->query($sql);
-        
+
         if (!$query) {
             throw new RestException(401);
         }
-        
+
         if (!$this->db->num_rows($query)) {
             throw new RestException(404, 'Attribute value not found');
         }
-        
+
         $result = $this->db->fetch_object($query);
-        
+
         $attrval = [];
         $attrval['id'] = $result->rowid;
         $attrval['fk_product_attribute'] = $result->fk_product_attribute;
         $attrval['ref'] = $result->ref;
         $attrval['value'] = $result->value;
-        
+
         return $attrval;
     }
-    
+
     /**
      * Delete attribute value by ref.
      *
@@ -1160,30 +1160,30 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
             throw new RestException(401);
         }
-        
+
         $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE ref LIKE '".trim($ref)."' AND fk_product_attribute = ".(int) $id." AND entity IN (".getEntity('product').")";
         $query = $this->db->query($sql);
-        
+
         if (!$query) {
             throw new RestException(401);
         }
-        
+
         if (!$this->db->num_rows($query)) {
             throw new RestException(404, 'Attribute value not found');
         }
-        
+
         $result = $this->db->fetch_object($query);
-        
+
         $attrval = new ProductAttributeValue($this->db);
         $attrval->id = $result->rowid;
         $result = $attrval->delete(DolibarrApiAccess::$user);
         if ($result > 0) {
             return 1;
         }
-        
+
         throw new RestException(500, "Error deleting attribute value");
     }
-    
+
     /**
      * Get all values for an attribute id.
      *
@@ -1200,11 +1200,11 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-        
+
         $objectval = new ProductAttributeValue($this->db);
         return $objectval->fetchAllByProductAttribute((int) $id);
     }
-    
+
     /**
      * Get all values for an attribute ref.
      *
@@ -1220,28 +1220,28 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-        
+
         $return = array();
-        
+
         $sql = 'SELECT ';
         $sql .= 'v.fk_product_attribute, v.rowid, v.ref, v.value FROM '.MAIN_DB_PREFIX.'product_attribute_value v ';
         $sql .= "WHERE v.fk_product_attribute = ( SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute WHERE ref LIKE '".strtoupper(trim($ref))."' LIMIT 1)";
-        
+
         $query = $this->db->query($sql);
-        
+
         while ($result = $this->db->fetch_object($query)) {
             $tmp = new ProductAttributeValue($this->db);
             $tmp->fk_product_attribute = $result->fk_product_attribute;
             $tmp->id = $result->rowid;
             $tmp->ref = $result->ref;
             $tmp->value = $result->value;
-            
+
             $return[] = $tmp;
         }
-        
+
         return $return;
     }
-    
+
     /**
      * Add attribute value.
      *
@@ -1260,22 +1260,22 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->creer) {
             throw new RestException(401);
         }
-        
+
         if (empty($ref) || empty($value)) {
             throw new RestException(401);
         }
-        
+
         $objectval = new ProductAttributeValue($this->db);
         $objectval->fk_product_attribute = $id;
         $objectval->ref = $ref;
         $objectval->value = $value;
-        
+
         if ($objectval->create(DolibarrApiAccess::$user) > 0) {
             return $objectval->id;
         }
         throw new RestException(500, "Error creating new attribute value");
     }
-    
+
     /**
      * Update attribute value.
      *
@@ -1293,22 +1293,22 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->creer) {
             throw new RestException(401);
         }
-        
+
         $objectval = new ProductAttributeValue($this->db);
         $result = $objectval->fetch((int) $id);
-        
+
         if ($result == 0) {
             throw new RestException(404, 'Attribute value not found');
         } elseif ($result < 0) {
             throw new RestException(500, "Error fetching attribute value");
         }
-        
+
         foreach ($request_data as $field => $value) {
             if ($field == 'rowid') { continue;
             }
             $objectval->$field = $value;
         }
-        
+
         if ($objectval->update(DolibarrApiAccess::$user) > 0) {
             $result = $objectval->fetch((int) $id);
             if ($result == 0) {
@@ -1321,7 +1321,7 @@ class Products extends DolibarrApi
         }
         throw new RestException(500, "Error updating attribute");
     }
-    
+
     /**
      * Delete attribute value by id.
      *
@@ -1338,16 +1338,16 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
             throw new RestException(401);
         }
-        
+
         $objectval = new ProductAttributeValue($this->db);
         $objectval->id = (int) $id;
-        
+
         if ($objectval->delete(DolibarrApiAccess::$user) > 0) {
             return 1;
         }
         throw new RestException(500, "Error deleting attribute value");
     }
-    
+
     /**
      * Get product variants.
      *
@@ -1364,18 +1364,18 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-        
+
         $prodcomb = new ProductCombination($this->db);
         $combinations = $prodcomb->fetchAllByFkProductParent((int) $id);
-        
+
         foreach ($combinations as $key => $combination) {
             $prodc2vp = new ProductCombination2ValuePair($this->db);
             $combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id);
         }
-        
+
         return $combinations;
     }
-    
+
     /**
      * Get product variants by Product ref.
      *
@@ -1392,23 +1392,23 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
-        
+
         $result = $this->product->fetch('', $ref);
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-        
+
         $prodcomb = new ProductCombination($this->db);
         $combinations = $prodcomb->fetchAllByFkProductParent((int) $this->product->id);
-        
+
         foreach ($combinations as $key => $combination) {
             $prodc2vp = new ProductCombination2ValuePair($this->db);
             $combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id);
         }
-        
+
         return $combinations;
     }
-    
+
     /**
      * Add variant.
      *
@@ -1433,14 +1433,14 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->creer) {
             throw new RestException(401);
         }
-        
+
         if (empty($id) || empty($features) || !is_array($features)) {
             throw new RestException(401);
         }
-        
+
         $weight_impact = price2num($weight_impact);
         $price_impact = price2num($price_impact);
-        
+
         $prodattr = new ProductAttribute($this->db);
         $prodattr_val = new ProductAttributeValue($this->db);
         foreach ($features as $id_attr => $id_value) {
@@ -1451,14 +1451,14 @@ class Products extends DolibarrApi
                 throw new RestException(401);
             }
         }
-        
+
         $result = $this->product->fetch((int) $id);
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-        
+
         $prodcomb = new ProductCombination($this->db);
-        
+
         $result = $prodcomb->createProductCombination(DolibarrApiAccess::$user, $this->product, $features, array(), $price_impact_is_percent, $price_impact, $weight_impact, $reference);
         if ($result > 0)
         {
@@ -1467,7 +1467,7 @@ class Products extends DolibarrApi
             throw new RestException(500, "Error creating new product variant");
         }
     }
-    
+
     /**
      * Add variant by product ref.
      *
@@ -1491,14 +1491,14 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->creer) {
             throw new RestException(401);
         }
-        
+
         if (empty($ref) || empty($features) || !is_array($features)) {
             throw new RestException(401);
         }
-        
+
         $weight_impact = price2num($weight_impact);
         $price_impact = price2num($price_impact);
-        
+
         $prodattr = new ProductAttribute($this->db);
         $prodattr_val = new ProductAttributeValue($this->db);
         foreach ($features as $id_attr => $id_value) {
@@ -1509,12 +1509,12 @@ class Products extends DolibarrApi
                 throw new RestException(404);
             }
         }
-        
+
         $result = $this->product->fetch('', trim($ref));
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-        
+
         $prodcomb = new ProductCombination($this->db);
         if (!$prodcomb->fetchByProductCombination2ValuePairs($this->product->id, $features))
         {
@@ -1529,7 +1529,7 @@ class Products extends DolibarrApi
             return $prodcomb->id;
         }
     }
-    
+
     /**
      * Put product variants.
      *
@@ -1547,16 +1547,16 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->creer) {
             throw new RestException(401);
         }
-        
+
         $prodcomb = new ProductCombination($this->db);
         $prodcomb->fetch((int) $id);
-        
+
         foreach ($request_data as $field => $value) {
             if ($field == 'rowid') { continue;
             }
             $prodcomb->$field = $value;
         }
-        
+
         $result = $prodcomb->update(DolibarrApiAccess::$user);
         if ($result > 0)
         {
@@ -1564,7 +1564,7 @@ class Products extends DolibarrApi
         }
         throw new RestException(500, "Error editing variant");
     }
-    
+
     /**
      * Delete product variants.
      *
@@ -1581,7 +1581,7 @@ class Products extends DolibarrApi
         if (!DolibarrApiAccess::$user->rights->produit->supprimer) {
             throw new RestException(401);
         }
-        
+
         $prodcomb = new ProductCombination($this->db);
         $prodcomb->id = (int) $id;
         $result = $prodcomb->delete(DolibarrApiAccess::$user);
@@ -1591,7 +1591,7 @@ class Products extends DolibarrApi
         }
         return $result;
     }
-    
+
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      * Clean sensible object datas
@@ -1603,24 +1603,24 @@ class Products extends DolibarrApi
     {
         // phpcs:enable
         $object = parent::_cleanObjectDatas($object);
-        
+
         unset($object->regeximgext);
         unset($object->price_by_qty);
         unset($object->prices_by_qty_id);
         unset($object->libelle);
         unset($object->product_id_already_linked);
         unset($object->reputations);
-        
+
         unset($object->name);
         unset($object->firstname);
         unset($object->lastname);
         unset($object->civility_id);
-        
+
         unset($object->recuperableonly);
-        
+
         return $object;
     }
-    
+
     /**
      * Validate fields before create or update object
      *
@@ -1639,7 +1639,7 @@ class Products extends DolibarrApi
         }
         return $product;
     }
-    
+
     /**
      * Get properties of a product object
      *
@@ -1662,25 +1662,25 @@ class Products extends DolibarrApi
         if (empty($id) && empty($ref) && empty($ref_ext) && empty($barcode)) {
             throw new RestException(400, 'bad value for parameter id, ref, ref_ext or barcode');
         }
-        
+
         $id = (empty($id) ? 0 : $id);
-        
+
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(403);
         }
-        
+
         $result = $this->product->fetch($id, $ref, $ref_ext, $barcode);
         if (!$result) {
             throw new RestException(404, 'Product not found');
         }
-        
+
         if (!DolibarrApi::_checkAccessToResource('product', $this->product->id)) {
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
-        
+
         if ($includestockdata) {
             $this->product->load_stock();
-            
+
             if (is_array($this->product->stock_warehouse)) {
                 foreach ($this->product->stock_warehouse as $keytmp => $valtmp) {
                     if (is_array($this->product->stock_warehouse[$keytmp]->detail_batch)) {
@@ -1691,19 +1691,19 @@ class Products extends DolibarrApi
                 }
             }
         }
-        
+
         if ($includesubproducts) {
             $childsArbo = $this->product->getChildsArbo($id, 1);
-            
+
             $keys = ['rowid', 'qty', 'fk_product_type', 'label', 'incdec'];
             $childs = [];
             foreach ($childsArbo as $values) {
                 $childs[] = array_combine($keys, $values);
             }
-            
+
             $this->product->sousprods = $childs;
         }
-        
+
         return $this->_cleanObjectDatas($this->product);
     }
 }
diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index 6d9fadf0101..6e2335c2f99 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -143,7 +143,7 @@ class ProductAttribute extends CommonObject
 	        }
 	        // End call triggers
 	    }
-	    
+
 		//Ref must be uppercase
 		$this->ref = strtoupper($this->ref);
 
@@ -178,7 +178,7 @@ class ProductAttribute extends CommonObject
 	        }
 	        // End call triggers
 	    }
-	    
+
 		//Ref must be uppercase
 		$this->ref = trim(strtoupper($this->ref));
 		$this->label = trim($this->label);
@@ -209,7 +209,7 @@ class ProductAttribute extends CommonObject
 	        }
 	        // End call triggers
 	    }
-	    
+
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute WHERE rowid = ".(int) $this->id;
 
 		if ($this->db->query($sql)) {
diff --git a/htdocs/variants/class/ProductAttributeValue.class.php b/htdocs/variants/class/ProductAttributeValue.class.php
index c655e188c5d..b93f8b04c0b 100644
--- a/htdocs/variants/class/ProductAttributeValue.class.php
+++ b/htdocs/variants/class/ProductAttributeValue.class.php
@@ -175,7 +175,7 @@ class ProductAttributeValue extends CommonObject
     		    }
     		    // End call triggers
     		}
-    		
+
 			return 1;
 		}
 
@@ -199,7 +199,7 @@ class ProductAttributeValue extends CommonObject
 	        }
 	        // End call triggers
 	    }
-	    
+
 		//Ref must be uppercase
 		$this->ref = trim(strtoupper($this->ref));
 		$this->value = trim($this->value);
@@ -224,7 +224,7 @@ class ProductAttributeValue extends CommonObject
 	 */
 	public function delete(User $user, $notrigger = 0)
 	{
-	    
+
 	    if (empty($notrigger)) {
 	        // Call trigger
 	        $result = $this->call_trigger('PRODUCT_ATTRIBUTE_VALUE_DELETE', $user);
@@ -237,7 +237,7 @@ class ProductAttributeValue extends CommonObject
 	    if ($this->db->query($sql)) {
 	        return 1;
 	    }
-	    
+
 	    return -1;
 	}
 
@@ -251,17 +251,17 @@ class ProductAttributeValue extends CommonObject
 	public function deleteByFkAttribute($fk_attribute, User $user)
 	{
 	    $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE fk_product_attribute = ".(int) $fk_attribute;
-	    
+
 	    $query = $this->db->query($sql);
-	    
+
 	    if (!$query) {
 	        return -1;
 	    }
-	    
+
 	    if (!$this->db->num_rows($query)) {
 	        return 1;
 	    }
-	    
+
 	    while ($obj = $this->db->fetch_object($query)) {
 	        $tmp = new ProductAttributeValue($this->db);
 	        if ($tmp->fetch($obj->rowid) > 0) {
@@ -273,7 +273,7 @@ class ProductAttributeValue extends CommonObject
 	            return -1;
 	        }
 	    }
-	    
+
 	    return 1;
 	}
 }

From 3f233a3200f93990ef8cf1136c883831f681c969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric?= <35066297+c3do@users.noreply.github.com>
Date: Sat, 8 Aug 2020 23:01:41 +0200
Subject: [PATCH 32/62] Fix comment params

---
 htdocs/variants/class/ProductAttributeValue.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/variants/class/ProductAttributeValue.class.php b/htdocs/variants/class/ProductAttributeValue.class.php
index b93f8b04c0b..ab998c6752b 100644
--- a/htdocs/variants/class/ProductAttributeValue.class.php
+++ b/htdocs/variants/class/ProductAttributeValue.class.php
@@ -244,8 +244,8 @@ class ProductAttributeValue extends CommonObject
 	/**
 	 * Deletes all product attribute values by a product attribute id
 	 *
-	 * @param int $fk_attribute Product attribute id
-     * @param  int  $notrigger Do not execute trigger
+	 * @param int  $fk_attribute Product attribute id
+	 * @param User $user         Object user
 	 * @return int <0 KO, >0 OK
 	 */
 	public function deleteByFkAttribute($fk_attribute, User $user)

From 4aa71240d26e497b071a4761260116540e7dfa93 Mon Sep 17 00:00:00 2001
From: Egil Priskorn <egils@riseup.net>
Date: Sun, 9 Aug 2020 16:33:34 +0200
Subject: [PATCH 33/62] Update README.md

Fix spelling, grammar and a add a few clarifications.
---
 README.md | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index fa5326079ec..d15808d2cac 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,13 @@
 ![Downloads per day](https://img.shields.io/sourceforge/dw/dolibarr.svg)
 ![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg)
 
-Dolibarr ERP & CRM is a modern software package to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda…).
+Dolibarr ERP & CRM is a modern software package that helps manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda…).
 
-It's an Open Source Software (written in PHP language) designed for small, medium or large companies, foundations and freelancers.
+It's Open Source Software (written in PHP) designed for small, medium or large companies, foundations and freelancers.
 
-You can freely use, study, modify or distribute it according to its Free Software licence.
+You can freely use, study, modify or distribute it according to its licence.
 
-You can use it as a standalone application or as a web application to be able to access it from the Internet or a LAN.
+You can use it as a standalone application or as a web application to access it from the Internet or a LAN.
 
 ![ScreenShot](https://www.dolibarr.org/images/dolibarr_screenshot1_1920x1080.jpg)
 
@@ -35,11 +35,15 @@ Releases can be downloaded from [official website](https://www.dolibarr.org/).
 
 ### Advanced setup
 
-You can use a Web server and a supported database (MariaDB, MySQL or PostgreSQL) to install the standard version.
+You can use a web server and a supported database (MariaDB, MySQL or PostgreSQL) to install the standard version.
+
+On GNU/Linux, first check if your distribution has already packaged Dolibarr.
+
+#### Generic install steps:
 
 - Check that your installed PHP version is supported [see PHP support](https://wiki.dolibarr.org/index.php/Versions).
 
-- Uncompress the downloaded .zip archive to copy the "dolibarr/htdocs" directory and all its files inside your web server root or get the files directly from GitHub (recommanded if you known git):
+- Uncompress the downloaded .zip archive to copy the "dolibarr/htdocs" directory and all its files inside your web server root or get the files directly from GitHub (recommanded if you know git as it makes it easier if you want to upgrade later):
 
   `git clone https://github.com/dolibarr/dolibarr -b x.y`     (where x.y is main version like 3.6, 9.0, ...)
 
@@ -70,11 +74,11 @@ If you don't have time to install it yourself, you can try some commercial 'read
 
 ## UPGRADING
 
-- At first make a backup of your Dolibarr files & than see https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr
+- At first make a backup of your Dolibarr files & then read https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr
 - Check that your installed PHP version is supported by the new version [see PHP support](./doc/phpmatrix.md).
 - Overwrite all old files from 'dolibarr' directory with files provided into the new version's package.
-- At first next access, Dolibarr will redirect your to the "install/" page to follow the upgrade process.
-  If an `install.lock` file exists to lock any other upgrade process, the application will ask you to remove the file manually (you should find the `install.lock` file into the directory used to store generated and uploaded documents, in most cases, it is the directory called "*documents*").
+- At first next access, Dolibarr will redirect you to the "install/" page to follow the upgrade process.
+  If an `install.lock` file exists to lock any other upgrade process, the application will ask you to remove the file manually (you should find the `install.lock` file in the directory used to store generated and uploaded documents, in most cases, it is the directory called "*documents*").
 
 *Note: migration process can be safely done multiple times by calling the `/install/index.php` page*
 
@@ -138,8 +142,8 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - customizable Dashboard
 - Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
 
-- APIs
-- An easy to understand, maintain and develop code (PHP with no heavy framework; trigger and hook architecture)
+- SOAP & REST APIs
+- Code that is easy to understand, maintain and develop (PHP with no heavy framework; trigger and hook architecture)
 - Support a lot of country specific features:
   - Spanish Tax RE and ISPF
   - French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM)
@@ -149,7 +153,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
   - Compatible with [European directives](http://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
   - Compatible with European GDPR rules
   - ...
-- PDF or ODT generation for invoice, proposals, orders...
+- Flexible PDF & ODT generation for invoices, proposals, orders...
 - …
 
 ### System Environment / Requirements
@@ -167,12 +171,12 @@ These are features that Dolibarr does **not** yet fully support:
 
 - Tasks dependencies in projects
 - Payroll module
-- No native embedded Webmail
+- No native embedded Webmail, but you can send email to contacts in Dolibarr with e.g. offers, invoices, etc.
 - Dolibarr can't do coffee (yet)
 
 ## DOCUMENTATION
 
-Administrator, user, developer and translator's documentations are available along with other community resources on the [Wiki](https://wiki.dolibarr.org).
+Administrator, user, developer and translator's documentations are available along with other community resources in the [Wiki](https://wiki.dolibarr.org).
 
 ## CONTRIBUTING
 
@@ -182,7 +186,7 @@ This project exists thanks to all the people who contribute. [[Contribute](https
 
 ## CREDITS
 
-Dolibarr is the work of many contributors over the years and uses some fine libraries.
+Dolibarr is the work of many contributors over the years and uses some fine PHP libraries.
 
 See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) file.
 

From f014365b650c31d34b250038d69115e4a2d11727 Mon Sep 17 00:00:00 2001
From: John Botella <john.botella@atm-consulting.fr>
Date: Mon, 10 Aug 2020 10:35:50 +0200
Subject: [PATCH 34/62] Fix lang fr

---
 htdocs/langs/fr_FR/main.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 611d27d7723..ff74af2ad5c 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -353,8 +353,8 @@ PriceUTTC=P.U TTC
 Amount=Montant
 AmountInvoice=Montant facture
 AmountInvoiced=Montant facturé
-AmountInvoicedHT=Montant facturé (TTC)
-AmountInvoicedTTC=Montant facturé (HT)
+AmountInvoicedHT=Montant facturé (HT)
+AmountInvoicedTTC=Montant facturé (TTC)
 AmountPayment=Montant paiement
 AmountHTShort=Montant HT
 AmountTTCShort=Montant TTC

From 821e7e289403e85a83c31442a76c253a4602a526 Mon Sep 17 00:00:00 2001
From: Christian Foellmann <foellmann@foe-services.de>
Date: Mon, 10 Aug 2020 15:39:05 +0200
Subject: [PATCH 35/62] set default unit to `PRODUCT_USE_UNITS` value

---
 htdocs/bom/tpl/objectline_create.tpl.php  | 2 +-
 htdocs/core/tpl/objectline_create.tpl.php | 2 +-
 htdocs/product/card.php                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index 8501f1ca30f..74eb88393df 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -113,7 +113,7 @@ if ($conf->global->PRODUCT_USE_UNITS)
 {
     $coldisplay++;
 	print '<td class="nobottom linecoluseunit left">';
-	print $form->selectUnits($line->fk_unit, "units");
+	print $form->selectUnits(empty($line->fk_unit) ? $conf->global->PRODUCT_USE_UNITS : $line->fk_unit, "units");
 	print '</td>';
 }
 
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 9bb792afbc7..821b18a3c3f 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -362,7 +362,7 @@ if ($nolinesbefore) {
 	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 		$coldisplay++;
 		print '<td class="nobottom linecoluseunit left">';
-		print $form->selectUnits($line->fk_unit, "units");
+		print $form->selectUnits( empty($line->fk_unit) ? $conf->global->PRODUCT_USE_UNITS : $line->fk_unit, "units");
 		print '</td>';
 	}
 	$remise_percent = $buyer->remise_percent;
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 0327456615c..32c50ccb661 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1107,7 +1107,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 	    {
 		    print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';
 		    print '<td colspan="3">';
-		    print $form->selectUnits('', 'units');
+		    print $form->selectUnits(empty($line->fk_unit) ? $conf->global->PRODUCT_USE_UNITS : $line->fk_unit, 'units');
 		    print '</td></tr>';
 	    }
 

From 3e168f949579f9955d4ec2a90a64491ddb3c632b Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 10 Aug 2020 14:06:22 +0000
Subject: [PATCH 36/62] Fixing style errors.

---
 htdocs/core/tpl/objectline_create.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 821b18a3c3f..6c38f5560a7 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -362,7 +362,7 @@ if ($nolinesbefore) {
 	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 		$coldisplay++;
 		print '<td class="nobottom linecoluseunit left">';
-		print $form->selectUnits( empty($line->fk_unit) ? $conf->global->PRODUCT_USE_UNITS : $line->fk_unit, "units");
+		print $form->selectUnits(empty($line->fk_unit) ? $conf->global->PRODUCT_USE_UNITS : $line->fk_unit, "units");
 		print '</td>';
 	}
 	$remise_percent = $buyer->remise_percent;

From b1735b0f80fd7b73087133ba92ffb32a555d1897 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Tue, 11 Aug 2020 10:02:46 +0200
Subject: [PATCH 37/62] FIX: MySql Strict mode

---
 htdocs/compta/index.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 00b4987ad66..ba7ff6af444 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2015 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2015-2016 Juanjo Menent	<jmenent@2byte.es>
+ * Copyright (C) 2015-2020 Juanjo Menent	<jmenent@2byte.es>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  * Copyright (C) 2015      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
@@ -161,6 +161,14 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	$reshook = $hookmanager->executeHooks('printFieldListWhereCustomerDraft', $parameters);
 	$sql .= $hookmanager->resPrint;
 
+	$sql.= " GROUP BY f.rowid, f.ref, f.datef, f.total, f.tva, f.total_ttc, f.ref_client, f.type, ";
+	$sql.= "s.email, s.nom, s.rowid, s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur";
+
+	// Add Group from hooks
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldListGroupByCustomerDraft', $parameters);
+	$sql .= $hookmanager->resPrint;
+
 	$resql = $db->query($sql);
 
 	if ($resql)

From 4e6b7289f277a3097632e828490a3554bcc45ced Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Tue, 11 Aug 2020 10:07:38 +0200
Subject: [PATCH 38/62] FIX: MySql Strict mode

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

diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index ba7ff6af444..23ef5b6d0d9 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -478,7 +478,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	$sql .= $hookmanager->resPrint;
 
 	$sql .= " GROUP BY ff.rowid, ff.ref, ff.fk_statut, ff.libelle, ff.total_ht, ff.tva, ff.total_tva, ff.total_ttc, ff.tms, ff.paye,";
-	$sql .= " s.nom, s.rowid, s.code_fournisseur, s.code_compta_fournisseur";
+	$sql .= " s.nom, s.rowid, s.code_fournisseur, s.code_compta_fournisseur, s.email";
 	$sql .= " ORDER BY ff.tms DESC ";
 	$sql .= $db->plimit($max, 0);
 

From 3eb23d3325e291022407f665080258d72f4a76a0 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Tue, 11 Aug 2020 10:12:19 +0200
Subject: [PATCH 39/62] FIX: MySql Strict mode

---
 htdocs/compta/facture/list.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 9b9b986324f..71184d905b3 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005-2015 Regis Houssin         <regis.houssin@inodbox.com>
  * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
- * Copyright (C) 2010-2012 Juanjo Menent         <jmenent@2byte.es>
+ * Copyright (C) 2010-2020 Juanjo Menent         <jmenent@2byte.es>
  * Copyright (C) 2012      Christophe Battarel   <christophe.battarel@altairis.fr>
  * Copyright (C) 2013      Florian Henry         <florian.henry@open-concept.pro>
  * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
@@ -554,6 +554,8 @@ if (!$sall)
 	$sql .= ' f.paye, f.fk_statut, f.close_code,';
 	$sql .= ' f.datec, f.tms, f.date_closing,';
 	$sql .= ' f.retained_warranty, f.retained_warranty_date_limit, f.situation_final, f.situation_cycle_ref, f.situation_counter,';
+	$sql .= ' f.fk_user_author, f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva,';
+	$sql .= ' f.multicurrency_total_tva, f.multicurrency_total_ttc,';
 	$sql .= ' s.rowid, s.nom, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,';
 	$sql .= ' typent.code,';
 	$sql .= ' state.code_departement, state.nom,';

From ef78b85062afcf86914300939e780104e8df8acb Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 11 Aug 2020 10:42:27 +0000
Subject: [PATCH 40/62] Fixing style errors.

---
 htdocs/core/tpl/objectline_create.tpl.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 8a745d10d92..86d321e0598 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -487,7 +487,7 @@ if ((!empty($conf->service->enabled) || ($object->element == 'contrat')) && $dat
 
 	if($prefillDates)
 	{
-?>
+		?>
         function prefill_service_dates()
         {
             $('#date_start').val("<?php echo dol_escape_js(dol_print_date($date_start_prefill, '%d/%m/%Y')); ?>").trigger('change');
@@ -501,7 +501,7 @@ if ((!empty($conf->service->enabled) || ($object->element == 'contrat')) && $dat
             $('#prefill_service_dates').click(prefill_service_dates);
         });
 
-<?php
+		<?php
 	}
 
 	if (!$date_start) {

From 8c5a86cb725e89929a1a677458d1722b1b9e565e Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Wed, 12 Aug 2020 07:07:18 +0200
Subject: [PATCH 41/62] Avoid empty sales and orders when all lines are
 removed.

---
 htdocs/takepos/invoice.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index cfde72c9fd3..350299814ec 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -398,6 +398,7 @@ if ($action == "deleteline") {
         $invoice->deleteline($deletelineid);
         $invoice->fetch($placeid);
     }
+	if (count($invoice->lines)==0) $invoice->delete($user);
 }
 
 if ($action == "delete") {

From 10810bc5bb3ed80a4892068e36cc21491be9479b Mon Sep 17 00:00:00 2001
From: atm-thibaultf <thibault.fiacre@atm-consulting.fr>
Date: Wed, 12 Aug 2020 09:09:59 +0200
Subject: [PATCH 42/62] Modify int to float for stock limit alert and desired
 stock

---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql           | 7 +++++++
 htdocs/install/mysql/tables/llx_product.sql                | 4 ++--
 htdocs/install/mysql/tables/llx_product_stock_entrepot.sql | 4 ++--
 htdocs/product/class/product.class.php                     | 6 +++---
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 3bb62c53e61..8859a6b5f0b 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -219,3 +219,10 @@ create table llx_c_recruitment_origin
   label 	    varchar(64)	NOT NULL,
   active  	    tinyint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
+
+
+
+ALTER TABLE llx_product MODIFY COLUMN seuil_stock_alerte float;
+ALTER TABLE llx_product MODIFY COLUMN desiredstock float;
+ALTER TABLE llx_product_warehouse_properties MODIFY COLUMN seuil_stock_alerte float; 
+ALTER TABLE llx_product_warehouse_properties MODIFY COLUMN desiredstock float; 
diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
index b360b4d7f9d..074012e138c 100644
--- a/htdocs/install/mysql/tables/llx_product.sql
+++ b/htdocs/install/mysql/tables/llx_product.sql
@@ -60,7 +60,7 @@ create table llx_product
   tobatch                       tinyint      DEFAULT 0 NOT NULL,    -- Is it a product that need a batch management (eat-by or lot management)
   fk_product_type               integer      DEFAULT 0,             -- Type of product: 0 for regular product, 1 for service, 9 for other (used by external module)
   duration                      varchar(6),
-  seuil_stock_alerte            integer      DEFAULT NULL,
+  seuil_stock_alerte            float      DEFAULT NULL,
   url                           varchar(255),
   barcode                       varchar(180) DEFAULT NULL,          -- barcode
   fk_barcode_type               integer      DEFAULT NULL,          -- barcode type
@@ -96,7 +96,7 @@ create table llx_product
   import_key                    varchar(14),                        -- Import key
   model_pdf                     varchar(255),                       -- model save dodument used
   fk_price_expression           integer,                            -- Link to the rule for dynamic price calculation
-  desiredstock                  integer      DEFAULT 0,
+  desiredstock                  float      DEFAULT 0,
   fk_unit                       integer      DEFAULT NULL,
   price_autogen                 tinyint      DEFAULT 0,
   fk_project                    integer      DEFAULT NULL           -- Used when product was generated by a project or is specifif to a project
diff --git a/htdocs/install/mysql/tables/llx_product_stock_entrepot.sql b/htdocs/install/mysql/tables/llx_product_stock_entrepot.sql
index b5d69defd9e..903bd59b524 100644
--- a/htdocs/install/mysql/tables/llx_product_stock_entrepot.sql
+++ b/htdocs/install/mysql/tables/llx_product_stock_entrepot.sql
@@ -24,8 +24,8 @@ create table llx_product_warehouse_properties
   tms             		timestamp,
   fk_product      		integer NOT NULL,
   fk_entrepot     		integer NOT NULL,
-  seuil_stock_alerte    integer DEFAULT '0',
-  desiredstock    		integer DEFAULT '0',
+  seuil_stock_alerte    float DEFAULT '0',
+  desiredstock    		float DEFAULT '0',
   import_key      		varchar(14)               -- Import key
 )ENGINE=innodb;
 
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index d5dbc0204c0..52c7d329b0d 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -205,7 +205,7 @@ class Product extends CommonObject
     /**
      * Stock alert
      *
-     * @var int
+     * @var float
      */
     public $seuil_stock_alerte = 0;
 
@@ -995,7 +995,7 @@ class Product extends CommonObject
             $sql .= ", volume = ".($this->volume != '' ? "'".$this->db->escape($this->volume)."'" : 'null');
             $sql .= ", volume_units = ".($this->volume_units != '' ? "'".$this->db->escape($this->volume_units)."'" : 'null');
             $sql .= ", fk_default_warehouse = ".($this->fk_default_warehouse > 0 ? $this->db->escape($this->fk_default_warehouse) : 'null');
-            $sql .= ", seuil_stock_alerte = ".((isset($this->seuil_stock_alerte) && is_numeric($this->seuil_stock_alerte)) ? (int) $this->seuil_stock_alerte : 'null');
+            $sql .= ", seuil_stock_alerte = ".((isset($this->seuil_stock_alerte) && is_numeric($this->seuil_stock_alerte)) ? (float) $this->seuil_stock_alerte : 'null');
             $sql .= ", description = '".$this->db->escape($this->description)."'";
             $sql .= ", url = ".($this->url ? "'".$this->db->escape($this->url)."'" : 'null');
             $sql .= ", customcode = '".$this->db->escape($this->customcode)."'";
@@ -1008,7 +1008,7 @@ class Product extends CommonObject
             $sql .= ", accountancy_code_sell= '".$this->db->escape($this->accountancy_code_sell)."'";
             $sql .= ", accountancy_code_sell_intra= '".$this->db->escape($this->accountancy_code_sell_intra)."'";
             $sql .= ", accountancy_code_sell_export= '".$this->db->escape($this->accountancy_code_sell_export)."'";
-            $sql .= ", desiredstock = ".((isset($this->desiredstock) && is_numeric($this->desiredstock)) ? (int) $this->desiredstock : "null");
+            $sql .= ", desiredstock = ".((isset($this->desiredstock) && is_numeric($this->desiredstock)) ? (float) $this->desiredstock : "null");
             $sql .= ", cost_price = ".($this->cost_price != '' ? $this->db->escape($this->cost_price) : 'null');
             $sql .= ", fk_unit= ".(!$this->fk_unit ? 'NULL' : (int) $this->fk_unit);
             $sql .= ", price_autogen = ".(!$this->price_autogen ? 0 : 1);

From f0268b4aafa979d9502cb72666f039602765d46d Mon Sep 17 00:00:00 2001
From: John Botella <john.botella@atm-consulting.fr>
Date: Wed, 12 Aug 2020 10:14:29 +0200
Subject: [PATCH 43/62] Add declinaison price level

---
 .../install/mysql/migration/12.0.0-13.0.0.sql |  10 +-
 ...duct_attribute_combination_price_level.sql |  28 ++
 htdocs/langs/en_US/products.lang              |   3 +
 htdocs/product/class/product.class.php        |   2 +-
 .../class/ProductCombination.class.php        | 440 +++++++++++++++++-
 htdocs/variants/combinations.php              |  95 +++-
 6 files changed, 562 insertions(+), 16 deletions(-)
 create mode 100644 htdocs/install/mysql/tables/llx_product_attribute_combination_price_level.sql

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 24b6fd687e1..cf4339f56b9 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -123,5 +123,13 @@ create table llx_recruitment_recruitmentjobposition_extrafields
 ALTER TABLE llx_recruitment_recruitmentjobposition_extrafields ADD INDEX idx_fk_object(fk_object);
 
 
+CREATE TABLE llx_product_attribute_combination_price_level
+(
+  rowid INTEGER PRIMARY KEY NOT NULL AUTO_INCREMENT,
+  fk_product_attribute_combination INTEGER DEFAULT 1 NOT NULL,
+  fk_price_level INTEGER DEFAULT 1 NOT NULL,
+  variation_price DOUBLE(24,8) NOT NULL,
+  variation_price_percentage INTEGER NULL
+)ENGINE=innodb;
 
-
+ALTER TABLE llx_product_attribute_combination_price_level ADD UNIQUE( fk_product_attribute_combination, fk_price_level);
diff --git a/htdocs/install/mysql/tables/llx_product_attribute_combination_price_level.sql b/htdocs/install/mysql/tables/llx_product_attribute_combination_price_level.sql
new file mode 100644
index 00000000000..ae068b71ed0
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_product_attribute_combination_price_level.sql
@@ -0,0 +1,28 @@
+-- ============================================================================
+-- Copyright (C) 2020      John BOTELLA         <john.botella@atm-consulting.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+
+CREATE TABLE llx_product_attribute_combination_price_level
+(
+  rowid INTEGER PRIMARY KEY NOT NULL AUTO_INCREMENT,
+  fk_product_attribute_combination INTEGER DEFAULT 1 NOT NULL,
+  fk_price_level INTEGER DEFAULT 1 NOT NULL,
+  variation_price DOUBLE(24,8) NOT NULL,
+  variation_price_percentage INTEGER NULL
+)ENGINE=innodb;
+
+ALTER TABLE llx_product_attribute_combination_price_level ADD UNIQUE( fk_product_attribute_combination, fk_price_level);
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 7f82db63178..be1afc5b7e7 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -361,6 +361,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=New attribute
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 07450eef805..39634c11302 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1077,7 +1077,7 @@ class Product extends CommonObject
                         $comb = new ProductCombination($this->db);
 
                         foreach ($comb->fetchAllByFkProductParent($this->id) as $currcomb) {
-                                 $currcomb->updateProperties($this, $user);
+                        	$currcomb->updateProperties($this, $user);
                         }
                     }
 
diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 3bb4f7312ee..777cb136b05 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -71,6 +71,12 @@ class ProductCombination
 	 */
 	public $entity;
 
+	/**
+	 * Combination price level
+	 * @var ProductCombinationLevel[]
+	 */
+	public $combination_price_levels;
+
 	/**
 	 * Constructor
 	 *
@@ -92,6 +98,8 @@ class ProductCombination
 	 */
 	public function fetch($rowid)
 	{
+		global $conf;
+
 		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE rowid = ".(int) $rowid." AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
@@ -113,9 +121,95 @@ class ProductCombination
 		$this->variation_price_percentage = $obj->variation_price_percentage;
 		$this->variation_weight = $obj->variation_weight;
 
+		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+			$this->fetchCombinationPriceLevels();
+		}
+
 		return 1;
 	}
 
+
+	/**
+	 * Retrieves combination price levels
+	 *
+	 * @param int $fk_price_level the price level to fetch, use 0 for all
+	 * @param bool $useCache to use cache or not
+	 * @return int <0 KO, >0 OK
+	 */
+	public function fetchCombinationPriceLevels($fk_price_level = 0, $useCache = true)
+	{
+		// Check cache
+		if(!empty($this->combination_price_levels) && $useCache){
+			if((!empty($fk_price_level) && isset($this->combination_price_levels[$fk_price_level])) || empty($fk_price_level)){
+				return 1;
+			}
+		}
+
+		if(!is_array($this->combination_price_levels)
+			|| empty($fk_price_level) // if fetch an unique level dont erase all already fetched
+		){
+			$this->combination_price_levels = array();
+		}
+
+		$staticProductCombinationLevel = new ProductCombinationLevel($this->db);
+		$combination_price_levels = $staticProductCombinationLevel->fetchAll($this->id, $fk_price_level);
+
+		if (!$combination_price_levels || !is_array($combination_price_levels)) {
+			return -1;
+		}
+
+		$this->combination_price_levels = $combination_price_levels;
+
+		return 1;
+	}
+
+	/**
+	 * Retrieves combination price levels
+	 *
+	 * @param int $clean levels off PRODUIT_MULTIPRICES_LIMIT
+	 * @return int <0 KO, >0 OK
+	 */
+	public function saveCombinationPriceLevels($clean = 1)
+	{
+		global $conf;
+
+		$errors = 0;
+
+		$staticProductCombinationLevel = new ProductCombinationLevel($this->db);
+
+		// Delete all
+		if(empty($this->combination_price_levels)){
+			return $staticProductCombinationLevel->deleteAllForCombination($this->id);
+		}
+
+		// Clean not needed price levels
+		if($clean){
+			$res = $staticProductCombinationLevel->clean($this->id);
+
+			if($res<0){
+				$this->errors[] = 'Fail to clean not needed price levels';
+				return -1;
+			}
+		}
+
+		foreach ($this->combination_price_levels as $fk_price_level => $combination_price_level){
+			$res = $combination_price_level->save();
+			if($res<1){
+				$this->error = 'save combination price level '.$fk_price_level . ' '.$combination_price_level->error;
+				$this->errors[] = $this->error;
+				$errors ++;
+			}
+		}
+
+		if($errors > 0){
+			return $errors*-1;
+		}
+		else{
+			return 1;
+		}
+	}
+
+
 	/**
 	 * Retrieves a product combination by a child product row id
 	 *
@@ -124,6 +218,8 @@ class ProductCombination
 	 */
 	public function fetchByFkProductChild($fk_child)
 	{
+		global $conf;
+
 		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_child = ".(int) $fk_child." AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
@@ -145,6 +241,10 @@ class ProductCombination
 		$this->variation_price_percentage = $result->variation_price_percentage;
 		$this->variation_weight = $result->variation_weight;
 
+		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+			$this->fetchCombinationPriceLevels();
+		}
+
 		return 1;
 	}
 
@@ -156,6 +256,8 @@ class ProductCombination
 	 */
 	public function fetchAllByFkProductParent($fk_product_parent)
 	{
+		global $conf;
+
 		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".(int) $fk_product_parent." AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
@@ -175,6 +277,10 @@ class ProductCombination
 			$tmp->variation_price_percentage = $result->variation_price_percentage;
 			$tmp->variation_weight = $result->variation_weight;
 
+			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+				$tmp->fetchCombinationPriceLevels();
+			}
+
 			$return[] = $tmp;
 		}
 
@@ -209,6 +315,8 @@ class ProductCombination
 	 */
 	public function create($user)
 	{
+		global $conf;
+
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_attribute_combination
 		(fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight, entity)
 		VALUES (".(int) $this->fk_product_parent.", ".(int) $this->fk_product_child.",
@@ -221,6 +329,13 @@ class ProductCombination
 			return -1;
 		}
 
+		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+			$res = $this->saveCombinationPriceLevels();
+			if($res<0){
+				return -2;
+			}
+		}
+
 		$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'product_attribute_combination');
 
 		return 1;
@@ -234,6 +349,8 @@ class ProductCombination
 	 */
 	public function update(User $user)
 	{
+		global $conf;
+
 		$sql = "UPDATE ".MAIN_DB_PREFIX."product_attribute_combination
 		SET fk_product_parent = ".(int) $this->fk_product_parent.", fk_product_child = ".(int) $this->fk_product_child.",
 		variation_price = ".(float) $this->variation_price.", variation_price_percentage = ".(int) $this->variation_price_percentage.",
@@ -245,6 +362,14 @@ class ProductCombination
 			return -1;
 		}
 
+
+		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+			$res = $this->saveCombinationPriceLevels();
+			if($res<0){
+				return -2;
+			}
+		}
+
 		$parent = new Product($this->db);
 		$parent->fetch($this->fk_product_parent);
 
@@ -266,6 +391,12 @@ class ProductCombination
 		$comb2val = new ProductCombination2ValuePair($this->db);
 		$comb2val->deleteByFkCombination($this->id);
 
+		// remove combination price levels
+		if(!$this->db->query("DELETE FROM ".MAIN_DB_PREFIX."product_attribute_combination_price_level WHERE fk_product_attribute_combination = ".(int) $this->id)) {
+			$this->db->rollback();
+			return -1;
+		}
+
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE rowid = ".(int) $this->id;
 
 		if ($this->db->query($sql)) {
@@ -341,6 +472,7 @@ class ProductCombination
 			$child->label           = $parent->label.$varlabel;;
 		}
 
+
 		if ($child->update($child->id, $user) > 0) {
 			$new_vat = $parent->tva_tx;
 			$new_npr = $parent->tva_npr;
@@ -349,9 +481,12 @@ class ProductCombination
 			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
 				for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
 				{
-					if ($parent->multiprices[$i] != '') {
+					if ($parent->multiprices[$i] != '' || isset($this->combination_price_levels[$i]->variation_price)) {
 						$new_type = $parent->multiprices_base_type[$i];
 						$new_min_price = $parent->multiprices_min[$i];
+						$variation_price = doubleval(!isset($this->combination_price_levels[$i]->variation_price) ? $this->variation_price : $this->combination_price_levels[$i]->variation_price);
+						$variation_price_percentage = doubleval(!isset($this->combination_price_levels[$i]->variation_price_percentage) ? $this->variation_price_percentage : $this->combination_price_levels[$i]->variation_price_percentage);
+
 						if ($parent->prices_by_qty_list[$i]) {
 							$new_psq = 1;
 						} else {
@@ -364,12 +499,12 @@ class ProductCombination
 							$new_price = $parent->multiprices[$i];
 						}
 
-						if ($this->variation_price_percentage) {
+						if ($variation_price_percentage) {
 							if ($new_price != 0) {
-								$new_price *= 1 + ($this->variation_price / 100);
+								$new_price *= 1 + ($variation_price / 100);
 							}
 						} else {
-							$new_price += $this->variation_price;
+							$new_price += $variation_price;
 						}
 
 						$child->updatePrice($new_price, $new_type, $user, $new_vat, $new_min_price, $i, $new_npr, $new_psq);
@@ -508,7 +643,7 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 	 * @param Product $product Parent product
 	 * @param array $combinations Attribute and value combinations.
 	 * @param array $variations Price and weight variations
-	 * @param bool $price_var_percent Is the price variation a relative variation?
+	 * @param bool|array $price_var_percent Is the price variation a relative variation?
 	 * @param bool|float $forced_pricevar If the price variation is forced
 	 * @param bool|float $forced_weightvar If the weight variation is forced
 	 * @param bool|string $forced_refvar If the reference is forced
@@ -523,6 +658,8 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 
 		$db->begin();
 
+		$price_impact = array(1=>0); // init level price impact
+
 		$forced_refvar = trim($forced_refvar);
 
 		if (!empty($forced_refvar) && $forced_refvar != $product->ref) {
@@ -545,7 +682,12 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 		$weight_impact = (float) $forced_weightvar;	// If false, return 0
 
 		//Final price impact
-		$price_impact = (float) $forced_pricevar;	// If false, return 0
+		if(!is_array($forced_pricevar)){
+			$price_impact[1] = (float) $forced_pricevar;	// If false, return 0
+		}
+		else{
+			$price_impact = $forced_pricevar;
+		}
 
 		$newcomb = new ProductCombination($db);
 		$existingCombination = $newcomb->fetchByProductCombination2ValuePairs($product->id, $combinations);
@@ -587,7 +729,15 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 				$weight_impact += (float) price2num($variations[$currcombattr][$currcombval]['weight']);
 			}
 			if ($forced_pricevar === false) {
-				$price_impact += (float) price2num($variations[$currcombattr][$currcombval]['price']);
+				$price_impact[1] += (float) price2num($variations[$currcombattr][$currcombval]['price']);
+
+				// Manage Price levels
+				if($conf->global->PRODUIT_MULTIPRICES){
+					for ($i = 2; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
+					{
+						$price_impact[$i] += (float) price2num($variations[$currcombattr][$currcombval]['price']);
+					}
+				}
 			}
 
 			if ($forced_refvar === false) {
@@ -606,9 +756,27 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 		}
 
 		$newcomb->variation_price_percentage = $price_var_percent;
-		$newcomb->variation_price = $price_impact;
+		$newcomb->variation_price = $price_impact[1];
 		$newcomb->variation_weight = $weight_impact;
 
+		// Init price level
+		if($conf->global->PRODUIT_MULTIPRICES){
+			for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++){
+				$productCombinationLevel = new ProductCombinationLevel($this->db);
+				$productCombinationLevel->fk_product_attribute_combination = 0;
+				$productCombinationLevel->fk_price_level = $i;
+				$productCombinationLevel->variation_price = $price_impact[$i];
+
+				if(is_array($price_var_percent)){
+					$productCombinationLevel->variation_price_percentage = !empty($price_var_percent[$i]) ? $price_var_percent[$i] : 0;
+				}else{
+					$productCombinationLevel->variation_price_percentage = $price_var_percent;
+				}
+
+				$newcomb->combination_price_levels[$i] = $productCombinationLevel;
+			}
+		}
+
 		$newproduct->weight += $weight_impact;
 
 		// Now create the product
@@ -764,3 +932,259 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 		return $label;
 	}
 }
+
+
+
+/**
+ * Class ProductCombinationLevel
+ * Used to represent a product combination Level
+ */
+class ProductCombinationLevel
+{
+	/**
+	 * Database handler
+	 * @var DoliDB
+	 */
+	private $db;
+
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'product_attribute_combination_price_level';
+
+	/**
+	 * Rowid of combination
+	 * @var int
+	 */
+	public $id;
+
+	/**
+	 * Rowid of parent product combination
+	 * @var int
+	 */
+	public $fk_product_attribute_combination;
+
+	/**
+	 * Combination price level
+	 * @var int
+	 */
+	public $fk_price_level;
+
+	/**
+	 * Price variation
+	 * @var float
+	 */
+	public $variation_price;
+
+	/**
+	 * Is the price variation a relative variation?
+	 * @var bool
+	 */
+	public $variation_price_percentage = false;
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 * Retrieves a combination level by its rowid
+	 *
+	 * @param int $rowid Row id
+	 * @return int <0 KO, >0 OK
+	 */
+	public function fetch($rowid)
+	{
+		$sql = "SELECT rowid, fk_product_attribute_combination, fk_price_level, variation_price, variation_price_percentage FROM " . MAIN_DB_PREFIX . $this->table_element." WHERE rowid = " . (int)$rowid;
+
+		$obj = $this->db->getRow($sql);
+
+		if($obj){
+			return $this->fetchFormObj($obj);
+		}
+
+		return -1;
+	}
+
+
+	/**
+	 * Retrieves combination price levels
+	 *
+	 * @param int $fk_product_attribute_combination
+	 * @param int $fk_price_level the price level to fetch, use 0 for all
+	 * @return self[] | -1 on KO
+	 */
+	public function fetchAll($fk_product_attribute_combination, $fk_price_level = 0)
+	{
+
+		$sql = "SELECT rowid, fk_product_attribute_combination, fk_price_level, variation_price, variation_price_percentage"
+			." FROM ".MAIN_DB_PREFIX.$this->table_element
+			." WHERE fk_product_attribute_combination = ".intval($fk_product_attribute_combination);
+
+		if(!empty($fk_price_level)){
+			$sql.= ' AND fk_price_level = '.intval($fk_price_level);
+		}
+
+		$combination_price_levels = $this->db->getRows($sql);
+
+		if (!$combination_price_levels || !is_array($combination_price_levels)) {
+			return -1;
+		}
+
+		$result = array();
+
+		// For more simple usage set level as array key
+		foreach($combination_price_levels as $k => $row){
+			$productCombinationLevel = new ProductCombinationLevel($this->db);
+			$productCombinationLevel->fetchFormObj($row);
+			$result[$row->fk_price_level] = $productCombinationLevel;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * assign vars form an stdclass like sql obj
+	 *
+	 * @param int $rowid Row id
+	 * @return int <0 KO, >0 OK
+	 */
+	public function fetchFormObj($obj)
+	{
+		if (!$obj) {
+			return -1;
+		}
+
+		$this->id = $obj->rowid;
+		$this->fk_product_attribute_combination = doubleval($obj->fk_product_attribute_combination);
+		$this->fk_price_level = intval($obj->fk_price_level);
+		$this->variation_price = doubleval($obj->variation_price);
+		$this->variation_price_percentage = (bool)$obj->variation_price_percentage;
+
+		return 1;
+	}
+
+
+	/**
+	 * save
+	 *
+	 * @return int <0 KO, >0 OK
+	 */
+	public function save()
+	{
+		$errors = 0;
+
+
+		if(empty($this->fk_product_attribute_combination) || empty($this->fk_price_level)){
+			return -1;
+		}
+
+		// check if level exist in DB before add
+		if(empty($this->id)){
+			$sql = "SELECT rowid id"
+				." FROM ".MAIN_DB_PREFIX . $this->table_element
+				." WHERE fk_product_attribute_combination = ".(int) $this->fk_product_attribute_combination
+				.' AND fk_price_level = '.intval($this->fk_price_level);
+
+			$existObj = $this->db->getRow($sql);
+			if($existObj){
+				$this->id = $existObj->id;
+			}
+		}
+
+		// Update
+		if(!empty($this->id)) {
+			$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET '
+				. ' variation_price = '.doubleval($this->variation_price)
+				. ' , variation_price_percentage = '.intval($this->variation_price_percentage)
+				. ' WHERE rowid = '.intval($this->id);
+
+			$res = $this->db->query($sql);
+			if($res>0){
+				return $this->id;
+			}
+			else{
+				$this->error = $this->db->error();
+				$this->errors[] = $this->error;
+				return -1;
+			}
+		}
+		else{
+			// ADD
+			$sql = "INSERT INTO " . MAIN_DB_PREFIX . $this->table_element . " ("
+				. " fk_product_attribute_combination, fk_price_level, variation_price, variation_price_percentage"
+				. " ) VALUES ( "
+				. intval($this->fk_product_attribute_combination)
+				. ' , '.intval($this->fk_price_level)
+				. ' , '.doubleval($this->variation_price)
+				. ' , '.intval($this->variation_price_percentage)
+				. " )";
+
+			$res = $this->db->query($sql);
+			if($res){
+				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+			}
+			else{
+				$this->error = $this->db->error();
+				$this->errors[] = $this->error;
+				return -1;
+			}
+		}
+
+		return $this->id;
+	}
+
+
+	/**
+	 * delete
+	 *
+	 * @return int <0 KO, >0 OK
+	 */
+	public function delete()
+	{
+		$res = $this->db->query("DELETE FROM ".MAIN_DB_PREFIX.$this->table_element
+			." WHERE rowid = ".(int) $this->id);
+
+		return $res ? 1 : -1;
+	}
+
+
+	/**
+	 * delete all for a combination
+	 *
+	 * @param $fk_product_attribute_combination
+	 * @return int <0 KO, >0 OK
+	 */
+	public function deleteAllForCombination($fk_product_attribute_combination)
+	{
+		$res = $this->db->query("DELETE FROM ".MAIN_DB_PREFIX.$this->table_element
+			." WHERE fk_product_attribute_combination = ".(int) $fk_product_attribute_combination);
+
+		return $res ? 1 : -1;
+	}
+
+
+	/**
+	 * Clean not needed price levels for a combination
+	 *
+	 * @param $fk_product_attribute_combination
+	 * @return int <0 KO, >0 OK
+	 */
+	public function clean($fk_product_attribute_combination)
+	{
+		global $conf;
+
+		$res = $this->db->query("DELETE FROM ".MAIN_DB_PREFIX.$this->table_element
+			. " WHERE fk_product_attribute_combination = ".(int) $fk_product_attribute_combination
+			. " AND fk_price_level > ".intval($conf->global->PRODUIT_MULTIPRICES_LIMIT) );
+
+
+		return $res ? 1 : -1;
+	}
+
+}
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 3886a8fcdce..5ad7b38af2e 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -33,6 +33,10 @@ $ref = GETPOST('ref', 'alpha');
 $weight_impact = GETPOST('weight_impact', 'alpha');
 $price_impact = GETPOST('price_impact', 'alpha');
 $price_impact_percent = (bool) GETPOST('price_impact_percent');
+
+$level_price_impact = GETPOST('level_price_impact', 'array');
+$level_price_impact_percent = GETPOST('level_price_impact_percent', 'array');
+
 $reference = GETPOST('reference', 'alpha');
 $form = new Form($db);
 
@@ -112,6 +116,18 @@ if ($_POST) {
 		    }
 			$weight_impact = price2num($weight_impact);
 			$price_impact = price2num($price_impact);
+
+			// for conf PRODUIT_MULTIPRICES
+			if($conf->global->PRODUIT_MULTIPRICES) {
+				$level_price_impact = array_map('price2num', $level_price_impact);
+				$level_price_impact_percent = array_map('price2num', $level_price_impact_percent);
+			}
+			else{
+				$level_price_impact = array(1 => $weight_impact);
+				$level_price_impact_percent = array(1 => $price_impact_percent);
+			}
+
+
 			$sanit_features = array();
 
 			//First, sanitize
@@ -141,11 +157,10 @@ if ($_POST) {
 			// sanit_feature is an array with 1 (and only 1) value per attribute.
 			// For example:  Color->blue, Size->Small, Option->2
 			//var_dump($sanit_features);
-			//var_dump($productCombination2ValuePairs1); exit;
 
 			if (!$prodcomb->fetchByProductCombination2ValuePairs($id, $sanit_features))
 			{
-				$result = $prodcomb->createProductCombination($user, $object, $sanit_features, array(), $price_impact_percent, $price_impact, $weight_impact, $reference);
+				$result = $prodcomb->createProductCombination($user, $object, $sanit_features, array(), $level_price_impact_percent, $level_price_impact, $weight_impact, $reference);
 				if ($result > 0)
 				{
 					setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
@@ -227,6 +242,31 @@ if ($_POST) {
 		$prodcomb->variation_price = $price_impact;
 		$prodcomb->variation_weight = $weight_impact;
 
+		// for conf PRODUIT_MULTIPRICES
+		if($conf->global->PRODUIT_MULTIPRICES) {
+			$level_price_impact = array_map('price2num', $level_price_impact);
+			$level_price_impact_percent = array_map(function($a){ return !empty($a);}, $level_price_impact_percent);
+
+			$prodcomb->variation_price = $level_price_impact[1];
+			$prodcomb->variation_price_percentage = (bool)$level_price_impact_percent[1];
+		}
+		else{
+			$level_price_impact = array(1 => $weight_impact);
+			$level_price_impact_percent = array(1 => $price_impact_percent);
+		}
+
+		if($conf->global->PRODUIT_MULTIPRICES){
+			$prodcomb->combination_price_levels = array();
+			for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++){
+				$productCombinationLevel = new ProductCombinationLevel($db);
+				$productCombinationLevel->fk_product_attribute_combination = $prodcomb->id;
+				$productCombinationLevel->fk_price_level = $i;
+				$productCombinationLevel->variation_price = $level_price_impact[$i];
+				$productCombinationLevel->variation_price_percentage = $level_price_impact_percent[$i];
+				$prodcomb->combination_price_levels[$i] = $productCombinationLevel;
+			}
+		}
+
 		if ($prodcomb->update($user) > 0) {
 			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 			header('Location: '.dol_buildpath('/variants/combinations.php?id='.$id, 2));
@@ -594,12 +634,34 @@ if (!empty($id) || !empty($ref))
 				<td><label for="reference"><?php echo $langs->trans('Reference') ?></label></td>
 				<td><input type="text" id="reference" name="reference" value="<?php echo trim($reference) ?>"></td>
 			</tr>
+<?php 		if (empty($conf->global->PRODUIT_MULTIPRICES)){ ?>
 			<tr>
 				<td><label for="price_impact"><?php echo $langs->trans('PriceImpact') ?></label></td>
 				<td><input type="text" id="price_impact" name="price_impact" value="<?php echo price($price_impact) ?>">
-				<input type="checkbox" id="price_impact_percent" name="price_impact_percent" <?php echo $price_impact_percent ? ' checked' : '' ?>> <label for="price_impact_percent"><?php echo $langs->trans('PercentageVariation') ?></label></td>
+				<input type="checkbox" id="price_impact_percent" name="price_impact_percent" <?php echo $price_impact_percent ? ' checked' : '' ?>> <label for="price_impact_percent"><?php echo $langs->trans('PercentageVariation') ?></label>
+				</td>
 			</tr>
-			<?php
+<?php 		}
+			else{
+				$prodcomb->fetchCombinationPriceLevels();
+
+				for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
+				{
+
+					print '<tr>';
+					print '<td><label for="level_price_impact_'.$i.'">'.$langs->trans('ImpactOnPriceLevel',$i).'</label>';
+					if($i===1){
+						print ' <a id="apply-price-impact-to-all-level" class="classfortooltip" href="#" title="'.$langs->trans('ApplyToAllPriceImpactLevelHelp').'">('.$langs->trans('ApplyToAllPriceImpactLevel').')</a>';
+					}
+					print '</td>';
+					print '<td><input type="text" class="level_price_impact" id="level_price_impact_'.$i.'" name="level_price_impact['.$i.']" value="'.price($prodcomb->combination_price_levels[$i]->variation_price).'">';
+					print '<input type="checkbox" class="level_price_impact_percent" id="level_price_impact_percent_'.$i.'" name="level_price_impact_percent['.$i.']" '. (!empty($prodcomb->combination_price_levels[$i]->variation_price_percentage) ? ' checked' : '' ).'> <label for="level_price_impact_percent_'.$i.'">'.$langs->trans('PercentageVariation').'</label>';
+
+					print '</td>';
+					print '</tr>';
+				}
+			}
+
             if ($object->isProduct()) {
 				print '<tr>';
 				print '<td><label for="weight_impact">'.$langs->trans('WeightImpact').'</label></td>';
@@ -609,9 +671,30 @@ if (!empty($id) || !empty($ref))
 			print '</table>';
 		}
 
-		dol_fiche_end();
-        ?>
+		if (!empty($conf->global->PRODUIT_MULTIPRICES)){
+?>
+		<script>
+			$(document).ready(function() {
+				// Apply level 1 impact to all prices impact levels
+				$('body').on('click', '#apply-price-impact-to-all-level', function(e) {
+					e.preventDefault();
+					let priceImpact = $( "#level_price_impact_1" ).val();
+					let priceImpactPrecent = $( "#level_price_impact_percent_1" ).prop("checked");
 
+					var multipricelimit = <?php print intval($conf->global->PRODUIT_MULTIPRICES_LIMIT); ?>
+
+					for (let i = 2; i <= multipricelimit; i++) {
+						$( "#level_price_impact_" + i ).val(priceImpact);
+						$( "#level_price_impact_percent_" + i  ).prop("checked", priceImpactPrecent);
+					}
+				});
+			});
+		</script>
+<?php
+		}
+
+		dol_fiche_end();
+?>
 		<div style="text-align: center">
 		<input type="submit" name="create" <?php if (!is_array($productCombination2ValuePairs1)) print ' disabled="disabled"'; ?> value="<?php echo $action == 'add' ? $langs->trans('Create') : $langs->trans('Save') ?>" class="button">
 		&nbsp;

From 1cc673a9c61722dd9c628f3dde9d386c374bc7bb Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 12 Aug 2020 08:53:24 +0000
Subject: [PATCH 44/62] Fixing style errors.

---
 .../class/ProductCombination.class.php        | 65 +++++++++----------
 htdocs/variants/combinations.php              | 32 ++++-----
 2 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 777cb136b05..17d1688d268 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -139,13 +139,13 @@ class ProductCombination
 	public function fetchCombinationPriceLevels($fk_price_level = 0, $useCache = true)
 	{
 		// Check cache
-		if(!empty($this->combination_price_levels) && $useCache){
-			if((!empty($fk_price_level) && isset($this->combination_price_levels[$fk_price_level])) || empty($fk_price_level)){
+		if (!empty($this->combination_price_levels) && $useCache){
+			if ((!empty($fk_price_level) && isset($this->combination_price_levels[$fk_price_level])) || empty($fk_price_level)){
 				return 1;
 			}
 		}
 
-		if(!is_array($this->combination_price_levels)
+		if (!is_array($this->combination_price_levels)
 			|| empty($fk_price_level) // if fetch an unique level dont erase all already fetched
 		){
 			$this->combination_price_levels = array();
@@ -178,15 +178,15 @@ class ProductCombination
 		$staticProductCombinationLevel = new ProductCombinationLevel($this->db);
 
 		// Delete all
-		if(empty($this->combination_price_levels)){
+		if (empty($this->combination_price_levels)){
 			return $staticProductCombinationLevel->deleteAllForCombination($this->id);
 		}
 
 		// Clean not needed price levels
-		if($clean){
+		if ($clean){
 			$res = $staticProductCombinationLevel->clean($this->id);
 
-			if($res<0){
+			if ($res<0){
 				$this->errors[] = 'Fail to clean not needed price levels';
 				return -1;
 			}
@@ -194,17 +194,17 @@ class ProductCombination
 
 		foreach ($this->combination_price_levels as $fk_price_level => $combination_price_level){
 			$res = $combination_price_level->save();
-			if($res<1){
+			if ($res<1){
 				$this->error = 'save combination price level '.$fk_price_level . ' '.$combination_price_level->error;
 				$this->errors[] = $this->error;
 				$errors ++;
 			}
 		}
 
-		if($errors > 0){
+		if ($errors > 0){
 			return $errors*-1;
 		}
-		else{
+		else {
 			return 1;
 		}
 	}
@@ -331,7 +331,7 @@ class ProductCombination
 
 		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
 			$res = $this->saveCombinationPriceLevels();
-			if($res<0){
+			if ($res<0){
 				return -2;
 			}
 		}
@@ -365,7 +365,7 @@ class ProductCombination
 
 		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
 			$res = $this->saveCombinationPriceLevels();
-			if($res<0){
+			if ($res<0){
 				return -2;
 			}
 		}
@@ -392,7 +392,7 @@ class ProductCombination
 		$comb2val->deleteByFkCombination($this->id);
 
 		// remove combination price levels
-		if(!$this->db->query("DELETE FROM ".MAIN_DB_PREFIX."product_attribute_combination_price_level WHERE fk_product_attribute_combination = ".(int) $this->id)) {
+		if (!$this->db->query("DELETE FROM ".MAIN_DB_PREFIX."product_attribute_combination_price_level WHERE fk_product_attribute_combination = ".(int) $this->id)) {
 			$this->db->rollback();
 			return -1;
 		}
@@ -682,10 +682,10 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 		$weight_impact = (float) $forced_weightvar;	// If false, return 0
 
 		//Final price impact
-		if(!is_array($forced_pricevar)){
+		if (!is_array($forced_pricevar)){
 			$price_impact[1] = (float) $forced_pricevar;	// If false, return 0
 		}
-		else{
+		else {
 			$price_impact = $forced_pricevar;
 		}
 
@@ -732,7 +732,7 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 				$price_impact[1] += (float) price2num($variations[$currcombattr][$currcombval]['price']);
 
 				// Manage Price levels
-				if($conf->global->PRODUIT_MULTIPRICES){
+				if ($conf->global->PRODUIT_MULTIPRICES){
 					for ($i = 2; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
 					{
 						$price_impact[$i] += (float) price2num($variations[$currcombattr][$currcombval]['price']);
@@ -760,16 +760,16 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 		$newcomb->variation_weight = $weight_impact;
 
 		// Init price level
-		if($conf->global->PRODUIT_MULTIPRICES){
+		if ($conf->global->PRODUIT_MULTIPRICES){
 			for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++){
 				$productCombinationLevel = new ProductCombinationLevel($this->db);
 				$productCombinationLevel->fk_product_attribute_combination = 0;
 				$productCombinationLevel->fk_price_level = $i;
 				$productCombinationLevel->variation_price = $price_impact[$i];
 
-				if(is_array($price_var_percent)){
+				if (is_array($price_var_percent)){
 					$productCombinationLevel->variation_price_percentage = !empty($price_var_percent[$i]) ? $price_var_percent[$i] : 0;
-				}else{
+				}else {
 					$productCombinationLevel->variation_price_percentage = $price_var_percent;
 				}
 
@@ -1000,11 +1000,11 @@ class ProductCombinationLevel
 	 */
 	public function fetch($rowid)
 	{
-		$sql = "SELECT rowid, fk_product_attribute_combination, fk_price_level, variation_price, variation_price_percentage FROM " . MAIN_DB_PREFIX . $this->table_element." WHERE rowid = " . (int)$rowid;
+		$sql = "SELECT rowid, fk_product_attribute_combination, fk_price_level, variation_price, variation_price_percentage FROM " . MAIN_DB_PREFIX . $this->table_element." WHERE rowid = " . (int) $rowid;
 
 		$obj = $this->db->getRow($sql);
 
-		if($obj){
+		if ($obj){
 			return $this->fetchFormObj($obj);
 		}
 
@@ -1026,7 +1026,7 @@ class ProductCombinationLevel
 			." FROM ".MAIN_DB_PREFIX.$this->table_element
 			." WHERE fk_product_attribute_combination = ".intval($fk_product_attribute_combination);
 
-		if(!empty($fk_price_level)){
+		if (!empty($fk_price_level)){
 			$sql.= ' AND fk_price_level = '.intval($fk_price_level);
 		}
 
@@ -1039,7 +1039,7 @@ class ProductCombinationLevel
 		$result = array();
 
 		// For more simple usage set level as array key
-		foreach($combination_price_levels as $k => $row){
+		foreach ($combination_price_levels as $k => $row){
 			$productCombinationLevel = new ProductCombinationLevel($this->db);
 			$productCombinationLevel->fetchFormObj($row);
 			$result[$row->fk_price_level] = $productCombinationLevel;
@@ -1064,7 +1064,7 @@ class ProductCombinationLevel
 		$this->fk_product_attribute_combination = doubleval($obj->fk_product_attribute_combination);
 		$this->fk_price_level = intval($obj->fk_price_level);
 		$this->variation_price = doubleval($obj->variation_price);
-		$this->variation_price_percentage = (bool)$obj->variation_price_percentage;
+		$this->variation_price_percentage = (bool) $obj->variation_price_percentage;
 
 		return 1;
 	}
@@ -1080,41 +1080,41 @@ class ProductCombinationLevel
 		$errors = 0;
 
 
-		if(empty($this->fk_product_attribute_combination) || empty($this->fk_price_level)){
+		if (empty($this->fk_product_attribute_combination) || empty($this->fk_price_level)){
 			return -1;
 		}
 
 		// check if level exist in DB before add
-		if(empty($this->id)){
+		if (empty($this->id)){
 			$sql = "SELECT rowid id"
 				." FROM ".MAIN_DB_PREFIX . $this->table_element
 				." WHERE fk_product_attribute_combination = ".(int) $this->fk_product_attribute_combination
 				.' AND fk_price_level = '.intval($this->fk_price_level);
 
 			$existObj = $this->db->getRow($sql);
-			if($existObj){
+			if ($existObj){
 				$this->id = $existObj->id;
 			}
 		}
 
 		// Update
-		if(!empty($this->id)) {
+		if (!empty($this->id)) {
 			$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET '
 				. ' variation_price = '.doubleval($this->variation_price)
 				. ' , variation_price_percentage = '.intval($this->variation_price_percentage)
 				. ' WHERE rowid = '.intval($this->id);
 
 			$res = $this->db->query($sql);
-			if($res>0){
+			if ($res>0){
 				return $this->id;
 			}
-			else{
+			else {
 				$this->error = $this->db->error();
 				$this->errors[] = $this->error;
 				return -1;
 			}
 		}
-		else{
+		else {
 			// ADD
 			$sql = "INSERT INTO " . MAIN_DB_PREFIX . $this->table_element . " ("
 				. " fk_product_attribute_combination, fk_price_level, variation_price, variation_price_percentage"
@@ -1126,10 +1126,10 @@ class ProductCombinationLevel
 				. " )";
 
 			$res = $this->db->query($sql);
-			if($res){
+			if ($res){
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
 			}
-			else{
+			else {
 				$this->error = $this->db->error();
 				$this->errors[] = $this->error;
 				return -1;
@@ -1186,5 +1186,4 @@ class ProductCombinationLevel
 
 		return $res ? 1 : -1;
 	}
-
 }
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 5ad7b38af2e..b9f62bdcf73 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -118,11 +118,11 @@ if ($_POST) {
 			$price_impact = price2num($price_impact);
 
 			// for conf PRODUIT_MULTIPRICES
-			if($conf->global->PRODUIT_MULTIPRICES) {
+			if ($conf->global->PRODUIT_MULTIPRICES) {
 				$level_price_impact = array_map('price2num', $level_price_impact);
 				$level_price_impact_percent = array_map('price2num', $level_price_impact_percent);
 			}
-			else{
+			else {
 				$level_price_impact = array(1 => $weight_impact);
 				$level_price_impact_percent = array(1 => $price_impact_percent);
 			}
@@ -243,19 +243,20 @@ if ($_POST) {
 		$prodcomb->variation_weight = $weight_impact;
 
 		// for conf PRODUIT_MULTIPRICES
-		if($conf->global->PRODUIT_MULTIPRICES) {
+		if ($conf->global->PRODUIT_MULTIPRICES) {
 			$level_price_impact = array_map('price2num', $level_price_impact);
-			$level_price_impact_percent = array_map(function($a){ return !empty($a);}, $level_price_impact_percent);
+			$level_price_impact_percent = array_map(function ($a) {
+				return !empty($a);}, $level_price_impact_percent);
 
 			$prodcomb->variation_price = $level_price_impact[1];
-			$prodcomb->variation_price_percentage = (bool)$level_price_impact_percent[1];
+			$prodcomb->variation_price_percentage = (bool) $level_price_impact_percent[1];
 		}
-		else{
+		else {
 			$level_price_impact = array(1 => $weight_impact);
 			$level_price_impact_percent = array(1 => $price_impact_percent);
 		}
 
-		if($conf->global->PRODUIT_MULTIPRICES){
+		if ($conf->global->PRODUIT_MULTIPRICES){
 			$prodcomb->combination_price_levels = array();
 			for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++){
 				$productCombinationLevel = new ProductCombinationLevel($db);
@@ -634,23 +635,22 @@ if (!empty($id) || !empty($ref))
 				<td><label for="reference"><?php echo $langs->trans('Reference') ?></label></td>
 				<td><input type="text" id="reference" name="reference" value="<?php echo trim($reference) ?>"></td>
 			</tr>
-<?php 		if (empty($conf->global->PRODUIT_MULTIPRICES)){ ?>
+			<?php 		if (empty($conf->global->PRODUIT_MULTIPRICES)){ ?>
 			<tr>
 				<td><label for="price_impact"><?php echo $langs->trans('PriceImpact') ?></label></td>
 				<td><input type="text" id="price_impact" name="price_impact" value="<?php echo price($price_impact) ?>">
 				<input type="checkbox" id="price_impact_percent" name="price_impact_percent" <?php echo $price_impact_percent ? ' checked' : '' ?>> <label for="price_impact_percent"><?php echo $langs->trans('PercentageVariation') ?></label>
 				</td>
 			</tr>
-<?php 		}
-			else{
+			<?php 		}
+			else {
 				$prodcomb->fetchCombinationPriceLevels();
 
 				for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
 				{
-
 					print '<tr>';
-					print '<td><label for="level_price_impact_'.$i.'">'.$langs->trans('ImpactOnPriceLevel',$i).'</label>';
-					if($i===1){
+					print '<td><label for="level_price_impact_'.$i.'">'.$langs->trans('ImpactOnPriceLevel', $i).'</label>';
+					if ($i===1){
 						print ' <a id="apply-price-impact-to-all-level" class="classfortooltip" href="#" title="'.$langs->trans('ApplyToAllPriceImpactLevelHelp').'">('.$langs->trans('ApplyToAllPriceImpactLevel').')</a>';
 					}
 					print '</td>';
@@ -672,7 +672,7 @@ if (!empty($id) || !empty($ref))
 		}
 
 		if (!empty($conf->global->PRODUIT_MULTIPRICES)){
-?>
+			?>
 		<script>
 			$(document).ready(function() {
 				// Apply level 1 impact to all prices impact levels
@@ -690,11 +690,11 @@ if (!empty($id) || !empty($ref))
 				});
 			});
 		</script>
-<?php
+			<?php
 		}
 
 		dol_fiche_end();
-?>
+		?>
 		<div style="text-align: center">
 		<input type="submit" name="create" <?php if (!is_array($productCombination2ValuePairs1)) print ' disabled="disabled"'; ?> value="<?php echo $action == 'add' ? $langs->trans('Create') : $langs->trans('Save') ?>" class="button">
 		&nbsp;

From 355d62e7db0d050a1e7296bb4f7195d78f3a6129 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 12 Aug 2020 20:24:44 +0200
Subject: [PATCH 45/62] FIX Update line of BOM

---
 htdocs/bom/bom_card.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index c98dee97f51..bd5e6fe7789 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -194,10 +194,10 @@ if (empty($reshook))
 		$error = 0;
 
 		// Set if we used free entry or predefined product
-		$qty = GETPOST('qty', 'int');
+		$qty = price2num(GETPOST('qty', 'int'));
 		$qty_frozen = GETPOST('qty_frozen', 'int');
 		$disable_stock_change = GETPOST('disable_stock_change', 'int');
-		$efficiency = GETPOST('efficiency', 'int');
+		$efficiency = price2num(GETPOST('efficiency', 'int'));
 
 		if ($qty == '') {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
@@ -223,6 +223,8 @@ if (empty($reshook))
 			unset($_POST['qty']);
 			unset($_POST['qty_frozen']);
 		    unset($_POST['disable_stock_change']);
+
+		    $object->fetchLines();
 		}
 	}
 }
@@ -545,7 +547,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	if (!empty($object->table_element_line))
 	{
-	    print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+	    print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '').'" method="POST">
     	<input type="hidden" name="token" value="' . newToken().'">
     	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
     	<input type="hidden" name="mode" value="">

From 4e1f554c15b0368a43fa2eb56fca821801d9cea5 Mon Sep 17 00:00:00 2001
From: John Botella <john.botella@atm-consulting.fr>
Date: Thu, 13 Aug 2020 11:43:33 +0200
Subject: [PATCH 46/62] Fix - add variation price fallback behavior

---
 .../class/ProductCombination.class.php        | 39 +++++++++++++++----
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 777cb136b05..0b3b3843867 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -138,6 +138,8 @@ class ProductCombination
 	 */
 	public function fetchCombinationPriceLevels($fk_price_level = 0, $useCache = true)
 	{
+		global $conf;
+
 		// Check cache
 		if(!empty($this->combination_price_levels) && $useCache){
 			if((!empty($fk_price_level) && isset($this->combination_price_levels[$fk_price_level])) || empty($fk_price_level)){
@@ -154,10 +156,31 @@ class ProductCombination
 		$staticProductCombinationLevel = new ProductCombinationLevel($this->db);
 		$combination_price_levels = $staticProductCombinationLevel->fetchAll($this->id, $fk_price_level);
 
-		if (!$combination_price_levels || !is_array($combination_price_levels)) {
+		if (!is_array($combination_price_levels)) {
 			return -1;
 		}
 
+		if(empty($combination_price_levels)){
+
+			/**
+			 * for auto retrocompatibility with last behavior
+			 */
+			$productCombinationLevel = new ProductCombinationLevel($this->db);
+			$productCombinationLevel->fk_price_level = intval($fk_price_level);
+			$productCombinationLevel->fk_product_attribute_combination = $this->id;
+			$productCombinationLevel->variation_price = $this->variation_price;
+			$productCombinationLevel->variation_price_percentage = $this->variation_price_percentage;
+
+			if($fk_price_level>0){
+				$combination_price_levels[$fk_price_level] = $productCombinationLevel;
+			}
+			else{
+				for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++){
+					$combination_price_levels[$i] = $productCombinationLevel;
+				}
+			}
+		}
+
 		$this->combination_price_levels = $combination_price_levels;
 
 		return 1;
@@ -1032,17 +1055,19 @@ class ProductCombinationLevel
 
 		$combination_price_levels = $this->db->getRows($sql);
 
-		if (!$combination_price_levels || !is_array($combination_price_levels)) {
+		if (!is_array($combination_price_levels)) {
 			return -1;
 		}
 
 		$result = array();
 
-		// For more simple usage set level as array key
-		foreach($combination_price_levels as $k => $row){
-			$productCombinationLevel = new ProductCombinationLevel($this->db);
-			$productCombinationLevel->fetchFormObj($row);
-			$result[$row->fk_price_level] = $productCombinationLevel;
+		if(!empty($combination_price_levels)) {
+			// For more simple usage set level as array key
+			foreach($combination_price_levels as $k => $row){
+				$productCombinationLevel = new ProductCombinationLevel($this->db);
+				$productCombinationLevel->fetchFormObj($row);
+				$result[$row->fk_price_level] = $productCombinationLevel;
+			}
 		}
 
 		return $result;

From 959ccce7770fe1174a07b31991f5a15e478c34c5 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 13 Aug 2020 09:48:28 +0000
Subject: [PATCH 47/62] Fixing style errors.

---
 .../class/ProductCombination.class.php        | 73 +++++++++----------
 1 file changed, 36 insertions(+), 37 deletions(-)

diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 0b3b3843867..7d6a07d736d 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -141,13 +141,13 @@ class ProductCombination
 		global $conf;
 
 		// Check cache
-		if(!empty($this->combination_price_levels) && $useCache){
-			if((!empty($fk_price_level) && isset($this->combination_price_levels[$fk_price_level])) || empty($fk_price_level)){
+		if (!empty($this->combination_price_levels) && $useCache){
+			if ((!empty($fk_price_level) && isset($this->combination_price_levels[$fk_price_level])) || empty($fk_price_level)){
 				return 1;
 			}
 		}
 
-		if(!is_array($this->combination_price_levels)
+		if (!is_array($this->combination_price_levels)
 			|| empty($fk_price_level) // if fetch an unique level dont erase all already fetched
 		){
 			$this->combination_price_levels = array();
@@ -160,7 +160,7 @@ class ProductCombination
 			return -1;
 		}
 
-		if(empty($combination_price_levels)){
+		if (empty($combination_price_levels)){
 
 			/**
 			 * for auto retrocompatibility with last behavior
@@ -171,10 +171,10 @@ class ProductCombination
 			$productCombinationLevel->variation_price = $this->variation_price;
 			$productCombinationLevel->variation_price_percentage = $this->variation_price_percentage;
 
-			if($fk_price_level>0){
+			if ($fk_price_level>0){
 				$combination_price_levels[$fk_price_level] = $productCombinationLevel;
 			}
-			else{
+			else {
 				for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++){
 					$combination_price_levels[$i] = $productCombinationLevel;
 				}
@@ -201,15 +201,15 @@ class ProductCombination
 		$staticProductCombinationLevel = new ProductCombinationLevel($this->db);
 
 		// Delete all
-		if(empty($this->combination_price_levels)){
+		if (empty($this->combination_price_levels)){
 			return $staticProductCombinationLevel->deleteAllForCombination($this->id);
 		}
 
 		// Clean not needed price levels
-		if($clean){
+		if ($clean){
 			$res = $staticProductCombinationLevel->clean($this->id);
 
-			if($res<0){
+			if ($res<0){
 				$this->errors[] = 'Fail to clean not needed price levels';
 				return -1;
 			}
@@ -217,17 +217,17 @@ class ProductCombination
 
 		foreach ($this->combination_price_levels as $fk_price_level => $combination_price_level){
 			$res = $combination_price_level->save();
-			if($res<1){
+			if ($res<1){
 				$this->error = 'save combination price level '.$fk_price_level . ' '.$combination_price_level->error;
 				$this->errors[] = $this->error;
 				$errors ++;
 			}
 		}
 
-		if($errors > 0){
+		if ($errors > 0){
 			return $errors*-1;
 		}
-		else{
+		else {
 			return 1;
 		}
 	}
@@ -354,7 +354,7 @@ class ProductCombination
 
 		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
 			$res = $this->saveCombinationPriceLevels();
-			if($res<0){
+			if ($res<0){
 				return -2;
 			}
 		}
@@ -388,7 +388,7 @@ class ProductCombination
 
 		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
 			$res = $this->saveCombinationPriceLevels();
-			if($res<0){
+			if ($res<0){
 				return -2;
 			}
 		}
@@ -415,7 +415,7 @@ class ProductCombination
 		$comb2val->deleteByFkCombination($this->id);
 
 		// remove combination price levels
-		if(!$this->db->query("DELETE FROM ".MAIN_DB_PREFIX."product_attribute_combination_price_level WHERE fk_product_attribute_combination = ".(int) $this->id)) {
+		if (!$this->db->query("DELETE FROM ".MAIN_DB_PREFIX."product_attribute_combination_price_level WHERE fk_product_attribute_combination = ".(int) $this->id)) {
 			$this->db->rollback();
 			return -1;
 		}
@@ -705,10 +705,10 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 		$weight_impact = (float) $forced_weightvar;	// If false, return 0
 
 		//Final price impact
-		if(!is_array($forced_pricevar)){
+		if (!is_array($forced_pricevar)){
 			$price_impact[1] = (float) $forced_pricevar;	// If false, return 0
 		}
-		else{
+		else {
 			$price_impact = $forced_pricevar;
 		}
 
@@ -755,7 +755,7 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 				$price_impact[1] += (float) price2num($variations[$currcombattr][$currcombval]['price']);
 
 				// Manage Price levels
-				if($conf->global->PRODUIT_MULTIPRICES){
+				if ($conf->global->PRODUIT_MULTIPRICES){
 					for ($i = 2; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
 					{
 						$price_impact[$i] += (float) price2num($variations[$currcombattr][$currcombval]['price']);
@@ -783,16 +783,16 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 		$newcomb->variation_weight = $weight_impact;
 
 		// Init price level
-		if($conf->global->PRODUIT_MULTIPRICES){
+		if ($conf->global->PRODUIT_MULTIPRICES){
 			for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++){
 				$productCombinationLevel = new ProductCombinationLevel($this->db);
 				$productCombinationLevel->fk_product_attribute_combination = 0;
 				$productCombinationLevel->fk_price_level = $i;
 				$productCombinationLevel->variation_price = $price_impact[$i];
 
-				if(is_array($price_var_percent)){
+				if (is_array($price_var_percent)){
 					$productCombinationLevel->variation_price_percentage = !empty($price_var_percent[$i]) ? $price_var_percent[$i] : 0;
-				}else{
+				}else {
 					$productCombinationLevel->variation_price_percentage = $price_var_percent;
 				}
 
@@ -1023,11 +1023,11 @@ class ProductCombinationLevel
 	 */
 	public function fetch($rowid)
 	{
-		$sql = "SELECT rowid, fk_product_attribute_combination, fk_price_level, variation_price, variation_price_percentage FROM " . MAIN_DB_PREFIX . $this->table_element." WHERE rowid = " . (int)$rowid;
+		$sql = "SELECT rowid, fk_product_attribute_combination, fk_price_level, variation_price, variation_price_percentage FROM " . MAIN_DB_PREFIX . $this->table_element." WHERE rowid = " . (int) $rowid;
 
 		$obj = $this->db->getRow($sql);
 
-		if($obj){
+		if ($obj){
 			return $this->fetchFormObj($obj);
 		}
 
@@ -1049,7 +1049,7 @@ class ProductCombinationLevel
 			." FROM ".MAIN_DB_PREFIX.$this->table_element
 			." WHERE fk_product_attribute_combination = ".intval($fk_product_attribute_combination);
 
-		if(!empty($fk_price_level)){
+		if (!empty($fk_price_level)){
 			$sql.= ' AND fk_price_level = '.intval($fk_price_level);
 		}
 
@@ -1061,9 +1061,9 @@ class ProductCombinationLevel
 
 		$result = array();
 
-		if(!empty($combination_price_levels)) {
+		if (!empty($combination_price_levels)) {
 			// For more simple usage set level as array key
-			foreach($combination_price_levels as $k => $row){
+			foreach ($combination_price_levels as $k => $row){
 				$productCombinationLevel = new ProductCombinationLevel($this->db);
 				$productCombinationLevel->fetchFormObj($row);
 				$result[$row->fk_price_level] = $productCombinationLevel;
@@ -1089,7 +1089,7 @@ class ProductCombinationLevel
 		$this->fk_product_attribute_combination = doubleval($obj->fk_product_attribute_combination);
 		$this->fk_price_level = intval($obj->fk_price_level);
 		$this->variation_price = doubleval($obj->variation_price);
-		$this->variation_price_percentage = (bool)$obj->variation_price_percentage;
+		$this->variation_price_percentage = (bool) $obj->variation_price_percentage;
 
 		return 1;
 	}
@@ -1105,41 +1105,41 @@ class ProductCombinationLevel
 		$errors = 0;
 
 
-		if(empty($this->fk_product_attribute_combination) || empty($this->fk_price_level)){
+		if (empty($this->fk_product_attribute_combination) || empty($this->fk_price_level)){
 			return -1;
 		}
 
 		// check if level exist in DB before add
-		if(empty($this->id)){
+		if (empty($this->id)){
 			$sql = "SELECT rowid id"
 				." FROM ".MAIN_DB_PREFIX . $this->table_element
 				." WHERE fk_product_attribute_combination = ".(int) $this->fk_product_attribute_combination
 				.' AND fk_price_level = '.intval($this->fk_price_level);
 
 			$existObj = $this->db->getRow($sql);
-			if($existObj){
+			if ($existObj){
 				$this->id = $existObj->id;
 			}
 		}
 
 		// Update
-		if(!empty($this->id)) {
+		if (!empty($this->id)) {
 			$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET '
 				. ' variation_price = '.doubleval($this->variation_price)
 				. ' , variation_price_percentage = '.intval($this->variation_price_percentage)
 				. ' WHERE rowid = '.intval($this->id);
 
 			$res = $this->db->query($sql);
-			if($res>0){
+			if ($res>0){
 				return $this->id;
 			}
-			else{
+			else {
 				$this->error = $this->db->error();
 				$this->errors[] = $this->error;
 				return -1;
 			}
 		}
-		else{
+		else {
 			// ADD
 			$sql = "INSERT INTO " . MAIN_DB_PREFIX . $this->table_element . " ("
 				. " fk_product_attribute_combination, fk_price_level, variation_price, variation_price_percentage"
@@ -1151,10 +1151,10 @@ class ProductCombinationLevel
 				. " )";
 
 			$res = $this->db->query($sql);
-			if($res){
+			if ($res){
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
 			}
-			else{
+			else {
 				$this->error = $this->db->error();
 				$this->errors[] = $this->error;
 				return -1;
@@ -1211,5 +1211,4 @@ class ProductCombinationLevel
 
 		return $res ? 1 : -1;
 	}
-
 }

From 88c07e86add27428ea6f919408e87baafb3620dd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 13 Aug 2020 13:46:53 +0200
Subject: [PATCH 48/62] Organization of setup for Takepos bar features

---
 htdocs/core/lib/takepos.lib.php  |  11 +-
 htdocs/langs/en_US/cashdesk.lang |   8 +-
 htdocs/takepos/admin/bar.php     | 263 ++++++++++++++++---------------
 htdocs/takepos/admin/receipt.php |  13 ++
 htdocs/takepos/admin/setup.php   |  16 --
 5 files changed, 160 insertions(+), 151 deletions(-)

diff --git a/htdocs/core/lib/takepos.lib.php b/htdocs/core/lib/takepos.lib.php
index 083e54c66c0..bf90f818b3e 100644
--- a/htdocs/core/lib/takepos.lib.php
+++ b/htdocs/core/lib/takepos.lib.php
@@ -48,13 +48,10 @@ function takepos_prepare_head()
 	$head[$h][2] = 'receipt';
 	$h++;
 
-	if ($conf->global->TAKEPOS_BAR_RESTAURANT)
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/takepos/admin/bar.php';
-		$head[$h][1] = $langs->trans("BarRestaurant");
-		$head[$h][2] = 'bar';
-		$h++;
-	}
+	$head[$h][0] = DOL_URL_ROOT.'/takepos/admin/bar.php';
+	$head[$h][1] = $langs->trans("BarRestaurant");
+	$head[$h][2] = 'bar';
+	$h++;
 
 	$numterminals = max(1, $conf->global->TAKEPOS_NUM_TERMINALS);
 	for ($i = 1; $i <= $numterminals; $i++)
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 73d8bdaa0df..a96f919e4f4 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -117,6 +117,6 @@ HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
 NumberOfLinesToShow=Number of lines of images to show 
 DefineTablePlan=Define tables plan
-GiftReceiptButton=Gift receipt button
+GiftReceiptButton=Add a "Gift receipt" button
 GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php
index b6a06dee9fb..2ec623024c7 100644
--- a/htdocs/takepos/admin/bar.php
+++ b/htdocs/takepos/admin/bar.php
@@ -34,7 +34,8 @@ if (!$user->admin) accessforbidden();
 
 $langs->loadLangs(array("admin", "cashdesk", "printing"));
 
-global $db;
+$res = 0;
+
 
 /*
  * Actions
@@ -44,9 +45,15 @@ if (GETPOST('action', 'alpha') == 'set')
 {
 	$db->begin();
 
-	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
+	dol_syslog("admin/bar");
 
-	if (!$res > 0) $error++;
+	$suplement_category = GETPOST('TAKEPOS_SUPPLEMENTS_CATEGORY', 'alpha');
+	if ($suplement_category < 0) $suplement_category= 0;
+
+	$res = dolibarr_set_const($db, "TAKEPOS_SUPPLEMENTS_CATEGORY", $suplement_category, 'chaine', 0, '', $conf->entity);
+	if ($res <= 0) {
+	    $error++;
+	}
 
  	if (!$error)
     {
@@ -74,7 +81,6 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackT
 print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
 $head = takepos_prepare_head();
 dol_fiche_head($head, 'bar', 'TakePOS', -1, 'cash-register');
-print '<br>';
 
 
 // Mode
@@ -93,129 +99,138 @@ function Floors() {
 
 <?php
 
-print '<a href="" onclick="Floors(); return false;"><span class="fa fa-glass-cheers"></span> '.$langs->trans("DefineTablePlan").'</a><br>';
-print '<br><br>';
-
-print '<div class="div-table-responsive">';
-print '<table class="noborder centpercent">';
-print '<tr class="liste_titre">';
-print '<td class="titlefieldcreate">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
-print "</tr>\n";
-
-if ($conf->global->TAKEPOS_BAR_RESTAURANT && $conf->global->TAKEPOS_PRINT_METHOD != "browser") {
-	print '<tr class="oddeven value"><td>';
-	print $langs->trans("OrderPrinters").' (<a href="'.DOL_URL_ROOT.'/takepos/admin/orderprinters.php?leftmenu=setup">'.$langs->trans("Setup").'</a>)';
-	print '</td>';
-	print '<td>';
-	print ajax_constantonoff("TAKEPOS_ORDER_PRINTERS", array(), $conf->entity, 0, 0, 1, 0);
-	//print $form->selectyesno("TAKEPOS_ORDER_PRINTERS", $conf->global->TAKEPOS_ORDER_PRINTERS, 1);
-	print '</td></tr>';
-
-	print '<tr class="oddeven value"><td>';
-	print $langs->trans("OrderNotes");
-	print '</td>';
-	print '<td>';
-	print ajax_constantonoff("TAKEPOS_ORDER_NOTES", array(), $conf->entity, 0, 0, 1, 0);
-	//print $form->selectyesno("TAKEPOS_ORDER_NOTES", $conf->global->TAKEPOS_ORDER_NOTES, 1);
-	print '</td></tr>';
-}
-
-print '<tr class="oddeven value"><td>';
-print $langs->trans("BasicPhoneLayout");
-print '</td>';
-print '<td>';
-//print $form->selectyesno("TAKEPOS_PHONE_BASIC_LAYOUT", $conf->global->TAKEPOS_PHONE_BASIC_LAYOUT, 1);
-print ajax_constantonoff("TAKEPOS_PHONE_BASIC_LAYOUT", array(), $conf->entity, 0, 0, 1, 0);
-print '</td></tr>';
-
-print '<tr class="oddeven value"><td>';
-print $langs->trans("ProductSupplements");
-print '</td>';
-print '<td>';
-//print $form->selectyesno("TAKEPOS_SUPPLEMENTS", $conf->global->TAKEPOS_SUPPLEMENTS, 1);
-print ajax_constantonoff("TAKEPOS_SUPPLEMENTS", array(), $conf->entity, 0, 0, 1, 0);
-print '</td></tr>';
-
-if ($conf->global->TAKEPOS_SUPPLEMENTS)
-{
-	print '<tr class="oddeven"><td>';
-	print $langs->trans("SupplementCategory");
-	print '</td>';
-	print '<td>';
-	print $form->select_all_categories(Categorie::TYPE_PRODUCT, $conf->global->TAKEPOS_SUPPLEMENTS_CATEGORY, 'TAKEPOS_SUPPLEMENTS_CATEGORY', 64, 0, 0);
-	print ajax_combobox('TAKEPOS_SUPPLEMENTS_CATEGORY');
-	print "</td></tr>\n";
-}
-
-print '<tr class="oddeven value"><td>';
-print 'QR - '.$langs->trans("CustomerMenu");
-print '</td>';
-print '<td>';
-print ajax_constantonoff("TAKEPOS_QR_MENU", array(), $conf->entity, 0, 0, 1, 0);
-print '</td></tr>';
-
-print '<tr class="oddeven value"><td>';
-print 'QR - '.$langs->trans("AutoOrder");
-print '</td>';
-print '<td>';
-print ajax_constantonoff("TAKEPOS_AUTO_ORDER", array(), $conf->entity, 0, 0, 1, 0);
-print '</td></tr>';
-
-print '</table>';
-
-
-if ($conf->global->TAKEPOS_QR_MENU)
-{
-	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
-	print '<br>';
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("URL").'</td><td class="right">'.$langs->trans("QR").'</td>';
-	print "</tr>\n";
-	print '<tr class="oddeven value"><td>';
-	print "<a target='_blank' href='".$urlwithroot."/takepos/public/menu.php'>".$urlwithroot."/takepos/public/menu.php</a>";
-	print '</td>';
-	print '<td class="right">';
-	print "<a target='_blank' href='printqr.php'><img src='".DOL_URL_ROOT."/takepos/genimg/qr.php' height='42' width='42'></a>";
-	print '</td></tr>';
-	print '</table>';
-}
-
-if ($conf->global->TAKEPOS_AUTO_ORDER)
-{
-	print '<br>';
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("Table").'</td><td>'.$langs->trans("URL").'</td><td class="right">'.$langs->trans("QR").'</td>';
-	print "</tr>\n";
-
-	//global $dolibarr_main_url_root;
-	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
-	$sql = "SELECT rowid, entity, label, leftpos, toppos, floor FROM ".MAIN_DB_PREFIX."takepos_floor_tables";
-	$resql = $db->query($sql);
-	$rows = array();
-	while ($row = $db->fetch_array($resql)) {
-		print '<tr class="oddeven value"><td>';
-		print $langs->trans("Table")." ".$row['label'];
-		print '</td>';
-		print '<td>';
-		print "<a target='_blank' href='".$urlwithroot."/takepos/public/auto_order.php?key=".dol_encode($row['rowid'])."'>".$urlwithroot."/takepos/public/auto_order.php?key=".dol_encode($row['rowid'])."</a>";
-		print '</td>';
-		print '<td class="right">';
-		print "<a target='_blank' href='printqr.php?id=".$row['rowid']."'><img src='".DOL_URL_ROOT."/takepos/genimg/qr.php?key=".dol_encode($row['rowid'])."' height='42' width='42'></a>";
-		print '</td></tr>';
-	}
-
-	print '</table>';
-}
-
-print '</div>';
+print $langs->trans("EnableBarOrRestaurantFeatures");
+print ajax_constantonoff("TAKEPOS_BAR_RESTAURANT", array(), $conf->entity, 0, 0, 1, 0);
 
 print '<br>';
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
+    print '<br>';
+    print '<a href="" onclick="Floors(); return false;"><span class="fa fa-glass-cheers"></span> '.$langs->trans("DefineTablePlan").'</a><br>';
+    print '<br><br>';
+
+    print '<div class="div-table-responsive-no-min">';
+    print '<table class="noborder centpercent">';
+    print '<tr class="liste_titre">';
+    print '<td class="titlefieldcreate">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
+    print "</tr>\n";
+
+    if ($conf->global->TAKEPOS_PRINT_METHOD != "browser") {
+    	print '<tr class="oddeven value"><td>';
+    	print $langs->trans("OrderPrinters").' (<a href="'.DOL_URL_ROOT.'/takepos/admin/orderprinters.php?leftmenu=setup">'.$langs->trans("Setup").'</a>)';
+    	print '</td>';
+    	print '<td>';
+    	print ajax_constantonoff("TAKEPOS_ORDER_PRINTERS", array(), $conf->entity, 0, 0, 1, 0);
+    	//print $form->selectyesno("TAKEPOS_ORDER_PRINTERS", $conf->global->TAKEPOS_ORDER_PRINTERS, 1);
+    	print '</td></tr>';
+
+    	print '<tr class="oddeven value"><td>';
+    	print $langs->trans("OrderNotes");
+    	print '</td>';
+    	print '<td>';
+    	print ajax_constantonoff("TAKEPOS_ORDER_NOTES", array(), $conf->entity, 0, 0, 1, 0);
+    	//print $form->selectyesno("TAKEPOS_ORDER_NOTES", $conf->global->TAKEPOS_ORDER_NOTES, 1);
+    	print '</td></tr>';
+    }
+
+	print '<tr class="oddeven value"><td>';
+    print $langs->trans("BasicPhoneLayout");
+    print '</td>';
+    print '<td>';
+    //print $form->selectyesno("TAKEPOS_PHONE_BASIC_LAYOUT", $conf->global->TAKEPOS_PHONE_BASIC_LAYOUT, 1);
+    print ajax_constantonoff("TAKEPOS_PHONE_BASIC_LAYOUT", array(), $conf->entity, 0, 0, 1, 0);
+    print '</td></tr>';
+
+    print '<tr class="oddeven value"><td>';
+    print $langs->trans("ProductSupplements");
+    print '</td>';
+    print '<td>';
+    //print $form->selectyesno("TAKEPOS_SUPPLEMENTS", $conf->global->TAKEPOS_SUPPLEMENTS, 1);
+    print ajax_constantonoff("TAKEPOS_SUPPLEMENTS", array(), $conf->entity, 0, 0, 1, 0);
+    print '</td></tr>';
+
+    if ($conf->global->TAKEPOS_SUPPLEMENTS)
+    {
+    	print '<tr class="oddeven"><td>';
+    	print $langs->trans("SupplementCategory");
+    	print '</td>';
+    	print '<td>';
+    	print $form->select_all_categories(Categorie::TYPE_PRODUCT, $conf->global->TAKEPOS_SUPPLEMENTS_CATEGORY, 'TAKEPOS_SUPPLEMENTS_CATEGORY', 64, 0, 0);
+    	print ajax_combobox('TAKEPOS_SUPPLEMENTS_CATEGORY');
+    	print "</td></tr>\n";
+    }
+
+    print '<tr class="oddeven value"><td>';
+    print 'QR - '.$langs->trans("CustomerMenu");
+    print '</td>';
+    print '<td>';
+    print ajax_constantonoff("TAKEPOS_QR_MENU", array(), $conf->entity, 0, 0, 1, 0);
+    print '</td></tr>';
+
+    print '<tr class="oddeven value"><td>';
+    print 'QR - '.$langs->trans("AutoOrder");
+    print '</td>';
+    print '<td>';
+    print ajax_constantonoff("TAKEPOS_AUTO_ORDER", array(), $conf->entity, 0, 0, 1, 0);
+    print '</td></tr>';
+
+    print '</table>';
+    print '</div>';
+
+    print '<br>';
+
+    print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+}
+
+if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
+    if ($conf->global->TAKEPOS_QR_MENU)
+    {
+    	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+    	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+    	print '<br>';
+    	print '<table class="noborder centpercent">';
+    	print '<tr class="liste_titre">';
+    	print '<td>'.$langs->trans("URL").'</td><td class="right">'.$langs->trans("QR").'</td>';
+    	print "</tr>\n";
+    	print '<tr class="oddeven value"><td>';
+    	print "<a target='_blank' href='".$urlwithroot."/takepos/public/menu.php'>".$urlwithroot."/takepos/public/menu.php</a>";
+    	print '</td>';
+    	print '<td class="right">';
+    	print "<a target='_blank' href='printqr.php'><img src='".DOL_URL_ROOT."/takepos/genimg/qr.php' height='42' width='42'></a>";
+    	print '</td></tr>';
+    	print '</table>';
+    }
+
+    if ($conf->global->TAKEPOS_AUTO_ORDER)
+    {
+    	print '<br>';
+    	print '<table class="noborder centpercent">';
+    	print '<tr class="liste_titre">';
+    	print '<td>'.$langs->trans("Table").'</td><td>'.$langs->trans("URL").'</td><td class="right">'.$langs->trans("QR").'</td>';
+    	print "</tr>\n";
+
+    	//global $dolibarr_main_url_root;
+    	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+    	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+    	$sql = "SELECT rowid, entity, label, leftpos, toppos, floor FROM ".MAIN_DB_PREFIX."takepos_floor_tables";
+    	$resql = $db->query($sql);
+    	$rows = array();
+    	while ($row = $db->fetch_array($resql)) {
+    		print '<tr class="oddeven value"><td>';
+    		print $langs->trans("Table")." ".$row['label'];
+    		print '</td>';
+    		print '<td>';
+    		print "<a target='_blank' href='".$urlwithroot."/takepos/public/auto_order.php?key=".dol_encode($row['rowid'])."'>".$urlwithroot."/takepos/public/auto_order.php?key=".dol_encode($row['rowid'])."</a>";
+    		print '</td>';
+    		print '<td class="right">';
+    		print "<a target='_blank' href='printqr.php?id=".$row['rowid']."'><img src='".DOL_URL_ROOT."/takepos/genimg/qr.php?key=".dol_encode($row['rowid'])."' height='42' width='42'></a>";
+    		print '</td></tr>';
+    	}
+
+    	print '</table>';
+    }
+}
+
 
 print "</form>\n";
 
diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index 59e0f3da96c..252781ec635 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -87,6 +87,7 @@ print '<input type="hidden" name="action" value="set">';
 
 print load_fiche_titre($langs->trans("PrintMethod"), '', '');
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td><td>'.$langs->trans("Description").'</td><td class="right">'.$langs->trans("Status").'</td>';
@@ -143,14 +144,25 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector")
 }
 print "</td></tr>\n";
 print '</table>';
+print '</div>';
+
 
 print load_fiche_titre($langs->trans("Setup"), '', '');
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
+// VAT Grouped on ticket
+print '<tr class="oddeven"><td>';
+print $langs->trans('TicketVatGrouped');
+print '<td colspan="2">';
+print ajax_constantonoff("TAKEPOS_TICKET_VAT_GROUPPED", array(), $conf->entity, 0, 0, 1, 0);
+//print $form->selectyesno("TAKEPOS_TICKET_VAT_GROUPPED", $conf->global->TAKEPOS_TICKET_VAT_GROUPPED, 1);
+print "</td></tr>\n";
+
 if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
 	print '<tr class="oddeven value"><td>';
 	print $langs->trans("URL")." / ".$langs->trans("IPAddress").' (<a href="http://en.takepos.com/connector" target="_blank">'.$langs->trans("TakeposConnectorNecesary").'</a>)';
@@ -214,6 +226,7 @@ print $form->selectyesno("TAKEPOS_AUTO_PRINT_TICKETS", $conf->global->TAKEPOS_AU
 print "</td></tr>\n";
 
 print '</table>';
+print '</div>';
 
 print '<br>';
 
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 22355c70d9d..ab3b200df35 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -274,14 +274,6 @@ print img_object('', 'category', 'class="paddingright"').$form->select_all_categ
 print ajax_combobox('TAKEPOS_ROOT_CATEGORY_ID');
 print "</td></tr>\n";
 
-// VAT Grouped on ticket
-print '<tr class="oddeven"><td>';
-print $langs->trans('TicketVatGrouped');
-print '<td colspan="2">';
-print ajax_constantonoff("TAKEPOS_TICKET_VAT_GROUPPED", array(), $conf->entity, 0, 0, 1, 0);
-//print $form->selectyesno("TAKEPOS_TICKET_VAT_GROUPPED", $conf->global->TAKEPOS_TICKET_VAT_GROUPPED, 1);
-print "</td></tr>\n";
-
 // Sort product
 print '<tr class="oddeven"><td>';
 print $langs->trans("SortProductField");
@@ -429,14 +421,6 @@ print "</td></tr>\n";
 //print $form->selectarray('TAKEPOS_ADDON', $array, (empty($conf->global->TAKEPOS_ADDON) ? '0' : $conf->global->TAKEPOS_ADDON), 0);
 //print "</td></tr>\n";
 
-print '<tr class="oddeven"><td>';
-print $langs->trans("EnableBarOrRestaurantFeatures");
-print '</td>';
-print '<td colspan="2">';
-print ajax_constantonoff("TAKEPOS_BAR_RESTAURANT", array(), $conf->entity, 0, 0, 1, 0);
-//print $form->selectyesno("TAKEPOS_BAR_RESTAURANT", $conf->global->TAKEPOS_BAR_RESTAURANT, 1);
-print "</td></tr>\n";
-
 print '</table>';
 print '</div>';
 

From 7ce1d36b59423d44d2ca05ddfb31755db283cf5d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 13 Aug 2020 13:51:08 +0200
Subject: [PATCH 49/62] FIX Category for suplements not saved

---
 htdocs/takepos/admin/bar.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php
index b6a06dee9fb..c9e53a86664 100644
--- a/htdocs/takepos/admin/bar.php
+++ b/htdocs/takepos/admin/bar.php
@@ -44,9 +44,15 @@ if (GETPOST('action', 'alpha') == 'set')
 {
 	$db->begin();
 
-	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
+	dol_syslog("admin/bar");
 
-	if (!$res > 0) $error++;
+	$suplement_category = GETPOST('TAKEPOS_SUPPLEMENTS_CATEGORY', 'alpha');
+	if ($suplement_category < 0) $suplement_category= 0;
+
+	$res = dolibarr_set_const($db, "TAKEPOS_SUPPLEMENTS_CATEGORY", $suplement_category, 'chaine', 0, '', $conf->entity);
+	if ($res <= 0) {
+	    $error++;
+	}
 
  	if (!$error)
     {

From 990217fcb00b5354c9853b79fe9254094231b019 Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Thu, 13 Aug 2020 16:59:27 +0200
Subject: [PATCH 50/62] FIX : task leftmenu

---
 htdocs/core/menus/standard/eldy.lib.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index f6d8aa401a5..78d3d8d91b8 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -531,6 +531,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	}
 
     if (empty($noout)) {
+
         foreach ($menu->liste as $menuval) {
             print_start_menu_entry($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
             print_text_menu_entry($menuval['titre'], $menuval['enabled'], (($menuval['url'] != '#' && !preg_match('/^(http:\/\/|https:\/\/)/i', $menuval['url'])) ? DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
@@ -540,6 +541,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	$showmode = 1;
     if (empty($noout)) {
+
         print_start_menu_entry('', 'class="tmenuend"', $showmode);
         print_end_menu_entry($showmode);
         print_end_menu_array();
@@ -1706,7 +1708,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				if (empty($conf->global->PROJECT_HIDE_TASKS))
 				{
 					// Project affected to user
-					$newmenu->add("/projet/activity/index.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("Activities"), 0, $user->rights->projet->lire);
+					$newmenu->add("/projet/activity/index.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("Activities"), 0, $user->rights->projet->lire, '',  'project', 'tasks');
 					$newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);
 					$newmenu->add("/projet/tasks/list.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $user->rights->projet->lire);
 				    $newmenu->add("/projet/tasks/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);

From d784c621c99d64c600309c84da3cada8c9d8e46e Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 13 Aug 2020 15:07:06 +0000
Subject: [PATCH 51/62] Fixing style errors.

---
 htdocs/core/menus/standard/eldy.lib.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 78d3d8d91b8..ca7220037a5 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -531,7 +531,6 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	}
 
     if (empty($noout)) {
-
         foreach ($menu->liste as $menuval) {
             print_start_menu_entry($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
             print_text_menu_entry($menuval['titre'], $menuval['enabled'], (($menuval['url'] != '#' && !preg_match('/^(http:\/\/|https:\/\/)/i', $menuval['url'])) ? DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
@@ -541,7 +540,6 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	$showmode = 1;
     if (empty($noout)) {
-
         print_start_menu_entry('', 'class="tmenuend"', $showmode);
         print_end_menu_entry($showmode);
         print_end_menu_array();

From b57c2585ad5337d4e8289f14cbde808866fa7b60 Mon Sep 17 00:00:00 2001
From: Tim Otte <otte@meuser.it>
Date: Fri, 14 Aug 2020 10:00:40 +0200
Subject: [PATCH 52/62] Fixed the smtps recipent to use the forced address

---
 htdocs/core/class/CMailFile.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 48a2b503eca..79791854a8f 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -355,7 +355,7 @@ class CMailFile
 			}
 
 			$smtps->setSubject($subjecttouse);
-			$smtps->setTO($this->getValidAddress($this->to, 0, 1));
+			$smtps->setTO($this->getValidAddress($this->addr_to, 0, 1));
 			$smtps->setFrom($this->getValidAddress($this->from, 0, 1));
 			$smtps->setTrackId($this->trackid);
 			$smtps->setReplyTo($this->getValidAddress($this->replyto, 0, 1));

From d35c7ed49b6322053e8abd3ddf8a64e5260fd86e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 14 Aug 2020 11:03:12 +0200
Subject: [PATCH 53/62] Fix trans

---
 htdocs/langs/en_US/main.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 051dde11ff7..e7c35f6d9f7 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -353,8 +353,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Payment amount
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Amount (inc. tax)

From d8c6e17efd0159f1595ccef86fd82aed1524875c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 14 Aug 2020 11:59:51 +0200
Subject: [PATCH 54/62] Fix travis

---
 htdocs/core/tpl/objectline_create.tpl.php | 8 ++++----
 htdocs/product/stock/list.php             | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 305be25347d..42c5ea0d2a9 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -426,9 +426,9 @@ if ((!empty($conf->service->enabled) || ($object->element == 'contrat')) && $dat
 
 	$prefillDates = false;
 
-	if(! empty($conf->global->MAIN_FILL_SERVICE_DATES_FROM_LAST_SERVICE_LINE) && ! empty($object->lines))
+	if (!empty($conf->global->MAIN_FILL_SERVICE_DATES_FROM_LAST_SERVICE_LINE) && ! empty($object->lines))
     {
-	    for($i = count($object->lines) - 1; $i >= 0; $i--)
+	    for ($i = count($object->lines) - 1; $i >= 0; $i--)
 	    {
 		    $lastline = $object->lines[$i];
 
@@ -457,14 +457,14 @@ if ((!empty($conf->service->enabled) || ($object->element == 'contrat')) && $dat
 		print $form->selectDate($date_end, 'date_end', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, 1, "addproduct", 1, 0);
 	};
 
-	if($prefillDates)
+	if ($prefillDates)
     {
         echo ' <span class="small"><a href="#" id="prefill_service_dates">' . $langs->trans('FillWithLastServiceDates') .  '</a></span>';
     }
 
 	print '<script>';
 
-	if($prefillDates)
+	if ($prefillDates)
 	{
 		?>
         function prefill_service_dates()
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index b5d497d28df..86178adeee2 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -102,7 +102,7 @@ $search = array();
 foreach ($object->fields as $key => $val)
 {
 	$search_key = $key;
-	if  ($search_key == 'statut') $search_key = 'status'; // remove this after refactor entrepot.class property statut to status
+	if ($search_key == 'statut') $search_key = 'status'; // remove this after refactor entrepot.class property statut to status
 	if (GETPOST('search_'.$search_key, 'alpha') !== '') $search[$search_key] = GETPOST('search_'.$search_key, 'alpha');
 }
 
@@ -228,7 +228,7 @@ if (!empty($conf->categorie->enabled))
 foreach ($search as $key => $val)
 {
 	$class_key = $key;
-	if  ($class_key == 'status') $class_key = 'statut'; // remove this after refactor entrepot.class property statut to status
+	if ($class_key == 'status') $class_key = 'statut'; // remove this after refactor entrepot.class property statut to status
 	if (($key == 'status' && $search[$key] == -1) || $key=='entity') continue;
 	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
 	if (strpos($object->fields[$key]['type'], 'integer:') === 0) {

From 73c11841957000018c9c8f2e390b21dc711ce027 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 14 Aug 2020 13:23:41 +0200
Subject: [PATCH 55/62] Fix phpcs

---
 htdocs/core/tpl/objectline_create.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 42c5ea0d2a9..8e19e632817 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -432,7 +432,7 @@ if ((!empty($conf->service->enabled) || ($object->element == 'contrat')) && $dat
 	    {
 		    $lastline = $object->lines[$i];
 
-		    if($lastline->product_type == Product::TYPE_SERVICE && (! empty($lastline->date_start) || ! empty($lastline->date_end)))
+		    if ($lastline->product_type == Product::TYPE_SERVICE && (! empty($lastline->date_start) || ! empty($lastline->date_end)))
 		    {
 			    $date_start_prefill = $lastline->date_start;
 			    $date_end_prefill = $lastline->date_end;

From 52b84a3ea25a243ffc2203b8b956dfb16a1cdf9e Mon Sep 17 00:00:00 2001
From: Bernard Saulme <b92@wanadoo.fr>
Date: Fri, 14 Aug 2020 18:08:59 +0200
Subject: [PATCH 56/62] Update functions.lib.php

---
 htdocs/core/lib/functions.lib.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f1de8ba630e..642a839e843 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6071,6 +6071,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__MEMBER_PHONE__'] = $object->phone;
 				$substitutionarray['__MEMBER_PHONEPRO__'] = $object->phone_perso;
 				$substitutionarray['__MEMBER_PHONEMOBILE__'] = $object->phone_mobile;
+				$substitutionarray['__MEMBER_TYPE__'] = $object->type;
 				$substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE__']       = dol_print_date($object->first_subscription_date, 'dayrfc');
 				$substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE_START__'] = dol_print_date($object->first_subscription_date_start, 'dayrfc');
 				$substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE_END__']   = dol_print_date($object->first_subscription_date_end, 'dayrfc');

From 2adac8e23347b00dd6865d69d13d6bde1f4da805 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 14 Aug 2020 21:11:55 +0200
Subject: [PATCH 57/62] CSS

---
 htdocs/theme/eldy/info-box.inc.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index b009d7ef95b..45be80d026b 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -77,7 +77,12 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 	text-align: center;
 	font-size: 45px;
 	line-height: 90px;
-	background: rgba(0, 0, 0, 0.08) !important
+	background: rgba(0, 0, 0, 0.08) !important;
+}
+
+.info-box-module .info-box-icon {
+    padding-top: 5px;
+    padding-bottom: 5px;
 }
 .info-box-sm .info-box-icon {
     height: 80px;
@@ -436,7 +441,7 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
 
 
 .info-box-module .info-box-content {
-	height: 6.4em;
+	height: 98px;
 }
 /* Disabled. This break the responsive on smartphone
 .box{

From 695420eb8b830ecd5fd33925b4c3282c9f5d8137 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 14 Aug 2020 21:18:06 +0200
Subject: [PATCH 58/62] CSS

---
 htdocs/theme/eldy/theme_vars.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index cd88654e309..c28b9a21e0c 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -71,7 +71,7 @@ $colortexttitle = '0,0,0';
 $colortexttitlelink = '10, 20, 100';
 $colortext = '0,0,0';
 $colortextlink = '10, 20, 100';
-$fontsize = '0.86em';
+$fontsize = '0.95em';
 $fontsizesmaller = '0.75em';
 $topMenuFontSize = '1.1em';
 $toolTipBgColor = 'rgba(255, 255, 255, 0.96)';

From f6c1a14d50ce420f3bfb04ed01d99a05ea1cd897 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 14 Aug 2020 21:22:45 +0200
Subject: [PATCH 59/62] CSS

---
 htdocs/langs/en_US/projects.lang | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index a068fe247fe..670fff06f03 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -211,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX

From c407a19563a1a90001a2ca0085402371bc31012e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 16 Aug 2020 22:03:11 +0200
Subject: [PATCH 60/62] Remove type= from script tags

---
 htdocs/core/tpl/admin_extrafields_add.tpl.php        |  2 +-
 htdocs/core/tpl/admin_extrafields_edit.tpl.php       |  2 +-
 htdocs/core/tpl/advtarget.tpl.php                    |  2 +-
 htdocs/core/tpl/ajax/fileupload_main.tpl.php         |  2 +-
 htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php |  2 +-
 htdocs/core/tpl/bloc_showhide.tpl.php                |  2 +-
 htdocs/core/tpl/extrafields_view.tpl.php             |  2 +-
 htdocs/core/tpl/filemanager.tpl.php                  |  2 +-
 htdocs/core/tpl/login.tpl.php                        | 11 +++++------
 htdocs/core/tpl/objectline_create.tpl.php            |  4 ++--
 htdocs/core/tpl/objectline_edit.tpl.php              |  4 ++--
 htdocs/core/tpl/onlinepaymentlinks.tpl.php           |  2 +-
 htdocs/core/tpl/passwordforgotten.tpl.php            | 11 +++++------
 htdocs/public/demo/index.php                         |  6 ++----
 14 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 6c25b5c07b5..616ecb74f40 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -40,7 +40,7 @@ $langs->load("modulebuilder");
 ?>
 
 <!-- BEGIN PHP TEMPLATE admin_extrafields_add.tpl.php -->
-<script type="text/javascript">
+<script>
     jQuery(document).ready(function() {
     	function init_typeoffields(type)
     	{
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index f677197e3df..52ce7124e7c 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -39,7 +39,7 @@ $langs->load("modulebuilder");
 ?>
 
 <!-- BEGIN PHP TEMPLATE admin_extrafields_edit.tpl.php -->
-<script type="text/javascript">
+<script>
     jQuery(document).ready(function() {
     	function init_typeoffields(type)
     	{
diff --git a/htdocs/core/tpl/advtarget.tpl.php b/htdocs/core/tpl/advtarget.tpl.php
index 245cd4f7f00..8f9c8ec83e2 100644
--- a/htdocs/core/tpl/advtarget.tpl.php
+++ b/htdocs/core/tpl/advtarget.tpl.php
@@ -19,7 +19,7 @@ if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 
-print '<script type="text/javascript" language="javascript">
+print '<script>
 	$(document).ready(function() {
 
 		// Click Function
diff --git a/htdocs/core/tpl/ajax/fileupload_main.tpl.php b/htdocs/core/tpl/ajax/fileupload_main.tpl.php
index 4bb9eb8aa2e..8aab549bf33 100644
--- a/htdocs/core/tpl/ajax/fileupload_main.tpl.php
+++ b/htdocs/core/tpl/ajax/fileupload_main.tpl.php
@@ -25,7 +25,7 @@ if (empty($conf) || !is_object($conf))
 ?>
 
 <!-- START TEMPLATE FILE UPLOAD MAIN -->
-<script type="text/javascript">
+<script>
 window.locale = {
     "fileupload": {
         "errors": {
diff --git a/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php b/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php
index 4f435bb2106..61bec967ecf 100644
--- a/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php
+++ b/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php
@@ -31,7 +31,7 @@ if ($object->element == 'propal')
 ?>
 
 <!-- START TEMPLATE IMPORT OBJECT LINKED LINES -->
-<script type="text/javascript">
+<script>
 
 $(document).ready(function(){
 	$('.objectlinked_importbtn').click(function (e) {
diff --git a/htdocs/core/tpl/bloc_showhide.tpl.php b/htdocs/core/tpl/bloc_showhide.tpl.php
index 9ee724d3dda..d654f2b97b3 100644
--- a/htdocs/core/tpl/bloc_showhide.tpl.php
+++ b/htdocs/core/tpl/bloc_showhide.tpl.php
@@ -32,7 +32,7 @@ if (isset($object->extraparams[$blocname]['showhide'])) $hide = (empty($object->
 <!-- BEGIN PHP TEMPLATE bloc_showhide.tpl.php -->
 
 <?php
-print '<script type="text/javascript">'."\n";
+print '<script>'."\n";
 print '$(document).ready(function() {'."\n";
 print '$("#hide-'.$blocname.'").click(function(){'."\n";
 print '		setShowHide(0);'."\n";
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index f3a181f0b2e..4e9ce5d6997 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -207,7 +207,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 	{
 		print "\n";
 		print '
-				<script type="text/javascript">
+				<script>
 				    jQuery(document).ready(function() {
 				    	function showOptions(child_list, parent_list)
 				    	{
diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index 2afdd3c568b..b980ca40cef 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -101,7 +101,7 @@ if ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE
 	if ((empty($section) || $section == -1) && ($module != 'medias'))
 	{
 		?>
-		<script type="text/javascript">
+		<script>
     	jQuery(document).ready(function() {
 			jQuery('#<?php echo $nameforformuserfile ?>').hide();
     	});
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index a12616e2bd5..a4b2ba13ed9 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -79,7 +79,7 @@ if (!empty($conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND)) {
 ?>
 
 <?php if (empty($conf->dol_use_jmobile)) { ?>
-<script type="text/javascript">
+<script>
 $(document).ready(function () {
 	/* Set focus on correct field */
 	<?php if ($focus_element) { ?>$('#<?php echo $focus_element; ?>').focus(); <?php } ?>		// Warning to use this only on visible element
@@ -356,23 +356,22 @@ if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AN_ID))
 	}
 }
 
-// Google Adsense
+// TODO Replace this with a hook
+// Google Adsense (need Google module)
 if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && !empty($conf->global->MAIN_GOOGLE_AD_SLOT))
 {
 	if (empty($conf->dol_use_jmobile))
 	{
 		?>
 	<div class="center"><br>
-		<script type="text/javascript"><!--
+		<script><!--
 			google_ad_client = "<?php echo $conf->global->MAIN_GOOGLE_AD_CLIENT ?>";
 			google_ad_slot = "<?php echo $conf->global->MAIN_GOOGLE_AD_SLOT ?>";
 			google_ad_width = <?php echo $conf->global->MAIN_GOOGLE_AD_WIDTH ?>;
 			google_ad_height = <?php echo $conf->global->MAIN_GOOGLE_AD_HEIGHT ?>;
 			//-->
 		</script>
-		<script type="text/javascript"
-			src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-		</script>
+		<script src="//pagead2.googlesyndication.com/pagead/show_ads.js"></script>
 	</div>
 		<?php
 	}
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 8e19e632817..3b345dfa1a1 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -224,7 +224,7 @@ if ($nolinesbefore) {
 				if (!empty($conf->global->MAIN_AUTO_OPEN_SELECT2_ON_FOCUS_FOR_CUSTOMER_PRODUCTS))
 				{
 					?>
-				<script type="text/javascript">
+				<script>
 					$(document).ready(function(){
 						// On first focus on a select2 combo, auto open the menu (this allow to use the keyboard only)
 						$(document).on('focus', '.select2-selection.select2-selection--single', function (e) {
@@ -259,7 +259,7 @@ if ($nolinesbefore) {
 				if (!empty($conf->global->MAIN_AUTO_OPEN_SELECT2_ON_FOCUS_FOR_SUPPLIER_PRODUCTS))
 				{
 					?>
-				<script type="text/javascript">
+				<script>
 					$(document).ready(function(){
 						// On first focus on a select2 combo, auto open the menu (this allow to use the keyboard only)
 						$(document).on('focus', '.select2-selection.select2-selection--single', function (e) {
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index ba63288b58f..86cb472da43 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -272,7 +272,7 @@ if (!empty($extrafields))
 	print $form->selectDate($line->date_start, 'date_start', $hourmin, $hourmin, $line->date_start ? 0 : 1, "updateline", 1, 0);
 	print ' '.$langs->trans('to').' ';
 	print $form->selectDate($line->date_end, 'date_end', $hourmin, $hourmin, $line->date_end ? 0 : 1, "updateline", 1, 0);
-	print '<script type="text/javascript">';
+	print '<script>';
 	if (!$line->date_start) {
 		if (isset($conf->global->MAIN_DEFAULT_DATE_START_HOUR)) {
 			print 'jQuery("#date_starthour").val("'.$conf->global->MAIN_DEFAULT_DATE_START_HOUR.'");';
@@ -297,7 +297,7 @@ if (!empty($extrafields))
 ?>
 
 
-<script type="text/javascript">
+<script>
 
 jQuery(document).ready(function()
 {
diff --git a/htdocs/core/tpl/onlinepaymentlinks.tpl.php b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
index 32720a39ede..d34b2da6b29 100644
--- a/htdocs/core/tpl/onlinepaymentlinks.tpl.php
+++ b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
@@ -148,7 +148,7 @@ if (!empty($conf->don->enabled))
 
 if (!empty($conf->use_javascript_ajax))
 {
-	print "\n".'<script type="text/javascript">';
+	print "\n".'<script>';
 	print '$(document).ready(function () {
 		$("#generate_token").click(function() {
             	$.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 5cd672ddea4..84abd97bc14 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -58,7 +58,7 @@ $colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1)); // Normalize
 <body class="body bodylogin"<?php print empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: url(\''.DOL_URL_ROOT.'/viewimage.php?cache=1&noalt=1&modulepart=mycompany&file='.urlencode('logos/'.$conf->global->MAIN_LOGIN_BACKGROUND).'\')"'; ?>>
 
 <?php if (empty($conf->dol_use_jmobile)) { ?>
-<script type="text/javascript">
+<script>
 $(document).ready(function () {
 	// Set focus on correct field
 	<?php if ($focus_element) { ?>$('#<?php echo $focus_element; ?>').focus(); <?php } ?>		// Warning to use this only on visible element
@@ -246,23 +246,22 @@ if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AN_ID))
 	}
 }
 
-// Google Adsense
+// TODO Replace this with a hook
+// Google Adsense (need Google module)
 if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && !empty($conf->global->MAIN_GOOGLE_AD_SLOT))
 {
 	if (empty($conf->dol_use_jmobile))
 	{
 		?>
 	<div class="center"><br>
-		<script type="text/javascript"><!--
+		<script><!--
 			google_ad_client = "<?php echo $conf->global->MAIN_GOOGLE_AD_CLIENT ?>";
 			google_ad_slot = "<?php echo $conf->global->MAIN_GOOGLE_AD_SLOT ?>";
 			google_ad_width = <?php echo $conf->global->MAIN_GOOGLE_AD_WIDTH ?>;
 			google_ad_height = <?php echo $conf->global->MAIN_GOOGLE_AD_HEIGHT ?>;
 			//-->
 		</script>
-		<script type="text/javascript"
-			src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-		</script>
+		<script	src="//pagead2.googlesyndication.com/pagead/show_ads.js"></script>
 	</div>
 		<?php
 	}
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 3773a530691..e69f08d10e7 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -417,16 +417,14 @@ if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AD_CLIEN
 	if (empty($conf->dol_use_jmobile))
 	{
 		print '<div align="center">'."\n";
-		print '<script type="text/javascript"><!--'."\n";
+		print '<script><!--'."\n";
 		print 'google_ad_client = "'.$conf->global->MAIN_GOOGLE_AD_CLIENT.'";'."\n";
 		print 'google_ad_slot = "'.$conf->global->MAIN_GOOGLE_AD_SLOT.'";'."\n";
 		print 'google_ad_width = '.$conf->global->MAIN_GOOGLE_AD_WIDTH.';'."\n";
 		print 'google_ad_height = '.$conf->global->MAIN_GOOGLE_AD_HEIGHT.';'."\n";
 		print '//-->'."\n";
 		print '</script>'."\n";
-		print '<script type="text/javascript"'."\n";
-		print 'src="http://pagead2.googlesyndication.com/pagead/show_ads.js">'."\n";
-		print '</script>'."\n";
+		print '<script src="//pagead2.googlesyndication.com/pagead/show_ads.js"></script>'."\n";
 		print '</div>'."\n";
 	} else {
 		print '<!-- google js advert tag disabled with jmobile -->'."\n";

From 99809b487e042ac55d5e8159a2fabc1b8ecdd02f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 16 Aug 2020 23:33:50 +0200
Subject: [PATCH 61/62] Standardize code

---
 htdocs/accountancy/admin/fiscalyear.php |  9 ++-
 htdocs/core/class/fiscalyear.class.php  | 75 +++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index b5cc46a3d0d..89aad6e2d0d 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -79,6 +79,7 @@ $object = new Fiscalyear($db);
 $max = 100;
 
 $form = new Form($db);
+$fiscalyearstatic = new Fiscalyear($db);
 
 $title = $langs->trans('AccountingPeriods');
 $helpurl = "";
@@ -132,13 +133,15 @@ if ($result)
 	print '</tr>';
 
 	if ($num) {
-		$fiscalyearstatic = new Fiscalyear($db);
-
 		while ($i < $num && $i < $max) {
 			$obj = $db->fetch_object($result);
+
 			$fiscalyearstatic->id = $obj->rowid;
+
 			print '<tr class="oddeven">';
-			print '<td><a href="fiscalyear_card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowFiscalYear"), "technic").' '.$obj->rowid.'</a></td>';
+			print '<td>';
+			print $fiscalyearstatic->getNomUrl(1);
+			print '</td>';
 			print '<td class="left">'.$obj->label.'</td>';
 			print '<td class="left">'.dol_print_date($db->jdate($obj->date_start), 'day').'</td>';
 			print '<td class="left">'.dol_print_date($db->jdate($obj->date_end), 'day').'</td>';
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index 0686b68115a..c0216f16a19 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -35,6 +35,8 @@ class Fiscalyear extends CommonObject
 	 */
 	public $element = 'fiscalyear';
 
+	public $picto = 'technic';
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
@@ -97,6 +99,7 @@ class Fiscalyear extends CommonObject
 	public $statuts = array();
 	public $statuts_short = array();
 
+
 	/**
 	 * Constructor
 	 *
@@ -267,6 +270,78 @@ class Fiscalyear extends CommonObject
 		}
 	}
 
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      int			$withpicto                Add picto into link
+	 *  @param	    int   	    $notooltip		          1=Disable tooltip
+	 *  @param      int         $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return     string          			          String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $notooltip = 0, $save_lastsearch_value = -1)
+	{
+		global $conf, $langs, $user;
+
+		if (empty($this->ref)) $this->ref = $this->id;
+
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+
+		$result = '';
+
+		$url = DOL_URL_ROOT.'/accountancy/admin/fiscalyear_card.php?id='.$this->id;
+
+		if (!$user->rights->accounting->fiscalyear->write)
+			$option = 'nolink';
+
+		if ($option !== 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
+
+		if ($short) return $url;
+
+		$label = '';
+
+		if ($user->rights->accounting->fiscalyear->write) {
+			$label = '<u>'.$langs->trans("FiscalPeriod").'</u>';
+			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->id;
+			if (isset($this->statut)) {
+				$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
+			}
+		}
+
+		$linkclose = '';
+		if (empty($notooltip) && $user->rights->accounting->fiscalyear->write)
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("FiscalYear");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip"';
+		}
+
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
+
+		if ($option === 'nolink') {
+			$linkstart = '';
+			$linkend = '';
+		}
+
+		$result .= $linkstart;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
+		$result .= $linkend;
+
+		return $result;
+	}
+
 	/**
 	 * Give a label from a status
 	 *

From d2db1a3557ac221f5d5d5b0f824334934fd32d10 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 16 Aug 2020 23:38:19 +0200
Subject: [PATCH 62/62] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d15808d2cac..17d56c6ec62 100644
--- a/README.md
+++ b/README.md
@@ -142,7 +142,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - customizable Dashboard
 - Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
 
-- SOAP & REST APIs
+- APIs
 - Code that is easy to understand, maintain and develop (PHP with no heavy framework; trigger and hook architecture)
 - Support a lot of country specific features:
   - Spanish Tax RE and ISPF