diff --git a/Build/Installer.fbl6 b/Build/Installer.fbl6
index d6c0a32..287b610 100644
Binary files a/Build/Installer.fbl6 and b/Build/Installer.fbl6 differ
diff --git a/Database/scripts/etiquetas.sql b/Database/scripts/etiquetas.sql
index 7526880..8b89163 100644
--- a/Database/scripts/etiquetas.sql
+++ b/Database/scripts/etiquetas.sql
@@ -1,5 +1,5 @@
 /******************************************************************************/
-/****         Generated by IBExpert 2007.05.03 14/11/2011 19:35:05         ****/
+/****         Generated by IBExpert 2007.05.03 12/12/2011 15:32:29         ****/
 /******************************************************************************/
 
 SET SQL DIALECT 3;
@@ -95,36 +95,45 @@ VARCHAR(30);
 /****                              Generators                              ****/
 /******************************************************************************/
 
+CREATE GENERATOR GEN_ARTICULOS_ID;
+SET GENERATOR GEN_ARTICULOS_ID TO 1;
+
 CREATE GENERATOR GEN_CATEGORIAS_ID;
-SET GENERATOR GEN_CATEGORIAS_ID TO 4;
+SET GENERATOR GEN_CATEGORIAS_ID TO 1;
 
 CREATE GENERATOR GEN_CONFIGURACION_ID;
-SET GENERATOR GEN_CONFIGURACION_ID TO 2;
+SET GENERATOR GEN_CONFIGURACION_ID TO 1;
 
 CREATE GENERATOR GEN_CONTACTOS_DATOS_BANCO_ID;
-SET GENERATOR GEN_CONTACTOS_DATOS_BANCO_ID TO 221;
+SET GENERATOR GEN_CONTACTOS_DATOS_BANCO_ID TO 1;
 
 CREATE GENERATOR GEN_CONTACTOS_DIR_ID;
-SET GENERATOR GEN_CONTACTOS_DIR_ID TO 470;
+SET GENERATOR GEN_CONTACTOS_DIR_ID TO 1;
 
 CREATE GENERATOR GEN_CONTACTOS_ID;
-SET GENERATOR GEN_CONTACTOS_ID TO 1202;
+SET GENERATOR GEN_CONTACTOS_ID TO 1;
 
 CREATE GENERATOR GEN_CONTACTOS_PERSONAL_ID;
-SET GENERATOR GEN_CONTACTOS_PERSONAL_ID TO 9;
+SET GENERATOR GEN_CONTACTOS_PERSONAL_ID TO 1;
 
 CREATE GENERATOR GEN_EMPRESAS_CONTACTOS_ID;
-SET GENERATOR GEN_EMPRESAS_CONTACTOS_ID TO 2243;
+SET GENERATOR GEN_EMPRESAS_CONTACTOS_ID TO 1;
 
 CREATE GENERATOR GEN_EMPRESAS_DATOS_BANCO_ID;
-SET GENERATOR GEN_EMPRESAS_DATOS_BANCO_ID TO 10;
+SET GENERATOR GEN_EMPRESAS_DATOS_BANCO_ID TO 1;
 
 CREATE GENERATOR GEN_EMPRESAS_ID;
-SET GENERATOR GEN_EMPRESAS_ID TO 13;
+SET GENERATOR GEN_EMPRESAS_ID TO 1;
 
 CREATE GENERATOR GEN_EMPRESAS_USUARIOS_ID;
 SET GENERATOR GEN_EMPRESAS_USUARIOS_ID TO 1;
 
+CREATE GENERATOR GEN_MEDICACION_DETALLES_ID;
+SET GENERATOR GEN_MEDICACION_DETALLES_ID TO 1;
+
+CREATE GENERATOR GEN_MEDICACION_ID;
+SET GENERATOR GEN_MEDICACION_ID TO 1;
+
 CREATE GENERATOR GEN_PERMISOSEX_ID;
 SET GENERATOR GEN_PERMISOSEX_ID TO 1;
 
@@ -132,13 +141,13 @@ CREATE GENERATOR GEN_PERMISOS_ID;
 SET GENERATOR GEN_PERMISOS_ID TO 1;
 
 CREATE GENERATOR GEN_REFERENCIAS_ID;
-SET GENERATOR GEN_REFERENCIAS_ID TO 25;
+SET GENERATOR GEN_REFERENCIAS_ID TO 1;
 
 CREATE GENERATOR GEN_UNIDADES_MEDIDA_ID;
-SET GENERATOR GEN_UNIDADES_MEDIDA_ID TO 23;
+SET GENERATOR GEN_UNIDADES_MEDIDA_ID TO 1;
 
 CREATE GENERATOR GEN_USUARIOS_ID;
-SET GENERATOR GEN_USUARIOS_ID TO 10;
+SET GENERATOR GEN_USUARIOS_ID TO 1;
 
 
 
