Commit Graph

18164 Commits

Author SHA1 Message Date
Jorge Penadés 168eee764f Merge branch 'dev' into 6119-addMicrosipLink
gitea/salix/pipeline/head This commit looks good Details
2023-09-18 06:10:43 +00:00
Jorge Penadés 32a0aedf11 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink 2023-09-18 08:07:27 +02:00
Sergio De la torre 3782170b9e Merge pull request '5652-ItemTrash' (!1747) from 5652-ItemTrash into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1747
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-09-18 05:44:30 +00:00
Pablo Natek 55b53c86c4 refs #6213 formatfix
gitea/salix/pipeline/head This commit looks good Details
2023-09-18 07:38:31 +02:00
Guillermo Bonet 690df509d3 refs #5684 Fixed no error
gitea/salix/pipeline/head This commit looks good Details
2023-09-18 07:10:12 +02:00
Sergio De la torre 881a1ee0b8 refs #5652 modify: solved Tests
gitea/salix/pipeline/head This commit looks good Details
2023-09-15 11:24:17 +02:00
Carlos Satorres 0912bd40f3 refs #5660 sql fix
gitea/salix/pipeline/head This commit looks good Details
2023-09-15 09:15:48 +02:00
Sergio De la torre 0403c67bad Merge branch 'dev' into 5652-ItemTrash
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-15 05:47:00 +00:00
Carlos Satorres 2a1e828e14 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant 2023-09-15 07:30:46 +02:00
Pablo Natek 8d9dcb1f3e Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head This commit looks good Details
2023-09-14 16:37:04 +00:00
Pablo Natek 191b254acc Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-14 16:05:25 +00:00
Sergio De la torre b756d2f938 refs #5652 modify
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-14 18:03:30 +02:00
Sergio De la torre 0b39265d14 Merge pull request 'refs #6141feat:buyer model' (!1748) from 6141-model-Buyer into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1748
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-09-14 15:35:06 +00:00
Pablo Natek cf138a0814 Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head This commit looks good Details
2023-09-14 13:15:52 +00:00
Pablo Natek a44e5206a7 refs #6213 fixConcatBug
gitea/salix/pipeline/head This commit looks good Details
2023-09-14 14:18:00 +02:00
Sergio De la torre 3cf4168e76 Merge branch 'dev' into 6141-model-Buyer
gitea/salix/pipeline/head This commit looks good Details
2023-09-14 11:50:07 +00:00
Javi Gallego ca2257d29b subo version 2340
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-14 13:47:04 +02:00
Javi Gallego 0d78e5506b Merge pull request 'dev' (!1750) from dev into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1750
2023-09-14 11:40:17 +00:00
Javi Gallego 45d78307b9 Merge pull request 'move sql' (!1749) from fixSQL into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1749
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-09-14 11:33:36 +00:00
Carlos Satorres 11109d72a6 move sql
gitea/salix/pipeline/head This commit looks good Details
2023-09-14 11:36:09 +02:00
Javi Gallego eff0975eb2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-09-14 10:27:03 +02:00
Javi Gallego 82631d6fcd claimingRate divide por 100 2023-09-14 10:26:59 +02:00
Javi Gallego e1b03172fb Merge pull request 'test' (!1744) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1744
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-09-14 07:32:24 +00:00
Sergio De la torre 43f5bbb04e Merge branch 'dev' into 5652-ItemTrash
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-14 09:05:55 +02:00
Sergio De la torre 4c1ff2e4d7 refs #6141feat:buyer model
gitea/salix/pipeline/head This commit looks good Details
2023-09-14 08:27:49 +02:00
Sergio De la torre d2cd522842 refs #5652 modify:without fit
gitea/salix/pipeline/head This commit looks good Details
2023-09-14 07:47:10 +02:00
Pablo Natek 66e851b5ea refs #4131 changeStateRefactor
gitea/salix/pipeline/head This commit looks good Details
2023-09-13 19:48:58 +02:00
Pablo Natek 7ab8cb37cd ref #6213 fixformat
gitea/salix/pipeline/head This commit looks good Details
2023-09-13 19:22:21 +02:00
Pablo Natek f82af979ed refs #6213 fixTraductionFile
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-13 16:54:51 +02:00
Pablo Natek 72026332ba Merge branch 'dev' into 6213-supplierFixCreateErrors
gitea/salix/pipeline/head This commit looks good Details
2023-09-13 13:07:38 +00:00
Carlos Satorres a9b2aef27a refs #5660 join and value
gitea/salix/pipeline/head This commit looks good Details
2023-09-13 12:02:25 +02:00
Carlos Satorres 5536e06ed1 Merge pull request '4764-serviceAbono' (!1505) from 4764-serviceAbono into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1505
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-09-13 09:47:34 +00:00
Carlos Satorres 12dff3e248 Merge branch 'dev' into 4764-serviceAbono
gitea/salix/pipeline/head This commit looks good Details
2023-09-13 08:52:59 +00:00
Javi Gallego 7bd3bfddc3 fix sin bankEntity ya no falla
gitea/salix/pipeline/head This commit looks good Details
2023-09-13 07:07:22 +02:00
Pablo Natek e1cc254f82 Merge pull request 'refs #6131 constraint' (!1708) from 6131-duplicatedProvince into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1708
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-09-12 14:53:50 +00:00
Pablo Natek d9088885e7 Merge branch 'dev' into 6131-duplicatedProvince
gitea/salix/pipeline/head This commit looks good Details
2023-09-12 14:47:38 +00:00
Pablo Natek 740514c5a8 Merge branch 'dev' into 5749-autoincrement-zoneIncluded
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-12 13:46:58 +00:00
Javi Gallego e25e0aad63 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-12 15:44:12 +02:00
Javi Gallego f8149a988c e2e invoiceIn basicData fixed 2023-09-12 15:44:05 +02:00
Carlos Satorres 0ddcb57209 refs #5660 fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-09-12 10:40:10 +02:00
Sergio De la torre 1d25355423 refs #5652 fix:without fit
gitea/salix/pipeline/head This commit looks good Details
2023-09-12 08:44:42 +02:00
Pablo Natek 37c57af2ed Merge branch 'dev' into 6131-duplicatedProvince
gitea/salix/pipeline/head This commit looks good Details
2023-09-11 17:27:10 +00:00
Pablo Natek 1b158bea67 refs #6131 unique constraint country-name
gitea/salix/pipeline/head Build queued... Details
2023-09-11 19:28:05 +02:00
Pablo Natek 6a753d26af refs #6213 default account value
gitea/salix/pipeline/head This commit looks good Details
2023-09-11 18:28:47 +02:00
Javi Gallego 705505b931 fixes #4059 acl for address
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-11 16:24:47 +02:00
Sergio De la torre 5f5a0645be refs #5652 feat:itemTrash_new
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-11 16:16:49 +02:00
Carlos Satorres 49e635ff4b refs #5660 dump dumpedFixtures 2023-09-11 13:49:18 +02:00
Carlos Satorres d3e5e187e1 refs #5660 change acl 2023-09-11 13:46:52 +02:00
Pablo Natek cbaf6001a8 refs #6213 remove console log
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-11 12:36:42 +02:00
Pablo Natek ccfd8fad05 refs #6213 fixCreateError
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-11 12:32:46 +02:00