Version 3.9: 4 Decimales, doble buscador, tipos de venta, cambio de situación manual de los pedidos de proveedor

git-svn-id: https://192.168.0.254/svn/Proyectos.AbetoDesign_FactuGES/trunk@166 93f398dd-4eb6-7a46-baf6-13f46f578da2

Build/Build.fbpInf

@@ -14,8 +14,8 @@
     <Notes>
       <![CDATA[]]>
     </Notes>
-    <LastBuildRun>00:01:15</LastBuildRun>
+    <LastBuildRun>00:00:07</LastBuildRun>
-    <LastBuildStart>19/01/2021 17:01:29</LastBuildStart>
+    <LastBuildStart>04/04/2022 10:55:43</LastBuildStart>
     <LastBuildState>True</LastBuildState>
   </properties>
 </project>

Source/ApplicationBase/uFactuGES_App.pas

@@ -281,9 +281,9 @@ begin
   //Nos devuelve el id de la tienda a la que pertenece el vendedor que tiene asignado
   //el usuario con el que ha accedido a la aplicación.
   //Esto funciona mientras la relación sea 1 a 1, cuando sea 1 a n (un usuario pertenece a varios vendedores deja de funcionar)
-//  FTiendaActiva := EmpresasController.DarTiendaUsuario(EmpresaActiva, UsuarioActivo.ID);
+  FTiendaActiva := EmpresasController.DarTiendaUsuario(EmpresaActiva, UsuarioActivo.ID);
 
-  FTiendaActiva := EmpresasController.DarTiendaEmpresa(EmpresaActiva, 0);
+//  FTiendaActiva := EmpresasController.DarTiendaEmpresa(EmpresaActiva, 0);
 
 
   Assert(Assigned(FTiendaActiva));

Source/Base/Base.dproj

@@ -44,13 +44,6 @@
     <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="PackageDescription">Libreria base de FactuGES</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><Excluded_Packages>
-      
-      
-      
-      
-      
-      
-      
       <Excluded_Packages Name="$(BDS)\Bin\dclintraweb_90_100.bpl">VCL for the Web Design Package for CodeGear RAD Studio</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
@@ -65,55 +58,55 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
+    <DCCReference Include="..\Modulos\Contactos\adortl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\cxDataD11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\cxEditorsD11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\cxExtEditorsD11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\cxGridD11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\cxLibraryD11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\cxPageControlD11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\dbrtl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\dclIndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\designide.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\dsnap.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\dxPSCoreD11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\dxThemeD11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\GUISDK_D11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\IndyCore.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\IndyProtocols.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\IndySystem.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\Jcl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JclVcl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JSDialog100.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvCmpD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvCoreD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvDlgsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvMMD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvNetD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\JvSystemD11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\pckMD5.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\pckUCDataConnector.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\pckUserControl_RT.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\PluginSDK_D11R.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\PngComponentsD10.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\PNG_D10.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\rtl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\TB2k_D10.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\tbx_d10.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\vcl.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\vclactnband.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\vcldb.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\vcljpg.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\VclSmp.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\vclx.dcp" />
+    <DCCReference Include="..\Modulos\Contactos\xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxGridD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dclIndyCore.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPSCoreD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\IndyCore.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\IndyProtocols.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\IndySystem.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JSDialog100.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCmpD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvDlgsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvMMD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvNetD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\pckMD5.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\pckUCDataConnector.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\pckUserControl_RT.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PluginSDK_D11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\TB2k_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\VclSmp.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
       <DesignClass>TForm</DesignClass>

Source/Base/Utiles/uCalculosUtils.pas

@@ -21,20 +21,20 @@ const
   CAMPO_VISIBLE = 'VISIBLE';
   CAMPO_VALORADO = 'VALORADO';
 
-  function CalcularLineaConcepto (const ADataTable : TDADataTable): Double;
+  function CalcularLineaConcepto (const ADataTable : TDADataTable; const NumDecimales: Smallint = 2): Double;
   procedure ValidarCamposLineaConcepto(DataTable: TDADataTable);
 
   procedure DesglosarPorte(ImportePorte: Currency; ADetalles: IDAStronglyTypedDataTable);
   function DarTotalPorte(ADetalles: IDAStronglyTypedDataTable): Double;
 
-  function CalcularImporteNeto (const ImporteUnidad: Double = 0; const Incremento: Double = 0; const Decremento: Double = 0): Double;
+  function CalcularImporteNeto (const ImporteUnidad: Double = 0; const Incremento: Double = 0; const Decremento: Double = 0; const NumDecimales: Smallint = 2): Double;
 
 implementation
 
 uses
   SysUtils, DB, Variants, cxControls, uNumUtils;
 
-function CalcularImporteNeto (const ImporteUnidad: Double = 0; const Incremento: Double = 0; const Decremento: Double = 0): Double;
+function CalcularImporteNeto (const ImporteUnidad: Double = 0; const Incremento: Double = 0; const Decremento: Double = 0; const NumDecimales: Smallint = 2): Double;
 var
   ValorAIncrementar: Double;
   ImporteNeto1: Double;
@@ -48,10 +48,11 @@ begin
   ValorAIncrementar := ImporteUnidad * (Incremento/100);
   ImporteNeto1 := ImporteUnidad + ValorAIncrementar;
   ValorADecrementar := ImporteNeto1 * (Decremento/100);
-  Result := RoundCurrency((ImporteNeto1 - ValorADecrementar));
+
+  Result := RoundCurrency((ImporteNeto1 - ValorADecrementar), NumDecimales)
 end;
 
-function CalcularLineaConcepto (const ADataTable : TDADataTable): Double;
+function CalcularLineaConcepto (const ADataTable : TDADataTable; const NumDecimales: Smallint = 2): Double;
 var
   AField: TDAField;
   ImporteTotal, ImporteNeto, Incremento, Decremento, Descuento, ImportePorte : Double;
@@ -77,7 +78,7 @@ begin
        if (not VarIsNull(AField.AsVariant)) then
           Decremento := AField.AsFloat;
 
-    ImporteNeto :=  CalcularImporteNeto(ImporteNeto, Incremento, Decremento);
+    ImporteNeto :=  CalcularImporteNeto(ImporteNeto, Incremento, Decremento, NumDecimales);
 
     if (not VarIsNull(FieldByName(CAMPO_DESCUENTO).AsVariant)) then
       Descuento :=  ImporteNeto * (FieldByName(CAMPO_DESCUENTO).AsFloat/100);
@@ -85,7 +86,7 @@ begin
     if (not VarIsNull(FieldByName(CAMPO_IMPORTE_PORTE).AsVariant)) then
       ImportePorte := FieldByName(CAMPO_CANTIDAD).asFloat * FieldByName(CAMPO_IMPORTE_PORTE).AsFloat;
 
-    ImporteTotal := (RoundCurrency(ImporteNeto - Descuento) * FieldByName(CAMPO_CANTIDAD).asFloat) + ImportePorte;
+    ImporteTotal := (RoundCurrency((ImporteNeto - Descuento), NumDecimales) * FieldByName(CAMPO_CANTIDAD).asFloat) + ImportePorte;
   end;
 
   Result := ImporteTotal;

Source/Base/Utiles/uNumUtils.pas

@@ -28,28 +28,68 @@ interface
 Function IntToLetras(Numero:LongInt):String;
 Function xxIntToLetras(Valor:LongInt):String;
 Function CifraToLetras(Cifra: Double): String;
-function RoundCurrency(const Value: Currency): Currency;
+function RoundCurrency(const Value: Currency; const NumDecimales: Smallint = 2): Currency;
-
 
 implementation
 
 uses SysUtils, Dialogs;
 //  SysUtils, Windows, Dialogs, Messages, Classes, Graphics, Controls, Forms, StdCtrls;
 
-function RoundCurrency(const Value: Currency): Currency;
+//Funcion importantisima, nos redondea por defecto el valor double-hasta 14 decimales- pasado por parametro a currency-solo 4 decimales-
+//tiene un parametro de redondeo a numero de decimales menor, por defecto a 2 decimales, si no
+function RoundCurrency(const Value: Currency; const NumDecimales: Smallint = 2): Currency;
 var
   V64: Int64 absolute Result;
   Decimals: Integer;
 begin
-  Result := Value;
+  if (NumDecimales = 2) then
-  Decimals := V64 mod 100;
+  begin
-  Dec(V64, Decimals);
+    Result := Value;
-  case Decimals of
+    Decimals := V64 mod 100;
-    -99 .. -50 : Dec(V64, 100);
+    Dec(V64, Decimals);
-    50 .. 99 : Inc(V64, 100);
+    case Decimals of
-  end;
+      -99 .. -50 : Dec(V64, 100);
+      50 .. 99 : Inc(V64, 100);
+    end;
+  end
+  else if (NumDecimales = 3) then
+  begin
+    Result := Value;
+    Decimals := V64 mod 10;
+    Dec(V64, Decimals);
+    case Decimals of
+      -9 .. -5 : Dec(V64, 10);
+      5 .. 9 : Inc(V64, 10);
+    end;
+  end
+  else
+    Result := Value;
 end;
 
