Albaranes de cliente:

* Repaso general para habilitar/deshabilitar funciones
  * Generación del informe.

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@215 0c75b7a4-871f-7646-8a2f-f78d34cc349f

Source/Modulos/Albaranes de cliente/Data/AlbaranesCliente_data.dproj

@@ -41,71 +41,30 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject xmlns=""> <Delphi.Personality>   <Parameters>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">AlbaranesCliente_data.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
-      <Parameters Name="UseLauncher">False</Parameters>
-      <Parameters Name="LoadAllSymbols">True</Parameters>
-      <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
-    </Parameters>
-    <Package_Options>
-      <Package_Options Name="ImplicitBuild">True</Package_Options>
-      <Package_Options Name="DesigntimeOnly">False</Package_Options>
-      <Package_Options Name="RuntimeOnly">False</Package_Options>
-    </Package_Options>
-    <VersionInfo>
-      <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
-      <VersionInfo Name="AutoIncBuild">False</VersionInfo>
-      <VersionInfo Name="MajorVer">1</VersionInfo>
-      <VersionInfo Name="MinorVer">0</VersionInfo>
-      <VersionInfo Name="Release">0</VersionInfo>
-      <VersionInfo Name="Build">0</VersionInfo>
-      <VersionInfo Name="Debug">False</VersionInfo>
-      <VersionInfo Name="PreRelease">False</VersionInfo>
-      <VersionInfo Name="Special">False</VersionInfo>
-      <VersionInfo Name="Private">False</VersionInfo>
-      <VersionInfo Name="DLL">False</VersionInfo>
-      <VersionInfo Name="Locale">3082</VersionInfo>
-      <VersionInfo Name="CodePage">1252</VersionInfo>
-    </VersionInfo>
-    <VersionInfoKeys>
-      <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
-      <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
-      <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
-      <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
-      <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
-      <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
-      <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
-      <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
-      <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
-      <VersionInfoKeys Name="Comments"></VersionInfoKeys>
-    </VersionInfoKeys>
-    <Source>
-      <Source Name="MainSource">AlbaranesCliente_data.dpk</Source>
-    </Source>
-  </Delphi.Personality> </BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
     <DelphiCompile Include="AlbaranesCliente_data.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="adortl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
-    <DCCReference Include="AlbaranesCliente_model.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\AlbaranesCliente_model.dcp" />
-    <DCCReference Include="cxLibraryD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
-    <DCCReference Include="dbrtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
-    <DCCReference Include="dsnap.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
-    <DCCReference Include="dxThemeD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
-    <DCCReference Include="rtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
     <DCCReference Include="uDataModuleAlbaranesCliente.pas">
       <Form>DataModuleAlbaranesCliente</Form>
     </DCCReference>
-    <DCCReference Include="vcl.dcp" />
-    <DCCReference Include="vcldb.dcp" />
   </ItemGroup>
 </Project>
-
 <!-- EurekaLog First Line
 [Exception Log]
-EurekaLog Version=6006
+EurekaLog Version=6011
 Activate=1
 Activate Handle=1
 Save Log File=1

Source/Modulos/Albaranes de cliente/Data/AlbaranesCliente_data.rc

@@ -0,0 +1,22 @@
+1 VERSIONINFO
+FILEVERSION 1,0,0,0
+PRODUCTVERSION 1,0,0,0
+FILEFLAGSMASK 0x3FL
+FILEFLAGS 0x00L
+FILEOS 0x40004L
+FILETYPE 0x1L
+FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+         BLOCK "0C0A04E4"
+         BEGIN
+              VALUE "FileVersion", "1.0.0.0\0"
+              VALUE "ProductVersion", "1.0.0.0\0"
+         END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+         VALUE "Translation", 0x0C0A, 1252
+    END
+END

Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.pas

@@ -61,7 +61,7 @@ end;
 
 function TDataModuleAlbaranesCliente.GetReport(const AID: String): Binary;
 begin
-//  Result := (RORemoteService as IsrvAlbaranesCliente).GenerateReport(AID)
+  Result := (RORemoteService as IsrvAlbaranesCliente).GenerateReport(AID);
 end;
 
 function TDataModuleAlbaranesCliente.NewItem: IBizAlbaranCliente;
@@ -89,7 +89,7 @@ end;
 
 function TDataModuleAlbaranesCliente.GetEtiquetas(const AID: Integer; withRefCliente: Boolean): Binary;
 begin
-//  Result := (RORemoteService as IsrvAlbaranesCliente).GenerateEtiquetas(AID, withRefCliente)
+  Result := (RORemoteService as IsrvAlbaranesCliente).GenerateEtiquetas(AID, withRefCliente)
 end;
 
 function TDataModuleAlbaranesCliente.GetItem(const ID: Integer): IBizAlbaranCliente;

Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas

