From 8aab392369c2242e4d7b5b5d6dcbe2a5a6b44ce4 Mon Sep 17 00:00:00 2001
From: FLIO <oflifli@nltechno.com>
Date: Tue, 29 Nov 2022 22:44:00 +0100
Subject: [PATCH 1/5] Fix(scrutinizer)
 https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/societe/price.php?selectedLabels%5B0%5D=9&selectedSeverities%5B0%5D=10&orderField=lastFound&order=desc&honorSelectedPaths=0

---
 htdocs/societe/class/societe.class.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index fa6d77ad485..fff6daf3ce6 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -504,6 +504,12 @@ class Societe extends CommonObject
 	 */
 	public $tva_intra;
 
+	public $tva_npr;
+
+	public $tva_tx;
+
+	public $price_base_type;
+
 	// Local taxes
 	public $localtax1_assuj;
 	public $localtax1_value;

From abe8c56ace97fdbd2adec977c9d68d6c0f4d5a56 Mon Sep 17 00:00:00 2001
From: FLIO <oflifli@nltechno.com>
Date: Wed, 1 Feb 2023 12:46:49 +0100
Subject: [PATCH 2/5] fix (scrutinizer) remove my edit

---
 htdocs/societe/class/societe.class.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index fff6daf3ce6..8d09012ccec 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -504,8 +504,6 @@ class Societe extends CommonObject
 	 */
 	public $tva_intra;
 
-	public $tva_npr;
-
 	public $tva_tx;
 
 	public $price_base_type;

From 8dc4ed05cad3b6548cc8508fb17f5196d9545597 Mon Sep 17 00:00:00 2001
From: FLIO <oflifli@nltechno.com>
Date: Wed, 1 Feb 2023 12:54:26 +0100
Subject: [PATCH 3/5] fix (scrutinizer) remove my edit

---
 htdocs/societe/class/societe.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 8d09012ccec..fff6daf3ce6 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -504,6 +504,8 @@ class Societe extends CommonObject
 	 */
 	public $tva_intra;
 
+	public $tva_npr;
+
 	public $tva_tx;
 
 	public $price_base_type;

From c19d259d46c11f068fe6e9489080c620a9834b37 Mon Sep 17 00:00:00 2001
From: FLIO <oflifli@nltechno.com>
Date: Wed, 1 Feb 2023 12:55:32 +0100
Subject: [PATCH 4/5] fix (scrutinizer) remove my edit

---
 htdocs/societe/class/societe.class.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index fff6daf3ce6..8d09012ccec 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -504,8 +504,6 @@ class Societe extends CommonObject
 	 */
 	public $tva_intra;
 
-	public $tva_npr;
-
 	public $tva_tx;
 
 	public $price_base_type;

From 465a88738e15d52386cd9743ddde4fb44ce1057d Mon Sep 17 00:00:00 2001
From: FLIO <oflifli@nltechno.com>
Date: Wed, 15 Feb 2023 15:39:49 +0100
Subject: [PATCH 5/5] fix (scrutinizer) deletion of the variables add in
 company

---
 htdocs/societe/class/societe.class.php | 4 ----
 htdocs/societe/price.php               | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 8d09012ccec..fa6d77ad485 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -504,10 +504,6 @@ class Societe extends CommonObject
 	 */
 	public $tva_intra;
 
-	public $tva_tx;
-
-	public $price_base_type;
-
 	// Local taxes
 	public $localtax1_assuj;
 	public $localtax1_value;
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index af2898a8556..dafe53a19d8 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -321,7 +321,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 		// VAT
 		print '<tr><td>'.$langs->trans("VATRate").'</td><td>';
-		print $form->load_tva("tva_tx", $object->tva_tx, $mysoc, '', $object->id, $object->tva_npr, '', false, 1);
+		print $form->load_tva("tva_tx", GETPOST("tva_tx", "alpha"), $mysoc, '', $object->id, 0, '', false, 1);
 		print '</td></tr>';
 
 		// Price base
@@ -329,7 +329,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print $langs->trans('PriceBase');
 		print '</td>';
 		print '<td>';
-		print $form->selectPriceBaseType($object->price_base_type, "price_base_type");
+		print $form->selectPriceBaseType(GETPOST("price_base_type", "aZ09"), "price_base_type");
 		print '</td>';
 		print '</tr>';