+
+{function RoundCurrency(const Value: Currency; const NumDecimales: Smallint = 2): Currency;
+const
+  factors: array [-4..-1] of Int64 = (10000, 1000, 100, 10);
+var
+  factor: Integer;
+  ValueAsInt64: Int64 absolute Value;
+  Scale: Integer;
+begin
+  Scale := -1*NumDecimales;
+  if Scale = -4 then
+    Result := ValueAsInt64
+  else if Scale < -4 then
+    Result := ValueAsInt64 * factors[4 + Scale]
+  else begin
+    factor := factors[-(4 + Scale)];
+    Result := ValueAsInt64 div factor;
+    if (ValueAsInt64 mod factor) >= (factor div 2) then
+      Result := Inc(Result);
+  end;
+end;}
+
+
+
 Function xxIntToLetras(Valor:LongInt):String;
 const
  aUnitat : array[1..15] of String = ('UNO','DOS','TRES','CUATRO','CINCO','SEIS',

Source/Cliente/FactuGES.dproj

@@ -51,7 +51,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">3</VersionInfo><VersionInfo Name="MinorVer">8</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">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">3.8.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.8.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><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">3</VersionInfo><VersionInfo Name="MinorVer">9</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">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">3.9.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.9.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\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>

Source/GUIBase/GUIBase.dproj

@@ -58,34 +58,34 @@
     <DelphiCompile Include="GUIBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\Base.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\ccpackD11.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\ccpackD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\cxDataD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\cxEditorsD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxExportD11.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\cxExportD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\cxLibraryD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\dbrtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\dxGDIPlusD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxLayoutControlD11.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\dxLayoutControlD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxCommonD11.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\dxPScxCommonD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxGrid6LnkD11.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\dxPScxGrid6LnkD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\dxThemeD11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\frx11.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\frx11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\frxe11.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\frxe11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\fs11.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\fs11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvAppFrmD11R.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\JvAppFrmD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\JvCtrlsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD11R.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\JvGlobusD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\PngComponentsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\PNG_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\rtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tb2k_d10.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\tb2k_d10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\tbx_d10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\vcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\vclactnband.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\vcldb.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\vcljpg.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
+    <DCCReference Include="..\Modulos\Historico de movimientos\vclx.dcp" />
     <DCCReference Include="uDialogBase.pas">
       <Form>fDialogBase</Form>
     </DCCReference>

Source/GUIBase/uEditorDBBase.dfm

@@ -5,7 +5,7 @@ inherited fEditorDBBase: TfEditorDBBase
   ClientHeight = 454
   ClientWidth = 646
   ExplicitWidth = 654
-  ExplicitHeight = 488
+  ExplicitHeight = 492
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader

Source/GUIBase/uEditorGridBase.dfm

@@ -6,7 +6,7 @@ inherited fEditorGridBase: TfEditorGridBase
   ClientWidth = 543
   OnDestroy = CustomEditorDestroy
   ExplicitWidth = 551
-  ExplicitHeight = 478
+  ExplicitHeight = 482
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -22,15 +22,15 @@ inherited fEditorGridBase: TfEditorGridBase
   inherited TBXDock: TTBXDock
     Top = 27
     Width = 543
-    Height = 75
+    Height = 79
     ExplicitTop = 27
     ExplicitWidth = 543
-    ExplicitHeight = 75
+    ExplicitHeight = 79
     inherited tbxMain: TTBXToolbar
       DockPos = 0
       DragHandleStyle = dhDouble
       TabOrder = 1
-      ExplicitWidth = 457
+      ExplicitWidth = 513
       inherited TBXItem29: TTBXItem
         Visible = False
       end
@@ -76,7 +76,7 @@ inherited fEditorGridBase: TfEditorGridBase
     end
     object tbxFiltro: TTBXToolbar [1]
       Left = 0
-      Top = 49
+      Top = 52
       Align = alRight
       CloseButton = False
       DefaultDock = TBXDock
@@ -104,7 +104,7 @@ inherited fEditorGridBase: TfEditorGridBase
         Caption = 'Filtrar:'
       end
       object tbxEditFiltro: TTBXEditItem
-        EditWidth = 200
+        EditWidth = 125
         ImageIndex = 10
         EditorFontSettings.Italic = tsTrue
         ExtendedAccept = True
@@ -112,6 +112,17 @@ inherited fEditorGridBase: TfEditorGridBase
         ShowImage = True
         OnChange = tbxEditFiltroChange
       end
+      object tbxEditFiltro2: TTBXEditItem
+        EditWidth = 125
+        Enabled = False
+        ImageIndex = 10
+        Visible = False
+        EditorFontSettings.Italic = tsTrue
+        ExtendedAccept = True
+        Images = SmallImages
+        ShowImage = True
+        OnChange = tbxEditFiltro2Change
+      end
       object TBXItem34: TTBXItem
         Action = actQuitarFiltro
       end
@@ -168,8 +179,8 @@ inherited fEditorGridBase: TfEditorGridBase
       end
     end
     object TBXTMain2: TTBXToolbar
-      Left = 337
+      Left = 334
-      Top = 49
+      Top = 52
       Caption = 'tbxMain'
       ChevronHint = 'M'#225's botones|'
       DockMode = dmCannotFloatOrChangeDocks

Source/GUIBase/uEditorGridBase.pas

@@ -67,7 +67,9 @@ type
     lblAno: TTBXLabelItem;
     cbxListaAnos: TTBXComboBoxItem;
     sepAno: TTBXSeparatorItem;
+    tbxEditFiltro2: TTBXEditItem;
     procedure tbxEditFiltroChange(Sender: TObject; const Text: String);
+    procedure tbxEditFiltro2Change(Sender: TObject; const Text: string);
     procedure FormShow(Sender: TObject);
     procedure actQuitarFiltroExecute(Sender: TObject);
     procedure actDuplicarUpdate(Sender: TObject);
@@ -81,6 +83,7 @@ type
     procedure CustomEditorDestroy(Sender: TObject);
     procedure actExportarExcelExecute(Sender: TObject);
     procedure actExportarExcelUpdate(Sender: TObject);
+
   protected
     FListaAnos: TStringList;
     FViewGrid : IViewGridBase;
@@ -224,6 +227,18 @@ begin
   end;
 end;
 
+procedure TfEditorGridBase.tbxEditFiltro2Change(Sender: TObject;
+  const Text: string);
+begin
+  if Assigned(ViewGrid) then
+  begin
+    if Length(Text) > 0 then
+      ViewGrid.Filter2 := Text
+    else
+      actQuitarFiltro.Execute;
+  end;
+end;
+
 procedure TfEditorGridBase.tbxEditFiltroChange(Sender: TObject; const Text: String);
 begin
   if Assigned(ViewGrid) then
@@ -281,6 +296,7 @@ begin
      if ViewGrid.ViewFiltros.VerFiltros then
      begin
        tbxEditFiltro.Visible := False;
+       tbxEditFiltro2.Visible := False;
        TBXItem7.Visible := False;
      end
      else
@@ -288,6 +304,12 @@ begin
        tbxEditFiltro.Text := '';
        tbxEditFiltro.Visible := True;
        TBXItem7.Visible := True;
+
+       if (tbxEditFiltro2.Enabled) then
+       begin
+         tbxEditFiltro2.Text := '';
+         tbxEditFiltro2.Visible := True;
+       end;
      end;
 end;
 
@@ -326,6 +348,8 @@ begin
   begin
     tbxEditFiltro.Text := '';
     ViewGrid.Filter := '';
+    tbxEditFiltro2.Text := '';
+    ViewGrid.Filter2 := '';
   end;
 end;
 

Source/GUIBase/uViewDetallesDTO.pas

@@ -46,6 +46,7 @@ procedure TfrViewDetallesDTO.cxGridViewIMPORTENETOGetDisplayText(Sender: TcxCust
   var AText: string);
 var
   ImporteNeto, Incremento, Decremento : Double;
+  NumDecimales : Smallint;
 
 begin
   //Se encarga de mostrar el campo calculado de importe neto
@@ -53,6 +54,8 @@ begin
   Incremento := 0;
   Decremento := 0;
 
+  NumDecimales := TcxCurrencyEditProperties(Sender.Properties).DecimalPlaces;
+
   if not VarIsNull(ARecord.Values[cxGridViewIMPORTEUNIDAD.Index]) then
   begin
      ImporteNeto := ARecord.Values[cxGridViewIMPORTEUNIDAD.Index];
@@ -63,12 +66,15 @@ begin
      if not VarIsNull(ARecord.Values[cxGridViewDECREMENTO.Index]) then
         Decremento := ARecord.Values[cxGridViewDECREMENTO.Index];
 
-     ImporteNeto := CalcularImporteNeto(ARecord.Values[cxGridViewIMPORTEUNIDAD.Index], Incremento, Decremento);
+     ImporteNeto := CalcularImporteNeto(ARecord.Values[cxGridViewIMPORTEUNIDAD.Index], Incremento, Decremento, NumDecimales);
   end;
 
   if (ImporteNeto <> -1) then
   begin
-    AText := FormatCurr(',0.00 €;-,0.00 €', FloatToCurr(ImporteNeto))
+    if (NumDecimales = 2) then
+      AText := FormatCurr(',0.00 €;-,0.00 €', FloatToCurr(ImporteNeto))
+    else
+      AText := FormatCurr(',0.0000 €;-,0.0000 €', FloatToCurr(ImporteNeto))
   end;
 end;
 
@@ -88,6 +94,7 @@ procedure TfrViewDetallesDTO.cxGridViewIMP_UNIDAD_DTOGetDisplayText( Sender: Tcx
   var AText: string);
 var
   ImporteUnidadDTO, ImporteNeto, Incremento, Decremento, Descuento : Double;
+  NumDecimales : Smallint;
 
 begin
   //Se encarga de mostrar el campo calculado de importe neto
@@ -96,6 +103,9 @@ begin
   Decremento := 0;
   Descuento := 0;
 
+  NumDecimales := TcxCurrencyEditProperties(Sender.Properties).DecimalPlaces;
+
+
   if not VarIsNull(ARecord.Values[cxGridViewIMPORTEUNIDAD.Index]) then
   begin
      if not VarIsNull(ARecord.Values[cxGridViewINCREMENTO.Index]) then
@@ -104,18 +114,21 @@ begin
      if not VarIsNull(ARecord.Values[cxGridViewDECREMENTO.Index]) then
         Decremento := ARecord.Values[cxGridViewDECREMENTO.Index];
 
-     ImporteNeto := CalcularImporteNeto(ARecord.Values[cxGridViewIMPORTEUNIDAD.Index], Incremento, Decremento);
+     ImporteNeto := CalcularImporteNeto(ARecord.Values[cxGridViewIMPORTEUNIDAD.Index], Incremento, Decremento, NumDecimales);
 
      if not VarIsNull(ARecord.Values[cxGridViewDESCUENTO.Index]) then
         Descuento := ImporteNeto * (ARecord.Values[cxGridViewDESCUENTO.Index]/100);
 
-     ImporteUnidadDTO := RoundCurrency(ImporteNeto - Descuento);
+     ImporteUnidadDTO := RoundCurrency((ImporteNeto - Descuento), NumDecimales)
   end;
 
 
   if (Descuento <> 0) then
   begin
-    AText := FormatCurr(',0.00 €;-,0.00 €', FloatToCurr(ImporteUnidadDTO))
+    if (NumDecimales = 2) then
+      AText := FormatCurr(',0.00 €;-,0.00 €', FloatToCurr(ImporteUnidadDTO))
+    else
+      AText := FormatCurr(',0.0000 €;-,0.0000 €', FloatToCurr(ImporteUnidadDTO))
   end;
 end;
 

Source/GUIBase/uViewFiltroBase.dfm

@@ -1,9 +1,9 @@
 inherited frViewFiltroBase: TfrViewFiltroBase
-  Width = 612
+  Width = 671
-  Height = 123
+  Height = 105
   Visible = False
-  ExplicitWidth = 612
+  ExplicitWidth = 671
-  ExplicitHeight = 123
+  ExplicitHeight = 105
   object TBXDockablePanel1: TTBXDockablePanel
     Left = 0
     Top = 0
@@ -22,8 +22,8 @@ inherited frViewFiltroBase: TfrViewFiltroBase
     object dxLayoutControl1: TdxLayoutControl
       Left = 0
       Top = 0
-      Width = 612
+      Width = 671
-      Height = 68
+      Height = 70
       Align = alTop
       ParentBackground = True
       TabOrder = 0
@@ -49,7 +49,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase
         StyleHot.LookAndFeel.NativeStyle = True
         StyleHot.LookAndFeel.SkinName = ''
         TabOrder = 0
-        Width = 273
+        Width = 250
       end
       object edtFechaIniFiltro: TcxDateEdit
         Left = 87
@@ -73,10 +73,10 @@ inherited frViewFiltroBase: TfrViewFiltroBase
         StyleHot.LookAndFeel.NativeStyle = True
         StyleHot.LookAndFeel.SkinName = ''
         TabOrder = 2
-        Width = 121
+        Width = 250
       end
       object edtFechaFinFiltro: TcxDateEdit
-        Left = 379
+        Left = 386
         Top = 37
         Properties.OnChange = OnCamposFiltroChange
         Style.BorderColor = clWindowFrame
@@ -97,10 +97,10 @@ inherited frViewFiltroBase: TfrViewFiltroBase
         StyleHot.LookAndFeel.NativeStyle = True
         StyleHot.LookAndFeel.SkinName = ''
         TabOrder = 3
-        Width = 121
+        Width = 250
       end
       object txtFiltroTodo2: TcxTextEdit
-        Left = 267
+        Left = 386
         Top = 10
         Properties.OnChange = OnCamposFiltroChange
         Style.BorderColor = clWindowFrame
@@ -119,7 +119,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase
         StyleHot.LookAndFeel.NativeStyle = True
         StyleHot.LookAndFeel.SkinName = ''
         TabOrder = 1
-        Width = 468
+        Width = 250
       end
       object dxLayoutControl1Group_Root: TdxLayoutGroup
         ShowCaption = False
@@ -140,6 +140,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase
           object dxLayoutControl1Item4: TdxLayoutItem
             AutoAligns = [aaVertical]
             AlignHorz = ahClient
+            Caption = 'y'
             Control = txtFiltroTodo2
             ControlOptions.ShowBorder = False
           end
@@ -168,8 +169,8 @@ inherited frViewFiltroBase: TfrViewFiltroBase
     end
     object TBXAlignmentPanel1: TTBXAlignmentPanel
       Left = 0
-      Top = 68
+      Top = 70
-      Width = 612
+      Width = 671
       Height = 30
       Margins.Left = 10
       Align = alTop
@@ -177,7 +178,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase
       object tbxBotones: TTBXToolbar
         Left = 10
         Top = 0
-        Width = 602
+        Width = 661
         Height = 30
         Align = alTop
         AutoResize = False

Source/GUIBase/uViewFiltroBase.pas

@@ -116,7 +116,7 @@ end;
 procedure TfrViewFiltroBase.LimpiarCampos;
 begin
   txtFiltroTodo.Clear;
-//  txtFiltroTodo2.Clear;
+  txtFiltroTodo2.Clear;
   edtFechaIniFiltro.Clear;
   edtFechaFinFiltro.Clear;
 end;
@@ -157,7 +157,7 @@ end;
 
 function TfrViewFiltroBase.GetTexto2: String;
 begin
-//  Result := txtFiltroTodo2.Text;
+  Result := txtFiltroTodo2.Text;
 end;
 
 procedure TfrViewFiltroBase.SetTexto(const Value: String);
@@ -167,7 +167,7 @@ end;
 
 procedure TfrViewFiltroBase.SetTexto2(const Value: String);
 begin
-  txtFiltroTodo.Text := Value;
+  txtFiltroTodo2.Text := Value;
 end;
 
 end.

Source/GUIBase/uViewGrid.dfm

@@ -80,6 +80,7 @@ inherited frViewGrid: TfrViewGrid
     Visible = False
     ReadOnly = False
     ExplicitWidth = 554
+    ExplicitHeight = 102
     inherited TBXDockablePanel1: TTBXDockablePanel
       ExplicitWidth = 554
       ExplicitHeight = 102
@@ -91,26 +92,43 @@ inherited frViewGrid: TfrViewGrid
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 457
+          ExplicitWidth = 250
-          Width = 457
+          Width = 250
         end
         inherited edtFechaIniFiltro: TcxDateEdit
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 240
+          ExplicitWidth = 250
-          Width = 240
+          Width = 250
         end
         inherited edtFechaFinFiltro: TcxDateEdit
-          Left = 344
+          Left = 321
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 344
+          ExplicitLeft = 321
-          ExplicitWidth = 200
+          ExplicitWidth = 250
-          Width = 200
+          Width = 250
+        end
+        inherited txtFiltroTodo2: TcxTextEdit
+          Left = 321
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
+          ExplicitLeft = 321
+          ExplicitWidth = 250
+          Width = 250
+        end
+        inherited dxLayoutControl1Group_Root: TdxLayoutGroup
+          inherited dxLayoutControl1Group2: TdxLayoutGroup
+            inherited dxLayoutControl1Item4: TdxLayoutItem
+              Visible = False
+            end
+          end
         end
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
@@ -135,7 +153,6 @@ inherited frViewGrid: TfrViewGrid
     SupportedDocks = [dkStandardDock, dkMultiDock]
     TabOrder = 2
     Visible = False
-    ExplicitWidth = 128
     object TBXAlignmentPanel1: TTBXAlignmentPanel
       Left = 0
       Top = 0
@@ -183,7 +200,7 @@ inherited frViewGrid: TfrViewGrid
       PrinterPage.ScaleMode = smFit
       PrinterPage._dxMeasurementUnits_ = 0
       PrinterPage._dxLastMU_ = 2
-      ReportDocument.CreationDate = 40113.806179872680000000
+      ReportDocument.CreationDate = 44649.770773101850000000
       StyleManager = dmBase.dxPrintStyleManager1
       OptionsCards.Shadow.Depth = 0
       OptionsExpanding.ExpandGroupRows = True

Source/GUIBase/uViewGridBase.pas

@@ -65,6 +65,10 @@ type
     function GetFilter: string;
     property Filter: string read GetFilter write SetFilter;
 
+    procedure SetFilter2(const Value: string);
+    function GetFilter2: string;
+    property Filter2: string read GetFilter2 write SetFilter2;
+
     function GetFiltered: Boolean;
     property Filtered : Boolean read GetFiltered;
 
@@ -115,8 +119,8 @@ type
     function GetViewFiltros: IViewFiltroBase;
     procedure SetViewFiltros(const Value: IViewFiltroBase); virtual;
     procedure FilterChanged(Sender : TObject); virtual;
-    procedure FiltrarGrid(TextoFiltro: String); virtual;
+    procedure FiltrarGrid(TextoFiltro1, TextoFiltro2: String); overload; virtual;
-    procedure FiltrarGrid2(TextoFiltro : String);
+    procedure FiltrarGrid(TextoFiltro : String); overload; virtual;
 
   public
     constructor Create(AOwner: TComponent); override;
@@ -147,6 +151,7 @@ type
     procedure RestoreFromRegistry (const Path : String); virtual;
 
     procedure RestoreFromIniFile;
+    procedure ConfigView; virtual; 
     procedure StoreToIniFile;
 
     {function Locate(const AItemIndex: Integer; const AValue: String;
@@ -220,6 +225,11 @@ begin
 //
 end;
 
+procedure TfrViewGridBase.ConfigView;
+begin
+//
+end;
+
 procedure TfrViewGridBase.ContraerTodo;
 begin
   if Assigned(_FocusedView) then
@@ -346,7 +356,7 @@ begin
   if Assigned(ViewFiltros) then
   begin
      Filter := ViewFiltros.Texto;
-//     Filter2 := ViewFiltros.Texto2;
+     Filter2 := ViewFiltros.Texto2;
   end;
 end;
 
@@ -366,6 +376,8 @@ begin
 
     _FocusedView.RestoreFromIniFile(AIniFile + 'grid.xml', True, False, []);
   end;
+  
+  ConfigView;
 end;
 
 procedure TfrViewGridBase.RestoreFromRegistry(const Path: String);
@@ -402,8 +414,7 @@ begin
   if Assigned(ViewFiltros) then
      ViewFiltros.Texto := FFilter;
 
-  FiltrarGrid(FFilter);
+  FiltrarGrid(FFilter, FFilter2);
-//  FiltrarGrid('add');
 
   //Obliga a generar todos los filtros de las vista hija
   AnadirOtrosFiltros;
@@ -417,16 +428,16 @@ begin
   FFilter2 := Value;
 
   //Así tendremos el mismo valor en el filtro simple que en el filtro en detalle
-//  if Assigned(ViewFiltros) then
+  if Assigned(ViewFiltros) then
-//     ViewFiltros.Texto := FFilter;
+     ViewFiltros.Texto2 := FFilter2;
 
-//  FiltrarGrid2(FFilter2);
+  FiltrarGrid(FFilter, FFilter2);
 
   //Obliga a generar todos los filtros de las vista hija
-//  AnadirOtrosFiltros;
+  AnadirOtrosFiltros;
 
-//  if Assigned(FOnFilterChanged) then
+  if Assigned(FOnFilterChanged) then
-//    FOnFilterChanged(Self);
+    FOnFilterChanged(Self);
 end;
 
 procedure TfrViewGridBase.SetMultiSelect(const Value: Boolean);
@@ -492,7 +503,7 @@ begin
     _FocusedView.StoreToRegistry(Path + '\\GridSettings\\' + Self.Name, False, [], Self.Name);
 end;
 
-procedure TfrViewGridBase.FiltrarGrid(TextoFiltro : String);
+procedure TfrViewGridBase.FiltrarGrid(TextoFiltro1, TextoFiltro2 : String);
 var
   Columna: TcxGridDBColumn;
   i: Integer;
@@ -504,7 +515,7 @@ begin
     try
       Options := [fcoCaseInsensitive, fcoSoftCompare];
       Root.Clear;
-      if Length(TextoFiltro) > 0 then
+      if Length(TextoFiltro1) > 0 then
       begin
         AItemList := Root.AddItemList(fboAnd);
         AItemList.BoolOperatorKind := fboOr;
@@ -512,10 +523,24 @@ begin
         begin
           Columna := (_FocusedView as TcxGridDBTableView).Columns[i];
           if (Length(Columna.Caption) > 0) and (Columna.Caption <> 'RecID') then
-             AItemList.AddItem(Columna, foLike, '%'+TextoFiltro+'%', IntToStr(i));
+             AItemList.AddItem(Columna, foLike, '%'+TextoFiltro1+'%', IntToStr(i));
         end;
-        Active := True;
+      end;
-      end
+
+      if Length(TextoFiltro2) > 0 then
+      begin
+        AItemList := Root.AddItemList(fboAnd);
+        AItemList.BoolOperatorKind := fboOr;
+        for i:=0 to (_FocusedView as TcxGridDBTableView).ColumnCount - 1 do
+        begin
+          Columna := (_FocusedView as TcxGridDBTableView).Columns[i];
+          if (Length(Columna.Caption) > 0) and (Columna.Caption <> 'RecID') then
+             AItemList.AddItem(Columna, foLike, '%'+TextoFiltro2+'%', IntToStr(i));
+        end;
+      end;
+
+      if ((Length(TextoFiltro1) > 0) or (Length(TextoFiltro2) > 0)) then
+        Active := True
       else
         Active := False;
     finally
@@ -525,7 +550,7 @@ begin
 end;
 
 
-procedure TfrViewGridBase.FiltrarGrid2(TextoFiltro: String);
+procedure TfrViewGridBase.FiltrarGrid(TextoFiltro: String);
 var
   Columna: TcxGridDBColumn;
   i: Integer;
@@ -536,7 +561,7 @@ begin
     BeginUpdate;
     try
       Options := [fcoCaseInsensitive, fcoSoftCompare];
-//      Root.Clear;
+      Root.Clear;
       if Length(TextoFiltro) > 0 then
       begin
         AItemList := Root.AddItemList(fboAnd);

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

@@ -26,6 +26,7 @@ type
     procedure AsignarController; override;
     //Si sobreescribimos este método podremos tener en cuenta otras columnas para el calculo del importe total de un concepto
     function CalcularImporteTotalConcepto(DataTable: TDADataTable): Double; override;
+    procedure CalculoDetalleConcepto(DataTable: TDADataTable; var ImporteAcumulado : Double; var ImporteTotal : Double; const Opcional: Boolean); override;    
     procedure ValidarCampos(DataTable: TDADataTable); override;
     procedure DesglosarPorteDetalles(ImportePorte: Currency; ADetalles: IDAStronglyTypedDataTable);
     function DarTotalPorteTotal(ADetalles: IDAStronglyTypedDataTable): Double;
@@ -40,7 +41,7 @@ type
 implementation
 
 uses Variants, uDialogUtils, uControllerDetallesBase, uDataModuleAlbaranesProveedor, uArticulosAlbaranProveedorController,
-     uDataTableUtils, uCalculosUtils;
+     uDataTableUtils, uCalculosUtils, uNumUtils;
 
 { TDetallesAlbaranProveedorController }
 
@@ -94,7 +95,22 @@ end;
 
 function TDetallesAlbaranProveedorController.CalcularImporteTotalConcepto(DataTable: TDADataTable): Double;
 begin
-  Result := CalcularLineaConcepto(DataTable);
+//Calcular con 4 decimales
+  Result := CalcularLineaConcepto(DataTable, 4);
+end;
+
+procedure TDetallesAlbaranProveedorController.CalculoDetalleConcepto(
+  DataTable: TDADataTable; var ImporteAcumulado, ImporteTotal: Double;
+  const Opcional: Boolean);
+begin
+  with DataTable do
+  begin
+    ImporteAcumulado := ImporteAcumulado + RoundCurrency(FieldByName(CAMPO_IMPORTE_TOTAL).AsCurrency, 4);
+//    ImporteAcumulado := ImporteAcumulado + FieldByName(CAMPO_IMPORTE_TOTAL).AsFloat;
+    if not Opcional then
+       ImporteTotal := ImporteTotal + RoundCurrency(FieldByName(CAMPO_IMPORTE_TOTAL).AsCurrency, 4);
+//       ImporteTotal := ImporteTotal + FieldByName(CAMPO_IMPORTE_TOTAL).AsFloat;
+  end;
 end;
 
 constructor TDetallesAlbaranProveedorController.Create;

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

@@ -1,9 +1,31 @@
 inherited frViewDetallesAlbaranProveedor: TfrViewDetallesAlbaranProveedor
   inherited cxGrid: TcxGrid
     inherited cxGridView: TcxGridDBTableView
+      inherited cxGridViewDESCRIPCION: TcxGridDBColumn
+        PropertiesClassName = 'TcxTextEditProperties'
+        Properties.AutoSelect = True
+      end
+      inherited cxGridViewIMPORTEUNIDAD: TcxGridDBColumn
+        Properties.DecimalPlaces = 4
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
+        Properties.EditFormat = ',0.0000;-,0.0000'
+      end
       inherited cxGridViewIMPORTENETO: TcxGridDBColumn
+        Properties.DecimalPlaces = 4
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
+        Properties.EditFormat = ',0.0000;-,0.0000'
         Properties.ReadOnly = False
       end
+      inherited cxGridViewIMP_UNIDAD_DTO: TcxGridDBColumn
+        Properties.DecimalPlaces = 4
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
+        Properties.EditFormat = ',0.0000;-,0.0000'
+      end
+      inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn
+        Properties.DecimalPlaces = 4
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
+        Properties.EditFormat = ',0.0000;-,0.0000'
+      end
     end
   end
 end

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

@@ -43,7 +43,6 @@ inherited frViewDireccionEntregaAlbaranProv: TfrViewDireccionEntregaAlbaranProv
       DataBinding.DataField = 'ID_ALMACEN'
       DataBinding.DataSource = dsAlbaran
       Properties.DropDownListStyle = lsFixedList
-      Properties.GridMode = True
       Properties.ImmediatePost = True
       Properties.KeyFieldNames = 'ID'
       Properties.ListColumns = <
@@ -53,6 +52,7 @@ inherited frViewDireccionEntregaAlbaranProv: TfrViewDireccionEntregaAlbaranProv
       Properties.ListOptions.AnsiSort = True
       Properties.ListOptions.GridLines = glNone
       Properties.ListOptions.ShowHeader = False
+      Properties.ListOptions.SyncMode = True
       Properties.ListSource = dsAlmacenes
       Properties.PostPopupValueOnTab = True
       Style.BorderColor = clWindowFrame

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

@@ -6,6 +6,32 @@ inherited frViewElegirArticulosAlbaranesProveedor: TfrViewElegirArticulosAlbaran
     Height = 286
     ExplicitHeight = 286
     inherited cxGridView: TcxGridDBTableView
+      inherited cxGridViewPRECIO_COSTE: TcxGridDBColumn
+        Caption = 'Precio material'
+        Properties.DecimalPlaces = 4
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
+        Properties.EditFormat = ',0.0000 '#8364';-,0.0000 '#8364
+      end
+      inherited cxGridViewDESCUENTO: TcxGridDBColumn
+        Visible = True
+      end
+      inherited cxGridViewPRECIO_NETO: TcxGridDBColumn
+        Caption = 'Precio coste'
+        Properties.DecimalPlaces = 4
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
+        Properties.EditFormat = ',0.0000 '#8364';-,0.0000 '#8364
+        Visible = True
+      end
+      inherited cxGridViewPRECIO_PVP: TcxGridDBColumn
+        Properties.DecimalPlaces = 4
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
+      end
+      inherited cxGridViewPRECIOPVP2: TcxGridDBColumn
+        Properties.DecimalPlaces = 4
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
+        Visible = False
+        VisibleForCustomization = False
+      end
       object cxGridViewID_PROVEEDOR: TcxGridDBColumn
         DataBinding.FieldName = 'ID_PROVEEDOR'
         Visible = False
@@ -17,6 +43,9 @@ inherited frViewElegirArticulosAlbaranesProveedor: TfrViewElegirArticulosAlbaran
     inherited cxGridLevel2: TcxGridLevel
       Visible = False
     end
+    inherited cxGridLevel3: TcxGridLevel
+      Caption = 'COMPRAS'
+    end
   end
   inherited frViewFiltroBase1: TfrViewFiltroBase
     inherited TBXDockablePanel1: TTBXDockablePanel
@@ -38,13 +67,25 @@ inherited frViewElegirArticulosAlbaranesProveedor: TfrViewElegirArticulosAlbaran
           Width = 121
         end
         inherited edtFechaFinFiltro: TcxDateEdit
+          Left = 549
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
+          ExplicitLeft = 549
           ExplicitWidth = 121
           Width = 121
         end
+        inherited txtFiltroTodo2: TcxTextEdit
+          Left = 548
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
+          ExplicitLeft = 548
+          ExplicitWidth = 223
+          Width = 223
+        end
       end
     end
   end

Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas

@@ -9,10 +9,10 @@ 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_Articulos_Proveedores = '{5D678D12-69CE-4F8D-B0A7-935BC46AB396}';
+  RID_Articulos_Proveedores = '{35843459-699A-4277-B2A0-79EAA4797337}';
-  RID_Articulos = '{7C64A385-817F-4F17-8431-34FCCA700469}';
+  RID_Articulos = '{104266C2-105C-4BBC-8B7A-C7B2025F4904}';
-  RID_ArticulosParaCompra = '{2CB03BC7-A75E-45C1-B0F4-A0041572AEFF}';
+  RID_ArticulosParaCompra = '{C0A12E36-ACA2-4A22-B567-DCD20CA71CC8}';
-  RID_ArticulosParaCliente = '{790C555B-1C87-4A88-8A26-D950849B291C}';
+  RID_ArticulosParaCliente = '{671736FB-3604-456E-A90C-A2740C9ADCB8}';
 
   { Data table names }
   nme_Articulos_Proveedores = 'Articulos_Proveedores';
@@ -201,7 +201,7 @@ const
 type
   { IArticulos_Proveedores }
   IArticulos_Proveedores = interface(IDAStronglyTypedDataTable)
-  ['{6375AC3C-024A-4EE1-8F95-103234615EE6}']
+  ['{4A8C9D9E-C6FC-4EA4-8585-36688DFA9180}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -356,7 +356,7 @@ type
 
   { IArticulos }
   IArticulos = interface(IDAStronglyTypedDataTable)
-  ['{D41402F4-E414-498B-9D9C-9911FDA7CB91}']
+  ['{642CA1F3-2076-4C49-BAAA-13B28C63236D}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -679,7 +679,7 @@ type
 
   { IArticulosParaCompra }
   IArticulosParaCompra = interface(IDAStronglyTypedDataTable)
-  ['{181773CE-BBDC-4BC0-B64A-D0ACA39DF9B2}']
+  ['{55011903-66C8-4B18-80EE-45701EDE1A4E}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1002,7 +1002,7 @@ type
 
   { IArticulosParaCliente }
   IArticulosParaCliente = interface(IDAStronglyTypedDataTable)
-  ['{A6F2D4A2-8C62-4F02-8EEE-B132F5DD263E}']
+  ['{276845CB-1DD2-4A12-B708-594EA6615D55}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);

Source/Modulos/Articulos/Model/schArticulosServer_Intf.pas

@@ -9,15 +9,15 @@ 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_Articulos_ProveedoresDelta = '{677EF24F-54AB-443D-8530-B8B18B38C132}';
+  RID_Articulos_ProveedoresDelta = '{508E14D6-DD8E-46A3-86B4-C4052CE37515}';
-  RID_ArticulosDelta = '{7D88B4CD-D716-4173-85EF-69526AA81C4D}';
+  RID_ArticulosDelta = '{D4A65D75-7A38-4EC0-94EE-9FBF9C9E1075}';
-  RID_ArticulosParaCompraDelta = '{20C0E521-A90A-4CEB-8070-C96D1C33F103}';
+  RID_ArticulosParaCompraDelta = '{C6706F97-CAC5-4DC0-9A73-E43F0F127EE6}';
-  RID_ArticulosParaClienteDelta = '{B8F9252C-D13A-4190-ADA5-4CE30B7E4BFB}';
+  RID_ArticulosParaClienteDelta = '{8C543A96-1303-4102-8B9F-B59196B961DE}';
 
 type
   { IArticulos_ProveedoresDelta }
   IArticulos_ProveedoresDelta = interface(IArticulos_Proveedores)
-  ['{677EF24F-54AB-443D-8530-B8B18B38C132}']
+  ['{508E14D6-DD8E-46A3-86B4-C4052CE37515}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_ARTICULOValue : Integer;
@@ -171,7 +171,7 @@ type
 
   { IArticulosDelta }
   IArticulosDelta = interface(IArticulos)
-  ['{7D88B4CD-D716-4173-85EF-69526AA81C4D}']
+  ['{D4A65D75-7A38-4EC0-94EE-9FBF9C9E1075}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -494,7 +494,7 @@ type
 
   { IArticulosParaCompraDelta }
   IArticulosParaCompraDelta = interface(IArticulosParaCompra)
-  ['{20C0E521-A90A-4CEB-8070-C96D1C33F103}']
+  ['{C6706F97-CAC5-4DC0-9A73-E43F0F127EE6}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -817,7 +817,7 @@ type
 
   { IArticulosParaClienteDelta }
   IArticulosParaClienteDelta = interface(IArticulosParaCliente)
-  ['{B8F9252C-D13A-4190-ADA5-4CE30B7E4BFB}']
+  ['{8C543A96-1303-4102-8B9F-B59196B961DE}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;

Source/Modulos/Articulos/Views/uEditorArticulo.dfm

@@ -16,7 +16,7 @@ inherited fEditorArticulo: TfEditorArticulo
     Width = 957
     Caption = 'Art'#237'culo'
     ExplicitTop = 52
-    ExplicitWidth = 624
+    ExplicitWidth = 957
     inherited Image1: TImage
       Left = 930
       Picture.Data = {
@@ -38,7 +38,7 @@ inherited fEditorArticulo: TfEditorArticulo
   end
   inherited TBXDock: TTBXDock
     Width = 957
-    ExplicitWidth = 624
+    ExplicitWidth = 957
     inherited tbxMain: TTBXToolbar
       ExplicitWidth = 543
       inherited TBXItem2: TTBXItem
@@ -107,26 +107,25 @@ inherited fEditorArticulo: TfEditorArticulo
       item
         Width = 200
       end>
-    ExplicitTop = 461
+    ExplicitTop = 650
-    ExplicitWidth = 624
+    ExplicitWidth = 957
   end
   inherited pgPaginas: TPageControl
     Width = 951
     Height = 535
+    ActivePage = pagPrecios
     ExplicitTop = 112
-    ExplicitWidth = 618
+    ExplicitWidth = 951
-    ExplicitHeight = 346
+    ExplicitHeight = 535
     inherited pagGeneral: TTabSheet
-      ExplicitLeft = 3
+      ExplicitLeft = 4
-      ExplicitTop = 25
+      ExplicitTop = 24
       ExplicitWidth = 943
       ExplicitHeight = 507
     end
     object pagPrecios: TTabSheet
       Caption = 'Precios'
       ImageIndex = 1
-      ExplicitWidth = 610
-      ExplicitHeight = 318
       inline frViewProveedoresArticulo1: TfrViewProveedoresArticulo
         Left = 0
         Top = 0
@@ -141,7 +140,6 @@ inherited fEditorArticulo: TfEditorArticulo
         ParentFont = False
         TabOrder = 0
         ReadOnly = False
-        ExplicitTop = -3
         ExplicitWidth = 943
         ExplicitHeight = 507
         inherited cxGrid: TcxGrid
@@ -160,7 +158,7 @@ inherited fEditorArticulo: TfEditorArticulo
   inherited PnlComentario: TPanel
     Width = 957
     ExplicitTop = 79
-    ExplicitWidth = 624
+    ExplicitWidth = 957
     inherited lbComentario: TLabel
       Width = 947
       Height = 25

Source/Modulos/Articulos/Views/uEditorArticulos.dfm

@@ -29,13 +29,20 @@ inherited fEditorArticulos: TfEditorArticulos
       ExplicitWidth = 543
     end
     inherited tbxFiltro: TTBXToolbar
+      ExplicitWidth = 406
       inherited tbxEditFiltro: TTBXEditItem
         EditOptions = [tboUseEditWhenVertical]
       end
+      inherited tbxEditFiltro2: TTBXEditItem
+        Enabled = True
+        Visible = True
+      end
     end
     inherited TBXTMain2: TTBXToolbar
+      Left = 406
       DockPos = 275
       Visible = True
+      ExplicitLeft = 406
       ExplicitWidth = 117
       object TBXItem38: TTBXItem
         Action = actAsignarTarifa

Source/Modulos/Articulos/Views/uViewArticulos.dfm

@@ -226,26 +226,26 @@ inherited frViewArticulos: TfrViewArticulos
           StyleHot.LookAndFeel.SkinName = ''
         end
         inherited edtFechaFinFiltro: TcxDateEdit
-          Left = 549
+          Left = 511
           Enabled = False
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 549
+          ExplicitLeft = 511
         end
         inherited txtFiltroTodo2: TcxTextEdit
-          Left = 550
+          Left = 511
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 550
+          ExplicitLeft = 511
         end
         inherited dxLayoutControl1Group_Root: TdxLayoutGroup
           inherited dxLayoutControl1Group2: TdxLayoutGroup
             inherited dxLayoutControl1Item4: TdxLayoutItem
-              Visible = False
+              Visible = True
             end
           end
           inherited dxLayoutControl1Group1: TdxLayoutGroup

Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm

@@ -95,6 +95,7 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
         Width = 48
       end
       inherited cxGridViewIMPORTEUNIDAD: TcxGridDBColumn
+        Properties.EditFormat = ',0.00 '#8364';-,0.00 '#8364
         Width = 68
       end
       inherited cxGridViewIMPORTENETO: TcxGridDBColumn
@@ -104,11 +105,6 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
         HeaderAlignmentHorz = taRightJustify
         Width = 29
       end
-      inherited cxGridViewIMP_UNIDAD_DTO: TcxGridDBColumn
-        Properties.DecimalPlaces = 2
-        Properties.DisplayFormat = ',0.00 '#8364';-,0.00 '#8364
-        Properties.EditFormat = ',0.00 '#8364';-,0.00 '#8364
-      end
       inherited cxGridViewIMPORTEPORTE: TcxGridDBColumn
         Caption = 'Porte unidad'
         Visible = False
@@ -116,9 +112,6 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
         Width = 78
       end
       inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn
-        Properties.DecimalPlaces = 2
-        Properties.DisplayFormat = ',0.00 '#8364';-,0.00 '#8364
-        Properties.EditFormat = ',0.00 '#8364';-,0.00 '#8364
         Width = 58
       end
     end

Source/Modulos/Articulos/Views/uViewProveedoresArticulo.dfm

@@ -47,8 +47,9 @@ inherited frViewProveedoresArticulo: TfrViewProveedoresArticulo
         DataBinding.FieldName = 'PRECIO_COSTE'
         PropertiesClassName = 'TcxCurrencyEditProperties'
         Properties.Alignment.Horz = taRightJustify
-        Properties.DecimalPlaces = 2
+        Properties.AssignedValues.EditFormat = True
-        Properties.DisplayFormat = ',0.00 '#8364';-,0.00 '#8364
+        Properties.DecimalPlaces = 4
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
         HeaderAlignmentHorz = taRightJustify
       end
       object cxGridViewDESCUENTO: TcxGridDBColumn
@@ -69,8 +70,9 @@ inherited frViewProveedoresArticulo: TfrViewProveedoresArticulo
         DataBinding.FieldName = 'PRECIO_NETO'
         PropertiesClassName = 'TcxCurrencyEditProperties'
         Properties.Alignment.Horz = taRightJustify
-        Properties.DecimalPlaces = 2
+        Properties.DecimalPlaces = 4
-        Properties.DisplayFormat = ',0.00 '#8364';-,0.00 '#8364
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
+        Properties.EditFormat = ',0.0000 '#8364';-,0.0000 '#8364
         HeaderAlignmentHorz = taRightJustify
         Options.Editing = False
       end
@@ -84,8 +86,9 @@ inherited frViewProveedoresArticulo: TfrViewProveedoresArticulo
         Caption = 'Precio P.V.P (Suministro)'
         DataBinding.FieldName = 'PRECIO_PVP_VENTA'
         PropertiesClassName = 'TcxCurrencyEditProperties'
-        Properties.DecimalPlaces = 2
+        Properties.DecimalPlaces = 4
-        Properties.DisplayFormat = ',0.00 '#8364';-,0.00 '#8364
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
+        Properties.EditFormat = ',0.0000 '#8364';-,0.0000 '#8364
         Visible = False
         Options.Editing = False
         VisibleForCustomization = False
@@ -94,8 +97,9 @@ inherited frViewProveedoresArticulo: TfrViewProveedoresArticulo
         Caption = 'Precio P.V.P (Total)'
         DataBinding.FieldName = 'PRECIO_PVP_TOTAL'
         PropertiesClassName = 'TcxCurrencyEditProperties'
-        Properties.DecimalPlaces = 2
+        Properties.DecimalPlaces = 4
-        Properties.DisplayFormat = ',0.00 '#8364';-,0.00 '#8364
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
+        Properties.EditFormat = ',0.0000 '#8364';-,0.0000 '#8364
         Visible = False
         Options.Editing = False
         VisibleForCustomization = False
@@ -110,18 +114,6 @@ inherited frViewProveedoresArticulo: TfrViewProveedoresArticulo
   inherited ToolBar1: TToolBar
     Width = 774
     ExplicitWidth = 774
-    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
   inherited ActionListContenido: TActionList
     inherited actModificar: TAction

Source/Modulos/Contactos/Contactos_Group.groupproj

@@ -14,6 +14,7 @@
     <Projects Include="..\Contabilidad\Model\Contabilidad_model.dproj" />
     <Projects Include="..\Contabilidad\Plugin\Contabilidad_plugin.dproj" />
     <Projects Include="..\Contabilidad\Views\Contabilidad_view.dproj" />
+    <Projects Include="..\Gestor de informes\Views\GestorInformes_view.dproj" />
     <Projects Include="Controller\Contactos_controller.dproj" />
     <Projects Include="Data\Contactos_data.dproj" />
     <Projects Include="Model\Contactos_model.dproj" />
@@ -161,14 +162,23 @@
   <Target Name="Contabilidad_plugin:Make">
     <MSBuild Projects="..\Contabilidad\Plugin\Contabilidad_plugin.dproj" Targets="Make" />
   </Target>
+  <Target Name="GestorInformes_view">
+    <MSBuild Projects="..\Gestor de informes\Views\GestorInformes_view.dproj" Targets="" />
+  </Target>
+  <Target Name="GestorInformes_view:Clean">
+    <MSBuild Projects="..\Gestor de informes\Views\GestorInformes_view.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="GestorInformes_view:Make">
+    <MSBuild Projects="..\Gestor de informes\Views\GestorInformes_view.dproj" Targets="Make" />
+  </Target>
   <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contabilidad_model;Contabilidad_data;Contabilidad_controller;Contactos_controller;Contactos_view;Contactos_plugin;Contabilidad_view;FactuGES;FactuGES_Server;Contabilidad_plugin" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contabilidad_model;Contabilidad_data;Contabilidad_controller;Contactos_controller;Contactos_view;Contactos_plugin;Contabilidad_view;FactuGES;FactuGES_Server;Contabilidad_plugin;GestorInformes_view" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contabilidad_model:Clean;Contabilidad_data:Clean;Contabilidad_controller:Clean;Contactos_controller:Clean;Contactos_view:Clean;Contactos_plugin:Clean;Contabilidad_view:Clean;FactuGES:Clean;FactuGES_Server:Clean;Contabilidad_plugin:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contabilidad_model:Clean;Contabilidad_data:Clean;Contabilidad_controller:Clean;Contactos_controller:Clean;Contactos_view:Clean;Contactos_plugin:Clean;Contabilidad_view:Clean;FactuGES:Clean;FactuGES_Server:Clean;Contabilidad_plugin:Clean;GestorInformes_view:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contabilidad_model:Make;Contabilidad_data:Make;Contabilidad_controller:Make;Contactos_controller:Make;Contactos_view:Make;Contactos_plugin:Make;Contabilidad_view:Make;FactuGES:Make;FactuGES_Server:Make;Contabilidad_plugin:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contabilidad_model:Make;Contabilidad_data:Make;Contabilidad_controller:Make;Contactos_controller:Make;Contactos_view:Make;Contactos_plugin:Make;Contabilidad_view:Make;FactuGES:Make;FactuGES_Server:Make;Contabilidad_plugin:Make;GestorInformes_view:Make" />
   </Target>
   <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
 </Project>

Source/Modulos/Contactos/Model/uBizContactosServer.pas

@@ -151,6 +151,7 @@ begin
 
 //En el caso de querer tener los contactos separados por empresas en lugar de tenerlos en común
   ACommand := ASchema.NewCommand(ACurrentConn, 'Insert_ContactoEmpresa');
+
 //En el caso de querer tener los contactos en común para todas las empresas
 //  ACommand := ASchema.NewCommand(ACurrentConn, 'Insert_ContactoEmpresas');
   try

Source/Modulos/Contratos de cliente/Reports/uRptContratosCliente_Server.dfm

@@ -367,8 +367,9 @@ object RptContratosCliente: TRptContratosCliente
               '   V_CONTRATOS_CLIENTE.POBLACION_ENVIO,'#10'    V_CONTRATOS_CLIENTE.' +
               'PROVINCIA_ENVIO,'#10'    V_CONTRATOS_CLIENTE.CODIGO_POSTAL_ENVIO,'#10'  ' +
               '  V_CONTRATOS_CLIENTE.PERS_CONTACTO_ENVIO,'#10'    V_CONTRATOS_CLIEN' +
-              'TE.TLFS_ENVIO,'#10'    V_CONTRATOS_CLIENTE.NOTAS_ENVIO'#10'FROM'#10'    V_CO' +
+              'TE.TLFS_ENVIO,'#10'    V_CONTRATOS_CLIENTE.NOTAS_ENVIO,'#10'    V_CONTRA' +
-              'NTRATOS_CLIENTE'#10'WHERE'#10'    V_CONTRATOS_CLIENTE.ID = :ID'#10
+              'TOS_CLIENTE.ID_TIENDA,'#10'    V_CONTRATOS_CLIENTE.TIENDA'#10'FROM'#10'    V' +
+              '_CONTRATOS_CLIENTE'#10'WHERE'#10'    V_CONTRATOS_CLIENTE.ID = :ID'#10
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -522,6 +523,14 @@ object RptContratosCliente: TRptContratosCliente
               item
                 DatasetField = 'NOTAS_ENVIO'
                 TableField = 'NOTAS_ENVIO'
+              end
+              item
+                DatasetField = 'ID_TIENDA'
+                TableField = 'ID_TIENDA'
+              end
+              item
+                DatasetField = 'TIENDA'
+                TableField = 'TIENDA'
               end>
           end>
         Name = 'Informe_Cabecera'
@@ -697,6 +706,15 @@ object RptContratosCliente: TRptContratosCliente
             Name = 'NOTAS_ENVIO'
             DataType = datString
             Size = 255
+          end
+          item
+            Name = 'ID_TIENDA'
+            DataType = datInteger
+          end
+          item
+            Name = 'TIENDA'
+            DataType = datString
+            Size = 255
           end>
         ReadOnly = True
       end
@@ -1295,6 +1313,15 @@ object RptContratosCliente: TRptContratosCliente
         Name = 'NOTAS_ENVIO'
         DataType = datString
         Size = 255
+      end
+      item
+        Name = 'ID_TIENDA'
+        DataType = datInteger
+      end
+      item
+        Name = 'TIENDA'
+        DataType = datString
+        Size = 255
       end>
     Params = <
       item

Source/Modulos/Contratos de cliente/Reports/uRptContratosCliente_Server.pas

@@ -593,7 +593,7 @@ begin
     tbl_Detalles.Active := True;
     tbl_Condiciones.Active := True;
 
-    AInforme := DarRutaFichero(DarRutaInformes, rptInforme, tbl_Cabecera.FieldByName('ID_EMPRESA').AsString);
+    AInforme := DarRutaFichero(DarRutaInformes, rptInforme, tbl_Cabecera.FieldByName('ID_EMPRESA').AsString, tbl_Cabecera.FieldByName('ID_TIENDA').AsString);
     if VarIsNull(AInforme) then
        raise Exception.Create (('Error Servidor: _GenerarContrato, no encuentra informe ' + rptInforme));
 

Source/Modulos/Contratos de cliente/Views/uEditorContratosCliente.dfm

@@ -2,7 +2,6 @@ inherited fEditorContratosCliente: TfEditorContratosCliente
   Caption = 'Lista de contratos de cliente'
   ClientWidth = 805
   ExplicitWidth = 813
-  ExplicitHeight = 482
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -163,7 +162,7 @@ inherited fEditorContratosCliente: TfEditorContratosCliente
       end
     end
     inherited tbxFiltro: TTBXToolbar
-      ExplicitWidth = 454
+      ExplicitWidth = 504
       inherited lblAno: TTBXLabelItem
         Visible = True
       end
@@ -173,6 +172,10 @@ inherited fEditorContratosCliente: TfEditorContratosCliente
       inherited sepAno: TTBXSeparatorItem
         Visible = True
       end
+      inherited tbxEditFiltro2: TTBXEditItem
+        Enabled = True
+        Visible = True
+      end
     end
     inherited tbxMenu: TTBXToolbar
       ExplicitWidth = 805
@@ -196,11 +199,11 @@ inherited fEditorContratosCliente: TfEditorContratosCliente
       end
     end
     inherited TBXTMain2: TTBXToolbar
-      Left = 454
+      Left = 504
       DockPos = 343
       Visible = True
-      ExplicitLeft = 454
+      ExplicitLeft = 504
-      ExplicitWidth = 351
+      ExplicitWidth = 301
       object TBXSeparatorItem18: TTBXSeparatorItem
       end
       object TBXItem40: TTBXItem

Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm

@@ -61,6 +61,12 @@ inherited frViewContratosCliente: TfrViewContratosCliente
         VisibleForCustomization = False
         Width = 20
       end
+      object cxGridViewTIENDA: TcxGridDBColumn
+        Caption = 'Tienda'
+        DataBinding.FieldName = 'TIENDA'
+        Visible = False
+        VisibleForCustomization = False
+      end
       object cxGridViewREFERENCIA: TcxGridDBColumn
         DataBinding.FieldName = 'REFERENCIA'
         BestFitMaxWidth = 25
@@ -173,26 +179,43 @@ inherited frViewContratosCliente: TfrViewContratosCliente
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 806
+          ExplicitWidth = 250
-          Width = 806
+          Width = 250
         end
         inherited edtFechaIniFiltro: TcxDateEdit
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 285
+          ExplicitWidth = 250
-          Width = 285
+          Width = 250
         end
         inherited edtFechaFinFiltro: TcxDateEdit
-          Left = 389
+          Left = 515
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 389
+          ExplicitLeft = 515
-          ExplicitWidth = 504
+          ExplicitWidth = 250
-          Width = 504
+          Width = 250
+        end
+        inherited txtFiltroTodo2: TcxTextEdit
+          Left = 515
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
+          ExplicitLeft = 515
+          ExplicitWidth = 250
+          Width = 250
+        end
+        inherited dxLayoutControl1Group_Root: TdxLayoutGroup
+          inherited dxLayoutControl1Group2: TdxLayoutGroup
+            inherited dxLayoutControl1Item4: TdxLayoutItem
+              Visible = True
+            end
+          end
         end
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
@@ -204,14 +227,6 @@ inherited frViewContratosCliente: TfrViewContratosCliente
         end
       end
     end
-    inherited dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList
-      Left = 56
-    end
-    inherited ActionList1: TActionList
-      inherited actQuitarFiltro: TAction
-        OnExecute = frViewFiltroBase1actQuitarFiltroExecute
-      end
-    end
   end
   inherited pnlAgrupaciones: TTBXDockablePanel
     Top = 499

Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas

@@ -53,6 +53,7 @@ type
     cxGridViewVENDEDOR: TcxGridDBColumn;
     cxGridViewBASE_IMPONIBLE_FACTURAS: TcxGridDBColumn;
     cxStylePENDIENTESYFACTURADASOK: TcxStyle;
+    cxGridViewTIENDA: TcxGridDBColumn;
     procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel:
             TcxGridLevel);
     procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
@@ -71,7 +72,6 @@ type
     procedure cxGridViewDataControllerCompare(
       ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
       AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
-    procedure frViewFiltroBase1actQuitarFiltroExecute(Sender: TObject);
     procedure actProcedenciaExecute(Sender: TObject);
     procedure actProcedenciaUpdate(Sender: TObject);
 
@@ -86,6 +86,7 @@ type
     procedure SetContratos(const Value: IBizContratoCliente);
   public
     procedure AnadirOtrosFiltros; override;
+    procedure ConfigView; override;
     property Contratos: IBizContratoCliente read GetContratos write SetContratos;
   end;
 
@@ -93,7 +94,7 @@ implementation
 
 uses
   SysUtils, variants, uDataModuleContratosCliente, schContratosClienteClient_Intf,
-  uViewGridBase,
+  uViewGridBase, uFactuGES_App,
   //uReferenciasUtils,
   cxVariants;
 
@@ -186,6 +187,16 @@ begin
   cxGrid.ActiveLevel.GridView := cxGridView;
 end;
 
+procedure TfrViewContratosCliente.ConfigView;
+begin
+  inherited;
+
+  if ((AppFactuGES.EmpresaActiva.ID = 2) or (AppFactuGES.EmpresaActiva.ID = 3)) then
+    cxGridViewTIENDA.Visible := True
+  else
+    cxGridViewTIENDA.Visible := False;
+end;
+
 procedure TfrViewContratosCliente.cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel);
 begin
   inherited;
@@ -275,11 +286,6 @@ begin
   end;
 end;
 
-procedure TfrViewContratosCliente.frViewFiltroBase1actQuitarFiltroExecute(Sender: TObject);
-begin
-  frViewFiltroBase1.txtFiltroTodo.Clear;
-end;
-
 function TfrViewContratosCliente.GetContratos: IBizContratoCliente;
 begin
   Result := FContratos;

Source/Modulos/Facturas de cliente/Controller/FacturasCliente_controller.dproj

@@ -49,15 +49,16 @@
     <DelphiCompile Include="FacturasCliente_controller.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\..\Servidor\AlbaranesCliente_controller.dcp" />
+    <DCCReference Include="..\..\Lib\AlbaranesCliente_controller.dcp" />
-    <DCCReference Include="..\..\..\Servidor\AlbaranesCliente_model.dcp" />
+    <DCCReference Include="..\..\Lib\AlbaranesCliente_model.dcp" />
-    <DCCReference Include="..\..\..\Servidor\ApplicationBase.dcp" />
+    <DCCReference Include="..\..\Lib\ApplicationBase.dcp" />
-    <DCCReference Include="..\..\..\Servidor\Articulos_controller.dcp" />
+    <DCCReference Include="..\..\Lib\Articulos_controller.dcp" />
-    <DCCReference Include="..\..\..\Servidor\Contactos_controller.dcp" />
+    <DCCReference Include="..\..\Lib\Contactos_controller.dcp" />
-    <DCCReference Include="..\..\..\Servidor\FacturasCliente_data.dcp" />
+    <DCCReference Include="..\..\Lib\FacturasCliente_data.dcp" />
-    <DCCReference Include="..\..\..\Servidor\FacturasCliente_model.dcp" />
+    <DCCReference Include="..\..\Lib\FacturasCliente_model.dcp" />
-    <DCCReference Include="..\..\..\Servidor\FormasPago_controller.dcp" />
+    <DCCReference Include="..\..\Lib\FormasPago_controller.dcp" />
-    <DCCReference Include="..\..\..\Servidor\RecibosCliente_controller.dcp" />
+    <DCCReference Include="..\..\Lib\RecibosCliente_controller.dcp" />
+    <DCCReference Include="..\..\Lib\TiposOperacionVenta_controller.dcp" />
     <DCCReference Include="uArticulosFacturaClienteController.pas" />
     <DCCReference Include="uDetallesFacturaClienteController.pas" />
     <DCCReference Include="uFacturasClienteController.pas" />

Source/Modulos/Facturas de cliente/Controller/uDetallesFacturaClienteController.pas

@@ -127,7 +127,8 @@ end;}
 
 function TDetallesFacturaClienteController.CalcularImporteTotalConcepto(DataTable: TDADataTable): Double;
 begin
-  Result := CalcularLineaConcepto(DataTable);
+//Calcular con 4 decimales
+  Result := CalcularLineaConcepto(DataTable, 4);
 end;
 
 constructor TDetallesFacturaClienteController.Create;

Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas

@@ -53,6 +53,9 @@ type
 
     function DarListaAnosFacturas: TStringList;
     procedure FiltrarAno(AFactura: IBizFacturaCliente; ADynWhereDataTable: WideString; const Ano: String);
+
+    function darTiposFacturaCliente: IBizTiposFacturaCliente;
+    function AsignarTipoOperacion(AFacturas: IBizFacturaCliente): Boolean;
   end;
 
   TFacturasClienteController = class(TControllerBase, IFacturasClienteController)
@@ -120,6 +123,9 @@ type
 
     function DarListaAnosFacturas: TStringList;
     procedure FiltrarAno(AFactura: IBizFacturaCliente; ADynWhereDataTable: WideString; const Ano: String);
+
+    function darTiposFacturaCliente: IBizTiposFacturaCliente;
+    function AsignarTipoOperacion(AFacturas: IBizFacturaCliente): Boolean;
   end;
 
 implementation
@@ -132,9 +138,9 @@ uses
   uDataModuleUsuarios, uDAInterfaces, uDataTableUtils, uAlbaranesClienteController,
   schAlbaranesClienteClient_Intf, uROTypes, uDetallesAlbaranClienteController,
   uBizDetallesAlbaranCliente, uFacturasClienteReportController, DateUtils, Forms,
-  Dialogs, uIntegerListUtils, uIEditorElegirFacturasCliente,
+  Dialogs, uIntegerListUtils, uIEditorElegirFacturasCliente, uStringsUtils,
   uFormasPagoController, uBizFormasPago,  uTiposIVAController, uBizTiposIVA,
-  uBizEjercicios, uRecibosClienteController, uBizRecibosCliente;
+  uBizEjercicios, uRecibosClienteController, uBizRecibosCliente, uTiposOperacionVentaController;
 
 
 procedure CopiarArticulosAlbaran(AOrigen: IBizDetallesAlbaranCliente;
@@ -218,6 +224,51 @@ begin
   Result := True;
 end;
 
+function TFacturasClienteController.AsignarTipoOperacion(AFacturas: IBizFacturaCliente): Boolean;
+var
+  ATipoOperacionController : ITiposOperacionVentaController;
+  ATipoOperacion: Variant;
+
+begin
+  Result := False;
+
+  if Assigned(AFacturas) then
+  begin
+    with TTiposOperacionVentaController.Create do
+    begin
+      try
+        ATipoOperacion := elegirTipoOperacionVenta;
+      finally
+        Free
+      end;
+    end;
+  end;
+
+  ShowHourglassCursor;
+  if not EsCadenaVacia(ATipoOperacion) then
+  begin
+      //Asignamos en factura
+      with  AFacturas.DataTable do
+      begin
+        First;
+        while not EOF do
+        begin
+          if (AFacturas.ID_TIPO_FACTURA <> ATipoOperacion) then
+          begin
+            Edit;
+            AFacturas.ID_TIPO_FACTURA := ATipoOperacion;
+            Post;
+          end;
+          Next;
+        end;
+        ApplyUpdates;
+        Result := True;
+      end;
+  end;
+  HideHourglassCursor;
+
+end;
+
 procedure TFacturasClienteController.ActualizarFormaDePago(
   AFactura: IBizFacturaCliente; ID_FORMA_PAGO: Integer);
 var
@@ -631,6 +682,11 @@ begin
   Result := FDataModule.GetAnosItems;
 end;
 
+function TFacturasClienteController.darTiposFacturaCliente: IBizTiposFacturaCliente;
+begin
+  Result := FDataModule.darTiposFacturaCliente;
+end;
+
 procedure TFacturasClienteController.DescartarCambios(AFactura: IBizFacturaCliente);
 begin
   if not Assigned(AFactura) then

Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm

@@ -363,6 +363,16 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente
       item
         Name = 'FECHA_RETENCION'
         DataType = datDateTime
+      end
+      item
+        Name = 'ID_TIPO_FACTURA'
+        DataType = datInteger
+      end
+      item
+        Name = 'TIPO_OPERACION'
+        DataType = datString
+        Size = 2000
+        ServerAutoRefresh = True
       end>
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]
@@ -515,4 +525,30 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente
     Left = 232
     Top = 184
   end
+  object tbl_TiposFacturaCliente: TDAMemDataTable
+    RemoteUpdatesOptions = []
+    Fields = <
+      item
+        Name = 'ID'
+        DataType = datInteger
+      end
+      item
+        Name = 'DESCRIPCION'
+        DataType = datString
+        Size = 2000
+      end>
+    Params = <>
+    StreamingOptions = [soDisableEventsWhileStreaming]
+    RemoteDataAdapter = rda_FacturasCliente
+    LogicalName = 'TiposFacturaCliente'
+    IndexDefs = <>
+    Left = 48
+    Top = 264
+  end
+  object ds_TiposFacturaCliente: TDADataSource
+    DataSet = tbl_TiposFacturaCliente.Dataset
+    DataTable = tbl_TiposFacturaCliente
+    Left = 48
+    Top = 208
+  end
 end

Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.pas

@@ -23,6 +23,8 @@ type
     ds_FacturasCliente_Detalles: TDADataSource;
     tbl_ListaAnosFacturas: TDAMemDataTable;
     ds_ListaAnosFacturas: TDADataSource;
+    tbl_TiposFacturaCliente: TDAMemDataTable;
+    ds_TiposFacturaCliente: TDADataSource;
     procedure DAClientDataModuleCreate(Sender: TObject);
   private
     function _GetDetalles : IBizDetallesFacturaCliente;
@@ -31,6 +33,7 @@ type
     function GetItems : IBizFacturaCliente;
     function GetItem(const ID : Integer) : IBizFacturaCliente;
     function NewItem : IBizFacturaCliente;
+    function darTiposFacturaCliente : IBizTiposFacturaCliente;
 
     // Report
     function GetReport(const AListaID: TIntegerList; const VerLogotipo: Boolean): Binary;
@@ -87,6 +90,20 @@ begin
   end;
 end;
 
+function TDataModuleFacturasCliente.darTiposFacturaCliente: IBizTiposFacturaCliente;
+var
+  ATipos : TDAMemDataTable;
+begin
+  ShowHourglassCursor;
+  try
+    ATipos := CloneDataTable(tbl_TiposFacturaCliente);
+    ATipos.BusinessRulesID := BIZ_CLIENT_TIPOS_FACTURA_CLIENTE;
+    Result := (ATipos as IBizTiposFacturaCliente);
+  finally
+    HideHourglassCursor;
+  end;
+end;
+
 function TDataModuleFacturasCliente.GetAnosItems: TStringList;
 var
   AListaAnos: TStringList;

Source/Modulos/Facturas de cliente/FacturasCliente_Group.groupproj

@@ -18,6 +18,9 @@
     <Projects Include="..\Contactos\Model\Contactos_model.dproj" />
     <Projects Include="..\Contactos\Views\Contactos_view.dproj" />
     <Projects Include="..\Contratos de cliente\Views\ContratosCliente_view.dproj" />
+    <Projects Include="..\Facturas de proveedor\Controller\FacturasProveedor_controller.dproj" />
+    <Projects Include="..\Facturas de proveedor\Data\FacturasProveedor_data.dproj" />
+    <Projects Include="..\Facturas de proveedor\Model\FacturasProveedor_model.dproj" />
     <Projects Include="..\Facturas de proveedor\Views\FacturasProveedor_view.dproj" />
     <Projects Include="..\Gestor de informes\Controller\GestorInformes_controller.dproj" />
     <Projects Include="..\Gestor de informes\Data\GestorInformes_data.dproj" />
@@ -28,6 +31,7 @@
     <Projects Include="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" />
     <Projects Include="..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.dproj" />
     <Projects Include="..\Relaciones\Contratos de cliente - Facturas de cliente\ConCli_FacCli_relation.dproj" />
+    <Projects Include="..\Tipos de operacion venta\Controller\TiposOperacionVenta_controller.dproj" />
     <Projects Include="Controller\FacturasCliente_controller.dproj" />
     <Projects Include="Data\FacturasCliente_data.dproj" />
     <Projects Include="Model\FacturasCliente_model.dproj" />
@@ -301,14 +305,50 @@
   <Target Name="FacturasProveedor_view:Make">
     <MSBuild Projects="..\Facturas de proveedor\Views\FacturasProveedor_view.dproj" Targets="Make" />
   </Target>
+  <Target Name="FacturasProveedor_model">
+    <MSBuild Projects="..\Facturas de proveedor\Model\FacturasProveedor_model.dproj" Targets="" />
+  </Target>
+  <Target Name="FacturasProveedor_model:Clean">
+    <MSBuild Projects="..\Facturas de proveedor\Model\FacturasProveedor_model.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="FacturasProveedor_model:Make">
+    <MSBuild Projects="..\Facturas de proveedor\Model\FacturasProveedor_model.dproj" Targets="Make" />
+  </Target>
+  <Target Name="FacturasProveedor_controller">
+    <MSBuild Projects="..\Facturas de proveedor\Controller\FacturasProveedor_controller.dproj" Targets="" />
+  </Target>
+  <Target Name="FacturasProveedor_controller:Clean">
+    <MSBuild Projects="..\Facturas de proveedor\Controller\FacturasProveedor_controller.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="FacturasProveedor_controller:Make">
+    <MSBuild Projects="..\Facturas de proveedor\Controller\FacturasProveedor_controller.dproj" Targets="Make" />
+  </Target>
+  <Target Name="FacturasProveedor_data">
+    <MSBuild Projects="..\Facturas de proveedor\Data\FacturasProveedor_data.dproj" Targets="" />
+  </Target>
+  <Target Name="FacturasProveedor_data:Clean">
+    <MSBuild Projects="..\Facturas de proveedor\Data\FacturasProveedor_data.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="FacturasProveedor_data:Make">
+    <MSBuild Projects="..\Facturas de proveedor\Data\FacturasProveedor_data.dproj" Targets="Make" />
+  </Target>
+  <Target Name="TiposOperacionVenta_controller">
+    <MSBuild Projects="..\Tipos de operacion venta\Controller\TiposOperacionVenta_controller.dproj" Targets="" />
+  </Target>
+  <Target Name="TiposOperacionVenta_controller:Clean">
+    <MSBuild Projects="..\Tipos de operacion venta\Controller\TiposOperacionVenta_controller.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="TiposOperacionVenta_controller:Make">
+    <MSBuild Projects="..\Tipos de operacion venta\Controller\TiposOperacionVenta_controller.dproj" Targets="Make" />
+  </Target>
   <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Articulos_controller;Articulos_view;GestorInformes_model;GestorInformes_data;GestorInformes_controller;GestorInformes_view;GestorInformes_plugin;FacturasCliente_model;FacturasCliente_data;FacturasCliente_controller;Contabilidad_view;AlbCli_FacCli_relation;FacturasCliente_view;FacturasCliente_plugin;FactuGES;FactuGES_Server;ContratosCliente_view;PresupuestosCliente_view;ConCli_FacCli_relation;AlbaranesCliente_view;PresupuestosCliente_controller;FacturasProveedor_view" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Articulos_controller;Articulos_view;GestorInformes_model;GestorInformes_data;GestorInformes_controller;GestorInformes_view;GestorInformes_plugin;FacturasCliente_model;FacturasCliente_data;FacturasCliente_controller;Contabilidad_view;AlbCli_FacCli_relation;FacturasCliente_view;FacturasCliente_plugin;FactuGES;FactuGES_Server;ContratosCliente_view;PresupuestosCliente_view;ConCli_FacCli_relation;AlbaranesCliente_view;PresupuestosCliente_controller;FacturasProveedor_view;FacturasProveedor_model;FacturasProveedor_controller;FacturasProveedor_data;TiposOperacionVenta_controller" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_controller:Clean;Articulos_view:Clean;GestorInformes_model:Clean;GestorInformes_data:Clean;GestorInformes_controller:Clean;GestorInformes_view:Clean;GestorInformes_plugin:Clean;FacturasCliente_model:Clean;FacturasCliente_data:Clean;FacturasCliente_controller:Clean;Contabilidad_view:Clean;AlbCli_FacCli_relation:Clean;FacturasCliente_view:Clean;FacturasCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;ContratosCliente_view:Clean;PresupuestosCliente_view:Clean;ConCli_FacCli_relation:Clean;AlbaranesCliente_view:Clean;PresupuestosCliente_controller:Clean;FacturasProveedor_view:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_controller:Clean;Articulos_view:Clean;GestorInformes_model:Clean;GestorInformes_data:Clean;GestorInformes_controller:Clean;GestorInformes_view:Clean;GestorInformes_plugin:Clean;FacturasCliente_model:Clean;FacturasCliente_data:Clean;FacturasCliente_controller:Clean;Contabilidad_view:Clean;AlbCli_FacCli_relation:Clean;FacturasCliente_view:Clean;FacturasCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;ContratosCliente_view:Clean;PresupuestosCliente_view:Clean;ConCli_FacCli_relation:Clean;AlbaranesCliente_view:Clean;PresupuestosCliente_controller:Clean;FacturasProveedor_view:Clean;FacturasProveedor_model:Clean;FacturasProveedor_controller:Clean;FacturasProveedor_data:Clean;TiposOperacionVenta_controller:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_controller:Make;Articulos_view:Make;GestorInformes_model:Make;GestorInformes_data:Make;GestorInformes_controller:Make;GestorInformes_view:Make;GestorInformes_plugin:Make;FacturasCliente_model:Make;FacturasCliente_data:Make;FacturasCliente_controller:Make;Contabilidad_view:Make;AlbCli_FacCli_relation:Make;FacturasCliente_view:Make;FacturasCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;ContratosCliente_view:Make;PresupuestosCliente_view:Make;ConCli_FacCli_relation:Make;AlbaranesCliente_view:Make;PresupuestosCliente_controller:Make;FacturasProveedor_view:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_controller:Make;Articulos_view:Make;GestorInformes_model:Make;GestorInformes_data:Make;GestorInformes_controller:Make;GestorInformes_view:Make;GestorInformes_plugin:Make;FacturasCliente_model:Make;FacturasCliente_data:Make;FacturasCliente_controller:Make;Contabilidad_view:Make;AlbCli_FacCli_relation:Make;FacturasCliente_view:Make;FacturasCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;ContratosCliente_view:Make;PresupuestosCliente_view:Make;ConCli_FacCli_relation:Make;AlbaranesCliente_view:Make;PresupuestosCliente_controller:Make;FacturasProveedor_view:Make;FacturasProveedor_model:Make;FacturasProveedor_controller:Make;FacturasProveedor_data:Make;TiposOperacionVenta_controller:Make" />
   </Target>
   <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
 </Project>

Source/Modulos/Facturas de cliente/Model/Data/uIDataModuleFacturasCliente.pas

@@ -13,6 +13,7 @@ type
     function GetItems: IBizFacturaCliente;
     function GetItem(const ID : Integer) : IBizFacturaCliente;
     function NewItem : IBizFacturaCliente;
+    function darTiposFacturaCliente : IBizTiposFacturaCliente;
   end;
 
 implementation

Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas

@@ -9,12 +9,14 @@ 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_ListaAnosFacturas = '{B9CBCAB7-D06E-41B6-A2AF-5DE26CB818F4}';
+  RID_ListaAnosFacturas = '{700A8C26-CB78-4B2A-9180-1C8EBE14F1F5}';
-  RID_FacturasCliente = '{C3E309EB-4021-4446-81DD-452C015CA0FA}';
+  RID_TiposFacturaCliente = '{16878B47-BBFA-49B8-A8B6-0BEC17027198}';
-  RID_FacturasCliente_Detalles = '{AF710A72-947F-483D-8DAD-66A9E58E0541}';
+  RID_FacturasCliente = '{F4246ABE-0846-4389-BD4C-6FE2438F1AEF}';
+  RID_FacturasCliente_Detalles = '{8E519944-EB60-4DA6-86B3-6F834F0AD6F5}';
 
   { Data table names }
   nme_ListaAnosFacturas = 'ListaAnosFacturas';
+  nme_TiposFacturaCliente = 'TiposFacturaCliente';
   nme_FacturasCliente = 'FacturasCliente';
   nme_FacturasCliente_Detalles = 'FacturasCliente_Detalles';
 
@@ -24,6 +26,14 @@ const
   { ListaAnosFacturas field indexes }
   idx_ListaAnosFacturasANO = 0;
 
+  { TiposFacturaCliente fields }
+  fld_TiposFacturaClienteID = 'ID';
+  fld_TiposFacturaClienteDESCRIPCION = 'DESCRIPCION';
+
+  { TiposFacturaCliente field indexes }
+  idx_TiposFacturaClienteID = 0;
+  idx_TiposFacturaClienteDESCRIPCION = 1;
+
   { FacturasCliente fields }
   fld_FacturasClienteID = 'ID';
   fld_FacturasClienteID_EMPRESA = 'ID_EMPRESA';
@@ -79,6 +89,8 @@ const
   fld_FacturasClienteRETENCION = 'RETENCION';
   fld_FacturasClienteIMPORTE_RETENCION = 'IMPORTE_RETENCION';
   fld_FacturasClienteFECHA_RETENCION = 'FECHA_RETENCION';
+  fld_FacturasClienteID_TIPO_FACTURA = 'ID_TIPO_FACTURA';
+  fld_FacturasClienteTIPO_OPERACION = 'TIPO_OPERACION';
 
   { FacturasCliente field indexes }
   idx_FacturasClienteID = 0;
@@ -135,6 +147,8 @@ const
   idx_FacturasClienteRETENCION = 51;
   idx_FacturasClienteIMPORTE_RETENCION = 52;
   idx_FacturasClienteFECHA_RETENCION = 53;
+  idx_FacturasClienteID_TIPO_FACTURA = 54;
+  idx_FacturasClienteTIPO_OPERACION = 55;
 
   { FacturasCliente_Detalles fields }
   fld_FacturasCliente_DetallesID = 'ID';
@@ -173,7 +187,7 @@ const
 type
   { IListaAnosFacturas }
   IListaAnosFacturas = interface(IDAStronglyTypedDataTable)
-  ['{BFABF626-A281-4D4E-B44B-7B40EADA006D}']
+  ['{97C76BDF-F243-45CF-83A8-3389872A1C88}']
     { Property getters and setters }
     function GetANOValue: String;
     procedure SetANOValue(const aValue: String);
@@ -206,9 +220,56 @@ type
 
   end;
 
+  { ITiposFacturaCliente }
+  ITiposFacturaCliente = interface(IDAStronglyTypedDataTable)
+  ['{9B6B81C1-044C-4B79-8686-B938DB928895}']
+    { Property getters and setters }
+    function GetIDValue: Integer;
+    procedure SetIDValue(const aValue: Integer);
+    function GetIDIsNull: Boolean;
+    procedure SetIDIsNull(const aValue: Boolean);
+    function GetDESCRIPCIONValue: String;
+    procedure SetDESCRIPCIONValue(const aValue: String);
+    function GetDESCRIPCIONIsNull: Boolean;
+    procedure SetDESCRIPCIONIsNull(const aValue: Boolean);
+
+
+    { Properties }
+    property ID: Integer read GetIDValue write SetIDValue;
+    property IDIsNull: Boolean read GetIDIsNull write SetIDIsNull;
+    property DESCRIPCION: String read GetDESCRIPCIONValue write SetDESCRIPCIONValue;
+    property DESCRIPCIONIsNull: Boolean read GetDESCRIPCIONIsNull write SetDESCRIPCIONIsNull;
+  end;
+
+  { TTiposFacturaClienteDataTableRules }
+  TTiposFacturaClienteDataTableRules = class(TIntfObjectDADataTableRules, ITiposFacturaCliente)
+  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 GetDESCRIPCIONValue: String; virtual;
+    procedure SetDESCRIPCIONValue(const aValue: String); virtual;
+    function GetDESCRIPCIONIsNull: Boolean; virtual;
+    procedure SetDESCRIPCIONIsNull(const aValue: Boolean); virtual;
+
+    { Properties }
+    property ID: Integer read GetIDValue write SetIDValue;
+    property IDIsNull: Boolean read GetIDIsNull write SetIDIsNull;
+    property DESCRIPCION: String read GetDESCRIPCIONValue write SetDESCRIPCIONValue;
+    property DESCRIPCIONIsNull: Boolean read GetDESCRIPCIONIsNull write SetDESCRIPCIONIsNull;
+
+  public
+    constructor Create(aDataTable: TDADataTable); override;
+    destructor Destroy; override;
+
+  end;
+
   { IFacturasCliente }
   IFacturasCliente = interface(IDAStronglyTypedDataTable)
-  ['{9539259F-170A-4008-BB16-3F91D42113EB}']
+  ['{53DF775E-B4D1-4621-836B-EE16A1A631FC}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -425,6 +486,14 @@ type
     procedure SetFECHA_RETENCIONValue(const aValue: DateTime);
     function GetFECHA_RETENCIONIsNull: Boolean;
     procedure SetFECHA_RETENCIONIsNull(const aValue: Boolean);
+    function GetID_TIPO_FACTURAValue: Integer;
+    procedure SetID_TIPO_FACTURAValue(const aValue: Integer);
+    function GetID_TIPO_FACTURAIsNull: Boolean;
+    procedure SetID_TIPO_FACTURAIsNull(const aValue: Boolean);
+    function GetTIPO_OPERACIONValue: String;
+    procedure SetTIPO_OPERACIONValue(const aValue: String);
+    function GetTIPO_OPERACIONIsNull: Boolean;
+    procedure SetTIPO_OPERACIONIsNull(const aValue: Boolean);
 
 
     { Properties }
@@ -536,6 +605,10 @@ type
     property IMPORTE_RETENCIONIsNull: Boolean read GetIMPORTE_RETENCIONIsNull write SetIMPORTE_RETENCIONIsNull;
     property FECHA_RETENCION: DateTime read GetFECHA_RETENCIONValue write SetFECHA_RETENCIONValue;
     property FECHA_RETENCIONIsNull: Boolean read GetFECHA_RETENCIONIsNull write SetFECHA_RETENCIONIsNull;
+    property ID_TIPO_FACTURA: Integer read GetID_TIPO_FACTURAValue write SetID_TIPO_FACTURAValue;
+    property ID_TIPO_FACTURAIsNull: Boolean read GetID_TIPO_FACTURAIsNull write SetID_TIPO_FACTURAIsNull;
+    property TIPO_OPERACION: String read GetTIPO_OPERACIONValue write SetTIPO_OPERACIONValue;
+    property TIPO_OPERACIONIsNull: Boolean read GetTIPO_OPERACIONIsNull write SetTIPO_OPERACIONIsNull;
   end;
 
   { TFacturasClienteDataTableRules }
@@ -760,6 +833,14 @@ type
     procedure SetFECHA_RETENCIONValue(const aValue: DateTime); virtual;
     function GetFECHA_RETENCIONIsNull: Boolean; virtual;
     procedure SetFECHA_RETENCIONIsNull(const aValue: Boolean); virtual;
+    function GetID_TIPO_FACTURAValue: Integer; virtual;
+    procedure SetID_TIPO_FACTURAValue(const aValue: Integer); virtual;
+    function GetID_TIPO_FACTURAIsNull: Boolean; virtual;
+    procedure SetID_TIPO_FACTURAIsNull(const aValue: Boolean); virtual;
+    function GetTIPO_OPERACIONValue: String; virtual;
+    procedure SetTIPO_OPERACIONValue(const aValue: String); virtual;
+    function GetTIPO_OPERACIONIsNull: Boolean; virtual;
+    procedure SetTIPO_OPERACIONIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -870,6 +951,10 @@ type
     property IMPORTE_RETENCIONIsNull: Boolean read GetIMPORTE_RETENCIONIsNull write SetIMPORTE_RETENCIONIsNull;
     property FECHA_RETENCION: DateTime read GetFECHA_RETENCIONValue write SetFECHA_RETENCIONValue;
     property FECHA_RETENCIONIsNull: Boolean read GetFECHA_RETENCIONIsNull write SetFECHA_RETENCIONIsNull;
+    property ID_TIPO_FACTURA: Integer read GetID_TIPO_FACTURAValue write SetID_TIPO_FACTURAValue;
+    property ID_TIPO_FACTURAIsNull: Boolean read GetID_TIPO_FACTURAIsNull write SetID_TIPO_FACTURAIsNull;
+    property TIPO_OPERACION: String read GetTIPO_OPERACIONValue write SetTIPO_OPERACIONValue;
+    property TIPO_OPERACIONIsNull: Boolean read GetTIPO_OPERACIONIsNull write SetTIPO_OPERACIONIsNull;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -879,7 +964,7 @@ type
 
   { IFacturasCliente_Detalles }
   IFacturasCliente_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{FE6D0998-F3A0-4271-9C1D-1840F9E1F578}']
+  ['{57377F2A-FB8A-490D-8CC7-F484CC677EC3}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1117,6 +1202,60 @@ begin
 end;
 
 
+{ TTiposFacturaClienteDataTableRules }
+constructor TTiposFacturaClienteDataTableRules.Create(aDataTable: TDADataTable);
+begin
+  inherited;
+end;
+
+destructor TTiposFacturaClienteDataTableRules.Destroy;
+begin
+  inherited;
+end;
+
+function TTiposFacturaClienteDataTableRules.GetIDValue: Integer;
+begin
+  result := DataTable.Fields[idx_TiposFacturaClienteID].AsInteger;
+end;
+
+procedure TTiposFacturaClienteDataTableRules.SetIDValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_TiposFacturaClienteID].AsInteger := aValue;
+end;
+
+function TTiposFacturaClienteDataTableRules.GetIDIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_TiposFacturaClienteID].IsNull;
+end;
+
+procedure TTiposFacturaClienteDataTableRules.SetIDIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_TiposFacturaClienteID].AsVariant := Null;
+end;
+
+function TTiposFacturaClienteDataTableRules.GetDESCRIPCIONValue: String;
+begin
+  result := DataTable.Fields[idx_TiposFacturaClienteDESCRIPCION].AsString;
+end;
+
+procedure TTiposFacturaClienteDataTableRules.SetDESCRIPCIONValue(const aValue: String);
+begin
+  DataTable.Fields[idx_TiposFacturaClienteDESCRIPCION].AsString := aValue;
+end;
+
+function TTiposFacturaClienteDataTableRules.GetDESCRIPCIONIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_TiposFacturaClienteDESCRIPCION].IsNull;
+end;
+
+procedure TTiposFacturaClienteDataTableRules.SetDESCRIPCIONIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_TiposFacturaClienteDESCRIPCION].AsVariant := Null;
+end;
+
+
 { TFacturasClienteDataTableRules }
 constructor TFacturasClienteDataTableRules.Create(aDataTable: TDADataTable);
 var
@@ -2269,6 +2408,48 @@ begin
     DataTable.Fields[idx_FacturasClienteFECHA_RETENCION].AsVariant := Null;
 end;
 
+function TFacturasClienteDataTableRules.GetID_TIPO_FACTURAValue: Integer;
+begin
+  result := DataTable.Fields[idx_FacturasClienteID_TIPO_FACTURA].AsInteger;
+end;
+
+procedure TFacturasClienteDataTableRules.SetID_TIPO_FACTURAValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_FacturasClienteID_TIPO_FACTURA].AsInteger := aValue;
+end;
+
+function TFacturasClienteDataTableRules.GetID_TIPO_FACTURAIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_FacturasClienteID_TIPO_FACTURA].IsNull;
+end;
+
+procedure TFacturasClienteDataTableRules.SetID_TIPO_FACTURAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_FacturasClienteID_TIPO_FACTURA].AsVariant := Null;
+end;
+
+function TFacturasClienteDataTableRules.GetTIPO_OPERACIONValue: String;
+begin
+  result := DataTable.Fields[idx_FacturasClienteTIPO_OPERACION].AsString;
+end;
+
+procedure TFacturasClienteDataTableRules.SetTIPO_OPERACIONValue(const aValue: String);
+begin
+  DataTable.Fields[idx_FacturasClienteTIPO_OPERACION].AsString := aValue;
+end;
+
+function TFacturasClienteDataTableRules.GetTIPO_OPERACIONIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_FacturasClienteTIPO_OPERACION].IsNull;
+end;
+
+procedure TFacturasClienteDataTableRules.SetTIPO_OPERACIONIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_FacturasClienteTIPO_OPERACION].AsVariant := Null;
+end;
+
 
 { TFacturasCliente_DetallesDataTableRules }
 constructor TFacturasCliente_DetallesDataTableRules.Create(aDataTable: TDADataTable);
@@ -2599,6 +2780,7 @@ end;
 
 initialization
   RegisterDataTableRules(RID_ListaAnosFacturas, TListaAnosFacturasDataTableRules);
+  RegisterDataTableRules(RID_TiposFacturaCliente, TTiposFacturaClienteDataTableRules);
   RegisterDataTableRules(RID_FacturasCliente, TFacturasClienteDataTableRules);
   RegisterDataTableRules(RID_FacturasCliente_Detalles, TFacturasCliente_DetallesDataTableRules);
 

Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas

@@ -9,14 +9,15 @@ 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_ListaAnosFacturasDelta = '{488EEBD9-F334-4412-B42F-CD53EDADEFF2}';
+  RID_ListaAnosFacturasDelta = '{27262DAF-04C2-41BD-BE56-F1E3932C3958}';
-  RID_FacturasClienteDelta = '{75964CD6-B60B-485C-BEA0-AF384F111E00}';
+  RID_TiposFacturaClienteDelta = '{23C627D7-E517-4F77-831E-FF7350A5F4B9}';
-  RID_FacturasCliente_DetallesDelta = '{D8C6075B-EF61-4846-9BC6-F4CD5D416FBD}';
+  RID_FacturasClienteDelta = '{6290AB0B-0540-4FC1-9614-D4AFFFA4D9F2}';
+  RID_FacturasCliente_DetallesDelta = '{48B82498-4D2D-4D30-9B4E-7193BC6B0308}';
 
 type
   { IListaAnosFacturasDelta }
   IListaAnosFacturasDelta = interface(IListaAnosFacturas)
-  ['{488EEBD9-F334-4412-B42F-CD53EDADEFF2}']
+  ['{27262DAF-04C2-41BD-BE56-F1E3932C3958}']
     { Property getters and setters }
     function GetOldANOValue : String;
 
@@ -48,9 +49,55 @@ type
 
   end;
 
+  { ITiposFacturaClienteDelta }
+  ITiposFacturaClienteDelta = interface(ITiposFacturaCliente)
+  ['{23C627D7-E517-4F77-831E-FF7350A5F4B9}']
+    { Property getters and setters }
+    function GetOldIDValue : Integer;
+    function GetOldDESCRIPCIONValue : String;
+
+    { Properties }
+    property OldID : Integer read GetOldIDValue;
+    property OldDESCRIPCION : String read GetOldDESCRIPCIONValue;
+  end;
+
+  { TTiposFacturaClienteBusinessProcessorRules }
+  TTiposFacturaClienteBusinessProcessorRules = class(TDABusinessProcessorRules, ITiposFacturaCliente, ITiposFacturaClienteDelta)
+  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 GetDESCRIPCIONValue: String; virtual;
+    function GetDESCRIPCIONIsNull: Boolean; virtual;
+    function GetOldDESCRIPCIONValue: String; virtual;
+    function GetOldDESCRIPCIONIsNull: Boolean; virtual;
+    procedure SetDESCRIPCIONValue(const aValue: String); virtual;
+    procedure SetDESCRIPCIONIsNull(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 DESCRIPCION : String read GetDESCRIPCIONValue write SetDESCRIPCIONValue;
+    property DESCRIPCIONIsNull : Boolean read GetDESCRIPCIONIsNull write SetDESCRIPCIONIsNull;
+    property OldDESCRIPCION : String read GetOldDESCRIPCIONValue;
+    property OldDESCRIPCIONIsNull : Boolean read GetOldDESCRIPCIONIsNull;
+
+  public
+    constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
+    destructor Destroy; override;
+
+  end;
+
   { IFacturasClienteDelta }
   IFacturasClienteDelta = interface(IFacturasCliente)
-  ['{75964CD6-B60B-485C-BEA0-AF384F111E00}']
+  ['{6290AB0B-0540-4FC1-9614-D4AFFFA4D9F2}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -106,6 +153,8 @@ type
     function GetOldRETENCIONValue : Float;
     function GetOldIMPORTE_RETENCIONValue : Currency;
     function GetOldFECHA_RETENCIONValue : DateTime;
+    function GetOldID_TIPO_FACTURAValue : Integer;
+    function GetOldTIPO_OPERACIONValue : String;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -162,6 +211,8 @@ type
     property OldRETENCION : Float read GetOldRETENCIONValue;
     property OldIMPORTE_RETENCION : Currency read GetOldIMPORTE_RETENCIONValue;
     property OldFECHA_RETENCION : DateTime read GetOldFECHA_RETENCIONValue;
+    property OldID_TIPO_FACTURA : Integer read GetOldID_TIPO_FACTURAValue;
+    property OldTIPO_OPERACION : String read GetOldTIPO_OPERACIONValue;
   end;
 
   { TFacturasClienteBusinessProcessorRules }
@@ -494,6 +545,18 @@ type
     function GetOldFECHA_RETENCIONIsNull: Boolean; virtual;
     procedure SetFECHA_RETENCIONValue(const aValue: DateTime); virtual;
     procedure SetFECHA_RETENCIONIsNull(const aValue: Boolean); virtual;
+    function GetID_TIPO_FACTURAValue: Integer; virtual;
+    function GetID_TIPO_FACTURAIsNull: Boolean; virtual;
+    function GetOldID_TIPO_FACTURAValue: Integer; virtual;
+    function GetOldID_TIPO_FACTURAIsNull: Boolean; virtual;
+    procedure SetID_TIPO_FACTURAValue(const aValue: Integer); virtual;
+    procedure SetID_TIPO_FACTURAIsNull(const aValue: Boolean); virtual;
+    function GetTIPO_OPERACIONValue: String; virtual;
+    function GetTIPO_OPERACIONIsNull: Boolean; virtual;
+    function GetOldTIPO_OPERACIONValue: String; virtual;
+    function GetOldTIPO_OPERACIONIsNull: Boolean; virtual;
+    procedure SetTIPO_OPERACIONValue(const aValue: String); virtual;
+    procedure SetTIPO_OPERACIONIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -712,6 +775,14 @@ type
     property FECHA_RETENCIONIsNull : Boolean read GetFECHA_RETENCIONIsNull write SetFECHA_RETENCIONIsNull;
     property OldFECHA_RETENCION : DateTime read GetOldFECHA_RETENCIONValue;
     property OldFECHA_RETENCIONIsNull : Boolean read GetOldFECHA_RETENCIONIsNull;
+    property ID_TIPO_FACTURA : Integer read GetID_TIPO_FACTURAValue write SetID_TIPO_FACTURAValue;
+    property ID_TIPO_FACTURAIsNull : Boolean read GetID_TIPO_FACTURAIsNull write SetID_TIPO_FACTURAIsNull;
+    property OldID_TIPO_FACTURA : Integer read GetOldID_TIPO_FACTURAValue;
+    property OldID_TIPO_FACTURAIsNull : Boolean read GetOldID_TIPO_FACTURAIsNull;
+    property TIPO_OPERACION : String read GetTIPO_OPERACIONValue write SetTIPO_OPERACIONValue;
+    property TIPO_OPERACIONIsNull : Boolean read GetTIPO_OPERACIONIsNull write SetTIPO_OPERACIONIsNull;
+    property OldTIPO_OPERACION : String read GetOldTIPO_OPERACIONValue;
+    property OldTIPO_OPERACIONIsNull : Boolean read GetOldTIPO_OPERACIONIsNull;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -721,7 +792,7 @@ type
 
   { IFacturasCliente_DetallesDelta }
   IFacturasCliente_DetallesDelta = interface(IFacturasCliente_Detalles)
-  ['{D8C6075B-EF61-4846-9BC6-F4CD5D416FBD}']
+  ['{48B82498-4D2D-4D30-9B4E-7193BC6B0308}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_FACTURAValue : Integer;
@@ -969,6 +1040,80 @@ begin
 end;
 
 
+{ TTiposFacturaClienteBusinessProcessorRules }
+constructor TTiposFacturaClienteBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
+begin
+  inherited;
+end;
+
+destructor TTiposFacturaClienteBusinessProcessorRules.Destroy;
+begin
+  inherited;
+end;
+
+function TTiposFacturaClienteBusinessProcessorRules.GetIDValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_TiposFacturaClienteID];
+end;
+
+function TTiposFacturaClienteBusinessProcessorRules.GetIDIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_TiposFacturaClienteID]);
+end;
+
+function TTiposFacturaClienteBusinessProcessorRules.GetOldIDValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_TiposFacturaClienteID];
+end;
+
+function TTiposFacturaClienteBusinessProcessorRules.GetOldIDIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_TiposFacturaClienteID]);
+end;
+
+procedure TTiposFacturaClienteBusinessProcessorRules.SetIDValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_TiposFacturaClienteID] := aValue;
+end;
+
+procedure TTiposFacturaClienteBusinessProcessorRules.SetIDIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_TiposFacturaClienteID] := Null;
+end;
+
+function TTiposFacturaClienteBusinessProcessorRules.GetDESCRIPCIONValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_TiposFacturaClienteDESCRIPCION];
+end;
+
+function TTiposFacturaClienteBusinessProcessorRules.GetDESCRIPCIONIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_TiposFacturaClienteDESCRIPCION]);
+end;
+
+function TTiposFacturaClienteBusinessProcessorRules.GetOldDESCRIPCIONValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_TiposFacturaClienteDESCRIPCION];
+end;
+
+function TTiposFacturaClienteBusinessProcessorRules.GetOldDESCRIPCIONIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_TiposFacturaClienteDESCRIPCION]);
+end;
+
+procedure TTiposFacturaClienteBusinessProcessorRules.SetDESCRIPCIONValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_TiposFacturaClienteDESCRIPCION] := aValue;
+end;
+
+procedure TTiposFacturaClienteBusinessProcessorRules.SetDESCRIPCIONIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_TiposFacturaClienteDESCRIPCION] := Null;
+end;
+
+
 { TFacturasClienteBusinessProcessorRules }
 constructor TFacturasClienteBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
 var
