Commit Graph

4905 Commits

Author SHA1 Message Date
Pau 600dd7a434 Created the model and UI 2022-10-05 11:52:14 +02:00
Joan Sanchez e4b61f81a9 Merge pull request '#4226-remove-density' (#1066) from #4226-remove-density into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1066
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-10-03 07:41:58 +00:00
Javi Gallego eb48685484 selectores reparados
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-30 14:55:31 +02:00
Joan Sanchez 7fd4728c33 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-09-30 14:13:16 +02:00
Joan Sanchez 4005d6f82a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2022-09-30 13:55:53 +02:00
Joan Sanchez 4172229051 Closure hotfix
gitea/salix/pipeline/head This commit looks good Details
2022-09-29 09:35:57 +02:00
Joan Sanchez ae2bc91cb5 Merge pull request '4505-clonar-foto-weightByPiece' (#1067) from 4505-clonar-foto-weightByPiece into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1067
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-28 06:38:46 +00:00
Joan Sanchez 93f5bf089d Merge pull request '4291-fix(vnInputTime): quit new date(null)' (#1031) from 4291-vnInputTime into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1031
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-28 06:10:55 +00:00
Pau 901007d34b change test case to expect the image to be defined
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 13:58:27 +02:00
Pau 2dd6de1d47 Modified Fixtures, clone.js and the item model
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 13:46:23 +02:00
Javi Gallego a662bb90a2 Merge branch 'dev' into #4226-remove-density
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 09:32:48 +02:00
Pau 26a16bf846 ACL para sector,añadido sector al model-config
gitea/salix/pipeline/head This commit looks good Details
2022-09-23 13:53:33 +02:00
Pau 620162aec7 Añadido el modelo de sector a shelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-23 12:24:11 +02:00
Joan Sanchez 284524e3fa Merge pull request '4358-financialBoss' (#1054) from 4358-financialBoss into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1054
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-21 06:49:44 +00:00
Joan Sanchez fcce73086e Merge pull request '2805-fix(entry_latestBuys): save chekeds when crudModel load more data' (#1045) from 2805-entry_latestBuy_saveChekeds into dev
Reviewed-on: #1045
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-21 06:47:29 +00:00
Joan Sanchez 5d6459d565 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-09-21 08:37:20 +02:00
Alex Moreno 55d6dacebb test(ticket_listPackaging):enable back test
gitea/salix/pipeline/head This commit looks good Details
2022-09-19 10:11:44 +02:00
Alex Moreno b3aaa493d5 fix(): fix fixtures and all code needed for change the structure
gitea/salix/pipeline/head This commit looks good Details
2022-09-19 09:45:28 +02:00
Joan Sanchez fe71e485aa Merge pull request '4545-route.basic-data_vehicle' (#1055) from 4545-route.basic-data_vehicle into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1055
2022-09-16 07:15:41 +00:00
Joan Sanchez 9f9581c722 Merge pull request '4464-zone.log_excludeEvent' (#1048) from 4464-zone.log_excludeEvent into dev
Reviewed-on: #1048
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-16 07:12:41 +00:00
Joan Sanchez 1b09f3bf7f Merge pull request '4139-refactor(travel_extra-community): use smart-table, fix scroll' (#1052) from 4139-travel_extra-community_refactor into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #1052
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-16 07:11:59 +00:00
Joan Sanchez f9f09440ec Merge pull request '4363-refactor(item_waste): refactor table and add totals in table_head' (#1053) from 4363-item_waste_refactor into dev
gitea/salix/pipeline/head This commit is unstable Details
Reviewed-on: #1053
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-16 07:10:48 +00:00
Alex Moreno 54b41faf12 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4358-financialBoss
gitea/salix/pipeline/head This commit is unstable Details
2022-09-16 08:55:39 +02:00
Vicent Llopis f5bbe3a9ac fix: scope updated
gitea/salix/pipeline/head This commit is unstable Details
2022-09-15 11:55:07 +02:00
Joan 90229112e9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-09-15 06:35:03 +00:00
Alex Moreno e72c0ae919 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-vnInputTime
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 13:09:00 +02:00
Alex Moreno 06eab58b3d is agency
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 12:45:40 +02:00
Alex Moreno 8c984b5ebe refactor(client): change rol manager to financialBoss
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 12:32:19 +02:00
Alex Moreno 6b252f7e33 refactor(item_waste): refactor table and add totals in table_head
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 10:13:30 +02:00
Alex Moreno 49a7a05310 feat(travel_extra-community): add vn-anchor
gitea/salix/pipeline/head This commit looks good Details
2022-09-14 08:08:07 +02:00
Alex Moreno 2b101cf7c1 refactor(travel_extra-community): use smart-table, fix scroll
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 15:11:14 +02:00
Vicent Llopis a6a5a84add fix: incorrect name of function
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 14:42:15 +02:00
Joan Sanchez 5a46444875 Use POST request method instead of GET
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 13:53:44 +02:00
Joan Sanchez 5cff983d4c Merge pull request 'regularizado' (#1040) from #4432-salesBoss-por-salesTeamBoss into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1040
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-13 10:33:04 +00:00
Vicent Llopis 6e31865add Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4464-zone.log_excludeEvent
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 12:17:30 +02:00
Vicent Llopis cc6ba8712c feat: log when a day is excluded
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 12:15:28 +02:00
Joan Sanchez 1f850d13e9 Merge pull request '4291-delete_it.warehouseFk' (#1035) from 4291-delete_it.warehouseFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1035
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-13 10:00:36 +00:00
Vicent Llopis 1fd97f167c 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-09-13 11:35:15 +02:00
Vicent Llopis b02aa8466c fix: tfront
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 10:27:17 +02:00
Vicent Llopis 8c6c7345cd fix: change GET by POST, to solve "Request Header Fields Too Large" 2022-09-13 10:27:08 +02:00
Joan Sanchez 3210f91bf7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-09-12 12:20:49 +02:00
Joan Sanchez de3e14e739 4514 - Write permissions for rrhh
gitea/salix/pipeline/head This commit looks good Details
2022-09-12 10:23:17 +02:00
Joan Sanchez faa3865da1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-09-09 11:53:57 +02:00
Alex Moreno c9721f4c7f fix(entry_latestBuys): save chekeds when crudModel load more data
gitea/salix/pipeline/head This commit looks good Details
2022-09-08 14:52:43 +02:00
Alex Moreno a15c051098 fix(monitor_salesFilter): mariadb not optimize query
gitea/salix/pipeline/head This commit looks good Details
2022-09-08 08:07:46 +02:00
Javi Gallego f0a9441e1f Merge branch 'dev' into #4226-remove-density
gitea/salix/pipeline/head This commit is unstable Details
2022-09-07 11:31:47 +02:00
Alex Moreno 886abfd897 fix(monitor): fix left join salesFilter
gitea/salix/pipeline/head This commit looks good Details
2022-09-07 08:49:24 +02:00
Alex Moreno 6fcb1e54b4 refactor(claim_action): set translations
gitea/salix/pipeline/head This commit looks good Details
2022-09-06 09:35:01 +02:00
Javi Gallego 9fe32788fc regularizado
gitea/salix/pipeline/head This commit looks good Details
2022-08-24 14:38:05 +02:00
Javi Gallego 5cf102c7fd sustituido density por weightByPiece
gitea/salix/pipeline/head This commit is unstable Details
2022-08-24 14:13:26 +02:00