Commit Graph

521 Commits

Author SHA1 Message Date
Carlos Satorres cd21d7817d refs #7396 fix summary basicData 2024-05-17 14:16:06 +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
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 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 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
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
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 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
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 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