From e70343188a9f7c0a90f7098ea6c601586de12ff0 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 8 Oct 2009 16:40:23 +0000 Subject: [PATCH] git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@446 f4e31baf-9722-1c47-927c-6f952f962d4b --- Source/Base/Base.dproj | 97 +++--- Source/Base/Base.res | Bin 384 -> 4748 bytes Source/Base/Utiles/uSistemaFunc.pas | 29 +- Source/GUIBase/GUIBase.dproj | 64 ++-- Source/GUIBase/GUIBase.res | Bin 384 -> 4748 bytes Source/GUIBase/uViewDetallesBase.pas | 7 +- Source/Informes/1/InfFacturaCliente.fr3 | 38 +-- Source/Informes/2/InfContratoCliente.fr3 | 102 ------ Source/Informes/2/InfFacturaCliente.fr3 | 36 +-- Source/Informes/2/InfPresupuestoCliente.fr3 | 79 ----- .../Informes/{1 => }/InfContratoCliente.fr3 | 56 ++-- .../{1 => }/InfPresupuestoCliente.fr3 | 56 ++-- .../Reports/uRptFacturasCliente_Server.dfm | 290 ++++++++++++++++-- .../ConCli_FacCli_relation.dcu | Bin 27773 -> 0 bytes 14 files changed, 470 insertions(+), 384 deletions(-) delete mode 100644 Source/Informes/2/InfContratoCliente.fr3 delete mode 100644 Source/Informes/2/InfPresupuestoCliente.fr3 rename Source/Informes/{1 => }/InfContratoCliente.fr3 (94%) rename Source/Informes/{1 => }/InfPresupuestoCliente.fr3 (77%) delete mode 100644 Source/Modulos/Relaciones/Contratos de cliente - Facturas de cliente/ConCli_FacCli_relation.dcu 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 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644 GIT binary patch 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 delta 11 ScmeBCZD5|Duvteife`=|>;pCc 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 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644 GIT binary patch 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 delta 11 ScmeBCZD5|Duvteife`=|>;pCc 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 28d616bc1464836f3de48212f50dfad8eaa0fa57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27773 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