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

htdocs/bom/bom_card.php

@@ -183,7 +183,7 @@ if (empty($reshook)) {
 		// We check if we're allowed to add this bom
 		$TParentBom=array();
 		$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->fetch($bom_child_id);
 			setEventMessages($langs->transnoentities('BomCantAddChildBom', $n_child->getNomUrl(1), $object->getNomUrl(1)), null, 'errors');

htdocs/bom/class/bom.class.php

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