diff --git a/Clientes/Clientes.dfm b/Clientes/Clientes.dfm
index d1b7859..aa394e9 100644
--- a/Clientes/Clientes.dfm
+++ b/Clientes/Clientes.dfm
@@ -1,8 +1,8 @@
 object frClientes: TfrClientes
   Left = 0
   Top = 0
-  Width = 638
-  Height = 459
+  Width = 844
+  Height = 571
   Color = 16383743
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
@@ -16,8 +16,8 @@ object frClientes: TfrClientes
   BarraSeleccion = brSeleccion
   object brSeleccion: TRdxBarraInferior
     Left = 0
-    Top = 409
-    Width = 638
+    Top = 521
+    Width = 844
     Height = 50
     Caption = ' '
     ParentColor = True
@@ -157,7 +157,7 @@ object frClientes: TfrClientes
   object BarraClientes: TRdxBarraSuperior
     Left = 0
     Top = 0
-    Width = 638
+    Width = 844
     Height = 25
     Caption = 'Clientes'
     Font.Charset = DEFAULT_CHARSET
@@ -185,7 +185,7 @@ object frClientes: TfrClientes
     object imgSombra: TImage
       Left = 0
       Top = 0
-      Width = 638
+      Width = 844
       Height = 8
       Align = alTop
     end
@@ -198,6 +198,15 @@ object frClientes: TfrClientes
       Pen.Color = 4759522
       Pen.Style = psDot
     end
+    object Shape2: TShape
+      Left = 440
+      Top = 4
+      Width = 1
+      Height = 17
+      Brush.Style = bsClear
+      Pen.Color = 4759522
+      Pen.Style = psDot
+    end
     object bAnadir: TRdxBotonSuperior
       Left = 5
       Top = 5
@@ -363,7 +372,7 @@ object frClientes: TfrClientes
       Spacing = 6
     end
     object RdxBotonSuperior1: TRdxBotonSuperior
-      Left = 369
+      Left = 447
       Top = 5
       Width = 110
       Height = 15
@@ -394,12 +403,44 @@ object frClientes: TfrClientes
       TabOrder = 5
       Spacing = 6
     end
+    object RdxBotonSuperior2: TRdxBotonSuperior
+      Left = 369
+      Top = 5
+      Width = 65
+      Height = 15
+      Action = actEtiquetas
+      Alignment = taCenter
+      ColorFocused = 4759522
+      ColorDown = 4759522
+      ColorBorder = 4759522
+      ColorHighLight = 11590911
+      ColorShadow = 11590911
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = 11590911
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      FontDown.Charset = DEFAULT_CHARSET
+      FontDown.Color = 18299
+      FontDown.Height = -11
+      FontDown.Name = 'Tahoma'
+      FontDown.Style = [fsBold]
+      FontDisabled.Charset = DEFAULT_CHARSET
+      FontDisabled.Color = clWindowText
+      FontDisabled.Height = -11
+      FontDisabled.Name = 'MS Sans Serif'
+      FontDisabled.Style = []
+      Margin = 5
+      ParentFont = False
+      TabOrder = 6
+      Spacing = 6
+    end
   end
   object pnlCuerpo2: TRdxPanel
     Left = 0
     Top = 25
-    Width = 638
-    Height = 384
+    Width = 844
+    Height = 496
     Caption = ' '
     ParentColor = True
     ColorHighLight = clBtnText
@@ -410,8 +451,8 @@ object frClientes: TfrClientes
     object pnlCuerpo: TPanel
       Left = 0
       Top = 25
-      Width = 638
-      Height = 359
+      Width = 844
+      Height = 471
       Align = alClient
       BevelOuter = bvNone
       BorderWidth = 10
@@ -420,8 +461,8 @@ object frClientes: TfrClientes
       object gridClientes: TcxGrid
         Left = 10
         Top = 39
-        Width = 618
-        Height = 300
+        Width = 824
+        Height = 412
         Align = alClient
         BevelInner = bvNone
         BevelKind = bkFlat
@@ -471,8 +512,8 @@ object frClientes: TfrClientes
       end
       object pnlSeparador: TPanel
         Left = 10
-        Top = 339
-        Width = 618
+        Top = 451
+        Width = 824
         Height = 10
         Align = alBottom
         BevelOuter = bvNone
@@ -482,7 +523,7 @@ object frClientes: TfrClientes
       object Panel1: TPanel
         Left = 10
         Top = 10
-        Width = 618
+        Width = 824
         Height = 29
         Align = alTop
         BevelOuter = bvNone
