wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
7,279 Commits 155 Branches 0 Tags 30 MiB
Commit Graph

7279 Commits

Author SHA1 Message Date
Javier Segarra e592a76946 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices 2024-09-06 10:42:07 +02:00
Jon Elias ef98f60486 refactor: refs #7889 modified shortcut and dashboard, and added tootlip in LeftMenu 2024-09-06 10:30:32 +02:00
Jorge Penadés 42a2d9124e Merge pull request 'hotfix dynamic fetch' (!683) from hotfix-dynamicFetch into master 
Reviewed-on: verdnatura/salix-front#683
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-06 08:02:17 +00:00
Jon Elias 5d78f564dd refactor: refs #7889 deleted subtitle attr and use keyBinding instead 2024-09-06 10:00:07 +02:00
Jorge Penadés 5d91b03f9a fix: dynamic fetch 2024-09-06 09:27:55 +02:00
Jon Elias 585919a4d9 feat: refs #7889 added shortcuts to modules 2024-09-06 09:19:38 +02:00
Jorge Penadés f0351b0417 chore: refs #7323 worker changes 2024-09-06 09:05:29 +02:00
Carlos Satorres d6d5039f48 Merge branch '7283-fixItemDescriptor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-fixItemDescriptor 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 2024-09-06 07:26:04 +02:00
Jon Elias e962063753 Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-06 07:16:05 +02:00
Jon Elias 8ff9dae1d8 refactor: refs #7553 requested changes 2024-09-06 07:16:03 +02:00
Jon Elias 102f7fb13e Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-06 07:15:48 +02:00
Javier Segarra 1f96f5c09a feat: orderCreateDialog 2024-09-05 22:20:57 +02:00
Javier Segarra b3391ab522 perf: minor comments 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 2024-09-05 19:45:41 +02:00
Javier Segarra af91ca43e0 Merge branch 'dev' into 7283-fixItemDescriptor 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 
Reviewed-on: verdnatura/salix-front#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 2024-09-05 14:56:50 +02:00
Jon Elias 9f24a7bc29 Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-05 12:34:19 +00:00
Jon Elias db6f4fd15a refactor: refs #7553 deleted logs 2024-09-05 14:32:22 +02:00
Jon Elias 6321ed4ee2 Merge branch 'dev' into plus_key_shortcut 2024-09-05 11:08:52 +00:00
Jon Elias b6e14c4e6a fix: refs #7911 fixed shortcut and related files 2024-09-05 13:08:02 +02:00
Carlos Satorres c8d6a67011 fix tootltip 2024-09-05 12:49:17 +02:00
Carlos Satorres d4da8fc69f fix branch 2024-09-05 12:48:31 +02:00
Carlos Satorres 99b65c564c fix branch 2024-09-05 12:41:21 +02:00
Carlos Satorres fc7cc86362 fix branch 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 2024-09-05 12:07:18 +02:00
Carlos Satorres 83969f1d57 fix traduction 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 
Reviewed-on: verdnatura/salix-front#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 
Reviewed-on: verdnatura/salix-front#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 2024-09-05 08:58:20 +00:00
Carlos Satorres 95b19b5cce refs #7283 refactor fix ItemDescriptor 2024-09-05 10:04:58 +02:00
Jorge Penadés fc5eb20dba chore: refs #7663 create test wip 2024-09-05 08:56:38 +02:00
Jon Elias 70806769ce feat: refs #7911 added shortcut to modules 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 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 2024-09-04 22:27:33 +02:00
Javi Gallego c2e2d5ca81 feat: minor fixes 2024-09-04 18:30:20 +02:00
Javi Gallego 91164da2eb feat: refuncInvoiceForm component 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 
Reviewed-on: verdnatura/salix-front#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 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 
Reviewed-on: verdnatura/salix-front#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 
Reviewed-on: verdnatura/salix-front#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 2024-09-04 12:53:09 +00:00
Carlos Satorres 61c0f63eaf refs #6943 add try catch get 2024-09-04 14:46:21 +02:00
Carlos Satorres bcdd6965e6 refs #6943 add try catch 2024-09-04 14:43:48 +02:00