Version 2.2.2 para subir a Alonso y Sal

git-svn-id: https://192.168.0.254/svn/Proyectos.AlonsoYSal_FactuGES2/trunk@25 40301925-124e-1c4e-b97d-170ad7a8785b
This commit is contained in:
roberto 2021-03-04 14:07:54 +00:00
parent d90bbb0871
commit 3d846a7f72
67 changed files with 1615 additions and 569 deletions

Binary file not shown.

View File

@ -10,13 +10,34 @@ uses
Forms, Classes, SysUtils, StdCtrls, ComCtrls, Forms, Classes, SysUtils, StdCtrls, ComCtrls,
Menus, Windows; Menus, Windows;
function RtfToText(Cadena: PChar): PChar;
var
AStream : TStringStream;
ARichEdit: TRichEdit;
begin
ARichEdit := TRichEdit.CreateParented(HWND_MESSAGE);
try
AStream := TStringStream.Create(Cadena);
try
ARichEdit.SelectAll;
ARichEdit.SelText := StrPas(Cadena);
Result := PChar(ARichEdit.Text);
finally
FreeAndNIL(AStream);
end;
finally
FreeAndNIL(ARichEdit);
end;
end;
{ANTIGUA FUNCION CON FUGA DE MEMORIA
function RtfToText(Cadena: PChar): PChar; function RtfToText(Cadena: PChar): PChar;
var var
AStream : TStringStream; AStream : TStringStream;
ARichEdit: TRichEdit; ARichEdit: TRichEdit;
begin begin
AStream := TStringStream.Create(Cadena); AStream := TStringStream.Create(Cadena);
ARichEdit := TRichEdit.CreateParented(HWND(-3)); ARichEdit := TRichEdit.CreateParented(HWND(-3));
try try
ARichEdit.SelectAll; ARichEdit.SelectAll;
ARichEdit.SelText := StrPas(Cadena); ARichEdit.SelText := StrPas(Cadena);
@ -25,7 +46,6 @@ begin
FreeAndNIL(AStream); FreeAndNIL(AStream);
end; end;
end; end;
}
end. end.

Binary file not shown.

View File

@ -467,5 +467,5 @@ END
/* c:\archivos de programa\codegear\rad studio\5.0\Lib\Controls.res */ /* c:\archivos de programa\codegear\rad studio\5.0\Lib\Controls.res */
/* c:\archivos de programa\codegear\rad studio\5.0\Lib\Buttons.res */ /* c:\archivos de programa\codegear\rad studio\5.0\Lib\Buttons.res */
/* c:\archivos de programa\codegear\rad studio\5.0\Lib\ExtDlgs.res */ /* c:\archivos de programa\codegear\rad studio\5.0\Lib\ExtDlgs.res */
/* C:\Codigo Acana\Database\udfs\udf_RtfToText.RES */ /* C:\Codigo Arribas2\Database\udfs\udf_RtfToText.RES */
/* C:\Codigo Acana\Database\udfs\udf_RtfToText.drf */ /* C:\Codigo Arribas2\Database\udfs\udf_RtfToText.drf */

View File

@ -110,20 +110,6 @@ inherited fEditorEjercicio: TfEditorEjercicio
end end
end end
end end
inherited pgPaginas: TPageControl
Width = 513
Height = 344
ExplicitLeft = 3
ExplicitTop = 79
ExplicitWidth = 513
ExplicitHeight = 344
inherited pagGeneral: TTabSheet
ExplicitLeft = 4
ExplicitTop = 24
ExplicitWidth = 505
ExplicitHeight = 316
end
end
inherited StatusBar: TJvStatusBar inherited StatusBar: TJvStatusBar
Top = 426 Top = 426
Width = 519 Width = 519
@ -134,20 +120,34 @@ inherited fEditorEjercicio: TfEditorEjercicio
ExplicitTop = 426 ExplicitTop = 426
ExplicitWidth = 519 ExplicitWidth = 519
end end
inherited pgPaginas: TPageControl
Width = 513
Height = 314
ExplicitTop = 79
ExplicitWidth = 513
ExplicitHeight = 344
inherited pagGeneral: TTabSheet
ExplicitLeft = 4
ExplicitTop = 24
ExplicitWidth = 505
ExplicitHeight = 316
end
end
inherited PnlComentario: TPanel
Width = 519
end
inherited EditorActionList: TActionList inherited EditorActionList: TActionList
Top = 128 Top = 128
end end
inherited SmallImages: TPngImageList
Top = 112
end
inherited dsDataTable: TDADataSource [6] inherited dsDataTable: TDADataSource [6]
Left = 168 Left = 168
Top = 120 Top = 120
end end
inherited LargeImages: TPngImageList [7] inherited LargeImages: TPngImageList
Top = 112 Top = 112
end end
inherited JvFormStorage: TJvFormStorage [8] inherited SmallImages: TPngImageList [9]
Top = 112
end end
inherited StatusBarImages: TPngImageList inherited StatusBarImages: TPngImageList
Left = 64 Left = 64

View File

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

View File

@ -52,7 +52,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality> <Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>VCLApplication</Borland.ProjectType> <Borland.ProjectType>VCLApplication</Borland.ProjectType>
<BorlandProject> <BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">2</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">2.2.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES v2</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES v2</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.2.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">2</VersionInfo><VersionInfo Name="MinorVer">2</VersionInfo><VersionInfo Name="Release">2</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.2.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES v2</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES v2</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.2.2.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 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> </Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>

Binary file not shown.

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -640,14 +640,18 @@ object PluginContabilidad: TPluginContabilidad
object actCuentas: TAction object actCuentas: TAction
Category = 'Contabilidad' Category = 'Contabilidad'
Caption = 'Cuentas' Caption = 'Cuentas'
Enabled = False
ImageIndex = 2 ImageIndex = 2
Visible = False
OnExecute = actCuentasExecute OnExecute = actCuentasExecute
OnUpdate = actCuentasUpdate OnUpdate = actCuentasUpdate
end end
object actSubCuentas: TAction object actSubCuentas: TAction
Category = 'Contabilidad' Category = 'Contabilidad'
Caption = 'Subcuentas' Caption = 'Subcuentas'
Enabled = False
ImageIndex = 1 ImageIndex = 1
Visible = False
OnExecute = actSubCuentasExecute OnExecute = actSubCuentasExecute
OnUpdate = actSubCuentasUpdate OnUpdate = actSubCuentasUpdate
end end

View File

@ -55,8 +55,8 @@ type
function EsModificable(AContrato : IBizContratoCliente): Boolean; function EsModificable(AContrato : IBizContratoCliente): Boolean;
function EsEliminable(AContrato : IBizContratoCliente): Boolean; function EsEliminable(AContrato : IBizContratoCliente): Boolean;
procedure Preview(AContrato : IBizContratoCliente; AllItems: Boolean = false); procedure Preview(AContrato : IBizContratoCliente; AllItems: Boolean = false; AVerCondiciones: Boolean = false);
procedure Print(AContrato : IBizContratoCliente; AllItems: Boolean = false); procedure Print(AContrato : IBizContratoCliente; AllItems: Boolean = false; AVerCondiciones: Boolean = false);
procedure EnviarContratoPorEMail(AContrato : IBizContratoCliente); procedure EnviarContratoPorEMail(AContrato : IBizContratoCliente);
function CambiarSituacion(AContrato : IBizContratoCliente; Situacion: String; FechaDecision: TDateTime; AllItems: Boolean = false): Boolean; function CambiarSituacion(AContrato : IBizContratoCliente; Situacion: String; FechaDecision: TDateTime; AllItems: Boolean = false): Boolean;
function AsignarLOPD(AContratos: IBizContratoCliente): Boolean; function AsignarLOPD(AContratos: IBizContratoCliente): Boolean;
@ -133,8 +133,8 @@ type
function EsModificable(AContrato : IBizContratoCliente): Boolean; function EsModificable(AContrato : IBizContratoCliente): Boolean;
function EsEliminable(AContrato : IBizContratoCliente): Boolean; function EsEliminable(AContrato : IBizContratoCliente): Boolean;
procedure Preview(AContrato : IBizContratoCliente; AllItems: Boolean = false); procedure Preview(AContrato : IBizContratoCliente; AllItems: Boolean = false; AVerCondiciones: Boolean = false);
procedure Print(AContrato : IBizContratoCliente; AllItems: Boolean = false); procedure Print(AContrato : IBizContratoCliente; AllItems: Boolean = false; AVerCondiciones: Boolean = false);
procedure EnviarContratoPorEMail(AContrato : IBizContratoCliente); procedure EnviarContratoPorEMail(AContrato : IBizContratoCliente);
function CambiarSituacion(AContrato : IBizContratoCliente; Situacion: String; FechaDecision: TDateTime; AllItems: Boolean = false): Boolean; function CambiarSituacion(AContrato : IBizContratoCliente; Situacion: String; FechaDecision: TDateTime; AllItems: Boolean = false): Boolean;
function AsignarLOPD(AContratos: IBizContratoCliente): Boolean; function AsignarLOPD(AContratos: IBizContratoCliente): Boolean;
@ -1115,7 +1115,7 @@ begin
Result := AContrato; Result := AContrato;
end; end;
procedure TContratosClienteController.Preview(AContrato: IBizContratoCliente; AllItems: Boolean = false); procedure TContratosClienteController.Preview(AContrato: IBizContratoCliente; AllItems: Boolean = false; AVerCondiciones: Boolean = false);
var var
AReportController : IContratosClienteReportController; AReportController : IContratosClienteReportController;
ID_Contratos: TIntegerList; ID_Contratos: TIntegerList;
@ -1141,14 +1141,14 @@ begin
else else
ID_Contratos.Add(AContrato.ID); ID_Contratos.Add(AContrato.ID);
AReportController.Preview(ID_Contratos); AReportController.Preview(ID_Contratos, AVerCondiciones);
finally finally
AReportController := NIL; AReportController := NIL;
FreeAndNil(ID_Contratos); FreeAndNil(ID_Contratos);
end; end;
end; end;
procedure TContratosClienteController.Print(AContrato: IBizContratoCliente; AllItems: Boolean = false); procedure TContratosClienteController.Print(AContrato: IBizContratoCliente; AllItems: Boolean = false; AVerCondiciones: Boolean = false);
var var
AReportController : IContratosClienteReportController; AReportController : IContratosClienteReportController;
ID_Contratos: TIntegerList; ID_Contratos: TIntegerList;
@ -1173,7 +1173,7 @@ begin
else else
ID_Contratos.Add(AContrato.ID); ID_Contratos.Add(AContrato.ID);
AReportController.Print(ID_Contratos); AReportController.Print(ID_Contratos, AVerCondiciones);
finally finally
AReportController := NIL; AReportController := NIL;

View File

@ -10,8 +10,8 @@ uses
type type
IContratosClienteReportController = interface(IControllerBase) IContratosClienteReportController = interface(IControllerBase)
['{FEF47B69-26A3-462A-AF6D-4B2073D4F9DC}'] ['{FEF47B69-26A3-462A-AF6D-4B2073D4F9DC}']
procedure Preview(const AListaID : TIntegerList); procedure Preview(const AListaID : TIntegerList; AVerCondiciones: Boolean = false);
procedure Print(const AListaID : TIntegerList); procedure Print(const AListaID : TIntegerList; AVerCondiciones: Boolean = false);
function ExportToPDF(const AID: Integer; const AFileName : String = ''): Boolean; function ExportToPDF(const AID: Integer; const AFileName : String = ''): Boolean;
end; end;
@ -23,8 +23,8 @@ type
constructor Create; override; constructor Create; override;
destructor Destroy; override; destructor Destroy; override;
procedure Preview(const AListaID : TIntegerList); procedure Preview(const AListaID : TIntegerList; AVerCondiciones: Boolean = false);
procedure Print(const AListaID : TIntegerList); procedure Print(const AListaID : TIntegerList; AVerCondiciones: Boolean = false);
function ExportToPDF(const AID: Integer; const AFileName : String = ''): Boolean; function ExportToPDF(const AID: Integer; const AFileName : String = ''): Boolean;
end; end;
@ -80,7 +80,7 @@ begin
end; end;
end; end;
procedure TContratosClienteReportController.Preview(const AListaID : TIntegerList); procedure TContratosClienteReportController.Preview(const AListaID : TIntegerList; AVerCondiciones: Boolean = false);
var var
AStream: Binary; AStream: Binary;
AEditor : IEditorContratosClientePreview; AEditor : IEditorContratosClientePreview;
@ -89,7 +89,7 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
AStream := FDataModule.GetRptContratos(AListaID); AStream := FDataModule.GetRptContratos(AListaID, AVerCondiciones);
try try
CreateEditor('EditorContratosClientePreview', IEditorContratosClientePreview, AEditor); CreateEditor('EditorContratosClientePreview', IEditorContratosClientePreview, AEditor);
if Assigned(AEditor) then if Assigned(AEditor) then
@ -113,7 +113,7 @@ begin
end; end;
end; end;
procedure TContratosClienteReportController.Print(const AListaID : TIntegerList); procedure TContratosClienteReportController.Print(const AListaID : TIntegerList; AVerCondiciones: Boolean = false);
var var
AStream: Binary; AStream: Binary;
AEditor : IEditorContratosClientePreview; AEditor : IEditorContratosClientePreview;
@ -122,7 +122,7 @@ begin
ShowHourglassCursor; ShowHourglassCursor;
try try
AStream := FDataModule.GetRptContratos(AListaID); AStream := FDataModule.GetRptContratos(AListaID, AVerCondiciones);
try try
CreateEditor('EditorContratosClientePreview', IEditorContratosClientePreview, AEditor); CreateEditor('EditorContratosClientePreview', IEditorContratosClientePreview, AEditor);
if Assigned(AEditor) then if Assigned(AEditor) then

View File

@ -45,8 +45,8 @@ type
function NewItem : IBizContratoCliente; function NewItem : IBizContratoCliente;
// Report // Report
function GetRptContratos(const AListaID: TIntegerList): Binary; function GetRptContratos(const AListaID: TIntegerList; AVerCondiciones: Boolean = false): Binary;
function GetRptPDFContrato(const AID: Integer): Binary; function GetRptPDFContrato(const AID: Integer; AVerCondiciones: Boolean = false): Binary;
function GetAnosItems : TStringList; function GetAnosItems : TStringList;
function GetContratosClienteBeneficios : IBizContratosClienteBeneficios; function GetContratosClienteBeneficios : IBizContratosClienteBeneficios;
@ -73,27 +73,26 @@ begin
RORemoteService.Message := dmConexion.Message; RORemoteService.Message := dmConexion.Message;
end; end;
function TDataModuleContratosCliente.GetRptPDFContrato( function TDataModuleContratosCliente.GetRptPDFContrato(const AID: Integer; AVerCondiciones: Boolean = false): Binary;
const AID: Integer): Binary;
var var
AParam : TIntegerArray; AParam : TIntegerArray;
begin begin
AParam := TIntegerArray.Create; AParam := TIntegerArray.Create;
try try
AParam.Add(AID); AParam.Add(AID);
Result := (RORemoteService as IsrvContratosCliente).GenerarInformeEnPDF(AParam) Result := (RORemoteService as IsrvContratosCliente).GenerarInformeEnPDF(AParam, AVerCondiciones)
finally finally
FreeANDNIL(AParam) FreeANDNIL(AParam)
end; end;
end; end;
function TDataModuleContratosCliente.GetRptContratos(const AListaID: TIntegerList): Binary; function TDataModuleContratosCliente.GetRptContratos(const AListaID: TIntegerList; AVerCondiciones: Boolean = false): Binary;
var var
AParam : TIntegerArray; AParam : TIntegerArray;
begin begin
AParam := AListaID.ToIntegerArray; AParam := AListaID.ToIntegerArray;
try try
Result := (RORemoteService as IsrvContratosCliente).GenerarInforme(AParam) Result := (RORemoteService as IsrvContratosCliente).GenerarInforme(AParam, AVerCondiciones)
finally finally
FreeANDNIL(AParam) FreeANDNIL(AParam)
end; end;

View File

@ -8,8 +8,8 @@ uses
type type
IDataModuleContratosClienteReport = interface IDataModuleContratosClienteReport = interface
['{6AB7469B-842A-413E-AF33-9506477A9666}'] ['{6AB7469B-842A-413E-AF33-9506477A9666}']
function GetRptContratos(const AListaID: TIntegerList): Binary; function GetRptContratos(const AListaID: TIntegerList; AVerCondiciones: Boolean = false): Binary;
function GetRptPDFContrato(const AID: Integer): Binary; function GetRptPDFContrato(const AID: Integer; AVerCondiciones: Boolean = false): Binary;
end; end;
implementation implementation

View File

