20727 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	ec095161c8	Merge pull request 'hotFix(closeAll): continue loop' (!2290) from hotFix_closeAll_continueLoop into master ... Reviewed-on: #2290 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-11 11:57:09 +00:00
Alex Moreno	99d80d4d30	hotFix(closeAll): continue loop	2024-04-11 13:51:33 +02:00
Guillermo Bonet	c190d2bef1	Merge branch 'master' into ticket168996-hotfix	2024-04-11 07:31:31 +00:00
Alex Moreno	01425bd95e	Merge pull request '7199-devToTest_2316' (!2287) from 7199-devToTest_2316 into test ... Reviewed-on: #2287 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-11 06:25:22 +00:00
Alex Moreno	c27585d6f3	deploy: refs #7199	2024-04-11 08:20:11 +02:00
Pablo Natek	c008614139	Merge pull request 'fix: refs #7024 fix error on setting local variable' (!2286) from 7024-fixInventorryError into master ... Reviewed-on: #2286 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-11 05:55:34 +00:00
Alex Moreno	3635a4b6d0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-04-11 07:46:16 +02:00
Pablo Natek	b2c3442c12	Merge branch 'master' into 7024-fixInventorryError	2024-04-11 05:33:44 +00:00
Pablo Natek	68ca5d369c	fix: refs #7024 fix error on setting local variable	2024-04-11 07:33:31 +02:00
Pablo Natek	4c2721b0c5	Merge pull request 'master' (!2285) from master into test ... Reviewed-on: #2285 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-11 05:16:37 +00:00
Juan Ferrer	ce55058314	feat(pbx): refs #7198 country prefix, schedule	2024-04-10 18:14:10 +02:00
Ivan Mas	7ceba23957	Merge pull request 'refs #6827 Check usernames special characters' (!2109) from 6827-check-usernames-special-characters into dev ... Reviewed-on: #2109 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es> Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-04-10 15:23:40 +00:00
Ivan Mas	83befbd120	Merge branch 'dev' into 6827-check-usernames-special-characters	2024-04-10 15:21:42 +00:00
Pablo Natek	e3feefefd7	Merge pull request 'fix: refs #7024 create exception for inventory' (!2282) from 7024-create-exception-for-inventory into master ... Reviewed-on: #2282 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-10 12:56:09 +00:00
Pablo Natek	2c5c2ca5a7	fix: refs #7024 fix condition sintax	2024-04-10 14:17:08 +02:00
Ivan Mas	b0b71935da	Merge pull request 'refs #6732 change Proveedores isReal' (!2281) from 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal into dev ... Reviewed-on: #2281 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-10 12:06:41 +00:00
Ivan Mas	08948ad360	Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal	2024-04-10 12:05:04 +00:00
Pablo Natek	2e15b35fd1	fix: refs #7024 create exception for inventory	2024-04-10 14:01:03 +02:00
Ivan Mas	0b7042d597	refs #6732 change Proveedores isReal	2024-04-10 13:55:25 +02:00
Ivan Mas	bd026af917	Merge pull request 'refs #6732 change name supplier.isSerious to supplier.isReal' (!2063) from 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal into dev ... Reviewed-on: #2063 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-10 11:21:19 +00:00
Ivan Mas	85301b84bc	Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal	2024-04-10 11:18:31 +00:00
Guillermo Bonet	1fe783cf0e	hotfix: ticket168996 Now ticket_doCmr ignore deliveryMethod	2024-04-10 12:00:52 +02:00
Jorge Penadés	0f5afc908c	Merge pull request '#6492 refactor vn2008 procedures' (!2159) from 6492-refactorProceduresVn2008 into dev ... Reviewed-on: #2159 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-10 09:42:06 +00:00
Jorge Penadés	099fb70582	Merge branch 'dev' into 6492-refactorProceduresVn2008	2024-04-10 09:29:15 +00:00
Alex Moreno	f76123f106	Merge pull request 'hotFix(workerTimeControl): getWeekNumber' (!2278) from hotFix_fix_getWeekNumber into master ... Reviewed-on: #2278 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-04-10 08:00:21 +00:00
Alex Moreno	51e7045e8b	hotFix(workerTimeControl): getWeekNumber	2024-04-10 09:44:09 +02:00
Robert Ferrús	acd422d48f	Merge pull request 'feat: refs #7150' (!2224) from 7150-greuge_dif_porte_add into dev ... Reviewed-on: #2224 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-10 07:01:13 +00:00
Robert Ferrús	2c91385e62	Merge branch '7150-greuge_dif_porte_add' of https://gitea.verdnatura.es/verdnatura/salix into 7150-greuge_dif_porte_add	2024-04-10 08:09:57 +02:00
Robert Ferrús	c30c0de92c	feat: refs #7150	2024-04-10 08:09:54 +02:00
Robert Ferrús	3420667ae5	Merge branch 'dev' into 7150-greuge_dif_porte_add	2024-04-10 06:05:03 +00:00
Javier Segarra	1bd1506c12	Merge pull request '#7188 - HOTFIX Rollback tokenMultimedia' (!2274) from 7188_HOTFIX_ROLLBACK_tokenMultimedia into master ... Reviewed-on: #2274 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-10 05:39:16 +00:00
Ivan Mas	eedf30a2dd	refs #6732 salix dependencies and undo changes Proveedores	2024-04-09 17:31:34 +02:00
Jorge Penadés	a3c1bceb7e	refactor: refs #6492 use enum	2024-04-09 15:57:34 +02:00
Jorge Penadés	dca75437f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-04-09 15:20:30 +02:00
Javier Segarra	d85562b090	refs #7188 fix: bug tokenMultimedia	2024-04-09 15:06:05 +02:00
Ivan Mas	f02c4354ba	Merge branch 'dev' into 6827-check-usernames-special-characters	2024-04-09 14:45:29 +02:00
Ivan Mas	521033edd2	Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal	2024-04-09 11:54:41 +00:00
Guillermo Bonet	0e2e68488d	Merge branch 'test' into dev	2024-04-09 13:08:54 +02:00
Guillermo Bonet	43111f8192	Merge branch 'master' into test	2024-04-09 13:08:31 +02:00
Guillermo Bonet	743dc2144e	hotfix: refs #6276 Fix send chat msg getSales	2024-04-09 13:05:01 +02:00
Jorge Penadés	9a28a59d00	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-04-09 11:11:30 +02:00
Alex Moreno	c69a4e1c98	Merge pull request 'refactor(workerDms): adapat to lilium' (!2269) from 6551-workerDms_refactor into dev ... Reviewed-on: #2269 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-04-09 08:21:20 +00:00
Guillermo Bonet	f8be6be7a3	feat: refs #6636 Minor change	2024-04-09 10:10:11 +02:00
Guillermo Bonet	9ab71318a9	Merge pull request 'feat: refs #6636 Modified updateClaim, model and tests' (!2256) from 6636-pickup into dev ... Reviewed-on: #2256 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-09 08:01:27 +00:00
Guillermo Bonet	c42e00f11e	Merge branch 'dev' into 6636-pickup	2024-04-09 07:43:51 +00:00
Guillermo Bonet	449a06c85c	feat: refs #6636 Added tests	2024-04-09 09:43:30 +02:00
Alex Moreno	500244dbed	fix id	2024-04-09 07:51:57 +02:00
Sergio De la torre	47c33c1648	Merge pull request 'refs #6276 hotFix:itemShelving_add' (!2270) from 6276_hotfix_itemShelving_add into master ... Reviewed-on: #2270 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-09 05:50:06 +00:00
Robert Ferrús	4a31fe29b8	Merge branch 'dev' into 7150-greuge_dif_porte_add	2024-04-09 05:40:01 +00:00
Sergio De la torre	75293fbb9a	refs #6276 hotFix:itemShelving_add	2024-04-09 07:38:28 +02:00