wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
1,941 Commits 154 Branches 0 Tags 22 MiB
Commit Graph

1941 Commits

Author SHA1 Message Date
William Buezas 219bacaebc merge with branch branch-PR2 2024-01-02 10:35:48 -03:00
carlosfonseca bf259b5fad Correcciones a branch pr 2 2024-01-02 08:12:44 -05:00
carlosfonseca 677660f5cc Se hacen maquetado general de menu izquierdo en summary de clientes 2024-01-02 06:54:15 -05:00
Jorge Penadés c6f8bbd616 Merge pull request 'add filter: refs #6606' (!140) from 6606-fixExportBtn into dev 
Reviewed-on: verdnatura/salix-front#140
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-02 11:49:20 +00:00
Jorge Penadés 34e71c1900 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary 2024-01-02 12:48:03 +01:00
William Buezas 9b9ac4dfe1 PR fixes 2024-01-02 08:47:38 -03:00
William Buezas a2c96d276e Supplier Basic data, Billing data and Fiscal data 2024-01-02 08:17:04 -03:00
Jorge Penadés 9b069fbddd add filter: refs #6606 2024-01-02 11:38:43 +01:00
Javier Segarra 17dc491cc6 Merge branch 'dev' into 5858-fiscalData-validations 2024-01-02 09:25:26 +00:00
Javier Segarra a6484964dd Merge pull request 'refs #6363 - Fix style in LoginMain when darkmode is activated' (!131) from 6363_lilium_darkMode_login into dev 
Reviewed-on: verdnatura/salix-front#131
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-02 09:23:54 +00:00
Javier Segarra 855164015a Merge branch 'dev' into 6363_lilium_darkMode_login 2024-01-02 09:22:12 +00:00
Javier Segarra 1b5fd42b96 Merge pull request 'Add button to copy current token' (!130) from 6098_lilium_token_copy into dev 
Reviewed-on: verdnatura/salix-front#130
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-02 09:21:30 +00:00
Javier Segarra 9c6de604f3 Merge branch 'dev' into 6098_lilium_token_copy 2024-01-02 09:18:50 +00:00
Alex Moreno 7f3cfddb25 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-01-02 09:21:06 +01:00
Alex Moreno 24818f5daa refs #5835 fix(invoiceOutSummary): add ?. 2024-01-02 09:19:29 +01:00
Jorge Penadés 5fb5258cf9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary 2024-01-02 09:19:03 +01:00
Carlos Fonseca c4e47d6f6b Merge pull request 'Se crea tabla y filtros de morosos en clientes' (#47) from features/ms_93_customer_defaulter into dev 
Reviewed-on: hyervoni/salix-front-mindshore#47
 2024-01-02 08:18:49 +00:00
carlosfonseca 31467a2bef Correccion de conflicto 2024-01-02 03:17:23 -05:00
Jorge Penadés 863a9b8213 Merge branch '5835-fixListAndSummary' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary 2024-01-02 09:06:01 +01:00
Jorge Penadés 61d69f7cf7 change btn & prevent error: refs #5835 2024-01-02 09:05:59 +01:00
Jorge Penadés 85d056b491 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary 2024-01-02 09:00:36 +01:00
Alex Moreno 1b6f2682eb Merge branch 'dev' into 5835-fixListAndSummary 2024-01-02 07:35:12 +00:00
Alex Moreno 82536847f5 Merge branch 'dev' into 6098_lilium_token_copy 2024-01-02 07:32:56 +00:00
Alex Moreno deeebd68d1 Merge branch 'dev' into 6363_lilium_darkMode_login 2024-01-02 07:32:22 +00:00
Alex Moreno 10a3a39b03 Merge branch 'dev' into 6578-orderClaim 2024-01-02 07:31:06 +00:00
Jorge Penadés c09848a1cf Merge pull request 'logs added: refs #6605' (!139) from 6605-invoiceInLog into dev 
Reviewed-on: verdnatura/salix-front#139
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-02 07:31:00 +00:00
William Buezas d476d504e1 Merge pull request 'Extended List big modifications and column add column filter component' (#48) from feature/ms-100-ExtendedListColumnFilter into dev 
Reviewed-on: hyervoni/salix-front-mindshore#48
 2023-12-31 01:17:18 +00:00
William Buezas 113df44705 create entries basic structure and add create entry and clone travel with entries feature to travel list and travel summary 2023-12-29 16:54:35 -03:00
William Buezas 8b24ac9fe4 change suppliers submodules titles casing 2023-12-29 14:43:20 -03:00
William Buezas 2edaf71e40 change suppliers submodules titles casing 2023-12-29 14:19:44 -03:00
William Buezas 3dd499c956 Merge pull request 'Add descriptor and submodules to supplier card left menu' (#49) from feature/ms-98-SuppliersCardDescriptor into dev 
Reviewed-on: hyervoni/salix-front-mindshore#49
 2023-12-29 17:01:37 +00:00
William Buezas c4c344f07a Add descriptor and submodules to supplier card left menu 2023-12-29 14:00:32 -03:00
William Buezas 1ab31a1e51 Extended List big modifications and column add column filter component 2023-12-29 11:08:11 -03:00
Jorge Penadés d374709d4a logs added: refs #6605 2023-12-29 08:58:32 +01:00
carlosfonseca 9ede2912f3 Correccion, elimine sin darme cuenta 2023-12-28 10:36:47 -05:00
carlosfonseca eebefca919 Correccion de conflictos 2023-12-28 10:31:15 -05:00
carlosfonseca 5729204a3b Se crea tabla y filtros de morosos en clientes 2023-12-28 10:25:23 -05:00
William Buezas 59e2e20827 Merge pull request 'feature/ms-68-WorkersDepartments' (#45) from feature/ms-68-WorkersDepartments into dev 
Reviewed-on: hyervoni/salix-front-mindshore#45
 2023-12-28 15:07:33 +00:00
Jorge Penadés 232827ef48 WIP: corrective section created: refs #4466 2023-12-28 16:02:04 +01:00
Carlos Satorres 6f78e1a173 refs #6420 importClaimNotes 2023-12-27 13:58:30 +01:00
Kevin Martinez 4de1b52c30 Implement orders no results 2023-12-27 08:08:19 -04:00
Kevin Martinez e3fd9bf54b Add order confirmation 2023-12-27 07:52:47 -04:00
Kevin Martinez b22fcddcd3 Create order lines 2023-12-26 17:45:54 -04:00
Kevin Martinez 1166a79669 Fix order descriptor total 2023-12-26 15:59:52 -04:00
William Buezas 893b1bb4c8 Add department basic data 2023-12-26 16:15:46 -03:00
Carlos Fonseca 5e1e49e253 Merge pull request 'Se crea tabla de notificaciones, tarjeta por identificador y filtros' (#44) from features/ms_93_customer_notifications_2 into dev 
Reviewed-on: hyervoni/salix-front-mindshore#44
 2023-12-26 13:56:09 +00:00
Carlos Fonseca a10b773b29 Merge pull request 'Create order volume' (#42) from feature/order into dev 
Reviewed-on: hyervoni/salix-front-mindshore#42
 2023-12-26 13:55:47 +00:00
Carlos Satorres 191114cf85 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6256-breakWord 2023-12-26 11:54:51 +01:00
Pablo Natek 11224733e8 Merge branch '6259-ticketSmsToClientSms' of https://gitea.verdnatura.es/verdnatura/salix-front into 6259-ticketSmsToClientSms 2023-12-26 09:53:49 +01:00
Pablo Natek f9b2faf918 feat(VnSms): refs #6259 unify ticket and customer sms 2023-12-26 09:53:47 +01:00