From 44347d46cc622eeda30a624c2bc6d35c1b026741 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Thu, 23 Feb 2017 16:21:58 +0100
Subject: [PATCH] [Fixed] getMachineWorkingInformation() was implemented with
 'static' machine id -> now dynamic

---
 build/database/repo/action_merge.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build/database/repo/action_merge.php b/build/database/repo/action_merge.php
index dda1efb..1e80fc0 100755
--- a/build/database/repo/action_merge.php
+++ b/build/database/repo/action_merge.php
@@ -177,6 +177,7 @@
 
 			//TODO: GROUP_CONCAT(DISTINCT a.id_action ORDER BY a.id_action ASC)
 			$u = Table::get('user')
+				->whereIdWarehouse($id_warehouse)
 				->select('id_user')
 				->select('code');
 
@@ -184,7 +185,8 @@
 				->join('id_user', $u);
 
 			$m = Table::get('machine')
-				->whereId(5);
+				->whereIdWarehouse($id_warehouse)
+				->whereId($id_machine);
 
 			$mcm = Table::get('machine_cluster_merge')
 				->join('id_machine', $m);