928 Commits

Author	SHA1	Message	Date
Pablo Natek	c400929c99	fix: refs #7129 translate page title	2024-09-24 08:33:16 +02:00
Alex Moreno	b7ed63afc6	Merge branch 'dev' into 7404-fixFront	2024-09-24 06:18:42 +00:00
Alex Moreno	98a3b03be7	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-24 07:48:58 +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	ac8aa6bcc1	fix: table order	2024-09-23 14:21:41 +02:00
Jon Elias	f025b4361e	refactor: refs #7553 last requested changes	2024-09-23 10:21:30 +02:00
Pablo Natek	17bb144bce	fix: refs #7404 translates and some minor style fixes	2024-09-23 10:04:45 +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	d7fb8bdaf5	Merge branch 'dev' into 7884-AddLabelerField	2024-09-20 08:24:39 +00:00
Carlos Satorres	45b5433206	refs #6898 fix filter	2024-09-20 09:14:11 +02: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
Alex Moreno	5ca38ca825	feat: global handler	2024-09-18 14:48:15 +02:00
Carlos Satorres	87bce8fc21	refs #7529 fix workerPit	2024-09-18 12:08:38 +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
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
Carlos Satorres	ae97e32826	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-09-17 14:55:48 +02:00
Pablo Natek	cead2c2b5e	Merge branch 'dev' into 7404-stockBought	2024-09-17 11:40:42 +00: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
Carlos Satorres	8c91cb42f6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-09-17 11:11:57 +02:00
Javier Segarra	e4adbfa9f7	Merge branch 'dev' into 7677_vnLocation_perf	2024-09-17 07:29:00 +00:00
Jon Elias	479f2a8e53	feat: refs #7884 added new filter field	2024-09-17 08:31:02 +02:00
Jorge Penadés	1ff15da8ca	fix: refs #7323 workerList	2024-09-16 16:33:09 +02:00
Carlos Satorres	70759b8a4e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-09-16 09:28:51 +02:00
Pablo Natek	c59c8127cc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-16 08:59:46 +02:00
Guillermo Bonet	07e45f2051	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-16 07:17:38 +02:00
Guillermo Bonet	57b939bdd5	Merge branch 'test' into dev	2024-09-16 07:17:25 +02:00
Carlos Satorres	0fcc4fe232	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-09-13 13:50:01 +02:00
Javier Segarra	025436b4b8	Merge branch 'dev' into 7677_vnLocation_perf	2024-09-13 09:27:38 +02:00
Jorge Penadés	dcde6a1b9d	Merge branch 'test' into 7353-warmfix-fixSearchbar	2024-09-13 07:19:42 +00: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
Alex Moreno	0dbcc4be3d	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-13 08:57:27 +02:00
Alex Moreno	f731e4f1a6	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-09-13 08:57:14 +02:00
Jon Elias	ed5987630f	Merge branch 'dev' into 6346-fixWagonModule	2024-09-13 06:14:05 +00:00
Javier Segarra	6e784bb290	fix: address-create i18n	2024-09-12 21:11:51 +02:00
Jon Elias	6a5f31ff1e	fix: refs #7553 fixed conflicts	2024-09-12 10:14:38 +02:00
Jorge Penadés	59f6913a74	fix: refs #7323 add correct label	2024-09-12 09:43:08 +02:00
Jorge Penadés	d92659289b	fix: refs #7323 add correct label	2024-09-12 09:41:29 +02:00
Carlos Satorres	039a8d1d02	refs #7283 fix items	2024-09-12 09:32:41 +02:00
Pablo Natek	e2dbe0fd38	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-12 09:09:21 +02:00
Carlos Satorres	b66e66eb0a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-09-12 07:44:35 +02:00
Carlos Satorres	04070a5a85	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-09-12 07:42:55 +02:00
Javier Segarra	c3108b4335	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable	2024-09-11 12:48:38 +02:00
Jorge Penadés	9219fa07f5	fix: refs #7353 hide search param	2024-09-11 11:23:14 +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
Jorge Penadés	b559f2f18c	refactor: refs #7353 use global locales	2024-09-11 10:18:11 +02:00
Javier Segarra	bcfa67baec	Merge branch 'dev' into 6943_fix_customerSummaryTable	2024-09-10 12:26:17 +02:00
Jon Elias	e7a89138ba	fix: refs #7553 fix conflicts	2024-09-10 11:47:38 +02:00
Jorge Penadés	f9adc49284	Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight	2024-09-10 09:41:34 +02:00
Jon Elias	b4fb9ceb2e	Merge branch 'dev' into 6346-fixWagonModule	2024-09-10 06:29:51 +00:00
Alex Moreno	3164209bef	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-09-10 08:13:56 +02:00
Jon Elias	6790067a89	Merge branch 'dev' into 6346-fixWagonModule	2024-09-10 06:02:18 +00:00
Javier Segarra	b3f305a3fd	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-09-09 12:17:59 +00:00
Jon Elias	f78ca3f357	Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule	2024-09-09 10:04:44 +02:00
Pablo Natek	e083d6a802	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-08 07:54:26 +02:00
Carlos Satorres	dc39dd5a76	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-09-06 13:26:34 +02:00
Javier Segarra	9bb298bbeb	feat: handle create row	2024-09-06 13:14:46 +02:00
Javier Segarra	e592a76946	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices	2024-09-06 10:42:07 +02:00
Carlos Satorres	6db1c8f083	fix traduction	2024-09-06 07:50:39 +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
Javier Segarra	1f96f5c09a	feat: orderCreateDialog	2024-09-05 22:20:57 +02:00
Javier Segarra	31abd8b4c5	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable	2024-09-05 19:45:41 +02:00
Carlos Satorres	8fe6fad4a7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-fixItemDescriptor	2024-09-05 12:07:18 +02:00
Carlos Satorres	83969f1d57	fix traduction	2024-09-05 12:05:53 +02:00
Javier Segarra	cf3b9b2ef8	perf: CustomerSummary	2024-09-04 17:55:27 +02:00
Jorge Penadés	af5e47ed3e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight	2024-09-04 16:06:31 +02:00
Carlos Satorres	3a703141c6	Merge branch 'dev' into 7407-MedicalWorker2	2024-09-04 07:49:14 +00:00
Jorge Penadés	50cdb053f8	feat: refs #7663 fine tunning	2024-09-03 17:33:17 +02:00
Jorge Penadés	a5887114ef	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-hotfix-fineTunning	2024-09-03 12:50:35 +02:00
Pablo Natek	2fb974af0f	Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought	2024-09-03 08:01:19 +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
Carlos Satorres	0475083a2b	refs #7407 Medical Section	2024-09-02 14:57:01 +02:00
Jon Elias	1af4a559fc	Merge branch 'dev' into 7354_ZoneMigration_End	2024-09-02 10:50:22 +00:00
Carlos Satorres	dfb098d440	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-09-02 12:32:47 +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	fb15e90f0b	Merge branch 'dev' into 7671_dense_itemFixedPrices	2024-09-02 09:48:48 +02:00
Jorge Penadés	a8fc5a8d73	Merge branch 'dev' of https: refs #7353//gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor	2024-09-02 09:09:27 +02:00
Jorge Penadés	be63c8a7fa	fix: refs #6900 fine tunning wip	2024-09-02 08:43:32 +02:00
Javier Segarra	c25b689685	Merge branch 'dev' into 6943_fix_customerSummaryTable	2024-08-31 00:14:42 +02:00
Carlos Satorres	268a27878c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-08-30 13:23:42 +02:00
Carlos Satorres	874cbfea9b	refs #7366 fix travel hours	2024-08-30 12:31:42 +02:00
Carlos Satorres	859eb918cd	refs #6897 fix entry	2024-08-30 11:50:05 +02:00
Jorge Penadés	f9a509ac67	feat: refs #7353 add no one opt	2024-08-30 11:40:55 +02:00
Carlos Satorres	f33733c7f2	refs #7355 fix total	2024-08-30 11:25:00 +02:00
Carlos Satorres	1544513a3e	refs #7355 #7366 fix account, summary, list, travelList, tooltip	2024-08-30 11:18:48 +02:00
Carlos Satorres	278f691ed2	refs #7355 fix views summarys, entryList, travelList refact	2024-08-30 09:52:43 +02:00
Jorge Penadés	966667bab7	refactor: refs #7353 tickets correction	2024-08-29 11:40:42 +02:00
Javier Segarra	20ddabcc01	Merge remote-tracking branch 'origin/7830-customerDesplegables' into 6943_fix_customerSummaryTable	2024-08-27 16:30:32 +02:00
Javier Segarra	cadd6a2b62	Merge remote-tracking branch 'origin/7830-customerDesplegables' into 6943_fix_customerSummaryTable	2024-08-27 15:52:38 +02:00
Javier Segarra	3ea8490e98	Merge branch 'dev' into 6943_fix_customerSummaryTable	2024-08-27 15:46:04 +02:00
Carlos Satorres	477984076b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-08-27 10:55:17 +02:00
Jorge Penadés	25be0df2e3	Merge branch 'dev' of https: refs #7353//gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor	2024-08-27 09:55:52 +02:00
Javier Segarra	2ae482ff8c	Merge branch 'test' into dev	2024-08-27 09:38:12 +02:00
Javier Segarra	461b764f0e	Merge branch 'test' into dev	2024-08-27 07:11:20 +02:00
Javier Segarra	10747d7a4f	perf: customerSummaryTable	2024-08-27 07:00:28 +02:00
Javier Segarra	56f687ce36	perf: sendEmail customerConsumption	2024-08-23 21:06:15 +02:00
Javi Gallego	defb11a6d7	Merge branch 'dev' into 7346-invoiceOutMultilple	2024-08-23 08:20:06 +00:00
Jon Elias	a31931f8cf	Merge branch 'dev' of https: refs #7354//gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End	2024-08-21 08:13:19 +02:00
Javi Gallego	0eb699bcbe	feat: refs #7346 formdata uses serialType	2024-08-20 10:10:11 +02:00
Jorge Penadés	f34f3a78cb	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-08-19 16:39:39 +02:00
Jorge Penadés	206253ac6b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor	2024-08-19 16:03:23 +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	ce8d12fe20	Merge branch 'dev' into 7717_fixOrderCatalog	2024-08-19 09:20:31 +00:00
Jon Elias	6fd0083870	fix: refs #7354 fix validation in price field	2024-08-19 10:45:13 +02:00
Jorge Penadés	ada1c948f6	feat: refs #7353 split sections	2024-08-19 10:14:02 +02:00
Alex Moreno	e45e551526	feat: customer consumption	2024-08-16 15:16:35 +02:00
Jon Elias	95cda2bad7	Merge branch 'dev' into 7354_ZoneMigration_End	2024-08-14 13:10:25 +00:00
Alex Moreno	a8f550fcc8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev	2024-08-14 13:39:54 +02:00
Jorge Penadés	e07d573788	Merge branch 'test' into 6900-addSerial	2024-08-14 10:13:39 +00:00
Jon Elias	926fba27b8	Merge branch 'dev' into 7354_ZoneMigration_End	2024-08-14 08:45:37 +00:00
Jon Elias	ed4bf3cfa8	refactor: refs #7354 requested changes	2024-08-14 10:44:45 +02:00
Javier Segarra	55b9cd9ff4	feat: handle same multiple CP	2024-08-14 09:18:24 +02:00
Alex Moreno	0a0e8be39f	Merge branch 'dev' into 7848-recoveryPassword	2024-08-13 14:41:23 +00:00
Jorge Penadés	a24caa9393	fix: refs #7323 use global locale	2024-08-13 12:56:39 +02:00
Carlos Satorres	e144f0be01	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration2	2024-08-13 12:52:14 +02:00
Alex Moreno	a46198e2d0	feat: add recover password and reset password	2024-08-13 12:25:08 +02:00
Carlos Satorres	ec9c2fb3ee	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-08-12 14:13:26 +02:00
Jorge Penadés	c4de1beabf	feat: refs #6900 add InvoiceInSerial	2024-08-12 13:46:56 +02:00
Alex Moreno	37244cdbc7	feat(orderBasicData): add notes	2024-08-09 14:55:49 +02:00
Jorge Penadés	dc5142c20a	feat: refs #6900 use VnTable & sort filter fields	2024-08-08 10:12:54 +02:00
Carlos Satorres	df1b63da98	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration2	2024-08-07 12:23:22 +02:00
Carlos Satorres	6b69a16122	refs #7355 changes BasicData	2024-08-07 12:22:52 +02:00
Pablo Natek	f2be2b4300	fea: stockBought add form and formDetail	2024-08-05 15:42:57 +02:00
Alex Moreno	810e579ea9	refactor(customer_recovery): to vnTable	2024-08-05 12:10:15 +02:00
Carlos Satorres	2604441c13	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration	2024-08-01 10:19:26 +02:00
Carlos Satorres	e41078b973	refs #7355 traduccions	2024-07-31 08:34:31 +02:00
Jorge Penadés	5705904e40	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn	2024-07-29 08:04:51 +02:00
Jon Elias	a7a1b7801c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule	2024-07-23 13:25:58 +02:00
Jon Elias	12370b6437	feat: refs #6346 new wagon type section	2024-07-23 13:22:54 +02:00
Carlos Satorres	f678c63043	refs #7283 request	2024-07-22 13:35:41 +02:00
Carlos Satorres	4d394a98a4	refs #7283 fix yml list basicData	2024-07-22 08:24:59 +02:00
Guillermo Bonet	580777af65	Deleted repeated labeler i18n	2024-07-22 08:20:08 +02:00
Guillermo Bonet	c5903e29e8	Merge branch 'master' into test	2024-07-19 13:08:41 +02:00
Javier Segarra	7cbdf0d98b	feat: fix bugs and filters	2024-07-18 15:20:44 +02:00
Javier Segarra	5fbbd27273	fat: i18n	2024-07-16 12:21:50 +02:00
Javier Segarra	fb2e3f1f9c	feat: required validation	2024-07-16 11:25:06 +02:00
Javier Segarra	8798598f41	Merge branch 'dev' into 7017_formModel_validations	2024-07-16 09:26:22 +02:00
Javier Segarra	be86b69079	fix: ticket menu order and i18n	2024-07-15 11:53:10 +02:00
Javier Segarra	c56610515c	Merge branch 'dev' into TicketDms	2024-07-15 11:29:27 +02:00
Javier Segarra	ae55983405	Merge branch 'dev' into feature/SaleTracking	2024-07-15 09:23:53 +00:00
Alex Moreno	cc8062785a	Merge branch 'dev' into feature/SaleTracking	2024-07-15 08:17:01 +00:00
Javier Segarra	20403287dd	feat: scopeDays replace by daysOnward	2024-07-12 22:38:38 +02:00
Javier Segarra	c5c96bf51b	Merge branch 'dev' into feature/SaleTracking	2024-07-09 09:41:45 +02:00
Javier Segarra	cededb54e8	Merge branch 'dev' into feature/TicketDms	2024-07-09 09:14:40 +02:00
Alex Moreno	75b8cca2e0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-migrationClaim-v5	2024-07-08 14:25:01 +02:00
Javier Segarra	aabd575854	Merge branch 'dev' into feature/TicketPackages	2024-07-08 10:55:14 +02:00
Javier Segarra	84462fe201	Merge branch 'dev' into feature/TicketComponents	2024-07-08 10:14:13 +02:00