25541 Commits

All Branches

Search

Author	SHA1	Message	Date
Juan Ferrer	9e01313fac	ci(Jenkinsfile): refs #8285 Move version step to begining	2024-12-10 11:18:21 +01:00
Juan Ferrer	15d3f7ee60	fix: refs #8285 Fix pipeline version	2024-12-10 11:13:38 +01:00
Juan Ferrer	dfbe1ef556	fix: refs #8285 Fix pipeline version	2024-12-10 11:05:57 +01:00
Sergio De la torre	699e56a64c	Merge pull request 'feat: refs #8188 refs#8188 orderPicking' (!3279) from 8188-orderPicking into test ... Reviewed-on: #3279 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-10 06:05:11 +00:00
Alex Moreno	eaa62909ff	chore: simplify	2024-12-09 14:30:45 +01:00
Alex Moreno	9403588d7b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-12-09 14:30:03 +01:00
Carlos Satorres	d1bf0195f0	Merge pull request 'fix: hotfix 7323 createAbsence' (!3265) from hotfix-7323workerHoliday into master ... Reviewed-on: #3265 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-12-09 12:28:52 +00:00
Carlos Satorres	cb516d2022	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-7323workerHoliday	2024-12-09 13:22:10 +01:00
Sergio De la torre	22e9a9104a	feat: refs #8188 refs#8188 orderPicking	2024-12-09 13:20:55 +01:00
Jorge Penadés	5cfcb85443	Merge pull request 'refactor: refs #7366 rename ref to reference' (!3283) from 7366-fixFilter into master ... Reviewed-on: #3283 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-09 11:51:00 +00:00
Jorge Penadés	f63d850ea3	refactor: refs #7366 rename ref to reference	2024-12-09 11:37:01 +01:00
Sergio De la torre	f8e5b76a6f	feat: refs #8188 refs#8188 orderPicking	2024-12-05 13:56:06 +01:00
Sergio De la torre	d17566107e	feat: refs #8188 refs#8188 orderPicking	2024-12-05 12:42:17 +01:00
Sergio De la torre	5db8ae53ac	feat: refs #8188 refs#8188 orderPicking	2024-12-05 12:39:20 +01:00
Guillermo Bonet	eb997429bb	Merge branch 'master' into test	2024-12-05 09:22:37 +01:00
Guillermo Bonet	004780c67b	Merge pull request 'feat: refs #8248 Added beta in jenkinsfile' (!3277) from 8248-addBetaJenskinsfile into beta ... Reviewed-on: #3277 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-12-05 07:55:39 +00:00
Guillermo Bonet	7b2439cb39	feat: refs #8248 Added beta in jenkinsfile	2024-12-05 08:47:28 +01:00
Guillermo Bonet	078b559bea	Merge branch 'master' into test	2024-12-05 06:56:48 +01:00
Guillermo Bonet	187cd226c4	feat: refs #7644 Added distinct total label count	2024-12-05 06:56:18 +01:00
Carlos Satorres	ed79aa488d	Merge pull request 'fix: fix invoiceOut filter' (!3272) from hotfix-6899invoiceOut into master ... Reviewed-on: #3272 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-04 08:19:58 +00:00
Carlos Satorres	7d1e3b6751	Merge branch 'master' into hotfix-6899invoiceOut	2024-12-04 08:18:27 +00:00
Carlos Andrés	d7af439787	Actualizar modules/travel/back/methods/travel/extraCommunityFilter.js	2024-12-03 17:49:48 +00:00
Jorge Penadés	ff2f4f94f4	Merge pull request 'feat: add country id filter to sales monitor' (!3273) from hotfix-setUserParams into master ... Reviewed-on: #3273 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-03 14:18:22 +00:00
Jorge Penadés	104bef43c1	feat: add country id filter to sales monitor	2024-12-03 14:03:08 +01:00
Alex Moreno	87136f1aba	Merge pull request '8267-devToTest' (!3270) from 8267-devToTest into test ... Reviewed-on: #3270 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-12-03 12:18:19 +00:00
Alex Moreno	fb13a9ff38	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 8267-devToTest	2024-12-03 13:11:09 +01:00
Guillermo Bonet	c52e03c677	Merge branch 'master' into test	2024-12-03 12:09:05 +01:00
Guillermo Bonet	01d8f15d2f	fix: refs #4948 expedition_selfConsumptionPackaging	2024-12-03 12:07:55 +01:00
Carlos Satorres	2267942368	fix: fix invoiceOut filter	2024-12-03 10:25:40 +01:00
Carlos Satorres	65a4578e15	Merge pull request 'fix: fix sql' (!3271) from hotfix-8222DeleteZoneSQL into master ... Reviewed-on: #3271 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-03 07:54:46 +00:00
Carlos Satorres	e95b2a4496	Merge branch 'master' into hotfix-8222DeleteZoneSQL	2024-12-03 07:50:08 +00:00
Carlos Satorres	0f0c8250a1	fix: fix sql	2024-12-03 08:44:00 +01:00
Alex Moreno	14892042bd	chore: refs #8267 pullinfo	2024-12-03 08:31:49 +01:00
Alex Moreno	6fcfb0208d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-12-03 08:29:21 +01:00
Alex Moreno	1ee6254976	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-12-03 08:24:49 +01:00
Carlos Satorres	9e691ee2be	Merge pull request 'fix: refs #8222 fix prDeleteZone' (!3269) from 8222-refactorDeleteZone2 into master ... Reviewed-on: #3269 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-03 07:24:07 +00:00
Carlos Satorres	32d3b2939a	Merge branch 'master' into 8222-refactorDeleteZone2	2024-12-03 07:19:05 +00:00
Jorge Penadés	14f9d3d22f	Merge pull request '#6818 hotfix-addInternationalChannel' (!3268) from 6818-hotfix-addInternationalChannel into master ... Reviewed-on: #3268 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-02 15:07:57 +00:00
Ivan Mas	c1c42de13a	Merge pull request 'refactor: refs #7146 route.created to route.dated' (!3260) from 7146-route.createdToDated into dev ... Reviewed-on: #3260 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-02 14:16:20 +00:00
Ivan Mas	1b2987494a	Merge branch 'dev' into 7146-route.createdToDated	2024-12-02 14:04:36 +00:00
Jorge Penadés	9573090318	chore: refs #6818 rollback	2024-12-02 14:49:35 +01:00
Jorge Penadés	13387beed9	feat: refs #6818 add PbxConfig model	2024-12-02 14:31:06 +01:00
Alex Moreno	bf9f7d45bf	Merge branch 'master' into 8222-refactorDeleteZone2	2024-12-02 12:53:00 +00:00
Carlos Satorres	fd05ce0915	fix: refs #8222 fix prDeleteZone	2024-12-02 13:45:04 +01:00
Jorge Penadés	33f8ee5e9d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6818-hotfix-addInternationalChannel	2024-12-02 13:34:38 +01:00
Jorge Penadés	66a87f1997	feat: refs #6818 add current country prefix	2024-12-02 13:33:39 +01:00
Guillermo Bonet	947812e9f1	Merge branch 'test' into dev	2024-12-02 13:07:08 +01:00
Guillermo Bonet	b67585137a	Merge branch 'master' into test	2024-12-02 13:06:47 +01:00
Guillermo Bonet	ef5522b2b3	Merge pull request 'fix: refs #7266 Created buy_getLastWihoutInventory proc' (!3267) from 7266-buyGetLastWihoutInventory into master ... Reviewed-on: #3267 Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>	2024-12-02 12:06:18 +00:00
Guillermo Bonet	508908bf85	fix: refs #7266 Minor changes	2024-12-02 13:01:12 +01:00