Commit Graph

4020 Commits

Author SHA1 Message Date
Jorge Penadés cfe95df9e8 fix: refs #7524 use dynamic load
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-10 09:46:07 +02:00
Javier Segarra f16707756e fix: change type vnput 2024-10-10 09:29:04 +02:00
Jorge Penadés 00dc2c6edc Merge branch 'dev' into 7207-showPbx
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-10 07:18:00 +00:00
Jon Elias 2dd3e09928 refactor: requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-10 08:26:16 +02:00
Jon Elias 419d3d2d45 fix: refs #6896 fixed module problems
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-10 07:20:33 +02:00
Carlos Satorres 855032e4a6 refs #7986 fix front 2024-10-08 15:36:57 +02:00
Alex Moreno b6778aaf17 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/pr-4774-traducciones This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-10-08 12:24:39 +02:00
Carlos Satorres 0517b39c60 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2024-10-08 09:26:07 +02:00
Carlos Satorres 56fff55f71 fix: unnecessary property 2024-10-08 09:26:00 +02:00
Carlos Satorres 73e5039ec3 refs #7986 create front 2024-10-08 08:35:24 +02:00
Jorge Penadés 1723331615 Merge branch 'dev' of https: refs #7207//gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 16:35:00 +02:00
Javier Segarra 43da6ea1b8 Merge branch 'master' into hotfix_vnImg_zoom_resolution
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-07 12:00:12 +00:00
Guillermo Bonet 50eed83d05 feat: refs #7893 Requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 13:50:19 +02:00
Jon Elias 27dca7c35f Merge branch 'Fix-TicketsModule' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketsModule
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 13:29:46 +02:00
Jon Elias afc52f6cea fix: changes in sale and summary 2024-10-07 13:29:43 +02:00
Javier Segarra 0ed9fdd55d fix: refs VnImg zoom resolution missing property
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-07 13:02:40 +02:00
Carlos Satorres e396cd0cac hotfix: routePrice null
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-07 12:16:32 +02:00
Guillermo Bonet a6944561de Merge branch 'dev' into 7893-wasteRecalc
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 11:32:03 +02:00
Guillermo Bonet c3eaab44ed Merge branch '7893-wasteRecalc' of https://gitea.verdnatura.es/verdnatura/salix-front into 7893-wasteRecalc
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 11:31:18 +02:00
Guillermo Bonet 178fa8cd21 feat: refs #7893 Requested changes 2024-10-07 11:31:16 +02:00
Guillermo Bonet f98739f0ed Merge branch 'dev' into 7893-wasteRecalc
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 08:03:26 +00:00
Guillermo Bonet 4f3e7e2630 feat: refs #7893 Added waste recalc section
gitea/salix-front/pipeline/pr-dev Build queued... Details
2024-10-07 10:03:05 +02:00
Carlos Satorres 27e6dd5bf1 Merge branch 'master' into 6898-hotfixSupplierAgency
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-07 07:51:02 +00:00
Carlos Satorres 5d65d3e20c refs #6898 hotfix agency
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-07 09:48:57 +02:00
Alex Moreno ef5ae0f723 refactor(ticketNotes): translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 09:16:07 +02:00
Jon Elias 33d6d529c5 Merge branch 'dev' into Fix-TicketsModule
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 07:11:52 +00:00
Jon Elias bd3de77cbd fix: changes in list and filter to fix section
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 09:10:20 +02:00
Alex Moreno b8407140f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/pr-4774-traducciones This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2024-10-07 09:02:01 +02:00
Alex Moreno 426b7254d6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-07 09:01:57 +02:00
Jorge Penadés 355c84ad06 Merge branch 'dev' into 7323-fineTunningWorker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-07 06:39:07 +00:00
Javier Segarra 04b2a4d9ce perf: clean warnings
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-05 00:31:41 +02:00
Javier Segarra c3c2528342 feat: #7356 improve NotesSummary 2024-10-05 00:31:32 +02:00
Pako Natek 355b1357b7 Merge branch 'dev' into Fix-OrderCatalog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-04 16:08:12 +00:00
Jorge Penadés 9383a71adb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-04 16:38:27 +02:00
Jorge Penadés 055b1b0a88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-04 16:12:31 +02:00
Jon Elias aee23c75e8 fix: order module
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-04 14:31:39 +02:00
Jon Elias e4e60abe0e Merge branch 'master' into Hotfix-ZoneOrderFilters
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-04 12:25:49 +00:00
Jon Elias 3a21f6aadb fix: order catalog
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-04 14:22:00 +02:00
Jorge Penadés 9c5ce6dbfd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-04 13:50:31 +02:00
Jorge Penadés 905841e0d6 Merge branch 'dev' into 7207-showPbx
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-04 11:45:28 +00:00
Jorge Penadés b735ccb3a0 Merge branch 'dev' of https: refs #7323//gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-10-04 13:37:55 +02:00
Pablo Natek efe5208d30 Merge branch 'dev' into 4988-fixE2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-04 11:32:40 +00:00
Pablo Natek 1869e3315a fix: refs #4988 remove id
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-04 13:14:14 +02:00
Pablo Natek 7dc019cfbb fix: refs #4988 selector on e2e 2024-10-04 13:13:57 +02:00
Jon Elias 195747b5a0 feat: added click and transfer tickets and deleted useless code
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-04 12:34:37 +02:00
Jorge Penadés 67c2e284ba feat: refs #7702 ask old pass
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-10-04 11:45:10 +02:00
Carlos Satorres 0d31adaa4b refs #7767 check holiday
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-04 11:29:21 +02:00
Jorge Penadés e43ba9b58a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-04 10:11:38 +02:00
Jon Elias 7874db1647 fix: zone delivery postcodes filter and order catalog type filter
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-04 09:58:23 +02:00
Jon Elias 4b9588c189 refactor: refs #7825 modified worker list form to fill the field when a bank entity is created
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-04 08:55:48 +02:00
Pablo Natek 4ba52f1a56 Merge branch 'dev' into 7404-addSomeLogisticPreferences
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-04 06:55:41 +00:00
Pablo Natek 4a357c5be6 Merge branch 'dev' into 7404-addSomeLogisticPreferences
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-04 06:53:53 +00:00
Pablo Natek 99ba7a39fa Merge branch 'dev' into 7129--fixTranslates
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-04 06:53:17 +00:00
Carlos Satorres 530ed4b716 refs #7355 fix searchbar
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-04 08:48:36 +02:00
Jorge Penadés c64fe8c044 chore: refs #7207 refactor locale
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-03 17:04:56 +02:00
Jorge Penadés b0ba6a5e0f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-03 15:40:05 +02:00
Jorge Penadés aca10b81af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-03 15:14:28 +02:00
Pablo Natek c04dad38f1 feat: refs #7404 change travel name and remove buyer filter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-03 15:02:14 +02:00
Jorge Penadés e10088ed06 Merge branch 'dev' of https: refs #7702//gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-03 13:49:33 +02:00
Jorge Penadés ad8b72660f fix: refs #7353 scopeDays
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-03 13:37:21 +02:00
Jorge Penadés fadfafbb1d Merge branch 'dev' into 7524-dynamicFetch
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-03 10:05:22 +00:00
Pablo Natek 05a1d0e8fb fix: refs #7129 translates from globals to module locals
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-03 10:52:16 +02:00
Jorge Penadés a8c48789ca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-03 10:03:49 +02:00
Jorge Penadés 9b8e388525 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-03 09:49:04 +02:00
Pablo Natek 06fa5b13a4 Merge branch 'dev' into 7404-fixStyle
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-03 07:47:52 +00:00
Jorge Penadés 739671a6da Merge branch 'dev' into 7524-dynamicFetch
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-03 07:25:40 +00:00
Jon Elias 6a1bb6d41f Merge branch '7010-AddPackingField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7010-AddPackingField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-03 08:38:58 +02:00
Jon Elias 8ee4edc5d5 perf: refs #7010 customer summary packaging type field 2024-10-03 08:38:56 +02:00
Pablo Natek 5e59ecdb43 fix: refs #7404 with on stockBought mobile version
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-02 17:14:51 +02:00
Jon Elias be53b466b9 Merge branch 'dev' into 7010-AddPackingField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-02 09:53:22 +00:00
Jon Elias 0b76d0d556 refactor: refs #7010 added function to get item packaging type
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-02 11:52:16 +02:00
Carlos Satorres ba3b2198b8 Merge branch 'dev' into warmFix-userListFixRole
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-02 09:31:54 +00:00
Jon Elias 0650380b7b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7010-AddPackingField 2024-10-02 11:29:54 +02:00
Jon Elias 375adfab76 Merge branch 'dev' into 7884-AddLabelerField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-02 08:46:08 +00:00
Carlos Satorres 49da7168ab Merge branch 'dev' into 6899-fixInvoiceOutNegative
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-02 08:41:19 +00:00
Jon Elias 12727e93eb Merge branch 'dev' into 7884-AddLabelerField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-02 08:36:11 +00:00
Jon Elias 7db166974f feat: refs #7884 use VnTable prop for chip label filters and modified translations 2024-10-02 10:34:50 +02:00
Carlos Satorres c2c4acfc30 refs #6899 fix filters, date from to socialName
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-02 09:42:38 +02:00
Jon Elias 03a3d6bd50 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField 2024-10-02 08:47:21 +02:00
Javier Segarra 6b38bdf868 style: improve ZoneLocationTree height
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 19:26:03 +00:00
Javi Gallego 36457f704d Merge branch 'dev' into 6722-showDegrees
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 14:04:18 +00:00
Javier Segarra 2ca99a51ae fix: refs #7356 transfer ticket method
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 15:12:22 +02:00
Carlos Satorres d69336c82a refs #7366 make travelFilter, travelList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 14:15:18 +02:00
Javi Gallego 589c672ab2 fix: show degrees 2024-10-01 13:28:49 +02:00
Jon Elias 7b63bb38f2 fix: deleted code
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 12:34:39 +02:00
Javier Segarra 6e4677848f Merge branch 'dev' into Fix-TicketSale
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 09:53:34 +00:00
Alex Moreno ddffd5b1c7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-10-01 11:47:55 +02:00
Alex Moreno 9b90487b6a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-01 11:47:43 +02:00
Alex Moreno 2e9a8d9205 fix(WorkerList): add type email
gitea/salix-front/pipeline/head This commit looks good Details
2024-10-01 11:47:31 +02:00
Javier Segarra 696c9ca9b3 fix: solve conflicts with stockBought
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 11:40:29 +02:00
Javier Segarra 27b2d0232c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into fixConflicts_testToDev
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 11:35:14 +02:00
Jon Elias 90ce9b2cd3 Merge branch '7884-AddLabelerField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 11:32:17 +02:00
Jon Elias de01dda2ed refactor: refs #7884 modified icon color 2024-10-01 11:32:15 +02:00
Carlos Satorres e64e6eefe3 refs #7355 add role 2024-10-01 10:35:31 +02:00
Javier Segarra 778e6299ce fix: solve conflicts from test to dev
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 08:57:04 +02:00
Jon Elias 86ab9f9540 Merge branch 'Fix-TicketSale' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketSale
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 06:52:21 +02:00
Jon Elias 10bada7463 fix: deleted useless button 2024-10-01 06:52:19 +02:00
Javier Segarra e7a2d3aa85 fix: refs #7354 ZonLocation filter 2024-09-30 20:20:51 +02:00
Javier Segarra 03450a86fb fix: SupplierFiscalData show data printing
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-30 13:13:35 +00:00
Javier Segarra 4d4554a6ca fix(lilium): #6898 SupplierFiscalData show fields
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-30 15:11:22 +02:00