@@ -7,14 +7,13 @@ uses
   Dialogs, frxClass, frxDBSet, uDAScriptingProvider,
   uDADataTable, uDACDSDataTable, DB, uDAClasses, frxChart, frxGradient,
   frxChBox, frxCross, frxOLE, frxBarcode, frxRich, uDABINAdapter, uROTypes,
-  uDAInterfaces;
+  uDAInterfaces, uDADataStreamer, IBCustomDataSet, IBQuery, IBDatabase,
+  uDAMemDataTable;
 
 type
   TRptAlbaranesCliente = class(TDataModule)
-    DADataCabecera: TDADataSource;
+    DADSCabecera: TDADataSource;
-    DADataDetalles: TDADataSource;
+    DADSDetalles: TDADataSource;
-    tbl_Cabecera: TDACDSDataTable;
-    tbl_Detalles: TDACDSDataTable;
     DABINAdapter: TDABINAdapter;
     frxRichObject1: TfrxRichObject;
     frxBarCodeObject1: TfrxBarCodeObject;
@@ -25,14 +24,48 @@ type
     frxChartObject1: TfrxChartObject;
     frxDBCabecera: TfrxDBDataset;
     frxDBDetalles: TfrxDBDataset;
+    frxReport: TfrxReport;
+    IBDatabase1: TIBDatabase;
+    IBTransaction1: TIBTransaction;
+    DataSource1: TDataSource;
+    DataSource3: TDataSource;
+    detalles: TIBQuery;
+    cabecera: TIBQuery;
+    cabeceraID: TIntegerField;
+    cabeceraID_EMPRESA: TIntegerField;
+    cabeceraID_CLIENTE: TIntegerField;
+    cabeceraFECHA_ALBARAN: TDateField;
+    cabeceraREFERENCIA: TIBStringField;
+    cabeceraREFERENCIA_CLIENTE: TIBStringField;
+    cabeceraID_PEDIDO: TIntegerField;
+    cabeceraREF_PEDIDO: TIBStringField;
+    cabeceraOBSERVACIONES: TMemoField;
+    cabeceraIMPORTE_TOTAL: TIBBCDField;
+    cabeceraNIF_CIF: TIBStringField;
+    cabeceraNOMBRE: TIBStringField;
+    cabeceraPERSONA_CONTACTO: TIBStringField;
+    cabeceraCALLE: TIBStringField;
+    cabeceraPOBLACION: TIBStringField;
+    cabeceraPROVINCIA: TIBStringField;
+    cabeceraCODIGO_POSTAL: TIBStringField;
+    detallesID: TIntegerField;
+    detallesID_ALBARAN: TIntegerField;
+    detallesPOSICION: TIntegerField;
+    detallesTIPO_DETALLE: TIBStringField;
+    detallesCONCEPTO: TIBStringField;
+    detallesCANTIDAD: TIntegerField;
+    detallesIMPORTE_UNIDAD: TIBBCDField;
+    detallesIMPORTE_TOTAL: TIBBCDField;
+    detallesREFERENCIA: TIBStringField;
     schReport: TDASchema;
     DataDictionary: TDADataDictionary;
-    frxReport: TfrxReport;
+    tbl_Cabecera: TDAMemDataTable;
+    tbl_Detalles: TDAMemDataTable;
     procedure DataModuleCreate(Sender: TObject);
   private
     FConnection: IDAConnection;
     //Genera cada uno de los albaranes a imprimir
-    procedure GenerarAlbaran(const ID: integer); overload;
+    procedure GenerarAlbaran(const AID: integer); overload;
   public
     function GenerarAlbaran(const AID : String): Binary; overload;
     function GenerarEtiquetas(const AID : Integer; withRefCliente: Boolean): Binary;
@@ -46,7 +79,7 @@ uses
   uDataModuleServer, schAlbaranesClienteClient_Intf;
 
 const
-  rptInfAlbaran = 'InfAlbaranCliente.fr3';
+  rptInforme = 'InfAlbaranCliente.fr3';
   rptInfEtiquetas = 'InfEtiquetasAlbaranCliente.fr3';
 
   { Dataset names for schReport }
@@ -71,7 +104,7 @@ var
   i: Integer;
 begin
   Result := Binary.Create;
-  FConnection.BeginTransaction;
+  //FConnection.BeginTransaction; <--- Creo que no va a hacer falta.
 
   try
     ID_Albaranes := TStringList.Create;
@@ -84,20 +117,20 @@ begin
     frxReport.PreviewPages.SaveToStream(Result);
 
   finally
-    FConnection.RollbackTransaction;
+    //FConnection.RollbackTransaction; <--- Creo que no va a hacer falta.
   end;
 end;
 
