verdnatura/hedera-web
verdnatura
/
hedera-web
0
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'test → master' (!76) from test into master
gitea/hedera-web/pipeline/head This commit looks good Details 

Reviewed-on: #76
This commit is contained in:
Guillermo Bonet 2024-08-06 07:08:53 +00:00
parent a5b8e56506 f2ca49b261
commit ce230b1133
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
forms/reports/shelves/ui.xml
View File

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

2
rest/edi/clean.php
View File

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

2
rest/edi/lib/method.php
View File

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