21848 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
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
Robert Ferrús	958f91ca93	Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop	2024-05-17 08:39:43 +00:00
Guillermo Bonet	1154e484e5	Merge branch 'test' into dev	2024-05-17 09:57:35 +02:00
Guillermo Bonet	91784f2253	Merge branch 'master' into test	2024-05-17 09:57:19 +02:00
Guillermo Bonet	a99554c773	fix: Occasionally saleVolume bad index	2024-05-17 09:50:53 +02:00
Carlos Satorres	481ecfa079	Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop	2024-05-17 07:01:45 +00: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
Carlos Andrés	402506467b	Merge pull request 'master' (!2464) from master into test ... Reviewed-on: #2464 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-16 14:56:56 +00:00
Carlos Andrés	c5f2b3a384	Merge pull request 'fix: invoiceInTax_getFromEntries (referenceRate)' (!2462) from Hotfix-referenceRate-en-invoiceInTax_getFromEntries into master ... Reviewed-on: #2462 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-05-16 12:53:27 +00:00
Carlos Andrés	2f4f199fad	fix: invoiceInTax_getFromEntries (referenceRate)	2024-05-16 14:40:02 +02:00
Pablo Natek	1372f817bd	fix: refs #7187 model	2024-05-16 14:05:22 +02:00
Pablo Natek	b299e842b9	fix: refs #7187 model foreignKey	2024-05-16 14:04:21 +02:00
Pablo Natek	4cf5457690	fix: refs #7187 remove focus on spec	2024-05-16 14:01:41 +02:00
Pablo Natek	1abacdc42b	fix: refs #7187 method	2024-05-16 14:00:42 +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	9b5b269fe6	Merge pull request 'refs #6965 Add Fk vehicleFk firstEditorFk' (!2433) from 6965-AddFkRoute-vehicleFk-firstEditorFk into dev ... Reviewed-on: #2433 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-05-16 11:41:31 +00: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
Robert Ferrús	11a0b98495	feat: refs #7296 roadmapStop	2024-05-16 10:20:08 +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