Commit Graph

1937 Commits

Author SHA1 Message Date
Guillermo Bonet 55e2bebff8 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2025-03-04 12:51:06 +01:00
Pako Natek 8eefcf53d0 fix(priceDelta): removes not null restriction for itemTypeFk
gitea/salix/pipeline/pr-master This commit looks good Details
refs#8674
2025-03-04 11:51:15 +01:00
PAU ROVIRA ROSALENY 139e7d064d feat: refs #8408 town, province, autonomy and country update to remove uppercase names
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-03-04 10:23:51 +01:00
PAU ROVIRA ROSALENY 9958c0509d feat: refs #8408 town and province update to remove uppercase names 2025-03-04 10:09:52 +01:00
Carlos Andrés 10a2dc484b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into fixlostTestMaster
gitea/salix/pipeline/pr-master This commit looks good Details
2025-03-04 09:50:04 +01:00
Juan Ferrer 1d592d336a fix: refs #4409 Grant CDC stock privileges
gitea/salix/pipeline/head This commit looks good Details
2025-03-04 09:04:50 +01:00
Juan Ferrer 68326fedd1 fix: refs #4409 Grant CDC stock privileges 2025-03-04 08:58:05 +01:00
Juan Ferrer 6ff366cf02 fix: refs #4409 Grant CDC stock privileges
gitea/salix/pipeline/head There was a failure building this commit Details
2025-03-04 08:43:25 +01:00
Alex Moreno 9a1669441f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-03-04 08:04:19 +01:00
Carlos Andrés b63f2e5539 Merge pull request 'hotfix-catalog_calculate-bonus-en-test' (!3521) from hotfix-catalog_calculate-bonus-en-test into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3521
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2025-03-04 06:43:32 +00:00
Alex Moreno b77961fb14 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-03-03 14:44:28 +01:00
Alex Moreno 75f5888741 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2025-03-03 14:44:21 +01:00
Jose Antonio Tubau c071d2a593 Merge branch 'dev' into 7587-addClaimedTicketRefToRefundTicket
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-03-03 12:51:03 +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
Pako Natek 9544894b17 Merge pull request 'fix(travel): refs #8048 resf#8048' (!3514) from 8048-vn.travel-updates into dev
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-03-03 09:25:14 +01:00
Pako Natek 3905bb58cb fix(travel): refs #8048 resf#8048
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-03-03 08:16:13 +01:00
Carlos Andrés 7908507825 feat: refs #8700 update XDiario table structure
gitea/salix/pipeline/pr-master This commit looks good Details
2025-03-02 13:06:43 +01:00
Carlos Andrés bbcdff2c31 feat: refs #8700 update invoiceOut procedure to use new serial and ref handling; modify foreign key constraints
gitea/salix/pipeline/pr-master This commit looks good Details
2025-03-02 11:13:09 +01:00
Carlos Andrés 2ca8de1d2e feat: refs #8644 workerTimeControl add mandatory break times and update procedures
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-03-02 09:41:53 +01:00
Guillermo Bonet 5a44b5d332 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-28 12:23:10 +01:00
Guillermo Bonet 156b965c24 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2025-02-28 12:22:51 +01:00
Pako Natek 054483cfdd Merge pull request '8408-disponible-por-zonas' (!3503) from 8408-disponible-por-zonas into dev
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2025-02-28 07:27:41 +01:00
Pako Natek bfa315fc55 fix(item_getBalance): refs #8408 tickets without zone must be included
gitea/salix/pipeline/pr-test There was a failure building this commit Details
Refs: #8408
2025-02-28 07:09:34 +01:00
Juan Ferrer d680dc8da7 fix: refs #8689 Drop foreign key cache.last_buy_FK_1
gitea/salix/pipeline/head This commit looks good Details
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
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3501
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2025-02-27 14:01:36 +00:00
Alex Moreno 011fb3a99a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2025-02-27 12:01:31 +01:00
Alex Moreno 7715a50724 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2025-02-27 12:01:13 +01:00
Jon Elias 01b78207a3 Merge branch 'dev' into 7949-TicketModifications
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-27 09:23:53 +00:00
Jon Elias 1ad1b1ea99 refactor: refs #7949 changed property in acl
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-27 10:12:28 +01:00
Jon Elias 002a106774 feat: refs #7949 added new field in sales
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-27 09:13:23 +01:00
Guillermo Bonet f4842827a6 Merge branch 'dev' into 8244-floricode
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-27 07:36:09 +01:00
Juan Ferrer c831f4ff3e fix: refs #4409 lotFk unique
gitea/salix/pipeline/head Build queued... Details
2025-02-26 12:46:15 +01:00
Pako Natek 1b3e5a2576 feat(catalog_calculate): refs #8674 new field and modified proc
gitea/salix/pipeline/pr-master This commit looks good Details
Refs: #8674
2025-02-26 12:20:39 +01:00
Pako Natek a80614a46d feat(catalog_calculate): refs #8674 refs#8674
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-26 12:18:55 +01:00
Juan Ferrer f9452c655a fix: refs #4409 lotFk index
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2025-02-26 12:02:01 +01:00
Juan Ferrer fcaa008241 fix: refs #4409 versions fix
gitea/salix/pipeline/head This commit looks good Details
2025-02-26 11:46:46 +01:00
Juan Ferrer a310b3e642 Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev Build queued... Details
2025-02-26 09:32:16 +01:00
Pako Natek aa597870a4 feat(catalog_calculate): priceDelta.isHidden restriction
gitea/salix/pipeline/pr-dev This commit looks good Details
refs#8674
2025-02-26 08:33:39 +01:00
Alex Moreno a9ae260409 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2025-02-26 07:31:33 +01:00
Juan Ferrer 7ad97a49cb fix: refs #4409 Added ticket.isAlive, orderRow.isReserved
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-25 18:23:41 +01:00
Juan Ferrer a88f41dd4b Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-25 11:18:19 +01:00
Juan Ferrer dc8cc6b49b fix: refs #4409 buyOut version source index fix
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-25 10:52:23 +01:00
Sergio De la torre 5093393f3b Merge branch 'dev' into 8624-addActionCleanShelving
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-25 06:19:12 +00:00
Juan Ferrer 7049933c6e fix: refs #4409 clean frozen sales and lost reserves
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-24 18:50:25 +01:00
Ivan Mas 04b6be23a1 fix: refs #8613 fk claimEnd
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-24 18:13:56 +01:00
Juan Ferrer 5e630562ce fix: refs #4409 don't cache parent ids
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-24 18:05:21 +01:00
Juan Ferrer 1c77e69ae4 fix: refs #4409 lotFk used for row identification
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-02-24 13:24:41 +01:00
Ivan Mas 218bb4db6f Merge branch 'dev' into 8613-addFkClaimDestinationFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-24 11:38:06 +00:00