-procedure TRptAlbaranesCliente.GenerarAlbaran(const ID: integer);
+procedure TRptAlbaranesCliente.GenerarAlbaran(const AID: integer);
 var
   AStream: TMemoryStream;
   dsMaster: IDADataset;
   dsDetail: IDADataset;
 begin
-  AStream := TMemoryStream.Create;
+  //AStream := TMemoryStream.Create;
 
   try
-    dsMaster := schReport.NewDataset(FConnection, ds_InformeCabecera, ['ID'], [ID]);
+    {dsMaster := schReport.NewDataset(FConnection, ds_InformeCabecera, ['ID'], [ID]);
     dsDetail := schReport.NewDataset(FConnection, ds_InformeDetalles, ['ID_ALBARAN'], [ID], False);
 
     AStream.Clear;
@@ -106,9 +139,18 @@ begin
 
     AStream.Clear;
     DABINAdapter.WriteDataset(AStream, dsDetail, [woRows, woSchema], -1);
-    DABINAdapter.ReadDataset(AStream, tbl_Detalles, TRUE, '', TRUE, TRUE);
+    DABINAdapter.ReadDataset(AStream, tbl_Detalles, TRUE, '', TRUE, TRUE);}
 
-    frxReport.LoadFromFile(DarRutaInformes + rptInfAlbaran, True);
+    frxDBCabecera.DataSource := DADSCabecera;
+    frxDBDetalles.DataSource := DADSDetalles;
+
+    tbl_Cabecera.ParamByName('ID').AsInteger := AID;
+    tbl_Detalles.ParamByName('ID_ALBARAN').AsInteger := AID;
+
+    tbl_Cabecera.Active := True;
+    tbl_Detalles.Active := True;
+
+    frxReport.LoadFromFile(DarRutaInformes + rptInforme, True);
     frxReport.PrepareReport(False);
 
   finally

Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.pas

@@ -43,8 +43,7 @@ implementation
 uses
   {Generated:} FactuGES_Invk, uDataModuleServer, uDatabaseUtils,
   schAlbaranesClienteClient_Intf, uRestriccionesUsuarioUtils,
-//  uRptAlbaranesCliente_Server,
+  uRptAlbaranesCliente_Server, uBizAlbaranClienteServer;
-  uBizAlbaranClienteServer;
 
 procedure Create_srvAlbaranesCliente(out anInstance : IUnknown);
 begin
@@ -92,17 +91,15 @@ begin
 end;
 
 function TsrvAlbaranesCliente.GenerateReport(const ID: String): Binary;
-//var
+var
-//  AReportGenerator : TRptAlbaranesCliente;
+  AReportGenerator : TRptAlbaranesCliente;
 begin
-{
   AReportGenerator := TRptAlbaranesCliente.Create(nil);
   try
     Result := AReportGenerator.GenerarAlbaran(ID);
   finally
     FreeAndNIL(AReportGenerator);
   end;
-}  
 end;
 
 initialization

Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm

@@ -6,7 +6,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
   ClientWidth = 765
   OnClose = CustomEditorClose
   ExplicitWidth = 773
-  ExplicitHeight = 612
+  ExplicitHeight = 619
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -145,26 +145,30 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
     end
   end
   inherited pgPaginas: TPageControl
-    Width = 765
+    Width = 759
-    Height = 412
+    Height = 406
     TabOrder = 1
     OnChanging = pgPaginasChanging
-    ExplicitWidth = 765
+    ExplicitWidth = 759
-    ExplicitHeight = 412
+    ExplicitHeight = 406
     inherited pagGeneral: TTabSheet
       ExplicitLeft = 4
       ExplicitTop = 24
-      ExplicitWidth = 757
+      ExplicitWidth = 751
-      ExplicitHeight = 384
+      ExplicitHeight = 378
     end
     object pagContenido: TTabSheet
       Caption = 'Contenido'
       ImageIndex = 1
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       inline frViewDetallesAlbaranCliente1: TfrViewDetallesAlbaranCliente
         Left = 0
         Top = 0
-        Width = 757
+        Width = 751
-        Height = 384
+        Height = 378
         Align = alClient
         BiDiMode = bdLeftToRight
         Font.Charset = DEFAULT_CHARSET
@@ -176,23 +180,110 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         ParentFont = False
         TabOrder = 0
         ReadOnly = False
-        ExplicitWidth = 757
+        ExplicitWidth = 751
-        ExplicitHeight = 384
+        ExplicitHeight = 378
         inherited ToolBar1: TToolBar
