Se adaptan los albaranes de proveedor para que se pueda imprimir con o sin importes, y con o sin referencias de proveedor

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

RodaxSoftware.FactuGES.proj

@@ -134,9 +134,9 @@
      </PropertyGroup>
   
      <ItemGroup>
-		 		<FBBuildScriptFile Include="$(FBScriptFolder)\Build.fbp5" />
+		 		<FBBuildScriptFile Include="$(FBScriptFolder)\Build.fbp6" />
-		 		<FBInstallerScriptFile Include="$(FBScriptFolder)\Installer.fbp5" />
+		 		<FBInstallerScriptFile Include="$(FBScriptFolder)\Installer.fbp6" />
-				<FBFTPUploadScriptFile Include="$(FBScriptFolder)\UploadFTP.fbp5" />
+				<FBFTPUploadScriptFile Include="$(FBScriptFolder)\UploadFTP.fbp6" />
 		
         <SqlProjects Include="$(SqlFolder)\RodaxSoftware.FactuGES.Database.proj"/>
        

Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas

@@ -3,7 +3,7 @@ unit schEmpresasClient_Intf;
 interface
 
 uses
-  Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
 
 const
   { Data table rules ids
@@ -271,7 +271,7 @@ type
   end;
 
   { TEmpresasDataTableRules }
-  TEmpresasDataTableRules = class(TDADataTableRules, IEmpresas)
+  TEmpresasDataTableRules = class(TIntfObjectDADataTableRules, IEmpresas)
   private
     f_NOTAS: IROStrings;
     f_LOGOTIPO: IROStream;
@@ -524,7 +524,7 @@ type
   end;
 
   { TEmpresasDatosBancoDataTableRules }
-  TEmpresasDatosBancoDataTableRules = class(TDADataTableRules, IEmpresasDatosBanco)
+  TEmpresasDatosBancoDataTableRules = class(TIntfObjectDADataTableRules, IEmpresasDatosBanco)
   private
   protected
     { Property getters and setters }

Source/Modulos/Albaranes de proveedor/Controller/View/uIEditorAlbaranesProveedorPreview.pas

@@ -8,6 +8,13 @@ uses
 type
   IEditorAlbaranesProveedorPreview = interface(IEditorPreview)
   ['{7299A2C7-2D2D-49C7-A23C-28DBA150D276}']
+    procedure SetVerPrecios(const Value: Boolean);
+    function GetVerPrecios: Boolean;
+    property VerPrecios : Boolean read GetVerPrecios write SetVerPrecios;
+
+    function GetVerRefProveedor: Boolean;
+    procedure SetVerRefProveedor(const Value: Boolean);
+    property VerRefProveedor : Boolean read GetVerRefProveedor write SetVerRefProveedor;
   end;
 
 

Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorController.pas

@@ -59,8 +59,10 @@ type
     function EsModificable(AAlbaran: IBizAlbaranProveedor): Boolean;
     function EsEliminable(AAlbaran: IBizAlbaranProveedor): Boolean;
 
-    procedure Preview(AAlbaran : IBizAlbaranProveedor; AllItems: Boolean = false);
+    procedure Preview(AAlbaran : IBizAlbaranProveedor; AllItems: Boolean = false;
-    procedure Print(AAlbaran : IBizAlbaranProveedor; AllItems: Boolean = false);
+      const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
+    procedure Print(AAlbaran : IBizAlbaranProveedor; AllItems: Boolean = false;
+      const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
 
     function DarListaAnosAlbaranes: TStringList;
     procedure FiltrarAno(AAlbaran: IBizAlbaranProveedor; ADynWhereDataTable: WideString; const Ano: String);
@@ -138,8 +140,10 @@ type
     function EsModificable(AAlbaran: IBizAlbaranProveedor): Boolean;
     function EsEliminable(AAlbaran: IBizAlbaranProveedor): Boolean;
 
-    procedure Preview(AAlbaran : IBizAlbaranProveedor; AllItems: Boolean = false);
+    procedure Preview(AAlbaran : IBizAlbaranProveedor; AllItems: Boolean = false;
-    procedure Print(AAlbaran : IBizAlbaranProveedor; AllItems: Boolean = false);
+      const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
+    procedure Print(AAlbaran : IBizAlbaranProveedor; AllItems: Boolean = false;
+      const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
 
     function DarListaAnosAlbaranes: TStringList;
     procedure FiltrarAno(AAlbaran: IBizAlbaranProveedor; ADynWhereDataTable: WideString; const Ano: String);
@@ -1075,7 +1079,8 @@ begin
   Result := AAlbaran;
 end;
 
-procedure TAlbaranesProveedorController.Preview(AAlbaran: IBizAlbaranProveedor; AllItems: Boolean = false);
+procedure TAlbaranesProveedorController.Preview(AAlbaran: IBizAlbaranProveedor; AllItems: Boolean = false;
+  const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
 var
   AReportController : IAlbaranesProveedorReportController;
   ID_Albaranes: TIntegerList;
@@ -1101,14 +1106,15 @@ begin
     else
      ID_Albaranes.Add(AAlbaran.ID);
 
-    AReportController.Preview(ID_Albaranes);
+    AReportController.Preview(ID_Albaranes, VerPrecios, VerRefProveedor);
   finally
     AReportController := NIL;
     FreeANDNIL(ID_Albaranes)
   end;
 end;
 
-procedure TAlbaranesProveedorController.Print(AAlbaran: IBizAlbaranProveedor; AllItems: Boolean = false);
+procedure TAlbaranesProveedorController.Print(AAlbaran: IBizAlbaranProveedor; AllItems: Boolean = false;
+  const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
 var
   AReportController : IAlbaranesProveedorReportController;
   ID_Albaranes: TIntegerList;
@@ -1134,7 +1140,7 @@ begin
     else
      ID_Albaranes.Add(AAlbaran.ID);
 
-    AReportController.Print(ID_Albaranes);
+    AReportController.Print(ID_Albaranes, VerPrecios, VerRefProveedor);
   finally
     AReportController := NIL;
     FreeANDNIL(ID_Albaranes)

Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorReportController.pas

@@ -10,10 +10,14 @@ uses
 type
   IAlbaranesProveedorReportController = interface(IControllerBase)
   ['{11F9D087-C6BE-4401-AB13-4342025D62BB}']
-    procedure Preview(const AListaID : TIntegerList);
+    procedure Preview(const AListaID : TIntegerList;
-    procedure Print(const AListaID : TIntegerList);
+      const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
-    function ExportToWord(const AID: Integer; const AFileName : String = ''): Boolean;
+    procedure Print(const AListaID : TIntegerList;
-    function ExportToPDF(const AID: Integer; const AFileName : String = ''): Boolean;
+      const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
+    function ExportToWord(const AID: Integer; const AFileName : String = '';
+      const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
+    function ExportToPDF(const AID: Integer; const AFileName : String = '';
+      const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
   end;
 
   TAlbaranesProveedorReportController = class(TControllerBase, IAlbaranesProveedorReportController)
@@ -24,10 +28,14 @@ type
     constructor Create; override;
     destructor Destroy; override;
 
-    procedure Preview(const AListaID : TIntegerList);
+    procedure Preview(const AListaID : TIntegerList;
-    procedure Print(const AListaID : TIntegerList);
+      const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
-    function ExportToWord(const AID: Integer; const AFileName : String = ''): Boolean;
+    procedure Print(const AListaID : TIntegerList;
-    function ExportToPDF(const AID: Integer; const AFileName : String = ''): Boolean;
+      const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
+    function ExportToWord(const AID: Integer; const AFileName : String = '';
+      const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
+    function ExportToPDF(const AID: Integer; const AFileName : String = '';
+      const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
   end;
 
 
@@ -59,8 +67,8 @@ begin
   inherited;
 end;
 
-function TAlbaranesProveedorReportController.ExportToPDF(const AID: Integer;
+function TAlbaranesProveedorReportController.ExportToPDF(const AID: Integer; const AFileName : String = '';
-  const AFileName: String): Boolean;
+      const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
 var
   AStream: Binary;
 begin
@@ -70,7 +78,7 @@ begin
 
   ShowHourglassCursor;
   try
-    AStream := FDataModule.GetRptPDFAlbaran(AID);
+    AStream := FDataModule.GetRptPDFAlbaran(AID, VerPrecios, VerRefProveedor);
     try
       AStream.SaveToFile(AFileName);
       Result := True;
@@ -82,8 +90,8 @@ begin
   end;
 end;
 
-function TAlbaranesProveedorReportController.ExportToWord(const AID: Integer;
+function TAlbaranesProveedorReportController.ExportToWord(const AID: Integer; const AFileName : String = '';
-  const AFileName: String): Boolean;
+      const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True): Boolean;
 var
   AStream: Binary;
   AFile : String;
@@ -96,7 +104,7 @@ begin
 
   ShowHourglassCursor;
   try
-    AStream := FDataModule.GetRptWordAlbaran(AID);
+    AStream := FDataModule.GetRptWordAlbaran(AID, VerPrecios, VerRefProveedor);
     try
       AStream.SaveToFile(AFile);
       Result := True;
@@ -108,8 +116,8 @@ begin
   end;
 end;
 
-procedure TAlbaranesProveedorReportController.Preview(
+procedure TAlbaranesProveedorReportController.Preview(const AListaID: TIntegerList;
-  const AListaID: TIntegerList);
+      const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
 var
   AStream: Binary;
   AEditor : IEditorAlbaranesProveedorPreview;
@@ -118,7 +126,7 @@ begin
 
   ShowHourglassCursor;
   try
-    AStream := FDataModule.GetReport(AListaID);
+    AStream := FDataModule.GetReport(AListaID, VerPrecios, VerRefProveedor);
     try
       CreateEditor('EditorAlbaranesProveedorPreview', IEditorAlbaranesProveedorPreview, AEditor);
       if Assigned(AEditor) then
@@ -126,6 +134,8 @@ begin
         try
           AEditor.Controller := Self;
           AEditor.ListaID := AListaID;
+          AEditor.VerPrecios := VerPrecios;
+          AEditor.VerRefProveedor := VerRefProveedor;
           AEditor.Title := 'Albarán de proveedor - ' + AppFactuGES.EmpresaActiva.NOMBRE;
           AEditor.LoadFromStream(AStream);
           AEditor.Preview;
@@ -142,8 +152,8 @@ begin
   end;
 end;
 
-procedure TAlbaranesProveedorReportController.Print(
+procedure TAlbaranesProveedorReportController.Print(const AListaID: TIntegerList;
-  const AListaID: TIntegerList);
+      const VerPrecios: Boolean = True; const VerRefProveedor: Boolean = True);
 var
   AStream: Binary;
   AEditor : IEditorAlbaranesProveedorPreview;
@@ -152,7 +162,7 @@ begin
 
   ShowHourglassCursor;
   try
-    AStream := FDataModule.GetReport(AListaID);
+    AStream := FDataModule.GetReport(AListaID, VerPrecios, VerRefProveedor);
     try
       CreateEditor('EditorAlbaranesProveedorPreview', IEditorAlbaranesProveedorPreview, AEditor);
       if Assigned(AEditor) then
@@ -160,7 +170,9 @@ begin
         try
           AEditor.Controller := Self;
           AEditor.ListaID := AListaID;
-        AEditor.Title := 'Albarán de proveedor - ' + AppFactuGES.EmpresaActiva.NOMBRE;
+          AEditor.VerPrecios := VerPrecios;
+          AEditor.VerRefProveedor := VerRefProveedor;
+          AEditor.Title := 'Albarán de proveedor - ' + AppFactuGES.EmpresaActiva.NOMBRE;
           AEditor.LoadFromStream(AStream);
           AEditor.Print;
         finally

Source/Modulos/Albaranes de proveedor/Data/uDataModuleAlbaranesProveedor.dfm

@@ -14,12 +14,12 @@ inherited DataModuleAlbaranesProveedor: TDataModuleAlbaranesProveedor
     Top = 92
   end
   object rda_AlbaranesProveedor: TDARemoteDataAdapter
+    DataStreamer = Bin2DataStreamer
     GetSchemaCall.RemoteService = RORemoteService
     GetDataCall.RemoteService = RORemoteService
     UpdateDataCall.RemoteService = RORemoteService
     GetScriptsCall.RemoteService = RORemoteService
     RemoteService = RORemoteService
-    DataStreamer = Bin2DataStreamer
     Left = 51
     Top = 151
   end
@@ -300,8 +300,6 @@ inherited DataModuleAlbaranesProveedor: TDataModuleAlbaranesProveedor
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]
     RemoteDataAdapter = rda_AlbaranesProveedor
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'AlbaranesProveedor'
     IndexDefs = <>
     Left = 168
@@ -426,8 +424,6 @@ inherited DataModuleAlbaranesProveedor: TDataModuleAlbaranesProveedor
     MasterSource = ds_AlbaranesProveedor
     MasterFields = 'ID'
     DetailFields = 'ID_ALBARAN'
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'AlbaranesProveedor_Detalles'
     IndexDefs = <>
     Left = 328
@@ -450,8 +446,6 @@ inherited DataModuleAlbaranesProveedor: TDataModuleAlbaranesProveedor
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]
     RemoteDataAdapter = rda_AlbaranesProveedor
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'ListaAnosAlbaranes'
     IndexDefs = <>
     Left = 168

Source/Modulos/Albaranes de proveedor/Data/uDataModuleAlbaranesProveedor.pas

@@ -36,9 +36,12 @@ type
     function NewItem : IBizAlbaranProveedor;
 
     // Report
-    function GetReport(const ListaID: TIntegerList): Binary;
+    function GetReport(const ListaID: TIntegerList; const ImprimirPrecio: Boolean = True;
-    function GetRptWordAlbaran(const AID: Integer): Binary;
+      const ImprimirRefProveedor: Boolean = True): Binary;
-    function GetRptPDFAlbaran(const AID: Integer): Binary;
+    function GetRptWordAlbaran(const AID: Integer; const ImprimirPrecio: Boolean = True;
+      const ImprimirRefProveedor: Boolean = True): Binary;
+    function GetRptPDFAlbaran(const AID: Integer; const ImprimirPrecio: Boolean = True;
+      const ImprimirRefProveedor: Boolean = True): Binary;
 
     function GetAnosItems : TStringList;    
   end;
@@ -64,37 +67,43 @@ begin
   RORemoteService.Message := dmConexion.Message;
 end;
 
-function TDataModuleAlbaranesProveedor.GetReport(
+function TDataModuleAlbaranesProveedor.GetReport(const ListaID: TIntegerList;
-  const ListaID: TIntegerList): Binary;
+      const ImprimirPrecio: Boolean = True;
+      const ImprimirRefProveedor: Boolean = True): Binary;
 var
   AParam : TIntegerArray;
 begin
   AParam := ListaID.ToIntegerArray;
   try
-    Result := (RORemoteService as IsrvAlbaranesProveedor).GenerarInforme(AParam);
+    Result := (RORemoteService as IsrvAlbaranesProveedor).GenerarInforme(AParam,
+      ImprimirPrecio, ImprimirRefProveedor);
   finally
     FreeANDNil(AParam);
   end;
 end;
 
-function TDataModuleAlbaranesProveedor.GetRptPDFAlbaran(
+function TDataModuleAlbaranesProveedor.GetRptPDFAlbaran(const AID: Integer;
-  const AID: Integer): Binary;
+      const ImprimirPrecio: Boolean = True;
+      const ImprimirRefProveedor: Boolean = True): Binary;
 var
   AParam : TIntegerArray;
 begin
   AParam := TIntegerArray.Create;
   try
     AParam.Add(AID);
-    Result := (RORemoteService as IsrvAlbaranesProveedor).GenerarInformeEnPDF(AParam);
+    Result := (RORemoteService as IsrvAlbaranesProveedor).GenerarInformeEnPDF(AParam,
+      ImprimirPrecio, ImprimirRefProveedor);
   finally
     FreeANDNil(AParam);
   end;
 end;
 
-function TDataModuleAlbaranesProveedor.GetRptWordAlbaran(
+function TDataModuleAlbaranesProveedor.GetRptWordAlbaran(const AID: Integer;
-  const AID: Integer): Binary;
+      const ImprimirPrecio: Boolean = True;
+      const ImprimirRefProveedor: Boolean = True): Binary;
 begin
-  Result := (RORemoteService as IsrvAlbaranesProveedor).GenerarInformeEnWord(AID);
+  Result := (RORemoteService as IsrvAlbaranesProveedor).GenerarInformeEnWord(AID,
+      ImprimirPrecio, ImprimirRefProveedor);
 end;
 
 function TDataModuleAlbaranesProveedor.NewItem: IBizAlbaranProveedor;

Source/Modulos/Albaranes de proveedor/Model/Data/uIDataModuleAlbaranesProveedorReport.pas

@@ -8,9 +8,12 @@ uses
 type
   IDataModuleAlbaranesProveedorReport = interface
   ['{FC37B698-7FBF-4658-BBD0-CBD4F6891CDF}']
-    function GetReport(const ListaID: TIntegerList): Binary;
+    function GetReport(const ListaID: TIntegerList; const ImprimirPrecio: Boolean = True;
-    function GetRptWordAlbaran(const AID: Integer): Binary;
+      const ImprimirRefProveedor: Boolean = True): Binary;
-    function GetRptPDFAlbaran(const AID: Integer): Binary;
+    function GetRptWordAlbaran(const AID: Integer; const ImprimirPrecio: Boolean = True;
+      const ImprimirRefProveedor: Boolean = True): Binary;
+    function GetRptPDFAlbaran(const AID: Integer; const ImprimirPrecio: Boolean = True;
+      const ImprimirRefProveedor: Boolean = True): Binary;
   end;
 
 implementation

Source/Modulos/Albaranes de proveedor/Reports/uRptAlbaranesProveedor_Server.dfm

@@ -494,7 +494,7 @@ object RptAlbaranesProveedor: TRptAlbaranesProveedor
     Top = 16
   end
   object frxReport: TfrxReport
-    Version = '4.3'
+    Version = '4.7.71'
     DotMatrixReport = False
     EngineOptions.DoublePass = True
     IniFile = '\Software\Fast Reports'
@@ -582,6 +582,7 @@ object RptAlbaranesProveedor: TRptAlbaranesProveedor
       'end.')
     ShowProgress = False
     StoreInDFM = False
+    OnGetValue = frxReportGetValue
     OnStartReport = 'frxReportOnStartReport'
     Left = 145
     Top = 16
@@ -590,6 +591,7 @@ object RptAlbaranesProveedor: TRptAlbaranesProveedor
     UserName = 'frxDBCabecera'
     CloseDataSource = False
     DataSource = DADSCabecera
+    BCDToCurrency = False
     Left = 264
     Top = 16
   end
@@ -597,6 +599,7 @@ object RptAlbaranesProveedor: TRptAlbaranesProveedor
     UserName = 'frxDBDetalles'
     CloseDataSource = False
     DataSource = DADSDetalles
+    BCDToCurrency = False
     Left = 344
     Top = 16
   end
@@ -819,8 +822,6 @@ object RptAlbaranesProveedor: TRptAlbaranesProveedor
     RemoteFetchEnabled = False
     LocalSchema = schReport
     LocalDataStreamer = DABin2DataStreamer1
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'Informe_Cabecera'
     IndexDefs = <>
     Left = 264
@@ -889,8 +890,6 @@ object RptAlbaranesProveedor: TRptAlbaranesProveedor
     LocalSchema = schReport
     LocalDataStreamer = DABin2DataStreamer1
     DetailFields = 'ID_ALBARAN'
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'Informe_Detalles'
     IndexDefs = <>
     Left = 344
@@ -900,13 +899,21 @@ object RptAlbaranesProveedor: TRptAlbaranesProveedor
     ShowDialog = False
     UseFileCache = True
     ShowProgress = False
+    OverwritePrompt = False
     PrintOptimized = True
     Outline = False
+    Background = False
+    HTMLTags = True
     Author = 'FactuGES'
     Subject = 'FactuGES'
-    Background = False
     Creator = 'FactuGES'
-    HTMLTags = True
+    ProtectionFlags = [ePrint, eModify, eCopy, eAnnot]
+    HideToolbar = False
+    HideMenubar = False
+    HideWindowUI = False
+    FitWindow = False
+    CenterWindow = False
+    PrintScaling = False
     Left = 344
     Top = 304
   end

Source/Modulos/Albaranes de proveedor/Reports/uRptAlbaranesProveedor_Server.pas

@@ -46,13 +46,20 @@ type
     schReport: TDASchema;
     procedure DataModuleCreate(Sender: TObject);
     procedure DataModuleDestroy(Sender: TObject);
+    procedure frxReportGetValue(const VarName: string; var Value: Variant);
   private
     FConnection: IDAConnection;
+    FImprimirPrecio : Boolean;
+    FImprimirRefProveedor : Boolean;
     //Genera cada uno de los albaranes a imprimir
     procedure _GenerarAlbaran(const AID: Integer);
   public
-    function GenerarAlbaran(const AListaID : TIntegerArray): Binary;
+    function GenerarAlbaran(const AListaID : TIntegerArray;
-    function GenerarAlbaranEnPDF(const ListaID : TIntegerArray): Binary;
+      const ImprimirPrecio: Boolean = True;
+      const ImprimirRefProveedor: Boolean = True): Binary;
+    function GenerarAlbaranEnPDF(const ListaID : TIntegerArray;
+      const ImprimirPrecio: Boolean = True;
+      const ImprimirRefProveedor: Boolean = True): Binary;
   end;
 
 implementation
@@ -92,11 +99,24 @@ begin
     tbl_Detalles.Active := False;
 end;
 
-function TRptAlbaranesProveedor.GenerarAlbaran(const AListaID : TIntegerArray): Binary;
+procedure TRptAlbaranesProveedor.frxReportGetValue(const VarName: string;
+  var Value: Variant);
+begin
+  if VarName = 'ImprimirPrecio' then
+    Value := FImprimirPrecio;
+  if VarName = 'ImprimirRefProveedor' then
+    Value := FImprimirRefProveedor;
+end;
+
+function TRptAlbaranesProveedor.GenerarAlbaran(const AListaID : TIntegerArray;
+      const ImprimirPrecio: Boolean = True;
+      const ImprimirRefProveedor: Boolean = True): Binary;
 var
   i: Integer;
 begin
   Result := Binary.Create;
+  FImprimirPrecio := ImprimirPrecio;
+  FImprimirRefProveedor := ImprimirRefProveedor;
   try
     //Vamos generando todos y cada uno de los albaranes recibidos
     for i := 0 to AListaID.Count - 1 do
@@ -106,12 +126,15 @@ begin
   end;
 end;
 
-function TRptAlbaranesProveedor.GenerarAlbaranEnPDF(
+function TRptAlbaranesProveedor.GenerarAlbaranEnPDF(const ListaID: TIntegerArray;
-  const ListaID: TIntegerArray): Binary;
+      const ImprimirPrecio: Boolean = True;
+      const ImprimirRefProveedor: Boolean = True): Binary;
 var
   i: Integer;
 begin
   Result := Binary.Create;
+  FImprimirPrecio := ImprimirPrecio;
+  FImprimirRefProveedor := ImprimirRefProveedor;
   try
     //Vamos generando todos y cada uno de los presupuestos recibidos
     for i := 0 to ListaID.Count - 1 do

Source/Modulos/Albaranes de proveedor/Reports/uRptWordAlbaranProveedor.pas

@@ -29,6 +29,8 @@ type
     function RellenarDatosDetalle : Boolean;
     procedure _GenerarAlbaran(const AID: String);
   public
+    ImprimirPrecio : Boolean;
+    ImprimirRefProveedor : Boolean;
     function Exportar(Codigo, Fichero : String): Boolean;
     constructor Create (AOwner : TComponent); override;
     destructor Destroy; override;
@@ -50,6 +52,8 @@ const
 constructor TRptWordAlbaranProveedor.Create(AOwner: TComponent);
 begin
   inherited;
+  ImprimirPrecio := False;
+  ImprimirRefProveedor := False;
   FDocumento := NIL;
 end;
 
@@ -129,7 +133,8 @@ begin
     begin
         Rows.Item (iRowCount).Cells.Split (numRows, numCols, mergesplit);
 
-        Cell(iRowCount, 1).Range.Text := FieldByName('REFERENCIA_PROVEEDOR').AsString;
+        if ImprimirRefProveedor then
+          Cell(iRowCount, 1).Range.Text := FieldByName('REFERENCIA_PROVEEDOR').AsString;
 
         Cell(iRowCount, 2).Range.Text := FieldByName('REFERENCIA_FABRICANTE').AsString;
         Cell(iRowCount, 3).Range.Text := FieldByName('CONCEPTO').AsString;
@@ -143,15 +148,18 @@ begin
 
         Cell(iRowCount, 4).Range.Text := AText + ' ' + FieldByName('UNIDAD_MEDIDA').AsString;
 
-        if (FieldByName('IMPORTE_UNIDAD').AsFloat = 0) then
+        if ImprimirPrecio
-          Cell(iRowCount, 5).Range.Text := ''
+        and (FieldByName('IMPORTE_UNIDAD').AsFloat <> 0) then
+          Cell(iRowCount, 5).Range.Text := FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_UNIDAD').AsFloat)
         else
-          Cell(iRowCount, 5).Range.Text := FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_UNIDAD').AsFloat);
+          Cell(iRowCount, 5).Range.Text := '';
 
-        if (FieldByName('IMPORTE_TOTAL').AsFloat = 0) then
+        if ImprimirPrecio
-          Cell(iRowCount, 6).Range.Text := ''
+        and (FieldByName('IMPORTE_TOTAL').AsFloat <> 0) then
+          Cell(iRowCount, 6).Range.Text := FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_TOTAL').AsFloat)
         else
-          Cell(iRowCount, 6).Range.Text := FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_TOTAL').AsFloat);
+          Cell(iRowCount, 6).Range.Text := '';
+
         Next;
         Inc (iRowCount);
     end;
@@ -232,7 +240,10 @@ begin
     ReplaceBookmark('PersonaContactoProveedor', FieldByName('PERSONA_CONTACTO').AsString);
     ReplaceBookmark('CodigoClienteProveedor', FieldByName('CODIGO_CLIENTE').AsString);
 
-    ReplaceBookmark('ImporteTotal', FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_TOTAL').AsFloat));
+    if ImprimirPrecio then
+      ReplaceBookmark('ImporteTotal', FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_TOTAL').AsFloat))
+    else
+      ReplaceBookmark('ImporteTotal', '');
 
     ReplaceBookmark('NotasAlbaran', FieldByName('OBSERVACIONES').AsString);
 

Source/Modulos/Albaranes de proveedor/Servidor/srvAlbaranesProveedor_Impl.pas

@@ -32,9 +32,12 @@ type
     procedure DataAbstractServiceBeforeAcquireConnection(aSender: TObject;
       var aConnectionName: string);
   protected
-    function GenerarInforme(const ListaID: TIntegerArray): Binary;
+    function GenerarInforme(const ListaID: TIntegerArray;
-    function GenerarInformeEnWord(const ID: Integer): Binary;
+      const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary;
-    function GenerarInformeEnPDF(const ListaID: TIntegerArray): Binary;
+    function GenerarInformeEnWord(const ID: Integer;
+      const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary;
+    function GenerarInformeEnPDF(const ListaID: TIntegerArray;
+      const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary;
   end;
 
 
@@ -81,33 +84,36 @@ begin
   ConnectionName := dmServer.ConnectionName;
 end;
 
-function TsrvAlbaranesProveedor.GenerarInforme(
+function TsrvAlbaranesProveedor.GenerarInforme(const ListaID: TIntegerArray;
-  const ListaID: TIntegerArray): Binary;
+      const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary;
 var
   AReportGenerator : TRptAlbaranesProveedor;
 begin
   AReportGenerator := TRptAlbaranesProveedor.Create(nil);
   try
-    Result := AReportGenerator.GenerarAlbaran(ListaID);
+    Result := AReportGenerator.GenerarAlbaran(ListaID,
+      ImprimirPrecio, ImprimirRefProveedor);
   finally
     FreeAndNIL(AReportGenerator);
   end;
 end;
 
-function TsrvAlbaranesProveedor.GenerarInformeEnPDF(
+function TsrvAlbaranesProveedor.GenerarInformeEnPDF(const ListaID: TIntegerArray;
-  const ListaID: TIntegerArray): Binary;
+      const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary;
 var
   AReportGenerator : TRptAlbaranesProveedor;
 begin
   AReportGenerator := TRptAlbaranesProveedor.Create(nil);
   try
-    Result := AReportGenerator.GenerarAlbaranEnPDF(ListaID);
+    Result := AReportGenerator.GenerarAlbaranEnPDF(ListaID,
+      ImprimirPrecio, ImprimirRefProveedor);
   finally
     FreeAndNIL(AReportGenerator);
   end;
 end;
 
-function TsrvAlbaranesProveedor.GenerarInformeEnWord(const ID: Integer): Binary;
+function TsrvAlbaranesProveedor.GenerarInformeEnWord(const ID: Integer;
+      const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary;
 var
   AReportGenerator : TRptWordAlbaranProveedor;
   AFicheroTMP : TFileName;
@@ -116,6 +122,8 @@ begin
   AFicheroTMP := DarFicheroTemporal;
   AReportGenerator := TRptWordAlbaranProveedor.Create(nil);
   try
+    AReportGenerator.ImprimirPrecio := ImprimirPrecio;
+    AReportGenerator.ImprimirRefProveedor := ImprimirRefProveedor;
     if AReportGenerator.Exportar(IntToStr(ID), AFicheroTMP) then
     begin
       Result := Binary.Create;

Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.dpk

@@ -34,7 +34,9 @@ requires
   Almacenes_model,
   Almacenes_controller,
   AlbProv_FacProv_relation,
-  PedProv_AlbProv_relation;
+  PedProv_AlbProv_relation,
+  rtl,
+  vcl;
 
 contains
   uAlbaranesProveedorViewRegister in 'uAlbaranesProveedorViewRegister.pas',
@@ -53,6 +55,7 @@ contains
   uEditorAlbaranDevProveedor in 'uEditorAlbaranDevProveedor.pas' {fEditorAlbaranDevProveedor: TCustomEditor},
   uViewAlbaranesDevProveedor in 'uViewAlbaranesDevProveedor.pas' {frViewAlbaranesDevProveedor: TCustomView},
   uEditorAlbaranesProveedorReport in 'uEditorAlbaranesProveedorReport.pas' {fEditorAlbaranesProveedorReport: TEditorAlbaranesProveedorReport},
-  uViewDatosYSeleccionProveedorAlbaran in 'uViewDatosYSeleccionProveedorAlbaran.pas' {frViewDatosYSeleccionProveedorAlbaran: TCustomView};
+  uViewDatosYSeleccionProveedorAlbaran in 'uViewDatosYSeleccionProveedorAlbaran.pas' {frViewDatosYSeleccionProveedorAlbaran: TCustomView},
+  uDialogOpcionesImpresionAlbaranesProveedor in 'uDialogOpcionesImpresionAlbaranesProveedor.pas' {fDialogOpcionesImpresionAlbaranesProveedor: TfDialogOpcionesImpresionAlbaranesProveedor};
 
 end.

Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.dproj

@@ -59,7 +59,12 @@
     <DCCReference Include="Base.dcp" />
     <DCCReference Include="GUIBase.dcp" />
     <DCCReference Include="PedProv_AlbProv_relation.dcp" />
+    <DCCReference Include="rtl.dcp" />
     <DCCReference Include="uAlbaranesProveedorViewRegister.pas" />
+    <DCCReference Include="uDialogOpcionesImpresionAlbaranesProveedor.pas">
+      <Form>fDialogOpcionesImpresionAlbaranesProveedor</Form>
+      <DesignClass>TfEditorElegirAlbaranesProveedor</DesignClass>
+    </DCCReference>
     <DCCReference Include="uEditorAlbaranDevProveedor.pas">
       <Form>fEditorAlbaranDevProveedor</Form>
       <DesignClass>TCustomEditor</DesignClass>
@@ -109,7 +114,7 @@
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
     <DCCReference Include="uViewDatosYSeleccionProveedorAlbaran.pas">
-      <Form>fruViewDatosYSeleccionProveedorAlbaran</Form>
+      <Form>frViewDatosYSeleccionProveedorAlbaran</Form>
       <DesignClass>TCustomView</DesignClass>
     </DCCReference>
     <DCCReference Include="uViewDetallesAlbaranProveedor.pas">
@@ -124,6 +129,7 @@
       <Form>frViewElegirArticulosAlbaranesProveedor</Form>
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
+    <DCCReference Include="vcl.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line

Source/Modulos/Albaranes de proveedor/Views/uDialogOpcionesImpresionAlbaranesProveedor.dfm

@@ -0,0 +1,87 @@
+inherited fDialogOpcionesImpresionAlbaranesProveedor: TfDialogOpcionesImpresionAlbaranesProveedor
+  Caption = 'Opciones para albar'#225'n a proveedor'
+  ClientHeight = 239
+  ClientWidth = 393
+  ExplicitWidth = 399
+  ExplicitHeight = 271
+  PixelsPerInch = 96
+  TextHeight = 13
+  inherited Bevel2: TBevel
+    Width = 393
+    ExplicitWidth = 393
+  end
+  inherited Bevel3: TBevel
+    Top = 195
+    Width = 393
+    ExplicitTop = 195
+    ExplicitWidth = 393
+  end
+  inherited pnlBotones: TPanel
+    Top = 197
+    Width = 393
+    ExplicitTop = 197
+    ExplicitWidth = 393
+    inherited btnAceptar: TButton
+      Left = 229
+      ExplicitLeft = 229
+    end
+    inherited btnCancelar: TButton
+      Left = 308
+      ExplicitLeft = 308
+    end
+  end
+  inherited pnlHeader: TPanel
+    Width = 393
+    ExplicitWidth = 393
+    inherited lblInstruccion: TLabel
+      Width = 343
+      Margins.Bottom = 10
+      Caption = 'Indique las siguiente opciones para el albar'#225'n de proveedor:'
+      ExplicitWidth = 340
+    end
+    inherited Label2: TLabel
+      Top = 31
+      Width = 318
+      Height = 25
+      Visible = False
+      ExplicitTop = 31
+    end
+  end
+  inherited pnlCuerpo: TPanel
+    Width = 393
+    Height = 129
+    ExplicitWidth = 393
+    ExplicitHeight = 129
+    object cbVerPrecios: TCheckBox
+      AlignWithMargins = True
+      Left = 50
+      Top = 29
+      Width = 415
+      Height = 17
+      Caption = 'Mostrar los precios en los conceptos'
+      Checked = True
+      State = cbChecked
+      TabOrder = 0
+    end
+    object cbVerRefProveedor: TCheckBox
+      AlignWithMargins = True
+      Left = 50
+      Top = 52
+      Width = 441
+      Height = 17
+      Caption = 'Mostrar las referencias de proveedor de los conceptos'
+      Checked = True
+      State = cbChecked
+      TabOrder = 1
+    end
+  end
+  inherited ActionList1: TActionList
+    Top = 16
+    inherited actAceptar: TAction
+      OnExecute = actAceptarExecute
+    end
+    inherited actCancelar: TAction
+      OnExecute = actCancelarExecute
+    end
+  end
+end

Source/Modulos/Albaranes de proveedor/Views/uDialogOpcionesImpresionAlbaranesProveedor.pas

@@ -0,0 +1,59 @@
+unit uDialogOpcionesImpresionAlbaranesProveedor;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, uDialogBase, ActnList, StdCtrls, ExtCtrls;
+
+type
+  TfDialogOpcionesImpresionAlbaranesProveedor = class(TfDialogBase)
+    cbVerPrecios: TCheckBox;
+    cbVerRefProveedor: TCheckBox;
+    procedure actAceptarExecute(Sender: TObject);
+    procedure actCancelarExecute(Sender: TObject);
+  private
+    { Private declarations }
+  public
+    { Public declarations }
+  end;
+
+  function ElegirOpcionesImpresionAlbaranProveedor(var AVerPrecios : Boolean; var AVerRefProveedor : Boolean): Boolean;
+
+implementation
+
+{$R *.dfm}
+
+function ElegirOpcionesImpresionAlbaranProveedor(var AVerPrecios : Boolean; var AVerRefProveedor : Boolean): Boolean;
+var
+  AEditor : TfDialogOpcionesImpresionAlbaranesProveedor;
+begin
+  AEditor := TfDialogOpcionesImpresionAlbaranesProveedor.Create(NIL);
+  try
+    AEditor.cbVerPrecios.Checked := AVerPrecios;
+    AEditor.cbVerRefProveedor.Checked := AVerRefProveedor;
+
+    Result := (AEditor.ShowModal = mrOk);
+    if Result then
+    begin
+      AVerPrecios := AEditor.cbVerPrecios.Checked;
+      AVerRefProveedor := AEditor.cbVerRefProveedor.Checked;
+    end;
+  finally
+    AEditor.Release;
+  end;
+end;
+
+procedure TfDialogOpcionesImpresionAlbaranesProveedor.actAceptarExecute(Sender: TObject);
+begin
+  inherited;
+  ModalResult := mrOk
+end;
+
+procedure TfDialogOpcionesImpresionAlbaranesProveedor.actCancelarExecute(Sender: TObject);
+begin
+  inherited;
+  ModalResult := mrCancel;
+end;
+
+end.

Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.dfm

@@ -154,7 +154,7 @@ inherited fEditorAlbaranesProveedor: TfEditorAlbaranesProveedor
       Left = 427
       Visible = True
       ExplicitLeft = 427
-      ExplicitWidth = 117
+      ExplicitWidth = 179
       object TBXItem41: TTBXItem
         Action = actGenerarDevolucion
         DisplayMode = nbdmImageAndText

Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedor.pas

@@ -73,7 +73,7 @@ implementation
 uses
   uDataModuleAlbaranesProveedor, uDataModuleUsuarios, uFactuGES_App,
   uGenerarFacturasProvAlbProvUtils,
-  uGenerarAlbaranesProvUtils,
+  uGenerarAlbaranesProvUtils, uDialogOpcionesImpresionAlbaranesProveedor,
   uEditorBase, schAlbaranesProveedorClient_Intf,
   uGridStatusUtils, uDBSelectionListUtils;
 
@@ -326,9 +326,15 @@ var
   Respuesta : Integer;
   AAlbaranes: IBizAlbaranProveedor;
   AllItems: Boolean;
+  FImprimirPrecios : Boolean;
+  FImprimirRefProveedor : Boolean;
+
 begin
   AAlbaranes := Nil;
   AllItems := False;
+  FImprimirPrecios := True;
+  FImprimirRefProveedor := True;
+  
 
   if MultiSelect and Assigned(ViewGrid) then
      AllItems :=  (ViewGrid.NumSeleccionados > 1);
@@ -354,8 +360,12 @@ begin
                   else
                     AAlbaranes := Albaranes;
 
+
                   if Assigned(AAlbaranes) then
-                     FController.Preview(AAlbaranes, AllItems);
+                  begin
+                    if ElegirOpcionesImpresionAlbaranProveedor(FImprimirPrecios, FImprimirRefProveedor) then
+                      FController.Preview(AAlbaranes, AllItems, FImprimirPrecios, FImprimirRefProveedor);
+                  end;
                 end;
       end;
     end;

Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedorReport.dfm

@@ -1,7 +1,5 @@
 inherited fEditorAlbaranesProveedorPreview: TfEditorAlbaranesProveedorPreview
   Caption = 'Previsualizar el albar'#225'n de proveedor'
-  ExplicitWidth = 320
-  ExplicitHeight = 240
   PixelsPerInch = 96
   TextHeight = 13
   inherited TBXDock: TTBXDock

Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranesProveedorReport.pas

@@ -16,9 +16,21 @@ type
   TfEditorAlbaranesProveedorPreview = class(TfEditorPreview, IEditorAlbaranesProveedorPreview)
     TBXItem58: TTBXItem;
     procedure actExportarRTFExecute(Sender: TObject);
+  private
+    FVerPrecios : Boolean;
+    FVerRefProveedor : Boolean;
+    function GetVerPrecios: Boolean;
+    function GetVerRefProveedor: Boolean;
+    procedure SetVerPrecios(const Value: Boolean);
+    procedure SetVerRefProveedor(const Value: Boolean);
+    { Private declarations }
+  public
+    property VerPrecios : Boolean read GetVerPrecios write SetVerPrecios;
+    property VerRefProveedor : Boolean read GetVerRefProveedor write SetVerRefProveedor;
   end;
 
 
+
 implementation
 {$R *.dfm}
 
@@ -35,9 +47,30 @@ begin
     raise Exception.Create('No se ha asignado el controlador necesario');
 
   for I := 0 to ListaID.Count - 1 do
-    if (Controller as IAlbaranesProveedorReportController).ExportToWord(ListaID[I], '') then
+    if (Controller as IAlbaranesProveedorReportController).ExportToWord(ListaID[I], '',
+      FVerPrecios, FVerRefProveedor) then
 	    ShowInfoMessage('El albarán de proveedor se ha exportado correctamente.');
 
 end;
 
+function TfEditorAlbaranesProveedorPreview.GetVerPrecios: Boolean;
+begin
+  Result := FVerPrecios;
+end;
+
+function TfEditorAlbaranesProveedorPreview.GetVerRefProveedor: Boolean;
+begin
+  Result := FVerRefProveedor;
+end;
+
+procedure TfEditorAlbaranesProveedorPreview.SetVerPrecios(const Value: Boolean);
+begin
+  FVerPrecios := Value;
+end;
+
+procedure TfEditorAlbaranesProveedorPreview.SetVerRefProveedor(const Value: Boolean);
+begin
+  FVerRefProveedor := Value;
+end;
+
 end.

Source/Modulos/Articulos/Plugin/Articulos_plugin.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/Contactos/Model/schContactosClient_Intf.pas

@@ -3,7 +3,7 @@ unit schContactosClient_Intf;
 interface
 
 uses
-  Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
 
 const
   { Data table rules ids
@@ -646,7 +646,7 @@ type
   end;
 
   { TContactosDataTableRules }
-  TContactosDataTableRules = class(TDADataTableRules, IContactos)
+  TContactosDataTableRules = class(TIntfObjectDADataTableRules, IContactos)
   private
     f_NOTAS: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);
@@ -820,7 +820,7 @@ type
   end;
 
   { TGruposClienteDataTableRules }
-  TGruposClienteDataTableRules = class(TDADataTableRules, IGruposCliente)
+  TGruposClienteDataTableRules = class(TIntfObjectDADataTableRules, IGruposCliente)
   private
   protected
     { Property getters and setters }
@@ -909,7 +909,7 @@ type
   end;
 
   { TDatosBancariosDataTableRules }
-  TDatosBancariosDataTableRules = class(TDADataTableRules, IDatosBancarios)
+  TDatosBancariosDataTableRules = class(TIntfObjectDADataTableRules, IDatosBancarios)
   private
   protected
     { Property getters and setters }
@@ -1213,7 +1213,7 @@ type
   end;
 
   { TClientesDataTableRules }
-  TClientesDataTableRules = class(TDADataTableRules, IClientes)
+  TClientesDataTableRules = class(TIntfObjectDADataTableRules, IClientes)
   private
     f_NOTAS: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);
@@ -1686,7 +1686,7 @@ type
   end;
 
   { TProveedoresDataTableRules }
-  TProveedoresDataTableRules = class(TDADataTableRules, IProveedores)
+  TProveedoresDataTableRules = class(TIntfObjectDADataTableRules, IProveedores)
   private
     f_NOTAS: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);
@@ -2131,7 +2131,7 @@ type
   end;
 
   { TEmpleadosDataTableRules }
-  TEmpleadosDataTableRules = class(TDADataTableRules, IEmpleados)
+  TEmpleadosDataTableRules = class(TIntfObjectDADataTableRules, IEmpleados)
   private
     f_NOTAS: IROStrings;
     f_FORMACION_BASE: IROStrings;
@@ -2458,7 +2458,7 @@ type
   end;
 
   { TDireccionesContactoDataTableRules }
-  TDireccionesContactoDataTableRules = class(TDADataTableRules, IDireccionesContacto)
+  TDireccionesContactoDataTableRules = class(TIntfObjectDADataTableRules, IDireccionesContacto)
   private
     f_NOTAS: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);
@@ -2608,7 +2608,7 @@ type
   end;
 
   { TClientesDescuentosDataTableRules }
-  TClientesDescuentosDataTableRules = class(TDADataTableRules, IClientesDescuentos)
+  TClientesDescuentosDataTableRules = class(TIntfObjectDADataTableRules, IClientesDescuentos)
   private
   protected
     { Property getters and setters }
@@ -2673,7 +2673,7 @@ type
   end;
 
   { TGruposProveedorDataTableRules }
-  TGruposProveedorDataTableRules = class(TDADataTableRules, IGruposProveedor)
+  TGruposProveedorDataTableRules = class(TIntfObjectDADataTableRules, IGruposProveedor)
   private
   protected
     { Property getters and setters }
@@ -2720,7 +2720,7 @@ type
   end;
 
   { TGruposEmpleadoDataTableRules }
-  TGruposEmpleadoDataTableRules = class(TDADataTableRules, IGruposEmpleado)
+  TGruposEmpleadoDataTableRules = class(TIntfObjectDADataTableRules, IGruposEmpleado)
   private
   protected
     { Property getters and setters }
@@ -2880,7 +2880,7 @@ type
   end;
 
   { TContactos_RefreshDataTableRules }
-  TContactos_RefreshDataTableRules = class(TDADataTableRules, IContactos_Refresh)
+  TContactos_RefreshDataTableRules = class(TIntfObjectDADataTableRules, IContactos_Refresh)
   private
     f_NOTAS: IROStrings;
     procedure NOTAS_OnChange(Sender: TObject);
@@ -3036,7 +3036,7 @@ type
   end;
 
   { TContratosEmpleadosDataTableRules }
-  TContratosEmpleadosDataTableRules = class(TDADataTableRules, IContratosEmpleados)
+  TContratosEmpleadosDataTableRules = class(TIntfObjectDADataTableRules, IContratosEmpleados)
   private
   protected
     { Property getters and setters }
@@ -3071,7 +3071,7 @@ type
   end;
 
   { TDescripcionesProveedoresDataTableRules }
-  TDescripcionesProveedoresDataTableRules = class(TDADataTableRules, IDescripcionesProveedores)
+  TDescripcionesProveedoresDataTableRules = class(TIntfObjectDADataTableRules, IDescripcionesProveedores)
   private
   protected
     { Property getters and setters }
@@ -3160,7 +3160,7 @@ type
   end;
 
   { TPersonalContactoDataTableRules }
-  TPersonalContactoDataTableRules = class(TDADataTableRules, IPersonalContacto)
+  TPersonalContactoDataTableRules = class(TIntfObjectDADataTableRules, IPersonalContacto)
   private
   protected
     { Property getters and setters }

Source/Modulos/Inventario/Model/Inventario_model.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/Pedidos a proveedor/PedidosProveedor_Group.groupproj

@@ -12,6 +12,7 @@
     <Projects Include="..\Albaranes de cliente\Data\AlbaranesCliente_data.dproj" />
     <Projects Include="..\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.dproj" />
     <Projects Include="..\Albaranes de proveedor\Data\AlbaranesProveedor_data.dproj" />
+    <Projects Include="..\Albaranes de proveedor\Views\AlbaranesProveedor_view.dproj" />
     <Projects Include="..\Articulos\Controller\Articulos_controller.dproj" />
     <Projects Include="..\Articulos\Data\Articulos_data.dproj" />
     <Projects Include="..\Articulos\Views\Articulos_view.dproj" />
@@ -251,14 +252,23 @@
   <Target Name="Inventario_view:Make">
     <MSBuild Projects="..\Inventario\Views\Inventario_view.dproj" Targets="Make" />
   </Target>
+  <Target Name="AlbaranesProveedor_view">
+    <MSBuild Projects="..\Albaranes de proveedor\Views\AlbaranesProveedor_view.dproj" Targets="" />
+  </Target>
+  <Target Name="AlbaranesProveedor_view:Clean">
+    <MSBuild Projects="..\Albaranes de proveedor\Views\AlbaranesProveedor_view.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="AlbaranesProveedor_view:Make">
+    <MSBuild Projects="..\Albaranes de proveedor\Views\AlbaranesProveedor_view.dproj" Targets="Make" />
+  </Target>
   <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_controller;Contactos_view;Articulos_data;Articulos_controller;Articulos_view;PedidosProveedor_model;PedidosProveedor_data;PedidosProveedor_controller;AlbaranesProveedor_controller;Inventario_controller;PedProv_AlbProv_relation;FacturasProveedor_controller;PedProv_FacProv_relation;PedidosProveedor_view;PedidosProveedor_plugin;AlbaranesProveedor_data;AlbaranesCliente_data;FactuGES;FactuGES_Server;Inventario_data;Inventario_view" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_controller;Contactos_view;Articulos_data;Articulos_controller;Articulos_view;PedidosProveedor_model;PedidosProveedor_data;PedidosProveedor_controller;AlbaranesProveedor_controller;Inventario_controller;PedProv_AlbProv_relation;FacturasProveedor_controller;PedProv_FacProv_relation;PedidosProveedor_view;PedidosProveedor_plugin;AlbaranesProveedor_data;AlbaranesCliente_data;FactuGES;FactuGES_Server;Inventario_data;Inventario_view;AlbaranesProveedor_view" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;PedidosProveedor_model:Clean;PedidosProveedor_data:Clean;PedidosProveedor_controller:Clean;AlbaranesProveedor_controller:Clean;Inventario_controller:Clean;PedProv_AlbProv_relation:Clean;FacturasProveedor_controller:Clean;PedProv_FacProv_relation:Clean;PedidosProveedor_view:Clean;PedidosProveedor_plugin:Clean;AlbaranesProveedor_data:Clean;AlbaranesCliente_data:Clean;FactuGES:Clean;FactuGES_Server:Clean;Inventario_data:Clean;Inventario_view:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;PedidosProveedor_model:Clean;PedidosProveedor_data:Clean;PedidosProveedor_controller:Clean;AlbaranesProveedor_controller:Clean;Inventario_controller:Clean;PedProv_AlbProv_relation:Clean;FacturasProveedor_controller:Clean;PedProv_FacProv_relation:Clean;PedidosProveedor_view:Clean;PedidosProveedor_plugin:Clean;AlbaranesProveedor_data:Clean;AlbaranesCliente_data:Clean;FactuGES:Clean;FactuGES_Server:Clean;Inventario_data:Clean;Inventario_view:Clean;AlbaranesProveedor_view:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;PedidosProveedor_model:Make;PedidosProveedor_data:Make;PedidosProveedor_controller:Make;AlbaranesProveedor_controller:Make;Inventario_controller:Make;PedProv_AlbProv_relation:Make;FacturasProveedor_controller:Make;PedProv_FacProv_relation:Make;PedidosProveedor_view:Make;PedidosProveedor_plugin:Make;AlbaranesProveedor_data:Make;AlbaranesCliente_data:Make;FactuGES:Make;FactuGES_Server:Make;Inventario_data:Make;Inventario_view:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;PedidosProveedor_model:Make;PedidosProveedor_data:Make;PedidosProveedor_controller:Make;AlbaranesProveedor_controller:Make;Inventario_controller:Make;PedProv_AlbProv_relation:Make;FacturasProveedor_controller:Make;PedProv_FacProv_relation:Make;PedidosProveedor_view:Make;PedidosProveedor_plugin:Make;AlbaranesProveedor_data:Make;AlbaranesCliente_data:Make;FactuGES:Make;FactuGES_Server:Make;Inventario_data:Make;Inventario_view:Make;AlbaranesProveedor_view:Make" />
   </Target>
   <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
 </Project>

Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm

@@ -197,24 +197,22 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor
           Width = 243
         end
         inherited edtFechaFinFiltro: TcxDateEdit
-          Left = 347
+          Left = 271
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 347
+          ExplicitLeft = 271
           ExplicitWidth = 482
           Width = 482
         end
         inherited eLista: TcxComboBox
-          Left = 866
+          Left = 673
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 866
+          ExplicitLeft = 673
-          ExplicitWidth = 215
-          Width = 215
         end
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel

Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas

@@ -11,7 +11,8 @@ uses
   cxGridCustomPopupMenu, cxGridPopupMenu, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk,
   uDADataTable, cxGridLevel, cxClasses, cxControls, cxGridCustomView, Classes,
   cxGrid, uBizPedidosProveedor, cxCurrencyEdit, Forms, uViewFiltroBase, ActnList,
-  TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces;
+  TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces,
+  uCustomView, uViewBase;
     
 type
   IViewPedidosProveedor = interface(IViewGrid)

Source/Modulos/Recibos de cliente/Controller/RecibosCliente_controller.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/Recibos de cliente/Plugin/RecibosCliente_plugin.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/Recibos de proveedor/Plugin/RecibosProveedor_plugin.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/Relaciones/Presupuestos de cliente - Albaranes de cliente/PreCli_AlbCli_relation.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/Remesas de cliente/Controller/RemesasCliente_controller.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/Remesas de cliente/Data/RemesasCliente_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/Remesas de cliente/Model/RemesasCliente_model.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/Remesas de cliente/Views/RemesasCliente_view.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/Remesas de proveedor/Controller/RemesasProveedor_controller.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/Remesas de proveedor/Data/RemesasProveedor_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/Remesas de proveedor/Model/RemesasProveedor_model.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/Remesas de proveedor/Views/RemesasProveedor_view.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/Servicios/FactuGES.RODL

@@ -428,6 +428,10 @@
 </Parameter>
 <Parameter Name="ListaID" DataType="TIntegerArray" Flag="In" >
 </Parameter>
+<Parameter Name="ImprimirPrecio" DataType="Boolean" Flag="In" >
+</Parameter>
+<Parameter Name="ImprimirRefProveedor" DataType="Boolean" Flag="In" >
+</Parameter>
 </Parameters>
 </Operation>
 <Operation Name="GenerarInformeEnWord" UID="{42BF6C64-3ABC-4EE8-9D2B-E21948AAF33C}">
@@ -436,6 +440,10 @@
 </Parameter>
 <Parameter Name="ID" DataType="Integer" Flag="In" >
 </Parameter>
+<Parameter Name="ImprimirPrecio" DataType="Boolean" Flag="In" >
+</Parameter>
+<Parameter Name="ImprimirRefProveedor" DataType="Boolean" Flag="In" >
+</Parameter>
 </Parameters>
 </Operation>
 <Operation Name="GenerarInformeEnPDF" UID="{950DBECF-9C9A-4B46-B9FD-637BBEC925D5}">
@@ -444,6 +452,10 @@
 </Parameter>
 <Parameter Name="ListaID" DataType="TIntegerArray" Flag="In" >
 </Parameter>
+<Parameter Name="ImprimirPrecio" DataType="Boolean" Flag="In" >
+</Parameter>
+<Parameter Name="ImprimirRefProveedor" DataType="Boolean" Flag="In" >
+</Parameter>
 </Parameters>
 </Operation>
 </Operations>

Source/Servicios/FactuGES_Intf.pas

@@ -615,9 +615,9 @@ type
   { IsrvAlbaranesProveedor }
   IsrvAlbaranesProveedor = interface(IDataAbstractService)
     ['{66B71884-5CE4-4574-B825-60CDA956B628}']
-    function GenerarInforme(const ListaID: TIntegerArray): Binary;
+    function GenerarInforme(const ListaID: TIntegerArray; const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary;
-    function GenerarInformeEnWord(const ID: Integer): Binary;
+    function GenerarInformeEnWord(const ID: Integer; const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary;
-    function GenerarInformeEnPDF(const ListaID: TIntegerArray): Binary;
+    function GenerarInformeEnPDF(const ListaID: TIntegerArray; const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary;
   end;
 
   { CosrvAlbaranesProveedor }
@@ -630,9 +630,9 @@ type
   protected
     function __GetInterfaceName:string; override;
 
-    function GenerarInforme(const ListaID: TIntegerArray): Binary;
+    function GenerarInforme(const ListaID: TIntegerArray; const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary;
-    function GenerarInformeEnWord(const ID: Integer): Binary;
+    function GenerarInformeEnWord(const ID: Integer; const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary;
-    function GenerarInformeEnPDF(const ListaID: TIntegerArray): Binary;
+    function GenerarInformeEnPDF(const ListaID: TIntegerArray; const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary;
   end;
 
   { IsrvReferencias }
@@ -1993,12 +1993,14 @@ begin
   result := 'srvAlbaranesProveedor';
 end;
 
-function TsrvAlbaranesProveedor_Proxy.GenerarInforme(const ListaID: TIntegerArray): Binary;
+function TsrvAlbaranesProveedor_Proxy.GenerarInforme(const ListaID: TIntegerArray; const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary;
 begin
   try
     result := nil;
     __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInforme');
     __Message.Write('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
+    __Message.Write('ImprimirPrecio', TypeInfo(Boolean), ImprimirPrecio, []);
+    __Message.Write('ImprimirRefProveedor', TypeInfo(Boolean), ImprimirRefProveedor, []);
     __Message.Finalize;
 
     __TransportChannel.Dispatch(__Message);
@@ -2010,12 +2012,14 @@ begin
   end
 end;
 
-function TsrvAlbaranesProveedor_Proxy.GenerarInformeEnWord(const ID: Integer): Binary;
+function TsrvAlbaranesProveedor_Proxy.GenerarInformeEnWord(const ID: Integer; const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary;
 begin
   try
     result := nil;
     __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInformeEnWord');
     __Message.Write('ID', TypeInfo(Integer), ID, []);
+    __Message.Write('ImprimirPrecio', TypeInfo(Boolean), ImprimirPrecio, []);
+    __Message.Write('ImprimirRefProveedor', TypeInfo(Boolean), ImprimirRefProveedor, []);
     __Message.Finalize;
 
     __TransportChannel.Dispatch(__Message);
@@ -2027,12 +2031,14 @@ begin
   end
 end;
 
-function TsrvAlbaranesProveedor_Proxy.GenerarInformeEnPDF(const ListaID: TIntegerArray): Binary;
+function TsrvAlbaranesProveedor_Proxy.GenerarInformeEnPDF(const ListaID: TIntegerArray; const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary;
 begin
   try
     result := nil;
     __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInformeEnPDF');
     __Message.Write('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
+    __Message.Write('ImprimirPrecio', TypeInfo(Boolean), ImprimirPrecio, []);
+    __Message.Write('ImprimirRefProveedor', TypeInfo(Boolean), ImprimirRefProveedor, []);
     __Message.Finalize;
 
     __TransportChannel.Dispatch(__Message);

Source/Servicios/FactuGES_Invk.pas

@@ -1261,9 +1261,11 @@ begin
 end;
 
 procedure TsrvAlbaranesProveedor_Invoker.Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
-{ function GenerarInforme(const ListaID: TIntegerArray): Binary; }
+{ function GenerarInforme(const ListaID: TIntegerArray; const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary; }
 var
   ListaID: FactuGES_Intf.TIntegerArray;
+  ImprimirPrecio: Boolean;
+  ImprimirRefProveedor: Boolean;
   lResult: Binary;
   __lObjectDisposer: TROObjectDisposer;
 begin
@@ -1271,8 +1273,10 @@ begin
   lResult := nil;
   try
     __Message.Read('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
+    __Message.Read('ImprimirPrecio', TypeInfo(Boolean), ImprimirPrecio, []);
+    __Message.Read('ImprimirRefProveedor', TypeInfo(Boolean), ImprimirRefProveedor, []);
 
-    lResult := (__Instance as IsrvAlbaranesProveedor).GenerarInforme(ListaID);
+    lResult := (__Instance as IsrvAlbaranesProveedor).GenerarInforme(ListaID, ImprimirPrecio, ImprimirRefProveedor);
 
     __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvAlbaranesProveedor', 'GenerarInformeResponse');
     __Message.Write('Result', TypeInfo(Binary), lResult, []);
@@ -1291,17 +1295,21 @@ begin
 end;
 
 procedure TsrvAlbaranesProveedor_Invoker.Invoke_GenerarInformeEnWord(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
-{ function GenerarInformeEnWord(const ID: Integer): Binary; }
+{ function GenerarInformeEnWord(const ID: Integer; const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary; }
 var
   ID: Integer;
+  ImprimirPrecio: Boolean;
+  ImprimirRefProveedor: Boolean;
   lResult: Binary;
   __lObjectDisposer: TROObjectDisposer;
 begin
   lResult := nil;
   try
     __Message.Read('ID', TypeInfo(Integer), ID, []);
+    __Message.Read('ImprimirPrecio', TypeInfo(Boolean), ImprimirPrecio, []);
+    __Message.Read('ImprimirRefProveedor', TypeInfo(Boolean), ImprimirRefProveedor, []);
 
-    lResult := (__Instance as IsrvAlbaranesProveedor).GenerarInformeEnWord(ID);
+    lResult := (__Instance as IsrvAlbaranesProveedor).GenerarInformeEnWord(ID, ImprimirPrecio, ImprimirRefProveedor);
 
     __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvAlbaranesProveedor', 'GenerarInformeEnWordResponse');
     __Message.Write('Result', TypeInfo(Binary), lResult, []);
@@ -1319,9 +1327,11 @@ begin
 end;
 
 procedure TsrvAlbaranesProveedor_Invoker.Invoke_GenerarInformeEnPDF(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
-{ function GenerarInformeEnPDF(const ListaID: TIntegerArray): Binary; }
+{ function GenerarInformeEnPDF(const ListaID: TIntegerArray; const ImprimirPrecio: Boolean; const ImprimirRefProveedor: Boolean): Binary; }
 var
   ListaID: FactuGES_Intf.TIntegerArray;
+  ImprimirPrecio: Boolean;
+  ImprimirRefProveedor: Boolean;
   lResult: Binary;
   __lObjectDisposer: TROObjectDisposer;
 begin
@@ -1329,8 +1339,10 @@ begin
   lResult := nil;
   try
     __Message.Read('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
+    __Message.Read('ImprimirPrecio', TypeInfo(Boolean), ImprimirPrecio, []);
+    __Message.Read('ImprimirRefProveedor', TypeInfo(Boolean), ImprimirRefProveedor, []);
 
-    lResult := (__Instance as IsrvAlbaranesProveedor).GenerarInformeEnPDF(ListaID);
+    lResult := (__Instance as IsrvAlbaranesProveedor).GenerarInformeEnPDF(ListaID, ImprimirPrecio, ImprimirRefProveedor);
 
     __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvAlbaranesProveedor', 'GenerarInformeEnPDFResponse');
     __Message.Write('Result', TypeInfo(Binary), lResult, []);

Source/Servidor/FactuGES_Server.dproj

@@ -36,11 +36,6 @@
     <Borland.ProjectType />
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">8</VersionInfo><VersionInfo Name="Release">1</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.8.1.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.8.1.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 16 de marzo de 2010 17:45</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
-      
-      
-      
-      
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>

Source/Servidor/FactuGES_Server.rc

@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "1.8.1.0\0"
               VALUE "ProductVersion", "1.8.1.0\0"
-              VALUE "CompileDate", "martes, 16 de marzo de 2010 17:57\0"
+              VALUE "CompileDate", "viernes, 18 de junio de 2010 12:30\0"
          END
     END
     BLOCK "VarFileInfo"