1574 Commits

Author	SHA1	Message	Date
Robert Ferrús	7292ac48b2	Merge branch 'dev' into 6822-entryTransfer	2025-01-21 08:48:24 +00:00
Guillermo Bonet	04180bf8da	Merge branch 'test' into dev	2025-01-20 07:52:04 +01:00
Guillermo Bonet	934507569e	feat: refs #7531 Added comment	2025-01-20 07:48:43 +01:00
Guillermo Bonet	e6abb1d759	feat: refs #7531 Minor change	2025-01-20 07:41:41 +01:00
Guillermo Bonet	044a22bc3e	feat: refs #7531 Deleted address_hasDelivery	2025-01-20 07:13:04 +01:00
Robert Ferrús	ce96b0a819	Merge branch 'dev' into 6822-entryTransfer	2025-01-19 07:58:16 +00:00
Guillermo Bonet	a666cfa4cd	feat: refs #7531 Added address_hasDelivery	2025-01-17 09:40:07 +01:00
Javi Gallego	d4b7d54052	Merge pull request '8298-zonePriceOptimum' (!3345) from 8298-zonePriceOptimum into dev ... Reviewed-on: #3345 Reviewed-by: Pako Natek <pako@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-17 08:30:44 +00:00
Guillermo Bonet	1aa1fbda6c	feat: refs #7531 Added address_hasDelivery	2025-01-17 08:10:26 +01:00
Guillermo Bonet	69b78b6bf1	feat: refs #7531 Added address_hasDelivery	2025-01-16 15:04:21 +01:00
Javi Gallego	125b7730e7	feat: refs #8298 update price calculation logic and add packagesDiscountFactor column to client table	2025-01-16 12:56:04 +01:00
Guillermo Bonet	c2ca9cfbe5	feat: refs #7531 Added address_hasDelivery	2025-01-15 12:26:16 +01:00
Robert Ferrús	277cd80f50	Merge branch 'dev' into 6822-entryTransfer	2025-01-14 07:13:52 +00:00
Alex Moreno	951376af2f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-13 09:19:03 +01:00
Sergio De la torre	1ac75d87ad	fix: refs #6861 refs#6861 addPrevOK	2025-01-10 08:55:45 +01:00
Javi Gallego	1816b6de67	feat: refs #8298 add priceOptimum and packagesDiscountFactor to zone and client tables	2025-01-08 10:24:18 +01: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
Robert Ferrús	65aa931738	Merge branch 'dev' into 6822-entryTransfer	2025-01-07 09:39:36 +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
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
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
Guillermo Bonet	fda2c5725a	refactor: refs #8262 Deprecated inventoryFailure	2024-12-16 12:23:02 +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	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
Robert Ferrús	43bbdfd421	feat: refs #6822	2024-12-11 11:54: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
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
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
Carlos Andrés	fc1e0672a4	fix: refs #8087 refs#8087 errores travel_moveRaids	2024-11-29 11:59:36 +01: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	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