23089 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	c9c9d5973d	test(salix): refs #6321 #6321 fix test	2024-07-20 00:36:59 +02:00
Javier Segarra	7e8c2eebe5	feat: refs #6321 restore fixtures.before.sql	2024-07-19 19:38:21 +02:00
Javier Segarra	212f84aa9b	revert commit	2024-07-19 11:41:33 +02:00
Javier Segarra	48b8bda49a	Merge branch 'dev' into 6321_negative_tickets	2024-07-19 09:42:42 +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
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
Javier Segarra	ac7c28cd27	Merge branch 'dev' into 6321_negative_tickets	2024-07-18 22:02:22 +02: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
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
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
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
Ivan Mas	1d10e61541	Merge branch 'dev' into 7393-Night_tcket_closing_report	2024-07-16 17:14:08 +00: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
Carlos Andrés	3e76fa4258	Merge pull request 'fix: ticket_setProblemTooLittleItemCost ticket_setRisk refs#7213' (!2745) from fix-ticket_setRisk-ticket_setProblemTooLittleItemCost into test ... Reviewed-on: #2745 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-16 13:16:21 +00:00
Carlos Andrés	2181664c25	fix: ticket_setProblemTooLittleItemCost ticket_setRisk refs#7213	2024-07-16 15:14:10 +02: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	3f1e340323	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-16 10:55:23 +02:00
Alex Moreno	4795b1ad88	Merge pull request 'fix: worker new if not has provinceFk' (!2741) from warmFix_worker_new into test ... Reviewed-on: #2741 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-07-16 08:54:51 +00:00
Alex Moreno	1cf0ab1654	Merge branch 'test' into warmFix_worker_new	2024-07-16 08:51:11 +00:00
Alex Moreno	b871615e8f	fix: worker new if not has provinceFk	2024-07-16 10:42:08 +02:00
Sergio De la torre	dbb893c723	Merge pull request 'refs newStatePartial refs #7642' (!2737) from 7642newState into test ... Reviewed-on: #2737 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-16 08:19:38 +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
Alex Moreno	945f20bfcf	Merge pull request '7729-devToTest_2430' (!2739) from 7729-devToTest_2430 into test ... Reviewed-on: #2739 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-07-16 07:11:35 +00:00
Alex Moreno	8a9a74a7eb	test: fix ticket e2e	2024-07-16 09:04:58 +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
Alex Moreno	4fa9f057de	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-16 07:41:21 +02: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
Sergio De la torre	dc5903421b	refs newStatePartial refs #7642	2024-07-15 16:21:19 +02:00
Sergio De la torre	87b0d3e8d1	refs newStatePartial refs #7642	2024-07-15 16:18:30 +02:00
Javi Gallego	3698651306	Merge pull request 'feat: refs #7348 hasDailyInvoice field' (!2670) from 7348-client-hasDailyInvoice into dev ... Reviewed-on: #2670 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-15 12:16:31 +00:00
Pablo Natek	2baff02443	Merge pull request 'master' (!2716) from master into test ... Reviewed-on: #2716 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-15 11:40:29 +00:00
Pablo Natek	71153d0f37	Merge pull request 'fix: refs #6403 fix delivery observation' (!2733) from 6403-fix-delivery-observation into master ... Reviewed-on: #2733 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-15 11:37:52 +00:00
Pablo Natek	08ba1acc3c	fix: refs #6403 fix delivery observation	2024-07-15 13:35:24 +02:00
Carlos Andrés	ac58b7a9e9	Merge pull request 'feat: Turn issues into calculated columns refs#7213' (!2646) from 7213-problemas-columnas into dev ... Reviewed-on: #2646 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-15 10:55:06 +00:00
Javi Gallego	f25d5c3bb5	Merge branch 'dev' into 7348-client-hasDailyInvoice	2024-07-15 10:37:53 +00:00