From 55827cde8285826ea8ab14a4df14b6485570ea77 Mon Sep 17 00:00:00 2001
From: roberto <rblanco@rodax-software.com>
Date: Thu, 5 Jun 2008 17:11:20 +0000
Subject: [PATCH] Cambio para que las facturas de proveedor puedan asociarse
 pedidos de proveedor

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@440 0c75b7a4-871f-7646-8a2f-f78d34cc349f
---
 .../Data/uDataModuleFacturasProveedor.dfm     |  70 +++-
 .../Data/uDataModuleFacturasProveedor.pas     |  23 ++
 .../Model/FacturasProveedor_model.dpk         | Bin 1035 -> 1211 bytes
 .../Model/FacturasProveedor_model.dproj       |  35 +-
 .../Model/FacturasProveedor_model.res         | Bin 384 -> 4748 bytes
 .../Model/schFacturasProveedorClient_Intf.pas | 301 ++++++++++++++-
 .../Model/schFacturasProveedorServer_Intf.pas | 345 +++++++++++++++++-
 .../Model/uBizFacturasProveedor.pas           |  29 +-
 .../Model/uBizPedidosFacturaProveedor.pas     |  47 +++
 .../Servidor/srvFacturasProveedor_Impl.dfm    | 257 ++++++++++++-
 .../Servidor/srvFacturasProveedor_Impl.pas    |   1 +
 .../Views/FacturasProveedor_view.dpk          | Bin 1687 -> 2647 bytes
 .../Views/FacturasProveedor_view.dproj        |  64 +++-
 .../Views/FacturasProveedor_view.res          | Bin 384 -> 4748 bytes
 .../Views/uEditorFacturaProveedor.dfm         | 292 ++++++---------
 .../Views/uEditorFacturaProveedor.pas         |  20 +-
 .../Views/uEditorFacturasProveedor.pas        |   7 +-
 .../Views/uViewPedidosFacturaProveedor.dfm    |  38 ++
 .../Views/uViewPedidosFacturaProveedor.pas    |  67 ++++
 19 files changed, 1381 insertions(+), 215 deletions(-)
 create mode 100644 Source/Modulos/Facturas de proveedor/Model/uBizPedidosFacturaProveedor.pas
 create mode 100644 Source/Modulos/Facturas de proveedor/Views/uViewPedidosFacturaProveedor.dfm
 create mode 100644 Source/Modulos/Facturas de proveedor/Views/uViewPedidosFacturaProveedor.pas

diff --git a/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm b/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm
index 4ed16590..dc014e55 100644
--- a/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm	
+++ b/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm	
@@ -1,6 +1,6 @@
 inherited DataModuleFacturasProveedor: TDataModuleFacturasProveedor
   OnCreate = DAClientDataModuleCreate
-  Height = 246
+  Height = 318
   Width = 518
   object RORemoteService: TRORemoteService
     Message = dmConexion.ROMessage
@@ -354,4 +354,72 @@ inherited DataModuleFacturasProveedor: TDataModuleFacturasProveedor
     Left = 368
     Top = 104
   end
+  object tbl_FacturasProveedor_Pedidos: TDAMemDataTable
+    RemoteUpdatesOptions = []
+    Fields = <
+      item
+        Name = 'ID'
+        DataType = datAutoInc
+        GeneratorName = 'GEN_PEDIDOS_PROV_PEDIDOS_ID'
+        DictionaryEntry = 'FacturasProveedor_Pedidos_ID'
+        InPrimaryKey = True
+      end
+      item
+        Name = 'ID_FACTURA'
+        DataType = datInteger
+        DisplayLabel = 'FacturasProveedor_Pedidos_ID_FACTURA'
+        DictionaryEntry = 'FacturasProveedor_Pedidos_ID_FACTURA'
+      end
+      item
+        Name = 'IMPORTE_TOTAL'
+        DataType = datCurrency
+        DisplayLabel = 'Importe total'
+        DictionaryEntry = 'FacturasProveedor_Pedidos_IMPORTE_TOTAL'
+      end
+      item
+        Name = 'ID_PEDIDO'
+        DataType = datInteger
+        DisplayLabel = 'FacturasProveedor_Pedidos_ID_PEDIDO'
+        DictionaryEntry = 'FacturasProveedor_Pedidos_ID_PEDIDO'
+      end
+      item
+        Name = 'REFERENCIA'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Ref. pedido'
+        DictionaryEntry = 'FacturasProveedor_Pedidos_REFERENCIA'
+      end
+      item
+        Name = 'FECHA_PEDIDO'
+        DataType = datDateTime
+        DisplayLabel = 'Fecha'
+        DictionaryEntry = 'FacturasProveedor_Pedidos_FECHA_PEDIDO'
+      end
+      item
+        Name = 'PROVEEDOR'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Proveedor'
+        DictionaryEntry = 'FacturasProveedor_Pedidos_PROVEEDOR'
+      end>
+    Params = <>
+    MasterMappingMode = mmWhere
+    StreamingOptions = [soDisableEventsWhileStreaming]
+    RemoteDataAdapter = rda_FacturasProveedor
+    MasterSource = ds_FacturasProveedor
+    MasterFields = 'ID'
+    DetailFields = 'ID_FACTURA'
+    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
+    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
+    LogicalName = 'FacturasProveedor_Pedidos'
+    IndexDefs = <>
+    Left = 368
+    Top = 168
+  end
+  object ds_FacturasProveedor_Pedidos: TDADataSource
+    DataSet = tbl_FacturasProveedor_Pedidos.Dataset
+    DataTable = tbl_FacturasProveedor_Pedidos
+    Left = 368
+    Top = 232
+  end
 end
diff --git a/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.pas b/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.pas
index c636933b..4502d3a5 100644
--- a/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.pas	
+++ b/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.pas	
@@ -8,6 +8,7 @@ uses
   uRORemoteService, uROClient, uROBinMessage,
   uDataModuleBase,
   uIDataModuleFacturasProveedor, uBizFacturasProveedor, uBizDetallesFacturaProveedor,
+  uBizPedidosFacturaProveedor,
   uDADesigntimeCall, uIDataModuleFacturasProveedorReport, uDARemoteDataAdapter,
   uDADataStreamer, uDABin2DataStreamer, uDAInterfaces, uDAMemDataTable;
 
@@ -20,9 +21,12 @@ type
     ds_FacturasProveedor: TDADataSource;
     tbl_FacturasProveedor_Detalles: TDAMemDataTable;
     ds_FacturasProveedor_Detalles: TDADataSource;
+    tbl_FacturasProveedor_Pedidos: TDAMemDataTable;
+    ds_FacturasProveedor_Pedidos: TDADataSource;
     procedure DAClientDataModuleCreate(Sender: TObject);
   private
     function _GetDetalles : IBizDetallesFacturaProveedor;
+    function _GetPedidos : IBizPedidosFacturaProveedor;
   public
     function GetItems : IBizFacturaProveedor;
     function GetItem(const ID : Integer) : IBizFacturaProveedor;
@@ -76,6 +80,24 @@ begin
   end;
 end;
 
+function TDataModuleFacturasProveedor._GetPedidos: IBizPedidosFacturaProveedor;
+var
+  APedidos : TDAMemDataTable;
+begin
+  ShowHourglassCursor;
+  try
+    APedidos := CloneDataTable(tbl_FacturasProveedor_Pedidos);
+    with APedidos do
+    begin
+      BusinessRulesID := BIZ_CLIENT_PEDIDOS_FACTURA_PROVEEDOR;
+      DetailOptions := DetailOptions - [dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates];
+    end;
+    Result := (APedidos as IBizPedidosFacturaProveedor);
+  finally
+    HideHourglassCursor;
+  end;
+end;
+
 function TDataModuleFacturasProveedor.GetItem(const ID: Integer): IBizFacturaProveedor;
 var
   Condicion: TDAWhereExpression;
@@ -115,6 +137,7 @@ begin
     with TBizFacturaProveedor(AFactura.BusinessEventsObj) do
     begin
       Detalles := _GetDetalles;
+      Pedidos := _GetPedidos;      
     end;
 
     Result := (AFactura as IBizFacturaProveedor);