-          Width = 757
+          Width = 751
-          ExplicitWidth = 757
+          Height = 46
+          ExplicitWidth = 751
+          ExplicitHeight = 46
+          inherited ToolButton3: TToolButton
+            Wrap = False
+          end
+          inherited ToolButton4: TToolButton
+            Left = 278
+            Top = 0
+            Wrap = True
+            ExplicitLeft = 278
+            ExplicitTop = 0
+          end
+          inherited ToolButton14: TToolButton
+            Left = 0
+            Wrap = False
+            ExplicitLeft = 0
+          end
+          inherited FontName: TJvFontComboBox
+            Left = 65
+            Top = 22
+            ExplicitLeft = 65
+            ExplicitTop = 22
+          end
+          inherited FontSize: TEdit
+            Left = 210
+            Top = 22
+            ExplicitLeft = 210
+            ExplicitTop = 22
+          end
+          inherited UpDown1: TUpDown
+            Left = 252
+            Top = 22
+            ExplicitLeft = 252
+            ExplicitTop = 22
+          end
+          inherited ToolButton13: TToolButton
+            Left = 269
+            Top = 22
+            ExplicitLeft = 269
+            ExplicitTop = 22
+          end
+          inherited ToolButton6: TToolButton
+            Left = 277
+            Top = 22
+            ExplicitLeft = 277
+            ExplicitTop = 22
+          end
+          inherited ToolButton7: TToolButton
+            Left = 343
+            Top = 22
+            ExplicitLeft = 343
+            ExplicitTop = 22
+          end
+          inherited ToolButton8: TToolButton
+            Left = 410
+            Top = 22
+            ExplicitLeft = 410
+            ExplicitTop = 22
+          end
+          inherited ToolButton12: TToolButton
+            Left = 493
+            Top = 22
+            ExplicitLeft = 493
+            ExplicitTop = 22
+          end
+          inherited ToolButton9: TToolButton
+            Left = 501
+            Top = 22
+            ExplicitLeft = 501
+            ExplicitTop = 22
+          end
+          inherited ToolButton10: TToolButton
+            Left = 646
+            Top = 22
+            ExplicitLeft = 646
+            ExplicitTop = 22
+          end
+          inherited ToolButton11: TToolButton
+            Left = 771
+            Top = 22
+            ExplicitLeft = 771
+            ExplicitTop = 22
+          end
         end
         inherited cxGrid: TcxGrid
-          Width = 757
+          Top = 72
-          Height = 312
+          Width = 751
-          ExplicitWidth = 757
+          Height = 306
-          ExplicitHeight = 312
+          ExplicitTop = 72
+          ExplicitWidth = 751
+          ExplicitHeight = 306
         end
         inherited TBXDock1: TTBXDock
-          Width = 757
+          Top = 46
+          Width = 751
+          ExplicitTop = 51
           ExplicitWidth = 757
           inherited TBXToolbar1: TTBXToolbar
-            ExplicitWidth = 548
+            ExplicitWidth = 626
           end
         end
       end
@@ -200,11 +291,15 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
     object pagInicidencias: TTabSheet
       Caption = 'Incidencias'
       ImageIndex = 2
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
       inline frViewIncidenciasCli: TfrViewIncidencias
         Left = 0
         Top = 0
-        Width = 757
+        Width = 751
-        Height = 384
+        Height = 378
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -214,20 +309,20 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
         ParentFont = False
         TabOrder = 0
         ReadOnly = False
-        ExplicitWidth = 757
+        ExplicitWidth = 751
-        ExplicitHeight = 384
+        ExplicitHeight = 378
         inherited pnlSup: TPanel
-          Width = 757
+          Width = 751
           ExplicitWidth = 757
           inherited eIncidenciaActiva: TcxDBCheckBox
             ExplicitHeight = 21
           end
         end
         inherited GroupBox1: TGroupBox
-          Width = 757
+          Width = 751
-          Height = 356
+          Height = 350
-          ExplicitWidth = 757
+          ExplicitWidth = 751
-          ExplicitHeight = 356
+          ExplicitHeight = 350
           inherited eIncidencias: TcxDBMemo
             ExplicitWidth = 734
             ExplicitHeight = 323

Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas

@@ -220,11 +220,8 @@ end;
 
 procedure TfEditorAlbaranCliente.ImprimirInterno;
 begin
-AppFactuGES.ShowCapado;
-{
   inherited;
   FController.Print(FAlbaran);
-}  
 end;
 
 procedure TfEditorAlbaranCliente.OnClienteChanged(Sender: TObject);
@@ -320,11 +317,8 @@ end;
 
 procedure TfEditorAlbaranCliente.PrevisualizarInterno;
 begin
-AppFactuGES.ShowCapado;
-{
   inherited;
   FController.Preview(FAlbaran);
-  }
 end;
 
 procedure TfEditorAlbaranCliente.RecalcularPortePorUnidad;

Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.dfm

