1090 Commits

Author	SHA1	Message	Date
Alex Moreno	d487d13cdb	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-14 11:26:11 +02:00
Pako Natek	53f49531b7	VIP now is Vip	2024-05-14 09:07:43 +02:00
Pako Natek	599f22a25d	catalogue tiene en cuenta apc	2024-05-14 09:03:49 +02:00
Robert Ferrús	eeb36a6810	Merge branch 'dev' into 7039-country-country	2024-05-14 06:32:45 +00:00
Alex Moreno	12f36dc825	hotFix: refs #6731 remove CodCOMPRADOR	2024-05-14 08:24:40 +02: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
Jorge Penadés	45082f532f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-createLocker	2024-05-13 15:05:27 +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
Carlos Andrés	3ce43909e2	feat: Turn issues into calculated columns refs#7213	2024-05-13 14:21:01 +02:00
Guillermo Bonet	6c325fccef	refactor: refs #7373 Deleted proc packageInvoicing	2024-05-13 13:41:47 +02:00
Carlos Andrés	f89ca786df	eat: Turn issues into calculated columns refs#7213	2024-05-13 13:31:58 +02:00
Robert Ferrús	5e3fa1be8b	Merge branch 'dev' into 7296-expeditionTruck	2024-05-13 10:33:37 +00:00
Carlos Andrés	b1af625937	feat: Turn issues into calculated columns refs#7213	2024-05-13 12:32:46 +02:00
Carlos Andrés	057121582e	feat: Turn issues into calculated columns refs#7213	2024-05-13 10:06:00 +02:00
Carlos Andrés	6d3f00ec95	feat: Turn issues into calculated columns refs#7213	2024-05-13 09:54:27 +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
Robert Ferrús	32b339ffdf	Merge branch 'dev' into 7363-item_getBalance	2024-05-10 11:13:09 +00:00
Robert Ferrús	e7df3fefc6	feat: refs #7363	2024-05-10 13:11:41 +02:00
Robert Ferrús	9163d3db74	feat: refs #7363 changes	2024-05-10 13:05:44 +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
Guillermo Bonet	ba72408e84	refactor: refs #7345 Deprecated isFarmer__	2024-05-10 12:45:53 +02:00
Robert Ferrús	cb9cacc1ea	feat: refs #7363 item_getBalance saleTracking no mostrar duplicados	2024-05-10 11:51:54 +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
Pako Natek	c048389412	Merge branch 'dev' into 7362-VIP	2024-05-10 05:13:35 +00:00
Pako Natek	ec060209aa	done	2024-05-09 18:53:32 +02:00
Guillermo Bonet	f4229284fa	Merge branch 'dev' into 7252-deliveryNoteFarmingFk	2024-05-09 12:56:05 +00:00
Carlos Andrés	cc941de606	feat: conversion art. A1 a A2 refs #4979	2024-05-09 14:24:20 +02:00
Ivan Mas	9d1dc6b483	Merge branch 'dev' into 7161-deleteItemTrash	2024-05-09 11:41:04 +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	f963923645	feat: refs #6223 pull master	2024-05-09 12:54:57 +02:00
Robert Ferrús	0498b425b3	Merge branch 'dev' into 7039-country-country	2024-05-09 10:51:18 +00: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
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	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	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
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
Javi Gallego	393d57f078	fix: #7344 getSupplierDebt agrupa por pago	2024-05-08 10:51:35 +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
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
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
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
Robert Ferrús	43c742938c	feat: refs #179881	2024-05-07 14:37:24 +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	cc8873f48a	hotfix: #7173 Rollback	2024-05-07 13:08:44 +02:00
Guillermo Bonet	2adf96cb37	refactor: #6585 Deleted transaction ticket_doCmr	2024-05-07 13:03:50 +02:00
Guillermo Bonet	da8378d422	hotfix: refs #7173 Deleted restriction invoiceInDueDay_beforeUpdate	2024-05-07 12:15:28 +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
Guillermo Bonet	e44568ff4b	feat: refs #6585 Added call ticket_afterUpdate	2024-05-07 08:00:26 +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
Javi Gallego	633a3c481c	Merge branch 'dev' into 6382-regularizar-Shelving-Parking	2024-05-06 07:42:38 +00: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
Carlos Andrés	2659e3b259	feat: Turn issues into calculated columns refs#7213	2024-05-03 14:03:26 +02:00
Robert Ferrús	82ee8d2209	Merge branch 'dev' into 7039-country-country	2024-05-03 09:25:06 +00: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
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	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
Robert Ferrús	9af3c17a1f	feat: refs #7291 sale_getProblems	2024-04-29 09:58:58 +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
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
Jorge Penadés	f7cdbd39f0	fix: refs #7211 tests	2024-04-25 16:08:52 +02: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
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
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
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
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	7899cf230e	feat: refs #7039 country	2024-04-24 09:05:29 +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
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
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
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
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
Juan Ferrer	d58607f26e	Merge branch 'dev' into 4409-binlog	2024-04-22 19:43:48 +00: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
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
Guillermo Bonet	eb9f81c81d	feat #7181 Rollback creditInsurance_getRisk	2024-04-22 13:05:16 +02:00
Robert Ferrús	debd163b3f	Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7	2024-04-22 10:16:01 +00: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
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
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
Guillermo Bonet	65892625d5	feat: #7231 Collection_assing more time and throw	2024-04-19 14:17:49 +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