7252 Commits

All Branches

Search

Author	SHA1	Message	Date
Jorge Penadés	679107d7ea	Merge pull request 'fix: refs #7354 redirect to ticket' (!917) from 7354-hotfix-redirectToTicket into master ... Reviewed-on: #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: #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: #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: #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: #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: #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
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: #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: #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: #909 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-11-12 07:01:11 +00: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
Alex Moreno	e21087e645	Merge pull request 'feat(Supplier): add companySize' (!906) from 6828-supplier_companySize into dev ... Reviewed-on: #906 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-11-11 12:48:16 +00:00
Alex Moreno	777ac58f04	feat(Supplier): add companySize	2024-11-11 10:31:41 +01:00
Jorge Penadés	462382ecb5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-saySimpleIntegration	2024-11-08 17:49:35 +01:00
Jorge Penadés	7fb3e71688	feat: refs #6818 fetch url & default channel	2024-11-08 17:41:27 +01:00
William Buezas	ade90afd03	refactor: change keyup.enter for update:model-value	2024-11-08 10:13:35 -03:00
William Buezas	c1d623622d	refactor: remove unused variable	2024-11-08 10:11:15 -03:00
Jorge Penadés	3bae121ed7	fix: refs #6818 use right icon	2024-11-08 13:04:40 +01:00
Javier Segarra	3825dc3851	feat: disabled buttons	2024-11-08 11:54:04 +01:00
Jorge Penadés	a467c44b91	feat: refs #6818 saysimple integration	2024-11-08 11:51:13 +01:00
Javier Segarra	c22c8d9f11	Merge pull request 'Improve required attrs for VnInput*' (!886) from improve_isRequired_input into dev ... Reviewed-on: #886 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-08 10:47:56 +00:00
Javier Segarra	ead326c66b	Merge branch 'improve_isRequired_input' of https://gitea.verdnatura.es/verdnatura/salix-front into improve_isRequired_input	2024-11-08 08:39:29 +01:00
Alex Moreno	dce57f4638	Merge branch 'dev' into improve_isRequired_input	2024-11-08 07:32:07 +00:00
Alex Moreno	0c6d6d6925	Merge pull request 'refs: #7782 Cypress features' (!891) from cypress_features into dev ... Reviewed-on: #891 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-08 07:31:46 +00:00
Javier Segarra	0a5c3bfe5b	Merge branch 'dev' into improve_isRequired_input	2024-11-08 07:29:54 +00:00
Javier Segarra	570c09bab5	Merge branch 'dev' into cypress_features	2024-11-08 07:27:26 +00:00
Javier Segarra	96d68ed106	Merge branch 'dev' into fix/OrderCatalog	2024-11-08 06:59:26 +00:00
William Buezas	8bff7fc1d6	fix: reset category	2024-11-07 21:09:39 -03:00
William Buezas	52a2250acc	refactor: apply QPopupProxy	2024-11-07 19:16:06 -03:00
William Buezas	498a52a3e5	refactor: small change	2024-11-07 19:07:03 -03:00
Alex Moreno	624ba2c13d	Merge pull request 'FIX: #6943 Customer issues' (!885) from fix_customer_issues into dev ... Reviewed-on: #885 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-07 16:20:22 +00:00
Alex Moreno	0b5be9e67f	chore: correct checkNotification	2024-11-07 17:19:35 +01:00
Javier Segarra	e210ad7de4	Merge branch 'dev' into fix_customer_issues	2024-11-07 13:06:33 +01:00