@ -9,13 +9,13 @@ const
{ Data table rules ids { Data table rules ids
Feel free to change them to something more human readable Feel free to change them to something more human readable
but make sure they are unique in the context of your application } but make sure they are unique in the context of your application }
RID_Valores = '{99FB7080-55D3-4F71-9776-CA0470AF1B16}'; RID_Valores = '{0549BE41-8DC9-4C9D-812F-6D146575E4B4}';
RID_Propiedades = '{39955AC4-909B-43B5-BFC3-AAC1E85B4521}'; RID_Propiedades = '{A65EEF12-2395-4143-9DA6-F23FFF505ADF}';
RID_ListaAnosContratos = '{842CF7DF-5B01-44CC-88B8-EF63F5B7B3BD}'; RID_ListaAnosContratos = '{D47DCD2C-5EED-4423-A22A-1CC3F1347D27}';
RID_ContratosClienteBeneficios = '{CB3A4E53-B875-4D04-A53A-637A86A595CA}'; RID_ContratosClienteBeneficios = '{6B12BAFF-EBC0-4A87-A7EA-CEF5B669B735}';
RID_ContratosCliente = '{CFCB6098-A9BA-4688-BDA7-0CA8EF49CBD4}'; RID_ContratosCliente = '{0BA8D712-E5F9-4808-B8C1-251F0007E42F}';
RID_TiposCapitulos = '{E3584A5B-938B-48B5-87B2-A23154011868}'; RID_TiposCapitulos = '{AE2C99EF-A3DF-41B8-A583-3D4D2146EFDF}';
RID_ContratosCliente_Detalles = '{78024C2B-F048-4252-A838-4636A2126824}'; RID_ContratosCliente_Detalles = '{A3A68389-EC21-4034-9751-29C596223D59}';
{ Data table names } { Data table names }
nme_Valores = 'Valores'; nme_Valores = 'Valores';
@ -255,7 +255,7 @@ const
type type
{ IValores } { IValores }
IValores = interface(IDAStronglyTypedDataTable) IValores = interface(IDAStronglyTypedDataTable)
['{09FAC198-D702-4643-8EC4-4EB93D4BF4F6}'] ['{456DE31B-603C-49A6-B24F-F8F67E7BA1D9}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -314,7 +314,7 @@ type
{ IPropiedades } { IPropiedades }
IPropiedades = interface(IDAStronglyTypedDataTable) IPropiedades = interface(IDAStronglyTypedDataTable)
['{54CBB767-40EE-4C07-B6A5-63974D22B258}'] ['{B20DDA26-6EF1-49DF-8C3F-3C113EC3A75A}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -373,7 +373,7 @@ type
{ IListaAnosContratos } { IListaAnosContratos }
IListaAnosContratos = interface(IDAStronglyTypedDataTable) IListaAnosContratos = interface(IDAStronglyTypedDataTable)
['{6B58BA26-5CD0-4833-8D04-BBCC26C3F2B5}'] ['{EDC46A9F-5445-43F2-8B16-2C80FA55312C}']
{ Property getters and setters } { Property getters and setters }
function GetANOValue: String; function GetANOValue: String;
procedure SetANOValue(const aValue: String); procedure SetANOValue(const aValue: String);
@ -408,7 +408,7 @@ type
{ IContratosClienteBeneficios } { IContratosClienteBeneficios }
IContratosClienteBeneficios = interface(IDAStronglyTypedDataTable) IContratosClienteBeneficios = interface(IDAStronglyTypedDataTable)
['{4ED11DCC-83B2-4E5D-ABDB-ECD75EB2E34D}'] ['{6D340200-67CA-469A-924A-B2AD661BF858}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -611,7 +611,7 @@ type
{ IContratosCliente } { IContratosCliente }
IContratosCliente = interface(IDAStronglyTypedDataTable) IContratosCliente = interface(IDAStronglyTypedDataTable)
['{F0ADB580-DB5D-4260-9065-0A37ED306068}'] ['{FE98EB74-D1A6-4425-8087-F9D05815E895}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -1285,7 +1285,7 @@ type
} }
{ ITiposCapitulos } { ITiposCapitulos }
ITiposCapitulos = interface(IDAStronglyTypedDataTable) ITiposCapitulos = interface(IDAStronglyTypedDataTable)
['{7F065E7D-C88C-4287-B4F1-4C90BDE4A5D0}'] ['{5302F198-C996-421D-9897-7155FFFF5C6C}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -1380,7 +1380,7 @@ type
{ IContratosCliente_Detalles } { IContratosCliente_Detalles }
IContratosCliente_Detalles = interface(IDAStronglyTypedDataTable) IContratosCliente_Detalles = interface(IDAStronglyTypedDataTable)
['{FDC78645-413A-493D-8809-FC071D4847D8}'] ['{45BBDB1C-0E57-4631-A81F-17286C3F0225}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);

View File

@ -9,18 +9,18 @@ const
{ Delta rules ids { Delta rules ids
Feel free to change them to something more human readable Feel free to change them to something more human readable
but make sure they are unique in the context of your application } but make sure they are unique in the context of your application }
RID_ValoresDelta = '{632E5888-2F7A-4385-87BD-46FC070B09D8}'; RID_ValoresDelta = '{406066CE-3BB3-42F3-B7FC-493C9BA814E8}';
RID_PropiedadesDelta = '{5BFC3D15-E4D9-4699-8EC7-9B314CD76D61}'; RID_PropiedadesDelta = '{F16E429C-3CD8-4458-8312-208C5A37AFD6}';
RID_ListaAnosContratosDelta = '{92902251-E218-4288-839E-12C085E7E005}'; RID_ListaAnosContratosDelta = '{524A7663-3184-41AC-98BC-61A438830141}';
RID_ContratosClienteBeneficiosDelta = '{8DB4D500-6D3F-4533-AC6F-99D59749A965}'; RID_ContratosClienteBeneficiosDelta = '{30858076-5CCE-49DC-8A00-C7B87CE73B2A}';
RID_ContratosClienteDelta = '{65572B83-AD9B-4706-87EB-1454077273F4}'; RID_ContratosClienteDelta = '{1F8826C9-2B51-4454-B6D7-CF7879E483EF}';
RID_TiposCapitulosDelta = '{21A8FE37-27F9-4CC7-9EE9-553179AC7015}'; RID_TiposCapitulosDelta = '{962F7FF0-8B19-4D5F-9F87-108CA74B52C9}';
RID_ContratosCliente_DetallesDelta = '{C96EC97B-D8F0-4CA9-891B-1483F39E2224}'; RID_ContratosCliente_DetallesDelta = '{E8242C5E-E9FE-492B-A51C-A9387B2E4765}';
type type
{ IValoresDelta } { IValoresDelta }
IValoresDelta = interface(IValores) IValoresDelta = interface(IValores)
['{632E5888-2F7A-4385-87BD-46FC070B09D8}'] ['{406066CE-3BB3-42F3-B7FC-493C9BA814E8}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_PROPIEDADValue : Integer; function GetOldID_PROPIEDADValue : Integer;
@ -78,7 +78,7 @@ type
{ IPropiedadesDelta } { IPropiedadesDelta }
IPropiedadesDelta = interface(IPropiedades) IPropiedadesDelta = interface(IPropiedades)
['{5BFC3D15-E4D9-4699-8EC7-9B314CD76D61}'] ['{F16E429C-3CD8-4458-8312-208C5A37AFD6}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldDESCRIPCIONValue : String; function GetOldDESCRIPCIONValue : String;
@ -136,7 +136,7 @@ type
{ IListaAnosContratosDelta } { IListaAnosContratosDelta }
IListaAnosContratosDelta = interface(IListaAnosContratos) IListaAnosContratosDelta = interface(IListaAnosContratos)
['{92902251-E218-4288-839E-12C085E7E005}'] ['{524A7663-3184-41AC-98BC-61A438830141}']
{ Property getters and setters } { Property getters and setters }
function GetOldANOValue : String; function GetOldANOValue : String;
@ -170,7 +170,7 @@ type
{ IContratosClienteBeneficiosDelta } { IContratosClienteBeneficiosDelta }
IContratosClienteBeneficiosDelta = interface(IContratosClienteBeneficios) IContratosClienteBeneficiosDelta = interface(IContratosClienteBeneficios)
['{8DB4D500-6D3F-4533-AC6F-99D59749A965}'] ['{30858076-5CCE-49DC-8A00-C7B87CE73B2A}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldREFERENCIAValue : String; function GetOldREFERENCIAValue : String;
@ -372,7 +372,7 @@ type
{ IContratosClienteDelta } { IContratosClienteDelta }
IContratosClienteDelta = interface(IContratosCliente) IContratosClienteDelta = interface(IContratosCliente)
['{65572B83-AD9B-4706-87EB-1454077273F4}'] ['{1F8826C9-2B51-4454-B6D7-CF7879E483EF}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer; function GetOldID_EMPRESAValue : Integer;
@ -1048,7 +1048,7 @@ type
{ ITiposCapitulosDelta } { ITiposCapitulosDelta }
ITiposCapitulosDelta = interface(ITiposCapitulos) ITiposCapitulosDelta = interface(ITiposCapitulos)
['{21A8FE37-27F9-4CC7-9EE9-553179AC7015}'] ['{962F7FF0-8B19-4D5F-9F87-108CA74B52C9}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldPOSICIONValue : Integer; function GetOldPOSICIONValue : Integer;
@ -1142,7 +1142,7 @@ type
{ IContratosCliente_DetallesDelta } { IContratosCliente_DetallesDelta }
IContratosCliente_DetallesDelta = interface(IContratosCliente_Detalles) IContratosCliente_DetallesDelta = interface(IContratosCliente_Detalles)
['{C96EC97B-D8F0-4CA9-891B-1483F39E2224}'] ['{E8242C5E-E9FE-492B-A51C-A9387B2E4765}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_CONTRATOValue : Integer; function GetOldID_CONTRATOValue : Integer;

View File

@ -1034,7 +1034,7 @@ object RptContratosCliente: TRptContratosCliente
PrintOptions.Printer = 'Por defecto' PrintOptions.Printer = 'Por defecto'
PrintOptions.PrintOnSheet = 0 PrintOptions.PrintOnSheet = 0
ReportOptions.CreateDate = 39065.872423495400000000 ReportOptions.CreateDate = 39065.872423495400000000
ReportOptions.LastChange = 41590.494716782410000000 ReportOptions.LastChange = 44126.785023055560000000
ScriptLanguage = 'PascalScript' ScriptLanguage = 'PascalScript'
ShowProgress = False ShowProgress = False
StoreInDFM = False StoreInDFM = False

View File

@ -86,6 +86,7 @@ type
FNombreEmpresa: String; FNombreEmpresa: String;
FVerPrecios: Boolean; FVerPrecios: Boolean;
FVerTotales: Boolean; FVerTotales: Boolean;
FVerCondiciones: Boolean;
procedure _GenerarContrato(const AID : Integer); procedure _GenerarContrato(const AID : Integer);
@ -94,10 +95,10 @@ type
function _GenerarInforme(const TipoInforme: String): Binary; function _GenerarInforme(const TipoInforme: String): Binary;
procedure IniciarParametrosInforme; procedure IniciarParametrosInforme;
procedure RecuperarNombresClientes; procedure RecuperarNombresClientes;
public public
function GenerarContrato(const ListaID : TIntegerArray): Binary; function GenerarContrato(const ListaID : TIntegerArray; const VerCondiciones: Boolean): Binary;
function GenerarContratoEnPDF(const ListaID : TIntegerArray): Binary; function GenerarContratoEnPDF(const ListaID : TIntegerArray; const VerCondiciones: Boolean): Binary;
function GenerarInformeListadoContratos(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary; function GenerarInformeListadoContratos(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary;
end; end;
@ -145,7 +146,7 @@ begin
end; end;
end; end;
function TRptContratosCliente.GenerarContratoEnPDF(const ListaID: TIntegerArray): Binary; function TRptContratosCliente.GenerarContratoEnPDF(const ListaID: TIntegerArray; const VerCondiciones: Boolean): Binary;
var var
i: Integer; i: Integer;
begin begin
@ -156,7 +157,7 @@ begin
FNombreEmpresa := ''; FNombreEmpresa := '';
FVerPrecios := true; FVerPrecios := true;
FVerTotales := true; FVerTotales := true;
FVerCondiciones := VerCondiciones;
try try
//Vamos generando todos y cada uno de los Contratos recibidos //Vamos generando todos y cada uno de los Contratos recibidos
@ -489,7 +490,7 @@ begin
end; end;
end; end;
function TRptContratosCliente.GenerarContrato(const ListaID: TIntegerArray): Binary; function TRptContratosCliente.GenerarContrato(const ListaID: TIntegerArray; const VerCondiciones: Boolean): Binary;
var var
i: Integer; i: Integer;
begin begin
@ -500,6 +501,7 @@ begin
FNombreEmpresa := ''; FNombreEmpresa := '';
FVerPrecios := True; FVerPrecios := True;
FVerTotales := True; FVerTotales := True;
FVerCondiciones := VerCondiciones;
try try
//Vamos generando todos y cada uno de los Contratos recibidos //Vamos generando todos y cada uno de los Contratos recibidos
@ -562,6 +564,7 @@ begin
frxReport.Variables.Variables['NombreEmpresa'] := ''''+FNombreEmpresa+''''; frxReport.Variables.Variables['NombreEmpresa'] := ''''+FNombreEmpresa+'''';
frxReport.Variables.Variables['VerPrecios'] := FVerPrecios; frxReport.Variables.Variables['VerPrecios'] := FVerPrecios;
frxReport.Variables.Variables['VerTotales'] := FVerTotales; frxReport.Variables.Variables['VerTotales'] := FVerTotales;
frxReport.Variables.Variables['VerCondiciones'] := FVerCondiciones;
frxReport.AddFunction('function PONERJUSTIFICACIONCOMPLETA(ARTFText : String): String', 'User Function',''); frxReport.AddFunction('function PONERJUSTIFICACIONCOMPLETA(ARTFText : String): String', 'User Function','');
frxReport.ReportOptions.Name := 'Presupuesto ' + tbl_Cabecera.FieldByName('REFERENCIA').AsString; frxReport.ReportOptions.Name := 'Presupuesto ' + tbl_Cabecera.FieldByName('REFERENCIA').AsString;

View File

@ -33,8 +33,9 @@ type
procedure DARemoteServiceCreate(Sender: TObject); procedure DARemoteServiceCreate(Sender: TObject);
protected protected
{ IsrvContratosCliente methods } { IsrvContratosCliente methods }
function GenerarInforme(const ListaID: TIntegerArray): Binary; function GenerarInforme(const ListaID: TIntegerArray; const VerCondiciones: Boolean): Binary;
function GenerarInformeEnPDF(const ListaID: TIntegerArray): Binary; function GenerarInformeEnPDF(const ListaID: TIntegerArray; const VerCondiciones: Boolean): Binary;
end; end;
implementation implementation
@ -77,25 +78,25 @@ begin
ConnectionName := dmServer.ConnectionName; ConnectionName := dmServer.ConnectionName;
end; end;
function TsrvContratosCliente.GenerarInforme(const ListaID: TIntegerArray): Binary; function TsrvContratosCliente.GenerarInforme(const ListaID: TIntegerArray; const VerCondiciones: Boolean): Binary;
var var
AReportGenerator : TRptContratosCliente; AReportGenerator : TRptContratosCliente;
begin begin
AReportGenerator := TRptContratosCliente.Create(nil); AReportGenerator := TRptContratosCliente.Create(nil);
try try
Result := AReportGenerator.GenerarContrato(ListaID); Result := AReportGenerator.GenerarContrato(ListaID, VerCondiciones);
finally finally
FreeAndNIL(AReportGenerator); FreeAndNIL(AReportGenerator);
end; end;
end; end;
function TsrvContratosCliente.GenerarInformeEnPDF(const ListaID: TIntegerArray): Binary; function TsrvContratosCliente.GenerarInformeEnPDF(const ListaID: TIntegerArray; const VerCondiciones: Boolean): Binary;
var var
AReportGenerator : TRptContratosCliente; AReportGenerator : TRptContratosCliente;
begin begin
AReportGenerator := TRptContratosCliente.Create(nil); AReportGenerator := TRptContratosCliente.Create(nil);
try try
Result := AReportGenerator.GenerarContratoEnPDF(ListaID); Result := AReportGenerator.GenerarContratoEnPDF(ListaID, VerCondiciones);
finally finally
FreeAndNIL(AReportGenerator); FreeAndNIL(AReportGenerator);
end; end;

View File

@ -175,6 +175,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Width = 866 Width = 866
Height = 473 Height = 473
ActivePage = pagCondiciones
TabOrder = 1 TabOrder = 1
OnChanging = pgPaginasChanging OnChanging = pgPaginasChanging
ExplicitTop = 109 ExplicitTop = 109
@ -581,10 +582,8 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
end end
end end
object pagCondiciones: TTabSheet object pagCondiciones: TTabSheet
Caption = 'Condiciones' Caption = 'Montadores/Enganches'
Enabled = False
ImageIndex = 4 ImageIndex = 4
TabVisible = False
object dxLayoutControl1: TdxLayoutControl object dxLayoutControl1: TdxLayoutControl
Left = 0 Left = 0
Top = 0 Top = 0
@ -766,15 +765,15 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
Width = 872 Width = 872
ExplicitWidth = 872 ExplicitWidth = 872
inherited Bevel3: TBevel inherited Bevel3: TBevel
Left = 429 Left = 351
Height = 122 Height = 122
ExplicitLeft = 429 ExplicitLeft = 351
ExplicitHeight = 122 ExplicitHeight = 122
end end
inherited Bevel4: TBevel inherited Bevel4: TBevel
Left = 541 Left = 463
Width = 210 Width = 210
ExplicitLeft = 541 ExplicitLeft = 463
ExplicitWidth = 210 ExplicitWidth = 210
end end
inherited ImporteDto: TcxDBCurrencyEdit inherited ImporteDto: TcxDBCurrencyEdit
@ -783,16 +782,16 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
Width = 93 Width = 93
end end
inherited ImporteIVA: TcxDBCurrencyEdit inherited ImporteIVA: TcxDBCurrencyEdit
Left = 612 Left = 534
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 612 ExplicitLeft = 534
ExplicitWidth = 137 ExplicitWidth = 137
Width = 137 Width = 137
end end
inherited ImporteTotal: TcxDBCurrencyEdit inherited ImporteTotal: TcxDBCurrencyEdit
Left = 542 Left = 464
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 542 ExplicitLeft = 464
ExplicitWidth = 137 ExplicitWidth = 137
Width = 137 Width = 137
end end
@ -800,26 +799,26 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
Style.IsFontAssigned = True Style.IsFontAssigned = True
end end
inherited edtIVA: TcxDBSpinEdit inherited edtIVA: TcxDBSpinEdit
Left = 541 Left = 463
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 541 ExplicitLeft = 463
end end
inherited ImporteBase: TcxDBCurrencyEdit inherited ImporteBase: TcxDBCurrencyEdit
Left = 541 Left = 463
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 541 ExplicitLeft = 463
ExplicitWidth = 92 ExplicitWidth = 92
Width = 92 Width = 92
end end
inherited edtRE: TcxDBSpinEdit inherited edtRE: TcxDBSpinEdit
Left = 541 Left = 463
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 541 ExplicitLeft = 463
end end
inherited ImporteRE: TcxDBCurrencyEdit inherited ImporteRE: TcxDBCurrencyEdit
Left = 612 Left = 534
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 612 ExplicitLeft = 534
ExplicitWidth = 56 ExplicitWidth = 56
Width = 56 Width = 56
end end
@ -840,14 +839,26 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
Width = 81 Width = 81
end end
inherited bTiposIVA: TButton inherited bTiposIVA: TButton
Left = 281 Left = 203
OnClick = frViewTotales1bTiposIVAClick OnClick = frViewTotales1bTiposIVAClick
ExplicitLeft = 281 ExplicitLeft = 203
end end
inherited cbRecargoEquivalencia: TcxDBCheckBox inherited cbRecargoEquivalencia: TcxDBCheckBox
ExplicitWidth = 219 ExplicitWidth = 219
Width = 219 Width = 219
end end
inherited edtRetencion: TcxDBSpinEdit
Left = 463
Style.IsFontAssigned = True
ExplicitLeft = 463
end
inherited ImporteRetencion: TcxDBCurrencyEdit
Left = 534
Style.IsFontAssigned = True
ExplicitLeft = 534
ExplicitWidth = 281
Width = 281
end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group_Root: TdxLayoutGroup
inherited dxLayoutControl1Group1: TdxLayoutGroup inherited dxLayoutControl1Group1: TdxLayoutGroup
inherited dxLayoutControl1Group2: TdxLayoutGroup inherited dxLayoutControl1Group2: TdxLayoutGroup

View File

@ -293,10 +293,15 @@ begin
end; end;
procedure TfEditorContratoCliente.ImprimirInterno; procedure TfEditorContratoCliente.ImprimirInterno;
var
FVerCondiciones : Boolean;
begin begin
inherited; inherited;
if not Modified then if not Modified then
FController.Print(FContrato); begin
FVerCondiciones := ShowConfirmMessage('Previsualizar presupuesto', '¿Desea previsualizar Montadores/Enganches?') = IDYES;
FController.Print(FContrato, False, FVerCondiciones);
end;
end; end;
procedure TfEditorContratoCliente.OnClienteChanged(Sender: TObject); procedure TfEditorContratoCliente.OnClienteChanged(Sender: TObject);
@ -392,10 +397,16 @@ begin
end; end;
procedure TfEditorContratoCliente.PrevisualizarInterno; procedure TfEditorContratoCliente.PrevisualizarInterno;
var
FVerCondiciones : Boolean;
begin begin
inherited; inherited;
if not Modified then if not Modified then
FController.Preview(FContrato); begin
FVerCondiciones := ShowConfirmMessage('Previsualizar presupuesto', '¿Desea previsualizar Montadores/Enganches?') = IDYES;
FController.Preview(FContrato, False, FVerCondiciones);
end;
end; end;
{procedure TfEditorContratoCliente.RecalcularPortePorUnidad; {procedure TfEditorContratoCliente.RecalcularPortePorUnidad;

View File

@ -633,9 +633,12 @@ var
Respuesta : Integer; Respuesta : Integer;
AContratos: IBizContratoCliente; AContratos: IBizContratoCliente;
AllItems: Boolean; AllItems: Boolean;
FVerCondiciones : Boolean;
begin begin
AContratos := Nil; AContratos := Nil;
AllItems := False; AllItems := False;
FVerCondiciones := False;
if MultiSelect and Assigned(ViewGrid) then if MultiSelect and Assigned(ViewGrid) then
AllItems := (ViewGrid.NumSeleccionados > 1); AllItems := (ViewGrid.NumSeleccionados > 1);
@ -662,7 +665,8 @@ begin
AContratos := Contratos; AContratos := Contratos;
if Assigned(AContratos) then if Assigned(AContratos) then
FController.Print(AContratos, AllItems); FVerCondiciones := ShowConfirmMessage('Previsualizar presupuesto', '¿Desea previsualizar Montadores/Enganches?') = IDYES;
FController.Print(AContratos, AllItems, FVerCondiciones);
end; end;
end; end;
end; end;
@ -706,9 +710,12 @@ var
Respuesta : Integer; Respuesta : Integer;
AContratos: IBizContratoCliente; AContratos: IBizContratoCliente;
AllItems: Boolean; AllItems: Boolean;
FVerCondiciones : Boolean;
begin begin
AContratos := Nil; AContratos := Nil;
AllItems := False; AllItems := False;
FVerCondiciones := False;
if MultiSelect and Assigned(ViewGrid) then if MultiSelect and Assigned(ViewGrid) then
AllItems := (ViewGrid.NumSeleccionados > 1); AllItems := (ViewGrid.NumSeleccionados > 1);
@ -735,7 +742,8 @@ begin
AContratos := Contratos; AContratos := Contratos;
if Assigned(AContratos) then if Assigned(AContratos) then
FController.Preview(AContratos, AllItems); FVerCondiciones := ShowConfirmMessage('Previsualizar presupuesto', '¿Desea previsualizar Montadores/Enganches?') = IDYES;
FController.Preview(AContratos, AllItems, FVerCondiciones);
end; end;
end; end;
end; end;

View File

@ -287,6 +287,11 @@ inherited DataModuleFacturasProveedor: TDataModuleFacturasProveedor
item item
Name = 'IMPORTE_RETENCION' Name = 'IMPORTE_RETENCION'
DataType = datCurrency DataType = datCurrency
end
item
Name = 'FORMA_PAGO'
DataType = datString
Size = 255
end> end>
Params = <> Params = <>
StreamingOptions = [soDisableEventsWhileStreaming] StreamingOptions = [soDisableEventsWhileStreaming]

View File

@ -9,10 +9,10 @@ const
{ Data table rules ids { Data table rules ids
Feel free to change them to something more human readable Feel free to change them to something more human readable
but make sure they are unique in the context of your application } but make sure they are unique in the context of your application }
RID_ListaAnosFacturas = '{5EC733D0-DC7F-43A8-A290-90DF3580EF60}'; RID_ListaAnosFacturas = '{53859183-8621-4E20-BD02-3946114224F4}';
RID_FacturasProveedor_Contratos = '{8CB5511A-E896-473C-A67E-6E3141296AF8}'; RID_FacturasProveedor_Contratos = '{D3B2A8DE-A702-4ED3-A508-8C998E852CC1}';
RID_FacturasProveedor = '{14B00AB0-8C72-44BF-8319-54A81E4EA612}'; RID_FacturasProveedor = '{B7A06876-C8B1-4219-9FA4-6F603C0626A0}';
RID_FacturasProveedor_Detalles = '{C43F1F4D-4F6A-4ECD-B6DA-D66F7E6042E6}'; RID_FacturasProveedor_Detalles = '{3687ACB0-058A-4BA3-AA58-C55ED1085DBC}';
{ Data table names } { Data table names }
nme_ListaAnosFacturas = 'ListaAnosFacturas'; nme_ListaAnosFacturas = 'ListaAnosFacturas';
@ -95,6 +95,7 @@ const
fld_FacturasProveedorASIENTO_PUNTEADO = 'ASIENTO_PUNTEADO'; fld_FacturasProveedorASIENTO_PUNTEADO = 'ASIENTO_PUNTEADO';
fld_FacturasProveedorRETENCION = 'RETENCION'; fld_FacturasProveedorRETENCION = 'RETENCION';
fld_FacturasProveedorIMPORTE_RETENCION = 'IMPORTE_RETENCION'; fld_FacturasProveedorIMPORTE_RETENCION = 'IMPORTE_RETENCION';
fld_FacturasProveedorFORMA_PAGO = 'FORMA_PAGO';
{ FacturasProveedor field indexes } { FacturasProveedor field indexes }
idx_FacturasProveedorID = 0; idx_FacturasProveedorID = 0;
@ -141,6 +142,7 @@ const
idx_FacturasProveedorASIENTO_PUNTEADO = 41; idx_FacturasProveedorASIENTO_PUNTEADO = 41;
idx_FacturasProveedorRETENCION = 42; idx_FacturasProveedorRETENCION = 42;
idx_FacturasProveedorIMPORTE_RETENCION = 43; idx_FacturasProveedorIMPORTE_RETENCION = 43;
idx_FacturasProveedorFORMA_PAGO = 44;
{ FacturasProveedor_Detalles fields } { FacturasProveedor_Detalles fields }
fld_FacturasProveedor_DetallesID = 'ID'; fld_FacturasProveedor_DetallesID = 'ID';
@ -177,7 +179,7 @@ const
type type
{ IListaAnosFacturas } { IListaAnosFacturas }
IListaAnosFacturas = interface(IDAStronglyTypedDataTable) IListaAnosFacturas = interface(IDAStronglyTypedDataTable)
['{DE768EB7-76CF-44E8-AE1E-BC2CE5BC60C2}'] ['{C0691AB6-E446-40DA-9325-CC2DBF58DE24}']
{ Property getters and setters } { Property getters and setters }
function GetANOValue: String; function GetANOValue: String;
procedure SetANOValue(const aValue: String); procedure SetANOValue(const aValue: String);
@ -212,7 +214,7 @@ type
{ IFacturasProveedor_Contratos } { IFacturasProveedor_Contratos }
IFacturasProveedor_Contratos = interface(IDAStronglyTypedDataTable) IFacturasProveedor_Contratos = interface(IDAStronglyTypedDataTable)
['{471034E3-DD97-4487-8564-52AA41745E50}'] ['{56C5F1C3-DFF3-43DD-8B4E-5578BC7E3123}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -355,7 +357,7 @@ type
{ IFacturasProveedor } { IFacturasProveedor }
IFacturasProveedor = interface(IDAStronglyTypedDataTable) IFacturasProveedor = interface(IDAStronglyTypedDataTable)
['{993E54AD-C84E-4314-A0FD-C6FC6B5C12C1}'] ['{19E27DC5-2CB0-4106-A46C-EF522AD57AC2}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -532,6 +534,10 @@ type
procedure SetIMPORTE_RETENCIONValue(const aValue: Currency); procedure SetIMPORTE_RETENCIONValue(const aValue: Currency);
function GetIMPORTE_RETENCIONIsNull: Boolean; function GetIMPORTE_RETENCIONIsNull: Boolean;
procedure SetIMPORTE_RETENCIONIsNull(const aValue: Boolean); procedure SetIMPORTE_RETENCIONIsNull(const aValue: Boolean);
function GetFORMA_PAGOValue: String;
procedure SetFORMA_PAGOValue(const aValue: String);
function GetFORMA_PAGOIsNull: Boolean;
procedure SetFORMA_PAGOIsNull(const aValue: Boolean);
{ Properties } { Properties }
@ -623,6 +629,8 @@ type
property RETENCIONIsNull: Boolean read GetRETENCIONIsNull write SetRETENCIONIsNull; property RETENCIONIsNull: Boolean read GetRETENCIONIsNull write SetRETENCIONIsNull;
property IMPORTE_RETENCION: Currency read GetIMPORTE_RETENCIONValue write SetIMPORTE_RETENCIONValue; property IMPORTE_RETENCION: Currency read GetIMPORTE_RETENCIONValue write SetIMPORTE_RETENCIONValue;
property IMPORTE_RETENCIONIsNull: Boolean read GetIMPORTE_RETENCIONIsNull write SetIMPORTE_RETENCIONIsNull; property IMPORTE_RETENCIONIsNull: Boolean read GetIMPORTE_RETENCIONIsNull write SetIMPORTE_RETENCIONIsNull;
property FORMA_PAGO: String read GetFORMA_PAGOValue write SetFORMA_PAGOValue;
property FORMA_PAGOIsNull: Boolean read GetFORMA_PAGOIsNull write SetFORMA_PAGOIsNull;
end; end;
{ TFacturasProveedorDataTableRules } { TFacturasProveedorDataTableRules }
@ -807,6 +815,10 @@ type
procedure SetIMPORTE_RETENCIONValue(const aValue: Currency); virtual; procedure SetIMPORTE_RETENCIONValue(const aValue: Currency); virtual;
function GetIMPORTE_RETENCIONIsNull: Boolean; virtual; function GetIMPORTE_RETENCIONIsNull: Boolean; virtual;
procedure SetIMPORTE_RETENCIONIsNull(const aValue: Boolean); virtual; procedure SetIMPORTE_RETENCIONIsNull(const aValue: Boolean); virtual;
function GetFORMA_PAGOValue: String; virtual;
procedure SetFORMA_PAGOValue(const aValue: String); virtual;
function GetFORMA_PAGOIsNull: Boolean; virtual;
procedure SetFORMA_PAGOIsNull(const aValue: Boolean); virtual;
{ Properties } { Properties }
property ID: Integer read GetIDValue write SetIDValue; property ID: Integer read GetIDValue write SetIDValue;
@ -897,6 +909,8 @@ type
property RETENCIONIsNull: Boolean read GetRETENCIONIsNull write SetRETENCIONIsNull; property RETENCIONIsNull: Boolean read GetRETENCIONIsNull write SetRETENCIONIsNull;
property IMPORTE_RETENCION: Currency read GetIMPORTE_RETENCIONValue write SetIMPORTE_RETENCIONValue; property IMPORTE_RETENCION: Currency read GetIMPORTE_RETENCIONValue write SetIMPORTE_RETENCIONValue;
property IMPORTE_RETENCIONIsNull: Boolean read GetIMPORTE_RETENCIONIsNull write SetIMPORTE_RETENCIONIsNull; property IMPORTE_RETENCIONIsNull: Boolean read GetIMPORTE_RETENCIONIsNull write SetIMPORTE_RETENCIONIsNull;
property FORMA_PAGO: String read GetFORMA_PAGOValue write SetFORMA_PAGOValue;
property FORMA_PAGOIsNull: Boolean read GetFORMA_PAGOIsNull write SetFORMA_PAGOIsNull;
public public
constructor Create(aDataTable: TDADataTable); override; constructor Create(aDataTable: TDADataTable); override;
@ -906,7 +920,7 @@ type
{ IFacturasProveedor_Detalles } { IFacturasProveedor_Detalles }
IFacturasProveedor_Detalles = interface(IDAStronglyTypedDataTable) IFacturasProveedor_Detalles = interface(IDAStronglyTypedDataTable)
['{024EFC64-A8A8-497F-891E-D4B407378FA4}'] ['{C9175800-D175-4276-B8E2-78AFE8EBBD48}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -2296,6 +2310,27 @@ begin
DataTable.Fields[idx_FacturasProveedorIMPORTE_RETENCION].AsVariant := Null; DataTable.Fields[idx_FacturasProveedorIMPORTE_RETENCION].AsVariant := Null;
end; end;
function TFacturasProveedorDataTableRules.GetFORMA_PAGOValue: String;
begin
result := DataTable.Fields[idx_FacturasProveedorFORMA_PAGO].AsString;
end;
procedure TFacturasProveedorDataTableRules.SetFORMA_PAGOValue(const aValue: String);
begin
DataTable.Fields[idx_FacturasProveedorFORMA_PAGO].AsString := aValue;
end;
function TFacturasProveedorDataTableRules.GetFORMA_PAGOIsNull: boolean;
begin
result := DataTable.Fields[idx_FacturasProveedorFORMA_PAGO].IsNull;
end;
procedure TFacturasProveedorDataTableRules.SetFORMA_PAGOIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_FacturasProveedorFORMA_PAGO].AsVariant := Null;
end;
{ TFacturasProveedor_DetallesDataTableRules } { TFacturasProveedor_DetallesDataTableRules }
constructor TFacturasProveedor_DetallesDataTableRules.Create(aDataTable: TDADataTable); constructor TFacturasProveedor_DetallesDataTableRules.Create(aDataTable: TDADataTable);

View File

@ -9,15 +9,15 @@ const
{ Delta rules ids { Delta rules ids
Feel free to change them to something more human readable Feel free to change them to something more human readable
but make sure they are unique in the context of your application } but make sure they are unique in the context of your application }
RID_ListaAnosFacturasDelta = '{30F77C37-AF68-42B8-9656-F46D79178373}'; RID_ListaAnosFacturasDelta = '{81F4E395-9EF6-40C1-83D5-5C2A0A2490B1}';
RID_FacturasProveedor_ContratosDelta = '{C5F637C2-E1B3-4A3E-8C74-35548EE2B2EB}'; RID_FacturasProveedor_ContratosDelta = '{9F853EA8-A072-49D3-974F-EC78904BF3E5}';
RID_FacturasProveedorDelta = '{6D103885-6FF2-4452-8C98-1F805E1C3147}'; RID_FacturasProveedorDelta = '{35C96B32-3020-4329-9690-9823F535BEEE}';
RID_FacturasProveedor_DetallesDelta = '{4A9BB6AD-05CD-4C05-8245-1004B1C351F9}'; RID_FacturasProveedor_DetallesDelta = '{C47D8D71-F005-4A0A-921C-99C45D6D01B2}';
type type
{ IListaAnosFacturasDelta } { IListaAnosFacturasDelta }
IListaAnosFacturasDelta = interface(IListaAnosFacturas) IListaAnosFacturasDelta = interface(IListaAnosFacturas)
['{30F77C37-AF68-42B8-9656-F46D79178373}'] ['{81F4E395-9EF6-40C1-83D5-5C2A0A2490B1}']
{ Property getters and setters } { Property getters and setters }
function GetOldANOValue : String; function GetOldANOValue : String;
@ -51,7 +51,7 @@ type
{ IFacturasProveedor_ContratosDelta } { IFacturasProveedor_ContratosDelta }
IFacturasProveedor_ContratosDelta = interface(IFacturasProveedor_Contratos) IFacturasProveedor_ContratosDelta = interface(IFacturasProveedor_Contratos)
['{C5F637C2-E1B3-4A3E-8C74-35548EE2B2EB}'] ['{9F853EA8-A072-49D3-974F-EC78904BF3E5}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_FACTURAValue : Integer; function GetOldID_FACTURAValue : Integer;
@ -193,7 +193,7 @@ type
{ IFacturasProveedorDelta } { IFacturasProveedorDelta }
IFacturasProveedorDelta = interface(IFacturasProveedor) IFacturasProveedorDelta = interface(IFacturasProveedor)
['{6D103885-6FF2-4452-8C98-1F805E1C3147}'] ['{35C96B32-3020-4329-9690-9823F535BEEE}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer; function GetOldID_EMPRESAValue : Integer;
@ -239,6 +239,7 @@ type
function GetOldASIENTO_PUNTEADOValue : SmallInt; function GetOldASIENTO_PUNTEADOValue : SmallInt;
function GetOldRETENCIONValue : Float; function GetOldRETENCIONValue : Float;
function GetOldIMPORTE_RETENCIONValue : Currency; function GetOldIMPORTE_RETENCIONValue : Currency;
function GetOldFORMA_PAGOValue : String;
{ Properties } { Properties }
property OldID : Integer read GetOldIDValue; property OldID : Integer read GetOldIDValue;
@ -285,6 +286,7 @@ type
property OldASIENTO_PUNTEADO : SmallInt read GetOldASIENTO_PUNTEADOValue; property OldASIENTO_PUNTEADO : SmallInt read GetOldASIENTO_PUNTEADOValue;
property OldRETENCION : Float read GetOldRETENCIONValue; property OldRETENCION : Float read GetOldRETENCIONValue;
property OldIMPORTE_RETENCION : Currency read GetOldIMPORTE_RETENCIONValue; property OldIMPORTE_RETENCION : Currency read GetOldIMPORTE_RETENCIONValue;
property OldFORMA_PAGO : String read GetOldFORMA_PAGOValue;
end; end;
{ TFacturasProveedorBusinessProcessorRules } { TFacturasProveedorBusinessProcessorRules }
@ -557,6 +559,12 @@ type
function GetOldIMPORTE_RETENCIONIsNull: Boolean; virtual; function GetOldIMPORTE_RETENCIONIsNull: Boolean; virtual;
procedure SetIMPORTE_RETENCIONValue(const aValue: Currency); virtual; procedure SetIMPORTE_RETENCIONValue(const aValue: Currency); virtual;
procedure SetIMPORTE_RETENCIONIsNull(const aValue: Boolean); virtual; procedure SetIMPORTE_RETENCIONIsNull(const aValue: Boolean); virtual;
function GetFORMA_PAGOValue: String; virtual;
function GetFORMA_PAGOIsNull: Boolean; virtual;
function GetOldFORMA_PAGOValue: String; virtual;
function GetOldFORMA_PAGOIsNull: Boolean; virtual;
procedure SetFORMA_PAGOValue(const aValue: String); virtual;
procedure SetFORMA_PAGOIsNull(const aValue: Boolean); virtual;
{ Properties } { Properties }
property ID : Integer read GetIDValue write SetIDValue; property ID : Integer read GetIDValue write SetIDValue;
@ -735,6 +743,10 @@ type
property IMPORTE_RETENCIONIsNull : Boolean read GetIMPORTE_RETENCIONIsNull write SetIMPORTE_RETENCIONIsNull; property IMPORTE_RETENCIONIsNull : Boolean read GetIMPORTE_RETENCIONIsNull write SetIMPORTE_RETENCIONIsNull;
property OldIMPORTE_RETENCION : Currency read GetOldIMPORTE_RETENCIONValue; property OldIMPORTE_RETENCION : Currency read GetOldIMPORTE_RETENCIONValue;
property OldIMPORTE_RETENCIONIsNull : Boolean read GetOldIMPORTE_RETENCIONIsNull; property OldIMPORTE_RETENCIONIsNull : Boolean read GetOldIMPORTE_RETENCIONIsNull;
property FORMA_PAGO : String read GetFORMA_PAGOValue write SetFORMA_PAGOValue;
property FORMA_PAGOIsNull : Boolean read GetFORMA_PAGOIsNull write SetFORMA_PAGOIsNull;
property OldFORMA_PAGO : String read GetOldFORMA_PAGOValue;
property OldFORMA_PAGOIsNull : Boolean read GetOldFORMA_PAGOIsNull;
public public
constructor Create(aBusinessProcessor: TDABusinessProcessor); override; constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@ -744,7 +756,7 @@ type
{ IFacturasProveedor_DetallesDelta } { IFacturasProveedor_DetallesDelta }
IFacturasProveedor_DetallesDelta = interface(IFacturasProveedor_Detalles) IFacturasProveedor_DetallesDelta = interface(IFacturasProveedor_Detalles)
['{4A9BB6AD-05CD-4C05-8245-1004B1C351F9}'] ['{C47D8D71-F005-4A0A-921C-99C45D6D01B2}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_FACTURAValue : Integer; function GetOldID_FACTURAValue : Integer;
@ -2685,6 +2697,37 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIMPORTE_RETENCION] := Null; BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorIMPORTE_RETENCION] := Null;
end; end;
function TFacturasProveedorBusinessProcessorRules.GetFORMA_PAGOValue: String;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorFORMA_PAGO];
end;
function TFacturasProveedorBusinessProcessorRules.GetFORMA_PAGOIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorFORMA_PAGO]);
end;
function TFacturasProveedorBusinessProcessorRules.GetOldFORMA_PAGOValue: String;
begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedorFORMA_PAGO];
end;
function TFacturasProveedorBusinessProcessorRules.GetOldFORMA_PAGOIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasProveedorFORMA_PAGO]);
end;
procedure TFacturasProveedorBusinessProcessorRules.SetFORMA_PAGOValue(const aValue: String);
begin
BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorFORMA_PAGO] := aValue;
end;
procedure TFacturasProveedorBusinessProcessorRules.SetFORMA_PAGOIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasProveedorFORMA_PAGO] := Null;
end;
{ TFacturasProveedor_DetallesBusinessProcessorRules } { TFacturasProveedor_DetallesBusinessProcessorRules }
constructor TFacturasProveedor_DetallesBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); constructor TFacturasProveedor_DetallesBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);

View File

@ -348,6 +348,10 @@ object srvFacturasProveedor: TsrvFacturasProveedor
item item
DatasetField = 'IMPORTE_RETENCION' DatasetField = 'IMPORTE_RETENCION'
TableField = 'IMPORTE_RETENCION' TableField = 'IMPORTE_RETENCION'
end
item
DatasetField = 'FORMA_PAGO'
TableField = 'FORMA_PAGO'
end> end>
end> end>
Name = 'FacturasProveedor' Name = 'FacturasProveedor'
@ -580,6 +584,11 @@ object srvFacturasProveedor: TsrvFacturasProveedor
item item
Name = 'IMPORTE_RETENCION' Name = 'IMPORTE_RETENCION'
DataType = datCurrency DataType = datCurrency
end
item
Name = 'FORMA_PAGO'
DataType = datString
Size = 255
end> end>
end end
item item

View File

@ -41,9 +41,6 @@
<Borland.ProjectType>Package</Borland.ProjectType> <Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject> <BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages> <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages> <Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FacturasProveedor_view.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> </Excluded_Packages><Source><Source Name="MainSource">FacturasProveedor_view.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions> </ProjectExtensions>
@ -52,42 +49,42 @@
<DelphiCompile Include="FacturasProveedor_view.dpk"> <DelphiCompile Include="FacturasProveedor_view.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\adortl.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
<DCCReference Include="..\Articulos_view.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Articulos_view.dcp" />
<DCCReference Include="..\Contabilidad_controller.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Contabilidad_controller.dcp" />
<DCCReference Include="..\Contabilidad_view.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Contabilidad_view.dcp" />
<DCCReference Include="..\Contactos_controller.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_controller.dcp" />
<DCCReference Include="..\Contactos_model.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_model.dcp" />
<DCCReference Include="..\ContratosCliente_controller.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\ContratosCliente_controller.dcp" />
<DCCReference Include="..\ContratosCliente_model.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\ContratosCliente_model.dcp" />
<DCCReference Include="..\cxDataD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
<DCCReference Include="..\cxEditorsD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
<DCCReference Include="..\cxExportD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\cxExportD11.dcp" />
<DCCReference Include="..\cxExtEditorsD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD11.dcp" />
<DCCReference Include="..\cxGridD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\cxGridD11.dcp" />
<DCCReference Include="..\cxLibraryD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
<DCCReference Include="..\cxPageControlD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD11.dcp" />
<DCCReference Include="..\DataAbstract_Core_D11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\dbrtl.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
<DCCReference Include="..\dsnap.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
<DCCReference Include="..\dxComnD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\dxComnD11.dcp" />
<DCCReference Include="..\dxCoreD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\dxCoreD11.dcp" />
<DCCReference Include="..\dxGDIPlusD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
<DCCReference Include="..\dxLayoutControlD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\dxLayoutControlD11.dcp" />
<DCCReference Include="..\dxThemeD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
<DCCReference Include="..\FacturasProveedor_controller.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\FacturasProveedor_controller.dcp" />
<DCCReference Include="..\FacturasProveedor_model.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\FacturasProveedor_model.dcp" />
<DCCReference Include="..\GestorInformes_controller.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\GestorInformes_controller.dcp" />
<DCCReference Include="..\GUIBase.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
<DCCReference Include="..\PngComponentsD10.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
<DCCReference Include="..\PNG_D10.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
<DCCReference Include="..\RemObjects_Core_D11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\rtl.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
<DCCReference Include="..\vcl.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
<DCCReference Include="..\vclactnband.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
<DCCReference Include="..\vcldb.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
<DCCReference Include="..\vcljpg.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
<DCCReference Include="..\vclx.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
<DCCReference Include="uEditorElegirArticulosFacturaProveedor.pas"> <DCCReference Include="uEditorElegirArticulosFacturaProveedor.pas">
<Form>fEditorElegirArticulosFacturaProveedor</Form> <Form>fEditorElegirArticulosFacturaProveedor</Form>
<DesignClass>TfEditorElegirArticulosFacturaProveedor</DesignClass> <DesignClass>TfEditorElegirArticulosFacturaProveedor</DesignClass>

View File

@ -83,7 +83,8 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
Width = 1105 Width = 1105
Height = 374 Height = 374
OnChanging = pgPaginasChanging OnChanging = pgPaginasChanging
ExplicitTop = 109 ExplicitLeft = 8
ExplicitTop = 106
ExplicitWidth = 1105 ExplicitWidth = 1105
ExplicitHeight = 374 ExplicitHeight = 374
inherited pagGeneral: TTabSheet inherited pagGeneral: TTabSheet
@ -210,6 +211,7 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
inherited memObservaciones: TcxDBMemo inherited memObservaciones: TcxDBMemo
DataBinding.DataSource = frViewFacturaProveedor1.DADataSource DataBinding.DataSource = frViewFacturaProveedor1.DADataSource
ExplicitWidth = 671 ExplicitWidth = 671
ExplicitHeight = 228
Height = 228 Height = 228
Width = 671 Width = 671
end end
@ -268,57 +270,57 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
ExplicitWidth = 57 ExplicitWidth = 57
end end
inherited UpDown1: TUpDown inherited UpDown1: TUpDown
Left = 586 Left = 570
Top = 0 Top = 0
ExplicitLeft = 586 ExplicitLeft = 570
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton13: TToolButton inherited ToolButton13: TToolButton
Left = 603 Left = 587
Top = 0 Top = 0
ExplicitLeft = 603 ExplicitLeft = 587
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton6: TToolButton inherited ToolButton6: TToolButton
Left = 611 Left = 595
Top = 0 Top = 0
ExplicitLeft = 611 ExplicitLeft = 595
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton7: TToolButton inherited ToolButton7: TToolButton
Left = 645 Left = 629
Top = 0 Top = 0
ExplicitLeft = 645 ExplicitLeft = 629
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton8: TToolButton inherited ToolButton8: TToolButton
Left = 679 Left = 663
Top = 0 Top = 0
ExplicitLeft = 679 ExplicitLeft = 663
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton12: TToolButton inherited ToolButton12: TToolButton
Left = 713 Left = 697
Top = 0 Top = 0
ExplicitLeft = 713 ExplicitLeft = 697
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton9: TToolButton inherited ToolButton9: TToolButton
Left = 721 Left = 705
Top = 0 Top = 0
ExplicitLeft = 721 ExplicitLeft = 705
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton10: TToolButton inherited ToolButton10: TToolButton
Left = 755 Left = 739
Top = 0 Top = 0
ExplicitLeft = 755 ExplicitLeft = 739
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton11: TToolButton inherited ToolButton11: TToolButton
Left = 789 Left = 773
Top = 0 Top = 0
ExplicitLeft = 789 ExplicitLeft = 773
ExplicitTop = 0 ExplicitTop = 0
end end
end end

View File

@ -1,6 +1,6 @@
inherited frViewFacturaProveedor: TfrViewFacturaProveedor inherited frViewFacturaProveedor: TfrViewFacturaProveedor
Width = 451 Width = 1007
Height = 304 Height = 604
Align = alClient Align = alClient
OnCreate = CustomViewCreate OnCreate = CustomViewCreate
OnDestroy = CustomViewDestroy OnDestroy = CustomViewDestroy
@ -9,17 +9,19 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
object dxLayoutControl1: TdxLayoutControl object dxLayoutControl1: TdxLayoutControl
Left = 0 Left = 0
Top = 0 Top = 0
Width = 451 Width = 1007
Height = 304 Height = 604
Align = alClient Align = alClient
ParentBackground = True ParentBackground = True
TabOrder = 0 TabOrder = 0
TabStop = False TabStop = False
AutoContentSizes = [acsWidth, acsHeight] AutoContentSizes = [acsWidth, acsHeight]
LookAndFeel = dxLayoutOfficeLookAndFeel1 LookAndFeel = dxLayoutOfficeLookAndFeel1
ExplicitWidth = 451
ExplicitHeight = 304
DesignSize = ( DesignSize = (
451 1007
304) 604)
object eReferencia: TcxDBTextEdit object eReferencia: TcxDBTextEdit
Left = 124 Left = 124
Top = 30 Top = 30
@ -95,7 +97,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
Width = 169 Width = 169
end end
object bFormasPago: TButton object bFormasPago: TButton
Left = 150 Left = 513
Top = 135 Top = 135
Width = 132 Width = 132
Height = 23 Height = 23
@ -142,7 +144,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
ExplicitHeight = 36 ExplicitHeight = 36
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 320 Width = 320
ExplicitWidth = 320 ExplicitWidth = 260
inherited cbTienda: TcxComboBox inherited cbTienda: TcxComboBox
ExplicitWidth = 376 ExplicitWidth = 376
Width = 376 Width = 376
@ -171,7 +173,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
Width = 158 Width = 158
end end
inline frViewProveedorFactura1: TfrViewProveedorFactura inline frViewProveedorFactura1: TfrViewProveedorFactura
Left = 310 Left = 673
Top = 30 Top = 30
Width = 312 Width = 312
Height = 260 Height = 260
@ -183,7 +185,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
ParentFont = False ParentFont = False
TabOrder = 7 TabOrder = 7
ReadOnly = False ReadOnly = False
ExplicitLeft = 310 ExplicitLeft = 673
ExplicitTop = 30 ExplicitTop = 30
ExplicitWidth = 312 ExplicitWidth = 312
ExplicitHeight = 260 ExplicitHeight = 260
@ -247,7 +249,8 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor
inherited memObservaciones: TcxDBMemo inherited memObservaciones: TcxDBMemo
DataBinding.DataField = 'OBSERVACIONES' DataBinding.DataField = 'OBSERVACIONES'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
ExplicitHeight = 228 ExplicitWidth = 600
ExplicitHeight = 20
Height = 228 Height = 228
end end
end end

View File

@ -93,6 +93,10 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor
DataBinding.FieldName = 'SITUACION' DataBinding.FieldName = 'SITUACION'
Width = 32 Width = 32
end end
object cxGridViewFORMA_PAGO: TcxGridDBColumn
Caption = 'Forma de pago'
DataBinding.FieldName = 'FORMA_PAGO'
end
object cxGridViewFECHA_FACTURA: TcxGridDBColumn object cxGridViewFECHA_FACTURA: TcxGridDBColumn
DataBinding.FieldName = 'FECHA_FACTURA' DataBinding.FieldName = 'FECHA_FACTURA'
PropertiesClassName = 'TcxDateEditProperties' PropertiesClassName = 'TcxDateEditProperties'

View File

@ -62,6 +62,7 @@ type
cxGridViewFECHA_VENCIMIENTO: TcxGridDBColumn; cxGridViewFECHA_VENCIMIENTO: TcxGridDBColumn;
cxGridViewRETENCION: TcxGridDBColumn; cxGridViewRETENCION: TcxGridDBColumn;
cxGridViewIMPORTE_RETENCION: TcxGridDBColumn; cxGridViewIMPORTE_RETENCION: TcxGridDBColumn;
cxGridViewFORMA_PAGO: TcxGridDBColumn;
procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
out AStyle: TcxStyle); out AStyle: TcxStyle);

View File

@ -45,6 +45,7 @@ type
function Eliminar(ARecibosCliente : IBizRecibosCliente; AllItems: Boolean = false): Boolean; function Eliminar(ARecibosCliente : IBizRecibosCliente; AllItems: Boolean = false): Boolean;
function AnadirPago(ARecibosCliente : IBizRecibosCliente; FechaPago: String =''; AIgnorarContabilidad : Integer = 1; AIdSubCuenta: Integer = 0; ASubCuenta: String = ''): Boolean; function AnadirPago(ARecibosCliente : IBizRecibosCliente; FechaPago: String =''; AIgnorarContabilidad : Integer = 1; AIdSubCuenta: Integer = 0; ASubCuenta: String = ''): Boolean;
function AnadirPagos(ARecibosCliente : IBizRecibosCliente; FechaPago: String =''; AIgnorarContabilidad : Integer = 1; AIdSubCuenta: Integer = 0; ASubCuenta: String = ''): Boolean;
procedure ModificarPago(ARecibosCliente : IBizRecibosCliente; FechaPago: String =''; AIgnorarContabilidad : Integer = 1; AIdSubCuenta: Integer = 0; ASubCuenta: String = ''); procedure ModificarPago(ARecibosCliente : IBizRecibosCliente; FechaPago: String =''; AIgnorarContabilidad : Integer = 1; AIdSubCuenta: Integer = 0; ASubCuenta: String = '');
function EliminarPago(ARecibosCliente : IBizRecibosCliente): Boolean; function EliminarPago(ARecibosCliente : IBizRecibosCliente): Boolean;
function EliminarTodo(ARecibosCliente : IBizRecibosCliente): Boolean; function EliminarTodo(ARecibosCliente : IBizRecibosCliente): Boolean;
@ -123,6 +124,7 @@ type
procedure RecuperarCliente(AReciboCliente : IBizRecibosCliente); procedure RecuperarCliente(AReciboCliente : IBizRecibosCliente);
procedure Anadir(ARecibosCliente : IBizRecibosCliente); procedure Anadir(ARecibosCliente : IBizRecibosCliente);
function AnadirPago(ARecibosCliente : IBizRecibosCliente; FechaPago: String =''; AIgnorarContabilidad : Integer = 1; AIdSubCuenta: Integer = 0; ASubCuenta: String = ''): Boolean; function AnadirPago(ARecibosCliente : IBizRecibosCliente; FechaPago: String =''; AIgnorarContabilidad : Integer = 1; AIdSubCuenta: Integer = 0; ASubCuenta: String = ''): Boolean;
function AnadirPagos(ARecibosCliente : IBizRecibosCliente; FechaPago: String =''; AIgnorarContabilidad : Integer = 1; AIdSubCuenta: Integer = 0; ASubCuenta: String = ''): Boolean;
procedure ModificarPago(ARecibosCliente : IBizRecibosCliente; FechaPago: String =''; AIgnorarContabilidad : Integer = 1; AIdSubCuenta: Integer = 0; ASubCuenta: String = ''); procedure ModificarPago(ARecibosCliente : IBizRecibosCliente; FechaPago: String =''; AIgnorarContabilidad : Integer = 1; AIdSubCuenta: Integer = 0; ASubCuenta: String = '');
function Eliminar(ARecibosCliente : IBizRecibosCliente; AllItems: Boolean = false): Boolean; function Eliminar(ARecibosCliente : IBizRecibosCliente; AllItems: Boolean = false): Boolean;
function EliminarPago(ARecibosCliente : IBizRecibosCliente): Boolean; function EliminarPago(ARecibosCliente : IBizRecibosCliente): Boolean;
@ -217,6 +219,23 @@ begin
end; end;
end; end;
function TRecibosClienteController.AnadirPagos(
ARecibosCliente: IBizRecibosCliente; FechaPago: String; AIgnorarContabilidad,
AIdSubCuenta: Integer; ASubCuenta: String): Boolean;
begin
if Assigned(ARecibosCliente) then
with ARecibosCliente.DataTable do
begin
First;
while not EOF do
begin
if (ARecibosCliente.SITUACION = CTE_PENDIENTE) then
Self.AnadirPago(ARecibosCliente, FechaPago, AIgnorarContabilidad, AIdSubCuenta, ASubCuenta);
Next;
end;
end;
end;
procedure TRecibosClienteController.AsignarDataModule; procedure TRecibosClienteController.AsignarDataModule;
begin begin
FDataModule := TDataModuleRecibosCliente.Create(Nil); FDataModule := TDataModuleRecibosCliente.Create(Nil);

View File

@ -405,6 +405,15 @@ inherited DataModuleRecibosCliente: TDataModuleRecibosCliente
Name = 'REFERENCIA_CONTRATO' Name = 'REFERENCIA_CONTRATO'
DataType = datString DataType = datString
Size = 255 Size = 255
end
item
Name = 'FECHA_PAGO'
DataType = datDateTime
end
item
Name = 'SUBCUENTA'
DataType = datString
Size = 255
end> end>
Params = <> Params = <>
StreamingOptions = [soDisableEventsWhileStreaming] StreamingOptions = [soDisableEventsWhileStreaming]

View File

@ -9,10 +9,10 @@ const
{ Data table rules ids { Data table rules ids
Feel free to change them to something more human readable Feel free to change them to something more human readable
but make sure they are unique in the context of your application } but make sure they are unique in the context of your application }
RID_ListaAnosRecibos = '{D5B6BF26-7BBC-47E0-B49F-E6F4D3B44319}'; RID_ListaAnosRecibos = '{2923957A-D068-4237-B223-2D9A29E62166}';
RID_RecibosCliente = '{B32FEACD-28B0-4FF2-8003-F5A89897D1B2}'; RID_RecibosCliente = '{6BA303A0-F7F4-49EE-A1C9-1F7593DC75D0}';
RID_PagosCliente = '{992BD3A1-1E54-4F16-9744-B8F6390D83C6}'; RID_PagosCliente = '{F177D453-F035-4169-90B3-87659AB92304}';
RID_RecibosCompensadosCli = '{745905DF-2406-47A4-953E-36D56DF294E3}'; RID_RecibosCompensadosCli = '{65A0935A-6F09-461F-BBB9-9BC6C4D699A4}';
{ Data table names } { Data table names }
nme_ListaAnosRecibos = 'ListaAnosRecibos'; nme_ListaAnosRecibos = 'ListaAnosRecibos';
@ -68,6 +68,8 @@ const
fld_RecibosClienteID_CONTRATO = 'ID_CONTRATO'; fld_RecibosClienteID_CONTRATO = 'ID_CONTRATO';
fld_RecibosClienteID_CON_FACTURA = 'ID_CON_FACTURA'; fld_RecibosClienteID_CON_FACTURA = 'ID_CON_FACTURA';
fld_RecibosClienteREFERENCIA_CONTRATO = 'REFERENCIA_CONTRATO'; fld_RecibosClienteREFERENCIA_CONTRATO = 'REFERENCIA_CONTRATO';
fld_RecibosClienteFECHA_PAGO = 'FECHA_PAGO';
fld_RecibosClienteSUBCUENTA = 'SUBCUENTA';
{ RecibosCliente field indexes } { RecibosCliente field indexes }
idx_RecibosClienteID = 0; idx_RecibosClienteID = 0;
@ -111,6 +113,8 @@ const
idx_RecibosClienteID_CONTRATO = 38; idx_RecibosClienteID_CONTRATO = 38;
idx_RecibosClienteID_CON_FACTURA = 39; idx_RecibosClienteID_CON_FACTURA = 39;
idx_RecibosClienteREFERENCIA_CONTRATO = 40; idx_RecibosClienteREFERENCIA_CONTRATO = 40;
idx_RecibosClienteFECHA_PAGO = 41;
idx_RecibosClienteSUBCUENTA = 42;
{ PagosCliente fields } { PagosCliente fields }
fld_PagosClienteID = 'ID'; fld_PagosClienteID = 'ID';
@ -235,7 +239,7 @@ const
type type
{ IListaAnosRecibos } { IListaAnosRecibos }
IListaAnosRecibos = interface(IDAStronglyTypedDataTable) IListaAnosRecibos = interface(IDAStronglyTypedDataTable)
['{D3C1EE97-0A4D-4B95-94FA-8F71079694AF}'] ['{7EC58276-B43B-46AA-A9F7-7F508A0938BC}']
{ Property getters and setters } { Property getters and setters }
function GetANOValue: String; function GetANOValue: String;
procedure SetANOValue(const aValue: String); procedure SetANOValue(const aValue: String);
@ -270,7 +274,7 @@ type
{ IRecibosCliente } { IRecibosCliente }
IRecibosCliente = interface(IDAStronglyTypedDataTable) IRecibosCliente = interface(IDAStronglyTypedDataTable)
['{29EF7928-3ACF-4AA1-985F-316885B0F742}'] ['{B8901349-7751-4A58-A1BE-7B75DA54BDD5}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -436,6 +440,14 @@ type
procedure SetREFERENCIA_CONTRATOValue(const aValue: String); procedure SetREFERENCIA_CONTRATOValue(const aValue: String);
function GetREFERENCIA_CONTRATOIsNull: Boolean; function GetREFERENCIA_CONTRATOIsNull: Boolean;
procedure SetREFERENCIA_CONTRATOIsNull(const aValue: Boolean); procedure SetREFERENCIA_CONTRATOIsNull(const aValue: Boolean);
function GetFECHA_PAGOValue: DateTime;
procedure SetFECHA_PAGOValue(const aValue: DateTime);
function GetFECHA_PAGOIsNull: Boolean;
procedure SetFECHA_PAGOIsNull(const aValue: Boolean);
function GetSUBCUENTAValue: String;
procedure SetSUBCUENTAValue(const aValue: String);
function GetSUBCUENTAIsNull: Boolean;
procedure SetSUBCUENTAIsNull(const aValue: Boolean);
{ Properties } { Properties }
@ -521,6 +533,10 @@ type
property ID_CON_FACTURAIsNull: Boolean read GetID_CON_FACTURAIsNull write SetID_CON_FACTURAIsNull; property ID_CON_FACTURAIsNull: Boolean read GetID_CON_FACTURAIsNull write SetID_CON_FACTURAIsNull;
property REFERENCIA_CONTRATO: String read GetREFERENCIA_CONTRATOValue write SetREFERENCIA_CONTRATOValue; property REFERENCIA_CONTRATO: String read GetREFERENCIA_CONTRATOValue write SetREFERENCIA_CONTRATOValue;
property REFERENCIA_CONTRATOIsNull: Boolean read GetREFERENCIA_CONTRATOIsNull write SetREFERENCIA_CONTRATOIsNull; property REFERENCIA_CONTRATOIsNull: Boolean read GetREFERENCIA_CONTRATOIsNull write SetREFERENCIA_CONTRATOIsNull;
property FECHA_PAGO: DateTime read GetFECHA_PAGOValue write SetFECHA_PAGOValue;
property FECHA_PAGOIsNull: Boolean read GetFECHA_PAGOIsNull write SetFECHA_PAGOIsNull;
property SUBCUENTA: String read GetSUBCUENTAValue write SetSUBCUENTAValue;
property SUBCUENTAIsNull: Boolean read GetSUBCUENTAIsNull write SetSUBCUENTAIsNull;
end; end;
{ TRecibosClienteDataTableRules } { TRecibosClienteDataTableRules }
@ -692,6 +708,14 @@ type
procedure SetREFERENCIA_CONTRATOValue(const aValue: String); virtual; procedure SetREFERENCIA_CONTRATOValue(const aValue: String); virtual;
function GetREFERENCIA_CONTRATOIsNull: Boolean; virtual; function GetREFERENCIA_CONTRATOIsNull: Boolean; virtual;
procedure SetREFERENCIA_CONTRATOIsNull(const aValue: Boolean); virtual; procedure SetREFERENCIA_CONTRATOIsNull(const aValue: Boolean); virtual;
function GetFECHA_PAGOValue: DateTime; virtual;
procedure SetFECHA_PAGOValue(const aValue: DateTime); virtual;
function GetFECHA_PAGOIsNull: Boolean; virtual;
procedure SetFECHA_PAGOIsNull(const aValue: Boolean); virtual;
function GetSUBCUENTAValue: String; virtual;
procedure SetSUBCUENTAValue(const aValue: String); virtual;
function GetSUBCUENTAIsNull: Boolean; virtual;
procedure SetSUBCUENTAIsNull(const aValue: Boolean); virtual;
{ Properties } { Properties }
property ID: Integer read GetIDValue write SetIDValue; property ID: Integer read GetIDValue write SetIDValue;
@ -776,6 +800,10 @@ type
property ID_CON_FACTURAIsNull: Boolean read GetID_CON_FACTURAIsNull write SetID_CON_FACTURAIsNull; property ID_CON_FACTURAIsNull: Boolean read GetID_CON_FACTURAIsNull write SetID_CON_FACTURAIsNull;
property REFERENCIA_CONTRATO: String read GetREFERENCIA_CONTRATOValue write SetREFERENCIA_CONTRATOValue; property REFERENCIA_CONTRATO: String read GetREFERENCIA_CONTRATOValue write SetREFERENCIA_CONTRATOValue;
property REFERENCIA_CONTRATOIsNull: Boolean read GetREFERENCIA_CONTRATOIsNull write SetREFERENCIA_CONTRATOIsNull; property REFERENCIA_CONTRATOIsNull: Boolean read GetREFERENCIA_CONTRATOIsNull write SetREFERENCIA_CONTRATOIsNull;
property FECHA_PAGO: DateTime read GetFECHA_PAGOValue write SetFECHA_PAGOValue;
property FECHA_PAGOIsNull: Boolean read GetFECHA_PAGOIsNull write SetFECHA_PAGOIsNull;
property SUBCUENTA: String read GetSUBCUENTAValue write SetSUBCUENTAValue;
property SUBCUENTAIsNull: Boolean read GetSUBCUENTAIsNull write SetSUBCUENTAIsNull;
public public
constructor Create(aDataTable: TDADataTable); override; constructor Create(aDataTable: TDADataTable); override;
@ -785,7 +813,7 @@ type
{ IPagosCliente } { IPagosCliente }
IPagosCliente = interface(IDAStronglyTypedDataTable) IPagosCliente = interface(IDAStronglyTypedDataTable)
['{08480DE6-29F3-4979-93F8-2C70BE75F582}'] ['{0ED35CB6-EBE6-4DC6-BEF1-A5A035A399A4}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -1024,7 +1052,7 @@ type
{ IRecibosCompensadosCli } { IRecibosCompensadosCli }
IRecibosCompensadosCli = interface(IDAStronglyTypedDataTable) IRecibosCompensadosCli = interface(IDAStronglyTypedDataTable)
['{33CEE61F-AA71-4B69-890D-B4A8730BF65F}'] ['{D6EBEA68-458A-4870-9D00-35D40782E532}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -2410,6 +2438,48 @@ begin
DataTable.Fields[idx_RecibosClienteREFERENCIA_CONTRATO].AsVariant := Null; DataTable.Fields[idx_RecibosClienteREFERENCIA_CONTRATO].AsVariant := Null;
end; end;
function TRecibosClienteDataTableRules.GetFECHA_PAGOValue: DateTime;
begin
result := DataTable.Fields[idx_RecibosClienteFECHA_PAGO].AsDateTime;
end;
procedure TRecibosClienteDataTableRules.SetFECHA_PAGOValue(const aValue: DateTime);
begin
DataTable.Fields[idx_RecibosClienteFECHA_PAGO].AsDateTime := aValue;
end;
function TRecibosClienteDataTableRules.GetFECHA_PAGOIsNull: boolean;
begin
result := DataTable.Fields[idx_RecibosClienteFECHA_PAGO].IsNull;
end;
procedure TRecibosClienteDataTableRules.SetFECHA_PAGOIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_RecibosClienteFECHA_PAGO].AsVariant := Null;
end;
function TRecibosClienteDataTableRules.GetSUBCUENTAValue: String;
begin
result := DataTable.Fields[idx_RecibosClienteSUBCUENTA].AsString;
end;
procedure TRecibosClienteDataTableRules.SetSUBCUENTAValue(const aValue: String);
begin
DataTable.Fields[idx_RecibosClienteSUBCUENTA].AsString := aValue;
end;
function TRecibosClienteDataTableRules.GetSUBCUENTAIsNull: boolean;
begin
result := DataTable.Fields[idx_RecibosClienteSUBCUENTA].IsNull;
end;
procedure TRecibosClienteDataTableRules.SetSUBCUENTAIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_RecibosClienteSUBCUENTA].AsVariant := Null;
end;
{ TPagosClienteDataTableRules } { TPagosClienteDataTableRules }
constructor TPagosClienteDataTableRules.Create(aDataTable: TDADataTable); constructor TPagosClienteDataTableRules.Create(aDataTable: TDADataTable);

View File

@ -9,15 +9,15 @@ const
{ Delta rules ids { Delta rules ids
Feel free to change them to something more human readable Feel free to change them to something more human readable
but make sure they are unique in the context of your application } but make sure they are unique in the context of your application }
RID_ListaAnosRecibosDelta = '{72D48DE9-24CF-46E8-851D-FFB3C34EF8A0}'; RID_ListaAnosRecibosDelta = '{F05CAFE8-C43F-4E9D-AA88-62F2B9E406EA}';
RID_RecibosClienteDelta = '{7C11BE84-F76A-4894-B7D2-2148A6A5FDB2}'; RID_RecibosClienteDelta = '{0883DCB0-8B4F-4577-A247-4D4AD216B31D}';
RID_PagosClienteDelta = '{7C905E12-6184-4266-A621-3082A0495D15}'; RID_PagosClienteDelta = '{57F40BC2-CE5A-4DE2-90CB-230F5A45E7F3}';
RID_RecibosCompensadosCliDelta = '{0CE1BC42-8D5A-4EA3-9E6F-E0158BD7F9B1}'; RID_RecibosCompensadosCliDelta = '{CB3E887F-CB3D-4A93-B22A-37F15431939D}';
type type
{ IListaAnosRecibosDelta } { IListaAnosRecibosDelta }
IListaAnosRecibosDelta = interface(IListaAnosRecibos) IListaAnosRecibosDelta = interface(IListaAnosRecibos)
['{72D48DE9-24CF-46E8-851D-FFB3C34EF8A0}'] ['{F05CAFE8-C43F-4E9D-AA88-62F2B9E406EA}']
{ Property getters and setters } { Property getters and setters }
function GetOldANOValue : String; function GetOldANOValue : String;
@ -51,7 +51,7 @@ type
{ IRecibosClienteDelta } { IRecibosClienteDelta }
IRecibosClienteDelta = interface(IRecibosCliente) IRecibosClienteDelta = interface(IRecibosCliente)
['{7C11BE84-F76A-4894-B7D2-2148A6A5FDB2}'] ['{0883DCB0-8B4F-4577-A247-4D4AD216B31D}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_RECIBO_COMPENSADOValue : Integer; function GetOldID_RECIBO_COMPENSADOValue : Integer;
@ -94,6 +94,8 @@ type
function GetOldID_CONTRATOValue : Integer; function GetOldID_CONTRATOValue : Integer;
function GetOldID_CON_FACTURAValue : Integer; function GetOldID_CON_FACTURAValue : Integer;
function GetOldREFERENCIA_CONTRATOValue : String; function GetOldREFERENCIA_CONTRATOValue : String;
function GetOldFECHA_PAGOValue : DateTime;
function GetOldSUBCUENTAValue : String;
{ Properties } { Properties }
property OldID : Integer read GetOldIDValue; property OldID : Integer read GetOldIDValue;
@ -137,6 +139,8 @@ type
property OldID_CONTRATO : Integer read GetOldID_CONTRATOValue; property OldID_CONTRATO : Integer read GetOldID_CONTRATOValue;
property OldID_CON_FACTURA : Integer read GetOldID_CON_FACTURAValue; property OldID_CON_FACTURA : Integer read GetOldID_CON_FACTURAValue;
property OldREFERENCIA_CONTRATO : String read GetOldREFERENCIA_CONTRATOValue; property OldREFERENCIA_CONTRATO : String read GetOldREFERENCIA_CONTRATOValue;
property OldFECHA_PAGO : DateTime read GetOldFECHA_PAGOValue;
property OldSUBCUENTA : String read GetOldSUBCUENTAValue;
end; end;
{ TRecibosClienteBusinessProcessorRules } { TRecibosClienteBusinessProcessorRules }
@ -390,6 +394,18 @@ type
function GetOldREFERENCIA_CONTRATOIsNull: Boolean; virtual; function GetOldREFERENCIA_CONTRATOIsNull: Boolean; virtual;
procedure SetREFERENCIA_CONTRATOValue(const aValue: String); virtual; procedure SetREFERENCIA_CONTRATOValue(const aValue: String); virtual;
procedure SetREFERENCIA_CONTRATOIsNull(const aValue: Boolean); virtual; procedure SetREFERENCIA_CONTRATOIsNull(const aValue: Boolean); virtual;
function GetFECHA_PAGOValue: DateTime; virtual;
function GetFECHA_PAGOIsNull: Boolean; virtual;
function GetOldFECHA_PAGOValue: DateTime; virtual;
function GetOldFECHA_PAGOIsNull: Boolean; virtual;
procedure SetFECHA_PAGOValue(const aValue: DateTime); virtual;
procedure SetFECHA_PAGOIsNull(const aValue: Boolean); virtual;
function GetSUBCUENTAValue: String; virtual;
function GetSUBCUENTAIsNull: Boolean; virtual;
function GetOldSUBCUENTAValue: String; virtual;
function GetOldSUBCUENTAIsNull: Boolean; virtual;
procedure SetSUBCUENTAValue(const aValue: String); virtual;
procedure SetSUBCUENTAIsNull(const aValue: Boolean); virtual;
{ Properties } { Properties }
property ID : Integer read GetIDValue write SetIDValue; property ID : Integer read GetIDValue write SetIDValue;
@ -556,6 +572,14 @@ type
property REFERENCIA_CONTRATOIsNull : Boolean read GetREFERENCIA_CONTRATOIsNull write SetREFERENCIA_CONTRATOIsNull; property REFERENCIA_CONTRATOIsNull : Boolean read GetREFERENCIA_CONTRATOIsNull write SetREFERENCIA_CONTRATOIsNull;
property OldREFERENCIA_CONTRATO : String read GetOldREFERENCIA_CONTRATOValue; property OldREFERENCIA_CONTRATO : String read GetOldREFERENCIA_CONTRATOValue;
property OldREFERENCIA_CONTRATOIsNull : Boolean read GetOldREFERENCIA_CONTRATOIsNull; property OldREFERENCIA_CONTRATOIsNull : Boolean read GetOldREFERENCIA_CONTRATOIsNull;
property FECHA_PAGO : DateTime read GetFECHA_PAGOValue write SetFECHA_PAGOValue;
property FECHA_PAGOIsNull : Boolean read GetFECHA_PAGOIsNull write SetFECHA_PAGOIsNull;
property OldFECHA_PAGO : DateTime read GetOldFECHA_PAGOValue;
property OldFECHA_PAGOIsNull : Boolean read GetOldFECHA_PAGOIsNull;
property SUBCUENTA : String read GetSUBCUENTAValue write SetSUBCUENTAValue;
property SUBCUENTAIsNull : Boolean read GetSUBCUENTAIsNull write SetSUBCUENTAIsNull;
property OldSUBCUENTA : String read GetOldSUBCUENTAValue;
property OldSUBCUENTAIsNull : Boolean read GetOldSUBCUENTAIsNull;
public public
constructor Create(aBusinessProcessor: TDABusinessProcessor); override; constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@ -565,7 +589,7 @@ type
{ IPagosClienteDelta } { IPagosClienteDelta }
IPagosClienteDelta = interface(IPagosCliente) IPagosClienteDelta = interface(IPagosCliente)
['{7C905E12-6184-4266-A621-3082A0495D15}'] ['{57F40BC2-CE5A-4DE2-90CB-230F5A45E7F3}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_RECIBOValue : Integer; function GetOldID_RECIBOValue : Integer;
@ -803,7 +827,7 @@ type
{ IRecibosCompensadosCliDelta } { IRecibosCompensadosCliDelta }
IRecibosCompensadosCliDelta = interface(IRecibosCompensadosCli) IRecibosCompensadosCliDelta = interface(IRecibosCompensadosCli)
['{0CE1BC42-8D5A-4EA3-9E6F-E0158BD7F9B1}'] ['{CB3E887F-CB3D-4A93-B22A-37F15431939D}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_RECIBO_COMPENSADOValue : Integer; function GetOldID_RECIBO_COMPENSADOValue : Integer;
@ -2609,6 +2633,68 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosClienteREFERENCIA_CONTRATO] := Null; BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosClienteREFERENCIA_CONTRATO] := Null;
end; end;
function TRecibosClienteBusinessProcessorRules.GetFECHA_PAGOValue: DateTime;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosClienteFECHA_PAGO];
end;
function TRecibosClienteBusinessProcessorRules.GetFECHA_PAGOIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosClienteFECHA_PAGO]);
end;
function TRecibosClienteBusinessProcessorRules.GetOldFECHA_PAGOValue: DateTime;
begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_RecibosClienteFECHA_PAGO];
end;
function TRecibosClienteBusinessProcessorRules.GetOldFECHA_PAGOIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_RecibosClienteFECHA_PAGO]);
end;
procedure TRecibosClienteBusinessProcessorRules.SetFECHA_PAGOValue(const aValue: DateTime);
begin
BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosClienteFECHA_PAGO] := aValue;
end;
procedure TRecibosClienteBusinessProcessorRules.SetFECHA_PAGOIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosClienteFECHA_PAGO] := Null;
end;
function TRecibosClienteBusinessProcessorRules.GetSUBCUENTAValue: String;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosClienteSUBCUENTA];
end;
function TRecibosClienteBusinessProcessorRules.GetSUBCUENTAIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosClienteSUBCUENTA]);
end;
function TRecibosClienteBusinessProcessorRules.GetOldSUBCUENTAValue: String;
begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_RecibosClienteSUBCUENTA];
end;
function TRecibosClienteBusinessProcessorRules.GetOldSUBCUENTAIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_RecibosClienteSUBCUENTA]);
end;
procedure TRecibosClienteBusinessProcessorRules.SetSUBCUENTAValue(const aValue: String);
begin
BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosClienteSUBCUENTA] := aValue;
end;
procedure TRecibosClienteBusinessProcessorRules.SetSUBCUENTAIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosClienteSUBCUENTA] := Null;
end;
{ TPagosClienteBusinessProcessorRules } { TPagosClienteBusinessProcessorRules }
constructor TPagosClienteBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); constructor TPagosClienteBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);

