diff --git a/03 - Painéis/CADASTRO - Categoria.xml b/03 - Painéis/CADASTRO - Categoria.xml
index 7c57467..02fb377 100644
--- a/03 - Painéis/CADASTRO - Categoria.xml	
+++ b/03 - Painéis/CADASTRO - Categoria.xml	
@@ -99,7 +99,10 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
             habilitaCampos(true);      
             engine.getLayout('pnlTitulo').getRootComposition().setVisible(false);
             engine.getLayout('pnlInclusao').getRootComposition().setVisible(true);           
-            engine.getWidgetController('btnVoltar').getButton().setVisible(true); 
+            engine.getWidgetController('btnVoltar').getButton().setVisible(true);
+            engine.getField('idPesquisaLista')['setValue(java.lang.String)'](null);
+            engine.getField('listaPrincipal').refresh();
+            engine.getField('idPesquisa')['setValue(java.lang.Object)'](null); 
             
             engine.getField('idDescricao').focus(); 
                            
diff --git a/03 - Painéis/CADASTRO - Combustivel.xml b/03 - Painéis/CADASTRO - Combustivel.xml
index 7b94afb..ecdd2c1 100644
--- a/03 - Painéis/CADASTRO - Combustivel.xml	
+++ b/03 - Painéis/CADASTRO - Combustivel.xml	
@@ -99,6 +99,9 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
             engine.getLayout('pnlTitulo').getRootComposition().setVisible(false);
             engine.getLayout('pnlInclusao').getRootComposition().setVisible(true);           
             engine.getWidgetController('btnVoltar').getButton().setVisible(true); 
+            engine.getField('idPesquisaLista')['setValue(java.lang.String)'](null);
+            engine.getField('listaPrincipal').refresh();
+            engine.getField('idPesquisa')['setValue(java.lang.Object)'](null);
             
             engine.getField('idChave').focus(); 
                            
diff --git a/03 - Painéis/CADASTRO - Forma_de_Pagamento.xml b/03 - Painéis/CADASTRO - Forma_de_Pagamento.xml
index 445d347..310d475 100644
--- a/03 - Painéis/CADASTRO - Forma_de_Pagamento.xml	
+++ b/03 - Painéis/CADASTRO - Forma_de_Pagamento.xml	
@@ -99,6 +99,9 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
             engine.getLayout('pnlTitulo').getRootComposition().setVisible(false);
             engine.getLayout('pnlInclusao').getRootComposition().setVisible(true);           
             engine.getWidgetController('btnVoltar').getButton().setVisible(true); 
+            engine.getField('idPesquisaLista')['setValue(java.lang.String)'](null);
+            engine.getField('listaPrincipal').refresh();
+            engine.getField('idPesquisa')['setValue(java.lang.Object)'](null);
             
             engine.getField('idChave').focus(); 
                            
diff --git a/03 - Painéis/CADASTRO - Fornecedores.xml b/03 - Painéis/CADASTRO - Fornecedores.xml
index 3087973..b35a9a7 100644
--- a/03 - Painéis/CADASTRO - Fornecedores.xml	
+++ b/03 - Painéis/CADASTRO - Fornecedores.xml	
@@ -102,6 +102,9 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
             engine.getLayout('pnlTitulo').getRootComposition().setVisible(false);
             engine.getLayout('pnlInclusao').getRootComposition().setVisible(true);           
             engine.getWidgetController('btnVoltar').getButton().setVisible(true); 
+            engine.getField('idPesquisaLista')['setValue(java.lang.String)'](null);
+            engine.getField('listaPrincipal').refresh();
+            engine.getField('idPesquisa')['setValue(java.lang.Object)'](null);
             
             engine.getField('idRazao').focus(); 
                            
diff --git a/03 - Painéis/CADASTRO - Funcionários.xml b/03 - Painéis/CADASTRO - Funcionários.xml
index 1e47544..a523a24 100644
--- a/03 - Painéis/CADASTRO - Funcionários.xml	
+++ b/03 - Painéis/CADASTRO - Funcionários.xml	
@@ -102,7 +102,10 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
             habilitaCampos(true);      
             engine.getLayout('pnlTitulo').getRootComposition().setVisible(false);
             engine.getLayout('pnlInclusao').getRootComposition().setVisible(true);           
