11 May, 2016
7 commits
-
# Conflicts: # cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/EntradaAlmoxarifadoController.js
-
…/cit-grp-almoxarifado into tarefa-3943
10 May, 2016
9 commits
-
…/cit-grp-almoxarifado into tarefa-3943
-
# Conflicts: # cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/EntradaAlmoxarifadoController.js # cit-almoxarifado-web/src/main/webapp/html/entradaAlmoxarifado/dialog_add_materiais.html
09 May, 2016
2 commits
06 May, 2016
4 commits
05 May, 2016
6 commits
04 May, 2016
7 commits
-
…cit-grp-almoxarifado into adm-1.15.0 # Conflicts: # cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/EnderecoEstoque.java # cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/MaterialEstoque.java # cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/MaterialEstoqueFIFOItem.java # cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/MaterialLocalEstoque.java # cit-almoxarifado-api/src/main/java/br/com/centralit/api/model/MovimentoEstoque.java
03 May, 2016
2 commits
02 May, 2016
3 commits