diff --git a/Build/Build.fbp5 b/Build/Build.fbp5 index 16442548..6f1991ba 100644 --- a/Build/Build.fbp5 +++ b/Build/Build.fbp5 @@ -15767,7 +15767,7 @@ Comments= vtProject - %DELPHI2007DIR%\Lib\Indy10;%project_path%\Lib;%project_path%\Lib\RemObjects\RemObjects_SDK;%project_path%\Lib\RemObjects\Data_Abstract;%project_path%\Lib\CCPack;%project_path%\Lib\CFPack;%project_path%\Lib\GUISDK;%project_path%\Lib\PluginSDK;%project_path%\Lib\DevExpressVCL;%project_path%\Lib\FastReport3;%project_path%\Lib\JCL;%project_path%\Lib\JVCL;%project_path%\Lib\PngComponents;%project_path%\Lib\cxIntl5;%project_path%\Lib\cxIntlPrintSys3;%project_path%\Lib\TB2k+TBX;%project_path%\Lib\Mustangpeak\MPCommonLib;%project_path%\Lib\Mustangpeak\EasyListview;%project_path%\Lib\JSDialog;%project_path%\Lib\UserControl; + %DELPHI2007DIR%\Lib\Indy10;%project_path%\Lib;%project_path%\Lib\RemObjects\RemObjects_SDK;%project_path%\Lib\RemObjects\Data_Abstract;%project_path%\Lib\CCPack;%project_path%\Lib\CFPack;%project_path%\Lib\GUISDK;%project_path%\Lib\PluginSDK;%project_path%\Lib\DevExpressVCL;%project_path%\Lib\FastReport4;%project_path%\Lib\JCL;%project_path%\Lib\JVCL;%project_path%\Lib\PngComponents;%project_path%\Lib\cxIntl5;%project_path%\Lib\cxIntlPrintSys3;%project_path%\Lib\TB2k+TBX;%project_path%\Lib\Mustangpeak\MPCommonLib;%project_path%\Lib\Mustangpeak\EasyListview;%project_path%\Lib\JSDialog;%project_path%\Lib\UserControl; True False False diff --git a/Source/GUIBase/GUIBase.bdsproj b/Source/GUIBase/GUIBase.bdsproj index 7b685de9..1de68a17 100644 --- a/Source/GUIBase/GUIBase.bdsproj +++ b/Source/GUIBase/GUIBase.bdsproj @@ -179,487 +179,3 @@ - - diff --git a/Source/GUIBase/GUIBase.dpk b/Source/GUIBase/GUIBase.dpk index 9705be45..82c968ff 100644 --- a/Source/GUIBase/GUIBase.dpk +++ b/Source/GUIBase/GUIBase.dpk @@ -36,9 +36,9 @@ requires dxPScxGridLnkD10, dxPsPrVwAdvD10, dxLayoutControlD10, - frx10, - frxe10, - fs10, + frx11, + frxe11, + fs11, JvAppFrmD11R, JvCtrlsD11R, Base; diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index caaad5a3..b397824a 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -57,22 +57,20 @@ MainSource - - - - - - - - - - - - - - - - + + + + + + + + + + + + + +
fDialogBase
 @@ -159,8 +157,11 @@
