Tareas #794: SAcar en informe de facturas de proveedor un resumen por tipo de gasto como en el programa anterior

Tareas #798: En el informe de listado de iva facturas proveedor ver el irpf
Tareas #799: En las facturas de proveedor si se pone fecha de vencimiento que se genere un recibo con dicha fecha



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

Source/Base/Base.dproj

@@ -44,6 +44,13 @@
     <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>
@@ -58,55 +65,55 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Modulos\Recibos de cliente\adortl.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\cxDataD11.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\cxEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\cxExtEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\cxGridD11.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\cxLibraryD11.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\cxPageControlD11.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\dbrtl.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\dclIndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\designide.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\dsnap.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\dxPSCoreD11.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\dxThemeD11.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\GUISDK_D11R.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\IndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\IndyProtocols.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\IndySystem.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\Jcl.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\JclVcl.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\JSDialog100.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\JvCmpD11R.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\JvCoreD11R.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\JvDlgsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\JvMMD11R.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\JvNetD11R.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\JvSystemD11R.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\pckMD5.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\pckUCDataConnector.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\pckUserControl_RT.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\PluginSDK_D11R.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\PngComponentsD10.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\PNG_D10.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\rtl.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\TB2k_D10.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\tbx_d10.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\vcl.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\vclactnband.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\vcldb.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\vcljpg.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\VclSmp.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\vclx.dcp" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
+    <DCCReference Include="..\Servidor\adortl.dcp" />
+    <DCCReference Include="..\Servidor\cxDataD11.dcp" />
+    <DCCReference Include="..\Servidor\cxEditorsD11.dcp" />
+    <DCCReference Include="..\Servidor\cxExtEditorsD11.dcp" />
+    <DCCReference Include="..\Servidor\cxGridD11.dcp" />
+    <DCCReference Include="..\Servidor\cxLibraryD11.dcp" />
+    <DCCReference Include="..\Servidor\cxPageControlD11.dcp" />
+    <DCCReference Include="..\Servidor\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\Servidor\dbrtl.dcp" />
+    <DCCReference Include="..\Servidor\dclIndyCore.dcp" />
+    <DCCReference Include="..\Servidor\designide.dcp" />
+    <DCCReference Include="..\Servidor\dsnap.dcp" />
+    <DCCReference Include="..\Servidor\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\Servidor\dxPSCoreD11.dcp" />
+    <DCCReference Include="..\Servidor\dxThemeD11.dcp" />
+    <DCCReference Include="..\Servidor\GUISDK_D11R.dcp" />
+    <DCCReference Include="..\Servidor\IndyCore.dcp" />
+    <DCCReference Include="..\Servidor\IndyProtocols.dcp" />
+    <DCCReference Include="..\Servidor\IndySystem.dcp" />
+    <DCCReference Include="..\Servidor\Jcl.dcp" />
+    <DCCReference Include="..\Servidor\JclVcl.dcp" />
+    <DCCReference Include="..\Servidor\JSDialog100.dcp" />
+    <DCCReference Include="..\Servidor\JvCmpD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvCoreD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvDlgsD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvMMD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvNetD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\Servidor\JvSystemD11R.dcp" />
+    <DCCReference Include="..\Servidor\pckMD5.dcp" />
+    <DCCReference Include="..\Servidor\pckUCDataConnector.dcp" />
+    <DCCReference Include="..\Servidor\pckUserControl_RT.dcp" />
+    <DCCReference Include="..\Servidor\PluginSDK_D11R.dcp" />
+    <DCCReference Include="..\Servidor\PngComponentsD10.dcp" />
+    <DCCReference Include="..\Servidor\PNG_D10.dcp" />
+    <DCCReference Include="..\Servidor\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\Servidor\rtl.dcp" />
+    <DCCReference Include="..\Servidor\TB2k_D10.dcp" />
+    <DCCReference Include="..\Servidor\tbx_d10.dcp" />
+    <DCCReference Include="..\Servidor\vcl.dcp" />
+    <DCCReference Include="..\Servidor\vclactnband.dcp" />
+    <DCCReference Include="..\Servidor\vcldb.dcp" />
+    <DCCReference Include="..\Servidor\vcljpg.dcp" />
+    <DCCReference Include="..\Servidor\VclSmp.dcp" />
+    <DCCReference Include="..\Servidor\vclx.dcp" />
+    <DCCReference Include="..\Servidor\xmlrtl.dcp" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
       <DesignClass>TForm</DesignClass>

