6449 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	5206f56cec	Merge pull request '#7864 - 7864_testToMaster_2434' (!629) from 7864_testToMaster_2434 into master ... Reviewed-on: #629 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-20 06:33:16 +00:00
Javier Segarra	9086735aa1	test: fix routeList	2024-08-20 08:22:20 +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
Jorge Penadés	1ec7b7a8c1	fix: refs #7353 css	2024-08-19 16:02:30 +02:00
Javier Segarra	f927e9b722	fix: #6943 fix customerSummaryTable	2024-08-19 14:31:52 +02:00
Jorge Penadés	3f9bdfcc9c	fix: refs #7353 saleTicketMonitors	2024-08-19 14:21:36 +02:00
Jon Elias	511d53d109	feat: refs #7553 added refund and add turn functions to descriptor	2024-08-19 13:48:55 +02:00
Jorge Penadés	e6e61e5717	fix: refs #7353 vnTable colors	2024-08-19 13:40:35 +02:00
Jon Elias	574a2efc92	feat: refs #7553 added transferClient function	2024-08-19 13:03:38 +02:00
Javier Segarra	c19585fb1b	fix: quasar build warnings	2024-08-19 11:36:12 +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	f31f876189	Merge branch 'dev' into 7354_ZoneMigration_End	2024-08-19 09:23:34 +00:00
Jon Elias	5230b8f722	Merge pull request '#7717 fix OrderCatalog' (!558) from 7717_fixOrderCatalog into dev ... Reviewed-on: #558 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-08-19 09:22:34 +00:00
Jon Elias	a0aa902fe3	Merge branch 'dev' into 7354_ZoneMigration_End	2024-08-19 09:22:25 +00:00
Jon Elias	ce8d12fe20	Merge branch 'dev' into 7717_fixOrderCatalog	2024-08-19 09:20:31 +00:00
Jon Elias	f3d7590edf	refactor: refs #7717 delete useless function and import	2024-08-19 10:49:04 +02:00
Jon Elias	6fd0083870	fix: refs #7354 fix validation in price field	2024-08-19 10:45:13 +02:00
Jorge Penadés	9a4a51fadb	refactor: refs #7353 simplify code	2024-08-19 10:29:55 +02:00
Javi Gallego	ca3406fbc0	Merge branch 'dev' into 7346-invoiceOutMultilple	2024-08-19 10:27:48 +02:00
Jorge Penadés	ada1c948f6	feat: refs #7353 split sections	2024-08-19 10:14:02 +02:00
Javier Segarra	74f335b22e	fix: #6336 ClaimListStates	2024-08-19 06:51:52 +00:00
Jorge Penadés	bd9aea767a	fix: refs #7353 salesorderTable	2024-08-16 18:10:10 +02:00
Jorge Penadés	1cca504c87	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor	2024-08-16 15:18:20 +02:00
Alex Moreno	e45e551526	feat: customer consumption	2024-08-16 15:16:35 +02:00
Jorge Penadés	a69f41834e	fix: refs #7353 padding	2024-08-16 14:19:02 +02:00
Jorge Penadés	a13ea900ce	fix: refs #7353 salesClientTable	2024-08-16 13:54:37 +02:00
Alex Moreno	00616939c6	Merge pull request 'feat(FormModel): trim data by default' (!625) from formModel_trimData into dev ... Reviewed-on: #625 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-16 11:13:38 +00:00
Alex Moreno	fa0ca732fc	feat(FormModel): trim data by default	2024-08-16 12:29:35 +02:00
Alex Moreno	4b2f4ffac1	fix(VnTable): orderBy v-model	2024-08-16 12:20:08 +02:00
Alex Moreno	93a56b036a	Merge branch 'dev' into 7354_ZoneMigration_End	2024-08-16 09:47:49 +00:00
Alex Moreno	2bea46b601	fix: test	2024-08-16 11:47:32 +02:00
Alex Moreno	0e8455888b	Merge branch 'dev' into 7354_ZoneMigration_End	2024-08-16 09:32:55 +00:00
Jon Elias	3c4fc9473d	refactor: refs #7354 changed descriptor menu options	2024-08-16 11:20:03 +02:00
Alex Moreno	b35bf85f4a	fix(claim_summary): url links	2024-08-16 10:50:45 +02:00
Alex Moreno	ed29088d76	typo	2024-08-16 10:49:52 +02:00
Javi Gallego	06c0f49128	feat: refs #7346 add seriaType option	2024-08-16 10:10:40 +02:00
Alex Moreno	51ee79b7f7	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test	2024-08-16 09:24:24 +02:00
Alex Moreno	83a8f7e147	fix(invoiceOutGlobal): formData is object	2024-08-16 09:20:53 +02:00
Jorge Penadés	bdaba6b3ef	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight	2024-08-14 16:29:53 +02:00
Jorge Penadés	a564f94e30	Merge pull request '#6900 add Serial' (!610) from 6900-addSerial into test ... Reviewed-on: #610 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-08-14 14:20:40 +00:00
Jorge Penadés	ecfdf0b6b9	fix: refs #6900 improve loading	2024-08-14 15:27:36 +02:00
Javier Segarra	6378be5933	Merge branch '7354_ZoneMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End	2024-08-14 15:26:49 +02:00
Javier Segarra	c878fc9cff	feat: remove duplicity	2024-08-14 15:26:47 +02:00
Jon Elias	95cda2bad7	Merge branch 'dev' into 7354_ZoneMigration_End	2024-08-14 13:10:25 +00:00
Jon Elias	ea43df81fd	Merge branch '7354_ZoneMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End	2024-08-14 15:09:30 +02:00
Jon Elias	d12fcd3b34	refactor: refs #7354 refactor deliveryPanel	2024-08-14 15:09:28 +02:00
Jorge Penadés	3bba5db1b5	fix: refs #6900 improve logic	2024-08-14 14:52:47 +02:00
Jorge Penadés	65d893e128	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-addSerial	2024-08-14 14:30:47 +02:00
Jorge Penadés	760dc0e6f4	Merge branch '6900-addSerial' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-addSerial	2024-08-14 14:27:57 +02:00