8093-devToTest_2442_3 #831

Merged

alexm merged 335 commits from 8093-devToTest_2442_3 into test 2024-10-15 07:22:05 +00:00

Conversation 0 Commits 335 Files Changed 129 +5225 -2264

335 Commits

Author	SHA1	Message	Date
Alex Moreno	3bb5f66ce7	fix(claimNotes): refs #8093 $props.selectType && !newNote.observationTypeFk	2024-10-15 08:43:58 +02:00
Alex Moreno	d87e8ec4ae	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-15 08:01:22 +02:00
Jorge Penadés	523423cce6	Merge pull request '#7874 add observation type' (!765) from 7874-addObservationType into dev ... Reviewed-on: #765 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-14 14:16:44 +00:00
Jorge Penadés	245c027357	chore: refs #7874 refactor imports	2024-10-14 15:43:59 +02:00
Jorge Penadés	0fb9b22935	chore: refs #7874 refactor code	2024-10-14 14:09:52 +02:00
Jorge Penadés	4ff3c18f33	feat: refs #7874 use badge type	2024-10-14 13:00:15 +02:00
Jorge Penadés	6f2187cb68	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType	2024-10-14 12:18:37 +02:00
Jorge Penadés	12392444b9	Merge pull request '#8019 make responsive inputs' (!812) from 8019-makeResponsiveInputs into dev ... Reviewed-on: #812 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-14 08:50:20 +00:00
Jorge Penadés	fdbae5c0b5	Merge branch 'dev' into 8019-makeResponsiveInputs	2024-10-14 08:48:50 +00:00
Javier Segarra	adbb745f0f	Merge pull request 'Fix own test' (!816) from fix_test_jsegarra into dev ... Reviewed-on: #816 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-14 07:24:16 +00:00
Javier Segarra	914f6022be	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_test_jsegarra	2024-10-14 09:23:31 +02:00
Alex Moreno	55b9fb1a87	Merge pull request 'fix: MyEntry e2e test' (!823) from Fix-EntryTest into dev ... Reviewed-on: #823 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-14 07:10:20 +00:00
Jon Elias	eebac7b36c	fix: fixed e2e test	2024-10-14 08:51:26 +02:00
Jorge Penadés	db5449444a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType	2024-10-14 08:37:44 +02:00
Alex Moreno	64c8d264af	warmFix(TravelList): add daysOnward in travelFilter	2024-10-14 07:43:29 +02:00
Jorge Penadés	50042ed45b	feat: refs #7874 prevent submit if empty fields	2024-10-10 16:49:41 +02:00
Jorge Penadés	6d674f2a2b	Merge branch 'dev' into 7874-addObservationType	2024-10-10 13:41:01 +00:00
Javier Segarra	f72761f36c	Merge pull request '#7404 - Rollback Style to compress spaces' (!820) from revert_css_styles into dev ... Reviewed-on: #820 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-10 12:29:40 +00:00
Javier Segarra	2ff99d3faa	feat: define as global dense value	2024-10-10 13:56:14 +02:00
Javier Segarra	3dfb836f8e	revert: rollback compress spacestyle	2024-10-10 13:56:11 +02:00
Jorge Penadés	5af14b1b52	chore: refs #7874 fix test	2024-10-10 12:12:03 +02:00
Jorge Penadés	44c4c378f9	chore: refs #7874 add default ob type	2024-10-10 11:02:03 +02:00
Jorge Penadés	830decb6db	Merge branch 'dev' into 7874-addObservationType	2024-10-10 08:16:36 +00:00
Jorge Penadés	480f243205	Merge pull request 'feat: refs #7207 show queue' (!748) from 7207-showPbx into dev ... Reviewed-on: #748 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-10 07:20:25 +00:00
Jorge Penadés	00dc2c6edc	Merge branch 'dev' into 7207-showPbx	2024-10-10 07:18:00 +00:00
Javier Segarra	6a79746080	test: fix TicketDescriptor	2024-10-08 13:18:51 +02:00
Javier Segarra	e0f60ed118	test: fix VnLocation	2024-10-08 11:07:05 +00:00
Alex Moreno	b6778aaf17	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-08 12:24:39 +02:00
Jorge Penadés	1723331615	Merge branch 'dev' of https: refs #7207//gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx	2024-10-07 16:35:00 +02:00
Jorge Penadés	e6535a5dd8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8019-makeResponsiveInputs	2024-10-07 16:10:59 +02:00
Jorge Penadés	4344458bb0	feat: refs #8019 fine-tunning vnTime	2024-10-07 16:02:29 +02:00
Jorge Penadés	c815066953	feat: refs #8019 fine-tunning vnDate	2024-10-07 15:55:18 +02:00
Guillermo Bonet	26b4110d22	Merge pull request 'feat: refs #7893 Added waste recalc section' (!809) from 7893-wasteRecalc into dev ... Reviewed-on: #809 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-07 12:59:28 +00:00
Guillermo Bonet	50eed83d05	feat: refs #7893 Requested changes	2024-10-07 13:50:19 +02:00
Jorge Penadés	d1b3e01d87	chore: refs #8019 refactor css scoped	2024-10-07 13:36:27 +02:00
Jorge Penadés	d88fadca55	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8019-makeResponsiveInputs	2024-10-07 11:47:39 +02:00
Guillermo Bonet	a6944561de	Merge branch 'dev' into 7893-wasteRecalc	2024-10-07 11:32:03 +02:00
Guillermo Bonet	c3eaab44ed	Merge branch '7893-wasteRecalc' of https://gitea.verdnatura.es/verdnatura/salix-front into 7893-wasteRecalc	2024-10-07 11:31:18 +02:00
Guillermo Bonet	178fa8cd21	feat: refs #7893 Requested changes	2024-10-07 11:31:16 +02:00
Alex Moreno	b1385cf08a	Merge pull request 'refactor(ticketNotes): translations' (!807) from fix_ticketNotes_translations into dev ... Reviewed-on: #807 Reviewed-by: Jon Elias <jon@verdnatura.es>	2024-10-07 08:09:12 +00:00
Guillermo Bonet	f98739f0ed	Merge branch 'dev' into 7893-wasteRecalc	2024-10-07 08:03:26 +00:00
Guillermo Bonet	4f3e7e2630	feat: refs #7893 Added waste recalc section	2024-10-07 10:03:05 +02:00
Jorge Penadés	5c5a359986	refactor: refs #8019 create VnTime	2024-10-07 09:38:39 +02:00
Jorge Penadés	947f913679	refactor: refs #8019 create VnDate	2024-10-07 09:25:06 +02:00
Alex Moreno	ef5ae0f723	refactor(ticketNotes): translations	2024-10-07 09:16:07 +02:00
Alex Moreno	b8407140f9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-07 09:02:01 +02:00
Alex Moreno	426b7254d6	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-07 09:01:57 +02:00
Jorge Penadés	120f96fedc	Merge pull request '#7323 workerList' (!719) from 7323-fineTunningWorker into dev ... Reviewed-on: #719 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-07 06:41:35 +00:00
Jorge Penadés	355c84ad06	Merge branch 'dev' into 7323-fineTunningWorker	2024-10-07 06:39:07 +00:00
Javier Segarra	a69a4577a3	Merge pull request 'Fix:: order module' (!802) from Fix-OrderCatalog into dev ... Reviewed-on: #802 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-04 17:48:47 +00:00
Pako Natek	355b1357b7	Merge branch 'dev' into Fix-OrderCatalog	2024-10-04 16:08:12 +00:00
Jorge Penadés	9383a71adb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx	2024-10-04 16:38:27 +02:00
Jorge Penadés	055b1b0a88	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType	2024-10-04 16:12:31 +02:00
Jon Elias	aee23c75e8	fix: order module	2024-10-04 14:31:39 +02:00
Pablo Natek	d325459beb	Merge pull request '4988-fixE2e' (!801) from 4988-fixE2e into dev ... Reviewed-on: #801 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-04 12:18:52 +00:00
Jorge Penadés	9c5ce6dbfd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType	2024-10-04 13:50:31 +02:00
Jorge Penadés	905841e0d6	Merge branch 'dev' into 7207-showPbx	2024-10-04 11:45:28 +00:00
Jorge Penadés	9fe3de22ac	Merge branch '7323-fineTunningWorker' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-10-04 13:37:57 +02:00
Jorge Penadés	b735ccb3a0	Merge branch 'dev' of https: refs #7323//gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-10-04 13:37:55 +02:00
Pablo Natek	efe5208d30	Merge branch 'dev' into 4988-fixE2e	2024-10-04 11:32:40 +00:00
Jorge Penadés	9f433afb51	Merge pull request '#7702 - FIX Change password error' (!542) from 7702_fix_setPassword into dev ... Reviewed-on: #542 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-04 11:15:42 +00:00
Pablo Natek	1869e3315a	fix: refs #4988 remove id	2024-10-04 13:14:14 +02:00
Pablo Natek	7dc019cfbb	fix: refs #4988 selector on e2e	2024-10-04 13:13:57 +02:00
Jorge Penadés	ae8e4ba4b9	chore: refs #7702 fix tests	2024-10-04 11:54:40 +02:00
Jorge Penadés	67c2e284ba	feat: refs #7702 ask old pass	2024-10-04 11:45:10 +02:00
Jorge Penadés	e43ba9b58a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword	2024-10-04 10:11:38 +02:00
Jorge Penadés	cebb3b2b16	Merge branch 'dev' into 7323-fineTunningWorker	2024-10-04 07:47:46 +00:00
Pablo Natek	222e83cad8	Merge pull request 'feat: refs #7404 change travel name and remove buyer filter' (!796) from 7404-addSomeLogisticPreferences into dev ... Reviewed-on: #796 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-04 06:59:12 +00:00
Pablo Natek	4ba52f1a56	Merge branch 'dev' into 7404-addSomeLogisticPreferences	2024-10-04 06:55:41 +00:00
Pablo Natek	7d0e3e6fd4	Merge pull request 'fix: refs #7129 translates from globals to module locals' (!794) from 7129--fixTranslates into dev ... Reviewed-on: #794 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-04 06:54:11 +00:00
Pablo Natek	4a357c5be6	Merge branch 'dev' into 7404-addSomeLogisticPreferences	2024-10-04 06:53:53 +00:00
Pablo Natek	99ba7a39fa	Merge branch 'dev' into 7129--fixTranslates	2024-10-04 06:53:17 +00:00
Jorge Penadés	c64fe8c044	chore: refs #7207 refactor locale	2024-10-03 17:04:56 +02:00
Jorge Penadés	b0ba6a5e0f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx	2024-10-03 15:40:05 +02:00
Jorge Penadés	cd20db637c	fix: refs #7874 btn ui	2024-10-03 15:30:26 +02:00
Jorge Penadés	aca10b81af	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType	2024-10-03 15:14:28 +02:00
Pablo Natek	c04dad38f1	feat: refs #7404 change travel name and remove buyer filter	2024-10-03 15:02:14 +02:00
Jorge Penadés	e10088ed06	Merge branch 'dev' of https: refs #7702//gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword	2024-10-03 13:49:33 +02:00
Jorge Penadés	c78e816f0c	Merge pull request 'fix: refs #7524 dynamic fetch' (!767) from 7524-dynamicFetch into dev ... Reviewed-on: #767 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-03 10:06:57 +00:00
Jorge Penadés	fadfafbb1d	Merge branch 'dev' into 7524-dynamicFetch	2024-10-03 10:05:22 +00:00
Pablo Natek	05a1d0e8fb	fix: refs #7129 translates from globals to module locals	2024-10-03 10:52:16 +02:00
Jorge Penadés	01dc25da8c	refactor: refs #7874 create element if condition	2024-10-03 10:23:27 +02:00
Jorge Penadés	a8c48789ca	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType	2024-10-03 10:03:49 +02:00
Jorge Penadés	30e34ea299	Merge branch 'dev' into 7323-fineTunningWorker	2024-10-03 07:59:46 +00:00
Pablo Natek	629524d63f	Merge pull request 'fix: refs #7404 fix style' (!785) from 7404-fixStyle into dev ... Reviewed-on: #785 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-03 07:54:18 +00:00
Jorge Penadés	9b8e388525	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType	2024-10-03 09:49:04 +02:00
Pablo Natek	06fa5b13a4	Merge branch 'dev' into 7404-fixStyle	2024-10-03 07:47:52 +00:00
Jorge Penadés	739671a6da	Merge branch 'dev' into 7524-dynamicFetch	2024-10-03 07:25:40 +00:00
Jorge Penadés	1536cbe205	Merge branch 'dev' into 7323-fineTunningWorker	2024-10-03 07:17:05 +00:00
Javi Gallego	ed5cf137b0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-03 08:29:29 +02:00
Javi Gallego	b08a5e63e9	fix: inheritWarehouse	2024-10-03 08:29:26 +02:00
Pablo Natek	5e59ecdb43	fix: refs #7404 with on stockBought mobile version	2024-10-02 17:14:51 +02:00
Carlos Satorres	f9e3c92e68	Merge pull request 'warmFix-userListFixRole' (!788) from warmFix-userListFixRole into dev ... Reviewed-on: #788 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-02 09:41:57 +00:00
Carlos Satorres	ba3b2198b8	Merge branch 'dev' into warmFix-userListFixRole	2024-10-02 09:31:54 +00:00
Jon Elias	e6dc2f16b8	Merge pull request '#7884 added new filter field' (!720) from 7884-AddLabelerField into dev ... Reviewed-on: #720 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-02 08:46:55 +00:00
Jon Elias	375adfab76	Merge branch 'dev' into 7884-AddLabelerField	2024-10-02 08:46:08 +00:00
Carlos Satorres	e374059f41	Merge pull request 'refs #6899 fix filters, date from to socialName' (!789) from 6899-fixInvoiceOutNegative into dev ... Reviewed-on: #789 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-02 08:45:54 +00:00
Jon Elias	c54189e06a	Merge branch '7884-AddLabelerField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField	2024-10-02 10:43:55 +02:00
Jon Elias	98df741f1b	fix: refs #7884 deleted useless translations	2024-10-02 10:43:54 +02:00
Carlos Satorres	49da7168ab	Merge branch 'dev' into 6899-fixInvoiceOutNegative	2024-10-02 08:41:19 +00:00
Jon Elias	12727e93eb	Merge branch 'dev' into 7884-AddLabelerField	2024-10-02 08:36:11 +00:00
Jon Elias	8fc3b2e86d	Merge branch '7884-AddLabelerField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField	2024-10-02 10:34:51 +02:00
Jon Elias	7db166974f	feat: refs #7884 use VnTable prop for chip label filters and modified translations	2024-10-02 10:34:50 +02:00
Carlos Satorres	c2c4acfc30	refs #6899 fix filters, date from to socialName	2024-10-02 09:42:38 +02:00
Javier Segarra	c987a1151c	Merge pull request 'Improve ZoneLocationTree height' (!786) from fix_height_zoneLocationTree into dev ... Reviewed-on: #786 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-02 07:36:09 +00:00
Jon Elias	03a3d6bd50	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField	2024-10-02 08:47:21 +02:00
Javier Segarra	6b38bdf868	style: improve ZoneLocationTree height	2024-10-01 19:26:03 +00:00
Pablo Natek	c0fd5a1c21	fix: refs #7404 fix style	2024-10-01 16:12:18 +02:00
Javi Gallego	38599be9bd	Merge pull request '6722-showDegrees' (!782) from 6722-showDegrees into dev ... Reviewed-on: #782 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-01 14:05:36 +00:00
Javi Gallego	36457f704d	Merge branch 'dev' into 6722-showDegrees	2024-10-01 14:04:18 +00:00
Javi Gallego	2f5358d439	Merge pull request '#7356 - transfer ticket method' (!784) from 7356_ticket_migration into dev ... Reviewed-on: #784 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-10-01 13:27:38 +00:00
Javier Segarra	2ca99a51ae	fix: refs #7356 transfer ticket method	2024-10-01 15:12:22 +02:00
Jon Elias	209c88884f	Merge branch 'dev' into 7884-AddLabelerField	2024-10-01 13:10:28 +00:00
Carlos Satorres	d69336c82a	refs #7366 make travelFilter, travelList	2024-10-01 14:15:18 +02:00
Javi Gallego	4399a91e99	fix: misSpelling	2024-10-01 13:29:45 +02:00
Javi Gallego	589c672ab2	fix: show degrees	2024-10-01 13:28:49 +02:00
Javier Segarra	ea7c799909	Merge pull request 'Fix: deleted code in sales' (!781) from FixSales into dev ... Reviewed-on: #781 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-01 10:36:30 +00:00
Jon Elias	7b63bb38f2	fix: deleted code	2024-10-01 12:34:39 +02:00
Jon Elias	21edf4b5d9	Merge pull request 'fix: duplicate call' (!775) from Fix-TicketSale into dev ... Reviewed-on: #775 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-10-01 09:54:30 +00:00
Javier Segarra	6e4677848f	Merge branch 'dev' into Fix-TicketSale	2024-10-01 09:53:34 +00:00
Alex Moreno	ddffd5b1c7	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-10-01 11:47:55 +02:00
Alex Moreno	7ae90908c4	Merge pull request 'fix: solve conflicts from test to dev' (!780) from fixConflicts_testToDev into dev ... Reviewed-on: #780 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-01 09:47:05 +00:00
Javier Segarra	696c9ca9b3	fix: solve conflicts with stockBought	2024-10-01 11:40:29 +02:00
Javier Segarra	27b2d0232c	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into fixConflicts_testToDev	2024-10-01 11:35:14 +02:00
Jon Elias	90ce9b2cd3	Merge branch '7884-AddLabelerField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField	2024-10-01 11:32:17 +02:00
Jon Elias	de01dda2ed	refactor: refs #7884 modified icon color	2024-10-01 11:32:15 +02:00
Carlos Satorres	e64e6eefe3	refs #7355 add role	2024-10-01 10:35:31 +02:00
Javier Segarra	8fa82c818d	fix: remove limit	2024-10-01 10:04:56 +02:00
Javier Segarra	30767b110f	Merge branch 'Fix-TicketSale' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketSale	2024-10-01 10:03:42 +02:00
Javier Segarra	d6efd21db6	style: remove space between value and label	2024-10-01 10:03:39 +02:00
Javier Segarra	e9364f69d4	feat: #7679 show tooltips	2024-10-01 10:03:14 +02:00
Javier Segarra	778e6299ce	fix: solve conflicts from test to dev	2024-10-01 08:57:04 +02:00
Jon Elias	86ab9f9540	Merge branch 'Fix-TicketSale' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketSale	2024-10-01 06:52:21 +02:00
Jon Elias	10bada7463	fix: deleted useless button	2024-10-01 06:52:19 +02:00
Javier Segarra	41acf0e1e2	feat: #7679 show country provinces	2024-10-01 00:24:34 +02:00
Javier Segarra	e7a2d3aa85	fix: refs #7354 ZonLocation filter	2024-09-30 20:20:51 +02:00
Jon Elias	3c5a5c3905	Merge branch 'dev' into Fix-TicketSale	2024-09-30 12:36:19 +00:00
Jon Elias	76a77dcee9	fix: duplicate call	2024-09-30 14:35:10 +02:00
Pablo Natek	6014ccebb4	Merge pull request '7404-fixSomeStyleIssues' (!774) from 7404-fixSomeStyleIssues into dev ... Reviewed-on: #774 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-30 12:27:42 +00:00
Pablo Natek	deb608cc96	Merge branch 'dev' into 7404-fixSomeStyleIssues	2024-09-30 12:26:37 +00:00
Javier Segarra	2d9dbbd23d	Merge pull request '#8031 - Enable notify positive when user update self data' (!750) from 8031_notify_dataSaved into dev ... Reviewed-on: #750 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-30 11:35:18 +00:00
Javier Segarra	7001a707b9	Merge branch 'dev' into 8031_notify_dataSaved	2024-09-30 11:34:38 +00:00
Javier Segarra	da78edb6d2	Merge branch '7404-fixSomeStyleIssues' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-fixSomeStyleIssues	2024-09-30 13:34:21 +02:00
Javier Segarra	d4dc12ebe3	Merge pull request '#8018 - Show fields instead null/undefined' (!737) from 8018_location_label into dev ... Reviewed-on: #737 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-30 10:55:04 +00:00
Javier Segarra	cf509d608a	Merge branch 'dev' into 8018_location_label	2024-09-30 10:53:33 +00:00
Javier Segarra	b3c36e555f	style: refs #7404 compress spaces	2024-09-30 12:50:23 +02:00
Javier Segarra	b41026806f	style: refs #7404 compress spaces	2024-09-30 12:48:05 +02:00
Javier Segarra	cf67865b0b	feat: refs #7404 updates	2024-09-30 11:53:54 +02:00
Pablo Natek	90762f1d1c	Merge branch '7404-fixSomeStyleIssues' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-fixSomeStyleIssues	2024-09-30 10:47:03 +02:00
Pablo Natek	7fa0a5b28c	fix: refs #7404 path name	2024-09-30 10:47:02 +02:00
Javier Segarra	63d2b06b70	Merge branch 'dev' into 8031_notify_dataSaved	2024-09-30 08:23:12 +00:00
Pablo Natek	37d32a7934	Merge branch 'dev' into 7404-fixSomeStyleIssues	2024-09-30 08:14:44 +00:00
Pablo Natek	c815177be9	fix: refs #7404 translate and width problem	2024-09-30 10:13:39 +02:00
Pablo Natek	868e6a312f	fix: refs #7404 class name	2024-09-30 10:04:00 +02:00
Pablo Natek	cb0d3c5bca	fix: refs #7404 sticky footer and transparent header for vnTable	2024-09-30 09:46:00 +02:00
Javier Segarra	fd202f30d2	Merge branch '8018_location_label' of https://gitea.verdnatura.es/verdnatura/salix-front into 8018_location_label	2024-09-30 09:43:09 +02:00
Javier Segarra	9d7db2020b	Merge pull request '#7679 Filter data from others filters' (!769) from 7679_improve_filters into dev ... Reviewed-on: #769 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-30 07:19:30 +00:00
Javier Segarra	12a452d774	Merge branch 'dev' into 8031_notify_dataSaved	2024-09-27 18:02:24 +00:00
Javier Segarra	cffd97a521	Merge branch 'dev' into 8018_location_label	2024-09-27 18:01:17 +00:00
Javier Segarra	bec50d6eed	perf: refs #7679 #7679 comments	2024-09-27 19:54:01 +02:00
Javier Segarra	157370ec26	Merge branch 'dev' into 8018_location_label	2024-09-27 13:18:06 +02:00
Javier Segarra	e06d567e3c	test: refs #7679 #7679 remove comment	2024-09-27 10:35:39 +02:00
Javier Segarra	6b2e0df9c2	test: refs #7679 #7679 improve test	2024-09-26 23:39:14 +02:00
Javier Segarra	d2067c633d	feat: refs #7679 #7679 use country or province to retrieve cities	2024-09-26 23:38:22 +02:00
Javier Segarra	3caeb9e738	Merge branch 'dev' into 7323-fineTunningWorker	2024-09-26 16:21:22 +00:00
Jorge Penadés	71201f1007	feat: refs #7874 required fields banner	2024-09-26 17:19:05 +02:00
Javi Gallego	a2b7e81982	feat: warehouse	2024-09-26 16:23:18 +02:00
Jorge Penadés	11c135e8c4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType	2024-09-26 16:01:40 +02:00
Jorge Penadés	ba9f1407ac	Merge branch 'dev' into 7524-dynamicFetch	2024-09-26 13:53:54 +00:00
Jorge Penadés	7eb951ef13	fix: refs #7323 use right locale	2024-09-26 15:28:00 +02:00
Jorge Penadés	14b7654db3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-09-26 15:16:32 +02:00
Jorge Penadés	18ea23adf1	refactor: refs #7323 pr request	2024-09-26 15:03:22 +02:00
Pablo Natek	6e6b88d340	Merge pull request '7129-fixMigrationIssues' (!754) from 7129-fixMigrationIssues into dev ... Reviewed-on: #754 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-26 12:53:44 +00:00
Javier Segarra	428c6966f2	Merge branch 'dev' into 8018_location_label	2024-09-26 14:48:47 +02:00
Jorge Penadés	01b62adba9	fix: refs #7524 dynamic fetch	2024-09-26 14:30:19 +02:00
Javier Segarra	a0b3e933a8	Merge branch 'dev' into 8031_notify_dataSaved	2024-09-26 12:17:40 +00:00
Jorge Penadés	c2b52473a1	fix: refs #7323 align tables	2024-09-26 10:04:16 +02:00
Jorge Penadés	e827d3aabf	fix: refs #7323 rollback	2024-09-26 09:47:54 +02:00
Jorge Penadés	478d4695b8	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-09-26 09:16:59 +02:00
Jorge Penadés	0cffe0b586	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType	2024-09-26 09:08:53 +02:00
Jorge Penadés	709a662ceb	feat: refs #7874 select observation type	2024-09-26 09:08:12 +02:00
Pablo Natek	6e6b65771a	Merge branch 'dev' into 7129-fixMigrationIssues	2024-09-26 06:09:21 +00:00
Javi Gallego	9095c579db	Merge pull request '6722-thermograph' (!761) from 6722-thermograph into dev ... Reviewed-on: #761 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-26 06:07:26 +00:00
Pablo Natek	c388d5ab2a	Merge branch 'dev' of https: refs #7129//gitea.verdnatura.es/verdnatura/salix-front into 7129-fixMigrationIssues	2024-09-26 07:57:59 +02:00
Javi Gallego	dcfdabde32	feat: tabulation	2024-09-25 14:17:26 +02:00
Javier Segarra	73c45b8c4a	Merge branch 'dev' into 8031_notify_dataSaved	2024-09-25 12:08:40 +00:00
Jorge Penadés	68ebda625b	fix: refs #7874 refs #6943 ui	2024-09-25 14:02:11 +02:00
Javi Gallego	eb0e18bf58	Merge branch 'dev' into 6722-thermograph	2024-09-25 13:48:12 +02:00
Javi Gallego	bd2fa37450	feat: maxTemperature and minTemperature	2024-09-25 13:34:43 +02:00
Alex Moreno	8c13ceb3fe	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-25 13:28:13 +02:00
Alex Moreno	8dd2c44832	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-25 12:53:12 +02:00
Pablo Natek	cea5edd506	fix: refs #7129 translate	2024-09-25 12:33:19 +02:00
Pablo Natek	ca568c31ca	fix: refs #7129 clone post	2024-09-25 11:51:51 +02:00
Pablo Natek	27b699ebf4	fix: refs #7129 some component styles	2024-09-25 11:16:27 +02:00
Javier Segarra	a0c324c339	Merge branch '8031_notify_dataSaved' of https://gitea.verdnatura.es/verdnatura/salix-front into 8031_notify_dataSaved	2024-09-25 10:54:13 +02:00
Javier Segarra	72ddeaa90a	test: refs #8031 e2e	2024-09-25 10:53:38 +02:00
Jorge Penadés	45b3ed6e17	fix: refs #7207 te2e	2024-09-25 09:53:06 +02:00
Jorge Penadés	b54d358617	fix: refs #7207 use right locale	2024-09-25 09:14:35 +02:00
Javier Segarra	8c7ee3024f	Merge branch 'dev' into 8031_notify_dataSaved	2024-09-25 09:12:17 +02:00
Jorge Penadés	dc6acfadb7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx	2024-09-25 08:51:21 +02:00
Pablo Natek	1ee3691cc0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-fixMigrationIssues	2024-09-25 08:26:27 +02:00
Jon Elias	a14eb53f14	Merge branch 'dev' into 7884-AddLabelerField	2024-09-25 06:02:51 +00:00
Jon Elias	4ff068aa8a	Merge pull request '#7553 modified TicketExpedition & changes in ticket section' (!571) from 7553_FixTicketExpedition into dev ... Reviewed-on: #571 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-25 05:51:15 +00:00
Javier Segarra	c1087614c6	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-25 05:50:22 +00:00
Javier Segarra	e8a0d44292	Merge pull request 'feat: autofocus after clear' (!747) from vnInput_autoFocus into dev ... Reviewed-on: #747 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-25 05:50:04 +00:00
Jon Elias	ff3ab83727	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-25 05:25:07 +00:00
Javier Segarra	bc37e372f5	Merge branch 'dev' into 8031_notify_dataSaved	2024-09-24 20:17:54 +00:00
Javier Segarra	2a64d9643e	Merge branch 'dev' into vnInput_autoFocus	2024-09-24 20:16:56 +00:00
Jorge Penadés	86a82c5aad	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx	2024-09-24 14:39:18 +02:00
Alex Moreno	d35b40a891	fix: vnTable color	2024-09-24 14:07:04 +02:00
Pablo Natek	f0c2baa60e	fix: refs #7129 remove consoleLog	2024-09-24 12:56:14 +02:00
Pablo Natek	70d640dc37	fix: refs #7129 some style issues	2024-09-24 12:54:34 +02:00
Jon Elias	67a1c28670	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-24 10:51:31 +00:00
Alex Moreno	32328da370	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-24 12:25:24 +02:00
Alex Moreno	c9e4ab490d	build: init version 2442	2024-09-24 12:23:19 +02:00
Jon Elias	8315eb2b4c	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-24 09:37:17 +00:00
Javier Segarra	41f168ebbe	Merge pull request '#7671 - Default Table Order by Description DESC' (!745) from 7671_dense_itemFixedPrices into dev ... Reviewed-on: #745 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-24 09:24:45 +00:00
Javier Segarra	3affd8712c	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-09-24 09:22:47 +00:00
Jon Elias	8ac0083b9c	Merge branch 'dev' into 7884-AddLabelerField	2024-09-24 08:44:15 +00:00
Jon Elias	21f7613f21	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-24 08:36:57 +00:00
Jon Elias	f34e81038e	Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-24 10:36:02 +02:00
Jon Elias	cd96003c0e	refactor: refs #7553 requested changes and added keyup.enter	2024-09-24 10:35:59 +02:00
Jorge Penadés	3eb846b70c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-09-24 10:15:46 +02:00
Javier Segarra	6e57306026	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-09-24 07:39:22 +00:00
Jorge Penadés	42e4493fb6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx	2024-09-24 09:27:38 +02:00
Pablo Natek	c400929c99	fix: refs #7129 translate page title	2024-09-24 08:33:16 +02:00
Pablo Natek	8124a341a0	feat: refs #7129 route extended list and simplify route list	2024-09-24 07:25:17 +02:00
Javier Segarra	a5c6d628ca	feat: enable notify positive when user update self data	2024-09-23 18:48:58 +00:00
Javier Segarra	55e017b0cc	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-23 18:39:09 +00:00
Jorge Penadés	2cb9899de1	feat: refs #7207 show queue	2024-09-23 15:38:54 +02:00
Javier Segarra	b4b31c0c92	fix: enable autofocus	2024-09-23 15:21:07 +02:00
Javier Segarra	e9e2caee85	feat: autofocus after clear	2024-09-23 13:18:14 +00:00
Javier Segarra	ac8aa6bcc1	fix: table order	2024-09-23 14:21:41 +02:00
Jon Elias	4fc3f08f77	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-23 11:52:31 +00:00
Jon Elias	b728b7c5bd	Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-23 13:51:22 +02:00
Jon Elias	3716507f93	perf: refs #7553 removeSales function	2024-09-23 13:51:20 +02:00
Jorge Penadés	f809e0fb31	fix: refs #7323 show prev month week color	2024-09-23 12:55:39 +02:00
Javier Segarra	7713e33c67	Merge branch 'dev' into 8018_location_label	2024-09-23 09:48:19 +00:00
Javier Segarra	013a76cbce	test: VnLocation	2024-09-23 11:48:00 +02:00
Javier Segarra	f06723a919	test: VnLocation	2024-09-23 11:39:10 +02:00
Jorge Penadés	7bbad14f53	feat: refs #7323 delete btn	2024-09-23 11:38:27 +02:00
Jon Elias	0dd79ed708	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-23 08:22:21 +00:00
Jon Elias	f025b4361e	refactor: refs #7553 last requested changes	2024-09-23 10:21:30 +02:00
Jorge Penadés	37545b4cab	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-09-23 09:29:26 +02:00
Jon Elias	4c071aea8b	Merge branch 'dev' into 7884-AddLabelerField	2024-09-23 06:51:07 +00:00
Jorge Penadés	6cc8ca6731	chore: refs #7702 add tests	2024-09-20 17:38:02 +02:00
Jorge Penadés	fc23f9a8dd	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword	2024-09-20 16:22:48 +02:00
Jon Elias	edea17340d	refactor: refs #7553 adjust ticket notes view in summary	2024-09-20 14:33:59 +02:00
Javier Segarra	271e33a999	feat: formatLocation when field is null	2024-09-20 11:57:15 +02:00
Jon Elias	d7fb8bdaf5	Merge branch 'dev' into 7884-AddLabelerField	2024-09-20 08:24:39 +00:00
Jon Elias	2c15f79a2d	Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-20 09:08:13 +02:00
Jon Elias	44d98865fe	fix: refs #7553 requested changes	2024-09-20 09:04:31 +02:00
Jon Elias	34f70d026e	feat: refs #7553 added new field in list and translations	2024-09-18 11:50:00 +02:00
Jorge Penadés	5625ef4ce1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-09-18 09:41:26 +02:00
Jon Elias	07cd9d5aae	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-18 08:42:59 +02:00
Jon Elias	98faf22e73	Merge branch 'dev' into 7884-AddLabelerField	2024-09-18 06:24:07 +00:00
Jon Elias	3a95cf123e	Merge branch '7884-AddLabelerField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField	2024-09-18 08:23:18 +02:00
Jon Elias	566d657f70	feat: refs #7884 added default params and chip translations	2024-09-18 08:23:15 +02:00
Jorge Penadés	41c43fde76	feat: refs #7323 hide log section	2024-09-17 16:08:48 +02:00
Jorge Penadés	84cf3bea95	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-09-17 16:02:15 +02:00
Jorge Penadés	47de2caed7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker	2024-09-17 13:26:48 +02:00
Jon Elias	6edabd856c	Merge branch 'dev' into 7884-AddLabelerField	2024-09-17 06:32:27 +00:00
Jon Elias	479f2a8e53	feat: refs #7884 added new filter field	2024-09-17 08:31:02 +02:00
Jorge Penadés	da7d0326c0	fix: refs #7323 workerBalance & arrayData setUserParams	2024-09-16 17:12:48 +02:00
Jorge Penadés	1ff15da8ca	fix: refs #7323 workerList	2024-09-16 16:33:09 +02:00
Jorge Penadés	b015397822	feat: refs #7702 test wip	2024-09-16 10:59:32 +02:00
Jorge Penadés	91dccd10d3	feat: refs #7702 drop old components	2024-09-16 10:39:39 +02:00
Jorge Penadés	9ec2fb4c77	feat: refs #7702 fine tunning	2024-09-16 10:36:56 +02:00
Jorge Penadés	153c9b743f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword	2024-09-16 09:01:20 +02:00
Jorge Penadés	98cdeabe9f	feat: refs #7702 vnChangePassword	2024-09-13 18:15:28 +02:00
Jon Elias	6f9e46f7a0	fix: refs #7553 deleted log	2024-09-13 13:01:07 +02:00
Jorge Penadés	4bf8e1224d	chore: refs #7702 rollback	2024-09-13 12:28:07 +02:00
Jorge Penadés	e90b78c4c5	fix: refs #7702 rollback	2024-09-13 12:27:37 +02:00
Jorge Penadés	6983245d7d	Merge branch 'dev' of https: refs #7702//gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword	2024-09-13 12:26:15 +02:00
Jon Elias	c291ea267c	refactor: refs #7553 added clickable event in transfer sales like Salix	2024-09-13 12:07:45 +02:00
Jon Elias	4a0b92eded	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-13 09:05:26 +02:00
Jon Elias	bb1eb30a25	fix: refs #7553 changed fields in order in purchase request table	2024-09-12 13:22:53 +02:00
Jon Elias	b4c46dc153	refactor: refs #7553 modified ticketSummary QChips, deleted useless code	2024-09-12 13:13:56 +02:00
Jon Elias	4a1f5e922c	refactor: refs #7553 align ticket sale qdrawer fields	2024-09-12 10:19:21 +02:00
Jon Elias	6a5f31ff1e	fix: refs #7553 fixed conflicts	2024-09-12 10:14:38 +02:00
Jon Elias	422907447b	refactor: refs #7553 merge conflicts	2024-09-11 10:27:08 +02:00
Jon Elias	d1138529b2	Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-11 10:26:52 +02:00
Jon Elias	ff7bcfb00a	refactor: refs #7553 modified ticket sale to create a row in the table	2024-09-11 10:16:42 +02:00
Jon Elias	8e35737c8e	Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-10 11:47:40 +02:00
Jon Elias	e7a89138ba	fix: refs #7553 fix conflicts	2024-09-10 11:47:38 +02:00
Jon Elias	8f8462db94	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-09 11:53:41 +00:00
Jon Elias	6248a4117d	refactor: refs #7553 requested changes	2024-09-09 13:52:41 +02:00
Jon Elias	0b961050a0	refactor: refs #7553 rollback ticket advance due to slot problems	2024-09-09 08:14:53 +02:00
Jon Elias	94ae74ca7f	Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-09 08:10:06 +02:00
Jon Elias	4630496361	refactor: refs #7553 changed fields in ticket component & ticket filter	2024-09-09 08:10:05 +02:00
Jon Elias	4636e2f2e6	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-06 12:05:07 +00:00
Jon Elias	04f4521a59	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-06 12:00:41 +00:00
Jon Elias	0e5607d685	feat: refs #7553 ticket component to vntable and fixed minor errors	2024-09-06 13:59:50 +02:00
Jon Elias	e962063753	Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-06 07:16:05 +02:00
Jon Elias	8ff9dae1d8	refactor: refs #7553 requested changes	2024-09-06 07:16:03 +02:00
Jon Elias	102f7fb13e	Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-06 07:15:48 +02:00
Jon Elias	9f24a7bc29	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-05 12:34:19 +00:00
Jon Elias	db6f4fd15a	refactor: refs #7553 deleted logs	2024-09-05 14:32:22 +02:00
Jon Elias	65e3fd874d	Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-04 14:15:58 +02:00
Jon Elias	f5eacea483	refactor: refs #7553 modified QDrawer and table columns	2024-09-04 14:12:27 +02:00
Jon Elias	1889aa85b5	refactor: refs #7553 deleted expedition code and slot in VnTable	2024-09-04 11:49:49 +02:00
Jon Elias	5edea7cad1	Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-04 09:11:06 +02:00
Jon Elias	0d9773a30f	refactor: refs #7553 added default date in new expedition modal	2024-09-04 09:11:05 +02:00
Jon Elias	4bc148f16b	Merge branch 'dev' into 7553_FixTicketExpedition	2024-09-04 06:19:20 +00:00
Jon Elias	5471607d32	refactor: refs #7553 added order to Expedition table and tootltip in delete button	2024-09-04 08:18:10 +02:00
Jon Elias	cb7d729b0f	fix: refs #7553 fixed details in summary and data-key in TicketList	2024-09-04 08:02:28 +02:00
Jon Elias	f35e33cf10	fix: refs #7553 fixed TicketTransfer	2024-09-03 12:54:44 +02:00
Jon Elias	d18ca14b4e	fix: refs #7553 merge changes	2024-09-03 07:45:46 +02:00
Jon Elias	3d683c1da3	Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-03 07:45:23 +02:00
Jon Elias	b622f6ef96	fix: refs #7553 fixed QChips like Salix	2024-09-03 07:36:40 +02:00
Jon Elias	8bcecb91c6	Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-09-02 11:25:11 +02:00
Jon Elias	45d9322892	feat: refs #7553 added icons, descriptors and missing columns in TicketList and minor changes	2024-09-02 11:24:06 +02:00
Javier Segarra	b8dea8551d	perf: TicketTransferSale	2024-08-27 12:04:33 +02:00
Javier Segarra	071f3ba4d0	perf: TicketSummary issues	2024-08-27 11:58:26 +02:00
Javier Segarra	390ab9cfd1	feat: CustomerConsumptionFilter	2024-08-23 10:34:54 +02:00
Javier Segarra	14961d0aec	fix: change order column by default	2024-08-22 23:40:29 +02:00
Jon Elias	ffa6ef57fe	fix: refs #7553 refs #7356 fix generatePdf function	2024-08-21 13:18:43 +02:00
Jon Elias	6b2df03b06	Merge branch '7553_FixTicketExpedition' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-08-21 12:41:32 +02:00
Jon Elias	56c461f085	refactor: refs #7553 refs #7356 changed generatePdf name, fixed changeTime & added order in TicketVolume	2024-08-21 12:41:04 +02:00
Javier Segarra	6218463e7e	perf: rename component	2024-08-21 12:16:29 +02:00
Javier Segarra	87eca93ef8	fix: use class link	2024-08-21 12:16:21 +02:00
Jon Elias	79a26d7b94	feat: refs #7553 refs #7356 added VnTable in TicketVolume & fixed QBadge in summary	2024-08-21 11:42:03 +02:00
Jon Elias	5f63a9b058	refactor: refs #7553 & #7356 changed makeInvoice function and dialogs	2024-08-20 10:02:23 +02:00
Jon Elias	85bc610298	feat: refs #7553 refs #7356 & #7553 added rest of missing functions in the descriptor menu	2024-08-20 09:36:27 +02:00
Jon Elias	511d53d109	feat: refs #7553 added refund and add turn functions to descriptor	2024-08-19 13:48:55 +02:00
Jon Elias	574a2efc92	feat: refs #7553 added transferClient function	2024-08-19 13:03:38 +02:00
Jon Elias	23e5072d38	Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-08-19 11:31:30 +02:00
Jon Elias	4a57c53c3d	fix: refs #7553 & #7356 migration	2024-08-19 11:30:20 +02:00
Jon Elias	954a6ff6c0	refacotr: refs #7553 refactor sales, purchaseRequest and saleTracking	2024-08-02 13:55:51 +02:00
Jon Elias	3330e43e25	Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition	2024-07-26 12:01:48 +02:00
Jon Elias	61f1eae282	fix: deleted branch cloned wrongly	2024-07-26 12:01:46 +02:00
Jon Elias	7c5f5aee77	Merge branch 'dev' into 7553_FixTicketExpedition	2024-07-26 09:25:37 +00:00
Jon Elias	1dace39882	refactor: refs #7553 changed isScanned field & fixed cardDescriptor warning	2024-07-26 11:24:40 +02:00
Jon Elias	2ab7d48b0c	feat: refs #7553 added VnTable in Expedition, new field & minor changes in rest of section	2024-07-26 09:55:24 +02:00
Javier Segarra	3f1c0b95fa	fix: proposal to avoid notify error	2024-07-10 15:03:25 +02:00