22084 Commits

All Branches

Search

Author	SHA1	Message	Date
Pablo Natek	143f9cf0bb	fix: refs #6404 fix return	2024-05-20 12:17:10 +02:00
Pablo Natek	d51c9fc120	fix: refs #6404 fix cancel shipment	2024-05-20 12:14:59 +02: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
Alex Moreno	9cba2be00d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-05-20 11:31:24 +02:00
Alex Moreno	f361a07dd5	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-05-20 11:31:03 +02:00
Alex Moreno	f82b105430	fix: TicketLog res.data	2024-05-20 11:30:43 +02:00
Carlos Satorres	2291c3ca86	Merge pull request 'master' (!2483) from master into test ... Reviewed-on: #2483 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-20 09:24:14 +00:00
Carlos Satorres	f9ecc687dd	Merge pull request 'hotfix TicketLog filter' (!2481) from hotfix-TicketLogs into master ... Reviewed-on: #2481 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-20 09:21:16 +00:00
Carlos Satorres	6d66c0f71f	hotfix TicketLog filter	2024-05-20 11:14:30 +02:00
Pako Natek	abdacb3627	casting values	2024-05-20 10:33:01 +02:00
Jorge Penadés	741c995c31	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6889-dropAddSaleByCode	2024-05-20 10:30:38 +02:00
Carlos Satorres	7f1210e712	refs #6820 fix back	2024-05-20 10:26:09 +02:00
Pako Natek	44ce998604	Merge pull request 'improved proc' (!2477) from 7420-supplierPackaging_ReportSource into dev ... Reviewed-on: #2477 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-20 08:22:39 +00:00
Pako Natek	f1ae4d9f29	Merge branch 'dev' into 7420-supplierPackaging_ReportSource	2024-05-20 08:21:25 +00: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
Robert Ferrús	e67981b382	Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop	2024-05-20 06:44:31 +00:00
Carlos Satorres	cbbd488674	Merge pull request 'refs #7396 fix worker model' (!2474) from 7396-addBasicDataWorker into dev ... Reviewed-on: #2474 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-20 06:27:33 +00:00
Pako Natek	9a5acedd38	improved proc	2024-05-20 08:21:54 +02:00
Guillermo Bonet	9d98ae4a03	Merge branch 'test' into dev	2024-05-20 07:02:00 +02:00
Guillermo Bonet	18ce388944	Merge branch 'test' into dev	2024-05-20 06:59:42 +02:00
Guillermo Bonet	329299d4d9	Merge branch 'master' into test	2024-05-20 06:58:22 +02:00
Guillermo Bonet	ac49daf0f3	Merge pull request 'hotfix: ticket 135539 Unroute tickets' (!2469) from 135539-hotfixCloseAll into master ... Reviewed-on: #2469 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-20 04:53:49 +00:00
Sergio De la torre	a24c289f63	Merge pull request 'feat: conversion art. A1 a A2 refs #4979' (!2171) from 4979-Conversión-automática-de-producto-A1-a-A2 into dev ... Reviewed-on: #2171 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-17 15:24:26 +00: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
Carlos Satorres	05f09d0b87	refs #7187 fix workerPda	2024-05-17 14:56:40 +02:00
Pablo Natek	7fb6ecd617	feat: refs #7187 redirect to lilium	2024-05-17 14:46:49 +02: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
Carlos Satorres	dd7ee27e9b	refs #7396 fix worker model	2024-05-17 14:28:28 +02:00
Jorge Penadés	1f1a49d0a5	refactor: refs #6889 use addSale	2024-05-17 14:20:33 +02:00
Javier Casado	d9d604b904	Merge branch 'dev' into 6939-change-README	2024-05-17 12:08:10 +00:00
Pablo Natek	2b0ab1816f	Merge pull request '#7187 add pda freelancers' (!2298) from 7187-addPdaFreelancers into dev ... Reviewed-on: #2298 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-17 11:35:18 +00:00
Pablo Natek	4790ae94d1	Merge branch 'dev' into 7187-addPdaFreelancers	2024-05-17 11:33:57 +00:00
Alex Moreno	96b013bbbf	Merge pull request 'fix: refs #7033 add es locale' (!2472) from 7033-hotfix-addLocale into master ... Reviewed-on: #2472 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-05-17 11:24:37 +00:00
Alex Moreno	44c4432c67	Merge pull request 'feat: refs #6428 auto-changelog with bash' (!2338) from 6428-auto-changeLog into dev ... Reviewed-on: #2338 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-17 11:13:54 +00:00
Jorge Penadés	2694f277d2	fix: refs #6744 add es locale	2024-05-17 13:03:24 +02: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
Guillermo Bonet	968effc936	hotfix: ticket 135539 Unroute tickets	2024-05-17 11:56:04 +02:00
Sergio De la torre	135526e513	refs #4979 feat:getInfoDetails && item_devalueA2	2024-05-17 11:20:26 +02:00
Pablo Natek	47c573a324	fix: refs #6095 filter by refFk null	2024-05-17 10:51:37 +02:00