Commit Graph

5995 Commits

Author SHA1 Message Date
Carlos Satorres d6d5039f48 Merge branch '7283-fixItemDescriptor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-fixItemDescriptor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 07:50:42 +02:00
Carlos Satorres 6db1c8f083 fix traduction 2024-09-06 07:50:39 +02:00
Pablo Natek cd12343302 feat: refs #7404 add some style to the form and reorganize fields
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-06 07:26:04 +02:00
Javier Segarra 1f96f5c09a feat: orderCreateDialog
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 22:20:57 +02:00
Javier Segarra b3391ab522 perf: minor comments
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 20:51:33 +02:00
Javier Segarra 31abd8b4c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 19:45:41 +02:00
Javier Segarra af91ca43e0 Merge branch 'dev' into 7283-fixItemDescriptor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 13:57:53 +00:00
Javier Segarra a48c293a9a Merge pull request '#7911 - Add Shortcut keyboard when press Ctrl+Alt++' (!653) from plus_key_shortcut into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #653
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-05 13:52:03 +00:00
Javier Segarra 6476a8307a perf: i18n 2024-09-05 15:08:59 +02:00
Javier Segarra 62cdc1d527 feat: CustomerCreateTicket
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-05 14:56:50 +02:00
Jon Elias 6321ed4ee2 Merge branch 'dev' into plus_key_shortcut
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 11:08:52 +00:00
Jon Elias b6e14c4e6a fix: refs #7911 fixed shortcut and related files
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 13:08:02 +02:00
Carlos Satorres c8d6a67011 fix tootltip
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 12:49:17 +02:00
Carlos Satorres d4da8fc69f fix branch
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 12:48:31 +02:00
Carlos Satorres 99b65c564c fix branch
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 12:41:21 +02:00
Carlos Satorres fc7cc86362 fix branch
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 12:39:55 +02:00
Carlos Satorres 8fe6fad4a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-fixItemDescriptor
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 12:07:18 +02:00
Carlos Satorres 83969f1d57 fix traduction
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-05 12:05:53 +02:00
Carlos Satorres 1662e3b459 Merge pull request 'refs #6943 remake, refactor, clean code Samples' (!677) from 6943-fixCustomerSamples into master
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-master This commit looks good Details
Reviewed-on: #677
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-05 09:57:20 +00:00
Javi Gallego 1b8a72175c Merge pull request '#7277 feat: transfer an invoice' (!674) from 7277-RefundInvoices into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #674
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-05 09:07:35 +00:00
Carlos Satorres 3999936ec1 Merge branch 'master' into 6943-fixCustomerSamples
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-05 08:58:20 +00:00
Carlos Satorres 95b19b5cce refs #7283 refactor fix ItemDescriptor
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-05 10:04:58 +02:00
Jorge Penadés fc5eb20dba chore: refs #7663 create test wip
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 08:56:38 +02:00
Jon Elias 70806769ce feat: refs #7911 added shortcut to modules
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 08:25:28 +02:00
Jon Elias 96cdb85258 Merge branch 'dev' of https: refs #7911//gitea.verdnatura.es/verdnatura/salix-front into 7911-plus_key_shortcut
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-05 07:42:55 +02:00
Javier Segarra e3c8adf676 Merge branch '7277-RefundInvoices' of https://gitea.verdnatura.es/verdnatura/salix-front into 7277-RefundInvoices
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-04 22:27:33 +02:00
Javi Gallego c2e2d5ca81 feat: minor fixes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-04 18:30:20 +02:00
Javi Gallego 91164da2eb feat: refuncInvoiceForm component
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-04 18:16:40 +02:00
Javier Segarra cf3b9b2ef8 perf: CustomerSummary 2024-09-04 17:55:27 +02:00
Javi Gallego 5d7e6be17c Merge branch 'dev' into 7277-RefundInvoices 2024-09-04 17:51:02 +02:00
Carlos Andrés 3e6710404b Merge pull request '#7897 - Merge master into test' (!668) from master into test
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev Build queued... Details
Reviewed-on: #668
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-09-04 14:28:54 +00:00
Jorge Penadés af5e47ed3e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-04 16:06:31 +02:00
Jorge Penadés a5d32895ea Merge pull request 'fix: refs #6900 fine tunning' (!661) from 6900-hotfix-fineTunning into master
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #661
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-04 13:58:58 +00:00
Javier Segarra 95e30c88ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7277-RefundInvoices 2024-09-04 15:32:14 +02:00
Carlos Satorres 251f27bec6 Merge pull request 'refs #7407 Medical Section' (!667) from 7407-MedicalWorker2 into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #667
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-04 13:07:33 +00:00
Carlos Satorres 716270ef92 Merge branch 'dev' into 7407-MedicalWorker2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-04 12:53:09 +00:00
Carlos Satorres 61c0f63eaf refs #6943 add try catch get
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-04 14:46:21 +02:00
Carlos Satorres bcdd6965e6 refs #6943 add try catch
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-04 14:43:48 +02:00
Carlos Satorres d08748b1a4 refs #6943 fix sampleType
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-04 14:41:35 +02:00
Pablo Natek 717bf1c3e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-04 14:40:53 +02:00
Pablo Natek 3dc720e2d0 feat: refs #7404 add m3 and fix detail
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-04 14:40:36 +02:00
Carlos Satorres b29a56d7dd refs #6943 remake, refactor, clean code Samples
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-04 14:37:39 +02:00
Jon Elias 63c2da9a51 Merge pull request '#6896 Added missing descriptors and small details' (!671) from Fix_OrderMissingDetails into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #671
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-04 10:36:04 +00:00
Jon Elias 4602f4c7b3 refactor: deleted useless prop
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-04 12:25:05 +02:00
Jorge Penadés 763cf2e345 refactor: refs #6900 create setRectificative composable
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-04 10:30:14 +02:00
Carlos Satorres 1f9d1b79ab refs #7283 refactor ItexDescriptor 2024-09-04 10:17:57 +02:00
Jon Elias 3a1575a385 Merge branch 'Fix_OrderMissingDetails' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderMissingDetails
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-04 10:05:19 +02:00
Jon Elias 19ae1f9d80 refactor: deleted useless prop in FetchedTags 2024-09-04 10:05:18 +02:00
Jon Elias beaa9ab5c8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderMissingDetails 2024-09-04 09:53:47 +02:00
Carlos Satorres 3a703141c6 Merge branch 'dev' into 7407-MedicalWorker2
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-04 07:49:14 +00:00