lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debug v17

Browse Source
This commit is contained in:
Laurent Destailleur 2023-01-31 20:07:08 +01:00
parent 99f26b49b7
commit 5e8e4551fb
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/bom/bom_card.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2017-2020 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2017-2023 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2019 Frédéric France <frederic.france@netlogic.fr> * Copyright (C) 2019 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * 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)) { if (!empty($object->table_element_line)) {
//Products // Products
$res = $object->fetchLinesbytypeproduct(0); $res = $object->fetchLinesbytypeproduct(0);
$object->calculateCosts(); $object->calculateCosts();
@ -613,7 +613,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print "</form>\n"; print "</form>\n";
//Services // Services
$filtertype = 1; $filtertype = 1;
$res = $object->fetchLinesbytypeproduct(1); $res = $object->fetchLinesbytypeproduct(1);
$object->calculateCosts(); $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')) { if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
print '</table>'; print '</table>';
} }
print '</div>'; print '</div>';
print "</form>\n"; print "</form>\n";
mrpCollapseBomManagement(); mrpCollapseBomManagement();

2
htdocs/bom/tpl/objectline_create.tpl.php
View File

@ -107,7 +107,7 @@ print '<td class="bordertop nobottom linecoldescription minwidth500imp">';
if (isModEnabled("product") || isModEnabled("service")) { if (isModEnabled("product") || isModEnabled("service")) {
if ($filtertype == 1) { if ($filtertype == 1) {
print $langs->trans("Service"); print $langs->trans("Service");
} elseif (!empty($conf->global->BOM_SUB_BOM)) { } else {
print $langs->trans("Product"); print $langs->trans("Product");
} }
echo '<span class="prod_entry_mode_predef">'; echo '<span class="prod_entry_mode_predef">';