no message

git-svn-id: https://svn.coded.pt/svn/SIPRP@222 bb69d46d-e84e-40c8-a05a-06db0d633741

trunk/siprp/companydataloaders/SIPRPDataLoader.java

@@ -76,6 +76,7 @@ public class SIPRPDataLoader implements CompanyDataLoader
 		Singleton.setInstance( SingletonConstants.CODIGO_EMPRESA_FORMAT, "2 6 / 2" );
 		Singleton.setInstance( SingletonConstants.FICHA_MARCA_EXAMES, Boolean.TRUE );
 		Singleton.setInstance( SingletonConstants.EXCEL_FORMAT, new int[]{ 0, 2, 3, 1, -1, 4, 5, 7, 6, -1 } );
+		Singleton.setInstance( SingletonConstants.EXCEL_FORMAT_DEMISSAO, new int[]{ 0, 1 } );
 		
 		Singleton.setInstance( SingletonConstants.MODULE_FICHA, Boolean.TRUE );
 		Singleton.setInstance( SingletonConstants.MODULE_CLIENTES, Boolean.TRUE );

trunk/siprp/importer/Importer.java

@@ -88,7 +88,7 @@ public class Importer extends CustomJDialog
 			DEFAULT_SELECTION = selection;
 		}
 		int []selectionDemissao = ( int [] ) Singleton.getInstance( SingletonConstants.EXCEL_FORMAT_DEMISSAO );
-		if( selection != null )
+		if( selectionDemissao != null )
 		{
 			DEFAULT_SELECTION_DEMISSAO = selectionDemissao;
 		}
@@ -287,7 +287,7 @@ public class Importer extends CustomJDialog
 				{
 					return null;
 				}
-				dcw = new DataChooserWindow( null, NAMES, vals, DEFAULT_SELECTION_DEMISSAO );
+				dcw = new DataChooserWindow( null, NAMES_DEMISSAO, vals, DEFAULT_SELECTION_DEMISSAO );
 				break;
 		}