From dbc21b5edb7e369693d0b9d75b69e5d0c2418624 Mon Sep 17 00:00:00 2001 From: roberto Date: Fri, 17 Oct 2008 16:36:44 +0000 Subject: [PATCH] Modulo nuevo para los informes estadisticos e informes que ya tenian anteriormente git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@699 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Source/Base/Base.dproj | 104 ++-- Source/Cliente/FactuGES.rc | 8 +- Source/Cliente/FactuGES.res | Bin 171984 -> 171984 bytes Source/GUIBase/uEditorPreview.pas | 8 - Source/Informes/InformeIVAClientes.fr3 | 30 +- ...nformeListadoFacturasClienteDesglosado.fr3 | 49 ++ ...nformeListadoFacturasClientePendientes.fr3 | 40 ++ .../InformeListadoRecibosCliPendientes.fr3 | 41 ++ .../Informes/InformeListadoRecibosCliente.fr3 | 41 ++ ...InformeListadoRecibosClienteDesglosado.fr3 | 41 ++ .../Views/FacturasCliente_view.res | Bin 4748 -> 384 bytes .../GestorInformes_controller.identcache | Bin 453 -> 339 bytes .../Controller/GestorInformes_controller.res | Bin 4748 -> 384 bytes .../Controller/uGestorInformesController.pas | 74 ++- .../Data/GestorInformes_data.dcu | Bin 13556 -> 13555 bytes .../Data/uDataModuleGestorInformes.pas | 30 +- .../Model/Data/uIDataModuleGestorInformes.pas | 5 + .../Servidor/srvGestorInformes_Impl.pas | 38 +- .../Views/GestorInformes_view.dpk | 3 +- .../Views/GestorInformes_view.dproj | 82 ++- .../Views/GestorInformes_view.res | Bin 4748 -> 384 bytes .../uEditorInformeFacturasClienteReport.dfm | 2 + .../uEditorInformeFacturasClienteReport.pas | 2 +- .../Views/uEditorInformeIVAClientesReport.dfm | 2 + .../Views/uEditorInformeIVAClientesReport.pas | 4 +- .../Views/uViewFiltroClientes.dfm | 2 + .../RecibosCliente_Group.groupproj | 46 +- .../Reports/uRptRecibosCliente_Server.dfm | 300 +++++++-- .../Reports/uRptRecibosCliente_Server.pas | 150 ++++- .../Views/RecibosCliente_view.dpk | Bin 1629 -> 1659 bytes .../Views/RecibosCliente_view.dproj | 66 +- .../Views/RecibosCliente_view.rc | 22 + .../Views/RecibosCliente_view.res | Bin 32 -> 384 bytes .../Views/uEditorRecibosCliente.dfm | 347 ++++++++++- .../Views/uEditorRecibosCliente.pas | 36 +- Source/Servicios/FactuGES.RODL | 36 ++ Source/Servicios/FactuGES_Intf.pas | 54 ++ Source/Servicios/FactuGES_Invk.pas | 84 +++ Source/Servicios/RODLFILE.res | Bin 31956 -> 33318 bytes Source/Servidor/FactuGES_Server.RES | Bin 23492 -> 23208 bytes Source/Servidor/FactuGES_Server.dproj | 586 +++++++++--------- Source/Servidor/FactuGES_Server.rc | 10 +- 42 files changed, 1802 insertions(+), 541 deletions(-) create mode 100644 Source/Informes/InformeListadoFacturasClienteDesglosado.fr3 create mode 100644 Source/Informes/InformeListadoFacturasClientePendientes.fr3 create mode 100644 Source/Informes/InformeListadoRecibosCliPendientes.fr3 create mode 100644 Source/Informes/InformeListadoRecibosCliente.fr3 create mode 100644 Source/Informes/InformeListadoRecibosClienteDesglosado.fr3 diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 832e442b..5dc01726 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -44,6 +44,8 @@ Package FalseTrueFalseLibreria base de FactuGESFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 + + Microsoft Office 2000 Sample Automation Server Wrapper Components Microsoft Office XP Sample Automation Server Wrapper Components Base.dpk @@ -53,57 +55,57 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index 52f774ce..a06fb814 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 1,3,9,0 -PRODUCTVERSION 1,3,9,0 +FILEVERSION 1,3,7,0 +PRODUCTVERSION 1,3,7,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "1.3.9.0\0" + VALUE "FileVersion", "1.3.7.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "1.3.9.0\0" + VALUE "ProductVersion", "1.3.7.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index c92c1b07997c2257c6d2b7845ec6be5e2bd62829..5d085937232e50af28bd9a2b586c2b4d18bc7117 100644 GIT binary patch delta 42 xcmcbxpXYrJf_(|s&zh-Hvk^l4G#bS delta 42 xcmcbxpX - + @@ -15,7 +15,7 @@ - + @@ -23,22 +23,22 @@ - + - - - - - - - - + + + + + + + + - - - - + + + + diff --git a/Source/Informes/InformeListadoFacturasClienteDesglosado.fr3 b/Source/Informes/InformeListadoFacturasClienteDesglosado.fr3 new file mode 100644 index 00000000..29665e4b --- /dev/null +++ b/Source/Informes/InformeListadoFacturasClienteDesglosado.fr3 @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Informes/InformeListadoFacturasClientePendientes.fr3 b/Source/Informes/InformeListadoFacturasClientePendientes.fr3 new file mode 100644 index 00000000..6e745478 --- /dev/null +++ b/Source/Informes/InformeListadoFacturasClientePendientes.fr3 @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Informes/InformeListadoRecibosCliPendientes.fr3 b/Source/Informes/InformeListadoRecibosCliPendientes.fr3 new file mode 100644 index 00000000..e80c8d95 --- /dev/null +++ b/Source/Informes/InformeListadoRecibosCliPendientes.fr3 @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Informes/InformeListadoRecibosCliente.fr3 b/Source/Informes/InformeListadoRecibosCliente.fr3 new file mode 100644 index 00000000..7fffee61 --- /dev/null +++ b/Source/Informes/InformeListadoRecibosCliente.fr3 @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Informes/InformeListadoRecibosClienteDesglosado.fr3 b/Source/Informes/InformeListadoRecibosClienteDesglosado.fr3 new file mode 100644 index 00000000..f31d305b --- /dev/null +++ b/Source/Informes/InformeListadoRecibosClienteDesglosado.fr3 @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.res b/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.res index 1641339fcc482e7e3492d1b45813a86619622c33..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 11 ScmeBCZD5|Duvteife`=|>;pCc literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP diff --git a/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.identcache b/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.identcache index bdbaa3dbcfa9168e5ca21f26d9a22b237ce8f615..6431bbd4a544b369876a5eab576791df08165961 100644 GIT binary patch delta 12 TcmX@ge3^-nc_L%(#0O6S8%+fF delta 38 tcmcc2bd;HqWg=rPW9r0wUlI4z;*$I#&%Ct!qTJNtpwxo=qLPVmUjh3X4uAjv diff --git a/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.res b/Source/Modulos/Gestor de informes/Controller/GestorInformes_controller.res index 1641339fcc482e7e3492d1b45813a86619622c33..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 11 ScmeBCZD5|Duvteife`=|>;pCc literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP diff --git a/Source/Modulos/Gestor de informes/Controller/uGestorInformesController.pas b/Source/Modulos/Gestor de informes/Controller/uGestorInformesController.pas index 0fc0eff9..44615d8b 100644 --- a/Source/Modulos/Gestor de informes/Controller/uGestorInformesController.pas +++ b/Source/Modulos/Gestor de informes/Controller/uGestorInformesController.pas @@ -4,7 +4,8 @@ interface uses - Classes, SysUtils, uDADataTable, uControllerBase, uIDataModuleGestorInformes; + Classes, SysUtils, uDADataTable, uControllerBase, uROTypes, uIDataModuleGestorInformes, + uIEditorInformeReportBase; type IGestorInformesController = interface(IControllerBase) @@ -13,9 +14,15 @@ type property DataModule: IDataModuleGestorInformes read GetDataModule; // procedure Preview(AFactura : IBizFacturaCliente; AllItems: Boolean = false); // procedure Print(AFactura : IBizFacturaCliente; AllItems: Boolean = false); + + //MODULO FACTURAS DE CLIENTE procedure GetInformeIVAClientes; procedure GetInformeListadoFacturas; procedure GetInformeListadoFacturasPendientes; + + //MODULO RECIBOS DE CLIENTE + procedure GetInformeListadoRecibosCliPendientes; + procedure GetInformeListadoRecibosCliente; end; TGestorInformesController = class(TControllerBase, IGestorInformesController) @@ -41,9 +48,15 @@ type procedure Print(AFactura : IBizFacturaCliente; AllItems: Boolean = false); } property DataModule: IDataModuleGestorInformes read GetDataModule; + + //MODULO FACTURAS DE CLIENTE procedure GetInformeIVAClientes; procedure GetInformeListadoFacturas; procedure GetInformeListadoFacturasPendientes; + + //MODULO RECIBOS DE CLIENTE + procedure GetInformeListadoRecibosCliPendientes; + procedure GetInformeListadoRecibosCliente; end; implementation @@ -51,7 +64,7 @@ implementation uses Windows, Controls, cxControls, DB, uEditorRegistryUtils, uFactuGES_App, uDAInterfaces, uDataTableUtils, uDateUtils, uNumUtils, - uROTypes, DateUtils, Forms, uIntegerListUtils, uDataModuleGestorInformes, + DateUtils, Forms, uIntegerListUtils, uDataModuleGestorInformes, uSistemaFunc, uDialogElegirEMail, uEMailUtils, Dialogs, uIEditorInformeIVAClientesReport; @@ -307,6 +320,63 @@ begin end; end; +procedure TGestorInformesController.GetInformeListadoRecibosCliente; +var + AStream: Binary; + AEditor : IEditorInformeIVAClientesReport; +begin + AEditor := NIL; + ShowHourglassCursor; + try + try + CreateEditor('EditorInformeIVAClientesReport', IEditorInformeIVAClientesReport, AEditor); + if Assigned(AEditor) then + with AEditor do + begin + AEditor.Controller := Self; + AStream := FDataModule.GetInformeListadoRecibosCliente(AppFactuGES.EmpresaActiva.ID, FechaInicio, FechaFin, ListaIDClientes, DesglosadoCliente, ImporteMinimo); + LoadFromStream(AStream); + Preview; + Release; + end; + finally + FreeAndNil(AStream); + AEditor := Nil; + end; + finally + HideHourglassCursor; + end; +end; + +procedure TGestorInformesController.GetInformeListadoRecibosCliPendientes; +var + AStream: Binary; + AEditor : IEditorInformeIVAClientesReport; +begin + AEditor := NIL; + ShowHourglassCursor; + try + try + CreateEditor('EditorInformeIVAClientesReport', IEditorInformeIVAClientesReport, AEditor); + if Assigned(AEditor) then + with AEditor do + begin + AEditor.Controller := Self; + AStream := FDataModule.GetInformeListadoRecibosCliPendientes(AppFactuGES.EmpresaActiva.ID, FechaInicio, FechaFin, ListaIDClientes, DesglosadoCliente, ImporteMinimo); + LoadFromStream(AStream); + Preview; + Release; + end; + finally + FreeAndNil(AStream); + AEditor := Nil; + end; + finally + HideHourglassCursor; + end; +end; + + { procedure TGestorInformesController.Ver(AFactura: IBizFacturaCliente); var diff --git a/Source/Modulos/Gestor de informes/Data/GestorInformes_data.dcu b/Source/Modulos/Gestor de informes/Data/GestorInformes_data.dcu index 337e86d1327abc7ddc5840e8bb48e7b20640d848..c9d2ace03473f2780e39727c0abd23cd6c3f1249 100644 GIT binary patch delta 54 zcmey8`8ktYnSnv*vk3!3^W?yZ+=`6a6LnR2T`cuVatr MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
fEditorInformeFacturasClienteReport
- TfEditorElegirFacturasCliente - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fEditorInformeIVAClientesReport
TfEditorElegirFacturasCliente @@ -92,12 +94,6 @@
frViewPeriodoFechas
TFrame - - - - - -