Source/Informes/InformeListadoFacturasRecibosCliente.fr3

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37800,8077143519" ReportOptions.Description.Text="" ReportOptions.LastChange="40946,6996157292" ScriptLanguage="PascalScript" ScriptText.Text="procedure mContinuaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FinalPass then&#13;&#10;  begin&#13;&#10;    if (&#60;Page#&#62; = &#60;TotalPages#&#62;) then&#13;&#10;    begin                      &#13;&#10;       mContinua.Visible := False;&#13;&#10;    end                 &#13;&#10;    else&#13;&#10;    begin                &#13;&#10;       mContinua.Visible := True;&#13;&#10;    end               &#13;&#10;  end;               &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end.  " ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C5000000020446174615365743D226672784442496E666F726D654C69737461646F46616374757261732220446174615365744E616D653D226672784442496E666F726D654C69737461646F46616374757261732200010C4E00000020446174615365743D226672784442496E666F726D654C69737461646F52656369626F732220446174615365744E616D653D226672784442496E666F726D654C69737461646F52656369626F73220000095661726961626C657301010C13000000204E616D653D2220506172616D6574726F732200010C17000000204E616D653D22546578746F506172616D6574726F73220000055374796C650100">
+<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37800,8077143519" ReportOptions.Description.Text="" ReportOptions.LastChange="40947,5609821065" ScriptLanguage="PascalScript" ScriptText.Text="procedure mContinuaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FinalPass then&#13;&#10;  begin&#13;&#10;    if (&#60;Page#&#62; = &#60;TotalPages#&#62;) then&#13;&#10;    begin                      &#13;&#10;       mContinua.Visible := False;&#13;&#10;    end                 &#13;&#10;    else&#13;&#10;    begin                &#13;&#10;       mContinua.Visible := True;&#13;&#10;    end               &#13;&#10;  end;               &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end.  " ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C5000000020446174615365743D226672784442496E666F726D654C69737461646F46616374757261732220446174615365744E616D653D226672784442496E666F726D654C69737461646F46616374757261732200010C4E00000020446174615365743D226672784442496E666F726D654C69737461646F52656369626F732220446174615365744E616D653D226672784442496E666F726D654C69737461646F52656369626F73220000095661726961626C657301010C13000000204E616D653D2220506172616D6574726F732200010C17000000204E616D653D22546578746F506172616D6574726F73220000055374796C650100">
   <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
   <TfrxReportPage Name="Page1" Orientation="poLandscape" PaperWidth="297" PaperHeight="210" PaperSize="9" LeftMargin="14,9992291666667" RightMargin="14,9992291666667" TopMargin="14,9992291666667" BottomMargin="19,9998541666667" Columns="2" ColumnWidth="133,5008125" ColumnPositions.Text="0&#13;&#10;133,50" HGuides.Text="" VGuides.Text="">
     <TfrxPageHeader Name="Band1" Height="136,10235" Left="0" Top="16" Width="1009,14033677542" OnBeforePrint="Band1OnBeforePrint">
@@ -47,7 +47,7 @@
       <TfrxMemoView Name="Memo9" Align="baLeft" Left="0" Top="25,22047" Width="120" Height="15" ShowHint="False" Color="13556733" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Nº recibo"/>
       <TfrxMemoView Name="Memo10" Align="baLeft" Left="410" Top="25,22047" Width="90" Height="15" ShowHint="False" Color="13556733" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe total"/>
       <TfrxMemoView Name="Memo11" Align="baLeft" Left="120" Top="25,22047" Width="95" Height="15" ShowHint="False" Color="13556733" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Fecha emisión"/>
