7837-testToMaster_2432 #2834

Merged

alexm merged 161 commits from 7837-testToMaster_2432 into master 2024-08-06 05:52:05 +00:00

Conversation 0 Commits 161 Files Changed 147 +786 -4822

161 Commits

Author	SHA1	Message	Date
Alex Moreno	e95d722a7c	add changelog	2024-08-05 14:52:09 +02:00
Guillermo Bonet	d6e09fcfc9	Merge branch 'master' into test	2024-08-05 12:59:37 +02:00
Guillermo Bonet	d5a8e32b52	Merge branch 'master' into test	2024-08-05 11:59:46 +02:00
Guillermo Bonet	f6db62945d	Merge branch 'master' into test	2024-08-02 12:08:22 +02:00
Guillermo Bonet	4c67daedec	Merge branch 'master' into test	2024-08-02 11:50:16 +02:00
Guillermo Bonet	01df29b47c	Merge branch 'master' into test	2024-08-02 10:00:12 +02:00
Robert Ferrús	619dd2fbe8	Merge pull request 'master' (!2823) from master into test ... Reviewed-on: #2823 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2024-08-01 05:05:14 +00:00
Guillermo Bonet	09da9129a6	Merge branch 'master' into test	2024-07-31 09:00:12 +02:00
Alex Moreno	eb135fc7f0	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-07-31 08:11:03 +02:00
Sergio De la torre	57b87d527a	Merge pull request 'master' (!2813) from master into test ... Reviewed-on: #2813 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-30 16:07:18 +00:00
Carlos Andrés	a61f68cbc9	Merge pull request 'master' (!2811) from master into test ... Reviewed-on: #2811 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-07-30 14:49:38 +00:00
Guillermo Bonet	80ad1f30af	fix: refs #7811 Variables pm2	2024-07-30 13:50:47 +02:00
Carlos Andrés	4cda233424	Merge pull request '7736-Añadir-parámetro-itemFk-a-buyUltimate' (!2805) from 7736-Añadir-parámetro-itemFk-a-buyUltimate into test ... Reviewed-on: #2805 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-30 09:13:08 +00:00
Carlos Andrés	495bb7e36e	Merge branch 'test' into 7736-Añadir-parámetro-itemFk-a-buyUltimate	2024-07-30 10:46:00 +02:00
Guillermo Bonet	e2c3539dfc	Merge branch 'master' into test	2024-07-30 10:26:17 +02:00
Alex Moreno	79c8ef7d11	Merge pull request '7806_devToTest_2332' (!2801) from 7806_devToTest_2330 into test ... Reviewed-on: #2801 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-07-30 06:14:08 +00:00
Carlos Andrés	9fc3516e52	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7736-Añadir-parámetro-itemFk-a-buyUltimate	2024-07-29 19:12:48 +02:00
Jorge Penadés	a95475ef61	Merge pull request '#7197 filter by correcting & supplierActivity' (!2641) from 7197-fixInvoiceIn into dev ... Reviewed-on: #2641 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-29 07:43:55 +00:00
Jorge Penadés	4f385f16e2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn	2024-07-29 09:40:34 +02:00
Guillermo Bonet	f9c58e63e1	Merge branch 'test' into dev	2024-07-29 09:24:57 +02:00
Guillermo Bonet	b013842750	Merge branch 'master' into test	2024-07-29 09:24:20 +02:00
Jorge Penadés	ffd8e5e282	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn	2024-07-29 08:05:55 +02:00
Guillermo Bonet	403252ac39	Merge branch 'test' into dev	2024-07-26 14:07:15 +02:00
Guillermo Bonet	5c6df930cf	Merge branch 'master' into test	2024-07-26 14:07:01 +02:00
Guillermo Bonet	c6bcf6f488	Merge branch 'test' into dev	2024-07-26 13:56:07 +02:00
Guillermo Bonet	ce8c355757	Merge branch 'master' into test	2024-07-26 13:55:47 +02:00
Pablo Natek	a49c36e179	Merge pull request 'feat: refs #7401 redirect lilium' (!2794) from 7401-routeToLilium into dev ... Reviewed-on: #2794 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-26 08:34:58 +00:00
Pablo Natek	cf84ce1337	feat: refs #7401 redirect lilium	2024-07-26 09:38:49 +02:00
Guillermo Bonet	95b61ae86a	Merge branch 'test' into dev	2024-07-25 13:29:42 +02:00
Guillermo Bonet	1bc50112fa	Merge branch 'master' into test	2024-07-25 13:29:28 +02:00
Guillermo Bonet	ff8f340978	Merge branch 'test' into dev	2024-07-25 09:40:45 +02:00
Guillermo Bonet	10dbc53acc	Merge branch 'master' into test	2024-07-25 09:40:33 +02:00
Guillermo Bonet	70142c43db	Merge branch 'test' into dev	2024-07-25 07:25:04 +02:00
Guillermo Bonet	3e0e43da2f	Merge branch 'master' into test	2024-07-25 07:24:46 +02:00
Guillermo Bonet	de850e62c9	Merge pull request 'feat: refs #7728 Added throw due date' (!2787) from 7728-dueDateThrow into dev ... Reviewed-on: #2787 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-25 05:03:29 +00:00
Robert Ferrús	5d11f0cd0a	Merge pull request 'feat: refs #7683 productionControl' (!2705) from 7683-productionControlDeadlock into dev ... Reviewed-on: #2705 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-24 12:46:30 +00:00
Robert Ferrús	cb7d6f25e9	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-24 12:45:03 +00:00
Guillermo Bonet	983d66a681	feat: refs #7728 Added throw due date	2024-07-24 14:24:06 +02:00
Guillermo Bonet	920f1a53b1	Merge pull request 'feat: refs #7728 tabla config dias margen vctos.' (!2784) from 7728-Vctos-DUA into dev ... Reviewed-on: #2784 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-24 11:35:17 +00:00
Alex Moreno	4db8e9b048	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-24 12:05:59 +02:00
Alex Moreno	b92165cf76	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-07-24 12:05:40 +02:00
Alex Moreno	ebac416034	remove console.log	2024-07-24 12:03:47 +02:00
Guillermo Bonet	3d1d5841fd	Merge branch 'dev' into 7728-Vctos-DUA	2024-07-24 08:25:33 +00:00
Alex Moreno	c0664fd1af	hotFix_liliumRedirection	2024-07-24 10:05:29 +02:00
Alex Moreno	e8d4a72315	Merge pull request 'feat: redirect to lilium page not found' (!2731) from hotFix_liliumRedirection into dev ... Reviewed-on: #2731 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-07-24 07:56:51 +00:00
Guillermo Bonet	e214da164a	Merge branch 'test' into dev	2024-07-24 09:40:06 +02:00
Guillermo Bonet	0c51a97a17	refactor: refs #7640 Multipleinventory available	2024-07-24 09:13:47 +02:00
Guillermo Bonet	23732ab20a	Merge branch 'test' into dev	2024-07-24 07:42:08 +02:00
Guillermo Bonet	fdef84f78d	Merge branch 'test' into dev	2024-07-24 07:11:56 +02:00
Alex Moreno	1f9cacedad	Merge pull request 'fix: defaulter filter correct sql' (!2779) from 6943-fix_defaulter_filter into dev ... Reviewed-on: #2779 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-07-23 12:47:51 +00:00
Alex Moreno	1a3ed42bcd	fix: defaulter filter correct sql	2024-07-23 14:37:34 +02:00
Alex Moreno	4f32134001	add prefix	2024-07-23 14:19:20 +02:00
Alex Moreno	eb18bd2400	fix: without path	2024-07-23 13:57:14 +02:00
Alex Moreno	a472059043	Merge branch 'dev' into hotFix_liliumRedirection	2024-07-23 11:34:51 +00:00
Alex Moreno	1c45aef883	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-23 11:46:19 +02:00
Guillermo Bonet	bc49600e21	Merge branch 'test' into dev	2024-07-23 10:24:47 +02:00
Guillermo Bonet	c6b49e2134	Merge branch 'test' into dev	2024-07-23 09:27:05 +02:00
Robert Ferrús	2a70df151a	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-23 07:16:28 +00:00
Sergio De la torre	c777b8dbf1	Merge pull request 'feat checkExpeditionPrintOut refs #7751' (!2762) from 7751_boxPicking_check into dev ... Reviewed-on: #2762 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-22 20:33:47 +00:00
Guillermo Bonet	3fc973dcee	Merge pull request 'feat: refs #7740 Ticket before update added restriction' (!2770) from 7740-ticketSignRoute into dev ... Reviewed-on: #2770 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-22 12:02:18 +00:00
Carlos Andrés	33a71867bd	feat: refactor buyUltimate refs #7736	2024-07-22 13:39:48 +02:00
Carlos Andrés	b086cc7658	feat: refactor buyUltimate refs #7736	2024-07-22 13:34:04 +02:00
Guillermo Bonet	513b4583b3	fix(deletExpeditions): merge test → dev	2024-07-22 12:49:50 +02:00
Guillermo Bonet	b9c57c2f0e	Fix	2024-07-22 12:45:57 +02:00
Guillermo Bonet	7e125cdba5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-22 12:36:29 +02:00
Guillermo Bonet	169534568e	Merge branch 'test' into dev	2024-07-22 12:36:27 +02:00
Guillermo Bonet	c7b2d6714d	Merge pull request 'feat: refs #7589 Added vItemTypeFk & vItemCategoryFk (item_valuateInventory)' (!2765) from 7589-itemValuateInventory into dev ... Reviewed-on: #2765 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-22 10:27:04 +00:00
Guillermo Bonet	24c85608eb	feat: refs #7740 Ticket before update added restriction	2024-07-22 12:09:24 +02:00
Carlos Andrés	d7b9a3ffd0	feat: refactor buyUltimate refs #7736	2024-07-22 11:58:51 +02:00
Guillermo Bonet	a2799e1e61	feat: refs #7589 Added display (item_valuateInventory)	2024-07-22 08:01:23 +02:00
Guillermo Bonet	ccc02d57b7	feat: refs #7589 Added vItemTypeFk & vItemCategoryFk (item_valuateInventory)	2024-07-22 07:59:15 +02:00
Carlos Andrés	bf0f95f661	Merge branch 'dev' into 7736-Añadir-parámetro-itemFk-a-buyUltimate	2024-07-19 15:57:16 +02:00
Carlos Andrés	5567359d73	feat: refactor buyUltimate refs #7736	2024-07-19 15:34:32 +02:00
Carlos Andrés	55ea761af4	eat: refactor buyUltimate refs #7736	2024-07-19 15:11:14 +02:00
Guillermo Bonet	fe363fd4db	fix: refs #7126 Primary key no unique data	2024-07-19 15:00:13 +02:00
Guillermo Bonet	05598b3371	fix: refs #7126 Slow update	2024-07-19 14:29:20 +02:00
Guillermo Bonet	ca48c64163	Merge branch 'dev' into 7126-improvedWaste	2024-07-19 13:19:02 +02:00
Guillermo Bonet	b72923f160	Merge pull request 'feat: refs #7681 Optimization and refactor' (!2707) from 7681-routeUpdateM3 into dev ... Reviewed-on: #2707 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-19 11:12:21 +00:00
Guillermo Bonet	6aab5fa9ef	fix: refs #7546 Deleted insert util.binlogQueue	2024-07-19 12:47:05 +02:00
Carlos Andrés	b2a8326170	feat: refactor buyUltimate refs #7736	2024-07-19 12:44:45 +02:00
Ivan Mas	f810c9ffa8	Merge pull request 'refs #7393 Modify night ticket closing report' (!2487) from 7393-Night_tcket_closing_report into dev ... Reviewed-on: #2487 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-19 07:13:34 +00:00
Ivan Mas	58ee4f1b75	Merge branch 'dev' into 7393-Night_tcket_closing_report	2024-07-19 07:08:48 +00:00
Guillermo Bonet	69a8b8ef49	fix: refs #7511 Minor change	2024-07-19 08:34:25 +02:00
Sergio De la torre	f19f107971	feat checkExpeditionPrintOut refs #7751	2024-07-19 08:27:22 +02:00
Guillermo Bonet	3525c878b6	Merge pull request 'feat: refs #7511 Rename to multiConfig tables' (!2711) from 7511-multiConfig into dev ... Reviewed-on: #2711 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-19 05:46:42 +00:00
Guillermo Bonet	3449aeb673	refactor: refs #7511 Minor change	2024-07-19 07:45:17 +02:00
Robert Ferrús	b9e9d9aad3	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-18 12:55:09 +00:00
Ivan Mas	6d1663617f	Merge branch 'dev' into 7393-Night_tcket_closing_report	2024-07-18 12:51:34 +00:00
Ivan Mas	03227d5e51	refs #7393 do the translations	2024-07-18 14:49:40 +02:00
Guillermo Bonet	f687994a7f	refactor: refs #7681 Requested changes	2024-07-18 14:27:10 +02:00
Alex Moreno	41ed73cb28	Merge pull request '6943-fixCustomer' (!2754) from 6943-fixCustomer into dev ... Reviewed-on: #2754 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-07-18 12:01:07 +00:00
Alex Moreno	c30362a266	Merge branch 'dev' into 6943-fixCustomer	2024-07-18 11:58:18 +00:00
Robert Ferrús	ff8820f18d	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-18 10:08:15 +00:00
Jon Elias	dc9d252a8a	Merge pull request '#7356 New parameters for Weekly tickets' (!2757) from 7356_TicketMigration_End_Back into dev ... Reviewed-on: #2757 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-07-18 10:07:53 +00:00
Robert Ferrús	57efba8601	Merge branch '7683-productionControlDeadlock' of https://gitea.verdnatura.es/verdnatura/salix into 7683-productionControlDeadlock	2024-07-18 12:04:19 +02:00
Robert Ferrús	15adc59ec5	feat: refs #7683 drop temporary table	2024-07-18 12:04:17 +02:00
Robert Ferrús	e878615983	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-18 09:53:38 +00:00
Robert Ferrús	c17214ce05	feat: refs #7683 drop temporary table	2024-07-18 11:50:01 +02:00
Jon Elias	719303b511	Merge branch 'dev' into 7356_TicketMigration_End_Back	2024-07-18 08:53:52 +00:00
Jon Elias	150b3a276e	feat: refs #7356 new parameters in sql for Weekly tickets front	2024-07-18 10:51:24 +02:00
Alex Moreno	e66d138091	feat(defaulter_filter): add department	2024-07-18 08:12:39 +02:00
Alex Moreno	12316fb44b	fix(client_filter): add recovery	2024-07-18 07:32:42 +02:00
Pablo Natek	075f2b7ba4	Merge pull request 'feat: refs #7297 add new columns' (!2740) from 7297-itemAddTags10-13 into dev ... Reviewed-on: #2740 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-17 12:58:40 +00:00
Ivan Mas	019e29f3dd	Merge branch 'dev' into 7393-Night_tcket_closing_report	2024-07-17 11:48:57 +00:00
Pablo Natek	0ae1de5c88	Merge pull request 'feat: refs #6403 add delete' (!2743) from 6403-feat-add-mrw-delete-on-salix into dev ... Reviewed-on: #2743 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-17 05:36:44 +00:00
Robert Ferrús	762989557f	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-17 05:18:01 +00:00
Ivan Mas	1d10e61541	Merge branch 'dev' into 7393-Night_tcket_closing_report	2024-07-16 17:14:08 +00:00
Carlos Andrés	4ee0bd687f	feat: refactor buyUltimate refs #7736	2024-07-16 19:01:02 +02:00
Carlos Andrés	5ca2a432da	feat: refactor buyUltimate refs #7736	2024-07-16 18:58:26 +02:00
Carlos Andrés	d6a949a9f3	feat: refactor buyUltimate refs #7736	2024-07-16 18:55:58 +02:00
Carlos Andrés	38d863aac6	feat: refactor buyUltimate refs #7736	2024-07-16 18:44:24 +02:00
Carlos Andrés	a0308d281a	Merge pull request 'test-dev' (!2734) from test into dev ... Reviewed-on: #2734 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-16 13:17:48 +00:00
Pablo Natek	d2f022ab64	Merge branch 'dev' into 6403-feat-add-mrw-delete-on-salix	2024-07-16 11:44:54 +00:00
Pablo Natek	9e007bfb8a	fix: refs #6403 fix mrw cancel shipment return type	2024-07-16 13:43:36 +02:00
Pablo Natek	b7e84f43de	feat: refs #6403 add delete	2024-07-16 13:26:20 +02:00
Alex Moreno	bdf9b7810c	Merge branch 'dev' into hotFix_liliumRedirection	2024-07-16 09:24:48 +00:00
Alex Moreno	3f1e340323	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-16 10:55:23 +02:00
Robert Ferrús	b1a401444e	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-16 08:19:34 +00:00
Pablo Natek	99bbb55c37	feat: refs #7297 add new columns	2024-07-16 10:02:57 +02:00
Alex Moreno	aa1db03224	build: init version 24.32	2024-07-16 09:18:52 +02:00
Javier Segarra	3e14d2fd48	Merge pull request '#7648 Add field for endpoint as buyLabel report' (!2738) from 7648_getBuys_fields into dev ... Reviewed-on: #2738 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-16 06:28:41 +00:00
Javier Segarra	a0be2edc41	feat(salix): #7648 remove white line	2024-07-15 17:33:21 +00:00
Javier Segarra	ddd6c799dc	feat(salix): #7648 Add field for endpoint as buyLabel report	2024-07-15 17:32:14 +00:00
Carlos Andrés	8d61cb762b	feat: tabla config dias margen vctos. refs #7728	2024-07-15 17:53:23 +02:00
Alex Moreno	94470915da	feat: redirect to lilium page not found	2024-07-15 08:21:54 +02:00
Guillermo Bonet	a2f2ed743d	refactor: refs #7681 Changes	2024-07-10 13:31:48 +02:00
Robert Ferrús	3de57b776b	Merge branch 'dev' into 7683-productionControlDeadlock	2024-07-10 11:02:32 +00:00
Guillermo Bonet	889982dd82	refactor: refs #7126 Requested changes	2024-07-10 12:00:54 +02:00
Guillermo Bonet	d660043df2	feat: refs #7511 Fix tests	2024-07-10 07:48:42 +02:00
Guillermo Bonet	46e8f5b811	feat: refs #7511 Rename to multiConfig tables	2024-07-10 07:46:18 +02:00
Guillermo Bonet	b28ef09f3d	Merge branch 'dev' into 7126-improvedWaste	2024-07-09 12:04:02 +02:00
Guillermo Bonet	1f2c0190d0	Merge branch 'dev' into 7126-improvedWaste	2024-07-09 12:02:15 +02:00
Guillermo Bonet	bb7002b702	fix: refs #7126 Minor change	2024-07-09 12:00:55 +02:00
Guillermo Bonet	f4e5f0205d	fix: refs #7126 Fix	2024-07-09 11:56:32 +02:00
Guillermo Bonet	c3051ebcfb	fix: refs #7126 Fix	2024-07-09 11:43:15 +02:00
Guillermo Bonet	769ee33ab2	fix: refs #7126 Added addressWaste type	2024-07-09 11:40:24 +02:00
Guillermo Bonet	96d2bacb3d	feat: refs #7681 Changes	2024-07-09 10:22:42 +02:00
Guillermo Bonet	376adebe9d	feat: refs #7681 Changes	2024-07-09 10:19:18 +02:00
Guillermo Bonet	a725cd2840	feat: refs #7681 Changes	2024-07-09 10:19:04 +02:00
Guillermo Bonet	042ea84055	feat: refs #7681 Changes	2024-07-09 10:14:55 +02:00
Guillermo Bonet	2078bf58ff	feat: refs #7681 Optimization and refactor	2024-07-09 10:09:00 +02:00
Robert Ferrús	8469b2ac3f	feat: refs #7683 productionControl	2024-07-09 08:24:50 +02:00
Jorge Penadés	f5fb596d28	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn	2024-07-05 15:44:51 +02:00
Jorge Penadés	b27023cb9e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn	2024-07-05 13:07:59 +02:00
Jorge Penadés	9d1ee964c5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn	2024-07-05 09:17:07 +02:00
Jorge Penadés	7cbda176ce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn	2024-07-04 13:57:58 +02:00
Jorge Penadés	dce62245e9	chore: refs #7197 add supplierActivityFk filter	2024-07-04 13:10:32 +02:00
Jorge Penadés	c99042c831	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn	2024-07-04 12:26:50 +02:00
Jorge Penadés	43c95c86fe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn	2024-07-04 09:19:25 +02:00
Jorge Penadés	2383f3cc67	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn	2024-07-02 16:08:15 +02:00
Jorge Penadés	45573fed41	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn	2024-07-02 09:57:10 +02:00
Jorge Penadés	dcfc156209	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7197-fixInvoiceIn	2024-07-01 11:56:30 +02:00
Jorge Penadés	624f4707ac	feat: refs #7197 filter by correcting	2024-06-26 10:43:02 +02:00
Guillermo Bonet	b9d04e9557	Merge branch 'dev' into 7126-improvedWaste	2024-06-03 05:22:15 +00:00
Ivan Mas	52400ab626	refs #7393 Modify night ticket closing report	2024-05-20 15:17:41 +02:00
Guillermo Bonet	b324b0c0f3	Merge branch 'dev' into 7126-improvedWaste	2024-05-10 11:20:33 +00:00
Guillermo Bonet	4d1031e031	feat: refs #7126 Added manaClaim calc	2024-05-10 13:20:15 +02:00
Guillermo Bonet	13ed86d26d	Fix: refs #7126 Tests back	2024-05-10 11:06:49 +02:00
Guillermo Bonet	b1e136aa47	Fix: refs #7126 Tests back	2024-05-10 11:05:20 +02:00
Guillermo Bonet	eea04520ad	Fix: refs #7126 Fix proc	2024-05-10 10:05:02 +02:00
Guillermo Bonet	1ea357a5dd	feat: refs #7126 Refactor and added columns in bs.waste table & proc	2024-05-10 10:01:46 +02:00