View File

@ -69,12 +69,13 @@ object srvRecibosCliente: TsrvRecibosCliente
'A, v_recibos_cliente.TIENDA, v_recibos_cliente.LISTA_NOMBRES,'#10' ' + 'A, v_recibos_cliente.TIENDA, v_recibos_cliente.LISTA_NOMBRES,'#10' ' +
' cont_subcuentas.descripcion as CUENTA_CONTABLE, v_recibos_clie' + ' cont_subcuentas.descripcion as CUENTA_CONTABLE, v_recibos_clie' +
'nte.ID_CONTRATO, v_recibos_cliente.ID_CON_FACTURA, v_recibos_cli' + 'nte.ID_CONTRATO, v_recibos_cliente.ID_CON_FACTURA, v_recibos_cli' +
'ente.REFERENCIA_CONTRATO'#10'from v_recibos_cliente'#10' left outer j' + 'ente.REFERENCIA_CONTRATO,'#10' v_recibos_cliente.FECHA_PAGO, v_re' +
'oin pagos_cliente pag on'#10' (pag.id_recibo = v_recibos_clie' + 'cibos_cliente.SUBCUENTA'#10'from v_recibos_cliente'#10' left outer jo' +
'nte.id)'#10' left outer join pagos_cliente pag2 on'#10' ((pag2' + 'in pagos_cliente pag on'#10' (pag.id_recibo = v_recibos_clien' +
'.id_recibo = pag.id_recibo) and (pag2.id > pag.id))'#10' left out' + 'te.id)'#10' left outer join pagos_cliente pag2 on'#10' ((pag2.' +
'er join cont_subcuentas on'#10' (cont_subcuentas.id = pag.cue' + 'id_recibo = pag.id_recibo) and (pag2.id > pag.id))'#10' left oute' +
'nta)'#10'where (pag2.id is null) and {Where}'#10 'r join cont_subcuentas on'#10' (cont_subcuentas.id = pag.cuen' +
'ta)'#10'where (pag2.id is null) and {Where}'#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = < ColumnMappings = <
item item
@ -241,6 +242,14 @@ object srvRecibosCliente: TsrvRecibosCliente
item item
DatasetField = 'ID_CONTRATO' DatasetField = 'ID_CONTRATO'
TableField = 'ID_CONTRATO' TableField = 'ID_CONTRATO'
end
item
DatasetField = 'FECHA_PAGO'
TableField = 'FECHA_PAGO'
end
item
DatasetField = 'SUBCUENTA'
TableField = 'SUBCUENTA'
end> end>
end> end>
Name = 'RecibosCliente' Name = 'RecibosCliente'
@ -475,6 +484,15 @@ object srvRecibosCliente: TsrvRecibosCliente
Name = 'REFERENCIA_CONTRATO' Name = 'REFERENCIA_CONTRATO'
DataType = datString DataType = datString
Size = 255 Size = 255
end
item
Name = 'FECHA_PAGO'
DataType = datDateTime
end
item
Name = 'SUBCUENTA'
DataType = datString
Size = 255
end> end>
end end
item item

