9539 Commits

Author	SHA1	Message	Date
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
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
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
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	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
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
Alex Moreno	896d273da8	fix(worker_new): fix countryFk	2024-07-12 12:06:37 +02: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	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
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
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	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
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