From dbbebba4977fca4fa93dfe9fe6a3d96f61df30a1 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 8 Feb 2021 20:44:40 +0100
Subject: [PATCH] this->errors is set on triggers action must be set by callers

---
 htdocs/comm/propal/class/propal.class.php                  | 5 ++++-
 htdocs/commande/class/commande.class.php                   | 1 +
 htdocs/compta/bank/class/account.class.php                 | 3 ++-
 htdocs/compta/facture/class/facture.class.php              | 2 ++
 htdocs/expensereport/class/expensereport.class.php         | 3 +++
 htdocs/supplier_proposal/class/supplier_proposal.class.php | 1 +
 6 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 9d6b6c201c5..34987cc1b0a 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -483,6 +483,7 @@ class Propal extends CommonObject
 			else
 			{
 				$this->error = $line->error;
+				$this->errors = $line->errors;
 				$this->db->rollback();
 				return -2;
 			}
@@ -727,6 +728,7 @@ class Propal extends CommonObject
             else
             {
                 $this->error = $this->line->error;
+				$this->errors = $this->line->errors;
                 $this->db->rollback();
                 return -2;
             }
@@ -924,7 +926,7 @@ class Propal extends CommonObject
 			else
 			{
 				$this->error = $this->line->error;
-
+				$this->errors = $this->line->errors;
 				$this->db->rollback();
 				return -1;
 			}
@@ -4424,3 +4426,4 @@ class PropaleLigne extends CommonObjectLine
 		}
 	}
 }
+
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 49f8005980f..4dae8711b34 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -2002,6 +2002,7 @@ class Commande extends CommonOrder
 			else
 			{
 				$this->error = $line->error;
+				$this->errors = $line->errors;
 				$this->db->rollback();
 				return -2;
 			}
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 31d7749a430..ef81ef452c7 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -581,7 +581,8 @@ class Account extends CommonObject
 
 			return $accline->id;
 		} else {
-			$this->error = $this->db->lasterror();
+			$this->error = $accline->error;
+			$this->errors = $accline->errors;
 			$this->db->rollback();
 
 			return -2;
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 392817b0368..8eb749b1d6b 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -783,6 +783,7 @@ class Facture extends CommonInvoice
 					if ($result < 0)
 					{
 						$this->error = $newinvoiceline->error;
+						$this->errors = $newinvoiceline->errors;
 						$error++;
 						break;
 					}
@@ -3227,6 +3228,7 @@ class Facture extends CommonInvoice
 			else
 			{
 				$this->error = $this->line->error;
+				$this->errors = $this->line->errors;
 				$this->db->rollback();
 				return -2;
 			}
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 3c18805362f..abb91fe5a6b 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -318,6 +318,7 @@ class ExpenseReport extends CommonObject
         	            if ($result < 0)
         	            {
         	                $this->error = $newndfline->error;
+							$this->errors = $newndfline->errors;
         	                $error++;
         	                break;
         	            }
@@ -2948,3 +2949,5 @@ function select_type_fees_id($selected = '', $htmlname = 'type', $showempty = 0,
     }
     print '</select>';
 }
+
+
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 9822c171cd8..d28a0ef3b72 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -636,6 +636,7 @@ class SupplierProposal extends CommonObject
             else
             {
                 $this->error = $this->line->error;
+                $this->errors = $this->line->errors;
                 $this->db->rollback();
                 return -2;
             }