21463 Commits

All Branches

Search

Author	SHA1	Message	Date
Carlos Satorres	e2696cd883	Merge branch 'dev' into 6976-supplierConsumption	2024-04-26 06:58:36 +00:00
Carlos Satorres	bc94850cc8	refs #6976 fix pr	2024-04-26 08:59:00 +02:00
Pablo Natek	51c42d09b2	fix: refs #4988 agency hook	2024-04-26 08:39:05 +02:00
Pablo Natek	4693ba13fa	Merge branch 'dev' of https: refs #4988//gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-26 08:37:51 +02:00
Carlos Satorres	e78b23a849	refs #6976 remove css	2024-04-26 08:31:33 +02:00
Robert Ferrús	2cdc64cbe7	Merge pull request 'feat: refs #6223 ticketCalculateClon' (!2360) from 6223-ticketCalculateClon into dev ... Reviewed-on: #2360 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-26 05:23:11 +00:00
Robert Ferrús	30a905f40b	Merge branch 'dev' into 6223-ticketCalculateClon	2024-04-26 05:08:26 +00:00
Javi Gallego	63320af4c7	Merge pull request '#7108 - exchange-rate' (!2295) from 7108-exchange-rate into dev ... Reviewed-on: #2295 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-26 05:00:05 +00:00
Javi Gallego	94e04c1c2f	Merge branch 'dev' into 7108-exchange-rate	2024-04-26 06:45:43 +02:00
Carlos Andrés	a4417dde6c	Merge branch 'test' into dev	2024-04-25 19:23:48 +02:00
Carlos Andrés	e07655bcf3	Merge pull request 'Hotfix test farmingDeliveryNote' (!2372) from HotFix-test-farmingDeliveryNote into test ... Reviewed-on: #2372 Reviewed-by: Ivan Mas <ivanm@verdnatura.es>	2024-04-25 17:10:03 +00:00
Carlos Andrés	f25d3c14c6	Hotfix test farmingDeliveryNote	2024-04-25 19:06:06 +02:00
Carlos Andrés	326c5c97bd	Hotfix test farmingDeliveryNote	2024-04-25 19:02:05 +02:00
Jorge Penadés	86d8bc877a	Merge pull request '#7019 fix(createManualInvoice): add throw error' (!2175) from 7019_fix_createManualInvoice into dev ... Reviewed-on: #2175 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-25 15:30:17 +00:00
Jorge Penadés	dd4762ad6e	Merge pull request '#7211 check if there's available clockIn' (!2368) from 7211-fixWorkerTimeControl into dev ... Reviewed-on: #2368 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-25 15:23:16 +00:00
Jorge Penadés	b09fa1e2fb	feat: refs #7019 changelog	2024-04-25 17:22:30 +02:00
Pablo Natek	d25c5eb327	fix: refs #4988 translates	2024-04-25 17:22:22 +02:00
Pablo Natek	af1abe934f	fix: refs #4988 translates	2024-04-25 17:21:59 +02:00
Jorge Penadés	b9de2b3ce6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7019_fix_createManualInvoice	2024-04-25 17:18:37 +02:00
Jorge Penadés	32da39899a	fix: refs #7211 test e2e	2024-04-25 17:16:43 +02:00
Pablo Natek	5c45dd6c17	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-25 16:18:18 +02:00
Jorge Penadés	180a484c55	fix: refs #7211 rollback	2024-04-25 16:14:34 +02:00
Jorge Penadés	f7cdbd39f0	fix: refs #7211 tests	2024-04-25 16:08:52 +02:00
Jorge Penadés	edeed037a2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7211-fixWorkerTimeControl	2024-04-25 15:38:40 +02:00
Jorge Penadés	4e864fed52	fix: refs #7211 tests	2024-04-25 15:38:21 +02:00
Javi Gallego	2e2bc3d594	Merge branch 'dev' into 6382-regularizar-Shelving-Parking	2024-04-25 12:31:06 +00:00
Javi Gallego	4f20224acc	Merge branch '6382-regularizar-Shelving-Parking' of https://gitea.verdnatura.es/verdnatura/salix into 6382-regularizar-Shelving-Parking	2024-04-25 14:28:53 +02:00
Javi Gallego	7d3870e4a1	feat: refs#6382 test fixed	2024-04-25 14:28:47 +02:00
Javier Casado	89ffdbfdf7	Merge pull request '#6697 - removeClaimQuantity' (!2363) from 6697-removeClaimQuantity into dev ... Reviewed-on: #2363 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-25 11:55:33 +00:00
Javier Casado	a9e4b2cd36	Merge branch 'dev' into 6697-removeClaimQuantity	2024-04-25 11:46:53 +00:00
Jorge Penadés	931c2c4f5e	feat: refs #7211 error & locale	2024-04-25 13:12:06 +02:00
Javi Gallego	a4f1183df6	feat: refs #7108 pascalCase	2024-04-25 13:11:57 +02:00
Pablo Natek	48d3ee373e	fix: refs #4988 yml	2024-04-25 12:47:52 +02:00
Pablo Natek	00359a0a6b	fix: refs #4988 traduction	2024-04-25 12:44:27 +02:00
Pablo Natek	c2888e4f97	fix: refs #4988 correct yml	2024-04-25 12:43:47 +02:00
Pablo Natek	4e11e46fff	feat: refs #4988 capture error on duplicate	2024-04-25 12:40:54 +02:00
Jorge Penadés	6749722634	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7019_fix_createManualInvoice	2024-04-25 10:10:06 +02:00
Pablo Natek	c5b02dc239	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency	2024-04-25 09:46:53 +02:00
Pablo Natek	42591af5c7	fix: refs #4988 create table	2024-04-25 09:46:15 +02:00
Jorge Penadés	c9dfccbc53	feat: refs #7211 add test & changelog	2024-04-25 09:35:53 +02:00
Javi Gallego	1b34822fb7	Merge branch 'dev' into 6382-regularizar-Shelving-Parking	2024-04-25 07:13:57 +00:00
Sergio De la torre	8ad61026ea	Merge pull request 'refs #6312 hotFix fix:replaceItem' (!2367) from 6312_originalQuanitty into master ... Reviewed-on: #2367 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-25 07:10:50 +00:00
Jorge Penadés	88b06ebef5	feat: refs #7211 check if there's available clockIn	2024-04-25 08:49:22 +02:00
Sergio De la torre	d4d31c6d9e	refs #6312 hotFix fix:replaceItem	2024-04-25 08:35:59 +02:00
Sergio De la torre	46f2d790db	refs #6312 hotFix fix:replaceItem	2024-04-25 08:01:32 +02:00
Alex Moreno	f1f2dfea35	Merge pull request 'hotFix(ticket): refs #7225 fix advanced and movable' (!2356) from 7225-hotFix_ticket_advanced_movable into master ... Reviewed-on: #2356 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-25 05:52:39 +00:00
Guillermo Bonet	60a3ec99d0	Merge branch 'dev' into 7258-lastChangesMigrationVn2008	2024-04-25 05:02:17 +00:00
Sergio De la torre	b8fdd7d726	Merge pull request 'refs #6574 feat: add order' (!2264) from 6574_itemGetBalance into dev ... Reviewed-on: #2264 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-24 13:55:05 +00:00
Sergio De la torre	8bb2fa93a7	Merge branch 'dev' into 6574_itemGetBalance	2024-04-24 13:46:53 +00:00
Alex Moreno	917592cdad	Merge pull request '7225-hotFix_ticket_advanced_movable a dev para probar' (!2366) from 7225-hotFix_ticket_advanced_movable into dev ... Reviewed-on: #2366 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-04-24 12:34:46 +00:00