7953-devToTest_2438 #2942

Merged

alexm merged 199 commits from 7953-devToTest_2438 into test 2024-09-10 07:22:31 +00:00

Conversation 0 Commits 199 Files Changed 1288 +2687 -7280

199 Commits

Author	SHA1	Message	Date
Alex Moreno	e74da7cbab	feat: refs #7953 pullinfo	2024-09-10 08:17:47 +02:00
Guillermo Bonet	f8b3db7023	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-09 14:25:53 +02:00
Guillermo Bonet	946806c98e	Merge branch 'test' into dev	2024-09-09 14:25:51 +02:00
Javier Segarra	1a0fb2fecd	Merge pull request 'feat(salix): #7671 define isDestiny field in model' (!2681) from 7671_dense_itemFixedPrices into dev ... Reviewed-on: #2681 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-09 12:17:56 +00:00
Javier Segarra	03d4427bcd	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-09-09 12:16:15 +00:00
Alex Moreno	5a04083d31	Merge pull request 'feat(AccessToken&ACL): refs #7547 upgrade security' (!2630) from 7547-accessToken-security into dev ... Reviewed-on: #2630 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-09-09 11:02:06 +00:00
Alex Moreno	0949112b13	Merge branch 'dev' of https: refs #7547//gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security	2024-09-09 12:42:13 +02:00
Carlos Satorres	a25dac140e	Merge pull request 'refs #6898 fix supplier remove' (!2605) from 6998-supplierMigration into dev ... Reviewed-on: #2605 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-09 09:56:41 +00:00
Carlos Satorres	01690ed081	Merge branch 'dev' into 6998-supplierMigration	2024-09-09 09:39:15 +00:00
Guillermo Bonet	daf3dfd2ee	Merge branch 'test' into dev	2024-09-09 11:35:28 +02:00
Carlos Satorres	44a183785e	Merge branch 'dev' into 6998-supplierMigration	2024-09-09 09:32:43 +00:00
Javier Segarra	7710b87f4a	test(salix): refs #7671 #7671 improve and revert where changes	2024-09-09 10:07:05 +02:00
Javier Segarra	57dbdc6f24	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7671_dense_itemFixedPrices	2024-09-09 09:58:07 +02:00
Javier Segarra	6012604946	perf(salix): refs #7671 #7671 imrpove and revert where changes	2024-09-09 09:57:38 +02:00
Alex Moreno	d7613767fb	Merge pull request 'feat: refs #7938 remove unnecessary insert in clientLog' (!2934) from 7938-unnecessary_insert_clientLog into dev ... Reviewed-on: #2934 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-09 07:46:12 +00:00
Guillermo Bonet	0c4b9dcdae	Merge pull request 'feat: refs #4515 New throw buy_checkItem' (!2935) from 4515-throwBuyCheck into dev ... Reviewed-on: #2935 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-09 07:07:53 +00:00
Jorge Penadés	af1cab44eb	Merge pull request 'fix: refs #7323 fetch from right source' (!2933) from 7323-replaceWorkerDataSource into dev ... Reviewed-on: #2933 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-09 07:05:01 +00:00
Guillermo Bonet	c4527cc5c5	feat: refs #4515 New throw buy_checkItem	2024-09-09 08:28:27 +02:00
Alex Moreno	632d3190b1	feat: refs #7938 remove unnecessary insert in clientLog	2024-09-09 07:49:22 +02:00
Javier Segarra	5c4a30f2f9	perf: refs #7671 improve showBadDates	2024-09-08 12:50:32 +02:00
Javier Segarra	dbd8f94555	perf: refs #7671 improve showBadDates	2024-09-08 12:49:55 +02:00
Javier Segarra	59cce5d349	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7671_dense_itemFixedPrices	2024-09-08 12:31:39 +02:00
Jorge Penadés	ba2c5cb209	chore: refs #7323 filter data	2024-09-06 17:49:45 +02:00
Jorge Penadés	0a4bd0f2d5	chore: refs #7323 fix test	2024-09-06 16:09:29 +02:00
Jorge Penadés	6065c056e2	chore: refs #7323 fix test	2024-09-06 16:04:40 +02:00
Jorge Penadés	eb11e18df5	fix: refs #7323 fetch from right source	2024-09-06 16:01:26 +02:00
Jorge Penadés	05b75c1f0d	Merge pull request 'chore: refs #7323 worker changes wip' (!2930) from 7323-dynamicRole into dev ... Reviewed-on: #2930 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-06 12:03:20 +00:00
Jorge Penadés	b277ae2d92	Merge branch 'dev' into 7323-dynamicRole	2024-09-06 12:01:18 +00:00
Javi Gallego	3d985d10d3	Merge pull request 'feat: refs #7277 test with warehouse' (!2931) from 7277-refunding into dev ... Reviewed-on: #2931 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-06 11:52:32 +00:00
Guillermo Bonet	a718b6e81f	Merge branch 'test' into dev	2024-09-06 13:52:10 +02:00
Ivan Mas	9eb2da621b	Merge pull request 'feat: refs #7898 Add column "floor" in vn.parking' (!2912) from 7898-New_column_floor_parking into dev ... Reviewed-on: #2912 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-06 09:56:18 +00:00
Ivan Mas	762975ed14	Merge branch 'dev' into 7898-New_column_floor_parking	2024-09-06 09:54:34 +00:00
Ivan Mas	0d6ae2fecd	Merge pull request 'feat: refs #7747 Delete buyUltimate and buyUltimateFromInterval' (!2929) from 7747-DeleteBuyUltimateAndBuyUltimateFromInterval into dev ... Reviewed-on: #2929 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-06 09:50:43 +00:00
Ivan Mas	d9c860c44a	Merge branch 'dev' into 7747-DeleteBuyUltimateAndBuyUltimateFromInterval	2024-09-06 09:48:58 +00:00
Jorge Penadés	af929c1ee9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-dynamicRole	2024-09-06 10:45:35 +02:00
Jorge Penadés	87d23b327a	Merge pull request 'chore: refs #7524 add select limit' (!2923) from 7524-addFixture into dev ... Reviewed-on: #2923 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-06 08:44:35 +00:00
Ivan Mas	8e87b7e6ba	Merge branch 'dev' into 7747-DeleteBuyUltimateAndBuyUltimateFromInterval	2024-09-06 08:44:00 +00:00
Jorge Penadés	2df9bb9bdb	Merge branch 'dev' into 7524-addFixture	2024-09-06 08:42:53 +00:00
Jorge Penadés	18d93d93a6	chore: refs #7323 worker changes	2024-09-06 10:40:16 +02:00
Jorge Penadés	0a7a9e2cc8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-dynamicRole	2024-09-06 10:29:44 +02:00
Guillermo Bonet	b0abe829b1	fix: refs ##7905 Handle error	2024-09-06 10:10:41 +02:00
Javi Gallego	46a4b577ce	feat: refs #7277 test with warehouse	2024-09-06 10:07:46 +02:00
Jorge Penadés	78a851336f	chore: refs #7323 worker changes wip	2024-09-06 09:11:20 +02:00
Ivan Mas	26db88b344	Merge branch 'dev' into 7898-New_column_floor_parking	2024-09-06 07:00:19 +00:00
Ivan Mas	0626b83370	Merge branch 'dev' into 7747-DeleteBuyUltimateAndBuyUltimateFromInterval	2024-09-06 06:56:15 +00:00
Ivan Mas	747e6a562a	feat: refs #7747 Delete buyUltimate and buyUltimateFromInterval	2024-09-06 08:51:41 +02:00
Guillermo Bonet	1b8583a19d	feat: refs #7759 Revoke routine grants vn	2024-09-06 08:50:50 +02:00
Guillermo Bonet	671dc0342a	Revert commit	2024-09-06 08:24:17 +02:00
Guillermo Bonet	718c37e057	feat: refs #7532 Requested changes	2024-09-06 08:22:07 +02:00
Ivan Mas	f193938264	Merge branch 'dev' into 7898-New_column_floor_parking	2024-09-06 06:02:01 +00:00
Guillermo Bonet	72024fb854	fix: refs #7759 Added user 'vn'@'localhost' & grants	2024-09-06 06:12:48 +02:00
Ivan Mas	ac8b101455	feat: refs #7898 Modify default	2024-09-05 17:05:48 +02:00
Jorge Penadés	4869322476	Merge branch 'dev' into 7524-addFixture	2024-09-05 09:57:26 +00:00
Guillermo Bonet	620ce5d45e	Merge pull request 'feat: refs #7905 getBuysCsv' (!2900) from 7905-getBuysCsv into dev ... Reviewed-on: #2900 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-05 09:44:38 +00:00
Guillermo Bonet	5a51d5c07b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-05 11:19:02 +02:00
Guillermo Bonet	ac01da5eed	feat: refs #7759 Deleted version 11163-maroonEucalyptus	2024-09-05 11:19:00 +02:00
Javi Gallego	40a1b24403	Merge pull request '#7277 - RefundInvoices' (!2904) from 7277-RefundInvoices into dev ... Reviewed-on: #2904 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-05 09:07:24 +00:00
Javier Segarra	bb401af086	Merge branch 'dev' into 7524-addFixture	2024-09-05 09:00:14 +00:00
Jon Elias	dc236dbf82	Merge pull request 'Redirect invoice out to Lilium' (!2807) from InvoiceOut_Migration into dev ... Reviewed-on: #2807 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-05 08:32:56 +00:00
Guillermo Bonet	97f409183e	Merge pull request 'feat: refs #7759 Changed definer root to vn' (!2769) from 7759-newDefiner into dev ... Reviewed-on: #2769 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-09-05 07:43:20 +00:00
Guillermo Bonet	8ca491b8de	Merge branch 'dev' into 7759-newDefiner	2024-09-05 09:40:42 +02:00
Jorge Penadés	e98313a1a5	Merge branch 'dev' into 7524-addFixture	2024-09-05 07:37:56 +00:00
Guillermo Bonet	d0eab064b7	Merge branch 'dev' into 7905-getBuysCsv	2024-09-05 07:26:27 +00:00
Guillermo Bonet	6df817ea5d	Merge branch 'test' into dev	2024-09-05 09:25:00 +02:00
Guillermo Bonet	f6e585433a	Merge branch '7905-getBuysCsv' of https://gitea.verdnatura.es/verdnatura/salix into 7905-getBuysCsv	2024-09-05 09:21:02 +02:00
Guillermo Bonet	2aeff19578	fix: refs #7905 added comments to flatten.js	2024-09-05 09:21:00 +02:00
Guillermo Bonet	2b465d0d23	Merge branch 'dev' into 7905-getBuysCsv	2024-09-05 07:18:37 +00:00
Javier Segarra	d49707828b	fix(salix): refs #7905 #7905 use right fn to flatten data	2024-09-05 09:13:33 +02:00
Jorge Penadés	03d711b694	chore: refs #7524 add select limit	2024-09-05 09:12:52 +02:00
Robert Ferrús	34d0cb76e8	Merge pull request 'feat: refs #7615 setDeleted' (!2719) from 7615-ticketRefundSetDeleted into dev ... Reviewed-on: #2719 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-05 06:14:42 +00:00
Robert Ferrús	4c96d57491	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-09-05 06:06:22 +00:00
Carlos Satorres	b66386fdb1	Merge pull request 'refs #7407 create models' (!2603) from 7407-workerMedical into dev ... Reviewed-on: #2603 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-04 13:07:50 +00:00
Guillermo Bonet	2bb73af47d	Merge branch 'test' into dev	2024-09-04 14:12:50 +02:00
Javi Gallego	c1e76e4c43	Merge branch '7277-RefundInvoices' of https://gitea.verdnatura.es/verdnatura/salix into 7277-RefundInvoices	2024-09-04 10:24:56 +02:00
Guillermo Bonet	fbfbcf9bd4	Merge branch 'test' into dev	2024-09-04 09:02:57 +02:00
Javi Gallego	99243fa248	feat: refs #7277 traducciones	2024-09-04 08:30:01 +02:00
Guillermo Bonet	c5521ea021	Merge branch 'test' into dev	2024-09-04 07:06:22 +02:00
Javier Segarra	d54361a0bc	Merge branch 'dev' into 7277-RefundInvoices	2024-09-03 13:38:03 +00:00
Javi Gallego	a1bc881385	Merge branch '7277-RefundInvoices' of https: refs #7277//gitea.verdnatura.es/verdnatura/salix into 7277-RefundInvoices	2024-09-03 15:15:20 +02:00
Javi Gallego	652395bee1	feat: refs #7277 transfer addressFk	2024-09-03 15:14:33 +02:00
Ivan Mas	77fd3e7f46	feat: refs #7898 Add column "floor" in vn.parking	2024-09-03 14:42:07 +02:00
Guillermo Bonet	32fa4155dd	Merge pull request 'feat: refs #6650 new itemShelvingLog' (!2847) from 6650-shelvingLog into dev ... Reviewed-on: #2847 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-03 07:27:51 +00:00
Guillermo Bonet	6b53c24f20	feat: refs #6650 Added saleGroupLog	2024-09-03 08:17:27 +02:00
Guillermo Bonet	5468049b26	Merge branch 'dev' into 6650-shelvingLog	2024-09-03 07:59:22 +02:00
Guillermo Bonet	8e34e78964	Merge branch 'test' into dev	2024-09-03 07:52:05 +02:00
Guillermo Bonet	6fc8b9b821	feat: ticket 215005 Changed acl show transferClient	2024-09-02 14:41:02 +02:00
Guillermo Bonet	7ab1eea7e9	Merge branch 'test' into dev	2024-09-02 14:30:32 +02:00
Carlos Satorres	28a34fa5af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical	2024-09-02 14:07:01 +02:00
Guillermo Bonet	6f022bc232	Merge pull request 'feat: refs #7650 Added no transfer lines to inventory entry and fixtures' (!2803) from 7650-triggerInv into dev ... Reviewed-on: #2803 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-02 10:17:58 +00:00
Guillermo Bonet	9485434dc2	Merge pull request 'feat: refs #7811 Added new params in datasources.json' (!2898) from 7811-datasourcesAddParams into dev ... Reviewed-on: #2898 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-09-02 10:02:13 +00:00
Javier Segarra	355714fec8	test: refs #7277 fix test proposal	2024-09-02 11:43:35 +02:00
Robert Ferrús	48bf5004a6	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-09-02 08:09:43 +00:00
Javier Segarra	48c7d1d783	Merge branch 'dev' into 7277-RefundInvoices	2024-09-02 09:35:08 +02:00
Guillermo Bonet	9d35cbfae4	Merge branch 'dev' into 7650-triggerInv	2024-09-02 07:31:04 +02:00
Guillermo Bonet	8fee3dd706	Merge branch 'test' into dev	2024-09-02 07:06:13 +02:00
Javier Segarra	8aa4427693	Merge branch 'dev' into 7905-getBuysCsv	2024-08-30 21:38:53 +00:00
Javi Gallego	e2f1fea6be	fix: refs #7277 error test	2024-08-30 17:04:45 +02:00
Javi Gallego	2e3fb7646f	feat: refs #7277 fit	2024-08-30 14:03:02 +02:00
Guillermo Bonet	b7fa6735a5	Merge pull request 'feat: refs #7564 Added volume column' (!2664) from 7564-ticketVolume into dev ... Reviewed-on: #2664 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-08-30 11:57:09 +00:00
Javi Gallego	ac36762e21	feat: refs #7277 fdescribe	2024-08-30 13:56:07 +02:00
Guillermo Bonet	d46a93a96f	Merge branch 'dev' into 7564-ticketVolume	2024-08-30 11:55:03 +00:00
Javi Gallego	c45a861ef4	feat: refs #7277 fdescribe	2024-08-30 13:51:36 +02:00
Javi Gallego	51535bfa6b	feat: refs #7277 refundInvoices	2024-08-30 13:50:51 +02:00
Carlos Satorres	cde5e20260	Merge pull request 'fix: refs #6897 fix filter' (!2901) from 6897-entryMigrationFilterFix into dev ... Reviewed-on: #2901 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-30 10:58:01 +00:00
Carlos Satorres	4a7d81f920	fix: refs #6897 back and tests	2024-08-30 12:53:44 +02:00
Carlos Satorres	f65d36011b	fix: refs #6897 back	2024-08-30 12:40:37 +02:00
Carlos Satorres	26d93ef474	fix: refs #6897 travel filter	2024-08-30 12:35:10 +02:00
Carlos Satorres	e8010d0f18	fix: refs #6897 fix json	2024-08-30 12:10:33 +02:00
Carlos Satorres	b451641d47	fix: refs #6897 fix filter	2024-08-30 11:49:39 +02:00
Javier Segarra	0f4bc3f83b	feat(salix): refs #7905 #7905 use getBuys toCSV flattened	2024-08-30 09:42:50 +02:00
Guillermo Bonet	4e52f344f4	feat: refs #7811 Added comment	2024-08-30 09:14:21 +02:00
Guillermo Bonet	e50c67c305	feat: refs #7905 Added new method getBuysCsv	2024-08-29 12:22:29 +02:00
Guillermo Bonet	72b4607d54	feat: refs #7905 Added new method getBuysCsv	2024-08-29 12:19:06 +02:00
Guillermo Bonet	c7777f609b	feat: refs #7811 Added new params in datasources.json	2024-08-29 10:10:37 +02:00
Guillermo Bonet	1e3ab2d31a	feat: refs #7905 Added param toCsv	2024-08-29 10:07:02 +02:00
Guillermo Bonet	611fbebd6d	feat: refs #7811 Added new params in datasources.json	2024-08-29 09:35:23 +02:00
Guillermo Bonet	6cb6110b14	Merge branch 'test' into dev	2024-08-29 07:51:23 +02:00
Guillermo Bonet	e6e142ce80	Merge pull request 'fix: refs #6727 No delete log tables data in clean procedures' (!2896) from 6727-noDeleteLogInProc into dev ... Reviewed-on: #2896 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-29 05:14:47 +00:00
Guillermo Bonet	5e95e0465c	Merge branch 'dev' into 6727-noDeleteLogInProc	2024-08-29 05:06:16 +00:00
Carlos Andrés	1a47040e75	Merge pull request 'fixes: refs #7760 collection problems' (!2888) from 7760-Refactor-collection_assign into dev ... Reviewed-on: #2888 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-28 15:27:14 +00:00
Javi Gallego	a4e09884db	Merge pull request 'feat: refs #6760 refs #actualiza campo nickname' (!2883) from 6760-transferClient into dev ... Reviewed-on: #2883 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-08-28 10:38:45 +00:00
Javi Gallego	a8ee92f891	Merge branch 'dev' into 6760-transferClient	2024-08-28 10:36:17 +00:00
Carlos Andrés	484bb48d04	fix: refs #7760 collection problems	2024-08-28 12:33:05 +02:00
Guillermo Bonet	fdeb041e56	Merge branch 'test' into dev	2024-08-28 08:40:37 +02:00
Guillermo Bonet	97b839bf1a	fix: refs #6727 No delete log tables data in clean procedures	2024-08-28 08:10:32 +02:00
Carlos Andrés	16fd69904b	fixes: refs #7760 collection problems	2024-08-27 18:36:07 +02:00
Javier Segarra	df8fe4f1cd	Merge pull request '7896_down_devToTest_2436' (!2892) from 7896_down_devToTest_2436 into dev ... Reviewed-on: #2892 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-27 12:32:22 +00:00
Javier Segarra	db2215e3fa	feat(salix): refs #7896 update version and changelog	2024-08-27 13:53:27 +02:00
Carlos Andrés	6090e8ceee	fixes: refs #7760 collection problems	2024-08-27 13:47:47 +02:00
Carlos Andrés	58f8903b53	fixes: refs #7760 collection problems	2024-08-27 13:43:20 +02:00
Carlos Andrés	44072de928	fixes: refs #7760 collection problems	2024-08-27 13:36:06 +02:00
Carlos Andrés	3ac2c18da5	fixes: refs #7760 collection problems	2024-08-27 13:31:07 +02:00
Carlos Andrés	b317c8c462	fixes: refs #7760 collection problems	2024-08-27 10:47:09 +02:00
Javier Segarra	b00070fd1a	Merge branch 'dev' into 6760-transferClient	2024-08-27 06:19:44 +00:00
Javi Gallego	5f06ae5cf4	feat: refs #6760 refs #actualiza campo nickname	2024-08-26 15:57:39 +02:00
Guillermo Bonet	1e91d689c5	Merge branch 'dev' into 7564-ticketVolume	2024-08-26 12:18:20 +00:00
Carlos Satorres	de73ee4718	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration	2024-08-26 11:42:32 +02:00
Guillermo Bonet	c991f32f5a	feat: refs #7564 Fix version	2024-08-20 12:01:28 +02:00
Guillermo Bonet	9154507b72	Merge branch '7564-ticketVolume' of https://gitea.verdnatura.es/verdnatura/salix into 7564-ticketVolume	2024-08-20 11:45:52 +02:00
Guillermo Bonet	2b12e046e4	feat: refs #7564 Fix version	2024-08-20 11:45:50 +02:00
Guillermo Bonet	289dc58be4	Merge branch 'dev' into 7564-ticketVolume	2024-08-20 09:45:01 +00:00
Guillermo Bonet	8a03650eca	feat: refs #7564 Requested changes	2024-08-20 11:44:38 +02:00
Guillermo Bonet	7fc47f0506	feat: refs #7564 Requested changes	2024-08-20 11:43:08 +02:00
Guillermo Bonet	6acd3e0b1d	feat: refs #7759 Changed defined only of vn objects	2024-08-20 10:10:46 +02:00
Guillermo Bonet	3087a14248	Merge branch 'dev' into 7759-newDefiner	2024-08-20 10:07:33 +02:00
Guillermo Bonet	8e63d85964	feat: refs #7759 Changed name	2024-08-20 10:06:10 +02:00
Guillermo Bonet	4fc43df11b	feat: refs #6650 new itemShelvingLog	2024-08-09 11:28:30 +02:00
Jon Elias	524acea70c	Merge branch 'InvoiceOut_Migration' of https://gitea.verdnatura.es/verdnatura/salix into InvoiceOut_Migration	2024-07-31 10:22:58 +02:00
Jon Elias	460b9899c0	refactor: deleted e2e & added back descriptor and summary	2024-07-31 10:22:56 +02:00
Jon Elias	1e711b63fc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into InvoiceOut_Migration	2024-07-31 09:52:13 +02:00
Robert Ferrús	67764f4139	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-07-31 06:13:42 +00:00
Jon Elias	179c3c30d8	Merge branch 'dev' into InvoiceOut_Migration	2024-07-30 09:40:05 +00:00
Jon Elias	d74a04a881	feat: deleted code and redirect to Lilium	2024-07-30 11:37:41 +02:00
Guillermo Bonet	0451e4bb2a	feat: refs #7650 Fix tests	2024-07-30 10:20:04 +02:00
Guillermo Bonet	18dc3873b8	feat: refs #7650 Added no transfer lines to inventory entry and fixtures	2024-07-30 09:54:43 +02:00
Guillermo Bonet	5d91566cc0	Merge branch 'dev' into 7759-newDefiner	2024-07-29 09:42:47 +02:00
Guillermo Bonet	e0b9100de1	fix	2024-07-29 07:20:05 +02:00
Guillermo Bonet	6de9ea4b16	Merge branch 'dev' into 7759-newDefiner	2024-07-29 07:18:23 +02:00
Robert Ferrús	cfa487a80f	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-07-25 06:18:10 +00:00
Carlos Satorres	15e2808d37	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration	2024-07-24 10:23:01 +02:00
Carlos Satorres	729a0bb166	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration	2024-07-24 09:47:25 +02:00
Alex Moreno	8845f78383	test: refs #7615 add test to setDeleted	2024-07-23 12:23:31 +02:00
Robert Ferrús	4259339afb	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-07-23 10:00:21 +00:00
Guillermo Bonet	219740f669	feat: refs #7759 Changed definer root to vn-admin	2024-07-22 11:52:42 +02:00
Robert Ferrús	d8f1368b32	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-07-22 05:07:01 +00:00
Alex Moreno	9340d47485	test: fix connections e2e	2024-07-19 09:53:41 +02:00
Alex Moreno	94aefb057c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security	2024-07-19 09:32:30 +02:00
Alex Moreno	b8244b48e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7547-accessToken-security	2024-07-19 09:08:47 +02:00
Robert Ferrús	10a4831f95	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-07-19 05:09:41 +00:00
Javier Segarra	304405a8a3	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-07-18 15:21:12 +02:00
Robert Ferrús	4ff61a75e0	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-07-17 06:26:26 +00:00
Javier Segarra	c5cb4d84f1	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-07-16 09:23:30 +02:00
Robert Ferrús	d85f40d725	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-07-15 05:28:16 +00:00
Javier Segarra	9206826135	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-07-12 12:57:22 +02:00
Robert Ferrús	625ab07e48	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-07-12 10:01:12 +00:00
Javier Segarra	9c5f38648a	feat(ssalix): refs #7671 #7671 checkDates to present	2024-07-12 00:24:26 +02:00
Robert Ferrús	373497e031	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-07-11 12:53:59 +00:00
Robert Ferrús	39b52e706a	feat: refs #7615 setDeleted	2024-07-11 14:51:34 +02:00
Javier Segarra	ea626821fc	feat(ssalix): refs #7671 #7671 checkDates	2024-07-11 06:17:19 +02:00
Javier Segarra	1be04babe4	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-07-09 12:18:55 +02:00
Javier Segarra	2064107897	feat(salix): #7671 define isDestiny field in model	2024-07-04 15:25:21 +00:00
Carlos Satorres	14bc6f1232	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration	2024-07-03 12:20:56 +02:00
Carlos Satorres	f37dcddbb4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration	2024-07-03 10:07:39 +02:00
Guillermo Bonet	2f8df96ba7	feat: refs #7564 Added ticket_setVolumeItemCost	2024-07-03 09:29:12 +02:00
Guillermo Bonet	1e5fd8002c	feat: refs #7564 Added proc	2024-07-02 09:36:23 +02:00
Guillermo Bonet	2a203926b9	feat: refs #7564 Added volume column	2024-07-02 09:02:24 +02:00
Carlos Satorres	a68f252658	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration	2024-07-01 12:56:22 +02:00
Alex Moreno	ebdd6bd08c	fix merge dev	2024-07-01 11:50:20 +02:00
Alex Moreno	a26f6eaf21	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical	2024-07-01 11:32:21 +02:00
Carlos Satorres	ca91c3926e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration	2024-06-26 11:42:35 +02:00
Carlos Satorres	827f3f6d1d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration	2024-06-26 10:05:29 +02:00
Alex Moreno	7f278269a5	feat(AccessToken&ACL): refs #7547 upgrade security	2024-06-21 14:28:55 +02:00
Carlos Satorres	d0ddbe6a8e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration	2024-06-21 10:32:38 +02:00
Carlos Satorres	cf4a7c8fba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical	2024-06-21 09:11:40 +02:00
Carlos Satorres	7619fa74ba	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6998-supplierMigration	2024-06-20 05:52:06 +02:00
Carlos Satorres	2d3311b824	refs #6898 fix supplier remove	2024-06-18 13:44:39 +02:00
Carlos Satorres	774d55d4ae	refs #7407 fix acls fixtures	2024-06-18 13:28:21 +02:00
Carlos Satorres	313c05f654	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical	2024-06-18 13:26:19 +02:00
Carlos Satorres	e404688042	refs #7407 create models	2024-06-18 10:12:22 +02:00