9989 Commits

Author	SHA1	Message	Date
Javier Segarra	8fad522a3e	feat(salix): refs #7677 #7677 return more postcode fields	2024-08-19 12:45:06 +02:00
Javi Gallego	ccfb53891f	Merge branch 'dev' into 7346	2024-08-19 09:10:06 +02:00
Javi Gallego	575577d29b	feat: refs #7346 add multiple feature	2024-08-16 10:08:58 +02:00
Alex Moreno	00dc58221e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-16 09:23:43 +02:00
Jorge Penadés	57a1de7f13	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-08-14 16:29:12 +02:00
Jorge Penadés	b2f4b54654	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6900-dropInvoiceIn	2024-08-14 14:41:18 +02:00
Carlos Satorres	c26bfffada	Merge branch 'dev' into 7355-accountMigration2	2024-08-14 11:04:24 +00:00
Guillermo Bonet	5e0bf4c739	Merge branch 'master' into test	2024-08-14 12:48:22 +02:00
Carlos Satorres	834f62a724	Merge branch '7355-accountMigration2' of https://gitea.verdnatura.es/verdnatura/salix into 7355-accountMigration2	2024-08-14 12:38:41 +02:00
Carlos Satorres	3ee377156b	fix: refs #7355 remove and tests accounts	2024-08-14 12:38:38 +02:00
Jorge Penadés	79923cc1d3	feat: refs #6900 drop section	2024-08-14 12:20:02 +02:00
Javi Gallego	f21c292e20	Merge branch 'dev' into 7346	2024-08-14 12:19:40 +02:00
Javi Gallego	7f543e8d3a	Merge branch 'dev' into 7346	2024-08-14 10:32:32 +02:00
Alex Moreno	f5fd85771f	Merge branch 'dev' into 7355-accountMigration2	2024-08-14 07:51:30 +00:00
Jorge Penadés	6c9676ce9c	chore: refs #7663 fix logic	2024-08-13 14:52:26 +02:00
Jorge Penadés	52d62710e6	chore: refs #7663 fix logic	2024-08-13 13:49:00 +02:00
Jorge Penadés	85f064c869	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-08-13 11:41:52 +02:00
Jorge Penadés	a733560649	feat: refs #7323 add locale	2024-08-13 10:26:36 +02:00
Jorge Penadés	c742f6f79d	Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-08-12 16:59:28 +02:00
Carlos Satorres	3ee9833a70	fix: refs #7355 remove and tests accounts	2024-08-12 14:06:02 +02:00
Alex Moreno	46abf2f57b	fix(defaulter_filter): recovery subquery	2024-08-12 10:27:26 +02:00
Alex Moreno	64fb097086	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-08-09 12:54:34 +02:00
Alex Moreno	af65ef2536	fix(orders_filter): add sourceApp accepts	2024-08-09 12:54:33 +02:00
Jorge Penadés	8ab049be0d	chore: refs #6900 beautify code	2024-08-09 11:48:22 +02:00
Jorge Penadés	5dfdb458a6	#6900 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6900-fineTunningInvoiceIn	2024-08-08 15:27:42 +02:00
Alex Moreno	30e1b7280a	Merge branch 'dev' into 6336-claim-redirectToLilium	2024-08-08 10:38:33 +00:00
Jorge Penadés	853a57ec63	#6900 fix: empty commit	2024-08-08 12:37:29 +02:00
Jorge Penadés	660ebfbe15	#6900 feat: empty commit	2024-08-08 12:36:06 +02:00
Jorge Penadés	4af881a8d9	#6900 feat: clear empty	2024-08-08 12:35:11 +02:00
Jorge Penadés	b4ea7819f8	#6900 feat: clear empty	2024-08-08 12:18:42 +02:00
Jorge Penadés	1ccfd8731f	#6900 feat: empty commit	2024-08-08 12:17:56 +02:00
Jorge Penadés	afc5615140	#6900 fix: #6900 rectificative filter	2024-08-08 12:14:44 +02:00
Alex Moreno	715439ae38	test: fix claim descriptor redirect to lilium	2024-08-08 08:23:17 +02:00
Alex Moreno	c768fa113e	test: fix ticket redirect to lilium	2024-08-08 08:20:26 +02:00
Jorge Penadés	8241a6c22a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into Worker_Migration	2024-08-07 15:48:41 +02:00
Guillermo Bonet	09a0459a7b	refs #7844 Fix tests part 2/2	2024-08-07 13:52:41 +02:00
Guillermo Bonet	4cbea3bf7b	refs #7844 Fix tests part 2/2	2024-08-07 13:51:00 +02:00
Guillermo Bonet	8aa06e12b3	refs #7844 Fix tests part 1/2	2024-08-07 12:39:18 +02:00
Alex Moreno	4e831dc1bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6336-claim-redirectToLilium	2024-08-07 11:17:09 +02:00
Alex Moreno	0152fb8a98	hotFix getTIckets	2024-08-06 09:51:15 +02:00
Alex Moreno	69c676d44b	hotFix(route): fix getTicket use skip	2024-08-06 09:38:27 +02:00
Alex Moreno	6fb78e1599	test: hotFix saveSign	2024-08-06 08:59:20 +02:00
Pablo Natek	323ab638d7	fix: refs #7404 fix fixtures and back test	2024-08-05 15:55:44 +02:00
Pablo Natek	0e7272f911	fix: refs #7404 fix error message	2024-08-05 15:42:21 +02:00
Pablo Natek	f148635c68	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed	2024-08-05 15:41:41 +02:00
Pablo Natek	47543d5760	refactor: refs #7404 remove console.log	2024-08-05 15:34:01 +02:00
Pablo Natek	961fafb33e	feat: refs #7404 stockBought add and calculate	2024-08-05 15:32:36 +02:00
Guillermo Bonet	d6e09fcfc9	Merge branch 'master' into test	2024-08-05 12:59:37 +02:00
Guillermo Bonet	91253cc807	fix: refs #7835 transferSales	2024-08-05 12:57:38 +02:00
Guillermo Bonet	d5a8e32b52	Merge branch 'master' into test	2024-08-05 11:59:46 +02:00
Guillermo Bonet	ab446b54ed	feat: refs #7644 Optimized entry labels report	2024-08-05 11:29:35 +02:00
Jon Elias	6620a1d119	Merge branch 'dev' into Worker_Migration	2024-08-01 11:56:06 +00:00
Jon Elias	ed283cac46	feat: deleted worker module code & redirect to Lilium	2024-08-01 13:15:11 +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
Sergio De la torre	94d89f9c99	Merge branch 'master' into 6861_triggerItemShelving	2024-07-31 19:51:36 +00:00
Carlos Andrés	5b0dcee62d	hotfix: getBuys add field comment Ticket 207748	2024-07-31 18:41:18 +02:00
Sergio De la torre	70b931553b	hotFix itemShelving refs #6861	2024-07-31 18:14:09 +02:00
Jorge Penadés	57f6c6d9a1	chore: refs #7663 WIP setWeight	2024-07-31 10:43:55 +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
Sergio De la torre	952b7a5054	hotFix model itemShelving refs #7805	2024-07-31 07:10:38 +02:00
Jon Elias	d74a04a881	feat: deleted code and redirect to Lilium	2024-07-30 11:37:41 +02: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	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	c713c3a5c0	fix: refs #6861 Unhandled error	2024-07-29 09:21:35 +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	c6bcf6f488	Merge branch 'test' into dev	2024-07-26 13:56:07 +02:00
Guillermo Bonet	b876d1c278	feat: refs #7644 Added item reference	2024-07-26 13:52:18 +02:00
Alex Moreno	2505adf87f	hotFix: ticketAdvanced	2024-07-26 13:47:15 +02:00
Pablo Natek	cf84ce1337	feat: refs #7401 redirect lilium	2024-07-26 09:38:49 +02:00
Javier Segarra	7254abea40	feat(salix): #7648 Add args to filter shipped value	2024-07-25 12:49:23 +02:00
Guillermo Bonet	ff8f340978	Merge branch 'test' into dev	2024-07-25 09:40:45 +02:00
Guillermo Bonet	af62c2e807	fix: refs #7664 No insert editorFk	2024-07-25 08:57:18 +02:00
Robert Ferrús	cfa487a80f	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-07-25 06:18:10 +00:00
Alex Moreno	df737c784d	Merge pull request 'fix: refs #6403 remove console log' (!2786) from 6403-remove-console-log into master ... Reviewed-on: #2786 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-24 10:57:06 +00:00
Pablo Natek	bc9fe220d5	fix: refs #6403 remove console log	2024-07-24 12:38:27 +02:00
Javier Segarra	de7b4dc9d6	fix: missing fields	2024-07-24 10:08:01 +00: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
Jon Elias	9cf5f8759f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule	2024-07-24 07:34:44 +02:00
Alex Moreno	1a3ed42bcd	fix: defaulter filter correct sql	2024-07-23 14:37:34 +02:00
Jon Elias	2568ac4e92	feat: refs #6346 new wagon type section	2024-07-23 13:24:43 +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	c6b49e2134	Merge branch 'test' into dev	2024-07-23 09:27:05 +02:00
Pablo Natek	d152a58dda	Merge branch '7129-fixFilter' of https://gitea.verdnatura.es/verdnatura/salix into 7129-fixFilter	2024-07-22 13:33:52 +02:00
Pablo Natek	b73eceb1c8	fix: refs #7129 fix backFilters	2024-07-22 13:33:51 +02:00
Pablo Natek	62ab72d6d5	Merge branch 'test' into 7129-fixFilter	2024-07-22 11:20:04 +00: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	169534568e	Merge branch 'test' into dev	2024-07-22 12:36:27 +02:00
Guillermo Bonet	b58cdcc590	Merge branch 'master' into test	2024-07-22 12:24:39 +02:00
Carlos Andrés	d7b9a3ffd0	feat: refactor buyUltimate refs #7736	2024-07-22 11:58:51 +02:00
Guillermo Bonet	ab45b988c8	feat: refs #7704 Added itemMinimumQuantity_check	2024-07-22 10:27:24 +02:00
Javi Gallego	8f623bd51e	feat: refs #7346 mas intuitivo	2024-07-22 10:26:40 +02:00
Pablo Natek	c18765f22f	fix: refs #7129 fix return	2024-07-22 09:18:37 +02:00
Pablo Natek	c3d3a21b23	feat: refs #7129 add fields	2024-07-22 09:12:24 +02:00
Guillermo Bonet	ce59a2bbbf	fix: refs #6769 Item diary redirection to Lilium	2024-07-22 08:40:12 +02:00
Robert Ferrús	d8f1368b32	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-07-22 05:07:01 +00:00
Pablo Natek	ae18a52a89	fix: refs #7129 fix filter	2024-07-22 06:41:02 +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
Guillermo Bonet	ca48c64163	Merge branch 'dev' into 7126-improvedWaste	2024-07-19 13:19:02 +02:00
Alex Moreno	15e1f9763a	BREACKING CHANGE: claim redirect to lilium	2024-07-19 12:58:34 +02:00
Javier Segarra	376ddebdcd	Merge branch 'master' into 7648_myEntries	2024-07-19 11:42:53 +02:00
Ivan Mas	58ee4f1b75	Merge branch 'dev' into 7393-Night_tcket_closing_report	2024-07-19 07:08:48 +00: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	fd2bac713d	fix: #6184 Deleted unused params	2024-07-19 07:16:24 +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
Ivan Mas	6d1663617f	Merge branch 'dev' into 7393-Night_tcket_closing_report	2024-07-18 12:51:34 +00:00
Alex Moreno	c30362a266	Merge branch 'dev' into 6943-fixCustomer	2024-07-18 11:58:18 +00:00
Guillermo Bonet	f18b165e4a	Merge branch 'master' into test	2024-07-18 13:45:23 +02:00
Jon Elias	150b3a276e	feat: refs #7356 new parameters in sql for Weekly tickets front	2024-07-18 10:51:24 +02:00
Robert Ferrús	e96fa75356	fix: refs #7039 country order	2024-07-18 09:22:27 +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
Sergio De la torre	0181764744	Merge pull request 'master' (!2750) from master into test ... Reviewed-on: #2750 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-17 15:09:35 +00:00
Sergio De la torre	3aea6fdd46	hotFix reservas refs #6861	2024-07-17 16:13:31 +02:00
Alex Moreno	a1f481deb1	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-07-17 14:17:17 +02:00
Ivan Mas	019e29f3dd	Merge branch 'dev' into 7393-Night_tcket_closing_report	2024-07-17 11:48:57 +00:00
Alex Moreno	2763839c54	hotFix(workerTimeControl): confirm correct url	2024-07-17 13:42:23 +02:00
Alex Moreno	d52a229613	hotFix(workerTimeControl): confirm correct url	2024-07-17 13:40:57 +02:00
Alex Moreno	021d315a01	fix: weeklyHourRecordEmail workerId prop and correct request in frontend	2024-07-17 13:30:47 +02:00
Alex Moreno	ae2ddcb8c7	add console.log	2024-07-17 12:20:58 +02:00
Alex Moreno	e5bfb4af23	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-07-17 12:20:22 +02:00
Alex Moreno	4ff388198b	fix(deletExpeditions): add try catch	2024-07-17 10:14:41 +02:00
Robert Ferrús	4ff61a75e0	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-07-17 06:26:26 +00:00
Pablo Natek	f83dd37a28	fix: refs #6403 remove line	2024-07-17 08:23:33 +02:00
Pablo Natek	0ea69427ec	feat: refs #6403 add cancelShipment on deleteExpeditions	2024-07-17 08:16:01 +02:00
Ivan Mas	1d10e61541	Merge branch 'dev' into 7393-Night_tcket_closing_report	2024-07-16 17:14:08 +00:00
Carlos Andrés	38d863aac6	feat: refactor buyUltimate refs #7736	2024-07-16 18:44:24 +02:00
Sergio De la torre	a82df8e2a2	feat handleUser refs #6868	2024-07-16 17:20:35 +02:00
Sergio De la torre	7870416860	feat handleUser refs #6868	2024-07-16 17:08:38 +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	b7e84f43de	feat: refs #6403 add delete	2024-07-16 13:26:20 +02:00
Javier Segarra	d558e3d9f4	test(salix): refs #7648 #7648 test travels and entries	2024-07-16 12:45:51 +02:00
Javier Segarra	8fe94772f3	feat(salix): refs #7648 #7648 buyLabels	2024-07-16 12:45:31 +02:00
Javier Segarra	6856ab0501	feat(salix): refs #7648 #7648 myEntries	2024-07-16 12:45:14 +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	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
Sergio De la torre	144cf20e71	feat handleUser refs #6868	2024-07-16 10:14:19 +02:00
Javi Gallego	63763f2b22	Merge branch 'dev' into 7346	2024-07-16 09:32:16 +02:00
Javier Segarra	c5cb4d84f1	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-07-16 09:23:30 +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
Sergio De la torre	ae6963c26d	feat handleUser refs #6868	2024-07-16 08:19:13 +02: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
Sergio De la torre	ac0c3b79b4	feat createLogin refs #6868	2024-07-15 15:51:52 +02:00
Javi Gallego	f25d5c3bb5	Merge branch 'dev' into 7348-client-hasDailyInvoice	2024-07-15 10:37:53 +00:00
Alex Moreno	eca89c1c4e	Merge branch 'dev' into 7348-client-hasDailyInvoice	2024-07-15 08:19:26 +00:00
Javier Segarra	199d8e0034	Merge branch '7648_myEntries_filter' of https://gitea.verdnatura.es/verdnatura/salix into 7648_myEntries_filter	2024-07-15 09:59:58 +02:00
Javier Segarra	fb8b31b397	perf: refs #7648 #7648 clean fixtures and SQL filter	2024-07-15 09:59:52 +02:00
Robert Ferrús	d85f40d725	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-07-15 05:28:16 +00:00
Javier Segarra	0ca4bffaf0	Perf: improve condition days filter	2024-07-13 18:07:46 +00:00
Javier Segarra	1d23554508	perf(ssalix): refs #7648 remove default value	2024-07-12 20:52:52 +02:00
Javier Segarra	5dcabd687e	feat(ssalix): refs #7648 clean test !entry.filter	2024-07-12 20:52:26 +02:00
Javier Segarra	bedff9f290	Merge branch 'dev' into 7648_myEntries_filter	2024-07-12 20:24:25 +02:00
Guillermo Bonet	dcde6bb37a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-12 14:04:50 +02:00
Guillermo Bonet	1e264c2102	fix: refs #7704 Warehouse priority	2024-07-12 14:04:49 +02:00
Javier Segarra	9206826135	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-07-12 12:57:22 +02:00
Alex Moreno	896d273da8	fix(worker_new): fix countryFk	2024-07-12 12:06:37 +02:00
Robert Ferrús	625ab07e48	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-07-12 10:01:12 +00:00
Robert Ferrús	4da811cba6	Merge branch 'dev' into 7670-addSaleRenewPrice	2024-07-12 08:50:48 +00:00
Guillermo Bonet	f8f6950de1	Merge pull request 'feat: refs #6769 itemDiary' (!2683) from 6769-itemDiary into dev ... Reviewed-on: #2683 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-12 08:13:27 +00:00
Guillermo Bonet	1531e27911	fix: refs #7704 Restored minimum quantity label	2024-07-12 10:00:52 +02:00
Guillermo Bonet	910071bde0	refactor: refs #7704 Requested changes	2024-07-12 09:11:55 +02:00
Guillermo Bonet	bb787b1581	refactor: refs #7704 Requested changes	2024-07-12 09:03:37 +02:00
Javier Segarra	47cff3f894	feat(ssalix): refs #7648 remove select field	2024-07-12 08:52:03 +02:00
Guillermo Bonet	5c80a99543	feat: refs #7704 Requested changes	2024-07-12 07:58:59 +02:00
Guillermo Bonet	31530d6d3d	feat: refs #6769 Fix tests	2024-07-12 07:22:22 +02:00
Javier Segarra	9c5f38648a	feat(ssalix): refs #7671 #7671 checkDates to present	2024-07-12 00:24:26 +02:00
Javier Segarra	b28a8a34dc	feat(salix): refs #7648 #7648 add new filter	2024-07-11 19:55:36 +02:00
Javier Segarra	ca48ad9777	feat(salix): refs #7648 #7648 add new entries and travels	2024-07-11 19:55:19 +02:00
Robert Ferrús	39b52e706a	feat: refs #7615 setDeleted	2024-07-11 14:51:34 +02:00
Guillermo Bonet	69e0d78537	feat: refs #7704 Fix tests	2024-07-11 14:31:17 +02:00
Guillermo Bonet	9e3baeffa6	feat: refs #7704 Added tests	2024-07-11 14:27:16 +02:00
Guillermo Bonet	f1b0b95442	feat: refs #7704 Refactor	2024-07-11 11:47:06 +02:00
Guillermo Bonet	7bdc242fc7	feat: refs #7704 Added minQuantity to tmp.ticketCalculateItem	2024-07-11 11:40:06 +02:00
Guillermo Bonet	90802bd330	feat: refs #7704 Minor changes	2024-07-11 11:28:00 +02:00
Guillermo Bonet	2e48263636	feat: refs #7704 Fix	2024-07-11 11:10:01 +02:00
Guillermo Bonet	823756d71a	feat: refs #7704 Optimization	2024-07-11 10:29:26 +02:00
Guillermo Bonet	7ba2e8d4c5	feat: refs #7704 Fix tests	2024-07-11 09:48:31 +02:00
Carlos Satorres	0579e7dbbf	hotfix routeSummary	2024-07-11 09:14:14 +02:00
Guillermo Bonet	61a746c2d8	feat: refs #7704 Fixes	2024-07-11 09:00:07 +02:00
Guillermo Bonet	02bcfd9be3	feat: refs #7704 Major changes	2024-07-11 08:57:45 +02:00
Javi Gallego	618baaf604	usa campo factura multipe	2024-07-11 08:37:08 +02:00
Javier Segarra	ea626821fc	feat(ssalix): refs #7671 #7671 checkDates	2024-07-11 06:17:19 +02:00
Robert Ferrús	36b1beeebf	Merge branch 'dev' into 7670-addSaleRenewPrice	2024-07-10 09:44:54 +00:00
Pablo Natek	64bddd4f63	feat: refs #6403 add dynamic clientType	2024-07-10 10:41:52 +02:00
Alex Moreno	c7d9fae17b	Merge branch 'dev' into 7348-client-hasDailyInvoice	2024-07-10 08:39:35 +00:00
Guillermo Bonet	46e8f5b811	feat: refs #7511 Rename to multiConfig tables	2024-07-10 07:46:18 +02:00
Guillermo Bonet	0b61a175ef	Merge branch 'test' into dev	2024-07-09 14:49:51 +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
Carlos Satorres	944cf3baa3	refs #7694 hotfix filter	2024-07-09 11:44:43 +02:00
Guillermo Bonet	be83fa6729	fix: refs #7622 Fix	2024-07-09 11:13:55 +02:00
Carlos Satorres	02c2ccd62e	stash filterState	2024-07-09 11:00:02 +02:00
Guillermo Bonet	f79b2378af	Merge branch 'dev' into 7622-addressWaste	2024-07-08 10:05:35 +00:00
Guillermo Bonet	e64f56cff1	Merge branch 'test' into dev	2024-07-08 07:55:00 +02:00
Guillermo Bonet	5213fd4feb	Merge branch 'master' into test	2024-07-08 07:54:42 +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
Javier Segarra	5192bfd8ea	fix(salix): refs #7648 #7648 entryFilter and getBuys by fi	2024-07-05 14:58:34 +02:00
Guillermo Bonet	1799b52f8b	feat: refs #7622 Added type column addressWaste	2024-07-05 12:37: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
Javi Gallego	d4b4c0fafe	feat: refs #7348 campos a modificar	2024-07-05 09:04:38 +02:00
Javi Gallego	e3db143b44	feat: refs #7348 campo en json	2024-07-05 08:55:24 +02:00
Sergio De la torre	159f2f5f1c	hotFix itemNewer refs #6964	2024-07-05 08:44:09 +02:00
Sergio De la torre	859f610f43	hotFix itemNewer refs #6964	2024-07-05 08:43:45 +02:00
Jorge Penadés	dce62245e9	chore: refs #7197 add supplierActivityFk filter	2024-07-04 13:10:32 +02:00
Alex Moreno	776fd05648	fix: send rocket after commit cau 199307	2024-07-04 12:45:52 +02:00
Robert Ferrús	1fff3aa681	feat: refs #7670 addSale	2024-07-04 12:34:56 +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	900fa2de5e	fix: refs #7648 add myOpts	2024-07-03 13:03:19 +02: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	fafebb4339	refs #6897 fix filter	2024-07-03 12:13:40 +02:00
Carlos Satorres	dd3a8d4b72	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration2	2024-07-03 12:05:00 +02:00
Jorge Penadés	12f29aa50e	Merge pull request '#6449 addColumnLogTables' (!2277) from 6449-addColumnLogTables into dev ... Reviewed-on: #2277 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-07-03 08:51:56 +00:00
Alex Moreno	4535795515	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-07-03 10:08:15 +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
Jon Elias	d01820c751	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-07-03 07:54:55 +00:00
Javier Segarra	d72a52d6b1	Merge pull request '#7648 - Customer View Entries' (!2659) from 7648_dev_customerEntries into dev ... Reviewed-on: #2659 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-03 07:29:00 +00:00
Sergio De la torre	1561e15d5e	feat roadmap refs #7195	2024-07-03 09:21:58 +02:00
Jon Elias	4bdbb3b08e	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-07-03 07:13:21 +00:00
Jorge Penadés	1c6dd17f90	Merge branch 'dev' into 6449-addColumnLogTables	2024-07-03 07:10:41 +00:00
Carlos Satorres	797a4e5df6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration2	2024-07-03 08:51:14 +02:00
Sergio De la torre	7677ada925	Merge branch 'dev' into 7195_roadmap2	2024-07-03 06:46:10 +00:00
Javier Segarra	5c73a20f43	Merge branch 'dev' into 7648_dev_customerEntries	2024-07-03 06:17:34 +00:00
Javier Segarra	946d6f553a	perf(salix): refs #7648 #7648 sql conventions	2024-07-03 08:16:55 +02:00
Guillermo Bonet	d1a38ec589	Merge pull request 'refactor: refs #7424 Component type refactor' (!2656) from 7424-componentType into dev ... Reviewed-on: #2656 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-03 05:22:48 +00:00
Javier Segarra	adbbe4aef9	fix(salix): refs #7648 #7648 solve big bug	2024-07-03 01:46:01 +02:00
Javier Segarra	cc004a864a	feat(salix): refs #7648 #7648 rename some travel fields	2024-07-02 20:41:53 +02:00
Sergio De la torre	61265a45e3	Merge branch 'dev' into 7195_roadmap2	2024-07-02 11:25:46 +00:00
Sergio De la torre	e1b6ba4276	feat roadmap refs #7195	2024-07-02 12:03:21 +02:00
Javier Segarra	3539b5a33e	test(salix): refs #7648 #7648 remove fdescribe	2024-07-02 10:08:51 +02:00
Javier Segarra	30520cbe48	test(salix): refs #7648 #7648 getBuys.filter	2024-07-02 10:06:26 +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
Javier Segarra	89a394a10d	test(salix): refs #7648 #7648 entry.filter	2024-07-02 09:52:18 +02:00
Javier Segarra	f41c2489d9	Merge branch 'dev' into 7648_dev_customerEntries	2024-07-02 09:34:46 +02:00
Sergio De la torre	08cf79b09b	feat roadmap refs #7195	2024-07-02 08:39:42 +02:00
Javier Segarra	f27bdec758	feat(salix): refs #7648 #7648 changes requested	2024-07-01 21:14:27 +02:00
Sergio De la torre	d9742afc9b	feat roadmap refs #7195	2024-07-01 17:45:45 +02:00
Sergio De la torre	5992d7f53f	Merge branch 'dev' into 6861-Reservas-front	2024-07-01 14:39:19 +00:00
Javier Segarra	f0326860ba	feat(salix): refs #7648 #7648 add new fields	2024-07-01 14:07:46 +02:00
Javier Segarra	f47197cd80	Merge branch '7648_customerEntries' into 7648_dev_customerEntries	2024-07-01 14:06:28 +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
Jon Elias	0e84749c07	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-07-01 10:22:11 +00: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
Carlos Satorres	0240734a4b	refs #6897 fix filter	2024-07-01 11:50:37 +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
Sergio De la torre	22959db0ee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmap2	2024-07-01 11:28:14 +02:00
Guillermo Bonet	a23f485296	refactor: refs #7424 Component type refactor	2024-07-01 11:11:16 +02:00
Guillermo Bonet	ac54994760	Merge pull request 'feat: refs #7644 First commit' (!2651) from 7644-entryLabel into dev ... Reviewed-on: #2651 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-01 07:56:14 +00:00
Guillermo Bonet	5c8d8ba280	refs #7644 Added locales and changed name of method	2024-07-01 09:07:36 +02:00
Guillermo Bonet	57a879723e	Merge branch 'test' into dev	2024-07-01 07:39:19 +02:00
Javi Gallego	355e426ccf	mail-alias-account con mixin	2024-07-01 07:19:00 +02:00
Guillermo Bonet	df4e5deae6	Merge branch 'test' into dev	2024-06-28 13:33:43 +02:00
Guillermo Bonet	19bf606330	refs #7644 First commit	2024-06-28 12:57:27 +02:00
Jorge Penadés	2b0df02f20	Merge branch 'dev' into 6286-setRightWorkerTimeControlAcls	2024-06-27 08:34:53 +00:00
Pablo Natek	b6a72a1abb	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-27 07:12:40 +00:00
Sergio De la torre	cbc00b90b9	feat front-reservas refs #6861	2024-06-26 14:02:25 +02:00
Guillermo Bonet	ad4dd088a3	Merge branch 'test' into dev	2024-06-26 11:58:43 +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
Jorge Penadés	624f4707ac	feat: refs #7197 filter by correcting	2024-06-26 10:43:02 +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
Carlos Satorres	f9a09f3fec	Merge branch 'dev' into 7409-workerIncome	2024-06-26 08:00:58 +00:00
Robert Ferrús	0534526ac2	fix: refs #7039 filterFix	2024-06-26 09:03:06 +02:00
Pablo Natek	478a38b0ab	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-26 05:14:37 +00:00
Jorge Penadés	1f6fd8d6d1	feat: refs #6286 check if is teamBoss	2024-06-25 17:27:00 +02:00
Jorge Penadés	93f2995d39	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls	2024-06-25 16:26:13 +02:00
Sergio De la torre	75f8de9277	Merge branch 'dev' into 7168-itemShelvingLog_get	2024-06-25 14:16:29 +00:00
Carlos Satorres	d1ed4b4459	refs #7409 fix back	2024-06-25 16:03:59 +02:00
Carlos Satorres	ffff851d1a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome	2024-06-25 14:49:32 +02:00
Alex Moreno	95a23ad9fc	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-06-25 11:43:42 +00:00
Sergio De la torre	c551e229fb	feat itemShelvingLog refs #7168	2024-06-25 13:30:46 +02:00
Carlos Satorres	f811e7e96c	Merge branch 'dev' into 7406-workerFormation	2024-06-25 10:39:38 +00:00
Carlos Satorres	95e1bba58b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome	2024-06-25 12:36:12 +02:00
Alex Moreno	45e8674087	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-25 11:34:35 +02:00
Guillermo Bonet	134c38b9fd	refs #6753 Hotfix	2024-06-25 08:57:21 +02:00
Jorge Penadés	24cf23dddc	feat: refs #62add travelKgPercentage table and model	2024-06-21 13:16:01 +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	424e0c430c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome	2024-06-21 09:50:29 +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	a80b0c3b4c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation	2024-06-21 08:36:50 +02:00
Guillermo Bonet	b02a4721af	Merge branch 'test' into dev	2024-06-20 13:10:31 +02:00
Guillermo Bonet	074d4f4755	Merge branch 'master' into test	2024-06-20 13:10:07 +02:00
Guillermo Bonet	9a4ec46073	hotfix: refs #6820 Deleted km validation	2024-06-20 13:09:40 +02:00
Jon Elias	419de69690	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll	2024-06-20 12:24:06 +02:00
Alex Moreno	f99b1beb86	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-20 09:48:57 +02:00
Alex Moreno	f84e85e443	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-06-20 09:48:34 +02:00
Javi Gallego	018972b948	Merge pull request 'feat: refs #7216 logUnpaid' (!2609) from 7216-clientUnpaid into dev ... Reviewed-on: #2609 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-20 05:50:14 +00: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
Jorge Penadés	4b8b503964	Merge branch 'master' into 6744-hotfix-showChangePass	2024-06-19 14:50:32 +00:00
Alex Moreno	7a0d107943	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-19 12:43:43 +00:00
Carlos Andrés	c596cae0c0	Merge pull request 'fix: asociar ticketRefund refs #7586' (!2592) from 7586---Proceso-abonar-tickets/facturas-desde-Salix into master ... Reviewed-on: #2592 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-19 12:22:32 +00:00
Jorge Penadés	905528a704	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6744-hotfix-showChangePass	2024-06-19 13:44:39 +02:00
Javi Gallego	1a8df4d87c	feat: refs #7216 triggers	2024-06-19 13:41:37 +02:00
Jorge Penadés	6967aa9811	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls	2024-06-19 13:40:09 +02:00
Guillermo Bonet	738dcc7060	Merge pull request 'feat: refs #7545 Deleted hasIncoterms client column' (!2582) from 7545-hasIncoterms into dev ... Reviewed-on: #2582 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-19 09:31:18 +00:00
Pablo Natek	47eb6dd8fe	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-19 08:46:42 +00:00
Javi Gallego	637c6a9035	feat: refs #7216 logUnpaid	2024-06-19 09:40:24 +02:00
Javi Gallego	df4b3add8d	fix: refs #6408 quito state.js	2024-06-19 07:59:45 +02:00
Carlos Satorres	2d3311b824	refs #6898 fix supplier remove	2024-06-18 13:44:39 +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
Sergio De la torre	239814e6b4	feat hasItemOlder refs#6964	2024-06-18 10:08:40 +02:00
Jorge Penadés	3070d1ef01	refactor: refs #6238 drop useless round	2024-06-18 10:04:21 +02:00
Jorge Penadés	87feddaedb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6238-addPercentage	2024-06-18 09:55:22 +02:00
Sergio De la torre	46cd20a1fd	feat hasItemOlder refs#6964	2024-06-18 08:24:15 +02:00
Alex Moreno	deb0f8e828	Merge branch 'dev' into 6897-entryMigration	2024-06-18 06:04:12 +00:00
Sergio De la torre	eedcdb54fa	feat hasItemOlder refs#6964	2024-06-17 19:50:51 +02:00
Sergio De la torre	dc777b2d7a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964-hasItemOlder	2024-06-17 19:12:00 +02:00
Sergio De la torre	c6da9e72e0	feat newLogin refs #6868	2024-06-17 16:53:06 +02:00
Sergio De la torre	0ab620b485	feat newLogin refs #6868	2024-06-17 16:50:00 +02:00
Alex Moreno	e8c7b55329	fix(WorkerIncome): refs #7409 fix models	2024-06-17 14:17:43 +02:00
Sergio De la torre	9d5d62afaf	feat newLogin refs #6868	2024-06-17 13:56:58 +02:00
Carlos Satorres	fa8c1b3879	acls, fixtures, models	2024-06-17 13:50:07 +02:00
Guillermo Bonet	39381a4a7c	Merge pull request 'fix: refs #5995 Optimized downloadCmrsZip' (!2596) from 5995-optimizedDownloadCmr into dev ... Reviewed-on: #2596 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-17 11:22:30 +00:00
Guillermo Bonet	eaaf83561c	fix: refs #5995 Optimized downloadCmrsZip	2024-06-17 13:03:02 +02:00
Jorge Penadés	4bc62a30bd	fix: refs #6744 back test	2024-06-17 12:23:01 +02:00
Jorge Penadés	89ea931d9c	feat: refs #6744 add locale & drop verification	2024-06-17 12:19:59 +02:00
Robert Ferrús	cfa0b87898	feat: refs #7296 RoutesMonitor	2024-06-17 11:50:25 +02:00
Carlos Satorres	54b6ef491f	refs #7409 back	2024-06-17 10:23:30 +02:00
Pablo Natek	25afa80bab	fix: refs #6404 remove fixtures after test	2024-06-17 09:09:45 +02:00
Sergio De la torre	60f64ff74b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin	2024-06-17 07:35:57 +02:00
Carlos Andrés	9b118f83e5	fix: asociar ticketRefund refs #7586	2024-06-14 17:56:24 +02:00
Jorge Penadés	202884fdce	feat: refs #6238 add travelKgPercentage table and model	2024-06-14 14:25:15 +02:00
Guillermo Bonet	9b80ef73a8	Merge branch 'test' into dev	2024-06-14 12:48:00 +02:00
Carlos Satorres	189c67bd2d	warmFix change if	2024-06-14 09:43:10 +02:00
Jon Elias	0bf384b2ce	Merge branch 'dev' into 6436_jasmine_beforeAll	2024-06-14 07:06:30 +00:00
Jon Elias	d3f23a6d7a	fix: refs #6436 fix filter test	2024-06-14 09:04:18 +02:00
Jon Elias	61a588b57c	refactor: refs #6436 fixed test	2024-06-14 08:39:57 +02:00
Jorge Penadés	7717c38a45	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls	2024-06-13 14:00:14 +02:00
Jorge Penadés	784bd91e04	fix: refs #6286 update WorkerTimeControl permissions	2024-06-13 13:43:28 +02:00
Sergio De la torre	52b82603d2	feat login-app refs #6868	2024-06-13 10:40:37 +02:00
Carlos Satorres	2d9092d2a5	Merge branch '6897-entryMigration' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration	2024-06-13 09:20:46 +02:00
Carlos Satorres	3c1544ac9d	refs #6897 fix es.yml	2024-06-13 09:20:43 +02:00
Robert Ferrús	5714539d78	Merge pull request 'test' (!2585) from test into dev ... Reviewed-on: #2585 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-13 07:18:55 +00:00
Jorge Penadés	e093808af0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls	2024-06-13 09:10:36 +02:00
Carlos Satorres	2dc7e75aee	Merge branch 'dev' into 6897-entryMigration	2024-06-13 06:51:09 +00:00
Robert Ferrús	b5e139b734	fix: refs #7039 supplier search-panel country	2024-06-13 08:43:11 +02:00
Guillermo Bonet	53c732bcb9	Merge branch 'test' into dev	2024-06-13 07:12:10 +02:00
Jorge Penadés	7480f5ecb3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls	2024-06-12 16:54:03 +02:00
Carlos Satorres	b72de3570a	refs #6897 fix redirection	2024-06-12 14:41:35 +02:00
Carlos Satorres	ba67acb72b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration	2024-06-12 14:33:11 +02:00
Jon Elias	84a51d3e8d	feat: refs #6436 changed tests	2024-06-12 12:23:37 +02:00
Javi Gallego	446e180cf0	hotfix claim	2024-06-12 11:58:07 +02:00
Guillermo Bonet	dcb9d54105	feat: refs #7545 Deleted hasIncoterms client column	2024-06-12 11:48:01 +02:00
Alex Moreno	3ca71b81af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation	2024-06-12 10:38:02 +02:00
Alex Moreno	b5ecf2e3b5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-12 10:11:14 +02:00
Alex Moreno	de0f0623e1	Merge branch 'master' into 6408-hotFix_updateQuantity	2024-06-12 08:07:25 +00:00
Alex Moreno	d9b0a1a75c	fix(updateQuantity): fix rocket translation	2024-06-12 09:59:58 +02:00
Alex Moreno	789e0e65e3	fix(sale): rocket is only sent if it has sales	2024-06-12 09:12:48 +02:00
Jon Elias	2b45c2c61a	feat: refs #6436 new test changes, rollback order/filter and /ticket/clone	2024-06-12 08:25:50 +02:00
Alex Moreno	60d4372996	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation	2024-06-12 07:51:01 +02:00
Alex Moreno	1eee1d0e9b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-12 07:47:56 +02:00
Pablo Natek	11a7d890a0	Merge pull request 'feat: refs #7499 add printedStickers' (!2577) from 7499-add-printedStickers into dev ... Reviewed-on: #2577 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-11 14:32:14 +00:00
Jorge Penadés	d7d6de73c5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables	2024-06-11 15:41:06 +02:00
Javi Gallego	4744f57269	Merge pull request 'feat: refs #7548 link a grafana' (!2568) from 7548-ticketSummaryCollection into dev ... Reviewed-on: #2568 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-11 12:54:06 +00:00
Javi Gallego	79c922300b	hotfix #6408	2024-06-11 14:50:47 +02:00
Pablo Natek	13d1d0a61c	feat: refs #7499 add printedStickers	2024-06-11 14:29:16 +02:00
Robert Ferrús	8039530ab4	fix: refs #7039 fix item-tax	2024-06-11 14:15:10 +02:00
Jon Elias	944355d54f	refactor: refs #6436 end first wave of changes in modules	2024-06-11 13:17:19 +02:00
Alex Moreno	3b44bdd2bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation	2024-06-11 12:56:56 +02:00
Jon Elias	665d03f048	refactor: refs #6436 user-config and some sections tests	2024-06-11 12:35:44 +02:00
Carlos Satorres	5d7a570c3f	refs #6897 fix redirection	2024-06-11 12:28:49 +02:00
Jon Elias	bd45352215	refactor: refs #6436 fourth wave	2024-06-11 12:02:15 +02:00
Jon Elias	093eaeb475	refactor: refs #6436 third wave	2024-06-11 10:45:46 +02:00
Jorge Penadés	902a9ee51b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables	2024-06-11 10:43:33 +02:00
Jon Elias	b3fa869757	refactor: refs #6436 second wave	2024-06-11 10:00:30 +02:00
Alex Moreno	9c2ccc5df4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-11 09:59:09 +02:00
Jon Elias	7df7382346	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll	2024-06-11 09:41:26 +02:00
Jon Elias	f0ad012835	refactor: refs #6436 first wave	2024-06-11 09:39:06 +02:00
Carlos Satorres	b38c5cdecc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration	2024-06-11 09:19:05 +02:00
Guillermo Bonet	873f36fef6	refactor: refs #7503 Added relations and ACLs	2024-06-11 08:50:32 +02:00
Sergio De la torre	5c3ce40bbd	feat login-app refs #6868	2024-06-11 07:12:47 +02:00
Jorge Penadés	562e8689e1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection	2024-06-10 15:36:34 +02:00
Jorge Penadés	8e3cc574ac	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6273-registerFreelance	2024-06-10 15:21:59 +02:00
Javi Gallego	e081c4504d	feat: refs #7548 link a grafana	2024-06-10 14:51:48 +02:00
Sergio De la torre	379ad6a8e2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin	2024-06-10 11:37:01 +02:00
Javi Gallego	b4046de190	Merge branch 'dev' into 4560-GastosReparto	2024-06-10 08:17:17 +00:00
Jorge Penadés	7794f23c17	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6273-registerFreelance	2024-06-10 09:02:52 +02:00
Sergio De la torre	cac1278c08	feat hsItemOlder refs $6964	2024-06-07 16:29:51 +02:00
Javi Gallego	f82f452423	Merge branch 'dev' into 7276_expeditionScanned	2024-06-07 13:44:24 +00:00
Jorge Penadés	479e4f3f8a	feat: refs #6273 required payMethod for internals	2024-06-07 13:55:56 +02:00
Jorge Penadés	ee1678ebb5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6273-registerFreelance	2024-06-07 12:14:18 +02:00
Jorge Penadés	faf450e075	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection	2024-06-07 11:45:51 +02:00
Carlos Satorres	48550bd986	refs #6897 fix remove	2024-06-07 11:35:03 +02:00
Javi Gallego	0c068ed126	Merge branch 'dev' into 4560-GastosReparto	2024-06-07 09:03:24 +00:00
Alex Moreno	379d7ef2ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-07 10:33:07 +02:00
Alex Moreno	ca6afb9c10	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-06-07 10:32:49 +02:00
Alex Moreno	6e17f3dca3	Merge branch 'master' into 6147-transferInvoice_split	2024-06-07 08:14:38 +00:00
Jorge Penadés	310c2383cb	fix: refs #6286 replace id for reason	2024-06-07 09:08:21 +02:00
Carlos Satorres	4508f7bfff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration	2024-06-07 08:53:28 +02:00