@@ -134,7 +134,7 @@ inherited fEditorAlbaranesCliente: TfEditorAlbaranesCliente
     end
     inherited TBXTMain2: TTBXToolbar
       Visible = True
-      ExplicitWidth = 246
+      ExplicitWidth = 129
       object TBXItem42: TTBXItem
         Action = actEnviar
         DisplayMode = nbdmImageAndText
@@ -188,28 +188,36 @@ inherited fEditorAlbaranesCliente: TfEditorAlbaranesCliente
     object actEnviar: TAction
       Category = 'Acciones'
       Caption = 'Enviar albar'#225'n...'
+      Enabled = False
       ImageIndex = 23
+      Visible = False
       OnExecute = actEnviarExecute
       OnUpdate = actEnviarUpdate
     end
     object actCancelarEnvio: TAction
       Category = 'Acciones'
       Caption = 'Cancelar envio'
+      Enabled = False
       ImageIndex = 23
+      Visible = False
       OnExecute = actCancelarEnvioExecute
       OnUpdate = actCancelarEnvioUpdate
     end
     object actConfirmarRecepcion: TAction
       Category = 'Acciones'
       Caption = 'Confirmar recepcion'
+      Enabled = False
       ImageIndex = 23
+      Visible = False
       OnExecute = actConfirmarRecepcionExecute
       OnUpdate = actConfirmarRecepcionUpdate
     end
     object actGenerarEtiquetas: TAction
       Category = 'Acciones'
       Caption = 'Generar etiquetas'
+      Enabled = False
       ImageIndex = 23
+      Visible = False
       OnExecute = actGenerarEtiquetasExecute
       OnUpdate = actGenerarEtiquetasUpdate
     end

Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas

@@ -184,9 +184,9 @@ end;
 
 procedure TfEditorAlbaranesCliente.actGenerarFacturaExecute(Sender: TObject);
 begin
-AppFactuGES.ShowCapado;
+  AppFactuGES.ShowCapado;
-//  GenerarFacturaCli(Albaranes.ID);
+  {GenerarFacturaCli(Albaranes.ID);
-//  actRefrescar.Execute;
+  actRefrescar.Execute;}
 end;
 
 procedure TfEditorAlbaranesCliente.actGenerarFacturaUpdate(Sender: TObject);
@@ -292,8 +292,6 @@ procedure TfEditorAlbaranesCliente.DuplicarInterno;
 var
   APedido : IBizAlbaranCliente;
 begin
-AppFactuGES.ShowCapado;
-{
   inherited;
   APedido := FController.Duplicar(Albaranes);
   try
@@ -301,7 +299,6 @@ AppFactuGES.ShowCapado;
   finally
     actRefrescar.Execute;
   end;
-}  
 end;
 
 procedure TfEditorAlbaranesCliente.EliminarInterno;
@@ -384,8 +381,7 @@ var
   AllItems: Boolean;
 
 begin
-AppFactuGES.ShowCapado;
+
-{
   AAlbaranes := Nil;
   AllItems := False;
 
@@ -418,8 +414,7 @@ AppFactuGES.ShowCapado;
                 end;
       end;
     end;
-  end;
+  end; 
-}  
 end;
 
 procedure TfEditorAlbaranesCliente.ModificarInterno;
@@ -471,8 +466,6 @@ var
   AAlbaranes: IBizAlbaranCliente;
   AllItems: Boolean;
 begin
-AppFactuGES.ShowCapado;
-{
   AAlbaranes := Nil;
   AllItems := False;
 
@@ -506,7 +499,6 @@ AppFactuGES.ShowCapado;
       end;
     end;
   end;
-}  
 end;
 
 procedure TfEditorAlbaranesCliente.SetController(const Value: IAlbaranesClienteController);

Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesClienteReport.dfm

@@ -1,12 +1,5 @@
 inherited fEditorAlbaranesClientePreview: TfEditorAlbaranesClientePreview
   Caption = 'Previsualizar el albar'#225'n de cliente'
-  ExplicitWidth = 660
-  ExplicitHeight = 494
   PixelsPerInch = 96
   TextHeight = 13
-  inherited frxReport1: TfrxReport
-    Datasets = <>
-    Variables = <>
-    Style = <>
-  end
 end

Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesClienteReport.pas

@@ -12,7 +12,7 @@ uses
   ExtCtrls, JvExControls, JvComponent, JvNavigationPane, uIEditorAlbaranesClientePreview,
   JvExComCtrls, JvStatusBar, frxDMPExport, frxGradient, frxChBox, frxCross,
   frxRich, frxOLE, frxBarcode, JvAppStorage, JvAppRegistryStorage,