-            engine.getWidgetController('btnVoltar').getButton().setVisible(true); 
+            engine.getWidgetController('btnVoltar').getButton().setVisible(true);
+            engine.getField('idPesquisaLista')['setValue(java.lang.String)'](null);
+            engine.getField('listaPrincipal').refresh();
+            engine.getField('idPesquisa')['setValue(java.lang.Object)'](null);
             
             engine.getField('idChave').focus(); 
                            
@@ -387,7 +390,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
 							</DBSearchField>
 							<HorizontalLayout width="100%" spacing="true">                    
 	                           <TextField id="idChave" type="number" caption="Código" width="100%" expandRatio="0.08" />                              
-	                           <TextField id="idDescricao" type="string" caption="Nome" required="true" width="100%" expandRatio="1"  /> 
+	                           <TextField id="idDescricao" type="string" text-transform="uppercase" caption="Nome" required="true" width="100%" expandRatio="1"  /> 
 	                        </HorizontalLayout>
 	                        <HorizontalLayout width="70%" spacing="true">
 	                        	<DateField id="idAdmissao" type="date" caption="Admissão" resolution="DAY" width="100%" expandRatio="0.3"/>
@@ -430,7 +433,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
 	                     <onClickScript language="JavaScript">
 	                        <![CDATA[
 	                           function run() {
-	                           	engine.setGlobalVariable('painelLista',0);
+	                           	  engine.setGlobalVariable('painelLista',0);
 	                              engine.getGlobalVariable('novoRegistro')();
 	                           }
 	                        ]]>
diff --git a/03 - Painéis/CADASTRO - Operacoes.xml b/03 - Painéis/CADASTRO - Operacoes.xml
index c62379a..1a3269f 100644
--- a/03 - Painéis/CADASTRO - Operacoes.xml	
+++ b/03 - Painéis/CADASTRO - Operacoes.xml	
@@ -100,6 +100,9 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
             engine.getLayout('pnlTitulo').getRootComposition().setVisible(false);
             engine.getLayout('pnlInclusao').getRootComposition().setVisible(true);           
             //engine.getWidgetController('btnVoltar').getButton().setVisible(true); 
+            engine.getField('idPesquisaLista')['setValue(java.lang.String)'](null);
+            engine.getField('listaPrincipal').refresh();
+            engine.getField('idPesquisa')['setValue(java.lang.Object)'](null);
             
             engine.getField('idChave').focus(); 
                            
diff --git a/03 - Painéis/CADASTRO - Socio.xml b/03 - Painéis/CADASTRO - Socio.xml
index 1751880..5278264 100644
--- a/03 - Painéis/CADASTRO - Socio.xml	
+++ b/03 - Painéis/CADASTRO - Socio.xml	
@@ -12,13 +12,12 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
                                  "nome"        : "socios" ,
                                  "sequence"    : "socio_seq" ,
                                  "idTabela"    : "CODIGO",
-                                 "campos"      : ["CODIGO", "NOME", "PERCENTUAL_PARTICIPACAO" ],
-                                 "camposTable" : ["CODIGO", "NOME", "PERCENTUAL_PARTICIPACAO" ]
+                                 "campos"      : ["CODIGO", "NOME" ],
+                                 "camposTable" : ["CODIGO", "NOME" ]
 
                               },
                                  "relaciona" : [ ["CODIGO","idChave","Number"] ,
-                                                 ["NOME","idDescricao","String"],
-                                                 ["PERCENTUAL_PARTICIPACAO","idPercentual","Number"]                                             
+                                                 ["NOME","idDescricao","String"]                                           
                                                ] ,
                                 "validacaoExclusao" : [ ["SELECT 0 AS CONTAR FROM SOCIOS WHERE CODIGO = ", "Existem registros ligados a esta tabela"],
                                 						["SELECT COUNT(CHAVE_RESPONSAVEL) AS CONTAR FROM CONTROLE_DESPESAS_PESSOAIS WHERE CHAVE_RESPONSAVEL = ", "Existem registros ligados a esta tabela."]
@@ -99,6 +98,9 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
             engine.getLayout('pnlTitulo').getRootComposition().setVisible(false);
             engine.getLayout('pnlInclusao').getRootComposition().setVisible(true);           
             engine.getWidgetController('btnVoltar').getButton().setVisible(true); 
+            engine.getField('idPesquisaLista')['setValue(java.lang.String)'](null);
+            engine.getField('listaPrincipal').refresh();
+            engine.getField('idPesquisa')['setValue(java.lang.Object)'](null);
             
             engine.getField('idChave').focus(); 
                            
@@ -149,7 +151,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
 			} else {
 				return true
 			}
