From 29a4900d0b24fbfd17e27e1c05db297cad8ffcbb Mon Sep 17 00:00:00 2001 From: atm-quentin Date: Wed, 26 Jul 2017 15:20:31 +0200 Subject: [PATCH 1/2] FIX_next_situation_keep_extrafields --- htdocs/compta/facture/class/facture.class.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index c410e507b96..4b0ba1ac2b7 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -748,6 +748,10 @@ class Facture extends CommonInvoice // Charge facture source $facture=new Facture($this->db); + + foreach($this->lines as $line){ + $line->fetch_optionals();//fetch extrafields + } $facture->fk_facture_source = $this->fk_facture_source; $facture->type = $this->type; From 09a11180369fa20b2b022d8e264239006fb8a0bb Mon Sep 17 00:00:00 2001 From: atm-quentin Date: Wed, 26 Jul 2017 15:55:50 +0200 Subject: [PATCH 2/2] FIX extrafields for invoice too --- htdocs/compta/facture/class/facture.class.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 4b0ba1ac2b7..221f224e043 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -749,7 +749,12 @@ class Facture extends CommonInvoice // Charge facture source $facture=new Facture($this->db); - foreach($this->lines as $line){ + $this->fetch_optionals(); + if(!empty($this->array_options)){ + $facture->array_options = $this->array_options; + } + + foreach($this->lines as &$line){ $line->fetch_optionals();//fetch extrafields }