diff --git a/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.dpk b/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.dpk
index 04af31dd206202fad5f4efde4d5df4fc768bd282..52d266384b6c90acf826b7ffecc62ff5b3775cc1 100644
GIT binary patch
delta 202
zcmeC?*v+}YkSSY-mrFsRs3ZqWrzF8xE{P?Hj!DHOMTyBJ@y_{0sqrp`hF~>i$vG)W
zFcw5tab98pn3b544>KSrHP=5WD>b>K7_NP@A=5d=K(NA6r_8E=)RfGW{9-qt4W&hi
k0Y&*`si{Ey3YmEd>UiY!3KEOet$De4xl;2|^mw@#0Ba^aivR!s

delta 25
gcmdnZ+0C)RkZJQArgMxu*1TN2T&Z~}dc0f=0Ao`IOaK4?

diff --git a/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.dproj b/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.dproj
index 7675fe40..5e57be23 100644
--- a/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.dproj	
+++ b/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.dproj	
@@ -1,4 +1,5 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{a7225a8d-f40d-4878-9a27-c5de0e7cb638}</ProjectGuid>
     <MainSource>FacturasProveedor_model.dpk</MainSource>
@@ -41,18 +42,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD10.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
@@ -63,22 +53,31 @@
     <DelphiCompile Include="FacturasProveedor_model.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_model.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\TiposIVA_controller.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\TiposIVA_model.dcp" />
+    <DCCReference Include="adortl.dcp" />
+    <DCCReference Include="Base.dcp" />
+    <DCCReference Include="Contactos_model.dcp" />
+    <DCCReference Include="DataAbstract_Core_D11.dcp" />
     <DCCReference Include="Data\uIDataModuleFacturasProveedor.pas" />
     <DCCReference Include="Data\uIDataModuleFacturasProveedorReport.pas" />
+    <DCCReference Include="dbrtl.dcp" />
+    <DCCReference Include="dsnap.dcp" />
+    <DCCReference Include="RemObjects_Core_D11.dcp" />
+    <DCCReference Include="rtl.dcp" />
     <DCCReference Include="schFacturasProveedorClient_Intf.pas" />
     <DCCReference Include="schFacturasProveedorServer_Intf.pas" />
+    <DCCReference Include="TiposIVA_controller.dcp" />
+    <DCCReference Include="TiposIVA_model.dcp" />
     <DCCReference Include="uBizDetallesFacturaProveedor.pas" />
     <DCCReference Include="uBizFacturasProveedor.pas" />
+    <DCCReference Include="uBizPedidosFacturaProveedor.pas" />
+    <DCCReference Include="vcl.dcp" />
+    <DCCReference Include="vcldb.dcp" />
     <None Include="ModelSupport_FacturasProveedor_model\default.txaPackage" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
 [Exception Log]
-EurekaLog Version=6006
+EurekaLog Version=6011
 Activate=0
 Activate Handle=1
 Save Log File=1
diff --git a/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.res b/Source/Modulos/Facturas de proveedor/Model/FacturasProveedor_model.res
index 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644
GIT binary patch
literal 4748
zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg
zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?<w4U-ol;S2jC7
zx4(byej2@_#)0HWvg0i^wC4Xli+W*aXJ^(njceK|Kb@c3qFNX>p${kR>3GhM`oH*q
zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W
zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7
z{BT%G%irdMe*|oDJmgvJ<ltI;x5J<Oc>aA2`9B<Z5Toyra?r{a4$fnJHGXo6Pmcq8
z{JGCD500t1h4|yI?-f&xoj9;YT&Ch&JLO*X#NC3sCI0Xmc<f_vh`jn-1E!?th$%QM
znzGM|)$vl3f7;nE+9qR}|A?C$H3K&BFdq9?uxrIqHIne#5?8G@da2ybWLGKA686M2
z*LJMMMk4<U`dzFC9}HrSxLfOGll{P#??xir)$c2}C;ql+y-&Wa(LP{PgPk1E1@{uR
zIMCNz;u9;r(axhQvEx%?i#p<Vn=Z!SK%f10?4_`0@RY8lXRM3(t(nFSzJ$4kJr6&x
ze)~B%biu*TY$HDstHD=|UGxJceYiUQQa0Gu(p3og@%ZJ><6Xi*?M~Q;)@Sbfwf3uf
zVaWkbU<NjR3%=~AdoZbkXp`f@b0%GBT^$^V5e(n|#O(?P)hBbF)4n%2cw6U#adPM!
zz(!`V|Bfl{aH0)Y&w;SK7R4<z{p;Gwz1D%l86L3ZFZQ&=pB$<&esXT|OZ?=AGaWoe
z{>jU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv
zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N|
z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc
z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0
zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38=
zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W
zVvPDBKHh;i=RU4J_ta3E;)M<P+=2X7;VbzliQZ=IHV#+fr#{!(ukt%UJMS8=332qg
z7jD)rSbpCW+^j*cd6LUEe8#9n&v!NEJM(@?SHvB$=h@|)fjw|&qD?NQ5A&R>n>Y+L
zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m
z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJu<OVP
zzHjp+hnwo*3NQE$JTA(agu~silV5T`du+GJgWGi_7mAy`Nk8fLt~%GF$;XXcE-ri?
zyIglyyzA`K-);4Eem2MZm07RBza@W3UP)d`Rz=RFk-I);`s{$L%yyBNX0OTjo5Gk0
zs}g44uXg*l%xo^{`#0=kd*2?}Cz22Bv2;Gu?;3o~(D#gk1OKYQSCAb$(&vu@_pvWO
z>gbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T
z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC
zy(^m((;DnQmDQ<zX+PK(Lfu@ox#mOnbZjSDl}IBqv$qwK+2@))5$ba>Katmw!@c`|
G?EMQ&4NnpP

delta 11
ScmeBCZD5|Duvteife`=|>;pCc

diff --git a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas
index 716422eb..e3625f1d 100644
--- a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas	
+++ b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas	
@@ -3,18 +3,20 @@ unit schFacturasProveedorClient_Intf;
 interface
 
 uses
-  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
 
 const
   { Data table rules ids
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_FacturasProveedor = '{88E29988-90B3-4F11-BDD5-725B135C5155}';
-  RID_FacturasProveedor_Detalles = '{B8192582-A958-4BCC-A261-5608584C2B67}';
+  RID_FacturasProveedor = '{459318AB-8D63-462A-B567-DCFA25BC17E8}';
+  RID_FacturasProveedor_Detalles = '{76543CD5-E43C-4B99-8A13-7D617B4F2635}';
+  RID_FacturasProveedor_Pedidos = '{13E16CA0-EC57-43BC-B975-EAB65060F724}';
 
   { Data table names }
   nme_FacturasProveedor = 'FacturasProveedor';
   nme_FacturasProveedor_Detalles = 'FacturasProveedor_Detalles';
+  nme_FacturasProveedor_Pedidos = 'FacturasProveedor_Pedidos';
 
   { FacturasProveedor fields }
   fld_FacturasProveedorID = 'ID';
@@ -114,10 +116,28 @@ const
   idx_FacturasProveedor_DetallesREFERENCIA = 12;
   idx_FacturasProveedor_DetallesREFERENCIA_PROVEEDOR = 13;
 
+  { FacturasProveedor_Pedidos fields }
+  fld_FacturasProveedor_PedidosID = 'ID';
+  fld_FacturasProveedor_PedidosID_FACTURA = 'ID_FACTURA';
+  fld_FacturasProveedor_PedidosIMPORTE_TOTAL = 'IMPORTE_TOTAL';
+  fld_FacturasProveedor_PedidosID_PEDIDO = 'ID_PEDIDO';
+  fld_FacturasProveedor_PedidosREFERENCIA = 'REFERENCIA';
+  fld_FacturasProveedor_PedidosFECHA_PEDIDO = 'FECHA_PEDIDO';
+  fld_FacturasProveedor_PedidosPROVEEDOR = 'PROVEEDOR';
+
+  { FacturasProveedor_Pedidos field indexes }
+  idx_FacturasProveedor_PedidosID = 0;
+  idx_FacturasProveedor_PedidosID_FACTURA = 1;
+  idx_FacturasProveedor_PedidosIMPORTE_TOTAL = 2;
+  idx_FacturasProveedor_PedidosID_PEDIDO = 3;
+  idx_FacturasProveedor_PedidosREFERENCIA = 4;
+  idx_FacturasProveedor_PedidosFECHA_PEDIDO = 5;
+  idx_FacturasProveedor_PedidosPROVEEDOR = 6;
+
 type
   { IFacturasProveedor }
   IFacturasProveedor = interface(IDAStronglyTypedDataTable)
-  ['{E152D3B2-9282-492A-8E11-DDBE597C9FB1}']
+  ['{DF0436D2-5D1A-4E1E-A064-807224190B0D}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -310,7 +330,7 @@ type
   end;
 
   { TFacturasProveedorDataTableRules }
-  TFacturasProveedorDataTableRules = class(TIntfObjectDADataTableRules, IFacturasProveedor)
+  TFacturasProveedorDataTableRules = class(TDADataTableRules, IFacturasProveedor)
   private
     f_OBSERVACIONES: IROStrings;
     procedure OBSERVACIONES_OnChange(Sender: TObject);
@@ -512,7 +532,7 @@ type
 
   { IFacturasProveedor_Detalles }
   IFacturasProveedor_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{97403572-2108-4BF9-BD7B-4359FD2F8C8D}']
+  ['{B87224BF-44AA-441C-B770-334B8BF05DC4}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -604,7 +624,7 @@ type
   end;
 
   { TFacturasProveedor_DetallesDataTableRules }
-  TFacturasProveedor_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IFacturasProveedor_Detalles)
+  TFacturasProveedor_DetallesDataTableRules = class(TDADataTableRules, IFacturasProveedor_Detalles)
   private
   protected
     { Property getters and setters }
@@ -701,6 +721,113 @@ type
 
   end;
 
+  { IFacturasProveedor_Pedidos }
+  IFacturasProveedor_Pedidos = interface(IDAStronglyTypedDataTable)
+  ['{5350FE40-8BE0-418C-8E8D-0E04AD1696C2}']
+    { Property getters and setters }
+    function GetIDValue: Integer;
+    procedure SetIDValue(const aValue: Integer);
+    function GetIDIsNull: Boolean;
+    procedure SetIDIsNull(const aValue: Boolean);
+    function GetID_FACTURAValue: Integer;
+    procedure SetID_FACTURAValue(const aValue: Integer);
+    function GetID_FACTURAIsNull: Boolean;
+    procedure SetID_FACTURAIsNull(const aValue: Boolean);
+    function GetIMPORTE_TOTALValue: Currency;
+    procedure SetIMPORTE_TOTALValue(const aValue: Currency);
+    function GetIMPORTE_TOTALIsNull: Boolean;
+    procedure SetIMPORTE_TOTALIsNull(const aValue: Boolean);
+    function GetID_PEDIDOValue: Integer;
+    procedure SetID_PEDIDOValue(const aValue: Integer);
+    function GetID_PEDIDOIsNull: Boolean;
+    procedure SetID_PEDIDOIsNull(const aValue: Boolean);
+    function GetREFERENCIAValue: String;
+    procedure SetREFERENCIAValue(const aValue: String);
+    function GetREFERENCIAIsNull: Boolean;
+    procedure SetREFERENCIAIsNull(const aValue: Boolean);
+    function GetFECHA_PEDIDOValue: DateTime;
+    procedure SetFECHA_PEDIDOValue(const aValue: DateTime);
+    function GetFECHA_PEDIDOIsNull: Boolean;
+    procedure SetFECHA_PEDIDOIsNull(const aValue: Boolean);
+    function GetPROVEEDORValue: String;
+    procedure SetPROVEEDORValue(const aValue: String);
+    function GetPROVEEDORIsNull: Boolean;
+    procedure SetPROVEEDORIsNull(const aValue: Boolean);
+
+
+    { Properties }
+    property ID: Integer read GetIDValue write SetIDValue;
+    property IDIsNull: Boolean read GetIDIsNull write SetIDIsNull;
+    property ID_FACTURA: Integer read GetID_FACTURAValue write SetID_FACTURAValue;
+    property ID_FACTURAIsNull: Boolean read GetID_FACTURAIsNull write SetID_FACTURAIsNull;
+    property IMPORTE_TOTAL: Currency read GetIMPORTE_TOTALValue write SetIMPORTE_TOTALValue;
+    property IMPORTE_TOTALIsNull: Boolean read GetIMPORTE_TOTALIsNull write SetIMPORTE_TOTALIsNull;
+    property ID_PEDIDO: Integer read GetID_PEDIDOValue write SetID_PEDIDOValue;
+    property ID_PEDIDOIsNull: Boolean read GetID_PEDIDOIsNull write SetID_PEDIDOIsNull;
+    property REFERENCIA: String read GetREFERENCIAValue write SetREFERENCIAValue;
+    property REFERENCIAIsNull: Boolean read GetREFERENCIAIsNull write SetREFERENCIAIsNull;
+    property FECHA_PEDIDO: DateTime read GetFECHA_PEDIDOValue write SetFECHA_PEDIDOValue;
+    property FECHA_PEDIDOIsNull: Boolean read GetFECHA_PEDIDOIsNull write SetFECHA_PEDIDOIsNull;
+    property PROVEEDOR: String read GetPROVEEDORValue write SetPROVEEDORValue;
+    property PROVEEDORIsNull: Boolean read GetPROVEEDORIsNull write SetPROVEEDORIsNull;
+  end;
+
+  { TFacturasProveedor_PedidosDataTableRules }
+  TFacturasProveedor_PedidosDataTableRules = class(TDADataTableRules, IFacturasProveedor_Pedidos)
+  private
+  protected
+    { Property getters and setters }
+    function GetIDValue: Integer; virtual;
+    procedure SetIDValue(const aValue: Integer); virtual;
+    function GetIDIsNull: Boolean; virtual;
+    procedure SetIDIsNull(const aValue: Boolean); virtual;
+    function GetID_FACTURAValue: Integer; virtual;
+    procedure SetID_FACTURAValue(const aValue: Integer); virtual;
+    function GetID_FACTURAIsNull: Boolean; virtual;
+    procedure SetID_FACTURAIsNull(const aValue: Boolean); virtual;
+    function GetIMPORTE_TOTALValue: Currency; virtual;
+    procedure SetIMPORTE_TOTALValue(const aValue: Currency); virtual;
+    function GetIMPORTE_TOTALIsNull: Boolean; virtual;
+    procedure SetIMPORTE_TOTALIsNull(const aValue: Boolean); virtual;
+    function GetID_PEDIDOValue: Integer; virtual;
+    procedure SetID_PEDIDOValue(const aValue: Integer); virtual;
+    function GetID_PEDIDOIsNull: Boolean; virtual;
+    procedure SetID_PEDIDOIsNull(const aValue: Boolean); virtual;
+    function GetREFERENCIAValue: String; virtual;
+    procedure SetREFERENCIAValue(const aValue: String); virtual;
+    function GetREFERENCIAIsNull: Boolean; virtual;
+    procedure SetREFERENCIAIsNull(const aValue: Boolean); virtual;
+    function GetFECHA_PEDIDOValue: DateTime; virtual;
+    procedure SetFECHA_PEDIDOValue(const aValue: DateTime); virtual;
+    function GetFECHA_PEDIDOIsNull: Boolean; virtual;
+    procedure SetFECHA_PEDIDOIsNull(const aValue: Boolean); virtual;
+    function GetPROVEEDORValue: String; virtual;
+    procedure SetPROVEEDORValue(const aValue: String); virtual;
+    function GetPROVEEDORIsNull: Boolean; virtual;
+    procedure SetPROVEEDORIsNull(const aValue: Boolean); virtual;
+
+    { Properties }
+    property ID: Integer read GetIDValue write SetIDValue;
+    property IDIsNull: Boolean read GetIDIsNull write SetIDIsNull;
+    property ID_FACTURA: Integer read GetID_FACTURAValue write SetID_FACTURAValue;
+    property ID_FACTURAIsNull: Boolean read GetID_FACTURAIsNull write SetID_FACTURAIsNull;
+    property IMPORTE_TOTAL: Currency read GetIMPORTE_TOTALValue write SetIMPORTE_TOTALValue;
+    property IMPORTE_TOTALIsNull: Boolean read GetIMPORTE_TOTALIsNull write SetIMPORTE_TOTALIsNull;
+    property ID_PEDIDO: Integer read GetID_PEDIDOValue write SetID_PEDIDOValue;
+    property ID_PEDIDOIsNull: Boolean read GetID_PEDIDOIsNull write SetID_PEDIDOIsNull;
+    property REFERENCIA: String read GetREFERENCIAValue write SetREFERENCIAValue;
+    property REFERENCIAIsNull: Boolean read GetREFERENCIAIsNull write SetREFERENCIAIsNull;
+    property FECHA_PEDIDO: DateTime read GetFECHA_PEDIDOValue write SetFECHA_PEDIDOValue;
+    property FECHA_PEDIDOIsNull: Boolean read GetFECHA_PEDIDOIsNull write SetFECHA_PEDIDOIsNull;
+    property PROVEEDOR: String read GetPROVEEDORValue write SetPROVEEDORValue;
+    property PROVEEDORIsNull: Boolean read GetPROVEEDORIsNull write SetPROVEEDORIsNull;
+
+  public
+    constructor Create(aDataTable: TDADataTable); override;
+    destructor Destroy; override;
+
+  end;
+
 implementation
 
 uses Variants, uROBinaryHelpers;
@@ -1681,8 +1808,168 @@ begin
 end;
 
 
+{ TFacturasProveedor_PedidosDataTableRules }
+constructor TFacturasProveedor_PedidosDataTableRules.Create(aDataTable: TDADataTable);
+begin
+  inherited;
+end;
+
+destructor TFacturasProveedor_PedidosDataTableRules.Destroy;
+begin
+  inherited;
+end;
+
+function TFacturasProveedor_PedidosDataTableRules.GetIDValue: Integer;
+begin
+  result := DataTable.Fields[idx_FacturasProveedor_PedidosID].AsInteger;
+end;
+
+procedure TFacturasProveedor_PedidosDataTableRules.SetIDValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_FacturasProveedor_PedidosID].AsInteger := aValue;
+end;
+
+function TFacturasProveedor_PedidosDataTableRules.GetIDIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_FacturasProveedor_PedidosID].IsNull;
+end;
+
+procedure TFacturasProveedor_PedidosDataTableRules.SetIDIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_FacturasProveedor_PedidosID].AsVariant := Null;
+end;
+
+function TFacturasProveedor_PedidosDataTableRules.GetID_FACTURAValue: Integer;
+begin
+  result := DataTable.Fields[idx_FacturasProveedor_PedidosID_FACTURA].AsInteger;
+end;
+
+procedure TFacturasProveedor_PedidosDataTableRules.SetID_FACTURAValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_FacturasProveedor_PedidosID_FACTURA].AsInteger := aValue;
+end;
+
+function TFacturasProveedor_PedidosDataTableRules.GetID_FACTURAIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_FacturasProveedor_PedidosID_FACTURA].IsNull;
+end;
+
+procedure TFacturasProveedor_PedidosDataTableRules.SetID_FACTURAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_FacturasProveedor_PedidosID_FACTURA].AsVariant := Null;
+end;
+
+function TFacturasProveedor_PedidosDataTableRules.GetIMPORTE_TOTALValue: Currency;
+begin
+  result := DataTable.Fields[idx_FacturasProveedor_PedidosIMPORTE_TOTAL].AsCurrency;
+end;
+
+procedure TFacturasProveedor_PedidosDataTableRules.SetIMPORTE_TOTALValue(const aValue: Currency);
+begin
+  DataTable.Fields[idx_FacturasProveedor_PedidosIMPORTE_TOTAL].AsCurrency := aValue;
+end;
+
+function TFacturasProveedor_PedidosDataTableRules.GetIMPORTE_TOTALIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_FacturasProveedor_PedidosIMPORTE_TOTAL].IsNull;
+end;
+
+procedure TFacturasProveedor_PedidosDataTableRules.SetIMPORTE_TOTALIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_FacturasProveedor_PedidosIMPORTE_TOTAL].AsVariant := Null;
+end;
+
+function TFacturasProveedor_PedidosDataTableRules.GetID_PEDIDOValue: Integer;
+begin
+  result := DataTable.Fields[idx_FacturasProveedor_PedidosID_PEDIDO].AsInteger;
+end;
+
+procedure TFacturasProveedor_PedidosDataTableRules.SetID_PEDIDOValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_FacturasProveedor_PedidosID_PEDIDO].AsInteger := aValue;
+end;
+
+function TFacturasProveedor_PedidosDataTableRules.GetID_PEDIDOIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_FacturasProveedor_PedidosID_PEDIDO].IsNull;
+end;
+
+procedure TFacturasProveedor_PedidosDataTableRules.SetID_PEDIDOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_FacturasProveedor_PedidosID_PEDIDO].AsVariant := Null;
+end;
+
+function TFacturasProveedor_PedidosDataTableRules.GetREFERENCIAValue: String;
+begin
+  result := DataTable.Fields[idx_FacturasProveedor_PedidosREFERENCIA].AsString;
+end;
+
+procedure TFacturasProveedor_PedidosDataTableRules.SetREFERENCIAValue(const aValue: String);
+begin
+  DataTable.Fields[idx_FacturasProveedor_PedidosREFERENCIA].AsString := aValue;
+end;
+
+function TFacturasProveedor_PedidosDataTableRules.GetREFERENCIAIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_FacturasProveedor_PedidosREFERENCIA].IsNull;
+end;
+
+procedure TFacturasProveedor_PedidosDataTableRules.SetREFERENCIAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_FacturasProveedor_PedidosREFERENCIA].AsVariant := Null;
+end;
+
+function TFacturasProveedor_PedidosDataTableRules.GetFECHA_PEDIDOValue: DateTime;
+begin
+  result := DataTable.Fields[idx_FacturasProveedor_PedidosFECHA_PEDIDO].AsDateTime;
+end;
+
+procedure TFacturasProveedor_PedidosDataTableRules.SetFECHA_PEDIDOValue(const aValue: DateTime);
+begin
+  DataTable.Fields[idx_FacturasProveedor_PedidosFECHA_PEDIDO].AsDateTime := aValue;
+end;
+
+function TFacturasProveedor_PedidosDataTableRules.GetFECHA_PEDIDOIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_FacturasProveedor_PedidosFECHA_PEDIDO].IsNull;
+end;
+
+procedure TFacturasProveedor_PedidosDataTableRules.SetFECHA_PEDIDOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_FacturasProveedor_PedidosFECHA_PEDIDO].AsVariant := Null;
+end;
+
+function TFacturasProveedor_PedidosDataTableRules.GetPROVEEDORValue: String;
+begin
+  result := DataTable.Fields[idx_FacturasProveedor_PedidosPROVEEDOR].AsString;
+end;
+
+procedure TFacturasProveedor_PedidosDataTableRules.SetPROVEEDORValue(const aValue: String);
+begin
+  DataTable.Fields[idx_FacturasProveedor_PedidosPROVEEDOR].AsString := aValue;
+end;
+
+function TFacturasProveedor_PedidosDataTableRules.GetPROVEEDORIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_FacturasProveedor_PedidosPROVEEDOR].IsNull;
+end;
+
+procedure TFacturasProveedor_PedidosDataTableRules.SetPROVEEDORIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_FacturasProveedor_PedidosPROVEEDOR].AsVariant := Null;
+end;
+
+
 initialization
   RegisterDataTableRules(RID_FacturasProveedor, TFacturasProveedorDataTableRules);
   RegisterDataTableRules(RID_FacturasProveedor_Detalles, TFacturasProveedor_DetallesDataTableRules);
+  RegisterDataTableRules(RID_FacturasProveedor_Pedidos, TFacturasProveedor_PedidosDataTableRules);
 
 end.
diff --git a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas
index 371391ed..2855459f 100644
--- a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas	
+++ b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas	
@@ -9,13 +9,14 @@ const
   { Delta rules ids 
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_FacturasProveedorDelta = '{E53CF4C8-D5FB-42BC-AA69-3E77733F61F0}';
-  RID_FacturasProveedor_DetallesDelta = '{6CC27603-B23C-40C4-9D22-8CFC5E1B738F}';
+  RID_FacturasProveedorDelta = '{6BF5A590-3DB6-42E2-8EBC-F025A961ACF3}';
+  RID_FacturasProveedor_DetallesDelta = '{7AF5266B-6F21-4093-A081-6F70DB42DFF6}';
+  RID_FacturasProveedor_PedidosDelta = '{1E86BD08-B170-47CB-9B6F-DA6B41DE6EDE}';
 
 type
   { IFacturasProveedorDelta }
   IFacturasProveedorDelta = interface(IFacturasProveedor)
-  ['{E53CF4C8-D5FB-42BC-AA69-3E77733F61F0}']
+  ['{6BF5A590-3DB6-42E2-8EBC-F025A961ACF3}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -410,7 +411,7 @@ type
 
   { IFacturasProveedor_DetallesDelta }
   IFacturasProveedor_DetallesDelta = interface(IFacturasProveedor_Detalles)
-  ['{6CC27603-B23C-40C4-9D22-8CFC5E1B738F}']
+  ['{7AF5266B-6F21-4093-A081-6F70DB42DFF6}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_FACTURAValue : Integer;
@@ -598,6 +599,112 @@ type
 
   end;
 
+  { IFacturasProveedor_PedidosDelta }
+  IFacturasProveedor_PedidosDelta = interface(IFacturasProveedor_Pedidos)
+  ['{1E86BD08-B170-47CB-9B6F-DA6B41DE6EDE}']
+    { Property getters and setters }
+    function GetOldIDValue : Integer;
+    function GetOldID_FACTURAValue : Integer;
+    function GetOldIMPORTE_TOTALValue : Currency;
+    function GetOldID_PEDIDOValue : Integer;
+    function GetOldREFERENCIAValue : String;
+    function GetOldFECHA_PEDIDOValue : DateTime;
+    function GetOldPROVEEDORValue : String;
+
+    { Properties }
+    property OldID : Integer read GetOldIDValue;
+    property OldID_FACTURA : Integer read GetOldID_FACTURAValue;
+    property OldIMPORTE_TOTAL : Currency read GetOldIMPORTE_TOTALValue;
+    property OldID_PEDIDO : Integer read GetOldID_PEDIDOValue;
+    property OldREFERENCIA : String read GetOldREFERENCIAValue;
+    property OldFECHA_PEDIDO : DateTime read GetOldFECHA_PEDIDOValue;
+    property OldPROVEEDOR : String read GetOldPROVEEDORValue;
+  end;
+
+  { TFacturasProveedor_PedidosBusinessProcessorRules }
+  TFacturasProveedor_PedidosBusinessProcessorRules = class(TDABusinessProcessorRules, IFacturasProveedor_Pedidos, IFacturasProveedor_PedidosDelta)
+  private
+  protected
+    { Property getters and setters }
+    function GetIDValue: Integer; virtual;
+    function GetIDIsNull: Boolean; virtual;
+    function GetOldIDValue: Integer; virtual;
+    function GetOldIDIsNull: Boolean; virtual;
+    procedure SetIDValue(const aValue: Integer); virtual;
+    procedure SetIDIsNull(const aValue: Boolean); virtual;
+    function GetID_FACTURAValue: Integer; virtual;
+    function GetID_FACTURAIsNull: Boolean; virtual;
+    function GetOldID_FACTURAValue: Integer; virtual;
+    function GetOldID_FACTURAIsNull: Boolean; virtual;
+    procedure SetID_FACTURAValue(const aValue: Integer); virtual;
+    procedure SetID_FACTURAIsNull(const aValue: Boolean); virtual;
+    function GetIMPORTE_TOTALValue: Currency; virtual;
+    function GetIMPORTE_TOTALIsNull: Boolean; virtual;
+    function GetOldIMPORTE_TOTALValue: Currency; virtual;
+    function GetOldIMPORTE_TOTALIsNull: Boolean; virtual;
+    procedure SetIMPORTE_TOTALValue(const aValue: Currency); virtual;
+    procedure SetIMPORTE_TOTALIsNull(const aValue: Boolean); virtual;
+    function GetID_PEDIDOValue: Integer; virtual;
+    function GetID_PEDIDOIsNull: Boolean; virtual;
+    function GetOldID_PEDIDOValue: Integer; virtual;
+    function GetOldID_PEDIDOIsNull: Boolean; virtual;
+    procedure SetID_PEDIDOValue(const aValue: Integer); virtual;
+    procedure SetID_PEDIDOIsNull(const aValue: Boolean); virtual;
+    function GetREFERENCIAValue: String; virtual;
+    function GetREFERENCIAIsNull: Boolean; virtual;
+    function GetOldREFERENCIAValue: String; virtual;
+    function GetOldREFERENCIAIsNull: Boolean; virtual;
+    procedure SetREFERENCIAValue(const aValue: String); virtual;
+    procedure SetREFERENCIAIsNull(const aValue: Boolean); virtual;
+    function GetFECHA_PEDIDOValue: DateTime; virtual;
+    function GetFECHA_PEDIDOIsNull: Boolean; virtual;
+    function GetOldFECHA_PEDIDOValue: DateTime; virtual;
+    function GetOldFECHA_PEDIDOIsNull: Boolean; virtual;
+    procedure SetFECHA_PEDIDOValue(const aValue: DateTime); virtual;
+    procedure SetFECHA_PEDIDOIsNull(const aValue: Boolean); virtual;
+    function GetPROVEEDORValue: String; virtual;
+    function GetPROVEEDORIsNull: Boolean; virtual;
+    function GetOldPROVEEDORValue: String; virtual;
+    function GetOldPROVEEDORIsNull: Boolean; virtual;
+    procedure SetPROVEEDORValue(const aValue: String); virtual;
+    procedure SetPROVEEDORIsNull(const aValue: Boolean); virtual;
+
+    { Properties }
+    property ID : Integer read GetIDValue write SetIDValue;
+    property IDIsNull : Boolean read GetIDIsNull write SetIDIsNull;
+    property OldID : Integer read GetOldIDValue;
+    property OldIDIsNull : Boolean read GetOldIDIsNull;
+    property ID_FACTURA : Integer read GetID_FACTURAValue write SetID_FACTURAValue;
+    property ID_FACTURAIsNull : Boolean read GetID_FACTURAIsNull write SetID_FACTURAIsNull;
+    property OldID_FACTURA : Integer read GetOldID_FACTURAValue;
+    property OldID_FACTURAIsNull : Boolean read GetOldID_FACTURAIsNull;
+    property IMPORTE_TOTAL : Currency read GetIMPORTE_TOTALValue write SetIMPORTE_TOTALValue;
+    property IMPORTE_TOTALIsNull : Boolean read GetIMPORTE_TOTALIsNull write SetIMPORTE_TOTALIsNull;
+    property OldIMPORTE_TOTAL : Currency read GetOldIMPORTE_TOTALValue;
+    property OldIMPORTE_TOTALIsNull : Boolean read GetOldIMPORTE_TOTALIsNull;
+    property ID_PEDIDO : Integer read GetID_PEDIDOValue write SetID_PEDIDOValue;
+    property ID_PEDIDOIsNull : Boolean read GetID_PEDIDOIsNull write SetID_PEDIDOIsNull;
+    property OldID_PEDIDO : Integer read GetOldID_PEDIDOValue;
+    property OldID_PEDIDOIsNull : Boolean read GetOldID_PEDIDOIsNull;
+    property REFERENCIA : String read GetREFERENCIAValue write SetREFERENCIAValue;
+    property REFERENCIAIsNull : Boolean read GetREFERENCIAIsNull write SetREFERENCIAIsNull;
+    property OldREFERENCIA : String read GetOldREFERENCIAValue;
+    property OldREFERENCIAIsNull : Boolean read GetOldREFERENCIAIsNull;
+    property FECHA_PEDIDO : DateTime read GetFECHA_PEDIDOValue write SetFECHA_PEDIDOValue;
+    property FECHA_PEDIDOIsNull : Boolean read GetFECHA_PEDIDOIsNull write SetFECHA_PEDIDOIsNull;
+    property OldFECHA_PEDIDO : DateTime read GetOldFECHA_PEDIDOValue;
+    property OldFECHA_PEDIDOIsNull : Boolean read GetOldFECHA_PEDIDOIsNull;
+    property PROVEEDOR : String read GetPROVEEDORValue write SetPROVEEDORValue;
+    property PROVEEDORIsNull : Boolean read GetPROVEEDORIsNull write SetPROVEEDORIsNull;
+    property OldPROVEEDOR : String read GetOldPROVEEDORValue;
+    property OldPROVEEDORIsNull : Boolean read GetOldPROVEEDORIsNull;
+
+  public
+    constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
+    destructor Destroy; override;
+
+  end;
+
 implementation
 
 uses
@@ -2030,8 +2137,238 @@ begin
 end;
 
 
+{ TFacturasProveedor_PedidosBusinessProcessorRules }
+constructor TFacturasProveedor_PedidosBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
+begin
+  inherited;
+end;
+
+destructor TFacturasProveedor_PedidosBusinessProcessorRules.Destroy;
+begin
+  inherited;
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetIDValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosID];
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetIDIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosID]);
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetOldIDValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedor_PedidosID];
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetOldIDIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedor_PedidosID]);
+end;
+
+procedure TFacturasProveedor_PedidosBusinessProcessorRules.SetIDValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosID] := aValue;
+end;
+
+procedure TFacturasProveedor_PedidosBusinessProcessorRules.SetIDIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosID] := Null;
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetID_FACTURAValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosID_FACTURA];
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetID_FACTURAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosID_FACTURA]);
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetOldID_FACTURAValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedor_PedidosID_FACTURA];
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetOldID_FACTURAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedor_PedidosID_FACTURA]);
+end;
+
+procedure TFacturasProveedor_PedidosBusinessProcessorRules.SetID_FACTURAValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosID_FACTURA] := aValue;
+end;
+
+procedure TFacturasProveedor_PedidosBusinessProcessorRules.SetID_FACTURAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosID_FACTURA] := Null;
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetIMPORTE_TOTALValue: Currency;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosIMPORTE_TOTAL];
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetIMPORTE_TOTALIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosIMPORTE_TOTAL]);
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetOldIMPORTE_TOTALValue: Currency;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedor_PedidosIMPORTE_TOTAL];
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetOldIMPORTE_TOTALIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedor_PedidosIMPORTE_TOTAL]);
+end;
+
+procedure TFacturasProveedor_PedidosBusinessProcessorRules.SetIMPORTE_TOTALValue(const aValue: Currency);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosIMPORTE_TOTAL] := aValue;
+end;
+
+procedure TFacturasProveedor_PedidosBusinessProcessorRules.SetIMPORTE_TOTALIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosIMPORTE_TOTAL] := Null;
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetID_PEDIDOValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosID_PEDIDO];
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetID_PEDIDOIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosID_PEDIDO]);
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetOldID_PEDIDOValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedor_PedidosID_PEDIDO];
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetOldID_PEDIDOIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedor_PedidosID_PEDIDO]);
+end;
+
+procedure TFacturasProveedor_PedidosBusinessProcessorRules.SetID_PEDIDOValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosID_PEDIDO] := aValue;
+end;
+
+procedure TFacturasProveedor_PedidosBusinessProcessorRules.SetID_PEDIDOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosID_PEDIDO] := Null;
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetREFERENCIAValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosREFERENCIA];
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetREFERENCIAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosREFERENCIA]);
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetOldREFERENCIAValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedor_PedidosREFERENCIA];
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetOldREFERENCIAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedor_PedidosREFERENCIA]);
+end;
+
+procedure TFacturasProveedor_PedidosBusinessProcessorRules.SetREFERENCIAValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosREFERENCIA] := aValue;
+end;
+
+procedure TFacturasProveedor_PedidosBusinessProcessorRules.SetREFERENCIAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosREFERENCIA] := Null;
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetFECHA_PEDIDOValue: DateTime;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosFECHA_PEDIDO];
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetFECHA_PEDIDOIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosFECHA_PEDIDO]);
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetOldFECHA_PEDIDOValue: DateTime;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedor_PedidosFECHA_PEDIDO];
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetOldFECHA_PEDIDOIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedor_PedidosFECHA_PEDIDO]);
+end;
+
+procedure TFacturasProveedor_PedidosBusinessProcessorRules.SetFECHA_PEDIDOValue(const aValue: DateTime);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosFECHA_PEDIDO] := aValue;
+end;
+
+procedure TFacturasProveedor_PedidosBusinessProcessorRules.SetFECHA_PEDIDOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosFECHA_PEDIDO] := Null;
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetPROVEEDORValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosPROVEEDOR];
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetPROVEEDORIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosPROVEEDOR]);
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetOldPROVEEDORValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedor_PedidosPROVEEDOR];
+end;
+
+function TFacturasProveedor_PedidosBusinessProcessorRules.GetOldPROVEEDORIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedor_PedidosPROVEEDOR]);
+end;
+
+procedure TFacturasProveedor_PedidosBusinessProcessorRules.SetPROVEEDORValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosPROVEEDOR] := aValue;
+end;
+
+procedure TFacturasProveedor_PedidosBusinessProcessorRules.SetPROVEEDORIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedor_PedidosPROVEEDOR] := Null;
+end;
+
+
 initialization
   RegisterBusinessProcessorRules(RID_FacturasProveedorDelta, TFacturasProveedorBusinessProcessorRules);
   RegisterBusinessProcessorRules(RID_FacturasProveedor_DetallesDelta, TFacturasProveedor_DetallesBusinessProcessorRules);
+  RegisterBusinessProcessorRules(RID_FacturasProveedor_PedidosDelta, TFacturasProveedor_PedidosBusinessProcessorRules);
 
 end.
diff --git a/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas b/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas
index 16e82a2c..edaf86a7 100644
--- a/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas	
+++ b/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas	
@@ -4,7 +4,8 @@ interface
 
 uses
   uDAInterfaces, uDADataTable, schFacturasProveedorClient_Intf,
-  uBizContactos, uBizDetallesFacturaProveedor, uDBSelectionListUtils, Classes;
+  uBizContactos, uBizDetallesFacturaProveedor, uBizPedidosFacturaProveedor,
+  uDBSelectionListUtils, Classes;
 
 const
   BIZ_CLIENT_FACTURA_PROVEEDOR = 'Client.FacturaProveedor';
@@ -34,6 +35,10 @@ type
     procedure SetDetalles(Value: IBizDetallesFacturaProveedor);
     property Detalles: IBizDetallesFacturaProveedor read GetDetalles write SetDetalles;
 
+    function GetPedidos: IBizPedidosFacturaProveedor;
+    procedure SetPedidos(Value: IBizPedidosFacturaProveedor);
+    property Pedidos: IBizPedidosFacturaProveedor read GetPedidos write SetPedidos;
+
 		function EsNuevo : Boolean;
     procedure CalcularImporteTotal;
   end;
@@ -50,6 +55,8 @@ type
     FProveedor : IBizProveedor;
     FDetalles : IBizDetallesFacturaProveedor;
     FDetallesLink : TDADataSource;
+    FPedidos: IBizPedidosFacturaProveedor;
+    FPedidosLink : TDADataSource;
 
     procedure SetProveedor(AValue : IBizProveedor);
     function GetProveedor : IBizProveedor;
@@ -60,6 +67,9 @@ type
     function GetDetalles: IBizDetallesFacturaProveedor;
     procedure SetDetalles(Value: IBizDetallesFacturaProveedor);
 
+    function GetPedidos: IBizPedidosFacturaProveedor;
+    procedure SetPedidos(Value: IBizPedidosFacturaProveedor);
+
     procedure RECARGO_EQUIVALENCIAOnChange(Sender: TDACustomField);
     procedure ID_TIPO_IVAOnChange(Sender: TDACustomField);
 
@@ -79,6 +89,7 @@ type
     property Proveedor : IBizProveedor read GetProveedor write SetProveedor;
     property _Proveedor : IBizProveedor read _GetProveedor write _SetProveedor;
     property Detalles: IBizDetallesFacturaProveedor read GetDetalles write SetDetalles;
+    property Pedidos: IBizPedidosFacturaProveedor read GetPedidos write SetPedidos;
 
     property SeleccionableInterface : ISeleccionable read FSeleccionableInterface
         write FSeleccionableInterface implements ISeleccionable;
@@ -192,6 +203,9 @@ begin
   FDetallesLink := TDADataSource.Create(NIL);
   FDetallesLink.DataTable := aDataTable;
 
+  FPedidosLink := TDADataSource.Create(NIL);
+  FPedidosLink.DataTable := aDataTable;
+
   FSeleccionableInterface := TSeleccionable.Create(aDataTable);
 end;
 
@@ -205,11 +219,18 @@ begin
   FProveedor := NIL;
   FDetalles := NIL;
   FDetallesLink.Free;
+  FPedidos := NIL;
+  FPedidosLink.Free;
 
   FSeleccionableInterface := NIL;
   inherited;
 end;
 
+function TBizFacturaProveedor.GetPedidos: IBizPedidosFacturaProveedor;
+begin
+  Result := FPedidos;
+end;
+
 function TBizFacturaProveedor.GetProveedor: IBizProveedor;
 begin
   Result := FProveedor;
@@ -269,6 +290,12 @@ begin
   CalcularImporteTotal;
 end;
 
+procedure TBizFacturaProveedor.SetPedidos(Value: IBizPedidosFacturaProveedor);
+begin
+  FPedidos := Value;
+  EnlazarMaestroDetalle(FPedidosLink, FPedidos);
+end;
+
 procedure TBizFacturaProveedor.SetProveedor(AValue: IBizProveedor);
 var
   bEnEdicion : Boolean;
diff --git a/Source/Modulos/Facturas de proveedor/Model/uBizPedidosFacturaProveedor.pas b/Source/Modulos/Facturas de proveedor/Model/uBizPedidosFacturaProveedor.pas
new file mode 100644
index 00000000..b64a45eb
--- /dev/null
+++ b/Source/Modulos/Facturas de proveedor/Model/uBizPedidosFacturaProveedor.pas	
@@ -0,0 +1,47 @@
+unit uBizPedidosFacturaProveedor;
+
+interface
+
+uses
+  uDAInterfaces, uDADataTable, schFacturasProveedorClient_Intf;
+
+const
+  BIZ_CLIENT_PEDIDOS_FACTURA_PROVEEDOR = 'Client.PedidosFacturaProveedor';
+
+type
+  IBizPedidosFacturaProveedor = interface(IFacturasProveedor_Pedidos)
+  ['{D0426F98-561B-46F1-9ADC-31A8BB1D68F4}']
+  end;
+
+  TBizPedidosFacturaProveedor = class(TFacturasProveedor_PedidosDataTableRules, IBizPedidosFacturaProveedor)
+  protected
+    procedure OnNewRecord(Sender: TDADataTable); override;
+    procedure BeforeInsert(Sender: TDADataTable); override;
+  end;
+
+implementation
+
+uses
+  SysUtils, DB;
+
+{ TBizPedidosFacturaProveedor }
+
+procedure TBizPedidosFacturaProveedor.BeforeInsert(Sender: TDADataTable);
+var
+  AMasterTable : TDADataTable;
+begin
+  inherited;
+  AMasterTable := DataTable.GetMasterDataTable;
+  if Assigned(AMasterTable) and (AMasterTable.State = dsInsert) then
+    AMasterTable.Post;
+end;
+
+procedure TBizPedidosFacturaProveedor.OnNewRecord(Sender: TDADataTable);
+begin
+  inherited;
+end;
+
+initialization
+  RegisterDataTableRules(BIZ_CLIENT_PEDIDOS_FACTURA_PROVEEDOR, TBizPedidosFacturaProveedor);
+
+end.
diff --git a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm
index ff1905f4..833e79f8 100644
--- a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm	
+++ b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm	
@@ -8,7 +8,7 @@ object srvFacturasProveedor: TsrvFacturasProveedor
   ServiceDataStreamer = Bin2DataStreamer
   ExportedDataTables = <>
   BeforeAcquireConnection = DataAbstractServiceBeforeAcquireConnection
-  Height = 180
+  Height = 216
   Width = 386
   object schFacturasProveedor: TDASchema
     ConnectionManager = dmServer.ConnectionManager
@@ -479,6 +479,97 @@ object srvFacturasProveedor: TsrvFacturasProveedor
             Size = 255
             DictionaryEntry = 'FacturasProveedor_Detalles_REFERENCIA_PROVEEDOR'
           end>
+      end
+      item
+        Params = <>
+        Statements = <
+          item
+            Connection = 'IBX'
+            TargetTable = 'FACTURAS_PROVEEDOR_PEDIDOS'
+            SQL = 
+              'SELECT'#10'    FACTURAS_PROVEEDOR_PEDIDOS.ID, FACTURAS_PROVEEDOR_PED' +
+              'IDOS.ID_FACTURA,'#10'    FACTURAS_PROVEEDOR_PEDIDOS.IMPORTE_TOTAL,'#10#10 +
+              '    FACTURAS_PROVEEDOR_PEDIDOS.ID_PEDIDO,'#10#10'    V_PEDIDOS_PROVEED' +
+              'OR.REFERENCIA, V_PEDIDOS_PROVEEDOR.FECHA_PEDIDO, V_PEDIDOS_PROVE' +
+              'EDOR.NOMBRE as PROVEEDOR'#10'FROM FACTURAS_PROVEEDOR_PEDIDOS'#10'LEFT JO' +
+              'IN V_PEDIDOS_PROVEEDOR ON FACTURAS_PROVEEDOR_PEDIDOS.ID_PEDIDO =' +
+              ' V_PEDIDOS_PROVEEDOR.ID'#10'WHERE {where}'#10
+            StatementType = stSQL
+            ColumnMappings = <
+              item
+                DatasetField = 'ID'
+                TableField = 'ID'
+              end
+              item
+                DatasetField = 'ID_FACTURA'
+                TableField = 'ID_FACTURA'
+              end
+              item
+                DatasetField = 'IMPORTE_TOTAL'
+                TableField = 'IMPORTE_TOTAL'
+              end
+              item
+                DatasetField = 'ID_PEDIDO'
+                TableField = '<unknown>'
+                SQLOrigin = 'ID_PEDIDO'
+              end
+              item
+                DatasetField = 'REFERENCIA'
+                TableField = '<unknown>'
+                SQLOrigin = 'REFERENCIA'
+              end
+              item
+                DatasetField = 'FECHA_PEDIDO'
+                TableField = '<unknown>'
+                SQLOrigin = 'FECHA_PEDIDO'
+              end
+              item
+                DatasetField = 'PROVEEDOR'
+                TableField = '<unknown>'
+                SQLOrigin = 'PROVEEDOR'
+              end>
+          end>
+        Name = 'FacturasProveedor_Pedidos'
+        Fields = <
+          item
+            Name = 'ID'
+            DataType = datAutoInc
+            GeneratorName = 'GEN_PEDIDOS_PROV_PEDIDOS_ID'
+            DictionaryEntry = 'FacturasProveedor_Pedidos_ID'
+            InPrimaryKey = True
+          end
+          item
+            Name = 'ID_FACTURA'
+            DataType = datInteger
+            DictionaryEntry = 'FacturasProveedor_Pedidos_ID_FACTURA'
+          end
+          item
+            Name = 'IMPORTE_TOTAL'
+            DataType = datCurrency
+            DictionaryEntry = 'FacturasProveedor_Pedidos_IMPORTE_TOTAL'
+          end
+          item
+            Name = 'ID_PEDIDO'
+            DataType = datInteger
+            DictionaryEntry = 'FacturasProveedor_Pedidos_ID_PEDIDO'
+          end
+          item
+            Name = 'REFERENCIA'
+            DataType = datString
+            Size = 255
+            DictionaryEntry = 'FacturasProveedor_Pedidos_REFERENCIA'
+          end
+          item
+            Name = 'FECHA_PEDIDO'
+            DataType = datDateTime
+            DictionaryEntry = 'FacturasProveedor_Pedidos_FECHA_PEDIDO'
+          end
+          item
+            Name = 'PROVEEDOR'
+            DataType = datString
+            Size = 255
+            DictionaryEntry = 'FacturasProveedor_Pedidos_PROVEEDOR'
+          end>
       end>
     JoinDataTables = <>
     UnionDataTables = <>
@@ -975,13 +1066,107 @@ object srvFacturasProveedor: TsrvFacturasProveedor
             ColumnMappings = <>
           end>
         Name = 'Update_FacturasProveedor_Detalles'
+      end
+      item
+        Params = <
+          item
+            Name = 'ID'
+            DataType = datAutoInc
+            GeneratorName = 'GEN_PEDIDOS_PROV_PEDIDOS_ID'
+            Value = ''
+          end
+          item
+            Name = 'ID_FACTURA'
+            Value = ''
+          end
+          item
+            Name = 'ID_PEDIDO'
+            Value = ''
+          end
+          item
+            Name = 'IMPORTE_TOTAL'
+            Value = ''
+          end>
+        Statements = <
+          item
+            Connection = 'IBX'
+            Default = True
+            TargetTable = 'FACTURAS_PROVEEDOR_PEDIDOS'
+            SQL = 
+              'INSERT'#10'  INTO FACTURAS_PROVEEDOR_PEDIDOS'#10'    (ID, ID_FACTURA, ID' +
+              '_PEDIDO, IMPORTE_TOTAL)'#10'  VALUES'#10'    (:ID, :ID_FACTURA, :ID_PEDI' +
+              'DO, :IMPORTE_TOTAL)'#10
+            StatementType = stSQL
+            ColumnMappings = <>
+          end>
+        Name = 'Insert_FacturasProveedor_Pedidos'
+      end
+      item
+        Params = <
+          item
+            Name = 'OLD_ID'
+            DataType = datAutoInc
+            Value = '0'
+          end>
+        Statements = <
+          item
+            Connection = 'IBX'
+            Default = True
+            TargetTable = 'FACTURAS_PROVEEDOR_PEDIDOS'
+            SQL = 
+              'DELETE '#10'  FROM'#10'    FACTURAS_PROVEEDOR_PEDIDOS'#10'  WHERE'#10'    (ID = ' +
+              ':OLD_ID)'
+            StatementType = stSQL
+            ColumnMappings = <>
+          end>
+        Name = 'Delete_FacturasProveedor_Pedidos'
+      end
+      item
+        Params = <
+          item
+            Name = 'ID_FACTURA'
+            Value = ''
+          end
+          item
+            Name = 'IMPORTE_TOTAL'
+            Value = ''
+          end
+          item
+            Name = 'ID_PEDIDO'
+            Value = ''
+          end
+          item
+            Name = 'OLD_ID'
+            Value = ''
+          end>
+        Statements = <
+          item
+            Connection = 'IBX'
+            Default = True
+            TargetTable = 'FACTURAS_PROVEEDOR_PEDIDOS'
+            SQL = 
+              'UPDATE FACTURAS_PROVEEDOR_PEDIDOS'#10'  SET '#10'    ID_FACTURA = :ID_FA' +
+              'CTURA, '#10'    IMPORTE_TOTAL = :IMPORTE_TOTAL, '#10'    ID_PEDIDO = :ID' +
+              '_PEDIDO'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
+            StatementType = stSQL
+            ColumnMappings = <>
+          end>
+        Name = 'Update_FacturasProveedor_Pedidos'
       end>
     RelationShips = <
+      item
+        Name = 'FK_FacturasProveedor_Pedidos'
+        MasterDatasetName = 'FacturasProveedor'
+        MasterFields = 'ID'
+        DetailDatasetName = 'FacturasProveedor_Pedidos'
+        DetailFields = 'ID_FACTURA'
+        RelationshipType = rtForeignKey
+      end
       item
         Name = 'FK_FacturasProveedor_Detalles'
         MasterDatasetName = 'FacturasProveedor'
         MasterFields = 'ID'
-        DetailDatasetName = 'FacturasProveedor_Detalles'
+        DetailDatasetName = 'FacturasProveedor_Pedidos'
         DetailFields = 'ID_FACTURA'
         RelationshipType = rtForeignKey
       end>
@@ -1000,6 +1185,13 @@ object srvFacturasProveedor: TsrvFacturasProveedor
         DatasetName = 'FacturasProveedor_Detalles'
         FailureBehavior = fbRaiseException
       end
+      item
+        Name = 'Insert FacturasProveedor_Pedidos'
+        DoUpdate = False
+        DoDelete = False
+        DatasetName = 'FacturasProveedor_Pedidos'
+        FailureBehavior = fbRaiseException
+      end
       item
         Name = 'Update FacturasProveedor'
         DoInsert = False
@@ -1014,6 +1206,13 @@ object srvFacturasProveedor: TsrvFacturasProveedor
         DatasetName = 'FacturasProveedor_Detalles'
         FailureBehavior = fbRaiseException
       end
+      item
+        Name = 'Update FacturasProveedor_Pedidos'
+        DoInsert = False
+        DoDelete = False
+        DatasetName = 'FacturasProveedor_Pedidos'
+        FailureBehavior = fbRaiseException
+      end
       item
         Name = 'Delete FacturasProveedor_Detalles'
         DoUpdate = False
@@ -1021,6 +1220,13 @@ object srvFacturasProveedor: TsrvFacturasProveedor
         DatasetName = 'FacturasProveedor_Detalles'
         FailureBehavior = fbRaiseException
       end
+      item
+        Name = 'Delete FacturasProveedor_Pedidos'
+        DoUpdate = False
+        DoInsert = False
+        DatasetName = 'FacturasProveedor_Pedidos'
+        FailureBehavior = fbRaiseException
+      end
       item
         Name = 'Delete FacturasProveedor'
         DoUpdate = False
@@ -1321,6 +1527,42 @@ object srvFacturasProveedor: TsrvFacturasProveedor
         DataType = datString
         Size = 255
         DisplayLabel = 'REFERENCIA_PROVEEDOR'
+      end
+      item
+        Name = 'FacturasProveedor_Pedidos_ID'
+        DataType = datAutoInc
+        GeneratorName = 'GEN_PEDIDOS_PROV_PEDIDOS_ID'
+        DisplayLabel = 'ID'
+      end
+      item
+        Name = 'FacturasProveedor_Pedidos_ID_FACTURA'
+        DataType = datInteger
+      end
+      item
+        Name = 'FacturasProveedor_Pedidos_IMPORTE_TOTAL'
+        DataType = datCurrency
+        DisplayLabel = 'Importe total'
+      end
+      item
+        Name = 'FacturasProveedor_Pedidos_ID_PEDIDO'
+        DataType = datInteger
+      end
+      item
+        Name = 'FacturasProveedor_Pedidos_REFERENCIA'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Ref. pedido'
+      end
+      item
+        Name = 'FacturasProveedor_Pedidos_FECHA_PEDIDO'
+        DataType = datDateTime
+        DisplayLabel = 'Fecha'
+      end
+      item
+        Name = 'FacturasProveedor_Pedidos_PROVEEDOR'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Proveedor'
       end>
     Left = 150
     Top = 22
@@ -1351,4 +1593,15 @@ object srvFacturasProveedor: TsrvFacturasProveedor
     Left = 48
     Top = 80
   end
+  object bpFacturasProveedor_Pedidos: TDABusinessProcessor
+    Schema = schFacturasProveedor
+    InsertCommandName = 'Insert_FacturasProveedor_Pedidos'
+    DeleteCommandName = 'Delete_FacturasProveedor_Pedidos'
+    UpdateCommandName = 'Update_FacturasProveedor_Pedidos'
+    ReferencedDataset = 'FacturasProveedor_Pedidos'
+    ProcessorOptions = [poPrepareCommands]
+    UpdateMode = updWhereKeyOnly
+    Left = 280
+    Top = 128
+  end
 end
diff --git a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.pas b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.pas
index 0f1ff7fa..3c2350ea 100644
--- a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.pas	
+++ b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.pas	
@@ -25,6 +25,7 @@ type
     bpFacturasProveedor: TDABusinessProcessor;
     bpFacturasProveedor_Detalles: TDABusinessProcessor;
     Bin2DataStreamer: TDABin2DataStreamer;
+    bpFacturasProveedor_Pedidos: TDABusinessProcessor;
     schFacturasProveedor: TDASchema;
     DataDictionary: TDADataDictionary;
     procedure DARemoteServiceBeforeGetDatasetData(const Dataset: IDADataset;
diff --git a/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dpk b/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dpk
index 6e83531dd6610f51d6dfed742dfb17d2c203c9b4..395d893d97aea975b9b504398b48f8b458daacb4 100644
GIT binary patch
literal 2647
zcmai0TW^~%7~ONE{0AN?Rhp)%ohGf?o(vdfm79R3mzT-`Cv!_oW=NZ=>VKaxF}IK;
z4~g@g^PTUClQm9W@RDd2PRb3(MZoh{LeiW+y;Ab_dpem;KF&hz>jfvpXLSY+vOVp(
zK1UG@W8{00=6lkj`@REbz|nlmk_Hp%w>I)DUoqf)3_TN?(SsL*du2s#;D<3ZO%Q{|
z<{N*Yanoo!z5$%*!PR}IWAp4N4v~0QZhip0JyVQa^a!d{8`=zpmgC>47`uE!;Ms6!
zgBA>-XTWY95wM_%X2^t1tx*h&8!H4Z6v^!L;)ej5z%)Y`wZ<6;>kL((x_NgYiXqS)
zXo!x+jf9Il=-s*zdW71QY$|er4RsJf?d->8_1akj2N@{VZ;@l}yr&aR{%xoj-gKgk
z3^~bJ$@45D{M$HTm8T?=n0<?MTo8E%yrjt{%L}<BwJDodyYnO#Nq%yY;gaS|g0D%f
z!OQwHovV|HOAO{k$;JLX8966U=GB$*N$2vE77VZD35&(tNrYtO&!0(B7JavXEscD&
z&KY54VP0KIzreGFZhaQHh*)fnS*qe}<ssQRbj~q<R~e++_%B(J_N#58AlnGlI>TfO
zQ(ES{W2nkeun6?LUhbrAPE!RW+dw>WM&0_>2)E^)9^9@)#fp<|qZi5w;co<(vXbxt
zQZ=w|@)rx5knfk5KXp;|OCKCHZ3YSk=6FT2zNe8d7GyxQGh7sYLNIF@QYTDZyritx
z*s2bPW)!o&u0zGPrqN4h29lbyG#3t|pqo^bzK$#A{~o`IX7%meb_@$`F`E-I5NyGK
zvOybLETY-#a44g;67zIZ3<f*HnOIuN27SF>;X(}XTF+$0@=mUvTd@K1sow0}-7|4@
zhh#|$u^}2|+WB$H#Tpmqa!)sv=bl_GF$zgn?PI}5(O+6@Rm<~Pi`UzIK>h%z0vv!v
zgv9}97qpXD^V_ypP=ly&-Fh1ESUC-;*6!uhU`l-)-K(YX>-7(2VzRusfp_g}xZU_C
zsQq+KklXA|5IcPzXSV+_+BuwJs#N7%PLT(5sy4tRB^JMO#dx=lF?x{?$qXX)=G&GV
ylIk+=4ruRLs3|JuQJr=m2UI$P2uMoP{7Cf&2r3cT_5+-zc6l)omR?LJU;YE4kY}a<

delta 25
gcmcaEGM#rrBGcwgtXeEQ*1TN2T&Z~}dc0f=0A!5@EC2ui

diff --git a/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dproj b/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dproj
index 4a9d70c7..606f176f 100644
--- a/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dproj	
+++ b/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dproj	
@@ -1,4 +1,5 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{0292650a-554d-47ac-933a-ac71d1f18f02}</ProjectGuid>
     <MainSource>FacturasProveedor_view.dpk</MainSource>
@@ -42,6 +43,9 @@
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
       
       
+      
+      
+      
       <Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">FacturasProveedor_view.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
@@ -50,11 +54,50 @@
     <DelphiCompile Include="FacturasProveedor_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\Lib\AlbProv_FacProv_relation.dcp" />
-    <DCCReference Include="..\..\Lib\Articulos_view.dcp" />
-    <DCCReference Include="..\..\Lib\FacturasProveedor_controller.dcp" />
-    <DCCReference Include="..\..\Lib\FacturasProveedor_model.dcp" />
-    <DCCReference Include="..\..\Lib\GUIBase.dcp" />
+    <DCCReference Include="adortl.dcp" />
+    <DCCReference Include="AlbProv_FacProv_relation.dcp" />
+    <DCCReference Include="Articulos_view.dcp" />
+    <DCCReference Include="cxDataD11.dcp" />
+    <DCCReference Include="cxEditorsD11.dcp" />
+    <DCCReference Include="cxExportD11.dcp" />
+    <DCCReference Include="cxExtEditorsD11.dcp" />
+    <DCCReference Include="cxGridD11.dcp" />
+    <DCCReference Include="cxLibraryD11.dcp" />
+    <DCCReference Include="cxPageControlD11.dcp" />
+    <DCCReference Include="DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="dbrtl.dcp" />
+    <DCCReference Include="dsnap.dcp" />
+    <DCCReference Include="dxGDIPlusD11.dcp" />
+    <DCCReference Include="dxSkinBlackD11.dcp" />
+    <DCCReference Include="dxSkinBlueD11.dcp" />
+    <DCCReference Include="dxSkinCaramelD11.dcp" />
+    <DCCReference Include="dxSkinCoffeeD11.dcp" />
+    <DCCReference Include="dxSkinGlassOceansD11.dcp" />
+    <DCCReference Include="dxSkiniMaginaryD11.dcp" />
+    <DCCReference Include="dxSkinLilianD11.dcp" />
+    <DCCReference Include="dxSkinLiquidSkyD11.dcp" />
+    <DCCReference Include="dxSkinLondonLiquidSkyD11.dcp" />
+    <DCCReference Include="dxSkinMcSkinD11.dcp" />
+    <DCCReference Include="dxSkinMoneyTwinsD11.dcp" />
+    <DCCReference Include="dxSkinOffice2007BlackD11.dcp" />
+    <DCCReference Include="dxSkinOffice2007BlueD11.dcp" />
+    <DCCReference Include="dxSkinOffice2007GreenD11.dcp" />
+    <DCCReference Include="dxSkinOffice2007PinkD11.dcp" />
+    <DCCReference Include="dxSkinOffice2007SilverD11.dcp" />
+    <DCCReference Include="dxSkinsCoreD11.dcp" />
+    <DCCReference Include="dxSkinscxPCPainterD11.dcp" />
+    <DCCReference Include="dxSkinSilverD11.dcp" />
+    <DCCReference Include="dxSkinStardustD11.dcp" />
+    <DCCReference Include="dxSkinValentineD11.dcp" />
+    <DCCReference Include="dxSkinXmas2008BlueD11.dcp" />
+    <DCCReference Include="dxThemeD11.dcp" />
+    <DCCReference Include="FacturasProveedor_controller.dcp" />
+    <DCCReference Include="FacturasProveedor_model.dcp" />
+    <DCCReference Include="GUIBase.dcp" />
+    <DCCReference Include="PngComponentsD10.dcp" />
+    <DCCReference Include="PNG_D10.dcp" />
+    <DCCReference Include="RemObjects_Core_D11.dcp" />
+    <DCCReference Include="rtl.dcp" />
     <DCCReference Include="uEditorElegirArticulosFacturaProveedor.pas">
       <Form>fEditorElegirArticulosFacturaProveedor</Form>
       <DesignClass>TfEditorElegirArticulosFacturaProveedor</DesignClass>
@@ -88,6 +131,15 @@
       <Form>frViewFacturasProveedor</Form>
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
+    <DCCReference Include="uViewPedidosFacturaProveedor.pas">
+      <Form>frViewPedidosFacturaProveedor</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
+    <DCCReference Include="vcl.dcp" />
+    <DCCReference Include="vclactnband.dcp" />
+    <DCCReference Include="vcldb.dcp" />
+    <DCCReference Include="vcljpg.dcp" />
+    <DCCReference Include="vclx.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
diff --git a/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.res b/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.res
index 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644
GIT binary patch
literal 4748
zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg
zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?<w4U-ol;S2jC7
zx4(byej2@_#)0HWvg0i^wC4Xli+W*aXJ^(njceK|Kb@c3qFNX>p${kR>3GhM`oH*q
zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W
zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7
z{BT%G%irdMe*|oDJmgvJ<ltI;x5J<Oc>aA2`9B<Z5Toyra?r{a4$fnJHGXo6Pmcq8
z{JGCD500t1h4|yI?-f&xoj9;YT&Ch&JLO*X#NC3sCI0Xmc<f_vh`jn-1E!?th$%QM
znzGM|)$vl3f7;nE+9qR}|A?C$H3K&BFdq9?uxrIqHIne#5?8G@da2ybWLGKA686M2
z*LJMMMk4<U`dzFC9}HrSxLfOGll{P#??xir)$c2}C;ql+y-&Wa(LP{PgPk1E1@{uR
zIMCNz;u9;r(axhQvEx%?i#p<Vn=Z!SK%f10?4_`0@RY8lXRM3(t(nFSzJ$4kJr6&x
ze)~B%biu*TY$HDstHD=|UGxJceYiUQQa0Gu(p3og@%ZJ><6Xi*?M~Q;)@Sbfwf3uf
zVaWkbU<NjR3%=~AdoZbkXp`f@b0%GBT^$^V5e(n|#O(?P)hBbF)4n%2cw6U#adPM!
zz(!`V|Bfl{aH0)Y&w;SK7R4<z{p;Gwz1D%l86L3ZFZQ&=pB$<&esXT|OZ?=AGaWoe
z{>jU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv
zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N|
z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc
z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0
zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38=
zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W
zVvPDBKHh;i=RU4J_ta3E;)M<P+=2X7;VbzliQZ=IHV#+fr#{!(ukt%UJMS8=332qg
z7jD)rSbpCW+^j*cd6LUEe8#9n&v!NEJM(@?SHvB$=h@|)fjw|&qD?NQ5A&R>n>Y+L
zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m
z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJu<OVP
zzHjp+hnwo*3NQE$JTA(agu~silV5T`du+GJgWGi_7mAy`Nk8fLt~%GF$;XXcE-ri?
zyIglyyzA`K-);4Eem2MZm07RBza@W3UP)d`Rz=RFk-I);`s{$L%yyBNX0OTjo5Gk0
zs}g44uXg*l%xo^{`#0=kd*2?}Cz22Bv2;Gu?;3o~(D#gk1OKYQSCAb$(&vu@_pvWO
z>gbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T
z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC
zy(^m((;DnQmDQ<zX+PK(Lfu@ox#mOnbZjSDl}IBqv$qwK+2@))5$ba>Katmw!@c`|
G?EMQ&4NnpP

delta 11
ScmeBCZD5|Duvteife`=|>;pCc

diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm
index 9046427c..80d07a39 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm	
+++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm	
@@ -2,20 +2,21 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
   Left = 454
   Top = 208
   Caption = 'Nueva factura de proveedor'
-  ClientHeight = 573
-  ClientWidth = 788
+  ClientHeight = 633
+  ClientWidth = 819
   Position = poScreenCenter
   OnClose = CustomEditorClose
-  ExplicitWidth = 796
-  ExplicitHeight = 607
+  ExplicitTop = 0
+  ExplicitWidth = 827
+  ExplicitHeight = 667
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
-    Width = 788
+    Width = 819
     Caption = 'Nueva factura de proveedor'
     ExplicitWidth = 788
     inherited Image1: TImage
-      Left = 761
+      Left = 792
       Picture.Data = {
         0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800
         0000180806000000E0773DF80000000970485973000017120000171201679FD2
@@ -39,7 +40,7 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
     end
   end
   inherited TBXDock: TTBXDock
-    Width = 788
+    Width = 819
     ExplicitWidth = 788
     inherited tbxMain: TTBXToolbar
       ExplicitWidth = 488
@@ -54,7 +55,7 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
       end
     end
     inherited tbxMenu: TTBXToolbar
-      ExplicitWidth = 788
+      ExplicitWidth = 819
       inherited TBXSubmenuItem4: TTBXSubmenuItem
         inherited TBXItem8: TTBXItem
           Visible = False
@@ -69,8 +70,9 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
     end
   end
   inherited pgPaginas: TPageControl
-    Width = 782
-    Height = 309
+    Width = 813
+    Height = 369
+    ActivePage = pagPedidos
     OnChanging = pgPaginasChanging
     ExplicitWidth = 782
     ExplicitHeight = 309
@@ -82,8 +84,8 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
       inline frViewFacturaProveedor1: TfrViewFacturaProveedor
         Left = 0
         Top = 0
-        Width = 774
-        Height = 281
+        Width = 805
+        Height = 341
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -96,121 +98,78 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         ExplicitWidth = 774
         ExplicitHeight = 281
         inherited dxLayoutControl1: TdxLayoutControl
-          Width = 774
-          Height = 281
+          Width = 805
+          Height = 341
           ExplicitWidth = 774
           ExplicitHeight = 281
           inherited eReferencia: TcxDBTextEdit
             Properties.ReadOnly = True
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 227
             Width = 227
           end
           inherited edtFecha: TcxDBDateEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 227
             Width = 227
           end
           inherited memObservaciones: TcxDBMemo
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 341
             ExplicitHeight = 101
             Height = 101
             Width = 341
           end
           inherited cbFormaPago: TcxDBLookupComboBox
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 89
             Width = 89
           end
           inherited bFormasPago: TButton
-            Left = 231
-            ExplicitLeft = 231
+            Left = 246
+            ExplicitLeft = 246
           end
           inherited eReferenciaProveedor: TcxDBTextEdit
-            Style.LookAndFeel.SkinName = ''
-            StyleDisabled.LookAndFeel.SkinName = ''
-            StyleFocused.LookAndFeel.SkinName = ''
-            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 227
             Width = 227
           end
           inherited frViewProveedorFactura: TfrViewDatosYSeleccionProveedor
-            Left = 391
+            Left = 406
             Width = 361
-            ExplicitLeft = 391
+            ExplicitLeft = 406
             ExplicitWidth = 361
             inherited dxLayoutControl1: TdxLayoutControl
               Width = 361
+              ExplicitWidth = 361
               inherited edtlNombre: TcxDBTextEdit
                 DataBinding.DataSource = frViewFacturaProveedor1.DADataSource
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 287
                 Width = 287
               end
               inherited edtNIFCIF: TcxDBTextEdit
                 DataBinding.DataSource = frViewFacturaProveedor1.DADataSource
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 287
                 Width = 287
               end
               inherited edtCalle: TcxDBTextEdit
                 DataBinding.DataSource = frViewFacturaProveedor1.DADataSource
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 287
                 Width = 287
               end
               inherited edtPoblacion: TcxDBTextEdit
                 DataBinding.DataSource = frViewFacturaProveedor1.DADataSource
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 169
                 Width = 169
               end
               inherited edtProvincia: TcxDBTextEdit
                 DataBinding.DataSource = frViewFacturaProveedor1.DADataSource
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
                 ExplicitWidth = 287
                 Width = 287
               end
               inherited edtCodigoPostal: TcxDBTextEdit
-                Left = 269
+                Left = 285
                 DataBinding.DataSource = frViewFacturaProveedor1.DADataSource
-                Style.LookAndFeel.SkinName = ''
-                StyleDisabled.LookAndFeel.SkinName = ''
-                StyleFocused.LookAndFeel.SkinName = ''
-                StyleHot.LookAndFeel.SkinName = ''
-                ExplicitLeft = 269
+                ExplicitLeft = 285
               end
               inherited Button3: TBitBtn
-                Left = 153
-                ExplicitLeft = 153
+                Left = 169
+                ExplicitLeft = 169
               end
             end
           end
@@ -220,11 +179,13 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
     object pagContenido: TTabSheet
       Caption = 'Contenido'
       ImageIndex = 1
+      ExplicitWidth = 774
+      ExplicitHeight = 281
       inline frViewDetallesFacturaProveedor1: TfrViewDetallesFacturaProveedor
         Left = 0
         Top = 0
-        Width = 774
-        Height = 281
+        Width = 805
+        Height = 341
         Align = alClient
         BiDiMode = bdLeftToRight
         Font.Charset = DEFAULT_CHARSET
@@ -239,7 +200,7 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         ExplicitWidth = 774
         ExplicitHeight = 281
         inherited ToolBar1: TToolBar
-          Width = 774
+          Width = 805
           Height = 51
           ExplicitWidth = 774
           ExplicitHeight = 51
@@ -272,13 +233,7 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
             ExplicitTop = 0
             ExplicitWidth = 72
           end
-          inherited UpDown1: TUpDown
-            Left = 616
-            Top = 0
-            ExplicitLeft = 616
-            ExplicitTop = 0
-          end
-          inherited ToolButton13: TToolButton
+          inherited ToolButton13: TToolButton [7]
             Left = 0
             Top = 0
             Wrap = True
@@ -286,61 +241,69 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
             ExplicitTop = 0
             ExplicitHeight = 27
           end
-          inherited ToolButton6: TToolButton [9]
+          inherited UpDown1: TUpDown [8]
             Left = 0
             Top = 27
             ExplicitLeft = 0
             ExplicitTop = 27
           end
-          inherited ToolButton7: TToolButton [10]
-            Left = 66
+          inherited ToolButton6: TToolButton [9]
+            Left = 17
             Top = 27
-            ExplicitLeft = 66
+            ExplicitLeft = 17
+            ExplicitTop = 27
+          end
+          inherited ToolButton7: TToolButton [10]
+            Left = 83
+            Top = 27
+            Wrap = False
+            ExplicitLeft = 83
             ExplicitTop = 27
           end
           inherited ToolButton8: TToolButton [11]
-            Left = 133
+            Left = 150
             Top = 27
-            ExplicitLeft = 133
+            ExplicitLeft = 150
             ExplicitTop = 27
           end
           inherited ToolButton12: TToolButton [12]
-            Left = 216
+            Left = 233
             Top = 27
-            ExplicitLeft = 216
+            Wrap = False
+            ExplicitLeft = 233
             ExplicitTop = 27
             ExplicitHeight = 22
           end
           inherited ToolButton9: TToolButton [13]
-            Left = 224
+            Left = 241
             Top = 27
-            ExplicitLeft = 224
+            ExplicitLeft = 241
             ExplicitTop = 27
           end
           inherited ToolButton10: TToolButton [14]
-            Left = 369
+            Left = 386
             Top = 27
-            ExplicitLeft = 369
+            ExplicitLeft = 386
             ExplicitTop = 27
           end
           inherited ToolButton11: TToolButton [15]
-            Left = 494
+            Left = 511
             Top = 27
-            ExplicitLeft = 494
+            ExplicitLeft = 511
             ExplicitTop = 27
           end
         end
         inherited cxGrid: TcxGrid
           Top = 77
-          Width = 774
-          Height = 204
-          ExplicitTop = 72
+          Width = 805
+          Height = 264
+          ExplicitTop = 77
           ExplicitWidth = 774
-          ExplicitHeight = 209
+          ExplicitHeight = 204
         end
         inherited TBXDock1: TTBXDock
           Top = 51
-          Width = 774
+          Width = 805
           ExplicitTop = 51
           ExplicitWidth = 774
           inherited TBXToolbar1: TTBXToolbar
@@ -361,10 +324,40 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         end
       end
     end
+    object pagPedidos: TTabSheet
+      Caption = 'Pedidos'
+      ImageIndex = 2
+      ExplicitWidth = 774
+      ExplicitHeight = 281
+      inline frViewPedidosFacturaProveedor1: TfrViewPedidosFacturaProveedor
+        Left = 0
+        Top = 0
+        Width = 805
+        Height = 341
+        Align = alClient
+        Font.Charset = DEFAULT_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -11
+        Font.Name = 'Tahoma'
+        Font.Style = []
+        ParentFont = False
+        TabOrder = 0
+        ReadOnly = False
+        ExplicitLeft = 232
+        ExplicitTop = -76
+        inherited cxGrid: TcxGrid
+          Width = 805
+          Height = 316
+        end
+        inherited ToolBar1: TToolBar
+          Width = 805
+        end
+      end
+    end
   end
   inherited StatusBar: TJvStatusBar
-    Top = 554
-    Width = 788
+    Top = 614
+    Width = 819
     Panels = <
       item
         Width = 200
@@ -374,8 +367,8 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
   end
   inline frViewTotales1: TfrViewTotales [4]
     Left = 0
-    Top = 391
-    Width = 788
+    Top = 451
+    Width = 819
     Height = 163
     Align = alBottom
     Font.Charset = DEFAULT_CHARSET
@@ -390,7 +383,7 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
     ExplicitWidth = 788
     ExplicitHeight = 163
     inherited dxLayoutControl1: TdxLayoutControl
-      Width = 788
+      Width = 819
       ExplicitWidth = 788
       inherited Bevel1: TBevel
         Top = 111
@@ -399,54 +392,42 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         ExplicitWidth = 73
       end
       inherited Bevel3: TBevel
-        Left = 420
+        Left = 451
         Top = 30
         Height = 122
-        ExplicitLeft = 420
+        ExplicitLeft = 451
         ExplicitTop = 30
         ExplicitHeight = 122
       end
       inherited Bevel4: TBevel
-        Left = 532
+        Left = 563
         Top = 111
         Width = 186
-        ExplicitLeft = 532
+        ExplicitLeft = 563
         ExplicitTop = 111
         ExplicitWidth = 186
       end
       inherited ImporteDto: TcxDBCurrencyEdit
         Top = 131
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitTop = 131
-        ExplicitWidth = 229
-        Width = 229
+        ExplicitWidth = 259
+        Width = 259
       end
       inherited ImporteIVA: TcxDBCurrencyEdit
-        Left = 603
+        Left = 634
         Top = 57
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 603
+        ExplicitLeft = 634
         ExplicitTop = 57
         ExplicitWidth = 163
         Width = 163
       end
       inherited ImporteTotal: TcxDBCurrencyEdit
-        Left = 533
+        Left = 564
         Top = 131
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 533
+        ExplicitLeft = 564
         ExplicitTop = 131
         ExplicitWidth = 233
         Width = 233
@@ -454,69 +435,45 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
       inherited edtDescuento: TcxDBSpinEdit
         Top = 131
         Properties.OnValidate = frViewTotales1edtDescuentoPropertiesValidate
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitTop = 131
       end
       inherited edtIVA: TcxDBSpinEdit
-        Left = 532
+        Left = 563
         Top = 57
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 532
+        ExplicitLeft = 563
         ExplicitTop = 57
       end
       inherited ImporteBase: TcxDBCurrencyEdit
-        Left = 532
+        Left = 563
         Top = 30
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 532
+        ExplicitLeft = 563
         ExplicitTop = 30
         ExplicitWidth = 234
         Width = 234
       end
       inherited edtRE: TcxDBSpinEdit
-        Left = 532
+        Left = 563
         Top = 84
         Properties.AssignedValues.MinValue = True
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 532
+        ExplicitLeft = 563
         ExplicitTop = 84
       end
       inherited ImporteRE: TcxDBCurrencyEdit
-        Left = 603
+        Left = 634
         Top = 84
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 603
+        ExplicitLeft = 634
         ExplicitTop = 84
         ExplicitWidth = 163
         Width = 163
       end
       inherited eImporteNeto: TcxDBCurrencyEdit
         Top = 30
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitTop = 30
         ExplicitWidth = 300
         Width = 300
@@ -525,42 +482,30 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         Top = 158
         DataBinding.DataSource = dsDataTable
         Properties.OnValidate = frViewTotales1ePortePropertiesValidate
-        Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         OnEditing = frViewTotales1ePorteEditing
         ExplicitTop = 158
-        ExplicitWidth = 300
-        Width = 300
+        ExplicitWidth = 324
+        Width = 324
       end
       inherited eIVA: TcxDBLookupComboBox
         Top = 57
         Properties.OnValidate = frViewTotales1eIVAPropertiesValidate
         Style.Color = clInfoBk
-        Style.LookAndFeel.SkinName = ''
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitTop = 57
         ExplicitWidth = 162
         Width = 162
       end
       inherited bTiposIVA: TButton
-        Left = 272
+        Left = 303
         Top = 57
         OnClick = frViewTotales1bTiposIVAClick
-        ExplicitLeft = 272
+        ExplicitLeft = 303
         ExplicitTop = 57
       end
       inherited cbRecargoEquivalencia: TcxDBCheckBox
         Top = 84
         Properties.OnEditValueChanged = frViewTotales1cbRecargoEquivalenciaPropertiesEditValueChanged
-        Style.LookAndFeel.SkinName = ''
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
         ExplicitTop = 84
         ExplicitWidth = 300
         Width = 300
@@ -573,14 +518,13 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
               Visible = False
             end
             inherited dxLayoutControl1Group7: TdxLayoutGroup
-              Visible = False
-              inherited dxLayoutControl1Item4: TdxLayoutItem
-                Visible = False
-              end
               inherited dxLayoutControl1Item1: TdxLayoutItem
                 Visible = False
               end
             end
+            inherited dxLayoutControl1Item9: TdxLayoutItem
+              Visible = False
+            end
           end
           inherited dxLayoutControl1Group5: TdxLayoutGroup
             inherited dxLayoutControl1Group3: TdxLayoutGroup
diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas
index f748a500..9d1921e3 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas	
+++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas	
@@ -13,7 +13,8 @@ uses
   uBizFacturasProveedor, uIEditorFacturaProveedor, uFacturasProveedorController, uViewDetallesBase,
   dxLayoutLookAndFeels, JvExComCtrls, JvStatusBar, uBizTiposIVA,
   uViewDetallesDTO, uViewDetallesArticulos, uTiposIVAController,
-  uViewDetallesFacturaProveedor, uViewFacturaProveedor, uDAInterfaces;
+  uViewDetallesFacturaProveedor, uViewFacturaProveedor, uDAInterfaces,
+  uViewDetallesGenerico, uViewPedidosFacturaProveedor;
 
 
 type
@@ -21,6 +22,8 @@ type
     frViewTotales1: TfrViewTotales;
     frViewFacturaProveedor1: TfrViewFacturaProveedor;
     frViewDetallesFacturaProveedor1: TfrViewDetallesFacturaProveedor;
+    pagPedidos: TTabSheet;
+    frViewPedidosFacturaProveedor1: TfrViewPedidosFacturaProveedor;
     procedure FormShow(Sender: TObject);
     procedure frViewProveedorFactura1edtlNombrePropertiesEditValueChanged(
       Sender: TObject);
@@ -301,6 +304,20 @@ begin
       FDetallesController := NIL;
     end;
   end;
+
+  // Si la factura tiene pedidos asociados hay que mirar si pertenecen al proveedor seleccionado si no es así se eliminan
+  if (FFactura.Pedidos.RecordCount > 0) then
+  begin
+    showmessage('Comprobar si los pedidos pertenecen al nuevo proveedor');
+
+{    FDetallesController := TDetallesFacturaProveedorController.Create;
+    try
+      FDetallesController.ActualizarDetalles(FFactura.Detalles, FFactura.Proveedor);
+    finally
+      FDetallesController := NIL;
+    end;
+}
+  end;
 end;
 
 procedure TfEditorFacturaProveedor.pgPaginasChanging(Sender: TObject;
@@ -393,6 +410,7 @@ begin
       frViewFacturaProveedor1.frViewProveedorFactura.OnProveedorChanged := OnProveedorChanged;
 
       FViewFactura.Factura := FFactura;
+      frViewPedidosFacturaProveedor1.Pedidos := FFactura.Pedidos;
       frViewDetallesFacturaProveedor1.Detalles := FFactura.Detalles;
       frViewDetallesFacturaProveedor1.Factura := FFactura; //Para poder sacar los descuento del articulos segun el proveedor seleccionado
     end;
diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.pas b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.pas
index d3346584..7dda0e38 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.pas	
+++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.pas	
@@ -287,6 +287,10 @@ var
 begin
   inherited;
 
+  if FController.Anadir(Facturas) then
+     FController.Ver(Facturas);
+
+{
   Respuesta := JsNuevaFacturaDialog.Execute;
 
   if Respuesta <> IDCANCEL then
@@ -306,7 +310,7 @@ begin
                   finally
                     FPedidosClienteController := NIL;
                   end;}
-                end;
+{                end;
       200   : begin   // Utilizar albaranes
                 GenerarFacturaProv;
                 actRefrescar.Execute;
@@ -317,6 +321,7 @@ begin
               end;
     end;
   end;
+}  
 end;
 
 procedure TfEditorFacturasProveedor.PonerTitulos(const ATitulo: string);
diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewPedidosFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewPedidosFacturaProveedor.dfm
new file mode 100644
index 00000000..aa00edad
--- /dev/null
+++ b/Source/Modulos/Facturas de proveedor/Views/uViewPedidosFacturaProveedor.dfm	
@@ -0,0 +1,38 @@
+inherited frViewPedidosFacturaProveedor: TfrViewPedidosFacturaProveedor
+  inherited cxGrid: TcxGrid
+    inherited cxGridView: TcxGridDBTableView
+      object cxGridViewID_FACTURA: TcxGridDBColumn
+        DataBinding.FieldName = 'ID_FACTURA'
+      end
+      object cxGridViewID_PEDIDO: TcxGridDBColumn
+        DataBinding.FieldName = 'ID_PEDIDO'
+      end
+      object cxGridViewREFERENCIA: TcxGridDBColumn
+        DataBinding.FieldName = 'REFERENCIA'
+      end
+      object cxGridViewFECHA_PEDIDO: TcxGridDBColumn
+        DataBinding.FieldName = 'FECHA_PEDIDO'
+      end
+      object cxGridViewPROVEEDOR: TcxGridDBColumn
+        DataBinding.FieldName = 'PROVEEDOR'
+      end
+      object cxGridViewIMPORTE_TOTAL: TcxGridDBColumn
+        DataBinding.FieldName = 'IMPORTE_TOTAL'
+      end
+    end
+  end
+  inherited ToolBar1: TToolBar
+    inherited ToolButton1: TToolButton
+      ExplicitWidth = 62
+    end
+    inherited ToolButton4: TToolButton
+      ExplicitWidth = 74
+    end
+    inherited ToolButton2: TToolButton
+      ExplicitWidth = 67
+    end
+    inherited ToolButton7: TToolButton
+      ExplicitWidth = 117
+    end
+  end
+end
diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewPedidosFacturaProveedor.pas b/Source/Modulos/Facturas de proveedor/Views/uViewPedidosFacturaProveedor.pas
new file mode 100644
index 00000000..bbe37daf
--- /dev/null
+++ b/Source/Modulos/Facturas de proveedor/Views/uViewPedidosFacturaProveedor.pas	
@@ -0,0 +1,67 @@
+unit uViewPedidosFacturaProveedor;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, uViewDetallesGenerico, cxStyles, dxSkinsCore, dxSkinBlack,
+  dxSkinBlue, dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary,
+  dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin,
+  dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinOffice2007Blue,
+  dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver,
+  dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinXmas2008Blue, dxSkinscxPCPainter, cxCustomData, cxGraphics, cxFilter,
+  cxData, cxDataStorage, cxEdit, DB, cxDBData, ActnList, ImgList, PngImageList,
+  uDAInterfaces, uDADataTable, ComCtrls, ToolWin, cxGridLevel,
+  cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses,
+  cxControls, cxGridCustomView, cxGrid, uBizPedidosFacturaProveedor;
+
+type
+  IViewPedidosFacturaProveedor = interface
+  ['{5ADBA311-E801-4AEC-9208-1003D23EA596}']
+    function GetPedidos: IBizPedidosFacturaProveedor;
+    procedure SetPedidos(const Value: IBizPedidosFacturaProveedor);
+    property Pedidos: IBizPedidosFacturaProveedor read GetPedidos write SetPedidos;
+  end;
+
+  TfrViewPedidosFacturaProveedor = class(TfrViewDetallesGenerico, IViewPedidosFacturaProveedor)
+    cxGridViewID_FACTURA: TcxGridDBColumn;
+    cxGridViewID_PEDIDO: TcxGridDBColumn;
+    cxGridViewREFERENCIA: TcxGridDBColumn;
+    cxGridViewFECHA_PEDIDO: TcxGridDBColumn;
+    cxGridViewPROVEEDOR: TcxGridDBColumn;
+    cxGridViewIMPORTE_TOTAL: TcxGridDBColumn;
+  private
+    FPedidos: IBizPedidosFacturaProveedor;
+    function GetPedidos: IBizPedidosFacturaProveedor;
+    procedure SetPedidos(const Value: IBizPedidosFacturaProveedor);
+
+  public
+    property Pedidos: IBizPedidosFacturaProveedor read GetPedidos write SetPedidos;
+  end;
+
+var
+  frViewPedidosFacturaProveedor: TfrViewPedidosFacturaProveedor;
+
+implementation
+
+{$R *.dfm}
+
+{ TfrViewPedidosFacturaProveedor }
+
+function TfrViewPedidosFacturaProveedor.GetPedidos: IBizPedidosFacturaProveedor;
+begin
+  Result := FPedidos;
+end;
+
+procedure TfrViewPedidosFacturaProveedor.SetPedidos(const Value: IBizPedidosFacturaProveedor);
+begin
+  FPedidos := Value;
+
+  if Assigned(FPedidos) then
+    dsDetalles.DataTable := FPedidos.DataTable
+  else
+    dsDetalles.DataTable := NIL;
+end;
+
+end.