8291 Commits

Author	SHA1	Message	Date
Javi Gallego	4071c06b5f	feat: refs #6275 getTickets con los campos de silex	2023-11-24 08:15:39 +01:00
Carlos Satorres	8a568f180a	refs #6506 fix e2e, refactor business	2023-11-24 07:47:57 +01:00
Carlos Satorres	ebe467f721	refs #6506 hotfix	2023-11-24 07:04:55 +01:00
Javi Gallego	aa0794e136	Merge branch 'dev' into 6275-silex-to-salix	2023-11-24 06:31:25 +01:00
Jorge Penadés	e314a67fe7	refs #6274 time control methods migrated	2023-11-23 13:25:31 +01:00
Jorge Penadés	6b2c1e09de	refs #5835 refactor	2023-11-23 11:31:00 +01:00
Javi Gallego	5b145a57e6	error: refs 6028 test front quitado	2023-11-23 11:29:53 +01:00
Jorge Penadés	048e3089cd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals	2023-11-23 11:26:41 +01:00
Jorge Penadés	db15285858	refs #5811 test updated	2023-11-23 11:21:56 +01:00
Jorge Penadés	2e67ef4f5d	refs #5811 refactor deleteExpeditions	2023-11-23 10:32:07 +01:00
Jorge Penadés	900dffbbba	refs #5811 delete viaexpress expeditions included	2023-11-23 10:26:28 +01:00
Javi Gallego	f44424dbcf	test: refs #6028 test	2023-11-23 09:44:47 +01:00
Javi Gallego	5b289ec083	Merge branch 'dev' into 6028_route_getRouteByWorker	2023-11-23 09:21:44 +01:00
Jorge Penadés	da7b670d74	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-23 08:28:56 +01:00
Alex Moreno	f4fabb9fff	refs #6491 refactor(order_filter): optimized	2023-11-23 08:26:14 +01:00
Carlos Satorres	2b455488a3	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-11-22 18:35:16 +01:00
Carlos Satorres	6b07ee4eb1	hotfix workerhours	2023-11-22 18:35:14 +01:00
Javi Gallego	e856de0cfd	feat: refs #6028 test	2023-11-22 15:54:38 +01:00
Jorge Penadés	26a8cc6a2c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-22 15:41:24 +01:00
Javi Gallego	e146c0ea46	Merge branch 'dev' into 6028_route_getRouteByWorker	2023-11-22 12:42:20 +01:00
Javi Gallego	a0a9e299d9	feat: refs #6275 getTickets with phone	2023-11-22 12:39:21 +01:00
Guillermo Bonet	d52c82fb19	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-22 11:36:07 +00:00
Jorge Penadés	a27bb53089	refs #5835 getTotals fixed	2023-11-22 08:57:45 +01:00
Carlos Satorres	7c6798c564	refs #6291 dni vn-user	2023-11-21 16:25:48 +01:00
Jorge Penadés	3f8d1ff617	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress	2023-11-21 10:17:31 +01:00
Guillermo Bonet	b3d1c72adc	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-21 09:13:41 +00:00
Alex Moreno	e909c2bc26	Merge branch 'dev' into 6454-dbDump	2023-11-21 09:13:17 +00:00
Alex Moreno	02e8b90926	refs #6454 test: fix e2e by dump	2023-11-21 10:12:07 +01:00
Juan Ferrer	bf7c67dbde	fix: refs #6197 add definer to events	2023-11-21 09:26:02 +01:00
Jorge Penadés	dd11cf5327	ref #5835 fix test	2023-11-21 09:03:25 +01:00
Jorge Penadés	34e5409533	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-newInvoiceInDueDay	2023-11-21 08:19:11 +01:00
Juan Ferrer	0a2fd9cf5d	fix: refs #6432, #5848 account sync fixes	2023-11-20 18:39:37 +01:00
Alex Moreno	ee1a0c15ee	refs #6454 feat: dump db	2023-11-20 15:09:55 +01:00
Guillermo Bonet	5fdf18825c	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-20 13:14:51 +00:00
Alex Moreno	e25ca914a0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-20 10:13:02 +01:00
Alex Moreno	0ddfb28327	refs #5914 fix: transferInvoice	2023-11-20 07:56:15 +01:00
Guillermo Bonet	badb4d69a2	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-20 06:15:40 +00:00
Pablo Natek	e2a2454d4e	Merge branch 'dev' into 6461-fixFilterNegativeBases	2023-11-17 10:31:35 +00:00
Pablo Natek	dc100f7959	fix(filter): refs #6461 now is mockDate in local	2023-11-17 11:29:57 +01:00
Juan Ferrer	bb6f3b4cfd	fix: refs #6432 account sync fixes	2023-11-17 08:56:25 +01:00
Guillermo Bonet	500eb22dc6	Merge branch 'dev' into 4502-zoneEstimatedDelivery	2023-11-17 06:43:58 +00:00
Guillermo Bonet	8da36569f7	refactor: refs #4502 zoneEstimatedDelivery	2023-11-17 07:44:43 +01:00
Guillermo Bonet	3d1c69be56	refactor: refs #4502 zoneEstimatedDelivery	2023-11-17 07:43:32 +01:00
Guillermo Bonet	2f611391b9	Revert "refactor: refs #4502 Deleted zoneEstimatedDelivery" ... This reverts commit bfd6e1f398.	2023-11-17 07:17:29 +01:00
Juan Ferrer	c2e295f777	fix: refs #6432 account sync fixes	2023-11-17 00:08:29 +01:00
Juan Ferrer	ea5a881d1f	fix: refs #6432 account sync fixes	2023-11-16 23:10:30 +01:00
Juan Ferrer	1937560118	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2023-11-16 23:07:30 +01:00
Juan Ferrer	4f5242e3ae	fix: refs #6432 account sync fixes	2023-11-16 23:07:26 +01:00
Javier Segarra	9e64939810	refs #6434 feat: add Id property in model	2023-11-16 11:56:48 +01:00
Alex Moreno	b8d256e4e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-11-16 09:58:51 +01:00
Alex Moreno	f677382f96	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-16 09:29:53 +01:00
Javier Segarra	e4f7790843	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signInLog_issue_MASTER	2023-11-16 09:15:01 +01:00
Javier Segarra	c6b5d7f5a4	refs #6434 feat: rename id key by token	2023-11-16 08:30:01 +01:00
Guillermo Bonet	bfd6e1f398	refactor: refs #4502 Deleted zoneEstimatedDelivery	2023-11-16 08:29:00 +01:00
Alex Moreno	5bdf6a7338	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-11-16 07:56:23 +01:00
Javier Segarra	13720291b2	refs #6434 perf: remove unique in token column	2023-11-15 15:18:02 +01:00
Alex Moreno	ac3d23579a	Merge branch 'master' into 6434-signInLog_issue_MASTER	2023-11-15 13:50:21 +00:00
Carlos Satorres	5b587b3449	Merge branch 'master' into hotfix-ticketAddresFk	2023-11-15 12:56:45 +00:00
Javier Segarra	e0f6d08a1e	refs #6434 feat: create signInLog table	2023-11-15 13:49:41 +01:00
Sergio De la torre	a5d94b3a26	Merge branch 'test' into 5652_warmFix_setVisibleDiscard	2023-11-15 12:43:58 +00:00
Alex Moreno	89967b8538	fix(workerDescriptor): show account button	2023-11-15 13:16:31 +01:00
Sergio De la torre	692c5eb164	refs #5652 fix: setVisibleDiscard add parameter null	2023-11-15 12:38:08 +01:00
Guillermo Bonet	2847b993d3	Merge branch 'dev' into 6023-changeRol	2023-11-15 11:30:23 +00:00
Javier Segarra	f7b0882978	refs #6434 feat: remove forceId property	2023-11-15 11:50:56 +01:00
Javi Gallego	a4328e607e	Merge branch 'dev' into 6207-incoterm-solo-en-serie-world	2023-11-15 10:11:05 +01:00
Javi Gallego	3f7663da97	feat: refs #6275 crea back etExpeditionSummary	2023-11-15 10:09:04 +01:00
Javier Segarra	4061241650	refs #6434 feat: create signInLog table	2023-11-15 09:37:03 +01:00
Alex Moreno	2a67048594	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-14 15:54:47 +01:00
Alex Moreno	88ec0f24c3	ref #5914 rename table	2023-11-14 15:45:52 +01:00
Pablo Natek	2a57f7e98a	Merge branch 'dev' into 6366-unifyTicketChangeState	2023-11-14 14:02:27 +00:00
Pablo Natek	0a5e8e1902	refactor(ticketTracking.create): refs #6366 unify Ticket.state ticketTracking.create i vn.ticket_setState	2023-11-14 14:49:54 +01:00
Carlos Satorres	f3faf37e1a	hotfix addressFk	2023-11-14 12:34:00 +01:00
Carlos Satorres	b57106af48	refs #6291 validateTin	2023-11-14 11:13:33 +01:00
Alex Moreno	2cd9c9c688	Merge branch 'dev' into 5914-warmfix-renameTable	2023-11-14 09:36:47 +00:00
Alex Moreno	bc6389fd66	Merge branch 'dev' into 6335-ticketAdvance_splitOrCreate	2023-11-14 09:00:12 +00:00
Alex Moreno	aec1c9d447	fix: correct align	2023-11-14 09:54:07 +01:00
Javier Segarra	384b5eb7c7	refs #5666 remove old file	2023-11-13 09:56:16 +01:00
Javier Segarra	aab88dc7de	refs #5666 perf: use use loggable as mixin	2023-11-13 09:54:12 +01:00
Javier Segarra	3c5af184bb	refs #5666 feat: use mixin for this models	2023-11-10 15:12:49 +01:00
Guillermo Bonet	a4cbc33ee1	Merge branch '6023-changeRol' of https://gitea.verdnatura.es/verdnatura/salix into 6023-changeRol	2023-11-10 11:55:38 +01:00
Guillermo Bonet	b7da144967	feat: refs #6023 Added SELECT FOR UPDATE	2023-11-10 11:55:37 +01:00
Guillermo Bonet	eb98de71b1	Merge branch 'dev' into 6023-changeRol	2023-11-10 10:49:38 +00:00
Carlos Satorres	a1c8bba4a5	hotfix addressId	2023-11-10 11:29:18 +01:00
Alex Moreno	0fed5c1ab4	Merge branch 'dev' into 6335-ticketAdvance_splitOrCreate	2023-11-10 09:59:24 +00:00
Alex Moreno	2eacf7391e	refs #6335 fix(db_ticket_canAdvance): not use unnecessary ifnulls	2023-11-10 08:46:49 +01:00
Alex Moreno	e9666a5930	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-11-10 08:11:52 +01:00
Jorge Penadés	40b9a83606	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-newInvoiceInDueDay	2023-11-09 15:59:12 +01:00
Jorge Penadés	8d94a94e14	ref #5914 fix test back	2023-11-09 15:56:50 +01:00
Jorge Penadés	513562955b	ref #5835 test back	2023-11-09 15:53:41 +01:00
Jorge Penadés	52f1843580	ref #5835 due day new and fixtures	2023-11-09 15:00:49 +01:00
Jorge Penadés	0baa9c5a98	ref #5914 fix summary	2023-11-09 14:34:53 +01:00
Jorge Penadés	b07858fddb	ref #5914 replace name	2023-11-09 14:33:46 +01:00
Guillermo Bonet	9668468f94	Merge branch 'dev' into 6023-changeRol	2023-11-09 13:06:55 +00:00
Jorge Penadés	01d3c23cf0	ref #5914 renameTable	2023-11-09 11:57:52 +01:00
Alex Moreno	52f419d4cf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-11-09 09:33:22 +01:00
Sergio De la torre	4258015c07	refs #5870 feat:fixModel	2023-11-09 08:04:38 +01:00
Javi Gallego	9d54618620	fix: refs: #6207 impide facturar si no tienes incoterm	2023-11-08 10:01:02 +01:00
Sergio De la torre	d30c4e4463	refs #5652 feat:addressShortage	2023-11-07 16:13:21 +01:00
Pablo Natek	1c6618d494	fix(new): refs #6150 revert chabges in worker new method	2023-11-06 14:56:48 +01:00
Pablo Natek	aa800b1fd3	Merge branch '6150-clientCredit-update-Fix' of https://gitea.verdnatura.es/verdnatura/salix into 6150-clientCredit-update-Fix	2023-11-06 14:23:38 +01:00
Pablo Natek	a75565f2ce	feat(client.create): refs #6150 clientCredit update fix	2023-11-06 14:23:36 +01:00
Juan Ferrer	99c88e6f5d	fix: refs #6390 Loggable set as base for ItemShelving	2023-11-05 09:33:18 +01:00
Alex Moreno	d06810b1b9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector	2023-11-03 14:58:55 +01:00
Alex Moreno	a523e32373	refs #6335 style(ticketAdvance): fix with split-progress	2023-11-03 07:57:53 +01:00
Sergio De la torre	728838334c	hotFix_6312 fix originalQuantity	2023-11-02 14:42:22 +01:00
Pablo Natek	2d3ee4a16e	Merge branch 'dev' into 6150-clientCredit-update-Fix	2023-11-02 13:05:31 +00:00
Pablo Natek	175e73e565	fix(clientCredit): refs #6150 se arreglan los inserts en clientCredit	2023-11-02 14:05:14 +01:00
Alex Moreno	740d2fb976	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-11-02 08:48:03 +01:00
Alex Moreno	83b9ef72fc	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-11-02 08:47:44 +01:00
Alex Moreno	742d6de986	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-11-02 07:28:41 +01:00
Carlos Andrés	8c1ff26de7	Merge branch 'dev' into 5637-saleGroupLog	2023-10-31 11:12:40 +00:00
Robert Ferrús	6112c7ba5f	refs #5637 saleGroup traducciones	2023-10-31 09:59:34 +01:00
Pablo Natek	a47d31cec9	Merge branch 'dev' into 4131-unifyTicketStatusChanges	2023-10-31 06:48:53 +00:00
Alex Moreno	37dce99447	refs #6335 test(ticketAdvance): add test to keep price	2023-10-30 15:00:05 +01:00
Pablo Natek	e504ad313c	remove(console.log): refs #4131 quitar console log	2023-10-30 14:56:33 +01:00
Alex Moreno	a80715583c	refs #6335 feat(ticketAdvance): change the date if you can	2023-10-30 14:16:25 +01:00
Jorge Penadés	ab0640291b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5216-addExpeditionState	2023-10-30 08:25:41 +01:00
Alex Moreno	bd8cc897c6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-10-30 07:21:31 +01:00
Pablo Natek	14753212bb	fix(saveSign): refs #4131 remove call state on saveSign	2023-10-27 18:07:17 +02:00
Pablo Natek	65a1d052dc	feat(ticket.state): refs #4131 to state	2023-10-27 18:03:40 +02:00
Sergio De la torre	7ae12327f5	refs #5134 fix: model ExpeditionScan	2023-10-27 16:16:22 +02:00
Alex Moreno	ae160890a8	refs #6335 feat(ticketAdvance): use componentUpdate	2023-10-27 15:06:20 +02:00
Pablo Natek	42bbdf9814	feat(ticket.state): refs #4131 convert changeState to State	2023-10-27 13:41:32 +02:00
Pablo Natek	524ac4d99d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4131-unifyTicketStatusChanges	2023-10-26 22:16:06 +02:00
Pablo Natek	3584b15c19	Merge branch 'dev' into 4131-unifyTicketStatusChanges	2023-10-26 22:10:35 +02:00
Alex Moreno	55d80458cc	refs #6065 warmFix(workerTimeControl): set date	2023-10-26 14:37:42 +02:00
Alex Moreno	30895f444f	Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress	2023-10-26 12:14:31 +00:00
Alex Moreno	6b94ea7d11	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate	2023-10-26 09:48:35 +02:00
Jorge Penadés	3a1227bdc2	ref #5914 fix ticketrefund	2023-10-26 09:20:25 +02:00
Jorge Penadés	da2bc416f5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-26 08:26:35 +02:00
Alex Moreno	013b010c22	refs #6278 test(itemRequest): fix e2e, correct selector	2023-10-26 07:56:57 +02:00
Alex Moreno	26bdbabff5	refs #6335 feat(ticketAdvanced): show all tickets	2023-10-25 15:48:19 +02:00
Alex Moreno	a501d577f8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-25 09:23:00 +02:00
Alex Moreno	efa9f16452	fix: remove unnecessary UserError	2023-10-25 09:22:44 +02:00
Carlos Andrés	001d7cd574	Merge branch 'master' into 4707-test-workerTimeControl	2023-10-24 15:03:38 +00:00
Jorge Penadés	9f141238bc	ref #5216 add userFk	2023-10-24 11:47:54 +02:00
Alex Moreno	5442476f05	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-10-24 10:35:11 +02:00
Jorge Penadés	35bb949fcb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-24 10:13:38 +02:00
Jorge Penadés	f1deeb69ca	ref #5914 add ticketrefund and fix text	2023-10-24 09:34:04 +02:00
Alex Moreno	22b7c59812	refs #6335 feat(ticketAdvance): add zone field	2023-10-24 09:23:03 +02:00
Jorge Penadés	1231d6dd1d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-24 08:34:42 +02:00
Carlos Andrés	08431e94c6	Merge branch 'master' into 4707-test-workerTimeControl	2023-10-23 13:52:52 +00:00
Carlos Andrés	6e3517b40f	refs #4707 fix: problemas fichadas y test	2023-10-23 14:51:09 +02:00
Alex Moreno	247aa5af2a	refs #6199 fix(sale_quantity): add isReduction	2023-10-23 09:52:06 +02:00
Alex Moreno	cf856a585b	refs #6199 fix(sale_quantity): add isReduction	2023-10-23 09:50:00 +02:00
Jorge Penadés	1f0a57d320	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate	2023-10-23 09:03:15 +02:00
Alex Moreno	dc00b85bec	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-23 08:31:37 +02:00
Jorge Penadés	33656e9d9a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate	2023-10-23 08:21:32 +02:00
Pablo Natek	0237517f0c	Merge branch 'master' into 5979-getAppOrigin	2023-10-20 10:55:30 +00:00
Pablo Natek	8597c23fb3	Merge branch '5979-getAppOrigin' of https://gitea.verdnatura.es/verdnatura/salix into 5979-getAppOrigin	2023-10-20 12:53:57 +02:00
Pablo Natek	5c69d9c7f0	fix: add await in async functions refs #5979	2023-10-20 12:53:54 +02:00
Alex Moreno	1eabad7f4b	refs #6257 fix(saleQuantity): add isInPreparing restriction	2023-10-20 12:37:44 +02:00
Pablo Natek	75cfea4a2e	Merge branch 'dev' into 6278-ticketRequestFixFilter	2023-10-20 10:18:43 +00:00
Pablo Natek	25c13e42ab	Merge branch '6278-ticketRequestFixFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6278-ticketRequestFixFilter	2023-10-20 11:36:24 +02:00
Pablo Natek	243a32dff5	remove(expand): quito expand de la columna requester refs #6278	2023-10-20 11:36:11 +02:00
Alex Moreno	ef1ddfd484	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-20 09:28:37 +02:00
Alex Moreno	84aed7ca21	refs #6257 fix(saleQuantity): newPrice correct restricction	2023-10-20 09:26:56 +02:00
Alex Moreno	d5f98700e7	refs #6287 fix: ticket new correct return type	2023-10-20 08:32:35 +02:00
Pablo Natek	9cb4e57951	Merge branch 'dev' into 6278-ticketRequestFixFilter	2023-10-20 05:31:12 +00:00
Pablo Natek	dc93328bcf	Merge branch '5979-getAppOrigin' of https://gitea.verdnatura.es/verdnatura/salix into 5979-getAppOrigin	2023-10-19 18:24:04 +02:00
Pablo Natek	07fa011035	fix(updateClaim): el spec daba error refs #5979	2023-10-19 18:24:03 +02:00
Pablo Natek	dad67539c5	Merge branch 'master' into 5979-getAppOrigin	2023-10-19 16:23:34 +00:00
Carlos Andrés	16f20cea70	refs #6199 fix(sale): get minim price without grouping	2023-10-19 15:12:06 +02:00
Pablo Natek	f26595bb62	Merge branch 'dev' into 3126-changePackageFkTopackagingFk	2023-10-19 12:15:43 +00:00
Alex Moreno	a0e32cf455	Merge branch 'test' into 6199-saleUploadQuantity	2023-10-19 12:05:25 +00:00
Alex Moreno	cadec7d01f	Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail	2023-10-19 11:36:14 +00:00
Guillermo Bonet	5c51d7fb04	Merge branch 'test' into dev	2023-10-19 13:22:33 +02:00
Alex Moreno	d9ab607126	refs #6199 feat(sale): increase quantity if newPrice is higher	2023-10-19 13:03:11 +02:00
Pablo Natek	71182d8630	Merge branch 'dev' into 5749-autoincrement-zoneIncluded	2023-10-19 10:49:31 +00:00
Alex Moreno	1ea6b87266	Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail	2023-10-19 10:48:51 +00:00
Juan Ferrer	39a0f13500	Merge branch 'dev' into 5749-autoincrement-zoneIncluded	2023-10-19 10:14:29 +00:00
Guillermo Bonet	1b8f227c47	ticket #125321 filter advance tickets fix	2023-10-19 11:58:15 +02:00
Pablo Natek	e2f7ce8b35	Merge branch 'dev' into 3126-changePackageFkTopackagingFk	2023-10-19 08:58:50 +00:00
Alex Moreno	3294937b54	Merge branch 'dev' into 6067-vnUser_privileges_and_verifyEmail	2023-10-19 08:50:29 +00:00
Jorge Penadés	e680a6a080	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-19 10:00:43 +02:00
Jorge Penadés	15890e80d8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate	2023-10-19 09:59:19 +02:00
Jorge Penadés	52b14cf8b4	ref #6138 fix emailVerified	2023-10-19 09:51:10 +02:00
Jorge Penadés	5b1e5743b5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword	2023-10-19 09:35:37 +02:00
Pablo Natek	f1b11fdca2	Merge branch 'master' into 5979-getAppOrigin	2023-10-19 06:51:50 +00:00
Javi Gallego	84fc0de4ea	Merge pull request 'refs #6312 no inserta el originalquantity' (!1803) from 6312 into dev ... Reviewed-on: #1803 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-10-19 06:41:43 +00:00
Pablo Natek	d3a7b4ecb9	remove: console.log from updateClaim refs #5979	2023-10-19 08:41:26 +02:00
Pablo Natek	f8889df903	remove(console.log): se quitan console.log que se utilizaron para dbuggear refs #5979	2023-10-19 08:40:25 +02:00
Pablo Natek	488181e1b6	feat(getUrl): se añade el metodo getUrl refs #5979	2023-10-19 08:37:28 +02:00
Jorge Penadés	770aa60b69	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-19 08:26:22 +02:00
Jorge Penadés	7e25fac3e9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword	2023-10-19 08:25:00 +02:00
Jorge Penadés	8917821ec0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate	2023-10-19 08:23:44 +02:00
Alex Moreno	daaf076133	Merge branch 'dev' into 6312	2023-10-19 05:29:43 +00:00
Alex Moreno	da20697052	refs #6199 feat(sale_updateQuantity): can upload	2023-10-18 15:19:26 +02:00
Javi Gallego	44ce0a8730	refs #6312 no inserta el originalquantity	2023-10-18 13:46:41 +02:00
Jorge Penadés	8fe911ee0b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate	2023-10-18 13:43:22 +02:00
Jorge Penadés	62d2c7e701	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-18 13:42:15 +02:00
Jorge Penadés	ea5597d3f3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6138-setPassword	2023-10-18 13:40:02 +02:00
Jorge Penadés	af0d5072ff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments	2023-10-18 13:37:14 +02:00
Pablo Natek	3e96b3d0d2	Merge branch 'dev' into 5749-autoincrement-zoneIncluded	2023-10-18 11:24:03 +00:00
Jorge Penadés	330fb08aac	ref #5417 fix back test	2023-10-18 13:23:00 +02:00
Pablo Natek	bf09f13aa2	Merge branch 'dev' into 5749-autoincrement-zoneIncluded	2023-10-18 11:07:24 +00:00
Pablo Natek	44bc30adf7	Merge branch 'dev' into 6278-ticketRequestFixFilter	2023-10-18 10:35:53 +00:00
Pablo Natek	2bb4300e1b	remove: se quita el console log refs #6278	2023-10-18 12:35:45 +02:00
Pablo Natek	34c9d030e9	Merge branch 'dev' into 6266-minimumImprtSmsFix	2023-10-18 10:31:12 +00:00
Pablo Natek	5f49a4fe1d	fix: created -> shipped refs #6266	2023-10-18 12:25:47 +02:00
Pablo Natek	1920a1b893	merge(dev): branch 'dev' into 6266-minimumImprtSmsFix refs #6266	2023-10-18 12:23:23 +02:00
Jorge Penadés	251d71a437	ref #5417 refactor transactions	2023-10-18 12:05:33 +02:00
Alex Moreno	a84f6fe1da	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-10-18 12:05:04 +02:00
Jorge Penadés	700caac641	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments	2023-10-18 12:03:07 +02:00
Alex Moreno	4300b24c14	refs #5918 refactor(worker_timeControl): simplify ng-show	2023-10-18 10:45:15 +02:00
Alex Moreno	d1cb2a1d9a	refs #5918 test: add updateWorkerTimeControlMail	2023-10-18 10:30:36 +02:00
Alex Moreno	a7b0ef1e4c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend	2023-10-18 09:23:55 +02:00
Alex Moreno	b3c7511e59	refs #6067 feat(url): getByUser	2023-10-18 08:52:06 +02:00
Alex Moreno	a916007314	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail	2023-10-18 07:20:34 +02:00
Pablo Natek	8d44bb8867	refactor(toggleIsIcluded): actualizo la versión y modifico el proc refs #5749	2023-10-17 15:05:48 +02:00
Jorge Penadés	69a54be1a9	ref #5947 refactorWorkerCreate	2023-10-17 14:02:08 +02:00
Pablo Natek	541926d3f7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5749-autoincrement-zoneIncluded	2023-10-17 13:57:32 +02:00
Pablo Natek	9870a0e60a	feat(origin): create method url_/geturl redf #5979	2023-10-17 13:56:49 +02:00
Alex Moreno	d4770c525e	refs #6199 test(sale): fix test	2023-10-17 11:00:41 +02:00
Jorge Penadés	48003b5d03	ref #6138	2023-10-17 08:28:15 +02:00
Pablo Natek	4f911e644c	fix: remove console.log refs #5979	2023-10-16 18:43:03 +02:00
Pablo Natek	afe4c676fc	fix(url): la ulr termina con / no es necesario añadir el texto	2023-10-16 18:38:33 +02:00
Pablo Natek	033c02750b	refactor(origin): .origin por getUrl()	2023-10-16 18:24:58 +02:00
Jorge Penadés	bd535374d8	ref #6138 setPasword created	2023-10-16 15:58:25 +02:00
Alex Moreno	093431ecdf	refs #6119 fix(sale_hook): fix quantity case	2023-10-16 15:27:10 +02:00
Alex Moreno	9e39e96cf4	hotFix: workerTimeControl	2023-10-16 15:22:33 +02:00
Alex Moreno	f79e711617	refs #6199 test: updateQuantity refactor	2023-10-16 10:19:33 +02:00
Alex Moreno	b769fa9bcf	refs #6199 ... fix(sale_updateQuantity): if clientType is loses skip test: fix updateQuantity activeCtx and add test for minQuantity	2023-10-16 10:10:57 +02:00
Jorge Penadés	3af72e1439	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments	2023-10-16 08:20:20 +02:00
Jorge Penadés	ab6c58cd12	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-16 08:18:00 +02:00
Pablo Natek	f832c1d9ec	refs #5979 getUrl	2023-10-15 11:08:33 +02:00
Sergio De la torre	f6bf36d46a	Merge branch 'dev' into 5134-ModelsSalix	2023-10-13 14:02:25 +00:00
Alex Moreno	ab1cc34015	refs #6199 feat(sale): best quantity restriction	2023-10-13 15:14:48 +02:00
Alex Moreno	03687cb482	hotFix: delete getCurrentWorkerMana	2023-10-13 14:56:56 +02:00
Jorge Penadés	9ba3c9c8bc	Merge branch 'dev' into 5914-transferInvoiceOut	2023-10-13 11:17:12 +00:00
Jorge Penadés	6b8a6c7a69	Merge branch 'dev' into 5914-transferInvoiceOut	2023-10-13 11:15:04 +00:00
Alex Moreno	f00a4e63a6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6199---Cantidad-mínima-back	2023-10-13 13:08:54 +02:00
Javi Gallego	0081c55b9e	Merge branch 'dev' into 6119-addMicrosipLink	2023-10-13 10:56:33 +00:00
Carlos Andrés	9c0334619d	refs #6199	2023-10-13 11:56:50 +02:00
Alex Moreno	fa90132934	refs #6199 fix(orderCatalogView): html and css	2023-10-13 10:23:48 +02:00
Guillermo Bonet	7367656a35	refs #6199 Requested changes	2023-10-13 09:02:40 +02:00
Sergio De la torre	35c0ec0d04	Merge branch 'dev' into 5134-ModelsSalix	2023-10-11 15:14:13 +00:00
Javi Gallego	393d1889f7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-11 14:06:32 +02:00
Javi Gallego	df9d6fd6f8	efectue con acento	2023-10-11 14:06:28 +02:00
Carlos Satorres	cba8a48d18	Merge branch 'dev' into 5768-incoterms	2023-10-11 10:05:45 +00:00
Carlos Satorres	0023561acb	refs #6293 traducción	2023-10-11 12:04:12 +02:00
Guillermo Bonet	6b1dded222	refs #6199 Requested change, position of input	2023-10-11 08:28:52 +02:00
Guillermo Bonet	d41233efaf	refs #6199 Requested change, name of color	2023-10-11 07:59:05 +02:00
Guillermo Bonet	2b41bf7eb1	refs #6199 Requested changes	2023-10-11 07:39:41 +02:00
Guillermo Bonet	d2ce920f13	refs #6199 Added minQuantity in catalog and more	2023-10-10 13:49:11 +02:00
Carlos Satorres	4adee11c63	refs #5768 remove comment	2023-10-10 12:35:34 +02:00
Jorge Penadés	179d8ab87d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-10 11:30:53 +02:00
Guillermo Bonet	03afea3b8e	refs #6199 Added minQuantity in item	2023-10-10 10:51:02 +02:00
Carlos Satorres	1adfa33a9a	hotfix length sales	2023-10-06 14:52:30 +02:00
Pablo Natek	c4e3fdf510	Merge branch 'dev' into 6213-supplierFixCreateErrors	2023-10-06 06:03:03 +00:00
Carlos Satorres	05812c3f35	refs #6282 left join	2023-10-06 07:14:30 +02:00
Carlos Satorres	62c7dc9db5	hotfix-change minus	2023-10-06 06:16:42 +02:00
Pablo Natek	f40185c2d4	refs #4764 hotfix	2023-10-05 14:24:52 +02:00
Carlos Satorres	3fbdae15b2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5768-incoterms	2023-10-05 14:04:42 +02:00
Carlos Satorres	3b81b511c2	remove consolelog	2023-10-05 14:01:53 +02:00
Carlos Satorres	5b6eb0a2a6	refs #5768 add address, nickname, pdf, email	2023-10-05 14:01:07 +02:00
Pablo Natek	020de5d754	Merge branch 'dev' into 3126-changePackageFkTopackagingFk	2023-10-05 07:57:46 +00:00
Alex Moreno	8d7eda5af3	refs #5673 fix: add development translation	2023-10-05 09:12:54 +02:00
Alex Moreno	7a6022efd4	Merge branch 'dev' into 6216-saleLog_open_ticketLog	2023-10-05 06:31:54 +00:00
Jorge Penadés	0d39471970	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink	2023-10-05 08:20:47 +02:00
Alex Moreno	9538841a30	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-10-05 07:28:02 +02:00
Alex Moreno	ca86b3cc2f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2023-10-05 07:27:35 +02:00
Alex Moreno	7cd2e290ce	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2023-10-05 07:22:41 +02:00
Carlos Satorres	f2adbc1716	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5768-incoterms	2023-10-04 13:54:18 +02:00
Alex Moreno	f8a510b330	refs #5918 fix(workerTimeControl): update(workerTimeControl	2023-10-04 12:31:46 +02:00
Alex Moreno	df6d10e514	refs #5918 fix(workerTimeControl): resend mail	2023-10-04 12:17:24 +02:00
Jorge Penadés	c35899542d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-10-04 08:40:44 +02:00
Alex Moreno	45e41de9a9	refs #5918 fix(worker_time-control): isMailSended	2023-10-03 14:03:52 +02:00
Alex Moreno	21ddcb7e8e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend	2023-10-03 11:39:44 +02:00
Carlos Satorres	bd46a77cb7	refs #5768 incoterms addressFk	2023-10-03 10:15:16 +02:00
Pablo Natek	96769d9ff9	refs #6213 fixIntermitentError	2023-10-03 08:57:59 +02:00
Alex Moreno	9baa450298	Merge branch 'dev' into 6216-saleLog_open_ticketLog	2023-10-03 05:25:55 +00:00
Pablo Natek	7fd2d143c3	refs #6213 devMerge	2023-10-03 07:08:29 +02:00
Alex Moreno	4545a63214	refs #6067 feat(vnUser): verifyEmail redirect to lilium	2023-10-02 14:51:19 +02:00
Pablo Natek	99d65804e8	refs #6278 fixFilter	2023-10-02 13:29:39 +02:00
Jorge Penadés	918cff55d9	Merge branch '5417-fixCustomerPayments' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments	2023-10-02 10:06:08 +02:00
Jorge Penadés	c59b119a4a	ref #5417 fix transactions	2023-10-02 10:06:04 +02:00
Jorge Penadés	a00cf557b7	Merge branch 'dev' into 5417-fixCustomerPayments	2023-10-02 07:57:25 +00:00
Jorge Penadés	2eb9a97ece	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink	2023-10-02 09:28:41 +02:00
Sergio De la torre	3ba349b74a	refs #5890 feat: itemShelvingSaleAsignado more calls	2023-10-02 09:14:30 +02:00
Jorge Penadés	a7128b8187	ref #5417 fix transactions	2023-10-02 09:04:43 +02:00
Jorge Penadés	cb2ac21349	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5417-fixCustomerPayments	2023-10-02 08:49:27 +02:00
Jorge Penadés	5f93df26a5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl	2023-10-02 08:21:09 +02:00
Alex Moreno	d3706733e4	Merge branch 'master' into 5929-hotFix_canEdit_weekly	2023-10-02 05:06:55 +00:00
Alex Moreno	7b8518ff5a	Merge branch 'dev' into 6033-vnLog_userDescriptor	2023-10-02 05:04:26 +00:00
Jorge Penadés	6f4a12e50f	ref #5417 date filters added	2023-09-29 14:42:47 +02:00
Jorge Penadés	3e9d01815a	Merge branch 'dev' into 6065-fixWorkerTimeControl	2023-09-29 10:30:44 +00:00
Alex Moreno	a0d705683b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail	2023-09-29 12:22:42 +02:00
Alex Moreno	53ab694ad4	Merge branch 'dev' into 5890--itemShelvingAsignado	2023-09-29 10:18:34 +00:00
Alex Moreno	b33700abc9	refs #6216 feat(ticket_sale): open filtered ticketLog	2023-09-29 11:57:25 +02:00
Jorge Penadés	9536fdba58	ref #6119 refactor	2023-09-29 10:10:58 +02:00
Alex Moreno	a0a59b672f	refs #6271 hotFix(email): clientCreditEmail → creditRequestEmail	2023-09-29 10:04:57 +02:00
Pablo Natek	0fa56149d7	refs #6266 smsfix	2023-09-29 09:47:22 +02:00
Alex Moreno	542119983b	refs #5929 test: fix test after fix ticket_isEditable	2023-09-29 09:28:23 +02:00
Jorge Penadés	f1dc809147	Merge branch 'dev' into 6119-addMicrosipLink	2023-09-29 06:22:51 +00:00
Jorge Penadés	4d226d9a58	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6065-fixWorkerTimeControl	2023-09-29 08:20:16 +02:00
Jorge Penadés	d4e78ea889	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-29 08:16:12 +02:00
Alex Moreno	f3c55cdee9	refs #5929 fix(isEditable): can edit if is weekly	2023-09-28 16:00:09 +02:00
Carlos Andrés	52cba80dc8	Merge branch 'dev' into 5890--itemShelvingAsignado	2023-09-28 15:13:37 +02:00
Alex Moreno	1d4001f520	Merge branch 'dev' into 5673-claim-development	2023-09-28 12:04:11 +00:00
Alex Moreno	28dfb895ca	refs #6224 deploy: correct sql folder and fix sql	2023-09-28 13:49:58 +02:00
Jorge Penadés	4b213c1c9d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-28 13:31:45 +02:00
Alex Moreno	e51df063d3	refs #5890 feat: add userId in rawSql	2023-09-28 13:26:05 +02:00
Alex Moreno	75e54bd82f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5890--itemShelvingAsignado	2023-09-28 13:21:12 +02:00
Jorge Penadés	e209ab28f4	ref #6065 first time hours load fixed	2023-09-28 11:53:09 +02:00
Jorge Penadés	869bdab7ce	ref #6065 fetchHours relocated	2023-09-28 11:36:03 +02:00
Sergio De la torre	22f71e6147	Merge branch 'dev' into 5134-ModelsSalix	2023-09-28 08:18:15 +02:00
Sergio De la torre	4048627c76	refs #5890 fix: format	2023-09-28 08:08:40 +02:00
Sergio De la torre	18de92f9e7	refs #5134 fix: format	2023-09-28 07:51:54 +02:00
Sergio De la torre	a86469ccd2	refs #5134 fix: format	2023-09-28 07:42:44 +02:00
Sergio De la torre	ac3e9c811d	refs #5890 feat: itemShelvingSaleAsignado	2023-09-27 14:01:17 +02:00
Jorge Penadés	a7c0949f0e	ref #6065 replace then by async/await	2023-09-27 08:57:31 +02:00
Alex Moreno	d313f6ea5c	Merge branch 'dev' into 5673-claim-development	2023-09-26 12:59:32 +00:00
Sergio De la torre	2ea2943eca	refs #5134 feat: models	2023-09-26 13:12:18 +02:00
Jorge Penadés	e1e225a1ef	Merge branch '5914-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-26 12:42:47 +02:00
Jorge Penadés	50543963c1	ref #5914 refactor createTicketRefund	2023-09-26 12:42:45 +02:00
Jorge Penadés	45fbe6f174	Merge branch 'dev' into 5914-transferInvoiceOut	2023-09-26 06:36:44 +00:00
Alex Moreno	e36f98195c	refs #6033 feat: create user-photo component for worker and user descriptor	2023-09-26 08:15:19 +02:00
Jorge Penadés	db8dc8487b	ref #6246 replace name	2023-09-25 15:28:08 +02:00
Jorge Penadés	474399b383	ref #5914 refactor	2023-09-25 15:23:51 +02:00
Alex Moreno	7a3d3d5e2a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend	2023-09-25 14:14:23 +02:00
Jorge Penadés	64eb216367	ref #5914 fixed back test	2023-09-25 14:01:40 +02:00
Jorge Penadés	f4ce5db93b	Merge branch 'dev' into 6246-checkTicketSales	2023-09-25 11:49:18 +00:00
Alex Moreno	eb0e6dd985	refs #6033 feat(VnLog): can use accountDescriptor	2023-09-25 13:06:28 +02:00
Jorge Penadés	98ee9bbaf3	ref #5914 back test added	2023-09-25 12:54:31 +02:00
Alex Moreno	d05106cc83	Merge branch 'dev' into 5673-claim-development	2023-09-25 10:10:21 +00:00
Jorge Penadés	c8c06f498c	ref #5914 fixed tests e2e	2023-09-25 10:49:47 +02:00
Alex Moreno	6cf1095b10	refs #6067 feat: vnUser use verify() and more security when update user and mailForward	2023-09-25 08:33:16 +02:00
Pablo Natek	af8773612c	refs #6213 remove f	2023-09-25 08:23:59 +02:00
Pablo Natek	fc4019ad69	Merge branch '6213-supplierFixCreateErrors' of https://gitea.verdnatura.es/verdnatura/salix into 6213-supplierFixCreateErrors	2023-09-25 08:23:25 +02:00
Pablo Natek	9b10a2904c	refs #6213 unifyTest	2023-09-25 08:23:23 +02:00
Jorge Penadés	731bad5981	ref #5914 create ticket with new and refactor	2023-09-22 14:52:56 +02:00
Jorge Penadés	f64f7a975d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-22 14:51:20 +02:00
Alex Moreno	d43b70c971	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-09-22 14:30:28 +02:00
Alex Moreno	cf36b10763	refs #4815 feat: add serialNumber in deviceLog	2023-09-22 14:29:48 +02:00
Alex Moreno	db7f72e262	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6067-vnUser_privileges_and_verifyEmail	2023-09-22 13:19:35 +02:00
Pablo Natek	ed157d1fd1	Merge branch 'dev' into 6213-supplierFixCreateErrors	2023-09-22 11:11:25 +00:00
Alex Moreno	d16ae47712	Merge branch 'dev' into 5843-quitUserFk2	2023-09-22 11:01:25 +00:00
Jorge Penadés	6fe52ba3e8	ref #6246 check sales and update test	2023-09-22 12:48:54 +02:00
Sergio De la torre	ed1d8ca94f	refs #5134 feat: models	2023-09-22 12:29:56 +02:00
Carlos Satorres	5b22314b07	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5768-incoterms	2023-09-22 12:17:23 +02:00
Jorge Penadés	6bc9b7b232	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-22 12:05:12 +02:00
Pablo Natek	a854fff94f	refs #3126 changes	2023-09-22 10:59:48 +02:00
Carlos Satorres	c7f84ad6db	refs #5843 add return	2023-09-22 10:36:51 +02:00
Pablo Natek	c175bcfc97	refs #6159 rename spec	2023-09-22 09:40:37 +02:00
Pablo Natek	1357b60b9b	refs #6159 fixFixtures	2023-09-22 09:14:08 +02:00
Carlos Satorres	c7e26f9155	refs #5768 autocomplete	2023-09-22 06:08:07 +02:00
Jorge Penadés	82f14e62ad	ref #5914 tests fixed	2023-09-21 16:08:55 +02:00
Alex Moreno	a78348f2de	refs #6067 feat(account_basicData): use vnUser/preview	2023-09-21 15:06:14 +02:00
Carlos Satorres	7b246b1bac	refs #5768 trad choose address	2023-09-21 13:15:00 +02:00
Carlos Satorres	1f1dfae7e3	refs #5843 changes models	2023-09-21 12:50:07 +02:00
Jorge Penadés	ac4aea7d38	ref #5914 created transfer issued invoice	2023-09-21 09:14:46 +02:00
Carlos Satorres	cd20a2d06d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2	2023-09-21 07:32:19 +02:00
Pablo Natek	324b3ed8ee	Merge branch 'dev' into 6213-supplierFixCreateErrors	2023-09-21 05:21:06 +00:00
Jorge Penadés	5b818cef0c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-20 15:25:20 +02:00
Alex Moreno	3b90d7e5e5	refs #6067 refactor: vnUser and mailForward privileges. fix: emailVerification	2023-09-20 15:10:28 +02:00
Carlos Satorres	f60b6b84fe	refs #5843 fix back	2023-09-20 11:58:36 +02:00
Carlos Satorres	f92acdfe6f	Merge branch 'dev' into 5660-changeRolDeliveryAssistant	2023-09-20 09:52:32 +00:00
Jorge Penadés	4870b0830b	ref #5914 fix refund and change method name	2023-09-20 11:06:30 +02:00
Pablo Natek	d29c37693d	Merge branch 'dev' into 4131-unifyTicketStatusChanges	2023-09-20 08:53:53 +00:00
Jorge Penadés	87cee57e56	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut	2023-09-20 10:47:53 +02:00
Javi Gallego	72a8256aee	Merge pull request 'fixes #6241 dbTest fixed' (!1756) from 6241--arreglar--dbTest into dev ... Reviewed-on: #1756 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2023-09-20 06:27:21 +00:00
Javi Gallego	29a186fa18	Merge branch 'dev' into 6241--arreglar--dbTest	2023-09-20 08:18:46 +02:00
Guillermo Bonet	e2229b6762	Merge branch 'test' into dev	2023-09-20 08:18:24 +02:00
Guillermo Bonet	4ccb09d057	Merge branch 'master' into test	2023-09-20 08:18:03 +02:00
Javi Gallego	45cf1b1ff3	fixes #6241 dbTest fixed	2023-09-20 08:12:07 +02:00
Guillermo Bonet	56c1dbc096	Merge branch 'master' into 5995-getExternalCmrRouteFk	2023-09-19 12:42:46 +00:00
Carlos Satorres	daf5b343fd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2	2023-09-19 13:58:13 +02:00
Guillermo Bonet	2686fd0601	refs #6210 Minor change	2023-09-19 12:18:46 +02:00
Guillermo Bonet	77b55e5b09	refs #6210 Minor change	2023-09-19 12:15:23 +02:00
Guillermo Bonet	661563a2b6	refs #6210 Refactor filter client (zoneFk)	2023-09-19 12:14:55 +02:00
Pablo Natek	971d77a198	refs #6213 specChangeId	2023-09-19 07:46:44 +02:00
Pablo Natek	361c2b4cad	refs #6213 fixSpec	2023-09-19 07:33:28 +02:00
Alex Moreno	2dbd711104	Merge branch 'dev' into 5811-ticket.expedition_deleteViaexpress	2023-09-19 05:24:05 +00:00
Pablo Natek	aef34165d2	refs #4131 reverse claim changes	2023-09-18 13:57:17 +02:00
Alex Moreno	656492b9a6	Merge branch 'dev' into 5673-claim-development	2023-09-18 10:40:26 +00:00
Carlos Satorres	cfd080530a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-09-18 11:49:03 +02:00
Guillermo Bonet	f6d46396b5	Merge branch 'dev' into 6023-changeRol	2023-09-18 08:15:43 +00:00
Pablo Natek	c1da4815cb	Merge branch 'dev' into 6213-supplierFixCreateErrors	2023-09-18 08:12:08 +00:00
Pablo Natek	cdf0951a1b	refs #6213 newSuplierSpec	2023-09-18 10:12:32 +02:00
Guillermo Bonet	6c34421413	refs #5995 Requested changes	2023-09-18 10:03:31 +02:00
Pablo Natek	44ec197ea0	Merge branch 'dev' into 5749-autoincrement-zoneIncluded	2023-09-18 06:56:48 +00:00
Jorge Penadés	32a0aedf11	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink	2023-09-18 08:07:27 +02:00
Pablo Natek	55b53c86c4	refs #6213 formatfix	2023-09-18 07:38:31 +02:00
Sergio De la torre	881a1ee0b8	refs #5652 modify: solved Tests	2023-09-15 11:24:17 +02:00
Sergio De la torre	0403c67bad	Merge branch 'dev' into 5652-ItemTrash	2023-09-15 05:47:00 +00:00
Carlos Satorres	2a1e828e14	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant	2023-09-15 07:30:46 +02:00
Pablo Natek	191b254acc	Merge branch 'dev' into 5749-autoincrement-zoneIncluded	2023-09-14 16:05:25 +00:00
Sergio De la torre	b756d2f938	refs #5652 modify	2023-09-14 18:03:30 +02:00
Pablo Natek	cf138a0814	Merge branch 'dev' into 6213-supplierFixCreateErrors	2023-09-14 13:15:52 +00:00
Pablo Natek	a44e5206a7	refs #6213 fixConcatBug	2023-09-14 14:18:00 +02:00
Javi Gallego	eff0975eb2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-09-14 10:27:03 +02:00
Javi Gallego	82631d6fcd	claimingRate divide por 100	2023-09-14 10:26:59 +02:00
Sergio De la torre	43f5bbb04e	Merge branch 'dev' into 5652-ItemTrash	2023-09-14 09:05:55 +02:00
Sergio De la torre	d2cd522842	refs #5652 modify:without fit	2023-09-14 07:47:10 +02:00
Pablo Natek	66e851b5ea	refs #4131 changeStateRefactor	2023-09-13 19:48:58 +02:00
Pablo Natek	7ab8cb37cd	ref #6213 fixformat	2023-09-13 19:22:21 +02:00
Pablo Natek	72026332ba	Merge branch 'dev' into 6213-supplierFixCreateErrors	2023-09-13 13:07:38 +00:00
Carlos Satorres	12dff3e248	Merge branch 'dev' into 4764-serviceAbono	2023-09-13 08:52:59 +00:00
Javi Gallego	7bd3bfddc3	fix sin bankEntity ya no falla	2023-09-13 07:07:22 +02:00