This commit is contained in:
parent
c5d1a6fd3a
commit
94c4c43bb5
|
@ -1,4 +1,4 @@
|
||||||
hedera-web (1.408.20) stable; urgency=low
|
hedera-web (1.408.21) stable; urgency=low
|
||||||
|
|
||||||
* Initial Release.
|
* Initial Release.
|
||||||
|
|
||||||
|
|
|
@ -50,8 +50,9 @@
|
||||||
</db-form>
|
</db-form>
|
||||||
<db-model
|
<db-model
|
||||||
id="items-model"
|
id="items-model"
|
||||||
result-index="2"
|
result-index="3"
|
||||||
on-status-changed="onItemsChange">
|
on-status-changed="onItemsChange">
|
||||||
|
DROP TEMPORARY TABLE IF EXISTS tmp.item;
|
||||||
CREATE TEMPORARY TABLE tmp.item
|
CREATE TEMPORARY TABLE tmp.item
|
||||||
(INDEX (itemFk))
|
(INDEX (itemFk))
|
||||||
ENGINE = MEMORY
|
ENGINE = MEMORY
|
||||||
|
@ -77,6 +78,13 @@
|
||||||
WHERE b.available > 0
|
WHERE b.available > 0
|
||||||
ORDER BY i.relevancy DESC, i.name, i.size
|
ORDER BY i.relevancy DESC, i.name, i.size
|
||||||
LIMIT 5000;
|
LIMIT 5000;
|
||||||
|
DROP TEMPORARY TABLE
|
||||||
|
tmp.item,
|
||||||
|
tmp.ticketCalculateItem,
|
||||||
|
tmp.ticketComponentPrice,
|
||||||
|
tmp.ticketComponent,
|
||||||
|
tmp.ticketLot,
|
||||||
|
tmp.zoneGetShipped;
|
||||||
<sql-batch property="batch" id="filter-batch">
|
<sql-batch property="batch" id="filter-batch">
|
||||||
<custom>
|
<custom>
|
||||||
<item name="filter" object="filter"/>
|
<item name="filter" object="filter"/>
|
||||||
|
@ -227,7 +235,8 @@
|
||||||
JOIN tmp.itemAvailable a ON a.id = i.id
|
JOIN tmp.itemAvailable a ON a.id = i.id
|
||||||
JOIN vn.itemTypeL10n l ON l.id = t.id
|
JOIN vn.itemTypeL10n l ON l.id = t.id
|
||||||
WHERE t.`order` >= 0 AND #filter
|
WHERE t.`order` >= 0 AND #filter
|
||||||
ORDER BY t.`order`, l.name
|
ORDER BY t.`order`, l.name;
|
||||||
|
DROP TEMPORARY TABLE tmp.itemAvailable;
|
||||||
</db-model>
|
</db-model>
|
||||||
<sql-filter property="filter" type="AND">
|
<sql-filter property="filter" type="AND">
|
||||||
<sql-filter-item type="EQUAL">
|
<sql-filter-item type="EQUAL">
|
||||||
|
@ -247,7 +256,8 @@
|
||||||
JOIN tmp.itemAvailable a ON a.id = i.id
|
JOIN tmp.itemAvailable a ON a.id = i.id
|
||||||
JOIN vn.inkL10n l ON l.id = i.inkFk
|
JOIN vn.inkL10n l ON l.id = i.inkFk
|
||||||
WHERE #filter
|
WHERE #filter
|
||||||
ORDER BY name
|
ORDER BY name;
|
||||||
|
DROP TEMPORARY TABLE tmp.itemAvailable;
|
||||||
</db-model>
|
</db-model>
|
||||||
<sql-filter property="filter" always-ready="true" type="AND">
|
<sql-filter property="filter" always-ready="true" type="AND">
|
||||||
<pointer object="op-realm"/>
|
<pointer object="op-realm"/>
|
||||||
|
@ -269,7 +279,8 @@
|
||||||
JOIN tmp.itemAvailable a ON a.id = i.id
|
JOIN tmp.itemAvailable a ON a.id = i.id
|
||||||
JOIN vn.producer p ON p.id = i.producerFk
|
JOIN vn.producer p ON p.id = i.producerFk
|
||||||
WHERE #filter
|
WHERE #filter
|
||||||
ORDER BY name
|
ORDER BY name;
|
||||||
|
DROP TEMPORARY TABLE tmp.itemAvailable;
|
||||||
</db-model>
|
</db-model>
|
||||||
<sql-filter property="filter" always-ready="true" type="AND">
|
<sql-filter property="filter" always-ready="true" type="AND">
|
||||||
<pointer object="op-realm"/>
|
<pointer object="op-realm"/>
|
||||||
|
@ -292,7 +303,8 @@
|
||||||
JOIN vn.origin o ON o.id = i.originFk
|
JOIN vn.origin o ON o.id = i.originFk
|
||||||
JOIN vn.originL10n l ON l.id = o.id
|
JOIN vn.originL10n l ON l.id = o.id
|
||||||
WHERE #filter
|
WHERE #filter
|
||||||
ORDER BY name
|
ORDER BY name;
|
||||||
|
DROP TEMPORARY TABLE tmp.itemAvailable;
|
||||||
</db-model>
|
</db-model>
|
||||||
<sql-filter property="filter" always-ready="true" type="AND">
|
<sql-filter property="filter" always-ready="true" type="AND">
|
||||||
<pointer object="op-realm"/>
|
<pointer object="op-realm"/>
|
||||||
|
@ -313,7 +325,8 @@
|
||||||
JOIN vn.itemType t ON t.id = i.typeFk
|
JOIN vn.itemType t ON t.id = i.typeFk
|
||||||
JOIN tmp.itemAvailable a ON a.id = i.id
|
JOIN tmp.itemAvailable a ON a.id = i.id
|
||||||
WHERE #filter
|
WHERE #filter
|
||||||
ORDER BY category
|
ORDER BY category;
|
||||||
|
DROP TEMPORARY TABLE tmp.itemAvailable;
|
||||||
</db-model>
|
</db-model>
|
||||||
<sql-filter property="filter" always-ready="true" type="AND">
|
<sql-filter property="filter" always-ready="true" type="AND">
|
||||||
<pointer object="op-realm"/>
|
<pointer object="op-realm"/>
|
||||||
|
@ -450,6 +463,12 @@
|
||||||
JOIN tmp.ticketComponentPrice p ON p.warehouseFk = l.warehouseFk
|
JOIN tmp.ticketComponentPrice p ON p.warehouseFk = l.warehouseFk
|
||||||
JOIN vn.warehouse w ON w.id = p.warehouseFk
|
JOIN vn.warehouse w ON w.id = p.warehouseFk
|
||||||
ORDER BY warehouseFk, `grouping`;
|
ORDER BY warehouseFk, `grouping`;
|
||||||
|
DROP TEMPORARY TABLE
|
||||||
|
tmp.ticketCalculateItem,
|
||||||
|
tmp.ticketComponentPrice,
|
||||||
|
tmp.ticketComponent,
|
||||||
|
tmp.ticketLot,
|
||||||
|
tmp.zoneGetShipped;
|
||||||
</db-model>
|
</db-model>
|
||||||
<htk-column-spin column="price" unit="€" digits="2"/>
|
<htk-column-spin column="price" unit="€" digits="2"/>
|
||||||
<htk-column-spin column="priceKg" unit="€/kg" digits="3" class="price-kg"/>
|
<htk-column-spin column="priceKg" unit="€/kg" digits="3" class="price-kg"/>
|
||||||
|
|
|
@ -18,8 +18,9 @@
|
||||||
IFNULL(SUM(tax), 0) tax
|
IFNULL(SUM(tax), 0) tax
|
||||||
FROM tmp.orderAmount
|
FROM tmp.orderAmount
|
||||||
) t;
|
) t;
|
||||||
DROP TEMPORARY TABLE tmp.orderAmount;
|
DROP TEMPORARY TABLE
|
||||||
DROP TEMPORARY TABLE tmp.orderTax;
|
tmp.orderAmount,
|
||||||
|
tmp.orderTax;
|
||||||
</db-model>
|
</db-model>
|
||||||
</db-form>
|
</db-form>
|
||||||
<db-query id="confirm-query" on-ready="onConfirm">
|
<db-query id="confirm-query" on-ready="onConfirm">
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "hedera-web",
|
"name": "hedera-web",
|
||||||
"version": "1.408.20",
|
"version": "1.408.21",
|
||||||
"description": "Verdnatura web page",
|
"description": "Verdnatura web page",
|
||||||
"license": "GPL-3.0",
|
"license": "GPL-3.0",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|
Loading…
Reference in New Issue