View File

@ -10,6 +10,7 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
inherited JvNavPanelHeader: TJvNavPanelHeader inherited JvNavPanelHeader: TJvNavPanelHeader
Width = 885 Width = 885
Caption = 'Recibo de cliente' Caption = 'Recibo de cliente'
ExplicitTop = 49
ExplicitWidth = 885 ExplicitWidth = 885
inherited Image1: TImage inherited Image1: TImage
Left = 858 Left = 858
@ -60,21 +61,22 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
end end
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Width = 879 Width = 879
Height = 331 Height = 213
ActivePage = pagPagos ActivePage = pagPagos
OnChanging = pgPaginasChanging OnChanging = pgPaginasChanging
ExplicitTop = 109
ExplicitWidth = 879 ExplicitWidth = 879
ExplicitHeight = 331 ExplicitHeight = 213
inherited pagGeneral: TTabSheet inherited pagGeneral: TTabSheet
ExplicitLeft = 4 ExplicitLeft = 4
ExplicitTop = 24 ExplicitTop = 24
ExplicitWidth = 871 ExplicitWidth = 871
ExplicitHeight = 303 ExplicitHeight = 185
inline frViewReciboCliente1: TfrViewReciboCliente inline frViewReciboCliente1: TfrViewReciboCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 871 Width = 871
Height = 303 Height = 185
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -85,15 +87,15 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 871 ExplicitWidth = 871
ExplicitHeight = 303 ExplicitHeight = 185
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 871 Width = 871
Height = 303 Height = 185
ExplicitWidth = 871 ExplicitWidth = 871
ExplicitHeight = 303 ExplicitHeight = 185
DesignSize = ( DesignSize = (
871 871
303) 185)
inherited eReferencia: TcxDBTextEdit inherited eReferencia: TcxDBTextEdit
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
@ -309,64 +311,6 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
object pagPagos: TTabSheet object pagPagos: TTabSheet
Caption = 'Pagos' Caption = 'Pagos'
ImageIndex = 2 ImageIndex = 2
inline frViewPagosCliente1: TfrViewPagosCliente
Left = 0
Top = 0
Width = 871
Height = 303
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = []
ParentFont = False
TabOrder = 0
ReadOnly = False
ExplicitWidth = 871
ExplicitHeight = 303
inherited dxLayoutControl1: TdxLayoutControl
Width = 871
Height = 303
ExplicitWidth = 871
ExplicitHeight = 303
end
inherited dxLayoutControl2: TdxLayoutControl
Width = 871
Height = 303
ExplicitWidth = 871
ExplicitHeight = 303
inherited ToolBar1: TToolBar
Width = 684
ExplicitWidth = 684
end
inherited ListaPagosCliente: TcxGrid
Width = 684
Height = 256
ExplicitWidth = 684
ExplicitHeight = 256
inherited ListaPagosClienteDBTableView1: TcxGridDBTableView
inherited ListaPagosClienteDBTableView1TIPO: TcxGridDBColumn
IsCaptionAssigned = True
end
end
end
end
inherited ActionListContenido: TActionList
inherited actAnadir: TAction
OnExecute = frViewPagosCliente1actAnadirExecute
OnUpdate = frViewPagosCliente1actAnadirUpdate
end
inherited actModificar: TAction
OnExecute = frViewPagosCliente1actModificarExecute
OnUpdate = frViewPagosCliente1actModificarUpdate
end
inherited actEliminar: TAction
OnExecute = frViewPagosCliente1actEliminarExecute
OnUpdate = frViewPagosCliente1actEliminarUpdate
end
end
end
end end
object pagCompensados: TTabSheet object pagCompensados: TTabSheet
Caption = 'Recibos compensados' Caption = 'Recibos compensados'
@ -375,7 +319,7 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 871 Width = 871
Height = 303 Height = 185
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -386,12 +330,12 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 871 ExplicitWidth = 871
ExplicitHeight = 303 ExplicitHeight = 185
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Width = 871 Width = 871
Height = 278 Height = 160
ExplicitWidth = 871 ExplicitWidth = 871
ExplicitHeight = 278 ExplicitHeight = 128
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
DataController.Summary.FooterSummaryItems = < DataController.Summary.FooterSummaryItems = <
item item
@ -429,7 +373,7 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
end end
inline frViewReciboCliImportes1: TfrViewReciboCliImportes [4] inline frViewReciboCliImportes1: TfrViewReciboCliImportes [4]
Left = 0 Left = 0
Top = 443 Top = 325
Width = 885 Width = 885
Height = 100 Height = 100
Align = alBottom Align = alBottom
@ -441,7 +385,7 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
ParentFont = False ParentFont = False
TabOrder = 5 TabOrder = 5
ReadOnly = False ReadOnly = False
ExplicitTop = 443 ExplicitTop = 325
ExplicitWidth = 885 ExplicitWidth = 885
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 885 Width = 885
@ -463,21 +407,87 @@ inherited fEditorReciboCliente: TfEditorReciboCliente
end end
inherited PnlComentario: TPanel [5] inherited PnlComentario: TPanel [5]
Width = 885 Width = 885
ExplicitTop = 76
ExplicitWidth = 885 ExplicitWidth = 885
inherited lbComentario: TLabel inherited lbComentario: TLabel
Width = 875 Width = 875
Height = 25 Height = 25
end end
end end
inherited JvFormStorage: TJvFormStorage inline frViewPagosCliente1: TfrViewPagosCliente [6]
Left = 0
Top = 425
Width = 885
Height = 118
Align = alBottom
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = []
ParentFont = False
TabOrder = 6
ReadOnly = False
ExplicitTop = 425
ExplicitWidth = 885
ExplicitHeight = 118
inherited dxLayoutControl1: TdxLayoutControl
Width = 885
Height = 118
ExplicitWidth = 885
ExplicitHeight = 118
end
inherited dxLayoutControl2: TdxLayoutControl
Width = 885
Height = 118
ExplicitWidth = 885
ExplicitHeight = 118
inherited ToolBar1: TToolBar
Width = 684
ExplicitWidth = 684
end
inherited ListaPagosCliente: TcxGrid
Width = 684
Height = 256
ExplicitWidth = 684
ExplicitHeight = 256
inherited ListaPagosClienteDBTableView1: TcxGridDBTableView
inherited ListaPagosClienteDBTableView1TIPO: TcxGridDBColumn
IsCaptionAssigned = True
end
end
end
end
inherited ActionListContenido: TActionList
inherited actAnadir: TAction
OnExecute = frViewPagosCliente1actAnadirExecute
OnUpdate = frViewPagosCliente1actAnadirUpdate
end
inherited actModificar: TAction
OnExecute = frViewPagosCliente1actModificarExecute
OnUpdate = frViewPagosCliente1actModificarUpdate
end
inherited actEliminar: TAction
OnExecute = frViewPagosCliente1actEliminarExecute
OnUpdate = frViewPagosCliente1actEliminarUpdate
end
end
end
inherited SmallImages: TPngImageList [7]
end
inherited LargeImages: TPngImageList [8]
end
inherited JvFormStorage: TJvFormStorage [9]
OnSavePlacement = JvFormStorageSavePlacement OnSavePlacement = JvFormStorageSavePlacement
OnRestorePlacement = JvFormStorageRestorePlacement OnRestorePlacement = JvFormStorageRestorePlacement
end end
inherited dsDataTable: TDADataSource inherited dsDataTable: TDADataSource [10]
Left = 16 Left = 16
Top = 200 Top = 200
end end
inherited EditorActionList: TActionList [11] inherited JvAppRegistryStorage: TJvAppRegistryStorage [11]
end
inherited EditorActionList: TActionList
Top = 96 Top = 96
inherited actNuevo: TAction inherited actNuevo: TAction
Enabled = False Enabled = False

