25562 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	11ae0e3759	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-12-10 11:28:41 +01:00
Juan Ferrer	a1e53ac55b	Merge pull request '#8257 test into master' (!3288) from test into master ... Reviewed-on: #3288	2024-12-10 10:24:08 +00:00
Juan Ferrer	06230d6b2a	Merge pull request 'refs #8257 test into dev' (!3287) from test into dev ... Reviewed-on: #3287	2024-12-10 10:22:54 +00:00
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
Alex Moreno	d3fe509827	Merge pull request '8282-testToMaster' (!3284) from 8282-testToMaster into master ... Reviewed-on: #3284 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-12-10 06:18:50 +00: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	94bc1241e5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-12-09 14:31:37 +01: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
Jon Elias	87577d0982	Merge pull request '#7283 Items module: added translations and show error in item-type' (!3278) from Fix-ItemsModuleBack into dev ... Reviewed-on: #3278 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-09 12:30:53 +00: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
Guillermo Bonet	185956b2c3	Merge pull request 'refactor: refs #7882 Deleted quadminds files' (!3280) from 7882-byeQuadminds into dev ... Reviewed-on: #3280 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-08 09:34:47 +00:00
Guillermo Bonet	04a96e87d6	refactor: refs #7882 Deleted quadminds files	2024-12-08 07:28:29 +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
Jon Elias	97f08542be	feat: added translations and show error in item-type	2024-12-05 10:28:57 +01:00
Guillermo Bonet	85fe8e5575	Merge branch 'test' into dev	2024-12-05 09:22:48 +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	127842a705	Merge branch 'test' into dev	2024-12-05 06:57:08 +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
Ivan Mas	86a36732f0	Merge pull request 'refactor: refs #8272 delete bi.rotacion' (!3275) from 8272-deleteBi.rotacion into dev ... Reviewed-on: #3275 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-12-04 13:35:59 +00:00
Ivan Mas	41a3f9ae94	refactor: refs #8272 delete bi.rotacion	2024-12-04 13:19:14 +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
Alex Moreno	fcaf854c87	Merge pull request '8004-liliumStyleRemake' (!3257) from 8004-liliumStyleRemake into dev ... Reviewed-on: #3257 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-12-04 07:18:48 +00:00
Alex Moreno	91db8817ef	Merge branch 'dev' into 8004-liliumStyleRemake	2024-12-04 07:09:30 +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
Alex Moreno	71da7772d9	build: new version	2024-12-03 14:33:42 +01:00
Alex Moreno	a8c7dea77f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-12-03 14:32:50 +01: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	6ae2853c4d	Merge branch 'test' into dev	2024-12-03 12:09:16 +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