-  JvComponentBase;
+  JvComponentBase, frxExportText, frxExportRTF, frxExportMail, frxExportXLS;
 
 type
   TfEditorAlbaranesClientePreview = class(TfEditorPreview, IEditorAlbaranesClientePreview)

Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesDevCliente.dfm

@@ -1,7 +1,5 @@
 inherited fEditorAlbaranesDevCliente: TfEditorAlbaranesDevCliente
   Caption = 'Lista de '#243'rdenes de devoluci'#243'n a cliente'
-  ExplicitWidth = 320
-  ExplicitHeight = 478
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -128,12 +126,6 @@ inherited fEditorAlbaranesDevCliente: TfEditorAlbaranesDevCliente
   inherited TBXDock: TTBXDock
     inherited TBXTMain2: TTBXToolbar
       ExplicitWidth = 124
-      inherited TBXItem43: TTBXItem
-        Visible = False
-      end
-      inherited TBXItem44: TTBXItem
-        Visible = False
-      end
     end
   end
   inherited EditorActionList: TActionList
@@ -143,13 +135,6 @@ inherited fEditorAlbaranesDevCliente: TfEditorAlbaranesDevCliente
     inherited actGenerarFactura: TAction
       Caption = 'Generar abono...'
     end
-    inherited actEnviar: TAction
-      Visible = False
-    end
-    inherited actGenerarEtiquetas: TAction
-      Enabled = False
-      Visible = False
-    end
   end
   inherited SmallImages: TPngImageList
     PngImages = <

Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm

@@ -615,6 +615,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
           AutoAligns = []
           AlignHorz = ahClient
           Caption = 'Direcci'#243'n de entrega'
+          Visible = False
           object dxLayoutControl1Item8: TdxLayoutItem
             Caption = 'Calle:'
             Control = eCalle
@@ -670,6 +671,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
         end
         object dxLayoutControl1Group11: TdxLayoutGroup
           Caption = 'Almac'#233'n de origen'
+          Visible = False
           object dxLayoutControl1Group10: TdxLayoutGroup
             ShowCaption = False
             Hidden = True
@@ -715,6 +717,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
         end
         object dxLayoutControl1Group12: TdxLayoutGroup
           Caption = 'Fechas de envio y recepci'#243'n'
+          Visible = False
           object dxLayoutControl1Item24: TdxLayoutItem
             AutoAligns = [aaVertical]
             AlignHorz = ahClient

Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.dfm

@@ -73,6 +73,10 @@ inherited frViewAlbaranDevCliente: TfrViewAlbaranDevCliente
       ExplicitWidth = 32
       Width = 32
     end
+    inherited eFechaRecepcion: TcxDBDateEdit
+      ExplicitWidth = 123
+      Width = 123
+    end
     inherited cbAlmacen: TcxDBLookupComboBox
       ExplicitWidth = 69
       Width = 69
@@ -81,13 +85,22 @@ inherited frViewAlbaranDevCliente: TfrViewAlbaranDevCliente
       ExplicitWidth = 207
       Width = 207
     end
+    inherited eFechaPrevista: TcxDBDateEdit
+      ExplicitWidth = 122
+      Width = 122
+    end
+    inherited eRefCliente: TcxDBTextEdit
+      ExplicitWidth = 284
+      Width = 284
+    end
+    inherited eFechaEnvio: TcxDBDateEdit
+      ExplicitWidth = 217
+      Width = 217
+    end
     inherited dxLayoutControl1Group_Root: TdxLayoutGroup
       inherited dxLayoutControl1Group6: TdxLayoutGroup
         inherited dxLayoutControl1Group1: TdxLayoutGroup
           Caption = 'Datos de la orden'
-          inherited dxLayoutControl1Item3: TdxLayoutItem
-            Caption = 'Referencia:'
-          end
           inherited dxLayoutControl1Item2: TdxLayoutItem
             Caption = 'Fecha de orden:'
           end
@@ -102,9 +115,6 @@ inherited frViewAlbaranDevCliente: TfrViewAlbaranDevCliente
             end
           end
         end
-        inherited dxLayoutControl1Group8: TdxLayoutGroup
-          Visible = False
-        end
         inherited dxLayoutControl1Group11: TdxLayoutGroup
           Caption = 'Almac'#233'n de entrada'
           inherited dxLayoutControl1Group10: TdxLayoutGroup
@@ -117,11 +127,6 @@ inherited frViewAlbaranDevCliente: TfrViewAlbaranDevCliente
           end
         end
       end
-      inherited dxLayoutControl1Group3: TdxLayoutGroup
-        inherited dxLayoutControl1Group12: TdxLayoutGroup
-          Visible = False
-        end
-      end
     end
   end
 end

Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.pas

