diff --git a/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.dpk b/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.dpk index 78ef7f0f..8826eae6 100644 --- a/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.dpk +++ b/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.dpk @@ -33,6 +33,7 @@ contains uGestorInformesController in 'uGestorInformesController.pas', uIEditorInformeFacturasClienteReport in 'View\uIEditorInformeFacturasClienteReport.pas', uIEditorInformeBase in 'View\uIEditorInformeBase.pas', - uIEditorInformeIVAClientesReport in 'View\uIEditorInformeIVAClientesReport.pas'; + uIEditorInformeIVAClientesReport in 'View\uIEditorInformeIVAClientesReport.pas', + uIEditorInformeFacturasClientePendientesReport in 'View\uIEditorInformeFacturasClientePendientesReport.pas'; end. diff --git a/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.dproj b/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.dproj index ab4c5fe6..ce482d02 100644 --- a/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.dproj +++ b/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.dproj @@ -43,6 +43,7 @@ + diff --git a/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.identcache b/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.identcache index 37e9efeb..06697ad6 100644 Binary files a/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.identcache and b/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.identcache differ diff --git a/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.res b/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.res index 8b251f31..1641339f 100644 Binary files a/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.res and b/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.res differ diff --git a/Source/Modulos/Gestor de informes/Controller/View/uIEditorInformeFacturasClientePendientesReport.pas b/Source/Modulos/Gestor de informes/Controller/View/uIEditorInformeFacturasClientePendientesReport.pas new file mode 100644 index 00000000..06f765bc --- /dev/null +++ b/Source/Modulos/Gestor de informes/Controller/View/uIEditorInformeFacturasClientePendientesReport.pas @@ -0,0 +1,26 @@ +unit uIEditorInformeFacturasClientePendientesReport; + +interface + +uses + FactuGES_Intf, uIEditorInformeBase; + +type + IEditorInformeFacturasClientePendientesReport = interface(IEditorInformeBase) + ['{6ADD8C8B-34D8-4F51-9C9C-4A9ED54DDE34}'] + function GetFechaFin: TDateTime; + function GetFechaInicio: TDateTime; + function GetListaIDClientes: TIntegerArray; + function GetDesglosadoCliente: Boolean; + function GetImporteMinimo: Currency; + property FechaInicio: TDateTime read GetFechaInicio; + property FechaFin: TDateTime read GetFechaFin; + property ListaIDClientes: TIntegerArray read GetListaIDClientes; + property DesglosadoCliente: Boolean read GetDesglosadoCliente; + property ImporteMinimo: Currency read getImporteMinimo; + end; + + +implementation + +end. diff --git a/Source/Modulos/Gestor de informes/Controller/uGestorInformesController.pas b/Source/Modulos/Gestor de informes/Controller/uGestorInformesController.pas index fa4289b4..36fffff2 100644 --- a/Source/Modulos/Gestor de informes/Controller/uGestorInformesController.pas +++ b/Source/Modulos/Gestor de informes/Controller/uGestorInformesController.pas @@ -66,7 +66,8 @@ uses uDAInterfaces, uDataTableUtils, uDateUtils, uNumUtils, DateUtils, Forms, uIntegerListUtils, uDataModuleGestorInformes, uSistemaFunc, uDialogElegirEMail, uEMailUtils, Dialogs, - uIEditorInformeIVAClientesReport, uIEditorInformeFacturasClienteReport; + uIEditorInformeIVAClientesReport, uIEditorInformeFacturasClienteReport, + uIEditorInformeFacturasClientePendientesReport; {procedure CopiarArticulosPedido(AOrigen: IBizDetallesPedidoCliente; @@ -251,6 +252,7 @@ begin with AEditor do begin AEditor.Controller := Self; + AEditor.Title := 'Listado de IVA de facturas de cliente'; AStream := FDataModule.GetInformeIVAClientes(AppFactuGES.EmpresaActiva.ID, FechaInicio, FechaFin, ListaIDClientes, DesglosadoCliente, ImporteMinimo); LoadFromStream(AStream); Preview; @@ -279,6 +281,7 @@ begin with AEditor do begin AEditor.Controller := Self; + AEditor.Title := 'Listado de facturas de cliente'; AStream := FDataModule.GetInformeListadoFacturas(AppFactuGES.EmpresaActiva.ID, FechaInicio, FechaFin, ListaIDClientes, DesglosadoCliente, ImporteMinimo); LoadFromStream(AStream); Preview; @@ -296,17 +299,18 @@ end; procedure TGestorInformesController.VerInformeListadoFacturasPendientes; var AStream: Binary; - AEditor : IEditorInformeIVAClientesReport; + AEditor : IEditorInformeFacturasClientePendientesReport; begin AEditor := NIL; ShowHourglassCursor; try try - CreateEditor('EditorInformeIVAClientesReport', IEditorInformeIVAClientesReport, AEditor); + CreateEditor('EditorInformeFacturasClientePendientesReport', IEditorInformeFacturasClientePendientesReport, AEditor); if Assigned(AEditor) then with AEditor do begin AEditor.Controller := Self; + AEditor.Title := 'Listado de facturas de cliente pendientes'; AStream := FDataModule.GetInformeListadoFacturasPendientes(AppFactuGES.EmpresaActiva.ID, FechaInicio, FechaFin, ListaIDClientes, DesglosadoCliente, ImporteMinimo); LoadFromStream(AStream); Preview; diff --git a/Source/Modulos/Gestor de informes/Plugin/uPluginGestorInformes.dfm b/Source/Modulos/Gestor de informes/Plugin/uPluginGestorInformes.dfm index 8f8b21be..7056dde4 100644 --- a/Source/Modulos/Gestor de informes/Plugin/uPluginGestorInformes.dfm +++ b/Source/Modulos/Gestor de informes/Plugin/uPluginGestorInformes.dfm @@ -49,6 +49,18 @@ object PluginGestorInformes: TPluginGestorInformes ImageIndex = 0 OnExecute = actInformeFacturasClienteExecute end + object actInformeFacturasClientePendientes: TAction + Category = 'Facturas de cliente' + Caption = 'Listado de facturas de cliente pendientes' + ImageIndex = 0 + OnExecute = actInformeFacturasClientePendientesExecute + end + object actInformeFacturasClienteIVA: TAction + Category = 'Facturas de cliente' + Caption = 'Listado de IVA de facturas de cliente' + ImageIndex = 0 + OnExecute = actInformeFacturasClienteIVAExecute + end end object MainMenu: TMainMenu Images = LargeImages @@ -59,6 +71,12 @@ object PluginGestorInformes: TPluginGestorInformes object Listadodefacturasdecliente1: TMenuItem Action = actInformeFacturasCliente end + object Listadodefacturasdeclientependientes1: TMenuItem + Action = actInformeFacturasClientePendientes + end + object ListadodeIVAdefacturasdecliente1: TMenuItem + Action = actInformeFacturasClienteIVA + end end end object SmallImages: TPngImageList diff --git a/Source/Modulos/Gestor de informes/Plugin/uPluginGestorInformes.pas b/Source/Modulos/Gestor de informes/Plugin/uPluginGestorInformes.pas index 6ec52a9e..5a2dbec3 100644 --- a/Source/Modulos/Gestor de informes/Plugin/uPluginGestorInformes.pas +++ b/Source/Modulos/Gestor de informes/Plugin/uPluginGestorInformes.pas @@ -20,7 +20,13 @@ type Informes1: TMenuItem; actInformeFacturasCliente: TAction; Listadodefacturasdecliente1: TMenuItem; + actInformeFacturasClientePendientes: TAction; + actInformeFacturasClienteIVA: TAction; + Listadodefacturasdeclientependientes1: TMenuItem; + ListadodeIVAdefacturasdecliente1: TMenuItem; procedure actInformeFacturasClienteExecute(Sender: TObject); + procedure actInformeFacturasClientePendientesExecute(Sender: TObject); + procedure actInformeFacturasClienteIVAExecute(Sender: TObject); private FController : IGestorInformesController; public @@ -50,6 +56,18 @@ begin FController.VerInformeListadoFacturas; end; +procedure TPluginGestorInformes.actInformeFacturasClienteIVAExecute( + Sender: TObject); +begin + FController.VerInformeIVAClientes; +end; + +procedure TPluginGestorInformes.actInformeFacturasClientePendientesExecute( + Sender: TObject); +begin + FController.VerInformeListadoFacturasPendientes; +end; + constructor TPluginGestorInformes.Create(AOwner: TComponent); begin inherited; diff --git a/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dpk b/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dpk index 839a94e5..dd418bca 100644 --- a/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dpk +++ b/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dpk @@ -43,6 +43,7 @@ contains uEditorInformeBase in 'uEditorInformeBase.pas' {fEditorInformeBase: TForm}, uViewFiltroClientes in 'uViewFiltroClientes.pas' {frViewFiltroClientes: TFrame}, uViewParametrosInforme in 'uViewParametrosInforme.pas' {frViewParametrosInforme: TFrame}, + uEditorInformeFacturasClientePendientesReport in 'uEditorInformeFacturasClientePendientesReport.pas' {fEditorInformeFacturasClientePendientesReport: t}, uEditorInformeFacturasClienteReport in 'uEditorInformeFacturasClienteReport.pas' {fEditorInformeFacturasClienteReport: TForm}; end. diff --git a/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dproj b/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dproj index 5118e753..7bcf16d6 100644 --- a/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dproj +++ b/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dproj @@ -38,23 +38,26 @@ MainSource - - - - - - - - - + + + + + + + +
fEditorInformeBase
TForm
- -
fEditorInformeFacturasClienteReport
+ +
fEditorInformeFacturasClientePendientesReport
t
+ +
EditorInformeFacturasClienteReport
+ T +
fEditorInformeIVAClientesReport
TForm @@ -76,6 +79,7 @@
frViewPeriodoFechas
TFrame
+