From 64eb3f51c76634b47b71e7d399d17ab818ec234c Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Tue, 31 Mar 2015 08:49:04 +0000
Subject: [PATCH] Tarea #1382 - Poder imprimir los pedidos a proveedor

git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@620 f4e31baf-9722-1c47-927c-6f952f962d4b
---
 Source/Cliente/FactuGES.dpr                   |   1 +
 Source/Cliente/FactuGES.dproj                 |   6 +-
 Source/Cliente/FactuGES.rc                    |   8 +-
 Source/Cliente/FactuGES.res                   | Bin 172156 -> 171984 bytes
 Source/Informes/InfPedidoProveedor.fr3        |  44 ++
 .../Data/uDataModulePedidosProveedor.pas      |   2 +-
 .../Reports/uRptPedidosProveedor_Server.dfm   | 453 ++----------------
 .../Reports/uRptPedidosProveedor_Server.pas   |  14 +-
 .../Servidor/srvPedidosProveedor_Impl.pas     |  15 +-
 .../Views/uEditorPedidoProveedor.dfm          |  48 --
 .../Views/uEditorPedidoProveedor.pas          |   4 -
 .../Views/uEditorPedidosProveedor.dfm         |  12 -
 .../Views/uEditorPedidosProveedor.pas         |  31 +-
 Source/Servidor/FactuGES_Server.dpr           |   3 +-
 Source/Servidor/FactuGES_Server.dproj         |   6 +-
 Source/Servidor/FactuGES_Server.rc            |  10 +-
 Source/Servidor/FactuGES_Server.res           | Bin 23348 -> 23344 bytes
 17 files changed, 152 insertions(+), 505 deletions(-)
 create mode 100644 Source/Informes/InfPedidoProveedor.fr3

diff --git a/Source/Cliente/FactuGES.dpr b/Source/Cliente/FactuGES.dpr
index 26dad992..953a0006 100644
--- a/Source/Cliente/FactuGES.dpr
+++ b/Source/Cliente/FactuGES.dpr
@@ -1,6 +1,7 @@
 program FactuGES;
 
 uses
+  ExceptionLog,
   Forms,
   Windows,
   SysUtils,
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index 28779487..e70a0105 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -43,7 +43,7 @@
     <DCC_ResourcePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_ResourcePath>
     <DCC_ObjPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_ObjPath>
     <DCC_IncludePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_IncludePath>
-    <DCC_Define>DEBUG;</DCC_Define>
+    <DCC_Define>DEBUG;EUREKALOG;EUREKALOG_VER6</DCC_Define>
     <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
     <DCC_DebugVN>True</DCC_DebugVN>
     <DCC_MapFile>3</DCC_MapFile>
@@ -52,7 +52,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">4</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.6.4.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.6.4.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">5</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.6.5.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.6.5.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
       
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
@@ -81,7 +81,7 @@
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=6006
-Activate=0
+Activate=1
 Activate Handle=1
 Save Log File=1
 Foreground Tab=0
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index c0933948..45fc4a13 100644
--- a/Source/Cliente/FactuGES.rc
+++ b/Source/Cliente/FactuGES.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Factuges.ico"
 1 VERSIONINFO
-FILEVERSION 2,6,3,0
-PRODUCTVERSION 2,6,3,0
+FILEVERSION 2,6,5,0
+PRODUCTVERSION 2,6,5,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "2.6.3.0\0"
+              VALUE "FileVersion", "2.6.5.0\0"
               VALUE "InternalName", "FactuGES\0"
               VALUE "ProductName", "FactuGES\0"
