From bd3a64d5802418ddffb548587c397134cb7b1e11 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 30 Jan 2014 01:35:01 +0100
Subject: [PATCH] Add test ($conf->global->FEATURES_LEVEL >= 2) for extrafields
on detailed lines because this feature is currently bugged. Should work when
the 2 forms (predefined product and free product) will be merged into one
(planned for 3.6)
---
htdocs/core/lib/invoice.lib.php | 4 +++-
htdocs/core/lib/order.lib.php | 3 +++
htdocs/core/lib/propal.lib.php | 3 +++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 3ad2787826f..7c4f4c0c99b 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -132,11 +132,13 @@ function invoice_admin_prepare_head($object)
$head[$h][2] = 'attributes';
$h++;
+ if ($conf->global->FEATURES_LEVEL >= 2) // FIXME This feature will works when form for predefined and free product will be merged, otherwise there is duplicate fields with same name
+ {
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/admin/facturedet_cust_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFieldsLines");
$head[$h][2] = 'attributeslines';
$h++;
-
+ }
complete_head_from_modules($conf,$langs,$object,$head,$h,'invoice_admin','remove');
diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index 216887139d4..535b77a3ee3 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -138,10 +138,13 @@ function order_admin_prepare_head($object)
$head[$h][2] = 'attributes';
$h++;
+ if ($conf->global->FEATURES_LEVEL >= 2) // FIXME This feature will works when form for predefined and free product will be merged, otherwise there is duplicate fields with same name
+ {
$head[$h][0] = DOL_URL_ROOT.'/admin/orderdet_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFieldsLines");
$head[$h][2] = 'attributeslines';
$h++;
+ }
complete_head_from_modules($conf,$langs,$object,$head,$h,'order_admin','remove');
diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
index d43885adf95..2e0da1e4ff6 100644
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -136,10 +136,13 @@ function propal_admin_prepare_head($object)
$head[$h][2] = 'attributes';
$h++;
+ if ($conf->global->FEATURES_LEVEL >= 2) // FIXME This feature will works when form for predefined and free product will be merged, otherwise there is duplicate fields with same name
+ {
$head[$h][0] = DOL_URL_ROOT.'/comm/admin/propaldet_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFieldsLines");
$head[$h][2] = 'attributeslines';
$h++;
+ }
complete_head_from_modules($conf,$langs,$object,$head,$h,'propal_admin','remove');
--
GitLab