@@ -8,7 +8,7 @@ uses
   dxLayoutControl, StdCtrls, cxDropDownEdit, cxLookupEdit, cxDBLookupEdit,
   cxDBLookupComboBox, cxTextEdit, Buttons, uCustomView, uViewBase,
   uViewDatosYSeleccionCliente, cxDBEdit, cxMemo, cxContainer, cxEdit,
-  cxMaskEdit, cxCalendar, cxControls;
+  cxMaskEdit, cxCalendar, cxControls, uDAInterfaces;
 
 type
   TfrViewAlbaranDevCliente = class(TfrViewAlbaranCliente)

Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm

@@ -67,7 +67,9 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
       end
       object cxGridViewSITUACION: TcxGridDBColumn
         DataBinding.FieldName = 'SITUACION'
+        Visible = False
         BestFitMaxWidth = 45
+        VisibleForCustomization = False
         Width = 65
       end
       object cxGridViewFECHA_ALBARAN: TcxGridDBColumn
@@ -80,7 +82,6 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
       object cxGridViewNOMBRE: TcxGridDBColumn
         Caption = 'Cliente'
         DataBinding.FieldName = 'NOMBRE'
-        BestFitMaxWidth = 120
         Width = 119
       end
       object cxGridViewREF_PEDIDO: TcxGridDBColumn
@@ -90,17 +91,23 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
       end
       object cxGridViewFECHA_PREVISTA_ENVIO: TcxGridDBColumn
         DataBinding.FieldName = 'FECHA_PREVISTA_ENVIO'
+        Visible = False
         BestFitMaxWidth = 45
+        VisibleForCustomization = False
         Width = 45
       end
       object cxGridViewFECHA_ENVIO: TcxGridDBColumn
         DataBinding.FieldName = 'FECHA_ENVIO'
+        Visible = False
         BestFitMaxWidth = 45
+        VisibleForCustomization = False
         Width = 45
       end
       object cxGridViewFECHA_RECEPCION: TcxGridDBColumn
         DataBinding.FieldName = 'FECHA_RECEPCION'
+        Visible = False
         BestFitMaxWidth = 45
+        VisibleForCustomization = False
         Width = 45
       end
       object cxGridViewREF_FACTURA: TcxGridDBColumn
@@ -110,32 +117,40 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
       end
       object cxGridViewNOMBRE_ALMACEN: TcxGridDBColumn
         DataBinding.FieldName = 'NOMBRE_ALMACEN'
+        Visible = False
+        VisibleForCustomization = False
         Width = 63
       end
       object cxGridViewCALLE: TcxGridDBColumn
         DataBinding.FieldName = 'CALLE'
         Visible = False
+        VisibleForCustomization = False
       end
       object cxGridViewCODIGO_POSTAL: TcxGridDBColumn
         DataBinding.FieldName = 'CODIGO_POSTAL'
         Visible = False
         BestFitMaxWidth = 45
+        VisibleForCustomization = False
       end
       object cxGridViewPOBLACION: TcxGridDBColumn
         DataBinding.FieldName = 'POBLACION'
         Visible = False
+        VisibleForCustomization = False
       end
       object cxGridViewPROVINCIA: TcxGridDBColumn
         DataBinding.FieldName = 'PROVINCIA'
         Visible = False
+        VisibleForCustomization = False
       end
       object cxGridViewPERSONA_CONTACTO: TcxGridDBColumn
         DataBinding.FieldName = 'PERSONA_CONTACTO'
         Visible = False
+        VisibleForCustomization = False
       end
       object cxGridViewTELEFONO: TcxGridDBColumn
         DataBinding.FieldName = 'TELEFONO'
         Visible = False
+        VisibleForCustomization = False
       end
       object cxGridViewIMPORTE_TOTAL: TcxGridDBColumn
         Caption = 'Importe total'
@@ -151,17 +166,21 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
     end
     object cxGridLevelPendientes: TcxGridLevel
       Caption = 'Pendientes'
+      Visible = False
     end
     object cxGridLevelEnviados: TcxGridLevel
       Caption = 'Enviados'
+      Visible = False
     end
     object cxGridLevelServidos: TcxGridLevel
       Caption = 'Servidos'
+      Visible = False
     end
     object cxGridLevelProximosAEnviar: TcxGridLevel
       Caption = 'Pasados de fecha'
       Options.DetailFrameColor = clNone
       Options.DetailFrameWidth = 0
+      Visible = False
     end
   end
   inherited frViewFiltroBase1: TfrViewFiltroBase
@@ -172,6 +191,14 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
       inherited dxLayoutControl1: TdxLayoutControl
         Width = 596
         ExplicitWidth = 596