frViewTotales
TFrame + + + \ No newline at end of file +EurekaLog Last Line --> diff --git a/Source/GUIBase/uEditorPreview.dfm b/Source/GUIBase/uEditorPreview.dfm index 0532ec05..5ed93afe 100644 --- a/Source/GUIBase/uEditorPreview.dfm +++ b/Source/GUIBase/uEditorPreview.dfm @@ -846,13 +846,14 @@ inherited fEditorPreview: TfEditorPreview Bitmap = {} end object frxReport1: TfrxReport - Version = '3.23.7' + Version = '4.3' DotMatrixReport = False EngineOptions.DoublePass = True IniFile = '\Software\Fast Reports' PreviewOptions.Buttons = [pbPrint, pbLoad, pbSave, pbExport, pbZoom, pbFind, pbOutline, pbPageSetup, pbTools, pbEdit, pbNavigator] PreviewOptions.Zoom = 1.000000000000000000 PrintOptions.Printer = 'Default' + PrintOptions.PrintOnSheet = 0 ReportOptions.CreateDate = 38658.858023541660000000 ReportOptions.LastChange = 38658.858023541660000000 ScriptLanguage = 'PascalScript' @@ -863,9 +864,6 @@ inherited fEditorPreview: TfEditorPreview StoreInDFM = False Left = 16 Top = 200 - Datasets = <> - Variables = <> - Style = <> end object frxBarCodeObject1: TfrxBarCodeObject Left = 16 diff --git a/Source/GUIBase/uEditorPreview.pas b/Source/GUIBase/uEditorPreview.pas index 91083c31..414d2c8d 100644 --- a/Source/GUIBase/uEditorPreview.pas +++ b/Source/GUIBase/uEditorPreview.pas @@ -118,7 +118,7 @@ type implementation uses - frxRes, frxUtils, frxPrinter, frxFormUtils, + frxRes, frxUtils, frxPrinter, uCustomEditor, uSistemaFunc; {$R *.dfm} diff --git a/Source/Informes/InfPresupuestoCliente.fr3 b/Source/Informes/InfPresupuestoCliente.fr3 index a3d4f298..89d9318e 100644 --- a/Source/Informes/InfPresupuestoCliente.fr3 +++ b/Source/Informes/InfPresupuestoCliente.fr3 @@ -1,37 +1,12 @@ - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + diff --git a/Source/Informes/InfPresupuestoCliente_anterior.fr3 b/Source/Informes/InfPresupuestoCliente_anterior.fr3 new file mode 100644 index 00000000..a3d4f298 --- /dev/null +++ b/Source/Informes/InfPresupuestoCliente_anterior.fr3 @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.dfm b/Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.dfm index 12c43db3..d3fde1b4 100644 --- a/Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.dfm +++ b/Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.dfm @@ -1,7 +1,7 @@ object RptPresupuestosCliente: TRptPresupuestosCliente OldCreateOrder = True OnCreate = DataModuleCreate - Height = 405 + Height = 604 Width = 447 object DADataCabecera: TDADataSource DataSet = tbl_Cabecera.Dataset @@ -16,24 +16,24 @@ object RptPresupuestosCliente: TRptPresupuestosCliente Top = 72 end object frxBarCodeObject1: TfrxBarCodeObject - Left = 144 - Top = 296 + Left = 280 + Top = 496 end object frxOLEObject1: TfrxOLEObject - Left = 48 - Top = 344 + Left = 184 + Top = 432 end object frxCrossObject1: TfrxCrossObject - Left = 144 - Top = 344 + Left = 384 + Top = 496 end object frxCheckBoxObject1: TfrxCheckBoxObject - Left = 256 - Top = 296 + Left = 280 + Top = 440 end object frxGradientObject1: TfrxGradientObject - Left = 360 - Top = 296 + Left = 384 + Top = 440 end object schReport: TDASchema ConnectionManager = dmServer.ConnectionManager @@ -440,15 +440,16 @@ object RptPresupuestosCliente: TRptPresupuestosCliente Top = 142 end object frxReport: TfrxReport - Version = '3.23.7' + Version = '4.3' DotMatrixReport = False EngineOptions.DoublePass = True IniFile = '\Software\Fast Reports' PreviewOptions.Buttons = [pbPrint, pbLoad, pbSave, pbExport, pbZoom, pbFind, pbOutline, pbPageSetup, pbTools, pbEdit, pbNavigator, pbExportQuick] PreviewOptions.Zoom = 1.000000000000000000 PrintOptions.Printer = 'Por defecto' + PrintOptions.PrintOnSheet = 0 ReportOptions.CreateDate = 39065.872423495400000000 - ReportOptions.LastChange = 39399.705345219900000000 + ReportOptions.LastChange = 39404.953391377300000000 ScriptLanguage = 'PascalScript' ScriptText.Strings = ( '' @@ -469,8 +470,7 @@ object RptPresupuestosCliente: TRptPresupuestosCliente '' 'procedure NombreEmpresaOnBeforePrint(Sender: TfrxComponent);' 'begin' - '{' - ' NombreEmpresa.Lines.Clear;' + '{ NombreEmpresa.Lines.Clear;' ' NombreEmpresa.Lines.Add();' '}' 'end;' @@ -479,8 +479,7 @@ object RptPresupuestosCliente: TRptPresupuestosCliente 'var' ' ACadena : String;' 'begin' - '{' - ' ACadena := '#39#39';' + '{ ACadena := '#39#39';' ' DireccionEnvio.Lines.Clear;' ' if ( <> '#39#39') then' ' ACadena := ;' @@ -532,29 +531,6 @@ object RptPresupuestosCliente: TRptPresupuestosCliente OnStartReport = 'frxReportOnStartReport' Left = 169 Top = 16 - Datasets = < - item - DataSet = frxDBCabecera - DataSetName = 'frxDBCabecera' - end - item - DataSet = frxDBDetalles - DataSetName = 'frxDBDetalles' - end> - Variables = < - item - Name = ' Paginacion' - Value = Null - end - item - Name = 'Pagina' - Value = Null - end - item - Name = 'TotalPaginas' - Value = Null - end> - Style = <> end object frxDBCabecera: TfrxDBDataset UserName = 'frxDBCabecera' @@ -576,30 +552,296 @@ object RptPresupuestosCliente: TRptPresupuestosCliente end object tbl_Cabecera: TDAMemDataTable RemoteUpdatesOptions = [] - Fields = <> - Params = <> + Fields = < + item + Name = 'ID' + DataType = datInteger + Required = True + InPrimaryKey = True + end + item + Name = 'ID_EMPRESA' + DataType = datInteger + end + item + Name = 'FECHA_PRESUPUESTO' + DataType = datDateTime + end + item + Name = 'FECHA_DECISION' + DataType = datDateTime + end + item + Name = 'REFERENCIA' + DataType = datString + Size = 255 + end + item + Name = 'SITUACION' + DataType = datString + Size = 255 + end + item + Name = 'ID_CLIENTE' + DataType = datInteger + end + item + Name = 'NIF_CIF' + DataType = datString + Size = 15 + end + item + Name = 'NOMBRE' + DataType = datString + Size = 255 + end + item + Name = 'REFERENCIA_CLIENTE' + DataType = datString + Size = 255 + end + item + Name = 'CLIENTE_FINAL' + DataType = datString + Size = 255 + end + item + Name = 'PORTADA' + DataType = datMemo + end + item + Name = 'MEMORIA' + DataType = datMemo + end + item + Name = 'OBSERVACIONES' + DataType = datMemo + end + item + Name = 'INCIDENCIAS' + DataType = datMemo + end + item + Name = 'INCIDENCIAS_ACTIVAS' + DataType = datSmallInt + Required = True + end + item + Name = 'FECHA_ALTA' + DataType = datDateTime + end + item + Name = 'FECHA_MODIFICACION' + DataType = datDateTime + end + item + Name = 'USUARIO' + DataType = datString + Size = 30 + end + item + Name = 'IMPORTE_NETO' + DataType = datCurrency + end + item + Name = 'IMPORTE_PORTE' + DataType = datCurrency + end + item + Name = 'DESCUENTO' + DataType = datFloat + end + item + Name = 'IMPORTE_DESCUENTO' + DataType = datCurrency + end + item + Name = 'BASE_IMPONIBLE' + DataType = datCurrency + end + item + Name = 'IVA' + DataType = datFloat + end + item + Name = 'IMPORTE_IVA' + DataType = datCurrency + end + item + Name = 'IMPORTE_TOTAL' + DataType = datCurrency + end + item + Name = 'ID_FORMA_PAGO' + DataType = datInteger + end> + Params = < + item + Name = 'ID' + Value = '' + ParamType = daptInput + end> MasterMappingMode = mmDataRequest LogChanges = False StreamingOptions = [soDisableEventsWhileStreaming] RemoteFetchEnabled = False + LocalSchema = schReport + LocalDataStreamer = Bin2DataStreamer DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] + LogicalName = 'Informe_Cabecera' IndexDefs = <> Left = 264 Top = 128 end object tbl_Detalles: TDAMemDataTable RemoteUpdatesOptions = [] - Fields = <> - Params = <> - MasterMappingMode = mmDataRequest + Fields = < + item + Name = 'ID' + DataType = datInteger + InPrimaryKey = True + end + item + Name = 'ID_PRESUPUESTO' + DataType = datInteger + end + item + Name = 'POSICION' + DataType = datInteger + end + item + Name = 'TIPO_DETALLE' + DataType = datString + Size = 10 + end + item + Name = 'CONCEPTO' + DataType = datString + Size = 2000 + end + item + Name = 'CANTIDAD' + DataType = datInteger + end + item + Name = 'IMPORTE_UNIDAD' + DataType = datCurrency + end + item + Name = 'IMPORTE_TOTAL' + DataType = datCurrency + end + item + Name = 'REFERENCIA' + DataType = datString + Size = 255 + end + item + Name = 'FAMILIA' + DataType = datString + Size = 255 + end + item + Name = 'REFERENCIA_PROVEEDOR' + DataType = datString + Size = 255 + end> + Params = < + item + Name = 'ID' + Value = '' + ParamType = daptInput + end> + MasterParamsMappings.Strings = ( + 'ID=ID') LogChanges = False StreamingOptions = [soDisableEventsWhileStreaming] RemoteFetchEnabled = False + LocalSchema = schReport + LocalDataStreamer = Bin2DataStreamer + MasterSource = DADataCabecera + MasterFields = 'ID' + DetailFields = 'ID_PRESUPUESTO' DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] + LogicalName = 'Informe_Detalles' IndexDefs = <> Left = 344 Top = 128 end + object IBDatabase1: TIBDatabase + DatabaseName = 'C:\Codigo Tecsitel\Output\Debug\Database\FACTUGES.FDB' + Params.Strings = ( + 'user_name=sysdba' + 'password=masterkey' + 'lc_ctype=ISO8859_1') + LoginPrompt = False + DefaultTransaction = IBTransaction1 + Left = 48 + Top = 296 + end + object IBTransaction1: TIBTransaction + Left = 48 + Top = 352 + end + object DataSource1: TDataSource + DataSet = cabecera + Left = 216 + Top = 296 + end + object DataSource2: TDataSource + DataSet = detalles + Left = 216 + Top = 352 + end + object cabecera: TIBQuery + Database = IBDatabase1 + Transaction = IBTransaction1 + SQL.Strings = ( + 'SELECT ' + ' ID, ID_EMPRESA, FECHA_PRESUPUESTO, FECHA_DECISION, ' + ' REFERENCIA, SITUACION, ID_CLIENTE, NIF_CIF, NOMBRE, ' + ' REFERENCIA_CLIENTE, CLIENTE_FINAL, PORTADA, MEMORIA, ' + + ' OBSERVACIONES, INCIDENCIAS, INCIDENCIAS_ACTIVAS, FECHA_ALTA,' + + ' ' + ' FECHA_MODIFICACION, USUARIO, IMPORTE_NETO, IMPORTE_PORTE, ' + ' DESCUENTO, IMPORTE_DESCUENTO, BASE_IMPONIBLE, IVA, ' + ' IMPORTE_IVA, IMPORTE_TOTAL, ID_FORMA_PAGO' + ' FROM' + ' V_PRESUPUESTOS_CLIENTE' + ' WHERE V_PRESUPUESTOS_CLIENTE.ID = 31') + Left = 136 + Top = 296 + end + object detalles: TIBQuery + Database = IBDatabase1 + Transaction = IBTransaction1 + SQL.Strings = ( + + 'SELECT PRESUPUESTOS_CLIENTE_DETALLES.ID, PRESUPUESTOS_CLIENTE_DE' + + 'TALLES.ID_PRESUPUESTO,' + + ' PRESUPUESTOS_CLIENTE_DETALLES.POSICION, PRESUPUESTOS_CLIE' + + 'NTE_DETALLES.TIPO_DETALLE,' + + ' PRESUPUESTOS_CLIENTE_DETALLES.CONCEPTO, PRESUPUESTOS_CLIE' + + 'NTE_DETALLES.CANTIDAD,' + + ' PRESUPUESTOS_CLIENTE_DETALLES.IMPORTE_UNIDAD, PRESUPUESTO' + + 'S_CLIENTE_DETALLES.IMPORTE_TOTAL,' + + ' ARTICULOS.REFERENCIA, ARTICULOS.FAMILIA, ARTICULOS.REFERE' + + 'NCIA_PROV as REFERENCIA_PROVEEDOR' + '' + 'FROM PRESUPUESTOS_CLIENTE_DETALLES' + + 'LEFT JOIN ARTICULOS ON (PRESUPUESTOS_CLIENTE_DETALLES.ID_ARTICUL' + + 'O = ARTICULOS.ID)' + 'WHERE PRESUPUESTOS_CLIENTE_DETALLES.ID_PRESUPUESTO = 31' + 'ORDER BY POSICION') + Left = 136 + Top = 352 + end end diff --git a/Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.pas b/Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.pas index 30e8b0af..a94f64b6 100644 --- a/Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.pas +++ b/Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.pas @@ -7,7 +7,8 @@ uses Dialogs, frxClass, frxDBSet, uDAScriptingProvider, uDADataTable, uDACDSDataTable, DB, uDAClasses, uDABINAdapter, uROTypes, uDAInterfaces, uDAMemDataTable, uDADataStreamer, uDABin2DataStreamer, - frxGradient, frxChBox, frxCross, frxOLE, frxBarcode, frxRich; + frxGradient, frxChBox, frxCross, frxOLE, frxBarcode, frxRich, uDAEngine, + IBSQL, IBDatabase, IBCustomDataSet, IBQuery; type TRptPresupuestosCliente = class(TDataModule) @@ -23,9 +24,15 @@ type Bin2DataStreamer: TDABin2DataStreamer; tbl_Cabecera: TDAMemDataTable; tbl_Detalles: TDAMemDataTable; + frxReport: TfrxReport; schReport: TDASchema; DataDictionary: TDADataDictionary; - frxReport: TfrxReport; + IBDatabase1: TIBDatabase; + IBTransaction1: TIBTransaction; + DataSource1: TDataSource; + DataSource2: TDataSource; + cabecera: TIBQuery; + detalles: TIBQuery; procedure DataModuleCreate(Sender: TObject); private FConnection: IDAConnection; @@ -89,10 +96,10 @@ var dsMaster: IDADataset; dsDetail: IDADataset; begin - AStream := TMemoryStream.Create; + //AStream := TMemoryStream.Create; try - dsMaster := schReport.NewDataset(FConnection, ds_InformeCabecera, ['ID'], [AID]); + {dsMaster := schReport.NewDataset(FConnection, ds_InformeCabecera, ['ID'], [AID]); dsDetail := schReport.NewDataset(FConnection, ds_InformeDetalles, ['ID'], [AID], False); AStream.Clear; @@ -101,13 +108,18 @@ begin AStream.Clear; Bin2DataStreamer.WriteDataset(AStream, dsDetail, [woRows, woSchema], -1); - Bin2DataStreamer.ReadDataset(AStream, tbl_Detalles, TRUE, '', TRUE, TRUE); + Bin2DataStreamer.ReadDataset(AStream, tbl_Detalles, TRUE, '', TRUE, TRUE);} + + tbl_Cabecera.ParamByName('ID').AsInteger := AID; + tbl_Detalles.ParamByName('ID').AsInteger := AID; + tbl_Cabecera.Active := True; + tbl_Detalles.Active := True; frxReport.LoadFromFile(DarRutaInformes + rptInforme, True); frxReport.PrepareReport(False); finally - AStream.Free; + //AStream.Free; dsMaster := Nil; dsDetail := Nil; end; diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm index 0273acee..82faf099 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm @@ -2,19 +2,19 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente Left = 332 Top = 147 Caption = 'Nuevo pedido de cliente' - ClientHeight = 608 - ClientWidth = 632 + ClientHeight = 631 + ClientWidth = 674 OnClose = CustomEditorClose - ExplicitWidth = 640 - ExplicitHeight = 635 + ExplicitWidth = 682 + ExplicitHeight = 658 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader - Width = 632 + Width = 674 Caption = 'Nuevo pedido de cliente' ExplicitWidth = 632 inherited Image1: TImage - Left = 605 + Left = 647 Picture.Data = { 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 0000180806000000E0773DF80000000970485973000017120000171201679FD2 @@ -126,7 +126,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente end end inherited TBXDock: TTBXDock - Width = 632 + Width = 674 ExplicitWidth = 632 inherited tbxMain: TTBXToolbar ExplicitWidth = 488 @@ -141,13 +141,13 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente end end inherited tbxMenu: TTBXToolbar - ExplicitWidth = 632 + ExplicitWidth = 674 end end inherited pgPaginas: TPageControl - Width = 632 - Height = 442 - ActivePage = pagMemoria + Width = 674 + Height = 465 + ActivePage = pagPortada TabOrder = 1 OnChanging = pgPaginasChanging ExplicitWidth = 632 @@ -161,11 +161,13 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente object pagContenido: TTabSheet Caption = 'Contenido' ImageIndex = 1 + ExplicitWidth = 624 + ExplicitHeight = 414 inline frViewDetallesPresupuestoCliente1: TfrViewDetallesPresupuestoCliente Left = 0 Top = 0 - Width = 624 - Height = 414 + Width = 666 + Height = 437 Align = alClient BiDiMode = bdLeftToRight Font.Charset = DEFAULT_CHARSET @@ -180,17 +182,57 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente ExplicitWidth = 624 ExplicitHeight = 414 inherited ToolBar1: TToolBar - Width = 624 + Width = 666 ExplicitWidth = 624 + inherited FontSize: TEdit + Width = 57 + ExplicitWidth = 57 + end + inherited UpDown1: TUpDown + Left = 236 + ExplicitLeft = 236 + end + inherited ToolButton13: TToolButton + Left = 253 + ExplicitLeft = 253 + end + inherited ToolButton6: TToolButton + Left = 261 + ExplicitLeft = 261 + end + inherited ToolButton7: TToolButton + Left = 295 + ExplicitLeft = 295 + end + inherited ToolButton8: TToolButton + Left = 329 + ExplicitLeft = 329 + end + inherited ToolButton12: TToolButton + Left = 363 + ExplicitLeft = 363 + end + inherited ToolButton9: TToolButton + Left = 371 + ExplicitLeft = 371 + end + inherited ToolButton10: TToolButton + Left = 405 + ExplicitLeft = 405 + end + inherited ToolButton11: TToolButton + Left = 439 + ExplicitLeft = 439 + end end inherited cxGrid: TcxGrid - Width = 624 - Height = 342 + Width = 666 + Height = 365 ExplicitWidth = 624 ExplicitHeight = 342 end inherited TBXDock1: TTBXDock - Width = 624 + Width = 666 ExplicitWidth = 624 inherited TBXToolbar1: TTBXToolbar ExplicitWidth = 548 @@ -201,15 +243,13 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente object pagInicidencias: TTabSheet Caption = 'Incidencias' ImageIndex = 2 - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 + ExplicitWidth = 624 + ExplicitHeight = 414 inline frViewIncidenciasCli: TfrViewIncidencias Left = 0 Top = 0 - Width = 624 - Height = 414 + Width = 666 + Height = 437 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -222,22 +262,22 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente ExplicitWidth = 624 ExplicitHeight = 414 inherited pnlSup: TPanel - Width = 624 + Width = 666 ExplicitWidth = 624 inherited eIncidenciaActiva: TcxDBCheckBox ExplicitHeight = 21 end end inherited GroupBox1: TGroupBox - Width = 624 - Height = 386 + Width = 666 + Height = 409 ExplicitWidth = 624 ExplicitHeight = 386 inherited eIncidencias: TcxDBMemo ExplicitWidth = 601 ExplicitHeight = 353 - Height = 353 - Width = 601 + Height = 376 + Width = 643 end end end @@ -245,28 +285,28 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente object pagPortada: TTabSheet Caption = 'Portada' ImageIndex = 3 - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 - object eIncidencias: TcxDBMemo + ExplicitWidth = 624 + ExplicitHeight = 414 + object edtPortada: TcxDBRichEdit Left = 0 Top = 0 Align = alClient DataBinding.DataField = 'PORTADA' DataBinding.DataSource = dsDataTable TabOrder = 0 - Height = 414 - Width = 624 + ExplicitLeft = 304 + ExplicitTop = 288 + ExplicitWidth = 185 + ExplicitHeight = 89 + Height = 437 + Width = 666 end end object pagMemoria: TTabSheet Caption = 'Memoria' ImageIndex = 4 - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 + ExplicitWidth = 624 + ExplicitHeight = 414 object cxDBMemo1: TcxDBMemo Left = 0 Top = 0 @@ -274,14 +314,16 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente DataBinding.DataField = 'MEMORIA' DataBinding.DataSource = dsDataTable TabOrder = 0 - Height = 414 - Width = 624 + ExplicitWidth = 624 + ExplicitHeight = 414 + Height = 437 + Width = 666 end end end inherited StatusBar: TJvStatusBar - Top = 589 - Width = 632 + Top = 612 + Width = 674 Panels = < item Width = 200 @@ -291,8 +333,8 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente end inline frViewTotales1: TfrViewTotales [4] Left = 0 - Top = 518 - Width = 632 + Top = 541 + Width = 674 Height = 71 Align = alBottom Font.Charset = DEFAULT_CHARSET @@ -307,7 +349,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente ExplicitWidth = 632 ExplicitHeight = 71 inherited dxLayoutControl1: TdxLayoutControl - Width = 632 + Width = 674 Height = 171 LookAndFeel = dxLayoutOfficeLookAndFeel1 ExplicitWidth = 632 @@ -321,20 +363,20 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente ExplicitWidth = 73 end inherited Bevel3: TBevel - Left = 313 + Left = 333 Top = 11 Width = 8 Height = 54 - ExplicitLeft = 313 + ExplicitLeft = 333 ExplicitTop = 11 ExplicitWidth = 8 ExplicitHeight = 54 end inherited Bevel4: TBevel - Left = 430 + Left = 450 Top = 92 Width = 21 - ExplicitLeft = 430 + ExplicitLeft = 450 ExplicitTop = 92 ExplicitWidth = 21 end @@ -348,19 +390,19 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente Width = 93 end inherited ImporteIVA: TcxDBCurrencyEdit - Left = 501 + Left = 521 Top = 38 Style.IsFontAssigned = True - ExplicitLeft = 501 + ExplicitLeft = 521 ExplicitTop = 38 ExplicitWidth = 137 Width = 137 end inherited ImporteTotal: TcxDBCurrencyEdit - Left = 431 + Left = 451 Top = 112 Style.IsFontAssigned = True - ExplicitLeft = 431 + ExplicitLeft = 451 ExplicitTop = 112 ExplicitWidth = 137 Width = 137 @@ -373,37 +415,37 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente ExplicitTop = 112 end inherited edtIVA: TcxDBSpinEdit - Left = 430 + Left = 450 Top = 38 Style.IsFontAssigned = True - ExplicitLeft = 430 + ExplicitLeft = 450 ExplicitTop = 38 end inherited ImporteBase: TcxDBCurrencyEdit - Left = 430 + Left = 450 Top = 11 Style.IsFontAssigned = True - ExplicitLeft = 430 + ExplicitLeft = 450 ExplicitTop = 11 ExplicitWidth = 92 Width = 92 end inherited edtRE: TcxDBSpinEdit - Left = 430 + Left = 450 Top = 65 DataBinding.DataField = '' DataBinding.DataSource = nil Style.IsFontAssigned = True - ExplicitLeft = 430 + ExplicitLeft = 450 ExplicitTop = 65 end inherited ImporteRE: TcxDBCurrencyEdit - Left = 501 + Left = 521 Top = 65 DataBinding.DataField = '' DataBinding.DataSource = nil Style.IsFontAssigned = True - ExplicitLeft = 501 + ExplicitLeft = 521 ExplicitTop = 65 ExplicitWidth = 56 Width = 56 @@ -438,9 +480,9 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente Width = 81 end inherited bTiposIVA: TButton - Left = 165 + Left = 185 Top = 38 - ExplicitLeft = 165 + ExplicitLeft = 185 ExplicitTop = 38 end inherited cbRecargoEquivalencia: TcxDBCheckBox diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas index e7d56ad8..d502b747 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas +++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas @@ -16,7 +16,7 @@ uses dxLayoutLookAndFeels, JvExComCtrls, JvStatusBar, uViewTotales, uIEditorPresupuestoCliente, uBizPresupuestosCliente, uViewPresupuestoCliente, uViewDetallesDTO, uViewDetallesArticulos, uViewDetallesPresupuestoCliente, - uDAInterfaces; + uDAInterfaces, cxRichEdit, cxDBRichEdit; type TfEditorPresupuestoCliente = class(TfEditorDBItem, IEditorPresupuestoCliente) @@ -29,8 +29,8 @@ type frViewDetallesPresupuestoCliente1: TfrViewDetallesPresupuestoCliente; pagPortada: TTabSheet; pagMemoria: TTabSheet; - eIncidencias: TcxDBMemo; cxDBMemo1: TcxDBMemo; + edtPortada: TcxDBRichEdit; procedure FormShow(Sender: TObject); procedure CustomEditorClose(Sender: TObject; var Action: TCloseAction); diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 51f0894a..b7b1c014 100644 Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index 6bd28e02..26bfec41 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -14,7 +14,7 @@ BEGIN BEGIN VALUE "FileVersion", "3.0.0.0\0" VALUE "ProductVersion", "3.0.0.0\0" - VALUE "CompileDate", "domingo, 18 de noviembre de 2007 21:05\0" + VALUE "CompileDate", "domingo, 18 de noviembre de 2007 21:49\0" END END BLOCK "VarFileInfo" diff --git a/Source/Servidor/uDataModuleServer.dfm b/Source/Servidor/uDataModuleServer.dfm index 0cef53c4..fa6c82af 100644 --- a/Source/Servidor/uDataModuleServer.dfm +++ b/Source/Servidor/uDataModuleServer.dfm @@ -39,9 +39,9 @@ object dmServer: TdmServer item Name = 'IBX' ConnectionString = - 'IBX?Server=localhost;Database=C:\Codigo tecsitel\Database\FACTUG' + - 'ES.FDB;UserID=sysdba;Password=masterkey;Dialect=3;Charset=ISO885' + - '9_1;' + 'IBX?Server=localhost;Database=C:\Codigo Tecsitel\Output\Debug\Da' + + 'tabase\FACTUGES.FDB;UserID=sysdba;Password=masterkey;Dialect=3;C' + + 'harset=ISO8859_1;' ConnectionType = 'Interbase' Default = True end> diff --git a/Tools/DBExtract/IBExtract.exe b/Tools/DBExtract/IBExtract.exe new file mode 100644 index 00000000..bd869cff Binary files /dev/null and b/Tools/DBExtract/IBExtract.exe differ diff --git a/Tools/DBExtract/IbExtractC.exe b/Tools/DBExtract/IbExtractC.exe new file mode 100644 index 00000000..374cbdb1 Binary files /dev/null and b/Tools/DBExtract/IbExtractC.exe differ