View File

@ -100,6 +100,7 @@ begin
//RECIBOS COMPENSADOS DESHABILITADOS //RECIBOS COMPENSADOS DESHABILITADOS
pagCompensados.TabVisible := False; pagCompensados.TabVisible := False;
pagPagos.TabVisible := False;
ViewRecibo := frViewReciboCliente1; ViewRecibo := frViewReciboCliente1;
end; end;
@ -196,7 +197,7 @@ end;
procedure TfEditorReciboCliente.frViewPagosCliente1actAnadirUpdate(Sender: TObject); procedure TfEditorReciboCliente.frViewPagosCliente1actAnadirUpdate(Sender: TObject);
begin begin
inherited; inherited;
(Sender as TAction).Enabled := not (Recibo.ID_RECIBO_COMPENSADO > 0); (Sender as TAction).Enabled := not (Recibo.ID_RECIBO_COMPENSADO > 0) and (FRecibo.Pagos.DataTable.RecordCount < 1)
end; end;
procedure TfEditorReciboCliente.frViewPagosCliente1actEliminarExecute(Sender: TObject); procedure TfEditorReciboCliente.frViewPagosCliente1actEliminarExecute(Sender: TObject);

View File

@ -59,12 +59,20 @@ inherited fEditorRecibosCliente: TfEditorRecibosCliente
ExplicitWidth = 645 ExplicitWidth = 645
end end
inherited TBXTMain2: TTBXToolbar inherited TBXTMain2: TTBXToolbar
Left = 431 Left = 437
DockPos = 437
Visible = True Visible = True
ExplicitLeft = 431 ExplicitLeft = 437
ExplicitWidth = 66 ExplicitWidth = 181
object TBXItem38: TTBXItem object TBXItem38: TTBXItem
Action = actInformes Action = actInformes
DisplayMode = nbdmImageAndText
end
object TBXSeparatorItem17: TTBXSeparatorItem
end
object TBXItem39: TTBXItem
Action = actCambioSituacion
DisplayMode = nbdmImageAndText
end end
end end
end end
@ -93,9 +101,9 @@ inherited fEditorRecibosCliente: TfEditorRecibosCliente
ExplicitHeight = 440 ExplicitHeight = 440
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Width = 645 Width = 645
Height = 312 Height = 319
ExplicitWidth = 645 ExplicitWidth = 645
ExplicitHeight = 312 ExplicitHeight = 319
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
DataController.Summary.DefaultGroupSummaryItems = < DataController.Summary.DefaultGroupSummaryItems = <
item item
@ -161,6 +169,30 @@ inherited fEditorRecibosCliente: TfEditorRecibosCliente
ExplicitWidth = 295 ExplicitWidth = 295
Width = 295 Width = 295
end end
inherited edtFecha2FinFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
inherited edtFecha2IniFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
inherited edtFecha3IniFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
inherited edtFecha3FinFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
end end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 645 Width = 645
@ -221,8 +253,15 @@ inherited fEditorRecibosCliente: TfEditorRecibosCliente
object actInformes: TAction object actInformes: TAction
Category = 'Archivo' Category = 'Archivo'
Caption = 'Informes' Caption = 'Informes'
ImageIndex = 23
OnExecute = actInformesExecute OnExecute = actInformesExecute
end end
object actCambioSituacion: TAction
Category = 'Archivo'
Caption = 'Cobrar recibo'
ImageIndex = 24
OnExecute = actCambioSituacionExecute
end
end end
inherited SmallImages: TPngImageList [5] inherited SmallImages: TPngImageList [5]
PngImages = < PngImages = <
@ -736,6 +775,121 @@ inherited fEditorRecibosCliente: TfEditorRecibosCliente
3E79D138E0990900FC7AC6454D6D985F0000000049454E44AE426082} 3E79D138E0990900FC7AC6454D6D985F0000000049454E44AE426082}
Name = 'PngImage22' Name = 'PngImage22'
Background = clWindow Background = clWindow
end
item
PngImage.Data = {
89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
610000000970485973000017120000171201679FD252000000EE4944415478DA
63FCFFFF3F0325801164C0D22D27C93225DAC79C116E00904350C3DF7FFF197E
FFF9CBF0EBF71F0687E02286733BA6116F00B2E645EB0E30CC5BBA09D3006E6E
6E86AF5FBF82696CE0F9ABB70CBF7FFF6558BEF930760308D90CD20C62AFD97E
0CBF01F85C72FDCE13864D7B4E127601369B7F81E97F0CDB0F9C26EC82B7EF3F
32080BF263B8E0D4C5BB0CFB8F5FC06DC02FA04D2836C2D848E2474E5FC61D0B
AFDEBC67101311C41AA047CFDE021B7AEAC2354C03423D4C08DA0C133F7FF526
A60101CE86446906B1AFDCBC836980B7BD1EC3920D0789CE071806F44E59485A
4E0202B80194000082585AF04025F9110000000049454E44AE426082}
Name = 'PngImage23'
Background = clWindow
end
item
PngImage.Data = {
89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
610000000970485973000017120000171201679FD25200000A4D694343505068
6F746F73686F70204943432070726F66696C65000078DA9D53775893F7163EDF
F7650F5642D8F0B1976C81002223AC08C81059A21092006184101240C585880A
561415119C4855C482D50A489D88E2A028B867418A885A8B555C38EE1FDCA7B5
7D7AEFEDEDFBD7FBBCE79CE7FCCE79CF0F8011122691E6A26A003952853C3AD8
1F8F4F48C4C9BD80021548E0042010E6CBC26705C50000F00379787E74B03FFC
01AF6F00020070D52E2412C7E1FF83BA50265700209100E02212E70B01905200
C82E54C81400C81800B053B3640A009400006C797C422200AA0D00ECF4493E05
00D8A993DC1700D8A21CA908008D0100992847240240BB00605581522C02C0C2
00A0AC40222E04C0AE018059B632470280BD0500768E58900F4060008099422C
CC0020380200431E13CD03204C03A030D2BFE0A95F7085B8480100C0CB95CD97
4BD23314B895D01A77F2F0E0E221E2C26CB142611729106609E4229C979B2313
48E7034CCE0C00001AF9D1C1FE383F90E7E6E4E1E666E76CEFF4C5A2FE6BF06F
223E21F1DFFEBC8C020400104ECFEFDA5FE5E5D60370C701B075BF6BA95B00DA
560068DFF95D33DB09A05A0AD07AF98B7938FC401E9EA150C83C1D1C0A0B0BED
2562A1BD30E38B3EFF33E16FE08B7EF6FC401EFEDB7AF000719A4099ADC0A383
FD71616E76AE528EE7CB0442316EF7E723FEC7857FFD8E29D1E234B15C2C158A
F15889B850224DC779B952914421C995E212E97F32F11F96FD0993770D00AC86
4FC04EB607B5CB6CC07EEE01028B0E58D27600407EF32D8C1A0B910010673432
79F7000093BFF98F402B0100CD97A4E30000BCE8185CA894174CC608000044A0
812AB041070CC114ACC00E9CC11DBCC01702610644400C24C03C104206E4801C
0AA11896411954C03AD804B5B0031AA0119AE110B4C131380DE7E0125C81EB70
170660189EC218BC86090441C8081361213A8811628ED822CE0817998E042261
48349280A420E988145122C5C872A402A9426A915D4823F22D7214398D5C40FA
90DBC820328AFC8ABC47319481B25103D4027540B9A81F1A8AC6A073D174340F
5D8096A26BD11AB41E3D80B6A2A7D14BE87574007D8A8E6380D1310E668CD961
5C8C87456089581A26C71663E55835568F35631D583776151BC09E61EF082402
8B8013EC085E8410C26C82909047584C5843A825EC23B412BA085709838431C2
272293A84FB4257A12F9C478623AB1905846AC26EE211E219E255E270E135F93
48240EC992E44E0A21259032490B496B48DB482DA453A43ED210699C4C26EB90
6DC9DEE408B280AC209791B7900F904F92FBC9C3E4B7143AC588E24C09A22452
A494124A35653FE504A59F324299A0AA51CDA99ED408AA883A9F5A496DA07650
2F5387A91334759A25CD9B1643CBA42DA3D5D09A696769F7682FE974BA09DD83
1E4597D097D26BE807E9E7E983F4770C0D860D83C7486228196B197B19A718B7
192F994CA605D39799C85430D7321B9967980F986F55582AF62A7C1591CA1295
3A9556957E95E7AA545573553FD579AA0B54AB550FAB5E567DA64655B350E3A9
09D416ABD5A91D55BBA936AECE5277528F50CF515FA3BE5FFD82FA630DB28685
46A08648A35463B7C6198D2116C63265F15842D6725603EB2C6B984D625BB2F9
EC4C7605FB1B762F7B4C534373AA66AC6691669DE671CD010EC6B1E0F039D99C
4ACE21CE0DCE7B2D032D3F2DB1D66AAD66AD7EAD37DA7ADABEDA62ED72ED16ED
EBDAEF75709D409D2C9DF53A6D3AF77509BA36BA51BA85BADB75CFEA3ED363EB
79E909F5CAF50EE9DDD147F56DF4A3F517EAEFD6EFD11F373034083690196C31
3863F0CC9063E86B9869B8D1F084E1A811CB68BA91C468A3D149A327B826EE87
67E33578173E66AC6F1C62AC34DE65DC6B3C61626932DBA4C4A4C5E4BE29CD94
6B9A66BAD1B4D374CCCCC82CDCACD8ACC9EC8E39D59C6B9E61BED9BCDBFC8D85
A5459CC54A8B368BC796DA967CCB05964D96F7AC98563E567956F556D7AC49D6
5CEB2CEB6DD6576C501B579B0C9B3A9BCBB6A8AD9BADC4769B6DDF14E2148F29
D229F5536EDA31ECFCEC0AEC9AEC06ED39F661F625F66DF6CF1DCC1C121DD63B
743B7C727475CC766C70BCEBA4E134C3A9C4A9C3E957671B67A1739DF33517A6
4B90CB1297769717536DA78AA76E9F7ACB95E51AEEBAD2B5D3F5A39BBB9BDCAD
D96DD4DDCC3DC57DABFB4D2E9B1BC95DC33DEF41F4F0F758E271CCE39DA79BA7
C2F390E72F5E765E595EFBBD1E4FB39C269ED6306DC8DBC45BE0BDCB7B603A3E
3D65FACEE9033EC63E029F7A9F87BEA6BE22DF3DBE237ED67E997E07FC9EFB3B
FACBFD8FF8BFE179F216F14E056001C101E501BD811A81B3036B031F049904A5
0735058D05BB062F0C3E15420C090D591F72936FC017F21BF96333DC672C9AD1
15CA089D155A1BFA30CC264C1ED6118E86CF08DF107E6FA6F94CE9CCB60888E0
476C88B81F69199917F97D14292A32AA2EEA51B453747174F72CD6ACE459FB67
BD8EF18FA98CB93BDB6AB6727667AC6A6C526C63EC9BB880B8AAB8817887F845
F1971274132409ED89E4C4D8C43D89E37302E76C9A339CE49A54967463AEE5DC
A2B917E6E9CECB9E773C593559907C3885981297B23FE5832042502F184FE5A7
6E4D1D13F2849B854F45BEA28DA251B1B7B84A3C92E69D5695F638DD3B7D43FA
68864F4675C633094F522B79911992B923F34D5644D6DEACCFD971D92D39949C
949CA3520D6996B42BD730B728B74F662B2B930DE479E66DCA1B9387CAF7E423
F973F3DB156C854CD1A3B452AE500E164C2FA82B785B185B78B848BD485AD433
DF66FEEAF9230B82167CBD90B050B8B0B3D8B87859F1E022BF45BB16238B5317
772E315D52BA647869F0D27DCB68CBB296FD50E2585255F26A79DCF28E5283D2
A5A5432B82573495A994C9CB6EAEF45AB9631561956455EF6A97D55B567F2A17
955FAC70ACA8AEF8B046B8E6E2574E5FD57CF5796DDADADE4AB7CAEDEB48EBA4
EB6EACF759BFAF4ABD6A41D5D086F00DAD1BF18DE51B5F6D4ADE74A17A6AF58E
CDB4CDCACD03356135ED5BCCB6ACDBF2A136A3F67A9D7F5DCB56FDADABB7BED9
26DAD6BFDD777BF30E831D153BDEEF94ECBCB52B78576BBD457DF56ED2EE82DD
8F1A621BBABFE67EDDB847774FC59E8F7BA57B07F645EFEB6A746F6CDCAFBFBF
B2096D52368D1E483A70E59B806FDA9BED9A77B5705A2A0EC241E5C127DFA67C
7BE350E8A1CEC3DCC3CDDF997FB7F508EB48792BD23ABF75AC2DA36DA03DA1BD
EFE88CA39D1D5E1D47BEB7FF7EEF31E36375C7358F579EA09D283DF1F9E48293
E3A764A79E9D4E3F3DD499DC79F74CFC996B5D515DBD6743CF9E3F1774EE4CB7
5FF7C9F3DEE78F5DF0BC70F422F762DB25B74BAD3DAE3D477E70FDE148AF5B6F
EB65F7CBED573CAE74F44DEB3BD1EFD37FFA6AC0D573D7F8D72E5D9F79BDEFC6
EC1BB76E26DD1CB825BAF5F876F6ED17770AEE4CDC5D7A8F78AFFCBEDAFDEA07
FA0FEA7FB4FEB165C06DE0F860C060CFC3590FEF0E09879EFE94FFD387E1D247
CC47D52346238D8F9D1F1F1B0D1ABDF264CE93E1A7B2A713CFCA7E56FF79EB73
ABE7DFFDE2FB4BCF58FCD8F00BF98BCFBFAE79A9F372EFABA9AF3AC723C71FBC
CE793DF1A6FCADCEDB7DEFB8EFBADFC7BD1F9928FC40FE50F3D1FA63C7A7D04F
F73EE77CFEFC2FF784F3FB25D29F330000012D4944415478DA63FCFFFF3F0325
80916203966D3945B60991DEA68C6003B42CC41852B26F6355F4E7E77F86DFDF
FE31FCFEFC97E1FBFBDF60F68E73460C89D19D0CE7764C4318000230434E2E77
C63048416B135C3308A018D0B7F8235C214CB30CFF5E880B3E3F6278F12F11CC
16175BC3F0FFF76F06865F7F18E4EC4E103600A41904600688092E076B66001A
22E77C16BB01BFBEFC6338BFD915C30BC89A19FFFC619075BF881A0620FF8334
FFFAF297E1D75760A07DF9C3B032A610670C641FF64018D03D793E8682A9B63B
184C53EA197E89A933309DE86638BFEF3CC3DC7DCF19A6B478C1D973F67E6764
C465C3B116C5D003AFD556DDBD7C10AB7CB293649865F5BDD5F80CF84FB10B80
D42A9042AABA00A4D1AAE6FE6A901A503E22D90573F7FD80EB011B40696E0400
A0BEE1E16734A0290000000049454E44AE426082}
Name = 'PngImage24'
Background = clWindow
end> end>
Bitmap = {} Bitmap = {}
end end

View File

@ -47,10 +47,14 @@ type
JSInformesDialog: TJSDialog; JSInformesDialog: TJSDialog;
actInformes: TAction; actInformes: TAction;
TBXItem38: TTBXItem; TBXItem38: TTBXItem;
actCambioSituacion: TAction;
TBXSeparatorItem17: TTBXSeparatorItem;
TBXItem39: TTBXItem;
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
procedure actEliminarUpdate(Sender: TObject); procedure actEliminarUpdate(Sender: TObject);
procedure actInformesExecute(Sender: TObject); procedure actInformesExecute(Sender: TObject);
procedure OnListaAnosChange(Sender: TObject; const Text: string); procedure OnListaAnosChange(Sender: TObject; const Text: string);
procedure actCambioSituacionExecute(Sender: TObject);
private private
FRecibosCliente: IBizRecibosCliente; FRecibosCliente: IBizRecibosCliente;
@ -82,7 +86,7 @@ type
implementation implementation
uses uses
uDataModuleRecibosCliente, uDataModuleUsuarios, uFactuGES_App, uDataModuleRecibosCliente, uDataModuleUsuarios, uFactuGES_App, uEditorFechaPago,
uGridUtils, uDBSelectionListUtils, uGestorInformesController; uGridUtils, uDBSelectionListUtils, uGestorInformesController;
{$R *.dfm} {$R *.dfm}
@ -90,6 +94,69 @@ uses
{ {
*************************** TfEditorRecibosCliente *************************** *************************** TfEditorRecibosCliente ***************************
} }
procedure TfEditorRecibosCliente.actCambioSituacionExecute(Sender: TObject);
var
AFechaPago: String;
AIgnorarContabilidad: Integer;
AIdSubCuenta: Integer;
ASubCuenta: String;
ARecibos: IBizRecibosCliente;
AllItems: Boolean;
begin
inherited;
ARecibos := Nil;
AllItems := False;
if MultiSelect and Assigned(ViewGrid) then
AllItems := (ViewGrid.NumSeleccionados > 1);
if AllItems then
begin
if (Application.MessageBox('¿Desea cambiar a pagados los recibos de cliente seleccionados, en caso de tener recibos ya pagados en la selección, estos no serán modificados?', 'Atención', MB_YESNO) = IDYES) then
begin
SeleccionarFilasDesdeGrid(ViewGrid._FocusedView, (RecibosCliente as ISeleccionable).SelectedRecords);
ARecibos := (Controller as IRecibosClienteController).ExtraerSeleccionados(RecibosCliente) as IBizRecibosCliente;
end
else
exit;
end
else begin
ARecibos := Controller.Buscar(RecibosCliente.ID);
ARecibos.DataTable.active := True;
end;
with TfEditorFechaPago.Create(Nil) do
begin
if (ShowModal = mrOk) then
begin
AFechaPago := DateToStr(FechaPago);
AIgnorarContabilidad := IgnorarContabilidad;
AIdSubCuenta := IdSubcuenta;
ASubCuenta := frViewListaSubcuentas1.cbSubCuentas.Text;
Release;
end
else
begin
//Operación cancelada
Release;
exit;
end;
end;
if Assigned(ARecibos) then
begin
ViewGrid._Grid.BeginUpdate;
ViewGrid._Grid.EndUpdate;
FController.AnadirPagos(ARecibos, AFechaPago, AIgnorarContabilidad, AIdSubCuenta, ASubCuenta);
FController.Guardar(ARecibos);
actRefrescar.Execute;
ViewGrid._Grid.EndUpdate;
end;
end;
procedure TfEditorRecibosCliente.actEliminarUpdate(Sender: TObject); procedure TfEditorRecibosCliente.actEliminarUpdate(Sender: TObject);
begin begin
inherited; inherited;

View File

@ -1,14 +1,14 @@
inherited frViewPagosCliente: TfrViewPagosCliente inherited frViewPagosCliente: TfrViewPagosCliente
Width = 666 Width = 666
Height = 401 Height = 130
OnShow = CustomViewShow OnShow = CustomViewShow
ExplicitWidth = 666 ExplicitWidth = 666
ExplicitHeight = 401 ExplicitHeight = 130
object dxLayoutControl1: TdxLayoutControl object dxLayoutControl1: TdxLayoutControl
Left = 0 Left = 0
Top = 0 Top = 0
Width = 666 Width = 666
Height = 401 Height = 130
Margins.Left = 0 Margins.Left = 0
Margins.Top = 0 Margins.Top = 0
Margins.Right = 0 Margins.Right = 0
@ -19,6 +19,7 @@ inherited frViewPagosCliente: TfrViewPagosCliente
TabStop = False TabStop = False
AutoContentSizes = [acsWidth, acsHeight] AutoContentSizes = [acsWidth, acsHeight]
LookAndFeel = dxLayoutOfficeLookAndFeel1 LookAndFeel = dxLayoutOfficeLookAndFeel1
ExplicitHeight = 401
object dxLayoutGroup1: TdxLayoutGroup object dxLayoutGroup1: TdxLayoutGroup
ShowCaption = False ShowCaption = False
Hidden = True Hidden = True
@ -29,13 +30,14 @@ inherited frViewPagosCliente: TfrViewPagosCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 666 Width = 666
Height = 401 Height = 130
Align = alClient Align = alClient
ParentBackground = True ParentBackground = True
TabOrder = 1 TabOrder = 1
TabStop = False TabStop = False
AutoContentSizes = [acsWidth, acsHeight] AutoContentSizes = [acsWidth, acsHeight]
LookAndFeel = dxLayoutOfficeLookAndFeel1 LookAndFeel = dxLayoutOfficeLookAndFeel1
ExplicitHeight = 401
object ToolBar1: TToolBar object ToolBar1: TToolBar
Left = 22 Left = 22
Top = 30 Top = 30
@ -83,9 +85,9 @@ inherited frViewPagosCliente: TfrViewPagosCliente
object ListaPagosCliente: TcxGrid object ListaPagosCliente: TcxGrid
Left = 22 Left = 22
Top = 61 Top = 61
Width = 605 Width = 622
Height = 262 Height = 150
Align = alClient Align = alBottom
Enabled = False Enabled = False
TabOrder = 1 TabOrder = 1
LookAndFeel.Kind = lfStandard LookAndFeel.Kind = lfStandard

View File

@ -118,6 +118,10 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
VisibleForCustomization = False VisibleForCustomization = False
Width = 40 Width = 40
end end
object cxGridViewFECHA_PAGO: TcxGridDBColumn
Caption = 'Fecha de cobro'
DataBinding.FieldName = 'FECHA_PAGO'
end
object cxGridViewDESCRIPCION: TcxGridDBColumn object cxGridViewDESCRIPCION: TcxGridDBColumn
Caption = 'Descripci'#243'n' Caption = 'Descripci'#243'n'
DataBinding.FieldName = 'DESCRIPCION' DataBinding.FieldName = 'DESCRIPCION'
@ -216,6 +220,13 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
Caption = 'Ref. presupuesto' Caption = 'Ref. presupuesto'
DataBinding.FieldName = 'REFERENCIA_CONTRATO' DataBinding.FieldName = 'REFERENCIA_CONTRATO'
end end
object cxGridViewSUBCUENTA: TcxGridDBColumn
Caption = 'Cuenta'
DataBinding.FieldName = 'SUBCUENTA'
PropertiesClassName = 'TcxTextEditProperties'
Properties.Alignment.Horz = taRightJustify
HeaderAlignmentHorz = taRightJustify
end
end end
inherited cxGridLevel: TcxGridLevel inherited cxGridLevel: TcxGridLevel
Caption = 'Todos' Caption = 'Todos'
@ -294,12 +305,8 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group_Root: TdxLayoutGroup
inherited dxLayoutControl1Group2: TdxLayoutGroup inherited dxLayoutControl1Group2: TdxLayoutGroup
Enabled = False Enabled = False
Visible = False
Hidden = False Hidden = False
end end
inherited dxLayoutControl1Group4: TdxLayoutGroup
Visible = False
end
end end
end end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel inherited TBXAlignmentPanel1: TTBXAlignmentPanel

View File

