Skip to content

Commit

Permalink
Add test ($conf->global->FEATURES_LEVEL >= 2) for extrafields on
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
eldy committed Jan 30, 2014
1 parent 1de5cb1 commit bd3a64d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
4 changes: 3 additions & 1 deletion htdocs/core/lib/invoice.lib.php
Expand Up @@ -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');

Expand Down
3 changes: 3 additions & 0 deletions htdocs/core/lib/order.lib.php
Expand Up @@ -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');

Expand Down
3 changes: 3 additions & 0 deletions htdocs/core/lib/propal.lib.php
Expand Up @@ -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');

Expand Down

0 comments on commit bd3a64d

Please sign in to comment.