diff --git a/CHANGELOG.md b/CHANGELOG.md index c1d078563..d203c8796 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ Todas as alterações serão documentadas neste arquivo Formato baseado em [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), e [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [4.20.2] - 2020-12-06 + +## Fixed +- Adequação para permitir editar observações de lançamentos financeiros. [@Pr3d4dor](https://github.com/Pr3d4dor) + ## [4.20.1] - 2020-11-10 ## Fixed diff --git a/README.md b/README.md index 501c29f33..15a8e9488 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ![MapOS](https://raw.githubusercontent.com/RamonSilva20/mapos/master/assets/img/logo.png) -![version](https://img.shields.io/badge/version-4.20.1-blue.svg?longCache=true&style=flat-square) +![version](https://img.shields.io/badge/version-4.20.2-blue.svg?longCache=true&style=flat-square) ![license](https://img.shields.io/badge/license-MIT-green.svg?longCache=true&style=flat-square) ![theme](https://img.shields.io/badge/theme-Matrix--Admin-lightgrey.svg?longCache=true&style=flat-square) ![issues](https://img.shields.io/github/issues/RamonSilva20/mapos.svg?longCache=true&style=flat-square) diff --git a/application/config/config.php b/application/config/config.php index d63de868a..4da741984 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -4,7 +4,7 @@ /** * App current version */ -$config['app_version'] = '4.20.1'; +$config['app_version'] = '4.20.2'; /** * Nome do sistema diff --git a/application/controllers/Financeiro.php b/application/controllers/Financeiro.php index f4e6facd5..11af3c306 100644 --- a/application/controllers/Financeiro.php +++ b/application/controllers/Financeiro.php @@ -266,6 +266,7 @@ public function editar() 'cliente_fornecedor' => $this->input->post('fornecedor'), 'forma_pgto' => $this->input->post('formaPgto'), 'tipo' => $this->input->post('tipo'), + 'observacoes' => $this->input->post('observacoes'), ]; if ($this->financeiro_model->edit('lancamentos', $data, 'idLancamentos', $this->input->post('id')) == true) { diff --git a/application/views/financeiro/lancamentos.php b/application/views/financeiro/lancamentos.php index 354b6eac9..45f118497 100644 --- a/application/views/financeiro/lancamentos.php +++ b/application/views/financeiro/lancamentos.php @@ -116,7 +116,7 @@ + echo ' Nenhum lançamento encontrado '; } @@ -144,7 +144,7 @@ echo ''; if ($this->permission->checkPermission($this->session->userdata('permissao'), 'eLancamento')) { - echo ''; + echo ''; } if ($this->permission->checkPermission($this->session->userdata('permissao'), 'dLancamento')) { echo ''; @@ -346,7 +346,10 @@ - +
+ + +
@@ -539,6 +542,7 @@ $("#idEditar").val($(this).attr('idLancamento')); $("#descricaoEditar").val($(this).attr('descricao')); $("#fornecedorEditar").val($(this).attr('cliente')); + $("#observacoes_edit").val($(this).attr('observacoes')); $("#valorEditar").val($(this).attr('valor')); $("#vencimentoEditar").val($(this).attr('vencimento')); $("#pagamentoEditar").val($(this).attr('pagamento'));