diff --git a/src/Cacic/CommonBundle/Entity/ComputadorColetaRepository.php b/src/Cacic/CommonBundle/Entity/ComputadorColetaRepository.php
index 1ba62c3..87263e7 100644
--- a/src/Cacic/CommonBundle/Entity/ComputadorColetaRepository.php
+++ b/src/Cacic/CommonBundle/Entity/ComputadorColetaRepository.php
@@ -270,7 +270,76 @@ class ComputadorColetaRepository extends EntityRepository
         if ( array_key_exists('conf', $filtros) && !empty($filtros['conf']) )
             $qb->andWhere('property.idClassProperty IN (:conf)')->setParameter('conf', explode( ',', $filtros['conf'] ));
 
+        return $qb->getQuery()->execute();
+    }
+
+    public function gerarRelatorioPatrimonio($filtros)
+    {
+        // Monta a Consulta básica...
+        $qb = $this->createQueryBuilder('coleta')
+            ->select( 'DISTINCT(comp.nmComputador), so.sgSo, class.nmPropertyName, coleta.teClassPropertyValue,
+                        r.teIpRede, r.idRede, r.nmRede, l.nmLocal, comp.idComputador,so.inMswindows, u.nmUorg')
+            ->innerJoin('CacicCommonBundle:Computador', 'comp','WITH','coleta.computador = comp.idComputador')
+            ->innerJoin('CacicCommonBundle:PropriedadeSoftware', 'prop', 'WITH', 'comp.idComputador = prop.computador')
+            ->innerJoin('CacicCommonBundle:ClassProperty', 'class','WITH', 'coleta.classProperty = class.idClassProperty')
+            ->innerJoin('CacicCommonBundle:Classe', 'classe','WITH', 'class.idClass = classe.idClass')
+            ->leftJoin('CacicCommonBundle:So', 'so','WITH','comp.idSo = so.idSo')
+            ->leftJoin('CacicCommonBundle:Rede', 'r','WITH', 'comp.idRede = r.idRede')
+            ->innerJoin('CacicCommonBundle:Uorg','u','WITH', 'r.idRede = u.rede')
+            ->innerJoin('CacicCommonBundle:Local','l','WITH', 'r.idLocal = l.idLocal')
+            ->groupBy('comp.nmComputador,r.idRede, class.nmPropertyName, u.nmUorg, coleta.teClassPropertyValue,so.sgSo, r.teIpRede,  l.nmLocal, r.nmRede, comp.idComputador,so.inMswindows')
+            ->orderBy('r.teIpRede, l.nmLocal');
+
+        /*
+         * Verifica os filtros que foram parametrizados
+         */
+
+        if ( array_key_exists('locais', $filtros) && !empty($filtros['locais']) )
+            $qb->andWhere('l.idLocal IN (:locais)')->setParameter('locais', explode( ',', $filtros['locais'] ));
+
+        if ( array_key_exists('so', $filtros) && !empty($filtros['so']) )
+            $qb->andWhere('comp.idSo IN (:so)')->setParameter('so', explode( ',', $filtros['so'] ));
+
+        if ( array_key_exists('conf', $filtros) && !empty($filtros['conf']) )
+            $qb->andWhere('class.idClassProperty IN (:conf)')->setParameter('conf', explode( ',', $filtros['conf'] ));
+
+        if ( array_key_exists('uorg', $filtros) && !empty($filtros['uorg']) )
+            $qb->andWhere('u.idUorg IN (:uorg)')->setParameter('uorg', explode( ',', $filtros['uorg'] ));
 
         return $qb->getQuery()->execute();
     }
+
+    public function gerarRelatorioSemPatrimonio($filtros)
+    {
+        // Monta a Consulta básica...
+        $qb = $this->createQueryBuilder('coleta')
+            ->select( 'DISTINCT(comp.nmComputador), so.sgSo,
+                        r.teIpRede, r.idRede, r.nmRede, l.nmLocal, comp.idComputador,so.inMswindows, u.nmUorg')
+            ->innerJoin('CacicCommonBundle:Computador', 'comp','WITH','coleta.computador = comp.idComputador')
+            ->innerJoin('CacicCommonBundle:PropriedadeSoftware', 'prop', 'WITH', 'comp.idComputador = prop.computador')
+            ->innerJoin('CacicCommonBundle:ClassProperty', 'class','WITH', 'coleta.classProperty = class.idClassProperty')
+            ->innerJoin('CacicCommonBundle:Classe', 'classe','WITH', 'class.idClass = classe.idClass')
+            ->leftJoin('CacicCommonBundle:So', 'so','WITH','comp.idSo = so.idSo')
+            ->leftJoin('CacicCommonBundle:Rede', 'r','WITH', 'comp.idRede = r.idRede')
+            ->innerJoin('CacicCommonBundle:Uorg','u','WITH', 'r.idRede = u.rede')
+            ->innerJoin('CacicCommonBundle:Local','l','WITH', 'r.idLocal = l.idLocal')
+            ->groupBy('comp.nmComputador,r.idRede, u.nmUorg,so.sgSo, r.teIpRede,  l.nmLocal, r.nmRede, comp.idComputador,so.inMswindows')
+            ->orderBy('r.teIpRede, l.nmLocal');
+
+        /*
+         * Verifica os filtros que foram parametrizados
+         */
+
+        if ( array_key_exists('locais', $filtros) && !empty($filtros['locais']) )
+            $qb->andWhere('l.idLocal IN (:locais)')->setParameter('locais', explode( ',', $filtros['locais'] ));
+
+        if ( array_key_exists('so', $filtros) && !empty($filtros['so']) )
+            $qb->andWhere('comp.idSo IN (:so)')->setParameter('so', explode( ',', $filtros['so'] ));
+
+
+        if ( array_key_exists('uorg', $filtros) && !empty($filtros['uorg']) )
+            $qb->andWhere('u.idUorg IN (:uorg)')->setParameter('uorg', explode( ',', $filtros['uorg'] ));
+
+            return $qb->getQuery()->execute();
+    }
 }
diff --git a/src/Cacic/CommonBundle/Entity/UorgRepository.php b/src/Cacic/CommonBundle/Entity/UorgRepository.php
index 14e91df..0b64b78 100644
--- a/src/Cacic/CommonBundle/Entity/UorgRepository.php
+++ b/src/Cacic/CommonBundle/Entity/UorgRepository.php
@@ -15,7 +15,8 @@ class UorgRepository extends EntityRepository
     public function listar()
     {
         $_dql = "SELECT uorg.idUorg, uorg.nmUorg
-				FROM CacicCommonBundle:Uorg uorg";
+				FROM CacicCommonBundle:Uorg uorg
+				ORDER BY uorg.uorgPai DESC, uorg.idUorg DESC ";
 
         return $this->getEntityManager()->createQuery( $_dql )->getArrayResult();
     }
diff --git a/src/Cacic/RelatorioBundle/Controller/DefaultController.php b/src/Cacic/RelatorioBundle/Controller/DefaultController.php
index 9cd7110..a3de0f5 100644
--- a/src/Cacic/RelatorioBundle/Controller/DefaultController.php
+++ b/src/Cacic/RelatorioBundle/Controller/DefaultController.php
@@ -30,15 +30,13 @@ class DefaultController extends Controller
 	{
         $locais = $this->getDoctrine()->getRepository('CacicCommonBundle:Local')->listar();
         $so = $this->getDoctrine()->getRepository('CacicCommonBundle:So')->listar();
-        $sw = $this->getDoctrine()->getRepository('CacicCommonBundle:Software')->listarSoftware();
         $uorg = $this->getDoctrine()->getRepository('CacicCommonBundle:Uorg')->listar();
         $conf = $this->getDoctrine()->getRepository('CacicCommonBundle:ComputadorColeta')->listarPropriedades('Patrimonio');
-//
+
 
         return $this->render(
             'CacicRelatorioBundle:Default:patrimonio.html.twig',
             array(
-                'sw'        => $sw,
                 'locais' 	=> $locais,
                 'so'		=> $so,
                 'conf'      => $conf,
@@ -51,22 +49,26 @@ class DefaultController extends Controller
      */
     public function patrimonioRelatorioAction( Request $request )
     {
-      	$filtros = $request->get('rel_filtro_patrimonio');
-        $locale = $request->getLocale();
-    	$dados = $this->getDoctrine()
-            ->getRepository('CacicCommonBundle:Software')
-            ->gerarRelatorioPatrimonio( $filtros );
+      	  $filtros = $request->get('rel_filtro_patrimonio');
+          $locale = $request->getLocale();
+
+        if($filtros['conf'] <> ""){
+            $dados = $this->getDoctrine()
+                ->getRepository('CacicCommonBundle:ComputadorColeta')
+                ->gerarRelatorioPatrimonio( $filtros );
+        }
+        else{
+            $dados = $this->getDoctrine()
+                ->getRepository('CacicCommonBundle:ComputadorColeta')
+                ->gerarRelatorioSemPatrimonio( $filtros );
+        }
 
-        //  Debug::dump($filtros);die;
         return $this->render(
             'CacicRelatorioBundle:Default:rel_patrimonio.html.twig',
             array(
                 'idioma'=>$locale,
-                'dados' => $dados,/*
-                'menu' => (bool) strlen( $filtros['pci']),*/
-            	'exibirColunaSoftware' => (bool) strlen( $filtros['softwares']
-
-    )
+                'dados' => $dados,
+                'menu' => (bool) strlen( $filtros['conf'])
             )
         );
     }
diff --git a/src/Cacic/RelatorioBundle/Resources/views/Default/patrimonio.html.twig b/src/Cacic/RelatorioBundle/Resources/views/Default/patrimonio.html.twig
index 021e804..36a484e 100644
--- a/src/Cacic/RelatorioBundle/Resources/views/Default/patrimonio.html.twig
+++ b/src/Cacic/RelatorioBundle/Resources/views/Default/patrimonio.html.twig
@@ -14,19 +14,11 @@
 	<script src="{{ asset('bundles/cacicrelatorio/libs/bootstrap-transfer-master/js/bootstrap-transfer.js') }}" type="text/javascript"></script>
 	<script type="text/javascript">
 		$(document).ready(function(){
-            var tSW = $('#transferSW').bootstrapTransfer({'target_id':'tSw'});
 		    var tLoc = $('#transferLocais').bootstrapTransfer({'target_id':'tLoc'});
 		    var tSO = $('#transferSO').bootstrapTransfer({'target_id':'tSo'});
             var tConf = $('#transferConf').bootstrapTransfer({'target_id':'tConf'});
 			var tUorg = $('#transferUorg').bootstrapTransfer({'target_id':'tUorg'});
 
-            tSW.populate([ // Popula o TRANSFER com Softwares
-                {% for sw in sw %}
-                {value: "{{ sw['idSoftware'] }}", content:"{{ sw['nmSoftware'] }}"}{% if loop.last != true %},{% endif %}
-
-                {% endfor %}
-            ]);
-
 		    tLoc.populate([ // Popula o TRANSFER com Locais
 		        {% for l in locais %}
 		        {value: "{{ l[0]['idLocal'] }}", content:"{{ l[0]['nmLocal'] ~ '/' ~ l[0]['sgLocal'] }}"}{% if loop.last != true %},{% endif %}
@@ -60,7 +52,6 @@
 					'form' : $('#frmFiltroRelatorioPatrimonio'),
 					'fieldsPrefix' : 'rel_filtro_patrimonio',
 					'elms' : [
-                        { 'transferElement' : tSW  , 'inputHiddenName' : 'softwares'  },
 						{ 'transferElement' : tLoc , 'inputHiddenName' : 'locais' },
 		      			{ 'transferElement' : tSO  , 'inputHiddenName' : 'so' },
 						{ 'transferElement' : tUorg  , 'inputHiddenName' : 'uorg' },
@@ -101,9 +92,6 @@
 				<h4>{{ 'Selecione as informações que deseja exibir'|trans }}</h4>
                 <div id="transferConf"></div>
 
-                <h4>{{ 'Selecione os Softwares que deseja exibir'|trans }}</h4>
-                <div id="transferSW"></div>
-
 	            <h4>{{ 'Selecione os Locais'|trans }}</h4>
 	            <div id="transferLocais"></div>
 	            
diff --git a/src/Cacic/RelatorioBundle/Resources/views/Default/rel_patrimonio.html.twig b/src/Cacic/RelatorioBundle/Resources/views/Default/rel_patrimonio.html.twig
index 821b569..3907d85 100644
--- a/src/Cacic/RelatorioBundle/Resources/views/Default/rel_patrimonio.html.twig
+++ b/src/Cacic/RelatorioBundle/Resources/views/Default/rel_patrimonio.html.twig
@@ -7,7 +7,7 @@
 
     <hr />
 
-    <table class="table table-striped table-bordered">
+    <table class="display datatable" id="datatable">
         <thead>
         <tr>
 			<th width="5%" style="text-align: center"></th>
@@ -15,9 +15,11 @@
             <th width="10%">{{ "S.O"|trans }}</th>
             <th width="20%">{{ "Sub-rede"|trans }}</th>
             <th width="10%">{{ "Local"|trans }}</th>
-            {%  if ( exibirColunaSoftware ) %}
-                <th width="20%">{{ "Software"|trans }}</th>
-            {%  endif %}
+            <th width="5%">{{ "Unidade" }}</th>
+            {% if menu  %}
+                <th width="10%">{{ "Propriedade"|trans }}</th>
+                <th width="10%">{{ "Valor"|trans }}</th>
+            {% endif %}
 
 
         </tr>
@@ -39,16 +41,17 @@
 					{{ reg['teIpRede'] }}/{{ reg['nmRede'] }}
 				</a></td>
                 <td>{{ reg['nmLocal'] }}</td>
-                {%  if ( exibirColunaSoftware ) %}
-                <td>{{ reg['nmSoftware'] }}</td>
+                <td>{{ reg['nmUorg'] }}</td>
+                {%  if ( menu ) %}
+                    <td>{{ reg['nmPropertyName'] }}</td>
+                    <td>{{ reg['teClassPropertyValue'] }}</td>
                 {%  endif %}
 
-
             </tr>
 
         {% else %}
             <tr>
-                <td style="text-align: center" colspan="{%  if ( exibirColunaSoftware ) %}5{% else %}4{% endif %}"><b>{{ "NENHUM REGISTRO ENCONTRADO!"|trans }}</b></td>
+                <td style="text-align: center" colspan="{%  if ( menu ) %}6{% else %}5{% endif %}"><b>{{ "NENHUM REGISTRO ENCONTRADO!"|trans }}</b></td>
             </tr>
         {% endfor %}
 
--
libgit2 0.21.2