Commit Graph

16986 Commits

Author SHA1 Message Date
Alex Moreno 2f6c988005 Merge branch 'dev' into 5983_inventory_parking
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 13:53:17 +00:00
Sergio De la torre 49c656928e refs #5983 feat(itemShelving): add visible
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 15:43:11 +02:00
Carlos Satorres bd723bb7ba refs #5824 mod ng
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-18 15:01:58 +02:00
Alex Moreno f07ac89cb6 refs #5976 add custom error
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-18 15:01:04 +02:00
Vicent Llopis d3165fcdc7 refs #5849 fix: tback
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 14:25:53 +02:00
Vicent Llopis 4c7f42acb5 a
gitea/salix/pipeline/head Build queued... Details
2023-07-18 14:17:07 +02:00
Vicent Llopis 7bd378e9dd refs #
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-18 14:15:56 +02:00
Sergio De la torre 9076553070 refs #5983 test(itemShelving): add getInventory
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 14:11:50 +02:00
Vicent Llopis 3e8775149a refs #5934 feat: change icon
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 13:02:42 +02:00
Vicent Llopis b3a7a170f0 refs #5934 feat: añadido clientSms log
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-18 11:54:43 +02:00
Sergio De la torre 93da129239 refs #5983 feat(itemShelving): add getInventory
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 08:54:45 +02:00
Guillermo Bonet b285c3e37a Merge pull request 'refs #5819 Added param to call zone_getLeaves' (!1667) from 5819-zone_getLeaves into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1667
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-07-18 06:40:50 +00:00
Vicent Llopis 09b00401ec Merge branch 'dev' into 4734-addViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 05:56:35 +00:00
Vicent Llopis 834e4b3723 refs #4734 refactor: variables definindas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-18 07:56:44 +02:00
Guillermo Bonet 3c013110d3 refs #5819 Changed structure sql
gitea/salix/pipeline/head This commit looks good Details
2023-07-18 07:32:45 +02:00
Carlos Satorres 47e8fab8d9 refs remove
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 19:51:46 +02:00
Alex Moreno 15dee8bef4 refs #5976 refactor: transaferSale call setDeleted
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 15:19:36 +02:00
Alex Moreno 125d908c5d refs #5762 uncomment
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 14:41:15 +02:00
Alex Moreno d2120cdc3d refs #5762 feat: multiplatform recover-password and change-password
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 14:24:50 +02:00
Carlos Satorres 52f58a92c8 refs err.sqlMessage
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 14:11:05 +02:00
Carlos Satorres a5d1c68511 change err and traduction
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 14:07:45 +02:00
Carlos Satorres 10e726c486 move vehicleInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 13:51:16 +02:00
Carlos Satorres f24aa2c801 pop vehicle error
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 13:27:27 +02:00
Carlos Satorres 6f3cdd3508 refs #5640 fix e2e back
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-17 12:30:48 +02:00
Alex Moreno ad5c021832 refs #5941 duplicate code
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 07:10:26 +02:00
Alex Moreno 858a3a3a45 refs #5941 typo
gitea/salix/pipeline/head This commit looks good Details
2023-07-17 07:09:31 +02:00
Alex Moreno 9097a1dc28 refs #5941 feat: sendToSuppor component and fix CSS and JSON format
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 14:30:08 +02:00
Carlos Satorres b2b335326e Merge branch 'dev' into 5066-vehicleSorted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 11:49:26 +00:00
Carlos Satorres b113052b5c refs #5640 fixtures and test fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 13:48:36 +02:00
Carlos Satorres 96da32edec Merge branch '5640-mayusFiscalDate' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 13:35:16 +02:00
Carlos Satorres 87f125453d refs #5640 fix mayus quit function 2023-07-14 13:35:13 +02:00
Vicent Llopis 06690ca71e Merge pull request 'hotfix_workCenter2' (!1669) from hotfix_workCenter2 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1669
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-07-14 11:34:49 +00:00
Carlos Satorres fa3745820d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate 2023-07-14 13:20:19 +02:00
Vicent Llopis 6980392ba1 fix: tabulacion
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 13:11:09 +02:00
Carlos Satorres 93387cae62 refs #5837 if isSocialNameUnique
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 13:07:40 +02:00
Vicent Llopis 28eedbfd23 Merge branch 'dev' into 5561-ticket.sale-tracking_cambiandoCrudModel
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 11:04:06 +00:00
Vicent Llopis 5716acaa3c fix: test
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 13:01:31 +02:00
Vicent Llopis 4f183d1c6a fix: worker.basic-data el boton guardar estava activo al hacer F5
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 12:18:41 +02:00
Vicent Llopis 4a7cfe9122 fix: workCenter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 11:51:15 +02:00
Carlos Satorres 765c22df96 refs #5837 new table
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 11:30:13 +02:00
Carlos Satorres 6d8b3e346d refs #5837 fix filter existingClient France
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 09:40:16 +02:00
Carlos Satorres 5ffa8b8910 Merge pull request '5999-defaultCountry' (!1665) from 5999-defaultCountry into master
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1665
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-07-14 07:38:23 +00:00
Carlos Satorres 190db79019 Merge branch 'master' into 5999-defaultCountry
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 07:34:27 +00:00
Carlos Satorres 575d7710a6 Merge pull request 'refs #5964 fix supply' (!1666) from 5964-supplyFixValidation into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1666
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-07-14 07:29:22 +00:00
Alex Moreno 7881385f4b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5941-send-to-support 2023-07-14 07:53:40 +02:00
Alex Moreno 29a4c51518 Merge branch 'master' into 5964-supplyFixValidation
gitea/salix/pipeline/head This commit looks good Details
2023-07-14 05:34:18 +00:00
Guillermo Bonet 765a84e2eb refs #5819 Added param to call zone_getLeaves
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-14 07:27:04 +02:00
Carlos Satorres 0d308ec8ad Merge pull request 'refs #5949 itemRecycle' (!1656) from 5949-recycledPlasticItem into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1656
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-07-13 11:59:30 +00:00
Carlos Satorres 173ed251c3 refs #5964 fix supply
gitea/salix/pipeline/head There was a failure building this commit Details
2023-07-13 13:45:07 +02:00
Alex Moreno 4632ed298d Merge branch 'master' into 5999-defaultCountry
gitea/salix/pipeline/head This commit looks good Details
2023-07-13 11:41:40 +00:00