Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2.6] Portabilis patch 29/10/2021 #807

Merged
merged 35 commits into from
Nov 4, 2021
Merged

[2.6] Portabilis patch 29/10/2021 #807

Changes from 2 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
e527a1c
Ordena matriculas pelo nome da serie
Bonot Oct 13, 2021
363f5a8
Cria view com os novos campos
rodrigocabral Oct 13, 2021
7cb342c
Adiciona novos campos para serem selcionados na tela do exportador
rodrigocabral Oct 13, 2021
02663ed
Corrige erro de sintaxe
Bonot Oct 13, 2021
2160be3
Corrige codigo da escola do historico de transferencia
Bonot Oct 18, 2021
b27de2d
Merge pull request #8654 from portabilis/issue-441
Oct 18, 2021
ce3bf3a
Style code
rodrigocabral Oct 18, 2021
fc7d7d3
Style code
edersoares Oct 18, 2021
c06cf76
Apresenta botao de cancelar transferencia apenas quando tem permissao
Bonot Oct 18, 2021
d9a08e1
Corrige problema ao apresentar mensagem de sucesso no cancelamento da…
Bonot Oct 18, 2021
4156161
Ajusta campo cnpj para obrigatório no cadastro e edição de pessoa jur…
Oct 19, 2021
23e7d8d
Merge pull request #8652 from portabilis/issue-826
Bonot Oct 19, 2021
141b9ee
Merge pull request #8662 from portabilis/issue-854
Bonot Oct 19, 2021
21b108c
Merge pull request #8663 from portabilis/issue-808
Bonot Oct 19, 2021
2bc43dc
Merge pull request #8655 from portabilis/issue-748
Bonot Oct 19, 2021
1ead550
Remove obrigatoriedade de CNPJ para pessoa Jurídica
Oct 20, 2021
7f6b0fd
Retorna flash message edição de cadastro
Oct 20, 2021
acb4a4f
Adiciona verificação de tipo na variável
jrbarros Oct 20, 2021
1574563
Adiciona validação para ignorar turmas com curso padrao_ano_escolar
jrbarros Oct 20, 2021
546c317
Adiciona implode removido
jrbarros Oct 21, 2021
2ee9658
Corrige variável correta na condicional padrão
jrbarros Oct 25, 2021
aa64c2c
Merge pull request #8668 from portabilis/issue-877
jrbarros Oct 25, 2021
4bc7fc3
Corrige bug que permitia que dados da turma, como escola curso e séri…
rodrigocabral Oct 25, 2021
c2309b9
Merge pull request #8671 from portabilis/issue-886
Oct 25, 2021
5027413
remove _set flash message
lucasferreiraestevam Oct 26, 2021
68a1728
Merge pull request #8664 from portabilis/issue-850
lucasferreiraestevam Oct 26, 2021
3e862c2
Adiciona campos faltantes no detalhe dos uniformes do aluno
jrbarros Oct 27, 2021
844496f
Merge pull request #8675 from portabilis/fix-uniforme
jrbarros Oct 27, 2021
aace697
Inicia variável
jrbarros Oct 28, 2021
cc9b976
Merge pull request #8677 from portabilis/fix-variavel
jrbarros Oct 28, 2021
d1ac834
Remove string vazia do slug evitando problemas de pesquisa
rodrigocabral Oct 28, 2021
2f7fd0b
Merge pull request #8678 from portabilis/hotfix-slug
Oct 28, 2021
bfcdf71
Merge branch 'main' into community-patch-2021-10-29
edersoares Oct 29, 2021
ae79446
Merge pull request #8679 from portabilis/community-patch-2021-10-29
edersoares Oct 29, 2021
7272e06
Atualiza dependências
edersoares Oct 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ieducar/intranet/educar_aluno_det.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,6 +766,8 @@ public function Gerar()
]);
$this->addDetalhe(['Quantidade de camisetas (manga curta)', $reg['camiseta_curta_qtd'] ?: '0']);
$this->addDetalhe(['Quantidade de camisetas (manga longa)', $reg['camiseta_longa_qtd'] ?: '0']);
$this->addDetalhe(['Quantidade de camisetas infantis (sem manga)', $reg['camiseta_infantil_qtd'] ?: '0']);
$this->addDetalhe(['Quantidade de calça jeans', $reg['calca_jeans_qtd'] ?: '0']);
$this->addDetalhe(['Quantidade de meias', $reg['meias_qtd'] ?: '0']);
$this->addDetalhe(['Bermudas tectels (masculino)', $reg['bermudas_tectels_qtd'] ?: '0']);
$this->addDetalhe(['Bermudas coton (feminino)', $reg['bermudas_coton_qtd'] ?: '0']);
Expand Down