5243 Commits

Author	SHA1	Message	Date
Alex Moreno	9ef835a077	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf	2022-10-19 15:10:22 +02:00
Joan Sanchez	7d502c6f57	Merge pull request 'Send delivery note to refund tickets' (!1086) from 3505-closure_refund into dev ... Reviewed-on: #1086	2022-10-19 13:00:18 +00:00
Alex Moreno	192e61a70d	hotFix(route_index): fix driverRoutePdf	2022-10-19 14:54:13 +02:00
Alex Moreno	ca138cc2be	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf	2022-10-19 08:23:19 +02:00
Pau	dc1b1bc1c3	Merge branch 'dev' into 4563-Worker-Description-workerDisableExcluded-checkbox	2022-10-19 05:35:06 +00:00
Alex Moreno	c9073641aa	feat(invoiceInPdf): content	2022-10-18 14:58:38 +02:00
Pau	9fa81fe9eb	Merge branch '2612-create-supplier' of https://gitea.verdnatura.es/verdnatura/salix into 2612-create-supplier	2022-10-18 14:22:56 +02:00
Pau	c2fd1fa44d	fixed tests	2022-10-18 14:22:54 +02:00
Pau	73a69051a8	Merge branch 'dev' into 2612-create-supplier	2022-10-18 12:01:04 +00:00
Vicent Llopis	9ea427dbfe	refactor: move front to back funcionality	2022-10-18 13:45:46 +02:00
Pau	db12ceb369	removed async from the redirect function	2022-10-18 13:07:10 +02:00
Pau	470b4485d5	Fixed test and DB structure	2022-10-18 12:58:44 +02:00
Vicent Llopis	ae3e3c3c49	fix: id model duplicated	2022-10-18 12:37:06 +02:00
Pau	a204c6e2b0	Fixed the suppliers not appearing	2022-10-18 12:29:04 +02:00
Vicent Llopis	5fce93abd5	refactor: change variables name	2022-10-18 11:47:37 +02:00
Vicent Llopis	423454d19e	feat: add date-picker	2022-10-18 11:47:22 +02:00
Pau	f481cc3c97	Capitalizar	2022-10-18 10:38:40 +02:00
Pau	89bbf35a87	Merge branch 'dev' into 4563-Worker-Description-workerDisableExcluded-checkbox	2022-10-18 08:30:32 +00:00
Pau	1d8fb25325	Refactored according to the suggested changes	2022-10-18 10:25:54 +02:00
Pau	047076f189	changed tests	2022-10-18 07:14:40 +02:00
Alex Moreno	eb58839839	feat(invoiceIn): invoiceInPdf	2022-10-17 15:13:27 +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
Pau	9290cd6fb6	Finished back tests	2022-10-17 14:02:18 +02:00
Vicent Llopis	f85c2e9700	refactor: delete code repeated	2022-10-17 14:01:21 +02:00
Pau	70c9c3d788	initial back test created, modified DB statetments	2022-10-17 12:07:34 +02:00
Alex Moreno	57b2ae770d	fix(e2e)	2022-10-17 11:44:29 +02:00
Alex Moreno	79b970286c	refactor(claim_claimPickupEmail): use text template and external form	2022-10-17 11:22:27 +02:00
Pau	cf50c4690a	Merge branch 'dev' into 4153-supplier.fiscal-data	2022-10-17 08:41:39 +00:00
Pau	a4243e14c5	Created Back test for newSupplier	2022-10-17 10:17:56 +02:00
Joan Sanchez	cfdcf91be2	Merge branch 'dev' into 3505-closure_refund	2022-10-17 08:15:16 +00:00
Pau	dc53aac163	Merge branch 'dev' into 2612-create-supplier	2022-10-17 07:32:50 +00:00
Pau	f0b1591b14	Remove debugging elements	2022-10-17 09:22:50 +02:00
Pau	0cdee89ac3	Button removed when user does not have permissions	2022-10-17 09:20:45 +02: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
Pau	1603619d81	removed debugging elements	2022-10-17 07:38:54 +02:00
Pau	594cee12f3	add checks to the existence of object variables	2022-10-17 07:35:02 +02:00
Alex Moreno	2b060a1437	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-10-17 07:32:32 +02:00
Pau	dc6c8f924d	feat: Create new Supplier	2022-10-17 07:25:25 +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	40075e7e21	fix: testFront	2022-10-14 14:38:47 +02:00
Vicent Llopis	86b7e9cabe	fix: only can exists 'mana' or 'manaClaim' discount. Never both	2022-10-14 14:30:37 +02:00
Vicent Llopis	2455a11c26	feat: changeMultipleDiscount uses the same popover than changeDiscount	2022-10-14 14:29:21 +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
Alex Moreno	74383b61e7	hotFix(monitor): use left join in ticketState	2022-10-13 09:22:53 +02:00
Pau	012cd68c89	Added menu to create a new supplier, not working	2022-10-11 11:43:01 +02:00
Vicent Llopis	bfefec397e	feat: add testFront	2022-10-11 09:13:29 +02:00
Vicent Llopis	1a38fc307f	delete: duplicated keybinding	2022-10-11 08:42:59 +02:00
Vicent Llopis	9c52508a88	feat: add total labels	2022-10-11 08:40:22 +02:00
Vicent Llopis	7b7e01f49e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving	2022-10-11 07:09:20 +02:00
Vicent Llopis	dbfc3d335d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-10-11 07:06:45 +02:00
Joan Sanchez	e3606c7273	Updated unit test	2022-10-10 14:46:06 +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
Vicent Llopis	843f67919c	feat: add backTest	2022-10-10 12:56:03 +02:00
Joan Sanchez	7f023d7456	Set user default warehouse	2022-10-10 12:23:40 +02:00
Joan Sanchez	990a1b3c67	250 nodes	2022-10-10 10:33:08 +02:00
Joan Sanchez	31d1b84bb9	Unfold when there's less than 100 nodes to show	2022-10-10 10:25:59 +02:00
Alex Moreno	e497ddd664	fix: add td-editable	2022-10-10 09:21:14 +02:00
Alex Moreno	18cd34bccb	fix(travel_extraCommunity): css	2022-10-10 08:57:41 +02:00
Joan Sanchez	4ecbb59ac0	Closure hours	2022-10-10 07:49:08 +02:00
Alex Moreno	9befa2531b	Merge branch 'hotFix_travel_extraCommunity-css' of https://gitea.verdnatura.es/verdnatura/salix into hotFix_travel_extraCommunity-css	2022-10-10 07:29:26 +02:00
Joan Sanchez	934c0d0169	Updated unit test	2022-10-10 07:28:10 +02:00
Alex Moreno	49e82156cf	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotFix_travel_extraCommunity-css	2022-10-10 07:10:25 +02:00
Joan Sanchez	3dee50a796	Updated method accessType	2022-10-09 20:14:14 +02:00
Alex Moreno	00d5876f88	hotFix(travel_extraCommunity): fix css	2022-10-07 14:35:16 +02:00
Vicent Llopis	bb26fa6502	feat: add tFront	2022-10-07 13:49:42 +02:00
Joan Sanchez	587da840c0	Fix	2022-10-07 12:16:30 +02:00
Joan Sanchez	6c5acc75eb	Consumption fix	2022-10-07 12:00:06 +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
Vicent Llopis	1894492a2c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-10-07 09:26:51 +02:00
Joan Sanchez	8ccb47d741	Merge pull request '4073-feat(user): add section privileges and remove changeRole in descriptor' (#1073) from 4073-user_privileges into dev ... Reviewed-on: #1073 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-06 11:54:16 +00: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
Pau	3376293d1a	Added user icon and fixed icon not updating	2022-10-06 11:54:14 +02: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
Vicent Llopis	37601934f5	feat: first option to delete and update	2022-10-06 11:40:46 +02:00
Joan Sanchez	8f3e09b88f	Merge branch 'dev' into 4033-route	2022-10-06 08:23:19 +00:00
Vicent Llopis	a3a432c753	fix: delete one or more expeditions	2022-10-06 10:18:19 +02:00
Pau	1165e050eb	feat: workerDisableExcluded update DB field	2022-10-06 10:18:08 +02:00
Vicent Llopis	26d04ce2d2	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition	2022-10-06 10:08:29 +02:00
Vicent Llopis	ddbe1057ad	feat: add new section	2022-10-06 09:47:53 +02:00
Vicent Llopis	434db10ac9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving	2022-10-06 07:22:16 +02:00
Joan Sanchez	fd219f853f	Merge branch 'dev' into 4581-client.web-access	2022-10-05 14:26:03 +00:00
Joan Sanchez	b134aeb0ea	Mock report pdf	2022-10-05 16:19:07 +02:00
Vicent Llopis	2f17257e46	feat: add new sub section itemShelving	2022-10-05 15:13:48 +02:00
Joan Sanchez	3d36c0339a	Merge branch 'dev' into 4592-jenkins_tests	2022-10-05 12:05:10 +00:00
Vicent Llopis	761563edc5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route	2022-10-05 13:38:17 +02:00
Vicent Llopis	26d655075e	fix: bad pull	2022-10-05 13:28:08 +02:00
Joan Sanchez	726b2d5eb2	Exit on completion	2022-10-05 13:26:18 +02:00
Vicent Llopis	aa51fa1722	feat: check the client to edit is in vn.client and not in account.account	2022-10-05 12:36:36 +02:00
Pau	600dd7a434	Created the model and UI	2022-10-05 11:52:14 +02:00
Joan Sanchez	377a0f7228	Attachments refactor	2022-10-04 13:41:37 +02:00
Joan Sanchez	eadff3fff9	Updated back unit tests	2022-10-04 09:46:44 +02:00
Joan Sanchez	1598b6c703	Back unit tests	2022-10-04 09:39:42 +02:00
Joan Sanchez	3dbd304217	Updated unit tests	2022-10-04 09:21:24 +02:00
Vicent Llopis	68e4f3a8bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4033-route	2022-10-04 09:10:15 +02:00
Vicent Llopis	6e9909400b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4369-ticket.request.create_getItemTypeWorker	2022-10-04 08:19:38 +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	000655fe1a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4570-tickets_translation	2022-10-04 07:51:24 +02:00
Vicent Llopis	197bbf392b	refator: updates translations	2022-10-04 07:50:37 +02:00
Joan Sanchez	c8bad23621	Tests	2022-10-04 07:41:40 +02:00
Vicent Llopis	11484edd10	feat: create new ticket	2022-10-03 15:18:07 +02:00
Alex Moreno	cca2878716	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4073-user_privileges	2022-10-03 15:16:33 +02:00
Alex Moreno	7a690dd880	feat(user): add section privileges and remove changeRole in descriptor ... test(user):back and e2e	2022-10-03 15:11:29 +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	c177c0366d	Item PDF	2022-10-03 13:35:49 +02:00
Joan Sanchez	e4b61f81a9	Merge pull request '#4226-remove-density' (#1066) from #4226-remove-density into dev ... Reviewed-on: #1066 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-03 07:41:58 +00:00
Pau	5ca39c9dd3	Modified TextField to have a insertable option	2022-10-03 08:48:04 +02:00
Joan Sanchez	21bb95fc88	CSV refactor	2022-10-03 08:28:47 +02:00
Javi Gallego	eb48685484	selectores reparados	2022-09-30 14:55:31 +02:00
Joan Sanchez	7fd4728c33	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-09-30 14:13:16 +02:00
Joan Sanchez	4005d6f82a	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-09-30 13:55:53 +02:00
Joan Sanchez	3b0f1efbf4	ACL's	2022-09-30 13:54:20 +02:00
Alex Moreno	eec1d6df4a	add translation	2022-09-30 09:06:43 +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	ccec38ef97	Renamed table	2022-09-29 14:49:08 +02:00
Joan Sanchez	3601881026	Client consumption queue	2022-09-29 14:43:27 +02:00
Joan Sanchez	7a7ad6ac5f	InvoiceOut_sendQueued	2022-09-29 13:09:44 +02:00
Joan Sanchez	4172229051	Closure hotfix	2022-09-29 09:35:57 +02:00
Joan Sanchez	5aec280adb	Closure migration	2022-09-29 09:07:18 +02:00
Pau	7ac7189a8a	added maxlength binding, finished logic on insert	2022-09-29 08:08:49 +02:00
Joan Sanchez	fe5eb3e13d	Changes	2022-09-29 07:35:20 +02:00
Alex Moreno	203b223cc6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-09-28 12:24:40 +02:00
Joan Sanchez	ae2bc91cb5	Merge pull request '4505-clonar-foto-weightByPiece' (#1067) from 4505-clonar-foto-weightByPiece into dev ... Reviewed-on: #1067 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-28 06:38:46 +00:00
Joan Sanchez	93f5bf089d	Merge pull request '4291-fix(vnInputTime): quit new date(null)' (#1031) from 4291-vnInputTime into dev ... Reviewed-on: #1031 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-09-28 06:10:55 +00:00
Joan Sanchez	d7ab95fcc8	closure	2022-09-27 15:00:12 +02:00
Joan Sanchez	660842ca31	Osticket & waste refactor	2022-09-27 14:20:57 +02:00
Pau	901007d34b	change test case to expect the image to be defined	2022-09-27 13:58:27 +02:00
Pau	2dd6de1d47	Modified Fixtures, clone.js and the item model	2022-09-27 13:46:23 +02:00
Pau	d30065f90a	Add vn-input-account tag and logic	2022-09-27 12:12:25 +02:00
Javi Gallego	a662bb90a2	Merge branch 'dev' into #4226-remove-density	2022-09-27 09:32:48 +02:00
Joan Sanchez	410e651edd	Buyer waste	2022-09-27 07:24:45 +02:00
Alex Moreno	2c691eb796	feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList	2022-09-26 14:49:11 +02:00
Joan Sanchez	7f78286d6b	Reports refactor	2022-09-26 13:33:27 +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
Pau	26a16bf846	ACL para sector,añadido sector al model-config	2022-09-23 13:53:33 +02:00
Pau	620162aec7	Añadido el modelo de sector a shelving	2022-09-23 12:24:11 +02:00
Vicent Llopis	c4649352a9	feat: add totalChecked	2022-09-23 08:50:11 +02:00
Joan Sanchez	664fd444cc	Sample refactor	2022-09-22 15:44:35 +02:00
Vicent Llopis	2a64fde57c	feat: add option "move expedition"	2022-09-22 14:58:38 +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	68f3544477	Claim pickup order	2022-09-22 09:17:14 +02:00