test_dev_resolveConflicts #647

Merged

jsegarra merged 40 commits from test_dev_resolveConflicts into dev 2024-08-27 07:10:20 +00:00

Conversation 0 Commits 40 Files Changed 20 +309 -115

40 Commits

Author	SHA1	Message	Date
Javier Segarra	461b764f0e	Merge branch 'test' into dev	2024-08-27 07:11:20 +02:00
Jorge Penadés	89287c3ea3	Merge pull request '#7864 - Merge master into test' (!630) from master into test ... Reviewed-on: #630 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-08-26 12:01:53 +00:00
Jorge Penadés	8277b30033	Merge pull request 'fix: refs #7323 auto fill bic' (!642) from 7323-hotfix-workerCreate into master ... Reviewed-on: #642 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-08-26 11:57:10 +00:00
Jorge Penadés	c418899fb3	chore: refs #7323 improve vnselect	2024-08-26 13:54:48 +02:00
Jorge Penadés	e1e768948e	chore: refs #7323 improve vnselect	2024-08-26 13:44:35 +02:00
Jorge Penadés	c47635fcf2	chore: refs #7323 refactor autofillbic	2024-08-26 13:42:08 +02:00
Jorge Penadés	6f9cd7fe15	fix: refs #7323 auto fill bic	2024-08-26 12:47:05 +02:00
Jorge Penadés	9636d5a3ad	Merge pull request 'hotfix: refs #7323 generate code & minor changes' (!635) from 7323-hotfix-workerFineTunning into master ... Reviewed-on: #635 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-23 06:49:17 +00:00
Jorge Penadés	48277a5f20	fix: refs #7323 vertical align	2024-08-22 12:14:16 +02:00
Jorge Penadés	fd09a6bfbe	fix: refs #7323 test	2024-08-21 16:36:45 +02:00
Jorge Penadés	b77a10a57a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-hotfix-workerFineTunning	2024-08-21 16:04:52 +02:00
Jorge Penadés	9c99266da6	fix: refs #7323 replace day	2024-08-21 16:02:16 +02:00
Jorge Penadés	517ec87e16	fix: refs #7323 use timeStamp	2024-08-21 14:18:01 +02:00
Javier Segarra	ed3b604c76	Merge pull request 'Show username instead name' (!634) from hotfix_account_descriptor into master ... Reviewed-on: #634 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-21 12:01:50 +00:00
Jorge Penadés	635ac2716d	fix: refs #7323 generate code & minor changes	2024-08-21 13:33:50 +02:00
Javier Segarra	292253fb45	fix: Show name in summary instead current value	2024-08-21 11:29:35 +00:00
Javier Segarra	bac0a3ba6c	fix: Show name in descriptor instead current value	2024-08-21 11:29:12 +00:00
Jorge Penadés	172c238ac3	Merge pull request 'hotfix: #6917 set right time' (!632) from hotfix-fixVnInputTime into master ... Reviewed-on: #632 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-21 07:28:27 +00:00
Jorge Penadés	7f2407996f	chore: const var	2024-08-20 17:02:38 +02:00
Jorge Penadés	d89d324a7e	chore: drop ref	2024-08-20 16:59:16 +02:00
Jorge Penadés	0277aa50ce	fix: set right time	2024-08-20 16:55:39 +02:00
Javier Segarra	7e3c5a9278	Merge pull request 'HOTFIX remove full-height class' (!631) from hotfix_workerTimeControl_style into master ... Reviewed-on: #631 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-20 09:42:37 +00:00
Javier Segarra	472d477b15	fix: trim vnsearchbar input value	2024-08-20 09:32:50 +00:00
Javier Segarra	145c8b00d5	fix: limit and order TicketTracking	2024-08-20 09:32:01 +00:00
Javier Segarra	6e814ed4a8	fix: remove full-height class	2024-08-20 08:02:06 +00:00
Javier Segarra	5206f56cec	Merge pull request '#7864 - 7864_testToMaster_2434' (!629) from 7864_testToMaster_2434 into master ... Reviewed-on: #629 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-20 06:33:16 +00:00
Javier Segarra	9086735aa1	test: fix routeList	2024-08-20 08:22:20 +02:00
Alex Moreno	b35bf85f4a	fix(claim_summary): url links	2024-08-16 10:50:45 +02:00
Alex Moreno	51ee79b7f7	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-08-16 09:24:24 +02:00
Alex Moreno	83a8f7e147	fix(invoiceOutGlobal): formData is object	2024-08-16 09:20:53 +02:00
Jorge Penadés	a564f94e30	Merge pull request '#6900 add Serial' (!610) from 6900-addSerial into test ... Reviewed-on: #610 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-14 14:20:40 +00:00
Jorge Penadés	ecfdf0b6b9	fix: refs #6900 improve loading	2024-08-14 15:27:36 +02:00
Jorge Penadés	3bba5db1b5	fix: refs #6900 improve logic	2024-08-14 14:52:47 +02:00
Jorge Penadés	65d893e128	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-addSerial	2024-08-14 14:30:47 +02:00
Jorge Penadés	760dc0e6f4	Merge branch '6900-addSerial' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-addSerial	2024-08-14 14:27:57 +02:00
Jorge Penadés	6dd9029871	fix: refs #6900 improve logic	2024-08-14 14:27:54 +02:00
Jorge Penadés	e07d573788	Merge branch 'test' into 6900-addSerial	2024-08-14 10:13:39 +00:00
Jorge Penadés	de24a3efdb	feat: refs #6900 add locale	2024-08-12 15:34:09 +02:00
Jorge Penadés	c7679fd142	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-addSerial	2024-08-12 14:22:47 +02:00
Jorge Penadés	c4de1beabf	feat: refs #6900 add InvoiceInSerial	2024-08-12 13:46:56 +02:00