Commit Graph

12709 Commits

Author SHA1 Message Date
Vicent Llopis b5db025106 refactor: move sql to new folder
gitea/salix/pipeline/head This commit looks good Details
2022-05-26 07:41:00 +02:00
Alex Moreno 79c42d04f9 feat(mdb): start section
gitea/salix/pipeline/head This commit is unstable Details
2022-05-25 14:59:28 +02:00
Carlos Jimenez Ruiz f66e5fac9e Merge pull request '4109-duplicated_folder' (#983) from 4109-duplicated_folder into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #983
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-05-25 07:53:56 +00:00
Carlos Jimenez Ruiz 402aa567dd Merge branch 'dev' into 4109-duplicated_folder
gitea/salix/pipeline/head This commit looks good Details
2022-05-25 07:39:42 +00:00
Carlos Jimenez Ruiz 00fc060bed Merge pull request '2470-account_e2e' (#980) from 2470-account_e2e into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #980
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-05-25 07:32:15 +00:00
Vicent Llopis a907354cc3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-25 09:03:52 +02:00
Alex Moreno 1b061852d2 fix e2e
gitea/salix/pipeline/head This commit looks good Details
2022-05-25 08:27:26 +02:00
Vicent Llopis 4baf1afb83 fix: show videos in claim.summary
gitea/salix/pipeline/head This commit looks good Details
2022-05-25 07:51:47 +02:00
Alex Moreno 316bd56acc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2470-account_e2e
gitea/salix/pipeline/head This commit looks good Details
2022-05-25 07:35:59 +02:00
Joan Sanchez 0cf8ee3edf Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-05-24 15:06:32 +02:00
Joan Sanchez 2ec03a5b99 Merge pull request '4049-hotFix_changesWithReferenceTable' (#984) from 4049-hotFix_changesWithReferenceTable into master
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
Reviewed-on: #984
2022-05-24 13:03:32 +00:00
Joan Sanchez f9b9dfaf4b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-24 14:54:06 +02:00
Alex Moreno 47ab4fc2c1 intro
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-24 14:52:26 +02:00
Alex Moreno 7a69d53642 fix(changes): add reference table
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-24 14:50:33 +02:00
Vicent Llopis 880f3ce647 refactor: move acl to new folder
gitea/salix/pipeline/head This commit looks good Details
2022-05-24 14:44:18 +02:00
Vicent Llopis 5880efe966 refator: commented code deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-24 12:51:00 +02:00
Vicent Llopis f00fb0dc3f feat: add new module shelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-24 12:50:22 +02:00
Vicent Llopis 99c7ad1c1b refactor: delete section shelving from client 2022-05-24 12:50:06 +02:00
Joan Sanchez caa9a63c4c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2022-05-24 08:45:37 +02:00
Carlos Jimenez Ruiz 1808eee9ab Merge pull request '4022-client.balance.create' (#976) from 4022-client.balance.create into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #976
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-05-23 12:52:21 +00:00
Carlos Jimenez Ruiz c721d9ae82 Merge branch 'dev' into 4022-client.balance.create
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:43:00 +00:00
Carlos Jimenez Ruiz 3dd872c720 Merge pull request '3870-models' (#975) from 3870-models into dev
gitea/salix/pipeline/head This commit is unstable Details
Reviewed-on: #975
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-05-23 12:42:28 +00:00
Carlos Jimenez Ruiz a76dd11825 Merge branch 'dev' into 3870-models
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:33:08 +00:00
Carlos Jimenez Ruiz 79a75dcfa5 Merge pull request '4002-item.itemType' (#974) from 4002-item.itemType into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #974
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-05-23 12:31:20 +00:00
Vicent Llopis ab6a0425f5 refactor: translate fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:47:43 +02:00
Vicent Llopis db7638f153 refactor: sectorFk property deleted
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:45:20 +02:00
Vicent Llopis 9bbdeb2840 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:41:01 +02:00
Vicent Llopis 1b3f0ee026 refactor: added itemPackingType and temperature relations
gitea/salix/pipeline/head This commit is unstable Details
2022-05-23 12:40:11 +02:00
Carlos Jimenez Ruiz 150507ea1e Merge pull request '3905-invoice-out_refund' (#949) from 3905-invoice-out_refund into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #949
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-05-20 11:36:12 +00:00
Vicent Llopis 9736a68dd9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4022-client.balance.create
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 13:16:58 +02:00
Vicent Llopis 875e9503c3 refactor: request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 13:16:47 +02:00
Vicent Llopis a043c5d346 refactor: request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 13:10:48 +02:00
Carlos Jimenez Ruiz d86ac41b70 Merge branch 'dev' into 3905-invoice-out_refund
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 10:54:08 +00:00
Carlos Jimenez Ruiz ae87373c6f Merge pull request '4082-zone.basic-data' (#982) from 4082-zone.basic-data into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #982
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-05-20 10:53:40 +00:00
Vicent Llopis f4b080243c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 12:53:23 +02:00
Vicent Llopis c9bfbe990a refactor: request changues
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 12:53:10 +02:00
Vicent Llopis fd80fc58fc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 12:33:23 +02:00
Vicent Llopis 3c9800a7a3 refactor: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 12:33:12 +02:00
Joan Sanchez 4d093d37bd Merge branch 'dev' into 3905-invoice-out_refund
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 10:22:48 +00:00
Carlos Jimenez Ruiz b3c0aa7933 Merge branch 'dev' into 4082-zone.basic-data
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 10:19:00 +00:00
Carlos Jimenez Ruiz 6c20f37211 Merge pull request '4065-delete_sms.destinationFk' (#977) from 4065-delete_sms.destinationFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #977
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-05-20 10:17:59 +00:00
Vicent Llopis c125fd54eb refactor: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 12:08:12 +02:00
Vicent Llopis 0425b17b4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3905-invoice-out_refund 2022-05-20 11:57:20 +02:00
Vicent Llopis 69e12e0dd8 refactor: 'bonus' can be a negative value
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 09:21:33 +02:00
Vicent Llopis c5683ab880 feat: added itemShelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-20 09:17:18 +02:00
Alex Moreno 3650567caf test(account): e2e for ldap and samba
gitea/salix/pipeline/head This commit looks good Details
2022-05-19 15:02:39 +02:00
Joan Sanchez 6586595976 feat(closure): send incoterms authorization
gitea/salix/pipeline/head This commit is unstable Details
2022-05-19 07:31:00 +02:00
Alex Moreno 68c94ec3c1 typo
gitea/salix/pipeline/head This commit looks good Details
2022-05-18 15:02:06 +02:00
Alex Moreno 34bcdf1bd3 test(account): acl, connections and accounts secctions
gitea/salix/pipeline/head This commit looks good Details
2022-05-18 14:01:30 +02:00
Joan Sanchez e294582039 Merge pull request '4058-fix(entry_latest-buys): fix multi_check_TEST' (#978) from 4058-multi-check_fix into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #978
2022-05-18 08:24:54 +00:00