5010 Commits

Author	SHA1	Message	Date
Pablo Natek	b203d94b27	feat: refs #6021 add new column	2024-05-20 11:37:40 +02:00
Pako Natek	abdacb3627	casting values	2024-05-20 10:33:01 +02:00
Guillermo Bonet	7f0f1b9547	refactor: refs #7422 Deleted tables	2024-05-20 09:54:30 +02:00
Sergio De la torre	598a7eefbc	6281 feat:buyFk in itemShelving	2024-05-20 09:39:23 +02:00
Sergio De la torre	2b2406ae52	6281 feat:buyFk in itemShelving	2024-05-20 09:32:12 +02:00
Sergio De la torre	20bf2b73b6	6281 feat:buyFk in itemShelving	2024-05-20 09:27:20 +02:00
Sergio De la torre	dd76168bc3	6281 feat:buyFk in itemShekving	2024-05-20 09:15:24 +02:00
Sergio De la torre	b71984c53f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6281_buyFk	2024-05-20 09:13:44 +02:00
Jorge Penadés	480daea26f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-20 08:54:17 +02:00
Pako Natek	9a5acedd38	improved proc	2024-05-20 08:21:54 +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
Sergio De la torre	c822a64dc7	refs #4979 feat:getInfoDetails && item_devalueA2	2024-05-17 16:38:11 +02:00
Ivan Mas	8b6844b9f0	Merge branch 'dev' into 7217-Unify_errorMessageAWB	2024-05-17 14:13:38 +00:00
Jorge Penadés	f36f5fa5df	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-17 14:39:35 +02:00
Pablo Natek	4790ae94d1	Merge branch 'dev' into 7187-addPdaFreelancers	2024-05-17 11:33:57 +00:00
Carlos Andrés	6a576e69e1	refs #4979 feat:getInfoDetails && item_devalueA2	2024-05-17 12:50:51 +02:00
Carlos Andrés	c8db0a3aa8	refs #4979 feat:getInfoDetails && item_devalueA2	2024-05-17 12:48:16 +02:00
Guillermo Bonet	0b5f05cbed	refactor: refs #7375 Refactor clientsDisable	2024-05-17 12:36:54 +02:00
Sergio De la torre	135526e513	refs #4979 feat:getInfoDetails && item_devalueA2	2024-05-17 11:20:26 +02:00
Guillermo Bonet	1154e484e5	Merge branch 'test' into dev	2024-05-17 09:57:35 +02:00
Ivan Mas	68425bd41f	Merge branch 'dev' into 7217-Unify_errorMessageAWB	2024-05-17 07:55:27 +00:00
Ivan Mas	db28bf335e	refs #7217 Modify error message	2024-05-17 09:53:17 +02:00
Guillermo Bonet	a99554c773	fix: Occasionally saleVolume bad index	2024-05-17 09:50:53 +02:00
Ivan Mas	4bf36f2655	refs #7217 Modify proc name	2024-05-17 08:16:50 +02:00
Guillermo Bonet	bddc9a8386	Deleted insert into util.debug (deletedState)	2024-05-17 07:51:51 +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	08ea0d2693	Merge pull request 'refs #7400 feat: book ledger with counters' (!2467) from 7400-Contador-para-los-asientos-contables into dev ... Reviewed-on: #2467 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-16 18:13:39 +00:00
Carlos Andrés	dab90633db	Merge pull request 'test' (!2466) from test into dev ... Reviewed-on: #2466 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-16 17:21:54 +00:00
Carlos Andrés	8d8cfa24de	refs #7400 feat: book ledger with counters	2024-05-16 19:16:25 +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
Ivan Mas	b2db076c2f	refs #7217 create travel_throwAWBError	2024-05-16 15:34:45 +02:00
Carlos Andrés	2f4f199fad	fix: invoiceInTax_getFromEntries (referenceRate)	2024-05-16 14:40:02 +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	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
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
Carlos Andrés	df15e44442	Merge pull request '6974-sale_add' (!2452) from 6974-sale_add into master ... Reviewed-on: #2452 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-05-14 15:06:35 +00:00
Carlos Andrés	adaba6ecfb	refs #6974 refactor: optimize sale_add	2024-05-14 15:39:28 +02:00
Carlos Andrés	d0d710f023	refs #6974 refactorLoop	2024-05-14 15:36:09 +02: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
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
Alex Moreno	d487d13cdb	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-14 11:26:11 +02:00
Alex Moreno	2ddadcd8a4	deploy: dump	2024-05-14 09:38:03 +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
Robert Ferrús	b0da193b4a	feat: refs #7039 añadir colum virtual country	2024-05-14 07:48:03 +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
Jorge Penadés	e16e5e3db3	feat: refs #5919 back test	2024-05-13 13:19:28 +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
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
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	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
Robert Ferrús	56906963de	Merge branch 'dev' into 7363-item_getBalance	2024-05-13 05:03:45 +00: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
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
Carlos Andrés	56815e4b1a	Ticket 180571 No se ven las ubicaciones	2024-05-10 13:10:54 +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
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
Robert Ferrús	cb9cacc1ea	feat: refs #7363 item_getBalance saleTracking no mostrar duplicados	2024-05-10 11:51:54 +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
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
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
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	1450a680ea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker	2024-05-09 12:45:33 +02: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
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