citsmart-grp / cit-grp-almoxarifado

31 May, 2016

6 commits

2bd74392 Redmine #4999 Browse Code »

Ronan Tavares Camargo
2016-05-31 14:53:01 -0300
572fb117 Merge branch 'adm-1.16.0' of http://ferramentasgo.centralit.com.br:8080/scm/git/… ... Browse Code »
```
…cit-grp-almoxarifado into adm-1.16.0
```
Ronan Tavares Camargo
2016-05-31 14:37:16 -0300
32405cfb Redmine #4999 Browse Code »

Ronan Tavares Camargo
2016-05-31 14:37:09 -0300
f23a138a Redmine #4936 Browse Code »

joyfas.silva
2016-05-31 14:30:57 -0300
f0feb942 Redmine #4936 Browse Code »

joyfas.silva
2016-05-31 13:22:04 -0300
cbf934b8 Redmine #4999 | Correção problema ao excluir atendimento Browse Code »

Ronan Tavares Camargo
2016-05-31 11:48:20 -0300

30 May, 2016

20 commits

86fecd57 Correção metodo de remover materiais busca avançada do atendimento requisicao consumo Browse Code »

Ronan Tavares Camargo
2016-05-30 18:01:20 -0300
016864fc Correções Browse Code »

Ronan Tavares Camargo
2016-05-30 17:42:12 -0300
111f5cc4 Merge branch 'adm-1.16.0' of http://ferramentasgo.centralit.com.br:8080/scm/git/… ... Browse Code »
```
…cit-grp-almoxarifado into adm-1.16.0
```
erick.sato
2016-05-30 17:29:05 -0300
00795e02 Redmine #4935 Quantidade em estoque Browse Code »

erick.sato
2016-05-30 17:28:56 -0300
5ed8b28f Merge branch 'adm-1.16.0' of http://ferramentasgo.centralit.com.br:8080/scm/git/… ... Browse Code »
```
…cit-grp-almoxarifado into adm-1.16.0
```
Ronan Tavares Camargo
2016-05-30 17:14:31 -0300
667b7376 Correções atendimento requisição de consumo Browse Code »

Ronan Tavares Camargo
2016-05-30 17:14:23 -0300
8c915b8e Redmin #4936 Browse Code »

joyfas.silva
2016-05-30 17:07:43 -0300
03f19ad9 Merge branch 'adm-1.16.0' of http://ferramentasgo.centralit.com.br:8080/scm/git/… ... Browse Code »
```
…cit-grp-almoxarifado into adm-1.16.0
```
joyfas.silva
2016-05-30 16:11:14 -0300
8a188e88 Redmine #4824 Browse Code »

joyfas.silva
2016-05-30 16:01:57 -0300
16dfde2e Merge branch 'adm-1.16.0' of http://ferramentasgo.centralit.com.br:8080/scm/git/… ... Browse Code »
```
…cit-grp-almoxarifado into adm-1.16.0
```
Ronan Tavares Camargo
2016-05-30 15:24:24 -0300
090e2794 Redmine Atendimento #4999 Browse Code »

Ronan Tavares Camargo
2016-05-30 15:22:47 -0300
e5321a8f Redmine #4679 Remoção ng if campo tipo recebimento Browse Code »

erick.sato
2016-05-30 11:03:59 -0300
a4b343fb Merge branch 'adm-1.16.0' of http://ferramentasgo.centralit.com.br:8080/scm/git/… ... Browse Code »
```
…cit-grp-almoxarifado into adm-1.16.0
```
Ronan Tavares Camargo
2016-05-30 10:55:46 -0300
dbaa048c Correção método que conta quantidade atendida de um material Browse Code »

Ronan Tavares Camargo
2016-05-30 10:55:38 -0300
5037ac23 Merge branch 'adm-1.16.0' of http://ferramentasgo.centralit.com.br:8080/scm/git/… ... Browse Code »
```
…cit-grp-almoxarifado into adm-1.16.0
```
erick.sato
2016-05-30 09:38:07 -0300
3339cd54 Redmine #5074 Validação quantidade ressuprimento Browse Code »

