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 08:44:29 +02:00
commit f1e98f2d35
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/bom/bom_card.php
View File

@ -183,7 +183,7 @@ if (empty($reshook)) {
// We check if we're allowed to add this bom // We check if we're allowed to add this bom
$TParentBom=array(); $TParentBom=array();
$object->getParentBomTreeRecursive($TParentBom, $object->id); $object->getParentBomTreeRecursive($TParentBom, $object->id);
if($bom_child_id > 0 && !empty($TParentBom) && in_array($bom_child_id, $TParentBom)) { if ($bom_child_id > 0 && !empty($TParentBom) && in_array($bom_child_id, $TParentBom)) {
$n_child = new BOM($db); $n_child = new BOM($db);
$n_child->fetch($bom_child_id); $n_child->fetch($bom_child_id);
setEventMessages($langs->transnoentities('BomCantAddChildBom', $n_child->getNomUrl(1), $object->getNomUrl(1)), null, 'errors'); setEventMessages($langs->transnoentities('BomCantAddChildBom', $n_child->getNomUrl(1), $object->getNomUrl(1)), null, 'errors');

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

@ -1155,7 +1155,8 @@ class BOM extends CommonObject
* @param int $bom_id ID of bom from which we want to get parent bom ids * @param int $bom_id ID of bom from which we want to get parent bom ids
* @return void * @return void
*/ */
public function getParentBomTreeRecursive(&$TParentBom, $bom_id) { public function getParentBomTreeRecursive(&$TParentBom, $bom_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
@ -1163,17 +1164,12 @@ class BOM extends CommonObject
WHERE fk_bom_child = '.((int) $bom_id); WHERE fk_bom_child = '.((int) $bom_id);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if(!empty($resql)) { if (!empty($resql)) {
while ($res = $this->db->fetch_object($resql)) {
while($res = $this->db->fetch_object($resql)) {
$TParentBom[$res->fk_bom] = $res->fk_bom; $TParentBom[$res->fk_bom] = $res->fk_bom;
$this->getParentBomTreeRecursive($TParentBom, $res->fk_bom); $this->getParentBomTreeRecursive($TParentBom, $res->fk_bom);
} }
} }
} }
} }