Commit Graph

14604 Commits

Author SHA1 Message Date
Vicent Llopis 8ac575419a fix: no mostraba la factura rectificada correcta
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-03 12:31:20 +01:00
Juan Ferrer 73c988b18e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-03-03 10:57:59 +01:00
Juan Ferrer 6eaf4bdd1b refs #5174 tpvTransaction: Añadidas columnas para depuración 2023-03-03 10:57:57 +01:00
Alexandre Riera f9f58c28d5 Merge pull request 'hotfix itemWaste' (!1363) from hotfix-itemWaste-openOtherTab into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1363
2023-03-03 09:01:30 +00:00
Alexandre Riera de0e7334df Merge branch 'master' into hotfix-itemWaste-openOtherTab
gitea/salix/pipeline/head This commit looks good Details
2023-03-03 07:55:28 +00:00
Alexandre Riera d58a5eb1ff hotfix itemWaste
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-03 08:54:55 +01:00
Joan Sanchez 7a03029168 Merge pull request 'refs #4975 Traduction no branch' (!1352) from 4975-noBranchTraduction into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1352
2023-03-02 06:35:27 +00:00
Joan Sanchez cbb8908af6 Merge pull request 'refs #4965 Hotfix' (!1360) from 4965-hotfix into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1360
2023-03-02 06:22:38 +00:00
Guillermo Bonet a5d236257b refs #4965 Hotfix
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 14:03:47 +01:00
Guillermo Bonet 8e79ad2f50 Merge pull request 'refs #4965 Hotfix collection-label' (!1359) from hotfixCollectionLabel into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1359
2023-03-01 12:07:16 +00:00
Guillermo Bonet fdf97b1fc7 refs #4965 Hotfix collection-label
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 12:59:46 +01:00
Alexandre Riera ab8c3b3f67 Merge pull request 'hotFix itemDiary reload card conditional' (!1357) from hotFix-itemDiary-reloadCardConditional into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1357
2023-03-01 11:38:42 +00:00
Alexandre Riera cd026d79c3 Merge branch 'master' into hotFix-itemDiary-reloadCardConditional
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 11:22:41 +00:00
Alexandre Riera d744cbb1a3 hotFix itemDiary reload card conditional
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 12:22:01 +01:00
Alexandre Riera d2e7526a09 Merge pull request 'hotfix isTrucker was not in the params' (!1350) from hotfix-supplier-isTrucker into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1350
2023-02-28 13:58:02 +00:00
Guillermo Bonet 15f2f46e4c refs #4975 Traduction no branch
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 14:48:17 +01:00
Alexandre Riera 4d6a770b26 Merge branch 'master' into hotfix-supplier-isTrucker
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 13:39:45 +00:00
Guillermo Bonet 3afdee9a75 Merge pull request '4975-mdbUploadFixes' (!1349) from 4975-mdbUploadFixes into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1349
2023-02-28 13:39:25 +00:00
Alexandre Riera 3dd6232d6a hotfix isTrucker was not in the params
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-28 14:39:01 +01:00
Guillermo Bonet 656685cd7e refs #4975 Minor changes
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 14:35:34 +01:00
Juan Ferrer 9336d20e45 refs #4975 MdbVersion/upload fixes & code clean
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 13:45:36 +01:00
Alexandre Riera afef2e4d63 Merge pull request 'hotfix Balance crear pago' (!1345) from hotfix-balance-crearPago into master
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1345
2023-02-24 06:04:00 +00:00
Alexandre Riera bca9e757d4 hotfix parsed description array to string
gitea/salix/pipeline/head This commit looks good Details
2023-02-23 15:52:47 +01:00
Joan Sanchez 0997f8cd27 Merge pull request 'feat: add console.log' (!1340) from post_add_consoleLog into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1340
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-02-21 13:58:10 +00:00
Alex Moreno f0827c992b feat: add console.log
gitea/salix/pipeline/head This commit looks good Details
2023-02-21 14:53:35 +01:00
Joan Sanchez 71167ffa1f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-02-21 14:02:25 +01:00
Joan Sanchez 49c2ec7f9a fix(image): Enabled failOn option
gitea/salix/pipeline/head This commit looks good Details
Refs: #5266
2023-02-21 14:01:12 +01:00
Vicent Llopis a6dbc64ef6 Merge pull request 'hotfix_item.getVisible&Available' (!1339) from hotfix_item.getVisible&Available into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1339
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-02-21 12:04:27 +00:00
Vicent Llopis c30242f9cc fix: front test
gitea/salix/pipeline/head This commit looks good Details
2023-02-21 12:17:16 +01:00
Vicent Llopis eda70b009b fix: cuando haces F5 en cualquier sección que no sea Diary, te coge el warehouse por defecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-21 11:48:56 +01:00
Joan Sanchez ceab11cc41 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 13:33:34 +01:00
Vicent Llopis e57cef4e5c Merge pull request 'hotfix_test_item.avilable' (!1334) from hotfix_test_item.avilable into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1334
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-02-17 12:09:42 +00:00
Vicent Llopis 677840e7cf Merge pull request 'hotfix-item.tags_card_reload' (!1332) from hotfix-iten.tags_card_reload into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1332
2023-02-17 12:08:53 +00:00
Vicent Llopis c6304898b4 refactor: borrado insert, se ha hecho directamente sobre produccion
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 13:00:02 +01:00
Vicent Llopis 853e06f523 fix: card reload automatic
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 12:38:07 +01:00
Vicent Llopis af92aa60e9 Merge pull request '5097-item.summary_available' (!1312) from 5097-item.summary_available into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1312
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-02-17 08:54:22 +00:00
Vicent Llopis d25ebaec0b Merge branch 'dev' into 5097-item.summary_available
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 08:47:56 +00:00
Alexandre Riera c5fc4e4b81 Merge pull request 'hotFix #5194 cambios ticketFutureAdvance' (!1320) from 5194-cambios-ticketFutureAdvance into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1320
2023-02-16 14:05:43 +00:00
Alexandre Riera 4cae4448f6 refs #5194 moved invoiceOut to 230402
gitea/salix/pipeline/head This commit looks good Details
2023-02-16 14:45:11 +01:00
Alexandre Riera 8b088e831a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-16 14:43:51 +01:00
Alexandre Riera ef12a428cd Merge pull request 'hotFix #5223 Mostrar cliente compensado al enviar email' (!1327) from 5223-cliente-compensado into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1327
2023-02-16 13:40:33 +00:00
Alexandre Riera ec16a0d66c Merge branch '5194-cambios-ticketFutureAdvance' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance
gitea/salix/pipeline/head This commit looks good Details
2023-02-16 14:35:33 +01:00
Alexandre Riera 457fd3f5f9 refs #5194 sql moved to 230404 2023-02-16 14:35:03 +01:00
Joan Sanchez 3031ae2511 Updated version
gitea/salix/pipeline/head This commit looks good Details
2023-02-16 14:28:33 +01:00
Joan Sanchez acf5981a5f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-02-16 14:20:05 +01:00
Vicent Llopis 76f2030125 feat: add update sql
gitea/salix/pipeline/head This commit looks good Details
2023-02-16 09:50:25 +01:00
Vicent Llopis 3dd870f7df fix: test e2e
gitea/salix/pipeline/head This commit looks good Details
2023-02-16 09:44:20 +01:00
Vicent Llopis dc2ab50f65 fix: test e2e 2023-02-16 09:44:06 +01:00
Vicent Llopis bb2eddc462 fix: test front
gitea/salix/pipeline/head This commit looks good Details
2023-02-16 07:32:44 +01:00
Vicent Llopis 73ae45c2c0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-15 15:08:58 +01:00