@@ -591,7 +632,7 @@ object frClientes: TfrClientes
     object pnlExtra: TRdxBarraSuperior
       Left = 0
       Top = 0
-      Width = 638
+      Width = 844
       Height = 25
       Caption = ' '
       BorderWidth = 1
@@ -748,5 +789,9 @@ object frClientes: TfrClientes
       Caption = 'Consultar cobros'
       OnExecute = actConsultarCobrosExecute
     end
+    object actEtiquetas: TAction
+      Caption = 'Etiquetas'
+      OnExecute = actEtiquetasExecute
+    end
   end
 end
diff --git a/Clientes/Clientes.pas b/Clientes/Clientes.pas
index c8c7b77..581f0a0 100644
--- a/Clientes/Clientes.pas
+++ b/Clientes/Clientes.pas
@@ -80,6 +80,9 @@ type
     Buscar: TcxTextEdit;
     bLimpiar: TRdxBoton;
     eNombre: TLabel;
+    RdxBotonSuperior2: TRdxBotonSuperior;
+    Shape2: TShape;
+    actEtiquetas: TAction;
     procedure RdxFrameClientesShow(Sender: TObject);
     procedure cxLookupComboBox1PropertiesEditValueChanged(Sender: TObject);
     procedure actAnadirExecute(Sender: TObject);
@@ -94,6 +97,7 @@ type
     procedure actConsultarCobrosExecute(Sender: TObject);
     procedure Edit1Change(Sender: TObject);
     procedure bLimpiarClick(Sender: TObject);
+    procedure actEtiquetasExecute(Sender: TObject);
   private
     procedure ActualizarBotones;
   protected
@@ -114,7 +118,7 @@ var
 implementation
 {$R *.DFM}
 uses
-  IBCustomDataSet, BaseDatos, Entidades, Cliente, Variants, ListadoClientes,
+  IBCustomDataSet, BaseDatos, Entidades, Cliente, Variants, ListadoClientes, EtiquetasClientes,
   ListadoPagosCliente, TablaFacturasCliente, TablaPagosCliente, Mensajes, Literales;
 
 constructor TfrClientes.Create (AOwner : TComponent);
@@ -316,4 +320,10 @@ begin
   Buscar.Text := '';
 end;
 
+procedure TfrClientes.actEtiquetasExecute(Sender: TObject);
+begin
+  Contenido := TfrEtiquetasClientes.Create(Self);
+  Contenido.Modo := Imprimir;
+end;
+
 end.