@@ -2662,6 +2807,68 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteFECHA_RETENCION] := Null;
 end;
 
+function TFacturasClienteBusinessProcessorRules.GetID_TIPO_FACTURAValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteID_TIPO_FACTURA];
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetID_TIPO_FACTURAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteID_TIPO_FACTURA]);
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetOldID_TIPO_FACTURAValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteID_TIPO_FACTURA];
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetOldID_TIPO_FACTURAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteID_TIPO_FACTURA]);
+end;
+
+procedure TFacturasClienteBusinessProcessorRules.SetID_TIPO_FACTURAValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteID_TIPO_FACTURA] := aValue;
+end;
+
+procedure TFacturasClienteBusinessProcessorRules.SetID_TIPO_FACTURAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteID_TIPO_FACTURA] := Null;
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetTIPO_OPERACIONValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteTIPO_OPERACION];
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetTIPO_OPERACIONIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteTIPO_OPERACION]);
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetOldTIPO_OPERACIONValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteTIPO_OPERACION];
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetOldTIPO_OPERACIONIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteTIPO_OPERACION]);
+end;
+
+procedure TFacturasClienteBusinessProcessorRules.SetTIPO_OPERACIONValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteTIPO_OPERACION] := aValue;
+end;
+
+procedure TFacturasClienteBusinessProcessorRules.SetTIPO_OPERACIONIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteTIPO_OPERACION] := Null;
+end;
+
 
 { TFacturasCliente_DetallesBusinessProcessorRules }
 constructor TFacturasCliente_DetallesBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
