From 58de8c9149d91dc21de35aca2d6386c14cc3b73d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 1 Oct 2020 17:04:24 +0200 Subject: [PATCH] Close #14885 Merge manualy the PR to solve a conflict. --- htdocs/fourn/class/fournisseur.facture.class.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 156f2a9a1df..23f0cc1f3ea 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -34,7 +34,7 @@ * \brief File of class to manage suppliers invoices */ -include_once DOL_DOCUMENT_ROOT.'/core/class/commoninvoice.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/commoninvoice.class.php'; require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; @@ -765,7 +765,7 @@ class FactureFournisseur extends CommonInvoice $sql .= ', f.localtax1_tx, f.localtax2_tx, f.localtax1_type, f.localtax2_type, f.total_localtax1, f.total_localtax2, f.fk_facture_fourn '; $sql .= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit'; $sql .= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc'; - $sql .= ', f.fk_multicurrency, f.multicurrency_code, f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc'; + $sql .= ', fk_code_ventilation, f.fk_multicurrency, f.multicurrency_code, f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc'; $sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det as f'; $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid'; $sql .= ' WHERE fk_facture_fourn='.$this->id; @@ -825,6 +825,10 @@ class FactureFournisseur extends CommonInvoice $line->rang = $obj->rang; $line->fk_unit = $obj->fk_unit; + // Accountancy + $line->code_ventilation = $obj->fk_code_ventilation; + $line->fk_accounting_account = $obj->fk_code_ventilation; + // Multicurrency $line->fk_multicurrency = $obj->fk_multicurrency; $line->multicurrency_code = $obj->multicurrency_code;