848 Commits

Author	SHA1	Message	Date
Guillermo Bonet	7dc17cd4f6	Merge branch 'test' into dev	2024-05-31 12:29:32 +02:00
Pablo Natek	884b5f8475	feat: refs #6404 add cero filler to counter	2024-05-31 11:51:32 +02:00
Jorge Penadés	38bea60776	refactor: refs #6889 script sql	2024-05-31 09:49:58 +02:00
Jorge Penadés	eb15262fb0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-31 08:37:28 +02:00
Robert Ferrús	fd233a5e51	Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop	2024-05-31 05:09:16 +00:00
Pablo Natek	d901584c3f	feat: refs #6404 add deadline field	2024-05-30 18:39:06 +02:00
Jorge Penadés	002111d8d1	fix: refs #6889 allocate 'productionReviewer' role to revision dep. workers & check if is owner or reviewer	2024-05-30 11:47:12 +02:00
Robert Ferrús	467383d7f4	feat: refs #6477 productionConfig add column	2024-05-30 10:32:17 +02:00
Jorge Penadés	05e6e10337	fix: refs #6889 fix back tests	2024-05-30 10:04:34 +02:00
Javi Gallego	7186686548	Merge branch 'dev' into 4560-GastosReparto	2024-05-30 09:44:06 +02:00
Jorge Penadés	d866ec6417	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-29 16:59:19 +02:00
Pako Natek	a2029f7934	Merge branch 'dev' into 6021-floranet_beta	2024-05-29 09:39:31 +00:00
Jorge Penadés	9d58c67b4a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-29 09:16:25 +02:00
Jorge Penadés	d35bbe5c06	Merge branch 'dev' into 6942-improveInvoiceIn	2024-05-29 07:00:17 +00:00
Pako Natek	03fa06a9fb	Merge branch 'dev' into 6021-floranet_beta	2024-05-29 06:37:44 +00:00
Pako Natek	e0d8a46cd6	nuevo enfoque recipe y manejo de errores en order_confirm	2024-05-29 08:36:18 +02:00
Guillermo Bonet	f87ee5cb91	Merge branch 'test' into dev	2024-05-29 08:09:53 +02:00
Jorge Penadés	885aa5208a	feat : refs #6889 wip: check if is productionReviewer or owner	2024-05-28 17:23:58 +02:00
Pablo Natek	33e823675e	feat: refs #6404 default weight	2024-05-28 10:08:15 +02:00
Carlos Satorres	eb2dd5ba5b	refs #7406 acls	2024-05-27 16:17:44 +02:00
Jorge Penadés	7cc86d5af0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-27 14:36:18 +02:00
Carlos Satorres	578b8a2c71	refs #7406 changes sql, modelconfig model	2024-05-27 14:28:13 +02:00
Robert Ferrús	b404c7d101	Merge pull request 'test' (!2514) from test into dev ... Reviewed-on: #2514 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-05-27 12:11:12 +00:00
Robert Ferrús	df5f4a5a42	feat: refs #7296 fixAPPWarehouse	2024-05-27 14:05:31 +02:00
Jorge Penadés	1af24e8473	fix : refs #6942 remove grafana update priv	2024-05-27 13:34:00 +02:00
Jorge Penadés	1671423d23	fix: refs #6942 add deleteById acl	2024-05-27 12:53:25 +02:00
Jorge Penadés	c136f2783a	refactor: refs #6942 toUnbook & drop buyer acls	2024-05-27 12:34:27 +02:00
Robert Ferrús	7559875aff	feat: refs #7296 roadmapStopFk	2024-05-27 12:08:14 +02:00
Sergio De la torre	74b71079f2	refs #6861 feat: obsrevation	2024-05-27 11:33:04 +02:00
Jorge Penadés	dc90ad6595	fix: refs #6942 acls & back	2024-05-27 10:48:32 +02:00
Robert Ferrús	941438efd0	Merge branch '7296-expeditionTruckToRoadmapStop' of https://gitea.verdnatura.es/verdnatura/salix into 7296-expeditionTruckToRoadmapStop	2024-05-27 09:41:30 +02:00
Robert Ferrús	aaea0c95f7	feat: refs #7296 roadmapStopFk	2024-05-27 09:41:28 +02:00
Jorge Penadés	f209718383	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-27 09:03:34 +02:00
Sergio De la torre	64f71e0f9d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-05-27 07:46:21 +02:00
Javi Gallego	0e5a15dd4e	con addressFk	2024-05-24 15:14:20 +02:00
Pako Natek	ab3b58ec3c	modificacion recipe y element	2024-05-24 13:41:02 +02:00
Pako Natek	49a2e6fc84	tickets y email	2024-05-24 11:44:58 +02:00
Pako Natek	257de96743	Merge remote-tracking branch 'origin/dev' into 6021-floranet_beta	2024-05-24 07:44:12 +02:00
Jorge Penadés	cddc034adf	fix: refs #6942 revoke update isBooked	2024-05-23 17:53:08 +02:00
Carlos Satorres	1fa5a22bb6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6111-routeList	2024-05-23 09:17:19 +02:00
Sergio De la torre	d1affb1191	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964-hasItemOlder	2024-05-23 07:49:11 +02:00
Carlos Satorres	4c5f46eb9b	Merge pull request 'refs #6820 fix back' (!2480) from 6820-fixMaxKmRoute into dev ... Reviewed-on: #2480 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-22 13:55:53 +00:00
Carlos Satorres	4dee90ff57	refs #6820 fix pr	2024-05-22 14:56:46 +02:00
Sergio De la torre	49fed4e51e	refs #6964 feat: hasItemOlder	2024-05-22 12:23:33 +02:00
Guillermo Bonet	35e892a90c	refs #7422 Fix	2024-05-21 10:07:51 +02:00
Guillermo Bonet	030106f06d	refactor: refs #7422 Deprecated column	2024-05-21 08:13:06 +02:00
Guillermo Bonet	b33d4ce319	Merge pull request 'refactor: refs #7375 Refactor clientsDisable' (!2471) from 7375-clientsDisable into dev ... Reviewed-on: #2471 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-21 06:11:24 +00:00
Guillermo Bonet	ac2ed0956b	refs #7422 Fixed all problems	2024-05-21 08:04:28 +02:00
Guillermo Bonet	cbf9a4c4e9	refs #7422 Fixed all problems	2024-05-21 07:58:51 +02:00
Guillermo Bonet	93314d67b6	refs #7422 Fix	2024-05-21 07:31:24 +02:00
Guillermo Bonet	cc2b5764e9	refs #7422 Fix	2024-05-21 07:26:54 +02:00
Guillermo Bonet	82d985ff3a	refs #7422 Fix	2024-05-21 07:19:04 +02:00
Guillermo Bonet	8563116091	Merge pull request 'refactor: refs #7422 Deleted tables' (!2478) from 7422-byeVn2008Tables into dev ... Reviewed-on: #2478 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-21 05:06:12 +00:00
Carlos Satorres	119102b0b3	refs #6820 acl	2024-05-20 16:00:38 +02:00
Pablo Natek	38b1e48959	Merge pull request 'feat: refs #6021 add new column' (!2485) from 6021-createObservations into dev ... Reviewed-on: #2485 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-05-20 12:27:48 +00:00
Pablo Natek	b203d94b27	feat: refs #6021 add new column	2024-05-20 11:37:40 +02:00
Guillermo Bonet	7f0f1b9547	refactor: refs #7422 Deleted tables	2024-05-20 09:54:30 +02:00
Sergio De la torre	df08f7a8de	Merge branch 'dev' into 4979-Conversión-automática-de-producto-A1-a-A2	2024-05-17 15:10:26 +00:00
Pablo Natek	4790ae94d1	Merge branch 'dev' into 7187-addPdaFreelancers	2024-05-17 11:33:57 +00:00
Guillermo Bonet	0b5f05cbed	refactor: refs #7375 Refactor clientsDisable	2024-05-17 12:36:54 +02:00
Sergio De la torre	27110c2abe	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4979-Conversión-automática-de-producto-A1-a-A2	2024-05-17 06:27:09 +02:00
Carlos Andrés	38c505fb7a	refs #7400 feat: book ledger with counters	2024-05-16 19:07:48 +02:00
Carlos Andrés	01d1a2391d	refs #7400 feat: book ledger with counters	2024-05-16 18:48:59 +02:00
Pablo Natek	b41104432c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers	2024-05-16 13:57:55 +02:00
Ivan Mas	10d812ae3d	Merge branch 'dev' into 6965-AddFkRoute-vehicleFk-firstEditorFk	2024-05-16 11:34:18 +00:00
Ivan Mas	993dd0d8bd	refs #6965 Modify firstEditorFk NULL	2024-05-16 13:15:55 +02:00
Pablo Natek	bcb3ea4837	feat: refs #7187 new method available pda	2024-05-16 10:23:33 +02:00
Guillermo Bonet	115d1aaf85	Fix version	2024-05-16 08:10:53 +02:00
Sergio De la torre	75bb08a0c6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-05-16 07:08:47 +02:00
Ivan Mas	c15f9b13f2	Merge branch 'dev' into 6965-AddFkRoute-vehicleFk-firstEditorFk	2024-05-15 11:17:11 +00:00
Ivan Mas	9ed90412de	refs #6965 Points to user instead of worker	2024-05-15 13:15:27 +02:00
Sergio De la torre	9288f08b91	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4979-Conversión-automática-de-producto-A1-a-A2	2024-05-15 11:30:05 +02:00
Robert Ferrús	1ee29036f4	Merge branch 'dev' into 7296-expeditionTruck	2024-05-15 08:22:00 +00:00
Guillermo Bonet	778f368300	Merge pull request 'refactor: refs #7252 Deprecated vn.deliveryNote.farmingFk' (!2429) from 7252-deliveryNoteFarmingFk into dev ... Reviewed-on: #2429 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-15 08:19:34 +00:00
Juan Ferrer	e469fb2da4	Merge pull request 'test' (!2456) from test into dev ... Reviewed-on: #2456	2024-05-15 06:57:05 +00:00
Juan Ferrer	b6f788a8db	fix: refs #7389 pbx.sipConfig: rename incomingLimit to call-limit	2024-05-14 14:21:16 +02:00
Pako Natek	bb4f78961f	element table	2024-05-14 14:01:13 +02:00
Carlos Andrés	4254fac6c2	Merge pull request '7213-Pasar-problemas-a-columnas-calculadas' (!2396) from 7213-Pasar-problemas-a-columnas-calculadas into dev ... Reviewed-on: #2396 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-14 09:35:51 +00:00
Robert Ferrús	eeb36a6810	Merge branch 'dev' into 7039-country-country	2024-05-14 06:32:45 +00:00
Alex Moreno	3798509206	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-14 07:51:04 +02:00
Robert Ferrús	c6f7a0768a	Merge branch 'dev' into 7039-country-country	2024-05-14 05:49:39 +00:00
Robert Ferrús	b0da193b4a	feat: refs #7039 añadir colum virtual country	2024-05-14 07:48:03 +02:00
Sergio De la torre	8656c16165	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-05-14 07:11:18 +02:00
Alex Moreno	6251493adb	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-05-13 14:24:31 +02:00
Robert Ferrús	5e3fa1be8b	Merge branch 'dev' into 7296-expeditionTruck	2024-05-13 10:33:37 +00:00
Pablo Natek	bde7fc9972	fix: refs #4988 no task id on table comment	2024-05-13 12:30:17 +02:00
Pablo Natek	c7eeaf238a	fix: refs #4988 add schema	2024-05-13 11:04:50 +02:00
Pablo Natek	48392879cb	fix: refs #4988 insert into agencyWorkCenter	2024-05-13 10:59:22 +02:00
Jorge Penadés	29e3f934af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-13 09:35:08 +02:00
Alex Moreno	6ac664a139	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-13 09:06:57 +02:00
Jorge Penadés	562aefecdd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-13 08:56:54 +02:00
Pablo Natek	1e956bb0f8	fix: duplicate version	2024-05-13 08:53:25 +02:00
Ivan Mas	473f261cf1	refs #7342 Modify decimal item plastic	2024-05-10 14:11:29 +02:00
Jorge Penadés	8943bc7115	fix: refs #5919 back tests	2024-05-10 14:04:34 +02:00
Jorge Penadés	1996a00af1	feat: refs #5919 drop version	2024-05-10 13:31:21 +02:00
Carlos Andrés	349c3d71dd	Ticket 180571 No se ven las ubicaciones	2024-05-10 13:14:23 +02:00
Carlos Andrés	56815e4b1a	Ticket 180571 No se ven las ubicaciones	2024-05-10 13:10:54 +02:00
Jorge Penadés	8876a7ea8f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-10 13:05:22 +02:00
Jorge Penadés	af11bb8663	feat: refs #5919 hook	2024-05-10 13:04:12 +02:00
Guillermo Bonet	ba72408e84	refactor: refs #7345 Deprecated isFarmer__	2024-05-10 12:45:53 +02:00
Guillermo Bonet	6b7a529b55	refactor: refs #7345 Renamed column of invoiceInConfig	2024-05-10 11:39:14 +02:00
Robert Ferrús	35f69b8692	Merge branch 'dev' into 7039-country-country	2024-05-10 07:21:05 +00:00
Jorge Penadés	4e7d0e6469	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-10 08:28:06 +02:00
Robert Ferrús	b03fe4e6d3	Merge branch 'dev' into 7296-expeditionTruck	2024-05-10 05:23:07 +00:00
Jorge Penadés	7f4965879c	fix: refs #5919 get locker by relation	2024-05-09 15:54:34 +02:00
Guillermo Bonet	f4229284fa	Merge branch 'dev' into 7252-deliveryNoteFarmingFk	2024-05-09 12:56:05 +00:00
Guillermo Bonet	9c5b46b3e2	Merge pull request 'feat: refs #7247 clientSupplier_add' (!2346) from 7247-monacoVies into dev ... Reviewed-on: #2346 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-09 11:30:28 +00:00
Robert Ferrús	0498b425b3	Merge branch 'dev' into 7039-country-country	2024-05-09 10:51:18 +00:00
Ivan Mas	9d7184ed7b	refs #6965 Add Fk vehicleFk firstEditorFk	2024-05-09 12:35:26 +02:00
Jorge Penadés	2c826ed838	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-09 12:14:43 +02:00
Guillermo Bonet	faf2d51a43	Merge branch 'test' into dev	2024-05-09 11:36:15 +02:00
Guillermo Bonet	494b46e7ec	fix: refs #6493 Fix buy_recalcPricesByBuy & buy_recalcPricesByEntry	2024-05-09 11:33:57 +02:00
Pablo Natek	98e28b8d50	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers	2024-05-09 09:09:00 +02:00
Jorge Penadés	dc45527e1d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-09 08:45:17 +02:00
Robert Ferrús	e02dfc0456	Merge branch 'dev' into 182001-packaging	2024-05-09 05:18:08 +00:00
Sergio De la torre	094b15fe8b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-05-09 07:08:31 +02:00
Carlos Andrés	710841ba4a	Merge branch 'dev' into 4979-Conversión-automática-de-producto-A1-a-A2	2024-05-08 16:31:25 +02:00
Guillermo Bonet	c4a66b42bb	feat: refs #7247 Minor changes	2024-05-08 14:56:51 +02:00
Guillermo Bonet	3a7d93759c	Merge branch 'dev' into 7247-monacoVies	2024-05-08 12:52:32 +00:00
Guillermo Bonet	1a375c0e88	refactor: refs #7252 Deprecated vn.deliveryNote.farmingFk	2024-05-08 14:45:37 +02:00
Guillermo Bonet	7d92b514c5	refactor: refs #6230 Revoke item: `size`, longName, name	2024-05-08 13:59:37 +02:00
Guillermo Bonet	53b58104c7	refactor: refs #6230 Revoke item: `size`, longName, name	2024-05-08 13:52:52 +02:00
Robert Ferrús	50157c932e	Merge branch 'dev' into 7296-expeditionTruck	2024-05-08 10:42:54 +00:00
Jorge Penadés	26ff5e8fa9	feat; refs #5919 WIP acls	2024-05-08 11:03:18 +02:00
Sergio De la torre	5a0882c2ac	refs #6861 feat:sectoCollection reserve	2024-05-08 10:59:19 +02:00
Sergio De la torre	a3e9c91bdb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-05-08 10:58:20 +02:00
Jorge Penadés	d0c9e83504	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-08 10:35:07 +02:00
Carlos Satorres	c0b4a931a6	Merge branch 'dev' into 6682-notHolidays	2024-05-08 07:55:26 +00:00
Carlos Satorres	8637488fc1	refs #6882 fix pr	2024-05-08 08:48:19 +02:00
Carlos Satorres	371df19194	Merge branch '6682-notHolidays' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays	2024-05-07 14:59:25 +02:00
Carlos Satorres	3eba4a1f69	refs #6882 fix sql	2024-05-07 14:59:23 +02:00
Robert Ferrús	6c6ae412bd	feat: refs #182001 packaging	2024-05-07 14:19:11 +02:00
Guillermo Bonet	0d7d4917a7	Merge branch 'master' into test	2024-05-07 13:18:28 +02:00
Jorge Penadés	0f5e2dcc54	fix: refs #6938 rollback	2024-05-07 11:47:22 +02:00
Robert Ferrús	1eb75599d8	Merge branch 'dev' into 7296-expeditionTruck	2024-05-06 09:38:14 +00:00
Sergio De la torre	e8a30c1df8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-05-06 10:30:19 +02:00
Robert Ferrús	b57be129e3	Merge branch 'dev' into 7039-country-country	2024-05-06 08:27:21 +00:00
Carlos Satorres	bc5f78827c	Merge branch 'dev' into 6682-notHolidays	2024-05-06 08:09:21 +00:00
Javi Gallego	633a3c481c	Merge branch 'dev' into 6382-regularizar-Shelving-Parking	2024-05-06 07:42:38 +00:00
Javi Gallego	fe025b510d	Merge pull request 'feat: create isInformal' (!2405) from 7109-entry-isInformal into dev ... Reviewed-on: #2405 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-06 07:41:27 +00:00
Carlos Satorres	fe300f0f24	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays	2024-05-06 09:26:14 +02:00
Robert Ferrús	87e85e4a4e	Merge branch 'dev' into 7039-country-country	2024-05-06 05:08:07 +00:00
Carlos Andrés	166f4da934	Merge pull request 'fix: descuentos en bs.ventas refs #6974' (!2331) from 6974-descuentos-bs.ventas into dev ... Reviewed-on: #2331 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-03 17:08:07 +00:00
Carlos Andrés	e979defd92	fix: descuentos en bs.ventas refs #6974	2024-05-03 15:03:05 +02:00
Javi Gallego	432b696305	feat: create isInformal	2024-05-03 14:57:09 +02:00
Pablo Natek	133b862dc0	fix: refs #7187 move column sim to deviceProductionUser	2024-05-03 14:20:16 +02:00
Pablo Natek	95aba9e7b3	Merge pull request 'feat(collection-label): refs #6602 add qr to the report' (!2292) from 6602-barcode-to-qr into dev ... Reviewed-on: #2292 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-03 11:52:22 +00:00
Carlos Satorres	f77cf619db	refs #6682 holidays conditional	2024-05-03 12:27:19 +02:00
Robert Ferrús	82ee8d2209	Merge branch 'dev' into 7039-country-country	2024-05-03 09:25:06 +00:00
Pako Natek	b5402a3f2f	defaultSector	2024-05-03 10:44:57 +02:00