2347 Commits

Author	SHA1	Message	Date
Robert Ferrús	94ccdabe89	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-08 06:23:04 +00:00
Robert Ferrús	8417030438	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-07 12:43:57 +00:00
Robert Ferrús	823be8e0ea	Merge branch '6822-entryTransfer' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer	2025-01-07 12:02:35 +01:00
Robert Ferrús	c4c9b5640e	feat: refs #6822 modify transaction	2025-01-07 12:02:32 +01:00
Guillermo Bonet	065f13557b	feat: refs #8357 Agregados triggers para manejar exclusiones de trabajadores en la tabla workerMana	2025-01-07 11:58:36 +01:00
Robert Ferrús	65aa931738	Merge branch 'dev' into 6822-entryTransfer	2025-01-07 09:39:36 +00:00
Robert Ferrús	5c42130495	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-07 06:15:15 +00:00
Robert Ferrús	31aa7f9915	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer	2025-01-03 08:35:17 +01:00
Robert Ferrús	02d77324b1	feat: refs #6822 crear test	2025-01-03 08:27:34 +01:00
Jon Elias	5221b9254a	Merge branch 'dev' of https: refs #7202//gitea.verdnatura.es/verdnatura/salix into 7202-AddCustomAgentFkColumn	2025-01-02 08:39:57 +01:00
Alex Moreno	7092226c01	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-02 07:51:54 +01:00
Alex Moreno	bf80cbbf4a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-01-02 07:50:28 +01:00
Carlos Andrés	94136d35ff	Actualizar db/routines/vn/triggers/route_afterUpdate.sql	2024-12-18 12:22:59 +00:00
Ivan Mas	ab5cf0f497	Merge branch 'dev' into 7880-hedera.order_confirmWithUserTranslations	2024-12-18 11:17:14 +00:00
Jorge Penadés	7a3339b623	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-18 10:18:43 +01:00
Ivan Mas	af86bb24c4	Merge branch 'dev' into 7880-hedera.order_confirmWithUserTranslations	2024-12-17 15:06:00 +00:00
Jorge Penadés	b4c8e16019	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination	2024-12-17 12:31:27 +01:00
Jorge Penadés	6476eb28e6	Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-17 10:51:52 +01:00
Robert Ferrús	68715a8c36	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2024-12-16 13:25:38 +00:00
Guillermo Bonet	fda2c5725a	refactor: refs #8262 Deprecated inventoryFailure	2024-12-16 12:23:02 +01:00
Robert Ferrús	e7e6c88ec5	Merge branch 'dev' into 8190-entry_getCommission	2024-12-16 10:18:53 +00:00
Jorge Penadés	d9eab36160	fix: refs #7936 conflicts	2024-12-16 09:35:41 +01:00
Jorge Penadés	4612bf2e9b	Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-16 09:35:23 +01:00
Robert Ferrús	1d7e69cb25	feat: refs #7584 workerTimeControl_afterDelete	2024-12-16 07:40:49 +01:00
Guillermo Bonet	3cdb6c438b	Merge branch 'test' into dev	2024-12-13 13:06:26 +01:00
Robert Ferrús	ab1eed66df	feat: refs #6822 changes required	2024-12-13 12:29:03 +01:00
Guillermo Bonet	452ec3d731	fix: refs #247552 ticket 247552 claimRatio_add	2024-12-13 08:29:14 +01:00
Carlos Andrés	20cf3e0d19	Merge pull request 'fix: refs #8087 refs#8087 errores travel_moveRaids' (!3264) from 8087-erroresTravel_moveRaid into master ... Reviewed-on: #3264 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-12 18:21:42 +00:00
Carlos Andrés	fbd6178c06	fix: refs #8149 taxableBase invoiceIn	2024-12-11 13:16:39 +01:00
Robert Ferrús	4f370dbaea	Merge branch '6822-entryTransfer' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer	2024-12-11 11:54:44 +01:00
Robert Ferrús	43bbdfd421	feat: refs #6822	2024-12-11 11:54:40 +01:00
Robert Ferrús	b681585ad5	Merge branch 'dev' into 6822-entryTransfer	2024-12-11 10:21:00 +00:00
Robert Ferrús	7886adb8f5	Merge branch 'dev' into 8190-entry_getCommission	2024-12-11 10:20:31 +00:00
Jorge Penadés	f69dfbd5aa	refactor: refs #7936 remove schema	2024-12-09 14:03:45 +01:00
Jorge Penadés	db8ab307ab	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-05 10:10:40 +01:00
Robert Ferrús	6ac30dcb0c	feat: refs #6822 fix conflict	2024-12-04 13:32:10 +01:00
Jorge Penadés	ea5bf85b55	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-04 13:31:54 +01:00
Ivan Mas	41a3f9ae94	refactor: refs #8272 delete bi.rotacion	2024-12-04 13:19:14 +01:00
Robert Ferrús	47cb1ff722	Merge branch 'dev' of https: refs #6822//gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer	2024-12-04 13:18:26 +01:00
Robert Ferrús	b97b61c7dd	feat: refs #6822 fix	2024-12-04 09:40:28 +01:00
Robert Ferrús	c518352bf7	feat: refs #6822 changes required	2024-12-04 08:12:47 +01: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
Jorge Penadés	9d26a9df7d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-02 17:11:21 +01:00
Ivan Mas	1b2987494a	Merge branch 'dev' into 7146-route.createdToDated	2024-12-02 14:04:36 +00:00
Guillermo Bonet	947812e9f1	Merge branch 'test' into dev	2024-12-02 13:07:08 +01:00
Guillermo Bonet	b67585137a	Merge branch 'master' into test	2024-12-02 13:06:47 +01:00
Guillermo Bonet	508908bf85	fix: refs #7266 Minor changes	2024-12-02 13:01:12 +01:00
Guillermo Bonet	4a74015fc5	fix: refs #7266 Minor changes	2024-12-02 12:57:34 +01:00
Guillermo Bonet	fb58ab5bd2	fix: refs #7266 Created buy_getLastWihoutInventory proc	2024-12-02 12:54:36 +01:00
Carlos Andrés	202ed47963	fix: refs #8087 refs#8087 errores travel_moveRaids	2024-11-29 17:20:14 +01:00
Carlos Andrés	b0ee1f3e24	fix: refs #8087 refs#8087 errores travel_moveRaids	2024-11-29 17:18:25 +01:00
Jorge Penadés	163c6ddd20	feat: refs #7936 add currency handling in invoiceIn trigger	2024-11-29 13:44:42 +01:00
Carlos Andrés	fc1e0672a4	fix: refs #8087 refs#8087 errores travel_moveRaids	2024-11-29 11:59:36 +01:00
Robert Ferrús	7afd14a301	Merge branch 'dev' into 8190-entry_getCommission	2024-11-29 05:42:08 +00:00
Ivan Mas	6d315bf84d	refactor: refs #7146 route.created to route.dated	2024-11-28 17:29:39 +01:00
Robert Ferrús	3f4aa60cd2	feat: refs #6822 poner esquemas en el with	2024-11-28 08:22:30 +01:00
Robert Ferrús	4b474834cf	feat: refs #6822 change request	2024-11-28 08:13:53 +01:00
Robert Ferrús	7b8d4c6a2c	Merge branch 'dev' into 6822-entryTransfer	2024-11-28 06:38:36 +00:00
Jorge Penadés	ba51052d88	feat: refs #7936 add SiiTypeInvoiceIn model and update invoice correction logic	2024-11-27 17:52:45 +01:00
Jorge Penadés	4bb3305704	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-11-27 13:12:31 +01:00
Guillermo Bonet	e62553630c	Merge branch 'test' into dev	2024-11-27 10:41:31 +01:00
Guillermo Bonet	55bf10435e	Merge branch 'master' into test	2024-11-27 10:41:14 +01:00
Jorge Penadés	4234e614fb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-11-27 09:41:19 +01:00
Robert Ferrús	70042c02aa	Merge branch 'dev' into 8190-entry_getCommission	2024-11-27 06:28:51 +00:00
Robert Ferrús	d9aa11b3e9	feat: refs #8190 entry_getCommission change request	2024-11-27 07:27:47 +01:00
Carlos Andrés	c550f711c6	Actualizar db/routines/vn/triggers/travel_beforeUpdate.sql	2024-11-26 17:55:36 +00:00
Ivan Mas	10d2d4c9c4	fix: hotfix entry_splitByShelving	2024-11-26 18:01:49 +01:00
Jorge Penadés	ad35a354a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-facturas-recibidas	2024-11-26 16:35:46 +01:00
Guillermo Bonet	10fe53b7f2	refactor: refs #8204 Deprecated itemShelvingLog	2024-11-26 14:01:44 +01:00
Robert Ferrús	5a92fe1691	feat: refs #8190 entry_getCommission	2024-11-26 11:57:24 +01:00
Robert Ferrús	96902afc83	Merge branch 'dev' of https: refs #8190//gitea.verdnatura.es/verdnatura/salix into 8190-entry_getCommission	2024-11-26 11:19:03 +01:00
Guillermo Bonet	c14484366e	Merge branch 'test' into dev	2024-11-26 10:10:09 +01:00
Guillermo Bonet	6487497638	Merge branch 'master' into test	2024-11-26 10:09:45 +01:00
Pablo Natek	e6df9d426f	fix: refs #8087 correct SQL query to use alias for isRaid in entry_beforeUpdate trigger	2024-11-26 09:17:18 +01:00
Pablo Natek	3057d80e76	fix: refs #8087 correct SQL join condition in entry_beforeUpdate trigger	2024-11-26 09:14:38 +01:00
Guillermo Bonet	ed6f490188	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-11-26 09:11:38 +01:00
Guillermo Bonet	45e6d7f046	fix: refs #4948 ticket_selfConsumptionPackaging	2024-11-26 09:11:36 +01:00
Robert Ferrús	43e39fd127	Merge branch 'master' into 8087-fixTrigger	2024-11-26 08:08:13 +00:00
Pablo Natek	0cbaac91c2	fix: refs #8087 correct SQL join condition in entry_beforeUpdate trigger	2024-11-26 09:06:25 +01:00
Robert Ferrús	00353186e6	fix: refs #8124 workCenterFk por commissionWorkCenterFk	2024-11-26 09:03:22 +01:00
Guillermo Bonet	2eed2f00a9	fix: refs #4948 ticket_selfConsumptionPackaging	2024-11-26 09:01:04 +01:00
Robert Ferrús	35b508d3d6	fix: refs #8124 workCenter por workCenterFk	2024-11-26 08:33:56 +01:00
Carlos Andrés	26406b6fdb	feat: refs #8124 Enrutadores nuevos requerimientos	2024-11-25 18:45:37 +01:00
Ivan Mas	10e332ca85	Merge branch 'dev' into 7880-hedera.order_confirmWithUserTranslations	2024-11-25 11:23:52 +00:00
Guillermo Bonet	65ca1b5af3	Merge pull request 'feat: refs #8149 Group by CuentaIvaRepercutido' (!3201) from 8149-ivaXDiario into dev ... Reviewed-on: #3201 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-11-22 12:09:47 +00:00
Carlos Andrés	771aeaa9bd	Merge pull request 'test' (!3237) from test into dev ... Reviewed-on: #3237 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-22 12:03:18 +00:00
Guillermo Bonet	1c6f59a0ec	Merge branch '8149-ivaXDiario' of https://gitea.verdnatura.es/verdnatura/salix into 8149-ivaXDiario	2024-11-22 12:59:26 +01:00
Guillermo Bonet	4ab2d7fd09	feat: refs #8149 Group by CuentaIvaRepercutido	2024-11-22 12:59:24 +01:00
Carlos Andrés	7cf6acec19	Merge pull request '8124-enrutadoresNuevosRequerimientos' (!3235) from 8124-enrutadoresNuevosRequerimientos into test ... Reviewed-on: #3235 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-22 09:46:03 +00:00
Guillermo Bonet	c440472693	Merge branch 'dev' into 8149-ivaXDiario	2024-11-22 09:43:26 +00:00
Guillermo Bonet	46c85d44d6	Merge branch 'test' into dev	2024-11-22 09:12:23 +01:00
Guillermo Bonet	a731bb3a45	Merge branch 'master' into test	2024-11-22 09:11:29 +01:00
Guillermo Bonet	c73196edec	fix: refs #7834 expeditionScan_Put no throw	2024-11-22 09:10:18 +01:00
Carlos Andrés	7ad17d75d7	feat: refs #8124 Enrutadores nuevos requerimientos	2024-11-21 18:41:55 +01:00
Javi Gallego	41b3f34158	fix: refs #7821 alias	2024-11-21 16:38:11 +01:00
Javi Gallego	53673f43b8	Merge branch 'dev' into 7821-entryIsBooked	2024-11-21 16:20:25 +01:00
Javi Gallego	0ecbef0c9f	Merge branch 'dev' into 7821-entryIsBooked	2024-11-21 16:15:10 +01:00