+        inherited txtFiltroTodo: TcxTextEdit
+          ExplicitWidth = 273
+          Width = 273
+        end
+        inherited edtFechaIniFiltro: TcxDateEdit
+          ExplicitWidth = 121
+          Width = 121
+        end
         inherited edtFechaFinFiltro: TcxDateEdit
           Left = 251
           ExplicitLeft = 251
@@ -195,7 +222,6 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
   end
   inherited pnlAgrupaciones: TTBXDockablePanel
     Top = 453
-    Visible = True
     ExplicitTop = 453
     ExplicitWidth = 596
     inherited TBXAlignmentPanel1: TTBXAlignmentPanel

Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas

@@ -12,7 +12,8 @@ uses
   uDADataTable, cxGridLevel, cxClasses, cxControls, cxGridCustomView, Classes,
   cxGrid,
   uBizAlbaranesCliente, cxCurrencyEdit, Forms, uViewFiltroBase, ComCtrls, Tabs,
-  cxPC, ActnList, TB2Item, TBX, TB2Dock, TB2Toolbar, TBXDkPanels, dxPgsDlg;
+  cxPC, ActnList, TB2Item, TBX, TB2Dock, TB2Toolbar, TBXDkPanels, dxPgsDlg,
+  uDAInterfaces;
 
 type
   IViewAlbaranesCliente = interface(IViewGrid)

Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesDevCliente.dfm

@@ -17,13 +17,9 @@ inherited frViewAlbaranesDevCliente: TfrViewAlbaranesDevCliente
           ExplicitWidth = 273
           Width = 273
         end
-        inherited edtFechaIniFiltro: TcxDateEdit
-          ExplicitWidth = 121
-          Width = 121
-        end
         inherited edtFechaFinFiltro: TcxDateEdit
-          ExplicitWidth = 121
+          ExplicitWidth = 217
-          Width = 121
+          Width = 217
         end
       end
     end

Source/Modulos/Albaranes de cliente/Views/uViewDetallesAlbaranCliente.dfm

@@ -1,12 +1,96 @@
 inherited frViewDetallesAlbaranCliente: TfrViewDetallesAlbaranCliente
+  inherited ToolBar1: TToolBar
+    Height = 95
+    ExplicitHeight = 95
+    inherited FontName: TJvFontComboBox [4]
+      Left = 56
+      Top = 22
+      ExplicitLeft = 56
+      ExplicitTop = 22
+    end
+    inherited ToolButton14: TToolButton [5]
+      Left = 201
+      Wrap = False
+      ExplicitLeft = 201
+    end
+    inherited FontSize: TEdit
+      Left = 266
+      Top = 22
+      ExplicitLeft = 266
+      ExplicitTop = 22
+    end
+    inherited UpDown1: TUpDown
+      Left = 308
+      Top = 22
+      ExplicitLeft = 308
+      ExplicitTop = 22
+    end
+    inherited ToolButton13: TToolButton
+      Left = 325
+      Top = 22
+      ExplicitLeft = 325
+      ExplicitTop = 22
+    end
+    inherited ToolButton11: TToolButton [9]
+      Left = 333
+      Top = 22
+      ExplicitLeft = 333
+      ExplicitTop = 22
+    end
+    inherited ToolButton12: TToolButton [10]
+      Left = 0
+      Top = 22
+      Wrap = True
+      ExplicitLeft = 0
+      ExplicitTop = 22
+      ExplicitHeight = 30
+    end
+    inherited ToolButton9: TToolButton [11]
+      Left = 0
+      Top = 52
+      ExplicitLeft = 0
+      ExplicitTop = 52
+    end
+    inherited ToolButton10: TToolButton [12]
+      Left = 145
+      Top = 52
+      ExplicitLeft = 145
+      ExplicitTop = 52
+    end
+    inherited ToolButton6: TToolButton [13]
+      Left = 270
+      Top = 52
+      ExplicitLeft = 270
+      ExplicitTop = 52
+    end
+    inherited ToolButton7: TToolButton [14]
+      Left = 336
+      Top = 52
+      Wrap = True
+      ExplicitLeft = 336
+      ExplicitTop = 52
+    end
+    inherited ToolButton8: TToolButton [15]
+      Left = 0
+      Top = 74
+      ExplicitLeft = 0
+      ExplicitTop = 74
+    end
+  end
   inherited cxGrid: TcxGrid
+    Top = 121
+    Height = 183
+    ExplicitTop = 121
+    ExplicitHeight = 183
     inherited cxGridView: TcxGridDBTableView
       inherited cxGridViewTIPO: TcxGridDBColumn
         Visible = False
-      end
+        VisibleForCustomization = False
-      inherited cxGridViewIMPORTEPORTE: TcxGridDBColumn
-        Visible = False
       end
     end
   end
+  inherited TBXDock1: TTBXDock
+    Top = 95
+    ExplicitTop = 95
+  end
 end