@@ -3142,6 +3349,7 @@ end;
 
 initialization
   RegisterBusinessProcessorRules(RID_ListaAnosFacturasDelta, TListaAnosFacturasBusinessProcessorRules);
+  RegisterBusinessProcessorRules(RID_TiposFacturaClienteDelta, TTiposFacturaClienteBusinessProcessorRules);
   RegisterBusinessProcessorRules(RID_FacturasClienteDelta, TFacturasClienteBusinessProcessorRules);
   RegisterBusinessProcessorRules(RID_FacturasCliente_DetallesDelta, TFacturasCliente_DetallesBusinessProcessorRules);
 

Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas

@@ -8,6 +8,7 @@ uses
 
 const
   BIZ_CLIENT_FACTURA_CLIENTE = 'Client.FacturaCliente';
+  BIZ_CLIENT_TIPOS_FACTURA_CLIENTE = 'Client.TiposFacturaCliente';
 
   CTE_TIPO_ABONO = 'A';
   CTE_TIPO_FACTURA = 'F';
@@ -17,6 +18,10 @@ const
   CTE_PAGADA = 'PAGADA';
 
 type
+  IBizTiposFacturaCliente = interface(ITiposFacturaCliente)
+  ['{2D4AD6DB-8B9C-4268-AFD6-3B309C1B90BC}']
+  end;
+
   IBizFacturaCliente = interface(IFacturasCliente)
   ['{8C6F2523-41FB-4240-A242-C14390FBD2B7}']
 
