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

Resolve merge conflicts

Browse Source
This commit is contained in:
kevin 2022-04-08 09:54:17 +02:00
commit 6a8e3761c3
2 changed files with 65 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/mrp/class/mo.class.php
View File

@ -795,8 +795,7 @@ class Mo extends CommonObject
$this->db->commit(); $this->db->commit();
} }
return $moline->delete($user, $notrigger); return $moline->delete($user, $notrigger);
} } else {
else {
foreach ($arrayoflines as $key => $arrayofline) { foreach ($arrayoflines as $key => $arrayofline) {
$lineDetails = $arrayoflines[$key]; $lineDetails = $arrayoflines[$key];
$productstatic->fetch($lineDetails['fk_product']); $productstatic->fetch($lineDetails['fk_product']);
@ -821,8 +820,7 @@ class Mo extends CommonObject
} }
return $this->deleteLineCommon($user, $idline, $notrigger); return $this->deleteLineCommon($user, $idline, $notrigger);
} }
} } else {
else {
return $this->deleteLineCommon($user, $idline, $notrigger); return $this->deleteLineCommon($user, $idline, $notrigger);
} }
} }