diff --git a/Clientes/EtiquetasClientes.dfm b/Clientes/EtiquetasClientes.dfm
new file mode 100644
index 0000000..56b60cd
--- /dev/null
+++ b/Clientes/EtiquetasClientes.dfm
@@ -0,0 +1,292 @@
+object frEtiquetasClientes: TfrEtiquetasClientes
+  Left = 0
+  Top = 0
+  Width = 641
+  Height = 270
+  Align = alClient
+  Color = 16383743
+  ParentColor = False
+  TabOrder = 0
+  object pnlTitulo: TRdxPanelTituloOperacion
+    Left = 0
+    Top = 0
+    Width = 641
+    Height = 22
+    Caption = ' '
+    Color = 9685681
+    Align = alTop
+    Font.Charset = DEFAULT_CHARSET
+    Font.Color = 3692855
+    Font.Height = -11
+    Font.Name = 'Tahoma'
+    Font.Style = [fsBold]
+  end
+  object pnlCuerpo: TPanel
+    Left = 0
+    Top = 22
+    Width = 641
+    Height = 144
+    Align = alTop
+    AutoSize = True
+    BevelOuter = bvNone
+    BorderWidth = 10
+    ParentColor = True
+    TabOrder = 0
+    object pnlProveedor: TAdvPanel
+      Left = 10
+      Top = 10
+      Width = 621
+      Height = 124
+      Align = alTop
+      BevelOuter = bvNone
+      Color = 16383743
+      TabOrder = 0
+      UseDockManager = True
+      Version = '1.5.0.0'
+      AnchorHint = False
+      AutoSize.Enabled = False
+      AutoSize.Height = True
+      AutoSize.Width = True
+      AutoHideChildren = True
+      BackgroundPosition = bpTopLeft
+      BorderColor = clBlack
+      BorderShadow = False
+      Buffered = True
+      CanMove = False
+      CanSize = False
+      Caption.Background.Data = {
+        72010000424D7201000000000000760000002800000014000000150000000100
+        040000000000FC000000E30E0000E30E00001000000010000000B5BDC600F9FE
+        FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+        FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00111111111111
+        1111111100001111111111111111111100001111111111111111111100001111
+        1111111111110000000011111111111111111111000011111111111111111111
+        0000111111111111111111110000111111111111111111110000111111111111
+        1111111100001111111111111111111100001111111111111111111100001111
+        1111111111111111000011111111111111111111000011111111111111111111
+        0000111111111111111111110000111111111111111111110000111111111111
+        1111111100001111111111111111111100001111111111111111111100001111
+        11111111111111110000111111111111111111110000}
+      Caption.ButtonPosition = cbpLeft
+      Caption.Color = clBtnFace
+      Caption.ColorTo = clNone
+      Caption.CloseColor = clBtnFace
+      Caption.CloseButton = False
+      Caption.CloseButtonColor = clBlack
+      Caption.Flat = True
+      Caption.Font.Charset = DEFAULT_CHARSET
+      Caption.Font.Color = 3692855
+      Caption.Font.Height = -11
+      Caption.Font.Name = 'Tahoma'
+      Caption.Font.Style = [fsBold]
+      Caption.Height = 23
+      Caption.Indent = -4
+      Caption.MinMaxButton = True
+      Caption.MinMaxButtonColor = 3692855
+      Caption.ShadeLight = 200
+      Caption.ShadeGrain = 0
+      Caption.ShadeType = stBitmapRStretch
+      Caption.Shape = csRectangle
+      Caption.Text = 'Par'#225'metros para el informe'
+      Caption.TopIndent = 0
+      Caption.Visible = True
+      Collaps = False
+      CollapsColor = clWhite
+      CollapsDelay = 20
+      CollapsSteps = 0
+      ColorTo = clNone
+      FixedTop = False
+      FixedLeft = False
+      FixedHeight = False
+      FixedWidth = False
+      FreeOnClose = False
+      Hover = False
+      HoverColor = clNone
+      HoverFontColor = clNone
+      Indent = 0
+      LineSpacing = 0
+      Position.Save = False
+      Position.Location = clRegistry
+      ShadowColor = clGray
+      ShadowOffset = 2
+      ShowMoveCursor = False
+      TextVAlign = tvaTop
+      TopIndent = 0
+      URLColor = clBlue
+      FullHeight = 38
+      object eCodigoCliente: TLabel
+        Left = 67
+        Top = 40
+        Width = 79
+        Height = 13
+        Alignment = taRightJustify
+        Caption = 'Desde el cliente:'
+        Font.Charset = DEFAULT_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -11
+        Font.Name = 'Tahoma'
+        Font.Style = []
+        ParentFont = False
+      end
+      object Label2: TLabel
+        Left = 70
+        Top = 64
+        Width = 76
+        Height = 13
+        Alignment = taRightJustify
+        Caption = 'hasta el cliente:'
+        Font.Charset = DEFAULT_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -11
+        Font.Name = 'Tahoma'
+        Font.Style = []
+        ParentFont = False
+      end
+      object Label1: TLabel
+        Left = 20
+        Top = 89
+        Width = 467
+        Height = 13
+        Caption = 
+          '* Solo saldr'#225'n aquellos clientes que tengan al menos un contrato' +
+          ' y su direcci'#243'n no sea incompleta'
+        Font.Charset = DEFAULT_CHARSET
+        Font.Color = clMaroon
+        Font.Height = -11
+        Font.Name = 'Tahoma'
+        Font.Style = []
+        ParentFont = False
+      end
+      object NombreCliIni: TcxButtonEdit
+        Left = 152
+        Top = 37
+        ParentFont = False
+        Properties.Buttons = <
+          item
+            Default = True
+            Glyph.Data = {
+              26050000424D260500000000000036040000280000000F0000000F0000000100
+              080000000000F0000000330B0000330B00000001000000010000212121003131
+              31004A4A4A00FFBD4A00636363006B6B6B00FF8C6B00FFC66B00FFFF8C000031
+              9400ADADAD00FFE7B500FFFFB500C6C6C600FFFFD600004ADE00FF00FF002152
+              FF008C8CFF0021ADFF008CD6FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00101010101010
+              101010101010101010FF101010101010101010100100001010FF101010101010
+              101010040F13090010FF1010101010101010040F14120F0010FF101010101010
+              10040F14120F00101000101010050202020214120F00101010FF101005070707
+              0306110F0010101010FF10050A0B0808070306021010101010FF10050B0E0C08
+              080703021010101010FF10050B0E0C0C0808030210101010100010050B0E0C0C
+              0C0803021010101010FF10050D0B0E0C0C0B0A021010101010FF1010050D0B0B
+              0B0A00101010101010FF101010050505050510101010101010FF101010101010
+              10101010101010101000}
+            Kind = bkGlyph
+          end>
+        Properties.ReadOnly = False
+        Properties.OnButtonClick = CodigoCliIniPropertiesButtonClick
+        Properties.OnValidate = NombreCliIniPropertiesValidate
+        Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro
+        TabOrder = 0
+        Text = 'NombreCliIni'
+        Width = 350
+      end
+      object NombreCliFin: TcxButtonEdit
+        Left = 152
+        Top = 61
+        ParentFont = False
+        Properties.Buttons = <
+          item
+            Default = True
+            Glyph.Data = {
+              26050000424D260500000000000036040000280000000F0000000F0000000100
+              080000000000F0000000330B0000330B00000001000000010000212121003131
+              31004A4A4A00FFBD4A00636363006B6B6B00FF8C6B00FFC66B00FFFF8C000031
+              9400ADADAD00FFE7B500FFFFB500C6C6C600FFFFD600004ADE00FF00FF002152
+              FF008C8CFF0021ADFF008CD6FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+              FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00101010101010
+              101010101010101010FF101010101010101010100100001010FF101010101010
+              101010040F13090010FF1010101010101010040F14120F0010FF101010101010
+              10040F14120F00101000101010050202020214120F00101010FF101005070707
+              0306110F0010101010FF10050A0B0808070306021010101010FF10050B0E0C08
+              080703021010101010FF10050B0E0C0C0808030210101010100010050B0E0C0C
+              0C0803021010101010FF10050D0B0E0C0C0B0A021010101010FF1010050D0B0B
+              0B0A00101010101010FF101010050505050510101010101010FF101010101010
+              10101010101010101000}
+            Kind = bkGlyph
+          end>
+        Properties.ReadOnly = False
+        Properties.OnButtonClick = CodigoCliFinPropertiesButtonClick
+        Properties.OnValidate = NombreCliFinPropertiesValidate
+        Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro
+        TabOrder = 1
+        Text = 'NombreCliFin'
+        Width = 350
+      end
+    end
+  end
+  object pnlVistaPrevia: TPanel
+    Left = 0
+    Top = 166
+    Width = 641
+    Height = 104
+    Align = alClient
+    BevelOuter = bvNone
+    Color = 16383743
+    TabOrder = 1
+  end
+end
diff --git a/Clientes/EtiquetasClientes.pas b/Clientes/EtiquetasClientes.pas
new file mode 100644
index 0000000..fe4b4d9
--- /dev/null
+++ b/Clientes/EtiquetasClientes.pas
@@ -0,0 +1,218 @@
+{
+===============================================================================
+  Copyright (©) 2007. Rodax Software.
+===============================================================================
+  Los contenidos de este fichero son propiedad de Rodax Software titular del
+  copyright. Este fichero sólo podrá ser copiado, distribuido y utilizado,
+  en su totalidad o en parte, con el permiso escrito de Rodax Software, o de
+  acuerdo con los términos y condiciones establecidas en el acuerdo/contrato
+  bajo el que se suministra.
+  -----------------------------------------------------------------------------
+  Web:  www.rodax-software.com
+===============================================================================
+  Fecha primera versión: 14-11-2007
+  Versión actual: 1.0.0
+  Fecha versión actual: 14-11-2007
+===============================================================================
+  Modificaciones:
+
+    Fecha         Comentarios
+    ---------------------------------------------------------------------------
+===============================================================================
+}
+
+unit EtiquetasClientes;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, RdxFrame, RdxBotones, RdxPaneles, RdxBarras, cxControls,
+  cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxButtonEdit, StdCtrls,
+  AdvPanel, ExtCtrls, RdxTitulos, cxDropDownEdit, VistaPrevia,
+  InformeEtiquetasClientes, TablaClientes, Entidades;
+
+type
+  TfrEtiquetasClientes = class(TRdxFrame)
+    pnlTitulo: TRdxPanelTituloOperacion;
+    pnlCuerpo: TPanel;
+    pnlProveedor: TAdvPanel;
+    eCodigoCliente: TLabel;
+    Label2: TLabel;
+    pnlVistaPrevia: TPanel;
+    Label1: TLabel;
+    NombreCliIni: TcxButtonEdit;
+    NombreCliFin: TcxButtonEdit;
+    procedure CodigoCliIniPropertiesButtonClick(Sender: TObject;
+      AButtonIndex: Integer);
+    procedure CodigoCliFinPropertiesButtonClick(Sender: TObject;
+      AButtonIndex: Integer);
+    procedure NombreCliIniPropertiesValidate(Sender: TObject;
+      var DisplayValue: Variant; var ErrorText: TCaption;
+      var Error: Boolean);
+    procedure NombreCliFinPropertiesValidate(Sender: TObject;
+      var DisplayValue: Variant; var ErrorText: TCaption;
+      var Error: Boolean);
+  private
+    FVistaPrevia : TfrVistaPrevia;
+    FInforme : TdmInformeEtiquetasClientes;
+    FClienteIni : TDatosCliente;
+    FClienteFin : TDatosCliente;
+    FCodigoClienteAux : Variant;
+    procedure RecogerParametrosInforme;
+  protected
+    procedure VerModal; override;
+    procedure FreeContenido; override;
+    function CloseFrame : Boolean; override;
+    function CambiarEntidad(EntidadAnterior, Entidad : TRdxEntidad): Boolean; override;
+  public
+    constructor Create(AOwner : TComponent); override;
+    destructor Destroy; override;
+  end;
+
+var
+  frEtiquetasClientes: TfrEtiquetasClientes;
+
+implementation
+
+{$R *.dfm}
+
+{ TfrEtiquetasClientes }
+
+uses
+  Literales, Mensajes, StrFunc, DateUtils, InformeBase,
+  Clientes, RdxFrameClientes, configuracion;
+
+constructor TfrEtiquetasClientes.Create(AOwner: TComponent);
+var
+  NombreAux : String;
+begin
+  inherited Create(AOwner);
+  Entidad := entListadoClientes;
+
+  FClienteIni := TDatosCliente.Create;
+  FClienteFin := TDatosCliente.Create;
+
+  NombreAux := dmTablaClientes.DarNombreCliMin;
+  FClienteIni.Codigo := '';
+  FClienteIni.Nombre := NombreAux;
+  FClienteIni.ObtenerDatos;
+  NombreCliIni.EditingText := FClienteIni.Nombre;
+
+  NombreAux := dmTablaClientes.DarNombreCliMax;
+  FClienteFin.Codigo := '';
+  FClienteFin.Nombre := NombreAux;
+  FClienteFin.ObtenerDatos;
+  NombreCliFin.EditingText := FClienteFin.Nombre;
+
+  FVistaPrevia := TfrVistaPrevia.Create(Self);
+  FVistaPrevia.Parent := pnlVistaPrevia;
+  FInforme := TdmInformeEtiquetasClientes.Create(Self);
+  FInforme.Preview := FVistaPrevia.Preview;
+  RecogerParametrosInforme;
+end;
+
+destructor TfrEtiquetasClientes.Destroy;
+begin
+  FInforme.Free;
+  FClienteIni.Free;
+  FClienteFin.Free;
+  inherited;
+end;
+
+procedure TfrEtiquetasClientes.RecogerParametrosInforme;
+begin
+  if not Assigned(FInforme) then
+    Exit;
+  with FInforme do
+  begin
+    NombreIni := FClienteIni.Nombre;
+    NombreFin := FClienteFin.Nombre;
+    Previsualizar;
+  end;
+end;
+
+procedure TfrEtiquetasClientes.CodigoCliIniPropertiesButtonClick(
+  Sender: TObject; AButtonIndex: Integer);
+begin
+  ContenidoModal := TfrClientes.Create(Self);
+  if FCodigoClienteAux <> Null then
+  begin
+    FClienteIni.Codigo := FCodigoClienteAux;
+    FClienteIni.ObtenerDatos;
+    NombreCliIni.EditingText := FClienteIni.Nombre;
+    PostMessage(NombreCliIni.Handle,WM_KEYDOWN,VK_RETURN,0);    
+  end;
+end;
+
+function TfrEtiquetasClientes.CloseFrame: Boolean;
+begin
+  FInforme.Preview := NIL;
+  (FVistaPrevia as TRdxFrame).CloseFrame;
+  Result := inherited CloseFrame;
+end;
+
+procedure TfrEtiquetasClientes.FreeContenido;
+begin
+  if (ContenidoModal is TRdxFrameClientes) then
+    FCodigoClienteAux := (ContenidoModal as TRdxFrameClientes).CodigoCliente;
+  inherited;
+end;
+
+procedure TfrEtiquetasClientes.VerModal;
+begin
+  if (ContenidoModal is TRdxFrameClientes) then
+    (ContenidoModal as TRdxFrameClientes).CodigoCliente := FCodigoClienteAux;
+  inherited;
+end;
+
+procedure TfrEtiquetasClientes.CodigoCliFinPropertiesButtonClick(
+  Sender: TObject; AButtonIndex: Integer);
+begin
+  ContenidoModal := TfrClientes.Create(Self);
+  if FCodigoClienteAux <> Null then
+  begin
+    FClienteFin.Codigo := FCodigoClienteAux;
+    FClienteFin.ObtenerDatos;
+    NombreCliFin.EditingText := FClienteFin.Nombre;
+    PostMessage(NombreCliFin.Handle,WM_KEYDOWN,VK_RETURN,0);    
+  end;
+end;
+
+procedure TfrEtiquetasClientes.NombreCliIniPropertiesValidate(
+  Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
+  var Error: Boolean);
+begin
+  if AnsiCompareText(DisplayValue, NombreCliFin.Text) > 0 then
+  begin
+    ErrorText := msgCliIniMayor;
+    Error := True;
+    Exit;
+  end;
+  FClienteIni.Nombre := DisplayValue;
+  FClienteIni.Codigo := '';
+  RecogerParametrosInforme;
+end;
+
+procedure TfrEtiquetasClientes.NombreCliFinPropertiesValidate(
+  Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
+  var Error: Boolean);
+begin
+  if AnsiCompareText(DisplayValue, NombreCliIni.Text) < 0 then
+  begin
+    ErrorText := msgCliIniMayor;
+    Error := True;
+    Exit;
+  end;
+  FClienteFin.Nombre := DisplayValue;
+  FClienteFin.Codigo := '';
+  RecogerParametrosInforme;
+end;
+
+function TfrEtiquetasClientes.CambiarEntidad(EntidadAnterior, Entidad: TRdxEntidad): Boolean;
+begin
+  inherited CambiarEntidad(EntidadAnterior, Entidad);
+  ConfigurarFrame(Self, Self.Entidad);
+end;
+
+end.
diff --git a/Factuges.dof b/Factuges.dof
index 3401f84..4c3d5b1 100644
--- a/Factuges.dof
+++ b/Factuges.dof
@@ -114,7 +114,7 @@ IncludeVerInfo=1
 AutoIncBuild=0
 MajorVer=3
 MinorVer=1
