353 Commits

Author	SHA1	Message	Date
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
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
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
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
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
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
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	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