diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql
index 5883cc8b..f9559311 100644
--- a/Database/scripts/factuges.sql
+++ b/Database/scripts/factuges.sql
@@ -566,7 +566,9 @@ CREATE TABLE EMPLEADOS_DATOS (
     FORMACION_RECIBIDA  TIPO_NOTAS,
     EXPERIENCIA         TIPO_NOTAS,
     CONTRATO            VARCHAR(255),
-    DURACION            VARCHAR(255)
+    DURACION            VARCHAR(255),
+    FECHA_BAJA          DATE,    
+    CAUSA_BAJA          VARCHAR(255)
 );
 
 
@@ -1798,7 +1800,9 @@ CREATE VIEW V_EMPLEADOS(
     FORMACION_RECIBIDA,
     EXPERIENCIA,
     CONTRATO,
-    DURACION)
+    DURACION,
+    FECHA_BAJA,
+    CAUSA_BAJA)
 AS
 SELECT V_CONTACTOS.ID,
   V_CONTACTOS.ID_CATEGORIA,
@@ -1832,7 +1836,9 @@ SELECT V_CONTACTOS.ID,
   EMPLEADOS_DATOS.FORMACION_RECIBIDA,
   EMPLEADOS_DATOS.EXPERIENCIA,
   EMPLEADOS_DATOS.CONTRATO,
-  EMPLEADOS_DATOS.DURACION
+  EMPLEADOS_DATOS.DURACION,
+  EMPLEADOS_DATOS.FECHA_BAJA,
+  EMPLEADOS_DATOS.CAUSA_BAJA
   
 FROM V_CONTACTOS
 INNER JOIN EMPLEADOS_DATOS ON (EMPLEADOS_DATOS.ID_EMPLEADO = V_CONTACTOS.ID)
diff --git a/Source/Informes/InfFacturaCliente.fr3 b/Source/Informes/InfFacturaCliente.fr3
index 890cdab5..37d2d193 100644
--- a/Source/Informes/InfFacturaCliente.fr3
+++ b/Source/Informes/InfFacturaCliente.fr3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TfrxReport Version="4.3" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="39065,8724234954" ReportOptions.Description.Text="" ReportOptions.LastChange="39612,70162375" ScriptLanguage="PascalScript" ScriptText.Text="&#13;&#10;procedure DatosEmpresaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  Cadena: String;&#13;&#10;begin&#13;&#10;{  DatosEmpresa.Lines.Clear;&#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO_1_EMPRESA&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := 'TLF: ' + &#60;frxDBCabecera.&#34;TELEFONO_1_EMPRESA&#34;&#62;;&#13;&#10;  if (&#60;frxDBCabecera.&#34;FAX_EMPRESA&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := Cadena + ' FAX: ' + &#60;frxDBCabecera.&#34;FAX_EMPRESA&#34;&#62;;&#13;&#10;  DatosEmpresa.Lines.Add(Cadena);&#13;&#10;}&#13;&#10;end;&#13;&#10;&#13;&#10;procedure NombreEmpresaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;{  NombreEmpresa.Lines.Clear;&#13;&#10;  NombreEmpresa.Lines.Add(&#60;frxDBCabecera.&#34;NOMBRE_EMPRESA&#34;&#62;);&#13;&#10;}&#13;&#10;end;&#13;&#10;&#13;&#10;procedure DireccionEnvioOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ACadena : String;&#13;&#10;begin&#13;&#10;{  ACadena := '';&#13;&#10;  DireccionEnvio.Lines.Clear;&#13;&#10;  if (&#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := &#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62;;&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PERSONA_CONTACTO&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := ACadena + '  ' + &#60;frxDBCabecera.&#34;PERSONA_CONTACTO&#34;&#62;;&#13;&#10;&#13;&#10;  DireccionEnvio.Lines.Add(ACadena);&#13;&#10;  ACadena := '';&#13;&#10;  DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; + ' ';&#13;&#10;  if (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := ACadena + &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62;;&#13;&#10;&#13;&#10;  if (ACadena &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(ACadena);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62;);&#13;&#10;}&#13;&#10;end;&#13;&#10;&#13;&#10;procedure PageHeader1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;{  if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));}  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);&#13;&#10;  Set('Capitulo', 0);&#13;&#10;  Set('NumCapitulos', 0);      &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo4OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (Length(&#60;frxDBCabecera.&#34;OBSERVACIONES&#34;&#62;) = 0) then&#13;&#10;        Memo4.Visible := False;  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo22OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (&#60;frxDBCabecera.&#34;DESCUENTO&#34;&#62; = 0) then&#13;&#10;  begin              &#13;&#10;     Memo22.Text := 'Base imponible:';&#13;&#10;&#13;&#10;     Memo10.Text := 'Importe total:';&#13;&#10;     Memo10.Font.Style := fsBold;                            &#13;&#10;&#13;&#10;     Memo9.Text := FormatFloat('#,##0.00 €', &#60;frxDBCabecera.&#34;IMPORTE_TOTAL&#34;&#62;);&#13;&#10;     Memo9.Font.Style := fsBold;         &#13;&#10;  &#13;&#10;     Memo23.Text := '[&#60;frxDBCabecera.&#34;IVA&#34;&#62;]% IVA:';&#13;&#10;     Memo25.Text := '[frxDBCabecera.&#34;IMPORTE_IVA&#34;]';&#13;&#10;     Memo12.Visible := False;&#13;&#10;     Memo14.Visible := False;&#13;&#10;     Memo16.Visible := False;  &#13;&#10;&#13;&#10;     Memo13.Visible := False;&#13;&#10;     Memo15.Visible := False;&#13;&#10;     Memo17.Visible := False;&#13;&#10;     Memo11.Color := $00CCFFCC;&#13;&#10;  end;                       &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo39OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Memo39.Clear;              &#13;&#10;  if (&#60;frxDBCabecera.&#34;TIPO&#34;&#62; = 'F') then&#13;&#10;     Memo39.Text := 'FACTURA'                                        &#13;&#10;  else&#13;&#10;     Memo39.Text := 'ABONO';        &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403910003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C65732200010C3C00000020446174615365743D22667278444256656E63696D69656E746F732220446174615365744E616D653D22667278444256656E63696D69656E746F73220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C10000000204E616D653D2220496E666F726D652200010C10000000204E616D653D224361706974756C6F2200010C14000000204E616D653D224E756D4361706974756C6F73220000055374796C650100">
+<TfrxReport Version="4.3" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="39065,8724234954" ReportOptions.Description.Text="" ReportOptions.LastChange="39680,5755554861" ScriptLanguage="PascalScript" ScriptText.Text="&#13;&#10;procedure DatosEmpresaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  Cadena: String;&#13;&#10;begin&#13;&#10;{  DatosEmpresa.Lines.Clear;&#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO_1_EMPRESA&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := 'TLF: ' + &#60;frxDBCabecera.&#34;TELEFONO_1_EMPRESA&#34;&#62;;&#13;&#10;  if (&#60;frxDBCabecera.&#34;FAX_EMPRESA&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := Cadena + ' FAX: ' + &#60;frxDBCabecera.&#34;FAX_EMPRESA&#34;&#62;;&#13;&#10;  DatosEmpresa.Lines.Add(Cadena);&#13;&#10;}&#13;&#10;end;&#13;&#10;&#13;&#10;procedure NombreEmpresaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;{  NombreEmpresa.Lines.Clear;&#13;&#10;  NombreEmpresa.Lines.Add(&#60;frxDBCabecera.&#34;NOMBRE_EMPRESA&#34;&#62;);&#13;&#10;}&#13;&#10;end;&#13;&#10;&#13;&#10;procedure DireccionEnvioOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ACadena : String;&#13;&#10;begin&#13;&#10;{  ACadena := '';&#13;&#10;  DireccionEnvio.Lines.Clear;&#13;&#10;  if (&#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := &#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62;;&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PERSONA_CONTACTO&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := ACadena + '  ' + &#60;frxDBCabecera.&#34;PERSONA_CONTACTO&#34;&#62;;&#13;&#10;&#13;&#10;  DireccionEnvio.Lines.Add(ACadena);&#13;&#10;  ACadena := '';&#13;&#10;  DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; + ' ';&#13;&#10;  if (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := ACadena + &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62;;&#13;&#10;&#13;&#10;  if (ACadena &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(ACadena);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62;);&#13;&#10;}&#13;&#10;end;&#13;&#10;&#13;&#10;procedure PageHeader1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;{  if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));}  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);&#13;&#10;  Set('Capitulo', 0);&#13;&#10;  Set('NumCapitulos', 0);      &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo4OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (Length(&#60;frxDBCabecera.&#34;OBSERVACIONES&#34;&#62;) = 0) then&#13;&#10;        Memo4.Visible := False;  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo22OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (&#60;frxDBCabecera.&#34;DESCUENTO&#34;&#62; = 0) then&#13;&#10;  begin              &#13;&#10;     Memo22.Text := 'Base imponible:';&#13;&#10;&#13;&#10;     Memo10.Text := 'Importe total:';&#13;&#10;     Memo10.Font.Style := fsBold;                            &#13;&#10;&#13;&#10;     Memo9.Text := FormatFloat('#,##0.00 €', &#60;frxDBCabecera.&#34;IMPORTE_TOTAL&#34;&#62;);&#13;&#10;     Memo9.Font.Style := fsBold;         &#13;&#10;  &#13;&#10;     Memo23.Text := '[&#60;frxDBCabecera.&#34;IVA&#34;&#62;]% IVA:';&#13;&#10;     Memo25.Text := '[frxDBCabecera.&#34;IMPORTE_IVA&#34;]';&#13;&#10;     Memo12.Visible := False;&#13;&#10;     Memo14.Visible := False;&#13;&#10;     Memo16.Visible := False;  &#13;&#10;&#13;&#10;     Memo13.Visible := False;&#13;&#10;     Memo15.Visible := False;&#13;&#10;     Memo17.Visible := False;&#13;&#10;     Memo11.Color := $00CCFFCC;&#13;&#10;  end;                       &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo39OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Memo39.Clear;              &#13;&#10;  if (&#60;frxDBCabecera.&#34;TIPO&#34;&#62; = 'F') then&#13;&#10;     Memo39.Text := 'FACTURA'                                        &#13;&#10;  else&#13;&#10;     Memo39.Text := 'ABONO';        &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403910003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C65732200010C3C00000020446174615365743D22667278444256656E63696D69656E746F732220446174615365744E616D653D22667278444256656E63696D69656E746F73220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C10000000204E616D653D2220496E666F726D652200010C10000000204E616D653D224361706974756C6F2200010C14000000204E616D653D224E756D4361706974756C6F73220000055374796C650100">
   <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
   <TfrxReportPage Name="Page3" Font.Charset="1" Font.Color="13056" Font.Height="-13" Font.Name="Arial" Font.Style="0" PaperWidth="210" PaperHeight="297" PaperSize="9" LeftMargin="20" RightMargin="20" TopMargin="20" BottomMargin="20" ColumnWidth="0" ColumnPositions.Text="" LargeDesignHeight="True" HGuides.Text="" VGuides.Text="">
     <TfrxPageHeader Name="PageHeader2" Height="404,40971" Left="0" Top="18,89765" Width="642,5201" Stretched="True">
@@ -32,7 +32,7 @@
       <TfrxMemoView Name="Memo31" Left="332,59864" Top="3,77953000000002" Width="82,77162913" Height="22,67718" Color="13434828" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="13056" Font.Height="-15" Font.Name="Tahoma" Font.Style="1" Frame.Typ="14" GapX="5" GapY="2" HAlign="haRight" ParentFont="False" Text="Cantidad"/>
       <TfrxMemoView Name="Memo30" Left="86,92919" Top="3,77953000000002" Width="246,42514559" Height="22,67718" Color="13434828" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="13056" Font.Height="-15" Font.Name="Tahoma" Font.Style="1" Frame.Typ="14" GapX="5" GapY="2" ParentFont="False" Text="Concepto"/>
     </TfrxHeader>
-    <TfrxFooter Name="Footer1" Height="124,72449" Left="0" Top="578,26809" Width="642,5201">
+    <TfrxFooter Name="Footer1" Height="177,63791" Left="0" Top="578,26809" Width="642,5201">
       <TfrxMemoView Name="Memo17" Left="333,59864" Top="89,70872" Width="308,78740157" Height="22,67718" Color="13434828" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="13056" Font.Height="-15" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" GapX="5" HAlign="haRight" ParentFont="False" Text=""/>
       <TfrxMemoView Name="Memo16" Left="333,71676" Top="67,0315399999999" Width="308,78740157" Height="22,67718" BrushStyle="bsClear" Color="16777215" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="13056" Font.Height="-15" Font.Name="Tahoma" Font.Style="1" Frame.Typ="11" GapX="5" HAlign="haRight" ParentFont="False" Text=""/>
       <TfrxMemoView Name="Memo11" Left="333,59864" Top="45,1338899999999" Width="308,78740157" Height="22,67718" BrushStyle="bsClear" Color="16777215" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="13056" Font.Height="-15" Font.Name="Tahoma" Font.Style="1" Frame.Typ="11" GapX="5" HAlign="haRight" ParentFont="False" Text=""/>
