diff --git a/Source/Modulos/Contactos/Controller/uEmpleadosController.pas b/Source/Modulos/Contactos/Controller/uEmpleadosController.pas index d604abcd..8a1b5bdc 100644 --- a/Source/Modulos/Contactos/Controller/uEmpleadosController.pas +++ b/Source/Modulos/Contactos/Controller/uEmpleadosController.pas @@ -178,7 +178,7 @@ begin else ID_Fichas.Add(IntToStr(AEmpleado.ID)); - AReportController.Preview(ID_Fichas.CommaText); + AReportController.Preview(ID_Fichas.CommaText); finally AReportController := NIL; diff --git a/Source/Modulos/Contactos/Reports/uRptEtiquetasContacto_Server.dfm b/Source/Modulos/Contactos/Reports/uRptEtiquetasContacto_Server.dfm index 447b847d..bac90c90 100644 --- a/Source/Modulos/Contactos/Reports/uRptEtiquetasContacto_Server.dfm +++ b/Source/Modulos/Contactos/Reports/uRptEtiquetasContacto_Server.dfm @@ -4,11 +4,12 @@ object RptEtiquetasContacto: TRptEtiquetasContacto Height = 405 Width = 447 object DADataCabecera: TDADataSource + DataSet = tbl_Contactos.Dataset DataTable = tbl_Contactos Left = 264 Top = 72 end - object tbl_Contactos: TDACDSDataTable + object tbl_Contactos: TDAMemDataTable RemoteUpdatesOptions = [] Fields = <> Params = <> @@ -16,21 +17,12 @@ object RptEtiquetasContacto: TRptEtiquetasContacto LogChanges = False StreamingOptions = [soDisableEventsWhileStreaming] RemoteFetchEnabled = False - SchemaCall.Params = <> - DataRequestCall.Params = <> - DataUpdateCall.Params = <> - ScriptCall.Params = <> - ReadOnly = False DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] IndexDefs = <> Left = 264 Top = 128 end - object DABINAdapter: TDABINAdapter - Left = 48 - Top = 80 - end object frxRichObject1: TfrxRichObject Left = 48 Top = 296 @@ -113,104 +105,49 @@ object RptEtiquetasContacto: TRptEtiquetasContacto item Name = 'ID' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'NIF_CIF' DataType = datString Size = 15 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'NOMBRE' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'PERSONA_CONTACTO' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'CALLE' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'POBLACION' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'PROVINCIA' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'CODIGO_POSTAL' DataType = datString Size = 10 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end> - BusinessRulesClient.ScriptLanguage = rslPascalScript - BusinessRulesServer.ScriptLanguage = rslPascalScript end> + JoinDataTables = <> + UnionDataTables = <> Commands = <> RelationShips = <> UpdateRules = <> + Version = 0 Left = 48 Top = 16 end @@ -219,298 +156,203 @@ object RptEtiquetasContacto: TRptEtiquetasContacto item Name = 'FacturasCliente_ID' DataType = datAutoInc - BlobType = dabtUnknown Required = True - DisplayWidth = 0 DisplayLabel = 'ID' - Alignment = taLeftJustify end item Name = 'FacturasCliente_ID_EMPRESA' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'ID_EMPRESA' - Alignment = taLeftJustify end item Name = 'FacturasCliente_ID_CONTRATO' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'ID_CONTRATO' - Alignment = taLeftJustify end item Name = 'FacturasCliente_FECHA_FACTURA' DataType = datDateTime - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Fecha de las factura' - Alignment = taLeftJustify end item Name = 'FacturasCliente_VENCIMIENTO' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Vencimiento' - Alignment = taLeftJustify end item Name = 'FacturasCliente_SITUACION' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Situaci'#243'n' - Alignment = taLeftJustify end item Name = 'FacturasCliente_BASE_IMPONIBLE' DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Base imponible' Alignment = taRightJustify end item Name = 'FacturasCliente_IMPORTE_DESCUENTO' DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Importe dto.' Alignment = taRightJustify end item Name = 'FacturasCliente_IMPORTE_IVA' DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Importe IVA' Alignment = taRightJustify end item Name = 'FacturasCliente_IMPORTE_TOTAL' DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Importe total' Alignment = taRightJustify end item Name = 'FacturasCliente_FORMA_PAGO' DataType = datMemo - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Forma de pago' - Alignment = taLeftJustify end item Name = 'FacturasCliente_ID_CLIENTE' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'ID_CLIENTE' - Alignment = taLeftJustify end item Name = 'FacturasCliente_NIF_CIF' DataType = datString Size = 15 - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'NIF/CIF' - Alignment = taLeftJustify end item Name = 'FacturasCliente_CODIGO_POSTAL' DataType = datString Size = 10 - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'C'#243'd. postal' - Alignment = taLeftJustify end item Name = 'FacturasCliente_FECHA_ALTA' DataType = datDateTime - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'FECHA_ALTA' - Alignment = taLeftJustify end item Name = 'FacturasCliente_FECHA_MODIFICACION' DataType = datDateTime - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'FECHA_MODIFICACION' - Alignment = taLeftJustify end item Name = 'FacturasCliente_OBSERVACIONES' DataType = datMemo - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Observaciones' - Alignment = taLeftJustify end item Name = 'FacturasCliente_NOMBRE' DataType = datString Size = 100 - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Cliente' - Alignment = taLeftJustify end item Name = 'FacturasCliente_CALLE' DataType = datString Size = 150 - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Direcci'#243'n' - Alignment = taLeftJustify end item Name = 'FacturasCliente_PROVINCIA' DataType = datString Size = 30 - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Provincia' - Alignment = taLeftJustify end item Name = 'FacturasCliente_POBLACION' DataType = datString Size = 150 - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Poblaci'#243'n' - Alignment = taLeftJustify end item Name = 'FacturasCliente_IVA' DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'IVA' - Alignment = taLeftJustify end item Name = 'FacturasCliente_USUARIO' DataType = datString Size = 100 - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'USUARIO' - Alignment = taLeftJustify end item Name = 'FacturasCliente_REFERENCIA' DataType = datString Size = 20 - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Referencia' - Alignment = taLeftJustify end item Name = 'FacturasCliente_DESCUENTO' DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Dto.' - Alignment = taLeftJustify end item Name = 'FacturasCliente_Detalles_ID' DataType = datAutoInc - BlobType = dabtUnknown Required = True - DisplayWidth = 0 DisplayLabel = 'ID' - Alignment = taLeftJustify end item Name = 'FacturasCliente_Detalles_ID_FACTURA' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'ID_FACTURA' - Alignment = taLeftJustify end item Name = 'FacturasCliente_Detalles_TIPO_DETALLE' DataType = datString Size = 10 - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Tipo detalle' - Alignment = taLeftJustify end item Name = 'FacturasCliente_Detalles_CONCEPTO' DataType = datString Size = 2000 - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Concepto' - Alignment = taLeftJustify end item Name = 'FacturasCliente_Detalles_IMPORTE_UNIDAD' DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Importe unidad' Alignment = taRightJustify end item Name = 'FacturasCliente_Detalles_IMPORTE_TOTAL' DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Importe total' Alignment = taRightJustify end item Name = 'FacturasCliente_Detalles_VISIBLE' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = #191'Visible?' - Alignment = taLeftJustify end item Name = 'FacturasCliente_Detalles_POSICION' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Posici'#243'n' - Alignment = taLeftJustify end item Name = 'FacturasCliente_Detalles_CANTIDAD' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Cantidad' - Alignment = taLeftJustify end> Left = 46 Top = 158 end object frxReport: TfrxReport - Version = '3.23.7' + Version = '4.3' DotMatrixReport = False 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 = 38330.712904247710000000 ReportOptions.LastChange = 39328.775946539350000000 ScriptLanguage = 'PascalScript' @@ -573,13 +415,6 @@ object RptEtiquetasContacto: TRptEtiquetasContacto StoreInDFM = False Left = 169 Top = 16 - Datasets = < - item - DataSet = frxDBCabecera - DataSetName = 'frxDBCabecera' - end> - Variables = <> - Style = <> end object frxDBCabecera: TfrxDBDataset UserName = 'frxDBCabecera' @@ -588,4 +423,8 @@ object RptEtiquetasContacto: TRptEtiquetasContacto Left = 264 Top = 16 end + object Bin2DataStreamer: TDABin2DataStreamer + Left = 48 + Top = 88 + end end diff --git a/Source/Modulos/Contactos/Reports/uRptEtiquetasContacto_Server.pas b/Source/Modulos/Contactos/Reports/uRptEtiquetasContacto_Server.pas index c2c4af9b..8d550a5f 100644 --- a/Source/Modulos/Contactos/Reports/uRptEtiquetasContacto_Server.pas +++ b/Source/Modulos/Contactos/Reports/uRptEtiquetasContacto_Server.pas @@ -7,13 +7,12 @@ uses Dialogs, frxClass, frxDBSet, uDAScriptingProvider, uDADataTable, uDACDSDataTable, DB, uDAClasses, frxChart, frxGradient, frxChBox, frxCross, frxOLE, frxBarcode, frxRich, uDABINAdapter, uROTypes, - uDAInterfaces; + uDAInterfaces, uDADataStreamer, uDABin2DataStreamer, uDAMemDataTable; type TRptEtiquetasContacto = class(TDataModule) DADataCabecera: TDADataSource; - tbl_Contactos: TDACDSDataTable; - DABINAdapter: TDABINAdapter; + tbl_Contactos: TDAMemDataTable; frxRichObject1: TfrxRichObject; frxBarCodeObject1: TfrxBarCodeObject; frxOLEObject1: TfrxOLEObject; @@ -25,6 +24,7 @@ type frxReport: TfrxReport; schReport: TDASchema; DataDictionary: TDADataDictionary; + Bin2DataStreamer: TDABin2DataStreamer; procedure DataModuleCreate(Sender: TObject); private FConnection: IDAConnection; @@ -73,8 +73,8 @@ begin dsMaster.Open; AStream.Clear; - DABINAdapter.WriteDataset(AStream, dsMaster, [woRows, woSchema], -1); - DABINAdapter.ReadDataset(AStream, tbl_Contactos, TRUE, '', TRUE, TRUE); + Bin2DataStreamer.WriteDataset(AStream, dsMaster, [woRows, woSchema], -1); + Bin2DataStreamer.ReadDataset(AStream, tbl_Contactos, TRUE, '', TRUE, TRUE); frxReport.LoadFromFile(DarRutaInformes + rptEtiquetasContacto, True); frxReport.PrepareReport(True); diff --git a/Source/Modulos/Contactos/Reports/uRptFichasEmpleado_Server.dfm b/Source/Modulos/Contactos/Reports/uRptFichasEmpleado_Server.dfm index 80a683a7..be6100e4 100644 --- a/Source/Modulos/Contactos/Reports/uRptFichasEmpleado_Server.dfm +++ b/Source/Modulos/Contactos/Reports/uRptFichasEmpleado_Server.dfm @@ -4,11 +4,12 @@ object RptFichasEmpleado: TRptFichasEmpleado Height = 405 Width = 447 object DADataCabecera: TDADataSource + DataSet = tbl_FichaEmpleado.Dataset DataTable = tbl_FichaEmpleado Left = 264 Top = 72 end - object tbl_FichaEmpleado: TDACDSDataTable + object tbl_FichaEmpleado: TDAMemDataTable RemoteUpdatesOptions = [] Fields = <> Params = <> @@ -16,21 +17,12 @@ object RptFichasEmpleado: TRptFichasEmpleado LogChanges = False StreamingOptions = [soDisableEventsWhileStreaming] RemoteFetchEnabled = False - SchemaCall.Params = <> - DataRequestCall.Params = <> - DataUpdateCall.Params = <> - ScriptCall.Params = <> - ReadOnly = False DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] IndexDefs = <> Left = 264 Top = 128 end - object DABINAdapter: TDABINAdapter - Left = 48 - Top = 80 - end object frxRichObject1: TfrxRichObject Left = 48 Top = 296 @@ -68,7 +60,6 @@ object RptFichasEmpleado: TRptFichasEmpleado item Name = 'ID' DataType = datInteger - BlobType = dabtUnknown Value = '' ParamType = daptInput end> @@ -243,416 +234,172 @@ object RptFichasEmpleado: TRptFichasEmpleado item Name = 'ID' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'ID_CATEGORIA' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'NIF_CIF' DataType = datString Size = 15 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'NOMBRE' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'PERSONA_CONTACTO' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'CALLE' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'POBLACION' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'PROVINCIA' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'CODIGO_POSTAL' DataType = datString Size = 10 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'TELEFONO_1' DataType = datString Size = 25 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'TELEFONO_2' DataType = datString Size = 25 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'MOVIL_1' DataType = datString Size = 25 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'MOVIL_2' DataType = datString Size = 25 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'FAX' DataType = datString Size = 25 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'EMAIL_1' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'EMAIL_2' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'PAGINA_WEB' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'NOTAS' DataType = datMemo - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'FECHA_ALTA' DataType = datDateTime - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'FECHA_MODIFICACION' DataType = datDateTime - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'USUARIO' DataType = datString Size = 20 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'ID_EMPRESA' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'REFERENCIA' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'FECHA_NACIMIENTO' DataType = datDateTime - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'CATEGORIA' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'FECHA_ALTA_EMPRESA' DataType = datDateTime - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'FORMACION_BASE' DataType = datMemo - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'FORMACION_COMPLE' DataType = datMemo - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'FORMACION_RECIBIDA' DataType = datMemo - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'EXPERIENCIA' DataType = datMemo - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'NOMBRE_EMPRESA' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'RAZON_SOCIAL' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'TELEFONO_1_EMPRESA' DataType = datString Size = 25 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'FAX_EMPRESA' DataType = datString Size = 25 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'LOGOTIPO' DataType = datBlob - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end> - BusinessRulesClient.ScriptLanguage = rslPascalScript - BusinessRulesServer.ScriptLanguage = rslPascalScript end> + JoinDataTables = <> + UnionDataTables = <> Commands = <> RelationShips = <> UpdateRules = <> + Version = 0 Left = 48 Top = 16 end @@ -661,299 +408,204 @@ object RptFichasEmpleado: TRptFichasEmpleado item Name = 'FacturasCliente_ID' DataType = datAutoInc - BlobType = dabtUnknown Required = True - DisplayWidth = 0 DisplayLabel = 'ID' - Alignment = taLeftJustify end item Name = 'FacturasCliente_ID_EMPRESA' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'ID_EMPRESA' - Alignment = taLeftJustify end item Name = 'FacturasCliente_ID_CONTRATO' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'ID_CONTRATO' - Alignment = taLeftJustify end item Name = 'FacturasCliente_FECHA_FACTURA' DataType = datDateTime - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Fecha de las factura' - Alignment = taLeftJustify end item Name = 'FacturasCliente_VENCIMIENTO' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Vencimiento' - Alignment = taLeftJustify end item Name = 'FacturasCliente_SITUACION' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Situaci'#243'n' - Alignment = taLeftJustify end item Name = 'FacturasCliente_BASE_IMPONIBLE' DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Base imponible' Alignment = taRightJustify end item Name = 'FacturasCliente_IMPORTE_DESCUENTO' DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Importe dto.' Alignment = taRightJustify end item Name = 'FacturasCliente_IMPORTE_IVA' DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Importe IVA' Alignment = taRightJustify end item Name = 'FacturasCliente_IMPORTE_TOTAL' DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Importe total' Alignment = taRightJustify end item Name = 'FacturasCliente_FORMA_PAGO' DataType = datMemo - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Forma de pago' - Alignment = taLeftJustify end item Name = 'FacturasCliente_ID_CLIENTE' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'ID_CLIENTE' - Alignment = taLeftJustify end item Name = 'FacturasCliente_NIF_CIF' DataType = datString Size = 15 - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'NIF/CIF' - Alignment = taLeftJustify end item Name = 'FacturasCliente_CODIGO_POSTAL' DataType = datString Size = 10 - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'C'#243'd. postal' - Alignment = taLeftJustify end item Name = 'FacturasCliente_FECHA_ALTA' DataType = datDateTime - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'FECHA_ALTA' - Alignment = taLeftJustify end item Name = 'FacturasCliente_FECHA_MODIFICACION' DataType = datDateTime - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'FECHA_MODIFICACION' - Alignment = taLeftJustify end item Name = 'FacturasCliente_OBSERVACIONES' DataType = datMemo - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Observaciones' - Alignment = taLeftJustify end item Name = 'FacturasCliente_NOMBRE' DataType = datString Size = 100 - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Cliente' - Alignment = taLeftJustify end item Name = 'FacturasCliente_CALLE' DataType = datString Size = 150 - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Direcci'#243'n' - Alignment = taLeftJustify end item Name = 'FacturasCliente_PROVINCIA' DataType = datString Size = 30 - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Provincia' - Alignment = taLeftJustify end item Name = 'FacturasCliente_POBLACION' DataType = datString Size = 150 - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Poblaci'#243'n' - Alignment = taLeftJustify end item Name = 'FacturasCliente_IVA' DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'IVA' - Alignment = taLeftJustify end item Name = 'FacturasCliente_USUARIO' DataType = datString Size = 100 - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'USUARIO' - Alignment = taLeftJustify end item Name = 'FacturasCliente_REFERENCIA' DataType = datString Size = 20 - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Referencia' - Alignment = taLeftJustify end item Name = 'FacturasCliente_DESCUENTO' DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Dto.' - Alignment = taLeftJustify end item Name = 'FacturasCliente_Detalles_ID' DataType = datAutoInc - BlobType = dabtUnknown Required = True - DisplayWidth = 0 DisplayLabel = 'ID' - Alignment = taLeftJustify end item Name = 'FacturasCliente_Detalles_ID_FACTURA' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'ID_FACTURA' - Alignment = taLeftJustify end item Name = 'FacturasCliente_Detalles_TIPO_DETALLE' DataType = datString Size = 10 - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Tipo detalle' - Alignment = taLeftJustify end item Name = 'FacturasCliente_Detalles_CONCEPTO' DataType = datString Size = 2000 - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Concepto' - Alignment = taLeftJustify end item Name = 'FacturasCliente_Detalles_IMPORTE_UNIDAD' DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Importe unidad' Alignment = taRightJustify end item Name = 'FacturasCliente_Detalles_IMPORTE_TOTAL' DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Importe total' Alignment = taRightJustify end item Name = 'FacturasCliente_Detalles_VISIBLE' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = #191'Visible?' - Alignment = taLeftJustify end item Name = 'FacturasCliente_Detalles_POSICION' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Posici'#243'n' - Alignment = taLeftJustify end item Name = 'FacturasCliente_Detalles_CANTIDAD' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 DisplayLabel = 'Cantidad' - Alignment = taLeftJustify end> Left = 46 Top = 158 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 = 39329.847549722220000000 ScriptLanguage = 'PascalScript' @@ -1006,25 +658,6 @@ object RptFichasEmpleado: TRptFichasEmpleado OnStartReport = 'frxReportOnStartReport' Left = 169 Top = 16 - Datasets = < - item - DataSet = frxDBCabecera - DataSetName = 'frxDBCabecera' - 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' @@ -1033,4 +666,8 @@ object RptFichasEmpleado: TRptFichasEmpleado Left = 264 Top = 16 end + object Bin2DataStreamer: TDABin2DataStreamer + Left = 48 + Top = 88 + end end diff --git a/Source/Modulos/Contactos/Reports/uRptFichasEmpleado_Server.pas b/Source/Modulos/Contactos/Reports/uRptFichasEmpleado_Server.pas index d65c7077..ede5e01a 100644 --- a/Source/Modulos/Contactos/Reports/uRptFichasEmpleado_Server.pas +++ b/Source/Modulos/Contactos/Reports/uRptFichasEmpleado_Server.pas @@ -7,13 +7,12 @@ uses Dialogs, frxClass, frxDBSet, uDAScriptingProvider, uDADataTable, uDACDSDataTable, DB, uDAClasses, frxChart, frxGradient, frxChBox, frxCross, frxOLE, frxBarcode, frxRich, uDABINAdapter, uROTypes, - uDAInterfaces; + uDAInterfaces, uDADataStreamer, uDABin2DataStreamer, uDAMemDataTable; type TRptFichasEmpleado = class(TDataModule) DADataCabecera: TDADataSource; - tbl_FichaEmpleado: TDACDSDataTable; - DABINAdapter: TDABINAdapter; + tbl_FichaEmpleado: TDAMemDataTable; frxRichObject1: TfrxRichObject; frxBarCodeObject1: TfrxBarCodeObject; frxOLEObject1: TfrxOLEObject; @@ -25,6 +24,7 @@ type schReport: TDASchema; DataDictionary: TDADataDictionary; frxReport: TfrxReport; + Bin2DataStreamer: TDABin2DataStreamer; procedure DataModuleCreate(Sender: TObject); private FConnection: IDAConnection; @@ -93,8 +93,8 @@ begin dsMaster := schReport.NewDataset(FConnection, ds_InformeFichaEmpleado, ['ID'], [ID]); AStream.Clear; - DABINAdapter.WriteDataset(AStream, dsMaster, [woRows, woSchema], -1); - DABINAdapter.ReadDataset(AStream, tbl_FichaEmpleado, TRUE, '', TRUE, TRUE); + Bin2DataStreamer.WriteDataset(AStream, dsMaster, [woRows, woSchema], -1); + Bin2DataStreamer.ReadDataset(AStream, tbl_FichaEmpleado, TRUE, '', TRUE, TRUE); frxReport.LoadFromFile(DarRutaInformes + rptFichaEmpleado, True); frxReport.PrepareReport(False); diff --git a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.pas b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.pas index 32d1ee08..a204de2e 100644 --- a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.pas +++ b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.pas @@ -53,8 +53,8 @@ uses uDataModuleServer, uDatabaseUtils, uUsersManager, schContactosClient_Intf, uBizEmpleadosServer, uBizClientesServer, uBizProveedoresServer, uRestriccionesUsuarioUtils, - uStringsUtils; -// uRptFichasEmpleado_Server, uRptEtiquetasContacto_Server; + uStringsUtils, + uRptFichasEmpleado_Server, uRptEtiquetasContacto_Server; procedure Create_srvContactos(out anInstance : IUnknown); begin @@ -140,30 +140,27 @@ begin end; function TsrvContactos.GenerateEtiquetasReport(const ContactosID: String): Binary; -//var -// AReportGenerator : TRptEtiquetasContacto; +var + AReportGenerator : TRptEtiquetasContacto; begin -{ AReportGenerator := TRptEtiquetasContacto.Create(nil); + AReportGenerator := TRptEtiquetasContacto.Create(nil); try Result := AReportGenerator.GenerarInforme(ContactosID); finally FreeAndNIL(AReportGenerator); end; -} end; function TsrvContactos.GenerateFichaEmpleadoReport(const EmpleadoID: String): Binary; -//var -// AReportGenerator : TRptFichasEmpleado; +var + AReportGenerator : TRptFichasEmpleado; begin -{ AReportGenerator := TRptFichasEmpleado.Create(nil); try Result := AReportGenerator.GenerarFicha(EmpleadoID); finally FreeAndNIL(AReportGenerator); end; -} end; initialization diff --git a/Source/Modulos/Contactos/Views/uEditorCliente.dfm b/Source/Modulos/Contactos/Views/uEditorCliente.dfm index de168eb0..05d438a8 100644 --- a/Source/Modulos/Contactos/Views/uEditorCliente.dfm +++ b/Source/Modulos/Contactos/Views/uEditorCliente.dfm @@ -5,7 +5,7 @@ inherited fEditorCliente: TfEditorCliente ClientHeight = 585 ClientWidth = 656 ExplicitWidth = 664 - ExplicitHeight = 619 + ExplicitHeight = 612 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -63,19 +63,19 @@ inherited fEditorCliente: TfEditorCliente end end inherited pgPaginas: TPageControl - Width = 656 - Height = 490 + Width = 650 + Height = 484 ActivePage = pagDirecciones - ExplicitWidth = 656 - ExplicitHeight = 490 + ExplicitWidth = 650 + ExplicitHeight = 484 inherited pagGeneral: TTabSheet - ExplicitWidth = 648 - ExplicitHeight = 462 + ExplicitWidth = 642 + ExplicitHeight = 456 inline frViewCliente1: TfrViewCliente Left = 0 Top = 0 - Width = 648 - Height = 462 + Width = 642 + Height = 456 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -85,37 +85,37 @@ inherited fEditorCliente: TfEditorCliente ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 648 - ExplicitHeight = 462 + ExplicitWidth = 642 + ExplicitHeight = 456 inherited dxLayoutControlContacto: TdxLayoutControl - Width = 648 - Height = 462 + Width = 642 + Height = 456 LookAndFeel = dxLayoutOfficeLookAndFeel - ExplicitWidth = 648 - ExplicitHeight = 462 + ExplicitWidth = 642 + ExplicitHeight = 456 inherited PngSpeedButton1: TPngSpeedButton - Left = 603 + Left = 597 Top = 218 - ExplicitLeft = 603 + ExplicitLeft = 597 ExplicitTop = 218 end inherited PngSpeedButton2: TPngSpeedButton - Left = 603 + Left = 597 Top = 190 - ExplicitLeft = 603 + ExplicitLeft = 597 ExplicitTop = 190 end inherited PngSpeedButton3: TPngSpeedButton - Left = 603 + Left = 597 Top = 162 - ExplicitLeft = 603 + ExplicitLeft = 597 ExplicitTop = 162 end inherited Label1: TLabel - Left = 432 + Left = 431 Top = 270 Width = 269 - ExplicitLeft = 432 + ExplicitLeft = 431 ExplicitTop = 270 ExplicitWidth = 269 end @@ -138,9 +138,9 @@ inherited fEditorCliente: TfEditorCliente Width = 78 end inherited eCodigoPostal: TcxDBTextEdit - Left = 339 + Left = 338 Top = 294 - ExplicitLeft = 339 + ExplicitLeft = 338 ExplicitTop = 294 end inherited eObservaciones: TcxDBMemo @@ -176,41 +176,42 @@ inherited fEditorCliente: TfEditorCliente Width = 205 end inherited cxDBCheckBox1: TcxDBCheckBox - Left = 432 + Left = 431 Top = 315 - ExplicitLeft = 432 + ExplicitLeft = 431 ExplicitTop = 315 - ExplicitWidth = 275 - Width = 275 + ExplicitWidth = 192 + ExplicitHeight = 34 + Width = 192 end inherited eTlfParticular: TcxDBTextEdit - Left = 527 + Left = 526 Top = 57 - ExplicitLeft = 527 + ExplicitLeft = 526 ExplicitTop = 57 ExplicitWidth = 91 Width = 91 end inherited eTlfTrabajo: TcxDBTextEdit - Left = 527 + Left = 526 Top = 30 - ExplicitLeft = 527 + ExplicitLeft = 526 ExplicitTop = 30 ExplicitWidth = 127 Width = 127 end inherited eTlfMovil: TcxDBTextEdit - Left = 527 + Left = 526 Top = 84 - ExplicitLeft = 527 + ExplicitLeft = 526 ExplicitTop = 84 ExplicitWidth = 140 Width = 140 end inherited eFax: TcxDBTextEdit - Left = 527 + Left = 526 Top = 111 - ExplicitLeft = 527 + ExplicitLeft = 526 ExplicitTop = 111 ExplicitWidth = 121 Width = 121 @@ -236,27 +237,27 @@ inherited fEditorCliente: TfEditorCliente Width = 268 end inherited eMailTrabajo: TcxDBHyperLinkEdit - Left = 527 + Left = 526 Top = 162 Properties.Prefix = 'mailto:' - ExplicitLeft = 527 + ExplicitLeft = 526 ExplicitTop = 162 ExplicitWidth = 121 Width = 121 end inherited eMailParticular: TcxDBHyperLinkEdit - Left = 527 + Left = 526 Top = 190 Properties.Prefix = 'mailto:' - ExplicitLeft = 527 + ExplicitLeft = 526 ExplicitTop = 190 ExplicitWidth = 121 Width = 121 end inherited ePaginaWeb: TcxDBHyperLinkEdit - Left = 527 + Left = 526 Top = 217 - ExplicitLeft = 527 + ExplicitLeft = 526 ExplicitTop = 217 ExplicitWidth = 121 Width = 121 @@ -281,24 +282,24 @@ inherited fEditorCliente: TfEditorCliente end end inherited pagDatosBancarios: TTabSheet - ExplicitWidth = 648 - ExplicitHeight = 462 + ExplicitWidth = 642 + ExplicitHeight = 456 inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios - Width = 648 - Height = 462 - ExplicitWidth = 648 - ExplicitHeight = 462 + Width = 642 + Height = 456 + ExplicitWidth = 642 + ExplicitHeight = 456 inherited dxLayoutControl1: TdxLayoutControl - Width = 648 + Width = 642 LookAndFeel = dxLayoutOfficeLookAndFeel - ExplicitWidth = 648 + ExplicitWidth = 642 inherited eEntidad: TcxDBTextEdit ExplicitWidth = 114 Width = 114 end inherited eSucursal: TcxDBTextEdit - Left = 418 - ExplicitLeft = 418 + Left = 415 + ExplicitLeft = 415 ExplicitWidth = 112 Width = 112 end @@ -319,7 +320,7 @@ inherited fEditorCliente: TfEditorCliente inline frViewClienteDatosComerciales1: TfrViewClienteDatosComerciales Left = 0 Top = 0 - Width = 648 + Width = 642 Height = 193 Align = alTop Font.Charset = DEFAULT_CHARSET @@ -330,26 +331,26 @@ inherited fEditorCliente: TfEditorCliente ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 648 + ExplicitWidth = 642 ExplicitHeight = 193 inherited dxLayoutControl1: TdxLayoutControl - Width = 648 + Width = 642 LookAndFeel = dxLayoutOfficeLookAndFeel - ExplicitWidth = 648 + ExplicitWidth = 642 inherited Label1: TLabel - Left = 397 + Left = 393 Top = 30 Width = 206 Height = 39 - ExplicitLeft = 397 + ExplicitLeft = 393 ExplicitTop = 30 ExplicitWidth = 206 ExplicitHeight = 39 end inherited eDiasVencimiento: TcxDBSpinEdit - Left = 464 + Left = 460 Top = 75 - ExplicitLeft = 464 + ExplicitLeft = 460 ExplicitTop = 75 ExplicitWidth = 160 Width = 160 @@ -373,9 +374,9 @@ inherited fEditorCliente: TfEditorCliente Width = 121 end inherited bFormasPago: TButton - Left = 237 + Left = 233 Top = 57 - ExplicitLeft = 237 + ExplicitLeft = 233 ExplicitTop = 57 end inherited eIVA: TcxDBLookupComboBox @@ -385,9 +386,9 @@ inherited fEditorCliente: TfEditorCliente Width = 121 end inherited bTiposIVA: TButton - Left = 237 + Left = 233 Top = 84 - ExplicitLeft = 237 + ExplicitLeft = 233 ExplicitTop = 84 end end @@ -399,8 +400,8 @@ inherited fEditorCliente: TfEditorCliente inline frViewDireccionesEntrega1: TfrViewDireccionesEntrega Left = 0 Top = 0 - Width = 648 - Height = 462 + Width = 642 + Height = 456 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -410,13 +411,13 @@ inherited fEditorCliente: TfEditorCliente ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 648 - ExplicitHeight = 462 + ExplicitWidth = 642 + ExplicitHeight = 456 inherited cxGrid: TcxGrid - Width = 648 - Height = 437 - ExplicitWidth = 648 - ExplicitHeight = 437 + Width = 642 + Height = 431 + ExplicitWidth = 642 + ExplicitHeight = 431 inherited cxGridView: TcxGridDBTableView inherited cxGridViewID: TcxGridDBColumn SortIndex = 0 @@ -425,8 +426,8 @@ inherited fEditorCliente: TfEditorCliente end end inherited ToolBar1: TToolBar - Width = 648 - ExplicitWidth = 648 + Width = 642 + ExplicitWidth = 642 end end end @@ -436,8 +437,8 @@ inherited fEditorCliente: TfEditorCliente inline frViewClienteDescuentos1: TfrViewClienteDescuentos Left = 0 Top = 0 - Width = 648 - Height = 462 + Width = 642 + Height = 456 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -447,17 +448,17 @@ inherited fEditorCliente: TfEditorCliente ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 648 - ExplicitHeight = 462 + ExplicitWidth = 642 + ExplicitHeight = 456 inherited cxGrid: TcxGrid - Width = 648 - Height = 437 - ExplicitWidth = 648 - ExplicitHeight = 437 + Width = 642 + Height = 431 + ExplicitWidth = 642 + ExplicitHeight = 431 end inherited ToolBar1: TToolBar - Width = 648 - ExplicitWidth = 648 + Width = 642 + ExplicitWidth = 642 inherited ToolButton1: TToolButton Top = 0 ExplicitTop = 0 @@ -497,6 +498,14 @@ inherited fEditorCliente: TfEditorCliente ExplicitWidth = 656 end inherited EditorActionList: TActionList + inherited actPrevisualizar: TAction + Enabled = False + Visible = False + end + inherited actImprimir: TAction + Enabled = False + Visible = False + end object actGruposCliente: TAction Category = 'Acciones' Caption = 'Grupos de cliente' diff --git a/Source/Modulos/Contactos/Views/uEditorClientes.dfm b/Source/Modulos/Contactos/Views/uEditorClientes.dfm index c725f6da..cc158719 100644 --- a/Source/Modulos/Contactos/Views/uEditorClientes.dfm +++ b/Source/Modulos/Contactos/Views/uEditorClientes.dfm @@ -5,7 +5,7 @@ inherited fEditorClientes: TfEditorClientes ClientHeight = 519 ClientWidth = 786 ExplicitWidth = 794 - ExplicitHeight = 553 + ExplicitHeight = 546 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -52,7 +52,7 @@ inherited fEditorClientes: TfEditorClientes Width = 786 ExplicitWidth = 786 inherited tbxMain: TTBXToolbar - ExplicitWidth = 474 + ExplicitWidth = 632 end inherited tbxMenu: TTBXToolbar ExplicitWidth = 786 @@ -175,6 +175,14 @@ inherited fEditorClientes: TfEditorClientes inherited actNuevo: TAction ImageIndex = 22 end + inherited actPrevisualizar: TAction + Enabled = True + Visible = True + end + inherited actImprimir: TAction + Enabled = True + Visible = True + end object actGruposCliente: TAction Category = 'Acciones' Caption = 'Grupos de cliente' @@ -2166,7 +2174,7 @@ inherited fEditorClientes: TfEditorClientes 0007F0000007F0000007F0000007F0000007F0000007F0000007800000078000 0007C0000007C000000700000007000000070000000700000007C000000FC000 001F8000003F800000FFF8FFFFFF} - Width = 450 + Width = 550 Left = 296 Top = 144 end @@ -2477,7 +2485,7 @@ inherited fEditorClientes: TfEditorClientes 0007F0000007F0000007F0000007F0000007F0000007F0000007800000078000 0007C0000007C000000700000007000000070000000700000007C000000FC000 001F8000003F800000FFF8FFFFFF} - Width = 450 + Width = 550 Left = 328 Top = 144 end diff --git a/Source/Modulos/Contactos/Views/uEditorContacto.dfm b/Source/Modulos/Contactos/Views/uEditorContacto.dfm index 818bf628..8796038b 100644 --- a/Source/Modulos/Contactos/Views/uEditorContacto.dfm +++ b/Source/Modulos/Contactos/Views/uEditorContacto.dfm @@ -7,7 +7,7 @@ inherited fEditorContacto: TfEditorContacto ClientWidth = 632 Scaled = False ExplicitWidth = 640 - ExplicitHeight = 240 + ExplicitHeight = 488 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -23,19 +23,13 @@ inherited fEditorContacto: TfEditorContacto Width = 632 ExplicitWidth = 632 inherited tbxMain: TTBXToolbar - ExplicitWidth = 330 + ExplicitWidth = 488 inherited TBXItem2: TTBXItem Visible = False end inherited TBXItem5: TTBXItem Visible = False end - inherited TBXItem23: TTBXItem - Visible = False - end - inherited TBXItem3: TTBXItem - Visible = False - end end inherited tbxMenu: TTBXToolbar DockPos = 0 @@ -75,12 +69,12 @@ inherited fEditorContacto: TfEditorContacto end inherited pgPaginas: TPageControl Width = 626 - ExplicitWidth = 632 + ExplicitWidth = 626 inherited pagGeneral: TTabSheet ExplicitLeft = 4 ExplicitTop = 24 - ExplicitWidth = 624 - ExplicitHeight = 338 + ExplicitWidth = 618 + ExplicitHeight = 332 end object pagDatosBancarios: TTabSheet Caption = 'Datos bancarios' diff --git a/Source/Modulos/Contactos/Views/uEditorContactos.dfm b/Source/Modulos/Contactos/Views/uEditorContactos.dfm index 488d56f3..6126e8ab 100644 --- a/Source/Modulos/Contactos/Views/uEditorContactos.dfm +++ b/Source/Modulos/Contactos/Views/uEditorContactos.dfm @@ -24,4 +24,12 @@ inherited fEditorContactos: TfEditorContactos ExplicitLeft = 334 end end + inherited EditorActionList: TActionList + inherited actPrevisualizar: TAction + Enabled = False + end + inherited actImprimir: TAction + Enabled = False + end + end end diff --git a/Source/Modulos/Contactos/Views/uEditorEmpleado.dfm b/Source/Modulos/Contactos/Views/uEditorEmpleado.dfm index acfb2a1c..ab7f6569 100644 --- a/Source/Modulos/Contactos/Views/uEditorEmpleado.dfm +++ b/Source/Modulos/Contactos/Views/uEditorEmpleado.dfm @@ -53,6 +53,9 @@ inherited fEditorEmpleado: TfEditorEmpleado inherited TBXDock: TTBXDock Width = 676 ExplicitWidth = 676 + inherited tbxMain: TTBXToolbar + DockPos = 0 + end inherited tbxMenu: TTBXToolbar ExplicitWidth = 676 end @@ -151,6 +154,12 @@ inherited fEditorEmpleado: TfEditorEmpleado ExplicitWidth = 80 Width = 80 end + inherited cbCategoria: TcxDBComboBox + Top = 111 + ExplicitTop = 111 + ExplicitWidth = 225 + Width = 225 + end inherited eTlfParticular: TcxDBTextEdit Left = 496 Top = 57 @@ -167,12 +176,6 @@ inherited fEditorEmpleado: TfEditorEmpleado ExplicitWidth = 172 Width = 172 end - inherited cbCategoria: TcxDBComboBox - Top = 111 - ExplicitTop = 111 - ExplicitWidth = 225 - Width = 225 - end inherited eTlfMovil: TcxDBTextEdit Left = 496 Top = 84 @@ -195,6 +198,10 @@ inherited fEditorEmpleado: TfEditorEmpleado ExplicitWidth = 263 Width = 263 end + inherited cbContrato: TcxDBComboBox + Top = 138 + ExplicitTop = 138 + end inherited eNIFCIF: TcxDBTextEdit Left = 217 Top = 30 @@ -241,10 +248,6 @@ inherited fEditorEmpleado: TfEditorEmpleado ExplicitWidth = 256 Width = 256 end - inherited cbContrato: TcxDBComboBox - Top = 138 - ExplicitTop = 138 - end end inherited dsContacto: TDADataSource Left = 8 diff --git a/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm b/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm index 42793c6e..3ecd82ef 100644 --- a/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm +++ b/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm @@ -2,7 +2,6 @@ inherited fEditorEmpleados: TfEditorEmpleados Caption = 'fEditorEmpleados' ClientWidth = 786 ExplicitWidth = 794 - ExplicitHeight = 478 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -49,7 +48,7 @@ inherited fEditorEmpleados: TfEditorEmpleados Width = 786 ExplicitWidth = 786 inherited tbxMain: TTBXToolbar - ExplicitWidth = 474 + ExplicitWidth = 632 inherited TBXItem2: TTBXItem ImageIndex = 22 Images = SmallImages @@ -172,6 +171,14 @@ inherited fEditorEmpleados: TfEditorEmpleados inherited EditorActionList: TActionList [4] Left = 72 Top = 160 + inherited actPrevisualizar: TAction + Enabled = True + Visible = True + end + inherited actImprimir: TAction + Enabled = True + Visible = True + end end inherited SmallImages: TPngImageList [5] PngImages = < diff --git a/Source/Modulos/Contactos/Views/uEditorProveedor.dfm b/Source/Modulos/Contactos/Views/uEditorProveedor.dfm index 8b7f4ab0..2965a16d 100644 --- a/Source/Modulos/Contactos/Views/uEditorProveedor.dfm +++ b/Source/Modulos/Contactos/Views/uEditorProveedor.dfm @@ -48,6 +48,9 @@ inherited fEditorProveedor: TfEditorProveedor inherited TBXDock: TTBXDock Width = 648 ExplicitWidth = 648 + inherited tbxMain: TTBXToolbar + ExplicitWidth = 330 + end inherited tbxMenu: TTBXToolbar ExplicitWidth = 648 end @@ -411,6 +414,14 @@ inherited fEditorProveedor: TfEditorProveedor inherited EditorActionList: TActionList Left = 32 Top = 160 + inherited actPrevisualizar: TAction + Enabled = False + Visible = False + end + inherited actImprimir: TAction + Enabled = False + Visible = False + end object actGruposProveedor: TAction Category = 'Acciones' Caption = 'Grupos de proveedor' diff --git a/Source/Modulos/Contactos/Views/uEditorProveedores.dfm b/Source/Modulos/Contactos/Views/uEditorProveedores.dfm index 334aa1ef..d3aa38b4 100644 --- a/Source/Modulos/Contactos/Views/uEditorProveedores.dfm +++ b/Source/Modulos/Contactos/Views/uEditorProveedores.dfm @@ -1,5 +1,6 @@ inherited fEditorProveedores: TfEditorProveedores Caption = 'fEditorProveedores' + ExplicitWidth = 551 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -40,6 +41,7 @@ inherited fEditorProveedores: TfEditorProveedores end inherited TBXDock: TTBXDock inherited tbxMain: TTBXToolbar + ExplicitWidth = 543 inherited TBXItem2: TTBXItem Images = SmallImages end @@ -151,6 +153,14 @@ inherited fEditorProveedores: TfEditorProveedores inherited actNuevo: TAction ImageIndex = 22 end + inherited actPrevisualizar: TAction + Enabled = True + Visible = True + end + inherited actImprimir: TAction + Enabled = True + Visible = True + end end inherited SmallImages: TPngImageList [5] PngImages = < @@ -992,7 +1002,7 @@ inherited fEditorProveedores: TfEditorProveedores 0007F0000007F0000007F0000007F0000007F0000007F0000007800000078000 0007C0000007C000000700000007000000070000000700000007C000000FC000 001F8000003F800000FFF8FFFFFF} - Width = 450 + Width = 550 Left = 296 Top = 144 end @@ -1303,7 +1313,7 @@ inherited fEditorProveedores: TfEditorProveedores 0007F0000007F0000007F0000007F0000007F0000007F0000007800000078000 0007C0000007C000000700000007000000070000000700000007C000000FC000 001F8000003F800000FFF8FFFFFF} - Width = 450 + Width = 550 Left = 328 Top = 144 end