5051 Commits

Author	SHA1	Message	Date
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
Jorge Penadés	bf0db89286	refactor: refs #6202 remove blanks	2024-05-09 12:02:44 +02:00
Jorge Penadés	74399d5ab6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6202-mytWatcher	2024-05-09 11:56:48 +02:00
Pako Natek	2203ac478b	Merge branch 'dev' into 7362-VIP	2024-05-09 09:56:41 +00:00
Pako Natek	42d17aa7f5	done	2024-05-09 11:52:25 +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
Javi Gallego	abd692cbd3	Merge pull request 'fix: #7344 getSupplierDebt agrupa por pago' (!2426) from 7344-getSupplierDebt into dev ... Reviewed-on: #2426 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-09 05:49:28 +00:00
Robert Ferrús	833994bd27	Merge branch 'dev' into 7291-sale_getProblems	2024-05-09 05:23:33 +00:00
Robert Ferrús	e02dfc0456	Merge branch 'dev' into 182001-packaging	2024-05-09 05:18:08 +00:00
Robert Ferrús	0fce8c755b	Merge branch 'master' into 5699-hoFixClientsDisable	2024-05-09 05:14:38 +00:00
Sergio De la torre	10513d1991	Merge branch 'master' into 6276_itemShelving_Add	2024-05-09 05:00:07 +00:00
Carlos Andrés	d6451a94e3	feat: conversion art. A1 a A2 refs #4979	2024-05-08 17:38:52 +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	162c78e392	Merge branch '6230-revoke' of https://gitea.verdnatura.es/verdnatura/salix into 6230-revoke	2024-05-08 13:59:38 +02:00
Guillermo Bonet	7d92b514c5	refactor: refs #6230 Revoke item: `size`, longName, name	2024-05-08 13:59:37 +02:00
Guillermo Bonet	a90e83e9e0	Merge branch 'dev' into 6230-revoke	2024-05-08 11:56:31 +00:00
Guillermo Bonet	53b58104c7	refactor: refs #6230 Revoke item: `size`, longName, name	2024-05-08 13:52:52 +02:00
Sergio De la torre	f7e6901ef6	Merge branch 'dev' into 7161-deleteItemTrash	2024-05-08 11:32:00 +00:00
Guillermo Bonet	4df13d900a	Merge branch 'dev' into 7335-modifyCmr	2024-05-08 10:55:47 +00:00
Robert Ferrús	b0848edff8	feat: refs #5699 quittar de client_afterUpdate desactivar cliente	2024-05-08 12:52:11 +02:00
Guillermo Bonet	82ac54f0b3	Merge branch 'test' into dev	2024-05-08 12:52:02 +02:00
Guillermo Bonet	90107936b7	Merge branch 'master' into test	2024-05-08 12:51:36 +02:00
Sergio De la torre	0d42b32611	Merge branch 'dev' into 7161-deleteItemTrash	2024-05-08 10:47:22 +00:00
Robert Ferrús	ce42cbf287	Merge branch 'master' into 5699-hoFixClientsDisable	2024-05-08 10:44:15 +00:00
Guillermo Bonet	84e90bb91b	hotfix: rollback tmp item_getSimilar	2024-05-08 12:43:46 +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
Javi Gallego	393d57f078	fix: #7344 getSupplierDebt agrupa por pago	2024-05-08 10:51:35 +02:00
Robert Ferrús	2866f231b8	Merge branch 'dev' into 182001-packaging	2024-05-08 08:41:38 +00: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
Guillermo Bonet	16e7fb9662	Merge branch 'dev' into 7335-modifyCmr	2024-05-08 08:29:00 +00:00
Sergio De la torre	5207f07c80	refs #6276 hotFix:itemShelving_add	2024-05-08 10:03:11 +02:00
Carlos Satorres	c0b4a931a6	Merge branch 'dev' into 6682-notHolidays	2024-05-08 07:55:26 +00:00
Guillermo Bonet	71f66085f6	Merge branch 'test' into dev	2024-05-08 09:50:52 +02:00
Guillermo Bonet	854604368a	Merge branch 'master' into test	2024-05-08 09:50:37 +02:00
Sergio De la torre	9a235838d8	refs #7161 feat:setVisibleDiscard by itemTrash	2024-05-08 09:04:08 +02:00
Carlos Satorres	8637488fc1	refs #6882 fix pr	2024-05-08 08:48:19 +02:00
Guillermo Bonet	6cde2e8170	fix: refs #6585 Requested changes	2024-05-08 08:48:08 +02:00
Guillermo Bonet	e070906ea6	hotfix: refs #6777 manaCustomerUpdate	2024-05-08 07:49:32 +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	43c742938c	feat: refs #179881	2024-05-07 14:37:24 +02:00
Robert Ferrús	f70f2949ec	feat: refs #182001	2024-05-07 14:30:38 +02:00
Robert Ferrús	f529a7f5b4	feat : refs #182001	2024-05-07 14:25:26 +02:00
Robert Ferrús	6c6ae412bd	feat: refs #182001 packaging	2024-05-07 14:19:11 +02:00
Robert Ferrús	9bd8369469	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5699-hoFixClientsDisable	2024-05-07 13:23:49 +02:00
Guillermo Bonet	0d7d4917a7	Merge branch 'master' into test	2024-05-07 13:18:28 +02:00
Robert Ferrús	2dcc959488	fix: refs #5699 clientsDisable	2024-05-07 13:17:56 +02:00
Guillermo Bonet	20414c70ad	Merge pull request 'hotfix: #7173 Rollback' (!2418) from 7173-rollbackInvoiceInRestriction into master ... Reviewed-on: #2418 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-07 11:12:55 +00:00
Guillermo Bonet	cc8873f48a	hotfix: #7173 Rollback	2024-05-07 13:08:44 +02:00
Guillermo Bonet	832db8901e	Merge branch '7335-modifyCmr' of https://gitea.verdnatura.es/verdnatura/salix into 7335-modifyCmr	2024-05-07 13:03:51 +02:00
Guillermo Bonet	2adf96cb37	refactor: #6585 Deleted transaction ticket_doCmr	2024-05-07 13:03:50 +02:00
Jorge Penadés	dce754a64b	Merge branch 'master' into 6938-hotfix-rollbackHidePhone	2024-05-07 10:41:50 +00:00
Guillermo Bonet	45f7412b35	Merge branch 'dev' into 7335-modifyCmr	2024-05-07 10:36:28 +00:00
Guillermo Bonet	da8378d422	hotfix: refs #7173 Deleted restriction invoiceInDueDay_beforeUpdate	2024-05-07 12:15:28 +02:00
Jorge Penadés	1d9b6e489c	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6938-hotfix-rollbackHidePhone	2024-05-07 11:49:31 +02:00
Jorge Penadés	0f5e2dcc54	fix: refs #6938 rollback	2024-05-07 11:47:22 +02:00
Guillermo Bonet	3ed1c8f6fd	hotfix: ticket #181890 duaInvoiceInBooking	2024-05-07 11:35:07 +02:00
Guillermo Bonet	ef567bb167	fix: ticket #181920 catalog_componentCalculate	2024-05-07 10:03:33 +02:00
Alex Moreno	966b7794f0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-07 08:03:37 +02:00
Guillermo Bonet	e44568ff4b	feat: refs #6585 Added call ticket_afterUpdate	2024-05-07 08:00:26 +02:00
Alex Moreno	56008ba51f	dump: db dump	2024-05-07 07:53:11 +02:00
Robert Ferrús	1610b9bd0a	Merge branch 'dev' into 7039-country-country	2024-05-07 05:11:02 +00:00
Alex Moreno	f23924e792	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-06 14:31:41 +02:00
Carlos Andrés	14a1c5cbbb	Merge pull request 'master' (!2408) from master into test ... Reviewed-on: #2408 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-05-06 12:22:04 +00:00
Javi Gallego	69766bbfeb	Merge pull request 'feat: #7109 inventoryType' (!2409) from 7109-inventoryType into dev ... Reviewed-on: #2409 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-06 12:00:14 +00:00
Javi Gallego	f9348b41ea	feat: #7109 inventoryType	2024-05-06 13:42:19 +02:00
Carlos Andrés	0b4ac51749	fix: Error workerTimeControl_direction Salix	2024-05-06 13:34:46 +02:00
Robert Ferrús	1eb75599d8	Merge branch 'dev' into 7296-expeditionTruck	2024-05-06 09:38:14 +00: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
Ivan Mas	5d3235977f	Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked	2024-05-03 12:57:26 +00: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
Carlos Andrés	2659e3b259	feat: Turn issues into calculated columns refs#7213	2024-05-03 14:03:26 +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
Carlos Andrés	7659a39b42	feat: Turn issues into calculated columns refs#7213	2024-05-03 10:19:05 +02:00
Robert Ferrús	b6e4130184	feat: refs #7325 item_getBalance	2024-05-03 07:51:04 +02:00
Robert Ferrús	523735e4fc	Merge branch 'dev' into 7296-expeditionTruck	2024-05-03 04:59:01 +00:00
Carlos Andrés	9905d7254d	Merge branch 'dev' into 7213-Pasar-problemas-a-columnas-calculadas	2024-05-02 18:17:31 +02:00
Carlos Andrés	e28a5eb478	feat: Turn issues into calculated columns refs#7213	2024-05-02 18:13:12 +02:00
Carlos Andrés	27e3ae897a	feat: Turn issues into calculated columns refs#7213	2024-05-02 17:05:10 +02:00
Robert Ferrús	00eae3920b	feat: refs 179918 clean	2024-05-02 13:33:25 +02:00
Robert Ferrús	145a477a80	feat: refs #179918 entry delete isBooked	2024-05-02 12:39:12 +02:00
Pablo Natek	d45d53d665	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6602-barcode-to-qr	2024-05-02 10:26:46 +02:00
Jorge Penadés	7cb728432a	fix refs #6889 set originalQuantity to 0	2024-05-02 10:15:01 +02:00
Jorge Penadés	63655a4dd1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-02 08:58:51 +02:00
Guillermo Bonet	0ab79728b5	Merge branch 'test' into dev	2024-05-02 08:10:20 +02:00
Guillermo Bonet	7eb2e8f218	Merge branch 'master' into test	2024-05-02 08:09:59 +02:00
Guillermo Bonet	b926725021	hotfix: ticket#179915 Fix no worker exists	2024-05-02 08:04:44 +02:00
Carlos Andrés	a67f603990	Merge branch 'dev' into 7213-Pasar-problemas-a-columnas-calculadas	2024-04-30 15:50:13 +02:00
Carlos Andrés	a40545264b	fix: descuentos en bs.ventas refs #6974	2024-04-30 15:46:24 +02:00
Ivan Mas	de5e43fb05	Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked	2024-04-30 12:41:54 +00:00
Ivan Mas	3167bdcdd0	refs #7191 message modification	2024-04-30 14:37:06 +02:00
Jon Elias	2b9bfb5d85	Merge pull request 'fix: refs #6731 fix ticketRequest' (!2364) from 6731-fixTicketRequestLog into dev ... Reviewed-on: #2364 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-30 10:19:29 +00:00
Robert Ferrús	5ea57ce728	Merge branch 'dev' into 7296-expeditionTruck	2024-04-30 10:04:40 +00:00
Robert Ferrús	83e9756692	fear: refs #7296 expeditionTruck	2024-04-30 12:02:19 +02:00
Robert Ferrús	e7be1e2efe	feat: refs #7296 expeditionTruck to roadmapStop	2024-04-30 11:48:18 +02:00
Guillermo Bonet	f10ecf4f00	Merge branch 'test' into dev	2024-04-30 11:47:55 +02:00
Guillermo Bonet	c987bb6e66	Merge branch 'master' into test	2024-04-30 11:47:35 +02:00
Guillermo Bonet	d44b8f7c9a	hotfix: ticket #179514 ticket_close packaging fix	2024-04-30 11:44:16 +02:00
Guillermo Bonet	110cae3171	Merge pull request 'refactor: #6997 Deleted vn.client.eypbc' (!2353) from 6997-eypbc into dev ... Reviewed-on: #2353 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-30 08:23:52 +00:00
Guillermo Bonet	80b44ccace	Merge pull request 'refactor: refs #7258 Deleted all dependences of vn2008 schema' (!2362) from 7258-lastChangesMigrationVn2008 into dev ... Reviewed-on: #2362 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-30 05:37:33 +00:00
Ivan Mas	a33cbb0a7c	Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked	2024-04-29 17:46:26 +00:00
Ivan Mas	30f6a9324d	refs #7191 SQL conventions mod	2024-04-29 19:40:43 +02:00
Carlos Andrés	e934b47e98	Hotfix feat: new function to kill connections	2024-04-29 17:09:51 +02:00
Carlos Andrés	e55658e6b3	Hotfix feat: new function to kill connections	2024-04-29 17:02:47 +02:00
Carlos Andrés	21a1e1eed3	Hotfix feat: new function to kill connections	2024-04-29 16:59:56 +02:00
Jorge Penadés	9802f0066c	fix: refs #5919 unique key & unassigned locker	2024-04-29 16:05:36 +02:00
Carlos Andrés	7b7afb05c5	hotfix collection_assign	2024-04-29 15:01:20 +02:00
Carlos Andrés	51c8736da2	hotFix collection_assign	2024-04-29 14:54:15 +02:00
Carlos Andrés	dcb6f90ab3	hotfix collection_assign elimino vLockTime	2024-04-29 14:42:16 +02:00
Jorge Penadés	0003779681	fix: refs 5919 apply version	2024-04-29 11:35:08 +02:00
Robert Ferrús	9af3c17a1f	feat: refs #7291 sale_getProblems	2024-04-29 09:58:58 +02:00
Jorge Penadés	8adb52aac4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-04-29 09:24:10 +02:00
Pako Natek	9aa6e3f80a	hotfix	2024-04-27 13:09:15 +02:00
Pako Natek	3440bb1725	hotFix	2024-04-27 12:43:15 +02:00
Pako Natek	9e87b055b7	hotFix	2024-04-27 12:36:21 +02:00
Jorge Penadés	b9d3684db2	feat: refs #6600 add column	2024-04-26 15:48:30 +02:00
Jorge Penadés	30e927d722	feat: refs #6202 dbWatcher script	2024-04-26 12:10:05 +02:00
Robert Ferrús	d2c3034ec6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7039-country-country	2024-04-26 12:07:53 +02:00
Robert Ferrús	c819b92141	fix: refs #177968 restore restriction	2024-04-26 09:09:22 +02:00
Robert Ferrús	2d0d4b5643	Merge branch 'dev' into 7039-country-country	2024-04-26 06:48:01 +00:00
Pablo Natek	4693ba13fa	Merge branch 'dev' of https: refs #4988//gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-26 08:37:51 +02:00
Robert Ferrús	30a905f40b	Merge branch 'dev' into 6223-ticketCalculateClon	2024-04-26 05:08:26 +00:00
Javi Gallego	94e04c1c2f	Merge branch 'dev' into 7108-exchange-rate	2024-04-26 06:45:43 +02:00
Carlos Andrés	a4417dde6c	Merge branch 'test' into dev	2024-04-25 19:23:48 +02:00
Carlos Andrés	f25d3c14c6	Hotfix test farmingDeliveryNote	2024-04-25 19:06:06 +02:00
Carlos Andrés	326c5c97bd	Hotfix test farmingDeliveryNote	2024-04-25 19:02:05 +02:00
Pablo Natek	5c45dd6c17	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-25 16:18:18 +02:00
Jorge Penadés	f7cdbd39f0	fix: refs #7211 tests	2024-04-25 16:08:52 +02:00
Jorge Penadés	edeed037a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7211-fixWorkerTimeControl	2024-04-25 15:38:40 +02:00
Javi Gallego	2e2bc3d594	Merge branch 'dev' into 6382-regularizar-Shelving-Parking	2024-04-25 12:31:06 +00:00
Javi Gallego	4f20224acc	Merge branch '6382-regularizar-Shelving-Parking' of https://gitea.verdnatura.es/verdnatura/salix into 6382-regularizar-Shelving-Parking	2024-04-25 14:28:53 +02:00
Javi Gallego	7d3870e4a1	feat: refs#6382 test fixed	2024-04-25 14:28:47 +02:00
Javier Casado	a9e4b2cd36	Merge branch 'dev' into 6697-removeClaimQuantity	2024-04-25 11:46:53 +00:00
Javi Gallego	a4f1183df6	feat: refs #7108 pascalCase	2024-04-25 13:11:57 +02:00
Pablo Natek	4e11e46fff	feat: refs #4988 capture error on duplicate	2024-04-25 12:40:54 +02:00
Pablo Natek	c5b02dc239	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-25 09:46:53 +02:00
Pablo Natek	42591af5c7	fix: refs #4988 create table	2024-04-25 09:46:15 +02:00
Javi Gallego	1b34822fb7	Merge branch 'dev' into 6382-regularizar-Shelving-Parking	2024-04-25 07:13:57 +00:00
Jorge Penadés	88b06ebef5	feat: refs #7211 check if there's available clockIn	2024-04-25 08:49:22 +02:00
Sergio De la torre	d4d31c6d9e	refs #6312 hotFix fix:replaceItem	2024-04-25 08:35:59 +02:00
Sergio De la torre	46f2d790db	refs #6312 hotFix fix:replaceItem	2024-04-25 08:01:32 +02:00
Guillermo Bonet	60a3ec99d0	Merge branch 'dev' into 7258-lastChangesMigrationVn2008	2024-04-25 05:02:17 +00:00
Sergio De la torre	8bb2fa93a7	Merge branch 'dev' into 6574_itemGetBalance	2024-04-24 13:46:53 +00:00
Alex Moreno	917592cdad	Merge pull request '7225-hotFix_ticket_advanced_movable a dev para probar' (!2366) from 7225-hotFix_ticket_advanced_movable into dev ... Reviewed-on: #2366 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-24 12:34:46 +00:00
Pablo Natek	f2d4283304	fix: refs #7187 number on de code	2024-04-24 14:29:57 +02:00
Pablo Natek	e8a32d8e13	fix: refs #7187 db version	2024-04-24 14:09:42 +02:00
Pablo Natek	008b6f6f41	fix: refs #7187 unify versions	2024-04-24 14:08:26 +02:00
Pablo Natek	88ef12032b	feat: refs #7187 serialNumber new column	2024-04-24 14:05:18 +02:00
jcasado	aeee012c2b	refs #6697 fix sql test	2024-04-24 11:43:10 +02:00
Alex Moreno	2638b93299	Merge branch '7225-hotFix_ticket_advanced_movable' of https://gitea.verdnatura.es/verdnatura/salix into 7225-hotFix_ticket_advanced_movable	2024-04-24 11:40:25 +02:00
Alex Moreno	eced03f69b	fix(ticket_getMovable): refs #7225 stock add ifnull	2024-04-24 11:40:24 +02:00
Guillermo Bonet	6fb87531c4	refactor: #7258 Deprecated last tables vn2008	2024-04-24 11:27:16 +02:00
Pablo Natek	a15970c95f	fix: refs #7187 sql for pdaFreelancer	2024-04-24 11:08:57 +02:00
Guillermo Bonet	71e1e53ccd	refactor: #7258 Fixes	2024-04-24 10:57:35 +02:00
Alex Moreno	2e1ad0c000	Merge branch 'master' into 7225-hotFix_ticket_advanced_movable	2024-04-24 08:42:26 +00:00
Jon Elias	6706974784	fix: refs #6731 fix ticketRequest	2024-04-24 10:31:26 +02:00
Guillermo Bonet	f7ebd071bf	refactor: #7258 Deleted all dependences of vn2008 schema	2024-04-24 09:53:31 +02:00
Robert Ferrús	ffe56edc9c	feat: refs #7039 country	2024-04-24 09:24:42 +02:00
Robert Ferrús	a27e06e8ff	feat: refs #7039 country	2024-04-24 09:08:19 +02:00
Robert Ferrús	7899cf230e	feat: refs #7039 country	2024-04-24 09:05:29 +02:00
Javi Gallego	73f7d09b0e	feat: #7108 acl a invoiceIn	2024-04-24 08:14:07 +02:00
Robert Ferrús	ec7dc390b9	Merge branch 'dev' into 6223-ticketCalculateClon	2024-04-24 06:05:03 +00:00
Robert Ferrús	e36e997844	feat: refs #6223 ticketCalculateClon	2024-04-24 08:04:28 +02:00
Javi Gallego	dcc46494bc	Merge branch 'dev' into 7108-exchange-rate	2024-04-24 07:45:02 +02:00
Guillermo Bonet	a6c57ef3df	Merge branch 'dev' into 6997-eypbc	2024-04-24 05:09:44 +00:00
Juanjo Breso	be8e55a905	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-24 05:03:19 +00:00
Pablo Natek	fbc1614132	fix: refs #7187 sql creation for deviceProductionUser	2024-04-23 18:50:28 +02:00
Carlos Andrés	26fd1ae6c9	Merge pull request 'test' (!2359) from test into dev ... Reviewed-on: #2359	2024-04-23 15:53:13 +00:00
Carlos Andrés	a7f1188975	Merge pull request 'master' (!2358) from master into test ... Reviewed-on: #2358 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-04-23 15:35:33 +00:00
Carlos Andrés	033bcf6b67	hotfix importErrorNotification refs #6189	2024-04-23 17:24:47 +02:00
Alex Moreno	cc06698214	hotFix(ticket): refs #7225 fix advanced and movable	2024-04-23 15:37:04 +02:00
Juanjo Breso	9c306d4cc2	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-23 12:55:02 +00:00
Juanjo Breso	5efb6acafe	feat: refs#6493 Cambios solicitados procedimientos	2024-04-23 14:55:05 +02:00
Guillermo Bonet	e0393a6e72	Merge branch 'test' into dev	2024-04-23 14:43:19 +02:00
Guillermo Bonet	f5844ff426	Merge branch 'master' into test	2024-04-23 14:42:57 +02:00
Guillermo Bonet	ec23cc7619	hotfix: entry_checkBooked	2024-04-23 14:41:43 +02:00
Juanjo Breso	022264ffff	Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-23 14:05:51 +02:00
Juanjo Breso	d1c72a0be3	feat: refs#6493 Cambios solicitados procedimientos	2024-04-23 14:05:48 +02:00
Juanjo Breso	9b2bb4be0e	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-23 12:04:19 +00:00
Guillermo Bonet	afe2669b27	Merge branch 'test' into dev	2024-04-23 13:57:42 +02:00
Guillermo Bonet	36c8a8db0f	Merge branch 'master' into test	2024-04-23 13:57:18 +02:00
Guillermo Bonet	1d5d6141d1	Merge branch 'dev' into 6997-eypbc	2024-04-23 11:17:29 +00:00
Ivan Mas	e7055e2428	Merge branch 'dev' into 7032-Delete-vn.recipeCook	2024-04-23 10:26:42 +00:00
Juanjo Breso	79172ef288	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-23 10:16:27 +00:00
Carlos Andrés	2d5daf55c2	Merge pull request 'feat: Varias líneas farming en albaranes refs #7020' (!2349) from 7020-Varias-líneas-farming-en-albaranes into dev ... Reviewed-on: #2349 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-23 10:04:08 +00:00
Guillermo Bonet	1044a24bc7	refactor: #6997 Deleted vn.client.eypbc	2024-04-23 12:00:23 +02:00
Guillermo Bonet	8dd4ac9119	hotfix: Throw msg and entry_updateComission start transaction	2024-04-23 11:50:48 +02:00
Alex Moreno	85491613b0	test: refs #7173 fix fixtures	2024-04-23 08:47:28 +02:00
Juanjo Breso	d7e4dd4fc7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-23 08:03:17 +02:00
Javi Gallego	eaf2762922	feat: #6382 chekCodeFormat	2024-04-23 07:57:37 +02:00
Juan Ferrer	d58607f26e	Merge branch 'dev' into 4409-binlog	2024-04-22 19:43:48 +00:00
Carlos Andrés	8bb331f0ed	feat: Varias líneas farming en albaranes refs #7020	2024-04-22 19:57:17 +02:00
Pablo Natek	71a9aed1bb	fix: refs #7187 check for multiple device on freelancer	2024-04-22 18:03:17 +02:00
Ivan Mas	9899efab97	refs #7032 Delete vn.recipe_Cook	2024-04-22 17:55:49 +02:00
Pablo Natek	adc3b413f5	feat: refs #4988 agency add module	2024-04-22 17:17:17 +02:00
Ivan Mas	f03a431ea2	Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked	2024-04-22 13:08:06 +00:00
Ivan Mas	0284b138d7	refs #7191 requested modifications	2024-04-22 15:03:08 +02:00
Robert Ferrús	44f2cd4efc	feat: refs #7247 clientSupplier_add	2024-04-22 14:04:07 +02:00
Ivan Mas	f380e0d1ce	Merge branch 'dev' into 7021-Delete_rfid_schema	2024-04-22 11:17:54 +00:00
Guillermo Bonet	eb9f81c81d	feat #7181 Rollback creditInsurance_getRisk	2024-04-22 13:05:16 +02:00
Ivan Mas	1ef98ecd8c	Merge branch 'dev' into 7021-Delete_rfid_schema	2024-04-22 10:37:15 +00:00
Sergio De la torre	0f05fe5d93	Merge branch 'dev' into 6921_addFromDelivery	2024-04-22 10:32:03 +00:00
Robert Ferrús	debd163b3f	Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7	2024-04-22 10:16:01 +00:00
Robert Ferrús	6bb36e0d82	Merge branch 'dev' into 7029-packagingVolumeRestriction	2024-04-22 09:53:51 +00:00
Javi Gallego	4416790ce1	Merge branch 'dev' into 7108-exchange-rate	2024-04-22 11:45:02 +02:00
Robert Ferrús	b0289d2e18	Merge pull request 'test' (!2344) from test into dev ... Reviewed-on: #2344 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-22 09:34:45 +00:00
Robert Ferrús	b88dff0d99	feat: refs #6777	2024-04-22 10:48:37 +02:00
Sergio De la torre	23fa74a5ad	Merge branch 'dev' into 6921_addFromDelivery	2024-04-22 08:11:37 +00:00
Robert Ferrús	e8d7f20221	Merge branch 'master' into 174903-item_getSimilar	2024-04-22 07:43:39 +00:00
Robert Ferrús	a1a3470df4	feat: refs #174903	2024-04-22 09:43:13 +02:00
Robert Ferrús	6a0a944319	Merge branch 'dev' into 7029-packagingVolumeRestriction	2024-04-22 07:23:18 +00:00
Juan Ferrer	739ae82ace	fix(binlog): refs #4409 Fix cursor name	2024-04-22 09:02:43 +02:00
Juan Ferrer	bc45cafb40	Merge branch 'dev' into 4409-binlog	2024-04-22 08:54:14 +02:00
Robert Ferrús	e09b828d88	Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7	2024-04-22 05:49:53 +00:00
Sergio De la torre	081c97828c	Merge branch 'master' into hotFix_Ubicador	2024-04-22 05:08:59 +00:00
Carlos Andrés	fd903f27c0	fix: descuentos en bs.ventas refs #6974	2024-04-21 16:01:32 +02:00
Guillermo Bonet	e7f81e99bc	Merge branch 'test' into dev	2024-04-19 14:40:26 +02:00
Juan Ferrer	a0126748e2	fix(binlog): refs #4409 Fix fixtures cursor name	2024-04-19 14:19:34 +02:00
Guillermo Bonet	65892625d5	feat: #7231 Collection_assing more time and throw	2024-04-19 14:17:49 +02:00
Ivan Mas	ad317cb5e5	refs #7021 Delete rfid schema	2024-04-19 14:11:35 +02:00
Carlos Andrés	e0cd08b280	fix: hotfix importar A3 Ticket 175840	2024-04-19 14:10:11 +02:00
Sergio De la torre	e6258dc9e5	refs #6413 hotFix fix:ubicadorChecking	2024-04-19 13:03:57 +02:00
Robert Ferrús	5b027a88fa	feat: refs #6777 restore view	2024-04-19 11:33:33 +02:00
Robert Ferrús	e601310d3e	feat: refs #6777 restore view	2024-04-19 11:27:54 +02:00
Robert Ferrús	28c08d8b18	feat: refs #7237 company_getSuppliersDebt	2024-04-19 10:58:19 +02:00
Robert Ferrús	fb17a54ebd	feat: refs #6777 resotre view	2024-04-19 10:53:03 +02:00
Robert Ferrús	c375223ae5	Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7	2024-04-19 05:23:23 +00:00
Carlos Andrés	27d59f4a8f	fix: descuentos en bs.ventas refs #6974	2024-04-18 19:12:24 +02:00
Sergio De la torre	f4afda8cb2	Merge branch 'dev' into 6921_addFromDelivery	2024-04-18 14:52:57 +00:00
Ivan Mas	7e488ee601	refs #7191 check isBooked in entry_BeforeUpdate	2024-04-18 16:09:05 +02:00
Robert Ferrús	f269d41596	Merge branch 'master' into 174903-item_getSimilar	2024-04-18 12:52:52 +00:00
Guillermo Bonet	bb8379f8db	refactor: refs #6724 Minor change	2024-04-18 14:42:29 +02:00
Robert Ferrús	4f7d315719	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6777-changeDependenciesVn2008toVnPart7	2024-04-18 14:07:23 +02:00
Guillermo Bonet	8f9adbb37c	Merge branch 'test' into dev	2024-04-18 13:55:22 +02:00
Guillermo Bonet	5c5d0ec9dc	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-04-18 13:52:31 +02:00
Guillermo Bonet	d5dc057c36	hotfix: changes	2024-04-18 13:52:30 +02:00
Sergio De la torre	279c300fbf	Merge branch 'dev' into 6921_addFromDelivery	2024-04-18 11:08:15 +00:00
Guillermo Bonet	2b11f85b67	Merge pull request 'feat: refs #6724 permissions to vn.entry.isBooked' (!2147) from 6724-permisos-vn.entry.isBooked into dev ... Reviewed-on: #2147 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-18 11:06:47 +00:00
Robert Ferrús	9295bddaa8	feat: refs #174903 item_getSimilar	2024-04-18 13:06:45 +02:00
Carlos Andrés	0ebdd032e5	Merge pull request 'testToMaster fix' (!2325) from test into master ... Reviewed-on: #2325 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-18 10:39:19 +00:00
Guillermo Bonet	d6ec84e1fe	hotfix	2024-04-18 12:07:00 +02:00
Sergio De la torre	958759dc80	Merge branch 'dev' into 6921_addFromDelivery	2024-04-18 08:12:46 +00:00
Alex Moreno	9143447eb8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-04-18 09:27:46 +02:00
Alex Moreno	51d09b4f2a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-04-18 09:27:15 +02:00
Alex Moreno	659adfd87d	deploy: refs #7226 dump	2024-04-18 09:20:47 +02:00
Alex Moreno	7a021c9ac6	fix(payrollCenter): refs #6738	2024-04-18 09:13:15 +02:00
Pablo Natek	77f7348acb	feat(workcenter): refs #4988 add workcenter config menu	2024-04-18 09:02:01 +02:00
Sergio De la torre	76fb9bf7a8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery	2024-04-18 07:12:43 +02:00
Pablo Natek	eee7062e3f	Merge pull request 'test' (!2319) from test into dev ... Reviewed-on: #2319 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-18 05:05:40 +00:00
Jorge Penadés	b83e0a4ae2	fix: refs #6492 castToInt	2024-04-17 16:43:17 +02:00
Pablo Natek	07f95f3f6c	Merge pull request 'master' (!2318) from master into test ... Reviewed-on: #2318 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-17 13:25:56 +00:00
Carlos Andrés	9ca1b9f104	feat: Turn issues into calculated columns refs#7213	2024-04-17 15:02:58 +02:00
Sergio De la torre	3f291da02c	refs #6921 feat: addFromDelivery	2024-04-17 13:57:56 +02:00
Sergio De la torre	32e2827287	refs #6921 feat: addFromDelivery	2024-04-17 13:55:07 +02:00
Robert Ferrús	edc6e4a5e3	Merge branch 'dev' into 6500-procRefactor8	2024-04-17 11:30:45 +00:00
Sergio De la torre	a3c8532661	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery	2024-04-17 13:27:00 +02:00
Juan Ferrer	7cda14c424	Merge branch 'dev' into 4409-binlog	2024-04-17 13:24:32 +02:00
Juan Ferrer	ae326e6e2e	feat(binlog): refs #4409 Old recalc code removed ... Queues: orderTotal, ticketTotal and travelEntries	2024-04-17 13:21:27 +02:00
Robert Ferrús	e769081a74	feat: refs #6500	2024-04-17 13:11:28 +02:00
Pablo Natek	d93dc28728	fix(view): refs #6372 fix	2024-04-17 12:32:33 +02:00
Robert Ferrús	998466f6eb	Merge pull request 'test' (!2316) from test into dev ... Reviewed-on: #2316 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-17 10:28:45 +00:00
Guillermo Bonet	0d50f5b405	Merge pull request 'master' (!2315) from master into test ... Reviewed-on: #2315 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-17 10:20:20 +00:00
Robert Ferrús	3e5b6a9ad1	Merge branch 'dev' into 6500-procRefactor8	2024-04-17 09:01:39 +00:00
Robert Ferrús	8ca278b5a9	feat: refs #6500 cambios solicitados	2024-04-17 11:00:00 +02:00
Guillermo Bonet	cffc1964b6	feat: refs #6968 Transactioned and isTriggerDisabled	2024-04-17 10:26:21 +02:00
Robert Ferrús	0a4cd4d4d0	feat: company_getSuppliersDebtHotFix	2024-04-17 09:58:27 +02:00
Guillermo Bonet	9f9662924d	Merge pull request 'feat: refs #6968 Changed groupingMode to enum' (!2306) from 6968-groupingModeRefactor into dev ... Reviewed-on: #2306 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-17 06:48:43 +00:00
Robert Ferrús	a0f3c6183b	Merge branch 'test' into 7219-sale_replaceItem	2024-04-17 06:42:18 +00:00
Guillermo Bonet	f1bb2fbcb3	Merge branch 'test' into dev	2024-04-17 08:41:33 +02:00
Guillermo Bonet	7d50907676	Merge branch 'master' into test	2024-04-17 08:41:10 +02:00
Guillermo Bonet	786a5a68b9	hotfix: EKT	2024-04-17 08:40:25 +02:00
Sergio De la torre	ae88a8a281	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery	2024-04-17 07:44:08 +02:00
Juanjo Breso	3950d60387	feat: refs#6493 Cambios solicitados procedimientos	2024-04-17 07:37:58 +02:00
Juanjo Breso	97c0db62ac	Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-17 07:33:11 +02:00
Juanjo Breso	187c918a21	feat: refs#6493 Cambios solicitados procedimientos	2024-04-17 07:33:08 +02:00
Juanjo Breso	81b2e89fd8	Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2	2024-04-17 05:30:39 +00:00
Guillermo Bonet	36bf770ed4	Merge pull request 'feat: refs #7173 Bloquear facturas recibidas contabilizadas' (!2258) from 7173-Restricción-eliminar/modificar-vn.invoiceIn into dev ... Reviewed-on: #2258 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-17 05:17:36 +00:00
Guillermo Bonet	d92d373db4	Merge branch 'dev' into 6968-groupingModeRefactor	2024-04-17 05:15:37 +00:00
Guillermo Bonet	c8e7706652	feat: refs #6968 Requested changes	2024-04-17 07:15:24 +02:00
Carlos Andrés	c262805d33	feat: Turn issues into calculated columns refs#7213	2024-04-16 18:29:14 +02:00
Carlos Andrés	7bbf113ffa	feat: Turn issues into calculated columns refs#7213	2024-04-16 18:26:57 +02:00
Pablo Natek	e15fb8dec6	fix: refs #6021 proc	2024-04-16 18:00:15 +02:00
Pablo Natek	70c9bae710	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6021-fix-item_get	2024-04-16 17:58:04 +02:00
Pablo Natek	dac562e960	Merge pull request 'feat: refs #6021 order_put refactor' (!2311) from 6021-fix-orderPut into dev ... Reviewed-on: #2311 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-04-16 15:54:19 +00:00
Pablo Natek	1d29c77aa7	feat: refs #6021 fix proc	2024-04-16 17:53:21 +02:00
Pablo Natek	70836b93b6	fix: refs #6021 catalogue_findById	2024-04-16 17:51:34 +02:00
Pako Natek	12f7cc85ed	Merge branch 'dev' into 6021-floranet_item_get	2024-04-16 15:45:41 +00:00
Pako Natek	c1c6204eab	Merge branch 'dev' into 6021-fix-orderPut	2024-04-16 15:44:02 +00:00
Pablo Natek	f05b33787f	feat: refs #6021 order_put refactor	2024-04-16 17:42:36 +02:00
Guillermo Bonet	e4c3704231	Merge branch 'test' into dev	2024-04-16 17:25:49 +02:00
Guillermo Bonet	62596de1dd	Merge branch 'master' into test	2024-04-16 17:25:28 +02:00
Guillermo Bonet	db5b0d7967	hotfix: ticket#174761 Greatest fix null possibility	2024-04-16 17:19:25 +02:00
Pako Natek	f5fd708891	item_get	2024-04-16 17:08:45 +02:00
Carlos Andrés	d53f19b47d	feat: Turn problems into calculated columns	2024-04-16 17:01:14 +02:00
Pablo Natek	d0dfdc668b	feat(agency): refs #4988 add new agency	2024-04-16 16:25:27 +02:00
Ivan Mas	3a7b0df36f	Merge branch 'dev' into 7161DeleteitemTrash	2024-04-16 11:29:03 +00:00
Robert Ferrús	01d959f6f4	feat: refs #7219	2024-04-16 12:46:50 +02:00
Guillermo Bonet	56dc0ddb68	Merge branch 'test' into dev	2024-04-16 12:32:53 +02:00
Guillermo Bonet	9ea1ac2a56	Merge branch 'master' into test	2024-04-16 12:32:27 +02:00
Guillermo Bonet	7fda58d4a4	hotfix: ticket#174308 Ekt load packing	2024-04-16 12:29:44 +02:00
Guillermo Bonet	7a557be09a	feat: refs #6968 Changed groupingMode to enum	2024-04-16 11:07:57 +02:00
Jorge Penadés	976b18203e	feat: refs #7187 check if is freelancer on insert & update	2024-04-16 10:49:17 +02:00
Robert Ferrús	ffd7b3cf50	Merge branch 'dev' into 6500-procRefactor8	2024-04-16 08:39:08 +00:00
Javi Gallego	58baa45e09	Merge branch 'dev' into 7108-exchange-rate	2024-04-16 09:47:21 +02:00
Guillermo Bonet	4678c0567b	Merge branch '7173-Restricción-eliminar/modificar-vn.invoiceIn' of https://gitea.verdnatura.es/verdnatura/salix into 7173-Restricción-eliminar/modificar-vn.invoiceIn	2024-04-16 08:58:27 +02:00
Guillermo Bonet	45fac06c6b	feat: refs #7173 Added restrictions in invoiceIn structure	2024-04-16 08:58:26 +02:00
Guillermo Bonet	d88957d157	Merge branch 'dev' into 7173-Restricción-eliminar/modificar-vn.invoiceIn	2024-04-16 06:45:04 +00:00
Guillermo Bonet	91d5f51e73	Merge branch '7173-Restricción-eliminar/modificar-vn.invoiceIn' of https://gitea.verdnatura.es/verdnatura/salix into 7173-Restricción-eliminar/modificar-vn.invoiceIn	2024-04-16 08:44:51 +02:00
Guillermo Bonet	93abfdd8a1	feat: refs #7173 Added restrictions in invoiceIn structure	2024-04-16 08:44:50 +02:00
Guillermo Bonet	0c24e67af1	Merge branch 'dev' into 7173-Restricción-eliminar/modificar-vn.invoiceIn	2024-04-16 05:42:59 +00:00
Pablo Natek	0418540ef9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-16 07:39:13 +02:00
Pablo Natek	336c3274ea	feat(agency): refs #4988 add summary	2024-04-16 07:38:48 +02:00
Ivan Mas	5bb3dccd19	Merge branch 'dev' into 7161DeleteitemTrash	2024-04-15 14:03:42 +00:00
Ivan Mas	6e183b7426	refs #7161 change vAddress to vAddressShortage	2024-04-15 15:59:05 +02:00
Guillermo Bonet	0f26fb46b6	feat: refs #6724 Grant changes	2024-04-15 13:16:36 +02:00
Guillermo Bonet	78bd561122	Merge branch 'dev' into 6724-permisos-vn.entry.isBooked	2024-04-15 11:11:55 +00:00
Sergio De la torre	4cb79956a6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery	2024-04-15 13:03:47 +02:00
Robert Ferrús	a41aa46c3a	Merge branch 'dev' into 6500-procRefactor8	2024-04-15 09:35:52 +00:00
Juan Ferrer	42fe7fb1e2	feat(binlog): refs #4409 Disable order recalc from triggers	2024-04-15 11:32:44 +02:00
Jorge Penadés	200cbd8d74	fix: refs #6938 acls & scope	2024-04-15 11:03:57 +02:00
Jorge Penadés	0219fa105e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6938-hideWorkerPhone	2024-04-15 10:22:44 +02:00
Juan Ferrer	133d45eecf	Merge branch 'dev' into 4409-binlog	2024-04-15 10:22:04 +02:00
Jorge Penadés	a68b8431c5	feat: refs #6938 add scope & acls	2024-04-15 10:21:59 +02:00
Juan Ferrer	31e27f1926	Merge branch '4409-binlogQueueFn' of https://gitea.verdnatura.es/verdnatura/salix into 4409-binlogQueueFn	2024-04-15 10:18:07 +02:00
Juan Ferrer	5414aaa1b4	fix(binlog): refs #4409 Fixtures for binlogQueue	2024-04-15 10:18:06 +02:00
Juan Ferrer	ba9e1d9233	Merge branch 'dev' into 4409-binlogQueueFn	2024-04-15 08:16:56 +00:00
jcasado	dc8a6d1274	Merge branch 'dev' into 6641-checkboxMyTeam	2024-04-15 10:11:36 +02:00
Juan Ferrer	50d6c234be	feat(binlog): refs #4409 New function for binlog queue monitoring	2024-04-15 09:31:24 +02:00
Robert Ferrús	36b3a92ca3	Merge branch 'dev' into 6500-procRefactor8	2024-04-15 05:18:54 +00:00
Robert Ferrús	f30f907d8e	feat: refs #6500 cambios solicitados	2024-04-12 12:13:07 +02:00
Javi Gallego	bb6ea31bf7	feat: funcional a falta de test	2024-04-12 10:26:32 +02:00