826 Commits

Author	SHA1	Message	Date
Pablo Natek	b41104432c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers	2024-05-16 13:57:55 +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
Sergio De la torre	9b73cdfa6f	refs #4979 feat:getInfoDetails && item_devalueA2	2024-05-15 17:03:33 +02:00
Guillermo Bonet	7e3861a02f	Merge branch 'test' into dev	2024-05-15 14:32:48 +02:00
Guillermo Bonet	049e8931ab	hotfix: Tmp fix item_getSimilar	2024-05-15 14:30:04 +02:00
Guillermo Bonet	9134e0ff65	feat: refs #7264 Minor change	2024-05-15 14:05:35 +02:00
Guillermo Bonet	53fa78894c	feat: refs #7264 Refactor proc itemShelvingRadar and added columns	2024-05-15 13:54:22 +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
Pako Natek	0adf6bfc45	Merge branch 'dev' into 7362-VIP	2024-05-14 10:50:59 +00: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
Pako Natek	53f49531b7	VIP now is Vip	2024-05-14 09:07:43 +02: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
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
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	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
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
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	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
Sergio De la torre	679f9a1b9b	refs #6861 feat:sectoCollection reserve	2024-05-09 07:07:10 +02: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	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
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
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
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
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
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
Sergio De la torre	7368561bad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-05-07 07:21:59 +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
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
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
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