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

Merge branch 'FIX/check_if_allowed_to_add_bom_as_bomline' of github.com:atm-gauthier/dolibarr into FIX/check_if_allowed_to_add_bom_as_bomline

Browse Source
This commit is contained in:
Gauthier PC portable 024 2022-09-02 11:57:44 +02:00
commit 4c15dafa14
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/bom/class/bom.class.php
View File

@ -1156,7 +1156,7 @@ class BOM extends CommonObject
* @param int $level Protection against infinite loop * @param int $level Protection against infinite loop
* @return void * @return void
*/ */
public function getParentBomTreeRecursive(&$TParentBom, $bom_id='', $level=1) public function getParentBomTreeRecursive(&$TParentBom, $bom_id = '', $level = 1)
{ {
// Protection against infinite loop // Protection against infinite loop
@ -1164,7 +1164,7 @@ class BOM extends CommonObject
return; return;
} }
if(empty($bom_id)) $bom_id=$this->id; if (empty($bom_id)) $bom_id=$this->id;
$sql = 'SELECT l.fk_bom, b.label $sql = 'SELECT l.fk_bom, b.label
FROM '.MAIN_DB_PREFIX.'bom_bomline l FROM '.MAIN_DB_PREFIX.'bom_bomline l