erick.sato
2016-05-30 09:37:58 -0300
37153882 Merge branch 'adm-1.16.0' of http://ferramentasgo.centralit.com.br:8080/scm/git/… ... Browse Code »
```
…cit-grp-almoxarifado into adm-1.16.0
```
Ronan Tavares Camargo
2016-05-30 09:15:32 -0300
bdc42ac0 Remoção de método não utilizado Browse Code »

Ronan Tavares Camargo
2016-05-30 09:15:22 -0300
a0b01b1b Redmine #tarefa-3816 Browse Code »

joyfas.silva
2016-05-30 09:02:39 -0300
9284e269 Redmine #5043 Reformulação ressuprimento notificação Browse Code »

erick.sato
2016-05-30 08:55:40 -0300

29 May, 2016

2 commits

b8f36bb7 Merge branch 'tarefa-3822' into adm-1.16.0 ... Browse Code »

# Conflicts:
#	cit-almoxarifado-api/src/main/java/br/com/centralit/api/dao/RequisicaoConsumoDao.java
#	cit-almoxarifado-api/src/main/java/br/com/centralit/api/dao/impl/RequisicaoConsumoDaoHibernate.java
#	cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/RequisicaoConsumoItemService.java
#	cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/RequisicaoConsumoService.java
#	cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/impl/EntradaAlmoxarifadoItemServiceImpl.java
#	cit-almoxarifado-api/src/main/java/br/com/centralit/api/service/impl/RequisicaoConsumoServiceImpl.java
#	cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/AtendimentoRequisicaoConsumoListController.js
#	cit-almoxarifado-web/src/main/webapp/html/atendimentoRequisicaoConsumo/atendimentoRequisicaoConsumoList.html

2016-05-29 20:24:18 -0300

38bf80fa Redmine #5043 Salvar e editar atendimento requisicao Browse Code »

Erick.sato
2016-05-29 20:06:55 -0300

25 May, 2016

12 commits

9130d51b Redmine #5043 Alteração item requisição consumo Browse Code »

erick.sato
2016-05-25 18:01:00 -0300
00e6fa5c Merge branch 'tarefa-3815' into adm-1.16.0 Browse Code »

joyfas.silva
2016-05-25 17:26:37 -0300
a4f6c726 Merge remote-tracking branch 'remotes/origin/adm-1.16.0' into tarefa-3815 Browse Code »

joyfas.silva
2016-05-25 17:25:10 -0300
c6232142 Redmine #tarefa-5046 Browse Code »

joyfas.silva
2016-05-25 17:24:17 -0300
4bc0538c Redmine #4922 Corrigindo mudança de tipo de campo (Decimal/inteiro) na quantidad… ... Browse Code »
```
…e na entrada de materiais.
```
geovane.filho
2016-05-25 17:16:15 -0300
3946521f Merge branch 'tarefa-3822' of http://ferramentasgo.centralit.com.br:8080/scm/git… ... Browse Code »
```
…/cit-grp-almoxarifado into tarefa-3822
```
erick.sato
2016-05-25 16:57:35 -0300
43a55b4c Redmine #5043 Validação excluir atendimento Browse Code »

erick.sato
2016-05-25 16:57:28 -0300
d2fac221 Merge branch 'tarefa-3822' of http://ferramentasgo.centralit.com.br:8080/scm/git… ... Browse Code »
```
…/cit-grp-almoxarifado into tarefa-3822
```
Ronan Tavares Camargo
2016-05-25 16:54:02 -0300
be19d893 Redmine Atendimento #4999 Browse Code »

Ronan Tavares Camargo
2016-05-25 16:53:51 -0300
23ed04da Redmine #5043 Tela visualizar atendimento Browse Code »

erick.sato
2016-05-25 16:45:54 -0300
03da991f Redmine #5043 Update registro excluido atendimento requisição Browse Code »

erick.sato
2016-05-25 16:22:43 -0300
780c5282 Merge branch 'tarefa-3822' of http://ferramentasgo.centralit.com.br:8080/scm/git… ... Browse Code »
```
…/cit-grp-almoxarifado into tarefa-3822
```
erick.sato
2016-05-25 16:04:25 -0300