Commit Graph

22948 Commits

Author SHA1 Message Date
Carlos Satorres 92163231b1 Merge pull request 'refs #6897 fix filter' (!2657) from 6897-entryMigration2 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2657
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-03 10:15:03 +00:00
Carlos Satorres fafebb4339 refs #6897 fix filter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 12:13:40 +02:00
Carlos Satorres dd3a8d4b72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-03 12:05:00 +02:00
Guillermo Bonet 2c39c2a6ba Merge pull request 'feat: refs #7664 Added created in calendar table' (!2668) from 7664-createdCalendar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2668
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-03 09:50:32 +00:00
Guillermo Bonet cf63d6e71c feat: refs #7378 Added productionConfigLog
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 11:17:33 +02:00
Jorge Penadés 12f29aa50e Merge pull request '#6449 addColumnLogTables' (!2277) from 6449-addColumnLogTables into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2277
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-07-03 08:51:56 +00:00
Javi Gallego a8d663bee4 feat: refs #7348 hasDailyInvoice field
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 10:49:51 +02:00
Guillermo Bonet aaca2d12c5 refactor: refs #7504 Rename id greuge
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 10:20:20 +02:00
Alex Moreno 4535795515 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-03 10:08:15 +02:00
Alex Moreno 39f95e376b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-07-03 10:06:39 +02:00
Sergio De la torre a0065dfc13 Merge pull request 'feat roadmap refs #7195' (!2666) from 7195_roadmap_t into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2666
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-03 08:04:29 +00:00
Jon Elias 743fdb16da Merge pull request '#6436 Definir funcion global que añada ctx' (!2232) from 6436_jasmine_beforeAll into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2232
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-03 07:56:17 +00:00
Guillermo Bonet 77d86c9fd9 feat: refs #7664 Added created in calendar table
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 09:55:14 +02:00
Jon Elias d01820c751 Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 07:54:55 +00:00
Guillermo Bonet d1ef1c80f8 feat: refs #7382 Added unique key
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 09:36:20 +02:00
Javier Segarra d72a52d6b1 Merge pull request '#7648 - Customer View Entries' (!2659) from 7648_dev_customerEntries into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2659
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-03 07:29:00 +00:00
Sergio De la torre 1561e15d5e feat roadmap refs #7195
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-03 09:21:58 +02:00
Jon Elias 4bdbb3b08e Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 07:13:21 +00:00
Jorge Penadés 1c6dd17f90 Merge branch 'dev' into 6449-addColumnLogTables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 07:10:41 +00:00
Sergio De la torre 947c28b988 Merge pull request '7195_roadmap2' (!2554) from 7195_roadmap2 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2554
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-03 06:56:49 +00:00
Javier Segarra 3710c7c9c8 Merge branch '7648_dev_customerEntries' of https://gitea.verdnatura.es/verdnatura/salix into 7648_dev_customerEntries
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 08:55:01 +02:00
Javier Segarra beff905e02 perf(salix): refs #7648 #7648 remove change role for user 2 2024-07-03 08:54:58 +02:00
Carlos Satorres 797a4e5df6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-entryMigration2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-03 08:51:14 +02:00
Robert Ferrús f1c9c71f4f Merge branch 'dev' into 7116-agencyIncoming
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 06:50:29 +00:00
Robert Ferrús 19c378d6bd feat: refs #7116 añadir comentario
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 08:48:24 +02:00
Sergio De la torre 7677ada925 Merge branch 'dev' into 7195_roadmap2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 06:46:10 +00:00
Javier Segarra 5c73a20f43 Merge branch 'dev' into 7648_dev_customerEntries
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 06:17:34 +00:00
Javier Segarra 946d6f553a perf(salix): refs #7648 #7648 sql conventions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 08:16:55 +02:00
Guillermo Bonet d1a38ec589 Merge pull request 'refactor: refs #7424 Component type refactor' (!2656) from 7424-componentType into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2656
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-03 05:22:48 +00:00
Guillermo Bonet 1afce8124f Merge pull request 'refactor: refs #7418 Item type refactor' (!2658) from 7418-itemType into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2658
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-03 05:21:19 +00:00
Guillermo Bonet 18b7fb48c7 Merge pull request 'refs #7443 Deleted ekt barcode' (!2665) from 7443-deleteEktBarcode into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2665
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-03 05:18:52 +00:00
Carlos Satorres 00b33df802 Merge branch 'dev' into 6952-productorItemPDF
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 05:13:52 +00:00
Javier Segarra adbbe4aef9 fix(salix): refs #7648 #7648 solve big bug
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 01:46:01 +02:00
Javier Segarra cc004a864a feat(salix): refs #7648 #7648 rename some travel fields
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-02 20:41:53 +02:00
Javier Segarra 0e4db6c3d3 Merge branch 'dev' into 7648_dev_customerEntries 2024-07-02 20:29:01 +02:00
Javi Gallego 0d70cb8929 fix: informatica no necesita este correo
gitea/salix/pipeline/head This commit looks good Details
2024-07-02 17:39:46 +02:00
Guillermo Bonet 0bb4439f85 refs #7443 Deleted ekt barcode
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-02 14:37:22 +02:00
Sergio De la torre 61265a45e3 Merge branch 'dev' into 7195_roadmap2
gitea/salix/pipeline/pr-test Build queued... Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-02 11:25:46 +00:00
Robert Ferrús e8a35764fd Merge pull request 'feat: refs #5855 drop temporary table' (!2040) from 5855-temporaryTable into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2040
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-07-02 11:12:29 +00:00
Robert Ferrús 872ab1a758 Merge branch 'dev' into 5855-temporaryTable
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-02 11:08:08 +00:00
Alex Moreno 9708e79e55 build: increase version 2430
gitea/salix/pipeline/head This commit looks good Details
2024-07-02 12:41:51 +02:00
Ivan Mas 4ad6c440e0 Merge pull request 'refs #7651 Add editorFk and triggers' (!2661) from 7651-Add_editorFk_mailAliasAccount into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2661
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-07-02 10:39:54 +00:00
Ivan Mas 99beb21927 Merge branch 'dev' into 7651-Add_editorFk_mailAliasAccount
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-02 10:36:40 +00:00
Guillermo Bonet edff15662c Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-02 12:34:51 +02:00
Carlos Satorres 62bdc13807 Merge branch '6952-productorItemPDF' of https://gitea.verdnatura.es/verdnatura/salix into 6952-productorItemPDF
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-02 12:07:54 +02:00
Sergio De la torre e1b6ba4276 feat roadmap refs #7195
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-02 12:03:21 +02:00
Carlos Satorres 7f213a7435 refs #6952 fix producer 2024-07-02 12:02:44 +02:00
Guillermo Bonet 028278ebcf refs #6626 Hotfix
gitea/salix/pipeline/pr-test There was a failure building this commit Details
gitea/salix/pipeline/head This commit looks good Details
2024-07-02 11:52:25 +02:00
Carlos Satorres 2fe995d3ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6952-productorItemPDF 2024-07-02 11:42:44 +02:00
Javier Segarra 3539b5a33e test(salix): refs #7648 #7648 remove fdescribe
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-02 10:08:51 +02:00