-Release=0
+Release=1
 Build=0
 Debug=0
 PreRelease=0
@@ -126,7 +126,7 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=
 FileDescription=
-FileVersion=3.1.0.0
+FileVersion=3.1.1.0
 InternalName=
 LegalCopyright=
 LegalTrademarks=
@@ -135,8 +135,35 @@ ProductName=
 ProductVersion=1.0.0.0
 Comments=
 [Excluded Packages]
-c:\archivos de programa\borland\delphi7\Bin\designdgm70.bpl=Borland Module Diagram Editview
-T:\Componentes\TJSDialog\Delphi7\JSDialog70.bpl=JED Software - TJSDialog
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxTreeListVCLD7.bpl=ExpressQuantumTreeList 4 (VCL Edition) by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxThemeD7.bpl=Express XP Theme Manager by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxLibraryVCLD7.bpl=Express Cross Platform Library (VCL Edition) by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxExportVCLD7.bpl=Express Cross Platform Export Library (VCL Edition) by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxDataD7.bpl=ExpressDataController by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxGridVCLD7.bpl=ExpressQuantumGrid 5 (VCL Edition) by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxPageControlVCLD7.bpl=Express Cross Platform PageControl (VCL Edition) by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxSchedulerVCLD7.bpl=ExpressScheduler 2 (VCL Edition) by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxsbD7.bpl=ExpressSideBar by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxComnD7.bpl=ExpressCommonLibrary by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxBarD7.bpl=ExpressBars by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxBarDBNavD7.bpl=ExpressBars DBNavigator by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxBarExtDBItemsD7.bpl=ExpressBars extended DB items by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxBarExtItemsD7.bpl=ExpressBars extended items by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxDockingD7.bpl=ExpressDocking Library by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxLayoutControlD7.bpl=ExpressLayout Control by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxNavBarD7.bpl=ExpressNavBar by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxGDIPlusD7.bpl=ExpressGDI+ Library by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxPSCoreD7.bpl=ExpressPrinting System by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxVerticalGridVCLD7.bpl=ExpressVerticalGrid (VCL Edition) by Developer Express Inc.
+C:\Archivos de programa\Clever Components\Database Comparer\Delphi 7\Lib\ComparerD7.bpl=Database Comparer VCL
+C:\Archivos de programa\Clever Components\Database Comparer\Delphi 7\Lib\ComparerBdeD7.bpl=Database Comparer VCL BDE
+C:\Archivos de programa\Clever Components\Database Comparer\Delphi 7\Lib\ComparerDBXD7.bpl=Database Comparer VCL DBX
+C:\Archivos de programa\Clever Components\Database Comparer\Delphi 7\Lib\ComparerIbxD7.bpl=Database Comparer VCL IBX
+C:\Archivos de programa\Clever Components\Database Comparer\Delphi 7\Lib\ComparerAdoD7.bpl=Database Comparer VCL ADO
+C:\WINDOWS\system32\dclShX_Namespace_V3D7.bpl=(untitled)
+C:\WINDOWS\system32\vclShX_Namespace_v3D7.bpl=(untitled)
 [HistoryLists\hlDebugSourcePath]
 Count=2
 Item0=D:\Proyectos\Componentes\FastReport\Source\;D:\Proyectos\FactuGES 2000 v2 (Acana)\Codigo\Frames\;T:\Componentes\CETools\
