Commit Graph

794 Commits

Author SHA1 Message Date
Carlos Satorres 0475083a2b refs #7407 Medical Section
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-02 14:57:01 +02:00
Jon Elias 1af4a559fc Merge branch 'dev' into 7354_ZoneMigration_End
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-02 10:50:22 +00:00
Javier Segarra fb15e90f0b Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-09-02 09:48:48 +02:00
Jorge Penadés a8fc5a8d73 Merge branch 'dev' of https: refs #7353//gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-02 09:09:27 +02:00
Jorge Penadés be63c8a7fa fix: refs #6900 fine tunning wip
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-02 08:43:32 +02:00
Javier Segarra c25b689685 Merge branch 'dev' into 6943_fix_customerSummaryTable
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-31 00:14:42 +02:00
Carlos Satorres 874cbfea9b refs #7366 fix travel hours
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-30 12:31:42 +02:00
Carlos Satorres 859eb918cd refs #6897 fix entry
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-30 11:50:05 +02:00
Jorge Penadés f9a509ac67 feat: refs #7353 add no one opt
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-30 11:40:55 +02:00
Carlos Satorres f33733c7f2 refs #7355 fix total
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-30 11:25:00 +02:00
Carlos Satorres 1544513a3e refs #7355 #7366 fix account, summary, list, travelList, tooltip 2024-08-30 11:18:48 +02:00
Carlos Satorres 278f691ed2 refs #7355 fix views summarys, entryList, travelList refact
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-30 09:52:43 +02:00
Jorge Penadés 966667bab7 refactor: refs #7353 tickets correction
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-29 11:40:42 +02:00
Javier Segarra 20ddabcc01 Merge remote-tracking branch 'origin/7830-customerDesplegables' into 6943_fix_customerSummaryTable
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-27 16:30:32 +02:00
Javier Segarra cadd6a2b62 Merge remote-tracking branch 'origin/7830-customerDesplegables' into 6943_fix_customerSummaryTable 2024-08-27 15:52:38 +02:00
Javier Segarra 3ea8490e98 Merge branch 'dev' into 6943_fix_customerSummaryTable 2024-08-27 15:46:04 +02:00
Jorge Penadés 25be0df2e3 Merge branch 'dev' of https: refs #7353//gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-27 09:55:52 +02:00
Javier Segarra 2ae482ff8c Merge branch 'test' into dev 2024-08-27 09:38:12 +02:00
Javier Segarra 461b764f0e Merge branch 'test' into dev
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-27 07:11:20 +02:00
Javier Segarra 10747d7a4f perf: customerSummaryTable 2024-08-27 07:00:28 +02:00
Javier Segarra 56f687ce36 perf: sendEmail customerConsumption
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-23 21:06:15 +02:00
Javi Gallego defb11a6d7 Merge branch 'dev' into 7346-invoiceOutMultilple
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-23 08:20:06 +00:00
Jon Elias a31931f8cf Merge branch 'dev' of https: refs #7354//gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-21 08:13:19 +02:00
Javi Gallego 0eb699bcbe feat: refs #7346 formdata uses serialType
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-20 10:10:11 +02:00
Jorge Penadés 206253ac6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-19 16:03:23 +02:00
Jon Elias ce8d12fe20 Merge branch 'dev' into 7717_fixOrderCatalog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-19 09:20:31 +00:00
Jon Elias 6fd0083870 fix: refs #7354 fix validation in price field
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-19 10:45:13 +02:00
Jorge Penadés ada1c948f6 feat: refs #7353 split sections
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-19 10:14:02 +02:00
Alex Moreno e45e551526 feat: customer consumption
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-16 15:16:35 +02:00
Jon Elias 95cda2bad7 Merge branch 'dev' into 7354_ZoneMigration_End
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-14 13:10:25 +00:00
Alex Moreno a8f550fcc8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-08-14 13:39:54 +02:00
Jorge Penadés e07d573788 Merge branch 'test' into 6900-addSerial
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-08-14 10:13:39 +00:00
Jon Elias 926fba27b8 Merge branch 'dev' into 7354_ZoneMigration_End
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-14 08:45:37 +00:00
Jon Elias ed4bf3cfa8 refactor: refs #7354 requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-14 10:44:45 +02:00
Javier Segarra 55b9cd9ff4 feat: handle same multiple CP 2024-08-14 09:18:24 +02:00
Alex Moreno 0a0e8be39f Merge branch 'dev' into 7848-recoveryPassword
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-13 14:41:23 +00:00
Jorge Penadés a24caa9393 fix: refs #7323 use global locale
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-08-13 12:56:39 +02:00
Carlos Satorres e144f0be01 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration2 2024-08-13 12:52:14 +02:00
Alex Moreno a46198e2d0 feat: add recover password and reset password 2024-08-13 12:25:08 +02:00
Jorge Penadés c4de1beabf feat: refs #6900 add InvoiceInSerial
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-12 13:46:56 +02:00
Alex Moreno 37244cdbc7 feat(orderBasicData): add notes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-09 14:55:49 +02:00
Jorge Penadés dc5142c20a feat: refs #6900 use VnTable & sort filter fields
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-08 10:12:54 +02:00
Carlos Satorres df1b63da98 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration2 2024-08-07 12:23:22 +02:00
Carlos Satorres 6b69a16122 refs #7355 changes BasicData 2024-08-07 12:22:52 +02:00
Pablo Natek f2be2b4300 fea: stockBought add form and formDetail 2024-08-05 15:42:57 +02:00
Alex Moreno 810e579ea9 refactor(customer_recovery): to vnTable 2024-08-05 12:10:15 +02:00
Carlos Satorres e41078b973 refs #7355 traduccions
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-31 08:34:31 +02:00
Jorge Penadés 5705904e40 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-29 08:04:51 +02:00
Jon Elias a7a1b7801c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-23 13:25:58 +02:00
Jon Elias 12370b6437 feat: refs #6346 new wagon type section
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-07-23 13:22:54 +02:00
Guillermo Bonet 580777af65 Deleted repeated labeler i18n
gitea/salix-front/pipeline/head This commit looks good Details
2024-07-22 08:20:08 +02:00
Guillermo Bonet c5903e29e8 Merge branch 'master' into test
gitea/salix-front/pipeline/head There was a failure building this commit Details
2024-07-19 13:08:41 +02:00
Javier Segarra 7cbdf0d98b feat: fix bugs and filters 2024-07-18 15:20:44 +02:00
Javier Segarra 5fbbd27273 fat: i18n 2024-07-16 12:21:50 +02:00
Javier Segarra fb2e3f1f9c feat: required validation 2024-07-16 11:25:06 +02:00
Javier Segarra 8798598f41 Merge branch 'dev' into 7017_formModel_validations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-16 09:26:22 +02:00
Javier Segarra be86b69079 fix: ticket menu order and i18n
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-15 11:53:10 +02:00
Javier Segarra c56610515c Merge branch 'dev' into TicketDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-15 11:29:27 +02:00
Javier Segarra ae55983405 Merge branch 'dev' into feature/SaleTracking
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-15 09:23:53 +00:00
Alex Moreno cc8062785a Merge branch 'dev' into feature/SaleTracking
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-15 08:17:01 +00:00
Javier Segarra 20403287dd feat: scopeDays replace by daysOnward
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-07-12 22:38:38 +02:00
Javier Segarra c5c96bf51b Merge branch 'dev' into feature/SaleTracking
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-09 09:41:45 +02:00
Javier Segarra cededb54e8 Merge branch 'dev' into feature/TicketDms 2024-07-09 09:14:40 +02:00
Alex Moreno 75b8cca2e0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-migrationClaim-v5 2024-07-08 14:25:01 +02:00
Javier Segarra aabd575854 Merge branch 'dev' into feature/TicketPackages
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-08 10:55:14 +02:00
Javier Segarra 84462fe201 Merge branch 'dev' into feature/TicketComponents
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-08 10:14:13 +02:00
Javier Segarra f87b806406 Merge branch 'dev' into feature/TicketPhotos
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-08 10:10:24 +02:00
Javier Segarra a303942f76 Merge branch 'dev' into feature/TicketExpedition
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-08 08:05:33 +00:00
Javier Segarra 9d4cfbd90c Merge branch 'dev' into feature/TicketPackages 2024-07-05 09:28:31 +02:00
Alex Moreno 12ca0faf21 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-migrationClaim-v5
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-05 07:23:20 +02:00
William Buezas decf33c0b7 small changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-04 09:46:10 -03:00
Javier Segarra d6cc447989 Merge branch 'dev' into feature/SaleTracking 2024-07-04 10:44:50 +02:00
Javier Segarra 14e26f0285 Merge branch 'dev' into feature/TicketComponents 2024-07-04 09:40:00 +02:00
William Buezas 91eb966586 Ticket photos 2024-07-03 14:44:36 -03:00
Alex Moreno 2340aaba0b feat: list use vnTable, fix descriptor 2024-07-03 14:39:15 +02:00
Jorge Penadés 076fbad20e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-07-03 14:11:29 +02:00
Jorge Penadés b0c5f19f1d merge dev
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-07-03 12:31:01 +02:00
Carlos Satorres 92b8104b19 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration 2024-07-03 12:21:03 +02:00
Carlos Satorres 885decc700 Merge branch 'dev' into 6897-entryMigration2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-03 10:02:28 +00:00
Alex Moreno 1463cc8904 Merge branch 'dev' into 7366-travelMigration2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-03 08:32:00 +00:00
Carlos Satorres 27876b0bab Merge branch 'dev' into 7366-travelMigration2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-03 08:30:56 +00:00
Pablo Natek 29c4b1bcb8 Merge branch '7404-add-e2e-to-route' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-add-e2e-to-route
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-03 10:20:58 +02:00
Pablo Natek 937167ce95 remove: refs #7404 remove traductions 2024-07-03 10:19:47 +02:00
Carlos Satorres 94680a6c2d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-03 10:07:34 +02:00
Pablo Natek f15fc0d6a7 Merge branch 'dev' into 7404-add-e2e-to-route
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-03 08:07:15 +00:00
Carlos Satorres dff77277ac refs #6897 fix summary, list, inputs
gitea/salix-front/pipeline/pr-dev Build queued... Details
2024-07-03 10:05:05 +02:00
Jon Elias f8d263c347 Merge branch 'dev' into 7543-StandarizeDescriptors
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-03 07:52:35 +00:00
Pablo Natek 61bd1eaf04 merge dev 2024-07-03 09:33:04 +02:00
Carlos Satorres b40e3f2c7c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-entryMigration2
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-07-03 08:48:33 +02:00
Carlos Satorres 21d5d6b986 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-03 08:46:05 +02:00
Javier Segarra f46443ee69 Merge branch 'dev' into 7648_dev_customerEntries
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-03 08:33:33 +02:00
Javier Segarra d15dc7336b Merge branch 'dev' into 7648_dev_customerEntries
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-07-03 08:26:27 +02:00
Jon Elias e13f98dffb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7543-StandarizeDescriptors 2024-07-03 07:12:07 +02:00
William Buezas 5c36ad14f4 Ticket components 2024-07-02 21:33:19 -03:00
Javier Segarra 8a94701422 Merge branch 'dev' into 7648_dev_customerEntries 2024-07-02 20:32:08 +02:00
Jon Elias c0e65ff3b7 fix: refs #7030 solve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-02 11:50:07 +02:00
Pablo Natek 2ad9530b1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-add-e2e-to-route 2024-07-02 09:58:46 +02:00
Jorge Penadés 2c9c1bed09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-07-02 09:56:55 +02:00
Javier Segarra 68298b9ba6 feat: rreplace eti by labeler 2024-07-01 19:03:17 +02:00
Javier Segarra 3f5f918684 Merge branch 'dev' into feature/TicketExpedition
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-07-01 15:12:40 +02:00