5331 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	8619abdfb4	feat: change navBar buttons	2024-08-28 14:03:37 +02:00
Javier Segarra	ae70256b5e	Merge pull request '#6772 - Reload data section when change Id' (!192) from 6772_reload_sections into dev ... Reviewed-on: #192 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-27 15:17:44 +00:00
Javier Segarra	50de0aa072	fix: InvoiceIn sections	2024-08-27 14:55:36 +02:00
Javier Segarra	ec979d11e0	Merge branch 'dev' into 6772_reload_sections	2024-08-27 14:50:01 +02:00
Javier Segarra	714b9063fd	Merge pull request '7896_down_devToTest_2436' (!651) from 7896_down_devToTest_2436 into dev ... Reviewed-on: #651 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-27 12:33:01 +00:00
Javier Segarra	f88dc4a59d	feat: update changelog	2024-08-27 14:01:48 +02:00
Javier Segarra	636861234b	fix: remove property	2024-08-27 14:00:21 +02:00
Javier Segarra	7567f1b13f	Merge branch 'dev' into 7896_down_devToTest_2436	2024-08-27 13:59:06 +02:00
Javier Segarra	137ed40f33	feat: update version and changelog	2024-08-27 13:53:45 +02:00
Javier Segarra	61ae3edf18	Merge pull request '#7896 - 24.36 Dev To Test' (!648) from 7896_devToTest_2436 into test ... Reviewed-on: #648 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-27 10:33:01 +00:00
Carlos Satorres	65d77b1d4e	Merge pull request '6899-fixInvoiceOutMigration' (!650) from 6899-fixInvoiceOutMigration into dev ... Reviewed-on: #650 Reviewed-by: Jorge Penades <jorgep@verdnatura.es>	2024-08-27 08:59:22 +00:00
Carlos Satorres	c81cf638bc	Merge branch 'dev' into 6899-fixInvoiceOutMigration	2024-08-27 08:49:22 +00:00
Carlos Satorres	0257e12e6b	Merge pull request '7355-fixesAccountMigration' (!643) from 7355-fixesAccountMigration into dev ... Reviewed-on: #643 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-08-27 08:46:10 +00:00
Javier Segarra	d4dc461e41	Merge branch 'dev' into 7355-fixesAccountMigration	2024-08-27 08:40:00 +00:00
Javier Segarra	ceec78da17	test: ticketDescriptorMenu	2024-08-27 10:27:51 +02:00
Javier Segarra	4a81598883	fix: ticketDescriptorMenu	2024-08-27 10:27:43 +02:00
Carlos Satorres	72e4f10287	refs #6899 fix order	2024-08-27 10:17:06 +02:00
Carlos Satorres	39656ee3f5	refs #7355 remove privileges	2024-08-27 10:11:38 +02:00
Javier Segarra	b7c6c92ff8	Merge branch 'dev' into 6772_reload_sections	2024-08-27 08:04:59 +00:00
Carlos Satorres	64e776d311	refs #6899 fix invoiceFix	2024-08-27 10:02:59 +02:00
Javier Segarra	2ae482ff8c	Merge branch 'test' into dev	2024-08-27 09:38:12 +02:00
Javier Segarra	216cd231bf	Merge pull request 'test_dev_resolveConflicts' (!647) from test_dev_resolveConflicts into dev ... Reviewed-on: #647 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-27 07:10:19 +00:00
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
Carlos Satorres	c4fc644a35	refs #7355 remove data	2024-08-26 13:08:47 +02:00
Jorge Penadés	6f9cd7fe15	fix: refs #7323 auto fill bic	2024-08-26 12:47:05 +02:00
Carlos Satorres	8568d36ee5	refs #7355 fix privileges	2024-08-26 12:40:01 +02:00
Carlos Satorres	c84786e053	refs #7355 fix accountPrivileges	2024-08-26 11:41:35 +02:00
Javi Gallego	b4d1a4dab4	Merge pull request '#7710 - uses cloneAll' (!640) from 7710-cloneWithTicketPackaging into dev ... Reviewed-on: #640 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-08-23 13:42:42 +00:00
Javi Gallego	b82449b174	Merge branch 'dev' into 7710-cloneWithTicketPackaging	2024-08-23 13:41:17 +00:00
Javi Gallego	a14c0f3fe0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-08-23 13:52:51 +02:00
Javi Gallego	fb0ed9c4ce	para que no de el fallo de muchos registros	2024-08-23 13:52:46 +02:00
Javier Segarra	6358fdb320	Merge pull request 'Create ticket future filter' (!638) from hyervoni/salix-front-mindshore:feature/TicketFutureFilter into dev ... Reviewed-on: #638 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-08-23 11:28:46 +00:00
Javier Segarra	e7ce2a0ef6	Merge branch 'dev' into feature/TicketFutureFilter	2024-08-23 11:17:02 +00:00
Javi Gallego	efc7df5a60	delivery traducido a Reparto	2024-08-23 12:19:54 +02:00
Javi Gallego	6dc7d8f9a2	Merge pull request 'feat: refs #7346 add seriaType option' (!626) from 7346-invoiceOutMultilple into dev ... Reviewed-on: #626 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-08-23 09:08:52 +00:00
Javi Gallego	d0ccce2656	feat: refs #7346 elimino ===	2024-08-23 10:32:36 +02:00
Javi Gallego	1984e1d0d8	feat: refs #7710 uses cloneAll	2024-08-23 10:25:05 +02:00
Javi Gallego	defb11a6d7	Merge branch 'dev' into 7346-invoiceOutMultilple	2024-08-23 08:20:06 +00:00
Javier Segarra	91e52432ea	Merge branch 'dev' into feature/TicketFutureFilter	2024-08-23 07:13:43 +00:00
Javier Segarra	03ebf28712	Merge pull request '#7323 - Handle workerPhoto' (!633) from 7323_workerPhoto into dev ... Reviewed-on: #633 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-23 07:09:19 +00: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
Javier Segarra	54eb567e39	perf: date fields	2024-08-22 22:13:50 +02:00
Jorge Penadés	48277a5f20	fix: refs #7323 vertical align	2024-08-22 12:14:16 +02:00
Javier Segarra	5b667366ae	fix: remove condition duplicated	2024-08-22 09:53:26 +02:00
Javier Segarra	40edda999d	Merge branch 'dev' into 6772_reload_sections	2024-08-22 09:50:53 +02:00