-          }     
+          }
         
          
          function run() {     
@@ -210,12 +212,11 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
                                       "nome"        : "socios" ,
                                       "sequence"    : "socio_seq" ,
                                       "idTabela"    : "CODIGO",
-                                      "campos"      : ["CODIGO", "NOME", "PERCENTUAL_PARTICIPACAO" ],
-                                      "camposTable" : ["CODIGO", "NOME", "PERCENTUAL_PARTICIPACAO" ]
+                                      "campos"      : ["CODIGO", "NOME" ],
+                                      "camposTable" : ["CODIGO", "NOME" ]
                                     },
                                     "relaciona" : [ ["CODIGO","idChave","Number"] ,
-                                                    ["NOME","idDescricao","String"],
-                                                    ["PERCENTUAL_PARTICIPACAO","idPercentual","Number"],                                             
+                                                    ["NOME","idDescricao","String"]                                            
                                                   ] ,
 
                                     "validacaoExclusao" : 
@@ -379,7 +380,6 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
 							<HorizontalLayout spacing="true" width="100%">
 								<TextField id="idChave" type="number" caption="Código" width="100%" expandRatio="0.08" />                              
                            		<TextField id="idDescricao" type="string" text-transform="uppercase" caption="Nome" required="true" width="100%" expandRatio="1"  />  
-                           		<DecimalField type="decimal" id="idPercentual" caption="Percentual" width="100%" expandRatio="0.1" /> 
 							</HorizontalLayout>                   
                         </VerticalLayout>  
                      </Tab>
