From 5e8e4551fb0ecfbe3c6cbd1d935cbd3c728d8e4d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 31 Jan 2023 20:07:08 +0100 Subject: [PATCH] Debug v17 --- htdocs/bom/bom_card.php | 10 +++++----- htdocs/bom/tpl/objectline_create.tpl.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php index dcb5d02b260..9aa7d084ef1 100644 --- a/htdocs/bom/bom_card.php +++ b/htdocs/bom/bom_card.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2017-2023 Laurent Destailleur * Copyright (C) 2019 Frédéric France * * This program is free software; you can redistribute it and/or modify @@ -565,7 +565,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea */ if (!empty($object->table_element_line)) { - //Products + // Products $res = $object->fetchLinesbytypeproduct(0); $object->calculateCosts(); @@ -613,7 +613,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea print "\n"; - //Services + // Services $filtertype = 1; $res = $object->fetchLinesbytypeproduct(1); $object->calculateCosts(); @@ -657,9 +657,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) { print ''; } - print ''; + print ''; - print "\n"; + print "\n"; mrpCollapseBomManagement(); diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php index e644c7813e7..b57196bb9a8 100644 --- a/htdocs/bom/tpl/objectline_create.tpl.php +++ b/htdocs/bom/tpl/objectline_create.tpl.php @@ -107,7 +107,7 @@ print ''; if (isModEnabled("product") || isModEnabled("service")) { if ($filtertype == 1) { print $langs->trans("Service"); - } elseif (!empty($conf->global->BOM_SUB_BOM)) { + } else { print $langs->trans("Product"); } echo '';