5606 Commits

Author	SHA1	Message	Date
Carlos Andrés	b5cd57e660	Merge pull request 'test' (!2621) from test into dev ... Reviewed-on: #2621 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-06-20 13:47:11 +00:00
Carlos Andrés	691413a854	Merge pull request 'master' (!2620) from master into test ... Reviewed-on: #2620 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-06-20 13:44:37 +00:00
Carlos Andrés	11675c2e35	Merge pull request 'feat: sincro client supplier sage refs #7595' (!2618) from 7595---Sincronizar-cambios-clientes-y-proveedores-con-Sage into master ... Reviewed-on: #2618 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-20 13:34:55 +00:00
Carlos Andrés	414bf9eb03	feat: sincro client supplier sage refs #7595	2024-06-20 14:48:32 +02:00
Carlos Andrés	e0d105313d	feat: sincro client supplier sage refs #7595	2024-06-20 14:27:11 +02:00
Sergio De la torre	182cd3fa8e	feat boxPicking refs #7357	2024-06-20 11:34:51 +02:00
Alex Moreno	f99b1beb86	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-20 09:48:57 +02:00
Alex Moreno	f84e85e443	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-06-20 09:48:34 +02:00
Sergio De la torre	c1c01df3c3	feat itemShelving_filterBuyer refs #7023	2024-06-20 09:37:22 +02:00
Sergio De la torre	c87f060d51	feat boxPicking refs #7357	2024-06-20 09:21:27 +02:00
Javi Gallego	018972b948	Merge pull request 'feat: refs #7216 logUnpaid' (!2609) from 7216-clientUnpaid into dev ... Reviewed-on: #2609 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-06-20 05:50:14 +00:00
Javi Gallego	1a8df4d87c	feat: refs #7216 triggers	2024-06-19 13:41:37 +02:00
Jorge Penadés	6967aa9811	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls	2024-06-19 13:40:09 +02:00
Pako Natek	b117352e1a	Merge branch 'dev' into 7420-supplierPackaging_reportSource_update	2024-06-19 10:31:36 +00:00
Robert Ferrús	c4d297f766	Merge branch 'dev' into 5855-temporaryTable	2024-06-19 09:50:27 +00:00
Guillermo Bonet	738dcc7060	Merge pull request 'feat: refs #7545 Deleted hasIncoterms client column' (!2582) from 7545-hasIncoterms into dev ... Reviewed-on: #2582 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-19 09:31:18 +00:00
Robert Ferrús	0128dfd967	feat: refs #5855 changes required	2024-06-19 11:30:50 +02:00
Pablo Natek	47eb6dd8fe	Merge branch 'master' into 6404-sendMailOnDeadLine	2024-06-19 08:46:42 +00:00
Pako Natek	49e01218e9	Warehouse name	2024-06-19 10:45:37 +02:00
Robert Ferrús	1e3376f908	Merge branch 'dev' into 5855-temporaryTable	2024-06-19 08:05:01 +00:00
Robert Ferrús	a42562b0ca	fear: refs #5855 claim_ratio_routine	2024-06-19 10:01:32 +02:00
Pako Natek	1fa0a841da	TP previous	2024-06-19 07:26:30 +02:00
Pako Natek	bf62f40c87	actualizada la rama	2024-06-19 07:17:25 +02:00
Pako Natek	841f8e9cac	Merge branch 'dev' into 7420-supplierPackaging_ReportSource	2024-06-18 18:38:48 +00:00
Sergio De la torre	ae01fb6440	hotFix delete unique refs #6281	2024-06-18 17:00:15 +02:00
Sergio De la torre	5694d9a9fe	Merge branch 'test' into 6964-hasItemOlder	2024-06-18 14:20:57 +00:00
Jorge Penadés	6cf7c58671	fix: refs #6238 use scheme	2024-06-18 12:59:55 +02:00
Ivan Mas	49943e4f25	Merge branch 'dev' into 7313-Delete_vn.ticketPackaging.workerFk	2024-06-18 10:09:04 +00:00
Pako Natek	66ed958c72	Merge branch 'dev' into 7420-supplierPackaging_ReportSource	2024-06-18 09:07:24 +00:00
Guillermo Bonet	a61c12a06d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-18 11:04:01 +02:00
Guillermo Bonet	b7fadddbb1	Merge branch 'master' into dev	2024-06-18 11:03:56 +02:00
Guillermo Bonet	4d5f3e43ed	Merge branch 'master' into test	2024-06-18 11:03:49 +02:00
Guillermo Bonet	2b1de271a9	refs #7552 Added force vShowType true	2024-06-18 11:03:30 +02:00
Sergio De la torre	239814e6b4	feat hasItemOlder refs#6964	2024-06-18 10:08:40 +02:00
Jorge Penadés	87feddaedb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6238-addPercentage	2024-06-18 09:55:22 +02:00
Carlos Satorres	52a34c8f2d	refs #7409 fix acls	2024-06-18 09:18:09 +02:00
Pako Natek	3711f26b5f	Merge branch 'dev' into 7420-supplierPackaging_ReportSource	2024-06-18 06:24:59 +00:00
Pako Natek	9fc027a3c6	tickets deleted excluded	2024-06-18 08:24:06 +02:00
Sergio De la torre	eedcdb54fa	feat hasItemOlder refs#6964	2024-06-17 19:50:51 +02:00
Sergio De la torre	dc777b2d7a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6964-hasItemOlder	2024-06-17 19:12:00 +02:00
Ivan Mas	671290b9a0	refs #7313 delete vn.itemPackaging.workerFk	2024-06-17 16:45:51 +02:00
Carlos Satorres	3e25fff90f	refs #7409 acl	2024-06-17 15:50:58 +02:00
Guillermo Bonet	a84badff87	Merge branch 'test' into dev	2024-06-17 14:52:55 +02:00
Guillermo Bonet	9b3f67ff62	Merge branch 'master' into test	2024-06-17 14:52:40 +02:00
Guillermo Bonet	ce709798b4	hotfix: refs #7486 collection_new debug error	2024-06-17 14:51:04 +02:00
Carlos Satorres	fa8c1b3879	acls, fixtures, models	2024-06-17 13:50:07 +02:00
Guillermo Bonet	664f4299b3	Merge branch 'test' into dev	2024-06-17 13:42:51 +02:00
Guillermo Bonet	9df3e914bd	Merge branch 'master' into test	2024-06-17 13:42:33 +02:00
Guillermo Bonet	131b44305d	hotfix: refs #7552 item_getSimilar	2024-06-17 13:38:40 +02:00
Guillermo Bonet	b4377e36e2	Merge branch 'test' into dev	2024-06-17 11:45:19 +02:00
Guillermo Bonet	e7eaecdf6f	Merge branch 'master' into test	2024-06-17 11:45:00 +02:00
Guillermo Bonet	4c345ffa93	hotfix: refs #7552 item_getSimilar	2024-06-17 10:57:23 +02:00
Guillermo Bonet	43df0ef55d	Merge branch 'dev' into 6701-claimRatioRoutine	2024-06-17 07:42:33 +00:00
Guillermo Bonet	1d0b89ed52	refs #7519 Requested changes	2024-06-17 09:42:16 +02:00
Pablo Natek	c3d64b2358	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6404-sendMailOnDeadLine	2024-06-17 08:49:26 +02:00
Pablo Natek	a30ff44837	fix: refs #6404 fix notification	2024-06-14 17:40:08 +02:00
Carlos Andrés	51078c804b	Ticket #194195 Recupero vn.item_getAtp	2024-06-14 16:32:13 +02:00
Carlos Andrés	5473f7a308	Hotfix Ticket #194195 Error radar negativos	2024-06-14 16:01:27 +02:00
Robert Ferrús	df6de7e74c	fix: refs #194195 item_getAtp	2024-06-14 14:55:03 +02:00
Jorge Penadés	202884fdce	feat: refs #6238 add travelKgPercentage table and model	2024-06-14 14:25:15 +02:00
Robert Ferrús	8dea9598e8	fix: refs #194195 item_getAtp	2024-06-14 13:54:43 +02:00
Guillermo Bonet	9b80ef73a8	Merge branch 'test' into dev	2024-06-14 12:48:00 +02:00
Guillermo Bonet	6c2fd2580d	Merge branch 'master' into test	2024-06-14 12:47:51 +02:00
Guillermo Bonet	798bf6d028	hotfix: refs #6281 itemShelving_add buy is required	2024-06-14 12:41:46 +02:00
Carlos Satorres	e3e9706fb8	fix fixtures	2024-06-14 09:53:50 +02:00
Carlos Satorres	189c67bd2d	warmFix change if	2024-06-14 09:43:10 +02:00
Robert Ferrús	828908a522	Merge branch 'dev' into 5855-temporaryTable	2024-06-14 06:07:39 +00:00
Robert Ferrús	831b2c39f6	Merge branch 'dev' into 5855-temporaryTable	2024-06-14 06:06:54 +00:00
Ivan Mas	615fd3e97b	refs #7530 delete trigger deviceProductionConfig_afterUpdate	2024-06-13 15:10:04 +02:00
Sergio De la torre	c2e4e187d6	feat itemShelvingSale refs #6861	2024-06-13 14:21:59 +02:00
Jorge Penadés	784bd91e04	fix: refs #6286 update WorkerTimeControl permissions	2024-06-13 13:43:28 +02:00
Guillermo Bonet	cfc5e32715	feat: refs #6701 Fix error	2024-06-13 13:11:50 +02:00
Guillermo Bonet	cb056ff789	Merge branch 'dev' into 6701-claimRatioRoutine	2024-06-13 11:14:00 +02:00
Sergio De la torre	5340729ead	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-06-13 11:07:57 +02:00
Guillermo Bonet	53c732bcb9	Merge branch 'test' into dev	2024-06-13 07:12:10 +02:00
Guillermo Bonet	d7317e4067	hotfix: refs #7024 Modify booked entries	2024-06-13 07:09:48 +02:00
Carlos Andrés	30caf79490	feat: previas con sitema de reservas refs #6861	2024-06-12 16:12:06 +02:00
Guillermo Bonet	d0b926b2c5	feat: refs #7490 Changes	2024-06-12 14:26:26 +02:00
Alex Moreno	671978ec02	Merge branch 'dev' into 6861-Pasar-modo-trabajo-de-previa-a-reservas	2024-06-12 10:21:36 +00:00
Javi Gallego	446e180cf0	hotfix claim	2024-06-12 11:58:07 +02:00
Guillermo Bonet	dcb9d54105	feat: refs #7545 Deleted hasIncoterms client column	2024-06-12 11:48:01 +02:00
Alex Moreno	60d4372996	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation	2024-06-12 07:51:01 +02:00
Alex Moreno	1eee1d0e9b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-12 07:47:56 +02:00
Guillermo Bonet	17fa1e10f6	feat: refs #6701 Added claimRatio_afterInsert	2024-06-12 07:33:10 +02:00
Carlos Andrés	b9d1c3228b	feat: previas con sitema de reservas refs #6861	2024-06-11 18:43:26 +02:00
Jorge Penadés	ee32bc1008	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables	2024-06-11 14:40:29 +02:00
Guillermo Bonet	aa0e06cfec	refactor: refs #7505 Changed name	2024-06-11 14:00:59 +02:00
Guillermo Bonet	3bd596e5fd	refactor: refs #7505 Added description	2024-06-11 13:53:41 +02:00
Guillermo Bonet	4f10a93584	refactor: refs #7505 Minor change	2024-06-11 13:36:46 +02:00
Alex Moreno	3b44bdd2bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation	2024-06-11 12:56:56 +02:00
Guillermo Bonet	a9aad7406a	refactor: refs #7505 Minor change	2024-06-11 12:51:36 +02:00
Carlos Andrés	d75e008a23	feat: previas con sitema de reservas refs #6861	2024-06-11 12:49:33 +02:00
Carlos Andrés	ed7218c133	feat: previas con sitema de reservas refs #6861	2024-06-11 12:44:25 +02:00
Guillermo Bonet	9f9063567a	refactor: refs #7505 item_getVisible refactor	2024-06-11 12:40:07 +02:00
Jorge Penadés	1cefe817f5	feat: add editZone ACL for buyer	2024-06-11 12:06:44 +02:00
Guillermo Bonet	76f76b8304	feat: refs #7568 Added freelancer exception	2024-06-11 10:48:24 +02:00
Jorge Penadés	902a9ee51b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6449-addColumnLogTables	2024-06-11 10:43:33 +02:00
Alex Moreno	9c2ccc5df4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-11 09:59:09 +02:00
Alex Moreno	2dec51804c	build: dump	2024-06-11 08:38:26 +02:00
Guillermo Bonet	bd13ecd464	refactor: refs #7486 engine memory and primary key sales_merge	2024-06-11 07:59:53 +02:00
Sergio De la torre	62f4561279	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7168-itemShelvingLog_get	2024-06-11 07:34:42 +02:00
Jorge Penadés	562e8689e1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection	2024-06-10 15:36:34 +02:00
Alex Moreno	c241189508	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-10 14:22:12 +02:00
Guillermo Bonet	75a529830c	Merge pull request 'refactor: refs #7486 Optimized procs' (!2564) from 7486-productionControl into test ... Reviewed-on: #2564 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-10 11:33:10 +00:00
Guillermo Bonet	9d82f0ff7c	Merge branch 'test' into dev	2024-06-10 12:48:53 +02:00
Guillermo Bonet	37fa92aca8	Merge branch 'master' into test	2024-06-10 12:48:38 +02:00
Guillermo Bonet	272a34c5f9	refactor: refs #7486 Added userFk debug	2024-06-10 12:46:26 +02:00
Pablo Natek	65fae086aa	Merge branch 'master' of https: refs #6404//gitea.verdnatura.es/verdnatura/salix into 6404-sendMailOnDeadLine	2024-06-10 12:29:42 +02:00
Pablo Natek	c5227d6cf6	feat: refs #6404 add mail notification	2024-06-10 12:24:23 +02:00
Guillermo Bonet	7579e15fcc	refactor: refs #7486 Optimized procs	2024-06-10 11:55:40 +02:00
Guillermo Bonet	b4820858c9	hotfix: ticket 192672 ticketPreviousPreparingList	2024-06-10 11:32:44 +02:00
Javi Gallego	b4046de190	Merge branch 'dev' into 4560-GastosReparto	2024-06-10 08:17:17 +00:00
Guillermo Bonet	ca7d67451b	refactor: refs #7517 Minor changes	2024-06-10 09:09:11 +02:00
Guillermo Bonet	2e8d28d795	refactor: refs #7517 Added throw	2024-06-10 09:08:26 +02:00
Guillermo Bonet	317f898c2e	refactor: refs #7490 Minor changes	2024-06-10 08:48:56 +02:00
Guillermo Bonet	a4f8c0df80	Merge branch '7490-duaInvoiceInBooking' of https://gitea.verdnatura.es/verdnatura/salix into 7490-duaInvoiceInBooking	2024-06-10 08:47:03 +02:00
Guillermo Bonet	fb4be69cf1	refactor: refs #7490 Added final update	2024-06-10 08:47:02 +02:00
Guillermo Bonet	e043badc19	Merge branch 'dev' into 7490-duaInvoiceInBooking	2024-06-10 06:39:15 +00:00
Guillermo Bonet	9b21cd5eb1	refactor: refs #7490 Deleted update duaInvoiceInBooking	2024-06-10 08:38:58 +02:00
Sergio De la torre	4cf5c0775c	feat isScannedExpedition refs #7276	2024-06-10 07:30:33 +02:00
Sergio De la torre	cac1278c08	feat hsItemOlder refs $6964	2024-06-07 16:29:51 +02:00
Carlos Andrés	1497146940	Merge branch 'master' into Hotfix-midnight-determinist	2024-06-07 16:17:11 +02:00
Javi Gallego	f82f452423	Merge branch 'dev' into 7276_expeditionScanned	2024-06-07 13:44:24 +00:00
Jorge Penadés	521f3f1446	feat: refs #6243 update ACL	2024-06-07 11:52:24 +02:00
Jorge Penadés	96a3a2e69b	fix: refs #6243 rollback	2024-06-07 11:50:16 +02:00
Jorge Penadés	faf450e075	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection	2024-06-07 11:45:51 +02:00
Javi Gallego	0c068ed126	Merge branch 'dev' into 4560-GastosReparto	2024-06-07 09:03:24 +00:00
Jorge Penadés	44e92964f1	Merge pull request 'test to dev' (!2558) from test into dev ... Reviewed-on: #2558 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-07 07:19:31 +00:00
Sergio De la torre	7c0fa6dbb9	feat isScannedExpedition refs #7276	2024-06-07 09:18:52 +02:00
Jorge Penadés	99e4808ae9	Merge branch 'test' into 6942-warmfix-setInsertAcl	2024-06-07 07:11:07 +00:00
Guillermo Bonet	aff0de23eb	Merge branch 'test' into dev	2024-06-07 08:29:28 +02:00
Guillermo Bonet	b6fb7650cd	Merge branch 'master' into test	2024-06-07 08:29:04 +02:00
Guillermo Bonet	70eddb6ce2	refactor: refs #7419 Added index ticketLog	2024-06-07 08:18:07 +02:00
Robert Ferrús	f7c2fd824f	feat: refs #7496 changesRequested	2024-06-07 07:05:22 +02:00
Jorge Penadés	5a6e2a2b31	fix: refs #6942 create invoiceIn acl	2024-06-06 15:45:39 +02:00
Robert Ferrús	1ca7b75ce3	Merge branch 'dev' into 7496-ticketIsLabeled	2024-06-06 12:33:35 +00:00
Robert Ferrús	d8e6a94797	Merge branch 'dev' into 7544-claimChangeState	2024-06-06 12:31:08 +00:00
Sergio De la torre	268c0a984c	feat isScanned refs #7276	2024-06-06 12:28:34 +02:00
Ivan Mas	a8f5993c21	Merge branch 'dev' into 7536-TPV_Wrong_abajo_field	2024-06-06 10:12:45 +00:00
Robert Ferrús	ef50d493f1	feat: refs #7544	2024-06-06 11:54:39 +02:00
Javi Gallego	e77bc87a2a	Merge pull request 'feat: refs #7203 remove numbres alertLevel' (!2546) from 7203-alertLevel into dev ... Reviewed-on: #2546 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-06 09:48:29 +00:00
Robert Ferrús	1c6e881273	feat: refs #7544 crear evento claim_changeState	2024-06-06 11:45:09 +02:00
Robert Ferrús	7f23c81756	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5855-temporaryTable	2024-06-06 07:28:40 +02:00
Carlos Andrés	b78ef97813	Hotfix modificar entradas contabilizadas Ticket 191417	2024-06-05 15:50:16 +02:00
Carlos Andrés	638a5e9a1e	Hotfix modificar entradas contabilizadas Ticket 191417	2024-06-05 15:44:11 +02:00
Ivan Mas	8458651ce0	Merge branch 'dev' into 7536-TPV_Wrong_abajo_field	2024-06-05 12:57:47 +00:00
Ivan Mas	71ea1d1467	refs #7536 modify itemShelvingRadar	2024-06-05 14:53:59 +02:00
Guillermo Bonet	feda14a21b	Merge branch 'test' into dev	2024-06-05 14:23:09 +02:00
Guillermo Bonet	c2fecde1b8	Merge branch 'master' into test	2024-06-05 14:22:59 +02:00
Robert Ferrús	40d40bd0bb	fix: refs #7335 hotFix cmrTicket	2024-06-05 13:42:21 +02:00
Javi Gallego	1fa22e71a9	feat: refs #7203 nombre variables	2024-06-05 12:42:55 +02:00
Guillermo Bonet	e4e7ae1699	Merge branch 'test' into dev	2024-06-05 11:16:15 +02:00
Guillermo Bonet	ceda2718d5	Merge branch 'master' into test	2024-06-05 11:15:56 +02:00
Guillermo Bonet	82954ed299	hotfix: ticket #176792	2024-06-05 11:13:40 +02:00
Carlos Andrés	8b584a08dc	Hotfix: midnight deterministic refs #7213	2024-06-05 10:11:04 +02:00
Carlos Andrés	f2b443021f	hotfix: midnight deterministis refs #7213	2024-06-05 10:03:37 +02:00
Robert Ferrús	e52da5117a	Merge branch 'dev' into 7496-ticketIsLabeled	2024-06-05 07:57:34 +00:00
Robert Ferrús	a0e79a778d	feat: refs #7496 deprecated ticket.isLabeled	2024-06-05 09:57:15 +02:00
Robert Ferrús	fd011428d5	Merge branch 'dev' into 7039-deleteVirtualColumnCountry	2024-06-05 06:48:20 +00:00
Guillermo Bonet	3dab181bff	Merge pull request 'refactor: refs #6701 New table clientRate' (!2536) from 6701-clientRate into dev ... Reviewed-on: #2536 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-06-05 06:17:10 +00:00
Javi Gallego	130d2b6b47	feat: refs #7203 remove numbres alertLevel	2024-06-05 08:05:46 +02:00
Juan Ferrer	feaf5f8f5a	Merge pull request 'test' (!2545) from test into dev ... Reviewed-on: #2545	2024-06-04 21:05:47 +00:00
Juan Ferrer	f903d7cd2a	Merge pull request 'master' (!2538) from master into test ... Reviewed-on: #2538	2024-06-04 21:05:27 +00:00
Carlos Andrés	35b4255505	Hotfix: ledger_next transacciones refs #7523	2024-06-04 16:45:42 +02:00
Carlos Andrés	e4969f7061	Hotfix: ledger_next transacciones refs #7523	2024-06-04 16:43:09 +02:00
Sergio De la torre	f70605e565	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps	2024-06-04 16:03:37 +02:00
Carlos Andrés	a9eb5f7d1e	hotfix: ledger_next transacciones refs #7523	2024-06-04 15:45:54 +02:00
Carlos Andrés	c57f4db623	hotfix: ledger_next transacciones refs #7523	2024-06-04 15:41:53 +02:00
Carlos Andrés	1927fbce45	hotfix: ledger_next transacciones refs #7523	2024-06-04 15:39:02 +02:00
Javi Gallego	8f7b034aa7	Merge branch 'dev' into 4560-GastosReparto	2024-06-04 14:24:55 +02:00
Javi Gallego	4089c7deb3	feat: refs #4560 minorChanges	2024-06-04 12:23:28 +02:00
Javi Gallego	da1b4649bb	feat: refs #4560 sin expeditionTruck	2024-06-04 11:58:39 +02:00
Javi Gallego	4230d46fe5	Merge branch 'dev' into 4560-GastosReparto	2024-06-04 09:47:58 +02:00
Robert Ferrús	3720f7acfe	Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop	2024-06-04 06:57:29 +00:00
Sergio De la torre	94aef434a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps	2024-06-04 07:17:37 +02:00
Carlos Andrés	9a7074d600	hotfix: ledger_next transacciones refs #7523	2024-06-03 20:16:27 +02:00
Juan Ferrer	1ec55c8850	Merge branch 'test' into dev	2024-06-03 17:38:39 +02:00
Jorge Penadés	58053d8286	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection	2024-06-03 15:22:08 +02:00
Guillermo Bonet	4abede62ab	Merge branch '6701-clientRate' of https://gitea.verdnatura.es/verdnatura/salix into 6701-clientRate	2024-06-03 12:16:34 +02:00
Guillermo Bonet	d3584691fa	refactor: refs #6701 Minor change	2024-06-03 12:16:33 +02:00
Guillermo Bonet	5ab8e79dde	Merge branch 'dev' into 6701-clientRate	2024-06-03 10:11:56 +00:00
Guillermo Bonet	85d68890b8	refactor: refs #6701 New table clientRate	2024-06-03 12:11:26 +02:00
Guillermo Bonet	b8e95c0284	refactor: refs #7519 Minor change	2024-06-03 11:46:52 +02:00
Guillermo Bonet	8cef8eace7	refactor: refs #7519 Minor change	2024-06-03 11:41:09 +02:00
Guillermo Bonet	fd237b6d35	Merge branch 'dev' into 6701-claimRatioRoutine	2024-06-03 11:40:50 +02:00
Guillermo Bonet	4703ebbdf3	refactor: refs #7519 Minor change	2024-06-03 11:38:09 +02:00
Carlos Satorres	7a92963886	fix acls	2024-06-03 10:21:25 +02:00
Jorge Penadés	ea7c2346d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-06-03 10:13:59 +02:00
Jorge Penadés	72630d613b	fix: refs #6600 rollback	2024-06-03 09:32:03 +02:00
Jorge Penadés	790a637d4d	feat: refs #6600 Add photoMotivation column to item table and create itemPhotoComment table	2024-06-03 09:25:48 +02:00
Jorge Penadés	084f31e441	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6600-createItemPhotoComment	2024-06-03 08:34:10 +02:00
Robert Ferrús	ecd34e080d	feat: refs #7039 deleteVirtualColumnCountry	2024-06-03 07:59:57 +02:00
Sergio De la torre	b9a9f52514	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmaps	2024-06-03 07:56:43 +02:00
Jorge Penadés	dc8696b422	feat: refs #6889 add back tests	2024-05-31 16:31:36 +02:00
Sergio De la torre	2985e1c9e8	feat: roadMap refs #7195	2024-05-31 13:08:48 +02:00
Jorge Penadés	ee09617b27	fix: refs #6889 e2e tests	2024-05-31 13:05:12 +02:00
Jorge Penadés	9578c506b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-31 12:58:05 +02:00
Jorge Penadés	ab9c11ef84	fix: refs #6889 modify fixtures	2024-05-31 12:56:22 +02:00
Jorge Penadés	4772509b67	fix: refs #6889 e2e tests	2024-05-31 12:51:06 +02:00
Guillermo Bonet	7dc17cd4f6	Merge branch 'test' into dev	2024-05-31 12:29:32 +02:00
Guillermo Bonet	d27bbd9a8f	hotfix: ticket 189567	2024-05-31 12:28:47 +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	81e1179ce0	Merge branch 'master' of https: refs #6404//gitea.verdnatura.es/verdnatura/salix into 6404-fixrefernce	2024-05-30 19:13:27 +02: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	4fa2a4d58c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-30 08:45:01 +02:00
Guillermo Bonet	d461b78c7b	Merge branch 'test' into dev	2024-05-30 07:19:03 +02:00
Guillermo Bonet	255a2c5283	fix: refs #7258 Proc bs.claim_ratio_routine	2024-05-30 07:18:30 +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
Jorge Penadés	a32db7840e	feat: refs #6889 fixtures & models	2024-05-29 16:54:24 +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
Guillermo Bonet	f770bce54c	fix: refs #7486 Deleted get_lock collection_assign	2024-05-29 07:55:33 +02:00
Jorge Penadés	885aa5208a	feat : refs #6889 wip: check if is productionReviewer or owner	2024-05-28 17:23:58 +02:00
Carlos Andrés	a022ed0854	Hotfix payments ticket 188787	2024-05-28 14:50:58 +02:00
Carlos Andrés	dc3c92eef1	Merge pull request 'Hotfix contabilizar DUA Ticket #188682' (!2519) from Hotfix-contabilizar-DUA-Ticket-#188682 into master ... Reviewed-on: #2519 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-28 11:34:04 +00:00
Jorge Penadés	44e71b303c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-28 13:14:31 +02:00
Carlos Andrés	cf84aa7256	Hotfix contabilizar DUA Ticket #188682	2024-05-28 13:01:27 +02:00
Carlos Andrés	6e5b41a886	Hotfix contabilizar DUA Ticket #188682	2024-05-28 12:30:17 +02:00
Pablo Natek	49a243a6fd	Merge branch 'master' into 6404-add-default-weight-and-height	2024-05-28 10:24:05 +00:00
Alex Moreno	08856a9132	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-28 12:11:51 +02:00
Alex Moreno	8ec2a10cbf	deploy: dump	2024-05-28 12:05:09 +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	f4426f5863	Merge branch 'test' into 7296-restoreExpeditionTruck	2024-05-27 12:05:49 +00:00
Robert Ferrús	df5f4a5a42	feat: refs #7296 fixAPPWarehouse	2024-05-27 14:05:31 +02:00
Guillermo Bonet	55fd94a12a	Merge branch 'test' into dev	2024-05-27 13:51:16 +02:00
Guillermo Bonet	086c2291d1	Merge branch 'master' into test	2024-05-27 13:50:59 +02:00
Guillermo Bonet	2498849ed0	hotfix: refs #7486 Added tmp debug insert	2024-05-27 13:43:55 +02:00
Jorge Penadés	1b4b8668be	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-27 13:34:53 +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
Ivan Mas	6222d2657b	Merge branch 'dev' into 7217-Unify_errorMessageAWB	2024-05-27 10:33:02 +00:00
Sergio De la torre	32aafc3545	feat: refs #6861 trigger	2024-05-27 12:21:22 +02:00
Robert Ferrús	7559875aff	feat: refs #7296 roadmapStopFk	2024-05-27 12:08:14 +02:00
Jorge Penadés	0fa6074278	fix: refs #6942 drop quotes	2024-05-27 12:03:07 +02:00
Sergio De la torre	e133dec514	refs #6861 feat: trigger	2024-05-27 11:55:42 +02:00
Robert Ferrús	0b648d09af	feat: refs #7296 roadmapStopFk	2024-05-27 11:45:22 +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
Robert Ferrús	cf5d520692	Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop	2024-05-27 07:09:34 +00:00
Robert Ferrús	eb503238d7	feat refs #7296 routesMonitor.expeditionTruckFk to routesMonitor.roadmapStopFk	2024-05-27 09:07:23 +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
Sergio De la torre	d770cd8d48	refs #6861 feat: getLock	2024-05-27 07:33:33 +02:00
Robert Ferrús	846ba9ef66	Merge branch 'dev' into 6281_buyFk	2024-05-27 05:30:33 +00:00
Pako Natek	4550d3719c	Merge branch 'dev' into 6021-floranet_beta	2024-05-27 05:17:27 +00:00
Robert Ferrús	b02995918e	Merge branch 'dev' into 6281_buyFk	2024-05-27 05:04:40 +00:00
Carlos Satorres	723327918b	refs #7406 worker formation	2024-05-24 15:55:23 +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
Guillermo Bonet	2c87730dba	Merge pull request 'feat: refs #7438 Added volume to item_valuateInventory' (!2505) from 7438-item_ValuateInventory into dev ... Reviewed-on: #2505 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-24 09:30:54 +00:00
Ivan Mas	4d79dabb69	Merge branch 'dev' into 7217-Unify_errorMessageAWB	2024-05-24 08:23:05 +00:00
Ivan Mas	7e22e19e62	refs #7217 Reduce error message	2024-05-24 10:21:35 +02:00
Jorge Penadés	c76fd15f07	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-24 08:46:16 +02:00
Pako Natek	257de96743	Merge remote-tracking branch 'origin/dev' into 6021-floranet_beta	2024-05-24 07:44:12 +02:00
Pako Natek	0a1e09be41	Merge branch 'dev' into 6021-add-observations-to-json	2024-05-24 05:31:10 +00:00
Guillermo Bonet	2fe279ed47	feat: refs #7438 Requested changes and little changes	2024-05-24 07:20:27 +02:00
Pablo Natek	ee17ea4842	feat: refs #6021 add new field	2024-05-23 21:38:02 +02:00
Jorge Penadés	cddc034adf	fix: refs #6942 revoke update isBooked	2024-05-23 17:53:08 +02:00
Sergio De la torre	ea4f70f460	refs #6861 feat: previas a reservas	2024-05-23 16:35:36 +02:00
Jorge Penadés	798b4f9df0	fix: refs #6942 toBook/toUnbook	2024-05-23 16:12:21 +02:00
Jorge Penadés	3e2abfea2c	fix: refs #6942 merge	2024-05-23 16:08:48 +02:00
Jorge Penadés	2cd3002d06	Merge pull request 'test' (!2506) from test into dev ... Reviewed-on: #2506 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-05-23 14:07:21 +00:00
Carlos Andrés	14f243f251	Merge pull request 'fix: refs #7400 ledger_next' (!2495) from 7400-warmfix-ledger into test ... Reviewed-on: #2495 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-05-23 14:03:22 +00:00
Carlos Satorres	33ba999725	Merge pull request 'refs #6111 routeList sql' (!2257) from 6111-routeList into dev ... Reviewed-on: #2257 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-23 12:47:56 +00:00
Guillermo Bonet	35ce259e5a	feat: refs #7438 Added volume to item_valuateInventory	2024-05-23 14:26:11 +02:00
Jorge Penadés	4219b22553	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-23 14:13:17 +02:00
Carlos Andrés	35a583d6d8	Merge pull request 'test' (!2504) from test into dev ... Reviewed-on: #2504 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-05-23 11:42:23 +00:00
Guillermo Bonet	bbd948c654	refs #7440 Minor change	2024-05-23 09:47:14 +02:00
Guillermo Bonet	56aec1c781	refs #7440 Optimized item_comparative	2024-05-23 09:44:18 +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
Jorge Penadés	a55a6baf6e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-23 08:58:36 +02:00
Robert Ferrús	974e327077	Merge branch 'dev' into 6281_buyFk	2024-05-23 06:29:16 +00: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 Andrés	22a6c3695c	feat:concurrency issue refs #6861	2024-05-22 18:05:16 +02:00
Carlos Andrés	774e92e639	hotfix: Eliminar restricciones ticketRefund Ticket #187137	2024-05-22 16:43:45 +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
Carlos Andrés	bc6af32962	fix: problems in colums ticket and sale refs #7213	2024-05-22 14:50:45 +02:00
Sergio De la torre	49fed4e51e	refs #6964 feat: hasItemOlder	2024-05-22 12:23:33 +02:00
Jorge Penadés	60fa55566c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-22 09:13:58 +02:00
Guillermo Bonet	a52b9b6d2e	Merge pull request 'refactor: refs #7398 Refactor and change ekt_scan' (!2494) from 7398-ektScan into dev ... Reviewed-on: #2494 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-05-22 06:31:06 +00:00
Guillermo Bonet	0d620c6f33	feat: refs #7398 Change	2024-05-22 08:11:27 +02:00
Jorge Penadés	365e5a3ba3	fix: refs # 7400 ledger_next	2024-05-21 17:31:29 +02:00
Guillermo Bonet	2ffdce3c64	refactor: refs #7398 Refactor and change ekt_scan	2024-05-21 14:40:42 +02:00
Robert Ferrús	b12fdef703	Merge branch 'dev' into 6281_buyFk	2024-05-21 11:38:59 +00:00
Pako Natek	ba478d5358	Merge branch 'dev' into 7420-supplierPackaging_ReportSource	2024-05-21 11:31:41 +00:00
Pako Natek	dfde2f6846	evita facturacion proveedores	2024-05-21 13:28:05 +02:00
Guillermo Bonet	35e892a90c	refs #7422 Fix	2024-05-21 10:07:51 +02:00
Robert Ferrús	0ef93bd98a	Merge branch 'dev' into 6281_buyFk	2024-05-21 08:00:50 +00:00
Robert Ferrús	7065cf0b38	feat: refs #6281 change fixtures	2024-05-21 09:58:03 +02:00
Alex Moreno	f803f5a57d	Merge branch 'dev' into 7431_itemPlacements	2024-05-21 07:49:00 +00:00
Guillermo Bonet	6f9826421d	refactor: refs #7422 Fix e2e	2024-05-21 09:39:09 +02:00
Sergio De la torre	6dad3d8af4	refs #7431 feat: itemPlacementSupplyStockGetTargetList	2024-05-21 09:37:29 +02:00
Sergio De la torre	cb866b4ab7	refs #7431 feat: itemPlacementSupplyStockGetTargetList	2024-05-21 09:16:47 +02:00
Jorge Penadés	c914199415	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-21 09:03:48 +02:00
Guillermo Bonet	c4b8cef4f8	refactor: refs #7422 Deleted column of Compres	2024-05-21 08:17:37 +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	81c220d130	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-21 07:58:53 +02:00
Guillermo Bonet	cbf9a4c4e9	refs #7422 Fixed all problems	2024-05-21 07:58:51 +02:00
Pako Natek	f947b44da1	Merge branch 'dev' into 7420-supplierPackaging_ReportSource	2024-05-21 05:51:15 +00: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
Jorge Penadés	50dbc5c515	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6942-improveInvoiceIn	2024-05-20 15:36:09 +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
Robert Ferrús	623aa8d537	Merge branch 'dev' into 6281_buyFk	2024-05-20 09:38:11 +00:00
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	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
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
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