@@ -38,6 +43,9 @@ type
     procedure CalcularImporteTotal;
   end;
 
+  TBizTiposFacturaCliente = class(TTiposFacturaClienteDataTableRules, IBizTiposFacturaCliente)
+  end;
+
   TBizFacturaCliente = class(TFacturasClienteDataTableRules, IBizFacturaCliente, ISeleccionable)
   private
     FSeleccionableInterface : ISeleccionable;
@@ -414,6 +422,7 @@ end;
 
 initialization
   RegisterDataTableRules(BIZ_CLIENT_FACTURA_CLIENTE, TBizFacturaCliente);
+  RegisterDataTableRules(BIZ_CLIENT_TIPOS_FACTURA_CLIENTE, TBizTiposFacturaCliente);
 
 finalization
 

Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm

@@ -517,12 +517,12 @@ object RptFacturasCliente: TRptFacturasCliente
               #10'when extract (month from fecha_factura) = 11 then '#39'NOVIEMBRE - ' +
               #39' || extract (year from fecha_factura)'#10'when extract (month from ' +
               'fecha_factura) = 12 then '#39'DICIEMBRE - '#39' || extract (year from fe' +
-              'cha_factura)'#10'end as TITULO,'#10'REFERENCIA,  ID_CLIENTE, NOMBRE, SIT' +
+              'cha_factura)'#10'end as TITULO,'#10'REFERENCIA,  ID_CLIENTE, NOMBRE, TIP' +
-              'UACION, NIF_CIF, REFERENCIA_CLIENTE, FECHA_FACTURA, FECHA_VENCIM' +
+              'O_OPERACION, SITUACION, NIF_CIF, REFERENCIA_CLIENTE, FECHA_FACTU' +
-              'IENTO, BASE_IMPONIBLE, IVA, IMPORTE_IVA,'#10'RE, IMPORTE_RE, RETENCI' +
+              'RA,'#10'FECHA_VENCIMIENTO, BASE_IMPONIBLE, IVA, IMPORTE_IVA, RE, IMP' +
-              'ON, IMPORTE_RETENCION, IMPORTE_TOTAL'#10#10'from V_facturas_cliente'#10'wh' +
+              'ORTE_RE, RETENCION, IMPORTE_RETENCION, IMPORTE_TOTAL'#10#10'from V_fac' +
-              'ere {where}'#10'order by ANO, MES, FECHA_FACTURA, REFERENCIA, NOMBRE' +
+              'turas_cliente'#10'where {where}'#10'order by ANO, MES, FECHA_FACTURA, RE' +
-              #10#10
+              'FERENCIA, NOMBRE'#10#10
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -604,6 +604,10 @@ object RptFacturasCliente: TRptFacturasCliente
               item
                 DatasetField = 'IMPORTE_RE'
                 TableField = 'IMPORTE_RE'
+              end
+              item
+                DatasetField = 'TIPO_OPERACION'
+                TableField = 'TIPO_OPERACION'
               end>
           end>
         Name = 'ListadoFacturas'
@@ -639,6 +643,11 @@ object RptFacturasCliente: TRptFacturasCliente
             DataType = datString
             Size = 255
           end
+          item
+            Name = 'TIPO_OPERACION'
+            DataType = datString
+            Size = 2000
+          end
           item
             Name = 'SITUACION'
             DataType = datString
@@ -695,6 +704,71 @@ object RptFacturasCliente: TRptFacturasCliente
             DataType = datCurrency
           end>
       end
+      item
+        Params = <>
+        Statements = <
+          item
+            Connection = 'IBX'
+            ConnectionType = 'Interbase'
+            Default = True
+            TargetTable = 'V_FACTURAS_CLIENTE'
+            Name = 'IBX'
+            SQL = 
+              'select V_facturas_cliente.ID_EMPRESA,'#10'coalesce(T.DESCRIPCION, '#39'S' +
+              'in asignar'#39') as DESCRIPCION,'#10'sum(V_facturas_cliente.BASE_IMPONIB' +
+              'LE) as BASE_IMPONIBLE,'#10'sum(V_facturas_cliente.IMPORTE_IVA) as IM' +
+              'PORTE_IVA,'#10'sum(V_facturas_cliente.IMPORTE_TOTAL) AS IMPORTE_TOTA' +
+              'L'#10'from V_facturas_cliente'#10'left join tipos_factura_cliente T on (' +
+              'T.ID = V_facturas_cliente.ID_TIPO_FACTURA)'#10'group by 1,2'#10'order by' +
+              ' 1,2'#10
+            StatementType = stSQL
+            ColumnMappings = <
+              item
+                DatasetField = 'ID_EMPRESA'
+                TableField = 'ID_EMPRESA'
+              end
+              item
+                DatasetField = 'DESCRIPCION'
+                TableField = '<unknown>'
+                SQLOrigin = 'DESCRIPCION'
+              end
+              item
+                DatasetField = 'BASE_IMPONIBLE'
+                TableField = 'BASE_IMPONIBLE'
+              end
+              item
+                DatasetField = 'IMPORTE_IVA'
+                TableField = 'IMPORTE_IVA'
+              end
+              item
+                DatasetField = 'IMPORTE_TOTAL'
+                TableField = 'IMPORTE_TOTAL'
+              end>
+          end>
+        Name = 'ListadoFacturasClienteTipoResumen'
+        Fields = <
+          item
+            Name = 'ID_EMPRESA'
+            DataType = datInteger
+          end
+          item
+            Name = 'DESCRIPCION'
+            DataType = datString
+            Size = 2000
+          end
+          item
+            Name = 'BASE_IMPONIBLE'
+            DataType = datCurrency
+          end
+          item
+            Name = 'IMPORTE_IVA'
+            DataType = datCurrency
+          end
+          item
+            Name = 'IMPORTE_TOTAL'
+            DataType = datCurrency
+          end>
+      end
       item
         Params = <
           item
@@ -1662,7 +1736,7 @@ object RptFacturasCliente: TRptFacturasCliente
     PrintOptions.Printer = 'Por defecto'
     PrintOptions.PrintOnSheet = 0
     ReportOptions.CreateDate = 37800.807714351900000000
-    ReportOptions.LastChange = 44592.627949988430000000
+    ReportOptions.LastChange = 44655.523157546300000000
     ScriptLanguage = 'PascalScript'
     ShowProgress = False
     StoreInDFM = False
@@ -1766,6 +1840,11 @@ object RptFacturasCliente: TRptFacturasCliente
         DataType = datString
         Size = 255
       end
+      item
+        Name = 'TIPO_OPERACION'
+        DataType = datString
+        Size = 2000
+      end
       item
         Name = 'SITUACION'
         DataType = datString
@@ -1878,7 +1957,7 @@ object RptFacturasCliente: TRptFacturasCliente
     DataSource = DADSInformeListadoRecibos
     BCDToCurrency = False
     Left = 736
-    Top = 16
+    Top = 24
   end
   object DADSInformeListadoRecibos: TDADataSource
     DataSet = tbl_InformeListadoRecibos.Dataset
@@ -1944,4 +2023,30 @@ object RptFacturasCliente: TRptFacturasCliente
     Left = 736
     Top = 128
   end
+  object frxDBInformeListadoFacturasTipoResumen: TfrxDBDataset
+    UserName = 'frxDBInformeListadoFacturasTipoResumen'
+    CloseDataSource = True
+    DataSource = DADSInformeListadoFacturasTipoResumen
+    BCDToCurrency = False
+    Left = 736
+    Top = 224
+  end
+  object DADSInformeListadoFacturasTipoResumen: TDADataSource
+    DataSet = tbl_InformeListadoFacturasTipoResumen.Dataset
+    DataTable = tbl_InformeListadoFacturasTipoResumen
+    Left = 736
+    Top = 280
+  end
+  object tbl_InformeListadoFacturasTipoResumen: TDAMemDataTable
+    RemoteUpdatesOptions = []
+    Fields = <>
+    Params = <>
+    MasterMappingMode = mmDataRequest
+    LogChanges = False
+    StreamingOptions = [soDisableEventsWhileStreaming]
+    RemoteFetchEnabled = False
+    IndexDefs = <>
+    Left = 736
+    Top = 336
+  end
 end

Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas

@@ -40,6 +40,9 @@ type
     DADSInformeListadoRecibos: TDADataSource;
     tbl_InformeListadoRecibos: TDAMemDataTable;
     schReport: TDASchema;
+    frxDBInformeListadoFacturasTipoResumen: TfrxDBDataset;
+    DADSInformeListadoFacturasTipoResumen: TDADataSource;
+    tbl_InformeListadoFacturasTipoResumen: TDAMemDataTable;
     procedure DataModuleCreate(Sender: TObject);
     procedure DataModuleDestroy(Sender: TObject);
   private
@@ -93,7 +96,7 @@ const
   rptInformeListadoFacturasRecibosClienteDesglosado = 'InformeListadoFacturasRecibosClienteDesglosado.fr3';
 
   ds_InformeListadoFacturasResumen = 'ListadoFacturasResumen';
-
+  ds_InformeListadoFacturasTipoResumen = 'ListadoFacturasClienteTipoResumen';
 
 { TRptFacturasCliente }
 
@@ -157,6 +160,7 @@ begin
     //Se van a prepara las tablas del informe
     if tbl_InformeListadoFacturas.Active then
        tbl_InformeListadoFacturas.Active := False;
+
     PrepararTablaInforme(tbl_InformeListadoFacturas);
 
     //Se prepara la tabla del listado resumen del informe
@@ -170,6 +174,16 @@ begin
     Bin2DataStreamer.WriteDataset(AStream, dsMaster, [woRows, woSchema], -1);
     Bin2DataStreamer.ReadDataset(AStream, tbl_InformeListadoFacturasResumen, TRUE, '', TRUE, TRUE);
 
+    if tbl_InformeListadoFacturasTipoResumen.Active then
+       tbl_InformeListadoFacturasTipoResumen.Active := False;
+    dsMaster := schReport.NewDataset(FConnection, ds_InformeListadoFacturasTipoResumen, [], [], False);
+    PrepararTablaResumenInforme(dsMaster);
+    //Esto se hace para rellenar la tabla del datamodule que usa el informe.
+    dsMaster.Open;
+    AStream.Clear;
+    Bin2DataStreamer.WriteDataset(AStream, dsMaster, [woRows, woSchema], -1);
+    Bin2DataStreamer.ReadDataset(AStream, tbl_InformeListadoFacturasTipoResumen, TRUE, '', TRUE, TRUE);
+
     //DESGLOSADO POR CLIENTE EN ESTE INFORME NO SE DESGLOSARÁ POR CLIENTE
     if Desglosado then
        ATipoInforme := rptInformeIVADesglosado
@@ -179,6 +193,7 @@ begin
     //Finalmente se abren las tablas del informe
     tbl_InformeListadoFacturas.Active := True;
     tbl_InformeListadoFacturasResumen.Active := True;
+    tbl_InformeListadoFacturasTipoResumen.Active := True;    
 
     Result := _GenerarInforme(ATipoInforme);
   finally

Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm

@@ -40,6 +40,41 @@ object srvFacturasCliente: TsrvFacturasCliente
             Size = 255
           end>
       end
+      item
+        Params = <>
+        Statements = <
+          item
+            Connection = 'IBX'
+            ConnectionType = 'Interbase'
+            Default = True
+            TargetTable = 'TIPOS_FACTURA_CLIENTE'
+            Name = 'IBX'
+            SQL = 
+              'SELECT'#10'    ID, DESCRIPCION'#10'  FROM'#10'    TIPOS_FACTURA_CLIENTE'#10'  WH' +
+              'ERE {Where}'#10'  order by 2'#10
+            StatementType = stSQL
+            ColumnMappings = <
+              item
+                DatasetField = 'ID'
+                TableField = 'ID'
+              end
+              item
+                DatasetField = 'DESCRIPCION'
+                TableField = 'DESCRIPCION'
+              end>
+          end>
+        Name = 'TiposFacturaCliente'
+        Fields = <
+          item
+            Name = 'ID'
+            DataType = datInteger
+          end
+          item
+            Name = 'DESCRIPCION'
+            DataType = datString
+            Size = 2000
+          end>
+      end
       item
         Params = <>
         Statements = <
@@ -263,6 +298,14 @@ object srvFacturasCliente: TsrvFacturasCliente
               item
                 DatasetField = 'PROCEDENCIA_CLIENTE'
                 TableField = 'PROCEDENCIA_CLIENTE'
+              end
+              item
+                DatasetField = 'ID_TIPO_FACTURA'
+                TableField = 'ID_TIPO_FACTURA'
+              end
+              item
+                DatasetField = 'TIPO_OPERACION'
+                TableField = 'TIPO_OPERACION'
               end>
           end>
         Name = 'FacturasCliente'
@@ -557,6 +600,16 @@ object srvFacturasCliente: TsrvFacturasCliente
           item
             Name = 'FECHA_RETENCION'
             DataType = datDateTime
+          end
+          item
+            Name = 'ID_TIPO_FACTURA'
+            DataType = datInteger
+          end
+          item
+            Name = 'TIPO_OPERACION'
+            DataType = datString
+            Size = 2000
+            ServerAutoRefresh = True
           end>
       end
       item
@@ -1174,6 +1227,11 @@ object srvFacturasCliente: TsrvFacturasCliente
             Name = 'FECHA_RETENCION'
             DataType = datDateTime
             Value = ''
+          end
+          item
+            Name = 'ID_TIPO_FACTURA'
+            DataType = datInteger
+            Value = ''
           end>
         Statements = <
           item
@@ -1190,18 +1248,18 @@ object srvFacturasCliente: TsrvFacturasCliente
               'RIO,'#10'    ID_FORMA_PAGO,'#10'    RECARGO_EQUIVALENCIA,'#10'    ID_TIPO_IV' +
               'A,'#10'    IMPORTE_NETO,'#10'    IMPORTE_PORTE,'#10'    IGNORAR_CONTABILIDAD' +
               ','#10'    ID_TIENDA,'#10'    ID_CONTRATO,'#10'    SIN_COMISION,'#10'    SITUACIO' +
-              'N,'#10'    RETENCION,'#10'    IMPORTE_RETENCION,'#10'    FECHA_RETENCION)'#10'  ' +
+              'N,'#10'    RETENCION,'#10'    IMPORTE_RETENCION,'#10'    FECHA_RETENCION,'#10'  ' +
-              'VALUES ('#10'    :ID,'#10'    :ID_EMPRESA,'#10'    :REFERENCIA,'#10'    :FECHA_F' +
+              '  ID_TIPO_FACTURA)'#10'  VALUES ('#10'    :ID,'#10'    :ID_EMPRESA,'#10'    :REF' +
-              'ACTURA,'#10'    :FECHA_VENCIMIENTO,'#10'    :BASE_IMPONIBLE,'#10'    :DESCUE' +
+              'ERENCIA,'#10'    :FECHA_FACTURA,'#10'    :FECHA_VENCIMIENTO,'#10'    :BASE_I' +
-              'NTO,'#10'    :IMPORTE_DESCUENTO,'#10'    :IVA,'#10'    :IMPORTE_IVA,'#10'    :RE' +
+              'MPONIBLE,'#10'    :DESCUENTO,'#10'    :IMPORTE_DESCUENTO,'#10'    :IVA,'#10'    ' +
-              ','#10'    :IMPORTE_RE,'#10'    :IMPORTE_TOTAL,'#10'    :OBSERVACIONES,'#10'    :' +
+              ':IMPORTE_IVA,'#10'    :RE,'#10'    :IMPORTE_RE,'#10'    :IMPORTE_TOTAL,'#10'    ' +
-              'ID_CLIENTE,'#10'    :NIF_CIF,'#10'    :NOMBRE,'#10'    :CALLE,'#10'    :POBLACIO' +
+              ':OBSERVACIONES,'#10'    :ID_CLIENTE,'#10'    :NIF_CIF,'#10'    :NOMBRE,'#10'    ' +
-              'N,'#10'    :PROVINCIA,'#10'    :CODIGO_POSTAL,'#10'    CURRENT_TIMESTAMP,'#10'  ' +
+              ':CALLE,'#10'    :POBLACION,'#10'    :PROVINCIA,'#10'    :CODIGO_POSTAL,'#10'    ' +
-              '  :USUARIO,'#10'    :ID_FORMA_PAGO,'#10'    :RECARGO_EQUIVALENCIA,'#10'    :' +
+              'CURRENT_TIMESTAMP,'#10'    :USUARIO,'#10'    :ID_FORMA_PAGO,'#10'    :RECARG' +
-              'ID_TIPO_IVA,'#10'    :IMPORTE_NETO,'#10'    :IMPORTE_PORTE,'#10'    :IGNORAR' +
+              'O_EQUIVALENCIA,'#10'    :ID_TIPO_IVA,'#10'    :IMPORTE_NETO,'#10'    :IMPORT' +
-              '_CONTABILIDAD,'#10'    :ID_TIENDA,'#10'    :ID_CONTRATO,'#10'    :SIN_COMISI' +
+              'E_PORTE,'#10'    :IGNORAR_CONTABILIDAD,'#10'    :ID_TIENDA,'#10'    :ID_CONT' +
-              'ON,'#10'    :SITUACION,'#10'    :RETENCION,'#10'    :IMPORTE_RETENCION,'#10'    ' +
+              'RATO,'#10'    :SIN_COMISION,'#10'    :SITUACION,'#10'    :RETENCION,'#10'    :IM' +
-              ':FECHA_RETENCION);'#10
+              'PORTE_RETENCION,'#10'    :FECHA_RETENCION,'#10'    :ID_TIPO_FACTURA);'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1388,6 +1446,11 @@ object srvFacturasCliente: TsrvFacturasCliente
             DataType = datDateTime
             Value = ''
           end
+          item
+            Name = 'ID_TIPO_FACTURA'
+            DataType = datInteger
+            Value = ''
+          end
           item
             Name = 'OLD_ID'
             Value = ''
@@ -1415,7 +1478,8 @@ object srvFacturasCliente: TsrvFacturasCliente
               'ENDA,'#10'    ID_CONTRATO = :ID_CONTRATO,'#10'    SIN_COMISION = :SIN_CO' +
               'MISION,'#10'    SITUACION = :SITUACION,'#10'    RETENCION = :RETENCION,'#10 +
               '    IMPORTE_RETENCION = :IMPORTE_RETENCION,'#10'    FECHA_RETENCION ' +
-              '= :FECHA_RETENCION'#10'  WHERE'#10'  (ID = :OLD_ID);'#10
+              '= :FECHA_RETENCION,'#10'    ID_TIPO_FACTURA = :ID_TIPO_FACTURA'#10'  WHE' +
+              'RE'#10'  (ID = :OLD_ID);'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>

Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm

@@ -58,7 +58,7 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
       end
     end
     inherited tbxFiltro: TTBXToolbar
-      ExplicitWidth = 454
+      ExplicitWidth = 379
       inherited lblAno: TTBXLabelItem
         Visible = True
       end
@@ -73,10 +73,17 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
       ExplicitWidth = 640
     end
     inherited TBXTMain2: TTBXToolbar
-      Left = 454
+      Left = 382
+      DockPos = 385
       Visible = True
-      ExplicitLeft = 454
+      ExplicitLeft = 382
-      ExplicitWidth = 91
+      ExplicitWidth = 258
+      object TBXItem41: TTBXItem
+        Action = actAsignarTipoOperacion
+        DisplayMode = nbdmImageAndText
+      end
+      object TBSeparatorItem1: TTBSeparatorItem
+      end
       object TBXItem40: TTBXItem
         Action = actInformes
         DisplayMode = nbdmImageAndText
@@ -200,15 +207,29 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 144
+            Width = 144
           end
           inherited edtFechaFinFiltro: TcxDateEdit
+            Left = 301
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 301
             ExplicitWidth = 263
             Width = 263
           end
+          inherited txtFiltroTodo2: TcxTextEdit
+            Left = 473
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 473
+            ExplicitWidth = 223
+            Width = 223
+          end
         end
         inherited TBXAlignmentPanel1: TTBXAlignmentPanel
           Width = 640
@@ -281,6 +302,12 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
       ImageIndex = 25
       OnExecute = actInformesExecute
     end
+    object actAsignarTipoOperacion: TAction
+      Caption = 'Asignar Tipo Operaci'#243'n'
+      ImageIndex = 26
+      OnExecute = actAsignarTipoOperacionExecute
+      OnUpdate = actAsignarTipoOperacionUpdate
+    end
   end
   inherited SmallImages: TPngImageList [5]
     PngImages = <
@@ -1026,6 +1053,25 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
           41A130430000000049454E44AE426082}
         Name = 'PngImage25'
         Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+          61000000097048597300000B3A00000B3A01647F570D0000015D4944415478DA
+          63FCFFFF3F030830323232C0C0CEB58DCA2F6E6CBDF3FEF129B818C30F061490
+          3FFF3F58032336032E9C58FD9F8B47904155DB192EF6FFD72B867F9F2F31FCB9
+          E3CA3063061E0380B6DBB373F01CB076CD66606165C7AAB96001923E6403809A
+          9979F925FEC8299B32482B18E2D40C16C7614032D08039164EA97017810CF875
+          5E1CAC196F18EC5AD7C40F74FA073DB36006411179B8E6FF3F5F32FCBEA687A2
+          196B18000D681797D6AAD06008852B64D5BA0434E4251833000DFBFBA2087718
+          2CEF76FFFFE1E119865F5FDF81F9B993706BC61906D0589056D7D07F2223CE8D
+          53332103DAC5C4A52B749438706AC6170BECACAC6C3FF4547918F8397FE3D48C
+          3F1A79F9E7982A7F66F8FBBA16A7669C061CDB35E1BF9CAA1D83C84B23BC9AB1
+          1A008C466BA0F38F5888D632CC9AF907AF66AC065C383AF73FC7B7150C3B97ED
+          21A819AB0137CE2CFBBF776E2643CE8C4F0435231B00004A4C11F0D3652A8300
+          00000049454E44AE426082}
+        Name = 'PngImage26'
+        Background = clWindow
       end>
     Left = 395
     Bitmap = {}

Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas

@@ -35,12 +35,17 @@ type
     actInformes: TAction;
     JSInformesDialog: TJSDialog;
     TBXItem40: TTBXItem;
+    actAsignarTipoOperacion: TAction;
+    TBXItem41: TTBXItem;
+    TBSeparatorItem1: TTBSeparatorItem;
     procedure FormShow(Sender: TObject);
     procedure actEliminarUpdate(Sender: TObject);
     procedure actNuevaFacturaExecute(Sender: TObject);
     procedure actNuevoAbonoExecute(Sender: TObject);
     procedure actInformesExecute(Sender: TObject);
     procedure OnListaAnosChange(Sender: TObject; const Text: string);
+    procedure actAsignarTipoOperacionExecute(Sender: TObject);
+    procedure actAsignarTipoOperacionUpdate(Sender: TObject);
 
   private
     FFacturas: IBizFacturaCliente;
@@ -82,6 +87,37 @@ uses
 {
 *************************** TfEditorFacturasCliente ***************************
 }
+procedure TfEditorFacturasCliente.actAsignarTipoOperacionExecute(Sender: TObject);
+var
+  AFacturas: IBizFacturaCliente;
+  i: integer;
+
+begin
+  inherited;
+
+  ViewGrid.SaveGridStatus;
+  try
+    SeleccionarFilasDesdeGrid(ViewGrid._FocusedView, (Facturas as ISeleccionable).SelectedRecords);
+    AFacturas := (Controller as IFacturasClienteController).ExtraerSeleccionados(Facturas) as IBizFacturaCliente;
+  finally
+    ViewGrid.RestoreGridStatus;
+  end;
+
+  if Controller.AsignarTipoOperacion(AFacturas) then
+     RefrescarInterno;
+end;
+
+procedure TfEditorFacturasCliente.actAsignarTipoOperacionUpdate(Sender: TObject);
+begin
+  inherited;
+  if HayDatos and Assigned(ViewGrid) then
+    (Sender as TAction).Enabled := not (dsDataTable.DataTable.State in dsEditModes)
+      and ViewGrid.esSeleccionCeldaDatos
+      and (ViewGrid.NumSeleccionados > 0)
+  else
+    (Sender as TAction).Enabled := False;
+end;
+
 procedure TfEditorFacturasCliente.actEliminarUpdate(Sender: TObject);
 begin
   inherited;

Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm

@@ -1,6 +1,6 @@
 inherited frViewFacturaCliente: TfrViewFacturaCliente
-  Width = 867
+  Width = 1079
-  Height = 490
+  Height = 553
   Align = alClient
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
@@ -9,8 +9,8 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 867
+    Width = 1079
-    Height = 490
+    Height = 553
     Align = alClient
     ParentBackground = True
     TabOrder = 0
@@ -20,8 +20,8 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
     ExplicitWidth = 451
     ExplicitHeight = 304
     DesignSize = (
-      867
+      1079
-      490)
+      553)
     object eReferencia: TcxDBTextEdit
       Left = 135
       Top = 30
@@ -66,7 +66,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
     end
     object cbFormaPago: TcxDBLookupComboBox
       Left = 135