@@ -323,6 +332,35 @@ CREATE TABLE EMPRESAS_USUARIOS (
 );
 
 
+CREATE TABLE MEDICACION (
+    ID                  TIPO_ID NOT NULL,
+    ID_PACIENTE         TIPO_ID,
+    REFERENCIA          VARCHAR(255),
+    FECHA_DESDE         DATE,
+    FECHA_HASTA         DATE,
+    TIPO                VARCHAR(255),
+    FECHA_ALTA          TIMESTAMP,
+    FECHA_MODIFICACION  TIMESTAMP,
+    USUARIO             TIPO_USUARIO
+);
+
+
+CREATE TABLE MEDICACION_DETALLES (
+    ID             TIPO_ID NOT NULL,
+    ID_MEDICACION  TIPO_ID NOT NULL,
+    POSICION       INTEGER,
+    TIPO_DETALLE   VARCHAR(25),
+    ID_ARTICULO    TIPO_ID,
+    REFERENCIA     VARCHAR(255),
+    CONCEPTO       TIPO_CONCEPTO,
+    CANTIDAD       TIPO_CANTIDAD,
+    POSOLOGIA      VARCHAR(255),
+    FORMA_COLOR    VARCHAR(255),
+    LOTE           VARCHAR(255),
+    VISIBLE        TIPO_BOOLEANO
+);
+
+
 CREATE TABLE PACIENTES_DATOS (
     ID_PACIENTE       TIPO_ID NOT NULL,
     FECHA_NACIMIENTO  DATE,
@@ -482,6 +520,34 @@ FROM CONTACTOS
 
 
 
+/* View: V_MEDICACION */
+CREATE VIEW V_MEDICACION(
+    ID,
+    ID_PACIENTE,
+    REFERENCIA,
+    NOMBRE,
+    NUMERO_SS,
+    FECHA_DESDE,
+    FECHA_HASTA,
+    TIPO)
+AS
+SELECT
+  MEDICACION.ID,
+  MEDICACION.ID_PACIENTE,
+  MEDICACION.REFERENCIA,
+  CONTACTOS.NOMBRE,
+  PACIENTES_DATOS.NUMERO_SS,
+  MEDICACION.FECHA_DESDE,
+  MEDICACION.FECHA_HASTA,
+  MEDICACION.TIPO
+FROM
+  MEDICACION
+  LEFT OUTER JOIN CONTACTOS ON (CONTACTOS.ID = MEDICACION.ID_PACIENTE)
+  LEFT OUTER JOIN PACIENTES_DATOS ON (PACIENTES_DATOS.ID_PACIENTE = CONTACTOS.ID)
+;
+
+
+
 /* View: V_PACIENTES */
 CREATE VIEW V_PACIENTES(
     ID,
@@ -546,9 +612,6 @@ INNER JOIN PACIENTES_DATOS ON (PACIENTES_DATOS.ID_PACIENTE = V_CONTACTOS.ID)
 WHERE V_CONTACTOS.ID_CATEGORIA = 4
 ;
 
-
-
-
 /******************************************************************************/
 /****                             Primary Keys                             ****/
 /******************************************************************************/
@@ -565,6 +628,7 @@ ALTER TABLE EMPRESAS ADD CONSTRAINT PK_EMPRESAS PRIMARY KEY (ID);
 ALTER TABLE EMPRESAS_CONTACTOS ADD CONSTRAINT PK_EMPRESAS_CONTACTOS PRIMARY KEY (ID);
 ALTER TABLE EMPRESAS_DATOS_BANCO ADD CONSTRAINT PK_EMPRESAS_DATOS_BANCO PRIMARY KEY (ID);
 ALTER TABLE EMPRESAS_USUARIOS ADD CONSTRAINT PK_EMPRESAS_USUARIOS PRIMARY KEY (ID);
+ALTER TABLE MEDICACION ADD CONSTRAINT PK_MEDICACION PRIMARY KEY (ID);
 ALTER TABLE PERMISOS ADD CONSTRAINT PK_PERMISOS PRIMARY KEY (ID);
 ALTER TABLE PERMISOSEX ADD CONSTRAINT PK_PERMISOSEX PRIMARY KEY (ID);
 ALTER TABLE POBLACIONES ADD CONSTRAINT PK_POBLACIONES PRIMARY KEY (ID);
@@ -612,4 +676,4 @@ CREATE INDEX IDX_REFERENCIAS ON REFERENCIAS (ID_EMPRESA);
 
 
 /* Privileges of users */
-GRANT SELECT ON RDB$ROLES TO PUBLIC;
+GRANT SELECT ON RDB$ROLES TO PUBLIC;
\ No newline at end of file
diff --git a/Database/scripts/etiquetas_sysdata.sql b/Database/scripts/etiquetas_sysdata.sql
index 72040b4..0f1ce70 100644
--- a/Database/scripts/etiquetas_sysdata.sql
+++ b/Database/scripts/etiquetas_sysdata.sql
@@ -10,21 +10,13 @@ INSERT INTO CATEGORIAS (ID, CATEGORIA) VALUES (4, 'PACIENTE');
 
 COMMIT WORK;
 
-INSERT INTO EMPRESAS (ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, FECHA_ALTA, FECHA_MODIFICACION, USUARIO, REGISTRO_MERCANTIL, PARAM_TIEMPO, PARAM_MARGEN, ID_TIPO_IVA, ID_FORMA_PAGO, ID_ALMACEN) VALUES (1, 'B81747396', 'TECSITEL S.L.', 'TECSITEL S.L.', 'C\ Buendía, 25', 'MADRID', 'MADRID', '28053', '91-507-56-92 / 63', NULL, '607 71 60 15', NULL, '91-785-96-35', 'tecsitel@tecsitel.com', NULL, 'www.tecsitel.com', '2008-01-14 11:53:52', NULL, 'Maribel', 'Insc. en el Reg. Merc. de Madrid, Tomo 12.291, Libro 0, Folio 131, Sección 8, Hoja M-194886 CIF: B81747396', 0.5, 30, 1, 9, NULL);
-
-COMMIT WORK;
-
-INSERT INTO PACIENTES_DATOS (ID_PACIENTE, FECHA_NACIMIENTO, NUMERO_SS, FECHA_BAJA, CAUSA_BAJA) VALUES (1198, '1911-01-01', 'U09D0980890809808080', NULL, NULL);
-INSERT INTO PACIENTES_DATOS (ID_PACIENTE, FECHA_NACIMIENTO, NUMERO_SS, FECHA_BAJA, CAUSA_BAJA) VALUES (1199, '1911-01-01', 'U09D0980890809808080', NULL, NULL);
-INSERT INTO PACIENTES_DATOS (ID_PACIENTE, FECHA_NACIMIENTO, NUMERO_SS, FECHA_BAJA, CAUSA_BAJA) VALUES (1200, '1911-01-01', 'U09D0980890809808080', NULL, NULL);
-INSERT INTO PACIENTES_DATOS (ID_PACIENTE, FECHA_NACIMIENTO, NUMERO_SS, FECHA_BAJA, CAUSA_BAJA) VALUES (1201, '1911-01-01', 'U09D0980890809808080', NULL, NULL);
-INSERT INTO PACIENTES_DATOS (ID_PACIENTE, FECHA_NACIMIENTO, NUMERO_SS, FECHA_BAJA, CAUSA_BAJA) VALUES (1202, NULL, NULL, NULL, NULL);
+INSERT INTO EMPRESAS (ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, FECHA_ALTA, FECHA_MODIFICACION, USUARIO, REGISTRO_MERCANTIL, PARAM_TIEMPO, PARAM_MARGEN, ID_TIPO_IVA, ID_FORMA_PAGO, ID_ALMACEN) VALUES (14, NULL, 'Patricia Hurtado', NULL, NULL, NULL, NULL, NULL, '91 462 33 44', NULL, '655 33 12 44', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'Administrador', NULL, NULL, NULL, NULL, NULL, NULL);
 
 COMMIT WORK;
 
 INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (1, NULL, 'REF_PACIENTES', '1', 'Ref. pacientes');
 INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (2, NULL, 'REF_ARTICULOS', '1', 'Ref. art¡culos');
-INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (3, 1, 'REF_ALBARANES_CLIENTE', '1', 'Ref. albaranes de cliente');
+INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (3, NULL, 'REF_MEDICACIONES', '1', 'Ref. albaranes de cliente');
 
 COMMIT WORK;
 
diff --git a/Source/Modulos/Medicaciones/Controller/uMedicacionReportController.pas b/Source/Modulos/Medicaciones/Controller/uMedicacionReportController.pas
index 62c4748..0b873a1 100644
--- a/Source/Modulos/Medicaciones/Controller/uMedicacionReportController.pas
+++ b/Source/Modulos/Medicaciones/Controller/uMedicacionReportController.pas
@@ -92,19 +92,19 @@ var
   AStream: Binary;
   AEditor : IEditorMedicacionesPreview;
 begin
-{  AEditor := NIL;
+  AEditor := NIL;
 
   ShowHourglassCursor;
   try
-    AStream := FDataModule.GetRptAlbaranes(AListaID);
+    AStream := FDataModule.GetRptMedicaciones(AListaID);
     try
-      CreateEditor('EditorMedicacionPreview', IEditorMedicacionPreview, AEditor);
+      CreateEditor('EditorMedicacionesPreview', IEditorMedicacionesPreview, AEditor);
       if Assigned(AEditor) then
       begin
         try
           AEditor.Controller := Self;
           AEditor.ListaID := AListaID;
-          AEditor.Title := 'Albarán - ' + AppFactuGES.EmpresaActiva.NOMBRE;
+          AEditor.Title := 'Medicación - ' + AppFactuGES.EmpresaActiva.NOMBRE;
           AEditor.LoadFromStream(AStream);
           AEditor.Print;
         finally
@@ -117,7 +117,7 @@ begin
     end;
   finally
     HideHourglassCursor;
-  end;  }
+  end;
 end;
 
 end.
diff --git a/Source/Modulos/Medicaciones/Views/Medicaciones_view.res b/Source/Modulos/Medicaciones/Views/Medicaciones_view.res
index 02236de..8b251f3 100644
Binary files a/Source/Modulos/Medicaciones/Views/Medicaciones_view.res and b/Source/Modulos/Medicaciones/Views/Medicaciones_view.res differ
diff --git a/Source/Servidor/Configuracion/uConexionBD_MSSQL.dfm b/Source/Servidor/Configuracion/uConexionBD_MSSQL.dfm
index f6d629c..4817fc5 100644
--- a/Source/Servidor/Configuracion/uConexionBD_MSSQL.dfm
+++ b/Source/Servidor/Configuracion/uConexionBD_MSSQL.dfm
@@ -1,4 +1,6 @@
 inherited frConexionBD_MSSQL: TfrConexionBD_MSSQL
+  Width = 399
+  Height = 269
   object GroupBox1: TGroupBox
     Left = 8
     Top = 8
@@ -16,37 +18,32 @@ inherited frConexionBD_MSSQL: TfrConexionBD_MSSQL
       Height = 13
       Caption = 'Nombre del servidor:'
     end
-    object Label2: TLabel
-      Left = 18
-      Top = 60
-      Width = 93
-      Height = 13
-      Caption = 'Puerto de escucha:'
-    end
     object Label3: TLabel
       Left = 18
-      Top = 92
+      Top = 60
       Width = 72
       Height = 13
       Caption = 'Base de datos:'
     end
     object Label4: TLabel
-      Left = 18
-      Top = 150
-      Width = 36
+      Left = 36
+      Top = 141
+      Width = 40
       Height = 13
-      Caption = 'Usuario'
+      Caption = 'Usuario:'
+      FocusControl = edtUser
     end
     object Label5: TLabel
-      Left = 18
-      Top = 180
+      Left = 36
+      Top = 171
       Width = 60
       Height = 13
       Caption = 'Contrase'#241'a:'
+      FocusControl = edtPassword
     end
     object Bevel1: TBevel
       Left = 16
-      Top = 120
+      Top = 87
       Width = 343
       Height = 10
       Anchors = [akLeft, akTop, akRight]
@@ -61,40 +58,38 @@ inherited frConexionBD_MSSQL: TfrConexionBD_MSSQL
       TabOrder = 0
       Text = 'localhost'
     end
-    object edtPort: TEdit
-      Left = 128
-      Top = 56
-      Width = 116
-      Height = 21
-      Anchors = [akLeft, akTop, akRight]
-      TabOrder = 1
-      Text = '3050'
-      OnExit = edtPortExit
-    end
     object edtUser: TEdit
       Left = 128
-      Top = 144
+      Top = 135
       Width = 116
       Height = 21
       Anchors = [akLeft, akTop, akRight]
-      TabOrder = 3
+      TabOrder = 2
       Text = 'sysdba'
     end
     object edtPassword: TEdit
       Left = 128
-      Top = 176
+      Top = 167
       Width = 116
       Height = 21
       Anchors = [akLeft, akTop, akRight]
       PasswordChar = '*'
-      TabOrder = 4
+      TabOrder = 3
     end
     object edtDatabaseName: TEdit
       Left = 128
-      Top = 88
+      Top = 56
       Width = 231
       Height = 21
-      TabOrder = 2
+      TabOrder = 1
+    end
+    object cbAutentSQL: TCheckBox
+      Left = 18
+      Top = 108
+      Width = 232
+      Height = 17
+      Action = actAutentSQL
+      TabOrder = 4
     end
   end
   object bProbar: TButton
@@ -106,15 +101,16 @@ inherited frConexionBD_MSSQL: TfrConexionBD_MSSQL
     TabOrder = 1
     OnClick = bProbarClick
   end
-  object OpenDialog: TOpenDialog
-    Filter = 'Base de datos Firebird (*.fdb)|*.FDB'
-    Options = [ofHideReadOnly, ofPathMustExist, ofFileMustExist, ofEnableSizing]
-    Title = 'Abrir base de datos Firebird'
-    Left = 264
-    Top = 56
-  end
   object ADOConnection1: TADOConnection
-    Left = 184
+    Left = 192
     Top = 224
   end
+  object ActionList1: TActionList
+    Left = 160
+    Top = 224
+    object actAutentSQL: TAction
+      Caption = 'Autentificaci'#243'n con SQL Server'
+      OnExecute = actAutentSQLExecute
+    end
+  end
 end
diff --git a/Source/Servidor/Configuracion/uConexionBD_MSSQL.pas b/Source/Servidor/Configuracion/uConexionBD_MSSQL.pas
index 296e045..ba4ede6 100644
--- a/Source/Servidor/Configuracion/uConexionBD_MSSQL.pas
+++ b/Source/Servidor/Configuracion/uConexionBD_MSSQL.pas
@@ -6,15 +6,13 @@ uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, 
   Dialogs, StdCtrls, ExtCtrls, IBServices,
   DB, IBDatabase, uFrameConfiguracion, cxControls, cxContainer, cxEdit,
-  cxTextEdit, cxMaskEdit, cxButtonEdit, ADODB;
+  cxTextEdit, cxMaskEdit, cxButtonEdit, ADODB, ActnList;
 
 type
   TfrConexionBD_MSSQL = class(TFrameConfiguracion)
     GroupBox1: TGroupBox;
     edtServer: TEdit;
-    edtPort: TEdit;
     Label1: TLabel;
-    Label2: TLabel;
     Label3: TLabel;
     bProbar: TButton;
     Label4: TLabel;
@@ -22,11 +20,13 @@ type
     Label5: TLabel;
     edtPassword: TEdit;
     Bevel1: TBevel;
-    OpenDialog: TOpenDialog;
     edtDatabaseName: TEdit;
     ADOConnection1: TADOConnection;
+    cbAutentSQL: TCheckBox;
+    ActionList1: TActionList;
+    actAutentSQL: TAction;
     procedure bProbarClick(Sender: TObject);
-    procedure edtPortExit(Sender: TObject);
+    procedure actAutentSQLExecute(Sender: TObject);
   protected
     procedure Finalize; override;
   public
@@ -39,16 +39,31 @@ uses uDataModuleServer;
 
 {$R *.dfm}
 
+procedure TfrConexionBD_MSSQL.actAutentSQLExecute(Sender: TObject);
+begin
+  inherited;
+  edtUser.Enabled := not edtUser.Enabled;
+  Label4.Enabled := edtUser.Enabled;
+
+  edtPassword.Enabled := not edtPassword.Enabled;
+  Label5.Enabled := edtPassword.Enabled;
+end;
+
 procedure TfrConexionBD_MSSQL.bProbarClick(Sender: TObject);
 var
   Aux : string;
   AConnStr : string;
 begin
-  AConnStr := 'Provider=sqloledb;' +
+  //Provider=SQLOLEDB.1;Integrated Security=SSPI;Persist Security Info=False;Initial Catalog=bd;Data Source=servidor
+  //Provider=SQLOLEDB.1;Password=assasasasa;Persist Security Info=True;User ID=11111111;Initial Catalog=aaaaa;Data Source=aaaa
+  AConnStr := 'Provider=SQLOLEDB.1;' +
             'Data Source=' + edtServer.Text + ';' +
-            'Initial Catalog=' + edtDatabaseName.Text + ';' +
-            'User Id=' + edtUser.Text + ';' +
-            'Password=' + edtPassword.Text;
+            'Initial Catalog=' + edtDatabaseName.Text + ';';
+
+  if not cbAutentSQL.Checked then
+    AConnStr := AConnStr + 'Integrated Security=SSPI;Persist Security Info=False;'
+  else
+    AConnStr := AConnStr + 'User ID=' + edtUser.Text + ';' + 'Password=' + edtPassword.Text;
 
   with ADOConnection1 do
   begin
@@ -74,7 +89,7 @@ end;
 procedure TfrConexionBD_MSSQL.Init;
 begin
   edtServer.Text := dmServer.FMSSQLServer;
-  edtPort.Text := dmServer.FMSSQLPort;
+  cbAutentSQL.Checked := (dmServer.FMSSQLIntSecurity = 1);
   edtDatabaseName.Text := dmServer.FMSSQLPath;
   edtUser.Text := dmServer.FMSSQLUser;
   edtPassword.Text := Decrypt(dmServer.FMSSQLPass);
@@ -83,17 +98,13 @@ end;
 procedure TfrConexionBD_MSSQL.Finalize;
 begin
   dmServer.FMSSQLServer := edtServer.Text;
-  dmServer.FMSSQLPort := edtPort.Text;
+  if cbAutentSQL.Checked then
+    dmServer.FMSSQLIntSecurity := 1
+  else
+    dmServer.FMSSQLIntSecurity := 0;
   dmServer.FMSSQLPath := edtDatabaseName.Text;
   dmServer.FMSSQLUser := edtUser.Text;
   dmServer.FMSSQLPass := Encrypt(edtPassword.Text);
 end;
 
-procedure TfrConexionBD_MSSQL.edtPortExit(Sender: TObject);
-begin
-  inherited;
-  if Length(edtPort.Text) = 0 then
-    edtPort.Text := MSSQL_PORT;
-end;
-
 end.
diff --git a/Source/Servidor/Etiquetas_Server.dproj b/Source/Servidor/Etiquetas_Server.dproj
index e9de56a..5bbd188 100644
--- a/Source/Servidor/Etiquetas_Server.dproj
+++ b/Source/Servidor/Etiquetas_Server.dproj
@@ -1,169 +1,169 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
-    <MainSource>Etiquetas_Server.dpr</MainSource>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-    <DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\Etiquetas_Server.exe</DCC_DependencyCheckOutputName>
-    <DCC_UsePackage>vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100</DCC_UsePackage>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Version>7.0</Version>
-    <DCC_DebugInformation>False</DCC_DebugInformation>
-    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
-    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-    <DCC_MapFile>3</DCC_MapFile>
-    <DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
-    <DCC_Define>RELEASE</DCC_Define>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <Version>7.0</Version>
-    <DCC_MapFile>3</DCC_MapFile>
-    <DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
-    <DCC_Define>DEBUG;</DCC_Define>
-    <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
-    <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
-    <DCC_DebugVN>True</DCC_DebugVN>
-    <DCC_UnitSearchPath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_UnitSearchPath>
-    <DCC_ResourcePath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ResourcePath>
-    <DCC_ObjPath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ObjPath>
-    <DCC_IncludePath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_IncludePath>
-    <DCC_DcuOutput>..\..\Output\Debug\Servidor</DCC_DcuOutput>
-    <DCC_ObjOutput>..\..\Output\Debug\Servidor</DCC_ObjOutput>
-    <DCC_HppOutput>..\..\Output\Debug\Servidor</DCC_HppOutput>
-    <DCC_BplOutput>..\..\Output\Debug\Servidor</DCC_BplOutput>
-    <DCC_DcpOutput>..\..\Output\Debug\Servidor</DCC_DcpOutput>
-  </PropertyGroup>
-  <ProjectExtensions>
-    <Borland.Personality>Delphi.Personality</Borland.Personality>
-    <Borland.ProjectType />
-    <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">Etiquetas Server</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Etiquetas Server</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 09 de diciembre de 2011 12:52</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
-    </Excluded_Packages><Source><Source Name="MainSource">Etiquetas_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
-  </ProjectExtensions>
-  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
-  <ItemGroup>
-    <DelphiCompile Include="Etiquetas_Server.dpr">
-      <MainSource>MainSource</MainSource>
-    </DelphiCompile>
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\uBizEmpresasServer.pas" />
-    <DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
-      <Form>srvEmpresas</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
-      <Form>srvProvinciasPoblaciones_Impl</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas">
-      <Form>srvUsuarios</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Base\schBase_Intf.pas" />
-    <DCCReference Include="..\Base\Utiles\uSistemaFunc.pas" />
-    <DCCReference Include="..\Base\Utiles\uStringsUtils.pas" />
-    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas">
-      <Form>srvArticulos</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizPacientesServer.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas">
-      <Form>RptEtiquetasContacto</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Contactos\Reports\uRptFichasPaciente_Server.pas">
-      <Form>RptFichasPaciente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
-      <Form>srvContactos</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Medicaciones\Model\schMedicacionClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Medicaciones\Model\schMedicacionServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Medicaciones\Model\uBizMedicacionServer.pas" />
-    <DCCReference Include="..\Modulos\Medicaciones\Reports\uRptMedicaciones_Server.pas">
-      <Form>RptMedicaciones</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Medicaciones\Servidor\srvMedicacion_Impl.pas">
-      <Form>srvMedicacion</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
-      <Form>srvReferencias</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
-      <Form>srvUnidadesMedida</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Servicios\Etiquetas_Intf.pas" />
-    <DCCReference Include="..\Servicios\Etiquetas_Invk.pas" />
-    <DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
-      <Form>srvConfiguracion</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConexionBD.pas">
-      <Form>frConexionBD</Form>
-      <DesignClass>TFrame</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConexionBD_MSSQL.pas">
-      <Form>frConexionBD_MSSQL</Form>
-      <DesignClass>TFrame</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConfGeneral.pas">
-      <Form>frConfGeneral</Form>
-      <DesignClass>TFrame</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConfiguracion.pas">
-      <Form>fConfiguracion</Form>
-      <DesignClass>TForm</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uFrameConfiguracion.pas">
-      <Form>FrameConfiguracion</Form>
-      <DesignClass>TFrame</DesignClass>
-    </DCCReference>
-    <DCCReference Include="srvLogin_Impl.pas">
-      <Form>srvLogin</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="uAcercaDe.pas">
-      <Form>fAcercaDe</Form>
-    </DCCReference>
-    <DCCReference Include="uDataModuleServer.pas">
-      <Form>dmServer</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="uServerMainForm.pas">
-      <Form>fServerForm</Form>
-    </DCCReference>
-    <DCCReference Include="Utiles\MidasSpeedFix.pas" />
-    <DCCReference Include="Utiles\RegExpr.pas" />
-    <DCCReference Include="Utiles\uBusinessUtils.pas" />
-    <DCCReference Include="Utiles\uDatabaseUtils.pas" />
-    <DCCReference Include="Utiles\uReferenciasUtils.pas" />
-    <DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas" />
-    <DCCReference Include="Utiles\uSchemaUtilsServer.pas" />
-    <DCCReference Include="Utiles\uServerAppUtils.pas" />
-    <DCCReference Include="Utiles\uSesionesUtils.pas" />
-  </ItemGroup>
+	<PropertyGroup>
+		<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
+		<MainSource>Etiquetas_Server.dpr</MainSource>
+		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+		<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+		<DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\Etiquetas_Server.exe</DCC_DependencyCheckOutputName>
+		<DCC_UsePackage>vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100</DCC_UsePackage>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+		<Version>7.0</Version>
+		<DCC_DebugInformation>False</DCC_DebugInformation>
+		<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+		<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+		<DCC_MapFile>3</DCC_MapFile>
+		<DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
+		<DCC_Define>RELEASE</DCC_Define>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+		<Version>7.0</Version>
+		<DCC_MapFile>3</DCC_MapFile>
+		<DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
+		<DCC_Define>DEBUG;</DCC_Define>
+		<DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+		<DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
+		<DCC_DebugVN>True</DCC_DebugVN>
+		<DCC_UnitSearchPath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_UnitSearchPath>
+		<DCC_ResourcePath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ResourcePath>
+		<DCC_ObjPath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ObjPath>
+		<DCC_IncludePath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_IncludePath>
+		<DCC_DcuOutput>..\..\Output\Debug\Servidor</DCC_DcuOutput>
+		<DCC_ObjOutput>..\..\Output\Debug\Servidor</DCC_ObjOutput>
+		<DCC_HppOutput>..\..\Output\Debug\Servidor</DCC_HppOutput>
+		<DCC_BplOutput>..\..\Output\Debug\Servidor</DCC_BplOutput>
+		<DCC_DcpOutput>..\..\Output\Debug\Servidor</DCC_DcpOutput>
+	</PropertyGroup>
+	<ProjectExtensions>
+		<Borland.Personality>Delphi.Personality</Borland.Personality>
+		<Borland.ProjectType/>
+		<BorlandProject>
+			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">Etiquetas Server</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Etiquetas Server</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 09 de diciembre de 2011 12:52</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+						<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
+					</Excluded_Packages><Source><Source Name="MainSource">Etiquetas_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+	</ProjectExtensions>
+	<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets"/>
+	<ItemGroup>
+		<DelphiCompile Include="Etiquetas_Server.dpr">
+			<MainSource>MainSource</MainSource>
+		</DelphiCompile>
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\uBizEmpresasServer.pas"/>
+		<DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
+			<Form>srvEmpresas</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
+			<Form>srvProvinciasPoblaciones_Impl</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas">
+			<Form>srvUsuarios</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Base\schBase_Intf.pas"/>
+		<DCCReference Include="..\Base\Utiles\uSistemaFunc.pas"/>
+		<DCCReference Include="..\Base\Utiles\uStringsUtils.pas"/>
+		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas">
+			<Form>srvArticulos</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizPacientesServer.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas">
+			<Form>RptEtiquetasContacto</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Contactos\Reports\uRptFichasPaciente_Server.pas">
+			<Form>RptFichasPaciente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
+			<Form>srvContactos</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Medicaciones\Model\schMedicacionClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Medicaciones\Model\schMedicacionServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Medicaciones\Model\uBizMedicacionServer.pas"/>
+		<DCCReference Include="..\Modulos\Medicaciones\Reports\uRptMedicaciones_Server.pas">
+			<Form>RptMedicaciones</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Medicaciones\Servidor\srvMedicacion_Impl.pas">
+			<Form>srvMedicacion</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
+			<Form>srvReferencias</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
+			<Form>srvUnidadesMedida</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Servicios\Etiquetas_Intf.pas"/>
+		<DCCReference Include="..\Servicios\Etiquetas_Invk.pas"/>
+		<DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
+			<Form>srvConfiguracion</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConexionBD.pas">
+			<Form>frConexionBD</Form>
+			<DesignClass>TFrame</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConexionBD_MSSQL.pas">
+			<Form>frConexionBD_MSSQL</Form>
+			<DesignClass>TFrame</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConfGeneral.pas">
+			<Form>frConfGeneral</Form>
+			<DesignClass>TFrame</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConfiguracion.pas">
+			<Form>fConfiguracion</Form>
+			<DesignClass>TForm</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uFrameConfiguracion.pas">
+			<Form>FrameConfiguracion</Form>
+			<DesignClass>TFrame</DesignClass>
+		</DCCReference>
+		<DCCReference Include="srvLogin_Impl.pas">
+			<Form>srvLogin</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="uAcercaDe.pas">
+			<Form>fAcercaDe</Form>
+		</DCCReference>
+		<DCCReference Include="uDataModuleServer.pas">
+			<Form>dmServer</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="uServerMainForm.pas">
+			<Form>fServerForm</Form>
+		</DCCReference>
+		<DCCReference Include="Utiles\MidasSpeedFix.pas"/>
+		<DCCReference Include="Utiles\RegExpr.pas"/>
+		<DCCReference Include="Utiles\uBusinessUtils.pas"/>
+		<DCCReference Include="Utiles\uDatabaseUtils.pas"/>
+		<DCCReference Include="Utiles\uReferenciasUtils.pas"/>
+		<DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas"/>
+		<DCCReference Include="Utiles\uSchemaUtilsServer.pas"/>
+		<DCCReference Include="Utiles\uServerAppUtils.pas"/>
+		<DCCReference Include="Utiles\uSesionesUtils.pas"/>
+	</ItemGroup>
 </Project>
 <!-- EurekaLog First Line
 [Exception Log]
diff --git a/Source/Servidor/Etiquetas_Server.rc b/Source/Servidor/Etiquetas_Server.rc
index 440bb10..54a47b5 100644
--- a/Source/Servidor/Etiquetas_Server.rc
+++ b/Source/Servidor/Etiquetas_Server.rc
@@ -17,7 +17,7 @@ BEGIN
               VALUE "InternalName", "Etiquetas Server\0"
               VALUE "ProductName", "Etiquetas Server\0"
               VALUE "ProductVersion", "1.0.0.0\0"
-              VALUE "CompileDate", "viernes, 09 de diciembre de 2011 12:52\0"
+              VALUE "CompileDate", "lunes, 12 de diciembre de 2011 15:31\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Servidor/Etiquetas_Server.res b/Source/Servidor/Etiquetas_Server.res
index 3daf195..ec1db60 100644
Binary files a/Source/Servidor/Etiquetas_Server.res and b/Source/Servidor/Etiquetas_Server.res differ
diff --git a/Source/Servidor/uDataModuleServer.pas b/Source/Servidor/uDataModuleServer.pas
index 54986df..153d3ed 100644
--- a/Source/Servidor/uDataModuleServer.pas
+++ b/Source/Servidor/uDataModuleServer.pas
@@ -49,7 +49,7 @@ type
     FDBPass : string;
 
     FMSSQLServer: string;
-    FMSSQLPort : string;
+    FMSSQLIntSecurity : integer;
     FMSSQLPath : string;
     FMSSQLUser : string;
     FMSSQLPass : string;
@@ -211,11 +211,11 @@ begin
     FDBUser := ReadString('UserDB', '');
     FDBPass := ReadString('PassDB', '');
 
-    FMSSQLServer := ReadString('ServerDB', 'localhost');
-    FDBPort := ReadString('PortDB', DBSERVER_PORT);
-    FDBPath := ReadString('PathDB');
-    FDBUser := ReadString('UserDB', '');
-    FDBPass := ReadString('PassDB', '');
+    FMSSQLServer := ReadString('ServerMSSQL', '');
+    FMSSQLIntSecurity := ReadInteger('IntSecurityMSSQL', 0);
+    FMSSQLPath := ReadString('PathMSSQL');
+    FMSSQLUser := ReadString('UserMSSQL', '');
+    FMSSQLPass := ReadString('PassMSSQL', '');
 
     FServerPort := ReadString('ServerPort', SERVER_PORT);
     FInicioWindows := ReadBoolean('InicioWindows', False);
@@ -233,8 +233,14 @@ begin
       WriteString('PathDB', FDBPath);
       WriteString('UserDB', FDBUser);
       WriteString('PassDB', FDBPass);
-      WriteString('ServerPort', FServerPort);
 
+      WriteString('ServerMSSQL', FMSSQLServer);
+      WriteInteger('IntSecurityMSSQL', FMSSQLIntSecurity);
+      WriteString('PathMSSQL', FMSSQLPath);
+      WriteString('UserMSSQL', FMSSQLUser);
+      WriteString('PassMSSQL', FMSSQLPass);
+
+      WriteString('ServerPort', FServerPort);
       WriteBoolean('InicioWindows', FInicioWindows);
       if FInicioWindows then
         WriteAutoRun('AdminPV_Server', Application.ExeName)