Commit Graph

767 Commits

Author SHA1 Message Date
Jorge Penadés d35f9c9468 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-07 12:03:52 +02:00
Javi Gallego 9ceac32d89 feat: refs #7548 grafana 2024-06-07 11:59:26 +02:00
Javier Segarra 0ea44eb8db Merge branch 'dev' into feature/AccountAcls 2024-06-07 10:07:15 +02:00
Pablo Natek 68e49e2ffa fix: refs #7129 fix some issues on load and tools 2024-06-07 07:52:50 +02:00
Alex Moreno 395eb6bed7 Merge branch 'dev' into feature/AccountRoles
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-06 07:32:15 +00:00
William Buezas 3efca6242d Account ACLs 2024-06-04 08:41:41 -03:00
Javier Segarra 5b1819f7da Merge branch 'dev' into 6321_negative_tickets 2024-06-04 09:27:46 +02:00
Jorge Penadés 1bc99cbd22 feat: refs #6243 show all cmrs & filter by warehouse
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-03 16:30:59 +02:00
Jorge Penadés f58b072964 feat: refs #6600 Add option to add comment for photo motivation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-06-03 09:30:37 +02:00
Javier Segarra 28173ddee2 Merge branch 'dev' into feature/AccountRoles
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-31 10:24:37 +02:00
William Buezas 4bd78922af remove unnecesary files
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-30 15:43:26 -03:00
William Buezas 05b7df9168 Role submodules 2024-05-30 15:34:37 -03:00
William Buezas 5c25c77f19 Mail aliases 2024-05-30 13:09:11 -03:00
William Buezas 0cf4f41d19 Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/MailAliases 2024-05-30 08:38:23 -03:00
Alex Moreno 2b6612317c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-05-29 14:05:42 +02:00
Alex Moreno 5965e70740 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-05-29 07:50:15 +02:00
William Buezas 0659eac652 Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/AccountRoles 2024-05-28 18:38:13 -03:00
Javier Segarra 577c21e601 Merge branch 'dev' into 6321_negative_tickets
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-28 12:48:00 +02:00
Alex Moreno 0f1c91d36c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-28 07:42:15 +02:00
Carlos Satorres d8512e2033 refs #7406 fix trad
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 18:23:33 +02:00
Carlos Satorres ef52c9b0c0 refs #7406 routes trad
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-27 10:42:47 +02:00
Jorge Penadés 3b799efa22 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-27 08:57:34 +02:00
Carlos Satorres ba5407310f refs #7396 fix summary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-24 13:40:00 +02:00
Javier Segarra ceae5eaa9e Merge branch 'dev' into 6321_negative_tickets 2024-05-24 11:21:06 +02:00
Javier Segarra 433564507e Merge branch 'dev' into 7311_boilerplate_users
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-23 08:53:10 +02:00
Javier Segarra 06664cc2d0 feat: newRole 2024-05-23 08:52:57 +02:00
Alex Moreno bcb800269e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-22 14:32:00 +02:00
Jorge Penadés 5bddc6e04d fix: refs #6942 wip: formModel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-22 11:22:46 +02:00
Javier Segarra a2316fb222 feat: change skeleteon different components 2024-05-18 10:35:08 +02:00
Javier Segarra aa007117a7 Merge branch 'dev' into 7311_boilerplate_users
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-18 10:16:28 +02:00
Carlos Satorres cd21d7817d refs #7396 fix summary basicData 2024-05-17 14:16:06 +02:00
Alex Moreno d00801b066 feat: refs #6825 VnComponent mix component and attrs Form to create new row 2024-05-17 13:00:57 +02:00
Javier Segarra 372e797059 feat: recover split
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-15 16:25:25 +02:00
Jorge Penadés 31573c0f0b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7274-fixCustomer
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-15 11:22:23 +02:00
Javier Segarra 58597bdddf Merge branch 'dev' into 6321_negative_tickets
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-15 08:55:47 +02:00
Javier Segarra 1ca7420207 feat: replace item 2024-05-15 08:54:22 +02:00
Jorge Penadés a6c761c031 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_Customer_1
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-14 13:42:38 +02:00
Javier Segarra fc6bd82ea0 Merge branch 'dev' into feature/ZoneCreate
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-14 11:52:29 +02:00
Javier Segarra 32e715ce6b Merge branch 'dev' into feature/Monitors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-13 17:59:39 +02:00
William Buezas 8e7b043a46 Resolve conflicts 2024-05-13 10:28:21 -03:00
Jorge Penadés 99ea8e843c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-13 13:22:39 +02:00
Jorge Penadés 0b83d3663f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-13 13:20:15 +02:00
Javier Segarra 4609e59cd9 feat: i18n
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-10 22:06:40 +02:00
Javier Segarra 7f185c091b feat: add descriptor 2024-05-10 08:13:02 +02:00
William Buezas d227d4b09b Zone create 2024-05-09 11:32:04 -03:00
Javier Segarra c68ad5be34 feat #7311: minor changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-09 08:40:00 +02:00
Javier Segarra 034342beb2 Merge branch 'dev' into 7311_boilerplate_users
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-09 08:29:18 +02:00
Javier Segarra 99ef7fad76 feat #7311: subsections 2024-05-09 08:28:58 +02:00
Javier Segarra c8b9233c87 feat #7311: i18n pageTitles 2024-05-09 08:00:53 +02:00
William Buezas 712d7e13ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/Monitors 2024-05-08 10:45:05 -03:00
William Buezas 5bdbbf426a Tables development 2024-05-08 10:43:18 -03:00
Javier Segarra 61519595a9 Merge branch 'dev' into 6321_negative_tickets
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-08 12:30:01 +02:00
Jorge Penadés a1f785ccbe feat: refs #5919 WIP workerlocker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-08 11:02:40 +02:00
Javier Segarra ccc87a0958 Merge branch 'dev' into 7271_boilerplate_zones
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-08 07:52:59 +02:00
Alex Moreno a139c11a22 Merge branch 'test' into fix_Customer_1
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-05-07 07:05:25 +00:00
William Buezas dbc9e9dd71 Sales monitor base 2024-05-05 19:13:36 -03:00
Jon Elias 312985b427 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7271_boilerplate_zones
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-03 12:37:30 +02:00
Jon Elias 1a5f2fbea2 feat: refs #7271 advanced structure 2024-05-03 12:30:53 +02:00
William Buezas d2e178a41b resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-02 12:02:44 -03:00
Javier Segarra 9fa03beda1 Merge branch 'dev' into 6887-endClaimMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-02 12:44:02 +00:00
Javier Segarra 988be19b96 Merge branch 'dev' into 6887-endClaimMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-02 12:42:46 +00:00
Javier Segarra 03759d2746 Merge branch 'dev' into feature/ItemLastEntries
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-02 14:34:54 +02:00
Jon Elias c1a464d9ae fix: refs #6887 fix conflicts 2024-05-02 13:02:59 +02:00
Javier Segarra 1907301852 Merge branch 'dev' into 6321_negative_tickets 2024-05-02 12:48:45 +02:00
Javier Segarra ef63d0cb6a Merge remote-tracking branch 'origin/dev' into feature/ItemTax
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-05-02 10:25:49 +02:00
Javier Segarra cd5389fb91 fix: i18n 2024-05-02 10:25:46 +02:00
Javier Segarra b530101cda Merge branch 'dev' into 7190_renewTokenMultimedia
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-02 07:44:20 +00:00
William Buezas ac219bfbb7 Item shelvings 2024-04-30 16:15:48 -03:00
Jon Elias d5762f65b3 refactor: refs #6887 fixed errors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-30 10:34:48 +02:00
Jon Elias 5b15558dbf refactor: refs #6887 fixed errors 2024-04-30 10:32:32 +02:00
William Buezas ac9063e166 Item Last entries 2024-04-29 17:01:26 -03:00
Javier Segarra b7bfb4b056 feat: updates 2024-04-29 15:08:12 +02:00
William Buezas 0b5aea76d9 Move translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-29 09:39:04 -03:00
Javier Segarra df29ad31fd minor changes 2024-04-29 13:22:31 +02:00
Javier Segarra 5425902918 Merge branch 'dev' into 6321_negative_tickets
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-29 11:55:56 +02:00
Javier Segarra 2f55272df7 fix: WorkerDescriptor 2024-04-29 11:23:50 +02:00
Javier Segarra 34c8874468 fix: i18n 2024-04-29 10:17:18 +02:00
Jon Elias b8380bc9c5 Merge branch 'dev' into 6887-endClaimMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-29 07:51:16 +00:00
Jon Elias 6ae38d2611 refactor: refs #6887 pending claim changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-29 09:49:06 +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 94a948c933 fix: add socialName 2024-04-26 12:29:55 +02:00
Javier Segarra 7831a69aa9 fix: i18n and icon class
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-04-26 11:03:40 +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
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 3c033458d3 fix: minor changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-26 09:02:51 +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
Javier Segarra 22d9d369c8 Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical 2024-04-26 08:52:05 +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 f29f7a55a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection 2024-04-25 16:28:30 +02:00
Pablo Natek 5544676a1b fix: mistakes like console.log an disables
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 16:18:06 +02:00
William Buezas 823351f76d Item botanical
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 10:55:48 -03:00
Javier Segarra b4e3157887 feat #7271 i18n 2024-04-25 14:28:06 +02:00
Pablo Natek d490d85ecc feat: agencyWorkCenter
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 12:34:19 +02:00
Pablo Natek e184f70be5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-25 09:59:17 +02:00
William Buezas 726699bbc5 Item log
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-24 10:38:00 -03:00
Javier Segarra e1f50f5daf fix: minorchanges
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 15:05:10 +02:00
Javier Segarra dcb06918dd Merge remote-tracking branch 'mindshore/feature/ItemRequests' into feature/ItemFamily 2024-04-24 14:35:20 +02:00
Javier Segarra e65ffb63c9 Merge remote-tracking branch 'mindshore/feature/ItemsSummary' into feature/ItemRequests 2024-04-24 14:26:12 +02:00
Javier Segarra 299838bfa5 Merge branch 'dev' into feature/ItemsSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 14:23:49 +02:00
Javier Segarra f4eb14f487 feat: i18n Clone 2024-04-24 14:22:14 +02:00
Javier Segarra 1c3660050b Merge branch 'dev' into 7190_renewTokenMultimedia
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 12:15:34 +02:00
Javier Segarra de91364ee8 Merge remote-tracking branch 'origin/dev' into feature/FixedPrices
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 09:33:34 +02:00
Javier Segarra bf08ca7655 Merge branch 'dev' into 7190_renewTokenMultimedia
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 06:25:14 +00:00
Javier Segarra 861e4385bb Merge branch 'dev' into feature/ItemsSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 07:34:49 +02:00
Javier Segarra 5dc41f8236 Merge branch 'dev' into feature/ItemFamily
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-24 07:01:46 +02:00
Javier Segarra 9a78b8ac3b Merge branch 'dev' into feature/ItemRequests 2024-04-23 13:55:43 +02:00
Javier Segarra bfb7dfb472 Merge branch 'dev' into feature/WorkerTimeControl
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-23 13:31:41 +02:00
Pablo Natek 663c093a00 feat: refs #4988 agency e2e 2024-04-22 18:17:01 +02:00
Javier Segarra 5779d37bbd feat: #6321 i18n to yml 2024-04-22 14:08:58 +02:00
William Buezas 78561c5f42 Item types
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-22 08:34:38 -03:00
Javier Segarra 5a588ead87 Merge remote-tracking branch 'origin/dev' into 7190_renewTokenMultimedia
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-22 07:38:07 +02:00
William Buezas 9212e53905 resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-19 12:48:07 -03:00
William Buezas 3a03e42cf9 Resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-19 10:40:04 -03:00
Javier Segarra fb26219354 refs #7190 feat: useTokenConfig 2024-04-19 12:09:04 +02:00
Alex Moreno 6db5c56f5a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-claim_changes_v3
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-19 09:36:10 +02:00
William Buezas 6c4901076f Apply ItemsFilterPanel to EntryLatestBuys
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-18 13:14:23 -03:00
William Buezas 5f01e5c705 change es translations
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-18 09:09:22 -03:00
William Buezas 5addd0056d Add filter panel 2024-04-17 17:18:38 -03:00
William Buezas 5551189f2f resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-17 08:46:37 -03:00
William Buezas 1dfaef2ffa Resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-17 08:26:12 -03:00
William Buezas da06e7bc87 WIP 2024-04-17 08:13:34 -03:00
Alex Moreno c4c317ef41 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-claim_changes_v3
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-17 10:53:18 +02:00
William Buezas ba2499db9d resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-16 12:11:57 -03:00
William Buezas e36949ad07 resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-16 10:11:03 -03:00
Alex Moreno 4f286cd032 Merge branch 'dev' into 6425-fixDevTranslations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-16 12:32:46 +00:00
William Buezas 2ab7a45114 resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-16 08:49:34 -03:00
William Buezas 5664ec1313 WIP 2024-04-16 08:21:44 -03:00
Jon Elias b216112d2a refactor: refs #6425 fix failed tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-16 11:42:43 +02:00
Jon Elias 73c5a5b7d2 fix: refs #6425 fixed dev translations
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-16 11:00:38 +02:00
Robert Ferrús 87ae6870a9 feat: refs #6679 add icon 2024-04-16 09:33:56 +02:00
Robert Ferrús d178d7dc6a feat: refs #6679 add icon
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-16 08:04:57 +02:00
William Buezas 00dfa171b0 WIP 2024-04-15 15:37:41 -03:00
William Buezas d9d868a6af Waste breakdown
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-15 09:02:35 -03:00
William Buezas c50741b4bf Remove single quotes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-15 08:51:48 -03:00
Alex Moreno f176312163 feat(VnNotes): refs #6336 better design
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-15 12:28:43 +02:00
William Buezas 9c7c98d64d Merge with dev 2024-04-12 16:55:51 -03:00
William Buezas 92429295cd more translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-12 10:44:25 -03:00
William Buezas 4d418c9cb7 Pull new traduction yml files and add translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-12 10:32:19 -03:00
William Buezas beaffbf685 delete old i18n files and adapt branch to the new ones
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-12 10:20:05 -03:00
William Buezas d38c85a0ef resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-12 09:39:34 -03:00
William Buezas f2dc50d229 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into WorkerCalendar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-12 08:13:58 -03:00
Jon Elias f83de74f01 refs #6425 fix conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-12 11:44:56 +02:00
William Buezas 73703dc778 Add translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-11 18:07:02 -03:00
William Buezas 98f273cb93 WIP 2024-04-11 18:04:11 -03:00
William Buezas c032c83e7f Item create view
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-11 08:40:41 -03:00
Javier Casado 6002800000 Merge branch 'dev' into 7179-changesClaimSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-11 11:37:11 +00:00
William Buezas 4a0ae8aa45 Item summary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-10 17:18:57 -03:00
William Buezas 9dfe5f5e68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-10 09:34:51 -03:00
William Buezas c881fe6577 Resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-10 09:19:54 -03:00
William Buezas eceb60f6e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-10 08:46:00 -03:00
William Buezas 9ae79a5631 Add translation again
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-10 08:43:57 -03:00
William Buezas e8486099fc Resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-10 08:37:52 -03:00
William Buezas c3835dfd7a resolve conflicts
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-09 15:23:05 -03:00
William Buezas 0144aab7a5 Mini fix
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-09 08:51:00 -03:00
jcasado 97ad1c7579 refs #7179 changes customer proxy and client Id
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-09 13:32:01 +02:00
William Buezas f6e140e369 Apply workerDms changes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-09 08:28:00 -03:00
William Buezas e51ea9996b Item list view
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-09 08:18:18 -03:00
Guillermo Bonet 4b9e69625b Merge branch 'dev' into 6636-pickup
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-09 08:02:30 +00:00
William Buezas 4da540fc9c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList 2024-04-08 08:47:56 -03:00
William Buezas f12ec3c0c9 Add redirection to summary and open summary action 2024-04-08 08:47:29 -03:00
Guillermo Bonet b2ef381f1d Merge branch 'dev' into 6636-pickup
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-08 05:18:34 +00:00
William Buezas 7584857c87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/WorkerTimeControl
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-05 09:11:23 -03:00
William Buezas 970d1a48e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into features/ms_submodulos_worker 2024-04-05 08:25:28 -03:00
Javier Casado 5d7fed3b32 Merge branch 'dev' into 6816-removeMicroSip
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-05 07:57:21 +00:00
Guillermo Bonet b09ecefad4 feat: refs #6636 Added pickup in claim
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-04 14:12:16 +02:00
Javier Segarra 0ad722381e #6425 fix quotes in yml file
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-04 13:38:25 +02:00
jcasado d00ec3c41c refs #6816 remove microsip tag
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-04 09:38:47 +02:00
William Buezas 4ee8c45fdc resolve conflicts 2024-04-03 11:22:52 -03:00
Jon Elias 94b177c9a2 fix: refs #6425 fix yml format
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-04-03 14:33:47 +02:00
Jon Elias 3e423867e3 fix: refs #6425 fix yml format
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-03 13:12:00 +02:00
William Buezas bfee37b631 WIP 2024-04-03 08:08:54 -03:00
Jon Elias 9a160d9248 refactor: refs #6425 merged changes
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-04-03 12:57:23 +02:00
William Buezas fc87bb8293 Add page title name 2024-04-02 13:04:28 -03:00
William Buezas addbe9345b Resolve conflicts 2024-04-02 12:40:26 -03:00
Jon Elias 33c54042df refactor: refs #6425 translation files in .yml format and minor changes 2024-04-02 14:12:01 +02:00
Alex Moreno 181bff6c0c Merge branch 'dev' into 6514-gestDocSupplier
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-28 07:17:28 +00:00
William Buezas 37465ffa4a resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-27 11:23:54 -03:00
William Buezas b546b63352 resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-27 10:11:20 -03:00
Jon Elias d555f7e09e Merge branch 'dev' into 6988-SummaryRefactor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-27 10:02:18 +00:00
Jorge Penadés 9c83c4cd6c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-27 08:30:37 +01:00
William Buezas 0a74b2a96e QCalendar implementation WIP
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-03-26 15:38:06 -03:00
Jon Elias 1ec54d7664 feat: #6514 create supplierDms lilium
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-26 08:55:01 +01:00
Alex Moreno a4a96a106f Merge branch 'dev' into 6988-SummaryRefactor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-26 06:41:39 +00:00
Kevin Martinez 5e089e616e Merge branch 'dev' into feature/worker-log
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-25 12:00:06 +00:00
Alex Moreno c335accffb refs #6905 fix translation and warnings
gitea/salix-front/pipeline/head This commit looks good Details
2024-03-25 12:42:48 +01:00
Jon Elias 3e0f151570 refactor: refs #6988 fixed error
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-25 12:36:50 +01:00
Jon Elias 84a25acf22 refactor: refs #6988 used global translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-25 11:42:29 +01:00
Jorge Penadés d2efbb204f feat: refs #5186 use arrayData in summary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-22 14:57:36 +01:00
carlosfonseca aa2db28eda Se crea submodulo mis documentos en worker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-22 08:30:54 -05:00
Carlos Satorres 95d943e6f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-userPanelConfig
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-22 10:17:36 +01:00
Jorge Penadés 4f242b0840 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-21 15:31:15 +01:00
William Buezas 65da9a3e69 resolve conflicts 2024-03-21 08:53:42 -03:00
William Buezas fc5d858bf1 WIP 2024-03-21 08:37:11 -03:00
Jon Elias 7658573ec6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6425-translationProposal 2024-03-21 12:23:45 +01:00
Jon Elias 63c6b523fb refactor: refs #6425 new translation proposal
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-21 12:14:54 +01:00
Kevin Martinez f6e3b3607a Merge branch 'salix-dev' into feature/worker-log
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-21 08:01:57 -03:00
Carlos Fonseca 142155e14e Merge branch 'dev' into features/ms_submodulos_worker
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-20 16:55:09 +00:00
Carlos Satorres 798ffa7de3 refs #6905 fix 2024-03-20 10:20:05 +01:00
Carlos Satorres 0946a34422 Merge branch '6905-userPanelConfig' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-userPanelConfig
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-20 09:38:14 +01:00
Carlos Satorres 89fc147ad8 refs #6905 fix traduction 2024-03-20 09:38:11 +01:00
Kevin Martinez cf25476a5d Create worker log
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-18 21:04:52 -03:00
carlosfonseca 844cd0e12b Desarrollo de los submodulos basic data, notes y pbx
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-18 08:39:10 -05:00
Carlos Fonseca f25e46cf08 Merge branch 'dev' into PR-CUSTOMER
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-15 03:12:46 +00:00
Jorge Penadés f39595087a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-03-14 15:00:16 +01:00
William Buezas 22c49d9cf7 resolve conflicts
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-03-14 09:50:27 -03:00
William Buezas 6baaebf6bd WIP 2024-03-14 09:48:04 -03:00
Kevin Martinez 8587d46943 Merge branch 'salix-dev' into feature/route-module
gitea/salix-front/pipeline/pr-dev This commit looks good Details
# Conflicts:
#	src/pages/Route/Card/RouteSummary.vue
2024-03-14 08:05:51 -03:00
Carlos Fonseca a3097a9223 Merge branch 'dev' into PR-CUSTOMER
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-14 10:55:02 +00:00
Jorge Penadés 0c012ed71a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-14 08:54:21 +01:00
William Buezas f26d14e875 resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-13 12:57:41 -03:00
William Buezas 4925bed845 resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-13 11:31:55 -03:00
Jorge Penadés e793b3dd93 feat: refs #5186 use global locales
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-13 15:06:02 +01:00
William Buezas 09582ab6a8 WIP 2024-03-13 09:05:23 -03:00
carlosfonseca 38d3d49ecb Solucion a comentarios 34
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-03-12 16:24:27 -05:00
William Buezas bd5eb1a1c3 remove assignPDA translation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-12 11:34:38 -03:00
William Buezas 632049c13b Assign button change
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-12 11:31:32 -03:00
William Buezas dad2711311 fix translation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-12 08:13:27 -03:00
William Buezas 029fc043de Change title translation
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-12 08:08:20 -03:00
William Buezas 319295f2c2 Workers PDA
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-11 16:53:33 -03:00
Jorge Penadés 33ef118dea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-11 09:32:30 +01:00
Pablo Natek e5e0d8f806 Merge branch 'dev' into 6349-removeRma
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-08 07:08:36 +00:00
Jorge Penadés d8a0adb852 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-07 15:57:54 +01:00
William Buezas b994d39369 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-07 08:44:30 -03:00
Kevin Martinez d3a93da849 Merge branch 'salix-dev' into feature/route-module
gitea/salix-front/pipeline/pr-dev This commit looks good Details
# Conflicts:
#	src/components/ui/VnPaginate.vue
2024-03-06 23:19:47 -03:00
Javier Segarra 7e769164d7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-refactor-claimSummary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-06 09:48:34 +01:00
William Buezas 992ada0984 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections 2024-03-05 18:21:00 -03:00
Alex Moreno 4484f431bf refs #6336 feat: polish claims 2024-03-04 14:42:15 +01:00
Carlos Satorres adc290da6d refs #6935 restyle card
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-04 12:26:14 +01:00
Jorge Penadés b5edc98732 fix: refs #5186 add all fields basic data & summary
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-03-01 12:12:44 +01:00
Jorge Penadés c18e395f6f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-29 15:52:43 +01:00
Pablo Natek b49db55892 Merge branch 'dev' into 6349-removeRma
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-29 06:50:18 +00:00
Kevin Martinez 64490f7e5b Merge remote-tracking branch 'salix/dev' into feature/route-module
gitea/salix-front/pipeline/pr-dev This commit looks good Details
# Conflicts:
#	src/i18n/en/index.js
#	src/i18n/es/index.js
2024-02-28 21:27:01 -03:00
William Buezas a0f9c811ff resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-28 12:56:13 -03:00
Alex Moreno 284eefa8f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-27 08:23:02 +01:00
Alex Moreno c8a4854df9 refs #5509 fix(vnDms): fix issues
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-27 08:22:38 +01:00
Pablo Natek 546df84db1 remove(claimRma): refs #6349 remove all references
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-26 19:06:21 +01:00
Alex Moreno 4988df882c refs #5509 fix: transaltions
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-26 15:06:49 +01:00
Jorge Penadés b6d84a5fc6 fix: refs #6904 VnLv icon, customer summary & extendedList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-26 14:17:02 +01:00
Kevin Martinez 185de3c931 Add roadmap stops
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-23 00:46:57 -03:00
William Buezas 1b67b7ab36 Customer description corrections and creation of tickets create view 2024-02-22 10:38:15 -03:00
Alex Moreno 9abac4a8fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-22 09:11:36 +01:00
Jorge Penadés 1af5b270a0 fear: refs #5186 WIP parking section
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-21 10:26:20 +01:00
carlosfonseca 01d68734b6 Correccion de conflictos
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-20 12:15:27 -05:00
Kevin Martinez 616d8519fa Fix translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-20 08:14:31 -03:00
Kevin Martinez 0a03ef69ea Create roadmap basic data page
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-20 08:00:17 -03:00
Kevin Martinez 343269fc02 Create roadmap summary page 2024-02-20 08:00:12 -03:00
Kevin Martinez 45d7b021a6 Create roadmap create page 2024-02-20 07:58:14 -03:00
Kevin Martinez 8ffa3b7626 Create roadmap list page 2024-02-20 07:57:59 -03:00
Kevin Martinez e846582606 Create route autonomous 2024-02-19 10:13:00 -03:00