@ -60,6 +60,8 @@ type
cxGridViewCUENTA_CONTABLE: TcxGridDBColumn; cxGridViewCUENTA_CONTABLE: TcxGridDBColumn;
cxGridViewLISTA_NOMBRES: TcxGridDBColumn; cxGridViewLISTA_NOMBRES: TcxGridDBColumn;
cxGridViewREFERENCIA_CONTRATO: TcxGridDBColumn; cxGridViewREFERENCIA_CONTRATO: TcxGridDBColumn;
cxGridViewFECHA_PAGO: TcxGridDBColumn;
cxGridViewSUBCUENTA: TcxGridDBColumn;
procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
out AStyle: TcxStyle); out AStyle: TcxStyle);

View File

@ -43,6 +43,7 @@ type
procedure Anadir(ARecibosProveedor : IBizRecibosProveedor); procedure Anadir(ARecibosProveedor : IBizRecibosProveedor);
function AnadirPago(ARecibosProveedor : IBizRecibosProveedor; FechaPago: String =''; AIgnorarContabilidad: Integer = 1; AIdSubCuenta: Integer = 0; ASubCuenta: String = ''): Boolean; function AnadirPago(ARecibosProveedor : IBizRecibosProveedor; FechaPago: String =''; AIgnorarContabilidad: Integer = 1; AIdSubCuenta: Integer = 0; ASubCuenta: String = ''): Boolean;
function AnadirPagos(ARecibosProveedor : IBizRecibosProveedor; FechaPago: String =''; AIgnorarContabilidad: Integer = 1; AIdSubCuenta: Integer = 0; ASubCuenta: String = ''): Boolean;
procedure ModificarPago(ARecibosProveedor : IBizRecibosProveedor; FechaPago: String =''; AIgnorarContabilidad : Integer = 1; AIdSubCuenta: Integer = 0; ASubCuenta: String = ''); procedure ModificarPago(ARecibosProveedor : IBizRecibosProveedor; FechaPago: String =''; AIgnorarContabilidad : Integer = 1; AIdSubCuenta: Integer = 0; ASubCuenta: String = '');
function Eliminar(ARecibosProveedor : IBizRecibosProveedor; AllItems: Boolean = false): Boolean; function Eliminar(ARecibosProveedor : IBizRecibosProveedor; AllItems: Boolean = false): Boolean;
function EliminarPago(ARecibosProveedor : IBizRecibosProveedor): Boolean; function EliminarPago(ARecibosProveedor : IBizRecibosProveedor): Boolean;
@ -115,6 +116,7 @@ type
procedure RecuperarProveedor(AReciboProveedor : IBizRecibosProveedor); procedure RecuperarProveedor(AReciboProveedor : IBizRecibosProveedor);
procedure Anadir(ARecibosProveedor : IBizRecibosProveedor); procedure Anadir(ARecibosProveedor : IBizRecibosProveedor);
function AnadirPago(ARecibosProveedor : IBizRecibosProveedor; FechaPago: String =''; AIgnorarContabilidad: Integer = 1; AIdSubCuenta: Integer = 0; ASubCuenta: String = ''): Boolean; function AnadirPago(ARecibosProveedor : IBizRecibosProveedor; FechaPago: String =''; AIgnorarContabilidad: Integer = 1; AIdSubCuenta: Integer = 0; ASubCuenta: String = ''): Boolean;
function AnadirPagos(ARecibosProveedor : IBizRecibosProveedor; FechaPago: String =''; AIgnorarContabilidad: Integer = 1; AIdSubCuenta: Integer = 0; ASubCuenta: String = ''): Boolean;
procedure ModificarPago(ARecibosProveedor : IBizRecibosProveedor; FechaPago: String =''; AIgnorarContabilidad : Integer = 1; AIdSubCuenta: Integer = 0; ASubCuenta: String = ''); procedure ModificarPago(ARecibosProveedor : IBizRecibosProveedor; FechaPago: String =''; AIgnorarContabilidad : Integer = 1; AIdSubCuenta: Integer = 0; ASubCuenta: String = '');
function Eliminar(ARecibosProveedor : IBizRecibosProveedor; AllItems: Boolean = false): Boolean; function Eliminar(ARecibosProveedor : IBizRecibosProveedor; AllItems: Boolean = false): Boolean;
function EliminarPago(ARecibosProveedor : IBizRecibosProveedor): Boolean; function EliminarPago(ARecibosProveedor : IBizRecibosProveedor): Boolean;
@ -205,6 +207,23 @@ begin
end; end;
end; end;
function TRecibosProveedorController.AnadirPagos(
ARecibosProveedor: IBizRecibosProveedor; FechaPago: String;
AIgnorarContabilidad, AIdSubCuenta: Integer; ASubCuenta: String): Boolean;
begin
if Assigned(ARecibosProveedor) then
with ARecibosProveedor.DataTable do
begin
First;
while not EOF do
begin
if (ARecibosProveedor.SITUACION = CTE_PENDIENTE) then
Self.AnadirPago(ARecibosProveedor, FechaPago, AIgnorarContabilidad, AIdSubCuenta, ASubCuenta);
Next;
end;
end;
end;
procedure TRecibosProveedorController.AsignarDataModule; procedure TRecibosProveedorController.AsignarDataModule;
begin begin
FDataModule := TDataModuleRecibosProveedor.Create(Nil); FDataModule := TDataModuleRecibosProveedor.Create(Nil);

View File

@ -584,6 +584,15 @@ inherited DataModuleRecibosProveedor: TDataModuleRecibosProveedor
Name = 'TIENDA' Name = 'TIENDA'
DataType = datString DataType = datString
Size = 255 Size = 255
end
item
Name = 'FECHA_PAGO'
DataType = datDateTime
end
item
Name = 'SUBCUENTA'
DataType = datString
Size = 255
end> end>
Params = <> Params = <>
StreamingOptions = [soDisableEventsWhileStreaming] StreamingOptions = [soDisableEventsWhileStreaming]

View File

@ -9,10 +9,10 @@ const
{ Data table rules ids { Data table rules ids
Feel free to change them to something more human readable Feel free to change them to something more human readable
but make sure they are unique in the context of your application } but make sure they are unique in the context of your application }
RID_ListaAnosRecibos = '{FDCECB7A-F380-4768-B4DD-BB7B099545B0}'; RID_ListaAnosRecibos = '{97AAE0FA-D3DF-4008-B070-A3015CC189F9}';
RID_RecibosCompensadosProv = '{5E1F3780-C4F1-4D78-A90D-7B4864BB534F}'; RID_RecibosCompensadosProv = '{4CB8497B-1BEB-4DE9-94B9-5E42284456AE}';
RID_RecibosProveedor = '{7C35903F-1550-47CC-8F7B-6653C6111C6F}'; RID_RecibosProveedor = '{151C8D3D-E3FC-47A4-BE6F-3A415A106120}';
RID_PagosProveedor = '{0769FC25-A19C-4585-91C9-CAA2733EBC94}'; RID_PagosProveedor = '{3711DD41-9259-4E70-AB01-30D8877B4B7E}';
{ Data table names } { Data table names }
nme_ListaAnosRecibos = 'ListaAnosRecibos'; nme_ListaAnosRecibos = 'ListaAnosRecibos';
@ -148,6 +148,8 @@ const
fld_RecibosProveedorUSUARIO = 'USUARIO'; fld_RecibosProveedorUSUARIO = 'USUARIO';
fld_RecibosProveedorID_TIENDA = 'ID_TIENDA'; fld_RecibosProveedorID_TIENDA = 'ID_TIENDA';
fld_RecibosProveedorTIENDA = 'TIENDA'; fld_RecibosProveedorTIENDA = 'TIENDA';
fld_RecibosProveedorFECHA_PAGO = 'FECHA_PAGO';
fld_RecibosProveedorSUBCUENTA = 'SUBCUENTA';
{ RecibosProveedor field indexes } { RecibosProveedor field indexes }
idx_RecibosProveedorID = 0; idx_RecibosProveedorID = 0;
@ -189,6 +191,8 @@ const
idx_RecibosProveedorUSUARIO = 36; idx_RecibosProveedorUSUARIO = 36;
idx_RecibosProveedorID_TIENDA = 37; idx_RecibosProveedorID_TIENDA = 37;
idx_RecibosProveedorTIENDA = 38; idx_RecibosProveedorTIENDA = 38;
idx_RecibosProveedorFECHA_PAGO = 39;
idx_RecibosProveedorSUBCUENTA = 40;
{ PagosProveedor fields } { PagosProveedor fields }
fld_PagosProveedorID = 'ID'; fld_PagosProveedorID = 'ID';
@ -233,7 +237,7 @@ const
type type
{ IListaAnosRecibos } { IListaAnosRecibos }
IListaAnosRecibos = interface(IDAStronglyTypedDataTable) IListaAnosRecibos = interface(IDAStronglyTypedDataTable)
['{240A3304-8A4A-437C-B507-EA3C29B09E34}'] ['{7BBFD3EA-3A1F-49D8-BC66-6EF128836528}']
{ Property getters and setters } { Property getters and setters }
function GetANOValue: String; function GetANOValue: String;
procedure SetANOValue(const aValue: String); procedure SetANOValue(const aValue: String);
@ -268,7 +272,7 @@ type
{ IRecibosCompensadosProv } { IRecibosCompensadosProv }
IRecibosCompensadosProv = interface(IDAStronglyTypedDataTable) IRecibosCompensadosProv = interface(IDAStronglyTypedDataTable)
['{E9748134-4CD2-4393-9ADC-F9B017F89E8D}'] ['{04E42180-C48E-4724-BA02-1B93D6251CCD}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -759,7 +763,7 @@ type
{ IRecibosProveedor } { IRecibosProveedor }
IRecibosProveedor = interface(IDAStronglyTypedDataTable) IRecibosProveedor = interface(IDAStronglyTypedDataTable)
['{672FBDB0-2292-4F6E-9FA1-ACCE04B8A41F}'] ['{52D22B65-BCBF-4AF8-919B-7AFBF217853C}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -917,6 +921,14 @@ type
procedure SetTIENDAValue(const aValue: String); procedure SetTIENDAValue(const aValue: String);
function GetTIENDAIsNull: Boolean; function GetTIENDAIsNull: Boolean;
procedure SetTIENDAIsNull(const aValue: Boolean); procedure SetTIENDAIsNull(const aValue: Boolean);
function GetFECHA_PAGOValue: DateTime;
procedure SetFECHA_PAGOValue(const aValue: DateTime);
function GetFECHA_PAGOIsNull: Boolean;
procedure SetFECHA_PAGOIsNull(const aValue: Boolean);
function GetSUBCUENTAValue: String;
procedure SetSUBCUENTAValue(const aValue: String);
function GetSUBCUENTAIsNull: Boolean;
procedure SetSUBCUENTAIsNull(const aValue: Boolean);
{ Properties } { Properties }
@ -998,6 +1010,10 @@ type
property ID_TIENDAIsNull: Boolean read GetID_TIENDAIsNull write SetID_TIENDAIsNull; property ID_TIENDAIsNull: Boolean read GetID_TIENDAIsNull write SetID_TIENDAIsNull;
property TIENDA: String read GetTIENDAValue write SetTIENDAValue; property TIENDA: String read GetTIENDAValue write SetTIENDAValue;
property TIENDAIsNull: Boolean read GetTIENDAIsNull write SetTIENDAIsNull; property TIENDAIsNull: Boolean read GetTIENDAIsNull write SetTIENDAIsNull;
property FECHA_PAGO: DateTime read GetFECHA_PAGOValue write SetFECHA_PAGOValue;
property FECHA_PAGOIsNull: Boolean read GetFECHA_PAGOIsNull write SetFECHA_PAGOIsNull;
property SUBCUENTA: String read GetSUBCUENTAValue write SetSUBCUENTAValue;
property SUBCUENTAIsNull: Boolean read GetSUBCUENTAIsNull write SetSUBCUENTAIsNull;
end; end;
{ TRecibosProveedorDataTableRules } { TRecibosProveedorDataTableRules }
@ -1161,6 +1177,14 @@ type
procedure SetTIENDAValue(const aValue: String); virtual; procedure SetTIENDAValue(const aValue: String); virtual;
function GetTIENDAIsNull: Boolean; virtual; function GetTIENDAIsNull: Boolean; virtual;
procedure SetTIENDAIsNull(const aValue: Boolean); virtual; procedure SetTIENDAIsNull(const aValue: Boolean); virtual;
function GetFECHA_PAGOValue: DateTime; virtual;
procedure SetFECHA_PAGOValue(const aValue: DateTime); virtual;
function GetFECHA_PAGOIsNull: Boolean; virtual;
procedure SetFECHA_PAGOIsNull(const aValue: Boolean); virtual;
function GetSUBCUENTAValue: String; virtual;
procedure SetSUBCUENTAValue(const aValue: String); virtual;
function GetSUBCUENTAIsNull: Boolean; virtual;
procedure SetSUBCUENTAIsNull(const aValue: Boolean); virtual;
{ Properties } { Properties }
property ID: Integer read GetIDValue write SetIDValue; property ID: Integer read GetIDValue write SetIDValue;
@ -1241,6 +1265,10 @@ type
property ID_TIENDAIsNull: Boolean read GetID_TIENDAIsNull write SetID_TIENDAIsNull; property ID_TIENDAIsNull: Boolean read GetID_TIENDAIsNull write SetID_TIENDAIsNull;
property TIENDA: String read GetTIENDAValue write SetTIENDAValue; property TIENDA: String read GetTIENDAValue write SetTIENDAValue;
property TIENDAIsNull: Boolean read GetTIENDAIsNull write SetTIENDAIsNull; property TIENDAIsNull: Boolean read GetTIENDAIsNull write SetTIENDAIsNull;
property FECHA_PAGO: DateTime read GetFECHA_PAGOValue write SetFECHA_PAGOValue;
property FECHA_PAGOIsNull: Boolean read GetFECHA_PAGOIsNull write SetFECHA_PAGOIsNull;
property SUBCUENTA: String read GetSUBCUENTAValue write SetSUBCUENTAValue;
property SUBCUENTAIsNull: Boolean read GetSUBCUENTAIsNull write SetSUBCUENTAIsNull;
public public
constructor Create(aDataTable: TDADataTable); override; constructor Create(aDataTable: TDADataTable); override;
@ -1250,7 +1278,7 @@ type
{ IPagosProveedor } { IPagosProveedor }
IPagosProveedor = interface(IDAStronglyTypedDataTable) IPagosProveedor = interface(IDAStronglyTypedDataTable)
['{751D7F88-FCB6-457A-9850-8B293B22A64D}'] ['{4D36AE20-8D1F-40F2-BDFF-EBF7B9330D5D}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -3185,6 +3213,48 @@ begin
DataTable.Fields[idx_RecibosProveedorTIENDA].AsVariant := Null; DataTable.Fields[idx_RecibosProveedorTIENDA].AsVariant := Null;
end; end;
function TRecibosProveedorDataTableRules.GetFECHA_PAGOValue: DateTime;
begin
result := DataTable.Fields[idx_RecibosProveedorFECHA_PAGO].AsDateTime;
end;
procedure TRecibosProveedorDataTableRules.SetFECHA_PAGOValue(const aValue: DateTime);
begin
DataTable.Fields[idx_RecibosProveedorFECHA_PAGO].AsDateTime := aValue;
end;
function TRecibosProveedorDataTableRules.GetFECHA_PAGOIsNull: boolean;
begin
result := DataTable.Fields[idx_RecibosProveedorFECHA_PAGO].IsNull;
end;
procedure TRecibosProveedorDataTableRules.SetFECHA_PAGOIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_RecibosProveedorFECHA_PAGO].AsVariant := Null;
end;
function TRecibosProveedorDataTableRules.GetSUBCUENTAValue: String;
begin
result := DataTable.Fields[idx_RecibosProveedorSUBCUENTA].AsString;
end;
procedure TRecibosProveedorDataTableRules.SetSUBCUENTAValue(const aValue: String);
begin
DataTable.Fields[idx_RecibosProveedorSUBCUENTA].AsString := aValue;
end;
function TRecibosProveedorDataTableRules.GetSUBCUENTAIsNull: boolean;
begin
result := DataTable.Fields[idx_RecibosProveedorSUBCUENTA].IsNull;
end;
procedure TRecibosProveedorDataTableRules.SetSUBCUENTAIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_RecibosProveedorSUBCUENTA].AsVariant := Null;
end;
{ TPagosProveedorDataTableRules } { TPagosProveedorDataTableRules }
constructor TPagosProveedorDataTableRules.Create(aDataTable: TDADataTable); constructor TPagosProveedorDataTableRules.Create(aDataTable: TDADataTable);

View File

@ -9,15 +9,15 @@ const
{ Delta rules ids { Delta rules ids
Feel free to change them to something more human readable Feel free to change them to something more human readable
but make sure they are unique in the context of your application } but make sure they are unique in the context of your application }
RID_ListaAnosRecibosDelta = '{5D29690B-384E-4780-9C9B-36BB88222B3B}'; RID_ListaAnosRecibosDelta = '{E8A296C6-C6C6-4821-ABD1-65EE5C5CE5E7}';
RID_RecibosCompensadosProvDelta = '{7B6C1BEB-EE45-4CBD-9706-211CB1030A5A}'; RID_RecibosCompensadosProvDelta = '{6210EF83-7686-4674-A385-B7071237FACB}';
RID_RecibosProveedorDelta = '{C93C14AF-851D-4BAA-BD1A-5FE048D5A0AC}'; RID_RecibosProveedorDelta = '{41AE7B3A-2837-467C-9EF5-EE52952DC66E}';
RID_PagosProveedorDelta = '{B4931DB5-8073-40F2-BD77-3A430666BC5F}'; RID_PagosProveedorDelta = '{42CA510C-C01E-4C46-A221-CE6EF13D95EA}';
type type
{ IListaAnosRecibosDelta } { IListaAnosRecibosDelta }
IListaAnosRecibosDelta = interface(IListaAnosRecibos) IListaAnosRecibosDelta = interface(IListaAnosRecibos)
['{5D29690B-384E-4780-9C9B-36BB88222B3B}'] ['{E8A296C6-C6C6-4821-ABD1-65EE5C5CE5E7}']
{ Property getters and setters } { Property getters and setters }
function GetOldANOValue : String; function GetOldANOValue : String;
@ -51,7 +51,7 @@ type
{ IRecibosCompensadosProvDelta } { IRecibosCompensadosProvDelta }
IRecibosCompensadosProvDelta = interface(IRecibosCompensadosProv) IRecibosCompensadosProvDelta = interface(IRecibosCompensadosProv)
['{7B6C1BEB-EE45-4CBD-9706-211CB1030A5A}'] ['{6210EF83-7686-4674-A385-B7071237FACB}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_RECIBO_COMPENSADOValue : Integer; function GetOldID_RECIBO_COMPENSADOValue : Integer;
@ -541,7 +541,7 @@ type
{ IRecibosProveedorDelta } { IRecibosProveedorDelta }
IRecibosProveedorDelta = interface(IRecibosProveedor) IRecibosProveedorDelta = interface(IRecibosProveedor)
['{C93C14AF-851D-4BAA-BD1A-5FE048D5A0AC}'] ['{41AE7B3A-2837-467C-9EF5-EE52952DC66E}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_RECIBO_COMPENSADOValue : Integer; function GetOldID_RECIBO_COMPENSADOValue : Integer;
@ -582,6 +582,8 @@ type
function GetOldUSUARIOValue : String; function GetOldUSUARIOValue : String;
function GetOldID_TIENDAValue : Integer; function GetOldID_TIENDAValue : Integer;
function GetOldTIENDAValue : String; function GetOldTIENDAValue : String;
function GetOldFECHA_PAGOValue : DateTime;
function GetOldSUBCUENTAValue : String;
{ Properties } { Properties }
property OldID : Integer read GetOldIDValue; property OldID : Integer read GetOldIDValue;
@ -623,6 +625,8 @@ type
property OldUSUARIO : String read GetOldUSUARIOValue; property OldUSUARIO : String read GetOldUSUARIOValue;
property OldID_TIENDA : Integer read GetOldID_TIENDAValue; property OldID_TIENDA : Integer read GetOldID_TIENDAValue;
property OldTIENDA : String read GetOldTIENDAValue; property OldTIENDA : String read GetOldTIENDAValue;
property OldFECHA_PAGO : DateTime read GetOldFECHA_PAGOValue;
property OldSUBCUENTA : String read GetOldSUBCUENTAValue;
end; end;
{ TRecibosProveedorBusinessProcessorRules } { TRecibosProveedorBusinessProcessorRules }
@ -864,6 +868,18 @@ type
function GetOldTIENDAIsNull: Boolean; virtual; function GetOldTIENDAIsNull: Boolean; virtual;
procedure SetTIENDAValue(const aValue: String); virtual; procedure SetTIENDAValue(const aValue: String); virtual;
procedure SetTIENDAIsNull(const aValue: Boolean); virtual; procedure SetTIENDAIsNull(const aValue: Boolean); virtual;
function GetFECHA_PAGOValue: DateTime; virtual;
function GetFECHA_PAGOIsNull: Boolean; virtual;
function GetOldFECHA_PAGOValue: DateTime; virtual;
function GetOldFECHA_PAGOIsNull: Boolean; virtual;
procedure SetFECHA_PAGOValue(const aValue: DateTime); virtual;
procedure SetFECHA_PAGOIsNull(const aValue: Boolean); virtual;
function GetSUBCUENTAValue: String; virtual;
function GetSUBCUENTAIsNull: Boolean; virtual;
function GetOldSUBCUENTAValue: String; virtual;
function GetOldSUBCUENTAIsNull: Boolean; virtual;
procedure SetSUBCUENTAValue(const aValue: String); virtual;
procedure SetSUBCUENTAIsNull(const aValue: Boolean); virtual;
{ Properties } { Properties }
property ID : Integer read GetIDValue write SetIDValue; property ID : Integer read GetIDValue write SetIDValue;
@ -1022,6 +1038,14 @@ type
property TIENDAIsNull : Boolean read GetTIENDAIsNull write SetTIENDAIsNull; property TIENDAIsNull : Boolean read GetTIENDAIsNull write SetTIENDAIsNull;
property OldTIENDA : String read GetOldTIENDAValue; property OldTIENDA : String read GetOldTIENDAValue;
property OldTIENDAIsNull : Boolean read GetOldTIENDAIsNull; property OldTIENDAIsNull : Boolean read GetOldTIENDAIsNull;
property FECHA_PAGO : DateTime read GetFECHA_PAGOValue write SetFECHA_PAGOValue;
property FECHA_PAGOIsNull : Boolean read GetFECHA_PAGOIsNull write SetFECHA_PAGOIsNull;
property OldFECHA_PAGO : DateTime read GetOldFECHA_PAGOValue;
property OldFECHA_PAGOIsNull : Boolean read GetOldFECHA_PAGOIsNull;
property SUBCUENTA : String read GetSUBCUENTAValue write SetSUBCUENTAValue;
property SUBCUENTAIsNull : Boolean read GetSUBCUENTAIsNull write SetSUBCUENTAIsNull;
property OldSUBCUENTA : String read GetOldSUBCUENTAValue;
property OldSUBCUENTAIsNull : Boolean read GetOldSUBCUENTAIsNull;
public public
constructor Create(aBusinessProcessor: TDABusinessProcessor); override; constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@ -1031,7 +1055,7 @@ type
{ IPagosProveedorDelta } { IPagosProveedorDelta }
IPagosProveedorDelta = interface(IPagosProveedor) IPagosProveedorDelta = interface(IPagosProveedor)
['{B4931DB5-8073-40F2-BD77-3A430666BC5F}'] ['{42CA510C-C01E-4C46-A221-CE6EF13D95EA}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_RECIBOValue : Integer; function GetOldID_RECIBOValue : Integer;
@ -3756,6 +3780,68 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosProveedorTIENDA] := Null; BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosProveedorTIENDA] := Null;
end; end;
function TRecibosProveedorBusinessProcessorRules.GetFECHA_PAGOValue: DateTime;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosProveedorFECHA_PAGO];
end;
function TRecibosProveedorBusinessProcessorRules.GetFECHA_PAGOIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosProveedorFECHA_PAGO]);
end;
function TRecibosProveedorBusinessProcessorRules.GetOldFECHA_PAGOValue: DateTime;
begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_RecibosProveedorFECHA_PAGO];
end;
function TRecibosProveedorBusinessProcessorRules.GetOldFECHA_PAGOIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_RecibosProveedorFECHA_PAGO]);
end;
procedure TRecibosProveedorBusinessProcessorRules.SetFECHA_PAGOValue(const aValue: DateTime);
begin
BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosProveedorFECHA_PAGO] := aValue;
end;
procedure TRecibosProveedorBusinessProcessorRules.SetFECHA_PAGOIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosProveedorFECHA_PAGO] := Null;
end;
function TRecibosProveedorBusinessProcessorRules.GetSUBCUENTAValue: String;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosProveedorSUBCUENTA];
end;
function TRecibosProveedorBusinessProcessorRules.GetSUBCUENTAIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosProveedorSUBCUENTA]);
end;
function TRecibosProveedorBusinessProcessorRules.GetOldSUBCUENTAValue: String;
begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_RecibosProveedorSUBCUENTA];
end;
function TRecibosProveedorBusinessProcessorRules.GetOldSUBCUENTAIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_RecibosProveedorSUBCUENTA]);
end;
procedure TRecibosProveedorBusinessProcessorRules.SetSUBCUENTAValue(const aValue: String);
begin
BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosProveedorSUBCUENTA] := aValue;
end;
procedure TRecibosProveedorBusinessProcessorRules.SetSUBCUENTAIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_RecibosProveedorSUBCUENTA] := Null;
end;
{ TPagosProveedorBusinessProcessorRules } { TPagosProveedorBusinessProcessorRules }
constructor TPagosProveedorBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); constructor TPagosProveedorBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);

View File