-      Top = 135
+      Top = 162
       DataBinding.DataField = 'ID_FORMA_PAGO'
       DataBinding.DataSource = DADataSource
       Properties.DropDownListStyle = lsFixedList
@@ -93,21 +93,21 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 3
+      TabOrder = 4
       Width = 78
     end
     object bFormasPago: TButton
-      Left = 300
+      Left = 409
-      Top = 135
+      Top = 162
       Width = 132
       Height = 23
       Caption = 'Ver las formas de pago...'
-      TabOrder = 4
+      TabOrder = 5
       OnClick = bFormasPagoClick
     end
     inline frViewTienda1: TfrViewTienda
       Left = 22
-      Top = 269
+      Top = 296
       Width = 351
       Height = 48
       Enabled = False
@@ -117,10 +117,10 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 8
+      TabOrder = 9
       ReadOnly = False
       ExplicitLeft = 22
-      ExplicitTop = 269
+      ExplicitTop = 296
       ExplicitWidth = 351
       ExplicitHeight = 48
       inherited dxLayoutControl1: TdxLayoutControl
@@ -140,7 +140,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       end
     end
     inline frViewClienteFactura1: TfrViewClienteFactura
-      Left = 460
+      Left = 569
       Top = 30
       Width = 398
       Height = 265
@@ -150,9 +150,9 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 10
+      TabOrder = 11
       ReadOnly = False
-      ExplicitLeft = 460
+      ExplicitLeft = 569
       ExplicitTop = 30
       ExplicitWidth = 398
       ExplicitHeight = 265
@@ -182,12 +182,12 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
           Width = 276
         end
         inherited edtCodigoPostal: TcxDBTextEdit
-          Left = 293
+          Left = 396
-          ExplicitLeft = 293
+          ExplicitLeft = 396
         end
         inherited Button3: TBitBtn
-          Left = 183
+          Left = 286
-          ExplicitLeft = 183
+          ExplicitLeft = 286
         end
         inherited cxDBTextEdit1: TcxDBTextEdit
           ExplicitWidth = 283
@@ -197,7 +197,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
     end
     object edtFechaVencimiento: TcxDBDateEdit
       Left = 135
-      Top = 164
+      Top = 191
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_VENCIMIENTO'
       DataBinding.DataSource = DADataSource
@@ -217,12 +217,12 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       StyleDisabled.LookAndFeel.NativeStyle = True
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 5
+      TabOrder = 6
       Width = 310
     end
     inline frViewObservaciones1: TfrViewObservaciones
       Left = 22
-      Top = 398
+      Top = 425
       Width = 521
       Height = 20
       Font.Charset = DEFAULT_CHARSET
@@ -231,10 +231,10 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 11
+      TabOrder = 12
       ReadOnly = False
       ExplicitLeft = 22
-      ExplicitTop = 398
+      ExplicitTop = 425
       ExplicitHeight = 20
       inherited memObservaciones: TcxDBMemo
         DataBinding.DataField = 'OBSERVACIONES'
@@ -245,7 +245,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
     end
     object cbRecargoEquivalencia: TcxDBCheckBox
       Left = 22
-      Top = 347
+      Top = 374
       Caption = '  No acogida a comisiones'
       DataBinding.DataField = 'SIN_COMISION'
       DataBinding.DataSource = DADataSource
@@ -271,12 +271,12 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 9
+      TabOrder = 10
       Width = 158
     end
     object edtSituacion: TcxDBComboBox
       Left = 135
-      Top = 84
+      Top = 111
       DataBinding.DataField = 'SITUACION'
       DataBinding.DataSource = DADataSource
       Properties.DropDownListStyle = lsFixedList
@@ -285,12 +285,12 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
         'PENDIENTE'
         'PARCIALMENTE PAGADA'
         'PAGADA')
-      TabOrder = 2
+      TabOrder = 3
       Width = 121
     end
     object edtRefContrato: TcxDBTextEdit
       Left = 135
-      Top = 215
+      Top = 242
       Anchors = [akLeft, akTop, akRight]
       AutoSize = False
       DataBinding.DataField = 'REF_CONTRATO'
@@ -307,13 +307,13 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       StyleDisabled.TextColor = clWindowText
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 6
+      TabOrder = 7
       Height = 21
       Width = 294
     end
     object edtRefClienteContrato: TcxDBTextEdit
       Left = 135
-      Top = 242
+      Top = 269
       Anchors = [akLeft, akTop, akRight]
       AutoSize = False
       DataBinding.DataField = 'REF_CLI_CONTRATO'
@@ -330,10 +330,42 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
       StyleDisabled.TextColor = clWindowText
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 7
+      TabOrder = 8
       Height = 21
       Width = 294
     end
+    object cbTipoFactura: TcxDBLookupComboBox
+      Left = 135
+      Top = 84
+      DataBinding.DataField = 'ID_TIPO_FACTURA'
+      DataBinding.DataSource = DADataSource
+      Properties.DropDownListStyle = lsFixedList
+      Properties.ImmediatePost = True
+      Properties.KeyFieldNames = 'ID'
+      Properties.ListColumns = <
+        item
+          FieldName = 'DESCRIPCION'
+        end>
+      Properties.ListOptions.GridLines = glNone
+      Properties.ListOptions.ShowHeader = False
+      Properties.ListOptions.SyncMode = True
+      Properties.ListSource = dsTiposFactura
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.ButtonStyle = bts3D
+      Style.PopupBorderStyle = epbsFrame3D
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 2
+      Width = 158
+    end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
@@ -363,6 +395,11 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
               Control = edtFecha
               ControlOptions.ShowBorder = False
             end
+            object dxLayoutControl1Item11: TdxLayoutItem
+              Caption = 'Tipo operaci'#243'n:'
+              Control = cbTipoFactura
+              ControlOptions.ShowBorder = False
+            end
             object ledtSituacion: TdxLayoutItem
               Caption = 'Situaci'#243'n:'
               Control = edtSituacion
@@ -479,4 +516,8 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente
     Left = 64
     Top = 24
   end
+  object dsTiposFactura: TDADataSource
+    Left = 48
+    Top = 104
+  end
 end

Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas

@@ -64,6 +64,9 @@ type
     edtRefContrato: TcxDBTextEdit;
     dxLayoutControl1Item9: TdxLayoutItem;
     edtRefClienteContrato: TcxDBTextEdit;
+    dxLayoutControl1Item11: TdxLayoutItem;
+    cbTipoFactura: TcxDBLookupComboBox;
+    dsTiposFactura: TDADataSource;
     procedure bFormasPagoClick(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
     procedure CustomViewCreate(Sender: TObject);
@@ -72,6 +75,7 @@ type
   protected
     FFactura : IBizFacturaCliente;
     FController : IFacturasClienteController;
+    FTiposFacturaCliente : IBizTiposFacturaCliente;
     FFormasPago : IBizFormaPago;
     FFormasPagoController : IFormasPagoController;
     function GetFactura: IBizFacturaCliente;
@@ -104,6 +108,7 @@ procedure TfrViewFacturaCliente.CustomViewCreate(Sender: TObject);
 begin
   inherited;
   FFormasPago := Nil;
+  FTiposFacturaCliente := Nil;
   FFormasPagoController := TFormasPagoController.Create;
   cbFormaPago.Properties.OnEditValueChanged := cbFormaPagoPropertiesEditValueChanged;
   edtFechaVencimiento.Properties.OnEditValueChanged := edtFechaVencimientoPropertiesEditValueChanged;
@@ -112,6 +117,7 @@ end;
 procedure TfrViewFacturaCliente.CustomViewDestroy(Sender: TObject);
 begin
   FFormasPago := Nil;
+  FTiposFacturaCliente := Nil;
   FFormasPagoController := NIL;
   edtFechaVencimiento.Properties.OnEditValueChanged := Nil;
   cbFormaPago.Properties.OnEditValueChanged := Nil;
@@ -221,6 +227,11 @@ begin
        ledtSituacion.Enabled := True;
     end;
 
+
+    FTiposFacturaCliente := FController.darTiposFacturaCliente;
+    dsTiposFactura.DataTable := FTiposFacturaCliente.DataTable;
+    dsTiposFactura.DataTable.Active := True;
+
     //Solo se deshabilita al insertar, luego la referencia será modificable
     //eReferencia.Enabled := (FFactura.DataTable.State = dsInsert);
 

Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm

@@ -176,6 +176,10 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
         GroupSummaryAlignment = taRightJustify
         HeaderAlignmentHorz = taRightJustify
       end
+      object cxGridViewTIPO_OPERACION: TcxGridDBColumn
+        Caption = 'Tipo operaci'#243'n'
+        DataBinding.FieldName = 'TIPO_OPERACION'
+      end
     end
     inherited cxGridLevel: TcxGridLevel
       Caption = 'Todas'
@@ -221,6 +225,16 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
           ExplicitWidth = 273
           Width = 273
         end
+        inherited txtFiltroTodo2: TcxTextEdit
+          Left = 541
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
+          ExplicitLeft = 541
+          ExplicitWidth = 250
+          Width = 250
+        end
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
         Width = 802

Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas

@@ -68,6 +68,7 @@ type
     actProcedencia: TAction;
     TBXSeparatorItem3: TTBXSeparatorItem;
     TBXItem4: TTBXItem;
+    cxGridViewTIPO_OPERACION: TcxGridDBColumn;
     procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
       ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
       out AStyle: TcxStyle);
@@ -91,6 +92,7 @@ type
 
   public
     procedure AnadirOtrosFiltros; override;
+    procedure ConfigView; override;
     property Facturas: IBizFacturaCliente read GetFacturas write SetFacturas;
   end;
 
@@ -98,7 +100,7 @@ type
 implementation
 
 uses
-  uDataModuleFacturasCliente, DateUtils, uViewGridBase;
+  uDataModuleFacturasCliente, DateUtils, uViewGridBase, uFactuGES_App;
 
 {$R *.dfm}
 
@@ -211,6 +213,17 @@ begin
   cxGrid.ActiveLevel.GridView := cxGridView;
 end;
 
+procedure TfrViewFacturasCliente.ConfigView;
+begin
+  inherited;
+
+  if ((AppFactuGES.EmpresaActiva.ID = 2) or (AppFactuGES.EmpresaActiva.ID = 3)) then
+    cxGridViewTIENDA.Visible := True
+  else
+    cxGridViewTIENDA.Visible := False;
+
+end;
+
 procedure TfrViewFacturasCliente.cxGridActiveTabChanged(Sender: TcxCustomGrid;
   ALevel: TcxGridLevel);
 begin

Source/Modulos/Facturas de proveedor/Controller/uDetallesFacturaProveedorController.pas

@@ -26,6 +26,7 @@ type
     procedure AsignarController; override;
     //Si sobreescribimos este método podremos tener en cuenta otras columnas para el calculo del importe total de un concepto
     function CalcularImporteTotalConcepto(DataTable: TDADataTable): Double; override;
+    procedure CalculoDetalleConcepto(DataTable: TDADataTable; var ImporteAcumulado : Double; var ImporteTotal : Double; const Opcional: Boolean); override;
     procedure ValidarCampos(DataTable: TDADataTable); override;
     procedure DesglosarPorteDetalles(ImportePorte: Currency; ADetalles: IDAStronglyTypedDataTable);
     function DarTotalPorteTotal(ADetalles: IDAStronglyTypedDataTable): Double;
@@ -43,7 +44,7 @@ implementation
 { TDetallesFacturaProveedorController }
 
 uses Variants, uDataModuleFacturasProveedor, uArticulosFacturaProveedorController,
-  uControllerDetallesBase, Dialogs, SysUtils, uDialogUtils, uCalculosUtils;
+  uControllerDetallesBase, Dialogs, SysUtils, uDialogUtils, uCalculosUtils, uNumUtils;
 
 procedure TDetallesFacturaProveedorController.ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; AProveedor: IBizProveedor);
 var
@@ -99,7 +100,22 @@ end;
 
 function TDetallesFacturaProveedorController.CalcularImporteTotalConcepto(DataTable: TDADataTable): Double;
 begin
-  Result := CalcularLineaConcepto(DataTable);
+//Calcular con 4 decimales
+  Result := CalcularLineaConcepto(DataTable, 4);
+end;
+
+procedure TDetallesFacturaProveedorController.CalculoDetalleConcepto(
+  DataTable: TDADataTable; var ImporteAcumulado, ImporteTotal: Double;
+  const Opcional: Boolean);
+begin
+  with DataTable do
+  begin
+    ImporteAcumulado := ImporteAcumulado + RoundCurrency(FieldByName(CAMPO_IMPORTE_TOTAL).AsCurrency, 4);
+//    ImporteAcumulado := ImporteAcumulado + FieldByName(CAMPO_IMPORTE_TOTAL).AsFloat;
+    if not Opcional then
+       ImporteTotal := ImporteTotal + RoundCurrency(FieldByName(CAMPO_IMPORTE_TOTAL).AsCurrency, 4);
+//       ImporteTotal := ImporteTotal + FieldByName(CAMPO_IMPORTE_TOTAL).AsFloat;
+  end;
 end;
 
 constructor TDetallesFacturaProveedorController.Create;

Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas

@@ -58,7 +58,7 @@ type
     procedure FiltrarAno(AFactura: IBizFacturaProveedor; ADynWhereDataTable: WideString; const Ano: String);
 
     function darTiposFacturaProveedor: IBizTiposFacturaProveedor;
-    procedure AsignarTipoOperacion(AFacturas: IBizFacturaProveedor);
+    function AsignarTipoOperacion(AFacturas: IBizFacturaProveedor): boolean;
   end;
 
   TFacturasProveedorController = class(TControllerBase, IFacturasProveedorController)
@@ -133,7 +133,7 @@ type
     procedure FiltrarAno(AFactura: IBizFacturaProveedor; ADynWhereDataTable: WideString; const Ano: String);
 
     function darTiposFacturaProveedor: IBizTiposFacturaProveedor;
-    procedure AsignarTipoOperacion(AFacturas: IBizFacturaProveedor);
+    function AsignarTipoOperacion(AFacturas: IBizFacturaProveedor): boolean;
   end;
 
 implementation
@@ -451,12 +451,13 @@ begin
   AFactura.TIPO := CTE_TIPO_ABONO;
 end;
 
-procedure TFacturasProveedorController.AsignarTipoOperacion(AFacturas: IBizFacturaProveedor);
+function TFacturasProveedorController.AsignarTipoOperacion(AFacturas: IBizFacturaProveedor): boolean;
 var
   ATipoOperacionController : ITiposOperacionCompraController;
   ATipoOperacion: Variant;
 
 begin
+  Result := False;
 
   if Assigned(AFacturas) then
   begin
@@ -488,6 +489,7 @@ begin
           Next;
         end;
         ApplyUpdates;
+        Result := True;
       end;
   end;
   HideHourglassCursor;

Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm

@@ -159,6 +159,10 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
             inherited dxLayoutControl1: TdxLayoutControl
               Width = 350
               ExplicitWidth = 350
+              inherited Bevel1: TBevel
+                Width = 242
+                ExplicitWidth = 242
+              end
               inherited edtlNombre: TcxDBTextEdit
                 DataBinding.DataSource = dsDataTable
                 ExplicitWidth = 259
@@ -200,14 +204,25 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
           end
           inherited frViewObservaciones1: TfrViewObservaciones
             Width = 671
+            Height = 228
             ExplicitWidth = 671
+            ExplicitHeight = 228
             inherited memObservaciones: TcxDBMemo
               DataBinding.DataSource = frViewFacturaProveedor1.DADataSource
-              ExplicitWidth = 669
+              ExplicitWidth = 671
-              ExplicitHeight = 20
+              ExplicitHeight = 228
+              Height = 228
               Width = 671
             end
           end
+          inherited cbTipoFactura: TcxDBLookupComboBox
+            ExplicitWidth = 209
+            Width = 209
+          end
+          inherited edtSituacion: TcxDBComboBox
+            ExplicitWidth = 294
+            Width = 294
+          end
         end
       end
     end
@@ -256,40 +271,40 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
             ExplicitWidth = 57
           end
           inherited UpDown1: TUpDown
-            Left = 220
+            Left = 202
-            ExplicitLeft = 220
+            ExplicitLeft = 202
           end
           inherited ToolButton13: TToolButton
-            Left = 237
+            Left = 219
-            ExplicitLeft = 237
+            ExplicitLeft = 219
           end
           inherited ToolButton6: TToolButton
-            Left = 245
+            Left = 227
-            ExplicitLeft = 245
+            ExplicitLeft = 227
           end
           inherited ToolButton7: TToolButton
-            Left = 279
+            Left = 261
-            ExplicitLeft = 279
+            ExplicitLeft = 261
           end
           inherited ToolButton8: TToolButton
-            Left = 313
+            Left = 295
-            ExplicitLeft = 313
+            ExplicitLeft = 295
           end
           inherited ToolButton12: TToolButton
-            Left = 347
+            Left = 329
-            ExplicitLeft = 347
+            ExplicitLeft = 329
           end
           inherited ToolButton9: TToolButton
-            Left = 355
+            Left = 337
-            ExplicitLeft = 355
+            ExplicitLeft = 337
           end
           inherited ToolButton10: TToolButton
-            Left = 389
+            Left = 371
-            ExplicitLeft = 389
+            ExplicitLeft = 371
           end
           inherited ToolButton11: TToolButton
-            Left = 423
+            Left = 405
-            ExplicitLeft = 423
+            ExplicitLeft = 405
           end
         end
         inherited cxGrid: TcxGrid
@@ -335,6 +350,18 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         inherited ToolBar1: TToolBar
           Width = 732
           ExplicitWidth = 732
+          inherited ToolButton1: TToolButton
+            ExplicitWidth = 113
+          end
+          inherited ToolButton4: TToolButton
+            ExplicitWidth = 113
+          end
+          inherited ToolButton2: TToolButton
+            ExplicitWidth = 113
+          end
+          inherited ToolButton7: TToolButton
+            ExplicitWidth = 113
+          end
         end
       end
     end
@@ -410,21 +437,35 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
       Width = 746
       ExplicitWidth = 746
       inherited Bevel3: TBevel
-        Left = 398
+        Left = 353
         Top = 30
         Height = 122
-        ExplicitLeft = 398
+        ExplicitLeft = 353
         ExplicitTop = 30
         ExplicitHeight = 122
       end
       inherited Bevel4: TBevel
-        Left = 510
+        Left = 465
         Top = 57
         Width = 186
-        ExplicitLeft = 510
+        ExplicitLeft = 465
         ExplicitTop = 57
         ExplicitWidth = 186
       end
+      inherited Bevel2: TBevel
+        Top = 185
+        Width = 333
+        ExplicitTop = 185
+        ExplicitWidth = 333
+      end
+      inherited Bevel1: TBevel
+        Left = 372
+        Top = 185
+        Width = 332
+        ExplicitLeft = 372
+        ExplicitTop = 185
+        ExplicitWidth = 332
+      end
       inherited ImporteDto: TcxDBCurrencyEdit
         Top = 57
         Style.LookAndFeel.SkinName = ''
@@ -437,27 +478,27 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         Width = 207
       end
       inherited ImporteIVA: TcxDBCurrencyEdit
-        Left = 581
+        Left = 536
         Top = 77
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 581
+        ExplicitLeft = 536
         ExplicitTop = 77
         ExplicitWidth = 143
         Width = 143
       end
       inherited ImporteTotal: TcxDBCurrencyEdit
-        Left = 511
+        Left = 466
         Top = 158
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 511
+        ExplicitLeft = 466
         ExplicitTop = 158
         ExplicitWidth = 213
         Width = 213
@@ -473,31 +514,31 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         ExplicitTop = 57
       end
       inherited edtIVA: TcxDBSpinEdit
-        Left = 510
+        Left = 465
         Top = 77
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 510
+        ExplicitLeft = 465
         ExplicitTop = 77
       end
       inherited ImporteBase: TcxDBCurrencyEdit
-        Left = 510
+        Left = 465
         Top = 30
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 510
+        ExplicitLeft = 465
         ExplicitTop = 30
         ExplicitWidth = 214
         Width = 214
       end
       inherited edtRE: TcxDBSpinEdit
-        Left = 510
+        Left = 465
         Top = 131
         Properties.AssignedValues.MinValue = True
         Style.LookAndFeel.SkinName = ''
@@ -505,37 +546,37 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 510
+        ExplicitLeft = 465
         ExplicitTop = 131
       end
       inherited edtIRPF: TcxDBSpinEdit
-        Left = 510
+        Left = 465
         Top = 104
         DataBinding.DataField = 'IRPF'
         Enabled = True
         Style.IsFontAssigned = True
-        ExplicitLeft = 510
+        ExplicitLeft = 465
         ExplicitTop = 104
       end
       inherited ImporteRE: TcxDBCurrencyEdit
-        Left = 581
+        Left = 536
         Top = 131
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 581
+        ExplicitLeft = 536
         ExplicitTop = 131
         ExplicitWidth = 143
         Width = 143
       end
       inherited ImporteIRPF: TcxDBCurrencyEdit
-        Left = 581
+        Left = 536
         Top = 104
         DataBinding.DataField = 'IMPORTE_IRPF'
         Style.IsFontAssigned = True
-        ExplicitLeft = 581
+        ExplicitLeft = 536
         ExplicitTop = 104
         ExplicitWidth = 56
         Width = 56
@@ -578,10 +619,10 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         Width = 140
       end
       inherited bTiposIVA: TButton
-        Left = 250
+        Left = 205
         Top = 111
         OnClick = frViewTotales1bTiposIVAClick
-        ExplicitLeft = 250
+        ExplicitLeft = 205
         ExplicitTop = 111
       end
       inherited cbRecargoEquivalencia: TcxDBCheckBox
@@ -594,6 +635,32 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         ExplicitWidth = 278
         Width = 278
       end
+      inherited edtRetencion: TcxDBSpinEdit
+        Left = 465
+        Top = 200
+        Style.IsFontAssigned = True
+        ExplicitLeft = 465
+        ExplicitTop = 200
+      end
+      inherited edtImporteRetencion: TcxDBCurrencyEdit
+        Left = 536
+        Top = 200
+        Style.IsFontAssigned = True
+        ExplicitLeft = 536
+        ExplicitTop = 200
+        ExplicitWidth = 342
+        Width = 342
+      end
+      inherited edtFechaRetencion: TcxDBDateEdit
+        Top = 200
+        Style.LookAndFeel.SkinName = ''
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitTop = 200
+        ExplicitWidth = 333
+        Width = 333
+      end
       inherited dxLayoutControl1Group_Root: TdxLayoutGroup
         LookAndFeel = frViewFacturaProveedor1.dxLayoutOfficeLookAndFeel1
         inherited dxLayoutControl1Group1: TdxLayoutGroup

Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.dfm

@@ -60,7 +60,7 @@ inherited fEditorFacturasProveedor: TfEditorFacturasProveedor
     end
     inherited tbxFiltro: TTBXToolbar
       DockPos = -6
-      ExplicitWidth = 454
+      ExplicitWidth = 379
       inherited lblAno: TTBXLabelItem
         Visible = True
       end
@@ -75,18 +75,18 @@ inherited fEditorFacturasProveedor: TfEditorFacturasProveedor
       ExplicitWidth = 929
     end
     inherited TBXTMain2: TTBXToolbar
-      Left = 454
+      Left = 379
       Visible = True
-      ExplicitLeft = 454
+      ExplicitLeft = 379
       ExplicitWidth = 258
-      object TBXItem40: TTBXItem
+      object TBXItem41: TTBXItem
-        Action = actInformes
+        Action = actAsignarTipoOperacion
         DisplayMode = nbdmImageAndText
       end
       object TBSeparatorItem1: TTBSeparatorItem
       end
-      object TBXItem41: TTBXItem
+      object TBXItem40: TTBXItem
-        Action = actAsignarTipoOperacion
+        Action = actInformes
         DisplayMode = nbdmImageAndText
       end
     end
@@ -144,6 +144,16 @@ inherited fEditorFacturasProveedor: TfEditorFacturasProveedor
             Kind = skSum
             Position = spFooter
             Column = frViewFacturasProveedor1.cxGridViewIMPORTE_RE
+          end
+          item
+            Format = ',0.00 '#8364';-,0.00 '#8364
+            Kind = skSum
+            Position = spFooter
+            Column = frViewFacturasProveedor1.cxGridViewIMPORTE_IRPF
+          end
+          item
+            Format = ',0.00 '#8364';-,0.00 '#8364
+            Column = frViewFacturasProveedor1.cxGridViewIMPORTE_IRPF
           end>
         DataController.Summary.FooterSummaryItems = <
           item
@@ -170,6 +180,10 @@ inherited fEditorFacturasProveedor: TfEditorFacturasProveedor
             Format = ',0.00 '#8364';-,0.00 '#8364
             Kind = skSum
             Column = frViewFacturasProveedor1.cxGridViewIMPORTE_RE
+          end
+          item
+            Kind = skSum
+            Column = frViewFacturasProveedor1.cxGridViewIMPORTE_IRPF
           end>
       end
     end
@@ -208,12 +222,12 @@ inherited fEditorFacturasProveedor: TfEditorFacturasProveedor
             Width = 263
           end
           inherited txtFiltroTodo2: TcxTextEdit
-            Left = 695
+            Left = 697
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 695
+            ExplicitLeft = 697
             ExplicitWidth = 204
             Width = 204
           end

Source/Modulos/Facturas de proveedor/Views/uEditorFacturasProveedor.pas

@@ -103,9 +103,7 @@ begin
     ViewGrid.RestoreGridStatus;
   end;
 
-  Controller.AsignarTipoOperacion(AFacturas);
+  if Controller.AsignarTipoOperacion(AFacturas) then
-
-  if (AFacturas.DataTable.RecordCount > 0) then
      RefrescarInterno;
 end;
 

Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.dfm

@@ -4,16 +4,31 @@ inherited frViewDetallesFacturaProveedor: TfrViewDetallesFacturaProveedor
       inherited cxGridViewCANTIDAD: TcxGridDBColumn
         Properties.Alignment.Horz = taRightJustify
       end
-      inherited cxGridViewDESCUENTO: TcxGridDBColumn
+      inherited cxGridViewIMPORTEUNIDAD: TcxGridDBColumn
-        Visible = False
+        Properties.DecimalPlaces = 4
-        VisibleForCustomization = False
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
+        Properties.EditFormat = ',0.0000;-,0.0000'
       end
       inherited cxGridViewIMPORTENETO: TcxGridDBColumn
+        Properties.DecimalPlaces = 4
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
+        Properties.EditFormat = ',0.0000;-,0.0000'
         Properties.ReadOnly = False
-        Visible = False
         Options.Editing = True
+      end
+      inherited cxGridViewDESCUENTO: TcxGridDBColumn
         VisibleForCustomization = False
       end
