Commit Graph

12489 Commits

Author SHA1 Message Date
Vicent Llopis 537c383cd2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk
gitea/salix/pipeline/head This commit looks good Details
2022-07-29 13:38:23 +02:00
Vicent Llopis 224ea61a62 fix: delete warehouseFk from itemType model
gitea/salix/pipeline/head This commit looks good Details
2022-07-29 13:07:25 +02:00
Vicent Llopis 840e792d13 fix: backTest
gitea/salix/pipeline/head This commit is unstable Details
2022-07-29 12:52:53 +02:00
Vicent Llopis 605da52286 fix: replace it.warehouseFk by userConfig.warehouseFk
gitea/salix/pipeline/head This commit is unstable Details
2022-07-29 12:22:03 +02:00
Vicent Llopis 21701601e3 fix: update frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-07-27 13:01:03 +02:00
Vicent Llopis 3bf7efea16 feat: add phone extension and personal phone. Update bussiness phone
gitea/salix/pipeline/head This commit looks good Details
2022-07-27 12:16:41 +02:00
Joan Sanchez d793dc3e09 Merge pull request '4348-rocketChat_2.0' (#1033) from 4348-rocketChat_2.0 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1033
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-07-27 07:38:14 +00:00
Vicent Llopis e5349ec7ed fix: send messages to channels
gitea/salix/pipeline/head This commit looks good Details
2022-07-27 09:16:49 +02:00
Joan Sanchez 468da0c5a9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-27 08:12:06 +02:00
Joan Sanchez 882c4cc3d7 fix(insurance): force script execution
gitea/salix/pipeline/head This commit looks good Details
2022-07-26 13:19:57 +02:00
Joan Sanchez a0ad26faa8 Merge pull request '4348-rocketChat' (#1032) from 4348-rocketChat into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1032
2022-07-26 11:07:12 +00:00
Vicent Llopis 3fd289ff51 update chat
gitea/salix/pipeline/head Build queued... Details
2022-07-26 13:03:03 +02:00
Joan Sanchez e916915435 Updated to POST
gitea/salix/pipeline/head This commit looks good Details
2022-07-26 12:08:38 +02:00
Joan Sanchez bbae986424 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-07-26 12:06:37 +02:00
Joan Sanchez f4825488c6 refactor(Tasks API): ghanged method to GET
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-07-26 11:47:43 +02:00
Joan Sanchez 24f87afa51 Updated package version
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-26 10:36:18 +02:00
Carlos Jimenez Ruiz b8183748ce Merge branch 'dev' into 1781-zoneHoliday
gitea/salix/pipeline/head This commit looks good Details
2022-07-22 13:58:52 +00:00
Carlos Jimenez Ruiz f13eac40a7 Merge pull request '4091-dms_clean' (#1028) from 4091-dms_clean into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1028
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-07-22 13:58:24 +00:00
Carlos Jimenez Ruiz f3766edbb7 Merge branch 'dev' into 1781-zoneHoliday
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-22 13:56:19 +00:00
Vicent Llopis 7ad555c73f restart backTest Jenkins
gitea/salix/pipeline/head This commit looks good Details
2022-07-22 13:59:36 +02:00
Vicent Llopis 7809d9dd7e fix: typo
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-22 13:41:18 +02:00
Vicent Llopis fc6e51e91f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4091-dms_clean 2022-07-22 13:41:02 +02:00
Vicent Llopis a90bea2328 fix: typo
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-22 13:37:48 +02:00
Vicent Llopis b3137ef399 delete translate
gitea/salix/pipeline/head Build queued... Details
2022-07-22 13:37:21 +02:00
Vicent Llopis 9bd3daf71c feat: add translate 2022-07-22 13:36:44 +02:00
Vicent Llopis 4076f2908e refactor: change type of params in endpoints
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-22 13:35:18 +02:00
Vicent Llopis b886a7e0da feat: add translate 2022-07-22 13:35:00 +02:00
Vicent Llopis cde4da01c5 delete translations
gitea/salix/pipeline/head This commit looks good Details
2022-07-22 13:14:20 +02:00
Vicent Llopis ab0f1b2c60 fix: restore translations
gitea/salix/pipeline/head This commit looks good Details
2022-07-22 13:13:12 +02:00
Vicent Llopis 465a5e4d73 refactor: mo ve folder of sql chagues 2022-07-22 13:12:54 +02:00
Carlos Jimenez Ruiz 7d7365c4f3 Merge branch 'dev' into 4270-route.create
gitea/salix/pipeline/head This commit looks good Details
2022-07-22 11:07:08 +00:00
Carlos Jimenez Ruiz e8d5f31283 Merge pull request '4221-intrastat' (#1022) from 4221-intrastat into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1022
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-07-22 11:05:53 +00:00
Vicent Llopis 8ea09a0449 jenkins testBack
gitea/salix/pipeline/head This commit looks good Details
2022-07-21 14:08:18 +02:00
Vicent Llopis 5491fce0c6 fix: musn't delete files on test enviroment
gitea/salix/pipeline/head This commit looks good Details
2022-07-21 13:16:30 +02:00
Vicent Llopis 9035123c53 feat: update structure
gitea/salix/pipeline/head This commit is unstable Details
2022-07-21 10:36:21 +02:00
Vicent Llopis 5446c960fb fix: frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-07-21 10:11:31 +02:00
Vicent Llopis 699f19b0d4 refactor: change invoice id by refFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-21 10:05:37 +02:00
Vicent Llopis cb3e488df9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4221-intrastat
gitea/salix/pipeline/head This commit looks good Details
2022-07-20 14:12:08 +02:00
Vicent Llopis 26f8996936 refactor: set vn-focus and move sql to new folder
gitea/salix/pipeline/head This commit looks good Details
2022-07-20 14:02:15 +02:00
Vicent Llopis af4e7be229 feat: add frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-07-20 13:41:33 +02:00
Vicent Llopis 771c86ba4b fix: shelving log
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-20 12:40:30 +02:00
Vicent Llopis a0ea3b4c03 delete unnecessary sql
gitea/salix/pipeline/head This commit looks good Details
2022-07-19 14:47:05 +02:00
Vicent Llopis b4408dc080 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4270-route.create
gitea/salix/pipeline/head This commit looks good Details
2022-07-19 14:42:43 +02:00
Vicent Llopis 318b688b67 fix: typo errors
gitea/salix/pipeline/head This commit looks good Details
2022-07-19 14:40:41 +02:00
Vicent Llopis 28deb34047 refactor: update translation 2022-07-19 14:40:23 +02:00
Vicent Llopis 7434532636 feat: add translate
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-19 13:38:06 +02:00
Vicent Llopis c56ac1c192 feat: add log
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-19 13:35:17 +02:00
Vicent Llopis 2a41c1bb93 update foreign key
gitea/salix/pipeline/head This commit looks good Details
2022-07-19 12:44:55 +02:00
Vicent Llopis 1be0e9b7a9 feat: delete dms trash file
gitea/salix/pipeline/head This commit looks good Details
2022-07-19 12:40:52 +02:00
Carlos Jimenez Ruiz f1c3a3f721 Merge pull request '4294-fix(zone): fix getEventsFiltered' (#1025) from 4294-zone_getEventsFiltered into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1025
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-07-15 12:53:09 +00:00