From 5f6437cbde2bac5d408b7f8ff5b21b8373bfbd77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 24 Mar 2022 10:46:30 +0100
Subject: [PATCH 1/3] remove debug

---
 htdocs/partnership/partnership_list.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index dc9958fa3df..0f4aa61f621 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -245,10 +245,8 @@ if (empty($reshook)) {
 		$nbok = 0;
 		foreach ($toselect as $toselectid) {
 			$result = $objecttmp->fetch($toselectid);
-			var_dump($objecttmp->status);
 			if ($result > 0) {
 				$result = $objecttmp->cancel($user, 0);
-				var_dump($result);
 				if ($result == 0) {
 					setEventMessages($langs->trans('StatusOfRefMustBe', $objecttmp->ref, $objecttmp->LibStatut($objecttmp::STATUS_APPROVED)), null, 'warnings');
 					$error++;

From e157dc117db796e51061982685d8a03968e21c57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 24 Mar 2022 10:51:01 +0100
Subject: [PATCH 2/3] replace debug

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

diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 935b8deb83d..ebb46d775c7 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2014-2020  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2015       Charlie BENKE           <charlie@patas-monkey.com>
- * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2022  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -270,7 +270,7 @@ if ($action == 'add' && empty($cancel)) {
 
 		$ret = $object->create($user);
 		if ($ret < 0) {
-			var_dump($ret);
+			setEventMessages($object->error, $object->errors, 'errors');
 			$error++;
 		}
 		if (!empty($auto_create_paiement) && !$error) {

From ef204b26206f9bfbc489d3afc21c634b19eb36fe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Mar 2022 12:52:04 +0100
Subject: [PATCH 3/3] Fix column conditions

---
 htdocs/mrp/mo_production.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index bc1a0457325..1c6f3f7ec39 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -735,9 +735,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			print $langs->trans("Warehouse");
 		}
 		print '</td>';
-		if ($conf->productbatch->enabled) {
+		if ($conf->stock->enabled) {
 			// Available
-			print '<td>';
+			print '<td align="right">';
 			if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
 				print $langs->trans("Stock");
 			}
@@ -958,12 +958,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						}
 
 						// Lot Batch
-						print '<td>';
-						if ($line2['batch'] != '') {
-							$tmpbatch->fetch(0, $line2['fk_product'], $line2['batch']);
-							print $tmpbatch->getNomUrl(1);
+						if ($conf->productbatch->enabled) {
+							print '<td>';
+							if ($line2['batch'] != '') {
+								$tmpbatch->fetch(0, $line2['fk_product'], $line2['batch']);
+								print $tmpbatch->getNomUrl(1);
+							}
+							print '</td>';
 						}
-						print '</td>';
 
 						// Action delete line
 						if ($permissiontodelete) {