-              VALUE "ProductVersion", "2.6.3.0\0"
+              VALUE "ProductVersion", "2.6.5.0\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index 754ab7399d621a7f9a1af9e06c7d277e3a7df64b..145d5389e91ba77bc3cab56dc7515e4556195a28 100644
GIT binary patch
delta 318
zcmex!fa}73u7(!IElezP>kS0Bco^V-k%5OnK!AaPkwJnXgB3)>c`OVJObikd5V;d<
z3=GV0UI!-w0}F$K0z_^F2Ll5uf(JB>jlsYGD#ypbz>eUlGQ=}*FgQ3sBsH8E7&sX`
zJRrP|5C#S=hJ*yD#wiR8+zbs3P?a1YhcYmHU}RuW0Mh^e3ji^Y0|W*P2oHT=oc?Go
zlZiSj&<RXHIaUUHuo{qaS%98H1p(7-=P@ZW>P%0Z#}q&P%{(RzM$_q{^O>xtUzpF7
L0Aw33VDbh43i~RC

delta 488
zcmY+9y-or_6otPT7lf6VEh#r4{x=kK#z@o{5>0IAVWS3!q6BTMpwNT|Fxdu{mItsk
zT3T9K+xZS8cxPvkc$3+glk;=We!jWWcenqjUbHjnd7hi&ZxlH^4-^@iDRW!o({w<S
z&s**z4ND2~8Dzo1_boTcKq^5#6G=-`EGFD4EGI~~HEOb`TsEZ7<^g1>R4f`)!KGfe
zXz~mz^!tf2V~WC1BR-hTJUL2UP-O8#LmhsPbZNtp3L=$~`?1EnOw#|EhI^4NsIM@H
zbZu)}c*QX-uDRq$&K>7;1$VfY?=3gh9==9;N0q{#NbmO6W7nyu8wBD!6kUgh*w>&b
vPCGVzp{t4_;6i+Dxw~A+w)t4?S(4F`y(W3y%%HaT;t3059Y~j_u|D|)H!wt<

diff --git a/Source/Informes/InfPedidoProveedor.fr3 b/Source/Informes/InfPedidoProveedor.fr3
new file mode 100644
index 00000000..5d395313
--- /dev/null
+++ b/Source/Informes/InfPedidoProveedor.fr3
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="39065,8724234954" ReportOptions.Description.Text="" ReportOptions.LastChange="42093,7229874074" ScriptLanguage="PascalScript" ScriptText.Text="procedure DatosEmpresaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  Cadena: String;&#13;&#10;begin&#13;&#10;  DatosEmpresa.Lines.Clear;&#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO_1_EMPRESA&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := 'TLF: ' + &#60;frxDBCabecera.&#34;TELEFONO_1_EMPRESA&#34;&#62;;&#13;&#10;  if (&#60;frxDBCabecera.&#34;FAX_EMPRESA&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := Cadena + ' FAX: ' + &#60;frxDBCabecera.&#34;FAX_EMPRESA&#34;&#62;;&#13;&#10;  DatosEmpresa.Lines.Add(Cadena);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure NombreEmpresaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  NombreEmpresa.Lines.Clear;&#13;&#10;  NombreEmpresa.Lines.Add(&#60;frxDBCabecera.&#34;NOMBRE_EMPRESA&#34;&#62;);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure DireccionEnvioOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ACadena : String;&#13;&#10;begin&#13;&#10;  ACadena := '';&#13;&#10;  DireccionEnvio.Lines.Clear;&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;NOMBRE_CLIENTE&#34;&#62; &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;NOMBRE_CLIENTE&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PERSONA_CONTACTO&#34;&#62; &#60;&#62; '') then&#13;&#10;     DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;PERSONA_CONTACTO&#34;&#62;);&#13;&#10;&#13;&#10;  DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; + ' ';&#13;&#10;  if (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := ACadena + &#60;frxDBCabecera.&#34;POBLACION&#34;&#62;;&#13;&#10;&#13;&#10;  if (ACadena &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(ACadena);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62;);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure PageHeader1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;    if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));&#13;&#10;end;&#13;&#10;&#13;&#10;procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure eImporteUnidadOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if &#60;ImprimirPrecio&#62; then&#13;&#10;  begin              &#13;&#10;     eImporteUnidad.Visible := True;  &#13;&#10;     lImporteUnidad.Visible := True;  &#13;&#10;     eImporteTotal.Visible := True;  &#13;&#10;     lImporteTotal.Visible := True;  &#13;&#10;     ImporteUnidad.Visible := True;  &#13;&#10;     ImporteTotal.Visible := True;           &#13;&#10;  end&#13;&#10;  else&#13;&#10;  begin              &#13;&#10;     eImporteUnidad.Visible := False;  &#13;&#10;     lImporteUnidad.Visible := False;  &#13;&#10;     eImporteTotal.Visible := False;  &#13;&#10;     lImporteTotal.Visible := False;  &#13;&#10;     ImporteUnidad.Visible := False;  &#13;&#10;     ImporteTotal.Visible := False;&#13;&#10;     eConcepto.Width := eConcepto.Width + eImporteTotal.Width + eImporteUnidad.Width;&#13;&#10;     Concepto.Width :=eConcepto.Width - 10;         &#13;&#10;  end&#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end.  " ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C14000000204E616D653D22546F74616C506167696E61732200010C0E000000204E616D653D22506167696E612200010C16000000204E616D653D22496D7072696D697250726563696F2200010C1C000000204E616D653D22496D7072696D697252656650726F766565646F722200010C14000000204E616D653D2253686F776C6F676F7469706F220000055374796C650100">
+  <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
+  <TfrxReportPage Name="Page1" PaperWidth="210" PaperHeight="297" PaperSize="9" LeftMargin="10" RightMargin="10" TopMargin="10" BottomMargin="10" ColumnWidth="0" ColumnPositions.Text="" HGuides.Text="" VGuides.Text="">
+    <TfrxMasterData Name="MasterData1" Height="24" Left="0" Top="308" Width="718,1107" ColumnWidth="0" ColumnGap="0" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" RowCount="0" Stretched="True">
+      <TfrxRichView Name="Concepto" ShiftMode="smWhenOverlapped" Left="1,5" Top="1,5" Width="438,5436" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataField="CONCEPTO" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" GapX="2" GapY="3" Wysiwyg="False" PropData="0852696368456469740A910000007B5C727466315C616E73695C616E7369637067313235325C64656666305C6465666C616E67333038327B5C666F6E7474626C7B5C66305C666E696C205461686F6D613B7D7D0D0A7B5C2A5C67656E657261746F72204D7366746564697420352E34312E31352E313531323B7D5C766965776B696E64345C7563315C706172645C66305C667331365C7061720D0A7D0D0A00"/>
+      <TfrxMemoView Name="MemoCampo2" Left="445" Top="1,5" Width="56,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%g" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;CANTIDAD&#34;]"/>
+      <TfrxMemoView Name="ImporteUnidad" Left="504" Top="2" Width="96,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;IMPORTE_UNIDAD&#34;]"/>
+      <TfrxMemoView Name="ImporteTotal" Left="606" Top="2" Width="109,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;IMPORTE_TOTAL&#34;]"/>
+    </TfrxMasterData>
+    <TfrxPageFooter Name="PageFooter1" Height="72,87953" Left="0" Top="392" Width="718,1107">
+      <TfrxLineView Name="Line4" Align="baCenter" Left="-0,94465" Top="0" Width="720" Height="0" ShowHint="False" Frame.Typ="4"/>
+    </TfrxPageFooter>
+    <TfrxPageHeader Name="PageHeader1" Height="232,44096685" Left="0" Top="16" Width="718,1107" OnBeforePrint="PageHeader1OnBeforePrint">
+      <TfrxMemoView Name="eConcepto" Align="baLeft" Left="0" Top="206,94094" Width="442,7" Height="26,45669291" ShowHint="False" Color="16777215" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" Frame.Typ="15" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Concepto"/>
+      <TfrxMemoView Name="Memo8" Align="baRight" Left="442,74273333" Top="206,94094" Width="59,25726667" Height="26,45669291" ShowHint="False" Color="16777215" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" Frame.Typ="15" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Cantidad"/>
+      <TfrxShapeView Name="Shape2" Left="357,60637" Top="72,22047" Width="360,69295" Height="122,95671" ShowHint="False" Color="16777215" Frame.Color="8421504"/>
+      <TfrxMemoView Name="NombreEmpresa" Left="0" Top="4,22047" Width="414,07885" Height="26,89765" OnBeforePrint="NombreEmpresaOnBeforePrint" ShowHint="False" Font.Charset="1" Font.Color="8421504" Font.Height="-19" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text=""/>
+      <TfrxMemoView Name="Memo7" Left="362,61441" Top="79,81107" Width="68,69295" Height="18,89765" ShowHint="False" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="Página nº:"/>
+      <TfrxMemoView Name="Memo12" Left="438,86642" Top="79,81107" Width="278,58287" Height="18,89765" ShowHint="False" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="[&#60;Pagina&#62;] / [&#60;TotalPaginas&#62;]"/>
+      <TfrxShapeView Name="Shape1" Left="0" Top="72,22047" Width="357,92125984" Height="122,96062016" ShowHint="False" Color="16777215" Frame.Color="8421504"/>
+      <TfrxMemoView Name="Memo10" Left="3,68491" Top="76,22047" Width="349,29159" Height="17,60637" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="DIRECCIÓN DESTINO:"/>
+      <TfrxMemoView Name="DatosEmpresa" Left="0" Top="36,22047" Width="414,07885" Height="26,89765" OnBeforePrint="DatosEmpresaOnBeforePrint" ShowHint="False" Font.Charset="1" Font.Color="8421504" Font.Height="-16" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text=""/>
+      <TfrxMemoView Name="Memo5" Left="362,61441" Top="101,35436" Width="98,92919" Height="18,67718" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="Nº pedido:"/>
+      <TfrxMemoView Name="Memo4" Left="362,61441" Top="130,89765" Width="72,47248" Height="18,67718" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="Proveedor:"/>
+      <TfrxMemoView Name="Memo11" Left="435,08689" Top="130,89765" Width="279,11812" Height="18,67718" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="[frxDBCabecera.&#34;NOMBRE&#34;]"/>
+      <TfrxMemoView Name="Memo3" Left="438,86642" Top="101,57483" Width="78,80303" Height="18,67718" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="[frxDBCabecera.&#34;REFERENCIA&#34;]"/>
+      <TfrxMemoView Name="DireccionEnvio" Left="4" Top="100,22047" Width="347,46475" Height="87,40483" OnBeforePrint="DireccionEnvioOnBeforePrint" ShowHint="False" StretchMode="smActualHeight" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text=""/>
+      <TfrxLineView Name="Line1" Left="718,5" Top="206,36222913" Width="0" Height="768,8947" ShowHint="False" Frame.Typ="1"/>
+      <TfrxLineView Name="Line2" Left="0" Top="206,36222913" Width="0" Height="768,8947" ShowHint="False" Frame.Typ="1"/>
+      <TfrxLineView Name="Line3" Align="baLeft" Left="0" Top="206,36222913" Width="0" Height="768,8947" ShowHint="False" Frame.Typ="1"/>
+      <TfrxLineView Name="Line5" Align="baLeft" Left="442,7" Top="206,36222913" Width="0" Height="768,8947" ShowHint="False" Frame.Typ="1"/>
+      <TfrxMemoView Name="Memo2" Left="365,92115" Top="18,89765" Width="347,93723" Height="38,89765" ShowHint="False" Font.Charset="1" Font.Color="8421504" Font.Height="-29" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" Text="PEDIDO A PROVEEDOR"/>
+      <TfrxMemoView Name="Memo1" Left="521,57514" Top="102,04731" Width="46,01577" Height="18,67718" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="Fecha:"/>
+      <TfrxMemoView Name="Memo6" Left="570,70903" Top="102,04731" Width="143,05504" Height="18,67718" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" HideZeros="True" ParentFont="False" Text="[frxDBCabecera.&#34;FECHA_PEDIDO&#34;]"/>
+      <TfrxMemoView Name="Memo9" Left="362,83488" Top="154,96073" Width="30,89765" Height="18,67718" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="Fax:"/>
+      <TfrxMemoView Name="Memo15" Left="396,85065" Top="154,96073" Width="316,91342" Height="18,67718" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="[frxDBCabecera.&#34;FAX&#34;]"/>
+      <TfrxMemoView Name="eImporteUnidad" Left="502" Top="207" Width="101,25726667" Height="26,45669291" OnBeforePrint="eImporteUnidadOnBeforePrint" ShowHint="False" Color="16777215" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" Frame.Typ="15" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Importe coste"/>
+      <TfrxMemoView Name="eImporteTotal" Left="603" Top="207" Width="115,25726667" Height="26,45669291" ShowHint="False" Color="16777215" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" Frame.Typ="15" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Importe total"/>
+      <TfrxLineView Name="lImporteUnidad" Left="502" Top="207" Width="0" Height="768,8947" ShowHint="False" Frame.Typ="1"/>
+      <TfrxLineView Name="lImporteTotal" Left="603" Top="207" Width="0" Height="768,8947" ShowHint="False" Frame.Typ="1"/>
+    </TfrxPageHeader>
+  </TfrxReportPage>
+</TfrxReport>
diff --git a/Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.pas b/Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.pas
index e598f1e6..bd06d2be 100644
--- a/Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.pas	
@@ -63,7 +63,7 @@ end;
 
 function TDataModulePedidosProveedor.GetReport(const AID: String): Binary;
 begin
-//  Result := (RORemoteService as IsrvPedidosProveedor).GenerateReport(AID)
+  Result := (RORemoteService as IsrvPedidosProveedor).GenerateReport(AID)
 end;
 
 function TDataModulePedidosProveedor.NewItem: IBizPedidoProveedor;
diff --git a/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm b/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm
index 06082a60..884d23f1 100644
--- a/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm	
@@ -4,11 +4,13 @@ object RptPedidosProveedor: TRptPedidosProveedor
   Height = 405
   Width = 447
   object DADataCabecera: TDADataSource
+    DataSet = tbl_Cabecera.Dataset
     DataTable = tbl_Cabecera
     Left = 264
     Top = 72
   end
   object DADataDetalles: TDADataSource
+    DataSet = tbl_Detalles.Dataset
     DataTable = tbl_Detalles
     Left = 344
     Top = 72
@@ -21,13 +23,6 @@ object RptPedidosProveedor: TRptPedidosProveedor
     LogChanges = False
     StreamingOptions = [soDisableEventsWhileStreaming]
     RemoteFetchEnabled = False
-    SchemaCall.Params = <>
-    DataRequestCall.Params = <>
-    DataUpdateCall.Params = <>
-    ScriptCall.Params = <>
-    ReadOnly = False
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     IndexDefs = <>
     Left = 264
     Top = 128
@@ -40,13 +35,6 @@ object RptPedidosProveedor: TRptPedidosProveedor
     LogChanges = False
     StreamingOptions = [soDisableEventsWhileStreaming]
     RemoteFetchEnabled = False
-    SchemaCall.Params = <>
-    DataRequestCall.Params = <>
-    DataUpdateCall.Params = <>
-    ScriptCall.Params = <>
-    ReadOnly = False
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     IndexDefs = <>
     Left = 344
     Top = 128
@@ -92,8 +80,7 @@ object RptPedidosProveedor: TRptPedidosProveedor
           item
             Name = 'ID'
             DataType = datInteger
-            BlobType = dabtUnknown
-            Value = '33'
+            Value = '28'
             ParamType = daptInput
           end>
         Statements = <
@@ -104,30 +91,21 @@ object RptPedidosProveedor: TRptPedidosProveedor
               'SELECT'#10'  V_PEDIDOS_PROVEEDOR.ID,'#10'  V_PEDIDOS_PROVEEDOR.ID_EMPRES' +
               'A,'#10'  V_PEDIDOS_PROVEEDOR.REFERENCIA,'#10'  V_PEDIDOS_PROVEEDOR.FECHA' +
               '_PEDIDO,'#10'  V_PEDIDOS_PROVEEDOR.OBSERVACIONES,'#10'  V_PROVEEDORES.NO' +
-              'MBRE,'#10'  V_PROVEEDORES.FAX,'#10'  ALMACENES.NOMBRE AS NOMBRE_ALMACEN,' +
-              #10#10'  CASE WHEN (ALMACENES.ID > 0)'#10'            THEN ALMACENES.CALL' +
-              'E'#10'            ELSE V_PEDIDOS_PROVEEDOR.CALLE'#10'  END as CALLE,'#10#10'  ' +
-              'CASE WHEN (ALMACENES.ID > 0)'#10'            THEN ALMACENES.POBLACIO' +
-              'N'#10'            ELSE V_PEDIDOS_PROVEEDOR.POBLACION'#10'  END as POBLAC' +
-              'ION,'#10#10'  CASE WHEN (ALMACENES.ID > 0)'#10'            THEN ALMACENES.' +
-              'PROVINCIA'#10'            ELSE V_PEDIDOS_PROVEEDOR.PROVINCIA'#10'  END a' +
-              's PROVINCIA,'#10#10'  CASE WHEN (ALMACENES.ID > 0)'#10'            THEN AL' +
-              'MACENES.CODIGO_POSTAL'#10'            ELSE V_PEDIDOS_PROVEEDOR.CODIG' +
-              'O_POSTAL'#10'  END as CODIGO_POSTAL,'#10#10'  CASE WHEN (ALMACENES.ID > 0)' +
-              #10'            THEN ALMACENES.PERSONA_CONTACTO'#10'            ELSE V_' +
-              'PEDIDOS_PROVEEDOR.PERSONA_CONTACTO'#10'  END as PERSONA_CONTACTO,'#10#10' ' +
-              ' CASE WHEN (ALMACENES.ID > 0)'#10'            THEN ALMACENES.TELEFON' +
-              'O'#10'            ELSE V_PEDIDOS_PROVEEDOR.TELEFONO'#10'  END as TELEFON' +
-              'O,'#10#10'  EMPRESAS.NIF_CIF AS NIF_CIF_EMPRESA,'#10'  EMPRESAS.NOMBRE AS ' +
-              'NOMBRE_EMPRESA,'#10'  EMPRESAS.RAZON_SOCIAL AS RAZON_SOCIAL_EMPRESA,' +
-              #10'  EMPRESAS.TELEFONO_1 AS TELEFONO_1_EMPRESA,'#10'  EMPRESAS.FAX AS ' +
-              'FAX_EMPRESA,'#10'  EMPRESAS.MOVIL_1 AS MOVIL_1_EMPRESA,'#10'  EMPRESAS.E' +
-              'MAIL_1 AS EMAIL_1_EMPRESA,'#10'  EMPRESAS.PAGINA_WEB AS PAGINA_WEB_E' +
-              'MPRESA'#10'FROM'#10'  V_PEDIDOS_PROVEEDOR'#10'  LEFT OUTER JOIN V_PROVEEDORE' +
-              'S ON (V_PROVEEDORES.ID = V_PEDIDOS_PROVEEDOR.ID_PROVEEDOR)'#10'  LEF' +
-              'T OUTER JOIN ALMACENES ON (ALMACENES.ID = V_PEDIDOS_PROVEEDOR.ID' +
-              '_ALMACEN)'#10'  LEFT OUTER JOIN EMPRESAS ON (EMPRESAS.ID = V_PEDIDOS' +
-              '_PROVEEDOR.ID_EMPRESA)'#10'WHERE V_PEDIDOS_PROVEEDOR.ID = :ID'
+              'MBRE,'#10'  V_PROVEEDORES.FAX,'#10#10'  V_CONTRATOS_CLIENTE.NOMBRE AS NOMB' +
+              'RE_CLIENTE,'#10'  V_CONTRATOS_CLIENTE.CALLE,'#10'  V_CONTRATOS_CLIENTE.P' +
+              'OBLACION,'#10'  V_CONTRATOS_CLIENTE.PROVINCIA,'#10'  V_CONTRATOS_CLIENTE' +
+              '.CODIGO_POSTAL,'#10'  V_CONTRATOS_CLIENTE.PERSONA_CONTACTO,'#10'  V_CONT' +
+              'RATOS_CLIENTE.TELEFONO,'#10#10'  EMPRESAS.NIF_CIF AS NIF_CIF_EMPRESA,'#10 +
+              '  EMPRESAS.NOMBRE AS NOMBRE_EMPRESA,'#10'  EMPRESAS.RAZON_SOCIAL AS ' +
+              'RAZON_SOCIAL_EMPRESA,'#10'  EMPRESAS.TELEFONO_1 AS TELEFONO_1_EMPRES' +
+              'A,'#10'  EMPRESAS.FAX AS FAX_EMPRESA,'#10'  EMPRESAS.MOVIL_1 AS MOVIL_1_' +
+              'EMPRESA,'#10'  EMPRESAS.EMAIL_1 AS EMAIL_1_EMPRESA,'#10'  EMPRESAS.PAGIN' +
+              'A_WEB AS PAGINA_WEB_EMPRESA'#10'FROM'#10'  V_PEDIDOS_PROVEEDOR'#10'  LEFT OU' +
+              'TER JOIN V_PROVEEDORES ON (V_PROVEEDORES.ID = V_PEDIDOS_PROVEEDO' +
+              'R.ID_PROVEEDOR)'#10'  LEFT OUTER JOIN V_CONTRATOS_CLIENTE ON (V_CONT' +
+              'RATOS_CLIENTE.ID = V_PEDIDOS_PROVEEDOR.ID_CONTRATO_CLIENTE)'#10'  LE' +
+              'FT OUTER JOIN EMPRESAS ON (EMPRESAS.ID = V_PEDIDOS_PROVEEDOR.ID_' +
+              'EMPRESA)'#10'WHERE V_PEDIDOS_PROVEEDOR.ID = :ID'#10
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -210,13 +188,14 @@ object RptPedidosProveedor: TRptPedidosProveedor
                 DatasetField = 'PAGINA_WEB_EMPRESA'
                 TableField = 'PAGINA_WEB_EMPRESA'
               end
-              item
-                DatasetField = 'NOMBRE_ALMACEN'
-                TableField = 'NOMBRE_ALMACEN'
-              end
               item
                 DatasetField = 'FAX'
                 TableField = 'FAX'
+              end
+              item
+                DatasetField = 'NOMBRE_CLIENTE'
+                TableField = '<unknown>'
+                SQLOrigin = 'NOMBRE_CLIENTE'
               end>
           end>
         Name = 'Informe_Cabecera'
@@ -224,271 +203,114 @@ object RptPedidosProveedor: TRptPedidosProveedor
           item
             Name = 'ID'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'ID_EMPRESA'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'REFERENCIA'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FECHA_PEDIDO'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'OBSERVACIONES'
             DataType = datMemo
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NOMBRE'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FAX'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
+          end
+          item
+            Name = 'NOMBRE_CLIENTE'
+            DataType = datString
+            Size = 255
           end
           item
             Name = 'CALLE'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
-          end
-          item
-            Name = 'CODIGO_POSTAL'
-            DataType = datString
-            Size = 10
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
-          end
-          item
-            Name = 'PROVINCIA'
-            DataType = datString
-            Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
-          end
-          item
-            Name = 'PERSONA_CONTACTO'
-            DataType = datString
-            Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
-          end
-          item
-            Name = 'TELEFONO'
-            DataType = datString
-            Size = 25
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'POBLACION'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
-            Name = 'NOMBRE_ALMACEN'
+            Name = 'PROVINCIA'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
+          end
+          item
+            Name = 'CODIGO_POSTAL'
+            DataType = datString
+            Size = 10
+          end
+          item
+            Name = 'PERSONA_CONTACTO'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'TELEFONO'
+            DataType = datString
+            Size = 25
           end
           item
             Name = 'NIF_CIF_EMPRESA'
             DataType = datString
             Size = 15
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NOMBRE_EMPRESA'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'RAZON_SOCIAL_EMPRESA'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'TELEFONO_1_EMPRESA'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FAX_EMPRESA'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'MOVIL_1_EMPRESA'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'EMAIL_1_EMPRESA'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'PAGINA_WEB_EMPRESA'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end>
-        BusinessRulesClient.ScriptLanguage = rslPascalScript
-        BusinessRulesServer.ScriptLanguage = rslPascalScript
       end
       item
         Params = <
           item
             Name = 'ID_PEDIDO'
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end>
@@ -559,135 +381,59 @@ object RptPedidosProveedor: TRptPedidosProveedor
           item
             Name = 'ID'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'ID_PEDIDO'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'POSICION'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'TIPO_DETALLE'
             DataType = datString
             Size = 10
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'REFERENCIA'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CONCEPTO'
             DataType = datString
             Size = 2000
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CANTIDAD'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'IMPORTE_UNIDAD'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'IMPORTE_TOTAL'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FAMILIA'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'REFERENCIA_PROVEEDOR'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            Lookup = False
-            LookupCache = False
           end>
-        BusinessRulesClient.ScriptLanguage = rslPascalScript
-        BusinessRulesServer.ScriptLanguage = rslPascalScript
       end>
+    JoinDataTables = <>
+    UnionDataTables = <>
     Commands = <>
     RelationShips = <>
     UpdateRules = <>
+    Version = 0
     Left = 48
     Top = 16
   end
@@ -697,123 +443,29 @@ object RptPedidosProveedor: TRptPedidosProveedor
     Top = 158
   end
   object frxReport: TfrxReport
-    Version = '3.23.7'
+    Version = '4.8.11'
     DotMatrixReport = False
     EngineOptions.DoublePass = True
     IniFile = '\Software\Fast Reports'
     PreviewOptions.Buttons = [pbPrint, pbLoad, pbSave, pbExport, pbZoom, pbFind, pbOutline, pbPageSetup, pbTools, pbEdit, pbNavigator, pbExportQuick]
     PreviewOptions.Zoom = 1.000000000000000000
     PrintOptions.Printer = 'Por defecto'
+    PrintOptions.PrintOnSheet = 0
     ReportOptions.CreateDate = 39065.872423495400000000
-    ReportOptions.LastChange = 39352.784043865740000000
+    ReportOptions.LastChange = 42093.722987407400000000
     ScriptLanguage = 'PascalScript'
-    ScriptText.Strings = (
-      ''
-      'procedure DatosEmpresaOnBeforePrint(Sender: TfrxComponent);'
-      'var'
-      '  Cadena: String;'
-      'begin'
-      '  DatosEmpresa.Lines.Clear;'
-      '  if (<frxDBCabecera."TELEFONO_1_EMPRESA"> <> '#39#39') then'
-      '       Cadena := '#39'TLF: '#39' + <frxDBCabecera."TELEFONO_1_EMPRESA">;'
-      '  if (<frxDBCabecera."FAX_EMPRESA"> <> '#39#39') then'
-      
-        '       Cadena := Cadena + '#39' FAX: '#39' + <frxDBCabecera."FAX_EMPRESA' +
-        '">;'
-      '  DatosEmpresa.Lines.Add(Cadena);'
-      'end;'
-      ''
-      'procedure NombreEmpresaOnBeforePrint(Sender: TfrxComponent);'
-      'begin'
-      '  NombreEmpresa.Lines.Clear;'
-      '  NombreEmpresa.Lines.Add(<frxDBCabecera."NOMBRE_EMPRESA">);'
-      'end;'
-      ''
-      'procedure DireccionEnvioOnBeforePrint(Sender: TfrxComponent);'
-      'var'
-      '  ACadena : String;'
-      'begin'
-      '  ACadena := '#39#39';'
-      '  DireccionEnvio.Lines.Clear;'
-      ''
-      '  if (<frxDBCabecera."NOMBRE_ALMACEN"> <> '#39#39') then'
-      
-        '       DireccionEnvio.Lines.Add(<frxDBCabecera."NOMBRE_ALMACEN">' +
-        ');'
-      ''
-      '  if (<frxDBCabecera."PERSONA_CONTACTO"> <> '#39#39') then'
-      
-        '     DireccionEnvio.Lines.Add(<frxDBCabecera."PERSONA_CONTACTO">' +
-        ');'
-      ''
-      '  DireccionEnvio.Lines.Add(<frxDBCabecera."CALLE">);'
-      ''
-      '  if (<frxDBCabecera."CODIGO_POSTAL"> <> '#39#39') then'
-      '     ACadena := <frxDBCabecera."CODIGO_POSTAL"> + '#39' '#39';'
-      '  if (<frxDBCabecera."POBLACION"> <> '#39#39') then'
-      '     ACadena := ACadena + <frxDBCabecera."POBLACION">;'
-      ''
-      '  if (ACadena <> '#39#39') then'
-      '       DireccionEnvio.Lines.Add(ACadena);'
-      ''
-      '  if (<frxDBCabecera."PROVINCIA"> <> '#39#39') then'
-      '       DireccionEnvio.Lines.Add(<frxDBCabecera."PROVINCIA">);'
-      ''
-      '  if (<frxDBCabecera."TELEFONO"> <> '#39#39') then'
-      '       DireccionEnvio.Lines.Add(<frxDBCabecera."TELEFONO">);'
-      'end;'
-      ''
-      'procedure PageHeader1OnBeforePrint(Sender: TfrxComponent);'
-      'begin'
-      '    if not Engine.FinalPass then'
-      '     Set('#39'TotalPaginas'#39', (<TotalPaginas> + 1));'
-      ''
-      '  if Engine.FinalPass then'
-      '     Set('#39'Pagina'#39', (<Pagina> + 1));'
-      'end;'
-      ''
-      'procedure frxReportOnStartReport(Sender: TfrxComponent);'
-      'begin'
-      '  Set('#39'Pagina'#39', 0);'
-      '  Set('#39'TotalPaginas'#39', 0);'
-      'end;'
-      ''
-      'begin'
-      ''
-      'end.')
     ShowProgress = False
     StoreInDFM = False
+    OnGetValue = frxReportGetValue
     OnStartReport = 'frxReportOnStartReport'
     Left = 169
     Top = 16
-    Datasets = <
-      item
-        DataSet = frxDBCabecera
-        DataSetName = 'frxDBCabecera'
-      end
-      item
-        DataSet = frxDBDetalles
-        DataSetName = 'frxDBDetalles'
-      end>
-    Variables = <
-      item
-        Name = ' Paginacion'
-        Value = Null
-      end
-      item
-        Name = 'TotalPaginas'
-        Value = Null
-      end
-      item
-        Name = 'Pagina'
-        Value = Null
-      end>
-    Style = <>
   end
   object frxDBCabecera: TfrxDBDataset
     UserName = 'frxDBCabecera'
     CloseDataSource = False
     DataSource = DADataCabecera
+    BCDToCurrency = False
     Left = 264
     Top = 16
   end
@@ -821,6 +473,7 @@ object RptPedidosProveedor: TRptPedidosProveedor
     UserName = 'frxDBDetalles'
     CloseDataSource = False
     DataSource = DADataDetalles
+    BCDToCurrency = False
     Left = 344
     Top = 16
   end
diff --git a/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.pas b/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.pas
index 85a40ad5..d41c8a46 100644
--- a/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.pas	
@@ -7,7 +7,7 @@ uses
   Dialogs, frxClass, frxDBSet, uDAScriptingProvider,
   uDADataTable, uDACDSDataTable, DB, uDAClasses, frxChart, frxGradient,
   frxChBox, frxCross, frxOLE, frxBarcode, frxRich, uDABINAdapter, uROTypes,
-  uDAInterfaces;
+  uDAInterfaces, uDADataStreamer;
 
 type
   TRptPedidosProveedor = class(TDataModule)
@@ -25,10 +25,11 @@ type
     frxChartObject1: TfrxChartObject;
     frxDBCabecera: TfrxDBDataset;
     frxDBDetalles: TfrxDBDataset;
+    frxReport: TfrxReport;
     schReport: TDASchema;
     DataDictionary: TDADataDictionary;
-    frxReport: TfrxReport;
     procedure DataModuleCreate(Sender: TObject);
+    procedure frxReportGetValue(const VarName: string; var Value: Variant);
   private
     FConnection: IDAConnection;
     procedure GenerarPedido(const AID : Integer); overload;
@@ -85,6 +86,15 @@ begin
   end;
 end;
 
+procedure TRptPedidosProveedor.frxReportGetValue(const VarName: string;
+  var Value: Variant);
+begin
+  if VarName = 'ImprimirPrecio' then
+    Value := False;
+  if VarName = 'ImprimirRefProveedor' then
+    Value := False;
+end;
+
 procedure TRptPedidosProveedor.GenerarPedido(const AID: Integer);
 var
   AStream: TMemoryStream;
diff --git a/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.pas b/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.pas
index f49c7101..fa6255dc 100644
--- a/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.pas	
@@ -44,12 +44,7 @@ uses
   Dialogs,
   {Generated:} FactuGES_Invk, uDataModuleServer, uDatabaseUtils,
   schPedidosProveedorClient_Intf, uRestriccionesUsuarioUtils,
-  uBizPedidosProveedorServer;
-//  uRptPedidosProveedor_Server, ;
-
-{  uRORemoteDataModule,
-  fServerForm;
-}
+  uBizPedidosProveedorServer, uRptPedidosProveedor_Server;
 
 procedure Create_srvPedidosProveedor(out anInstance : IUnknown);
 begin
@@ -99,17 +94,17 @@ begin
 end;
 
 function TsrvPedidosProveedor.GenerateReport(const ID: String): Binary;
-//var
-//  AReportGenerator : TRptPedidosProveedor;
+var
+  AReportGenerator : TRptPedidosProveedor;
 begin
   Result := NIL;
-{  AReportGenerator := TRptPedidosProveedor.Create(nil);
+  AReportGenerator := TRptPedidosProveedor.Create(nil);
   try
     Result := AReportGenerator.GenerarPedido(ID);
   finally
     FreeAndNIL(AReportGenerator);
   end;
-}
+
 end;
 
 initialization
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm
index 5e3280a0..05daa65e 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm	
@@ -242,11 +242,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
       inherited ImporteDto: TcxDBCurrencyEdit
         Left = 164
         Top = 38
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 164
         ExplicitTop = 38
         ExplicitWidth = 93
@@ -255,11 +251,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
       inherited ImporteIVA: TcxDBCurrencyEdit
         Left = 539
         Top = 88
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 539
         ExplicitTop = 88
         ExplicitWidth = 137
@@ -268,11 +260,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
       inherited ImporteTotal: TcxDBCurrencyEdit
         Left = 469
         Top = 142
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 469
         ExplicitTop = 142
         ExplicitWidth = 137
@@ -281,33 +269,21 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
       inherited edtDescuento: TcxDBSpinEdit
         Left = 93
         Top = 38
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 93
         ExplicitTop = 38
       end
       inherited edtIVA: TcxDBSpinEdit
         Left = 468
         Top = 88
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 468
         ExplicitTop = 88
       end
       inherited ImporteBase: TcxDBCurrencyEdit
         Left = 468
         Top = 11
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 468
         ExplicitTop = 11
         ExplicitWidth = 92
@@ -318,11 +294,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
         Top = 115
         DataBinding.DataField = ''
         DataBinding.DataSource = nil
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 468
         ExplicitTop = 115
       end
@@ -331,11 +303,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
         Top = 115
         DataBinding.DataField = ''
         DataBinding.DataSource = nil
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 539
         ExplicitTop = 115
         ExplicitWidth = 56
@@ -344,11 +312,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
       inherited eImporteNeto: TcxDBCurrencyEdit
         Left = 93
         Top = 11
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 93
         ExplicitTop = 11
         ExplicitWidth = 147
@@ -358,11 +322,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
         Left = 93
         Top = 65
         Properties.OnValidate = frViewTotales1ePortePropertiesValidate
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 93
         ExplicitTop = 65
         ExplicitWidth = 147
@@ -373,10 +333,6 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
         Top = 92
         DataBinding.DataField = ''
         DataBinding.DataSource = nil
-        Style.LookAndFeel.SkinName = ''
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 93
         ExplicitTop = 92
         ExplicitWidth = 81
@@ -392,10 +348,6 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
         Left = 93
         Top = 119
         DataBinding.DataField = ''
-        Style.LookAndFeel.SkinName = ''
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 93
         ExplicitTop = 119
         ExplicitWidth = 219
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas
index 35d26c4e..f8f67bb1 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas	
@@ -207,10 +207,8 @@ end;
 
 procedure TfEditorPedidoProveedor.ImprimirInterno;
 begin
-{
   inherited;
   FController.Print(FPedido);
-}  
 end;
 
 procedure TfEditorPedidoProveedor.OnProveedorChanged(Sender: TObject);
@@ -255,10 +253,8 @@ end;
 
 procedure TfEditorPedidoProveedor.PrevisualizarInterno;
 begin
-{
   inherited;
   FController.Preview(FPedido);
-}  
 end;
 
 procedure TfEditorPedidoProveedor.RecalcularPortePorUnidad;
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.dfm
index b905cd2a..b112d930 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.dfm	
@@ -124,27 +124,15 @@ inherited fEditorPedidosProveedor: TfEditorPedidosProveedor
           Width = 700
           ExplicitWidth = 700
           inherited txtFiltroTodo: TcxTextEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 457
             Width = 457
           end
           inherited edtFechaIniFiltro: TcxDateEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 240
             Width = 240
           end
           inherited edtFechaFinFiltro: TcxDateEdit
             Left = 349
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitLeft = 349
           end
         end
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.pas
index abb68bb9..d197db35 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedor.pas	
@@ -46,6 +46,8 @@ type
     procedure DuplicarInterno; override;
     procedure ImprimirInterno; override;
     procedure PrevisualizarInterno; override;
+
+    procedure AsignarVista; virtual;
   public
     procedure PonerTitulos(const ATitulo: string = ''); override;
 
@@ -108,15 +110,20 @@ begin
                                 (FPedidos.SITUACION = SITUACION_PEDIDO_PENDIENTE);
 end;
 
+procedure TfEditorPedidosProveedor.AsignarVista;
+begin
+//  ViewGrid := frViewPedidosProveedor1; //CreateView(TfrViewPedidosProveedor) as IViewPedidosProveedor;
+  ViewGrid := CreateView(TfrViewPedidosProveedor) as IViewPedidosProveedor;
+end;
+
 constructor TfEditorPedidosProveedor.Create(AOwner: TComponent);
 begin
   inherited;
 
-  FHeaderText := 'Lista de pedidos a proveedor';
-  FWindowCaption := FHeaderText;
+//  FHeaderText := 'Lista de pedidos a proveedor';
+//  FWindowCaption := FHeaderText;
 
-
-  ViewGrid := frViewPedidosProveedor1; //CreateView(TfrViewPedidosProveedor) as IViewPedidosProveedor;
+  AsignarVista;
 end;
 
 destructor TfEditorPedidosProveedor.Destroy;
@@ -217,13 +224,11 @@ begin
 end;
 
 procedure TfEditorPedidosProveedor.ImprimirInterno;
-{var
+var
   Respuesta : Integer;
   APedidos: IBizPedidoProveedor;
-  AllItems: Boolean;}
+  AllItems: Boolean;
 begin
- inherited;
-{
   APedidos := Nil;
   AllItems := False;
 
@@ -257,7 +262,7 @@ begin
       end;
     end;
   end;
-}
+
 end;
 
 procedure TfEditorPedidosProveedor.ModificarInterno;
@@ -287,13 +292,11 @@ begin
 end;
 
 procedure TfEditorPedidosProveedor.PrevisualizarInterno;
-{var
+var
   Respuesta : Integer;
   APedidos: IBizPedidoProveedor;
-  AllItems: Boolean;}
+  AllItems: Boolean;
 begin
-  inherited;
-{
   APedidos := Nil;
   AllItems := False;
 
@@ -327,7 +330,7 @@ begin
       end;
     end;
   end;
-}  
+  
 end;
 
 procedure TfEditorPedidosProveedor.SetController(const Value: IPedidosProveedorController);
diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr
index eb56cda1..aeb63df5 100644
--- a/Source/Servidor/FactuGES_Server.dpr
+++ b/Source/Servidor/FactuGES_Server.dpr
@@ -137,7 +137,8 @@ uses
   schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas',
   schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas',
   schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas',
-  uRptListadosContactos_Server in '..\Modulos\Contactos\Reports\uRptListadosContactos_Server.pas' {RptListadosContactos: TDataModule};
+  uRptListadosContactos_Server in '..\Modulos\Contactos\Reports\uRptListadosContactos_Server.pas' {RptListadosContactos: TDataModule},
+  uRptPedidosProveedor_Server in '..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas' {RptPedidosProveedor: TDataModule};
 
 {$R *.res}
 {$R ..\Servicios\RODLFile.res}
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index a510ab53..84f848c4 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -28,7 +28,7 @@
 		<Borland.Personality>Delphi.Personality</Borland.Personality>
 		<Borland.ProjectType/>
 		<BorlandProject>
-			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">3</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.6.3.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.6.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 23 de enero de 2015 11:51</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">4</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.6.4.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.6.5.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 13 de marzo de 2015 18:16</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
 						<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
 					</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
 	</ProjectExtensions>
@@ -177,6 +177,10 @@
 		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas"/>
 		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas"/>
 		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas"/>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas">
+			<Form>RptPedidosProveedor</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
 		<DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
 			<Form>srvPedidosProveedor</Form>
 			<DesignClass>TDataAbstractService</DesignClass>
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index e27c8ec2..a7cb4774 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico"
 1 VERSIONINFO
-FILEVERSION 2,6,3,0
-PRODUCTVERSION 2,6,3,0
+FILEVERSION 2,6,4,0
+PRODUCTVERSION 2,6,4,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "2.6.3.0\0"
+              VALUE "FileVersion", "2.6.4.0\0"
               VALUE "ProductName", "FactuGES (Servidor)\0"
-              VALUE "ProductVersion", "2.6.3.0\0"
-              VALUE "CompileDate", "viernes, 13 de marzo de 2015 18:16\0"
+              VALUE "ProductVersion", "2.6.4.0\0"
+              VALUE "CompileDate", "lunes, 30 de marzo de 2015 17:48\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res
index 0ea2007d313b74035299a83d49432c0d898cfc26..c99f0305afb2a55c2f8e68a5e5b1f1b7b265fb51 100644
GIT binary patch
delta 103
zcmdn8jd24I-HBi{nS3`w9!UO;Fy&-nU}IonU|?XGY#k}fIB9ZZq%vdP<l4w~pge0-
zHMa?a9)kf;K8Znba(9%hU=BkmLmopaLotI6g93vwgTdszQR?jG3|0&#3>K4LM|lDO
D0m>Ti

delta 107
zcmdn6jd9C1#tnBO7%e8>jgSYDe<MsenHks^m>3usm?v9D$}&!y92u$1STwmdvYpX*
zGHX;dw=shrg8@)JjX`;Gca*GX8AB#RDnk)N9*`_%&|y$uFk~>EyfaFj-Gadi$Tpk&
HJjxRQazq=@