27073 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	b65b884ca9	Merge pull request 'fix: #6321 - replace arg id by itemFk' (!3455) from fix_ticketNegative into dev ... Reviewed-on: #3455 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-03-03 11:52:53 +00:00
Javier Segarra	7aae9be750	Merge branch 'dev' into fix_ticketNegative	2025-03-03 10:49:51 +00:00
Jon Elias	e059417d10	Merge pull request '#8081 recovered supplier decriptor and summary' (!3516) from 8081-RecoverSupplierDescriptor into dev ... Reviewed-on: #3516 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-03-03 10:43:11 +00:00
Javier Segarra	6804cdd5a3	Merge branch 'dev' into fix_ticketNegative	2025-03-03 10:41:21 +00:00
Jon Elias	51f759c1f8	refactor: refs #8081 deleted code	2025-03-03 11:17:27 +01:00
Jon Elias	2afe4bb5b4	refactor: refs #8081 recovered supplier decriptor and summary	2025-03-03 11:15:55 +01:00
Pako Natek	9544894b17	Merge pull request 'fix(travel): refs #8048 resf#8048' (!3514) from 8048-vn.travel-updates into dev ... Reviewed-on: #3514 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-03-03 08:58:23 +00:00
Pako Natek	b59070c69e	fix(travel): refs #8048 refs#8048 remove empty lines	2025-03-03 08:18:31 +01:00
Pako Natek	3905bb58cb	fix(travel): refs #8048 resf#8048	2025-03-03 08:16:13 +01:00
Guillermo Bonet	243c9a3de4	Merge pull request 'refactor: refs #7912 Item calc cost Ricardo' (!3510) from 7912-wasteCost into dev ... Reviewed-on: #3510 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-03-03 06:12:13 +00:00
Guillermo Bonet	3871c9c505	Merge branch 'dev' into 7912-wasteCost	2025-03-03 06:09:36 +00:00
Carlos Andrés	23085a57b6	Merge pull request 'feat: refs #8644 workerTimeControl add mandatory break times and update procedures' (!3511) from 8644-Fichador-restriccion-por-horas into dev ... Reviewed-on: #3511 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-03-02 10:29:54 +00:00
Carlos Andrés	2ca8de1d2e	feat: refs #8644 workerTimeControl add mandatory break times and update procedures	2025-03-02 09:41:53 +01:00
Guillermo Bonet	b24cc0df7b	Merge branch 'dev' into 7912-wasteCost	2025-02-28 12:02:00 +00:00
Guillermo Bonet	076f4f3173	refactor: refs #7912 Requested changes	2025-02-28 13:01:49 +01:00
Javier Segarra	e9af527f30	Merge branch 'dev' into fix_ticketNegative	2025-02-28 11:39:19 +00:00
Guillermo Bonet	5a44b5d332	Merge branch 'test' into dev	2025-02-28 12:23:10 +01:00
Guillermo Bonet	156b965c24	Merge branch 'master' into test	2025-02-28 12:22:51 +01:00
Guillermo Bonet	4190dc7803	Merge branch 'dev' into 7912-wasteCost	2025-02-28 11:07:44 +00:00
Guillermo Bonet	e225d6d123	refactor: refs #7912 Item calc cost Ricardo	2025-02-28 12:07:25 +01:00
Carlos Satorres	6dac5cc9ce	Merge pull request 'fix: refs #6553 workerBusiness v3' (!3508) from 6553-workerBusinessV3 into test ... Reviewed-on: #3508 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-28 10:10:08 +00:00
Pako Natek	f94a52e0e9	Merge pull request 'fix(entrySource): refs #8048 refs#8048' (!3505) from 8048-entrySource into dev ... Reviewed-on: #3505 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-02-28 09:55:23 +00:00
Carlos Satorres	434c3ac2f9	fix: refs #6553 workerBusiness v3	2025-02-28 10:32:16 +01:00
Pako Natek	92e77ab604	fix(entrySource): refs #8048 refs#8048	2025-02-28 08:28:38 +01:00
Pako Natek	054483cfdd	Merge pull request '8408-disponible-por-zonas' (!3503) from 8408-disponible-por-zonas into dev ... Reviewed-on: #3503 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2025-02-28 06:56:09 +00:00
Pako Natek	1103b0b257	fix(travel): refs #8408 refs#8408	2025-02-28 07:27:41 +01:00
Pako Natek	bfa315fc55	fix(item_getBalance): refs #8408 tickets without zone must be included ... Refs: #8408	2025-02-28 07:09:34 +01:00
Juan Ferrer	c050e39aae	fix: refs #4409 Optimize stock_refreshAll	2025-02-27 19:50:54 +01:00
Juan Ferrer	d680dc8da7	fix: refs #8689 Drop foreign key cache.last_buy_FK_1	2025-02-27 19:23:21 +01:00
Jon Elias	c6bfdb2cd7	Merge pull request '#7949: Added new field in sales' (!3501) from 7949-TicketModifications into dev ... Reviewed-on: #3501 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-27 14:01:36 +00:00
Jose Antonio Tubau	2f4adab3e6	Merge pull request 'refactor: refs #8645 update route kmStart and kmEnd, and include supplierRef in agency-term filter' (!3480) from 8645-addSupplierRefToAgencyTermFilter into dev ... Reviewed-on: #3480 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-02-27 12:06:59 +00:00
Jose Antonio Tubau	93862fecfc	Merge branch 'dev' into 8645-addSupplierRefToAgencyTermFilter	2025-02-27 11:21:09 +00:00
Pako Natek	7b8476b42c	Merge pull request '8408-disponible-por-zonas' (!3495) from 8408-disponible-por-zonas into dev ... Reviewed-on: #3495 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-27 11:03:02 +00:00
Alex Moreno	011fb3a99a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-27 12:01:31 +01:00
Alex Moreno	7715a50724	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-02-27 12:01:13 +01:00
Alex Moreno	a85771c1e7	fix: closure email	2025-02-27 12:00:59 +01:00
Jose Antonio Tubau	44dc7bbb58	Merge branch 'dev' into 8645-addSupplierRefToAgencyTermFilter	2025-02-27 11:00:22 +00:00
Pako Natek	ed054bfb3d	Merge branch 'dev' into 8408-disponible-por-zonas	2025-02-27 09:59:14 +00:00
Pako Natek	d78288b778	fix(availabled): refs #8408 refs#8408 new price diference	2025-02-27 10:30:24 +01:00
Jon Elias	01b78207a3	Merge branch 'dev' into 7949-TicketModifications	2025-02-27 09:23:53 +00:00
Jon Elias	1ad1b1ea99	refactor: refs #7949 changed property in acl	2025-02-27 10:12:28 +01:00
Jon Elias	002a106774	feat: refs #7949 added new field in sales	2025-02-27 09:13:23 +01:00
Guillermo Bonet	929c866c7e	Merge pull request 'feat: refs #8244 Floricode api' (!3472) from 8244-floricode into dev ... Reviewed-on: #3472 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-27 08:06:35 +00:00
Guillermo Bonet	87b3abd4e2	fix: refs #8244 Path test	2025-02-27 09:04:08 +01:00
Guillermo Bonet	f4842827a6	Merge branch 'dev' into 8244-floricode	2025-02-27 07:36:09 +01:00
Jose Antonio Tubau	201eca7765	Merge branch 'dev' into 8645-addSupplierRefToAgencyTermFilter	2025-02-27 06:12:18 +00:00
Juan Ferrer	c831f4ff3e	fix: refs #4409 lotFk unique	2025-02-26 12:46:15 +01:00
Pako Natek	ef7ce9bbb6	Merge pull request 'feat(catalog_calculate): refs #8674 new field and modified proc' (!3500) from 8674-hotFix-Restringir-el-acceso-a-determinadas-familias into master ... Reviewed-on: #3500 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-26 11:38:55 +00:00
Pako Natek	b5e8bfa8af	Merge pull request 'feat(catalog_calculate): refs #8674 refs#8674' (!3499) from 8674-restringir-acceso-a-familias into test ... Reviewed-on: #3499 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-26 11:29:26 +00:00
Pako Natek	1b3e5a2576	feat(catalog_calculate): refs #8674 new field and modified proc ... Refs: #8674	2025-02-26 12:20:39 +01:00