@@ -394,11 +394,12 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
 	                     <onClickScript language="JavaScript">
 	                        <![CDATA[
 	                           importClass(Packages.br.com.davinti.base.vaadin.components.layout.MessageBox);
+	                           	
 	                           	function run() {
 	                              if (engine.isValid()) {
 	                              	if ((engine.getGlobalVariable('validarDuplicidade')(engine.getField('idDescricao').getValue())) && (!engine.getField('idChave').getValue())) {
 	                              		MessageBox.show(MessageBox.BoxType.INFO, 'Atenção', 'Já existe um sócio cadastrado com este nome.');
-	                              	} else {
+	                              	} else {	                              		
 		                                 var config = engine.getGlobalVariable('config');
 		                                 var id     = engine.getField('idChave').getConvertedValue();
 		                                 var lib = libService.loadScript('lib_cadastro_padrao');
diff --git a/03 - Painéis/CADASTRO - Sub_Categoria.xml b/03 - Painéis/CADASTRO - Sub_Categoria.xml
index 9be7a07..060322e 100644
--- a/03 - Painéis/CADASTRO - Sub_Categoria.xml	
+++ b/03 - Painéis/CADASTRO - Sub_Categoria.xml	
@@ -12,12 +12,13 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
                                  "nome"        : "subcategoria" ,
                                  "sequence"    : "subcategoria_seq" ,
                                  "idTabela"    : "CODIGO",
-                                 "campos"      : ["CODIGO", "DESCRICAO" ],
-                                 "camposTable" : ["CODIGO", "DESCRICAO" ]
+                                 "campos"      : ["CODIGO", "DESCRICAO", "CODIGO_CATEGORIA" ],
+                                 "camposTable" : ["CODIGO", "DESCRICAO", "CODIGO_CATEGORIA" ]
 
                               },
                                  "relaciona" : [ ["CODIGO","idChave","Number"] ,
-                                                 ["DESCRICAO","idDescricao","String"]                                             
+                                                 ["DESCRICAO","idDescricao","String"] ,
+                                                 ["CODIGO_CATEGORIA","idCategoria","Number"]                                            
                                                ] ,
                                 "validacaoExclusao" : [ ["SELECT 0 AS CONTAR FROM CATEGORIA WHERE CODIGO = ", "Existem registros ligados a esta tabela"],
                                 						["SELECT count(chave_subcategoria) AS CONTAR FROM CONTROLE_DESPESAS_OPERACIONAIS WHERE CHAVE_SUBCATEGORIA = ", "Existem registros ligados a esta tabela"]
@@ -60,6 +61,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
             var config = engine.getGlobalVariable('config');
             var lib = libService.loadScript('lib_cadastro_padrao');
             var retorno = lib.fncLimpaCampos(config);
+            engine.getField('idCategoria')['setValue(java.lang.Object)'](null); 	
          };
          
          var habilitaCampos = function(lHabilita){
@@ -97,7 +99,11 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
             habilitaCampos(true);      
             engine.getLayout('pnlTitulo').getRootComposition().setVisible(false);
             engine.getLayout('pnlInclusao').getRootComposition().setVisible(true);           
-            engine.getWidgetController('btnVoltar').getButton().setVisible(true); 
+            engine.getWidgetController('btnVoltar').getButton().setVisible(true);
+            engine.getField('idPesquisaLista')['setValue(java.lang.String)'](null);
+            engine.getField('listaPrincipal').refresh(); 
+            engine.getField('idCategoria')['setValue(java.lang.Object)'](null);
+            engine.getField('idPesquisa')['setValue(java.lang.Object)'](null);
             
             engine.getField('idChave').focus(); 
                            
@@ -209,11 +215,12 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
                                       "nome"        : "subcategoria" ,
                                       "sequence"    : "subcategoria_seq" ,
                                       "idTabela"    : "CODIGO",
-                                      "campos"      : ["CODIGO", "DESCRICAO" ],
-                                      "camposTable" : ["CODIGO", "DESCRICAO" ]
+                                      "campos"      : ["CODIGO", "DESCRICAO", "CODIGO_CATEGORIA" ],
+                                      "camposTable" : ["CODIGO", "DESCRICAO", "CODIGO_CATEGORIA" ]
                                     },
                                     "relaciona" : [ ["CODIGO","idChave","Number"] ,
-                                                    ["DESCRICAO","idDescricao","String"]                                             
+                                                    ["DESCRICAO","idDescricao","String"],
+                                                    ["CODIGO_CATEGORIA","idCategoria","Number"]                                             
                                                   ] ,
 
                                     "validacaoExclusao" : 
@@ -325,6 +332,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
                          
                         <column name="CODIGO" caption="Código"/>  
                         <column name="DESCRICAO" caption="Descrição"/>
+                        
                      </columns>
                   </DBTable>  
                </VerticalLayout>
@@ -377,6 +385,17 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
 							<HorizontalLayout width="100%" spacing="true">
 								<TextField id="idChave" type="string" caption="Código" width="100%" expandRatio="0.08" />                              
                            		<TextField id="idDescricao" text-transform="uppercase" type="string" caption="Nome" required="true" width="100%" expandRatio="1"  />
+                           		<DBComboBox type="number" required="true" id="idCategoria" allowNullSelection="true" caption="Categoria" description="Selecione a categoria que será vinculada" width="100%" expandRatio="0.4">
+                           			<datasource>
+                           				<freeQuery connection-key="vitruvio">
+                           					<![CDATA[
+                           						Select c.codigo, c.descricao from categoria c
+                           					]]>
+                           				</freeQuery>
+                           			</datasource>
+                           			<key-field>CODIGO</key-field>
+                           			<caption-field>DESCRICAO</caption-field>
+                           		</DBComboBox>
 							</HorizontalLayout>                   
                         </VerticalLayout>  
                      </Tab>
diff --git a/03 - Painéis/CADASTRO - Veiculos.xml b/03 - Painéis/CADASTRO - Veiculos.xml
index fea4c28..7fa7d1d 100644
--- a/03 - Painéis/CADASTRO - Veiculos.xml	
+++ b/03 - Painéis/CADASTRO - Veiculos.xml	
@@ -6,7 +6,6 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
       <description>Cadastro de Veículos</description>
       <afterFormRenderScript language="JavaScript">
          <![CDATA[
-         /*, */
             var config = { "tabela" :
                               {
                                  "conexao"     : "vitruvio",
@@ -103,6 +102,9 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
             engine.getLayout('pnlTitulo').getRootComposition().setVisible(false);
             engine.getLayout('pnlInclusao').getRootComposition().setVisible(true);           
             engine.getWidgetController('btnVoltar').getButton().setVisible(true); 
+            engine.getField('idPesquisaLista')['setValue(java.lang.String)'](null);
+            engine.getField('listaPrincipal').refresh();
+            engine.getField('idPesquisa')['setValue(java.lang.Object)'](null);
             
             engine.getField('idChave').focus(); 
                            
@@ -385,12 +387,12 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
 							</DBSearchField>
 							<HorizontalLayout width="60%" spacing="true">
 								<TextField type="number" id="idChave" caption="Código" width="100%" expandRatio="0.08" />                              
-                           		<TextField type="string" id="idPlaca" text-transform="uppercase" caption="Placa" required="true" width="100%" expandRatio="1" />
+                           		<TextField type="string" id="idPlaca" text-transform="uppercase" caption="Placa" maxLength="8" required="true" width="100%" expandRatio="0.15" />
+                           		<TextField type="string" id="idModelo" text-transform="uppercase" caption="Modelo" width="100%" expandRatio="1" /> 
 							</HorizontalLayout>
-							<HorizontalLayout width="100%" spacing="true" >
-								<TextField type="string" id="idModelo" caption="Modelo" required="true" width="100%" expandRatio="0.45" /> 
-	                            <TextField type="string" id="idMarca" caption="Marca" required="true" width="100%" expandRatio="0.45" />  
-	                            <NumericField type="number" id="idAno" caption="Ano" required="true" width="100%" expandRatio="0.1" maximumValue="2999" />
+							<HorizontalLayout width="60%" spacing="true" >
+	                            <TextField type="string" id="idMarca" text-transform="uppercase" caption="Marca" width="100%" expandRatio="1" />  
+	                            <NumericField type="number" id="idAno" caption="Ano" width="100%" expandRatio="0.15" maximumValue="2999" maxLength="4"/>
 							</HorizontalLayout>                     
                         </VerticalLayout>  
                      </Tab>
@@ -407,7 +409,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
 	                           importClass(Packages.br.com.davinti.base.vaadin.components.layout.MessageBox);
 	                           	function run() {
 	                              if (engine.isValid()) {
-	                              	if (engine.getGlobalVariable('validarDuplicidade')(engine.getField('idDescricao').getValue())) {
+	                              	if (engine.getGlobalVariable('validarDuplicidade')(engine.getField('idPlaca').getValue())) {
 	                              		MessageBox.show(MessageBox.BoxType.INFO, 'Atenção', 'Já existe uma operação cadastrada com este nome.');
 	                              	} else {
 		                                 var config = engine.getGlobalVariable('config');
diff --git a/03 - Painéis/LANÇAMENTO - Despesas.xml b/03 - Painéis/LANÇAMENTO - Despesas.xml
index 9543b33..f03793b 100644
--- a/03 - Painéis/LANÇAMENTO - Despesas.xml	
+++ b/03 - Painéis/LANÇAMENTO - Despesas.xml	
@@ -228,12 +228,15 @@
 								      		<datasource>
 								      			<freeQuery connection-key="vitruvio">
 								      				<![CDATA[
-								      					Select * from subcategoria
+								      					Select * from subcategoria where codigo_categoria = ${categoria}
 								      				]]>
 								      			</freeQuery>
 								      		</datasource>
 								      		<key-field>CODIGO</key-field>
 								      		<caption-field>DESCRICAO</caption-field>
+								      		<bind>
+								      			<parameter value-type="number" defaultValue="-1" parameterName="categoria" field-ref="categoria" />
+								      		</bind>
 								      	</DBComboBox>
 								    </HorizontalLayout>
 								    <HorizontalLayout spacing="true" width="100%" height="100%" >