1858 Commits

Author	SHA1	Message	Date
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
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
Alex Moreno	951376af2f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-01-13 09:19:03 +01:00
Robert Ferrús	bdaaffbbd7	feat: refs #7584 changes request	2025-01-10 10:33:19 +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	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
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	5c42130495	Merge branch 'dev' into 7584-workerTimeControl_afterDelete	2025-01-07 06:15:15 +00: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	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
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
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	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	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	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	ea5bf85b55	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-04 13:31:54 +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
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