21062 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	caaa4fdd30	Merge remote-tracking branch 'origin/dev' into 6321_negative_tickets	2024-04-23 11:45:59 +02:00
Javier Segarra	27354e452f	Merge pull request '#7190 - RenewTokenMultimedia' (!2335) from 7190_renewTokenMultimedia into dev ... Reviewed-on: #2335 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-23 08:28:08 +00:00
Javier Segarra	83d89d13ad	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-23 08:26:23 +00:00
Alex Moreno	7fd7acbb56	deploy: refs #7253 init version 2420	2024-04-23 10:06:22 +02:00
Alex Moreno	fbf1b6e1af	Merge pull request '7253-devToTest_2418' (!2350) from 7253-devToTest_2418 into test ... Reviewed-on: #2350 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-23 08:02:45 +00:00
Pablo Natek	06e743f5da	fix: refs #7253 check booked add new restriction to be tested	2024-04-23 10:00:11 +02:00
Alex Moreno	60d5b9e4aa	test: refs #7173 fix sql, adding alias	2024-04-23 08:47:52 +02:00
Alex Moreno	85491613b0	test: refs #7173 fix fixtures	2024-04-23 08:47:28 +02:00
Alex Moreno	e52322f649	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-04-23 07:42:56 +02:00
Alex Moreno	902be9e788	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-04-23 07:41:04 +02:00
Juan Ferrer	91608b9053	Merge pull request 'refs #4409 Remove old recalc code' (!2300) from 4409-binlog into dev ... Reviewed-on: #2300 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-22 19:45:18 +00:00
Juan Ferrer	d58607f26e	Merge branch 'dev' into 4409-binlog	2024-04-22 19:43:48 +00:00
Carlos Andrés	c6a1ae338c	Merge pull request 'Hot fix informe facturas recibidas Ticket #176640' (!2347) from Hotfix-informe-facturas-emitidas-Ticket-#176640 into master ... Reviewed-on: #2347 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-04-22 15:56:50 +00:00
Carlos Andrés	d249645c37	Hot fix informe facturas recibidas Ticket #176640	2024-04-22 17:51:21 +02:00
Javier Segarra	68158f341d	feat(salix): refs #6321 #6331 publish negativeOrigin model	2024-04-22 14:09:27 +02:00
Javier Segarra	5a5032f6e6	Merge remote-tracking branch 'origin/dev' into 6321_negative_tickets	2024-04-22 13:34:06 +02:00
Ivan Mas	6a3224dfcd	Merge pull request 'refs #7021 Delete rfid schema' (!2340) from 7021-Delete_rfid_schema into dev ... Reviewed-on: #2340 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-22 11:19:39 +00:00
Ivan Mas	f380e0d1ce	Merge branch 'dev' into 7021-Delete_rfid_schema	2024-04-22 11:17:54 +00:00
Guillermo Bonet	eb9f81c81d	feat #7181 Rollback creditInsurance_getRisk	2024-04-22 13:05:16 +02:00
Ivan Mas	1ef98ecd8c	Merge branch 'dev' into 7021-Delete_rfid_schema	2024-04-22 10:37:15 +00:00
Sergio De la torre	ccc9251d39	Merge pull request '6921_addFromDelivery' (!2304) from 6921_addFromDelivery into dev ... Reviewed-on: #2304 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-22 10:33:33 +00:00
Sergio De la torre	0f05fe5d93	Merge branch 'dev' into 6921_addFromDelivery	2024-04-22 10:32:03 +00:00
Robert Ferrús	88b71245a5	Merge pull request 'feat: refs #6777 change dependecies vn2008 to vn' (!2000) from 6777-changeDependenciesVn2008toVnPart7 into dev ... Reviewed-on: #2000 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-22 10:20:50 +00:00
Robert Ferrús	debd163b3f	Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7	2024-04-22 10:16:01 +00:00
Robert Ferrús	2e1cb6e827	Merge pull request 'feat: refs #7029 packaging' (!2164) from 7029-packagingVolumeRestriction into dev ... Reviewed-on: #2164 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-22 09:55:46 +00:00
Robert Ferrús	6bb36e0d82	Merge branch 'dev' into 7029-packagingVolumeRestriction	2024-04-22 09:53:51 +00:00
Robert Ferrús	b0289d2e18	Merge pull request 'test' (!2344) from test into dev ... Reviewed-on: #2344 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-22 09:34:45 +00:00
Robert Ferrús	c109f3616e	Merge pull request 'master' (!2343) from master into test ... Reviewed-on: #2343 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-22 09:24:59 +00:00
Robert Ferrús	c44998e77b	Merge pull request 'feat: refs #174903 item_getSimilar' (!2326) from 174903-item_getSimilar into master ... Reviewed-on: #2326 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-22 08:53:58 +00:00
Robert Ferrús	b88dff0d99	feat: refs #6777	2024-04-22 10:48:37 +02:00
Robert Ferrús	7be856118e	Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7	2024-04-22 08:46:43 +00:00
Sergio De la torre	23fa74a5ad	Merge branch 'dev' into 6921_addFromDelivery	2024-04-22 08:11:37 +00:00
Robert Ferrús	e8d7f20221	Merge branch 'master' into 174903-item_getSimilar	2024-04-22 07:43:39 +00:00
Robert Ferrús	a1a3470df4	feat: refs #174903	2024-04-22 09:43:13 +02:00
Javier Segarra	0a5100135f	Merge pull request '#6930 - Add DEFAULT scope when is Multimedia scope' (!2333) from 6930_scope_Default_Multimedia into dev ... Reviewed-on: #2333 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-22 07:26:36 +00:00
Robert Ferrús	6a0a944319	Merge branch 'dev' into 7029-packagingVolumeRestriction	2024-04-22 07:23:18 +00:00
Juan Ferrer	739ae82ace	fix(binlog): refs #4409 Fix cursor name	2024-04-22 09:02:43 +02:00
Javier Segarra	f6199f8f8e	Actualizar modules/worker/back/models/worker.json	2024-04-22 06:56:05 +00:00
Juan Ferrer	bc45cafb40	Merge branch 'dev' into 4409-binlog	2024-04-22 08:54:14 +02:00
Javier Segarra	283d27e1c5	Actualizar modules/worker/back/models/worker.json	2024-04-22 06:22:36 +00:00
Javier Segarra	5e8310f5e1	Merge branch 'dev' into 7190_renewTokenMultimedia	2024-04-22 06:20:53 +00:00
Robert Ferrús	e09b828d88	Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7	2024-04-22 05:49:53 +00:00
Javier Segarra	0005d3329d	Merge branch 'dev' into 6930_scope_Default_Multimedia	2024-04-22 05:40:21 +00:00
Sergio De la torre	e2a6f992cb	Merge pull request 'refs #6413 hotFix fix:ubicadorChecking' (!2337) from hotFix_Ubicador into master ... Reviewed-on: #2337 Reviewed-by: Pako Natek <pako@verdnatura.es>	2024-04-22 05:35:08 +00:00
Sergio De la torre	081c97828c	Merge branch 'master' into hotFix_Ubicador	2024-04-22 05:08:59 +00:00
Ivan Mas	0615510a9c	refs #7021 Modify myt.config.yml	2024-04-19 15:28:53 +02:00
Guillermo Bonet	e7f81e99bc	Merge branch 'test' into dev	2024-04-19 14:40:26 +02:00
Guillermo Bonet	6c552b9ee0	Merge pull request 'feat: #7231 Collection_assing more time and throw' (!2341) from 7231-collectionProcsThrow into master ... Reviewed-on: #2341 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-19 12:37:30 +00:00
Juan Ferrer	a0126748e2	fix(binlog): refs #4409 Fix fixtures cursor name	2024-04-19 14:19:34 +02:00
Guillermo Bonet	65892625d5	feat: #7231 Collection_assing more time and throw	2024-04-19 14:17:49 +02:00