Merge pull request 'refactor: refs #7511 Changed dependences' (!75) from dev into test

Reviewed-on: #75

forms/reports/shelves/ui.xml

@@ -26,7 +26,7 @@
 				<db-model property="model">
 					SELECT c.id, c.name reportTitle, c.namePrefix, c.warehouse, c.family,
 					c.shelf, c.maxAmount, c.showPacking, c.stack, it.categoryFk realm
-						FROM shelfConfig c
+						FROM shelfMultiConfig c
 							JOIN vn.itemType it ON it.id = c.family
 				</db-model>
 			</htk-combo>

rest/edi/clean.php

@@ -8,7 +8,7 @@ class Clean extends Edi\Method {
 
 		$cleanPeriod = $db->getValue(
 			"SELECT ic.cleanPeriod
-				FROM imapConfig ic
+				FROM imapMultiConfig ic
 				JOIN util.config c ON c.environment = ic.environment");
 
 		$deleted = 0;

rest/edi/lib/method.php

@@ -14,7 +14,7 @@ abstract class Method extends \Vn\Lib\Method {
 
 		$imapConf = $db->getRow(
 			"SELECT ic.host, ic.user, ic.pass, ic.successFolder, ic.errorFolder
-				FROM imapConfig ic
+				FROM imapMultiConfig ic
 				JOIN util.config c ON c.environment = ic.environment");
 
 		$this->mailbox = sprintf('{%s/imap/ssl/novalidate-cert}',