27098 Commits

All Branches

Search

Author	SHA1	Message	Date
Juan Ferrer	6ff366cf02	fix: refs #4409 Grant CDC stock privileges	2025-03-04 08:43:25 +01:00
Alex Moreno	9a1669441f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-03-04 08:04:19 +01:00
Alex Moreno	959c6f25e1	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-03-04 08:02:22 +01:00
Alex Moreno	80a27e44d9	Merge pull request '8713-testToMaster' (!3523) from 8713-testToMaster into master ... Reviewed-on: #3523 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-03-04 06:52:13 +00:00
Carlos Andrés	b63f2e5539	Merge pull request 'hotfix-catalog_calculate-bonus-en-test' (!3521) from hotfix-catalog_calculate-bonus-en-test into test ... Reviewed-on: #3521 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-03-04 06:43:32 +00:00
Carlos Andrés	4605a26b1f	fix: comment out shipping time adjustments in beforeInsert and beforeUpdate triggers	2025-03-04 07:41:04 +01:00
Alex Moreno	b77961fb14	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-03-03 14:44:28 +01:00
Alex Moreno	75f5888741	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-03-03 14:44:21 +01:00
Jose Antonio Tubau	3fbc13d468	Merge pull request 'feat: refs #7587 add ACL entry for TicketRefund model to allow employee read access' (!3515) from 7587-addClaimedTicketRefToRefundTicket into dev ... Reviewed-on: #3515 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-03-03 13:15:22 +00:00
Carlos Andrés	6861f2d4a0	Merge pull request '8700_invoiceOut' (!3513) from 8700_invoiceOut into master ... Reviewed-on: #3513 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-03-03 13:12:14 +00:00
Pako Natek	892c95f5f0	feat(availabled): refs #8048	2025-03-03 14:01:30 +01:00
Jose Antonio Tubau	5d61587153	Merge pull request '8664-refactorCmrList' (!3498) from 8664-refactorCmrList into dev ... Reviewed-on: #3498	2025-03-03 12:56:05 +00:00
Jose Antonio Tubau	c071d2a593	Merge branch 'dev' into 7587-addClaimedTicketRefToRefundTicket	2025-03-03 12:51:03 +00:00
Jose Antonio Tubau	e6d56cf2d6	Merge branch 'dev' into 8664-refactorCmrList	2025-03-03 12:40:47 +00:00
Pako Natek	8cc88453c4	fix(travel): new trigger for travel and new version to update it ... stockRefresh and entryIn also updated Refs: #8048	2025-03-03 13:29:20 +01:00
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	3adcdeae82	Merge pull request 'fix: hotfix back' (!3517) from hotfix-7830AddresType into master ... Reviewed-on: #3517 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-03-03 11:39:59 +00:00
Pako Natek	99bc9b4698	fix(catalog_calculate): improves new option for not itemtype selected ... Refs: #8674	2025-03-03 11:50:34 +01: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
Carlos Satorres	5363a368de	fix: hotfix back	2025-03-03 11:39:05 +01: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
Jose Antonio Tubau	cb8e555cf1	feat: refs #7587 add ACL entry for TicketRefund model to allow employee read access	2025-03-03 09:25:14 +01: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
Alex Moreno	f1f5987b5f	Merge branch 'dev' into 8664-refactorCmrList	2025-03-03 06:34:24 +00: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	7908507825	feat: refs #8700 update XDiario table structure	2025-03-02 13:06:43 +01: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	bbcdff2c31	feat: refs #8700 update invoiceOut procedure to use new serial and ref handling; modify foreign key constraints	2025-03-02 11:13:09 +01: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