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

2741 Commits

Author SHA1 Message Date
Jorge Penadés c2048afb53 Merge pull request '#6938 hide personal phone' (!290) from 6938-hideWorkerPhone into dev 
Reviewed-on: verdnatura/salix-front#290
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-04-16 06:38:56 +00:00
Robert Ferrús d178d7dc6a feat: refs #6679 add icon 2024-04-16 08:04:57 +02:00
Robert Ferrús d70da976c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon 2024-04-16 08:04:23 +02:00
Guillermo Bonet 46fa06cf1e feat: refs #6724 Restriction QCheckbox entry isBooked 2024-04-16 07:14:00 +02:00
Guillermo Bonet de68af5e13 feat: refs #6724 Disabled QCheckbox entry isBooked 2024-04-15 14:17:23 +02:00
William Buezas d9d868a6af Waste breakdown 2024-04-15 09:02:35 -03:00
William Buezas c50741b4bf Remove single quotes 2024-04-15 08:51:48 -03:00
Jorge Penadés b2211369ea fix: refs #6938 remove personal phone 2024-04-15 13:30:42 +02:00
Jorge Penadés 1e77e82784 fix: refs #6938 id filter 2024-04-15 13:28:10 +02:00
Robert Ferrús 058ddc8e9a feat: refs #6500 2024-04-15 13:18:39 +02:00
Javier Segarra e1716b9ea4 Merge branch 'dev' into 6907_fix_input_clearable_hover 2024-04-15 13:11:21 +02:00
Jorge Penadés 68069ba9c6 feat: refs #6938 hide personal phone 2024-04-15 12:48:07 +02:00
Alex Moreno f176312163 feat(VnNotes): refs #6336 better design 2024-04-15 12:28:43 +02:00
Alex Moreno fe13125085 Merge pull request 'feat(supplierSummary): refs #6898 use VnTitle' (!289) from 6898-supplierSummary_use_VnTitle into test 
Reviewed-on: verdnatura/salix-front#289
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2024-04-15 09:56:01 +00:00
Alex Moreno 6e0510f0bd feat(supplierSummary): refs #6898 use VnTitle 2024-04-15 08:58:39 +02:00
Alex Moreno 4efe09722f refs #6336 feat(claim): improvements 2024-04-15 08:40:15 +02:00
William Buezas beaffbf685 delete old i18n files and adapt branch to the new ones 2024-04-12 10:20:05 -03:00
William Buezas d38c85a0ef resolve conflicts 2024-04-12 09:39:34 -03:00
William Buezas b4d92d4f97 Fix Options item labels 2024-04-12 09:35:57 -03:00
Jon Elias 32382622e4 Merge pull request 'refactor: refs #6425 new translation proposal' (!250) from 6425-translationProposal into dev 
Reviewed-on: verdnatura/salix-front#250
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-04-12 12:22:23 +00:00
Jon Elias 5cd32ec2fe Merge branch 'dev' into 6425-translationProposal 2024-04-12 12:21:41 +00:00
Javier Casado 372863e693 Merge pull request '#6946 add table and floating button' (!248) from 6946-refactorEntryNotes into dev 
Reviewed-on: verdnatura/salix-front#248
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
 2024-04-12 11:48:36 +00:00
William Buezas 6019c7f7b2 Add remove chip button only if is manual 2024-04-12 08:41:45 -03:00
William Buezas 9283b190b0 Differentiate manual chips 2024-04-12 08:35:39 -03:00
Jorge Penadés a27bdc37d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6946-refactorEntryNotes 2024-04-12 13:27:14 +02:00
William Buezas c4a8127a5b Add toggle right drawer button 2024-04-12 08:24:56 -03:00
William Buezas 0006761201 Use black background on WorkerDateLabel 2024-04-12 08:22:17 -03:00
William Buezas f2dc50d229 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into WorkerCalendar 2024-04-12 08:13:58 -03:00
William Buezas 3d9d444bb4 remove filter field 2024-04-12 08:11:58 -03:00
William Buezas c12fd77218 Remove businessFk from FetchData 2024-04-12 08:10:14 -03:00
Jon Elias f83de74f01 refs #6425 fix conflicts 2024-04-12 11:44:56 +02:00
William Buezas 73703dc778 Add translations 2024-04-11 18:07:02 -03:00
William Buezas c032c83e7f Item create view 2024-04-11 08:40:41 -03:00
Javier Casado a66ece1683 Merge pull request 'refs #7179 changes customer proxy and client Id' (!279) from 7179-changesClaimSummary into dev 
Reviewed-on: verdnatura/salix-front#279
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-04-11 11:38:59 +00:00
Javier Casado 6002800000 Merge branch 'dev' into 7179-changesClaimSummary 2024-04-11 11:37:11 +00:00
Alex Moreno cc633acfd9 deploy: refs #7199 init version 2418 2024-04-11 12:34:23 +02:00
Alex Moreno 3f8d97e2a3 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-04-11 12:32:51 +02:00
Alex Moreno da8ed5d6b3 Merge pull request '7199-devToTest_2316' (!282) from 7199-devToTest_2316 into test 
Reviewed-on: verdnatura/salix-front#282
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-04-11 10:31:49 +00:00
Alex Moreno d99d934dab fix: refs #7199 e2e 2024-04-11 12:29:30 +02:00
Jorge Penadés 170747371a fix: refs #6480 css 2024-04-11 12:27:58 +02:00
Jorge Penadés bfa9dc9634 feat: refs #6480 include drawer 2024-04-11 12:23:00 +02:00
Jorge Penadés edf75c8cdd feat: refs #6480 check if hasContent or slots 2024-04-11 09:22:15 +02:00
Jon Elias 675b764c82 refactor: fixed invoiceInVat tests 2024-04-11 09:05:02 +02:00
Jorge Penadés 96d3073f67 Revert "Merge branch '6480-improveCard' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard" 
This reverts commit 984539b70f, reversing
changes made to d7ab6e8a02.
 2024-04-11 09:01:44 +02:00
Jorge Penadés 984539b70f Merge branch '6480-improveCard' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-11 08:42:17 +02:00
Jorge Penadés d7ab6e8a02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-11 08:41:52 +02:00
Alex Moreno 9be132b8a0 Merge pull request 'feature/ItemsList' (!280) from hyervoni/salix-front-mindshore:feature/ItemsList into dev 
Reviewed-on: verdnatura/salix-front#280
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-11 05:56:27 +00:00
Javier Segarra 5f502c2aad #6480: POC Claims 2024-04-10 20:52:45 +02:00
Robert Ferrús de18b56cb2 feat: refs #6679 add icon 2024-04-10 14:47:20 +02:00
Robert Ferrús f59ecbf94e Merge branch '6679-addCreateIcon' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon 2024-04-10 14:42:48 +02:00