verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

Merge pull request '4273-MASTER_hotFix(entry): isExcludedFromAvailable' (#1020) from 4273-master_hotFix_entry into master
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #1020
This commit is contained in:
Joan Sanchez 2022-07-01 09:21:48 +00:00
parent ad021265c7 169f39cf1a
commit b2c4ca4453
9 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/dump/fixtures.sql
View File

@ -1351,7 +1351,7 @@ INSERT INTO `vn`.`travel`(`id`,`shipped`, `landed`, `warehouseInFk`, `warehouseO
(7, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 5, 4, 1, 50.00, 500, 'seventh travel', 2, 1), (7, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 5, 4, 1, 50.00, 500, 'seventh travel', 2, 1),
(8, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 5, 1, 1, 50.00, 500, 'eight travel', 1, 2); (8, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 5, 1, 1, 50.00, 500, 'eight travel', 1, 2);
INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `ref`,`isInventory`, `isRaid`, `notes`, `evaNotes`) INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `isConfirmed`, `companyFk`, `ref`,`isExcludedFromAvailable`, `isRaid`, `notes`, `evaNotes`)
VALUES VALUES
(1, 1, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1, 1, 442, 'Movement 1', 0, 0, '', ''), (1, 1, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 1, 1, 442, 'Movement 1', 0, 0, '', ''),
(2, 2, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 2, 0, 442, 'Movement 2', 0, 0, 'this is the note two', 'observation two'), (2, 2, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), 2, 0, 442, 'Movement 2', 0, 0, 'this is the note two', 'observation two'),

24
db/dump/structure.sql
View File

@ -7863,7 +7863,7 @@ proc: BEGIN
JOIN vn.warehouse w ON w.id = t.warehouseInFk JOIN vn.warehouse w ON w.id = t.warehouseInFk
WHERE t.landed BETWEEN vInventoryDate AND vStartDate WHERE t.landed BETWEEN vInventoryDate AND vStartDate
AND t.warehouseInFk = vWarehouse AND t.warehouseInFk = vWarehouse
AND NOT e.isInventory AND NOT e.isExcludedFromAvailable
GROUP BY b.itemFk GROUP BY b.itemFk
) c ) c
JOIN vn.item i ON i.id = c.item_id JOIN vn.item i ON i.id = c.item_id
@ -27642,7 +27642,7 @@ trig: BEGIN
END IF; END IF;
END IF; END IF;
SELECT e.isInventory INTO vIsInventory SELECT e.isExcludedFromAvailable INTO vIsInventory
FROM entry e FROM entry e
WHERE e.id = NEW.entryFk; WHERE e.id = NEW.entryFk;
@ -31067,7 +31067,7 @@ CREATE TABLE `entry` (
`dated` datetime NOT NULL, `dated` datetime NOT NULL,
`ref` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL, `ref` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
`isBooked` tinyint(1) NOT NULL DEFAULT '0', `isBooked` tinyint(1) NOT NULL DEFAULT '0',
`isInventory` tinyint(1) NOT NULL DEFAULT '0', `isExcludedFromAvailable` tinyint(1) NOT NULL DEFAULT '0',
`notes` longtext COLLATE utf8_unicode_ci, `notes` longtext COLLATE utf8_unicode_ci,
`isConfirmed` tinyint(1) NOT NULL DEFAULT '0', `isConfirmed` tinyint(1) NOT NULL DEFAULT '0',
`isOrdered` tinyint(1) NOT NULL DEFAULT '0', `isOrdered` tinyint(1) NOT NULL DEFAULT '0',
@ -58720,7 +58720,7 @@ BEGIN
LEFT JOIN vn.producer pr on pr.id = i.producerFk LEFT JOIN vn.producer pr on pr.id = i.producerFk
LEFT JOIN vn.coolerPathDetail cpd ON LEFT(ip.code, 3) = cpd.hallway LEFT JOIN vn.coolerPathDetail cpd ON LEFT(ip.code, 3) = cpd.hallway
WHERE WHERE
NOT wIn.isFeedStock AND NOT e.isInventory AND NOT e.isRaid NOT wIn.isFeedStock AND NOT e.isExcludedFromAvailable AND NOT e.isRaid
AND e.id = 158772 AND e.id = 158772
AND i.typeFk IS NOT NULL AND i.typeFk IS NOT NULL
AND ic.display IS NOT FALSE; AND ic.display IS NOT FALSE;
@ -64830,7 +64830,7 @@ BEGIN
WHERE tr.landed >= vDateInventory WHERE tr.landed >= vDateInventory
AND vWarehouse = tr.warehouseInFk AND vWarehouse = tr.warehouseInFk
AND b.itemFk = vItemId AND b.itemFk = vItemId
AND e.isInventory = 0 AND e.isExcludedFromAvailable = 0
AND e.isRaid = 0 AND e.isRaid = 0
UNION ALL UNION ALL
@ -64861,7 +64861,7 @@ BEGIN
AND vWarehouse =tr.warehouseOutFk AND vWarehouse =tr.warehouseOutFk
AND s.id <> 4 AND s.id <> 4
AND b.itemFk = vItemId AND b.itemFk = vItemId
AND e.isInventory = 0 AND e.isExcludedFromAvailable = 0
AND w.isFeedStock = 0 AND w.isFeedStock = 0
AND e.isRaid = 0 AND e.isRaid = 0
UNION ALL UNION ALL
@ -68525,7 +68525,7 @@ BEGIN
WHERE tr.landed >= vDateInventory WHERE tr.landed >= vDateInventory
AND vWarehouse = tr.warehouseInFk AND vWarehouse = tr.warehouseInFk
AND b.itemFk = vItemId AND b.itemFk = vItemId
AND e.isInventory = FALSE AND e.isExcludedFromAvailable = FALSE
AND e.isRaid = FALSE AND e.isRaid = FALSE
UNION ALL UNION ALL
@ -68560,7 +68560,7 @@ BEGIN
AND vWarehouse =tr.warehouseOutFk AND vWarehouse =tr.warehouseOutFk
AND s.id <> 4 AND s.id <> 4
AND b.itemFk = vItemId AND b.itemFk = vItemId
AND e.isInventory = FALSE AND e.isExcludedFromAvailable = FALSE
AND w.isFeedStock = FALSE AND w.isFeedStock = FALSE
AND e.isRaid = FALSE AND e.isRaid = FALSE
UNION ALL UNION ALL
@ -68813,7 +68813,7 @@ BEGIN
LEFT JOIN travel t ON t.id = e.travelFk LEFT JOIN travel t ON t.id = e.travelFk
WHERE t.landed BETWEEN vDatedFrom AND vDatedTo WHERE t.landed BETWEEN vDatedFrom AND vDatedTo
AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk) AND (vWarehouseFk IS NULL OR t.warehouseInFk = vWarehouseFk)
AND !e.isInventory AND !e.isExcludedFromAvailable
AND b.quantity != 0 AND b.quantity != 0
AND (vItemFk IS NULL OR b.itemFk = vItemFk) AND (vItemFk IS NULL OR b.itemFk = vItemFk)
UNION ALL UNION ALL
@ -68826,7 +68826,7 @@ BEGIN
LEFT JOIN travel t ON t.id = e.travelFk LEFT JOIN travel t ON t.id = e.travelFk
WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo WHERE t.shipped BETWEEN vDatedFrom AND vDatedTo
AND (vWarehouseFk IS NULL OR t.warehouseOutFk = vWarehouseFk) AND (vWarehouseFk IS NULL OR t.warehouseOutFk = vWarehouseFk)
AND !e.isInventory AND !e.isExcludedFromAvailable
AND b.quantity != 0 AND b.quantity != 0
AND (vItemFk IS NULL OR b.itemFk = vItemFk) AND (vItemFk IS NULL OR b.itemFk = vItemFk)
AND !e.isRaid AND !e.isRaid
@ -96545,7 +96545,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */; /*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */ /*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
/*!50001 VIEW `itemEntryIn` AS select `t`.`warehouseInFk` AS `warehouseInFk`,`t`.`landed` AS `landed`,`b`.`itemFk` AS `itemFk`,`b`.`quantity` AS `quantity`,`t`.`isReceived` AS `isReceived`,`e`.`isRaid` AS `isVirtualStock`,`e`.`id` AS `entryFk` from ((`buy` `b` join `entry` `e` on((`b`.`entryFk` = `e`.`id`))) join `travel` `t` on((`e`.`travelFk` = `t`.`id`))) where ((`e`.`isInventory` = 0) and (`b`.`quantity` <> 0)) */; /*!50001 VIEW `itemEntryIn` AS select `t`.`warehouseInFk` AS `warehouseInFk`,`t`.`landed` AS `landed`,`b`.`itemFk` AS `itemFk`,`b`.`quantity` AS `quantity`,`t`.`isReceived` AS `isReceived`,`e`.`isRaid` AS `isVirtualStock`,`e`.`id` AS `entryFk` from ((`buy` `b` join `entry` `e` on((`b`.`entryFk` = `e`.`id`))) join `travel` `t` on((`e`.`travelFk` = `t`.`id`))) where ((`e`.`isExcludedFromAvailable` = 0) and (`b`.`quantity` <> 0)) */;
/*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */; /*!50001 SET collation_connection = @saved_col_connection */;
@ -96564,7 +96564,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8mb4_unicode_ci */; /*!50001 SET collation_connection = utf8mb4_unicode_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */ /*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */ /*!50013 DEFINER=`root`@`localhost` SQL SECURITY DEFINER */
/*!50001 VIEW `itemEntryOut` AS select `t`.`warehouseOutFk` AS `warehouseOutFk`,`t`.`shipped` AS `shipped`,`b`.`itemFk` AS `itemFk`,-(`b`.`quantity`) AS `quantity`,`t`.`isDelivered` AS `isDelivered`,`e`.`id` AS `entryFk` from ((`buy` `b` join `entry` `e` on((`b`.`entryFk` = `e`.`id`))) join `travel` `t` on((`e`.`travelFk` = `t`.`id`))) where ((`e`.`isInventory` = 0) and (`e`.`isRaid` = 0) and (`b`.`quantity` <> 0)) */; /*!50001 VIEW `itemEntryOut` AS select `t`.`warehouseOutFk` AS `warehouseOutFk`,`t`.`shipped` AS `shipped`,`b`.`itemFk` AS `itemFk`,-(`b`.`quantity`) AS `quantity`,`t`.`isDelivered` AS `isDelivered`,`e`.`id` AS `entryFk` from ((`buy` `b` join `entry` `e` on((`b`.`entryFk` = `e`.`id`))) join `travel` `t` on((`e`.`travelFk` = `t`.`id`))) where ((`e`.`isExcludedFromAvailable` = 0) and (`e`.`isRaid` = 0) and (`b`.`quantity` <> 0)) */;
/*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */; /*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */; /*!50001 SET collation_connection = @saved_col_connection */;

2
e2e/helpers/selectors.js
View File

@ -1094,7 +1094,7 @@ export default {
company: 'vn-entry-basic-data vn-autocomplete[ng-model="$ctrl.entry.companyFk"]', company: 'vn-entry-basic-data vn-autocomplete[ng-model="$ctrl.entry.companyFk"]',
ordered: 'vn-entry-basic-data vn-check[ng-model="$ctrl.entry.isOrdered"]', ordered: 'vn-entry-basic-data vn-check[ng-model="$ctrl.entry.isOrdered"]',
confirmed: 'vn-entry-basic-data vn-check[ng-model="$ctrl.entry.isConfirmed"]', confirmed: 'vn-entry-basic-data vn-check[ng-model="$ctrl.entry.isConfirmed"]',
inventory: 'vn-entry-basic-data vn-check[ng-model="$ctrl.entry.isInventory"]', inventory: 'vn-entry-basic-data vn-check[ng-model="$ctrl.entry.isExcludedFromAvailable"]',
raid: 'vn-entry-basic-data vn-check[ng-model="$ctrl.entry.isRaid"]', raid: 'vn-entry-basic-data vn-check[ng-model="$ctrl.entry.isRaid"]',
booked: 'vn-entry-basic-data vn-check[ng-model="$ctrl.entry.isBooked"]', booked: 'vn-entry-basic-data vn-check[ng-model="$ctrl.entry.isBooked"]',
save: 'vn-entry-basic-data button[type=submit]', save: 'vn-entry-basic-data button[type=submit]',

2
modules/entry/back/methods/entry/filter.js
View File

@ -156,7 +156,7 @@ module.exports = Self => {
e.dated, e.dated,
e.ref, e.ref,
e.isBooked, e.isBooked,
e.isInventory, e.isExcludedFromAvailable,
e.notes, e.notes,
e.evaNotes AS observation, e.evaNotes AS observation,
e.isConfirmed, e.isConfirmed,

2
modules/entry/back/models/entry.json
View File

@ -24,7 +24,7 @@
"isBooked": { "isBooked": {
"type": "boolean" "type": "boolean"
}, },
"isInventory": { "isExcludedFromAvailable": {
"type": "boolean" "type": "boolean"
}, },
"notes": { "notes": {

2
modules/entry/front/basic-data/index.html
View File

@ -103,7 +103,7 @@
</vn-check> </vn-check>
<vn-check <vn-check
label="Inventory" label="Inventory"
ng-model="$ctrl.entry.isInventory"> ng-model="$ctrl.entry.isExcludedFromAvailable">
</vn-check> </vn-check>
<vn-check <vn-check
label="Raid" label="Raid"

2
modules/entry/front/descriptor/index.html
View File

@ -25,7 +25,7 @@
<vn-icon <vn-icon
vn-tooltip="Is inventory entry" vn-tooltip="Is inventory entry"
icon="icon-inventory" icon="icon-inventory"
ng-if="$ctrl.entry.isInventory"> ng-if="$ctrl.entry.isExcludedFromAvailable">
</vn-icon> </vn-icon>
<vn-icon <vn-icon
vn-tooltip="Is virtual entry" vn-tooltip="Is virtual entry"

2
modules/entry/front/index/index.html
View File

@ -25,7 +25,7 @@
ui-sref="entry.card.summary({id: {{::entry.id}}})"> ui-sref="entry.card.summary({id: {{::entry.id}}})">
<vn-td shrink> <vn-td shrink>
<vn-icon <vn-icon
ng-show="entry.isInventory" ng-show="entry.isExcludedFromAvailable"
class="bright" class="bright"
vn-tooltip="Inventory entry" vn-tooltip="Inventory entry"
icon="icon-inventory"> icon="icon-inventory">

2
modules/entry/front/summary/index.html
View File

@ -91,7 +91,7 @@
</vn-check> </vn-check>
<vn-check <vn-check
label="Inventory" label="Inventory"
ng-model="$ctrl.entryData.isInventory" ng-model="$ctrl.entryData.isExcludedFromAvailable"
disabled="true"> disabled="true">
</vn-check> </vn-check>
</vn-vertical> </vn-vertical>