Download as
Browse Code »

Commit d55760cb8c4da4561b601203734b214f0b170cb2

Authored by Ronan Tavares Camargo
2 parents 0b81b937 1c5411fe
Exists in master

Merge branch 'master' into cnt-1.1.0-alfa2

Showing 3 changed files with 4 additions and 3 deletions   Show diff stats
cit-tabelas-corp-api/src/main/java/br/com/centralit/api/model/Pessoa.java
  Diff comments   View file @d55760c
... ... @@ -77,7 +77,8 @@ public class Pessoa extends PersistentObjectAuditOrganizacao {
77 77 // TODO acrescentar view do estrutura organizacional, substituir Views.LookupView.class pelo do estrutura organizacional
78 78 @JsonView({ Views.FornecedorFindView.class, Views.LookupView.class, Views.PessoaListViewListView.class, Views.ColaboradorAutoCompleteView.class, Views.ComissaoListView.class, Views.BemPatrimonialAutoCompleteView.class, Views.EntradaListView.class, Views.EstruturaOrganizacionalEditView.class, Views.TransferenciaListView.class, Views.SaidaTemporariaListView.class, Views.AdicaoBemPatrimonialView.class, Views.ParceiroAutoCompleteView.class, Views.BaixaEditView.class,
79 79 Views.SaidaTemporariaItemListView.class, Views.ColaboradorContratoAutoCompleteView.class, Views.SeguradoraAutoCompleteView.class, Views.ComissaoIntegranteEditView.class, Views.InventarioBemPatrimonialInconsistenciaView.class, Views.DadosBemPatrimonialEditView.class, Views.BemPatrimonialInventarioAutoCompleteView.class, Views.BaixaAlmoxarifadoView.class, Views.GenericView.class, Views.InventarioMobileCompleto.class, Views.InventarioMobileSimples.class,
80   - Views.InventarioMobileJEDI.class, Views.DefinicaoDetentorListView.class, ViewsTabelasCorp.CentroResultadoResponsavelTodosResponsaveis.class, ViewsTabelasCorp.CentroResultadoDelegacaoTodasDelegacoes.class, ViewsTabelasCorp.CentroResultadoSubstituicao.class, Views.BemPatrimonialEditView.class, Views.DocumentoGedEdit.class, Views.ProcessoEdit.class, Views.DocumentoGedEdit.class, Views.ContratoView.class, Views.PessoaAutoCompeteView.class })
  80 + Views.InventarioMobileJEDI.class, Views.DefinicaoDetentorListView.class, ViewsTabelasCorp.CentroResultadoResponsavelTodosResponsaveis.class, ViewsTabelasCorp.CentroResultadoDelegacaoTodasDelegacoes.class, ViewsTabelasCorp.CentroResultadoSubstituicao.class, Views.BemPatrimonialEditView.class, Views.DocumentoGedEdit.class, Views.ProcessoEdit.class, Views.DocumentoGedEdit.class, Views.ContratoView.class, Views.PessoaAutoCompeteView.class,
  81 + Views.ProcessoVHView.class})
81 82 private String nome;
82 83  
83 84 /** Atributo email. */
... ...
cit-tabelas-corp-api/src/main/java/br/com/centralit/api/service/impl/EnderecoServiceImpl.java
  Diff comments   View file @d55760c
... ... @@ -289,7 +289,7 @@ public class EnderecoServiceImpl extends GenericServiceImpl<Endereco, Long> impl
289 289 public String buscaUltimoCodigoEndereco(){
290 290 Endereco ultimoRegistro = (Endereco) this.enderecoDao.buscarUltimoRegistroComOrdenadoParametrizada("codigo");
291 291  
292   - Long sequencial = null;
  292 + Long sequencial = 0L;
293 293 if (UtilObjeto.isReferencia(ultimoRegistro)) {
294 294 sequencial = ultimoRegistro.getCodigo() == null ? null : Long.parseLong(ultimoRegistro.getCodigo());
295 295 }
... ...
cit-tabelas-corp-web/src/main/webapp/html/pessoa/contatos.html
  Diff comments   View file @d55760c
... ... @@ -48,7 +48,7 @@
48 48 </label>
49 49 <i ng-show="formPessoa['cpfContato'].$error.required && (!formPessoa['cpfContato'].$pristine)" class='fa fa-warning red' tooltip="{{$translate.instant('CORPORATIVO.LABEL.REPRESENTANTE_LEGAL') + ' ' +$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}" tooltip-placement='top'></i>
50 50 <input type="text" ng-cpf class='form-control' id="cpfContato" name="cpfContato" ng-model="contato.cpf" ui-mask="999.999.999-99" ng-disabled="isVisualizar" ng-required="contato.representanteLegal"/>
51   - <p class='help-block small red' ng-show="contato.cpf && !formPessoa.cpfContato.$valid"><translate>CORPORATIVO.LABEL.CPF</translate><translate>LABEL.INVALIDO</translate> </p>
  51 + <p class='help-block small red' ng-show="contato.cpf && !formPessoa.cpfContato.$valid"><translate>CORPORATIVO.LABEL.CPF</translate> <translate>LABEL.INVALIDO</translate> </p>
52 52 </div>
53 53 </div>
54 54 <div class='col-sm-4'>
... ...