Commit Graph

20721 Commits

Author SHA1 Message Date
Sergio De la torre c10e8d6733 Merge branch 'dev' into 6964_itemOlder
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-22 10:43:39 +00:00
Sergio De la torre 976c5b7ba8 refs #6964 feat:advice for olderItem
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-22 11:42:19 +01:00
Guillermo Bonet bda80e03ee Hotfix item_getSimilar
gitea/salix/pipeline/head This commit looks good Details
2024-03-22 11:36:26 +01:00
Pako Natek 6ad6c88c2c Merge pull request 'floranet' (!2042) from 6021-floranet into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2042
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-03-22 10:20:03 +00:00
Pablo Natek 531bd9ef80 Merge branch 'dev' into 6021-floranet
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-22 10:17:49 +00:00
Pako Natek 214aff403a delete fixtures local
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-22 11:09:49 +01:00
Pako Natek 8fd7792e7c gitignore
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-22 11:05:48 +01:00
Jon Elias 595b86b33e refs #6556 fixed hash changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-22 10:10:40 +01:00
Sergio De la torre 4dca49360e Merge branch 'dev' into 6964_itemOlder
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-22 09:10:32 +00:00
Sergio De la torre 027aa86662 refs #6964 feat:advice for olderItem
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-22 10:08:20 +01:00
Carlos Satorres 641d7c0918 Merge pull request 'ref #5034 remove e2e' (!2193) from 5034-removeE2Econnection into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2193
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-03-22 08:38:42 +00:00
Jon Elias c49b8bf954 refactor: refs #6556 minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-22 09:35:09 +01:00
Carlos Satorres 1ad65d9925 Merge branch 'dev' into 5034-removeE2Econnection
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-22 08:34:16 +00:00
Jon Elias eadd8f750d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6556-ChangeImages 2024-03-22 08:22:49 +01:00
Guillermo Bonet 17f6327339 Merge pull request 'fix: refs #7018 Fix invoiceInTax_recalc' (!2192) from 7018-invoiceInTax_rec into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2192
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-22 06:38:50 +00:00
Guillermo Bonet 9e62db6d01 Merge pull request 'refactor: refs #6923 Deteted procs' (!2180) from 6923-migratedProcs into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2180
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-03-22 06:12:48 +00:00
Sergio De la torre 0116389290 Merge branch 'master' into 6276-newWarehouse-salix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-22 06:01:17 +00:00
Sergio De la torre 9e5e49c28f refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-22 06:56:27 +01:00
Carlos Satorres ca0d269ee2 refs #6074 remove isBlocked
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 15:02:09 +01:00
Guillermo Bonet 84056e3c2a Merge branch 'dev' into 7018-invoiceInTax_rec
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 14:57:47 +01:00
Guillermo Bonet 122fe7eecd Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev Build started... Details
2024-03-21 14:46:09 +01:00
Jorge Penadés 17ed853e09 Merge branch 'master' into 6085-hotFix-addOwnedAlias
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 12:51:06 +00:00
Guillermo Bonet 6dff42a45d Merge pull request 'ticket #167473 Hotfix' (!2191) from ticket167473-hotfix into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2191
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-21 12:45:28 +00:00
Jorge Penadés d8aad86c92 feat: refs #6085 add acl authenticated
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 13:42:02 +01:00
Robert Ferrús 9795f449b9 Merge branch 'dev' into 6738-cleanTables2008Part2to2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 12:23:06 +00:00
Guillermo Bonet 2b26153bfa refactor: refs #7018 Requested changes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 12:52:04 +01:00
Carlos Satorres ece94c2bd1 ref #5034 remove e2e
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 12:39:39 +01:00
Guillermo Bonet ee67820c20 refactor: refs #7018 Fix invoiceInTax_recalc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 12:14:48 +01:00
Guillermo Bonet 535dd40625 fix: refs #7018 Fix invoiceInTax_recalc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 12:06:59 +01:00
Sergio De la torre 2a976664ec refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 12:05:34 +01:00
Ivan Mas 268c63ce8f Merge pull request 'refs #6498 procRefactor6' (!2134) from 6499-procRefactor6 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2134
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-03-21 11:03:32 +00:00
Sergio De la torre 5135bee2d2 refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 12:02:57 +01:00
Ivan Mas c33c90aefe Merge branch 'dev' into 6499-procRefactor6
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 10:39:05 +00:00
Guillermo Bonet d0067c8096 ticket #167473 Hotfix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 11:30:10 +01:00
Sergio De la torre d8da317339 Merge branch 'dev' into 6964_itemOlder
gitea/salix/pipeline/pr-dev Build started... Details
2024-03-21 10:10:57 +00:00
Javi Gallego a24d38128b feat: #7013 muestra solo clientes asegurados
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-03-21 10:48:43 +01:00
Javi Gallego c46e7227e7 feat: #7013 solo muestra clientes asegurados 2024-03-21 10:40:30 +01:00
Sergio De la torre 1d37d3d8bf refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 10:33:49 +01:00
Sergio De la torre 3fbf32bd52 refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-21 10:32:36 +01:00
Pablo Natek 130fb68d27 Merge pull request 'feat: refs #6302 delete after add to turn' (!2187) from 6302-delete-ticket-after-add-to-turn into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2187
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-21 09:28:39 +00:00
Javi Gallego 20a338f746 feat: #7120 specialPrice with new fiels 2024-03-21 10:25:08 +01:00
Ivan Mas db71e69317 Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 09:21:32 +00:00
Sergio De la torre 9eee26cbe9 refs #6276 feat:newWarehouse
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-21 10:18:54 +01:00
Guillermo Bonet 1cd495df06 fix: refs #7018 Fix invoiceInTax_recalc
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-03-21 09:25:33 +01:00
Guillermo Bonet 844291fec9 Merge branch 'dev' into 6923-migratedProcs
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-21 07:20:23 +00:00
Guillermo Bonet 2f87ba03b2 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-21 08:16:44 +01:00
Guillermo Bonet bbbd212547 build: refs #5846 HOTFIX Myt updated
gitea/salix/pipeline/head This commit looks good Details
2024-03-21 08:14:59 +01:00
Guillermo Bonet de83cef68c build: refs #5846 HOTFIX Myt updated
gitea/salix/pipeline/head There was a failure building this commit Details
2024-03-21 08:01:27 +01:00
Alex Moreno b087c35a36 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-21 08:01:05 +01:00
Alex Moreno 60ebe31b3f Merge pull request '2412_testToMaster' (!2185) from 2412_testToMaster into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2185
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-03-21 06:00:09 +00:00