From 35f32391a0310834d77c6d9e914837b570de1cd5 Mon Sep 17 00:00:00 2001
From: atm-lena <lena@atm-consulting.fr>
Date: Tue, 10 Mar 2020 14:46:15 +0100
Subject: [PATCH 1/4] FIX - Clone Fourn Command, add line's extrafields

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

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index a4283ee5162..377151536b7 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1288,6 +1288,10 @@ class CommandeFournisseur extends CommonOrder
 
 		$this->db->begin();
 
+        // get extrafields so they will be clone
+        foreach($this->lines as $line)
+            $line->fetch_optionals($line->rowid);
+
 		// Load source object
 		$objFrom = clone $this;
 

From 6d1f62c1d95f0090e0150689c3e0484b91a7805f Mon Sep 17 00:00:00 2001
From: Florian Mortgat <florian.mortgat@atm-consulting.fr>
Date: Wed, 11 Mar 2020 11:03:19 +0100
Subject: [PATCH 2/4] FIX 10.0 - status missing from last customer invoices box
 when using MAIN_STATUS_USES_CSS

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

diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 34070520aa5..25f357ce06b 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -332,13 +332,13 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
                             if (! empty($contents[$i][$j]['maxlength'])) $maxlength=$contents[$i][$j]['maxlength'];
 
                             if ($maxlength) $textwithnotags=dol_trunc($textwithnotags, $maxlength);
-                            if (preg_match('/^<img/i', $text) || preg_match('/^<div/i', $text) || ! empty($contents[$i][$j]['asis'])) $out.= $text;   // show text with no html cleaning
+                            if (preg_match('/^<(img|div|span)/i', $text) || ! empty($contents[$i][$j]['asis'])) $out.= $text;   // show text with no html cleaning
                             else $out.= $textwithnotags;                // show text with html cleaning
 
                             // End Url
                             if (! empty($contents[$i][$j]['url'])) $out.= '</a>';
 
-                            if (preg_match('/^<img/i', $text2) || preg_match('/^<div/i', $text2) || ! empty($contents[$i][$j]['asis2'])) $out.= $text2; // show text with no html cleaning
+                            if (preg_match('/^<(img|div|span)/i', $text2) || ! empty($contents[$i][$j]['asis2'])) $out.= $text2; // show text with no html cleaning
                             else $out.= $text2withnotags;               // show text with html cleaning
 
                             if (! empty($textnoformat)) $out.= "\n".$textnoformat."\n";

From ce01cf278d7a3d32c2ce850c7e0c874aaf057551 Mon Sep 17 00:00:00 2001
From: Florian Mortgat <florian.mortgat@atm-consulting.fr>
Date: Wed, 11 Mar 2020 11:45:57 +0100
Subject: [PATCH 3/4] FIX 10.0 - translations for "orders" not loaded in the
 homepage box

---
 htdocs/core/boxes/box_commandes.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index 956e73b4acf..31a7b8d33de 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -72,6 +72,7 @@ class box_commandes extends ModeleBoxes
     public function loadBox($max = 5)
     {
         global $user, $langs, $db, $conf;
+        $langs->load('orders');
 
         $this->max = $max;
 

From 20aa51f26bdc69b2aa1dadeb878a0f624d08339b Mon Sep 17 00:00:00 2001
From: atm-lena <lena@atm-consulting.fr>
Date: Wed, 11 Mar 2020 15:26:49 +0100
Subject: [PATCH 4/4] FIX - Clone Fourn Command, add line's extrafields Part 2

---
 htdocs/fourn/class/fournisseur.commande.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 377151536b7..0f91b021e00 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1178,7 +1178,7 @@ class CommandeFournisseur extends CommonOrder
                         false,
 	                    $this->lines[$i]->date_start,
                         $this->lines[$i]->date_end,
-                        0,
+                        $this->lines[$i]->array_options,
                         $this->lines[$i]->fk_unit
 	                );
 	                if ($result < 0)