diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 51cf8874..c8226812 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -51,6 +51,13 @@ + + + + + + + VCL for the Web Design Package for CodeGear RAD Studio CodeGear WebSnap Components CodeGear SOAP Components @@ -65,52 +72,52 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
TForm diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 8b251f31..1641339f 100644 Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ diff --git a/Source/Base/Utiles/uSistemaFunc.pas b/Source/Base/Utiles/uSistemaFunc.pas index b50be476..bc21f81a 100644 --- a/Source/Base/Utiles/uSistemaFunc.pas +++ b/Source/Base/Utiles/uSistemaFunc.pas @@ -24,7 +24,8 @@ unit uSistemaFunc; interface -uses SysUtils, Classes; +uses + SysUtils, Classes, Graphics; { Funciones del sistema } function Ejecutar (const LineaComando: String; Oculto, Esperar: Boolean) : Boolean; @@ -52,12 +53,16 @@ function FindFile(const filespec: TFileName; attributes: integer = faReadOnly Or function DarRutaFichero(const ARutaIni: String; const AFichero: String; const ADirectorio1: String = ''; const ADirectorio2: String = ''): Variant; +{ Fuentes } +procedure SetDefaultFonts(const AFont: TFont); +procedure SetDesktopIconFonts(const AFont: TFont); + implementation uses Windows, Variants, Dialogs, JclFileUtils, - Messages, Graphics, Controls, Forms, + Messages, Controls, Forms, StdCtrls, SHFolder, cxShellBrowserDialog, cxLookAndFeels, uStringsUtils; @@ -460,4 +465,24 @@ begin end end; + + +procedure SetDefaultFonts(const AFont: TFont); +begin + AFont.Handle := GetStockObject(DEFAULT_GUI_FONT); +end; + +procedure SetDesktopIconFonts(const AFont: TFont); +var + LogFont: TLogFont; +begin + if SystemParametersInfo(SPI_GETICONTITLELOGFONT, SizeOf(LogFont), + @LogFont, 0) then + AFont.Handle := CreateFontIndirect(LogFont) + else + SetDefaultFonts(AFont); +end; + + + end. diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index f7807393..37aa08af 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -58,38 +58,38 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res index 8b251f31..1641339f 100644 Binary files a/Source/GUIBase/GUIBase.res and b/Source/GUIBase/GUIBase.res differ diff --git a/Source/GUIBase/uViewDetallesBase.pas b/Source/GUIBase/uViewDetallesBase.pas index c7cad67d..ebf37180 100644 --- a/Source/GUIBase/uViewDetallesBase.pas +++ b/Source/GUIBase/uViewDetallesBase.pas @@ -192,7 +192,7 @@ implementation {$R *.dfm} uses - uCalculosUtils; + uCalculosUtils, uSistemaFunc; function EnumFontsProc(var LogFont: TLogFont; var TextMetric: TTextMetric; FontType: Integer; Data: Pointer): Integer; stdcall; @@ -466,8 +466,9 @@ begin if ATipo = TIPO_DETALLE_CONCEPTO then begin - Result.Name := 'Lucida Console'; - Result.Size := 13; + //SetDesktopIconFonts(Result); + Result.Name := 'DejaVu Sans Mono'; + Result.Size := 9; Result.Style := []; end; diff --git a/Source/Informes/1/InfFacturaCliente.fr3 b/Source/Informes/1/InfFacturaCliente.fr3 index 1fd9b720..0673eafe 100644 --- a/Source/Informes/1/InfFacturaCliente.fr3 +++ b/Source/Informes/1/InfFacturaCliente.fr3 @@ -1,8 +1,8 @@ - + - + @@ -30,40 +30,40 @@ - + - - - + + + - + - + - + - + - - - - - - - + + + + + + + - + - + diff --git a/Source/Informes/2/InfContratoCliente.fr3 b/Source/Informes/2/InfContratoCliente.fr3 deleted file mode 100644 index 6e25b58a..00000000 --- a/Source/Informes/2/InfContratoCliente.fr3 +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/2/InfFacturaCliente.fr3 b/Source/Informes/2/InfFacturaCliente.fr3 index 86315f66..7e35932b 100644 --- a/Source/Informes/2/InfFacturaCliente.fr3 +++ b/Source/Informes/2/InfFacturaCliente.fr3 @@ -1,8 +1,8 @@ - + - + @@ -30,18 +30,18 @@ - + - - - - - - - + + + + + + + - + @@ -51,21 +51,21 @@ - + - + - + - + - + - + - + diff --git a/Source/Informes/2/InfPresupuestoCliente.fr3 b/Source/Informes/2/InfPresupuestoCliente.fr3 deleted file mode 100644 index 31cc7dfa..00000000 --- a/Source/Informes/2/InfPresupuestoCliente.fr3 +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InfContratoCliente.fr3 b/Source/Informes/InfContratoCliente.fr3 similarity index 94% rename from Source/Informes/1/InfContratoCliente.fr3 rename to Source/Informes/InfContratoCliente.fr3 index 16381e42..3c6e98ea 100644 --- a/Source/Informes/1/InfContratoCliente.fr3 +++ b/Source/Informes/InfContratoCliente.fr3 @@ -1,8 +1,8 @@ - + - + @@ -21,62 +21,62 @@ - + - - + + - + - + - - - - + + + + - + - + - + - + - + - - - - - - - - + + + + + + + + - + - + - + - + diff --git a/Source/Informes/1/InfPresupuestoCliente.fr3 b/Source/Informes/InfPresupuestoCliente.fr3 similarity index 77% rename from Source/Informes/1/InfPresupuestoCliente.fr3 rename to Source/Informes/InfPresupuestoCliente.fr3 index bc982efe..a395f097 100644 --- a/Source/Informes/1/InfPresupuestoCliente.fr3 +++ b/Source/Informes/InfPresupuestoCliente.fr3 @@ -1,8 +1,8 @@ - + - + @@ -11,7 +11,7 @@ - + @@ -23,56 +23,56 @@ - + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - - - - - - + + + + + + - + - - - + + + diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm index 992e35bc..c880fbc7 100644 --- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm +++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm @@ -246,8 +246,6 @@ object RptFacturasCliente: TRptFacturasCliente RemoteFetchEnabled = False LocalSchema = schReport LocalDataStreamer = Bin2DataStreamer - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'InformeFacturasCliente' IndexDefs = <> Left = 264 @@ -321,8 +319,6 @@ object RptFacturasCliente: TRptFacturasCliente RemoteFetchEnabled = False LocalSchema = schReport LocalDataStreamer = Bin2DataStreamer - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'InformeFacturasCliente_Detalles' IndexDefs = <> Left = 344 @@ -1054,10 +1050,11 @@ object RptFacturasCliente: TRptFacturasCliente Connection = 'IBX' TargetTable = 'FACTURAS_CLIENTE_DETALLES' SQL = - 'SELECT'#10' ID, ID_FACTURA, POSICION, TIPO_DETALLE, CONCEPTO, CAN' + - 'TIDAD,'#10' IMPORTE_UNIDAD, DESCUENTO, IMPORTE_TOTAL, VISIBLE'#10'FRO' + - 'M FACTURAS_CLIENTE_DETALLES'#10'WHERE ID_FACTURA = :ID_FACTURA'#10'ORDER' + - ' BY POSICION;' + 'SELECT'#10' ID, ID_FACTURA, POSICION, TIPO_DETALLE, F_RTFTOTEXT(C' + + 'ONCEPTO) AS CONCEPTO,'#10' CONCEPTO AS CONCEPTO_RTF, CANTIDAD,'#10' ' + + ' IMPORTE_UNIDAD, DESCUENTO, IMPORTE_TOTAL, VISIBLE'#10'FROM FACTURA' + + 'S_CLIENTE_DETALLES'#10'WHERE ID_FACTURA = :ID_FACTURA'#10'ORDER BY POSIC' + + 'ION;'#10 StatementType = stSQL ColumnMappings = < item @@ -1099,6 +1096,11 @@ object RptFacturasCliente: TRptFacturasCliente item DatasetField = 'DESCUENTO' TableField = 'DESCUENTO' + end + item + DatasetField = 'CONCEPTO_RTF' + TableField = 'CONCEPTO' + SQLOrigin = 'CONCEPTO_RTF' end> end> Name = 'InformeFacturasCliente_Detalles' @@ -1125,6 +1127,11 @@ object RptFacturasCliente: TRptFacturasCliente Size = 10 DictionaryEntry = 'FacturasCliente_Detalles_TIPO_DETALLE' end + item + Name = 'CONCEPTO_RTF' + DataType = datString + BlobType = dabtMemo + end item Name = 'CONCEPTO' DataType = datString @@ -1399,26 +1406,259 @@ object RptFacturasCliente: TRptFacturasCliente EngineOptions.DoublePass = True IniFile = '\Software\Fast Reports' PreviewOptions.Buttons = [pbPrint, pbLoad, pbSave, pbExport, pbZoom, pbFind, pbOutline, pbPageSetup, pbTools, pbEdit, pbNavigator, pbExportQuick] + PreviewOptions.OutlineWidth = 180 PreviewOptions.Zoom = 1.000000000000000000 - PrintOptions.Printer = 'Por defecto' + PrintOptions.Printer = 'Default' PrintOptions.PrintOnSheet = 0 - ReportOptions.CreateDate = 37800.807714351900000000 - ReportOptions.LastChange = 39882.453172557870000000 + ReportOptions.CreateDate = 37871.995398692100000000 + ReportOptions.LastChange = 40094.542152187500000000 + ReportOptions.VersionBuild = '1' + ReportOptions.VersionMajor = '12' + ReportOptions.VersionMinor = '13' + ReportOptions.VersionRelease = '1' ScriptLanguage = 'PascalScript' ScriptText.Strings = ( - 'procedure mContinuaOnBeforePrint(Sender: TfrxComponent);' + 'procedure DatosClienteOnBeforePrint(Sender: TfrxComponent);' 'begin' - ' if Engine.FinalPass then' + ' DatosCliente.Lines.Clear;' + ' DatosCliente.Lines.Add();' + '' + ' if ( <> '#39#39')' + ' or ( <> '#39#39') then' + + ' DatosCliente.Lines.Add( + '#39' ' + + ' '#39' + );' + '' + ' if ( <> '#39#39') then' + ' DatosCliente.Lines.Add();' + 'end;' + '' + 'procedure BandaDetallesOnBeforePrint(Sender: TfrxComponent);' + 'begin' + '{ ' + ' BandaDetalles.StartNewPage := False;' + ' BandaDetalles.Visible := True;' + ' MemPrecio.Style := '#39'Concepto normal'#39';' + ' MemCantidad.Style := '#39'Concepto normal'#39';' + ' MemImpTotal.Style := '#39'Concepto normal'#39';' + ' RichConcepto.Visible := True;' + '' + ' case of' + ' '#39'Salto'#39': begin' + ' BandaDetalles.StartNewPage := True;' + ' RichConcepto.Visible := False;' + ' end;' + ' '#39'Titulo'#39': begin' + ' MemPrecio.Style := '#39'Concepto titulo'#39';' + ' MemCantidad.Style := '#39'Concepto titulo'#39';' + ' MemImpTotal.Style := '#39'Concepto titulo'#39';' + ' end;' + ' '#39'Concepto'#39': begin' + ' MemPrecio.Style := '#39'Concepto normal'#39';' + ' MemCantidad.Style := '#39'Concepto normal'#39';' + ' MemImpTotal.Style := '#39'Concepto normal'#39';' + ' end;' + ' '#39'Subtotal'#39': begin' + ' MemPrecio.Style := '#39'Concepto subtotal'#39';' + ' MemCantidad.Style := '#39'Concepto subtotal'#39';' + ' MemImpTotal.Style := '#39'Concepto subtotal'#39';' + ' end;' + ' '#39'Descuento'#39': begin' + ' BandaDetalles.Visible := False;' + ' RichConcepto.Color := clNone;' + ' end;' + ' end;' + '' + ' RichConcepto.Color := MemImpTotal.Color;' + ' RichConcepto.Frame := MemImpTotal.Frame;' + '} ' + 'end;' + '' + '{procedure ReportSummary1OnBeforePrint(Sender: TfrxComponent);' + 'begin' + '// if Engine.FreeSpace > ReportSummary1.Height then ' + + ' Engine.CurY := Engine.PageHeight - ReportSummary1.Height - ' + + 'Band3.Height - 1' + 'end;} ' + '' + 'procedure Memo15OnBeforePrint(Sender: TfrxComponent);' + 'begin' + ' Memo15.Lines.Clear;' + ' if (StrToFloat() < 0) then' + ' Memo15.Lines.Add('#39'ABONO'#39')' + ' else' + ' Memo15.Lines.Add('#39'FACTURA'#39')' + 'end;' + '' + 'procedure Band2OnBeforePrint(Sender: TfrxComponent);' + 'begin' + ' if not Engine.FinalPass then' + ' Set('#39'TotalPaginas'#39', ( + 1));' + '' + ' if Engine.FinalPass then' + ' Set('#39'Pagina'#39', ( + 1));' + '' + '{ if Engine.FinalPass and ( = ) then' + ' begin ' + ' LineaCorta1.visible := False; ' + ' LineaLarga1.visible := True; ' + ' LineaCorta2.visible := False; ' + ' LineaLarga2.visible := True; ' + ' end' + ' else' ' begin' - ' if ( = ) then' - ' begin ' - ' mContinua.Visible := False;' - ' end ' - ' else' - ' begin ' - ' mContinua.Visible := True;' - ' end ' - ' end; ' + ' LineaCorta1.visible := True; ' + ' LineaLarga1.visible := False;' + ' LineaCorta2.visible := True; ' + ' LineaLarga2.visible := False;' + ' end;' + '} ' + 'end;' + '' + 'procedure frxReportOnStartReport(Sender: TfrxComponent);' + 'begin' + ' Set('#39'Pagina'#39', 0);' + ' Set('#39'TotalPaginas'#39', 0);' + 'end;' + '' + 'procedure Memo26OnBeforePrint(Sender: TfrxComponent);' + 'begin ' + ' if ( > 0) then' + ' begin' + ' eDescuento.visible := True;' + ' Descuento.visible := True; ' + ' end' + ' else' + ' begin' + ' eDescuento.visible := False; ' + ' Descuento.visible := False; ' + ' end; ' + 'end;' + '' + '' + + 'procedure ReportSummary1OnAfterCalcHeight(Sender: TfrxComponent)' + + ';' + 'begin' + + '//Es peor el remedio que la enfermedad, en el caso de sobre pasa' + + 'r en uno el numero de conceptos para que no quepa el reportsumar' + + 'y,' + + '//no hay forma de ponerlo al final en la p'#225'gina siguiente hasta ' + + 'que el numero de conceptos rellene al menos un concepto de la si' + + 'guiente hoja. ' + + ' ' + + ' ' + + ' ' + + ' ' + + ' ' + '// if Engine.FreeSpace > ReportSummary1.Height then ' + + '// Engine.CurY := Engine.PageHeight - ReportSummary1.Height ' + + '- Band3.Height - 1' + 'end;' + '' + 'procedure Shape4OnBeforePrint(Sender: TfrxComponent);' + 'begin' + ' if Engine.FinalPass and ( = ) then ' + ' begin' + ' Band3.Height := 192;' + '' + ' if ( = 0) then' + ' begin' + + ' eBaseimponible.Top := eBaseimponible.Top - (eImporteneto.' + + 'Height + eDescuento.Height);' + + ' Baseimponible.Top := Baseimponible.Top - (eImporteneto.He' + + 'ight + eDescuento.Height);' + + ' eIva.Top := eIva.Top - (eImporteneto.Height + eDescuento.' + + 'Height);' + + ' Iva.Top := Iva.Top - (eImporteneto.Height + eDescuento.He' + + 'ight);' + + ' eRe.Top := eRe.Top - (eImporteneto.Height + eDescuento.He' + + 'ight);' + + ' Re.Top := Re.Top - (eImporteneto.Height + eDescuento.Heig' + + 'ht);' + + ' lImportetotal.Top := lImportetotal.Top - (eImporteneto.He' + + 'ight + eDescuento.Height); ' + + ' eImportetotal.Top := eImportetotal.Top - (eImporteneto.He' + + 'ight + eDescuento.Height);' + + ' Importetotal.Top := Importetotal.Top - (eImporteneto.Heig' + + 'ht + eDescuento.Height);' + + ' Shape4.Height := Shape4.Height - (eImporteneto.Height + e' + + 'Descuento.Height); ' + ' end' + ' else' + ' begin' + ' eImporteneto.Visible := True;' + ' Importeneto.Visible := True;' + ' eDescuento.Visible := True;' + ' Descuento.Visible := True; ' + ' end;' + ' ' + ' if ( = 0) then' + ' begin' + + ' lImporteTotal.Top := lImporteTotal.Top - eRe.Height; ' + + ' ' + + ' eImportetotal.Top := eImportetotal.Top - eRe.Height; ' + + ' ' + ' Importetotal.Top := Importetotal.Top - eRe.Height;' + + ' Shape4.Height := Shape4.Height - eRe.Height; ' + + ' ' + ' end' + ' else' + ' begin' + ' eRe.Visible := True;' + ' Re.Visible := True; ' + ' end; ' + ' ' + ' if ( = 0) then' + ' begin' + + ' lImporteTotal.Top := lImporteTotal.Top - eIva.Height; ' + + ' ' + + ' eImportetotal.Top := eImportetotal.Top - eIva.Height; ' + + ' ' + ' Importetotal.Top := Importetotal.Top - eIva.Height;' + + ' Shape4.Height := Shape4.Height - eIva.Height; ' + + ' ' + ' end' + ' else' + ' begin' + ' eIva.Visible := True;' + ' Iva.Visible := True; ' + ' end; ' + ' ' + ' eBaseimponible.Visible := True;' + ' Baseimponible.Visible := True; ' + ' lImporteTotal.Visible := True;' + ' eImportetotal.Visible := True; ' + ' Importetotal.Visible := True;' + '' + ' Shape4.Visible := True; ' + ' end' + ' else' + ' begin' + + ' Band3.Height := 100; ' + + ' ' + ' end ' 'end;' '' 'begin' @@ -1473,8 +1713,6 @@ object RptFacturasCliente: TRptFacturasCliente RemoteFetchEnabled = False LocalSchema = schReport LocalDataStreamer = Bin2DataStreamer - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'InformeFacturasCliente_Vencimientos' IndexDefs = <> Left = 456 @@ -1553,8 +1791,6 @@ object RptFacturasCliente: TRptFacturasCliente RemoteFetchEnabled = False LocalSchema = schReport LocalDataStreamer = Bin2DataStreamer - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'ListadoFacturas' IndexDefs = <> Left = 576 @@ -1581,8 +1817,6 @@ object RptFacturasCliente: TRptFacturasCliente LogChanges = False StreamingOptions = [soDisableEventsWhileStreaming] RemoteFetchEnabled = False - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] IndexDefs = <> Left = 584 Top = 304 diff --git a/Source/Modulos/Relaciones/Contratos de cliente - Facturas de cliente/ConCli_FacCli_relation.dcu b/Source/Modulos/Relaciones/Contratos de cliente - Facturas de cliente/ConCli_FacCli_relation.dcu deleted file mode 100644 index 28d616bc..00000000 Binary files a/Source/Modulos/Relaciones/Contratos de cliente - Facturas de cliente/ConCli_FacCli_relation.dcu and /dev/null differ