wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
6,439 Commits 155 Branches 0 Tags 30 MiB
Commit Graph

6439 Commits

Author SHA1 Message Date
Jon Elias f5eacea483 refactor: refs #7553 modified QDrawer and table columns 2024-09-04 14:12:27 +02:00
Jon Elias 63c2da9a51 Merge pull request '#6896 Added missing descriptors and small details' (!671) from Fix_OrderMissingDetails into dev 
Reviewed-on: verdnatura/salix-front#671
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-04 10:36:04 +00:00
Jon Elias 4602f4c7b3 refactor: deleted useless prop 2024-09-04 12:25:05 +02:00
Jon Elias 1889aa85b5 refactor: refs #7553 deleted expedition code and slot in VnTable 2024-09-04 11:49:49 +02:00
Jorge Penadés 763cf2e345 refactor: refs #6900 create setRectificative composable 2024-09-04 10:30:14 +02:00
Carlos Satorres 1f9d1b79ab refs #7283 refactor ItexDescriptor 2024-09-04 10:17:57 +02:00
Jon Elias 3a1575a385 Merge branch 'Fix_OrderMissingDetails' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderMissingDetails 2024-09-04 10:05:19 +02:00
Jon Elias 19ae1f9d80 refactor: deleted useless prop in FetchedTags 2024-09-04 10:05:18 +02:00
Jon Elias beaa9ab5c8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix_OrderMissingDetails 2024-09-04 09:53:47 +02:00
Carlos Satorres 3a703141c6 Merge branch 'dev' into 7407-MedicalWorker2 2024-09-04 07:49:14 +00: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 6097f46e29 Merge branch 'dev' into Fix_OrderMissingDetails 2024-09-04 06:38:34 +00: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
Jorge Penadés 50cdb053f8 feat: refs #7663 fine tunning 2024-09-03 17:33:17 +02:00
Jorge Penadés edfc6ace0a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight 2024-09-03 16:23:48 +02:00
Javi Gallego 5b53e9dc37 feat: transfer an invoice 2024-09-03 15:25:36 +02:00
Jorge Penadés 00beeaf51b feat: refs #6900 add tooltip 2024-09-03 14:37:24 +02:00
Jon Elias 58eca71e95 Merge branch 'dev' into 6346-fixWagonModule 2024-09-03 12:36:42 +00:00
Jorge Penadés 6eb5435e25 chore: refs #6900 drop useless code 2024-09-03 13:03:38 +02:00
Jon Elias f35e33cf10 fix: refs #7553 fixed TicketTransfer 2024-09-03 12:54:44 +02:00
Jorge Penadés 02264b2bb5 Merge branch '6900-hotfix-fineTunning' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-hotfix-fineTunning 2024-09-03 12:50:52 +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
Javier Segarra 4d4997951c Merge pull request 'fix_mainShortcutMixin' (!673) from fix_mainShortcutMixin into dev 
Reviewed-on: verdnatura/salix-front#673
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-09-03 08:43:44 +00:00
Javier Segarra 397a2606f1 fix: cli warnings 2024-09-03 10:31:37 +02:00
Javier Segarra 4e73e74c2c fix: add border-top 2024-09-03 10:31:24 +02:00
Javier Segarra eca68b76a0 perf: improve mainShrotcutMixin 2024-09-03 10:31:01 +02:00
Carlos Satorres 65bf1664ff Merge pull request 'refs #6899 fix InvoiceOut' (!672) from hotfix-descriptorSummaryInvoiceOut into master 
Reviewed-on: verdnatura/salix-front#672
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-03 08:11:31 +00:00
Carlos Satorres 64eeeb67fa refs #6899 fix InvoiceOut 2024-09-03 10:00:44 +02:00
Jon Elias f4694792eb Merge branch 'dev' into Fix_OrderMissingDetails 2024-09-03 07:57:37 +00:00
Jon Elias 75e18a1e2f fix: added missing descriptors and small details 2024-09-03 09:55:58 +02:00
Pablo Natek 74b47361c4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-03 09:42:35 +02:00
Jorge Penadés 3e81b34379 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight 2024-09-03 09:10:34 +02:00
Jorge Penadés 02383f28f0 Merge branch 'master' into 6900-hotfix-fineTunning 2024-09-03 07:07:38 +00:00
Robert Ferrús ea8fde49ff Merge pull request 'feat: refs #211153 businessDataLinkGrafana' (!663) from 211153-businessDataLinkGrafana into dev 
Reviewed-on: verdnatura/salix-front#663
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-03 06:47:24 +00:00
Robert Ferrús 5a684e244f Merge branch 'dev' into 211153-businessDataLinkGrafana 2024-09-03 06:46:35 +00:00
Javier Segarra e2bbe8cf3d Merge pull request '#7897 - masterTest_24_36' (!669) from 7897_masterTest_24_36 into master 
Reviewed-on: verdnatura/salix-front#669
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-03 06:37:48 +00:00
Javier Segarra ecba084f8b feat: reduce changelog.md lines 2024-09-03 08:31:27 +02:00
Javier Segarra c4c4285b4b fix: remove unnecessary console.log 2024-09-03 08:16:01 +02:00
Javier Segarra 6e2630c69e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7897_masterTest_24_36 2024-09-03 08:07:57 +02:00
Javier Segarra 84076309a5 feat: update changelog.md 2024-09-03 08:04:42 +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 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
Javier Segarra 61721b84b9 Merge pull request '#7897 - Solve conflicts masterTest_24_36' (!670) from 7897_masterTest_24_36 into test 
Reviewed-on: verdnatura/salix-front#670
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-03 05:40:47 +00:00
Jon Elias b622f6ef96 fix: refs #7553 fixed QChips like Salix 2024-09-03 07:36:40 +02:00
Pablo Natek 18ded3b6f5 Merge pull request 'feat: refs #7129 add km start and end on create form' (!666) from 7129-someFixesAfterMigration into dev 
Reviewed-on: verdnatura/salix-front#666
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-03 05:28:09 +00:00
Pablo Natek f6fe05a47a Merge branch 'dev' into 7129-someFixesAfterMigration 2024-09-03 05:26:37 +00:00