1343 Commits

Author	SHA1	Message	Date
Alexandre Riera	2651081838	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour	2022-11-22 10:15:31 +01:00
Pau	3003290e61	refs #4551 @20min requested changes	2022-11-21 14:38:51 +01:00
Pau	0099b42fe3	requested changes	2022-11-21 14:06:38 +01:00
Alexandre Riera	6ddd2d95a5	insert acl	2022-11-21 11:48:18 +01:00
Alexandre Riera	4c21ffac3b	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-21 11:44:53 +01:00
Alexandre Riera	463e56b631	corrections	2022-11-21 11:41:17 +01:00
Alexandre Riera	c4430b4bca	fix acl	2022-11-17 08:56:51 +01:00
Pau	a733bc8c2f	refs #4789 hasInvoice on ticket searchbar @3h30m	2022-11-16 13:36:26 +01:00
Alexandre Riera	4feb2bea2c	working on e2e	2022-11-16 10:57:15 +01:00
Alexandre Riera	294f806bd9	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-16 09:52:13 +01:00
Alexandre Riera	78dc7db7a7	correcciones	2022-11-16 09:46:35 +01:00
Vicent Llopis	46c7aa24b8	fix: corregidas traducciones	2022-11-16 07:14:45 +01:00
Alexandre Riera	b7c9d6ea50	refs #3963 front and back tests fixed	2022-11-15 15:30:00 +01:00
Pau	192d7336a4	change test	2022-11-15 14:22:09 +01:00
Pau	6e58b1de8b	refs #4511 Changed fixtures to fix broken test @30min	2022-11-15 14:17:24 +01:00
Vicent Llopis	dd8117b6a4	feat: añadidas traducciones	2022-11-15 14:02:31 +01:00
Pau	56893ea58b	Merge branch 'dev' into 4511-kkear-expedition.itemFk	2022-11-15 13:42:06 +01:00
Alexandre Riera	09d7c450a2	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-15 13:08:36 +01:00
Alexandre Riera	97a6aff499	fix workerFk	2022-11-15 13:08:06 +01:00
Alexandre Riera	607f61092a	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-15 13:06:10 +01:00
Alexandre Riera	01607c71b6	fix rocket message and order table	2022-11-15 13:03:55 +01:00
Vicent Llopis	fc516d4029	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4793-models_translation	2022-11-15 12:23:59 +01:00
Vicent Llopis	843e5ae736	feat: traducciones en los modelos	2022-11-15 11:41:57 +01:00
Alexandre Riera	23ed6c6031	refs #3963 test front done	2022-11-14 14:30:35 +01:00
Alexandre Riera	99aa674995	refs #3963 working on mockup	2022-11-14 14:29:40 +01:00
Vicent Llopis	d6a0580203	feat: traducciones modelo Ticket	2022-11-14 11:08:23 +01:00
Alexandre Riera	05f0eba741	Merge branch 'split-tour' into 3963-ticket-advance	2022-11-14 09:06:51 +01:00
Alexandre Riera	c16210dd8a	refs #4700 working on e2e	2022-11-11 15:58:11 +01:00
Alexandre Riera	117e2c03f5	refs #4700 tests back y empezando e2e	2022-11-10 15:54:00 +01:00
Alex Moreno	37d412bf3b	refactor: delete unnecessary test	2022-11-10 14:38:37 +01:00
Alex Moreno	32701794bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-11-10 13:34:43 +01:00
Joan Sanchez	5a56fb4b6a	Merge pull request '4590-Refactor-isBox-freightItemFk' (!1079) from 4590-Refactor-isBox-freightItemFk into dev ... Reviewed-on: #1079 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-10 07:50:10 +00:00
Guillermo Bonet	6804c1a756	Merge branch 'dev' into 4550-printServer	2022-11-09 16:55:29 +01:00
Alexandre Riera	ff00066138	refs #4700 tests front y fixtures	2022-11-08 15:56:58 +01:00
Guillermo Bonet	6744b3f797	added collection-label	2022-11-08 14:40:38 +01:00
Pau	f45eaa07f9	refs #4511 fixed test, changed drop to rename @1h	2022-11-08 09:45:56 +01:00
Pau	0da6bd44e7	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-11-08 07:06:27 +00:00
Pau	2df195764d	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-11-08 08:05:13 +01:00
Alexandre Riera	896a7eb6f0	refs #4700 arreglar filtro y traducciones	2022-11-07 15:55:17 +01:00
Vicent Llopis	b1eb7d469f	fix: error duplicated key	2022-11-07 09:51:33 +01:00
Alex Moreno	03ec8e27e6	feat(ticket_isEditable): use ticketWeekly	2022-11-07 09:19:20 +01:00
Alex Moreno	e6e8f15d64	Merge branch 'dev' into 3569-refactor_isEditable-canEdit	2022-11-03 08:39:10 +00:00
Vicent Llopis	3cc89c170c	Merge branch 'dev' into 3811-ticket.sale_updatePrice	2022-11-02 13:55:07 +00:00
Vicent Llopis	8a4aa6285b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-11-02 14:49:39 +01:00
Joan Sanchez	34997b72f5	Merge branch 'dev' into 3811-ticket.sale_updatePrice	2022-11-02 11:55:47 +00:00
Joan Sanchez	177b448441	Merge branch 'dev' into 4616-ticket.sale_mana	2022-11-02 06:42:35 +00:00
Alex Moreno	e7047e982f	fix e2e	2022-10-31 15:07:22 +01:00
Alex Moreno	b37c257885	feat(canEdit): use checkAccess	2022-10-31 14:13:06 +01:00
Alex Moreno	445c6f1cc9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-28 09:32:08 +02:00
Vicent Llopis	c671540a7f	refactor: renombrada variable	2022-10-26 09:04:53 +02:00
Vicent Llopis	d4e2783630	refactor: corregidas traducciones, eliminado destroyAll y añadida transacción	2022-10-26 08:39:07 +02:00
Vicent Llopis	925565d3d2	refator: borrada variable global y añadida Promesa al array	2022-10-26 08:23:36 +02:00
Vicent Llopis	a8dfc9d06f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4616-ticket.sale_mana	2022-10-26 08:11:15 +02:00
Alex Moreno	342832c475	try	2022-10-25 15:02:22 +02:00
Alex Moreno	e1e13468a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-25 11:58:43 +02:00
Alex Moreno	3fd10dfc64	Merge branch 'dev' into 4075-ticket_boxing	2022-10-25 09:58:17 +00:00
Joan Sanchez	8f0b566935	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-10-25 07:25:07 +00:00
Vicent Llopis	c33cab7b10	fix: test back	2022-10-21 09:01:08 +02:00
Vicent Llopis	e7261573d7	delete focus	2022-10-21 08:01:22 +02:00
Vicent Llopis	6f31bea21f	feat: update testBack	2022-10-21 08:00:48 +02:00
Vicent Llopis	5da29fe381	refactor: unify duplicated code	2022-10-21 08:00:24 +02:00
Vicent Llopis	6891190c72	refactor: create endpoint to unify code	2022-10-20 15:05:46 +02:00
Vicent Llopis	29093d7d30	feat: en vez de consultar si el usuario está en la tabla workerMana, consultar es si el usuario está en un departamento que cuelga de ventas	2022-10-20 14:25:55 +02:00
Vicent Llopis	b0471037a7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-10-20 08:49:08 +02:00
Vicent Llopis	bcc9acac0a	fix: tBack	2022-10-20 08:41:00 +02:00
Alex Moreno	508decaf0b	try	2022-10-19 08:22:36 +02:00
Pau	8b07180890	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-10-18 11:56:56 +00:00
Vicent Llopis	9ea427dbfe	refactor: move front to back funcionality	2022-10-18 13:45:46 +02:00
Alex Moreno	a5ceee07e9	use loopback	2022-10-18 11:50:16 +02:00
Vicent Llopis	5fce93abd5	refactor: change variables name	2022-10-18 11:47:37 +02:00
Alex Moreno	8985a678d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-18 09:49:06 +02:00
Alex Moreno	0bc018ec02	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-10-17 14:06:31 +02:00
Vicent Llopis	f85c2e9700	refactor: delete code repeated	2022-10-17 14:01:21 +02:00
Joan Sanchez	cfdcf91be2	Merge branch 'dev' into 3505-closure_refund	2022-10-17 08:15:16 +00:00
Vicent Llopis	787d10aac6	fix: select one result only	2022-10-17 08:29:09 +02:00
Vicent Llopis	cdce628038	refactor: delete line break	2022-10-17 08:11:50 +02:00
Vicent Llopis	06ecceb478	refactor: lines to long	2022-10-17 08:02:19 +02:00
Vicent Llopis	a11ef73dfb	refactor: code repetead	2022-10-17 08:01:55 +02:00
Vicent Llopis	a036578832	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4616-ticket.sale_mana	2022-10-14 14:43:08 +02:00
Vicent Llopis	86b7e9cabe	fix: only can exists 'mana' or 'manaClaim' discount. Never both	2022-10-14 14:30:37 +02:00
Joan Sanchez	390ee60e59	Get first element in array	2022-10-14 07:26:34 +02:00
Joan Sanchez	67097970ed	Incoterms required param	2022-10-13 10:44:20 +02:00
Joan Sanchez	e81c39d8dc	Send delivery note to refund tickets	2022-10-13 09:30:31 +02:00
Vicent Llopis	1f21fdeb65	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-10-10 13:30:27 +02:00
Alex Moreno	99271f275f	remove unnecessary isEditable	2022-10-10 13:26:38 +02:00
Alex Moreno	376d46b67e	feat(canEdit): integrate isWeekly and adapt back tests and e2e	2022-10-10 13:06:49 +02:00
Vicent Llopis	843f67919c	feat: add backTest	2022-10-10 12:56:03 +02:00
Alex Moreno	3ac8e1d3bf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-10 09:57:21 +02:00
Joan Sanchez	4ecbb59ac0	Closure hours	2022-10-10 07:49:08 +02:00
Alex Moreno	94a51db3d5	hotFix(ticket_request): autocomplete buyer	2022-10-07 10:56:12 +02:00
Vicent Llopis	deb8a00dfb	feat: add backRoutes	2022-10-07 10:47:54 +02:00
Alex Moreno	e7bafb1386	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-07 07:47:46 +02:00
Alex Moreno	c29625f079	fix: funcionalityAcl	2022-10-06 15:04:27 +02:00
Joan Sanchez	dd9b517883	Merge pull request '4369-ticket.request.create_getItemTypeWorker' (#1061) from 4369-ticket.request.create_getItemTypeWorker into dev ... Reviewed-on: #1061	2022-10-06 11:30:49 +00:00
Vicent Llopis	c8d270499b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4570-tickets_translation	2022-10-06 11:50:11 +02:00
Vicent Llopis	d427c3a6db	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4369-ticket.request.create_getItemTypeWorker	2022-10-06 11:48:31 +02:00
Alex Moreno	9d482f7dfd	test(ticket): fix tests and add funcionalityAcl	2022-10-05 15:13:36 +02:00
Pau	940b431059	feat(model) Created the model for packagingMistake	2022-10-05 14:04:30 +02:00
Alex Moreno	8b636497a4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-10-05 13:47:25 +02:00
Alex Moreno	5f39249edb	fix(ticket): canEdit use aclFunc	2022-10-04 15:02:00 +02:00
Alex Moreno	fe8ae164eb	refactor(ticket): isEditable, canEdit	2022-10-04 13:22:11 +02:00
Joan Sanchez	1598b6c703	Back unit tests	2022-10-04 09:39:42 +02:00
Pau	3caf89bddb	refactor: Replaced isBox with freightItemFk	2022-10-04 09:27:31 +02:00
Vicent Llopis	5c76437498	refator: delete unnecessary transaction	2022-10-04 08:19:09 +02:00
Vicent Llopis	f510e26141	refactor: translation	2022-10-04 07:55:30 +02:00
Vicent Llopis	197bbf392b	refator: updates translations	2022-10-04 07:50:37 +02:00
Joan Sanchez	a065d77929	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2	2022-10-03 13:37:59 +02:00
Joan Sanchez	21bb95fc88	CSV refactor	2022-10-03 08:28:47 +02:00
Joan Sanchez	3b0f1efbf4	ACL's	2022-09-30 13:54:20 +02:00
Joan Sanchez	1ac35c0b68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2	2022-09-29 14:52:31 +02:00
Joan Sanchez	5aec280adb	Closure migration	2022-09-29 09:07:18 +02:00
Joan Sanchez	fe5eb3e13d	Changes	2022-09-29 07:35:20 +02:00
Joan Sanchez	d7ab95fcc8	closure	2022-09-27 15:00:12 +02:00
Alex Moreno	2c691eb796	feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList	2022-09-26 14:49:11 +02:00
Alex Moreno	f698a22fcf	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-09-26 09:25:43 +02:00
Joan Sanchez	85698410db	Templates refactor	2022-09-26 08:07:45 +02:00
Vicent Llopis	a486b1593b	fix: backTest	2022-09-22 13:55:09 +02:00
Vicent Llopis	95e5b1a970	fix: code for search-function	2022-09-22 13:54:58 +02:00
Joan Sanchez	8105c12a18	Campaign metrics	2022-09-22 08:48:29 +02:00
Vicent Llopis	0fb7487191	feat: add getItemTypeWorker endpoint	2022-09-22 08:32:18 +02:00
Vicent Llopis	fae1516b33	refactor: correct bleeding	2022-09-21 14:55:43 +02:00
Vicent Llopis	65e15ada69	refator: delete line break	2022-09-21 14:53:02 +02:00
Joan Sanchez	5a43bdb6c9	Delivery note	2022-09-21 13:18:32 +02:00
Joan Sanchez	09bdee8b34	View & send PDF from loopback endpoint	2022-09-19 12:59:32 +02:00
Alex Moreno	55d6dacebb	test(ticket_listPackaging):enable back test	2022-09-19 10:11:44 +02:00
Alex Moreno	b3aaa493d5	fix(): fix fixtures and all code needed for change the structure	2022-09-19 09:45:28 +02:00
Joan Sanchez	18ac0a0b61	Export Email and Report classes	2022-09-16 23:13:37 +02:00
Alex Moreno	c06d2970ae	test(boxing): getVideoList	2022-09-07 13:58:39 +02:00
Alex Moreno	8dd02ab6ee	quit console.logs	2022-09-06 15:08:28 +02:00
Alex Moreno	43df1e7e10	refactor(boxing): refactor getVideo	2022-09-05 12:06:14 +02:00
Alex Moreno	4a058faaf8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-09-05 08:12:07 +02:00
Joan Sanchez	768e4d5e77	Resolved conflicts	2022-08-10 12:13:31 +02:00
Alex Moreno	062806b3f0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-08-05 13:19:43 +02:00
Vicent Llopis	c3d396b042	fix: test e2e	2022-08-04 13:52:59 +02:00
Vicent Llopis	020990dadc	fix: backTest	2022-08-04 09:53:22 +02:00
Alex Moreno	b4b6d61460	feat(ticket_boxing): fix getVideo	2022-08-03 14:57:39 +02:00
Alex Moreno	8a08b6f399	feat(ticket_boxing): return video stream	2022-08-02 15:15:05 +02:00
Alex Moreno	7d4dd7bb52	feat(boxing): return stream video	2022-08-01 15:03:17 +02:00
Alex Moreno	d040ecb743	feat(ticket): getVideo from shinobi	2022-08-01 07:59:04 +02:00
Carlos Jimenez Ruiz	333828c583	Moved invoiceOut, Ticket and Sales refund loginc to backend + tests	2022-07-14 13:40:50 +02:00
Carlos Jimenez Ruiz	d0e06a46d0	removed deprecated stowaway comp and usages	2022-07-01 09:15:07 +02:00
Carlos Jimenez Ruiz	57a2cd46ce	ticket filter pending uses isNotValidated now	2022-06-29 12:55:11 +02:00
Joan Sanchez	f7d64e89ab	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-22 08:59:06 +02:00
Vicent Llopis	ec852b898c	fix: check if services exists	2022-06-21 12:44:19 +02:00
Vicent Llopis	00e48f5257	feat: add backTest	2022-06-16 10:59:31 +02:00
Vicent Llopis	84ffe3f594	feat: delete from ticketCollection and sectorCollection when a ticket is deleted	2022-06-16 09:58:15 +02:00
Vicent Llopis	363c5f349a	fix: solved bug to create temporary table	2022-06-13 10:04:12 +02:00
Alex Moreno	f786cdd33d	fix pass dates	2022-06-09 14:39:51 +02:00
Alex Moreno	eb9bd66ddb	prepare for static dates	2022-06-09 13:33:01 +02:00
Alex Moreno	7eec9de0aa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate	2022-06-09 07:47:03 +02:00
Joan Sanchez	13e0772f0b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-03 14:28:39 +02:00
Alex Moreno	4e3380cf65	hotFix(ticket_expedition): delete e.checked in filter	2022-06-02 15:28:11 +02:00
Joan Sanchez	f9b9dfaf4b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-05-24 14:54:06 +02:00
Joan Sanchez	caa9a63c4c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2022-05-24 08:45:37 +02:00
Joan Sanchez	4d093d37bd	Merge branch 'dev' into 3905-invoice-out_refund	2022-05-20 10:22:48 +00:00
Vicent Llopis	c125fd54eb	refactor: pull request changes	2022-05-20 12:08:12 +02:00
Vicent Llopis	0425b17b4e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3905-invoice-out_refund	2022-05-20 11:57:20 +02:00
Vicent Llopis	605ab2ec62	refactor: delete sms.detinationFk	2022-05-17 12:37:54 +02:00
Carlos Jimenez Ruiz	d31f7f1b6b	all type Dates replaced to date as per convention	2022-05-16 10:19:43 +02:00
Carlos Jimenez Ruiz	b5ccd32800	Merge branch 'dev' into 3409-clientCredit_maxRows	2022-05-16 07:23:08 +00:00
Carlos Jimenez Ruiz	990f7fe4b1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into gulp-jasmine_deprecation	2022-05-13 18:37:48 +02:00
Carlos Jimenez Ruiz	cce1d93dde	jasmine reporters config for CI	2022-05-12 11:43:41 +02:00
Alex Moreno	5021315ed4	refactor(clientCredit): test and types	2022-05-12 09:47:47 +02:00
Vicent Llopis	6441393249	refactor: pull request changes	2022-05-12 08:47:17 +02:00
Alex Moreno	d34a8629f7	fix(setSaleQuantity): save originalQuantity	2022-05-06 13:09:37 +02:00
Vicent Llopis	66685e7541	feat(ticket.expedition): add popover	2022-05-04 10:35:31 +02:00
Vicent Llopis	1766222c12	refactor: updated backTest	2022-04-26 13:25:12 +02:00
Vicent Llopis	4ffb61b75c	refactor: refund	2022-04-22 11:45:14 +02:00
Vicent Llopis	d1bd2f9c77	refactor: refund	2022-04-21 14:59:41 +02:00
Alex Moreno	e00d63d7af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3498-staticDate	2022-04-20 14:30:23 +02:00
Alex Moreno	7cecf1584b	feat(ticket): change isAvailable to itemShortage	2022-04-19 12:04:06 +02:00
Vicent Llopis	013390fae9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3830-ticket_sale	2022-04-12 12:49:34 +02:00
Carlos Jimenez Ruiz	56e52c35d8	Merge branch 'dev' into 3802-ticket_sale_mana	2022-04-11 10:40:52 +00:00
Vicent Llopis	d88a404ce6	refactor: pull request changes	2022-04-11 10:01:00 +02:00
Vicent Llopis	655db502f7	refactor: pull request changes	2022-04-11 09:04:05 +02:00
Joan Sanchez	0e75555bcd	Updated unit tests	2022-04-07 08:51:07 +02:00
Alex Moreno	d616367714	fix(test): use static dates	2022-04-05 07:46:49 +02:00
Vicent Llopis	c5efc17fe9	refactr: update test	2022-04-04 13:56:36 +02:00
Vicent Llopis	5f2424dc44	feat(ticket): add option 'refund all' in descriptor menu	2022-04-04 13:26:53 +02:00
Alex Moreno	c904bf0bdf	feat(back): new Date mocked time	2022-04-01 13:55:45 +02:00
Alex Moreno	eec1c1ff86	feat(db): static dates	2022-03-30 12:45:01 +02:00
Vicent Llopis	86350b2afa	feat(ticket_sale): add backTest	2022-03-29 14:00:53 +02:00
Vicent Llopis	a5ca116571	feat(ticket_sale): add mana options	2022-03-29 13:42:37 +02:00
Joan Sanchez	52b61d16ac	Merge pull request '3638-export_database' (#899) from 3638-export_database into dev ... Reviewed-on: #899 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-03-23 10:43:14 +00:00
Carlos Jimenez Ruiz	728a5de311	Merge branch 'dev' into 3625-ticket_log_routeFk	2022-03-21 11:56:44 +00:00
Vicent Llopis	a9b6dcacfe	included sms test	2022-03-17 08:13:18 +01:00
Vicent Llopis	a3dbec82bd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database	2022-03-17 07:59:07 +01:00
Alex Moreno	4dea046c97	feat(ticket_log): add routeFk log	2022-03-15 10:07:39 +01:00
Vicent Llopis	6a91fe6c11	solved backTest	2022-03-10 14:43:07 +01:00
Alex Moreno	e8d7ce7cc7	refactor(ticket): change role productionBoss to deliveryBoss	2022-03-07 14:50:51 +01:00
Alex Moreno	a136d8b03d	accept array in params	2022-03-07 10:10:45 +01:00
Carlos Jimenez Ruiz	2647b4e423	Merge branch 'dev' into 3595-item-waste-folding	2022-02-28 10:05:07 +00:00
Carlos Jimenez Ruiz	bf0734ca67	excluded 3 test suites until db export	2022-02-28 10:46:14 +01:00
Alex Moreno	4e5e6dccca	fix(test): change movable expeted	2022-02-10 10:15:43 +01:00
Alex Moreno	dc47af7224	feat(ticket): isEmpty ticketRequest not necessary isOk	2022-02-03 11:51:50 +01:00
Alex Moreno	91b6dcee05	fix(test): fixed bugs non compatible ECMA options	2022-02-02 14:33:16 +01:00
Joan Sanchez	8be7f9153e	Removed non compatible ECMA options	2022-02-01 14:50:24 +01:00
Alex Moreno	60adb6f37c	translations	2022-02-01 07:21:34 +01:00
Alex Moreno	b25ffa8feb	feat(ticket_step-two): redirect to new ticket	2022-01-28 09:15:41 +01:00
Alex Moreno	f8a0094321	word movible	2022-01-26 08:54:48 +01:00
Alex Moreno	57e4b400c9	Merge branch '3430-ticket_step-two' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-26 07:12:57 +01:00
Alex Moreno	442d58f59b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-26 07:11:22 +01:00
Alex Moreno	f67a4355db	refactor(ticket_sale): split e2e, change name backTest	2022-01-25 15:09:29 +01:00
Alex Moreno	6d9afd5f4c	feat(ticket_sale): role restriction to create payBack	2022-01-21 11:40:48 +01:00
Alex Moreno	9ddf11c6bc	test(ticket): update to advanceable	2022-01-18 12:49:16 +01:00
Alex Moreno	8e1c3e107c	refactor(ticket): advanceable code	2022-01-18 12:48:39 +01:00
Alex Moreno	b8355320f2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-17 14:50:10 +01:00
Alex Moreno	83d2dd2d80	refacto(ticket_volume): tests and front js	2022-01-17 13:17:06 +01:00
Alex Moreno	5824acf3bc	change tests to advanceable	2022-01-17 10:12:13 +01:00
Alex Moreno	61859a23c9	feat(ticket): getAdvanceable	2022-01-17 07:14:29 +01:00
Alex Moreno	c87e3e1210	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2022-01-13 07:20:23 +01:00
Alex Moreno	757fe73ecd	test(ticket_volume): backTest	2022-01-12 14:55:20 +01:00
Alex Moreno	fba09e8c40	feat(ticket_volume): volume for packingType	2022-01-12 14:02:58 +01:00
Carlos Jimenez Ruiz	cc3e2fbc3a	can't transfer claimed sales without claimManager role	2022-01-12 10:17:51 +01:00
Alex Moreno	5462af91ee	extract to variable	2022-01-10 11:38:02 +01:00
Alex Moreno	860499db82	refactor(ticket): add more text in error when change zone	2022-01-07 08:28:57 +01:00
Alex Moreno	e609994efa	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2021-12-21 21:01:18 +01:00
Alex Moreno	18b6efe8f1	test(ticket_basic-data): test and fixtures	2021-12-21 20:58:58 +01:00
Vicent Llopis	6bd48ab30b	delete comment	2021-12-21 15:06:57 +01:00
Vicent Llopis	bdb42437ae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono	2021-12-21 14:45:40 +01:00
Vicent Llopis	5c899d28c3	feat(ticket_sale): add tests and refactor backRoute name	2021-12-21 14:43:53 +01:00
Alex Moreno	831bfb0352	change route for hasRoute	2021-12-21 08:52:39 +01:00
Alex Moreno	405494c85b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3426-ticket_index	2021-12-21 08:31:17 +01:00
Vicent Llopis	e30fb0fb37	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono	2021-12-21 07:10:19 +01:00
Alex Moreno	50db693e51	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two	2021-12-20 13:50:50 +01:00
Alex Moreno	b0019d09ad	feat(ticket_basic-data_step-two): adapted for available and transfer sales in back	2021-12-20 13:50:31 +01:00
Joan Sanchez	872f5b488b	Merge branch 'dev' into 3411-route_ticket_fixtures	2021-12-20 09:40:34 +00:00
Alex Moreno	850ea2ef39	getVisible sql	2021-12-17 12:38:56 +01:00
Alex Moreno	87f994aa77	test(ticket_basci-data_step-two): back and front	2021-12-16 08:14:27 +01:00
Vicent Llopis	a6b755138f	feat(abono): add option "abono" in ticket_sale	2021-12-15 15:24:45 +01:00
Alex Moreno	3e91929d0d	half test	2021-12-15 15:16:21 +01:00
Alex Moreno	e01d676bb1	feat(ticket_basic-data_step-two): show visible and option withoutNegatives	2021-12-15 14:45:45 +01:00
Alex Moreno	5960d40891	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3426-ticket_index	2021-12-14 12:43:40 +01:00
Alex Moreno	9cfe6b5b7a	feat(ticket): filter by route	2021-12-14 12:05:06 +01:00
Joan Sanchez	f2a8992410	fix(ticketIndex): excluded collectionFk property from date ranges ... Refs: 3431	2021-12-14 09:17:00 +01:00
Vicent Llopis	ac3dc039fe	feat: add fixtures of ticket and update test	2021-12-01 12:49:53 +01:00
Alex Moreno	75e32feb16	refactor ticket_sale	2021-12-01 11:39:48 +01:00
Alex Moreno	decd4b5a95	separate sql procedures	2021-11-30 15:13:20 +01:00
Alex Moreno	d5c0be5a9d	refactor(ticket_sale): logic and tests	2021-11-30 13:47:16 +01:00
Alex Moreno	815826e891	refactor(ticket): modify transferSales.js for avoid unnecessary logs	2021-11-25 11:23:18 +01:00
Joan Sanchez	8ede14ab40	fix(sales): update price on any change affecting the ticket total ... Refs: 3363	2021-11-24 09:25:24 +01:00
Carlos Jimenez Ruiz	c011a82edc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table	2021-11-15 14:40:50 +01:00
Carlos Jimenez Ruiz	d87e8ac226	refactor(entry.lastBuys): usage of smart table on latests buys	2021-11-10 17:07:16 +01:00
Vicent Llopis	0849f40df7	feat: update backTest	2021-11-10 11:44:29 +01:00
Vicent Llopis	f60fa5a852	change receiver to requesterId	2021-10-27 12:22:32 +02:00
Vicent Llopis	d94e2900d0	feat(ticket-request): send rocket message when ticket-reques is denied	2021-10-27 12:16:37 +02:00
Carlos Jimenez Ruiz	c4c1aa929a	refactor(endpoints): corrected indentation and removed unused code	2021-10-15 16:00:50 +02:00
Carlos Jimenez Ruiz	de7af0fee2	fix(transaction): priceDifference now commits its created transaction	2021-10-15 15:59:59 +02:00
Carlos Jimenez Ruiz	270b2802c8	refactor(transactions): added transaction to sendChechingPresence and corrected a typo	2021-10-15 15:31:13 +02:00
Carlos Jimenez Ruiz	580ba36357	refactor(jasmine): usage of done on async functions is deprecated	2021-10-15 14:45:41 +02:00
Carlos Jimenez Ruiz	35a2a71602	refactor(sales): transaction correctly passed to findById	2021-10-14 16:16:00 +02:00
Carlos Jimenez Ruiz	cb7d1b24e8	refactor(ticket): all ticket endpoints are using transactions now	2021-10-07 09:57:07 +02:00
Carlos Jimenez Ruiz	392c4dcba3	refactor(sale): ticket.sale endpoints now use transactions	2021-09-29 08:27:18 +02:00
Carlos Jimenez Ruiz	cb3d0678ce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions	2021-09-24 10:09:51 +02:00
Carlos Jimenez Ruiz	8c446edc9e	Merge branch 'dev' into 3098-item_tag_productor	2021-09-24 08:02:19 +00:00
Carlos Jimenez Ruiz	23ba5657c5	refactor(sales): ticket sales now shows item.subName	2021-09-22 15:14:29 +02:00
Carlos Jimenez Ruiz	cc90a08f03	refactor(ticket): ticket endpoins now can receive transactions	2021-09-21 18:48:59 +02:00
Joan Sanchez	08cba0a9c8	fix(filter): search limit by date range was not being applied ... Refs: 3059	2021-09-21 15:49:59 +02:00
Carlos Jimenez Ruiz	6b465f9150	Merge branch 'dev' into 3068-ticket_colletion	2021-09-02 13:07:57 +00:00
Joan Sanchez	0b704db353	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-09-02 08:56:19 +02:00
Joan Sanchez	b68e99b412	fix(invoice): invoicing was throwing a transaction error ... Refs: 3077	2021-09-02 08:55:41 +02:00
Joan Sanchez	7a98613ef8	Updated unit tests	2021-09-01 11:48:21 +02:00
Joan Sanchez	0370cbf207	feat(Searchbar): You can now filter by a ticket collection ... Refs: 3068	2021-09-01 11:27:24 +02:00
Joan Sanchez	a0efe5f896	Merge branch 'dev' into 2407-eliminar-trigger-ticketAfterUpdate	2021-08-31 06:27:23 +00:00
Carlos Jimenez Ruiz	7a7bbe2ba8	more module transactions	2021-08-13 16:46:44 +02:00
Carlos Jimenez Ruiz	2b4afdd04d	ticket module transactions + tests	2021-08-12 11:21:59 +02:00
Carlos Jimenez Ruiz	708c0035c0	deprecated changeWorker as it is no longer in use	2021-08-12 11:06:49 +02:00
Javi Gallego	3b9bdc18bf	funciona	2021-08-12 09:23:19 +02:00
Carlos Jimenez Ruiz	da7bda2d0e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3038-module_transactions	2021-08-11 16:06:52 +02:00
Joan Sanchez	8e84f98629	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2984-invoiceOut_global	2021-08-09 12:59:00 +02:00
Carlos Jimenez Ruiz	870314277f	add sale and canbeInvoice refactor + tests	2021-08-05 13:32:35 +02:00
Joan Sanchez	41a1b3d909	2984 - Global invoicing endpoint	2021-08-02 13:35:38 +02:00
Carlos Jimenez Ruiz	a771fd584f	minor refactors + missing transaction on discount	2021-07-30 10:29:57 +02:00
Carlos Jimenez Ruiz	9578895f95	backend unit tests adapted	2021-07-29 17:40:45 +02:00
Carlos Jimenez Ruiz	8d682f4e03	chat notifications for many sales modifications	2021-07-29 17:20:57 +02:00
Joan Sanchez	9d855a80d5	3028 - Added visible column on ticket sales	2021-07-20 12:33:27 +02:00
Joan Sanchez	3246101574	Updated unit tests	2021-07-01 14:03:28 +02:00
Joan Sanchez	319a168b89	Removed focus	2021-07-01 13:43:13 +02:00
Joan Sanchez	7e836e570f	2983 - Invoice tickets	2021-06-30 16:10:26 +02:00
Joan Sanchez	33d03c8f21	Merge branch 'dev' into 2950-alertlevel_to_alertlevel_id	2021-06-30 06:15:05 +00:00
Carlos Jimenez Ruiz	08360bfdc4	deprecated alertLevel.alertLevel now using alertLevel.id	2021-06-29 18:01:33 +02:00
Carlos Jimenez Ruiz	e2ff3ff17f	validation message for dup entry	2021-06-28 13:30:49 +02:00
Carlos Jimenez Ruiz	0e47cf72e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing	2021-06-28 11:19:07 +02:00
Carlos Jimenez Ruiz	2548fdc891	#3000 add buyer to ticket isEditable	2021-06-25 09:46:18 +02:00
Carlos Jimenez Ruiz	8344a58ab8	updated client/worker/user IDs on tests	2021-06-23 13:24:23 +02:00
Carlos Jimenez Ruiz	4656b2e25a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2960-ticket_basicdata_add_alias	2021-06-18 15:54:41 +02:00
Joan Sanchez	8695fadc18	Merge branch 'dev' into 2948-ticket_sale_itemPackingType	2021-06-18 05:21:01 +00:00
Joan Sanchez	bbbf008076	Added done() to async beforeAll()	2021-06-17 16:09:17 +02:00
Carlos Jimenez Ruiz	b906a8e91d	added ticket.nickname to basicdata	2021-06-17 11:52:12 +02:00
Javi Gallego	e2f32a60fd	cambio campos en front	2021-06-17 07:30:22 +02:00
Carlos Jimenez Ruiz	7370269e4d	ticket.sale now shows Packing type	2021-06-16 17:06:11 +02:00
Carlos Jimenez Ruiz	e85b7b9817	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2931-entry_summary_pagination	2021-06-14 12:07:54 +02:00
Carlos Jimenez Ruiz	f36b54f97b	invoiceOut summary tickets pagination + refactor	2021-06-14 11:38:57 +02:00
Carlos Jimenez Ruiz	48f80fad8f	added postcode to summary + basic data translation	2021-06-13 19:11:05 +02:00
Carlos Jimenez Ruiz	fc3af7b6a6	ticket expedition now shows scan worker and scanned date	2021-06-09 14:25:50 +02:00
Joan Sanchez	edf18938a6	HOTFIX: clientGetDebt	2021-06-03 16:21:43 +02:00
Joan Sanchez	a24cfe0087	Merge branch 'dev' into 2891-ticket_sale_problems	2021-05-27 09:42:27 +00:00
Joan Sanchez	920e7b1daf	E2E fixes	2021-05-26 13:05:58 +02:00
Carlos Jimenez Ruiz	3f167de10f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2801_ticket_sale_restrictions	2021-05-26 09:14:30 +02:00
Carlos Jimenez Ruiz	d6ef5352a2	sale module now has canEdit endpoint to check arrays of sales	2021-05-26 09:14:18 +02:00
Joan Sanchez	099ff657e4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2891-ticket_sale_problems	2021-05-25 14:08:02 +02:00
Joan Sanchez	f6a0bcb12c	Updated unit tests	2021-05-25 13:33:17 +02:00
Joan Sanchez	26cc3a3dec	2891 - Show problems on tickets sales	2021-05-25 10:01:18 +02:00
Joan Sanchez	60185bdf34	Merge branch 'dev' into 2891-ticket_sale_problems	2021-05-21 07:24:34 +00:00
Joan Sanchez	a103c8d7fc	2891 - Get ticket problems for every sale	2021-05-21 08:49:32 +02:00
Joan Sanchez	6f245698f2	Merge branch 'dev' into 2620-mostrar-disponible	2021-05-21 06:29:43 +00:00
Joan Sanchez	fbc11b7a39	Merge branch 'dev' into 2921-notification_url	2021-05-20 08:23:45 +00:00
Javi Gallego	df073cce2f	refactor tod usa get sales	2021-05-19 17:04:13 +02:00
Carlos Jimenez Ruiz	2494af0113	removed unused relation from item @addSale	2021-05-19 15:33:35 +02:00
Carlos Jimenez Ruiz	5eb0ab8296	add and edit sales no longer intervene the prices	2021-05-19 15:25:49 +02:00
Carlos Jimenez Ruiz	72a0b774de	add and get sales now sets item.price from packaging for EMB items	2021-05-19 14:15:28 +02:00
Joan Sanchez	a5c3ba3926	2921 - Changed the ticket url of rocket notifications	2021-05-19 10:26:58 +02:00
Carlos Jimenez Ruiz	1e8ab4d348	added transactions to several endpoints	2021-05-14 19:21:04 +02:00
Joan Sanchez	6fdb91fdc8	Removed line	2021-05-13 10:20:22 +02:00
Joan Sanchez	e6e91ced99	2905 - Restore ticket shipped and landed	2021-05-13 08:56:26 +02:00
Joan Sanchez	88616862cb	Updated unit tests	2021-05-12 09:12:46 +02:00
Javi Gallego	4a7a4f6dcf	test ok	2021-04-22 09:06:08 +02:00
Carlos Jimenez Ruiz	420f05bb03	mocked api client due to service instability	2021-04-16 12:40:41 +02:00
Carlos Jimenez Ruiz	847e0bd2c8	tests fixed for production sneaky changes	2021-03-30 14:43:21 +02:00
Joan Sanchez	e2a9a64f88	#2871 and #2868. Included ticket filter unit test	2021-03-30 11:20:26 +02:00
Joan Sanchez	eddd769af0	Excluded unit test	2021-03-29 08:39:33 +02:00
Joan Sanchez	dbb6ccd89d	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2021-03-29 07:50:16 +02:00
Joan Sanchez	320e3143cd	Ticket filter hotfix	2021-03-26 12:51:14 +01:00
Joan Sanchez	4dbcc0dd5c	HOTFIX: Ticket filter changed ticketGetTotal() args	2021-03-26 12:32:32 +01:00
Joan Sanchez	985bcc61b1	Rollback	2021-03-22 09:11:02 +01:00
Joan Sanchez	59bf458ca5	Removed xdescribe	2021-03-22 09:10:45 +01:00
Joan Sanchez	29979d5367	Rollback	2021-03-22 09:10:12 +01:00
Joan Sanchez	7ac4d67f97	Empty value not being logged in	2021-03-22 09:08:27 +01:00
Joan Sanchez	6210e60896	2669 - Changes to the translate values function	2021-03-19 19:20:19 +01:00
jorgebl	e12be7bf0d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2817-translate_ticket_request_message	2021-03-18 13:40:56 +01:00
Joan Sanchez	565162740a	Updated unit tests	2021-03-15 16:35:55 +01:00
Joan Sanchez	0ec6d273e6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2734-invoice_report	2021-03-15 13:49:16 +01:00
Joan Sanchez	bd081f9fd6	2734 - Make invoice PDF refactor	2021-03-15 13:43:22 +01:00
Joan Sanchez	92aa9eb933	Removed ticket total temporary table	2021-03-15 06:52:15 +01:00
Joan Sanchez	c3bb099b85	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-03-15 06:50:42 +01:00
Joan Sanchez	6cb620a41d	Ticket filter fix	2021-03-14 17:20:42 +01:00
Joan Sanchez	7b94cc2942	Ticket filter test	2021-03-14 17:12:31 +01:00
jorgebl	c74b635a1a	Translate and show url of item	2021-03-12 12:24:08 +01:00
Carlos Jimenez Ruiz	674b959bbc	minor refactor	2021-03-11 15:14:08 +01:00
Joan Sanchez	1719f53111	2734 - Recreate invoice	2021-03-11 08:58:34 +01:00
Carlos Jimenez Ruiz	0cb7ddd9ce	ticket.total with and witout VAT refactor	2021-03-10 19:25:26 +01:00
Carlos Jimenez Ruiz	3374356d58	both created tickets are now discarded after tests	2021-02-11 11:53:30 +01:00
Javi Gallego	f87ea1b051	arrow-spacing	2021-02-10 08:13:45 +01:00
Javi Gallego	3a3dae179c	done	2021-02-10 07:58:11 +01:00
Joan Sanchez	3dd8ff5194	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2021-02-05 08:28:32 +01:00
Joan Sanchez	5bd7e4a67f	Translation fix	2021-02-05 08:05:57 +01:00
Carlos Jimenez Ruiz	532cb582cf	columns moved and no refresh on stateState changes	2021-02-03 17:01:43 +01:00
Javi Gallego	7bdfb36f25	minor refactor	2021-01-22 14:30:46 +01:00
Javi Gallego	aab9797d3f	Merge branch 'dev' into 2479-factura-ticket	2021-01-21 13:40:55 +01:00
Javi Gallego	3dc50e8a16	test ok	2021-01-21 13:39:40 +01:00
Carlos Jimenez Ruiz	01191b3f0f	excluded faling tests for future fixing	2021-01-20 14:43:20 +01:00
Javi Gallego	4cdbb85e30	primer comit	2021-01-20 13:53:49 +01:00
Carlos Jimenez Ruiz	7ec1e4272a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed	2021-01-19 20:56:40 +01:00
Joan Sanchez	dfbf114161	Merge branch 'dev' into 2708-travel_extracommunity	2021-01-19 12:10:06 +00:00
Joan Sanchez	8c8891f8e3	Requested changes	2021-01-19 13:06:10 +01:00
Carlos Jimenez Ruiz	8d6dd3e03a	minor refactors	2021-01-18 14:17:01 +01:00
Joan Sanchez	e5b13267e2	2605 - Ticket request send chat notification	2021-01-05 15:03:35 +01:00
Carlos Jimenez Ruiz	4e7d64e5ca	re-enabled working unit test	2020-12-31 11:17:42 +01:00
Joan Sanchez	910caf5689	2661 - Added clone options	2020-12-28 14:53:26 +01:00
Jorge Padawan	259842c22d	Retirado el parametro required por no utilizarse	2020-12-23 13:32:58 +01:00
Joan Sanchez	42cd2356a2	Refactor v2	2020-12-18 17:23:04 +01:00
Joan Sanchez	260b502cd6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader	2020-12-10 07:30:31 +01:00
Joan Sanchez	1ba1d27ba0	2576 - Photo upload component	2020-11-27 13:10:39 +01:00
Bernat Exposito	78f25e0b46	export production	2020-11-25 12:37:44 +01:00
Joan Sanchez	9f5ba5bb85	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download	2020-11-18 10:44:00 +01:00
Joan Sanchez	ac5f30924a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-11-18 08:20:46 +01:00
Joan Sanchez	0fc01b2316	1419 - Claim update discount hotfix	2020-11-18 08:16:37 +01:00
Bernat Exposito	2454999938	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2575-image_download	2020-11-12 08:14:55 +01:00
Bernat Exposito	44d3cf748b	change id in ticketLastState model	2020-11-10 11:44:41 +01:00
Carlos Jimenez Ruiz	282adfa7b6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2425-ticket_descriptor_menu	2020-11-09 16:06:29 +01:00
Carlos Jimenez Ruiz	54d31f15bb	fixed collection tests pollution	2020-11-09 14:53:26 +01:00
Joan Sanchez	637116b17d	Added descriptor-menu component	2020-11-09 14:52:25 +01:00
Javi Gallego	a472ce9a81	Merge branch 'dev' into 2510-client-address-create-test	2020-10-30 17:24:20 +01:00
Javi Gallego	b50ae7b8ca	testback arreglados	2020-10-30 15:50:59 +01:00
Carlos Jimenez Ruiz	28ec55b440	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2482-fix_worker_timeControl_e2e	2020-10-30 10:46:05 +01:00
Carlos Jimenez Ruiz	2f6b3f0c38	small refactors for #2512	2020-10-30 10:45:55 +01:00
Javi Gallego	31b5a140d4	test completados	2020-10-30 10:07:53 +01:00
Javi Gallego	3fdc9c315d	Merge branch 'dev' into 2510-client-address-create-test	2020-10-30 08:40:47 +01:00
Bernat Exposito Domenech	42d16d0258	ticket component refactor	2020-10-29 11:09:58 +01:00
Joan Sanchez	3779a7c7a5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-10-22 13:00:48 +02:00
Joan Sanchez	f87a7664e5	Added loggable utils	2020-10-22 11:24:53 +02:00
Joan Sanchez	fc9b9eb718	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2020-10-22 07:49:04 +02:00
Joan Sanchez	d3532608e1	Changed oldValue	2020-10-21 14:05:14 +02:00
Joan Sanchez	628154b7e8	Trigger jenkins	2020-10-21 13:40:54 +02:00
Joan Sanchez	c87783b446	2528 - Rocket notifications hotfix	2020-10-21 13:25:52 +02:00
Javi Gallego	ef7a886d86	Merge branch 'dev' into 2510-client-address-create-test	2020-10-21 10:13:04 +02:00
Joan Sanchez	3730bf86cc	Updated destinatary	2020-10-20 16:05:05 +02:00
Joan Sanchez	86d3e2d689	Changed message destinatary	2020-10-20 16:03:07 +02:00
Joan Sanchez	611e1a3802	Updated unit test	2020-10-20 15:13:12 +02:00
Joan Sanchez	f7e9372bf0	2525 - Change to past date	2020-10-20 15:12:00 +02:00
Joan Sanchez	ffcb3629c5	Updated unit test	2020-10-20 15:01:02 +02:00
Joan Sanchez	7d0790684b	2525 - Change to past date	2020-10-20 14:54:23 +02:00
Javi Gallego	4aea284703	WIP: a falta de e2e	2020-10-20 14:42:23 +02:00
Carlos Jimenez Ruiz	b96007aa62	fixed login/out problems at random + others	2020-10-16 11:16:24 +02:00
Carlos Jimenez Ruiz	c622175192	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-15 18:57:33 +02:00
Carlos Jimenez Ruiz	dd6035606f	some more tests fixed + refactors	2020-10-15 18:57:27 +02:00
Carlos Jimenez Ruiz	64b65d204a	excluded confirm with no easy fix for pollution	2020-10-14 11:16:23 +02:00
Carlos Jimenez Ruiz	b6b84cfea7	more tests fixed + small refactors	2020-10-08 16:00:19 +02:00
Joan Sanchez	355f95ae40	2473 - Added ticket restore option	2020-10-08 13:42:20 +02:00
Joan Sanchez	eceb33cce0	2473 - Added restore method	2020-10-07 11:00:26 +02:00
Carlos Jimenez Ruiz	89fb980f14	some tests fixed	2020-10-06 10:15:27 +02:00
Carlos Jimenez Ruiz	27d2c59358	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random	2020-10-05 16:09:30 +02:00
Javi Gallego	0294d2a845	Merge branch 'dev' into 2443	2020-10-05 09:07:00 +02:00
Bernat Exposito Domenech	161313ad15	refactor getComponentSum	2020-10-02 13:58:48 +02:00
Carlos Jimenez Ruiz	ff3b75267a	priceDifference test fix + refactor	2020-10-02 09:39:58 +02:00
Javi Gallego	2714857227	Merge branch 'dev' into 2443	2020-09-30 14:07:38 +02:00
Carlos Jimenez Ruiz	1e55632b94	refactor & fix regularize claim and prices Diff	2020-09-29 13:28:02 +02:00
Carlos Jimenez Ruiz	40abd68734	fix byWarehouse and ticket.filter tests	2020-09-29 13:11:11 +02:00
Carlos Jimenez Ruiz	6afee4924c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2457-fix_regularizeClaim_unit_test	2020-09-29 08:44:33 +02:00
Joan Sanchez	a1349de32d	Merge branch 'dev' into 2381-mariaDB	2020-09-28 06:18:53 +00:00
Joan Sanchez	3e2f85dbd2	Merge branch 'dev' into 2458-ticket_index_pending	2020-09-28 06:13:39 +00:00
Joan Sanchez	0438171a47	Merge branch 'dev' into 2381-mariaDB	2020-09-28 06:09:48 +00:00
Bernat Exposito Domenech	790c9bfe6f	update models and fixtures	2020-09-25 14:50:04 +02:00
Javi Gallego	c909470f41	merge	2020-09-25 08:10:37 +02:00
Joan Sanchez	f1d36df558	#2458 - Removed states from pending tickets	2020-09-24 15:00:00 +02:00
Joan Sanchez	de3c7acb08	Merge branch 'dev' into 2381-mariaDB	2020-09-24 12:30:44 +00:00
Carlos Jimenez Ruiz	87e4765a1c	fixed ticket-weekly backend unit test	2020-09-22 16:53:47 +02:00
Joan Sanchez	89667a18c9	Handle ticket without old state	2020-09-22 07:50:30 +02:00
Juan Ferrer	6abd707a6d	Tests fixed	2020-09-21 19:16:51 +02:00
Juan Ferrer	3880e21ce3	Test fixes	2020-09-21 16:09:34 +02:00
Javi Gallego	8fb674819a	ticket service	2020-09-21 10:35:39 +02:00
Javi Gallego	1b13e58e10	item basic-data añadir isFragile	2020-09-17 09:58:00 +02:00
Carlos Jimenez Ruiz	bde6c4495d	e2e path updated + 2 new tasks for broken tests	2020-09-16 16:10:43 +02:00
Carlos Jimenez Ruiz	5b69ce983c	salesPersonUser replaces salesPerson relation	2020-09-15 19:43:07 +02:00
Carlos Jimenez Ruiz	13a5c4c4c9	test enhanced	2020-09-14 13:58:42 +02:00
Carlos Jimenez Ruiz	0b4c53a655	added invoiceOut descriptor	2020-09-14 13:11:53 +02:00
Bernat Exposito Domenech	0cf99a5a83	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2438-export_production	2020-09-10 11:34:35 +02:00
Bernat Exposito Domenech	348412c5db	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component	2020-09-09 15:50:06 +02:00
Bernat Exposito Domenech	d4b6d7cd96	cr changes	2020-09-09 15:49:59 +02:00
Bernat Exposito Domenech	9ff7232b50	export production and fix test	2020-09-09 12:54:10 +02:00
Bernat Exposito Domenech	5bb8aacfb0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component	2020-09-09 11:12:18 +02:00
Joan Sanchez	d0ac1b621c	Merge branch 'dev' into 2385-worker_descriptor_refactor	2020-09-09 09:06:11 +00:00
Bernat Exposito Domenech	f99fb69d48	front and back test	2020-09-09 08:20:27 +02:00
Joan Sanchez	db081501eb	2440 - Ticket filter hotfix	2020-09-09 08:14:17 +02:00
Bernat Exposito Domenech	d79cffb2c3	back test for getComponentsSum	2020-09-08 08:13:54 +02:00
Bernat Exposito Domenech	174cea7bc3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component	2020-09-08 07:17:23 +02:00
Bernat Exposito Domenech	92e14d5292	update getComponentSum	2020-09-08 07:17:16 +02:00
Joan Sanchez	b848fa52f2	2385 - Replaced worker nickname	2020-09-03 15:11:16 +02:00
Javi Gallego	b4952002a3	Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk	2020-09-01 06:49:09 +00:00
Joan Sanchez	6297d09de2	Updated syntax	2020-08-31 12:14:39 +02:00
Joan Sanchez	baf9ec6e70	2416 - Item request - Added state filter	2020-08-31 08:32:30 +02:00
Javi Gallego	8b26c41b7f	campo packageFk	2020-08-28 17:06:27 +02:00
Joan Sanchez	4d8a84e774	Fixed back unit tests	2020-08-20 08:45:03 +02:00
Joan Sanchez	f13c47ce6d	Ticket problems filter fix	2020-08-17 14:31:26 +02:00
Bernat Exposito Domenech	0d689a8c01	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component	2020-08-13 10:43:25 +02:00
Joan Sanchez	88c5b6f8a6	Changed ticket problems min date	2020-08-13 08:23:55 +02:00
Carlos Jimenez Ruiz	9402f368f6	ticket index and zone descriptor refactor	2020-07-30 12:51:19 +02:00
Bernat Exposito Domenech	b972353bb4	create method getComponentSum	2020-07-21 11:11:09 +02:00
Bernat Exposito Domenech	064b950773	export production	2020-07-16 12:10:18 +02:00
Bernat Exposito Domenech	f7100f11ee	first step add right menu in ticket components	2020-07-16 07:43:07 +02:00
Joan Sanchez	6aca80b075	Merge branch 'dev' into 2338-ticket_weekly	2020-07-07 12:34:04 +00:00
Joan Sanchez	53d672152b	Merge branch 'dev' into 2343-exportar_produccion	2020-07-07 06:19:12 +00:00
Carlos Jimenez Ruiz	c801d8a969	Merge branch '1368-ticket_sale_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor	2020-07-01 14:45:53 +02:00
Carlos Jimenez Ruiz	354123dc86	e2e toolkit 2.0 + refactors	2020-07-01 14:45:48 +02:00
Joan Sanchez	b40e09a6cb	Methods refactor & updated back unit tests	2020-07-01 14:28:05 +02:00
Joan Sanchez	0a327087ce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor	2020-07-01 11:57:16 +02:00
Javi Gallego	039eec7d26	test excepto fallo e2e	2020-06-30 10:16:22 +02:00
Javi Gallego	db06626675	refactor	2020-06-29 14:26:27 +02:00
Bernat Exposito Domenech	faee28cb01	fix bugs in ticket weekly	2020-06-29 09:35:18 +02:00
Bernat Exposito Domenech	ea1eb16060	export structure	2020-06-29 07:32:08 +02:00
Javi Gallego	962436b8bb	2344 ticket sale descuento usuario	2020-06-25 17:12:53 +02:00
Joan Sanchez	d4c78b46c1	1368 - First sale refactor	2020-06-23 13:40:49 +02:00
Carlos Jimenez Ruiz	e6a72d0f09	clean code refactor	2020-06-18 15:26:15 +02:00
Carlos Jimenez Ruiz	4d97357213	update estate without model.refresh()	2020-06-18 13:50:52 +02:00
Carlos Jimenez Ruiz	edea60dd94	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note	2020-06-17 15:38:49 +02:00
Carlos Jimenez Ruiz	2abd45f498	setDelivered and open delivery notes and tests	2020-06-17 15:38:37 +02:00
Joan Sanchez	fd97845979	Revert "Removed sms excluded tests" ... This reverts commit 30912bd5e9.	2020-06-17 14:00:04 +02:00
Joan Sanchez	30912bd5e9	Removed sms excluded tests	2020-06-16 15:11:24 +02:00
Joan Sanchez	dddfe2773a	2293 - getVolume() call to saleVolume	2020-06-12 11:26:32 +02:00
Carlos Jimenez Ruiz	538ae75b89	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2283_e2e_delete_ticket_with_stowaway	2020-06-10 16:24:17 +02:00
Joan Sanchez	5edfc59d97	Updated unit test	2020-06-10 13:57:32 +02:00
Joan Sanchez	461fec7e64	Updated unit test	2020-06-10 13:57:08 +02:00
Carlos Jimenez Ruiz	4b1e79a433	2314 server side unit test fixed	2020-06-10 13:50:03 +02:00
Joan Sanchez	3cfb8b4730	2323 - Filter by myTeam fix	2020-06-10 12:13:07 +02:00
Joan Sanchez	1fed4c7913	Contextmenu fixes	2020-06-09 12:16:40 +02:00
Carlos Jimenez Ruiz	d8593ea3e0	Merge pull request '2176-contextmenu' (#302) from 2176-contextmenu into dev ... Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>	2020-06-08 12:59:59 +00:00
Joan Sanchez	ba9a44dec1	Updated back unit test	2020-06-08 13:06:33 +02:00
Joan Sanchez	ab1e8fb622	2176 First working version	2020-06-08 12:14:27 +02:00
Joan Sanchez	181f2f0148	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2176-contextmenu	2020-06-08 08:19:18 +02:00
Javi Gallego	faa053a3d2	Merge branch 'dev' into 2035-el-parametro-vShowExpiredZones	2020-06-05 10:01:52 +02:00
Javi Gallego	b40be5cca9	2035	2020-06-05 10:01:21 +02:00
Bernat Exposito Domenech	a81862baad	set deleteded skiped	2020-06-05 08:29:51 +02:00
Bernat Exposito Domenech	f340466daf	fix test 2296	2020-06-04 14:23:48 +02:00
Joan Sanchez	94dcf7679b	Merge pull request '2265-item_request_filters' (#289) from 2265-item_request_filters into dev ... Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2020-06-03 10:54:41 +00:00
Joan Sanchez	613937dc8d	Fixed order	2020-06-03 12:21:03 +02:00
Joan Sanchez	18edd523d2	Excluded failing test	2020-06-03 11:40:18 +02:00
Joan Sanchez	b7ceeae65a	Excluded back unit tests. TLS error	2020-06-03 11:27:14 +02:00
Joan Sanchez	751f79373a	Merge pull request '2230-log_ticket_request' (#282) from 2230-log_ticket_request into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-02 09:28:14 +00:00
Bernat Exposito	fac64c45c0	Merge pull request 'zone delete' (#285) from 2244-zone_descriptor into dev ... Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2020-06-02 09:18:24 +00:00
Bernat Exposito Domenech	aac47e52e9	update log	2020-06-02 11:15:07 +02:00
Joan Sanchez	a0767a6ea2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2265-item_request_filters	2020-06-02 10:56:40 +02:00
Joan Sanchez	1e4f36b775	Updated back unit test	2020-06-02 09:34:42 +02:00
Bernat Exposito Domenech	546272cc3f	zone delete	2020-06-02 08:59:04 +02:00
Joan Sanchez	052c51cee5	2282 - Change stowaway state to FIXING	2020-06-01 12:47:04 +02:00
Joan Sanchez	3f1109aee3	Test changes	2020-05-29 12:10:04 +02:00
Joan Sanchez	90ae1562dd	Added filters	2020-05-29 11:10:58 +02:00
Bernat Exposito Domenech	8be929c1da	log tiquet request	2020-05-27 08:07:14 +02:00
Javi Gallego	d8871c0bce	cr	2020-05-26 10:37:52 +02:00
Joan Sanchez	4d2d57d646	2265 Changes to filter	2020-05-26 08:08:09 +02:00
Javi Gallego	692af6078c	Merge pull request 'Tarea-#2242-zone-upcomingDeliveries' (#260) from Tarea-#2242-zone-upcomingDeliveries into dev ... Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2020-05-19 10:21:33 +00:00
Javi Gallego	a7e6e3d4b7	cr juan	2020-05-19 08:46:42 +02:00
Bernat Exposito Domenech	2681060878	update mehod ticket summary	2020-05-18 14:59:58 +02:00
Bernat Exposito Domenech	c205c173f8	invoiceOut descriptor popover in ticket summary	2020-05-18 10:28:33 +02:00
Javi Gallego	3815edfbea	falta CR	2020-05-15 12:17:34 +02:00
Javi Gallego	6dacf20bd9	ticket.index modificar orden de las secciones	2020-04-23 17:59:46 +02:00
Javi Gallego	dbb2257430	test de zone_getLanded y zone_getFromGeo	2020-04-20 13:49:33 +02:00
Javi Gallego	09e425c33c	2174 ticket.weekly con campo agencyModeFk con E2E	2020-04-08 12:33:36 +02:00
Joan Sanchez	59fadf410e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2208-ticket_summary	2020-03-27 11:45:10 +01:00
Joan Sanchez	d640b66ef5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1934-ticket_stowaway	2020-03-27 11:22:00 +01:00
Bernat Exposito Domenech	74b27778ab	add phones in ticket summary	2020-03-27 11:10:20 +01:00
Joan Sanchez	598ebe96d1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2203-ticket_sale	2020-03-27 11:06:35 +01:00
Joan Sanchez	d4ca58edad	Updated back unit test	2020-03-27 09:10:30 +01:00
Joan Sanchez	835c415ba7	1934 - Moved procedure logic to method	2020-03-26 14:45:38 +01:00
Bernat Exposito Domenech	6928092594	fix ticket.sale state autocomplete	2020-03-26 12:00:07 +01:00
Joan Sanchez	9bae89a672	Updated unit test	2020-03-23 16:03:27 +01:00
Joan Sanchez	27b1376799	changes	2020-03-23 11:21:25 +01:00
Bernat Exposito Domenech	f6ca9eee01	ticketlog in componentUpdate	2020-03-16 09:13:44 +01:00
Bernat Exposito Domenech	fdd1c73485	refactor componentUpdate	2020-03-13 12:26:15 +01:00
Bernat Exposito Domenech	3ab80e1479	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2088-ticket_datosBasicos	2020-03-12 12:04:35 +01:00
Joan Sanchez	6d437d0e2e	Allow empty agency on ticket creation	2020-03-10 11:46:58 +01:00
Joan Sanchez	24becf7872	Updated var names	2020-03-04 11:17:35 +01:00
Joan Sanchez	d6278e0df9	2164 - Show confirmation only when data is not empty	2020-03-04 09:26:12 +01:00
Joan Sanchez	7e694c3e80	2073 - Filter by pending tickets	2020-03-02 11:35:43 +01:00
Bernat Exposito Domenech	42b151c849	fix isEditable spec	2020-03-02 09:43:22 +01:00
Bernat Exposito Domenech	63cd436d3c	fix request changes	2020-03-02 08:30:33 +01:00
Bernat Exposito Domenech	4561b6eeef	refactor ticket.isEditable	2020-02-27 12:31:38 +01:00
Bernat Exposito Domenech	9cad13f166	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1970-test_crud_model	2020-02-26 08:24:21 +01:00
Bernat Exposito Domenech	85db094f1d	componentUpdate	2020-02-25 12:36:33 +01:00
Bernat Exposito Domenech	2fdd275085	log in ticketUpdate	2020-02-25 11:43:50 +01:00
Joan Sanchez	415316d7d0	2081 - Fix ticket search by order id	2020-02-24 13:28:59 +01:00
Joan Sanchez	d0c2f88a77	2126 - Search by client name	2020-02-24 12:08:53 +01:00
Joan Sanchez	2f089681df	Don't throw error if no salesPerson is assigned	2020-02-20 12:52:05 +01:00
Carlos Jimenez Ruiz	587653fb40	#2119 e2e item.request	2020-02-20 09:31:44 +01:00
Bernat Exposito Domenech	f900b7ef62	crud model test	2020-02-17 13:50:54 +01:00
Bernat Exposito Domenech	e0f7b917d7	db test ticket_recalcComponent	2020-02-12 10:39:46 +01:00
Joan Sanchez	91210c3a0d	1684 - Log old quantity value	2020-02-11 08:19:03 +01:00
Joan Sanchez	e1942875af	1684 - Log transfer old values	2020-02-10 14:32:52 +01:00
Bernat Exposito Domenech	dd368a8c3f	refactor ticket.basicData steps	2020-02-07 13:38:32 +01:00
Bernat Exposito Domenech	bb09fc9746	update ticket.isEditable	2020-02-06 11:50:32 +01:00
Bernat Exposito Domenech	8193b0ffc0	update ticket.filter	2020-02-06 07:37:41 +01:00
Bernat Exposito Domenech	b244df4807	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2014-remove_bi_from_db	2020-01-24 12:56:01 +01:00
Bernat Exposito Domenech	439f9009ff	fix model componentType	2020-01-23 13:47:00 +01:00
Joan Sanchez	57acca2f5e	refactor & updated tests	2020-01-23 13:31:07 +01:00
Bernat Exposito Domenech	64bd721287	update structure db	2020-01-23 12:58:38 +01:00
Joan Sanchez	3ff1fb7d2d	Added back unit tests	2020-01-20 11:59:15 +01:00
Bernat Exposito	e1aefc795b	Merge branch '2008-item_buyer_waste_detail' of verdnatura/salix into dev	2020-01-16 13:42:12 +00:00
Bernat Exposito Domenech	ba2300288f	sendSms test	2020-01-16 12:40:28 +01:00
Bernat Exposito Domenech	b42b2ec8c3	refactor sms send	2020-01-15 13:27:14 +01:00
Joan Sanchez	708789502d	Added waste section	2020-01-15 13:07:33 +01:00
Joan Sanchez	048fcb733d	added zone name to ticket summary	2020-01-13 07:42:41 +01:00
Bernat Exposito Domenech	e9d3b14da7	refactor models component and componentType	2019-12-27 08:01:53 +01:00
Joan Sanchez	5273e90a30	Added params to ticket method & updated unit tests	2019-12-26 07:12:34 +01:00
Joan Sanchez	42239815e0	removed fdescribe	2019-12-19 15:01:33 +01:00
Juan Ferrer	9947021736	#1953 Temporal fix	2019-12-19 12:17:53 +01:00
Joan Sanchez	ef95244d07	stowaway refactor	2019-12-17 08:38:36 +01:00
Joan Sanchez	780f1e4773	renamed expence to expense and added field	2019-12-13 11:59:25 +01:00
Bernat	f38210ddd2	udate structure db	2019-12-04 11:09:36 +01:00
Joan Sanchez	fd72f206bc	Recalculate ticket components #1770	2019-11-21 12:00:56 +01:00
Joan Sanchez	fee0d674a0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1770-calculate_components	2019-11-21 11:06:31 +01:00
Joan Sanchez	5bb7f7f14a	deprecated getItemVisibleAvailable() #1887	2019-11-20 11:14:11 +01:00
Joan Sanchez	c6d1536500	recalculate ticket components	2019-11-20 06:53:37 +01:00
Javi Gallego	c736e4de29	#1850 descomentar test back	2019-11-18 12:32:50 +01:00
Joan Sanchez	c028233012	ticket.sale recalculate sale price #1768	2019-11-14 14:19:39 +01:00
Joan Sanchez	236dcbf207	changed isRaid to isVirtual, atenderFk to attenderFk	2019-11-13 13:22:39 +01:00
Joan Sanchez	c166067888	updated tests & email compatibility with phone	2019-11-13 12:18:30 +01:00
Joan Sanchez	603bb034a1	Excluded specs with calls to setDeleted #1874	2019-11-13 07:56:09 +01:00
Joan Sanchez	7f2af116bc	updated translation	2019-11-13 07:04:47 +01:00
Joan Sanchez	c3962c3d78	updated test	2019-11-12 15:07:37 +01:00
Joan Sanchez	1b70721b0e	#1864 added restrictions, send rocketchat message	2019-11-12 14:53:58 +01:00
Bernat	1be61b16d5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-11-05 08:56:59 +01:00
Javi Gallego	03a4da307d	Tarea #1848 test back arreglados/comentados	2019-10-31 12:54:16 +01:00
Bernat	9353d54b16	add alias on weekly filter	2019-10-29 14:55:05 +01:00
Bernat	afd7c5684a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1773-1774-travel_summary	2019-10-24 12:49:23 +02:00
Joan Sanchez	2ed4cf3e4a	Item request refactor #1818	2019-10-22 13:44:36 +02:00
Bernat	939c507fba	#1810 El método listPackaging filtrar por isPackagingReturnable	2019-10-21 09:16:52 +02:00
Joan Sanchez	e2a7c09e4a	Uploadfile parameters are now required + fixed date filters	2019-10-21 08:31:14 +02:00
Joan Sanchez	55f3390f85	added validation for confirmed purcharse requests	2019-10-21 07:08:47 +02:00
Bernat	ed1ed7f50b	#1738 exportar estructura y datos de produccion a la local	2019-10-15 07:23:34 +02:00
Joan Sanchez	300ba61fd3	#1759 Forzar desenrutado al cambiar datos básicos de ticket	2019-10-14 14:43:10 +02:00
Joan Sanchez	9bfc87f1e2	changed state to stowaway ticket	2019-10-10 09:59:28 +02:00
Joan Sanchez	c0403873e7	stowaway changed to correct field name	2019-10-08 14:36:02 +02:00
Carlos Jimenez Ruiz	fb846baaa4	#1740 Intermitencia test de back	2019-10-01 13:19:22 +02:00
Juan Ferrer	a177ad8e26	Fixes	2019-09-30 13:02:11 +02:00
Carlos Jimenez Ruiz	6e50c1fad9	#1685 ticket.transferSale	2019-09-27 16:55:40 +02:00
Carlos Jimenez Ruiz	a8c6c57b7e	#1719 claim.detail final amends and tests	2019-09-26 12:07:40 +02:00
Carlos Jimenez Ruiz	2a2c5ae3c4	#1719 claim.detail cambiar descuento falla	2019-09-26 10:56:49 +02:00
Carlos Jimenez Ruiz	65981099b6	#1719 claim.detail cambiar descuento falla	2019-09-26 09:05:18 +02:00
Carlos Jimenez Ruiz	1841e4edb0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-25 11:53:42 +02:00
Carlos Jimenez Ruiz	be65c5acad	#1719 claim.detail cambiar descuento falla	2019-09-25 11:53:12 +02:00
Joan Sanchez	73eca9905e	fixed #1734 canHaveStowaway validation	2019-09-25 11:26:12 +02:00
Carlos Jimenez Ruiz	0c27b90c5d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-24 14:39:22 +02:00
Carlos Jimenez Ruiz	99ef8a6010	#1719 claim.detail cambiar descuento falla	2019-09-24 14:23:21 +02:00
Bernat	bf5a9967cf	Refactor #1682 modificar modelos componentRate y componentTypeRate	2019-09-24 13:45:54 +02:00
Joan Sanchez	15183df65f	transfer sales error fixed	2019-09-24 08:51:21 +02:00
Bernat	cbbce91def	#1693 export structure, data and fix back test	2019-09-17 13:52:29 +02:00
Bernat	2e1b329584	#1681 delete comment	2019-09-13 11:27:32 +02:00
Bernat	c6507fc2bb	#1681 crear test para el endpoint getPossibleStowaways	2019-09-13 07:40:27 +02:00
Bernat	c344d8088b	merge	2019-09-11 14:18:21 +02:00
Joan Sanchez	ff626764d8	fixed back unit tests	2019-09-11 08:24:28 +02:00
Joan Sanchez	342886942f	fixed sale loggable transaction error #1686	2019-09-11 08:12:27 +02:00