diff --git a/Factuges.dpr b/Factuges.dpr
index f7d6bf4..cd11674 100644
--- a/Factuges.dpr
+++ b/Factuges.dpr
@@ -194,7 +194,9 @@ uses
   AlbaranesClientes in 'Clientes\AlbaranesClientes.pas' {frAlbaranesClientes: TRdxFrameAlbaranesCliente},
   InformeAlbaranCliente in 'Informes\InformeAlbaranCliente.pas' {dmInformeAlbaranCliente: TDataModule},
   ImprimirAlbaranCliente in 'Clientes\ImprimirAlbaranCliente.pas' {frImprimirAlbaranCliente: TRdxFrame},
-  VistaRichEditor in 'VistaRichEditor.pas' {frVistaRichEdit: TFrame};
+  VistaRichEditor in 'VistaRichEditor.pas' {frVistaRichEdit: TFrame},
+  InformeEtiquetasClientes in 'Informes\InformeEtiquetasClientes.pas' {dmInformeEtiquetasClientes: TDataModule},
+  EtiquetasClientes in 'Clientes\EtiquetasClientes.pas' {frEtiquetasClientes: TRdxFrame};
 
 {$R *.RES}
 {$R Prueba.res}
diff --git a/Factuges.res b/Factuges.res
index d2663e7..d4e1e43 100644
Binary files a/Factuges.res and b/Factuges.res differ
diff --git a/Informes/InformeEtiquetasClientes.dfm b/Informes/InformeEtiquetasClientes.dfm
new file mode 100644
index 0000000..d0ba091
--- /dev/null
+++ b/Informes/InformeEtiquetasClientes.dfm
@@ -0,0 +1,21 @@
+inherited dmInformeEtiquetasClientes: TdmInformeEtiquetasClientes
+  OldCreateOrder = True
+  Left = 548
+  Top = 252
+  inherited FReport: TfrReport
+    Dataset = dsTablaClientes
+    ReportForm = {19000000}
+  end
+  object dsTablaClientes: TfrDBDataSet
+    CloseDataSource = True
+    DataSet = TablaClientes
+    Left = 152
+    Top = 24
+  end
+  object TablaClientes: TIBQuery
+    BufferChunks = 1000
+    CachedUpdates = False
+    Left = 152
+    Top = 80
+  end
+end
diff --git a/Informes/InformeEtiquetasClientes.pas b/Informes/InformeEtiquetasClientes.pas
new file mode 100644
index 0000000..fd67e86
--- /dev/null
+++ b/Informes/InformeEtiquetasClientes.pas
@@ -0,0 +1,119 @@
+{
+===============================================================================
+  Copyright (©) 2007. Rodax Software.
+===============================================================================
+  Los contenidos de este fichero son propiedad de Rodax Software titular del
+  copyright. Este fichero sólo podrá ser copiado, distribuido y utilizado,
+  en su totalidad o en parte, con el permiso escrito de Rodax Software, o de
+  acuerdo con los términos y condiciones establecidas en el acuerdo/contrato
+  bajo el que se suministra.
+  -----------------------------------------------------------------------------
+  Web:  www.rodax-software.com
+===============================================================================
+  Fecha primera versión: 14-11-2007
+  Versión actual: 1.0.0
+  Fecha versión actual: 14-11-2007
+===============================================================================
+  Modificaciones:
+
+    Fecha         Comentarios
+    ---------------------------------------------------------------------------
+===============================================================================
+}
+
+unit InformeEtiquetasClientes;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, InformeBase, FR_IBXDB, FR_Shape, FR_Class, DB, IBCustomDataSet,
+  IBQuery, FR_DSet, FR_DBSet, RdxEmpresaActiva;
+
+type
+  TdmInformeEtiquetasClientes = class(TdmInformeBase)
+    dsTablaClientes: TfrDBDataSet;
+    TablaClientes: TIBQuery;
+  private
+    FNombreIni: String;
+    FNombreFin: String;
+  protected
+    procedure RellenarCabecera(Band: TfrBand); override;
+    procedure PrepararConsultas; override;
+  public
+    constructor Create(AOwner: TComponent); override;
+  published
+    property NombreIni : String read FNombreIni write FNombreIni;
+    property NombreFin : String read FNombreFin write FNombreFin;
+  end;
+
+var
+  dmInformeEtiquetasClientes: TdmInformeEtiquetasClientes;
+
+implementation
+
+{$R *.dfm}
+
+{ TdmInformeEtiquetasClientes }
+
+constructor TdmInformeEtiquetasClientes.Create(AOwner: TComponent);
+begin
+  inherited;
+  FNombreInforme := 'InformeEtiquetasClientes.frf';
+end;
+
+procedure TdmInformeEtiquetasClientes.PrepararConsultas;
+begin
+  inherited;
+  with TablaClientes do
+  begin
+    Database := FBaseDatos;
+    Transaction := FTransaccion;
+    SQL.Clear;
+    SQL.Add('select distinct CLIENTES.CODIGO, CLIENTES.NOMBRE, ');
+    SQL.Add('case when SUCURSALESCLIENTE.NUMERO is null ');
+    SQL.Add('then SUCURSALESCLIENTE.CALLE ');
+    SQL.Add('else SUCURSALESCLIENTE.CALLE || '', '' || SUCURSALESCLIENTE.NUMERO');
+    SQL.Add('end as DIRECCION, ');
+    SQL.Add('SUCURSALESCLIENTE.CODIGOPOSTAL, SUCURSALESCLIENTE.POBLACION, SUCURSALESCLIENTE.PROVINCIA');
+
+    SQL.Add('from contratoscliente');
+    SQL.Add('left join CLIENTES on (CLIENTES.CODIGO = contratoscliente.codigocliente)');
+    SQL.Add('left join SUCURSALESCLIENTE on (SUCURSALESCLIENTE.CODIGOCLIENTE = CLIENTES.CODIGO and SUCURSALESCLIENTE.TIPO = ''P'')');
+
+    SQL.Add('where (ltrim(SUCURSALESCLIENTE.calle) <> '''')');
+    SQL.Add('and (ltrim(SUCURSALESCLIENTE.codigopostal) <> '''')');
+    SQL.Add('and (upper(CLIENTES.NOMBRE) between upper(:NOMBREINI) and upper(:NOMBREFIN))');
+    SQL.Add('order by CLIENTES.NOMBRE');
+
+    ParamByName('NOMBREINI').AsString := FNombreIni;
+    ParamByName('NOMBREFIN').AsString := FNombreFin;
+    Prepare;
+  end;
+end;
+
+procedure TdmInformeEtiquetasClientes.RellenarCabecera(Band: TfrBand);
+var
+  iCont : Integer;
+  Objeto : TfrView;
+begin
+  inherited;
+  with Band do
+  begin
+     for iCont := 0 to Objects.Count - 1 do
+      begin
+        Objeto := Objects[iCont];
+        if ((Objeto is TfrMemoView) and (Objeto.Name = 'CabParametros')) then
+        begin
+          with (Objeto as TfrMemoView) do
+          begin
+            Memo.Clear;
+            Memo.Add('Rango de clientes: ' + FNombreIni + ' - ' + FNombreFin);
+          end;
+        end;
+      end;
+  end;
+end;
+
+end.
+
diff --git a/Temp/Factuges.exe b/Temp/Factuges.exe
index aeb392d..afc305f 100644
Binary files a/Temp/Factuges.exe and b/Temp/Factuges.exe differ
diff --git a/Temp/Informes/InformeEtiquetasClientes.frf b/Temp/Informes/InformeEtiquetasClientes.frf
new file mode 100644
index 0000000..a46f168
Binary files /dev/null and b/Temp/Informes/InformeEtiquetasClientes.frf differ