@ -9,10 +9,12 @@
<Projects Include="..\..\Cliente\FactuGES.dproj" /> <Projects Include="..\..\Cliente\FactuGES.dproj" />
<Projects Include="..\..\GUIBase\GUIBase.dproj" /> <Projects Include="..\..\GUIBase\GUIBase.dproj" />
<Projects Include="..\..\Servidor\FactuGES_Server.dproj" /> <Projects Include="..\..\Servidor\FactuGES_Server.dproj" />
<Projects Include="..\Contabilidad\Plugin\Contabilidad_plugin.dproj" />
<Projects Include="..\Contabilidad\Views\Contabilidad_view.dproj" /> <Projects Include="..\Contabilidad\Views\Contabilidad_view.dproj" />
<Projects Include="..\Contactos\Controller\Contactos_controller.dproj" /> <Projects Include="..\Contactos\Controller\Contactos_controller.dproj" />
<Projects Include="..\Contactos\Views\Contactos_view.dproj" /> <Projects Include="..\Contactos\Views\Contactos_view.dproj" />
<Projects Include="..\Contratos de cliente\Views\ContratosCliente_view.dproj" /> <Projects Include="..\Contratos de cliente\Views\ContratosCliente_view.dproj" />
<Projects Include="..\Facturas de proveedor\Views\FacturasProveedor_view.dproj" />
<Projects Include="Controller\RecibosProveedor_controller.dproj" /> <Projects Include="Controller\RecibosProveedor_controller.dproj" />
<Projects Include="Data\RecibosProveedor_data.dproj" /> <Projects Include="Data\RecibosProveedor_data.dproj" />
<Projects Include="Model\RecibosProveedor_model.dproj" /> <Projects Include="Model\RecibosProveedor_model.dproj" />
@ -151,14 +153,32 @@
<Target Name="ContratosCliente_view:Make"> <Target Name="ContratosCliente_view:Make">
<MSBuild Projects="..\Contratos de cliente\Views\ContratosCliente_view.dproj" Targets="Make" /> <MSBuild Projects="..\Contratos de cliente\Views\ContratosCliente_view.dproj" Targets="Make" />
</Target> </Target>
<Target Name="Contabilidad_plugin">
<MSBuild Projects="..\Contabilidad\Plugin\Contabilidad_plugin.dproj" Targets="" />
</Target>
<Target Name="Contabilidad_plugin:Clean">
<MSBuild Projects="..\Contabilidad\Plugin\Contabilidad_plugin.dproj" Targets="Clean" />
</Target>
<Target Name="Contabilidad_plugin:Make">
<MSBuild Projects="..\Contabilidad\Plugin\Contabilidad_plugin.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="Build"> <Target Name="Build">
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_controller;Contactos_view;Contabilidad_view;RecibosProveedor_model;RecibosProveedor_data;RecibosProveedor_controller;RecibosProveedor_view;RecibosProveedor_plugin;FactuGES;FactuGES_Server;ContratosCliente_view" /> <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_controller;Contactos_view;Contabilidad_view;RecibosProveedor_model;RecibosProveedor_data;RecibosProveedor_controller;RecibosProveedor_view;RecibosProveedor_plugin;FactuGES;FactuGES_Server;ContratosCliente_view;Contabilidad_plugin;FacturasProveedor_view" />
</Target> </Target>
<Target Name="Clean"> <Target Name="Clean">
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_controller:Clean;Contactos_view:Clean;Contabilidad_view:Clean;RecibosProveedor_model:Clean;RecibosProveedor_data:Clean;RecibosProveedor_controller:Clean;RecibosProveedor_view:Clean;RecibosProveedor_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;ContratosCliente_view:Clean" /> <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_controller:Clean;Contactos_view:Clean;Contabilidad_view:Clean;RecibosProveedor_model:Clean;RecibosProveedor_data:Clean;RecibosProveedor_controller:Clean;RecibosProveedor_view:Clean;RecibosProveedor_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;ContratosCliente_view:Clean;Contabilidad_plugin:Clean;FacturasProveedor_view:Clean" />
</Target> </Target>
<Target Name="Make"> <Target Name="Make">
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_controller:Make;Contactos_view:Make;Contabilidad_view:Make;RecibosProveedor_model:Make;RecibosProveedor_data:Make;RecibosProveedor_controller:Make;RecibosProveedor_view:Make;RecibosProveedor_plugin:Make;FactuGES:Make;FactuGES_Server:Make;ContratosCliente_view:Make" /> <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_controller:Make;Contactos_view:Make;Contabilidad_view:Make;RecibosProveedor_model:Make;RecibosProveedor_data:Make;RecibosProveedor_controller:Make;RecibosProveedor_view:Make;RecibosProveedor_plugin:Make;FactuGES:Make;FactuGES_Server:Make;ContratosCliente_view:Make;Contabilidad_plugin:Make;FacturasProveedor_view:Make" />
</Target> </Target>
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" /> <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
</Project> </Project>

View File

@ -553,6 +553,14 @@ object srvRecibosProveedor: TsrvRecibosProveedor
item item
DatasetField = 'NOMBRE_COMERCIAL' DatasetField = 'NOMBRE_COMERCIAL'
TableField = 'NOMBRE_COMERCIAL' TableField = 'NOMBRE_COMERCIAL'
end
item
DatasetField = 'FECHA_PAGO'
TableField = 'FECHA_PAGO'
end
item
DatasetField = 'SUBCUENTA'
TableField = 'SUBCUENTA'
end> end>
end> end>
Name = 'RecibosProveedor' Name = 'RecibosProveedor'
@ -770,6 +778,15 @@ object srvRecibosProveedor: TsrvRecibosProveedor
Name = 'TIENDA' Name = 'TIENDA'
DataType = datString DataType = datString
Size = 255 Size = 255
end
item
Name = 'FECHA_PAGO'
DataType = datDateTime
end
item
Name = 'SUBCUENTA'
DataType = datString
Size = 255
end> end>
end end
item item

View File

@ -21,11 +21,9 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor
object Label1: TLabel object Label1: TLabel
Left = 42 Left = 42
Top = 31 Top = 31
Width = 362 Width = 285
Height = 13 Height = 13
Caption = Caption = 'Introduzca la fecha en la que se ha hecho efectivo el pago:'
'Introduzca la fecha en la que se ha hecho efectivo el cobro o la' +
' devoluci'#243'n:'
end end
object Label2: TLabel object Label2: TLabel
Left = 42 Left = 42
@ -39,9 +37,9 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor
object Label3: TLabel object Label3: TLabel
Left = 42 Left = 42
Top = 101 Top = 101
Width = 306 Width = 240
Height = 13 Height = 13
Caption = 'Seleccione el banco o caja donde se hace el cobro o devoluci'#243'n:' Caption = 'Seleccione el banco o caja donde se hace el pago:'
end end
object eFechaPago: TcxDateEdit object eFechaPago: TcxDateEdit
Left = 129 Left = 129
@ -65,7 +63,6 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor
Height = 41 Height = 41
Align = alBottom Align = alBottom
TabOrder = 1 TabOrder = 1
ExplicitTop = 176
object bAceptar: TButton object bAceptar: TButton
Left = 268 Left = 268
Top = 6 Top = 6
@ -99,7 +96,7 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor
ParentFont = False ParentFont = False
TabOrder = 2 TabOrder = 2
ReadOnly = False ReadOnly = False
ExplicitTop = 136 ExplicitTop = 118
ExplicitWidth = 443 ExplicitWidth = 443
ExplicitHeight = 40 ExplicitHeight = 40
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
@ -159,8 +156,7 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor
Caption = 'Comentario' Caption = 'Comentario'
Visible = False Visible = False
WordWrap = True WordWrap = True
ExplicitWidth = 55 ExplicitHeight = 24
ExplicitHeight = 13
end end
end end
end end

View File

@ -1,18 +1,19 @@
inherited fEditorReciboProveedor: TfEditorReciboProveedor inherited fEditorReciboProveedor: TfEditorReciboProveedor
Caption = 'Recibo de cliente' Caption = 'Recibo de cliente'
ClientHeight = 554 ClientHeight = 732
ClientWidth = 691 ClientWidth = 1015
OnClose = CustomEditorClose OnClose = CustomEditorClose
ExplicitWidth = 699 ExplicitWidth = 1023
ExplicitHeight = 588 ExplicitHeight = 766
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader inherited JvNavPanelHeader: TJvNavPanelHeader
Width = 691 Width = 1015
Caption = 'Recibo de cliente' Caption = 'Recibo de proveedor'
ExplicitWidth = 691 ExplicitTop = 49
ExplicitWidth = 1015
inherited Image1: TImage inherited Image1: TImage
Left = 664 Left = 988
Picture.Data = { Picture.Data = {
0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800
0000180806000000E0773DF80000000970485973000017120000171201679FD2 0000180806000000E0773DF80000000970485973000017120000171201679FD2
@ -39,41 +40,41 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor
end end
end end
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock
Width = 691 Width = 1015
ExplicitWidth = 691 ExplicitWidth = 1015
inherited tbxMain: TTBXToolbar inherited tbxMain: TTBXToolbar
ExplicitWidth = 267 ExplicitWidth = 267
end end
inherited tbxMenu: TTBXToolbar inherited tbxMenu: TTBXToolbar
ExplicitWidth = 691 ExplicitWidth = 1015
end end
end end
inherited StatusBar: TJvStatusBar inherited StatusBar: TJvStatusBar
Top = 535 Top = 713
Width = 691 Width = 1015
Panels = < Panels = <
item item
Width = 200 Width = 200
end> end>
ExplicitTop = 535 ExplicitTop = 713
ExplicitWidth = 691 ExplicitWidth = 1015
end end
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Width = 685 Width = 1009
Height = 323 Height = 381
ActivePage = pagPagos ExplicitTop = 109
ExplicitWidth = 685 ExplicitWidth = 1009
ExplicitHeight = 323 ExplicitHeight = 381
inherited pagGeneral: TTabSheet inherited pagGeneral: TTabSheet
ExplicitLeft = 4 ExplicitLeft = 4
ExplicitTop = 24 ExplicitTop = 24
ExplicitWidth = 677 ExplicitWidth = 1001
ExplicitHeight = 295 ExplicitHeight = 353
inline frViewReciboProveedor1: TfrViewReciboProveedor inline frViewReciboProveedor1: TfrViewReciboProveedor
Left = 0 Left = 0
Top = 0 Top = 0
Width = 677 Width = 1001
Height = 295 Height = 353
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -83,16 +84,16 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 677 ExplicitWidth = 1001
ExplicitHeight = 295 ExplicitHeight = 353
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 677 Width = 1001
Height = 295 Height = 353
ExplicitWidth = 677 ExplicitWidth = 1001
ExplicitHeight = 295 ExplicitHeight = 353
DesignSize = ( DesignSize = (
677 1001
295) 353)
inherited eReferencia: TcxDBTextEdit inherited eReferencia: TcxDBTextEdit
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
@ -110,43 +111,43 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor
Width = 112 Width = 112
end end
inherited edtFechaVencimiento: TcxDBDateEdit inherited edtFechaVencimiento: TcxDBDateEdit
Left = 228 Left = 418
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 228 ExplicitLeft = 418
ExplicitWidth = 20 ExplicitWidth = 20
Width = 20 Width = 20
end end
inherited eFechaEmision: TcxDBTextEdit inherited eFechaEmision: TcxDBTextEdit
Left = 384 Left = 696
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 384 ExplicitLeft = 696
ExplicitWidth = 255 ExplicitWidth = 255
Width = 255 Width = 255
end end
inherited eImporteTotal: TcxDBCurrencyEdit inherited eImporteTotal: TcxDBCurrencyEdit
Left = 384 Left = 696
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 384 ExplicitLeft = 696
ExplicitWidth = 255 ExplicitWidth = 255
Width = 255 Width = 255
end end
inherited eNombreCliente: TcxDBTextEdit inherited eNombreCliente: TcxDBTextEdit
Left = 384 Left = 696
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 384 ExplicitLeft = 696
ExplicitWidth = 255 ExplicitWidth = 255
Width = 255 Width = 255
end end
@ -175,12 +176,12 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor
Width = 112 Width = 112
end end
inherited rReferenciaFacturaProv: TcxDBTextEdit inherited rReferenciaFacturaProv: TcxDBTextEdit
Left = 384 Left = 696
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 384 ExplicitLeft = 696
ExplicitWidth = 255 ExplicitWidth = 255
Width = 255 Width = 255
end end
@ -217,19 +218,19 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor
Width = 112 Width = 112
end end
inherited eNifCif: TcxDBTextEdit inherited eNifCif: TcxDBTextEdit
Left = 384 Left = 696
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 384 ExplicitLeft = 696
ExplicitWidth = 255 ExplicitWidth = 255
Width = 255 Width = 255
end end
inherited frViewProveedorRecibo1: TfrViewProveedorRecibo inherited frViewProveedorRecibo1: TfrViewProveedorRecibo
Left = 276 Left = 588
Width = 374 Width = 374
ExplicitLeft = 276 ExplicitLeft = 588
ExplicitWidth = 374 ExplicitWidth = 374
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 374 Width = 374
@ -307,16 +308,16 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor
end end
end end
inherited frViewObservaciones1: TfrViewObservaciones inherited frViewObservaciones1: TfrViewObservaciones
Width = 521 Width = 561
Height = 150 Height = 100
ExplicitWidth = 521 ExplicitWidth = 561
ExplicitHeight = 150 ExplicitHeight = 100
inherited memObservaciones: TcxDBMemo inherited memObservaciones: TcxDBMemo
DataBinding.DataSource = frViewReciboProveedor1.DADataSource DataBinding.DataSource = frViewReciboProveedor1.DADataSource
ExplicitWidth = 226 ExplicitWidth = 561
ExplicitHeight = 129 ExplicitHeight = 100
Height = 150 Height = 100
Width = 521 Width = 561
end end
end end
end end
@ -325,63 +326,6 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor
object pagPagos: TTabSheet object pagPagos: TTabSheet
Caption = 'Pagos' Caption = 'Pagos'
ImageIndex = 1 ImageIndex = 1
inline frViewPagosProveedor1: TfrViewPagosProveedor
Left = 0
Top = 0
Width = 677
Height = 295
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = []
ParentFont = False
TabOrder = 0
ReadOnly = False
ExplicitWidth = 677
ExplicitHeight = 295
inherited dxLayoutControl1: TdxLayoutControl
Width = 677
Height = 295
ExplicitWidth = 677
ExplicitHeight = 295
inherited ListaPagosProveedor: TcxGrid
Width = 633
Height = 248
Enabled = False
ExplicitWidth = 633
ExplicitHeight = 248
inherited ListaPagosProveedorDBTableView1: TcxGridDBTableView
inherited ListaPagosProveedorDBTableView1TIPO: TcxGridDBColumn
IsCaptionAssigned = True
end
end
end
inherited ToolBar1: TToolBar
Width = 633
ExplicitWidth = 633
end
end
inherited DADataSource: TDADataSource
Left = 48
Top = 88
end
inherited ActionListContenido: TActionList
Left = 24
inherited actAnadir: TAction
OnExecute = frViewPagosProveedor1actAnadirExecute
end
inherited actModificar: TAction
OnExecute = frViewPagosProveedor1actModificarExecute
OnUpdate = frViewPagosProveedor1actModificarUpdate
end
inherited actEliminar: TAction
OnExecute = frViewPagosProveedor1actEliminarExecute
OnUpdate = frViewPagosProveedor1actEliminarUpdate
end
end
end
end end
object pagCompensados: TTabSheet object pagCompensados: TTabSheet
Caption = 'Compensados' Caption = 'Compensados'
@ -389,8 +333,8 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor
inline frViewRecibosProvCompensados1: TfrViewRecibosProvCompensados inline frViewRecibosProvCompensados1: TfrViewRecibosProvCompensados
Left = 0 Left = 0
Top = 0 Top = 0
Width = 677 Width = 1001
Height = 295 Height = 353
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -400,13 +344,13 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 677 ExplicitWidth = 1001
ExplicitHeight = 295 ExplicitHeight = 353
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Width = 677 Width = 1001
Height = 270 Height = 328
ExplicitWidth = 677 ExplicitWidth = 1001
ExplicitHeight = 300 ExplicitHeight = 328
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
DataController.Summary.FooterSummaryItems = < DataController.Summary.FooterSummaryItems = <
item item
@ -418,20 +362,8 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor
end end
end end
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Width = 677 Width = 1001
ExplicitWidth = 677 ExplicitWidth = 1001
inherited ToolButton1: TToolButton
ExplicitWidth = 113
end
inherited ToolButton4: TToolButton
ExplicitWidth = 113
end
inherited ToolButton2: TToolButton
ExplicitWidth = 113
end
inherited ToolButton7: TToolButton
ExplicitWidth = 113
end
inherited ToolButton3: TToolButton inherited ToolButton3: TToolButton
Top = 0 Top = 0
ExplicitTop = 0 ExplicitTop = 0
@ -448,8 +380,8 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor
end end
inline frViewReciboProvImportes1: TfrViewReciboProvImportes [4] inline frViewReciboProvImportes1: TfrViewReciboProvImportes [4]
Left = 0 Left = 0
Top = 435 Top = 493
Width = 691 Width = 1015
Height = 100 Height = 100
Align = alBottom Align = alBottom
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
@ -460,11 +392,11 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor
ParentFont = False ParentFont = False
TabOrder = 5 TabOrder = 5
ReadOnly = False ReadOnly = False
ExplicitTop = 435 ExplicitTop = 493
ExplicitWidth = 691 ExplicitWidth = 1015
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 691 Width = 1015
ExplicitWidth = 691 ExplicitWidth = 1015
inherited eImporte: TcxDBCurrencyEdit inherited eImporte: TcxDBCurrencyEdit
DataBinding.DataSource = dsDataTable DataBinding.DataSource = dsDataTable
Properties.OnEditValueChanged = frViewReciboProvImportes1eImportePropertiesEditValueChanged Properties.OnEditValueChanged = frViewReciboProvImportes1eImportePropertiesEditValueChanged
@ -481,22 +413,75 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor
end end
end end
inherited PnlComentario: TPanel [5] inherited PnlComentario: TPanel [5]
Width = 691 Width = 1015
ExplicitWidth = 691 ExplicitTop = 76
ExplicitWidth = 1015
inherited lbComentario: TLabel inherited lbComentario: TLabel
Width = 681 Width = 1005
Height = 25 Height = 25
end end
end end
inherited JvFormStorage: TJvFormStorage inline frViewPagosProveedor1: TfrViewPagosProveedor [6]
Left = 0
Top = 593
Width = 1015
Height = 120
Align = alBottom
Constraints.MaxHeight = 120
TabOrder = 6
ReadOnly = False
ExplicitTop = 593
ExplicitWidth = 1015
inherited dxLayoutControl1: TdxLayoutControl
Width = 1015
ExplicitWidth = 1015
inherited ListaPagosProveedor: TcxGrid
Width = 252
Height = 105
ExplicitWidth = 252
ExplicitHeight = 105
inherited ListaPagosProveedorDBTableView1: TcxGridDBTableView
inherited ListaPagosProveedorDBTableView1TIPO: TcxGridDBColumn
IsCaptionAssigned = True
end
end
end
inherited ToolBar1: TToolBar
Width = 622
ExplicitWidth = 622
end
end
inherited ActionListContenido: TActionList
Left = 24
inherited actAnadir: TAction
OnExecute = frViewPagosProveedor1actAnadirExecute
OnUpdate = frViewPagosProveedor1actAnadirUpdate
end
inherited actModificar: TAction
OnExecute = frViewPagosProveedor1actModificarExecute
OnUpdate = frViewPagosProveedor1actModificarUpdate
end
inherited actEliminar: TAction
OnExecute = frViewPagosProveedor1actEliminarExecute
OnUpdate = actEliminarUpdate
end
end
end
inherited SmallImages: TPngImageList [7]
end
inherited LargeImages: TPngImageList [8]
end
inherited JvFormStorage: TJvFormStorage [9]
OnSavePlacement = JvFormStorageSavePlacement OnSavePlacement = JvFormStorageSavePlacement
OnRestorePlacement = JvFormStorageRestorePlacement OnRestorePlacement = JvFormStorageRestorePlacement
end end
inherited dsDataTable: TDADataSource inherited dsDataTable: TDADataSource [10]
Left = 8 Left = 8
Top = 136 Top = 136
end end
inherited EditorActionList: TActionList [11] inherited JvAppRegistryStorage: TJvAppRegistryStorage [11]
end
inherited EditorActionList: TActionList
Left = 56 Left = 56
Top = 144 Top = 144
inherited actNuevo: TAction inherited actNuevo: TAction

View File

@ -19,9 +19,9 @@ type
frViewReciboProveedor1: TfrViewReciboProveedor; frViewReciboProveedor1: TfrViewReciboProveedor;
pagPagos: TTabSheet; pagPagos: TTabSheet;
pagCompensados: TTabSheet; pagCompensados: TTabSheet;
frViewPagosProveedor1: TfrViewPagosProveedor;
frViewRecibosProvCompensados1: TfrViewRecibosProvCompensados; frViewRecibosProvCompensados1: TfrViewRecibosProvCompensados;
frViewReciboProvImportes1: TfrViewReciboProvImportes; frViewReciboProvImportes1: TfrViewReciboProvImportes;
frViewPagosProveedor1: TfrViewPagosProveedor;
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
procedure dsDataTableDataChange(Sender: TObject; Field: TField); procedure dsDataTableDataChange(Sender: TObject; Field: TField);
procedure CustomEditorClose(Sender: TObject; var Action: TCloseAction); procedure CustomEditorClose(Sender: TObject; var Action: TCloseAction);
@ -40,6 +40,7 @@ type
procedure JvFormStorageSavePlacement(Sender: TObject); procedure JvFormStorageSavePlacement(Sender: TObject);
procedure frViewReciboProvImportes1eImportePropertiesEditValueChanged(Sender: TObject); procedure frViewReciboProvImportes1eImportePropertiesEditValueChanged(Sender: TObject);
procedure frViewRecibosProvCompensados1cxGridViewDataControllerSummaryAfterSummary(ASender: TcxDataSummary); procedure frViewRecibosProvCompensados1cxGridViewDataControllerSummaryAfterSummary(ASender: TcxDataSummary);
procedure frViewPagosProveedor1actAnadirUpdate(Sender: TObject);
private private
FController : IRecibosProveedorController; FController : IRecibosProveedorController;
@ -96,6 +97,8 @@ begin
//RECIBOS COMPENSADOS DESHABILITADOS //RECIBOS COMPENSADOS DESHABILITADOS
pagCompensados.TabVisible := False; pagCompensados.TabVisible := False;
pagPagos.TabVisible := False;
ViewRecibo := frViewReciboProveedor1; ViewRecibo := frViewReciboProveedor1;
end; end;
@ -189,6 +192,14 @@ begin
frViewPagosProveedor1.ListaPagosProveedorDBTableView1.DataController.GotoLast; frViewPagosProveedor1.ListaPagosProveedorDBTableView1.DataController.GotoLast;
end; end;
procedure TfEditorReciboProveedor.frViewPagosProveedor1actAnadirUpdate(
Sender: TObject);
begin
//El recibo solo podrá tener un único pago
if Assigned(FRecibo) and Assigned(FRecibo.Pagos) then
frViewPagosProveedor1.actAnadir.Enabled := (FRecibo.Pagos.DataTable.RecordCount < 1)
end;
procedure TfEditorReciboProveedor.frViewPagosProveedor1actEliminarExecute(Sender: TObject); procedure TfEditorReciboProveedor.frViewPagosProveedor1actEliminarExecute(Sender: TObject);
begin begin
inherited; inherited;
@ -210,7 +221,7 @@ begin
DeshabilitarRecibo; DeshabilitarRecibo;
end; end;
frViewPagosProveedor1.ListaPagosProveedorDBTableView1.DataController.GotoLast; frViewPagosProveedor1.ListaPagosProveedorDBTableView1.DataController.GotoLast;
end; end;
procedure TfEditorReciboProveedor.frViewPagosProveedor1actEliminarUpdate(Sender: TObject); procedure TfEditorReciboProveedor.frViewPagosProveedor1actEliminarUpdate(Sender: TObject);

View File

@ -62,9 +62,16 @@ inherited fEditorRecibosProveedor: TfEditorRecibosProveedor
Left = 431 Left = 431
Visible = True Visible = True
ExplicitLeft = 431 ExplicitLeft = 431
ExplicitWidth = 66 ExplicitWidth = 176
object TBXItem38: TTBXItem object TBXItem38: TTBXItem
Action = actInformes Action = actInformes
DisplayMode = nbdmImageAndText
end
object TBXSeparatorItem17: TTBXSeparatorItem
end
object TBXItem39: TTBXItem
Action = actCambiarSituacion
DisplayMode = nbdmImageAndText
end end
end end
end end
@ -258,8 +265,15 @@ inherited fEditorRecibosProveedor: TfEditorRecibosProveedor
object actInformes: TAction object actInformes: TAction
Category = 'Archivo' Category = 'Archivo'
Caption = 'Informes' Caption = 'Informes'
ImageIndex = 24
OnExecute = actInformesExecute OnExecute = actInformesExecute
end end
object actCambiarSituacion: TAction
Category = 'Archivo'
Caption = 'Pagar recibo'
ImageIndex = 23
OnExecute = actCambiarSituacionExecute
end
end end
inherited SmallImages: TPngImageList [5] inherited SmallImages: TPngImageList [5]
PngImages = < PngImages = <
@ -773,6 +787,121 @@ inherited fEditorRecibosProveedor: TfEditorRecibosProveedor
3E79D138E0990900FC7AC6454D6D985F0000000049454E44AE426082} 3E79D138E0990900FC7AC6454D6D985F0000000049454E44AE426082}
Name = 'PngImage22' Name = 'PngImage22'
Background = clWindow Background = clWindow
end
item
PngImage.Data = {
89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
610000000970485973000017120000171201679FD25200000A4D694343505068
6F746F73686F70204943432070726F66696C65000078DA9D53775893F7163EDF
F7650F5642D8F0B1976C81002223AC08C81059A21092006184101240C585880A
561415119C4855C482D50A489D88E2A028B867418A885A8B555C38EE1FDCA7B5
7D7AEFEDEDFBD7FBBCE79CE7FCCE79CF0F8011122691E6A26A003952853C3AD8
1F8F4F48C4C9BD80021548E0042010E6CBC26705C50000F00379787E74B03FFC
01AF6F00020070D52E2412C7E1FF83BA50265700209100E02212E70B01905200
C82E54C81400C81800B053B3640A009400006C797C422200AA0D00ECF4493E05
00D8A993DC1700D8A21CA908008D0100992847240240BB00605581522C02C0C2
00A0AC40222E04C0AE018059B632470280BD0500768E58900F4060008099422C
CC0020380200431E13CD03204C03A030D2BFE0A95F7085B8480100C0CB95CD97
4BD23314B895D01A77F2F0E0E221E2C26CB142611729106609E4229C979B2313
48E7034CCE0C00001AF9D1C1FE383F90E7E6E4E1E666E76CEFF4C5A2FE6BF06F
223E21F1DFFEBC8C020400104ECFEFDA5FE5E5D60370C701B075BF6BA95B00DA
560068DFF95D33DB09A05A0AD07AF98B7938FC401E9EA150C83C1D1C0A0B0BED
2562A1BD30E38B3EFF33E16FE08B7EF6FC401EFEDB7AF000719A4099ADC0A383
FD71616E76AE528EE7CB0442316EF7E723FEC7857FFD8E29D1E234B15C2C158A
F15889B850224DC779B952914421C995E212E97F32F11F96FD0993770D00AC86
4FC04EB607B5CB6CC07EEE01028B0E58D27600407EF32D8C1A0B910010673432
79F7000093BFF98F402B0100CD97A4E30000BCE8185CA894174CC608000044A0
812AB041070CC114ACC00E9CC11DBCC01702610644400C24C03C104206E4801C
0AA11896411954C03AD804B5B0031AA0119AE110B4C131380DE7E0125C81EB70
170660189EC218BC86090441C8081361213A8811628ED822CE0817998E042261
48349280A420E988145122C5C872A402A9426A915D4823F22D7214398D5C40FA
90DBC820328AFC8ABC47319481B25103D4027540B9A81F1A8AC6A073D174340F
5D8096A26BD11AB41E3D80B6A2A7D14BE87574007D8A8E6380D1310E668CD961
5C8C87456089581A26C71663E55835568F35631D583776151BC09E61EF082402
8B8013EC085E8410C26C82909047584C5843A825EC23B412BA085709838431C2
272293A84FB4257A12F9C478623AB1905846AC26EE211E219E255E270E135F93
48240EC992E44E0A21259032490B496B48DB482DA453A43ED210699C4C26EB90
6DC9DEE408B280AC209791B7900F904F92FBC9C3E4B7143AC588E24C09A22452
A494124A35653FE504A59F324299A0AA51CDA99ED408AA883A9F5A496DA07650
2F5387A91334759A25CD9B1643CBA42DA3D5D09A696769F7682FE974BA09DD83
1E4597D097D26BE807E9E7E983F4770C0D860D83C7486228196B197B19A718B7
192F994CA605D39799C85430D7321B9967980F986F55582AF62A7C1591CA1295
3A9556957E95E7AA545573553FD579AA0B54AB550FAB5E567DA64655B350E3A9
09D416ABD5A91D55BBA936AECE5277528F50CF515FA3BE5FFD82FA630DB28685
46A08648A35463B7C6198D2116C63265F15842D6725603EB2C6B984D625BB2F9
EC4C7605FB1B762F7B4C534373AA66AC6691669DE671CD010EC6B1E0F039D99C
4ACE21CE0DCE7B2D032D3F2DB1D66AAD66AD7EAD37DA7ADABEDA62ED72ED16ED
EBDAEF75709D409D2C9DF53A6D3AF77509BA36BA51BA85BADB75CFEA3ED363EB
79E909F5CAF50EE9DDD147F56DF4A3F517EAEFD6EFD11F373034083690196C31
3863F0CC9063E86B9869B8D1F084E1A811CB68BA91C468A3D149A327B826EE87
67E33578173E66AC6F1C62AC34DE65DC6B3C61626932DBA4C4A4C5E4BE29CD94
6B9A66BAD1B4D374CCCCC82CDCACD8ACC9EC8E39D59C6B9E61BED9BCDBFC8D85
A5459CC54A8B368BC796DA967CCB05964D96F7AC98563E567956F556D7AC49D6
5CEB2CEB6DD6576C501B579B0C9B3A9BCBB6A8AD9BADC4769B6DDF14E2148F29
D229F5536EDA31ECFCEC0AEC9AEC06ED39F661F625F66DF6CF1DCC1C121DD63B
743B7C727475CC766C70BCEBA4E134C3A9C4A9C3E957671B67A1739DF33517A6
4B90CB1297769717536DA78AA76E9F7ACB95E51AEEBAD2B5D3F5A39BBB9BDCAD
D96DD4DDCC3DC57DABFB4D2E9B1BC95DC33DEF41F4F0F758E271CCE39DA79BA7
C2F390E72F5E765E595EFBBD1E4FB39C269ED6306DC8DBC45BE0BDCB7B603A3E
3D65FACEE9033EC63E029F7A9F87BEA6BE22DF3DBE237ED67E997E07FC9EFB3B
FACBFD8FF8BFE179F216F14E056001C101E501BD811A81B3036B031F049904A5
0735058D05BB062F0C3E15420C090D591F72936FC017F21BF96333DC672C9AD1
15CA089D155A1BFA30CC264C1ED6118E86CF08DF107E6FA6F94CE9CCB60888E0
476C88B81F69199917F97D14292A32AA2EEA51B453747174F72CD6ACE459FB67
BD8EF18FA98CB93BDB6AB6727667AC6A6C526C63EC9BB880B8AAB8817887F845
F1971274132409ED89E4C4D8C43D89E37302E76C9A339CE49A54967463AEE5DC
A2B917E6E9CECB9E773C593559907C3885981297B23FE5832042502F184FE5A7
6E4D1D13F2849B854F45BEA28DA251B1B7B84A3C92E69D5695F638DD3B7D43FA
68864F4675C633094F522B79911992B923F34D5644D6DEACCFD971D92D39949C
949CA3520D6996B42BD730B728B74F662B2B930DE479E66DCA1B9387CAF7E423
F973F3DB156C854CD1A3B452AE500E164C2FA82B785B185B78B848BD485AD433
DF66FEEAF9230B82167CBD90B050B8B0B3D8B87859F1E022BF45BB16238B5317
772E315D52BA647869F0D27DCB68CBB296FD50E2585255F26A79DCF28E5283D2
A5A5432B82573495A994C9CB6EAEF45AB9631561956455EF6A97D55B567F2A17
955FAC70ACA8AEF8B046B8E6E2574E5FD57CF5796DDADADE4AB7CAEDEB48EBA4
EB6EACF759BFAF4ABD6A41D5D086F00DAD1BF18DE51B5F6D4ADE74A17A6AF58E
CDB4CDCACD03356135ED5BCCB6ACDBF2A136A3F67A9D7F5DCB56FDADABB7BED9
26DAD6BFDD777BF30E831D153BDEEF94ECBCB52B78576BBD457DF56ED2EE82DD
8F1A621BBABFE67EDDB847774FC59E8F7BA57B07F645EFEB6A746F6CDCAFBFBF
B2096D52368D1E483A70E59B806FDA9BED9A77B5705A2A0EC241E5C127DFA67C
7BE350E8A1CEC3DCC3CDDF997FB7F508EB48792BD23ABF75AC2DA36DA03DA1BD
EFE88CA39D1D5E1D47BEB7FF7EEF31E36375C7358F579EA09D283DF1F9E48293
E3A764A79E9D4E3F3DD499DC79F74CFC996B5D515DBD6743CF9E3F1774EE4CB7
5FF7C9F3DEE78F5DF0BC70F422F762DB25B74BAD3DAE3D477E70FDE148AF5B6F
EB65F7CBED573CAE74F44DEB3BD1EFD37FFA6AC0D573D7F8D72E5D9F79BDEFC6
EC1BB76E26DD1CB825BAF5F876F6ED17770AEE4CDC5D7A8F78AFFCBEDAFDEA07
FA0FEA7FB4FEB165C06DE0F860C060CFC3590FEF0E09879EFE94FFD387E1D247
CC47D52346238D8F9D1F1F1B0D1ABDF264CE93E1A7B2A713CFCA7E56FF79EB73
ABE7DFFDE2FB4BCF58FCD8F00BF98BCFBFAE79A9F372EFABA9AF3AC723C71FBC
CE793DF1A6FCADCEDB7DEFB8EFBADFC7BD1F9928FC40FE50F3D1FA63C7A7D04F
F73EE77CFEFC2FF784F3FB25D29F330000012D4944415478DA63FCFFFF3F0325
80916203966D3945B60991DEA68C6003B42CC41852B26F6355F4E7E77F86DFDF
FE31FCFEFC97E1FBFBDF60F68E73460C89D19D0CE7764C4318000230434E2E77
C63048416B135C3308A018D0B7F8235C214CB30CFF5E880B3E3F6278F12F11CC
16175BC3F0FFF76F06865F7F18E4EC4E103600A41904600688092E076B66001A
22E77C16BB01BFBEFC6338BFD915C30BC89A19FFFC619075BF881A0620FF8334
FFFAF297E1D75760A07DF9C3B032A610670C641FF64018D03D793E8682A9B63B
184C53EA197E89A933309DE86638BFEF3CC3DC7DCF19A6B478C1D973F67E6764
C465C3B116C5D003AFD556DDBD7C10AB7CB293649865F5BDD5F80CF84FB10B80
D42A9042AABA00A4D1AAE6FE6A901A503E22D90573F7FD80EB011B40696E0400
A0BEE1E16734A0290000000049454E44AE426082}
Name = 'PngImage23'
Background = clWindow
end
item
PngImage.Data = {
89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
610000000970485973000017120000171201679FD252000000EE4944415478DA
63FCFFFF3F0325801164C0D22D27C93225DAC79C116E00904350C3DF7FFF197E
FFF9CBF0EBF71F0687E02286733BA6116F00B2E645EB0E30CC5BBA09D3006E6E
6E86AF5FBF82696CE0F9ABB70CBF7FFF6558BEF930760308D90CD20C62AFD97E
0CBF01F85C72FDCE13864D7B4E127601369B7F81E97F0CDB0F9C26EC82B7EF3F
32080BF263B8E0D4C5BB0CFB8F5FC06DC02FA04D2836C2D848E2474E5FC61D0B
AFDEBC67101311C41AA047CFDE021B7AEAC2354C03423D4C08DA0C133F7FF526
A60101CE86446906B1AFDCBC836980B7BD1EC3920D0789CE071806F44E59485A
4E0202B80194000082585AF04025F9110000000049454E44AE426082}
Name = 'PngImage24'
Background = clWindow
end> end>
Bitmap = {} Bitmap = {}
end end
@ -1907,7 +2036,7 @@ inherited fEditorRecibosProveedor: TfEditorRecibosProveedor
0007C0000007C000000700000007000000070000000700000007C000000FC000 0007C0000007C000000700000007000000070000000700000007C000000FC000
001F8000003F800000FFF8FFFFFF} 001F8000003F800000FFF8FFFFFF}
Width = 450 Width = 450
Left = 408 Left = 352
Top = 80 Top = 88
end end
end end

