Jorge Penadés
|
96e9de519f
|
Merge branch 'dev' into 6818-saySimpleIntegration
|
2024-11-13 08:22:44 +00:00 |
Pablo Natek
|
5c59ae8217
|
fix: refs #7404 some filter issues
|
2024-11-13 09:12:51 +01:00 |
Alex Moreno
|
9ac3316567
|
Merge branch 'dev' into 8087-nuevosCamposTravel
|
2024-11-13 07:56:33 +00:00 |
Alex Moreno
|
1f8ead608c
|
Merge pull request 'feat(VnSelect): order data equal salix' (!918) from warmFix_order_equalSalix into dev
Reviewed-on: verdnatura/salix-front#918
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-11-13 06:48:55 +00:00 |
Alex Moreno
|
6f1e6a3bfa
|
Merge branch 'dev' into 8036-arrayData_exprBuilder_after
|
2024-11-13 06:22:52 +00:00 |
Alex Moreno
|
2ae9d68fec
|
Merge branch 'dev' into warmFix_order_equalSalix
|
2024-11-13 06:21:59 +00:00 |
Alex Moreno
|
8269037faa
|
chore: perf
|
2024-11-13 07:21:42 +01:00 |
Guillermo Bonet
|
8db3ab4d47
|
Merge branch 'dev' into 7950-cmrModelUnify
|
2024-11-13 06:13:23 +00:00 |
Jorge Penadés
|
4572817699
|
feat: refs #8087 reactive data
|
2024-11-12 16:37:59 +01:00 |
Carlos Andrés
|
b460a0be2f
|
Merge branch '8087-nuevosCamposTravel' of https://gitea.verdnatura.es/verdnatura/salix-front into 8087-nuevosCamposTravel
|
2024-11-12 16:27:41 +01:00 |
Carlos Andrés
|
18593cc3f9
|
feat: refs #8087 refs#8087 Redadas en travel
|
2024-11-12 16:27:40 +01:00 |
Jorge Penadés
|
83be57a0c4
|
chore: refs #6818 drop useless code & comment
|
2024-11-12 15:01:17 +01:00 |
Jorge Penadés
|
e29cd38ae9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-saySimpleIntegration
|
2024-11-12 15:00:18 +01:00 |
Alex Moreno
|
fc28639556
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-11-12 14:40:42 +01:00 |
Alex Moreno
|
3f15c3cce0
|
feat(VnSelect): order data equal salix
|
2024-11-12 14:35:55 +01:00 |
Jorge Penadés
|
679107d7ea
|
Merge pull request 'fix: refs #7354 redirect to ticket' (!917) from 7354-hotfix-redirectToTicket into master
Reviewed-on: verdnatura/salix-front#917
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-11-12 12:47:35 +00:00 |
Jorge Penadés
|
86b8f9bf54
|
Merge pull request 'feat: refs #6919 sync entry data' (!913) from 6919-reactiveDescriptor into dev
Reviewed-on: verdnatura/salix-front#913
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-11-12 12:37:39 +00:00 |
Jorge Penadés
|
90f04cc010
|
Merge branch 'dev' into 6919-reactiveDescriptor
|
2024-11-12 12:36:48 +00:00 |
Jorge Penadés
|
18f544f8dc
|
fix: refs #7354 redirect to ticket
|
2024-11-12 13:23:28 +01:00 |
Javier Segarra
|
830c3658d4
|
Merge pull request 'fix/OrderCatalog' (!893) from wbuezas/salix-front-mindshore-fork2:fix/OrderCatalog into dev
Reviewed-on: verdnatura/salix-front#893
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-11-12 12:01:43 +00:00 |
Jorge Penadés
|
1554333e07
|
Merge pull request 'fix: refs #7354 zip filter' (!916) from 7354-hotfix-zipFilter into master
Reviewed-on: verdnatura/salix-front#916
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-11-12 11:53:41 +00:00 |
Jorge Penadés
|
db8340bde5
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354-hotfix-zipFilter
|
2024-11-12 12:51:09 +01:00 |
Alex Moreno
|
26af102804
|
fix(CreateThermographForm): remove limit
|
2024-11-12 12:47:30 +01:00 |
Jorge Penadés
|
2afddeb063
|
fix: refs #7354 zip filter
|
2024-11-12 12:41:10 +01:00 |
Javier Segarra
|
a7d53fcbe6
|
Merge branch 'dev' into fix/OrderCatalog
|
2024-11-12 11:30:36 +00:00 |
Javier Segarra
|
a76d63ff00
|
Merge pull request 'HOTFIX: Send SMS using mobile instead phone' (!914) from hotFix-customer_sms into master
Reviewed-on: verdnatura/salix-front#914
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
|
2024-11-12 11:13:32 +00:00 |
Javier Segarra
|
2139b7e8e8
|
Merge branch 'master' into hotFix-customer_sms
|
2024-11-12 11:12:46 +00:00 |
Carlos Satorres
|
d8ae6c056e
|
Merge pull request 'fix: fix termo' (!915) from hotfix-termog into master
Reviewed-on: verdnatura/salix-front#915
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-11-12 11:09:41 +00:00 |
Carlos Satorres
|
fefa61ea5c
|
fix: fix termo
|
2024-11-12 12:07:02 +01:00 |
Javier Segarra
|
6355993c14
|
fix: mobile is more relevant than phone
|
2024-11-12 11:00:05 +00:00 |
Carlos Andrés
|
4a0c15ed90
|
Merge branch 'dev' into 8087-nuevosCamposTravel
|
2024-11-12 10:24:06 +00:00 |
Jorge Penadés
|
b4d7653661
|
refactor: refs #6919 export filter
|
2024-11-12 11:15:34 +01:00 |
Jorge Penadés
|
efd66ea02a
|
feat: refs #6919 sync entry data
|
2024-11-12 11:08:45 +01:00 |
Alex Moreno
|
95b6e72e6c
|
Merge pull request 'HOTFIX(CustomerBalance): getClientRisk' (!912) from hotFix_customer_balance into master
Reviewed-on: verdnatura/salix-front#912
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
|
2024-11-12 09:27:54 +00:00 |
Alex Moreno
|
700fb7481b
|
fix(CustomerBalance): getClientRisk
|
2024-11-12 10:15:31 +01:00 |
Jorge Penadés
|
81b35aa75b
|
chore: refs #6818 add spaces
|
2024-11-12 10:11:26 +01:00 |
Jorge Penadés
|
700701f055
|
refactor: refs #6818 channel logic
|
2024-11-12 10:10:26 +01:00 |
Jorge Penadés
|
c775ba8592
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-saySimpleIntegration
|
2024-11-12 09:45:05 +01:00 |
Jorge Penadés
|
cc12250109
|
Merge pull request 'feat: refs #6839 module searching' (!910) from 6839-addSearchMenu into dev
Reviewed-on: verdnatura/salix-front#910
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-11-12 08:35:42 +00:00 |
Guillermo Bonet
|
40ecd6e358
|
refactor: refs #7950 Created cmr model
|
2024-11-12 08:28:02 +01:00 |
Alex Moreno
|
8c78991163
|
fix(EntryStockBought): min width
|
2024-11-12 08:23:49 +01:00 |
Alex Moreno
|
87b7fd6db4
|
Merge pull request '8179-testToMaster' (!909) from 8179-testToMaster into master
Reviewed-on: verdnatura/salix-front#909
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
|
2024-11-12 07:01:11 +00:00 |
Javi Gallego
|
8e4931516a
|
feat: refs #7346 traducciones en cammelCase
|
2024-11-12 07:42:55 +01:00 |
Javi Gallego
|
76e35cc758
|
feat: refs #7346 address ordered
|
2024-11-12 07:28:51 +01:00 |
William Buezas
|
4bfbd1925e
|
test: refs #8162 ticket list e2e tests
|
2024-11-11 15:18:29 -03:00 |
Jorge Penadés
|
7f1a4d6cc8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-saySimpleIntegration
|
2024-11-11 16:42:20 +01:00 |
Jorge Penadés
|
07e7cbc355
|
feat: refs #6839 module searching
|
2024-11-11 16:36:18 +01:00 |
Carlos Andrés
|
e9fad1a44e
|
feat: refs #8087 refs#8087 Redadas en travel
|
2024-11-11 15:00:07 +01:00 |
Carlos Andrés
|
fc73149dcf
|
feat: refs #8087 refs#8087 Redadas en travel
|
2024-11-11 14:20:39 +01:00 |
Alex Moreno
|
e21087e645
|
Merge pull request 'feat(Supplier): add companySize' (!906) from 6828-supplier_companySize into dev
Reviewed-on: verdnatura/salix-front#906
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
|
2024-11-11 12:48:16 +00:00 |