diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index c761d564..bd1cde21 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -58,55 +58,55 @@ MainSource + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
fConfigurarConexion
TForm diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 2a7920de..66003d38 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -52,8 +52,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2790FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.7.9.0FactuGESFactuGES2.7.9.0 - +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2800FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.8.0.0FactuGESFactuGES2.8.0.0 File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index a5ae7563..a353b934 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 2,7,9,0 -PRODUCTVERSION 2,7,9,0 +FILEVERSION 2,8,0,0 +PRODUCTVERSION 2,8,0,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "2.7.9.0\0" + VALUE "FileVersion", "2.8.0.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "2.7.9.0\0" + VALUE "ProductVersion", "2.8.0.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 5d0b0a6f..1caa999e 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Informes/InformeIVAClientes.fr3 b/Source/Informes/InformeIVAClientes.fr3 index 20ba2941..d91749c9 100644 --- a/Source/Informes/InformeIVAClientes.fr3 +++ b/Source/Informes/InformeIVAClientes.fr3 @@ -1,5 +1,5 @@ - + @@ -27,9 +27,9 @@ - + - + @@ -52,8 +52,8 @@ - - + + diff --git a/Source/Informes/InformeIVAClientesDesglosado.fr3 b/Source/Informes/InformeIVAClientesDesglosado.fr3 index 3aa83c00..7dd7ca68 100644 --- a/Source/Informes/InformeIVAClientesDesglosado.fr3 +++ b/Source/Informes/InformeIVAClientesDesglosado.fr3 @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm index 235357ca..83c077b2 100644 --- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm +++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm @@ -368,14 +368,16 @@ object RptFacturasCliente: TRptFacturasCliente Name = 'IBX' SQL = 'select V_facturas_cliente.ID_EMPRESA,'#10'contactos.REFERENCIA,'#10'cont' + - 'actos.nif_cif,'#10'contactos.poblacion,'#10'V_facturas_cliente.NOMBRE,'#10'V' + - '_facturas_cliente.IVA,'#10'V_facturas_cliente.RE,'#10'sum(V_facturas_cli' + - 'ente.BASE_IMPONIBLE) as BASE_IMPONIBLE,'#10'sum(V_facturas_cliente.I' + - 'MPORTE_IVA) as IMPORTE_IVA,'#10'sum(V_facturas_cliente.IMPORTE_RE) a' + - 's IMPORTE_RE,'#10'sum(V_facturas_cliente.IMPORTE_TOTAL) AS IMPORTE_T' + - 'OTAL'#10'from V_facturas_cliente'#10'left join contactos on (contactos.I' + - 'D = V_facturas_cliente.ID_CLIENTE)'#10'group by 1,2,3,4,5,6,7'#10'order ' + - 'by 1,5,6,7,2,4'#10 + 'actos.nif_cif,'#10'contactos.poblacion,'#10'V_facturas_cliente.NOMBRE ||' + + ' COALESCE(v_contactos_nombres.otros_nombres, '#39#39') as NOMBRE,'#10'V_fa' + + 'cturas_cliente.IVA,'#10'V_facturas_cliente.RE,'#10'sum(V_facturas_client' + + 'e.BASE_IMPONIBLE) as BASE_IMPONIBLE,'#10'sum(V_facturas_cliente.IMPO' + + 'RTE_IVA) as IMPORTE_IVA,'#10'sum(V_facturas_cliente.IMPORTE_RE) as I' + + 'MPORTE_RE,'#10'sum(V_facturas_cliente.IMPORTE_TOTAL) AS IMPORTE_TOTA' + + 'L'#10'from V_facturas_cliente'#10'left join contactos on (contactos.ID =' + + ' V_facturas_cliente.ID_CLIENTE)'#10'LEFT OUTER JOIN v_contactos_nomb' + + 'res ON (v_contactos_nombres.id = v_facturas_cliente.id_cliente)'#10 + + 'group by 1,2,3,4,5,6,7'#10'order by 1,5,6,7,2,4'#10 StatementType = stSQL ColumnMappings = < item diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas index 244636fd..dbee8ac2 100644 --- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas +++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas @@ -36,8 +36,8 @@ type tbl_InformeListadoFacturasResumen: TDAMemDataTable; DADSInformeListadoFacturasResumen: TDADataSource; frxDBInformeListadoFacturasResumen: TfrxDBDataset; - schReport: TDASchema; frxPDFExport1: TfrxPDFExport; + schReport: TDASchema; procedure DataModuleCreate(Sender: TObject); procedure DataModuleDestroy(Sender: TObject); private diff --git a/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dproj b/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dproj index ddbf662d..e2b645b3 100644 --- a/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dproj +++ b/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dproj @@ -38,13 +38,13 @@ MainSource - - - - - - - + + + + + + +
fEditorInformeBase
TForm diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeBase.dfm b/Source/Modulos/Gestor de informes/Views/uEditorInformeBase.dfm index cb500f4f..9c4abab8 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeBase.dfm +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeBase.dfm @@ -8,6 +8,7 @@ inherited fEditorInformeBase: TfEditorInformeBase TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader Width = 787 + ExplicitTop = 89 ExplicitWidth = 787 inherited Image1: TImage Left = 760 @@ -29,16 +30,16 @@ inherited fEditorInformeBase: TfEditorInformeBase end object TBXMultiDockIzquierdo: TTBXMultiDock [3] Left = 0 - Top = 102 + Top = 116 Width = 7 - Height = 362 + Height = 348 Position = dpLeft end object TBXMultiDockDerecho: TTBXMultiDock [4] - Left = 633 - Top = 102 - Width = 154 - Height = 362 + Left = 537 + Top = 116 + Width = 250 + Height = 348 Position = dpRight object pnlParametros: TTBXDockablePanel Left = 0 @@ -48,7 +49,7 @@ inherited fEditorInformeBase: TfEditorInformeBase CloseButtonWhenDocked = False DefaultDock = TBXMultiDockDerecho DockableTo = [dpLeft, dpRight] - DockedWidth = 150 + DockedWidth = 246 DockMode = dmCannotFloat DockPos = 6 FloatingWidth = 128 @@ -57,7 +58,7 @@ inherited fEditorInformeBase: TfEditorInformeBase TabOrder = 0 object TBXDockablePanel1: TTBXDockablePanel Left = 0 - Top = 196 + Top = 259 MaxClientHeight = 50 Align = alBottom Caption = 'TBXDockablePanel1' @@ -65,8 +66,9 @@ inherited fEditorInformeBase: TfEditorInformeBase FloatingHeight = 128 SupportedDocks = [dkStandardDock, dkMultiDock] TabOrder = 0 - ExplicitTop = 274 - ExplicitWidth = 128 + ExplicitTop = 181 + ExplicitWidth = 150 + ExplicitHeight = 128 object TBXButton1: TTBXButton Left = 16 Top = 12 diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeBase.pas b/Source/Modulos/Gestor de informes/Views/uEditorInformeBase.pas index 1e5dee61..55825abc 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeBase.pas +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeBase.pas @@ -10,7 +10,7 @@ uses JvAppRegistryStorage, JvComponentBase, JvFormPlacement, ImgList, PngImageList, StdActns, ActnList, ComCtrls, JvExComCtrls, JvStatusBar, TB2ExtItems, TBXExtItems, TBX, TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, - JvExControls, JvNavigationPane, uIEditorInformeBase, TBXDkPanels; + JvExControls, JvNavigationPane, uIEditorInformeBase, TBXDkPanels, frxExportCSV; type TfEditorInformeBase = class(TfEditorPreview, IEditorInformeBase) diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAClientesReport.dfm b/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAClientesReport.dfm index ac518a1d..2d90881f 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAClientesReport.dfm +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAClientesReport.dfm @@ -21,7 +21,7 @@ inherited fEditorInformeIVAClientesReport: TfEditorInformeIVAClientesReport ExplicitWidth = 895 end inherited TBXToolbar1: TTBXToolbar - ExplicitWidth = 591 + ExplicitWidth = 678 object TBXItem58: TTBXItem [0] Action = actRefrescar DisplayMode = nbdmImageAndText @@ -36,24 +36,24 @@ inherited fEditorInformeIVAClientesReport: TfEditorInformeIVAClientesReport ExplicitWidth = 895 end inherited TBXMultiDockIzquierdo: TTBXMultiDock - Height = 534 - ExplicitHeight = 534 + Height = 520 + ExplicitHeight = 520 end inherited TBXMultiDockDerecho: TTBXMultiDock - Left = 703 - Width = 192 - Height = 534 - ExplicitLeft = 703 - ExplicitWidth = 192 - ExplicitHeight = 534 + Left = 660 + Width = 235 + Height = 520 + ExplicitLeft = 660 + ExplicitWidth = 235 + ExplicitHeight = 520 inherited pnlParametros: TTBXDockablePanel - DockedWidth = 188 - ExplicitWidth = 192 - ExplicitHeight = 518 + DockedWidth = 231 + ExplicitWidth = 235 + ExplicitHeight = 504 inline frViewPeriodoFechas1: TfrViewPeriodoFechas [0] Left = 0 Top = 0 - Width = 188 + Width = 231 Height = 136 Align = alTop Font.Charset = DEFAULT_CHARSET @@ -67,10 +67,10 @@ inherited fEditorInformeIVAClientesReport: TfEditorInformeIVAClientesReport ExplicitWidth = 188 ExplicitHeight = 136 inherited TBXAlignmentPanel2: TTBXAlignmentPanel - Width = 182 + Width = 225 ExplicitWidth = 182 inherited Label3: TLabel - Width = 172 + Width = 215 end inherited edtFechaFin: TcxDateEdit Left = 77 @@ -80,7 +80,7 @@ inherited fEditorInformeIVAClientesReport: TfEditorInformeIVAClientesReport StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 77 ExplicitWidth = 96 - Width = 96 + Width = 139 end inherited edtFechaIni: TcxDateEdit Left = 76 @@ -90,7 +90,7 @@ inherited fEditorInformeIVAClientesReport: TfEditorInformeIVAClientesReport StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 76 ExplicitWidth = 97 - Width = 97 + Width = 140 end inherited cbPeriodo: TcxComboBox Style.LookAndFeel.SkinName = '' @@ -98,19 +98,19 @@ inherited fEditorInformeIVAClientesReport: TfEditorInformeIVAClientesReport StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 170 - Width = 170 + Width = 213 end end inherited TBXLabel2: TTBXLabel - Width = 188 + Width = 231 ExplicitWidth = 188 end inherited TBXAlignmentPanel3: TTBXAlignmentPanel - Width = 182 + Width = 225 Visible = False ExplicitWidth = 182 inherited Label4: TLabel - Width = 172 + Width = 215 end inherited edtFechaVenFin: TcxDateEdit Style.LookAndFeel.SkinName = '' @@ -118,7 +118,7 @@ inherited fEditorInformeIVAClientesReport: TfEditorInformeIVAClientesReport StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 99 - Width = 99 + Width = 142 end inherited edtFechaVenIni: TcxDateEdit Style.LookAndFeel.SkinName = '' @@ -126,26 +126,27 @@ inherited fEditorInformeIVAClientesReport: TfEditorInformeIVAClientesReport StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 97 - Width = 97 + Width = 140 end inherited cbPeriodo2: TcxComboBox Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + Width = 472 end end end inherited TBXDockablePanel1: TTBXDockablePanel - Top = 368 + Top = 431 TabOrder = 2 - ExplicitTop = 368 + ExplicitTop = 353 ExplicitWidth = 188 inherited TBXButton1: TTBXButton AlignWithMargins = True Left = 3 Top = 3 - Width = 182 + Width = 225 Height = 37 Margins.Left = 8 Margins.Top = 8 @@ -161,7 +162,7 @@ inherited fEditorInformeIVAClientesReport: TfEditorInformeIVAClientesReport inline frViewFiltroImportes1: TfrViewFiltroImportes Left = 0 Top = 136 - Width = 188 + Width = 231 Height = 77 Align = alTop AutoSize = True @@ -177,11 +178,11 @@ inherited fEditorInformeIVAClientesReport: TfEditorInformeIVAClientesReport ExplicitWidth = 188 ExplicitHeight = 77 inherited TBXLabel2: TTBXLabel - Width = 188 + Width = 231 ExplicitWidth = 188 end inherited TBXAlignmentPanel1: TTBXAlignmentPanel - Width = 182 + Width = 225 ExplicitWidth = 182 inherited eImporte: TcxSpinEdit Style.LookAndFeel.SkinName = '' @@ -194,7 +195,7 @@ inherited fEditorInformeIVAClientesReport: TfEditorInformeIVAClientesReport inline frViewFiltroClientes1: TfrViewFiltroClientes Left = 0 Top = 213 - Width = 188 + Width = 231 Height = 146 Align = alTop AutoSize = True @@ -210,11 +211,11 @@ inherited fEditorInformeIVAClientesReport: TfEditorInformeIVAClientesReport ExplicitWidth = 188 ExplicitHeight = 146 inherited TBXLabel2: TTBXLabel - Width = 188 + Width = 231 ExplicitWidth = 188 end inherited bElegirCliente: TBitBtn - Width = 108 + Width = 151 ExplicitWidth = 108 end inherited edtCliente: TcxTextEdit @@ -223,7 +224,7 @@ inherited fEditorInformeIVAClientesReport: TfEditorInformeIVAClientesReport StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 141 - Width = 141 + Width = 184 end end end diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAClientesReport.pas b/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAClientesReport.pas index 407de3d8..2c2f5763 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAClientesReport.pas +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeIVAClientesReport.pas @@ -14,7 +14,8 @@ uses uViewBase, uViewPeriodoFechas, uViewFiltroClientes, dxLayoutControl, cxControls, uViewFiltroImportes, FactuGES_Intf, TBXDkPanels, uEditorInformeBase, - uIEditorInformeBase, uViewParametrosInforme, uIEditorInformeIVAClientesReport; + uIEditorInformeBase, uViewParametrosInforme, uIEditorInformeIVAClientesReport, + frxExportCSV; type TfEditorInformeIVAClientesReport = class(TfEditorInformeBase, IEditorInformeIVAClientesReport) diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 87964d52..b3038609 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -28,7 +28,7 @@ Delphi.Personality - FalseTrueFalseTrueFalse2790FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.7.9.0FactuGES (Servidor)2.7.9.0lunes, 12 de septiembre de 2016 17:15 + FalseTrueFalseTrueFalse2800FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.8.0.0FactuGES (Servidor)2.8.0.0jueves, 10 de noviembre de 2016 12:55 File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found FactuGES_Server.dpr diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index be98c008..71e861c7 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico" 1 VERSIONINFO -FILEVERSION 2,7,9,0 -PRODUCTVERSION 2,7,9,0 +FILEVERSION 2,8,0,0 +PRODUCTVERSION 2,8,0,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "2.7.9.0\0" + VALUE "FileVersion", "2.8.0.0\0" VALUE "ProductName", "FactuGES (Servidor)\0" - VALUE "ProductVersion", "2.7.9.0\0" - VALUE "CompileDate", "lunes, 12 de septiembre de 2016 19:29\0" + VALUE "ProductVersion", "2.8.0.0\0" + VALUE "CompileDate", "jueves, 10 de noviembre de 2016 15:18\0" END END BLOCK "VarFileInfo" diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res index 9389bd63..ee3df140 100644 Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