@@ -48,6 +48,7 @@
       <TfrxMemoView Name="Memo22" Left="333,354330708661" Top="0" Width="183,30714276" Height="22,67718" OnBeforePrint="Memo22OnBeforePrint" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-15" Font.Name="Tahoma" Font.Style="0" Frame.Typ="3" Frame.LeftLine.Style="fsDot" Frame.RightLine.Style="fsDot" GapX="5" GapY="2" HAlign="haRight" ParentFont="False" Text="Subtotal:"/>
       <TfrxMemoView Name="Memo23" Left="333,35433071" Top="22,67718" Width="183,30714276" Height="22,67718" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2f" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-15" Font.Name="Tahoma" Font.Style="0" Frame.Typ="2" Frame.LeftLine.Style="fsDot" Frame.RightLine.Style="fsDot" GapX="5" GapY="2" HAlign="haRight" ParentFont="False" Text="[frxDBCabecera.&#34;DESCUENTO&#34;]% descuento:"/>
       <TfrxMemoView Name="Memo25" Left="516,66196654" Top="22,67718" Width="124,72449" Height="22,67718" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-15" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="[frxDBCabecera.&#34;IMPORTE_DESCUENTO&#34;]"/>
+      <TfrxPictureView Name="Picture4" Left="52,91342" Top="41,57483" Width="195" Height="132" AutoSize="True" Picture.PropData="04446174610A091F00000A544A504547496D616765FA1E0000FFD8FFE000104A46494600010200006400640000FFEC00114475636B79000100040000003C0000FFEE000E41646F62650064C000000001FFDB0084000604040405040605050609060506090B080606080B0C0A0A0B0A0A0C100C0C0C0C0C0C100C0E0F100F0E0C1313141413131C1B1B1B1C1F1F1F1F1F1F1F1F1F1F010707070D0C0D181010181A1511151A1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1F1FFFC0001108008400C303011100021101031101FFC4009F000100020301010100000000000000000000050603040702010801010003010100000000000000000000000002030401051000010303030301060502040505000000010203040011052112063141132251613242140771819123155233F0B12516A1C1627243825363832411000202010204020903040301000000000001110203211231415104F02261718191A1B1D13213C14252E1F1231462F23343FFDA000C03010002110311003F00FD5340280500A0140280500A0140280500A0140280500A0140280500A0140280500A0140280500A0140280500A01400900124D80D4934045CAE51808DB83939A529009521B3E450B76B2376B55BCB55C594DBB8C75E2D1AC39962D6B0865994F5C1254861640B1B77B53F2A7C27DCC87FB557C13F733CFFBD7129712875996C157C25C8EE0B93DBA1AE7E65CE7DCCE7FB75E69AF633763F24C1C85F8D131B4BB6BF89C3E357E8BDB52592AF492CAE7A3D24914A92A1749041E846A2A65C7DA0140280500A0140280500A0140280500A0140280500A004800926C06A49A0219DCF4894A533858E652C1DA65380A63A483EAF5685447B07EB55EF6FEDFE867799DB4A29F4F2235F82ECC98B8B25D732D2594A4BE8DC63466891702C8BEE51F67B2A2EB3A3D7E0BC7BCA9D37386F73F723D4C8EAC7E1A3498B0463D45695644C76D2B75091A28A6FBAFA8146B6D6528EB076EB65134B6F5833A27224E1B22EC3C8999B1B538C94A821E6C845C85DB6F7F75777A756D393BBE6966AD3F33023CFF00EDC8B93939576344623AE4CB5A969055E9B825D57448A513754E45159D2AF73E1EF29CC722CC67996918FC3379B53C95AA54E94DFD241653FF008DCFABDA16F5BE64A01FC6BB5C4DAFF2410A63765FE44BD26AE1F0D394DB931ECECCC744716A0D32CDD18F3B2E082EA4977683A852BA5554B2DB145B75E3C7FB15636B6C53CB2F8F15E3D87DE11972CF256A5467E531C69B43B1A44E7E448951A7C9DDB52582F9504A1937BAD2753A74D6AE7976A4AFA3F1F32FAE5D91BF49F71D85B71B71016DA82D0A174A9241047B88A99AD393D50E911C8F956138EC44C8C9BFB14EA8223466C171F7DC51012865A4FA96A24F6FCEBA949C6E0D7E2F90E55913226E620358B82EDBF8F82495CB4A41375C820F8D2562C4213F0F7347071493F5C24280500A0140280500A01402805018E44862330B7DF586D96C152D6A36000AE37072D6494B2BCBFE43368321D6DC6F1C3D51B1C8586DD909B82971E5120A526DA26AA537D5FDBF332F9B26AFEDE9D7D66383968E82CAD21D7E5A545918C8C084B0D5EC7720686C35BABF2AEABAF6F4E9E3FB1CA654A39BE8B91953918F88C94E71D495C290EDCC96D25652F776D7B4696ED5D76556E7812FC8A9673C1FCCD87B293A4C67A6465220C360A14D3F2FF6D2E007F737EEF85BDA743D6F5D96F81277B594D74F5F32B5067CDCA3F3DDC0C26A4FF20D78179146E6A080014F902D4373CAFF00B13EFBD7563D5B7CC8571B6DBFE5A68641F6E65BB862C64A7FF31350DA998EDBDB9B82CA0829B371C158528016DCE157E5D28D355DB5D3424F1354DB57AC1B3C8728DF18E10C469CE223BCA68454A8282AEE5BE142345B8562FA245EA1B2DB36AE3046D5B5712AAFBA20ABE03153391A2147CDCA541E2A8DCA8FC754E25329FDA8DC5D985A3B90DDC93E22AF65EA58B6D12AD5C9CC3B6A95532D78A6467321214C2037C699408A98C520B6F16EDAA07CBB7B2935526F259BFD9C3D6429396CDFFF003E1EB314B6A670C0E4D65D2E71E40DCFB6F2BFB57501D4F4FC6B8A96C6FCBAD7A7D0E7E3BE17E5D69D08695F75B23C926B985FB770FEB662520C8CB4A1B224704DB76BAACF5034D7A80A02B6EC8E26E92C7C47EDEC2C23EBCA645F56639248D64E5E40BAC5EE763292541A40BDAC9EDFA545DA4245B2A248500A0140280500A0140280500A014053B29925655E7A4A029587C6280000D244ADDB5373FF00B68BDCEB59DDB739FDB5F8BFA23064C9BDCAFB2BF17F446C4693FC5653CD9A6C17A61B33946EE59D522CD9D7D23B274A96EDAFCDCF9FE84AB6D96F3F3E7CBD465998F9AD674CDC304A3EADB299EFA8A4B208F854537B958EBA7E75DB51AB4D79F1257C7657DD4E7C7A1AB1F90478C0C0E391DCCECD75D52E5CC4A826325C58054E3AF1F4F7164B77FCAADAE3DA8B6955550B566E33C515394DCAE48F7F212536221A49109B2011E868DB71B2BE25EB52DDD09EDEA585084212108484A13A04A4580FC85449956E43CDFE9E7FF05C7A38CC7255101511248662A0EA5E96E80436903E5F895A01D6A4ABCD916FA1F38F70853190FE7B9149198E46459B90A404B1150493E388D9F807AAC547D468EDC904BA92D97E390322870DBE9E5AD253F54D001763D42BFA81EE0D537C6ACBD25597056E9F27D4A24DFBA0CF1B4AB08CC1625CD85669E763BC96A1B45570DAA43EBBA1A2AD86E92777615DC75694351E3922BC56B556D692F1CBF52218E27CB7EE2CE4CEE41296C71D3B54D3690B650E27E64C68CE04AC255D9F7C6EEE948D2DA255781A16A59B1B8C81F6F6678A0B6471C98BB2EC4AD4D3DED5A8DCA8D877EDD3A562C991D2D367357F031DF23C5796E696F81D010B4AD095A0EE42805248EE0EA2B41BCFB40280500A0140280500A014028050109CAE6484446B1F101FACC92FC0DA87CA9F9D44F6B26AACB6710B8B337737696D5C6DA1258EC7458101A851D3665A4EDB1EFED27F1A9D6AAAA11763C6AB5555C085E45928790664E0E132AC8CE5A0071B6ADE36771F4A9D74FA51D3A0BABDD5DB53755A7CC8654AF575EA6B44E16FBA969BCC492F4069284B5888C5488C95255B8B8EA9442DF5136F8B4D3448BD4AB15508ED31ED51C8B4468D1E3329623B4965940010DA004A401A680570B1220F35CD3198D2B6D0152DF6C5D68688DA9005C952CE82DDEAABE649C2D5F4467CBDD56AE1799FA0E7B37EE4F2AE4A5D8980F163F1A165A7F2C3715A81D2D1944D890AD37DAC3B5E9F9B6A9B2D7A7D4A9F72D2D78F4FA9B3C7F2991E3D0DE8F063B496EC5E79C5A2EE3CF1D54E38E6AB716AF69359BFDAC9CD232AEEF229D112B2BEEA2F0EDB6EE6E3212D2CA508F0289756B576437A9575ED5762CB7B387534E2EEAF670EA4064F9F64F95BA31719B7632249286B8FC457FA8C84585CCE7C02882C10B1BAD75DAF5AA8D3D53F1FA9A56456E0FC7EA5978E7DAAC6B6234ACFB119E7A32BC90F13153B71D14DB6DD282029F5A858A9C7AE6FD2D5D77E858AA4DCECE4B4BF9961E5261B50A31530770F2ACA81DAE27DDA5BDC6B35B239B2E88CD7CCE6CB8422131381727E3A130869461CF88B5E45F52BD21E07F656807E70A1AFB8D554C5354BF6B5A99F1E0DD54A3CB6AEBEBE448F07CABA9F36066B815320FF006FDA5B06C41BF749352EDEFF00B1F1A96F6795EB8EDC6A5B6B49B8500A0140280500A0140280500A02B0996D2B944A9725C2A4C4022C08E9D54A7549DCE6C02DB95B7AFB2AAAA9BB7D0C89CE56DFEDD11E32A9CC646643C749598AD4970B8EC58CB21618689DC5C7858FAC6DD136D7B9A9DADAA4895ED67655EBF22C71198B1D94C688DA5B659B202102C94803A0D35A91A1472336894EA6C00EA4F61EF343A5079673742D998CC27C330A2A48972C9B5C742013D13EFEF592F95D9BAD0F3737736BB75C640C1E2790CD4344CCF7FA4F1C0A0B671EA4A8C99608BA3CD650286D475F1DB77B6DDB462C6B1AF496E2C2B1A964D3783C138DB78D65FF00A25A4A430024253B7A042900D9BB5AC05537C54B693A94DB152DA4C32B59496EC7C84A89C7971B2AFE3D0B5CC98E1F1E3E1ED3EAFA879442370BFC0824E9ADABB4ED5A733A0AF68D39994546244C8E467197194B538E800F21968BB8500D948C6B2ABA52D8276EFBF7554F26454516F4797EACEE4C8A8A1FA3CBF56593178563071CC8C723C521BF53B294ADEFBAE26EA2B5AFA9D4FE1D6B0E4C977E6FE263BE4BBF370DA758E259D398C4A1E706D92DFA1E4FB4DAE15FFA856EC3977D64F5BB5CDF9293CCC5CBB1501F80B9CEC34C991193E82565BF48D48510754FBAB996956A5A9823DD62ABAEE6A5A3CBBCCF8CE3E3B6DAE4237A129058601581703A585AD4B67A57987DDE2AA89F7150773717F9981C923A3C45F7CB521B48B0B0F42EFA7CC850577ACB6C95DD5C8B9B8303CD5DF5C8B9B87E3D474C7A4C66192FBEEA1A6522EA756A09481D6E5474AF40F624A94BFB9F835AD51F8F32FF00249C084F8B1C852DA048B8DF248F0A47B7D552DBD4E3B18D586E7FC8143F999E8E3D8C201563F12E17252FADC392D494ECFF00EB4FE75D9484365970587188C7A60A65C898DB64F89C94B0E38126DE92BB02AB7B4EB516E4EA506CAA7414CA10D521A12CA7788E569F214DEDBB65F75AF5C81267A1D140280500A0313EF16D3E91759048F6003A93EE15D471B2B9C71CC4C080725364B69979275D7DC79D207CC53645FA245BB567C4D2ACB6B53260B56B5DD66A6C4B34EB53E4A6442DA5AD9B17353A9524EBB1B3F8EB7ABD43D4BD35672BDE48A1094242522C91D050B4AD73DCD46C7E2911D721487E738186633092E4A7C907F6986D36BA95D3712123B9AE5A8ECA114E6ABB56138922B8D7067242D8CBF258CCB2A62CEE3F02DED5C786A1FF0091D72DFBEFFF00D6744EBB6BB555AA8AA3B8F156AB4504272BE5ADBAEBB9479619C7425A9B696BB847A49F5586AA52BB01F875AC16C96BD96D5CF43CCCB9AD92FE55A4E852A565F2F9E7C372512A3C593B43106121472334A095156CD54D356D371B5FA93635AA9473AC5AFCFF008A8FD4BB1D1CFF002BFC17F53A6E13EDD0971A30E451988D8C8C7743E2913582CA812438FAFAC974DF52AF4FB8F5AD0EDD0DEAA5CE762A04E8E23C8652A6D22CDD858A34B5D0474AAAD54D4317C75B2868A364381E7D1254880E34E45734F22CED70026FEAF6FE558ADDADA7CAF43CCBF63913F2B505BF8D605185C6222070BCE93B9D70F42A3D923B015AF163D95837F6F87F1D60F59DCC6020C375196C84784DB882097DC420D8E9701475EA2AD892DB4350733E31CFB046298F85E3F2790E61974B6B91158FDA23768B71F706D6F4E9DBA5558306D5E64933276D8B6D75AF98F7CD637DC9CA6084B9D1F1FC7A2C7712B4B2D28CB9414BB22C540259FD3FE54EE762A4B5BA3D877BB55549B298F6133C7FED9F1CCA418993CECA99C8DE712971AFE45F5A996D413B484308296EDA7CC0D5B5CBB94AE65F89AB555BA97E8B12244652C4565B8EC26E52D3490840B9B9B25200EB5C2D32D00A0231CE3383733EDF205C44AB2ED3263A2512AB86C9BDB6DF6FE06D7AECE9072093AE1D140280500A034F332998B899921D5F8D0DB2E28ABA1D104E9EFA11BF0650F8D39947E2B72F238B2CE1551996E19420BAF3FD55E47D3A29A49DC2E900EE3D6D6AAEB5554B9E9EC31D2AAB552A5472E1F52E5C5A3B4CE253E2710E21D71C707892A4368DCA364210BF52427D86989255D0BFB7AA54D08FE41CC4C79A309818E32BC89C4EEFA549B331D0494F9A539D1080AF97E23D855C9732D6FA1978E71118E92BCAE4E52B2BC85F4EC7F22E8DA94209BF8A3B572965BE9A27E2EA6B8D848C1F71395C4E3FC7DE52D7BA64A059891900ADD7091EAD881A9B26FEEA8D937570433B7B5C71385A2565F3AF94290995223B895A10A57FA763CDBA100832646D16F624FBAAA4EB4A6B297C5FD17E8624D529ACA5F17F45FA1D6783E0F8F70CC32B359B9ED232591017272331696D4A49F8129DC7D23D894FB85598A76AE9D3A1A7B7515D7D8BA237E1FDDCE1F3DE92DE39C7E5A230F548432A4B4A55EDB12A5ED24F7E96B532D96353627973D68A59AB97FBB989C5287D73498E369516DC74790E97F4A002AEFECAAD65B370AACA177566E1559A28FBCEE64F6B3C7701265BEE14844898E370E290AF9838E1BA80FF00B6AD6D270DA4CB9E75C1B499BE78C7DC9CE03FCF721461E2AC282A06111B57627D3794EDD60DBFA455929702C86C90C5FDA9E0901FFA938C4CE9A4EE5CB9EA54A714AD3D47CA549BE9D8571DD925526B1BC7E263A7CB991D6B1F586EB62E0360F5B848154D71AAB6D732AC78152CDAE662E6086D5C6E77900294A02B517E8A06B9994D1FA88F7493C6CC3C1544F1683E92900282776B71BC9F60A8F6DFF9A23D97FE489EABCD4280500A0140280500A035B2391898F88B95297B1A458682EA528E894A52355294740050E37041BF8395992323950A47892B563F146C50DA949B21C7AD7DCEFF00C13DBDA7B3C883AB6B521D7CA67E2B8DC291BE33115B8F771F737281536B28527B04D858FA8D64592CA8A172F4986B9AEB1D76F4F4B35B0F96E6DCBA2F8E0BCBC760DC5952F3EA683125F65562910995056C1FFC8B1D3E1D6B5D53AFDDAB3663DF1E665D707C7B118388A8B8C8E1942D45C7DC24A9C75C57C4E3AE2895AD67BA9468DC96A5041F3BFB83038CC55B2C844BCCA9B2E370F7592DA3A79E411FDB681EE7AF41AD76B5938EC71BE46A7243672B9F9243D965A014ED272531ADA4A1986C0B9890D5716DF65B97F575A6494BCABDFC3D6CCF95DA34F8FCC04F37998F4C1E3B8C670CD8D23465A9224B9BCDD3B5246C6D4ADDEA0AD7DF5969F8F7799EEB7C3FAFCA0CB4FC6EDE67BADF0F1F025703F6CF9E3AA732597C0C3C8E65DD3EA73B355250916B68C32149B022E3728D8682B73BA3D0866EE6F8467E238D339AE4291F564AFE831AD263368437D0793FB9B4DBA0B77AC39AD4A729B3EBF430E7D98DF04ECFA966E0BF6FB89BB8B71C730ED870387C53DCFDC90A247AD5E455D5D6A74C8F257CDCCBB037968F71E392707CA474B6DE3D0B9CD2C8483A6F4EB7F57BBDF58F376AD7DBA98BB8ECACBEDD517FC246971713163CB73C925A6C25C5FBFD9F974ADF44D249F13D5C5575AA4F89BB522C207944F9ECBF8B8705D0CBD32480A77436422C542C7A837D6AACB669A4B9B337717B275AD78B67AE6CE251C6276E3B77A528BDAFF1280FF2AE770E28C778E31336B8DC411305098036ED68122F7D55EA3FE753C75DB5489E0A6DA244954CB8500A0140280500A034B379AC6613172329937C4785193B9D715FA0000D4A944D801D4D752938D911C7A265322FFF003F9A4A995BBAE2F12BD8443688B052CA7E27DC1AA8DFD37DA3B9267129D59EF35CD31F0272315099772D9A77E1C7C30145B04DB7C873E06117F997F9035D553B250B1DC43313E53A79238E485439476E2E1DDC871D0E24AD0A6DB55BCAADDD56B0769E9D2F54CFEDACAD7DBAEBF330C3D6AA524FDBAEA5F304E478794761EC5B6B949F2A5521E4B8F2D4DFA4FA537DA00A561382DC2D56DB7AF57A95CFB9FF0075A3F1C8EEE3B0EB6E567D43614FC698EA58F46F48BDDC57C88FCCFA6F5A2949343650785FDAAE6D9EC97F399B75CC530F12E176580FE416E0DBB5DB389B21405D285285D03E14EBBAA56BA5A1C893A4653806030DC7A4BD8C8DBB2082979DC83EA2EC97082412B795751D1474161593B8974667EEE9FE37043E05415998057F179DBB81A924773EEFC2B161D6CA4F3B07DEBD6753AF48F70E67CCA2A721C956D170B4B2B6998EA3ED206ED07EB5E7F714DD787E83C6EEEBBF2C7A91D1E2466E3466A3B62C8692123B5EDDFF003AF41283D8AD614196874500A023A7615A99938539C7143E8C9525A006D2A3D0DFA8B545D65A7D0AAF895ACADD088E76E2DE6B1B8C6ADE69B2D035FE8475FF0089154F70E52AF5667EF5CAAD57EE659D084A1094206D42404A40EC0682B41B4FB40280500A014028050158E79C6F2B9B898E5631D6132B1935B9E98D2C28C77CB414036E6CD46AAB836352AB822D185EC1F36CD4543198CAB5896490643786DE1D7136D51F50EFA91AF7426F494B8086C9BC071BC2F1F83F45898A98CC93BDC22EA5B8B3D56E2D5752D47DA4D71B93A910BCAD8722E4112D2B536CE49B105E7104A4B6E6EDCD2EE2D6D4589ACF97469F5D3E863EE545A7F9797E8739E71CC9EC7CC678E7174F9796BCF20B8860071315C08521690EA8DD4B3D557F4A46A7A568C785717EB254C296AFC3E05A3ED6FDA9C460DA6F3F3DE4E5F9048BBA676E2B6DA52FE30D124EF55EF770EA7B5B5BF5E4DCB4E068A34D4A3A554499E1E61A7585B0B4DDA71250A4F6DAA1623F4A3D4E349A83954F893B1397318924465A5D697A7A93A6D235FCADEDAF32C9D2F1D353C2BD6D8EF1D0EAAC3CDBECA1E6CEE6DC48524FB8EB5E99EEA72A4A1F388DFC767A0E6482A8CA7505D0120ED537D7AFF50AC3DCADB7ADF91E5F795D992B7E45F90B4AD095A0EE42805248EE0EA2B71EA9F680501AD929EC4084ECB7D41286924EA6D73D85FDE6B96B24A590C97554DB29A723978E944C952A4B3935AC29B86B0170DF4A8FF69ADBA5F6F7BDEB2CD96AE7774E5EA479FBEEBCCDB56E9FB5FA1129052BCA72F933CA7FFCB8C498CCAAF70A59F8ADDBFC0AB2BE6C8DF2AE85D4F3E676E55D0B3D5E6D140280500A0140280500A0140280A4677212796C993C6704A2DC16884E5F3E9176DA20EAC4555C6F9171EA50D1BEFEAF4D75D546A5775B94157E25C2715C55CC8CB7DA5CDCE97BC2A4B8434CB6C38AB36A52AFB94D9B0DEB3F11EB5464CB2B55AAF76BCFD464BE4D3CCBCCB972D79FA8BA61F20C635E921D969760FA4BAEB6901844975607898DBD458DCFEB5CA59579E9F09E88EE2C8A8DCBD3E13D116B041008370750455E6E14043728E3E9CC41DAD90DCC6BD4C387A7BD27DCAAAB362DEA3999FB9C1F92BE923F84E456DB0AC24B4782543252DB6A2028A6F73A7E77FC2A1DBDB4DAF8A2AECEF0B63D1D4B06471D1721117164A7734BEE3A823A149EC6AEB5559433564C6AEA19A9C771F90C74030E63A8792CA8A632D37BF8BB055FD951C557550CAF052D4AED6E6094AB0BCF8A525292A51094A45D4A3A0007734053391676548783905C6646219B25E090DBC95BA49F4BC15FDB4DBA1F6D65CB91CE90EBE38F43CECF99B7E5874F63F7F4314998EC7404E25B71A7A7FA61639C521C6D2A045E437AAC2529ED6EFAD76D6755E5E2F82FD4E5AEEABC9C6DC17EA5A70388462B1ADC40ADEE7C6F39FD4E2BE222AEC74DAA0DB8716CAC121532D140280500A0140280500A014056A6C89DC85F3031AF2E2E1DB5A9192C937B9B75C2856D31E2AAC2D72085BA3A0D13A9DC9EF020DCF02731B8D818C82CC180C223448E9086596C592903FC7535C6C991DC831121EB6431A129C9B49DB657C2EB57BA9A58EE0F6AAF255F1AFDDE3433E7C4DF9ABF72F8FA0866A4A640FE41A8E992A8C15E280B0969B84503F70ADBEEA26FB5550AB4F5F87428ADA7CC94C72FE258B8FBD2DFC5B52652CADC7EEE0DC00212AF845874D3B55B4729335616DD537CCDB8F362492E263BC874B2AD8E842812950EC6DD2BA9A64EB64F8333574911F91C1409F223C97029A93196971B7DA3B16769BED51B1BA4FB2A16C69B4F9A2AC986B669F344854CB4501827CF8B022AE54A5F8D86FE256A7A9B0D0546D65552C85EEAAA5F02133D9388A7178DC936A463E4B685B531B27437F9D235B0207FCEA191AE16E0519F22FB6DF6BE645ADE30A42644A69B5B8DB4B8C16C5BFD410E001A01B47509BFA95DBB556DC397FF006286F6B97D234FDDD094E35C71C8CEFF00253D2913568D8CC740B371DBFE8401A7E353C78E1EE7C7E5E82EEDF034F75BEEF9162AB8D6280500A0140280500A01402808B991139969C8CF85A71AAF4B894A94DA9EB1D45D242823B1F6D77810E3EA24586198ECA1861096D96D212DB69164A523400015C267BA014042E6F8F2661FAA86A11B209046F03D2E0208DAE0F981BD577C73AAD1F8E267CD8376AB4B78E24662F3F2E2392E2E4D831B226DF4D1D4A088842404A10D2F54A6FF008D578F235A5943F87B0A716775956516E5D3D86A4B4BE98AA74BCB632D356DA9C828478CADA0BDBE364A6FDC956EB927A9D29698FF0093F10BC7C085E638C5DF2FD117165F8C87130BCE1725B6D24A14A05D29E814A1EFB75ABE791BD35C2752164F289318CD122186CC70DA9BBB808DAE92029D207A3A7F9541E4899E467B770D4CAE11CFAF53EFFBA5D5380261AF629B46CB9F579DD6CB8841481D0816BD37FA3C713BFEC39E1FDE24D75E6F2BFC7C4C9A9CB36DBE1BC94665857A124DD455E4BAC6D4DAF6A83BDA13F795BCD7DAADE9D7419AC6484CD5BF04791ACA3611259737968947AB713F2129E86A56A6ADAE6772E37BA57EEE26B225BA92C418611939F152E3094B7AB1E058091E75A87CB6E82A3BB92D5AF1A90DDC2ABCD65A7A23D24AE178E08AE09B90704AC91F8176DADB29ECDB48E8902A54C71ABD5F8E05D8B043DD6D6DF2F5139569A4500A0140280500A0140280500A0140280500A014062951234B64B325B4BAD2BAA542F5C6A7891B55594320D1C5E5C2742F1590719690084457BF75B17F6155C8BD56B147DAE174E2675DBBABF25A174E2655CBE411E46F7314DC9B2128F3B2E242C9BDD5A285F6F7AEBB5BA1277C89FDB240388F0B525992CE456A94EA5FDC6321692A4926CBD53BC58DAD555B495167EC32BD25357D5CF032353A2EF8CB870724EA9ADA0B4A69282A718494B6A2A57F4851FF0002BB5B2D22B6F71DADD4A8ADFDDD0CCDA3914A8FE34E29212E3A1D71C9AE59454059254846D040B7C3A8A3DEF97BDFD09464B28DBEFF00E8480E37929AF97333915BAD76871FF6D9BFFD5DD42DEDA97E36DF99FB3822DFF5ED6737B4FA16889B87061C26433159432D0E8940B55A924A11A2B455509419ABA48500A0140280500A0140280500A0140280500A0140280500A0140280500A0140280500A0140280500A0140280500A03FFFD9"/>
     </TfrxFooter>
     <TfrxMasterData Name="MasterData1" Height="22,67718" Left="0" Top="532,91373" Width="642,5201" ColumnWidth="0" ColumnGap="0" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" RowCount="0" Stretched="True">
       <TfrxMemoView Name="frxDBDetallesPOSICION" Left="333,73228835" Top="0" Width="82,77162913" Height="22,67718" StretchMode="smMaxHeight" DataField="CANTIDAD" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%g" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-15" Font.Name="Tahoma" Font.Style="0" Frame.Typ="14" Frame.RightLine.Style="fsDot" GapX="5" GapY="2" HAlign="haRight" ParentFont="False" Text="[frxDBDetalles.&#34;CANTIDAD&#34;]"/>
@@ -56,7 +57,7 @@
       <TfrxMemoView Name="Memo6" Left="0" Top="0" Width="86,55115913" Height="22,67718" StretchMode="smMaxHeight" DataField="REFERENCIA" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%g" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-15" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" Frame.RightLine.Style="fsDot" GapX="5" GapY="2" ParentFont="False" Text="[frxDBDetalles.&#34;REFERENCIA&#34;]"/>
       <TfrxRichView Name="Rich1" Left="86,92919" Top="0" Width="246,42519685" Height="22,67716535" StretchMode="smMaxHeight" Frame.Typ="14" Frame.RightLine.Style="fsDot" GapX="2" GapY="1" PropData="0852696368456469740A8C0000007B5C727466315C616E73695C616E7369637067313235325C64656666305C6465666C616E67333038327B5C666F6E7474626C7B5C66305C666E696C205461686F6D613B7D7D0D0A5C766965776B696E64345C7563315C706172645C66305C66733232205B6672784442446574616C6C65732E22434F4E434550544F225D5C667331365C7061720D0A7D0D0A00"/>
     </TfrxMasterData>
-    <TfrxOverlay Name="Overlay1" Height="1016,69357" Left="0" Top="725,66976" Width="642,5201">
+    <TfrxOverlay Name="Overlay1" Height="1016,69357" Left="0" Top="778,58318" Width="642,5201">
       <TfrxPictureView Name="Picture1" Align="baBottom" Left="192,75603" Top="539,2919" Width="451,74026" Height="477,40167" Center="True" Picture.PropData="04446174610A7D0800000A544A504547496D6167656E080000FFD8FFE000104A46494600010200006400640000FFEC00114475636B79000100040000001E0000FFEE000E41646F62650064C000000001FFDB008400100B0B0B0C0B100C0C10170F0D0F171B141010141B1F17171717171F1E171A1A1A1A171E1E23252725231E2F2F33332F2F40404040404040404040404040404001110F0F1113111512121514111411141A141616141A261A1A1C1A1A2630231E1E1E1E23302B2E2727272E2B35353030353540403F404040404040404040404040FFC0001108014A012503012200021101031101FFC400640001000301010000000000000000000000000103040207010101010000000000000000000000000000010210010100030002020203010000000000000001110203213141125113617132221101010101010100000000000000000000000111312141FFDA000C03010002110311003F00F4000000000000000000000011991CDE9AC0742ABDBF0E2F4D9360D1991CDDF567BB6D7DD4793535A2F5D51FBB550269ABFF0076A7EED54069AD13AEA9FBEACC66C34D6BCC1966FB477AF5BF2BA340E66D2FA74AA00000000000000000000000000080CAADFAC9E27B416DB27B55B7693D2ADB6DAD425A9AEB6DED73E5000000000000000000002CD37FADFE1A25CC645FC6E75C2C1680AA000000000000000000000873B6F239E9D31E27B516DA96A6BBDBA5BFD384080000000000000000000000000BF87AAA5A394C4211600D280000000000000000801574E98F13D9D3A63C4536DCE6A5A85B7280400000000001249F8040EA6953FAF6A0E059FAB64FE9A65150B7F4D47EAD8CA2B1DFEBDA22EBB40723AFAED5DEBCAFC98239E99B9F868889244AE2A40500000000000000010AFA6F8F13DBBDF6FAC66DAFDAD4A9516DCA010000013250425D6BCEDBFC2D9C64328A66BB5F51DCE5B7F4BA6B22570713949EDD4D359EA2414C482450000001062240462240000000000000000000105B815F5DB13082BE9BE6E15A508800024C5BE96E9CBF2668E35E76FF004BB5E524F2EFC447DA2E62A52E7ED12A240000000000000000000000000000000000000045B88CBBED9D96F6DBC63E54B36A540003A9ADA6BAFDAB469A4D61D11A739AA76DA6B3CBAB7132CDBED76AAA9DBA5BEBC4716DBF2811139B3E5DEBD2CF6AC06AD779B3A65D76FADCB4EB7332B2ABA0140000000000000439BBEB3D83A155ED3E1CFEEB5345E337ECD8FD9B1A9AD2337ECD933AEDF269AD22BD3A4D962A800084B8DEE35051D2E76709F7E50CA0EB5D6DA8D667D34E9A7D601A6935760D2ABEB71AB3AEED5433500000005FC6F8C285DC7D93A2F01A5000000000422EF27B71D3A7D67F2A6ED6FCA6A3BDBADBE95E7281000000000075A5C6CD53CC65D25B661AA788B08901550ABB5F185ACDD2E764A384FBF0859CB5CDFE911673D31E56034A904028EDFE952CEBFE95B37A80000002FE33C295FC7C6A422D01A500000042BE9D31E27B4F4DB119EDCF9A950B72813ED0425D6BCF6BFD2D9C759EC862892FE1D7EBD9A26B27A4AE18CDFAB64FE9D9A0320CFF00AB647EBDB2D2182BE7CFEBE6AC05548008BE9936F36B4EF7FE59BDD4A953ACB6C69D75C455C75F9AB884480AA2128066E9FEAB877D3FD570CD40000004B4729FF2CFF2D3CFFC9076034A00022DC0AFAED880ABA6D9BFC384BAD34FB7F4CF51135B7C459AEBAEB3CBBC4D35F0A36DADF9382F9D35772E5932EF9EF65C55D35A442554000000000001C74BFF002CD3CD68EBFE55F2D7373F84FA8BB498D70E81540000019BAFFA56B7B7FA54CDEA00000025A395FF009675FC7FC905A034A0008ACFD36CED7F117ED7C335F3B7F6952A74D7ED71F0D1AEB24F0E79EB88EC555DAF850BBB55297A8265C5884EB3C8356BE9D39D7D3A694000000000001575F49E5313FB4EF331D4F110480A00000028EDF0A5A3B4CEB950CDEA200000017F1F4A16F1BE704E8D0034A000E3A5FF00955CB5CDCDF859D7FC9CF5C6A83B4828CFDBDAA5DDBE14B37A83AD7DB94CF60D73D25CEBE9D34A000000000000848000000000039DA666196CF35AD9FA4C6C952AB0100001DE971B384FAF20D6971A5CEAEDA500071B4CBA9E1200002AEDFE54356F258CB662B351099E3084834E9658E95F1BE162AA40500000000000000000000010A7B4F195C8DE666106413662D88440000005FC6F8C2D66E7715A562A40500000010CFD35C5FE1A1C74D73106613679F28445BCB6C5C2F649715A74DB3160EC05500000000000000000000000067EBAF9CAA6BDF5CCC32ED316C4B12A004000132E2E5A79ED9D5956F2DB17041A006940000000019FAE98F2A9AEC9628DF4FAFAF49622B59CF6C5C38106B1573E9F156AEAA40500000000000000000000010A7AE9F3171665306442CE9A62E67A568800026665CC400D3CF6FB476CDCF6FADFE1A65CAAA40500000007364B1D00CDBF3C5CC70D766556FCBF09898A678F4B79F4F8AAEEB67B466C49706B1469D31E2AE9B4B3C2C574028000000000000000000000E76D7ED19B6D6CAD4E3A69F6883309DA62A1100012B396FF0015527D79251AD2AB9EF9F17DAC69520000000000039BACAAF6E33E168833DE5B444FBEBEB2D2625313156BD7E2AC9B4A7D353EB20A90144800000000000000000000AFA739B4FE59ECC35B8DF9CD92C4661D5D6C728000265C7A68E7D26D3F9664CB65C8358AF4E92FF6B1A54800000000000000000000000000000000000000000000E76D26CA37E767AF31A04A3263085FBF297D2ABAD9F096623912804CB62EE7D73E2A84E704F06B19F5EB6592AED779562BB0140000000000000000000000000000000000000000001CDD65F6E8051B71FC2BBA6DAFC35164BED3131910D1B72D6B8BCAFC794CA2A4CDACBED375DA7C2016EBDBF2B66D2CF0CA99BD9494D6A14EBDBF2B26F2AABB109500000000000000000000000000000000000000000000011895CDE7ABB0155E3AA3F4FE1709E0A3F4D44E5B4BE2AF13C3C5735DE3B99F948A24050000001FFFD9"/>
       <TfrxMemoView Name="Memo37" Align="baBottom" Left="3,77953" Top="1005,35498" Width="634,96104" Height="11,33859" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-8" Font.Name="Arial" Font.Style="0" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Insc. en el Reg. Merc. de Madrid, Tomo 12.291, Libro 0, Folio 131, Sección 8, Hoja M-194886 CIF: B81747396"/>
     </TfrxOverlay>
diff --git a/Source/Modulos/Contactos/Contactos_Group.groupproj b/Source/Modulos/Contactos/Contactos_Group.groupproj
index acab6020..ed6f9d2d 100644
--- a/Source/Modulos/Contactos/Contactos_Group.groupproj
+++ b/Source/Modulos/Contactos/Contactos_Group.groupproj
@@ -9,6 +9,7 @@
     <Projects Include="..\..\Cliente\FactuGES.dproj" />
     <Projects Include="..\..\GUIBase\GUIBase.dproj" />
     <Projects Include="..\..\Servidor\FactuGES_Server.dproj" />
+    <Projects Include="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" />
     <Projects Include="Controller\Contactos_controller.dproj" />
     <Projects Include="Data\Contactos_data.dproj" />
     <Projects Include="Model\Contactos_model.dproj" />
@@ -111,14 +112,23 @@
   <Target Name="FactuGES_Server:Make">
     <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" />
   </Target>
+  <Target Name="PresupuestosCliente_view">
+    <MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" Targets="" />
+  </Target>
+  <Target Name="PresupuestosCliente_view:Clean">
+    <MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="PresupuestosCliente_view:Make">
+    <MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" Targets="Make" />
+  </Target>
   <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Contactos_plugin;FactuGES;FactuGES_Server" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Contactos_plugin;FactuGES;FactuGES_Server;PresupuestosCliente_view" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Contactos_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Contactos_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;PresupuestosCliente_view:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Contactos_plugin:Make;FactuGES:Make;FactuGES_Server:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Contactos_plugin:Make;FactuGES:Make;FactuGES_Server:Make;PresupuestosCliente_view:Make" />
   </Target>
   <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
 </Project>
\ No newline at end of file
diff --git a/Source/Modulos/Contactos/Controller/uEmpleadosController.pas b/Source/Modulos/Contactos/Controller/uEmpleadosController.pas
index c2c83486..6e941bca 100644
--- a/Source/Modulos/Contactos/Controller/uEmpleadosController.pas
+++ b/Source/Modulos/Contactos/Controller/uEmpleadosController.pas
@@ -19,6 +19,9 @@ type
   end;
 
   TEmpleadosController = class(TContactosController, IEmpleadosController)
+  protected
+    function ValidarContacto(AContacto : IBizContacto): Boolean; override;
+
   public
     constructor Create; override;
 
@@ -250,6 +253,21 @@ begin
   end;
 end;
 
+function TEmpleadosController.ValidarContacto(AContacto: IBizContacto): Boolean;
+begin
+  Result := inherited ValidarContacto(AContacto);
+
+  if Result then
+  begin
+    if not (AContacto as IBizEmpleado).FECHA_BAJAIsNull
+    and (Length((AContacto as IBizEmpleado).CAUSA_BAJA) = 0) then
+    begin
+      Result := False;
+      raise Exception.Create('Debe indicar la causa de la baja del empleado.');
+    end;
+  end;
+end;
+
 procedure TEmpleadosController.Ver(AContacto: IBizContacto);
 var
   AEditor : IEditorEmpleado;
diff --git a/Source/Modulos/Contactos/Data/uDataModuleEmpleados.dfm b/Source/Modulos/Contactos/Data/uDataModuleEmpleados.dfm
index d5dd959e..9e07e390 100644
--- a/Source/Modulos/Contactos/Data/uDataModuleEmpleados.dfm
+++ b/Source/Modulos/Contactos/Data/uDataModuleEmpleados.dfm
@@ -262,6 +262,7 @@ inherited DataModuleEmpleados: TDataModuleEmpleados
         Name = 'MOVIL_2'
         DataType = datString
         Size = 25
+        DisplayLabel = 'M'#243'vil 2'
         DictionaryEntry = 'Contactos_MOVIL_2'
       end
       item
@@ -385,6 +386,15 @@ inherited DataModuleEmpleados: TDataModuleEmpleados
         Name = 'DURACION'
         DataType = datString
         Size = 255
+      end
+      item
+        Name = 'FECHA_BAJA'
+        DataType = datDateTime
+      end
+      item
+        Name = 'CAUSA_BAJA'
+        DataType = datString
+        Size = 255
       end>
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]
diff --git a/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas b/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas
index 977e6adf..0a33f18d 100644
--- a/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas
+++ b/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas
@@ -9,20 +9,20 @@ const
   { Data table rules ids
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_Contactos = '{93EE37EB-EC83-4592-8FE0-7213976D576D}';
-  RID_GruposCliente = '{405EBA8C-423C-4F5C-A73D-C2ED7FADCF50}';
-  RID_DatosBancarios = '{553F9CFD-FE58-4438-A870-320A6710FCBB}';
-  RID_Clientes = '{E6D1F0FB-258F-418D-A500-D78BFF26BDD9}';
-  RID_Proveedores = '{4A0F6766-6036-4C05-8C74-5353D2DA1E2B}';
-  RID_Empleados = '{5D29F2D4-A1FA-491F-A55F-E0FD6580AF8D}';
-  RID_DireccionesContacto = '{FBCF230B-6E4D-41E0-A1AA-32B8974AFA2D}';
-  RID_ClientesDescuentos = '{492B1649-7148-4F9C-AAAD-779E432AAA55}';
-  RID_GruposProveedor = '{F1D82002-96A0-4752-BC1B-094DE5333C26}';
-  RID_GruposEmpleado = '{99BFA415-6A6F-4FAD-9BA4-1CA0C43C8703}';
-  RID_Contactos_Refresh = '{2E88E5F4-9D4C-41EB-8124-B7E11F35EC30}';
-  RID_ContratosEmpleados = '{EAC10CE6-2393-438D-B2EC-6B42270C7A54}';
-  RID_DescripcionesProveedores = '{B54CE8F6-BE2F-4585-8FD2-74C9F174B767}';
-  RID_PersonalContacto = '{E684C573-A7E7-48C0-BA69-47291498ED5B}';
+  RID_Contactos = '{BA38FE66-615B-443E-AC3B-35C54BDAFC7A}';
+  RID_GruposCliente = '{ECDB7613-9634-41F2-A3E9-ACFC9A17B4F5}';
+  RID_DatosBancarios = '{77786226-ACA0-48D9-AA44-100AA432FDEF}';
+  RID_Clientes = '{6F4ADF37-1957-4D1E-B7E0-659C9DC9B27D}';
+  RID_Proveedores = '{58992D88-A743-479E-BE3F-183331F83BEA}';
+  RID_Empleados = '{D2941064-ABFB-4CE5-8832-8683F90888A8}';
+  RID_DireccionesContacto = '{2FE736C9-BBC8-43AB-88FC-A6675E0644B2}';
+  RID_ClientesDescuentos = '{F0E0984F-17C9-4C7D-8D57-18ED1698C080}';
+  RID_GruposProveedor = '{FFA4AEFF-DC59-4422-9CFA-28857080FC60}';
+  RID_GruposEmpleado = '{43140B72-AFD6-404D-A094-8612B4E8934D}';
+  RID_Contactos_Refresh = '{301DA664-5CB6-4311-91C7-A12C42F115B1}';
+  RID_ContratosEmpleados = '{49DF13A6-2C5B-4F25-A3CE-7326FAB32B84}';
+  RID_DescripcionesProveedores = '{83FBF40E-6287-46F5-BFAF-C6D92FE7AF4F}';
+  RID_PersonalContacto = '{0BF3EDA4-836A-4340-9F68-0C3312527D0B}';
 
   { Data table names }
   nme_Contactos = 'Contactos';
@@ -299,6 +299,8 @@ const
   fld_EmpleadosEXPERIENCIA = 'EXPERIENCIA';
   fld_EmpleadosCONTRATO = 'CONTRATO';
   fld_EmpleadosDURACION = 'DURACION';
+  fld_EmpleadosFECHA_BAJA = 'FECHA_BAJA';
+  fld_EmpleadosCAUSA_BAJA = 'CAUSA_BAJA';
 
   { Empleados field indexes }
   idx_EmpleadosID = 0;
@@ -333,6 +335,8 @@ const
   idx_EmpleadosEXPERIENCIA = 29;
   idx_EmpleadosCONTRATO = 30;
   idx_EmpleadosDURACION = 31;
+  idx_EmpleadosFECHA_BAJA = 32;
+  idx_EmpleadosCAUSA_BAJA = 33;
 
   { DireccionesContacto fields }
   fld_DireccionesContactoID = 'ID';
@@ -485,7 +489,7 @@ const
 type
   { IContactos }
   IContactos = interface(IDAStronglyTypedDataTable)
-  ['{E59305EA-4E84-419D-BD85-09D7CCE228B0}']
+  ['{411FE58B-C504-42A1-881E-C645A05E3996}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -784,7 +788,7 @@ type
 
   { IGruposCliente }
   IGruposCliente = interface(IDAStronglyTypedDataTable)
-  ['{A5E9E3A7-70E6-497D-A259-BA3D053DFC4E}']
+  ['{7C7B3A92-D0E8-4041-91B0-BFBED35FAAF1}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -831,7 +835,7 @@ type
 
   { IDatosBancarios }
   IDatosBancarios = interface(IDAStronglyTypedDataTable)
-  ['{8099114C-D422-4D38-922C-E8A3D6AC04DD}']
+  ['{0262BC83-1F74-45D2-A847-0E0348C36252}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -962,7 +966,7 @@ type
 
   { IClientes }
   IClientes = interface(IDAStronglyTypedDataTable)
-  ['{F0AA957B-22FD-410C-8BDD-7E51344DDA81}']
+  ['{9799E066-6E73-47CC-A9A4-9E816290C1D6}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1405,7 +1409,7 @@ type
 
   { IProveedores }
   IProveedores = interface(IDAStronglyTypedDataTable)
-  ['{B87D9D38-E5EF-48AE-8462-2651C12521D7}']
+  ['{7EBD5AEC-9F83-44E3-A329-B74A389C9814}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1836,7 +1840,7 @@ type
 
   { IEmpleados }
   IEmpleados = interface(IDAStronglyTypedDataTable)
-  ['{F05CFAAA-AFD5-4EEA-9153-CCAC4226505B}']
+  ['{7FADA31E-8655-459C-83CF-22C5B4E04828}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1961,6 +1965,14 @@ type
     procedure SetDURACIONValue(const aValue: String);
     function GetDURACIONIsNull: Boolean;
     procedure SetDURACIONIsNull(const aValue: Boolean);
+    function GetFECHA_BAJAValue: DateTime;
+    procedure SetFECHA_BAJAValue(const aValue: DateTime);
+    function GetFECHA_BAJAIsNull: Boolean;
+    procedure SetFECHA_BAJAIsNull(const aValue: Boolean);
+    function GetCAUSA_BAJAValue: String;
+    procedure SetCAUSA_BAJAValue(const aValue: String);
+    function GetCAUSA_BAJAIsNull: Boolean;
+    procedure SetCAUSA_BAJAIsNull(const aValue: Boolean);
 
 
     { Properties }
@@ -2028,6 +2040,10 @@ type
     property CONTRATOIsNull: Boolean read GetCONTRATOIsNull write SetCONTRATOIsNull;
     property DURACION: String read GetDURACIONValue write SetDURACIONValue;
     property DURACIONIsNull: Boolean read GetDURACIONIsNull write SetDURACIONIsNull;
+    property FECHA_BAJA: DateTime read GetFECHA_BAJAValue write SetFECHA_BAJAValue;
+    property FECHA_BAJAIsNull: Boolean read GetFECHA_BAJAIsNull write SetFECHA_BAJAIsNull;
+    property CAUSA_BAJA: String read GetCAUSA_BAJAValue write SetCAUSA_BAJAValue;
+    property CAUSA_BAJAIsNull: Boolean read GetCAUSA_BAJAIsNull write SetCAUSA_BAJAIsNull;
   end;
 
   { TEmpleadosDataTableRules }
@@ -2168,6 +2184,14 @@ type
     procedure SetDURACIONValue(const aValue: String); virtual;
     function GetDURACIONIsNull: Boolean; virtual;
     procedure SetDURACIONIsNull(const aValue: Boolean); virtual;
+    function GetFECHA_BAJAValue: DateTime; virtual;
+    procedure SetFECHA_BAJAValue(const aValue: DateTime); virtual;
+    function GetFECHA_BAJAIsNull: Boolean; virtual;
+    procedure SetFECHA_BAJAIsNull(const aValue: Boolean); virtual;
+    function GetCAUSA_BAJAValue: String; virtual;
+    procedure SetCAUSA_BAJAValue(const aValue: String); virtual;
+    function GetCAUSA_BAJAIsNull: Boolean; virtual;
+    procedure SetCAUSA_BAJAIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -2234,6 +2258,10 @@ type
     property CONTRATOIsNull: Boolean read GetCONTRATOIsNull write SetCONTRATOIsNull;
     property DURACION: String read GetDURACIONValue write SetDURACIONValue;
     property DURACIONIsNull: Boolean read GetDURACIONIsNull write SetDURACIONIsNull;
+    property FECHA_BAJA: DateTime read GetFECHA_BAJAValue write SetFECHA_BAJAValue;
+    property FECHA_BAJAIsNull: Boolean read GetFECHA_BAJAIsNull write SetFECHA_BAJAIsNull;
+    property CAUSA_BAJA: String read GetCAUSA_BAJAValue write SetCAUSA_BAJAValue;
+    property CAUSA_BAJAIsNull: Boolean read GetCAUSA_BAJAIsNull write SetCAUSA_BAJAIsNull;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -2243,7 +2271,7 @@ type
 
   { IDireccionesContacto }
   IDireccionesContacto = interface(IDAStronglyTypedDataTable)
-  ['{18FB7335-FF1C-4630-8854-17884DC46240}']
+  ['{5B3F654F-2625-40E8-A6F7-F83DE29B3AF2}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2458,7 +2486,7 @@ type
 
   { IClientesDescuentos }
   IClientesDescuentos = interface(IDAStronglyTypedDataTable)
-  ['{E5432957-80FF-4189-BB6C-FC5AFF168B06}']
+  ['{5DA8AAC1-7E71-496C-83E2-CB4A5DEA2D89}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2541,7 +2569,7 @@ type
 
   { IGruposProveedor }
   IGruposProveedor = interface(IDAStronglyTypedDataTable)
-  ['{4E1C83AD-248C-4770-8423-06D6781FAD25}']
+  ['{AF7D8134-2E25-47ED-B907-F122AAECFDC4}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2588,7 +2616,7 @@ type
 
   { IGruposEmpleado }
   IGruposEmpleado = interface(IDAStronglyTypedDataTable)
-  ['{9A44FB5F-D13D-4E10-8C49-288C227EAD86}']
+  ['{6D69900D-66A4-45F4-B39D-F553E5040214}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2635,7 +2663,7 @@ type
 
   { IContactos_Refresh }
   IContactos_Refresh = interface(IDAStronglyTypedDataTable)
-  ['{4A0B8556-7E34-434D-9A0E-B0C9D491CE4D}']
+  ['{E71CEE7C-252B-4AD6-952F-1D4A6DCCB33C}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2910,7 +2938,7 @@ type
 
   { IContratosEmpleados }
   IContratosEmpleados = interface(IDAStronglyTypedDataTable)
-  ['{87553D29-875F-488F-861C-29563ABC962F}']
+  ['{31774D76-B4F1-4DC8-9A99-040A137AC446}']
     { Property getters and setters }
     function GetCONTRATOValue: String;
     procedure SetCONTRATOValue(const aValue: String);
@@ -2945,7 +2973,7 @@ type
 
   { IDescripcionesProveedores }
   IDescripcionesProveedores = interface(IDAStronglyTypedDataTable)
-  ['{7F14E7C1-A3ED-4F13-9C58-2375D3663AFC}']
+  ['{EAFB7FCC-50C5-49F7-9A09-F407F1BCEEAC}']
     { Property getters and setters }
     function GetDESCRIPCION_PROVEEDORValue: String;
     procedure SetDESCRIPCION_PROVEEDORValue(const aValue: String);
@@ -2980,7 +3008,7 @@ type
 
   { IPersonalContacto }
   IPersonalContacto = interface(IDAStronglyTypedDataTable)
-  ['{B0636C03-3DAC-4019-974C-EE81DAB0BA70}']
+  ['{A05D0D86-2240-4E70-95EC-C4C0252EDB5F}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -6079,6 +6107,48 @@ begin
     DataTable.Fields[idx_EmpleadosDURACION].AsVariant := Null;
 end;
 
+function TEmpleadosDataTableRules.GetFECHA_BAJAValue: DateTime;
+begin
+  result := DataTable.Fields[idx_EmpleadosFECHA_BAJA].AsDateTime;
+end;
+
+procedure TEmpleadosDataTableRules.SetFECHA_BAJAValue(const aValue: DateTime);
+begin
+  DataTable.Fields[idx_EmpleadosFECHA_BAJA].AsDateTime := aValue;
+end;
+
+function TEmpleadosDataTableRules.GetFECHA_BAJAIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_EmpleadosFECHA_BAJA].IsNull;
+end;
+
+procedure TEmpleadosDataTableRules.SetFECHA_BAJAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_EmpleadosFECHA_BAJA].AsVariant := Null;
+end;
+
+function TEmpleadosDataTableRules.GetCAUSA_BAJAValue: String;
+begin
+  result := DataTable.Fields[idx_EmpleadosCAUSA_BAJA].AsString;
+end;
+
+procedure TEmpleadosDataTableRules.SetCAUSA_BAJAValue(const aValue: String);
+begin
+  DataTable.Fields[idx_EmpleadosCAUSA_BAJA].AsString := aValue;
+end;
+
+function TEmpleadosDataTableRules.GetCAUSA_BAJAIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_EmpleadosCAUSA_BAJA].IsNull;
+end;
+
+procedure TEmpleadosDataTableRules.SetCAUSA_BAJAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_EmpleadosCAUSA_BAJA].AsVariant := Null;
+end;
+
 
 { TDireccionesContactoDataTableRules }
 constructor TDireccionesContactoDataTableRules.Create(aDataTable: TDADataTable);
diff --git a/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas b/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas
index dd8d1e7f..9b253407 100644
--- a/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas
+++ b/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas
@@ -9,25 +9,25 @@ const
   { Delta rules ids 
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_ContactosDelta = '{DC6F6461-F577-4A1C-A1BB-EC1E73A19C7E}';
-  RID_GruposClienteDelta = '{B8209C23-AEBA-42A5-A5BC-459C0774043A}';
-  RID_DatosBancariosDelta = '{BFD56656-7A74-44F2-A4DF-2101321A9BA5}';
-  RID_ClientesDelta = '{F68DC47E-1F6C-4AB6-9F4D-58DA04D34466}';
-  RID_ProveedoresDelta = '{1773D482-A165-4F3C-963F-04057C33EC5F}';
-  RID_EmpleadosDelta = '{93D28665-986C-4574-BB95-2E129DF0EF59}';
-  RID_DireccionesContactoDelta = '{2DB84B28-7422-43C3-8D75-53D31444CA9D}';
-  RID_ClientesDescuentosDelta = '{C9C2DF04-9907-4B61-90A4-F44243B0E952}';
-  RID_GruposProveedorDelta = '{EC035096-E936-4A1D-8160-C602BFF6AD1A}';
-  RID_GruposEmpleadoDelta = '{938B3E8F-B9BE-42C1-8451-D1ACE543035C}';
-  RID_Contactos_RefreshDelta = '{F1258795-69A3-4A08-87A0-E9E0A3E82FA0}';
-  RID_ContratosEmpleadosDelta = '{DDEB329D-3B2C-49FF-A10F-DA282E098379}';
-  RID_DescripcionesProveedoresDelta = '{845273A7-ABAD-460B-8079-150C94E427AC}';
-  RID_PersonalContactoDelta = '{47E745DC-106B-473F-9CB1-BC3193862428}';
+  RID_ContactosDelta = '{76362088-C1EE-4136-B602-2F4FE5B4E65F}';
+  RID_GruposClienteDelta = '{4E47FE40-C579-45F2-8D30-E8A67549374E}';
+  RID_DatosBancariosDelta = '{155E0B8B-5958-4383-A845-188DCB34D694}';
+  RID_ClientesDelta = '{DD3F0937-1632-4E02-81AA-D9F9DB99752E}';
+  RID_ProveedoresDelta = '{E1C41362-DAC0-4923-AF1B-3E7151FCB617}';
+  RID_EmpleadosDelta = '{BB760188-169E-4A71-85E1-76DACB9C2960}';
+  RID_DireccionesContactoDelta = '{9DB84202-F502-4E91-8182-C05343B87D04}';
+  RID_ClientesDescuentosDelta = '{34323D2F-6886-4CE0-B598-715E117C439C}';
+  RID_GruposProveedorDelta = '{E5D84743-C153-4EE6-8F3B-66D11843D594}';
+  RID_GruposEmpleadoDelta = '{9BEC700D-7D02-415D-8BCE-A5230A37D7DB}';
+  RID_Contactos_RefreshDelta = '{9B20DE7E-89CE-41AE-910E-8B2A8C93976B}';
+  RID_ContratosEmpleadosDelta = '{9EDC7470-B7F4-4DC6-8329-7D7AD29B6770}';
+  RID_DescripcionesProveedoresDelta = '{BA14BEED-A34C-4CF6-937B-7491E24D854B}';
+  RID_PersonalContactoDelta = '{2C7A84B7-C510-47E2-8975-3EC5F7BA0BC4}';
 
 type
   { IContactosDelta }
   IContactosDelta = interface(IContactos)
-  ['{DC6F6461-F577-4A1C-A1BB-EC1E73A19C7E}']
+  ['{76362088-C1EE-4136-B602-2F4FE5B4E65F}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -326,7 +326,7 @@ type
 
   { IGruposClienteDelta }
   IGruposClienteDelta = interface(IGruposCliente)
-  ['{B8209C23-AEBA-42A5-A5BC-459C0774043A}']
+  ['{4E47FE40-C579-45F2-8D30-E8A67549374E}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -372,7 +372,7 @@ type
 
   { IDatosBancariosDelta }
   IDatosBancariosDelta = interface(IDatosBancarios)
-  ['{BFD56656-7A74-44F2-A4DF-2101321A9BA5}']
+  ['{155E0B8B-5958-4383-A845-188DCB34D694}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTACTOValue : Integer;
@@ -502,7 +502,7 @@ type
 
   { IClientesDelta }
   IClientesDelta = interface(IClientes)
-  ['{F68DC47E-1F6C-4AB6-9F4D-58DA04D34466}']
+  ['{DD3F0937-1632-4E02-81AA-D9F9DB99752E}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -945,7 +945,7 @@ type
 
   { IProveedoresDelta }
   IProveedoresDelta = interface(IProveedores)
-  ['{1773D482-A165-4F3C-963F-04057C33EC5F}']
+  ['{E1C41362-DAC0-4923-AF1B-3E7151FCB617}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -1376,7 +1376,7 @@ type
 
   { IEmpleadosDelta }
   IEmpleadosDelta = interface(IEmpleados)
-  ['{93D28665-986C-4574-BB95-2E129DF0EF59}']
+  ['{BB760188-169E-4A71-85E1-76DACB9C2960}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -1410,6 +1410,8 @@ type
     function GetOldEXPERIENCIAValue : IROStrings;
     function GetOldCONTRATOValue : String;
     function GetOldDURACIONValue : String;
+    function GetOldFECHA_BAJAValue : DateTime;
+    function GetOldCAUSA_BAJAValue : String;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -1444,6 +1446,8 @@ type
     property OldEXPERIENCIA : IROStrings read GetOldEXPERIENCIAValue;
     property OldCONTRATO : String read GetOldCONTRATOValue;
     property OldDURACION : String read GetOldDURACIONValue;
+    property OldFECHA_BAJA : DateTime read GetOldFECHA_BAJAValue;
+    property OldCAUSA_BAJA : String read GetOldCAUSA_BAJAValue;
   end;
 
   { TEmpleadosBusinessProcessorRules }
@@ -1648,6 +1652,18 @@ type
     function GetOldDURACIONIsNull: Boolean; virtual;
     procedure SetDURACIONValue(const aValue: String); virtual;
     procedure SetDURACIONIsNull(const aValue: Boolean); virtual;
+    function GetFECHA_BAJAValue: DateTime; virtual;
+    function GetFECHA_BAJAIsNull: Boolean; virtual;
+    function GetOldFECHA_BAJAValue: DateTime; virtual;
+    function GetOldFECHA_BAJAIsNull: Boolean; virtual;
+    procedure SetFECHA_BAJAValue(const aValue: DateTime); virtual;
+    procedure SetFECHA_BAJAIsNull(const aValue: Boolean); virtual;
+    function GetCAUSA_BAJAValue: String; virtual;
+    function GetCAUSA_BAJAIsNull: Boolean; virtual;
+    function GetOldCAUSA_BAJAValue: String; virtual;
+    function GetOldCAUSA_BAJAIsNull: Boolean; virtual;
+    procedure SetCAUSA_BAJAValue(const aValue: String); virtual;
+    procedure SetCAUSA_BAJAIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -1778,6 +1794,14 @@ type
     property DURACIONIsNull : Boolean read GetDURACIONIsNull write SetDURACIONIsNull;
     property OldDURACION : String read GetOldDURACIONValue;
     property OldDURACIONIsNull : Boolean read GetOldDURACIONIsNull;
+    property FECHA_BAJA : DateTime read GetFECHA_BAJAValue write SetFECHA_BAJAValue;
+    property FECHA_BAJAIsNull : Boolean read GetFECHA_BAJAIsNull write SetFECHA_BAJAIsNull;
+    property OldFECHA_BAJA : DateTime read GetOldFECHA_BAJAValue;
+    property OldFECHA_BAJAIsNull : Boolean read GetOldFECHA_BAJAIsNull;
+    property CAUSA_BAJA : String read GetCAUSA_BAJAValue write SetCAUSA_BAJAValue;
+    property CAUSA_BAJAIsNull : Boolean read GetCAUSA_BAJAIsNull write SetCAUSA_BAJAIsNull;
+    property OldCAUSA_BAJA : String read GetOldCAUSA_BAJAValue;
+    property OldCAUSA_BAJAIsNull : Boolean read GetOldCAUSA_BAJAIsNull;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -1787,7 +1811,7 @@ type
 
   { IDireccionesContactoDelta }
   IDireccionesContactoDelta = interface(IDireccionesContacto)
-  ['{2DB84B28-7422-43C3-8D75-53D31444CA9D}']
+  ['{9DB84202-F502-4E91-8182-C05343B87D04}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTACTOValue : Integer;
@@ -2002,7 +2026,7 @@ type
 
   { IClientesDescuentosDelta }
   IClientesDescuentosDelta = interface(IClientesDescuentos)
-  ['{C9C2DF04-9907-4B61-90A4-F44243B0E952}']
+  ['{34323D2F-6886-4CE0-B598-715E117C439C}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CLIENTEValue : Integer;
@@ -2084,7 +2108,7 @@ type
 
   { IGruposProveedorDelta }
   IGruposProveedorDelta = interface(IGruposProveedor)
-  ['{EC035096-E936-4A1D-8160-C602BFF6AD1A}']
+  ['{E5D84743-C153-4EE6-8F3B-66D11843D594}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -2130,7 +2154,7 @@ type
 
   { IGruposEmpleadoDelta }
   IGruposEmpleadoDelta = interface(IGruposEmpleado)
-  ['{938B3E8F-B9BE-42C1-8451-D1ACE543035C}']
+  ['{9BEC700D-7D02-415D-8BCE-A5230A37D7DB}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -2176,7 +2200,7 @@ type
 
   { IContactos_RefreshDelta }
   IContactos_RefreshDelta = interface(IContactos_Refresh)
-  ['{F1258795-69A3-4A08-87A0-E9E0A3E82FA0}']
+  ['{9B20DE7E-89CE-41AE-910E-8B2A8C93976B}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldNIF_CIFValue : String;
@@ -2451,7 +2475,7 @@ type
 
   { IContratosEmpleadosDelta }
   IContratosEmpleadosDelta = interface(IContratosEmpleados)
-  ['{DDEB329D-3B2C-49FF-A10F-DA282E098379}']
+  ['{9EDC7470-B7F4-4DC6-8329-7D7AD29B6770}']
     { Property getters and setters }
     function GetOldCONTRATOValue : String;
 
@@ -2485,7 +2509,7 @@ type
 
   { IDescripcionesProveedoresDelta }
   IDescripcionesProveedoresDelta = interface(IDescripcionesProveedores)
-  ['{845273A7-ABAD-460B-8079-150C94E427AC}']
+  ['{BA14BEED-A34C-4CF6-937B-7491E24D854B}']
     { Property getters and setters }
     function GetOldDESCRIPCION_PROVEEDORValue : String;
 
@@ -2519,7 +2543,7 @@ type
 
   { IPersonalContactoDelta }
   IPersonalContactoDelta = interface(IPersonalContacto)
-  ['{47E745DC-106B-473F-9CB1-BC3193862428}']
+  ['{2C7A84B7-C510-47E2-8975-3EC5F7BA0BC4}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTACTOValue : Integer;
@@ -6976,6 +7000,68 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_EmpleadosDURACION] := Null;
 end;
 
+function TEmpleadosBusinessProcessorRules.GetFECHA_BAJAValue: DateTime;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_EmpleadosFECHA_BAJA];
+end;
+
+function TEmpleadosBusinessProcessorRules.GetFECHA_BAJAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_EmpleadosFECHA_BAJA]);
+end;
+
+function TEmpleadosBusinessProcessorRules.GetOldFECHA_BAJAValue: DateTime;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_EmpleadosFECHA_BAJA];
+end;
+
+function TEmpleadosBusinessProcessorRules.GetOldFECHA_BAJAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_EmpleadosFECHA_BAJA]);
+end;
+
+procedure TEmpleadosBusinessProcessorRules.SetFECHA_BAJAValue(const aValue: DateTime);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_EmpleadosFECHA_BAJA] := aValue;
+end;
+
+procedure TEmpleadosBusinessProcessorRules.SetFECHA_BAJAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_EmpleadosFECHA_BAJA] := Null;
+end;
+
+function TEmpleadosBusinessProcessorRules.GetCAUSA_BAJAValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_EmpleadosCAUSA_BAJA];
+end;
+
+function TEmpleadosBusinessProcessorRules.GetCAUSA_BAJAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_EmpleadosCAUSA_BAJA]);
+end;
+
+function TEmpleadosBusinessProcessorRules.GetOldCAUSA_BAJAValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_EmpleadosCAUSA_BAJA];
+end;
+
+function TEmpleadosBusinessProcessorRules.GetOldCAUSA_BAJAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_EmpleadosCAUSA_BAJA]);
+end;
+
+procedure TEmpleadosBusinessProcessorRules.SetCAUSA_BAJAValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_EmpleadosCAUSA_BAJA] := aValue;
+end;
+
+procedure TEmpleadosBusinessProcessorRules.SetCAUSA_BAJAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_EmpleadosCAUSA_BAJA] := Null;
+end;
+
 
 { TDireccionesContactoBusinessProcessorRules }
 constructor TDireccionesContactoBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
diff --git a/Source/Modulos/Contactos/Model/uBizContactos.pas b/Source/Modulos/Contactos/Model/uBizContactos.pas
index 141cd1f6..056f5b36 100644
--- a/Source/Modulos/Contactos/Model/uBizContactos.pas
+++ b/Source/Modulos/Contactos/Model/uBizContactos.pas
@@ -172,6 +172,14 @@ type
     function GetEXPERIENCIAValue: IROStrings;
     procedure SetEXPERIENCIAValue(const aValue: IROStrings);
 
+    function GetFECHA_BAJAValue: TDateTime;
+    procedure SetFECHA_BAJAValue(const aValue: TDateTime);
+    function GetFECHA_BAJAIsNull: Boolean;
+    procedure SetFECHA_BAJAIsNull(const aValue: Boolean);
+
+    function GetCAUSA_BAJAValue: String;
+    procedure SetCAUSA_BAJAValue(const aValue: String);
+
     property FECHA_NACIMIENTO: TDateTime read GetFECHA_NACIMIENTOValue write SetFECHA_NACIMIENTOValue;
     property CATEGORIA: String read GetCATEGORIAValue write SetCATEGORIAValue;
     property FECHA_ALTA_EMPRESA: TDateTime read GetFECHA_ALTA_EMPRESAValue write SetFECHA_ALTA_EMPRESAValue;
@@ -180,6 +188,9 @@ type
     property FORMACION_COMPLE: IROStrings read GetFORMACION_COMPLEValue write SetFORMACION_COMPLEValue;
     property FORMACION_RECIBIDA: IROStrings read GetFORMACION_RECIBIDAValue write SetFORMACION_RECIBIDAValue;
     property EXPERIENCIA: IROStrings read GetEXPERIENCIAValue write SetEXPERIENCIAValue;
+    property FECHA_BAJA: TDateTime read GetFECHA_BAJAValue write SetFECHA_BAJAValue;
+    property FECHA_BAJAIsNull: Boolean read GetFECHA_BAJAIsNull write SetFECHA_BAJAIsNull;    
+    property CAUSA_BAJA: String read GetCAUSA_BAJAValue write SetCAUSA_BAJAValue;
   end;
 
 
@@ -333,7 +344,7 @@ type
     property HOMOLOGADO: Integer read GetHOMOLOGADOValue write SetHOMOLOGADOValue;
     property CERTIFICACION: String read GetCERTIFICACIONValue write SetCERTIFICACIONValue;
     property GRUPO_PROVEEDOR: String read GetGRUPO_PROVEEDORValue write SetGRUPO_PROVEEDORValue;
-    property SUBCONTRATA: SmallInt read GetSUBCONTRATAValue write SetSUBCONTRATAValue;    
+    property SUBCONTRATA: SmallInt read GetSUBCONTRATAValue write SetSUBCONTRATAValue;
   end;
 
 
@@ -360,6 +371,14 @@ type
     function GetEXPERIENCIAValue: IROStrings;
     procedure SetEXPERIENCIAValue(const aValue: IROStrings);
 
+    function GetFECHA_BAJAValue: TDateTime;
+    procedure SetFECHA_BAJAValue(const aValue: TDateTime);
+    function GetFECHA_BAJAIsNull: Boolean;
+    procedure SetFECHA_BAJAIsNull(const aValue: Boolean);
+
+    function GetCAUSA_BAJAValue: String;
+    procedure SetCAUSA_BAJAValue(const aValue: String);
+
   public
     property FECHA_NACIMIENTO: TDateTime read GetFECHA_NACIMIENTOValue write SetFECHA_NACIMIENTOValue;
     property CATEGORIA: String read GetCATEGORIAValue write SetCATEGORIAValue;
@@ -369,6 +388,9 @@ type
     property FORMACION_COMPLE: IROStrings read GetFORMACION_COMPLEValue write SetFORMACION_COMPLEValue;
     property FORMACION_RECIBIDA: IROStrings read GetFORMACION_RECIBIDAValue write SetFORMACION_RECIBIDAValue;
     property EXPERIENCIA: IROStrings read GetEXPERIENCIAValue write SetEXPERIENCIAValue;
+    property FECHA_BAJA: TDateTime read GetFECHA_BAJAValue write SetFECHA_BAJAValue;
+    property FECHA_BAJAIsNull: Boolean read GetFECHA_BAJAIsNull write SetFECHA_BAJAIsNull;
+    property CAUSA_BAJA: String read GetCAUSA_BAJAValue write SetCAUSA_BAJAValue;    
     procedure IniciarValoresContactoNuevo; override;
   end;
 
@@ -376,7 +398,7 @@ type
 implementation
 
 uses
-  uDataTableUtils, Classes, DateUtils, SysUtils, uFactuGES_App;
+  uDataTableUtils, Classes, DateUtils, SysUtils, uFactuGES_App, Variants;
 
 { TBizContacto }
 
@@ -745,6 +767,11 @@ begin
   result := DataTable.Fields[idx_EmpleadosCATEGORIA].AsString;
 end;
 
+function TBizEmpleado.GetCAUSA_BAJAValue: String;
+begin
+  result := DataTable.Fields[idx_EmpleadosCAUSA_BAJA].AsString;
+end;
+
 function TBizEmpleado.GetEXPERIENCIAValue: IROStrings;
 begin
   result := NewROStrings();
@@ -756,6 +783,16 @@ begin
   result := DataTable.Fields[idx_EmpleadosFECHA_ALTA_EMPRESA].AsDateTime;
 end;
 
+function TBizEmpleado.GetFECHA_BAJAIsNull: Boolean;
+begin
+  result := DataTable.Fields[idx_EmpleadosFECHA_BAJA].IsNull;
+end;
+
+function TBizEmpleado.GetFECHA_BAJAValue: TDateTime;
+begin
+  result := DataTable.Fields[idx_EmpleadosFECHA_BAJA].AsDateTime;
+end;
+
 function TBizEmpleado.GetFECHA_NACIMIENTOValue: TDateTime;
 begin
   result := DataTable.Fields[idx_EmpleadosFECHA_NACIMIENTO].AsDateTime;
@@ -790,6 +827,11 @@ begin
   DataTable.Fields[idx_EmpleadosCATEGORIA].AsString := aValue;
 end;
 
+procedure TBizEmpleado.SetCAUSA_BAJAValue(const aValue: String);
+begin
+  DataTable.Fields[idx_EmpleadosCAUSA_BAJA].AsString := aValue;
+end;
+
 procedure TBizEmpleado.SetEXPERIENCIAValue(const aValue: IROStrings);
 begin
   DataTable.Fields[idx_EmpleadosEXPERIENCIA].AsString := aValue.Text;
@@ -800,6 +842,17 @@ begin
   DataTable.Fields[idx_EmpleadosFECHA_ALTA_EMPRESA].AsDateTime := aValue;
 end;
 
+procedure TBizEmpleado.SetFECHA_BAJAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_EmpleadosFECHA_BAJA].AsVariant := Null;
+end;
+
+procedure TBizEmpleado.SetFECHA_BAJAValue(const aValue: TDateTime);
+begin
+  DataTable.Fields[idx_EmpleadosFECHA_BAJA].AsDateTime := aValue;
+end;
+
 procedure TBizEmpleado.SetFECHA_NACIMIENTOValue(const aValue: TDateTime);
 begin
   DataTable.Fields[idx_EmpleadosFECHA_NACIMIENTO].AsDateTime := aValue;
diff --git a/Source/Modulos/Contactos/Model/uBizEmpleadosServer.pas b/Source/Modulos/Contactos/Model/uBizEmpleadosServer.pas
index 75d95771..720447df 100644
--- a/Source/Modulos/Contactos/Model/uBizEmpleadosServer.pas
+++ b/Source/Modulos/Contactos/Model/uBizEmpleadosServer.pas
@@ -89,6 +89,8 @@ begin
       ParamByName('EXPERIENCIA').Value := aChange.NewValueByName[fld_EmpleadosEXPERIENCIA];
       ParamByName('CONTRATO').Value := aChange.NewValueByName[fld_EmpleadosCONTRATO];
       ParamByName('DURACION').Value := aChange.NewValueByName[fld_EmpleadosDURACION];
+      ParamByName('FECHA_BAJA').Value := aChange.NewValueByName[fld_EmpleadosFECHA_BAJA];
+      ParamByName('CAUSA_BAJA').Value := aChange.NewValueByName[fld_EmpleadosCAUSA_BAJA];            
       Execute;
     end;
   finally
@@ -120,7 +122,9 @@ begin
       ParamByName('FORMACION_RECIBIDA').Value := aChange.NewValueByName[fld_EmpleadosFORMACION_RECIBIDA];
       ParamByName('EXPERIENCIA').Value := aChange.NewValueByName[fld_EmpleadosEXPERIENCIA];
       ParamByName('CONTRATO').Value := aChange.NewValueByName[fld_EmpleadosCONTRATO];
-      ParamByName('DURACION').Value := aChange.NewValueByName[fld_EmpleadosDURACION];            
+      ParamByName('DURACION').Value := aChange.NewValueByName[fld_EmpleadosDURACION];
+      ParamByName('FECHA_BAJA').Value := aChange.NewValueByName[fld_EmpleadosFECHA_BAJA];
+      ParamByName('CAUSA_BAJA').Value := aChange.NewValueByName[fld_EmpleadosCAUSA_BAJA];
       Execute;
     end;
   finally
diff --git a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm
index e259c8d0..6ec20b49 100644
--- a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm
+++ b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm
@@ -1103,14 +1103,14 @@ object srvContactos: TsrvContactos
                 DatasetField = 'NOMBRE'
                 TableField = 'NOMBRE'
               end
-              item
-                DatasetField = 'CALLE'
-                TableField = 'CALLE'
-              end
               item
                 DatasetField = 'PERSONA_CONTACTO'
                 TableField = 'PERSONA_CONTACTO'
               end
+              item
+                DatasetField = 'CALLE'
+                TableField = 'CALLE'
+              end
               item
                 DatasetField = 'POBLACION'
                 TableField = 'POBLACION'
@@ -1159,6 +1159,14 @@ object srvContactos: TsrvContactos
                 DatasetField = 'NOTAS'
                 TableField = 'NOTAS'
               end
+              item
+                DatasetField = 'FECHA_ALTA'
+                TableField = 'FECHA_ALTA'
+              end
+              item
+                DatasetField = 'FECHA_MODIFICACION'
+                TableField = 'FECHA_MODIFICACION'
+              end
               item
                 DatasetField = 'USUARIO'
                 TableField = 'USUARIO'
@@ -1171,14 +1179,14 @@ object srvContactos: TsrvContactos
                 DatasetField = 'REFERENCIA'
                 TableField = 'REFERENCIA'
               end
-              item
-                DatasetField = 'CATEGORIA'
-                TableField = 'CATEGORIA'
-              end
               item
                 DatasetField = 'FECHA_NACIMIENTO'
                 TableField = 'FECHA_NACIMIENTO'
               end
+              item
+                DatasetField = 'CATEGORIA'
+                TableField = 'CATEGORIA'
+              end
               item
                 DatasetField = 'FECHA_ALTA_EMPRESA'
                 TableField = 'FECHA_ALTA_EMPRESA'
@@ -1199,14 +1207,6 @@ object srvContactos: TsrvContactos
                 DatasetField = 'EXPERIENCIA'
                 TableField = 'EXPERIENCIA'
               end
-              item
-                DatasetField = 'FECHA_ALTA'
-                TableField = 'FECHA_ALTA'
-              end
-              item
-                DatasetField = 'FECHA_MODIFICACION'
-                TableField = 'FECHA_MODIFICACION'
-              end
               item
                 DatasetField = 'CONTRATO'
                 TableField = 'CONTRATO'
@@ -1214,6 +1214,14 @@ object srvContactos: TsrvContactos
               item
                 DatasetField = 'DURACION'
                 TableField = 'DURACION'
+              end
+              item
+                DatasetField = 'FECHA_BAJA'
+                TableField = 'FECHA_BAJA'
+              end
+              item
+                DatasetField = 'CAUSA_BAJA'
+                TableField = 'CAUSA_BAJA'
               end>
           end>
         Name = 'Empleados'
@@ -1401,6 +1409,15 @@ object srvContactos: TsrvContactos
             Name = 'DURACION'
             DataType = datString
             Size = 255
+          end
+          item
+            Name = 'FECHA_BAJA'
+            DataType = datDateTime
+          end
+          item
+            Name = 'CAUSA_BAJA'
+            DataType = datString
+            Size = 255
           end>
       end
       item
@@ -3457,6 +3474,14 @@ object srvContactos: TsrvContactos
           item
             Name = 'DURACION'
             Value = ''
+          end
+          item
+            Name = 'FECHA_BAJA'
+            Value = ''
+          end
+          item
+            Name = 'CAUSA_BAJA'
+            Value = ''
           end>
         Statements = <
           item
@@ -3465,10 +3490,11 @@ object srvContactos: TsrvContactos
             SQL = 
               'INSERT'#10'  INTO EMPLEADOS_DATOS'#10'    (ID_EMPLEADO, FECHA_NACIMIENTO' +
               ', CATEGORIA, FECHA_ALTA_EMPRESA, FORMACION_BASE,'#10'    FORMACION_C' +
-              'OMPLE, FORMACION_RECIBIDA, EXPERIENCIA, CONTRATO, DURACION)'#10'  VA' +
-              'LUES'#10'    (:ID_EMPLEADO, :FECHA_NACIMIENTO, :CATEGORIA, :FECHA_AL' +
-              'TA_EMPRESA, :FORMACION_BASE,'#10'    :FORMACION_COMPLE, :FORMACION_R' +
-              'ECIBIDA, :EXPERIENCIA, :CONTRATO, :DURACION)'#10
+              'OMPLE, FORMACION_RECIBIDA, EXPERIENCIA, CONTRATO, DURACION, FECH' +
+              'A_BAJA,'#10'    CAUSA_BAJA)'#10'  VALUES'#10'    (:ID_EMPLEADO, :FECHA_NACIM' +
+              'IENTO, :CATEGORIA, :FECHA_ALTA_EMPRESA, :FORMACION_BASE,'#10'    :FO' +
+              'RMACION_COMPLE, :FORMACION_RECIBIDA, :EXPERIENCIA, :CONTRATO, :D' +
+              'URACION, :FECHA_BAJA,'#10'    :CAUSA_BAJA)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -3512,6 +3538,14 @@ object srvContactos: TsrvContactos
             Name = 'DURACION'
             Value = ''
           end
+          item
+            Name = 'FECHA_BAJA'
+            Value = ''
+          end
+          item
+            Name = 'CAUSA_BAJA'
+            Value = ''
+          end
           item
             Name = 'OLD_ID_EMPLEADO'
             Value = ''
@@ -3526,8 +3560,9 @@ object srvContactos: TsrvContactos
               'CHA_ALTA_EMPRESA,'#10'    FORMACION_BASE = :FORMACION_BASE,'#10'    FORM' +
               'ACION_COMPLE = :FORMACION_COMPLE,'#10'    FORMACION_RECIBIDA = :FORM' +
               'ACION_RECIBIDA,'#10'    EXPERIENCIA = :EXPERIENCIA,'#10'    CONTRATO = :' +
-              'CONTRATO,'#10'    DURACION = :DURACION'#10'  WHERE'#10'    (ID_EMPLEADO = :O' +
-              'LD_ID_EMPLEADO)'#10
+              'CONTRATO,'#10'    DURACION = :DURACION,'#10'    FECHA_BAJA = :FECHA_BAJA' +
+              ','#10'    CAUSA_BAJA = :CAUSA_BAJA'#10'  WHERE'#10'    (ID_EMPLEADO = :OLD_I' +
+              'D_EMPLEADO)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
diff --git a/Source/Modulos/Contactos/Views/uEditorEmpleado.dfm b/Source/Modulos/Contactos/Views/uEditorEmpleado.dfm
index cf5a9e5b..55b3a2ec 100644
--- a/Source/Modulos/Contactos/Views/uEditorEmpleado.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorEmpleado.dfm
@@ -110,35 +110,35 @@ inherited fEditorEmpleado: TfEditorEmpleado
             ExplicitTop = 162
           end
           inherited eCalle: TcxDBTextEdit
-            Top = 216
-            ExplicitTop = 216
+            Top = 243
+            ExplicitTop = 243
             ExplicitWidth = 341
             Width = 341
           end
           inherited cbProvincia: TcxDBComboBox
-            Top = 243
-            ExplicitTop = 243
+            Top = 270
+            ExplicitTop = 270
             ExplicitWidth = 240
             Width = 240
           end
           inherited cbPoblacion: TcxDBComboBox
-            Top = 270
-            ExplicitTop = 270
+            Top = 297
+            ExplicitTop = 297
             ExplicitWidth = 341
             Width = 341
           end
           inherited eCodigoPostal: TcxDBTextEdit
             Left = 397
-            Top = 243
+            Top = 270
             ExplicitLeft = 397
-            ExplicitTop = 243
+            ExplicitTop = 270
           end
           inherited eObservaciones: TcxDBMemo
-            Top = 348
-            ExplicitTop = 348
+            Top = 375
+            ExplicitTop = 375
             ExplicitWidth = 871
-            ExplicitHeight = 90
-            Height = 90
+            ExplicitHeight = 63
+            Height = 63
             Width = 871
           end
           inherited eFechaNacimiento: TcxDBDateEdit
@@ -167,6 +167,14 @@ inherited fEditorEmpleado: TfEditorEmpleado
             ExplicitWidth = 308
             Width = 308
           end
+          inherited eDuracionContrato: TcxDBTextEdit
+            Left = 585
+            Top = 297
+            ExplicitLeft = 585
+            ExplicitTop = 297
+            ExplicitWidth = 308
+            Width = 308
+          end
           inherited eTlfParticular: TcxDBTextEdit
             Left = 585
             Top = 57
@@ -205,14 +213,6 @@ inherited fEditorEmpleado: TfEditorEmpleado
             ExplicitWidth = 341
             Width = 341
           end
-          inherited eDuracionContrato: TcxDBTextEdit
-            Left = 585
-            Top = 297
-            ExplicitLeft = 585
-            ExplicitTop = 297
-            ExplicitWidth = 308
-            Width = 308
-          end
           inherited eNIFCIF: TcxDBTextEdit
             Left = 259
             Top = 30
@@ -239,6 +239,19 @@ inherited fEditorEmpleado: TfEditorEmpleado
             ExplicitWidth = 279
             Width = 279
           end
+          inherited eFechaBaja: TcxDBDateEdit
+            Top = 165
+            Properties.ImmediatePost = True
+            ExplicitTop = 165
+            ExplicitWidth = 341
+            Width = 341
+          end
+          inherited eCausaBaja: TcxDBTextEdit
+            Top = 192
+            ExplicitTop = 192
+            ExplicitWidth = 341
+            Width = 341
+          end
           inherited ePaginaWeb: TcxDBHyperLinkEdit
             Left = 585
             Top = 217
@@ -254,8 +267,8 @@ inherited fEditorEmpleado: TfEditorEmpleado
             Width = 105
           end
           inherited ePersonaContacto: TcxDBTextEdit
-            Top = 297
-            ExplicitTop = 297
+            Top = 324
+            ExplicitTop = 324
             ExplicitWidth = 341
             Width = 341
           end
@@ -283,6 +296,18 @@ inherited fEditorEmpleado: TfEditorEmpleado
         inherited ToolBar1: TToolBar
           Width = 915
           ExplicitWidth = 915
+          inherited ToolButton1: TToolButton
+            ExplicitWidth = 62
+          end
+          inherited ToolButton4: TToolButton
+            ExplicitWidth = 74
+          end
+          inherited ToolButton2: TToolButton
+            ExplicitWidth = 67
+          end
+          inherited ToolButton7: TToolButton
+            ExplicitWidth = 117
+          end
         end
       end
     end
@@ -304,6 +329,18 @@ inherited fEditorEmpleado: TfEditorEmpleado
         inherited ToolBar1: TToolBar
           Width = 915
           ExplicitWidth = 915
+          inherited ToolButton1: TToolButton
+            ExplicitWidth = 62
+          end
+          inherited ToolButton4: TToolButton
+            ExplicitWidth = 74
+          end
+          inherited ToolButton2: TToolButton
+            ExplicitWidth = 67
+          end
+          inherited ToolButton7: TToolButton
+            ExplicitWidth = 117
+          end
         end
       end
     end
diff --git a/Source/Modulos/Contactos/Views/uViewEmpleado.dfm b/Source/Modulos/Contactos/Views/uViewEmpleado.dfm
index 887bbeaa..97a2baeb 100644
--- a/Source/Modulos/Contactos/Views/uViewEmpleado.dfm
+++ b/Source/Modulos/Contactos/Views/uViewEmpleado.dfm
@@ -11,55 +11,55 @@ inherited frViewEmpleado: TfrViewEmpleado
     ExplicitWidth = 673
     ExplicitHeight = 424
     inherited PngSpeedButton1: TPngSpeedButton
-      Left = 628
-      ExplicitLeft = 628
+      Left = 611
+      ExplicitLeft = 611
     end
     inherited PngSpeedButton2: TPngSpeedButton
-      Left = 628
-      ExplicitLeft = 628
+      Left = 611
+      ExplicitLeft = 611
     end
     inherited PngSpeedButton3: TPngSpeedButton
-      Left = 628
-      ExplicitLeft = 628
+      Left = 611
+      ExplicitLeft = 611
     end
     inherited eCalle: TcxDBTextEdit
       Left = 121
-      Top = 226
-      TabOrder = 6
+      Top = 247
+      TabOrder = 8
       ExplicitLeft = 121
-      ExplicitTop = 226
+      ExplicitTop = 247
       ExplicitWidth = 239
       Width = 239
     end
     inherited cbProvincia: TcxDBComboBox
       Left = 121
-      Top = 253
-      TabOrder = 7
+      Top = 274
+      TabOrder = 9
       ExplicitLeft = 121
-      ExplicitTop = 253
+      ExplicitTop = 274
       ExplicitWidth = 138
       Width = 138
     end
     inherited cbPoblacion: TcxDBComboBox
       Left = 121
-      Top = 280
-      TabOrder = 9
+      Top = 301
+      TabOrder = 11
       ExplicitLeft = 121
-      ExplicitTop = 280
+      ExplicitTop = 301
       ExplicitWidth = 239
       Width = 239
     end
     inherited eCodigoPostal: TcxDBTextEdit
-      Left = 295
-      Top = 253
-      TabOrder = 8
-      ExplicitLeft = 295
-      ExplicitTop = 253
+      Left = 285
+      Top = 274
+      TabOrder = 10
+      ExplicitLeft = 285
+      ExplicitTop = 274
     end
     inherited eObservaciones: TcxDBMemo
-      Top = 364
-      TabOrder = 20
-      ExplicitTop = 364
+      Top = 385
+      TabOrder = 22
+      ExplicitTop = 385
       ExplicitWidth = 629
       ExplicitHeight = 38
       Height = 38
@@ -124,7 +124,7 @@ inherited frViewEmpleado: TfrViewEmpleado
       Width = 239
     end
     object cbContrato: TcxDBComboBox [11]
-      Left = 485
+      Left = 475
       Top = 280
       DataBinding.DataField = 'CONTRATO'
       DataBinding.DataSource = dsContacto
@@ -144,11 +144,11 @@ inherited frViewEmpleado: TfrViewEmpleado
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 18
+      TabOrder = 20
       Width = 166
     end
     object eDuracionContrato: TcxDBTextEdit [12]
-      Left = 485
+      Left = 475
       Top = 307
       DataBinding.DataField = 'DURACION'
       DataBinding.DataSource = dsContacto
@@ -162,34 +162,34 @@ inherited frViewEmpleado: TfrViewEmpleado
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 19
+      TabOrder = 21
       Width = 166
     end
     inherited eTlfParticular: TcxDBTextEdit
-      Left = 485
-      TabOrder = 12
-      ExplicitLeft = 485
+      Left = 475
+      TabOrder = 14
+      ExplicitLeft = 475
       ExplicitWidth = 166
       Width = 166
     end
     inherited eTlfTrabajo: TcxDBTextEdit
-      Left = 485
-      TabOrder = 11
-      ExplicitLeft = 485
+      Left = 475
+      TabOrder = 13
+      ExplicitLeft = 475
       ExplicitWidth = 166
       Width = 166
     end
     inherited eTlfMovil: TcxDBTextEdit
-      Left = 485
-      TabOrder = 13
-      ExplicitLeft = 485
+      Left = 475
+      TabOrder = 15
+      ExplicitLeft = 475
       ExplicitWidth = 166
       Width = 166
     end
     inherited eFax: TcxDBTextEdit
-      Left = 485
-      TabOrder = 14
-      ExplicitLeft = 485
+      Left = 475
+      TabOrder = 16
+      ExplicitLeft = 475
       ExplicitWidth = 166
       Width = 166
     end
@@ -200,31 +200,31 @@ inherited frViewEmpleado: TfrViewEmpleado
       Width = 239
     end
     inherited eNIFCIF: TcxDBTextEdit
-      Left = 227
-      ExplicitLeft = 227
-      ExplicitWidth = 133
-      Width = 133
+      Left = 225
+      ExplicitLeft = 225
+      ExplicitWidth = 126
+      Width = 126
     end
     inherited eMailTrabajo: TcxDBHyperLinkEdit
-      Left = 485
+      Left = 475
       Properties.Prefix = 'mailto:'
-      TabOrder = 15
-      ExplicitLeft = 485
+      TabOrder = 17
+      ExplicitLeft = 475
       ExplicitWidth = 137
       Width = 137
     end
     inherited eMailParticular: TcxDBHyperLinkEdit
-      Left = 485
+      Left = 475
       Properties.Prefix = 'mailto:'
-      TabOrder = 16
-      ExplicitLeft = 485
+      TabOrder = 18
+      ExplicitLeft = 475
       ExplicitWidth = 137
       Width = 137
     end
     inherited ePaginaWeb: TcxDBHyperLinkEdit
-      Left = 485
-      TabOrder = 17
-      ExplicitLeft = 485
+      Left = 475
+      TabOrder = 19
+      ExplicitLeft = 475
       ExplicitWidth = 137
       Width = 137
     end
@@ -236,13 +236,50 @@ inherited frViewEmpleado: TfrViewEmpleado
     end
     inherited ePersonaContacto: TcxDBTextEdit
       Left = 121
-      Top = 307
-      TabOrder = 10
+      Top = 328
+      TabOrder = 12
       ExplicitLeft = 121
-      ExplicitTop = 307
+      ExplicitTop = 328
       ExplicitWidth = 239
       Width = 239
     end
+    object eFechaBaja: TcxDBDateEdit [24]
+      Left = 121
+      Top = 163
+      DataBinding.DataField = 'FECHA_BAJA'
+      DataBinding.DataSource = dsContacto
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.NativeStyle = True
+      Style.ButtonStyle = bts3D
+      Style.PopupBorderStyle = epbsFrame3D
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 6
+      Width = 229
+    end
+    object eCausaBaja: TcxDBTextEdit [25]
+      Left = 121
+      Top = 190
+      DataBinding.DataField = 'CAUSA_BAJA'
+      DataBinding.DataSource = dsContacto
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.Color = clWindow
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 7
+      Width = 229
+    end
     inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup
       inherited dxLayoutControlContactoGroup9: TdxLayoutGroup
         inherited dxLayoutControlContactoGroup4: TdxLayoutGroup
@@ -274,6 +311,16 @@ inherited frViewEmpleado: TfrViewEmpleado
               Control = cbCategoria
               ControlOptions.ShowBorder = False
             end
+            object dxLayoutControlContactoItem23: TdxLayoutItem
+              Caption = 'Fecha de baja:'
+              Control = eFechaBaja
+              ControlOptions.ShowBorder = False
+            end
+            object dxLayoutControlContactoItem24: TdxLayoutItem
+              Caption = 'Causa de baja:'
+              Control = eCausaBaja
+              ControlOptions.ShowBorder = False
+            end
           end
           inherited dxLayoutControlContactoGroup3: TdxLayoutGroup
             inherited dxLayoutControlContactoItem167: TdxLayoutItem
diff --git a/Source/Modulos/Contactos/Views/uViewEmpleado.pas b/Source/Modulos/Contactos/Views/uViewEmpleado.pas
index f42043a0..a689aad8 100644
--- a/Source/Modulos/Contactos/Views/uViewEmpleado.pas
+++ b/Source/Modulos/Contactos/Views/uViewEmpleado.pas
@@ -33,6 +33,10 @@ type
     dxLayoutControlContactoItem22: TdxLayoutItem;
     eDuracionContrato: TcxDBTextEdit;
     dxLayoutControlContactoGroup14: TdxLayoutGroup;
+    dxLayoutControlContactoItem23: TdxLayoutItem;
+    eFechaBaja: TcxDBDateEdit;
+    dxLayoutControlContactoItem24: TdxLayoutItem;
+    eCausaBaja: TcxDBTextEdit;
     procedure CustomViewCreate(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
     procedure cbCategoriaPropertiesInitPopup(Sender: TObject);
diff --git a/Source/Modulos/Contactos/Views/uViewEmpleados.dfm b/Source/Modulos/Contactos/Views/uViewEmpleados.dfm
index a5f37389..e401f266 100644
--- a/Source/Modulos/Contactos/Views/uViewEmpleados.dfm
+++ b/Source/Modulos/Contactos/Views/uViewEmpleados.dfm
@@ -1,5 +1,7 @@
 inherited frViewEmpleados: TfrViewEmpleados
   inherited cxGrid: TcxGrid
+    RootLevelOptions.DetailTabsPosition = dtpTop
+    OnActiveTabChanged = cxGridActiveTabChanged
     inherited cxGridView: TcxGridDBTableView
       DataController.Summary.FooterSummaryItems = <
         item
@@ -27,6 +29,19 @@ inherited frViewEmpleados: TfrViewEmpleados
       inherited cxGridViewEMAIL_1: TcxGridDBColumn
         Visible = False
       end
+      object cxGridViewFECHA_BAJA: TcxGridDBColumn
+        Caption = 'Fecha de baja'
+        DataBinding.FieldName = 'FECHA_BAJA'
+      end
+    end
+    inherited cxGridLevel: TcxGridLevel
+      Caption = 'Todos'
+    end
+    object cxGridLevel1: TcxGridLevel
+      Caption = 'Activos'
+    end
+    object cxGridLevel2: TcxGridLevel
+      Caption = 'Inactivos'
     end
   end
   inherited frViewFiltroBase1: TfrViewFiltroBase
@@ -51,6 +66,19 @@ inherited frViewEmpleados: TfrViewEmpleados
       BuiltInReportLink = True
     end
   end
+  inherited cxStyleRepository1: TcxStyleRepository
+    object cxStyleActivos: TcxStyle
+    end
+    object cxStyleInactivos: TcxStyle
+      AssignedValues = [svFont, svTextColor]
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clMaroon
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = []
+      TextColor = clSilver
+    end
+  end
   inherited GridPNGImageList: TPngImageList
     PngImages = <
       item
diff --git a/Source/Modulos/Contactos/Views/uViewEmpleados.pas b/Source/Modulos/Contactos/Views/uViewEmpleados.pas
index 1db3a917..c01017df 100644
--- a/Source/Modulos/Contactos/Views/uViewEmpleados.pas
+++ b/Source/Modulos/Contactos/Views/uViewEmpleados.pas
@@ -25,10 +25,78 @@ type
   end;
 
   TfrViewEmpleados = class(TfrViewContactos, IViewEmpleados)
+    cxGridLevel1: TcxGridLevel;
+    cxGridLevel2: TcxGridLevel;
+    cxGridViewFECHA_BAJA: TcxGridDBColumn;
+    cxStyleActivos: TcxStyle;
+    cxStyleInactivos: TcxStyle;
+    procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel);
+    procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
+      ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
+      out AStyle: TcxStyle);
+  private
+    //Filtros relativos a la vista
+    procedure AnadirFiltroSituaciones;
+
+  public
+    procedure AnadirOtrosFiltros; override;
   end;
 
 implementation
-
 {$R *.dfm}
 
+uses schContactosClient_Intf;
+
+procedure TfrViewEmpleados.AnadirFiltroSituaciones;
+var
+  FFiltro : TcxFilterCriteriaItemList;
+begin
+  FFiltro := AddFilterGrid(fboAnd);
+
+  case cxGrid.ActiveLevel.Index of
+    1   : FFiltro.AddItem(cxGridViewFECHA_BAJA, foEqual, Null, 'ACTIVOS');
+    2   : FFiltro.AddItem(cxGridViewFECHA_BAJA, foNotEqual, Null, 'INACTIVOS');
+  end;
+end;
+
+procedure TfrViewEmpleados.AnadirOtrosFiltros;
+begin
+  inherited;
+
+  AnadirFiltroSituaciones;
+
+  //Finalmente activamos el filtro si tenemos algo
+  if cxGridView.DataController.Filter.IsEmpty then
+    cxGridView.DataController.Filter.Active := False
+  else
+    cxGridView.DataController.Filter.Active := True;
+  cxGrid.ActiveLevel.GridView := cxGridView;
+end;
+
+procedure TfrViewEmpleados.cxGridActiveTabChanged(Sender: TcxCustomGrid;
+  ALevel: TcxGridLevel);
+begin
+  inherited;
+  RefrescarFiltro;
+end;
+
+procedure TfrViewEmpleados.cxGridViewStylesGetContentStyle(
+  Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
+  AItem: TcxCustomGridTableItem; out AStyle: TcxStyle);
+var
+  IndiceCol: Integer;
+  ASituacion: String;
+begin
+  inherited;
+  if Assigned(ARecord) then
+  begin
+    IndiceCol := (Sender as TcxGridDBTableView).GetColumnByFieldName(fld_EmpleadosFECHA_BAJA).Index;
+    ASituacion := VarToStr(ARecord.DisplayTexts[IndiceCol]);
+    if Length(ASituacion) = 0 then
+       AStyle.TextColor := cxStyleActivos.TextColor
+    else
+       AStyle.TextColor := cxStyleInactivos.TextColor;
+  end;
+end;
+
 end.
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index fbd828f4..e2e74863 100644
Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ
diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr
index a299d7ee..6a91b438 100644
--- a/Source/Servidor/FactuGES_Server.dpr
+++ b/Source/Servidor/FactuGES_Server.dpr
@@ -84,8 +84,6 @@ uses
   AHWord97 in 'Utiles\AHWord97.pas',
   uSistemaFunc in '..\Base\Utiles\uSistemaFunc.pas',
   uRptWordAlbaranCliente in '..\Modulos\Albaranes de cliente\Reports\uRptWordAlbaranCliente.pas' {RptWordAlbaranCliente: TDataModule},
-  schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas',
-  schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas',
   srvReferencias_Impl in '..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas' {srvReferencias: TDataAbstractService},
   schReferenciasServer_Intf in '..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas',
   schReferenciasClient_Intf in '..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas',
@@ -128,7 +126,9 @@ uses
   uRptPresupuestosCliente_Server in '..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas' {RptPresupuestosCliente: TDataModule},
   uRptWordPresupuestoCliente in '..\Modulos\Presupuestos de cliente\Reports\uRptWordPresupuestoCliente.pas' {RptWordPresupuestoCliente: TDataModule},
   schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas',
-  schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas';
+  schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas',
+  schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas',
+  schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas';
 
 {$R *.res}
 {$R ..\Servicios\RODLFile.res}
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 70d748e5..b51f4147 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "1.2.3.0\0"
               VALUE "ProductVersion", "1.2.3.0\0"
-              VALUE "CompileDate", "miércoles, 20 de agosto de 2008 15:40\0"
+              VALUE "CompileDate", "miércoles, 20 de agosto de 2008 16:35\0"
          END
     END
     BLOCK "VarFileInfo"