22579 Commits

All Branches

Search

Author	SHA1	Message	Date
Robert Ferrús	e8a35764fd	Merge pull request 'feat: refs #5855 drop temporary table' (!2040) from 5855-temporaryTable into dev ... Reviewed-on: #2040 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-02 11:12:29 +00:00
Robert Ferrús	872ab1a758	Merge branch 'dev' into 5855-temporaryTable	2024-07-02 11:08:08 +00:00
Alex Moreno	9708e79e55	build: increase version 2430	2024-07-02 12:41:51 +02:00
Ivan Mas	4ad6c440e0	Merge pull request 'refs #7651 Add editorFk and triggers' (!2661) from 7651-Add_editorFk_mailAliasAccount into dev ... Reviewed-on: #2661 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-02 10:39:54 +00:00
Ivan Mas	99beb21927	Merge branch 'dev' into 7651-Add_editorFk_mailAliasAccount	2024-07-02 10:36:40 +00:00
Guillermo Bonet	edff15662c	Merge branch 'master' into test	2024-07-02 12:34:51 +02:00
Guillermo Bonet	028278ebcf	refs #6626 Hotfix	2024-07-02 11:52:25 +02:00
Alex Moreno	0df6eb5065	Merge pull request '7658-devToTest_2428' (!2663) from 7658-devToTest_2428 into test ... Reviewed-on: #2663 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-02 07:20:12 +00:00
Guillermo Bonet	b6b3da0771	Merge branch 'test' into dev	2024-07-02 08:06:54 +02:00
Guillermo Bonet	958322066b	Merge branch 'master' into test	2024-07-02 08:06:29 +02:00
Guillermo Bonet	a7c7c4c2f6	Merge pull request 'fix: refs #7552 Hotfix' (!2655) from 7552-itemGetSimilarFix into master ... Reviewed-on: #2655 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-02 05:35:52 +00:00
Sergio De la torre	68b7f5baf6	Merge pull request 'feat refactor setParking REGEXP refs #7575' (!2654) from 7575_setParking_regExp into dev ... Reviewed-on: #2654 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-07-01 15:47:28 +00:00
Sergio De la torre	4650f1f388	Merge branch 'dev' into 7575_setParking_regExp	2024-07-01 15:27:40 +00:00
Sergio De la torre	97655bf1e3	Merge pull request 'feat front-reservas refs #6861' (!2642) from 6861-Reservas-front into dev ... Reviewed-on: #2642 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-01 15:22:06 +00:00
Sergio De la torre	5992d7f53f	Merge branch 'dev' into 6861-Reservas-front	2024-07-01 14:39:19 +00:00
Sergio De la torre	1ca22dab92	Merge branch 'dev' into 7575_setParking_regExp	2024-07-01 14:36:18 +00:00
Ivan Mas	da9ff6f22c	Merge branch 'dev' into 7651-Add_editorFk_mailAliasAccount	2024-07-01 12:55:06 +00:00
Ivan Mas	29aecd62a5	refs #7651 add afterDelete trigger	2024-07-01 14:51:32 +02:00
Guillermo Bonet	cafa7bce44	Merge branch 'test' into dev	2024-07-01 13:40:31 +02:00
Guillermo Bonet	78a28d0191	Merge branch 'master' into test	2024-07-01 13:40:22 +02:00
Guillermo Bonet	a0ea742f9e	fix: refs #7486 Hotfix	2024-07-01 13:38:25 +02:00
Ivan Mas	2ed31ee1d3	refs #7651 Add editorFk and triggers	2024-07-01 13:26:59 +02:00
Guillermo Bonet	8409ffa950	fix: refs #7552 Hotfix	2024-07-01 10:26:46 +02:00
Guillermo Bonet	2bf06d8add	fix: refs #7552 Hotfix	2024-07-01 10:06:34 +02:00
Guillermo Bonet	ac54994760	Merge pull request 'feat: refs #7644 First commit' (!2651) from 7644-entryLabel into dev ... Reviewed-on: #2651 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-07-01 07:56:14 +00:00
Sergio De la torre	3ad2346504	feat refactor setParking REGEXP refs #7575	2024-07-01 09:25:00 +02:00
Guillermo Bonet	5c8d8ba280	refs #7644 Added locales and changed name of method	2024-07-01 09:07:36 +02:00
Guillermo Bonet	7bf55c6815	refs #7644 Added control source	2024-07-01 08:00:27 +02:00
Guillermo Bonet	57a879723e	Merge branch 'test' into dev	2024-07-01 07:39:19 +02:00
Guillermo Bonet	e33b8893f6	Merge branch 'master' into test	2024-07-01 07:38:55 +02:00
Guillermo Bonet	f73176375b	Merge pull request 'hotfix: refs #7640 multiple inventory' (!2645) from 7640-multipleInventory into master ... Reviewed-on: #2645 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-07-01 05:30:31 +00:00
Robert Ferrús	cc3dab1007	Merge pull request '7296-routesMonitorDropVirtualColumn' (!2648) from 7296-routesMonitorDropVirtualColumn into dev ... Reviewed-on: #2648 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-07-01 05:22:00 +00:00
Javi Gallego	355e426ccf	mail-alias-account con mixin	2024-07-01 07:19:00 +02:00
Guillermo Bonet	85c7336d92	refs #7644 Minor changes	2024-06-28 14:52:19 +02:00
Robert Ferrús	d4fba0a95f	Merge branch 'dev' into 7296-routesMonitorDropVirtualColumn	2024-06-28 11:49:08 +00:00
Guillermo Bonet	df4e5deae6	Merge branch 'test' into dev	2024-06-28 13:33:43 +02:00
Guillermo Bonet	08c9d43b17	refs #7486 Declare exit handler fix collection_assign error	2024-06-28 13:30:08 +02:00
Jon Elias	264d5b4b9a	Merge pull request '#5447 warehouse out filter' (!2500) from 5447-TravelExtraCommunity into dev ... Reviewed-on: #2500 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-28 11:21:10 +00:00
Jon Elias	0917fc318a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5447-TravelExtraCommunity	2024-06-28 13:19:38 +02:00
Guillermo Bonet	19bf606330	refs #7644 First commit	2024-06-28 12:57:27 +02:00
Pablo Natek	8e7cfb6391	Merge pull request 'fix: refs #6404 get label' (!2649) from 6404-fixtGetLabel into master ... Reviewed-on: #2649 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-28 07:19:51 +00:00
Pablo Natek	94a73294cb	fix: refs #6404 get label	2024-06-28 09:11:20 +02:00
Robert Ferrús	ca3750ebac	feat: refs #7296	2024-06-28 08:46:54 +02:00
Robert Ferrús	f1f57a388d	feat: refs #7296 drop column expeditionTruckFk	2024-06-28 08:45:18 +02:00
Sergio De la torre	8246eb51d4	Merge pull request 'feat expeditionPalletPrint refs #5210' (!2647) from 5210_expeditionPalletPrint into dev ... Reviewed-on: #2647 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-27 13:48:34 +00:00
Guillermo Bonet	9164901eac	refs #7640 Requested changes	2024-06-27 13:26:59 +02:00
Sergio De la torre	746fa82f2a	feat expeditionPalletPrint refs #5210	2024-06-27 13:20:52 +02:00
Jorge Penadés	7af2ae80b7	Merge pull request '#6286 set right workerTimeControl acls' (!2557) from 6286-setRightWorkerTimeControlAcls into dev ... Reviewed-on: #2557 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-27 08:50:09 +00:00
Jorge Penadés	2b0df02f20	Merge branch 'dev' into 6286-setRightWorkerTimeControlAcls	2024-06-27 08:34:53 +00:00
Jorge Penadés	4814151b15	Merge pull request '#6238 drop duplicate script' (!2644) from 6238-fix-duplicateRecords into dev ... Reviewed-on: #2644 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-27 08:19:46 +00:00