Commit Graph

3128 Commits

Author SHA1 Message Date
Javier Segarra 1c435725f2 Merge branch 'dev' into feature/ItemFamily 2024-04-29 08:23:11 +02:00
Javier Segarra 9a840c9cee Merge branch 'dev' into feature/ItemFamily
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-29 06:03:50 +00:00
Javier Segarra 4d0b9707cf Merge pull request 'feature/ItemListFilter' (!324) from hyervoni/salix-front-mindshore:feature/ItemListFilter into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #324
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-29 06:02:41 +00:00
Javier Segarra f83ef4eb4c Merge branch 'dev' into feature/ItemListFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-29 06:02:02 +00:00
Alex Moreno fdd088955b Merge pull request 'Item Barcode' (!333) from hyervoni/salix-front-mindshore:feature/ItemBarCode into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #333
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-29 05:24:59 +00:00
William Buezas 322ad816b9 item diary 2024-04-28 19:37:44 -03:00
Javier Segarra 1e1c88e55c fix: reset fieldFilter.value when change model
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 21:05:45 +02:00
William Buezas ce55109dd3 fix more fields label when selected
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 15:41:03 -03:00
William Buezas 4282463e51 Fill filter fields with user params
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 14:29:11 -03:00
William Buezas ad085974da remove console.log
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 13:51:20 -03:00
William Buezas 4792485214 Translate more fields label
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 13:50:39 -03:00
Javier Segarra 955e196882 fix: filterPanelbug
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 17:43:57 +02:00
Javier Segarra a03049a721 fix: poc 2024-04-26 17:26:18 +02:00
William Buezas dc0f4fb40e resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 10:37:19 -03:00
Javier Segarra 0d50944c2d fix: add exprBuilder
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 15:24:44 +02:00
Javier Segarra c1ed4ab032 fix: add exprBuilder
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 14:49:54 +02:00
William Buezas 485e916f55 Add input focus 2024-04-26 09:16:26 -03:00
Carlos Satorres 76cd79173c refs #7172 fix select
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 13:50:11 +02:00
Javier Segarra 127567898d fix: add filter panel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 13:27:58 +02:00
Alex Moreno 88e1e577c4 hotFix: refs #6636 fix ref optionsList
gitea/salix-front/pipeline/head This commit looks good Details
2024-04-26 13:10:29 +02:00
William Buezas cf193b07c5 Item tax 2024-04-26 08:02:17 -03:00
Javier Segarra 2deeada1f5 Merge remote-tracking branch 'origin/dev' into fix_Customer_1
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 12:50:46 +02:00
Javier Segarra 95fded4a83 Merge branch 'dev' into feature/ItemListFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 10:49:20 +00:00
Javier Casado 8864048a56 Merge branch 'dev' into 6641-myTeamFilterClaim
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 09:14:54 +00:00
Jon Elias 8e4429a28c Merge branch 'dev' into 6767-deleteDivCol
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 07:48:23 +00:00
Jon Elias e6dc7b9862 refactor: refs #6767 fix all conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 09:47:44 +02:00
Javier Segarra 33f3024246 Merge branch 'dev' into 7190_renewTokenMultimedia
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 07:47:24 +00:00
Alex Moreno 8f064e3338 warmFix: replace VnSelectFilter to VnSelect
gitea/salix-front/pipeline/head This commit looks good Details
2024-04-26 09:37:02 +02:00
Javier Segarra c84555b0a3 Merge pull request 'Item botanical' (!329) from hyervoni/salix-front-mindshore:feature/ItemBotanical into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
Reviewed-on: #329
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-26 07:31:29 +00:00
Javier Segarra 98846bbd1a Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 09:28:40 +02:00
Javier Segarra 36e99e2c6c fix: bug when save 2024-04-26 09:28:32 +02:00
Pablo Natek 119f625435 Merge pull request '#4988 - agencySection' (!293) from 4988-agencySection into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
Reviewed-on: #293
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-26 07:19:07 +00:00
Carlos Satorres 022fd6caa4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData 2024-04-26 09:17:23 +02:00
Pablo Natek 7af802c306 Merge branch 'dev' into 4988-agencySection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 07:07:15 +00:00
Carlos Satorres f53caac771 Merge pull request 'refs #6976 supplier onUnmounted' (!286) from 6976-supplierConsumption into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
Reviewed-on: #286
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-26 07:05:00 +00:00
Javier Segarra 3c033458d3 fix: minor changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 09:02:51 +02:00
Jon Elias 652e85a6e0 Merge pull request 'refactor: refs #7239 changed spanish translations' (!331) from ES_smsTranslations into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #331
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-26 07:01:39 +00:00
Carlos Satorres e64936da72 Merge branch 'dev' into 6976-supplierConsumption
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 07:00:22 +00:00
Carlos Satorres 966831b6d3 refs #6976 fix pr
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 09:00:42 +02:00
Pablo Natek cb22eaee4d Merge branch 'dev' into 4988-agencySection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 06:58:53 +00:00
Carlos Satorres dbdcc7cdf1 Merge pull request 'refs #6905 fix bank select' (!322) from 6905-fixUserPanel into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
Reviewed-on: #322
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-26 06:56:50 +00:00
Carlos Satorres 1d9f4e30af Merge branch 'dev' into 6905-fixUserPanel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 06:54:39 +00:00
Javier Segarra 7f4155cde9 fix: replace VnSelectFilter by VnSelect 2024-04-26 08:54:26 +02:00
Javier Segarra 22d9d369c8 Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical 2024-04-26 08:52:05 +02:00
Javier Segarra b3be7c8bc3 Merge pull request 'Item log' (!323) from hyervoni/salix-front-mindshore:feature/ItemLog into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
Reviewed-on: #323
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-04-26 06:37:22 +00:00
Carlos Satorres 7fd053b842 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-fixUserPanel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 08:36:15 +02:00
Javier Segarra aa87d54f57 Merge remote-tracking branch 'origin/dev' into feature/ItemLog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 08:34:05 +02:00
Pablo Natek faa6d0e4fa feat: setup commit
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 08:33:41 +02:00
Carlos Satorres fc275d9274 refs #6976 remove logs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 08:29:34 +02:00
Pablo Natek d7bebfecb1 fix: fix translates
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 08:28:42 +02:00