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

5220 Commits

Author SHA1 Message Date
Alex Moreno f4347411ab test: add better test to vnLocation 2024-07-30 10:01:16 +02:00
Jorge Penadés 1fe2ba7f09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6989-showClientName 2024-07-30 09:52:29 +02:00
Alex Moreno b16f00b2e9 build: init version 2434 2024-07-30 08:38:14 +02:00
Alex Moreno eba8523a76 Merge pull request '7806_devToTest_2332' (!578) from 7806_devToTest_2330 into test 
Reviewed-on: verdnatura/salix-front#578
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-07-30 06:14:01 +00:00
Jon Elias 2cd696aeb9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-30 08:03:46 +02:00
Alex Moreno b5cb28a0cf Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-30 07:47:46 +02:00
Alex Moreno 9179e13dcd fix: vnLocation 2024-07-29 15:03:21 +02:00
Jorge Penadés 839af6d50c fix: refs #6989 show entity name & default time from config table 2024-07-29 13:41:44 +02:00
Jorge Penadés 3741999fae Merge pull request '#6891 worker tests' (!575) from fixE2e into dev 
Reviewed-on: verdnatura/salix-front#575
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-29 08:31:51 +00:00
Jorge Penadés a7af5d43a2 fix: refs #6891 worker tests 2024-07-29 10:10:34 +02:00
Jorge Penadés 328c54deee Merge pull request '#7197 fixInvoiceIn' (!466) from 7197-fixInvoiceIn into dev 
Reviewed-on: verdnatura/salix-front#466
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-07-29 07:44:04 +00:00
Jorge Penadés 979b3b2a6c fix: refs #7197 drop character 2024-07-29 08:46:47 +02:00
Jorge Penadés 5705904e40 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn 2024-07-29 08:04:51 +02:00
Jon Elias be113656ae Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-26 14:56:27 +02:00
Jon Elias 4d7fe0fd86 fix: refs #7717 fix volume and lines redirect 2024-07-26 14:56:26 +02:00
Alex Moreno f079ba4022 hotFix: twoFactor add required import 2024-07-26 14:51:22 +02:00
Jon Elias 356e7768b7 Merge branch 'dev' into 7717_fixOrderCatalog 2024-07-26 12:11:18 +00:00
Jon Elias 4cad7cbced Merge branch '7717_fixOrderCatalog' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog 2024-07-26 14:09:10 +02:00
Jon Elias d588db05ac fix: refs #7717 fix OrderList table filters' and summary table style 2024-07-26 14:09:09 +02:00
Robert Ferrús 01c58484e2 Merge pull request 'fix: refs #7039 supplierSummary' (!574) from 7039-hotFixSupplierSummary into master 
Reviewed-on: verdnatura/salix-front#574
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-26 12:00:29 +00:00
Robert Ferrús bfbe4d64b3 Merge branch 'master' into 7039-hotFixSupplierSummary 2024-07-26 11:59:32 +00:00
Guillermo Bonet 7b13250a16 Merge branch 'test' into dev 2024-07-26 13:57:11 +02:00
Guillermo Bonet 36dd6fbe1e Merge pull request 'fix: refs #6769 Fixes item diary' (!573) from 6769-itemDiaryFix into master 
Reviewed-on: verdnatura/salix-front#573
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-26 11:18:47 +00:00
Guillermo Bonet 621de11890 fix: refs #6769 Requested changes 2024-07-26 13:14:45 +02:00
Guillermo Bonet 48e133ffc7 fix: refs #6769 Fix worker images 2024-07-26 13:00:55 +02:00
Robert Ferrús d4ff3ab993 fix: refs #7039 supplierSummary 2024-07-26 12:55:36 +02:00
Guillermo Bonet 86ab161302 fix: refs #6769 Fixes item diary 2024-07-26 12:37:53 +02:00
Alex Moreno 21b642a7c5 typo 2024-07-26 12:15:57 +02:00
Carlos Satorres 5d42a2128e Merge pull request 'refs #6898 filters' (!572) from hotfix-supplierMigration3 into master 
Reviewed-on: verdnatura/salix-front#572
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-26 10:14:33 +00:00
Jon Elias 3330e43e25 Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-07-26 12:01:48 +02:00
Carlos Satorres f4c0288ca0 refs #6898 filters sortby 2024-07-26 12:01:46 +02:00
Jon Elias 61f1eae282 fix: deleted branch cloned wrongly 2024-07-26 12:01:46 +02:00
Carlos Satorres 1ad15869e8 refs #6898 filters select 2024-07-26 11:45:13 +02:00
Carlos Satorres d575c3cdae refs #6898 filters 2024-07-26 11:25:44 +02:00
Jon Elias 7c5f5aee77 Merge branch 'dev' into 7553_FixTicketExpedition 2024-07-26 09:25:37 +00:00
Jon Elias 1dace39882 refactor: refs #7553 changed isScanned field & fixed cardDescriptor warning 2024-07-26 11:24:40 +02:00
Pablo Natek 0fee90d371 Merge pull request '7401-add-option-on-descriptor-menu' (!569) from 7401-add-option-on-descriptor-menu into dev 
Reviewed-on: verdnatura/salix-front#569
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-26 08:34:48 +00:00
Jon Elias 2ab7d48b0c feat: refs #7553 added VnTable in Expedition, new field & minor changes in rest of section 2024-07-26 09:55:24 +02:00
Alex Moreno 28e50512ba remove console.log 2024-07-26 09:51:46 +02:00
Alex Moreno 21dd2e4b46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-customer_migration_subsection 2024-07-26 09:49:22 +02:00
Alex Moreno 026c632a4c feat(customer): improve basicData to balance 2024-07-26 09:47:28 +02:00
Pablo Natek 81463cf129 Merge branch 'dev' into 7401-add-option-on-descriptor-menu 2024-07-26 07:46:32 +00:00
Pablo Natek 2d8eecca1c fix: refs #7401 fix routeForm 2024-07-26 09:46:00 +02:00
Pablo Natek ed60793381 fix: refs #7401 remove console.log 2024-07-26 09:42:53 +02:00
Pablo Natek eae2144e1d feat: refs #7401 add menu options 2024-07-26 09:41:47 +02:00
Alex Moreno a96693f94c Merge pull request 'warmFix: rollback VnRow' (!568) from warmFix_rollback_VnRow into dev 
Reviewed-on: verdnatura/salix-front#568
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2024-07-26 07:33:19 +00:00
Alex Moreno c5927f14c3 warmFix: rollback VnRow 2024-07-26 09:27:38 +02:00
Carlos Satorres 2f617f4b92 passwordAccount 2024-07-26 09:09:38 +02:00
Javier Segarra 1923e83210 Merge pull request '#7648 - HOTFIX: myEntries filters' (!566) from hotfix_myEntries into master 
Reviewed-on: verdnatura/salix-front#566
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-26 05:50:35 +00:00
Javier Segarra 662ffeac0a fix: minor changes 2024-07-26 07:44:46 +02:00