+      inherited cxGridViewIMP_UNIDAD_DTO: TcxGridDBColumn
+        Properties.DecimalPlaces = 4
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
+        Properties.EditFormat = ',0.0000;-,0.0000'
+      end
+      inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn
+        Properties.DecimalPlaces = 4
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
+        Properties.EditFormat = ',0.0000;-,0.0000'
+      end
     end
   end
 end

Source/Modulos/Facturas de proveedor/Views/uViewElegirArticulosFacturasProveedor.dfm

@@ -6,6 +6,26 @@ inherited frViewElegirArticulosFacturasProveedor: TfrViewElegirArticulosFacturas
     Height = 321
     ExplicitHeight = 321
     inherited cxGridView: TcxGridDBTableView
+      inherited cxGridViewPRECIO_COSTE: TcxGridDBColumn
+        Caption = 'Precio material'
+        Properties.DecimalPlaces = 4
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
+        Properties.EditFormat = ''
+        VisibleForCustomization = False
+      end
+      inherited cxGridViewDESCUENTO: TcxGridDBColumn
+        Visible = True
+      end
+      inherited cxGridViewPRECIO_NETO: TcxGridDBColumn
+        Caption = 'Precio coste'
+        Properties.DecimalPlaces = 4
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
+        Properties.EditFormat = ''
+        Visible = True
+      end
+      inherited cxGridViewPRECIOPVP2: TcxGridDBColumn
+        Visible = False
+      end
       object cxGridViewID_PROVEEDOR: TcxGridDBColumn
         DataBinding.FieldName = 'ID_PROVEEDOR'
         Visible = False
@@ -38,13 +58,25 @@ inherited frViewElegirArticulosFacturasProveedor: TfrViewElegirArticulosFacturas
           Width = 121
         end
         inherited edtFechaFinFiltro: TcxDateEdit
+          Left = 549
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
+          ExplicitLeft = 549
           ExplicitWidth = 121
           Width = 121
         end
+        inherited txtFiltroTodo2: TcxTextEdit
+          Left = 525
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
+          ExplicitLeft = 525
+          ExplicitWidth = 250
+          Width = 250
+        end
       end
     end
   end

Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm

@@ -31,6 +31,12 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor
           Kind = skSum
           Position = spFooter
           Column = cxGridViewBASE_IMPONIBLE
+        end
+        item
+          Format = ',0.00 '#8364';-,0.00 '#8364
+          Kind = skSum
+          Position = spFooter
+          Column = cxGridViewIMPORTE_IRPF
         end>
       DataController.Summary.FooterSummaryItems = <
         item
@@ -52,6 +58,11 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor
           Format = ',0.00 '#8364';-,0.00 '#8364
           Kind = skSum
           Column = cxGridViewBASE_IMPONIBLE
+        end
+        item
+          Format = ',0.00 '#8364';-,0.00 '#8364
+          Kind = skSum
+          Column = cxGridViewIMPORTE_IRPF
         end>
       OptionsCustomize.ColumnHidingOnGrouping = False
       OptionsView.GroupFooters = gfAlwaysVisible
@@ -242,12 +253,14 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor
           Width = 287
         end
         inherited txtFiltroTodo2: TcxTextEdit
-          Left = 377
+          Left = 361
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 377
+          ExplicitLeft = 361
+          ExplicitWidth = 250
+          Width = 250
         end
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel

Source/Modulos/Formas de pago/Views/uEditorFormaPago.pas

@@ -121,6 +121,9 @@ end;
 
 procedure TfEditorFormaPago.actAnadirExecute(Sender: TObject);
 begin
+  if Assigned(FFormaPago) and (FFormaPago.State = dsInsert) then
+    FController.Guardar(FFormaPago);
+
   FPlazos.Append;
 end;
 

Source/Modulos/Historico de movimientos/Views/uEditorHistoricoMovimientos.dfm

@@ -5,7 +5,7 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos
   ClientHeight = 620
   ClientWidth = 902
   ExplicitWidth = 910
-  ExplicitHeight = 654
+  ExplicitHeight = 658
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -137,10 +137,10 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos
     Width = 902
     ExplicitWidth = 902
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 358
+      ExplicitWidth = 569
     end
     inherited tbxFiltro: TTBXToolbar
-      ExplicitWidth = 269
+      ExplicitWidth = 201
       inherited TBXItem37: TTBXItem
         Visible = False
       end
@@ -148,10 +148,6 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos
     inherited tbxMenu: TTBXToolbar
       ExplicitWidth = 902
     end
-    inherited TBXTMain2: TTBXToolbar
-      Left = 334
-      ExplicitLeft = 334
-    end
   end
   inherited StatusBar: TJvStatusBar
     Top = 601
@@ -161,9 +157,9 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos
   end
   inline frViewHistoricoMovimientos1: TfrViewHistoricoMovimientos [3]
     Left = 0
-    Top = 102
+    Top = 106
     Width = 902
-    Height = 499
+    Height = 495
     Align = alClient
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
@@ -173,14 +169,14 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos
     ParentFont = False
     TabOrder = 3
     ReadOnly = False
-    ExplicitTop = 102
+    ExplicitTop = 106
     ExplicitWidth = 902
-    ExplicitHeight = 499
+    ExplicitHeight = 495
     inherited cxGrid: TcxGrid
       Width = 902
-      Height = 371
+      Height = 367
       ExplicitWidth = 902
-      ExplicitHeight = 371
+      ExplicitHeight = 367
       inherited cxGridView: TcxGridDBTableView
         DataController.Summary.FooterSummaryItems = <
           item
@@ -207,19 +203,41 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos
           Width = 902
           ExplicitWidth = 902
           inherited txtFiltroTodo: TcxTextEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 273
             Width = 273
           end
           inherited edtFechaIniFiltro: TcxDateEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
             ExplicitWidth = 121
             Width = 121
           end
           inherited edtFechaFinFiltro: TcxDateEdit
             Left = 553
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
             ExplicitLeft = 553
             ExplicitWidth = 121
             Width = 121
           end
+          inherited txtFiltroTodo2: TcxTextEdit
+            Left = 529
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 529
+            ExplicitWidth = 250
+            Width = 250
+          end
         end
         inherited TBXAlignmentPanel1: TTBXAlignmentPanel
           Width = 902
@@ -232,8 +250,8 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos
       end
     end
     inherited pnlAgrupaciones: TTBXDockablePanel
-      Top = 473
+      Top = 469
-      ExplicitTop = 473
+      ExplicitTop = 469
       ExplicitWidth = 902
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
         Width = 902
@@ -289,6 +307,10 @@ inherited fEditorHistoricoMovimientos: TfEditorHistoricoMovimientos
     inherited actAnchoAuto: TAction
       ImageIndex = 27
     end
+    inherited actExportarExcel: TAction
+      Enabled = True
+      Visible = True
+    end
     object actExpandir: TAction
       Category = 'Ver'
       Caption = 'Expandir'

Source/Modulos/Inventario/Views/uEditorInventario.dfm

@@ -43,7 +43,7 @@ inherited fEditorInventario: TfEditorInventario
     Width = 669
     ExplicitWidth = 669
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 639
+      ExplicitWidth = 669
       object TBXSeparatorItem84: TTBXSeparatorItem [6]
       end
       object TBXItem54: TTBXItem [7]
@@ -66,7 +66,7 @@ inherited fEditorInventario: TfEditorInventario
       end
     end
     inherited tbxFiltro: TTBXToolbar
-      ExplicitWidth = 276
+      ExplicitWidth = 201
       inherited TBXItem37: TTBXItem
         Visible = False
       end
@@ -75,10 +75,9 @@ inherited fEditorInventario: TfEditorInventario
       ExplicitWidth = 669
     end
     inherited TBXTMain2: TTBXToolbar
-      Left = 276
+      Left = 201
-      DockPos = 264
+      DockPos = 200
-      Visible = True
+      ExplicitLeft = 201
-      ExplicitLeft = 276
       object TBXItem38: TTBXItem
         Action = actReservados
         DisplayMode = nbdmImageAndText
@@ -202,6 +201,16 @@ inherited fEditorInventario: TfEditorInventario
             ExplicitWidth = 205
             Width = 205
           end
+          inherited txtFiltroTodo2: TcxTextEdit
+            Left = 462
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 462
+            ExplicitWidth = 250
+            Width = 250
+          end
         end
         inherited TBXAlignmentPanel1: TTBXAlignmentPanel
           Width = 669
@@ -268,6 +277,10 @@ inherited fEditorInventario: TfEditorInventario
     inherited actAnchoAuto: TAction
       ImageIndex = 27
     end
+    inherited actExportarExcel: TAction
+      Enabled = True
+      Visible = True
+    end
     object actRecibirPedido: TAction
       Category = 'Logistica'
       Caption = 'Recibir pedido'

Source/Modulos/Pedidos a proveedor/Controller/uDetallesPedidoProveedorController.pas

@@ -101,7 +101,8 @@ end;
 
 function TDetallesPedidoProveedorController.CalcularImporteTotalConcepto(DataTable: TDADataTable): Double;
 begin
-  Result := CalcularLineaConcepto(DataTable);
+//Calcular con 4 decimales
+  Result := CalcularLineaConcepto(DataTable, 4);
 end;
 
 constructor TDetallesPedidoProveedorController.Create;

Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorController.pas

@@ -49,6 +49,8 @@ type
     function ElegirPedidos(APedido: IBizPedidoProveedor; AMensaje: String; AMultiSelect: Boolean): IBizPedidoProveedor;
     procedure RecuperarProveedor(APedido: IBizPedidoProveedor);
     function ArticulosPendientesDeRecibir(IDPedido: Integer): IBizDetallesPedidoProveedorPend;
+
+    function AsignarSituacion(const ASituacion: Variant; APedidos: IBizPedidoProveedor): boolean;
   end;
 
   TPedidosProveedorController = class(TControllerBase, IPedidosProveedorController)
@@ -112,6 +114,8 @@ type
     function ExtraerSeleccionados(APedido: IBizPedidoProveedor) : IBizPedidoProveedor;
     function ElegirPedidos(APedido: IBizPedidoProveedor; AMensaje: String; AMultiSelect: Boolean): IBizPedidoProveedor;
     function ArticulosPendientesDeRecibir(IDPedido: Integer): IBizDetallesPedidoProveedorPend;
+
+    function AsignarSituacion(const ASituacion: Variant; APedidos: IBizPedidoProveedor): boolean;
   end;
 
 implementation
@@ -123,7 +127,7 @@ uses
   schPedidosProveedorClient_Intf, uDAInterfaces, uPedidosProveedorReportController,
   uDateUtils, uIEditorPedidoProveedor, uIEditorElegirPedidosProveedor,
   Dialogs, uIEditorDireccionEntregaPedidoProveedor, Classes,
-  uIEditorSituacionPedidoProveedor, Variants, uSistemaFunc, uEMailUtils;
+  uIEditorSituacionPedidoProveedor, Variants, uSistemaFunc, uEMailUtils, uStringsUtils;
 
 { TPedidosProveedorController }
 
@@ -157,6 +161,32 @@ begin
   FDataModule := TDataModulePedidosProveedor.Create(Nil);
 end;
 
+function TPedidosProveedorController.AsignarSituacion(const ASituacion: Variant; APedidos: IBizPedidoProveedor): Boolean;
+begin
+  ShowHourglassCursor;
+  if not EsCadenaVacia(ASituacion) then
+  begin
+      //Asignamos en pedido
+      with  APedidos.DataTable do
+      begin
+        First;
+        while not EOF do
+        begin
+          if (APedidos.SITUACION <> ASituacion) then
+          begin
+            Edit;
+            APedidos.SITUACION := ASituacion;
+            Post;
+          end;
+          Next;
+        end;
+        ApplyUpdates;
+        Result := True;
+      end;
+  end;
+  HideHourglassCursor;
+end;
+
 function TPedidosProveedorController.Buscar(const ID: Integer): IBizPedidoProveedor;
 begin
   Result := FDataModule.GetItem(ID);

Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorClient_Intf.pas

@@ -9,9 +9,9 @@ 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_PedidosProveedor = '{E291476A-60EC-42CA-B06D-6B53509DE7FB}';
+  RID_PedidosProveedor = '{C73B03E3-5C63-486F-A7DC-BE04B7E6ADFD}';
-  RID_PedidosProveedor_Detalles = '{0B034760-70AA-425B-90B2-1AA38AB853A0}';
+  RID_PedidosProveedor_Detalles = '{667B33D5-3D6D-42CB-B3C3-9F457A096632}';
-  RID_PedidosProveedor_Articulos_Pendientes = '{1F3E072E-DC0B-4112-8143-9D1A5B5308A0}';
+  RID_PedidosProveedor_Articulos_Pendientes = '{FB971448-F902-43CA-A8E5-9436043FBC5F}';
 
   { Data table names }
   nme_PedidosProveedor = 'PedidosProveedor';
@@ -163,7 +163,7 @@ const
 type
   { IPedidosProveedor }
   IPedidosProveedor = interface(IDAStronglyTypedDataTable)
