5064 Commits

Author	SHA1	Message	Date
Vicent Llopis	84036d582f	fic: delete unnecessary acl	2022-07-29 13:42:52 +02:00
Vicent Llopis	537c383cd2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk	2022-07-29 13:38:23 +02:00
Vicent Llopis	224ea61a62	fix: delete warehouseFk from itemType model	2022-07-29 13:07:25 +02:00
Vicent Llopis	840e792d13	fix: backTest	2022-07-29 12:52:53 +02:00
Vicent Llopis	605da52286	fix: replace it.warehouseFk by userConfig.warehouseFk	2022-07-29 12:22:03 +02:00
Vicent Llopis	21701601e3	fix: update frontTest	2022-07-27 13:01:03 +02:00
Vicent Llopis	3bf7efea16	feat: add phone extension and personal phone. Update bussiness phone	2022-07-27 12:16:41 +02:00
Alex Moreno	4c60303968	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-vnInputTime	2022-07-27 11:17:35 +02:00
Joan Sanchez	468da0c5a9	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-07-27 08:12:06 +02:00
Joan Sanchez	f4825488c6	refactor(Tasks API): ghanged method to GET	2022-07-26 11:47:43 +02:00
Alex Moreno	d3852bac5d	fix(vnInputTime): quit new date(null)	2022-07-26 11:45:12 +02:00
Carlos Jimenez Ruiz	f3766edbb7	Merge branch 'dev' into 1781-zoneHoliday	2022-07-22 13:56:19 +00:00
Vicent Llopis	9bd3daf71c	feat: add translate	2022-07-22 13:36:44 +02:00
Vicent Llopis	4076f2908e	refactor: change type of params in endpoints	2022-07-22 13:35:18 +02:00
Carlos Jimenez Ruiz	7d7365c4f3	Merge branch 'dev' into 4270-route.create	2022-07-22 11:07:08 +00:00
Vicent Llopis	5446c960fb	fix: frontTest	2022-07-21 10:11:31 +02:00
Vicent Llopis	699f19b0d4	refactor: change invoice id by refFk	2022-07-21 10:05:37 +02:00
Vicent Llopis	cb3e488df9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4221-intrastat	2022-07-20 14:12:08 +02:00
Vicent Llopis	26f8996936	refactor: set vn-focus and move sql to new folder	2022-07-20 14:02:15 +02:00
Vicent Llopis	af4e7be229	feat: add frontTest	2022-07-20 13:41:33 +02:00
Vicent Llopis	771c86ba4b	fix: shelving log	2022-07-20 12:40:30 +02:00
Vicent Llopis	b4408dc080	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4270-route.create	2022-07-19 14:42:43 +02:00
Vicent Llopis	318b688b67	fix: typo errors	2022-07-19 14:40:41 +02:00
Vicent Llopis	28deb34047	refactor: update translation	2022-07-19 14:40:23 +02:00
Vicent Llopis	7434532636	feat: add translate	2022-07-19 13:38:06 +02:00
Vicent Llopis	c56ac1c192	feat: add log	2022-07-19 13:35:17 +02:00
Carlos Jimenez Ruiz	7437da92a5	Merge branch 'dev' into 4294-zone_getEventsFiltered	2022-07-15 12:43:50 +00:00
Carlos Jimenez Ruiz	bbfab8d0bd	Merge branch 'dev' into 4270-route.create	2022-07-15 12:22:15 +00:00
Carlos Jimenez Ruiz	c883f45653	Merge branch 'dev' into 4221-intrastat	2022-07-15 12:18:33 +00:00
Carlos Jimenez Ruiz	333828c583	Moved invoiceOut, Ticket and Sales refund loginc to backend + tests	2022-07-14 13:40:50 +02:00
Vicent Llopis	ac344d6edd	refactor: add column id PK and updated column code UQ	2022-07-14 09:54:28 +02:00
Vicent Llopis	762ec3045f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3069-client.shelving	2022-07-14 09:11:43 +02:00
Vicent Llopis	fdf6e04233	change travel.agencyFk by agencyModeFk	2022-07-13 14:36:03 +02:00
Vicent Llopis	dd46a974cc	fix: backTest	2022-07-12 11:57:01 +02:00
Vicent Llopis	7bf9a8c100	delete itemType.warehouseFk	2022-07-12 11:52:47 +02:00
Vicent Llopis	6f3d4792d5	update backTest	2022-07-12 10:03:58 +02:00
Vicent Llopis	eaa7658b23	delete it.warehouseFk	2022-07-12 10:03:50 +02:00
Vicent Llopis	25dab78ca2	Merge branch 'dev' into 4270-route.create	2022-07-12 06:20:07 +00:00
Alex Moreno	051a849a21	fix(zone): fix getEventsFiltered	2022-07-12 08:10:29 +02:00
Vicent Llopis	2d57b3bd54	Merge branch 'dev' into 4221-intrastat	2022-07-12 06:10:20 +00:00
Vicent Llopis	1eb6ee69cc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday	2022-07-12 08:09:02 +02:00
Vicent Llopis	e4b04fadbc	fix: set editMode = 'include' by default	2022-07-12 08:00:17 +02:00
Vicent Llopis	2b5550bc6e	feat: add testFront	2022-07-12 07:57:28 +02:00
Carlos Jimenez Ruiz	136dcee214	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4265-refunds	2022-07-11 16:39:57 +02:00
Carlos Jimenez Ruiz	44c29aa489	updated file as per convention	2022-07-11 11:25:31 +02:00
Alex Moreno	b3d001bb9d	fix(timeEntry): fix back test	2022-07-11 08:17:32 +02:00
Vicent Llopis	4b65b531fd	feat: add backTest	2022-07-08 10:09:03 +02:00
Vicent Llopis	eb586643ca	refactor: change name of endpoint	2022-07-08 09:47:11 +02:00
Vicent Llopis	94872f8493	fix: show geos checked onSearch	2022-07-07 13:37:36 +02:00
Vicent Llopis	6f7a4fc5ff	refactor title of test	2022-07-05 12:08:16 +02:00
Vicent Llopis	979ee1d956	feat: add backTest	2022-07-05 10:19:22 +02:00
Vicent Llopis	51bd18ac37	feat: update commissionWorkCenterFk when create a route	2022-07-05 10:19:06 +02:00
Joan Sanchez	fc87039571	Merge pull request '4213-item.summary' (#1011) from 4213-item.summary into dev ... Reviewed-on: #1011	2022-07-01 09:25:07 +00:00
Carlos Jimenez Ruiz	d0e06a46d0	removed deprecated stowaway comp and usages	2022-07-01 09:15:07 +02:00
Joan Sanchez	d810b3712b	Merge pull request 'added max width to email of 400px + title to overflowing content' (#1017) from 4268-client_list_scroll into dev ... Reviewed-on: #1017 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-06-30 12:22:41 +00:00
Alex Moreno	ca767b84f0	fix(entry): change isInventory to isExcludedFromAvailable	2022-06-30 13:21:07 +02:00
Joan Sanchez	ae79163048	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-30 13:17:04 +02:00
Joan Sanchez	140af7e808	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-06-30 13:14:08 +02:00
Joan Sanchez	ad021265c7	Deprecated field taxTypeFk	2022-06-30 11:42:37 +02:00
Carlos Jimenez Ruiz	dab8c60f77	Merge branch 'dev' into 4268-client_list_scroll	2022-06-30 08:13:59 +00:00
Carlos Jimenez Ruiz	14350358d6	added max width to email of 400px + title to overflowing content	2022-06-29 15:21:30 +02:00
Vicent Llopis	748dc1b37e	fix: delete engine memory to pass backTest	2022-06-29 14:36:17 +02:00
Vicent Llopis	24159cd3e8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4213-item.summary	2022-06-29 14:28:54 +02:00
Vicent Llopis	d49a2666f1	refactor: don´t show 'description' if it is empty	2022-06-29 14:28:23 +02:00
Vicent Llopis	459a1fe518	feat: update instrastat.sql	2022-06-29 14:15:22 +02:00
Carlos Jimenez Ruiz	57a2cd46ce	ticket filter pending uses isNotValidated now	2022-06-29 12:55:11 +02:00
Alex Moreno	22fd0e91b0	title translations, and getWorkedHours test	2022-06-28 12:10:37 +02:00
Alex Moreno	a3f1c36226	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests	2022-06-28 11:12:06 +02:00
Carlos Jimenez Ruiz	bdf4ecdf50	Merge branch 'dev' into 4223-claim_observations	2022-06-28 07:03:44 +00:00
Javi Gallego	4c5c51a319	claim basic-data minor bug	2022-06-27 18:20:26 +02:00
Alex Moreno	8e2ed4e182	fix(worker_getWorkedHours): fix fixtures and test	2022-06-27 15:09:43 +02:00
Alex Moreno	7980a941a9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests	2022-06-27 14:03:24 +02:00
Alex Moreno	a98a927663	fix back test and e2e that now fail	2022-06-27 11:17:45 +02:00
Carlos Jimenez Ruiz	6370471bd5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4223-claim_observations	2022-06-27 11:01:42 +02:00
Vicent Llopis	fcf79a507c	Merge branch 'dev' into 4213-item.summary	2022-06-27 05:32:21 +00:00
Alex Moreno	4155b45785	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4217-worker_time-control_tests	2022-06-27 07:22:43 +02:00
Carlos Jimenez Ruiz	d183ccb843	feat(claim.notes): added the observations setction to claim plus refactors	2022-06-25 15:22:47 +02:00
Vicent Llopis	3e43bf2024	feat(route.index): can edit fields	2022-06-23 14:14:13 +02:00
Alex Moreno	4d4e09fb9f	test(worker_time-control): new backTest and e2e using workerTimeControl_clockIn	2022-06-23 14:07:53 +02:00
Carlos Jimenez Ruiz	3c963b5ab2	refactor(routes json): fixed indentation	2022-06-22 16:42:59 +02:00
Vicent Llopis	2c721867fc	feat(item.summary): add description	2022-06-22 14:30:25 +02:00
Joan Sanchez	2381a5d09a	Updated e2e tests	2022-06-22 12:40:11 +02:00
Joan Sanchez	2a758fd12a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4045-incoterms_authorization	2022-06-22 11:38:01 +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
Joan Sanchez	004f1390fc	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-06-22 08:58:51 +02:00
Joan Sanchez	e7bf88c703	Fix order	2022-06-21 14:26:34 +02:00
Alex Moreno	20f886e933	change email and text info in email field	2022-06-21 13:58:47 +02:00
Alex Moreno	17fd50ee33	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4088-client_web-access_email	2022-06-21 13:40:24 +02:00
Joan Sanchez	9751514b10	Merge branch 'dev' into 4138-ticket_create_address_isActive	2022-06-21 11:15:33 +00:00
Joan Sanchez	e5b1bfeec2	Merge branch 'dev' into 4231-worker.calendar_payedHolidays	2022-06-21 10:59:46 +00:00
Vicent Llopis	ec852b898c	fix: check if services exists	2022-06-21 12:44:19 +02:00
Joan Sanchez	16d677528a	FIX: Sort by id as last field	2022-06-21 12:18:33 +02:00
Alex Moreno	8d9d64b49d	feat(client_web-access): add email field	2022-06-20 07:31:10 +02:00
Carlos Jimenez Ruiz	7c580da6b8	refactor(ticket.create): display only active addresses	2022-06-17 16:42:59 +02:00
Carlos Jimenez Ruiz	ba0975fe0e	Merge branch 'dev' into 4081-ticket.setDeleted	2022-06-17 10:48:18 +00:00
Carlos Jimenez Ruiz	c22e36ff1e	Merge branch 'dev' into 4081-ticket.setDeleted	2022-06-17 10:45:13 +00:00
Vicent Llopis	6611fcb40e	fix: show correct payedHolidays	2022-06-17 12:34:33 +02:00
Joan Sanchez	9250cc78ff	Merge branch 'dev' into 4197-entry.lastetBuysFilter	2022-06-17 10:34:00 +00:00
Vicent Llopis	44e95a00c3	refactor: delete duplicated code	2022-06-17 08:54:40 +02:00
Vicent Llopis	1bd4b02a62	refactor: code	2022-06-17 08:18:23 +02:00
Carlos Jimenez Ruiz	1e504b6b9f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2808-e2e_account_descriptor	2022-06-16 16:46:33 +02:00
Carlos Jimenez Ruiz	e151e35f7e	replaced isActive by active as per it's model and updated original data in controller	2022-06-16 16:25:21 +02:00
Carlos Jimenez Ruiz	aa6ec3f770	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4185-secure_client_pass_changes	2022-06-16 12:01:05 +02:00
Carlos Jimenez Ruiz	0f44f072ee	refactor(client): added updateUser and setPassword methods to client module	2022-06-16 11:32:42 +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	f41b9b0b57	refator: delete console.log	2022-06-15 14:25:31 +02:00
Vicent Llopis	f3cca1c930	fix: warehouse changed from 'silla' to 'algemesi'	2022-06-15 14:24:35 +02:00
Vicent Llopis	980ac50ba9	feat: add frontTets	2022-06-15 14:03:58 +02:00
Vicent Llopis	f69fb45b90	feat: it only sets the highest priority, in case that ticket doesn't already have the highest priority.	2022-06-15 12:53:13 +02:00
Vicent Llopis	cc23913c9e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route	2022-06-15 09:40:02 +02:00
Alex Moreno	8474fb5692	Merge branch 'dev' into 3498-staticDate	2022-06-15 07:15:34 +00:00
Vicent Llopis	e61784b6ba	refactor: undo chages about drag&drop	2022-06-14 13:52:32 +02:00
Vicent Llopis	52e78db9ee	feat: group by address in buscaman, delete priority by checked, show notes of tickets	2022-06-14 12:36:08 +02:00
Vicent Llopis	189e8dbab3	feat: order by column enabled	2022-06-14 12:34:32 +02:00
Vicent Llopis	931c4fb259	refactor: translate	2022-06-14 08:03:46 +02:00
Vicent Llopis	c26b09ead3	refactor: create endpoint	2022-06-13 14:33:22 +02:00
Vicent Llopis	dd65f4a468	refator: rewrite conditionals	2022-06-13 13:17:56 +02:00
Vicent Llopis	8d4c735744	refactor: delete duplicated code	2022-06-13 12:26:40 +02:00
Vicent Llopis	363c5f349a	fix: solved bug to create temporary table	2022-06-13 10:04:12 +02:00
Alex Moreno	5e586bf1d0	test(client_defaulter): getBalanceDueTotal tested	2022-06-13 07:44:21 +02:00
Joan Sanchez	9ab8b84290	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4045-incoterms_authorization	2022-06-10 13:16:27 +02:00
Carlos Jimenez Ruiz	096f225656	Merge branch 'dev' into 4024-client_defaulter	2022-06-10 07:21:54 +00:00
Vicent Llopis	06f181e913	feat: add frontTest for calendar	2022-06-10 08:29:10 +02:00
Vicent Llopis	f6ab9d8a31	feat: updated backTest	2022-06-10 08:15:54 +02:00
Alex Moreno	de0f7c98fa	Merge branch 'dev' into 3653-clientInsurance	2022-06-10 05:32:58 +00:00
Alex Moreno	f74c7a6999	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4024-client_defaulter	2022-06-09 15:13:04 +02:00
Vicent Llopis	a9badfc1ba	feat: add backTest	2022-06-09 14:59:17 +02:00
Alex Moreno	f786cdd33d	fix pass dates	2022-06-09 14:39:51 +02:00
Vicent Llopis	afd95872c8	feat: drag and drop	2022-06-09 13:48:57 +02:00
Alex Moreno	eb9bd66ddb	prepare for static dates	2022-06-09 13:33:01 +02:00
Carlos Jimenez Ruiz	92088c00f7	Merge branch 'dev' into 4163-supplier.account	2022-06-09 09:04:14 +00:00
Carlos Jimenez Ruiz	ad8eace5cb	Merge branch 'dev' into 3817-updatePortfolio	2022-06-09 07:52:52 +00:00
Vicent Llopis	fb7f26216c	feat: update combo "Banck entity"	2022-06-09 08:43:33 +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
Alex Moreno	61cc3c19f3	refactor(client): creditInsuarnce change creditClassification for creditClassificationFk	2022-06-09 07:13:54 +02:00
Vicent Llopis	409e935cc7	feat: add fields	2022-06-08 15:17:45 +02:00
Vicent Llopis	aa99424476	deleted unnecessary 'await'	2022-06-08 12:50:32 +02:00
Joan Sanchez	c92f444776	Ammends	2022-06-07 14:59:18 +02:00
Carlos Jimenez Ruiz	27e8c99604	Merge branch 'dev' into 4067-client_detail	2022-06-07 12:50:37 +00:00
Carlos Jimenez Ruiz	6ebcf4bc02	Merge branch 'dev' into 3817-updatePortfolio	2022-06-07 12:35:31 +00:00
Joan Sanchez	58a1eea642	Merge branch 'dev' into 4111-claim.summary	2022-06-07 12:27:12 +00:00
Vicent Llopis	eba6c149ba	refactor	2022-06-07 13:26:55 +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
Vicent Llopis	5e01ea58e3	fix: backTest	2022-06-02 13:41:51 +02:00
Vicent Llopis	e9c98a98e7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday	2022-06-02 13:38:27 +02:00
Vicent Llopis	3da9a775bd	feat: add frontTest	2022-06-02 13:36:57 +02:00
Vicent Llopis	8dcd430178	fix: events frontTest	2022-06-02 13:11:26 +02:00
Vicent Llopis	f7be419bbe	refator: updated fixtures	2022-06-02 11:52:53 +02:00
Vicent Llopis	b5fa360960	feat: edit excluded selecetion with specificLocations	2022-06-02 10:40:02 +02:00
Juan Ferrer	ea0a43d0fb	Merge branch 'dev' into 4108-mdb_backend	2022-06-02 06:45:50 +00:00
Joan Sanchez	b6d0d9f210	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-01 14:26:20 +02:00
Joan Sanchez	fab4705618	Rollback	2022-06-01 14:01:19 +02:00
Vicent Llopis	1235affe2d	fix: show correct css	2022-06-01 13:47:46 +02:00
Joan Sanchez	4ecffc2448	Merge branch 'dev' into 4067-client_detail	2022-06-01 11:45:02 +00:00
Joan Sanchez	a4a9ea45b7	Removed front unit test	2022-06-01 13:44:07 +02:00
Joan Sanchez	571e2f03d3	Removed focus	2022-06-01 13:07:47 +02:00
Joan Sanchez	0faabeb145	Added back unit tests	2022-06-01 13:07:28 +02:00
Joan Sanchez	0bc48dc27b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-06-01 09:39:53 +02:00
Joan Sanchez	4ac26895ba	fix(regularizeClaim): refound with negative quantity ... Refs: #4148	2022-06-01 09:36:47 +02:00
Alex Moreno	8340041b33	throw userError and maxFileSize	2022-06-01 07:57:32 +02:00
Joan Sanchez	c369453bfc	Added model fields	2022-05-31 13:36:27 +02:00
Vicent Llopis	0c996f7915	fix: excluded backTest fixed	2022-05-31 12:23:56 +02:00
Vicent Llopis	c7471fdac4	refator: variable names changed	2022-05-31 12:21:04 +02:00
Alex Moreno	7c7c64415d	fix(monitor_ticket): add isTooLittle problem	2022-05-31 12:00:15 +02:00
Alex Moreno	cac4e74793	refactor	2022-05-31 09:06:15 +02:00
Joan Sanchez	a5e833af2c	feat(client): detail section with smart-table	2022-05-31 07:56:17 +02:00
Vicent Llopis	da1e188983	fix: put requests	2022-05-27 13:54:35 +02:00
Alex Moreno	1e2f827233	fix	2022-05-27 13:39:33 +02:00
Alex Moreno	863977915e	fix	2022-05-27 13:27:05 +02:00
Alex Moreno	2b10abbe24	typo	2022-05-27 10:08:40 +02:00
Alex Moreno	ff264ab930	hotFix(client): fiscal-data edit by salesAssistant	2022-05-27 09:45:08 +02:00
Alex Moreno	aa7074f303	test(mdb): back test	2022-05-27 08:23:52 +02:00
Joan Sanchez	a5f3580b17	derp	2022-05-26 16:14:10 +02:00
Vicent Llopis	6359c9e5bf	feat: add fixtures	2022-05-26 15:08:23 +02:00
Vicent Llopis	456f167513	feat: fix editExclusion mode	2022-05-26 11:09:03 +02:00
Vicent Llopis	bbdaa7de39	feat: add editExclusion mode	2022-05-26 08:33:45 +02:00
Alex Moreno	79c42d04f9	feat(mdb): start section	2022-05-25 14:59:28 +02:00
Vicent Llopis	a907354cc3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday	2022-05-25 09:03:52 +02:00
Vicent Llopis	4baf1afb83	fix: show videos in claim.summary	2022-05-25 07:51:47 +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
Vicent Llopis	5880efe966	refator: commented code deleted	2022-05-24 12:51:00 +02:00
Vicent Llopis	f00fb0dc3f	feat: add new module shelving	2022-05-24 12:50:22 +02:00
Vicent Llopis	99c7ad1c1b	refactor: delete section shelving from client	2022-05-24 12:50:06 +02:00
Joan Sanchez	caa9a63c4c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix	2022-05-24 08:45:37 +02:00
Carlos Jimenez Ruiz	c721d9ae82	Merge branch 'dev' into 4022-client.balance.create	2022-05-23 12:43:00 +00:00
Carlos Jimenez Ruiz	a76dd11825	Merge branch 'dev' into 3870-models	2022-05-23 12:33:08 +00:00
Vicent Llopis	db7638f153	refactor: sectorFk property deleted	2022-05-23 12:45:20 +02:00
Vicent Llopis	9bbdeb2840	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType	2022-05-23 12:41:01 +02:00
Vicent Llopis	1b3f0ee026	refactor: added itemPackingType and temperature relations	2022-05-23 12:40:11 +02:00
Vicent Llopis	9736a68dd9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4022-client.balance.create	2022-05-20 13:16:58 +02:00
Vicent Llopis	875e9503c3	refactor: request changes	2022-05-20 13:16:47 +02:00
Vicent Llopis	a043c5d346	refactor: request changes	2022-05-20 13:10:48 +02:00
Carlos Jimenez Ruiz	d86ac41b70	Merge branch 'dev' into 3905-invoice-out_refund	2022-05-20 10:54:08 +00:00
Vicent Llopis	f4b080243c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3870-models	2022-05-20 12:53:23 +02:00
Vicent Llopis	fd80fc58fc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType	2022-05-20 12:33:23 +02:00
Vicent Llopis	3c9800a7a3	refactor: pull request changes	2022-05-20 12:33:12 +02:00
Joan Sanchez	4d093d37bd	Merge branch 'dev' into 3905-invoice-out_refund	2022-05-20 10:22:48 +00:00
Carlos Jimenez Ruiz	b3c0aa7933	Merge branch 'dev' into 4082-zone.basic-data	2022-05-20 10:19:00 +00:00