View File

@ -45,10 +45,14 @@ type
actInformes: TAction; actInformes: TAction;
TBXItem38: TTBXItem; TBXItem38: TTBXItem;
JSInformesDialog: TJSDialog; JSInformesDialog: TJSDialog;
actCambiarSituacion: TAction;
TBXItem39: TTBXItem;
TBXSeparatorItem17: TTBXSeparatorItem;
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
procedure actEliminarUpdate(Sender: TObject); procedure actEliminarUpdate(Sender: TObject);
procedure actInformesExecute(Sender: TObject); procedure actInformesExecute(Sender: TObject);
procedure OnListaAnosChange(Sender: TObject; const Text: string); procedure OnListaAnosChange(Sender: TObject; const Text: string);
procedure actCambiarSituacionExecute(Sender: TObject);
private private
FRecibosProveedor: IBizRecibosProveedor; FRecibosProveedor: IBizRecibosProveedor;
@ -81,13 +85,76 @@ implementation
uses uses
uDataModuleRecibosProveedor, uFactuGES_App, uDataModuleUsuarios, uGridUtils, uDBSelectionListUtils, uDataModuleRecibosProveedor, uFactuGES_App, uDataModuleUsuarios, uGridUtils, uDBSelectionListUtils,
uGestorInformesController; uGestorInformesController, uEditorFechaPagoProveedor;
{$R *.dfm} {$R *.dfm}
{ {
*************************** TfEditorRecibosProveedor *************************** *************************** TfEditorRecibosProveedor ***************************
} }
procedure TfEditorRecibosProveedor.actCambiarSituacionExecute(Sender: TObject);
var
AFechaPago: String;
AIgnorarContabilidad: Integer;
AIdSubCuenta: Integer;
ASubCuenta: String;
ARecibos: IBizRecibosProveedor;
AllItems: Boolean;
begin
inherited;
ARecibos := Nil;
AllItems := False;
if MultiSelect and Assigned(ViewGrid) then
AllItems := (ViewGrid.NumSeleccionados > 1);
if AllItems then
begin
if (Application.MessageBox('¿Desea cambiar a pagados los recibos de proveedor seleccionados, en caso de tener recibos ya pagados en la selección, estos no serán modificados?', 'Atención', MB_YESNO) = IDYES) then
begin
SeleccionarFilasDesdeGrid(ViewGrid._FocusedView, (RecibosProveedor as ISeleccionable).SelectedRecords);
ARecibos := (Controller as IRecibosProveedorController).ExtraerSeleccionados(RecibosProveedor) as IBizRecibosProveedor;
end
else
exit;
end
else begin
ARecibos := Controller.Buscar(RecibosProveedor.ID);
ARecibos.DataTable.active := True;
end;
with TfEditorFechaPagoProveedor.Create(Nil) do
begin
if (ShowModal = mrOk) then
begin
AFechaPago := DateToStr(FechaPago);
AIgnorarContabilidad := IgnorarContabilidad;
AIdSubCuenta := IdSubcuenta;
ASubCuenta := frViewListaSubcuentas1.cbSubCuentas.Text;
Release;
end
else
begin
//Operación cancelada
Release;
exit;
end;
end;
if Assigned(ARecibos) then
begin
ViewGrid._Grid.BeginUpdate;
ViewGrid._Grid.EndUpdate;
FController.AnadirPagos(ARecibos, AFechaPago, AIgnorarContabilidad, AIdSubCuenta, ASubCuenta);
FController.Guardar(ARecibos);
actRefrescar.Execute;
ViewGrid._Grid.EndUpdate;
end;
end;
procedure TfEditorRecibosProveedor.actEliminarUpdate(Sender: TObject); procedure TfEditorRecibosProveedor.actEliminarUpdate(Sender: TObject);
begin begin
inherited; inherited;

View File

@ -1,14 +1,15 @@
inherited frViewPagosProveedor: TfrViewPagosProveedor inherited frViewPagosProveedor: TfrViewPagosProveedor
Width = 664 Width = 673
Height = 355 Height = 120
Constraints.MaxHeight = 120
OnShow = CustomViewShow OnShow = CustomViewShow
ExplicitWidth = 664 ExplicitWidth = 673
ExplicitHeight = 355 ExplicitHeight = 120
object dxLayoutControl1: TdxLayoutControl object dxLayoutControl1: TdxLayoutControl
Left = 0 Left = 0
Top = 0 Top = 0
Width = 664 Width = 673
Height = 355 Height = 120
Margins.Left = 0 Margins.Left = 0
Margins.Top = 0 Margins.Top = 0
Margins.Right = 0 Margins.Right = 0
@ -151,7 +152,7 @@ inherited frViewPagosProveedor: TfrViewPagosProveedor
object dxLayoutControl1Group1: TdxLayoutGroup object dxLayoutControl1Group1: TdxLayoutGroup
AutoAligns = [aaHorizontal] AutoAligns = [aaHorizontal]
AlignVert = avClient AlignVert = avClient
Caption = 'Cobros y devoluciones del recibo' Caption = 'Pago de recibo'
object dxLayoutControl1Item3: TdxLayoutItem object dxLayoutControl1Item3: TdxLayoutItem
ShowCaption = False ShowCaption = False
Control = ToolBar1 Control = ToolBar1

View File

@ -101,6 +101,11 @@ inherited frViewRecibosProveedor: TfrViewRecibosProveedor
SortOrder = soDescending SortOrder = soDescending
Width = 61 Width = 61
end end
object cxGridViewFECHA_PAGO: TcxGridDBColumn
Caption = 'Fecha de pago'
DataBinding.FieldName = 'FECHA_PAGO'
PropertiesClassName = 'TcxDateEditProperties'
end
object cxGridViewDESCRIPCION: TcxGridDBColumn object cxGridViewDESCRIPCION: TcxGridDBColumn
Caption = 'Descripci'#243'n' Caption = 'Descripci'#243'n'
DataBinding.FieldName = 'DESCRIPCION' DataBinding.FieldName = 'DESCRIPCION'
@ -151,6 +156,13 @@ inherited frViewRecibosProveedor: TfrViewRecibosProveedor
Visible = False Visible = False
VisibleForCustomization = False VisibleForCustomization = False
end end
object cxGridViewSUBCUENTA: TcxGridDBColumn
Caption = 'Cuenta'
DataBinding.FieldName = 'SUBCUENTA'
PropertiesClassName = 'TcxTextEditProperties'
Properties.Alignment.Horz = taRightJustify
HeaderAlignmentHorz = taRightJustify
end
end end
inherited cxGridLevel: TcxGridLevel inherited cxGridLevel: TcxGridLevel
Caption = 'Todos' Caption = 'Todos'

View File

@ -52,6 +52,8 @@ type
cxGridViewID_RECIBO_COMPENSADO: TcxGridDBColumn; cxGridViewID_RECIBO_COMPENSADO: TcxGridDBColumn;
cxGridViewREFERENCIA_REC_COMPENSADO: TcxGridDBColumn; cxGridViewREFERENCIA_REC_COMPENSADO: TcxGridDBColumn;
cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn; cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn;
cxGridViewFECHA_PAGO: TcxGridDBColumn;
cxGridViewSUBCUENTA: TcxGridDBColumn;
procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
out AStyle: TcxStyle); out AStyle: TcxStyle);

View File

@ -919,6 +919,8 @@
</Parameter> </Parameter>
<Parameter Name="ListaID" DataType="TIntegerArray" Flag="In" > <Parameter Name="ListaID" DataType="TIntegerArray" Flag="In" >
</Parameter> </Parameter>
<Parameter Name="VerCondiciones" DataType="Boolean" Flag="In" >
</Parameter>
</Parameters> </Parameters>
</Operation> </Operation>
<Operation Name="GenerarInformeEnPDF" UID="{BFA4B911-5DE4-44DF-BB65-1A37D64AF78E}"> <Operation Name="GenerarInformeEnPDF" UID="{BFA4B911-5DE4-44DF-BB65-1A37D64AF78E}">
@ -927,6 +929,8 @@
</Parameter> </Parameter>
<Parameter Name="ListaID" DataType="TIntegerArray" Flag="In" > <Parameter Name="ListaID" DataType="TIntegerArray" Flag="In" >
</Parameter> </Parameter>
<Parameter Name="VerCondiciones" DataType="Boolean" Flag="In" >
</Parameter>
</Parameters> </Parameters>
</Operation> </Operation>
</Operations> </Operations>

View File

@ -859,8 +859,8 @@ type
{ IsrvContratosCliente } { IsrvContratosCliente }
IsrvContratosCliente = interface(IDataAbstractService) IsrvContratosCliente = interface(IDataAbstractService)
['{ADBF1627-F507-4A0F-818E-38BAE28579B6}'] ['{ADBF1627-F507-4A0F-818E-38BAE28579B6}']
function GenerarInforme(const ListaID: TIntegerArray): Binary; function GenerarInforme(const ListaID: TIntegerArray; const VerCondiciones: Boolean): Binary;
function GenerarInformeEnPDF(const ListaID: TIntegerArray): Binary; function GenerarInformeEnPDF(const ListaID: TIntegerArray; const VerCondiciones: Boolean): Binary;
end; end;
{ CosrvContratosCliente } { CosrvContratosCliente }
@ -873,8 +873,8 @@ type
protected protected
function __GetInterfaceName:string; override; function __GetInterfaceName:string; override;
function GenerarInforme(const ListaID: TIntegerArray): Binary; function GenerarInforme(const ListaID: TIntegerArray; const VerCondiciones: Boolean): Binary;
function GenerarInformeEnPDF(const ListaID: TIntegerArray): Binary; function GenerarInformeEnPDF(const ListaID: TIntegerArray; const VerCondiciones: Boolean): Binary;
end; end;
implementation implementation
@ -2778,12 +2778,13 @@ begin
result := 'srvContratosCliente'; result := 'srvContratosCliente';
end; end;
function TsrvContratosCliente_Proxy.GenerarInforme(const ListaID: TIntegerArray): Binary; function TsrvContratosCliente_Proxy.GenerarInforme(const ListaID: TIntegerArray; const VerCondiciones: Boolean): Binary;
begin begin
try try
result := nil; result := nil;
__Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInforme'); __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInforme');
__Message.Write('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []); __Message.Write('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
__Message.Write('VerCondiciones', TypeInfo(Boolean), VerCondiciones, []);
__Message.Finalize; __Message.Finalize;
__TransportChannel.Dispatch(__Message); __TransportChannel.Dispatch(__Message);
@ -2795,12 +2796,13 @@ begin
end end
end; end;
function TsrvContratosCliente_Proxy.GenerarInformeEnPDF(const ListaID: TIntegerArray): Binary; function TsrvContratosCliente_Proxy.GenerarInformeEnPDF(const ListaID: TIntegerArray; const VerCondiciones: Boolean): Binary;
begin begin
try try
result := nil; result := nil;
__Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInformeEnPDF'); __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInformeEnPDF');
__Message.Write('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []); __Message.Write('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
__Message.Write('VerCondiciones', TypeInfo(Boolean), VerCondiciones, []);
__Message.Finalize; __Message.Finalize;
__TransportChannel.Dispatch(__Message); __TransportChannel.Dispatch(__Message);

View File

@ -2289,9 +2289,10 @@ begin
end; end;
procedure TsrvContratosCliente_Invoker.Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions); procedure TsrvContratosCliente_Invoker.Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
{ function GenerarInforme(const ListaID: TIntegerArray): Binary; } { function GenerarInforme(const ListaID: TIntegerArray; const VerCondiciones: Boolean): Binary; }
var var
ListaID: FactuGES_Intf.TIntegerArray; ListaID: FactuGES_Intf.TIntegerArray;
VerCondiciones: Boolean;
lResult: Binary; lResult: Binary;
__lObjectDisposer: TROObjectDisposer; __lObjectDisposer: TROObjectDisposer;
begin begin
@ -2299,8 +2300,9 @@ begin
lResult := nil; lResult := nil;
try try
__Message.Read('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []); __Message.Read('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
__Message.Read('VerCondiciones', TypeInfo(Boolean), VerCondiciones, []);
lResult := (__Instance as IsrvContratosCliente).GenerarInforme(ListaID); lResult := (__Instance as IsrvContratosCliente).GenerarInforme(ListaID, VerCondiciones);
__Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvContratosCliente', 'GenerarInformeResponse'); __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvContratosCliente', 'GenerarInformeResponse');
__Message.Write('Result', TypeInfo(Binary), lResult, []); __Message.Write('Result', TypeInfo(Binary), lResult, []);
@ -2319,9 +2321,10 @@ begin
end; end;
procedure TsrvContratosCliente_Invoker.Invoke_GenerarInformeEnPDF(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions); procedure TsrvContratosCliente_Invoker.Invoke_GenerarInformeEnPDF(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
{ function GenerarInformeEnPDF(const ListaID: TIntegerArray): Binary; } { function GenerarInformeEnPDF(const ListaID: TIntegerArray; const VerCondiciones: Boolean): Binary; }
var var
ListaID: FactuGES_Intf.TIntegerArray; ListaID: FactuGES_Intf.TIntegerArray;
VerCondiciones: Boolean;
lResult: Binary; lResult: Binary;
__lObjectDisposer: TROObjectDisposer; __lObjectDisposer: TROObjectDisposer;
begin begin
@ -2329,8 +2332,9 @@ begin
lResult := nil; lResult := nil;
try try
__Message.Read('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []); __Message.Read('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []);
__Message.Read('VerCondiciones', TypeInfo(Boolean), VerCondiciones, []);
lResult := (__Instance as IsrvContratosCliente).GenerarInformeEnPDF(ListaID); lResult := (__Instance as IsrvContratosCliente).GenerarInformeEnPDF(ListaID, VerCondiciones);
__Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvContratosCliente', 'GenerarInformeEnPDFResponse'); __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvContratosCliente', 'GenerarInformeEnPDFResponse');
__Message.Write('Result', TypeInfo(Binary), lResult, []); __Message.Write('Result', TypeInfo(Binary), lResult, []);

Binary file not shown.

View File

@ -121,16 +121,12 @@ uses
uRptPedidosProveedor_Server in '..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas' {RptPedidosProveedor: TDataModule}, uRptPedidosProveedor_Server in '..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas' {RptPedidosProveedor: TDataModule},
schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas', schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas',
schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas', schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas',
schRecibosProveedorClient_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas',
schRecibosProveedorServer_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas',
schFormasPagoClient_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas', schFormasPagoClient_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas',
schFormasPagoServer_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas', schFormasPagoServer_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas',
schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas', schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas',
schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas', schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas',
schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas', schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas',
schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas', schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas',
schRecibosClienteClient_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas',
schRecibosClienteServer_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas',
schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas', schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas',
schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas', schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas',
schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas', schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas',
@ -138,7 +134,11 @@ uses
schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas', schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas',
schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas', schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas',
schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas', schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas',
schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas'; schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas',
schRecibosProveedorClient_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas',
schRecibosProveedorServer_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas',
schRecibosClienteClient_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas',
schRecibosClienteServer_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas';
{$R *.res} {$R *.res}
{$R ..\Servicios\RODLFile.res} {$R ..\Servicios\RODLFile.res}

View File

@ -28,7 +28,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality> <Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType/> <Borland.ProjectType/>
<BorlandProject> <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">2</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">2.2.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES v2(Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.2.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 05 de junio de 2020 18:48</VersionInfoKeys></VersionInfoKeys><Excluded_Packages> <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">2</VersionInfo><VersionInfo Name="Release">2</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.2.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES v2(Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.2.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 02 de marzo de 2021 15:34</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 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> </Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions> </ProjectExtensions>

Binary file not shown.