Commit Graph

342 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Jon Elias 33c54042df refactor: refs #6425 translation files in .yml format and minor changes 2024-04-02 14:12:01 +02:00