-      <TfrxMemoView Name="Memo12" Align="baLeft" Left="0" Top="4" Width="485,37013" Height="15,11811024" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" ParentFont="False" Text="Facturas de [frxDBInformeListadoRecibos.&#34;NOMBRE_CLIENTE&#34;]"/>
+      <TfrxMemoView Name="Memo12" Align="baLeft" Left="0" Top="4" Width="485,37013" Height="15,11811024" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" ParentFont="False" Text="Recibos de [frxDBInformeListadoRecibos.&#34;NOMBRE_CLIENTE&#34;]"/>
       <TfrxMemoView Name="Memo13" Align="baLeft" Left="320" Top="25,22047" Width="90" Height="15" ShowHint="False" Color="13556733" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Situación"/>
       <TfrxMemoView Name="Memo24" Align="baLeft" Left="215" Top="25" Width="105" Height="15" ShowHint="False" Color="13556733" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Fecha vencimiento"/>
     </TfrxGroupHeader>
@@ -55,9 +55,9 @@
       <TfrxMemoView Name="Memo17" Align="baLeft" Left="0" Top="0" Width="400" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="13556733" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="13" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="TOTAL :"/>
       <TfrxMemoView Name="Memo19" Align="baLeft" Left="400" Top="0" Width="100" Height="16" Restrictions="2" ShowHint="False" StretchMode="smMaxHeight" Color="13556733" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="14" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoRecibos.&#34;IMPORTE_TOTAL&#34;&#62;,MasterData1)]"/>
     </TfrxGroupFooter>
-    <TfrxFooter Name="Footer1" Height="38" Left="0" Top="151" Width="718,1107">
+    <TfrxFooter Name="Footer1" Height="23" Left="0" Top="151" Width="718,1107">
-      <TfrxMemoView Name="Memo20" Align="baLeft" Left="410" Top="18" Width="90" Height="16" ShowHint="False" DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Arial" Font.Style="1" HAlign="haRight" ParentFont="False" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1) - SUM(&#60;frxDBInformeListadoRecibos.&#34;IMPORTE_TOTAL&#34;&#62;,MasterData1)]"/>
+      <TfrxMemoView Name="Memo20" Align="baLeft" Left="410" Top="3" Width="90" Height="16" ShowHint="False" DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Arial" Font.Style="1" HAlign="haRight" ParentFont="False" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1) - SUM(&#60;frxDBInformeListadoRecibos.&#34;IMPORTE_TOTAL&#34;&#62;,MasterData1)]"/>
-      <TfrxMemoView Name="Memo23" Align="baLeft" Left="0" Top="18" Width="410" Height="16" ShowHint="False" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Arial" Font.Style="1" HAlign="haRight" ParentFont="False" Text="El importe pendiente del cliente es: "/>
+      <TfrxMemoView Name="Memo23" Align="baLeft" Left="0" Top="3" Width="410" Height="16" ShowHint="False" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Arial" Font.Style="1" HAlign="haRight" ParentFont="False" Text="El importe pendiente del cliente es: "/>
     </TfrxFooter>
   </TfrxReportPage>
 </TfrxReport>

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

@@ -631,6 +631,7 @@ begin
       REFERENCIA := ''; //Para que se asigne una nueva
       SITUACION := CTE_PENDIENTE; //Una factura nueva debe estar pendiente
       FECHA_FACTURA := DateOf(Now);
+      FECHA_VENCIMIENTO := DateOf(Now);      
 
 {$IFDEF CONTABILIDAD}
       ID_EJERCICIO := AppFactuGES.EjercicioActivo.ID;
@@ -700,7 +701,7 @@ begin
 
   //De esta forma obligaremos siempre a tener un recibo asociado a la factura,
   //porque si la forma de pago no tiene plazos es obligatorio la fecha de vencimiento
-{  with TFormasPagoController.Create do
+  with TFormasPagoController.Create do
   begin
     try
       AFormaPago := Buscar(AFactura.ID_FORMA_PAGO);
@@ -713,7 +714,7 @@ begin
       Free;
     end;
   end;
-}
+
   //En caso de ser un Abono no podra tener un importe total positivo
   if (AFactura.TIPO = CTE_TIPO_ABONO) then
     if (AFactura.IMPORTE_TOTAL >= 0) then
@@ -1260,8 +1261,6 @@ begin
   AFormasPagoController := TFormasPagoController.Create;
   AFormaPago := AFormasPagoController.Buscar(AFactura.ID_FORMA_PAGO);
   AFormaPago.DataTable.Active := True;
-  if AFormaPago.Plazos.RecordCount = 0 then
-     Exit; //No hay plazos en la forma de pago en la factura y por lo tanto no se generan recibos
 
   ARecibosProveedorController := TRecibosProveedorController.Create;
   //Eliminamos todos los recibos que tuviera la factura porque sabemos que todos

Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas

@@ -3,17 +3,17 @@ unit schFacturasProveedorClient_Intf;
 interface
 
 uses
-  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
 
 const
   { Data table rules ids
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_ListaAnosFacturas = '{C7DA1898-B917-4186-82B9-EF7F3688C121}';
+  RID_ListaAnosFacturas = '{772E3A80-73F5-425A-8F80-2DA4BA6889CE}';
-  RID_FacturasProveedor_Contratos = '{3BA8F2FD-0730-4766-B593-D8B413B5905B}';
+  RID_FacturasProveedor_Contratos = '{DE5C1077-9860-424E-895B-C6348ACCA4DB}';
-  RID_TiposFacturaProveedor = '{99A70923-CC81-401B-A06C-3AEFA31F1956}';
+  RID_TiposFacturaProveedor = '{67B410B2-667E-4EB4-B78D-CBD675A717BD}';
-  RID_FacturasProveedor = '{703B7E51-6194-4F69-B9BC-849C4821B81B}';
+  RID_FacturasProveedor = '{D4BA7205-7758-40CB-934A-3DD2238AC1B1}';
-  RID_FacturasProveedor_Detalles = '{355A9F5B-B76A-4ED7-AD99-723ECC24197E}';
+  RID_FacturasProveedor_Detalles = '{01304CD4-713A-442B-A701-8B37BA847E7C}';
 
   { Data table names }
   nme_ListaAnosFacturas = 'ListaAnosFacturas';
@@ -183,7 +183,7 @@ const
 type
   { IListaAnosFacturas }
   IListaAnosFacturas = interface(IDAStronglyTypedDataTable)
-  ['{39519A2A-11BC-4AFA-B812-3055340CAE84}']
+  ['{B368FF8D-1FFD-47E0-AE16-C42B17DDFAA1}']
     { Property getters and setters }
     function GetANOValue: String;
     procedure SetANOValue(const aValue: String);
@@ -197,7 +197,7 @@ type
   end;
 
   { TListaAnosFacturasDataTableRules }
-  TListaAnosFacturasDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosFacturas)
+  TListaAnosFacturasDataTableRules = class(TDADataTableRules, IListaAnosFacturas)
   private
   protected
     { Property getters and setters }
@@ -218,7 +218,7 @@ type
 
   { IFacturasProveedor_Contratos }
   IFacturasProveedor_Contratos = interface(IDAStronglyTypedDataTable)
-  ['{42B0326B-8965-4E74-AC91-64D82C5ABCAA}']
+  ['{D2ECFD06-1A26-4A80-8334-1DF7DBB1824B}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -268,7 +268,7 @@ type
   end;
 
   { TFacturasProveedor_ContratosDataTableRules }
-  TFacturasProveedor_ContratosDataTableRules = class(TIntfObjectDADataTableRules, IFacturasProveedor_Contratos)
+  TFacturasProveedor_ContratosDataTableRules = class(TDADataTableRules, IFacturasProveedor_Contratos)
   private
   protected
     { Property getters and setters }
@@ -325,7 +325,7 @@ type
 
   { ITiposFacturaProveedor }
   ITiposFacturaProveedor = interface(IDAStronglyTypedDataTable)
-  ['{940D609C-16AA-442E-84A1-6C0181D4F10D}']
+  ['{C16445EE-8D36-4166-97C6-045FE267548E}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -345,7 +345,7 @@ type
   end;
 
   { TTiposFacturaProveedorDataTableRules }
-  TTiposFacturaProveedorDataTableRules = class(TIntfObjectDADataTableRules, ITiposFacturaProveedor)
+  TTiposFacturaProveedorDataTableRules = class(TDADataTableRules, ITiposFacturaProveedor)
   private
   protected
     { Property getters and setters }
@@ -372,7 +372,7 @@ type
 
   { IFacturasProveedor }
   IFacturasProveedor = interface(IDAStronglyTypedDataTable)
-  ['{07C8CFF1-8C44-4C84-9171-83E0C9AF81FE}']
+  ['{689FC1AA-5A56-4ABC-AFB2-984B5749E875}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -649,7 +649,7 @@ type
   end;
 
   { TFacturasProveedorDataTableRules }
-  TFacturasProveedorDataTableRules = class(TIntfObjectDADataTableRules, IFacturasProveedor)
+  TFacturasProveedorDataTableRules = class(TDADataTableRules, IFacturasProveedor)
   private
     f_OBSERVACIONES: IROStrings;
     procedure OBSERVACIONES_OnChange(Sender: TObject);
@@ -935,7 +935,7 @@ type
 
   { IFacturasProveedor_Detalles }
   IFacturasProveedor_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{97EF127B-7478-45C9-B15F-832618C17F19}']
+  ['{6001EDD7-2FD3-46B9-A5D4-7E90AD339EC0}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1027,7 +1027,7 @@ type
   end;
 
   { TFacturasProveedor_DetallesDataTableRules }
-  TFacturasProveedor_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IFacturasProveedor_Detalles)
+  TFacturasProveedor_DetallesDataTableRules = class(TDADataTableRules, IFacturasProveedor_Detalles)
   private
   protected
     { Property getters and setters }

Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas

@@ -9,16 +9,16 @@ 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 = '{B5BAE581-991C-4B73-9455-984D9A5AB62B}';
+  RID_ListaAnosFacturasDelta = '{5E2C03E7-40F8-4863-B08C-2946B58596A3}';
-  RID_FacturasProveedor_ContratosDelta = '{F3AA3D9B-47DB-4B66-914C-ADF42111EAFB}';
+  RID_FacturasProveedor_ContratosDelta = '{62B5396F-4A08-443D-8B7F-974267E456A5}';
-  RID_TiposFacturaProveedorDelta = '{72320F2D-F96B-42D2-8046-226C5F0CFF90}';
+  RID_TiposFacturaProveedorDelta = '{EA8E5C49-5AE7-496F-B4FA-9680EAC18C03}';
-  RID_FacturasProveedorDelta = '{56EEC02F-6B35-4538-A885-E3FD6408F13B}';
+  RID_FacturasProveedorDelta = '{64C30025-CE2E-4DDC-8684-E0E7B5552C00}';
-  RID_FacturasProveedor_DetallesDelta = '{918408EE-23B5-4145-B189-D7B8CC62E7F6}';
+  RID_FacturasProveedor_DetallesDelta = '{05C62271-95BD-4275-B16B-3E75CD24CB3F}';
 
 type
   { IListaAnosFacturasDelta }
   IListaAnosFacturasDelta = interface(IListaAnosFacturas)
-  ['{B5BAE581-991C-4B73-9455-984D9A5AB62B}']
+  ['{5E2C03E7-40F8-4863-B08C-2946B58596A3}']
     { Property getters and setters }
     function GetOldANOValue : String;
 
@@ -52,7 +52,7 @@ type
 
   { IFacturasProveedor_ContratosDelta }
   IFacturasProveedor_ContratosDelta = interface(IFacturasProveedor_Contratos)
-  ['{F3AA3D9B-47DB-4B66-914C-ADF42111EAFB}']
+  ['{62B5396F-4A08-443D-8B7F-974267E456A5}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_FACTURAValue : Integer;
@@ -158,7 +158,7 @@ type
 
   { ITiposFacturaProveedorDelta }
   ITiposFacturaProveedorDelta = interface(ITiposFacturaProveedor)
-  ['{72320F2D-F96B-42D2-8046-226C5F0CFF90}']
+  ['{EA8E5C49-5AE7-496F-B4FA-9680EAC18C03}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -204,7 +204,7 @@ type
 
   { IFacturasProveedorDelta }
   IFacturasProveedorDelta = interface(IFacturasProveedor)
-  ['{56EEC02F-6B35-4538-A885-E3FD6408F13B}']
+  ['{64C30025-CE2E-4DDC-8684-E0E7B5552C00}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -767,7 +767,7 @@ type
 
   { IFacturasProveedor_DetallesDelta }
   IFacturasProveedor_DetallesDelta = interface(IFacturasProveedor_Detalles)
-  ['{918408EE-23B5-4145-B189-D7B8CC62E7F6}']
+  ['{05C62271-95BD-4275-B16B-3E75CD24CB3F}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_FACTURAValue : Integer;

Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas

@@ -14,6 +14,7 @@ const
   CTE_TIPO_FACTURA = 'F';
 
   CTE_PENDIENTE = 'PENDIENTE';
+  CTE_PARCIAMENTE_PAGADA = 'PARCIALMENTE PAGADA';  
   CTE_PAGADA = 'PAGADA';
 
 type
@@ -298,6 +299,7 @@ begin
   ID_EMPRESA := AppFactuGES.EmpresaActiva.ID;
   USUARIO := AppFactuGES.UsuarioActivo.UserName;
   FECHA_FACTURA := DateOf(Now);
+  FECHA_VENCIMIENTO := DateOf(Now);
   ID_PROVEEDOR := ID_NULO;
   TIPO := CTE_TIPO_FACTURA;
 
@@ -305,7 +307,7 @@ begin
   ID_TIPO_IVA := AppFactuGES.EmpresaActiva.ID_TIPO_IVA;
   
   RE := 0;
-  SITUACION := CTE_PENDIENTE;
+//  SITUACION := CTE_PENDIENTE;
   ID_TIENDA := AppFactuGES.TiendaActiva.ID;
   TIENDA := AppFactuGES.TiendaActiva.NOMBRE;
 

Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.dfm

@@ -3,7 +3,7 @@ object RptFacturasProveedor: TRptFacturasProveedor
   OnCreate = DataModuleCreate
   OnDestroy = DataModuleDestroy
   Height = 405
-  Width = 763
+  Width = 837
   object frxRichObject1: TfrxRichObject
     Left = 48
     Top = 296
@@ -49,10 +49,11 @@ object RptFacturasProveedor: TRptFacturasProveedor
               'select V_facturas_proveedor.ID_EMPRESA,'#10'contactos.REFERENCIA,'#10'co' +
               'ntactos.nif_cif,'#10'contactos.poblacion,'#10'V_facturas_proveedor.NOMBR' +
               'E,'#10'sum(V_facturas_proveedor.BASE_IMPONIBLE) as BASE_IMPONIBLE,'#10's' +
-              'um(V_facturas_proveedor.IMPORTE_IVA) as IMPORTE_IVA,'#10'sum(V_factu' +
+              'um(V_facturas_proveedor.IMPORTE_IRPF) as IMPORTE_IRPF,'#10'sum(V_fac' +
-              'ras_proveedor.IMPORTE_TOTAL) AS IMPORTE_TOTAL'#10'from V_facturas_pr' +
+              'turas_proveedor.IMPORTE_IVA) as IMPORTE_IVA,'#10'sum(V_facturas_prov' +
-              'oveedor'#10'left join contactos on (contactos.ID = V_facturas_provee' +
+              'eedor.IMPORTE_TOTAL) AS IMPORTE_TOTAL'#10'from V_facturas_proveedor'#10 +
-              'dor.ID_PROVEEDOR)'#10'group by 1,2,3,4,5'#10'order by 1,5,2,3,4'#10
+              'left join contactos on (contactos.ID = V_facturas_proveedor.ID_P' +
+              'ROVEEDOR)'#10'group by 1,2,3,4,5'#10'order by 1,5,2,3,4'#10
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -86,6 +87,10 @@ object RptFacturasProveedor: TRptFacturasProveedor
               item
                 DatasetField = 'REFERENCIA'
                 TableField = 'REFERENCIA'
+              end
+              item
+                DatasetField = 'IMPORTE_IRPF'
+                TableField = 'IMPORTE_IRPF'
               end>
           end>
         Name = 'ListadoFacturasProveedorResumen'
@@ -118,6 +123,10 @@ object RptFacturasProveedor: TRptFacturasProveedor
             Name = 'BASE_IMPONIBLE'
             DataType = datCurrency
           end
+          item
+            Name = 'IMPORTE_IRPF'
+            DataType = datCurrency
+          end
           item
             Name = 'IMPORTE_IVA'
             DataType = datCurrency
@@ -156,9 +165,9 @@ object RptFacturasProveedor: TRptFacturasProveedor
               'fecha_factura) = 12 then '#39'DICIEMBRE - '#39' || extract (year from fe' +
               'cha_factura)'#10'end as TITULO,'#10'REFERENCIA, REFERENCIA_PROVEEDOR, ID' +
               '_PROVEEDOR, REF_PROVEEDOR, NOMBRE, SITUACION, NIF_CIF,'#10'FECHA_FAC' +
-              'TURA, FECHA_VENCIMIENTO, BASE_IMPONIBLE, IMPORTE_IVA, IMPORTE_TO' +
+              'TURA, FECHA_VENCIMIENTO, BASE_IMPONIBLE, IVA, IMPORTE_IVA, IRPF,' +
-              'TAL'#10#10'from V_facturas_proveedor'#10'where {where}'#10'order by ANO, MES, ' +
+              ' IMPORTE_IRPF, IMPORTE_TOTAL'#10#10'from V_facturas_proveedor'#10'where {w' +
-              'FECHA_FACTURA, NOMBRE'#10#10
+              'here}'#10'order by ANO, MES, FECHA_FACTURA, NOMBRE'#10#10
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -227,6 +236,18 @@ object RptFacturasProveedor: TRptFacturasProveedor
               item
                 DatasetField = 'REF_PROVEEDOR'
                 TableField = 'REF_PROVEEDOR'
+              end
+              item
+                DatasetField = 'IVA'
+                TableField = 'IVA'
+              end
+              item
+                DatasetField = 'IRPF'
+                TableField = 'IRPF'
+              end
+              item
+                DatasetField = 'IMPORTE_IRPF'
+                TableField = 'IMPORTE_IRPF'
               end>
           end>
         Name = 'ListadoFacturasProveedor'
@@ -275,7 +296,7 @@ object RptFacturasProveedor: TRptFacturasProveedor
           item
             Name = 'SITUACION'
             DataType = datString
-            Size = 19
+            Size = 255
           end
           item
             Name = 'NIF_CIF'
@@ -294,6 +315,90 @@ object RptFacturasProveedor: TRptFacturasProveedor
             Name = 'BASE_IMPONIBLE'
             DataType = datCurrency
           end
+          item
+            Name = 'IVA'
+            DataType = datFloat
+          end
+          item
+            Name = 'IMPORTE_IVA'
+            DataType = datCurrency
+          end
+          item
+            Name = 'IRPF'
+            DataType = datFloat
+          end
+          item
+            Name = 'IMPORTE_IRPF'
+            DataType = datCurrency
+          end
+          item
+            Name = 'IMPORTE_TOTAL'
+            DataType = datCurrency
+          end>
+      end
+      item
+        Params = <>
+        Statements = <
+          item
+            Connection = 'IBX'
+            ConnectionType = 'Interbase'
+            Default = True
+            TargetTable = 'v_facturas_proveedor'
+            SQL = 
+              'select V_facturas_proveedor.ID_EMPRESA,'#10'coalesce(T.DESCRIPCION, ' +
+              #39'Sin asignar'#39') as DESCRIPCION,'#10'sum(V_facturas_proveedor.BASE_IMP' +
+              'ONIBLE) as BASE_IMPONIBLE,'#10'sum(V_facturas_proveedor.IMPORTE_IRPF' +
+              ') as IMPORTE_IRPF,'#10'sum(V_facturas_proveedor.IMPORTE_IVA) as IMPO' +
+              'RTE_IVA,'#10'sum(V_facturas_proveedor.IMPORTE_TOTAL) AS IMPORTE_TOTA' +
+              'L'#10'from V_facturas_proveedor'#10'left join tipos_factura_proveedor T ' +
+              'on (T.ID = V_facturas_proveedor.ID_TIPO_FACTURA)'#10'group by 1,2'#10'or' +
+              'der by 1,2'#10
+            StatementType = stSQL
+            ColumnMappings = <
+              item
+                DatasetField = 'ID_EMPRESA'
+                TableField = 'ID_EMPRESA'
+              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
+              item
+                DatasetField = 'IMPORTE_IRPF'
+                TableField = 'IMPORTE_IRPF'
+              end
+              item
+                DatasetField = 'DESCRIPCION'
+                TableField = 'DESCRIPCION'
+              end>
+          end>
+        Name = 'ListadoFacturasProveedorTipoResumen'
+        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_IRPF'
+            DataType = datCurrency
+          end
           item
             Name = 'IMPORTE_IVA'
             DataType = datCurrency
@@ -516,7 +621,7 @@ object RptFacturasProveedor: TRptFacturasProveedor
     PrintOptions.Printer = 'Por defecto'
     PrintOptions.PrintOnSheet = 0
     ReportOptions.CreateDate = 37800.807714351900000000
-    ReportOptions.LastChange = 40945.691024224540000000
+    ReportOptions.LastChange = 40947.762142453710000000
     ScriptLanguage = 'PascalScript'
     ShowProgress = False
     StoreInDFM = False
@@ -571,7 +676,7 @@ object RptFacturasProveedor: TRptFacturasProveedor
       item
         Name = 'SITUACION'
         DataType = datString
-        Size = 19
+        Size = 255
       end
       item
         Name = 'NIF_CIF'
@@ -590,10 +695,22 @@ object RptFacturasProveedor: TRptFacturasProveedor
         Name = 'BASE_IMPONIBLE'
         DataType = datCurrency
       end
+      item
+        Name = 'IVA'
+        DataType = datFloat
+      end
       item
         Name = 'IMPORTE_IVA'
         DataType = datCurrency
       end
+      item
+        Name = 'IRPF'
+        DataType = datFloat
+      end
+      item
+        Name = 'IMPORTE_IRPF'
+        DataType = datCurrency
+      end
       item
         Name = 'IMPORTE_TOTAL'
         DataType = datCurrency
@@ -653,4 +770,30 @@ object RptFacturasProveedor: TRptFacturasProveedor
     Left = 648
     Top = 136
   end
+  object frxDBInformeListadoFacturasTipoResumen: TfrxDBDataset
+    UserName = 'frxDBInformeListadoFacturasTipoResumen'
+    CloseDataSource = True
+    DataSource = DADSInformeListadoFacturasTipoResumen
+    BCDToCurrency = False
+    Left = 648
+    Top = 192
+  end
+  object DADSInformeListadoFacturasTipoResumen: TDADataSource
+    DataSet = tbl_InformeListadoFacturasTipoResumen.Dataset
+    DataTable = tbl_InformeListadoFacturasTipoResumen
+    Left = 648
+    Top = 248
+  end
+  object tbl_InformeListadoFacturasTipoResumen: TDAMemDataTable
+    RemoteUpdatesOptions = []
+    Fields = <>
+    Params = <>
+    MasterMappingMode = mmDataRequest
+    LogChanges = False
+    StreamingOptions = [soDisableEventsWhileStreaming]
+    RemoteFetchEnabled = False
+    IndexDefs = <>
+    Left = 648
+    Top = 304
+  end
 end

Source/Modulos/Facturas de proveedor/Reports/uRptFacturasProveedor_Server.pas

@@ -27,6 +27,9 @@ type
     frxDBInformeListadoFacturasResumen: TfrxDBDataset;
     DADSInformeListadoFacturasResumen: TDADataSource;
     tbl_InformeListadoFacturasResumen: TDAMemDataTable;
+    frxDBInformeListadoFacturasTipoResumen: TfrxDBDataset;
+    DADSInformeListadoFacturasTipoResumen: TDADataSource;
+    tbl_InformeListadoFacturasTipoResumen: TDAMemDataTable;
     schReport: TDASchema;
     DataDictionary: TDADataDictionary;
     procedure DataModuleCreate(Sender: TObject);
@@ -73,6 +76,7 @@ const
   rptInformeListadoFactuasProveedorPendiente = 'InformeListadoFacturasProveedorPendientes.fr3';
   rptInformeListadoFactuasProveedorPendienteDesglosado = 'InformeListadoFacturasProveedorPendientesDesglosado.fr3';
   ds_InformeListadoFacturasResumen = 'ListadoFacturasProveedorResumen';
+  ds_InformeListadoFacturasTipoResumen = 'ListadoFacturasProveedorTipoResumen';  
 
 
 { TRptFacturasProveedor }
@@ -128,16 +132,24 @@ begin
     //Se prepara la tabla del listado resumen del informe
     if tbl_InformeListadoFacturasResumen.Active then
        tbl_InformeListadoFacturasResumen.Active := False;
-
     dsMaster := schReport.NewDataset(FConnection, ds_InformeListadoFacturasResumen, [], [], 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_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 PROVEEDOR EN ESTE INFORME NO SE DESGLOSARÁ POR PROVEEDOR
     if FDesglosado then
        ATipoInforme := rptInformeIVADesglosado
@@ -147,6 +159,7 @@ begin
     //Finalmente se abren las tablas del informe
     tbl_InformeListadoFacturas.Active := True;
     tbl_InformeListadoFacturasResumen.Active := True;
+    tbl_InformeListadoFacturasTipoResumen.Active := True;
 
     Result := _GenerarInforme(ATipoInforme);
 

Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm

@@ -1008,12 +1008,6 @@ object srvFacturasProveedor: TsrvFacturasProveedor
             Name = 'ID_TIPO_FACTURA'
             DataType = datInteger
             Value = ''
-          end
-          item
-            Name = 'SITUACION'
-            DataType = datString
-            Size = 255
-            Value = ''
           end>
         Statements = <
           item
@@ -1029,16 +1023,16 @@ object srvFacturasProveedor: TsrvFacturasProveedor
               ', PROVINCIA, CODIGO_POSTAL, '#10'     FECHA_ALTA, FECHA_MODIFICACION' +
               ', USUARIO, ID_FORMA_PAGO, '#10'     RECARGO_EQUIVALENCIA, ID_TIPO_IV' +
               'A, IMPORTE_NETO, IMPORTE_PORTE, IGNORAR_CONTABILIDAD,'#10'     ID_TI' +
-              'ENDA, ID_TIPO_FACTURA, SITUACION)'#10'  VALUES'#10'    (:ID, :ID_EMPRESA' +
+              'ENDA, ID_TIPO_FACTURA)'#10'  VALUES'#10'    (:ID, :ID_EMPRESA, :REFERENC' +
-              ', :REFERENCIA, :REFERENCIA_PROVEEDOR,'#10'     :FECHA_FACTURA, :FECH' +
+              'IA, :REFERENCIA_PROVEEDOR,'#10'     :FECHA_FACTURA, :FECHA_VENCIMIEN' +
-              'A_VENCIMIENTO, :BASE_IMPONIBLE, :DESCUENTO,'#10'     :IMPORTE_DESCUE' +
+              'TO, :BASE_IMPONIBLE, :DESCUENTO,'#10'     :IMPORTE_DESCUENTO, :IVA, ' +
-              'NTO, :IVA, :IMPORTE_IVA, :IRPF, :IMPORTE_IRPF,'#10'     :RE, :IMPORT' +
+              ':IMPORTE_IVA, :IRPF, :IMPORTE_IRPF,'#10'     :RE, :IMPORTE_RE, :IMPO' +
-              'E_RE, :IMPORTE_TOTAL, :OBSERVACIONES, :ID_PROVEEDOR, :NIF_CIF,'#10' ' +
+              'RTE_TOTAL, :OBSERVACIONES, :ID_PROVEEDOR, :NIF_CIF,'#10'     :NOMBRE' +
-              '    :NOMBRE, :CALLE, :POBLACION, :PROVINCIA, :CODIGO_POSTAL, '#10'  ' +
+              ', :CALLE, :POBLACION, :PROVINCIA, :CODIGO_POSTAL, '#10'     :FECHA_A' +
-              '   :FECHA_ALTA, :FECHA_MODIFICACION, :USUARIO, :ID_FORMA_PAGO, '#10 +
+              'LTA, :FECHA_MODIFICACION, :USUARIO, :ID_FORMA_PAGO, '#10'     :RECAR' +
-              '     :RECARGO_EQUIVALENCIA, :ID_TIPO_IVA, :IMPORTE_NETO, '#10'     :' +
+              'GO_EQUIVALENCIA, :ID_TIPO_IVA, :IMPORTE_NETO, '#10'     :IMPORTE_POR' +
-              'IMPORTE_PORTE, :IGNORAR_CONTABILIDAD, :ID_TIENDA, :ID_TIPO_FACTU' +
+              'TE, :IGNORAR_CONTABILIDAD, :ID_TIENDA, :ID_TIPO_FACTURA)'#10'     '#10' ' +
-              'RA, :SITUACION)'#10'     '#10'     '#10#10
+              '    '#10#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1249,12 +1243,6 @@ object srvFacturasProveedor: TsrvFacturasProveedor
             DataType = datInteger
             Value = ''
           end
-          item
-            Name = 'SITUACION'
-            DataType = datString
-            Size = 255
-            Value = ''
-          end
           item
             Name = 'OLD_ID'
             Value = ''
@@ -1283,8 +1271,7 @@ object srvFacturasProveedor: TsrvFacturasProveedor
               ', '#10'    ID_TIPO_IVA = :ID_TIPO_IVA, '#10'    IMPORTE_NETO = :IMPORTE_' +
               'NETO, '#10'    IMPORTE_PORTE = :IMPORTE_PORTE,'#10'    IGNORAR_CONTABILI' +
               'DAD = :IGNORAR_CONTABILIDAD,'#10'    ID_TIENDA = :ID_TIENDA,'#10'    ID_' +
-              'TIPO_FACTURA = :ID_TIPO_FACTURA,'#10'    SITUACION = :SITUACION'#10'  WH' +
+              'TIPO_FACTURA = :ID_TIPO_FACTURA'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
-              'ERE'#10'    (ID = :OLD_ID)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>

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

@@ -1,6 +1,6 @@
 inherited frViewFacturaProveedor: TfrViewFacturaProveedor
-  Width = 740
+  Width = 451
-  Height = 479
+  Height = 304
   Align = alClient
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
@@ -9,19 +9,17 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 740
+    Width = 451
-    Height = 479
+    Height = 304
     Align = alClient
     ParentBackground = True
     TabOrder = 0
     TabStop = False
     AutoContentSizes = [acsWidth, acsHeight]
     LookAndFeel = dxLayoutOfficeLookAndFeel1
-    ExplicitWidth = 451
-    ExplicitHeight = 304
     DesignSize = (
-      740
+      451
-      479)
+      304)
     object eReferencia: TcxDBTextEdit
       Left = 124
       Top = 30
@@ -65,7 +63,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
     end
     object cbFormaPago: TcxDBLookupComboBox
       Left = 124
-      Top = 189
+      Top = 162
       DataBinding.DataField = 'ID_FORMA_PAGO'
       DataBinding.DataSource = DADataSource
       Properties.DropDownListStyle = lsFixedList
@@ -93,16 +91,16 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 5
+      TabOrder = 4
       Width = 169
     end
     object bFormasPago: TButton
-      Left = 246
+      Left = 150
-      Top = 189
+      Top = 162
       Width = 132
       Height = 23
       Caption = 'Ver las formas de pago...'
-      TabOrder = 6
+      TabOrder = 5
       OnClick = bFormasPagoClick
     end
     object eReferenciaProveedor: TcxDBTextEdit
@@ -127,7 +125,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
     end
     inline frViewTienda1: TfrViewTienda
       Left = 22
-      Top = 269
+      Top = 242
       Width = 320
       Height = 36
       Enabled = False
@@ -137,10 +135,10 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 8
+      TabOrder = 7
       ReadOnly = False
       ExplicitLeft = 22
-      ExplicitTop = 269
+      ExplicitTop = 242
       ExplicitWidth = 320
       ExplicitHeight = 36
       inherited dxLayoutControl1: TdxLayoutControl
@@ -154,7 +152,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
     end
     object edtFechaVencimiento: TcxDBDateEdit
       Left = 124
-      Top = 218
+      Top = 191
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_VENCIMIENTO'
       DataBinding.DataSource = DADataSource
@@ -170,11 +168,11 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
       StyleDisabled.LookAndFeel.NativeStyle = True
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 7
+      TabOrder = 6
       Width = 158
     end
     inline frViewProveedorFactura1: TfrViewProveedorFactura
-      Left = 406
+      Left = 310
       Top = 30
       Width = 312
       Height = 260
@@ -184,9 +182,9 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 9
+      TabOrder = 8
       ReadOnly = False
-      ExplicitLeft = 406
+      ExplicitLeft = 310
       ExplicitTop = 30
       ExplicitWidth = 312
       ExplicitHeight = 260
@@ -233,7 +231,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
     end
     inline frViewObservaciones1: TfrViewObservaciones
       Left = 22
-      Top = 335
+      Top = 320
       Width = 521
       Height = 228
       Font.Charset = DEFAULT_CHARSET
@@ -242,10 +240,10 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 10
+      TabOrder = 9
       ReadOnly = False
       ExplicitLeft = 22
-      ExplicitTop = 335
+      ExplicitTop = 320
       ExplicitHeight = 228
       inherited memObservaciones: TcxDBMemo
         DataBinding.DataField = 'OBSERVACIONES'
@@ -256,7 +254,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
     end
     object cbTipoFactura: TcxDBLookupComboBox
       Left = 124
-      Top = 138
+      Top = 111
       DataBinding.DataField = 'ID_TIPO_FACTURA'
       DataBinding.DataSource = DADataSource
       Properties.DropDownListStyle = lsFixedList
@@ -284,20 +282,8 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 4
-      Width = 209
-    end
-    object edtSituacion: TcxDBComboBox
-      Left = 124
-      Top = 111
-      DataBinding.DataField = 'SITUACION'
-      DataBinding.DataSource = DADataSource
-      Properties.DropDownListStyle = lsFixedList
-      Properties.Items.Strings = (
-        'PENDIENTE'
-        'PAGADA')
       TabOrder = 3
-      Width = 121
+      Width = 209
     end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
@@ -334,11 +320,6 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
               Control = edtFecha
               ControlOptions.ShowBorder = False
             end
-            object dxLayoutControl1Item9: TdxLayoutItem
-              Caption = 'Situaci'#243'n:'
-              Control = edtSituacion
-              ControlOptions.ShowBorder = False
-            end
             object dxLayoutControl1Item8: TdxLayoutItem
               Caption = 'Tipo operaci'#243'n:'
               Control = cbTipoFactura

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

@@ -63,8 +63,6 @@ type
     dxLayoutControl1Item8: TdxLayoutItem;
     cbTipoFactura: TcxDBLookupComboBox;
     dsTiposFactura: TDADataSource;
-    edtSituacion: TcxDBComboBox;
-    dxLayoutControl1Item9: TdxLayoutItem;
     procedure bFormasPagoClick(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
     procedure CustomViewCreate(Sender: TObject);

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

@@ -198,6 +198,9 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor
     object cxGridPendientes: TcxGridLevel
       Caption = 'Pendientes'
     end
+    object cxGridParcial: TcxGridLevel
+      Caption = 'Parcialmente pagadas'
+    end
     object cxGridPagadas: TcxGridLevel
       Caption = 'Pagadas'
     end

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

@@ -45,6 +45,7 @@ type
     cxGridViewPOBLACION: TcxGridDBColumn;
     cxStylePagada: TcxStyle;
     cxGridPendientes: TcxGridLevel;
+    cxGridParcial: TcxGridLevel;
     cxStyleAbono: TcxStyle;
     cxGridPagadas: TcxGridLevel;
     cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn;
@@ -162,6 +163,7 @@ begin
 
   case cxGrid.ActiveLevel.Index of
     1   : FFiltro.AddItem(cxGridViewSITUACION, foEqual, CTE_PENDIENTE, CTE_PENDIENTE);
+    2   : FFiltro.AddItem(cxGridViewSITUACION, foEqual, CTE_PARCIAMENTE_PAGADA, CTE_PARCIAMENTE_PAGADA);
     3   : FFiltro.AddItem(cxGridViewSITUACION, foEqual, CTE_PAGADA, CTE_PAGADA);
   end;
 end;
@@ -204,7 +206,9 @@ begin
     if (ASituacion = CTE_PAGADA) then
       AStyle := cxStylePagada
     else if (ASituacion = CTE_PENDIENTE) then
-      AStyle := cxStylePendientes;
+      AStyle := cxStylePendientes
+    else if (ASituacion = CTE_PARCIAMENTE_PAGADA) then
+      AStyle := cxStyleParciales;
 
     IndiceCol := cxGridViewIMPORTE_TOTAL.Index;
     if (Pos('-', ARecord.DisplayTexts[IndiceCol]) > 0) then

Source/Servidor/FactuGES_Server.dproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
@@ -29,6 +29,7 @@
     <Borland.ProjectType />
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">5</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.5.1.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.5.1.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 07 de febrero de 2012 17:20</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>