26915 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Andrés	6706e47481	Merge pull request 'fix: shipment' (!3536) from Hotfix-available-for-item_getLack into master ... Reviewed-on: #3536 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-03-05 13:17:18 +00:00
Pako Natek	f0b5044b65	fix: shipment	2025-03-05 14:14:26 +01:00
Javier Segarra	f0033e2654	Merge pull request 'Hotfix[AccountRoutes]: Rollback deleted routes to redirect to Lilium' (!3535) from Hotfix-RedirectToUserSummary into master ... Reviewed-on: #3535 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-03-05 13:05:26 +00:00
Jon Elias	b7d49af2c2	Merge branch 'master' into Hotfix-RedirectToUserSummary	2025-03-05 13:02:00 +00:00
Pako Natek	8e14d1e1e2	Merge pull request 'fix: update item_getMinacum procedure to include vTime parameter and adjust date calculations' (!3534) from Hotfix-available-for-item_getLack into master ... Reviewed-on: #3534 Reviewed-by: Pako Natek <pako@verdnatura.es>	2025-03-05 12:46:45 +00:00
Pako Natek	5959a9e9e0	fix: sin foco	2025-03-05 13:45:25 +01:00
Pako Natek	9ee40a4931	fix: lost vDated	2025-03-05 13:44:08 +01:00
Pako Natek	f95e0cacdb	fix(item_getInfo): modified availabled	2025-03-05 13:40:26 +01:00
Carlos Andrés	4680128b8f	feat: add time parameter to item_getLack procedure and update related queries	2025-03-05 13:31:05 +01:00
Jon Elias	7f69a343c1	Merge branch 'master' into Hotfix-RedirectToUserSummary	2025-03-05 12:16:47 +00:00
Jon Elias	e9aae88ba2	fix: rollback deleted routes to redirect to Lilium	2025-03-05 13:13:14 +01:00
Carlos Andrés	68c028669d	fix: update item_getMinacum procedure to include vTime parameter and adjust date calculations	2025-03-05 11:32:27 +01:00
Guillermo Bonet	5ae36641df	fix: refs #7882 Change longitude and latitude types to any in createAddress method	2025-03-05 11:27:59 +01:00
Carlos Andrés	dfe5735903	Actualizar db/routines/vn/procedures/item_getLack.sql	2025-03-04 15:02:54 +00:00
Alex Moreno	70446fd13f	feat(salesFilter): add isFragile column to sales filter query	2025-03-04 14:57:52 +01:00
Carlos Andrés	49cc86fea9	Actualizar db/routines/vn/procedures/item_getBalance.sql	2025-03-04 13:48:23 +00:00
Carlos Andrés	1632da06ca	Actualizar db/routines/vn/procedures/item_getBalance.sql	2025-03-04 12:18:17 +00:00
Guillermo Bonet	d14937fd64	fix: refs #7956 item_getSimilar	2025-03-04 12:50:07 +01:00
Pako Natek	539a7f375f	Merge pull request 'fix(priceDelta): removes not null restriction for itemTypeFk' (!3529) from hotfix-master-priceDelta into master ... Reviewed-on: #3529 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-03-04 11:11:15 +00:00
Pako Natek	8eefcf53d0	fix(priceDelta): removes not null restriction for itemTypeFk ... refs#8674	2025-03-04 11:51:15 +01:00
Jon Elias	ff977de929	Merge pull request 'Hotfix[MonitorSalesFilter]: Fix filtering' (!3525) from Hotfix-MonitorFilter into master ... Reviewed-on: #3525 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-03-04 10:41:56 +00:00
Jon Elias	d7f06b7df9	fix: fixed salesFilter test	2025-03-04 10:33:48 +01:00
Jon Elias	729185f921	fix: fix salesFilter excluding ticket filtered	2025-03-04 10:25:19 +01:00
Carlos Andrés	c4c606018d	Merge pull request 'fixlostTestMaster' (!3524) from fixlostTestMaster into master ... Reviewed-on: #3524 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-03-04 08:55:34 +00:00
Carlos Andrés	10a2dc484b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into fixlostTestMaster	2025-03-04 09:50:04 +01:00
Carlos Andrés	dd0bcd66cf	fix: comment out time adjustment logic in beforeInsert and beforeUpdate triggers	2025-03-04 09:45:24 +01:00
Carlos Andrés	06068c41c9	Actualizar db/routines/vn/procedures/item_getMinacum.sql	2025-03-04 08:38:44 +00:00
Carlos Andrés	b7d972593a	Actualizar db/routines/vn/procedures/item_getBalance.sql	2025-03-04 08:36:35 +00:00
Carlos Andrés	3b1e906a87	Actualizar db/routines/vn/procedures/item_getStock.sql	2025-03-04 08:20:30 +00:00
Carlos Andrés	8e82a6d0f1	Actualizar db/routines/cache/procedures/available_refresh.sql	2025-03-04 08:03:59 +00:00
Alex Moreno	2037c3d1fb	build: dump db	2025-03-04 08:51:41 +01:00
Alex Moreno	80a27e44d9	Merge pull request '8713-testToMaster' (!3523) from 8713-testToMaster into master ... Reviewed-on: #3523 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-03-04 06:52:13 +00:00
Carlos Andrés	4605a26b1f	fix: comment out shipping time adjustments in beforeInsert and beforeUpdate triggers	2025-03-04 07:41:04 +01:00
Alex Moreno	75f5888741	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-03-03 14:44:21 +01:00
Carlos Andrés	6861f2d4a0	Merge pull request '8700_invoiceOut' (!3513) from 8700_invoiceOut into master ... Reviewed-on: #3513 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-03-03 13:12:14 +00:00
Pako Natek	892c95f5f0	feat(availabled): refs #8048	2025-03-03 14:01:30 +01:00
Pako Natek	8cc88453c4	fix(travel): new trigger for travel and new version to update it ... stockRefresh and entryIn also updated Refs: #8048	2025-03-03 13:29:20 +01:00
Javier Segarra	3adcdeae82	Merge pull request 'fix: hotfix back' (!3517) from hotfix-7830AddresType into master ... Reviewed-on: #3517 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-03-03 11:39:59 +00:00
Pako Natek	99bc9b4698	fix(catalog_calculate): improves new option for not itemtype selected ... Refs: #8674	2025-03-03 11:50:34 +01:00
Carlos Satorres	5363a368de	fix: hotfix back	2025-03-03 11:39:05 +01:00
Carlos Andrés	7908507825	feat: refs #8700 update XDiario table structure	2025-03-02 13:06:43 +01:00
Carlos Andrés	bbcdff2c31	feat: refs #8700 update invoiceOut procedure to use new serial and ref handling; modify foreign key constraints	2025-03-02 11:13:09 +01:00
Guillermo Bonet	156b965c24	Merge branch 'master' into test	2025-02-28 12:22:51 +01:00
Carlos Satorres	6dac5cc9ce	Merge pull request 'fix: refs #6553 workerBusiness v3' (!3508) from 6553-workerBusinessV3 into test ... Reviewed-on: #3508 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-28 10:10:08 +00:00
Carlos Satorres	434c3ac2f9	fix: refs #6553 workerBusiness v3	2025-02-28 10:32:16 +01:00
Juan Ferrer	d680dc8da7	fix: refs #8689 Drop foreign key cache.last_buy_FK_1	2025-02-27 19:23:21 +01:00
Alex Moreno	7715a50724	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-27 12:01:13 +01:00
Alex Moreno	a85771c1e7	fix: closure email	2025-02-27 12:00:59 +01:00
Pako Natek	ef7ce9bbb6	Merge pull request 'feat(catalog_calculate): refs #8674 new field and modified proc' (!3500) from 8674-hotFix-Restringir-el-acceso-a-determinadas-familias into master ... Reviewed-on: #3500 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-26 11:38:55 +00:00
Pako Natek	b5e8bfa8af	Merge pull request 'feat(catalog_calculate): refs #8674 refs#8674' (!3499) from 8674-restringir-acceso-a-familias into test ... Reviewed-on: #3499 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-26 11:29:26 +00:00