-  ['{D1C7924F-2580-4890-A79B-447004B53DFC}']
+  ['{515217A3-BE4D-4E2F-B936-A2F9FC4B1D7A}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -702,7 +702,7 @@ type
 
   { IPedidosProveedor_Detalles }
   IPedidosProveedor_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{1F888592-BF9F-45C1-ACD2-42737A0B014C}']
+  ['{6B771F28-DF70-41D2-9948-515B7A48DAF3}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -917,7 +917,7 @@ type
 
   { IPedidosProveedor_Articulos_Pendientes }
   IPedidosProveedor_Articulos_Pendientes = interface(IDAStronglyTypedDataTable)
-  ['{186978BA-45ED-4A96-B7C2-FE934735D937}']
+  ['{14A36B92-488C-4ADB-8611-B1411470FBF9}']
     { Property getters and setters }
     function GetID_PEDIDOValue: Integer;
     procedure SetID_PEDIDOValue(const aValue: Integer);

Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorServer_Intf.pas

@@ -9,14 +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_PedidosProveedorDelta = '{DE5BDE2A-F485-42FF-A4F5-10C2257351A5}';
+  RID_PedidosProveedorDelta = '{6C7C036D-2572-42F5-97DA-3E5D61AB9411}';
-  RID_PedidosProveedor_DetallesDelta = '{F285279F-D471-4EBE-AEB2-820D2410DD07}';
+  RID_PedidosProveedor_DetallesDelta = '{D2DC8AD6-E572-4D22-83A4-B01887DC0D97}';
-  RID_PedidosProveedor_Articulos_PendientesDelta = '{2DE02310-A897-477C-8AE2-1ED5B72E0FC2}';
+  RID_PedidosProveedor_Articulos_PendientesDelta = '{7C16369F-51C4-440D-823E-A228CFE5B7EF}';
 
 type
   { IPedidosProveedorDelta }
   IPedidosProveedorDelta = interface(IPedidosProveedor)
-  ['{DE5BDE2A-F485-42FF-A4F5-10C2257351A5}']
+  ['{6C7C036D-2572-42F5-97DA-3E5D61AB9411}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -556,7 +556,7 @@ type
 
   { IPedidosProveedor_DetallesDelta }
   IPedidosProveedor_DetallesDelta = interface(IPedidosProveedor_Detalles)
-  ['{F285279F-D471-4EBE-AEB2-820D2410DD07}']
+  ['{D2DC8AD6-E572-4D22-83A4-B01887DC0D97}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_PEDIDOValue : Integer;
@@ -770,7 +770,7 @@ type
 
   { IPedidosProveedor_Articulos_PendientesDelta }
   IPedidosProveedor_Articulos_PendientesDelta = interface(IPedidosProveedor_Articulos_Pendientes)
-  ['{2DE02310-A897-477C-8AE2-1ED5B72E0FC2}']
+  ['{7C16369F-51C4-440D-823E-A228CFE5B7EF}']
     { Property getters and setters }
     function GetOldID_PEDIDOValue : Integer;
     function GetOldREFERENCIAValue : String;

Source/Modulos/Pedidos a proveedor/PedidosProveedor_Group.groupproj

@@ -17,12 +17,17 @@
     <Projects Include="..\Articulos\Model\Articulos_model.dproj" />
     <Projects Include="..\Articulos\Views\Articulos_view.dproj" />
     <Projects Include="..\Contactos\Views\Contactos_view.dproj" />
+    <Projects Include="..\Contratos de cliente\Views\ContratosCliente_view.dproj" />
+    <Projects Include="..\Facturas de proveedor\Controller\FacturasProveedor_controller.dproj" />
+    <Projects Include="..\Facturas de proveedor\Views\FacturasProveedor_view.dproj" />
     <Projects Include="..\Inventario\Controller\Inventario_controller.dproj" />
     <Projects Include="..\Inventario\Views\Inventario_view.dproj" />
+    <Projects Include="..\Presupuestos de cliente\Controller\PresupuestosCliente_controller.dproj" />
     <Projects Include="..\Presupuestos de cliente\Model\PresupuestosCliente_model.dproj" />
     <Projects Include="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" />
     <Projects Include="..\Relaciones\Pedidos de proveedor - Albaranes de proveedor\PedProv_AlbProv_relation.dproj" />
     <Projects Include="..\Relaciones\Presupuestos de cliente - Contratos de cliente\PreCli_ConCli_relation.dproj" />
+    <Projects Include="..\Tipos de operacion compra\Views\TiposOperacionCompra_view.dproj" />
     <Projects Include="Controller\PedidosProveedor_controller.dproj" />
     <Projects Include="Data\PedidosProveedor_data.dproj" />
     <Projects Include="Model\PedidosProveedor_model.dproj" />
@@ -251,14 +256,59 @@
   <Target Name="PresupuestosCliente_model:Make">
     <MSBuild Projects="..\Presupuestos de cliente\Model\PresupuestosCliente_model.dproj" Targets="Make" />
   </Target>
+  <Target Name="FacturasProveedor_view">
+    <MSBuild Projects="..\Facturas de proveedor\Views\FacturasProveedor_view.dproj" Targets="" />
+  </Target>
+  <Target Name="FacturasProveedor_view:Clean">
+    <MSBuild Projects="..\Facturas de proveedor\Views\FacturasProveedor_view.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="FacturasProveedor_view:Make">
+    <MSBuild Projects="..\Facturas de proveedor\Views\FacturasProveedor_view.dproj" Targets="Make" />
+  </Target>
+  <Target Name="FacturasProveedor_controller">
+    <MSBuild Projects="..\Facturas de proveedor\Controller\FacturasProveedor_controller.dproj" Targets="" />
+  </Target>
+  <Target Name="FacturasProveedor_controller:Clean">
+    <MSBuild Projects="..\Facturas de proveedor\Controller\FacturasProveedor_controller.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="FacturasProveedor_controller:Make">
+    <MSBuild Projects="..\Facturas de proveedor\Controller\FacturasProveedor_controller.dproj" Targets="Make" />
+  </Target>
+  <Target Name="TiposOperacionCompra_view">
+    <MSBuild Projects="..\Tipos de operacion compra\Views\TiposOperacionCompra_view.dproj" Targets="" />
+  </Target>
+  <Target Name="TiposOperacionCompra_view:Clean">
+    <MSBuild Projects="..\Tipos de operacion compra\Views\TiposOperacionCompra_view.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="TiposOperacionCompra_view:Make">
+    <MSBuild Projects="..\Tipos de operacion compra\Views\TiposOperacionCompra_view.dproj" Targets="Make" />
+  </Target>
+  <Target Name="ContratosCliente_view">
+    <MSBuild Projects="..\Contratos de cliente\Views\ContratosCliente_view.dproj" Targets="" />
+  </Target>
+  <Target Name="ContratosCliente_view:Clean">
+    <MSBuild Projects="..\Contratos de cliente\Views\ContratosCliente_view.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="ContratosCliente_view:Make">
+    <MSBuild Projects="..\Contratos de cliente\Views\ContratosCliente_view.dproj" Targets="Make" />
+  </Target>
+  <Target Name="PresupuestosCliente_controller">
+    <MSBuild Projects="..\Presupuestos de cliente\Controller\PresupuestosCliente_controller.dproj" Targets="" />
+  </Target>
+  <Target Name="PresupuestosCliente_controller:Clean">
+    <MSBuild Projects="..\Presupuestos de cliente\Controller\PresupuestosCliente_controller.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="PresupuestosCliente_controller:Make">
+    <MSBuild Projects="..\Presupuestos de cliente\Controller\PresupuestosCliente_controller.dproj" Targets="Make" />
+  </Target>
   <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_model;Articulos_data;Articulos_controller;Articulos_view;PedidosProveedor_model;PedidosProveedor_data;PedidosProveedor_controller;Inventario_controller;AlbaranesProveedor_controller;PedProv_AlbProv_relation;PedidosProveedor_view;PedidosProveedor_plugin;FactuGES;FactuGES_Server;PreCli_ConCli_relation;AlbaranesProveedor_view;AlbaranesProveedor_model;Inventario_view;PresupuestosCliente_view;PresupuestosCliente_model" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_model;Articulos_data;Articulos_controller;Articulos_view;PedidosProveedor_model;PedidosProveedor_data;PedidosProveedor_controller;Inventario_controller;AlbaranesProveedor_controller;PedProv_AlbProv_relation;PedidosProveedor_view;PedidosProveedor_plugin;FactuGES;FactuGES_Server;PreCli_ConCli_relation;AlbaranesProveedor_view;AlbaranesProveedor_model;Inventario_view;PresupuestosCliente_view;PresupuestosCliente_model;FacturasProveedor_view;FacturasProveedor_controller;TiposOperacionCompra_view;ContratosCliente_view;PresupuestosCliente_controller" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_model:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;PedidosProveedor_model:Clean;PedidosProveedor_data:Clean;PedidosProveedor_controller:Clean;Inventario_controller:Clean;AlbaranesProveedor_controller:Clean;PedProv_AlbProv_relation:Clean;PedidosProveedor_view:Clean;PedidosProveedor_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;PreCli_ConCli_relation:Clean;AlbaranesProveedor_view:Clean;AlbaranesProveedor_model:Clean;Inventario_view:Clean;PresupuestosCliente_view:Clean;PresupuestosCliente_model:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_model:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;PedidosProveedor_model:Clean;PedidosProveedor_data:Clean;PedidosProveedor_controller:Clean;Inventario_controller:Clean;AlbaranesProveedor_controller:Clean;PedProv_AlbProv_relation:Clean;PedidosProveedor_view:Clean;PedidosProveedor_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;PreCli_ConCli_relation:Clean;AlbaranesProveedor_view:Clean;AlbaranesProveedor_model:Clean;Inventario_view:Clean;PresupuestosCliente_view:Clean;PresupuestosCliente_model:Clean;FacturasProveedor_view:Clean;FacturasProveedor_controller:Clean;TiposOperacionCompra_view:Clean;ContratosCliente_view:Clean;PresupuestosCliente_controller:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_model:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;PedidosProveedor_model:Make;PedidosProveedor_data:Make;PedidosProveedor_controller:Make;Inventario_controller:Make;AlbaranesProveedor_controller:Make;PedProv_AlbProv_relation:Make;PedidosProveedor_view:Make;PedidosProveedor_plugin:Make;FactuGES:Make;FactuGES_Server:Make;PreCli_ConCli_relation:Make;AlbaranesProveedor_view:Make;AlbaranesProveedor_model:Make;Inventario_view:Make;PresupuestosCliente_view:Make;PresupuestosCliente_model:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_model:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;PedidosProveedor_model:Make;PedidosProveedor_data:Make;PedidosProveedor_controller:Make;Inventario_controller:Make;AlbaranesProveedor_controller:Make;PedProv_AlbProv_relation:Make;PedidosProveedor_view:Make;PedidosProveedor_plugin:Make;FactuGES:Make;FactuGES_Server:Make;PreCli_ConCli_relation:Make;AlbaranesProveedor_view:Make;AlbaranesProveedor_model:Make;Inventario_view:Make;PresupuestosCliente_view:Make;PresupuestosCliente_model:Make;FacturasProveedor_view:Make;FacturasProveedor_controller:Make;TiposOperacionCompra_view:Make;ContratosCliente_view:Make;PresupuestosCliente_controller:Make" />
   </Target>
   <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
 </Project>

Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.dfm

@@ -984,6 +984,12 @@ object srvPedidosProveedor: TsrvPedidosProveedor
             Name = 'ID_TIPO_IVA'
             DataType = datInteger
             Value = ''
+          end
+          item
+            Name = 'SITUACION'
+            DataType = datString
+            Size = 255
+            Value = ''
           end>
         Statements = <
           item
@@ -998,15 +1004,16 @@ object srvPedidosProveedor: TsrvPedidosProveedor
               '     TELEFONO, ID_CONTRATO_CLIENTE, IMPORTE_NETO, IMPORTE_PORTE,' +
               #10'     DESCUENTO, IMPORTE_DESCUENTO, BASE_IMPONIBLE, IVA,'#10'     IM' +
               'PORTE_IVA, ID_FORMA_PAGO, ID_TIENDA, ID_VENDEDOR,'#10'     ID_DIRECC' +
-              'ION, ID_TIPO_IVA)'#10'  VALUES'#10'    (:ID, :ID_EMPRESA, CURRENT_TIMEST' +
+              'ION, ID_TIPO_IVA, SITUACION)'#10'  VALUES'#10'    (:ID, :ID_EMPRESA, CUR' +
-              'AMP, :ID_PROVEEDOR,'#10'     :USUARIO, :OBSERVACIONES, :REFERENCIA, ' +
+              'RENT_TIMESTAMP, :ID_PROVEEDOR,'#10'     :USUARIO, :OBSERVACIONES, :R' +
-              ':FECHA_ENVIO,'#10'     :FECHA_PEDIDO, :FECHA_CONFIRMACION, :FECHA_EN' +
+              'EFERENCIA, :FECHA_ENVIO,'#10'     :FECHA_PEDIDO, :FECHA_CONFIRMACION' +
-              'TREGA, :INCIDENCIAS,'#10'     :IMPORTE_TOTAL, :INCIDENCIAS_ACTIVAS, ' +
+              ', :FECHA_ENTREGA, :INCIDENCIAS,'#10'     :IMPORTE_TOTAL, :INCIDENCIA' +
-              ':ID_ALMACEN, :CALLE,'#10'     :POBLACION, :PROVINCIA, :CODIGO_POSTAL' +
+              'S_ACTIVAS, :ID_ALMACEN, :CALLE,'#10'     :POBLACION, :PROVINCIA, :CO' +
-              ', :PERSONA_CONTACTO,'#10'     :TELEFONO, :ID_CONTRATO_CLIENTE, :IMPO' +
+              'DIGO_POSTAL, :PERSONA_CONTACTO,'#10'     :TELEFONO, :ID_CONTRATO_CLI' +
-              'RTE_NETO, :IMPORTE_PORTE,'#10'     :DESCUENTO, :IMPORTE_DESCUENTO, :' +
+              'ENTE, :IMPORTE_NETO, :IMPORTE_PORTE,'#10'     :DESCUENTO, :IMPORTE_D' +
-              'BASE_IMPONIBLE, :IVA,'#10'     :IMPORTE_IVA, :ID_FORMA_PAGO, :ID_TIE' +
+              'ESCUENTO, :BASE_IMPONIBLE, :IVA,'#10'     :IMPORTE_IVA, :ID_FORMA_PA' +
-              'NDA, :ID_VENDEDOR,'#10'     :ID_DIRECCION, :ID_TIPO_IVA)'#10#10'     '#10
+              'GO, :ID_TIENDA, :ID_VENDEDOR,'#10'     :ID_DIRECCION, :ID_TIPO_IVA, ' +
+              ':SITUACION)'#10#10'     '#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1182,6 +1189,12 @@ object srvPedidosProveedor: TsrvPedidosProveedor
             DataType = datInteger
             Value = ''
           end
+          item
+            Name = 'SITUACION'
+            DataType = datString
+            Size = 255
+            Value = ''
+          end
           item
             Name = 'OLD_ID'
             Value = ''
@@ -1208,8 +1221,8 @@ object srvPedidosProveedor: TsrvPedidosProveedor
               ' BASE_IMPONIBLE = :BASE_IMPONIBLE,'#10'    IVA = :IVA,'#10'    IMPORTE_I' +
               'VA = :IMPORTE_IVA,'#10'    ID_FORMA_PAGO = :ID_FORMA_PAGO,'#10'    ID_TI' +
               'ENDA = :ID_TIENDA,'#10'    ID_VENDEDOR = :ID_VENDEDOR,'#10'    ID_DIRECC' +
-              'ION = :ID_DIRECCION,'#10'    ID_TIPO_IVA = :ID_TIPO_IVA'#10'  WHERE'#10'    ' +
+              'ION = :ID_DIRECCION,'#10'    ID_TIPO_IVA = :ID_TIPO_IVA,'#10'    SITUACI' +
-              '(ID = :OLD_ID)'#10#10#10
+              'ON = :SITUACION'#10'  WHERE'#10'    (ID = :OLD_ID)'#10#10#10
             StatementType = stSQL
             ColumnMappings = <>
           end>

Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dproj

@@ -49,15 +49,27 @@
     <DelphiCompile Include="PedidosProveedor_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\Lib\Almacenes_controller.dcp" />
+    <DCCReference Include="adortl.dcp" />
-    <DCCReference Include="..\..\Lib\Almacenes_model.dcp" />
+    <DCCReference Include="Almacenes_controller.dcp" />
-    <DCCReference Include="..\..\Lib\Articulos_model.dcp" />
+    <DCCReference Include="Almacenes_model.dcp" />
-    <DCCReference Include="..\..\Lib\Articulos_view.dcp" />
+    <DCCReference Include="Articulos_model.dcp" />
-    <DCCReference Include="..\..\Lib\Contactos_view.dcp" />
+    <DCCReference Include="Articulos_view.dcp" />
-    <DCCReference Include="..\..\Lib\GUIBase.dcp" />
+    <DCCReference Include="Contactos_view.dcp" />
-    <DCCReference Include="..\..\Lib\PedidosProveedor_controller.dcp" />
+    <DCCReference Include="cxDataD11.dcp" />
-    <DCCReference Include="..\..\Lib\PedidosProveedor_model.dcp" />
+    <DCCReference Include="cxEditorsD11.dcp" />
-    <DCCReference Include="..\..\Lib\PedProv_AlbProv_relation.dcp" />
+    <DCCReference Include="cxLibraryD11.dcp" />
+    <DCCReference Include="DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="dbrtl.dcp" />
+    <DCCReference Include="dsnap.dcp" />
+    <DCCReference Include="dxCoreD11.dcp" />
+    <DCCReference Include="dxGDIPlusD11.dcp" />
+    <DCCReference Include="dxThemeD11.dcp" />
+    <DCCReference Include="GUIBase.dcp" />
+    <DCCReference Include="PedidosProveedor_controller.dcp" />
+    <DCCReference Include="PedidosProveedor_model.dcp" />
+    <DCCReference Include="PedProv_AlbProv_relation.dcp" />
+    <DCCReference Include="RemObjects_Core_D11.dcp" />
+    <DCCReference Include="rtl.dcp" />
     <DCCReference Include="uEditorDireccionEntregaPedidoProveedor.pas">
       <Form>fEditorDireccionEntregaPedidoProveedor </Form>
       <DesignClass>TfEditorDireccionEntregaPedidoProveedor</DesignClass>
@@ -70,6 +82,10 @@
       <Form>fEditorElegirPedidosProveedor</Form>
       <DesignClass>TForm</DesignClass>
     </DCCReference>
+    <DCCReference Include="uEditorElegirSituacionPedido.pas">
+      <Form>fEditorElegirSituacionPedido</Form>
+      <DesignClass>TfEditorSituacionPedidoProveedor</DesignClass>
+    </DCCReference>
     <DCCReference Include="uEditorPedidoProveedor.pas">
       <Form>fEditorPedidoProveedor</Form>
       <DesignClass>TfEditorPedidoProveedor</DesignClass>
@@ -107,6 +123,10 @@
       <Form>frViewPedidosProveedor</Form>
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
+    <DCCReference Include="vcl.dcp" />
+    <DCCReference Include="vcldb.dcp" />
+    <DCCReference Include="vcljpg.dcp" />
+    <DCCReference Include="vclx.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line

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

@@ -0,0 +1,96 @@
+object fEditorElegirSituacionPedido: TfEditorElegirSituacionPedido
+  Left = 0
+  Top = 0
+  BorderStyle = bsDialog
+  Caption = 'Cambio de situaci'#243'n'
+  ClientHeight = 124
+  ClientWidth = 377
+  Color = clWindow
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
+  OldCreateOrder = False
+  Position = poScreenCenter
+  PixelsPerInch = 96
+  TextHeight = 13
+  object Label1: TLabel
+    Left = 21
+    Top = 16
+    Width = 197
+    Height = 13
+    Caption = 'Seleccione la situaci'#243'n que desea asignar'
+  end
+  object combo: TLabel
+    Left = 58
+    Top = 45
+    Width = 47
+    Height = 13
+    Alignment = taRightJustify
+    Caption = 'Situaci'#243'n:'
+  end
+  object Panel1: TPanel
+    Left = 0
+    Top = 83
+    Width = 377
+    Height = 41
+    Align = alBottom
+    TabOrder = 0
+    DesignSize = (
+      377
+      41)
+    object bAceptar: TButton
+      Left = 213
+      Top = 8
+      Width = 75
+      Height = 25
+      Anchors = [akTop, akRight]
+      Caption = 'Aceptar'
+      ModalResult = 1
+      TabOrder = 0
+    end
+    object bCancelar: TButton
+      Left = 294
+      Top = 8
+      Width = 75
+      Height = 25
+      Anchors = [akTop, akRight]
+      Caption = 'Cancelar'
+      ModalResult = 2
+      TabOrder = 1
+    end
+  end
+  object cbSituacion: TcxImageComboBox
+    Left = 111
+    Top = 41
+    EditValue = 'PENDIENTE'
+    Properties.DefaultImageIndex = 0
+    Properties.Items = <
+      item
+        Description = 'PENDIENTE'
+        ImageIndex = 0
+        Value = 'PENDIENTE'
+      end
+      item
+        Description = 'PARCIAL'
+        Tag = 1
+        Value = 'PARCIAL'
+      end
+      item
+        Description = 'RECIBIDO'
+        Tag = 2
+        Value = 'RECIBIDO'
+      end>
+    Style.BorderColor = clWindowFrame
+    Style.BorderStyle = ebs3D
+    Style.LookAndFeel.NativeStyle = True
+    Style.ButtonStyle = bts3D
+    Style.PopupBorderStyle = epbsFrame3D
+    StyleDisabled.LookAndFeel.NativeStyle = True
+    StyleFocused.LookAndFeel.NativeStyle = True
+    StyleHot.LookAndFeel.NativeStyle = True
+    TabOrder = 1
+    Width = 224
+  end
+end

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

@@ -0,0 +1,39 @@
+unit uEditorElegirSituacionPedido;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, StdCtrls, cxControls, cxContainer, cxEdit, cxTextEdit, cxMaskEdit,
+  cxDropDownEdit, cxCalendar, ExtCtrls, uEditorBasico, cxGraphics, DB, uDAInterfaces,
+  uDADataTable, cxDBEdit, cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox,
+  cxImageComboBox;
+
+type
+  TfEditorElegirSituacionPedido = class(TfEditorBasico)
+    Label1: TLabel;
+    bAceptar: TButton;
+    bCancelar: TButton;
+    combo: TLabel;
+    Panel1: TPanel;
+    cbSituacion: TcxImageComboBox;
+
+  private
+    function GetSituacion: Variant;
+
+  public
+    property Situacion: Variant Read GetSituacion;
+
+  end;
+
+implementation
+{$R *.dfm}
+
+uses uFactuGES_App;
+
+function TfEditorElegirSituacionPedido.GetSituacion: Variant;
+begin
+  Result := cbSituacion.EditValue;
+end;
+
+end.

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

@@ -69,27 +69,27 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
       item
         Width = 200
       end>
-    ExplicitTop = 508
+    ExplicitTop = 523
     ExplicitWidth = 786
   end
   inherited pgPaginas: TPageControl
     Width = 780
     Height = 408
+    ActivePage = pagInicidencias
     TabOrder = 1
     OnChanging = pgPaginasChanging
     ExplicitTop = 112
     ExplicitWidth = 780
-    ExplicitHeight = 393
+    ExplicitHeight = 408
     inherited pagGeneral: TTabSheet
       ExplicitLeft = 4
       ExplicitTop = 24
       ExplicitWidth = 772
-      ExplicitHeight = 365
+      ExplicitHeight = 380
     end
     object pagContenido: TTabSheet
       Caption = 'Contenido'
       ImageIndex = 1
-      ExplicitHeight = 365
       inline frViewDetallesPedidoProveedor1: TfrViewDetallesPedidoProveedor
         Left = 0
         Top = 0
@@ -107,7 +107,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 772
-        ExplicitHeight = 365
+        ExplicitHeight = 380
         inherited ToolBar1: TToolBar
           Width = 772
           ExplicitWidth = 772
@@ -116,47 +116,47 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
             ExplicitWidth = 60
           end
           inherited UpDown1: TUpDown
-            Left = 257
+            Left = 239
-            ExplicitLeft = 257
+            ExplicitLeft = 239
           end
           inherited ToolButton13: TToolButton
-            Left = 274
+            Left = 256
-            ExplicitLeft = 274
+            ExplicitLeft = 256
           end
           inherited ToolButton6: TToolButton
-            Left = 282
+            Left = 264
-            ExplicitLeft = 282
+            ExplicitLeft = 264
           end
           inherited ToolButton7: TToolButton
-            Left = 316
+            Left = 298
-            ExplicitLeft = 316
+            ExplicitLeft = 298
           end
           inherited ToolButton8: TToolButton
-            Left = 350
+            Left = 332
-            ExplicitLeft = 350
+            ExplicitLeft = 332
           end
           inherited ToolButton12: TToolButton
-            Left = 384
+            Left = 366
-            ExplicitLeft = 384
+            ExplicitLeft = 366
           end
           inherited ToolButton9: TToolButton
-            Left = 392
+            Left = 374
-            ExplicitLeft = 392
+            ExplicitLeft = 374
           end
           inherited ToolButton10: TToolButton
-            Left = 426
+            Left = 408
-            ExplicitLeft = 426
+            ExplicitLeft = 408
           end
           inherited ToolButton11: TToolButton
-            Left = 460
+            Left = 442
-            ExplicitLeft = 460
+            ExplicitLeft = 442
           end
         end
         inherited cxGrid: TcxGrid
           Width = 772
           Height = 308
           ExplicitWidth = 772
-          ExplicitHeight = 293
+          ExplicitHeight = 308
           inherited cxGridView: TcxGridDBTableView
             inherited cxGridViewIMPORTENETO: TcxGridDBColumn
               Options.Editing = True
@@ -175,7 +175,6 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
     object pagInicidencias: TTabSheet
       Caption = 'Incidencias'
       ImageIndex = 2
-      ExplicitHeight = 365
       inline frViewIncidenciasProv: TfrViewIncidencias
         Left = 0
         Top = 0
@@ -191,7 +190,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 772
-        ExplicitHeight = 365
+        ExplicitHeight = 380
         inherited pnlSup: TPanel
           Width = 772
           ExplicitWidth = 772
@@ -203,10 +202,10 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
           Width = 772
           Height = 352
           ExplicitWidth = 772
-          ExplicitHeight = 337
+          ExplicitHeight = 352
           inherited eIncidencias: TcxDBMemo
             ExplicitWidth = 768
-            ExplicitHeight = 320
+            ExplicitHeight = 335
             Height = 335
             Width = 768
           end

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

@@ -5,7 +5,6 @@ inherited fEditorPedidosProveedor: TfEditorPedidosProveedor
   ClientWidth = 700
   Position = poDesigned
   ExplicitWidth = 708
-  ExplicitHeight = 482
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -55,12 +54,21 @@ inherited fEditorPedidosProveedor: TfEditorPedidosProveedor
       ExplicitWidth = 700
     end
     inherited TBXTMain2: TTBXToolbar
+      Left = 285
+      DockPos = 285
       Visible = True
-      ExplicitWidth = 121
+      ExplicitLeft = 285
+      ExplicitWidth = 282
       object TBXItem39: TTBXItem
         Action = actRecibirPedido
         DisplayMode = nbdmImageAndText
       end
+      object TBXSeparatorItem17: TTBXSeparatorItem
+      end
+      object TBXItem40: TTBXItem
+        Action = actCambiarSituacion
+        DisplayMode = nbdmImageAndText
+      end
     end
   end
   inherited StatusBar: TJvStatusBar
@@ -138,12 +146,24 @@ inherited fEditorPedidosProveedor: TfEditorPedidosProveedor
             Width = 240
           end
           inherited edtFechaFinFiltro: TcxDateEdit
-            Left = 349
+            Left = 371
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 349
+            ExplicitLeft = 371
+            ExplicitWidth = 294
+            Width = 294
+          end
+          inherited txtFiltroTodo2: TcxTextEdit
+            Left = 382
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 382
+            ExplicitWidth = 468
+            Width = 468
           end
         end
         inherited TBXAlignmentPanel1: TTBXAlignmentPanel
@@ -203,7 +223,7 @@ inherited fEditorPedidosProveedor: TfEditorPedidosProveedor
     end
     object actRecibirPedido: TAction
       Category = 'Acciones'
-      Caption = 'Recibir pedido'
+      Caption = 'Generar Albar'#225'n'
       ImageIndex = 23
       OnExecute = actRecibirPedidoExecute
       OnUpdate = actRecibirPedidoUpdate
@@ -215,6 +235,13 @@ inherited fEditorPedidosProveedor: TfEditorPedidosProveedor
       OnExecute = ActEnviarEMailExecute
       OnUpdate = ActEnviarEMailUpdate
     end
+    object actCambiarSituacion: TAction
+      Category = 'Acciones'
+      Caption = 'Cambio de situaci'#243'n'
+      ImageIndex = 23
+      OnExecute = actCambiarSituacionExecute
+      OnUpdate = actCambiarSituacionUpdate
+    end
   end
   inherited SmallImages: TPngImageList [5]
     PngImages = <

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

@@ -27,13 +27,17 @@ type
     JsListaPedidosNoEliminados: TJSDialog;
     TBXItem38: TTBXItem;
     ActEnviarEMail: TAction;
+    actCambiarSituacion: TAction;
+    TBXItem40: TTBXItem;
+    TBXSeparatorItem17: TTBXSeparatorItem;
     procedure FormShow(Sender: TObject);
-    procedure actCambiarSituacionExecute(Sender: TObject);
     procedure actRecibirPedidoUpdate(Sender: TObject);
     procedure actRecibirPedidoExecute(Sender: TObject);
     procedure actEliminarUpdate(Sender: TObject);
     procedure ActEnviarEMailExecute(Sender: TObject);
     procedure ActEnviarEMailUpdate(Sender: TObject);
+    procedure actCambiarSituacionUpdate(Sender: TObject);
+    procedure actCambiarSituacionExecute(Sender: TObject);
 
   protected
     FPedidos: IBizPedidoProveedor;
@@ -67,6 +71,7 @@ uses
   uDialogUtils, uGridUtils, uDBSelectionListUtils,
 //  uAlbaranesProveedorController, uBizAlbaranesProveedor,
 //  uGenerarPedidosProvUtils,
+  uEditorElegirSituacionPedido,
   uGenerarAlbaranesProvUtils, uBizDetallesPedidoProveedor;
 
 {$R *.dfm}
@@ -75,11 +80,44 @@ uses
 *************************** TfEditorPedidosProveedor ***************************
 }
 procedure TfEditorPedidosProveedor.actCambiarSituacionExecute(Sender: TObject);
+var
+  APedidos: IBizPedidoProveedor;
+  AEditor : TfEditorElegirSituacionPedido;
+  ASituacion : Variant;
+
 begin
-{
   inherited;
-  FController.CambiarSituacion(FPedidos)
+
-}
+  ViewGrid.SaveGridStatus;
+  try
+    SeleccionarFilasDesdeGrid(ViewGrid._FocusedView, (Pedidos as ISeleccionable).SelectedRecords);
+    APedidos := (Controller as IPedidosProveedorController).ExtraerSeleccionados(Pedidos) as IBizPedidoProveedor;
+  finally
+    ViewGrid.RestoreGridStatus;
+  end;
+
+  AEditor := TfEditorElegirSituacionPedido.Create(NIL);
+  try
+    if (AEditor.ShowModal = mrOk) then
+    begin
+      ASituacion := AEditor.Situacion;
+      if Controller.AsignarSituacion(ASituacion, APedidos) then
+         RefrescarInterno;
+    end;
+  finally
+    AEditor.Release;
+  end;
+end;
+
+procedure TfEditorPedidosProveedor.actCambiarSituacionUpdate(Sender: TObject);
+begin
+  inherited;
+  if HayDatos and Assigned(ViewGrid) then
+    (Sender as TAction).Enabled := not (dsDataTable.DataTable.State in dsEditModes)
+      and ViewGrid.esSeleccionCeldaDatos
+      and (ViewGrid.NumSeleccionados > 0)
+  else
+    (Sender as TAction).Enabled := False;
 end;
 
 procedure TfEditorPedidosProveedor.actEliminarUpdate(Sender: TObject);

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

@@ -16,20 +16,25 @@ inherited frViewDetallesPedidoProveedor: TfrViewDetallesPedidoProveedor
         DataBinding.FieldName = 'UNIDAD_MEDIDA'
       end
       inherited cxGridViewIMPORTEUNIDAD: TcxGridDBColumn
-        Properties.EditFormat = ',0.00 '#8364';-,0.00 '#8364
+        Properties.DecimalPlaces = 4
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
+        Properties.EditFormat = ',0.0000;-,0.0000'
       end
       inherited cxGridViewIMPORTENETO: TcxGridDBColumn
+        Properties.DecimalPlaces = 4
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
+        Properties.EditFormat = ',0.0000;-,0.0000'
         Properties.ReadOnly = False
       end
       inherited cxGridViewIMP_UNIDAD_DTO: TcxGridDBColumn
-        Properties.DecimalPlaces = 2
+        Properties.DecimalPlaces = 4
-        Properties.DisplayFormat = ',0.00 '#8364';-,0.00 '#8364
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
-        Properties.EditFormat = ',0.00 '#8364';-,0.00 '#8364
+        Properties.EditFormat = ',0.0000;-,0.0000'
       end
       inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn
-        Properties.DecimalPlaces = 2
+        Properties.DecimalPlaces = 4
-        Properties.DisplayFormat = ',0.00 '#8364';-,0.00 '#8364
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
-        Properties.EditFormat = ',0.00 '#8364';-,0.00 '#8364
+        Properties.EditFormat = ',0.0000;-,0.0000'
       end
     end
   end

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

@@ -10,10 +10,34 @@ inherited frViewElegirArticulosPedidosProveedor: TfrViewElegirArticulosPedidosPr
     ExplicitWidth = 565
     ExplicitHeight = 279
     inherited cxGridView: TcxGridDBTableView
+      inherited cxGridViewPRECIO_COSTE: TcxGridDBColumn
+        Caption = 'Precio material'
+        Properties.DecimalPlaces = 4
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
+        Properties.EditFormat = ',0.0000 '#8364';-,0.0000 '#8364
+        Options.Editing = False
+        VisibleForCustomization = False
+      end
       inherited cxGridViewDESCUENTO: TcxGridDBColumn
         Visible = True
       end
+      inherited cxGridViewPRECIO_NETO: TcxGridDBColumn
+        Caption = 'Precio coste'
+        Properties.DecimalPlaces = 4
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
+        Properties.EditFormat = ',0.0000 '#8364';-,0.0000 '#8364
+        Visible = True
+        Options.Editing = False
+      end
+      inherited cxGridViewPRECIO_PVP: TcxGridDBColumn
+        Properties.AssignedValues.EditFormat = True
+        Properties.DecimalPlaces = 4
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
+      end
       inherited cxGridViewPRECIOPVP2: TcxGridDBColumn
+        Properties.AssignedValues.EditFormat = True
+        Properties.DecimalPlaces = 4
+        Properties.DisplayFormat = ',0.0000 '#8364';-,0.0000 '#8364
         Visible = False
         VisibleForCustomization = False
       end
@@ -64,6 +88,14 @@ inherited frViewElegirArticulosPedidosProveedor: TfrViewElegirArticulosPedidosPr
           ExplicitWidth = 205
           Width = 205
         end
+        inherited txtFiltroTodo2: TcxTextEdit
+          Left = 283
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
+          ExplicitLeft = 283
+        end
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
         Width = 565

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

@@ -1,14 +1,14 @@
 inherited frViewPedidoProveedor: TfrViewPedidoProveedor
-  Width = 704
+  Width = 751
   Height = 467
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
-  ExplicitWidth = 704
+  ExplicitWidth = 751
   ExplicitHeight = 467
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 704
+    Width = 751
     Height = 467
     Align = alClient
     ParentBackground = True
@@ -16,10 +16,10 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
     TabStop = False
     AutoContentSizes = [acsWidth, acsHeight]
     DesignSize = (
-      704
+      751
       467)
     inline frViewProveedorPedido: TfrViewDatosYSeleccionProveedor
-      Left = 325
+      Left = 341
       Top = 28
       Width = 357
       Height = 215
@@ -29,9 +29,9 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 10
+      TabOrder = 11
       ReadOnly = False
-      ExplicitLeft = 325
+      ExplicitLeft = 341
       ExplicitTop = 28
       ExplicitWidth = 357
       ExplicitHeight = 215
@@ -82,18 +82,18 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
           Width = 283
         end
         inherited edtCodigoPostal: TcxDBTextEdit
-          Left = 276
+          Left = 307
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 276
+          ExplicitLeft = 307
           ExplicitWidth = 71
           Width = 71
         end
         inherited Button3: TBitBtn
-          Left = 149
+          Left = 180
-          ExplicitLeft = 149
+          ExplicitLeft = 180
         end
       end
     end
@@ -199,7 +199,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
     end
     inline frViewDireccionEntregaPedidoProv1: TfrViewDireccionEntregaPedidoProv
       Left = 22
-      Top = 279
+      Top = 306
       Width = 273
       Height = 166
       Font.Charset = DEFAULT_CHARSET
@@ -208,10 +208,10 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 9
+      TabOrder = 10
       ReadOnly = False
       ExplicitLeft = 22
-      ExplicitTop = 279
+      ExplicitTop = 306
       ExplicitWidth = 273
       ExplicitHeight = 166
       inherited dxLayoutControl1: TdxLayoutControl
@@ -236,10 +236,10 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
           Width = 238
         end
         inherited bModificar: TBitBtn
-          Left = 135
+          Left = 132
-          Top = 131
+          Top = 109
-          ExplicitLeft = 135
+          ExplicitLeft = 132
-          ExplicitTop = 131
+          ExplicitTop = 109
         end
         inherited txtDireccion: TStaticText
           Width = 238
@@ -292,7 +292,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       Width = 20
     end
     object bFormasPago: TButton
-      Left = 163
+      Left = 179
       Top = 82
       Width = 132
       Height = 21
@@ -353,7 +353,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       Width = 20
     end
     object Button1: TButton
-      Left = 163
+      Left = 179
       Top = 109
       Width = 132
       Height = 23
@@ -362,7 +362,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       TabOrder = 5
     end
     inline frViewTienda1: TfrViewTienda
-      Left = 325
+      Left = 341
       Top = 279
       Width = 357
       Height = 46
@@ -374,9 +374,9 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 11
+      TabOrder = 12
       ReadOnly = False
-      ExplicitLeft = 325
+      ExplicitLeft = 341
       ExplicitTop = 279
       ExplicitWidth = 357
       ExplicitHeight = 46
@@ -392,7 +392,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       end
     end
     inline frViewObservaciones1: TfrViewObservaciones
-      Left = 325
+      Left = 341
       Top = 361
       Width = 521
       Height = 150
@@ -402,15 +402,46 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 12
+      TabOrder = 13
       ReadOnly = False
-      ExplicitLeft = 325
+      ExplicitLeft = 341
       ExplicitTop = 361
       inherited memObservaciones: TcxDBMemo
         DataBinding.DataField = 'OBSERVACIONES'
         DataBinding.DataSource = DADataSource
       end
     end
+    object cbSituacion: TcxDBImageComboBox
+      Left = 137
+      Top = 249
+      DataBinding.DataField = 'SITUACION'
+      DataBinding.DataSource = DADataSource
+      Properties.ImmediatePost = True
+      Properties.Items = <
+        item
+          Description = 'PENDIENTE'
+          ImageIndex = 0
+          Value = 'PENDIENTE'
+        end
+        item
+          Description = 'PARCIAL'
+          Value = 'PARCIAL'
+        end
+        item
+          Description = 'RECIBIDO'
+          Value = 'RECIBIDO'
+        end>
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.LookAndFeel.NativeStyle = True
+      Style.ButtonStyle = bts3D
+      Style.PopupBorderStyle = epbsFrame3D
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 9
+      Width = 276
+    end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
@@ -504,6 +535,11 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
             Control = edtFechaEntrega
             ControlOptions.ShowBorder = False
           end
+          object dxLayoutControl1Item14: TdxLayoutItem
+            Caption = 'Situaci'#243'n:'
+            Control = cbSituacion
+            ControlOptions.ShowBorder = False
+          end
         end
         object dxLayoutControl1Group8: TdxLayoutGroup
           AutoAligns = []
@@ -572,7 +608,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
     Top = 40
   end
   object dsFormaPago: TDADataSource
-    Left = 56
+    Left = 24
     Top = 8
   end
   object ActionList1: TActionList