diff --git a/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteController.pas b/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteController.pas index 0938527f..a8ac2456 100644 --- a/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteController.pas +++ b/Source/Modulos/Recibos de cliente/Controller/uRecibosClienteController.pas @@ -708,11 +708,6 @@ begin begin ShowHourglassCursor; try -// if ARecibosCliente.EsNuevo then -// NuevoID := FDataModule.GetNextID(ARecibosCliente.DataTable.LogicalName) -// else -// NuevoID := ARecibosCliente.ID; - //Si el importe ha cambiado se debe hacer un recibo nuevo con el importe restante if ImporteTotalModificado(ARecibosCliente, ImporteRestante) then begin diff --git a/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.pas index 9f9317f9..c41a8a91 100644 --- a/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.pas +++ b/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.pas @@ -70,7 +70,7 @@ uses function TDataModuleRecibosCliente.GetReport(const ID: String): Binary; begin -// Result := (RORemoteService as IsrvRecibosCliente).GenerateReport(ID); + Result := (RORemoteService as IsrvRecibosCliente).GenerateReport(ID); end; procedure TDataModuleRecibosCliente.DAClientDataModuleCreate(Sender: TObject); diff --git a/Source/Modulos/Recibos de cliente/RecibosCliente_Group.groupproj b/Source/Modulos/Recibos de cliente/RecibosCliente_Group.groupproj index bc1f00d9..d106d64c 100644 --- a/Source/Modulos/Recibos de cliente/RecibosCliente_Group.groupproj +++ b/Source/Modulos/Recibos de cliente/RecibosCliente_Group.groupproj @@ -9,6 +9,7 @@ + @@ -111,14 +112,23 @@ + + + + + + + + + - + - + - + \ No newline at end of file diff --git a/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm b/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm index 0e6b65c9..16f73f8d 100644 --- a/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm +++ b/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.dfm @@ -4,25 +4,207 @@ object RptRecibosCliente: TRptRecibosCliente Height = 405 Width = 447 object DADataCabecera: TDADataSource + DataSet = tbl_Cabecera.Dataset DataTable = tbl_Cabecera Left = 264 Top = 72 end - object tbl_Cabecera: TDACDSDataTable + object tbl_Cabecera: TDAMemDataTable RemoteUpdatesOptions = [] - Fields = <> - Params = <> + Fields = < + item + Name = 'ID' + DataType = datInteger + end + item + Name = 'ID_RECIBO_COMPENSADO' + DataType = datInteger + end + item + Name = 'REFERENCIA_REC_COMPENSADO' + DataType = datString + Size = 255 + end + item + Name = 'ID_EMPRESA' + DataType = datInteger + end + item + Name = 'REFERENCIA' + DataType = datString + Size = 255 + end + item + Name = 'SITUACION' + DataType = datString + Size = 9 + end + item + Name = 'ID_FACTURA' + DataType = datInteger + end + item + Name = 'ID_REMESA' + DataType = datInteger + end + item + Name = 'REFERENCIA_REMESA' + DataType = datString + Size = 255 + end + item + Name = 'FECHA_EMISION' + DataType = datDateTime + end + item + Name = 'FECHA_VENCIMIENTO' + DataType = datDateTime + end + item + Name = 'DESCRIPCION' + DataType = datString + Size = 255 + end + item + Name = 'OBSERVACIONES' + DataType = datString + Size = 255 + end + item + Name = 'IMPORTE' + DataType = datFloat + end + item + Name = 'OTROS_GASTOS' + DataType = datFloat + end + item + Name = 'IMPORTE_TOTAL' + DataType = datFloat + end + item + Name = 'FECHA_FACTURA' + DataType = datDateTime + end + item + Name = 'FORMA_PAGO_FACTURA' + DataType = datString + Size = 255 + end + item + Name = 'IMPORTE_FACTURA' + DataType = datFloat + end + item + Name = 'NOMBRE_CLIENTE' + DataType = datString + Size = 255 + end + item + Name = 'NIF_CIF_CLIENTE' + DataType = datString + Size = 15 + end + item + Name = 'ENTIDAD_CLIENTE' + DataType = datString + Size = 15 + end + item + Name = 'SUCURSAL_CLIENTE' + DataType = datString + Size = 15 + end + item + Name = 'DC_CLIENTE' + DataType = datString + Size = 15 + end + item + Name = 'CUENTA_CLIENTE' + DataType = datString + Size = 15 + end + item + Name = 'NIF_CIF_EMPRESA' + DataType = datString + Size = 15 + end + item + Name = 'RAZON_SOCIAL' + DataType = datString + Size = 255 + end + item + Name = 'CALLE_EMPRESA' + DataType = datString + Size = 255 + end + item + Name = 'POBLACION_EMPRESA' + DataType = datString + Size = 255 + end + item + Name = 'PROVINCIA_EMPRESA' + DataType = datString + Size = 255 + end + item + Name = 'CODIGO_POSTAL_EMPRESA' + DataType = datString + Size = 10 + end + item + Name = 'TELEFONO_1' + DataType = datString + Size = 25 + end + item + Name = 'FAX' + DataType = datString + Size = 25 + end + item + Name = 'MOVIL_1' + DataType = datString + Size = 25 + end + item + Name = 'EMAIL_1' + DataType = datString + Size = 255 + end + item + Name = 'PAGINA_WEB' + DataType = datString + Size = 255 + end + item + Name = 'REGISTRO_MERCANTIL' + DataType = datString + Size = 255 + end + item + Name = 'LOGOTIPO' + DataType = datBlob + end> + Params = < + item + Name = 'ID' + DataType = datInteger + Value = '' + ParamType = daptInput + end> MasterMappingMode = mmDataRequest LogChanges = False StreamingOptions = [soDisableEventsWhileStreaming] RemoteFetchEnabled = False - SchemaCall.Params = <> - DataRequestCall.Params = <> - DataUpdateCall.Params = <> - ScriptCall.Params = <> - ReadOnly = False + LocalSchema = schReport + LocalDataStreamer = DABINAdapter DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] + LogicalName = 'Informe_Cabecera' IndexDefs = <> Left = 264 Top = 128 @@ -67,7 +249,6 @@ object RptRecibosCliente: TRptRecibosCliente Params = < item Name = 'ID_RECIBO' - BlobType = dabtUnknown Value = '' ParamType = daptInput end> @@ -99,46 +280,22 @@ object RptRecibosCliente: TRptRecibosCliente Name = 'REFERENCIA' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'DESCRIPCION' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'IMPORTE_TOTAL' DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end> - BusinessRulesClient.ScriptLanguage = rslPascalScript - BusinessRulesServer.ScriptLanguage = rslPascalScript end item Params = < item Name = 'ID' DataType = datInteger - BlobType = dabtUnknown Value = '' ParamType = daptInput end> @@ -159,23 +316,36 @@ object RptRecibosCliente: TRptRecibosCliente 'PORTE_TOTAL,'#10' V_RECIBOS_CLIENTE.FECHA_FACTURA,'#10' V_RECIBOS_' + 'CLIENTE.FORMA_PAGO_FACTURA,'#10' V_RECIBOS_CLIENTE.IMPORTE_FACTUR' + 'A,'#10' V_RECIBOS_CLIENTE.NOMBRE_CLIENTE,'#10' V_RECIBOS_CLIENTE.N' + - 'IF_CIF_CLIENTE,'#10' V_RECIBOS_CLIENTE.ENTIDAD_CLIENTE,'#10' V_REC' + - 'IBOS_CLIENTE.SUCURSAL_CLIENTE,'#10' V_RECIBOS_CLIENTE.DC_CLIENTE,' + - #10' V_RECIBOS_CLIENTE.CUENTA_CLIENTE,'#10#10' EMPRESAS.NIF_CIF as ' + - 'NIF_CIF_EMPRESA, EMPRESAS.RAZON_SOCIAL,'#10' EMPRESAS.CALLE as CA' + - 'LLE_EMPRESA, EMPRESAS.POBLACION as POBLACION_EMPRESA,'#10' EMPRES' + - 'AS.PROVINCIA as PROVINCIA_EMPRESA, EMPRESAS.CODIGO_POSTAL as COD' + - 'IGO_POSTAL_EMPRESA,'#10' EMPRESAS.TELEFONO_1, EMPRESAS.FAX, EMPRE' + - 'SAS.MOVIL_1, EMPRESAS.EMAIL_1,'#10' EMPRESAS.PAGINA_WEB, EMPRESAS' + - '.REGISTRO_MERCANTIL, EMPRESAS.LOGOTIPO'#10#10'FROM'#10' V_RECIBOS_CLIENTE' + - #10' LEFT OUTER JOIN EMPRESAS ON (EMPRESAS.ID = V_RECIBOS_CLIENTE.' + - 'ID_EMPRESA)'#10'WHERE'#10' V_RECIBOS_CLIENTE.ID = :ID' + 'IF_CIF_CLIENTE,'#10' V_RECIBOS_CLIENTE.CALLE_CLIENTE,'#10' V_RECIB' + + 'OS_CLIENTE.CODIGO_POSTAL_CLIENTE,'#10' V_RECIBOS_CLIENTE.PROVINCI' + + 'A_CLIENTE,'#10' V_RECIBOS_CLIENTE.POBLACION_CLIENTE,'#10' V_RECIBO' + + 'S_CLIENTE.TITULAR_CLIENTE,'#10' V_RECIBOS_CLIENTE.ENTIDAD_CLIENTE' + + ','#10' V_RECIBOS_CLIENTE.SUCURSAL_CLIENTE,'#10' V_RECIBOS_CLIENTE.' + + 'DC_CLIENTE,'#10' V_RECIBOS_CLIENTE.CUENTA_CLIENTE,'#10#10' EMPRESAS.' + + 'NIF_CIF as NIF_CIF_EMPRESA, EMPRESAS.RAZON_SOCIAL,'#10' EMPRESAS.' + + 'CALLE as CALLE_EMPRESA, EMPRESAS.POBLACION as POBLACION_EMPRESA,' + + #10' EMPRESAS.PROVINCIA as PROVINCIA_EMPRESA, EMPRESAS.CODIGO_PO' + + 'STAL as CODIGO_POSTAL_EMPRESA,'#10' EMPRESAS.TELEFONO_1, EMPRESAS' + + '.FAX, EMPRESAS.MOVIL_1, EMPRESAS.EMAIL_1,'#10' EMPRESAS.PAGINA_WE' + + 'B, EMPRESAS.REGISTRO_MERCANTIL, EMPRESAS.LOGOTIPO'#10#10'FROM'#10' V_RECI' + + 'BOS_CLIENTE'#10' LEFT OUTER JOIN EMPRESAS ON (EMPRESAS.ID = V_RECIB' + + 'OS_CLIENTE.ID_EMPRESA)'#10'WHERE'#10' V_RECIBOS_CLIENTE.ID = :ID'#10 StatementType = stSQL ColumnMappings = < item DatasetField = 'ID' TableField = 'ID' end + item + DatasetField = 'ID_RECIBO_COMPENSADO' + TableField = '' + SQLOrigin = 'ID_RECIBO_COMPENSADO' + end + item + DatasetField = 'REFERENCIA_REC_COMPENSADO' + TableField = '' + SQLOrigin = 'REFERENCIA_REC_COMPENSADO' + end item DatasetField = 'ID_EMPRESA' TableField = 'ID_EMPRESA' @@ -186,23 +356,33 @@ object RptRecibosCliente: TRptRecibosCliente end item DatasetField = 'SITUACION' - TableField = 'SITUACION' + TableField = '' + SQLOrigin = 'SITUACION' end item DatasetField = 'ID_FACTURA' - TableField = 'ID_FACTURA' + TableField = '' + SQLOrigin = 'ID_FACTURA' end item DatasetField = 'ID_REMESA' - TableField = 'ID_REMESA' + TableField = '' + SQLOrigin = 'ID_REMESA' end item DatasetField = 'REFERENCIA_REMESA' - TableField = 'REFERENCIA_REMESA' + TableField = '' + SQLOrigin = 'REFERENCIA_REMESA' + end + item + DatasetField = 'FECHA_EMISION' + TableField = '' + SQLOrigin = 'FECHA_EMISION' end item DatasetField = 'FECHA_VENCIMIENTO' - TableField = 'FECHA_VENCIMIENTO' + TableField = '' + SQLOrigin = 'FECHA_VENCIMIENTO' end item DatasetField = 'DESCRIPCION' @@ -210,119 +390,157 @@ object RptRecibosCliente: TRptRecibosCliente end item DatasetField = 'OBSERVACIONES' - TableField = 'OBSERVACIONES' + TableField = '' + SQLOrigin = 'OBSERVACIONES' end item DatasetField = 'IMPORTE' - TableField = 'IMPORTE' - end - item - DatasetField = 'FECHA_FACTURA' - TableField = 'FECHA_FACTURA' - end - item - DatasetField = 'FORMA_PAGO_FACTURA' - TableField = 'FORMA_PAGO_FACTURA' - end - item - DatasetField = 'IMPORTE_FACTURA' - TableField = 'IMPORTE_FACTURA' - end - item - DatasetField = 'NOMBRE_CLIENTE' - TableField = 'NOMBRE_CLIENTE' - end - item - DatasetField = 'NIF_CIF_CLIENTE' - TableField = 'NIF_CIF_CLIENTE' - end - item - DatasetField = 'ENTIDAD_CLIENTE' - TableField = 'ENTIDAD_CLIENTE' - end - item - DatasetField = 'SUCURSAL_CLIENTE' - TableField = 'SUCURSAL_CLIENTE' - end - item - DatasetField = 'DC_CLIENTE' - TableField = 'DC_CLIENTE' - end - item - DatasetField = 'CUENTA_CLIENTE' - TableField = 'CUENTA_CLIENTE' - end - item - DatasetField = 'NIF_CIF_EMPRESA' - TableField = 'NIF_CIF_EMPRESA' - end - item - DatasetField = 'RAZON_SOCIAL' - TableField = 'RAZON_SOCIAL' - end - item - DatasetField = 'CALLE_EMPRESA' - TableField = 'CALLE_EMPRESA' - end - item - DatasetField = 'POBLACION_EMPRESA' - TableField = 'POBLACION_EMPRESA' - end - item - DatasetField = 'PROVINCIA_EMPRESA' - TableField = 'PROVINCIA_EMPRESA' - end - item - DatasetField = 'CODIGO_POSTAL_EMPRESA' - TableField = 'CODIGO_POSTAL_EMPRESA' - end - item - DatasetField = 'TELEFONO_1' - TableField = 'TELEFONO_1' - end - item - DatasetField = 'FAX' - TableField = 'FAX' - end - item - DatasetField = 'MOVIL_1' - TableField = 'MOVIL_1' - end - item - DatasetField = 'EMAIL_1' - TableField = 'EMAIL_1' - end - item - DatasetField = 'PAGINA_WEB' - TableField = 'PAGINA_WEB' - end - item - DatasetField = 'REGISTRO_MERCANTIL' - TableField = 'REGISTRO_MERCANTIL' - end - item - DatasetField = 'LOGOTIPO' - TableField = 'LOGOTIPO' + TableField = '' + SQLOrigin = 'IMPORTE' end item DatasetField = 'OTROS_GASTOS' - TableField = 'OTROS_GASTOS' + TableField = '' + SQLOrigin = 'OTROS_GASTOS' end item DatasetField = 'IMPORTE_TOTAL' TableField = 'IMPORTE_TOTAL' end item - DatasetField = 'FECHA_EMISION' - TableField = 'FECHA_EMISION' + DatasetField = 'FECHA_FACTURA' + TableField = '' + SQLOrigin = 'FECHA_FACTURA' end item - DatasetField = 'ID_RECIBO_COMPENSADO' - TableField = 'ID_RECIBO_COMPENSADO' + DatasetField = 'FORMA_PAGO_FACTURA' + TableField = '' + SQLOrigin = 'FORMA_PAGO_FACTURA' end item - DatasetField = 'REFERENCIA_REC_COMPENSADO' - TableField = 'REFERENCIA_REC_COMPENSADO' + DatasetField = 'IMPORTE_FACTURA' + TableField = '' + SQLOrigin = 'IMPORTE_FACTURA' + end + item + DatasetField = 'NOMBRE_CLIENTE' + TableField = '' + SQLOrigin = 'NOMBRE_CLIENTE' + end + item + DatasetField = 'NIF_CIF_CLIENTE' + TableField = '' + SQLOrigin = 'NIF_CIF_CLIENTE' + end + item + DatasetField = 'CALLE_CLIENTE' + TableField = '' + SQLOrigin = 'CALLE_CLIENTE' + end + item + DatasetField = 'CODIGO_POSTAL_CLIENTE' + TableField = '' + SQLOrigin = 'CODIGO_POSTAL_CLIENTE' + end + item + DatasetField = 'PROVINCIA_CLIENTE' + TableField = '' + SQLOrigin = 'PROVINCIA_CLIENTE' + end + item + DatasetField = 'POBLACION_CLIENTE' + TableField = '' + SQLOrigin = 'POBLACION_CLIENTE' + end + item + DatasetField = 'ENTIDAD_CLIENTE' + TableField = '' + SQLOrigin = 'ENTIDAD_CLIENTE' + end + item + DatasetField = 'SUCURSAL_CLIENTE' + TableField = '' + SQLOrigin = 'SUCURSAL_CLIENTE' + end + item + DatasetField = 'DC_CLIENTE' + TableField = '' + SQLOrigin = 'DC_CLIENTE' + end + item + DatasetField = 'CUENTA_CLIENTE' + TableField = '' + SQLOrigin = 'CUENTA_CLIENTE' + end + item + DatasetField = 'NIF_CIF_EMPRESA' + TableField = '' + SQLOrigin = 'NIF_CIF_EMPRESA' + end + item + DatasetField = 'RAZON_SOCIAL' + TableField = '' + SQLOrigin = 'RAZON_SOCIAL' + end + item + DatasetField = 'CALLE_EMPRESA' + TableField = '' + SQLOrigin = 'CALLE_EMPRESA' + end + item + DatasetField = 'POBLACION_EMPRESA' + TableField = '' + SQLOrigin = 'POBLACION_EMPRESA' + end + item + DatasetField = 'PROVINCIA_EMPRESA' + TableField = '' + SQLOrigin = 'PROVINCIA_EMPRESA' + end + item + DatasetField = 'CODIGO_POSTAL_EMPRESA' + TableField = '' + SQLOrigin = 'CODIGO_POSTAL_EMPRESA' + end + item + DatasetField = 'TELEFONO_1' + TableField = '' + SQLOrigin = 'TELEFONO_1' + end + item + DatasetField = 'FAX' + TableField = '' + SQLOrigin = 'FAX' + end + item + DatasetField = 'MOVIL_1' + TableField = '' + SQLOrigin = 'MOVIL_1' + end + item + DatasetField = 'EMAIL_1' + TableField = '' + SQLOrigin = 'EMAIL_1' + end + item + DatasetField = 'PAGINA_WEB' + TableField = '' + SQLOrigin = 'PAGINA_WEB' + end + item + DatasetField = 'REGISTRO_MERCANTIL' + TableField = '' + SQLOrigin = 'REGISTRO_MERCANTIL' + end + item + DatasetField = 'LOGOTIPO' + TableField = '' + SQLOrigin = 'LOGOTIPO' + end + item + DatasetField = 'TITULAR_CLIENTE' + TableField = '' + SQLOrigin = 'TITULAR_CLIENTE' end> end> Name = 'Informe_Cabecera' @@ -330,452 +548,212 @@ object RptRecibosCliente: TRptRecibosCliente item Name = 'ID' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'ID_RECIBO_COMPENSADO' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'REFERENCIA_REC_COMPENSADO' DataType = datString Size = 255 - 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 = 'SITUACION' DataType = datString Size = 9 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'ID_FACTURA' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'ID_REMESA' DataType = datInteger - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'REFERENCIA_REMESA' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'FECHA_EMISION' DataType = datDateTime - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'FECHA_VENCIMIENTO' DataType = datDateTime - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'DESCRIPCION' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'OBSERVACIONES' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'IMPORTE' - DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False + DataType = datCurrency end item Name = 'OTROS_GASTOS' - DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False + DataType = datCurrency end item Name = 'IMPORTE_TOTAL' - DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False + DataType = datCurrency end item Name = 'FECHA_FACTURA' DataType = datDateTime - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'FORMA_PAGO_FACTURA' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'IMPORTE_FACTURA' - DataType = datFloat - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False + DataType = datCurrency end item Name = 'NOMBRE_CLIENTE' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'NIF_CIF_CLIENTE' DataType = datString Size = 15 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False + end + item + Name = 'CALLE_CLIENTE' + DataType = datString + Size = 255 + end + item + Name = 'CODIGO_POSTAL_CLIENTE' + DataType = datString + Size = 10 + end + item + Name = 'PROVINCIA_CLIENTE' + DataType = datString + Size = 255 + end + item + Name = 'POBLACION_CLIENTE' + DataType = datString + Size = 255 + end + item + Name = 'TITULAR_CLIENTE' + DataType = datString + Size = 255 end item Name = 'ENTIDAD_CLIENTE' DataType = datString Size = 15 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'SUCURSAL_CLIENTE' DataType = datString Size = 15 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'DC_CLIENTE' DataType = datString Size = 15 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'CUENTA_CLIENTE' DataType = datString Size = 15 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'NIF_CIF_EMPRESA' DataType = datString Size = 15 - 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 = 'CALLE_EMPRESA' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'POBLACION_EMPRESA' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'PROVINCIA_EMPRESA' DataType = datString Size = 255 - BlobType = dabtUnknown - DisplayWidth = 0 - Alignment = taLeftJustify - InPrimaryKey = False - Calculated = False - Lookup = False - LookupCache = False end item Name = 'CODIGO_POSTAL_EMPRESA' 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 = 'FAX' 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 = 'EMAIL_1' 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 = 'REGISTRO_MERCANTIL' DataType = datString Size = 255 - 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 @@ -785,7 +763,7 @@ object RptRecibosCliente: TRptRecibosCliente Top = 158 end object frxReport: TfrxReport - Version = '3.23.7' + Version = '4.3' DotMatrixReport = False EngineOptions.DoublePass = True IniFile = '\Software\Fast Reports' @@ -793,10 +771,11 @@ object RptRecibosCliente: TRptRecibosCliente PreviewOptions.OutlineWidth = 180 PreviewOptions.Zoom = 1.000000000000000000 PrintOptions.Printer = 'Default' + PrintOptions.PrintOnSheet = 0 ReportOptions.CreateDate = 37871.995398692100000000 ReportOptions.Description.Strings = ( 'Demonstrates how to create simple list report.') - ReportOptions.LastChange = 39276.413526655100000000 + ReportOptions.LastChange = 39603.668680543980000000 ReportOptions.VersionBuild = '1' ReportOptions.VersionMajor = '12' ReportOptions.VersionMinor = '13' @@ -841,7 +820,23 @@ object RptRecibosCliente: TRptRecibosCliente 'procedure EtiCompensadoOnBeforePrint(Sender: TfrxComponent);' 'begin' ' if ( = '#39#39') then' + ' begin' ' EtiCompensado.Visible := False;' + ' EtiCompensado2.Visible := False;' + ' end;' + 'end;' + '' + 'procedure Memo55OnBeforePrint(Sender: TfrxComponent);' + 'begin' + ' if ( <> '#39#39') then' + ' begin' + + ' Memo55.Text := '#39'( Compensado en el recibo '#39' + + '#39' )'#39';' + + ' Memo1.Text := '#39'( Compensado en el recibo '#39' + + '#39' )'#39';' + ' end;' 'end;' '' 'begin' @@ -851,17 +846,6 @@ object RptRecibosCliente: TRptRecibosCliente StoreInDFM = False Left = 169 Top = 16 - Datasets = < - item - DataSet = frxDBCabecera - DataSetName = 'frxDBCabecera' - end - item - DataSet = frxDBCompensados - DataSetName = 'frxDBCompensados' - end> - Variables = <> - Style = <> end object frxDBCabecera: TfrxDBDataset UserName = 'frxDBCabecera' @@ -871,6 +855,7 @@ object RptRecibosCliente: TRptRecibosCliente Top = 16 end object DADataCompensados: TDADataSource + DataSet = tbl_Compensados.Dataset DataTable = tbl_Compensados Left = 360 Top = 72 @@ -882,21 +867,38 @@ object RptRecibosCliente: TRptRecibosCliente Left = 360 Top = 16 end - object tbl_Compensados: TDACDSDataTable + object tbl_Compensados: TDAMemDataTable RemoteUpdatesOptions = [] - Fields = <> - Params = <> + Fields = < + item + Name = 'REFERENCIA' + DataType = datString + Size = 255 + end + item + Name = 'DESCRIPCION' + DataType = datString + Size = 255 + end + item + Name = 'IMPORTE_TOTAL' + DataType = datFloat + end> + Params = < + item + Name = 'ID_RECIBO' + Value = '' + ParamType = daptInput + end> MasterMappingMode = mmDataRequest LogChanges = False StreamingOptions = [soDisableEventsWhileStreaming] RemoteFetchEnabled = False - SchemaCall.Params = <> - DataRequestCall.Params = <> - DataUpdateCall.Params = <> - ScriptCall.Params = <> - ReadOnly = False + LocalSchema = schReport + LocalDataStreamer = DABINAdapter DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] + LogicalName = 'Informe_Compensados' IndexDefs = <> Left = 360 Top = 128 diff --git a/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.pas b/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.pas index de45331b..b795aeb0 100644 --- a/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.pas +++ b/Source/Modulos/Recibos de cliente/Reports/uRptRecibosCliente_Server.pas @@ -5,14 +5,14 @@ interface uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, frxClass, frxDBSet, uDAScriptingProvider, - uDADataTable, uDACDSDataTable, DB, uDAClasses, frxChart, frxGradient, + uDADataTable, uDAMemDataTable, DB, uDAClasses, frxChart, frxGradient, frxChBox, frxCross, frxOLE, frxBarcode, frxRich, uDABINAdapter, uROTypes, - uDAInterfaces; + uDAInterfaces, uDADataStreamer; type TRptRecibosCliente = class(TDataModule) DADataCabecera: TDADataSource; - tbl_Cabecera: TDACDSDataTable; + tbl_Cabecera: TDAMemDataTable; DABINAdapter: TDABINAdapter; frxRichObject1: TfrxRichObject; frxBarCodeObject1: TfrxBarCodeObject; @@ -24,10 +24,10 @@ type frxDBCabecera: TfrxDBDataset; DADataCompensados: TDADataSource; frxDBCompensados: TfrxDBDataset; - tbl_Compensados: TDACDSDataTable; + tbl_Compensados: TDAMemDataTable; + frxReport: TfrxReport; schReport: TDASchema; DataDictionary: TDADataDictionary; - frxReport: TfrxReport; procedure DataModuleCreate(Sender: TObject); private FConnection: IDAConnection; @@ -67,7 +67,7 @@ var begin Result := Binary.Create; - FConnection.BeginTransaction; + //FConnection.BeginTransaction; <--- Creo que no va a hacer falta. try ID_Recibos := TStringList.Create; @@ -80,7 +80,7 @@ begin frxReport.PreviewPages.SaveToStream(Result); finally - FConnection.RollbackTransaction; + //FConnection.RollbackTransaction; <--- Creo que no va a hacer falta. end; end; @@ -94,16 +94,14 @@ begin AStream := TMemoryStream.Create; try - dsMaster := schReport.NewDataset(FConnection, ds_InformeCabecera, ['ID'], [ID]); - dsCompensados := schReport.NewDataset(FConnection, ds_InformeCompensados, ['ID_RECIBO'], [ID], False); + frxDBCabecera.DataSource := DADataCabecera; + frxDBCompensados.DataSource := DADataCompensados; - AStream.Clear; - DABINAdapter.WriteDataset(AStream, dsMaster, [woRows, woSchema], -1); - DABINAdapter.ReadDataset(AStream, tbl_Cabecera, TRUE, '', TRUE, TRUE); + tbl_Cabecera.ParamByName('ID').AsInteger := ID; + tbl_Compensados.ParamByName('ID_RECIBO').AsInteger := ID; - AStream.Clear; - DABINAdapter.WriteDataset(AStream, dsCompensados, [woRows, woSchema], -1); - DABINAdapter.ReadDataset(AStream, tbl_Compensados, TRUE, '', TRUE, TRUE); + tbl_Cabecera.Active := True; + tbl_Compensados.Active := True; frxReport.LoadFromFile(DarRutaInformes + rptInforme, True); frxReport.PrepareReport(False); diff --git a/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.pas b/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.pas index bf830ed3..6db31840 100644 --- a/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.pas +++ b/Source/Modulos/Recibos de cliente/Servidor/srvRecibosCliente_Impl.pas @@ -42,8 +42,8 @@ implementation uses Dialogs, {Generated:} FactuGES_Invk, uDataModuleServer, uDatabaseUtils, - schRecibosClienteClient_Intf, uRestriccionesUsuarioUtils; -// uRptRecibosCliente_Server; + schRecibosClienteClient_Intf, uRestriccionesUsuarioUtils, + uRptRecibosCliente_Server; //, uBizRecibosClienteServer; procedure Create_srvRecibosCliente(out anInstance : IUnknown); @@ -77,16 +77,15 @@ begin end; function TsrvRecibosCliente.GenerateReport(const ID: String): Binary; -//var -// AReportGenerator : TRptRecibosCliente; +var + AReportGenerator : TRptRecibosCliente; begin -{ AReportGenerator := TRptRecibosCliente.Create(nil); + AReportGenerator := TRptRecibosCliente.Create(nil); try Result := AReportGenerator.GenerarRecibo(ID); finally FreeAndNIL(AReportGenerator); end; -} end; initialization diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm index 205e5501..a661a7ea 100644 --- a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm @@ -4,7 +4,7 @@ inherited fEditorReciboCliente: TfEditorReciboCliente ClientWidth = 691 OnClose = CustomEditorClose ExplicitWidth = 699 - ExplicitHeight = 557 + ExplicitHeight = 564 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -49,19 +49,20 @@ inherited fEditorReciboCliente: TfEditorReciboCliente end end inherited pgPaginas: TPageControl - Width = 691 - Height = 335 - ExplicitWidth = 691 - ExplicitHeight = 335 + Width = 685 + Height = 329 + ActivePage = pagPagos + ExplicitWidth = 685 + ExplicitHeight = 329 inherited pagGeneral: TTabSheet ExplicitLeft = 4 ExplicitTop = 24 - ExplicitWidth = 683 - ExplicitHeight = 307 + ExplicitWidth = 677 + ExplicitHeight = 301 inline frViewReciboCliente1: TfrViewReciboCliente Left = 0 Top = 0 - Width = 683 + Width = 677 Height = 335 Align = alTop Font.Charset = DEFAULT_CHARSET @@ -72,15 +73,15 @@ inherited fEditorReciboCliente: TfEditorReciboCliente ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 683 + ExplicitWidth = 677 ExplicitHeight = 335 inherited dxLayoutControl1: TdxLayoutControl - Width = 683 + Width = 677 Height = 335 - ExplicitWidth = 683 + ExplicitWidth = 677 ExplicitHeight = 335 DesignSize = ( - 683 + 677 335) inherited eReferencia: TcxDBTextEdit ExplicitWidth = 217 @@ -95,65 +96,65 @@ inherited fEditorReciboCliente: TfEditorReciboCliente Width = 217 end inherited memObservaciones: TcxDBMemo - ExplicitWidth = 293 + ExplicitWidth = 315 ExplicitHeight = 44 Height = 44 - Width = 293 + Width = 315 end inherited eFechaEmision: TcxDBTextEdit Left = 441 ExplicitLeft = 441 - ExplicitWidth = 253 - Width = 253 + ExplicitWidth = 214 + Width = 214 end inherited eFormaPago: TcxDBTextEdit Left = 441 ExplicitLeft = 441 - ExplicitWidth = 253 - Width = 253 + ExplicitWidth = 214 + Width = 214 end inherited eImporteTotal: TcxDBCurrencyEdit Left = 441 Style.IsFontAssigned = True ExplicitLeft = 441 - ExplicitWidth = 253 - Width = 253 + ExplicitWidth = 214 + Width = 214 end inherited eNombreCliente: TcxDBTextEdit Left = 441 ExplicitLeft = 441 - ExplicitWidth = 286 - Width = 286 + ExplicitWidth = 214 + Width = 214 end inherited eNifCif: TcxDBTextEdit Left = 441 ExplicitLeft = 441 - ExplicitWidth = 286 - Width = 286 + ExplicitWidth = 214 + Width = 214 end inherited eEntidad: TcxDBTextEdit Left = 441 ExplicitLeft = 441 - ExplicitWidth = 84 - Width = 84 + ExplicitWidth = 44 + Width = 44 end inherited eSucursal: TcxDBTextEdit - Left = 544 - ExplicitLeft = 544 - ExplicitWidth = 81 - Width = 81 + Left = 540 + ExplicitLeft = 540 + ExplicitWidth = 49 + Width = 49 end inherited eDC: TcxDBTextEdit - Left = 624 - ExplicitLeft = 624 + Left = 618 + ExplicitLeft = 618 ExplicitWidth = 37 Width = 37 end inherited eCuenta: TcxDBTextEdit Left = 441 ExplicitLeft = 441 - ExplicitWidth = 286 - Width = 286 + ExplicitWidth = 214 + Width = 214 end inherited eRemesa: TcxDBTextEdit ExplicitWidth = 217 @@ -165,8 +166,12 @@ inherited fEditorReciboCliente: TfEditorReciboCliente Width = 217 end inherited rRefReciboCompensado: TcxDBTextEdit - ExplicitWidth = 191 - Width = 191 + ExplicitWidth = 217 + Width = 217 + end + inherited eConcepto: TcxDBTextEdit + ExplicitWidth = 217 + Width = 217 end end end @@ -177,8 +182,8 @@ inherited fEditorReciboCliente: TfEditorReciboCliente inline frViewPagosCliente1: TfrViewPagosCliente Left = 0 Top = 0 - Width = 683 - Height = 307 + Width = 677 + Height = 301 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -188,28 +193,28 @@ inherited fEditorReciboCliente: TfEditorReciboCliente ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 683 - ExplicitHeight = 307 + ExplicitWidth = 677 + ExplicitHeight = 301 inherited dxLayoutControl1: TdxLayoutControl - Width = 683 - Height = 307 - ExplicitWidth = 683 - ExplicitHeight = 307 + Width = 677 + Height = 301 + ExplicitWidth = 677 + ExplicitHeight = 301 end inherited dxLayoutControl2: TdxLayoutControl - Width = 683 - Height = 307 - ExplicitWidth = 683 - ExplicitHeight = 307 + Width = 677 + Height = 301 + ExplicitWidth = 677 + ExplicitHeight = 301 inherited ToolBar1: TToolBar - Width = 666 - ExplicitWidth = 666 + Width = 633 + ExplicitWidth = 633 end inherited ListaPagosCliente: TcxGrid - Width = 605 - Height = 262 - ExplicitWidth = 605 - ExplicitHeight = 262 + Width = 633 + Height = 224 + ExplicitWidth = 633 + ExplicitHeight = 224 inherited ListaPagosClienteDBTableView1: TcxGridDBTableView inherited ListaPagosClienteDBTableView1TIPO: TcxGridDBColumn IsCaptionAssigned = True @@ -236,11 +241,12 @@ inherited fEditorReciboCliente: TfEditorReciboCliente object pagCompensados: TTabSheet Caption = 'Recibos compensados' ImageIndex = 1 + TabVisible = False inline frViewRecibosCliCompensados1: TfrViewRecibosCliCompensados Left = 0 Top = 0 - Width = 683 - Height = 307 + Width = 677 + Height = 301 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -250,13 +256,13 @@ inherited fEditorReciboCliente: TfEditorReciboCliente ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 683 - ExplicitHeight = 307 + ExplicitWidth = 677 + ExplicitHeight = 301 inherited cxGrid: TcxGrid - Width = 683 - Height = 282 - ExplicitWidth = 683 - ExplicitHeight = 282 + Width = 677 + Height = 276 + ExplicitWidth = 677 + ExplicitHeight = 276 inherited cxGridView: TcxGridDBTableView DataController.Summary.FooterSummaryItems = < item @@ -268,20 +274,8 @@ inherited fEditorReciboCliente: TfEditorReciboCliente end end inherited ToolBar1: TToolBar - Width = 683 - ExplicitWidth = 683 - inherited ToolButton1: TToolButton - ExplicitWidth = 113 - end - inherited ToolButton4: TToolButton - ExplicitWidth = 113 - end - inherited ToolButton2: TToolButton - ExplicitWidth = 113 - end - inherited ToolButton7: TToolButton - ExplicitWidth = 113 - end + Width = 677 + ExplicitWidth = 677 inherited ToolButton3: TToolButton ExplicitWidth = 98 end @@ -324,15 +318,13 @@ inherited fEditorReciboCliente: TfEditorReciboCliente inherited eImporte: TcxDBCurrencyEdit DataBinding.DataSource = dsDataTable Properties.OnEditValueChanged = frViewReciboCliImportes1eImportePropertiesEditValueChanged - ExplicitWidth = 150 - Width = 150 end inherited eOtrosGastos: TcxDBCurrencyEdit DataBinding.DataSource = dsDataTable end inherited eImporteTotalRecibo: TcxCurrencyEdit - ExplicitWidth = 183 - Width = 183 + ExplicitWidth = 315 + Width = 315 end end end diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas index 0dcc524e..8d8ae369 100644 --- a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas +++ b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas @@ -264,11 +264,8 @@ end; procedure TfEditorReciboCliente.ImprimirInterno; begin -AppFactuGES.ShowCapado; -{ inherited; FController.Print(FRecibo); -} end; procedure TfEditorReciboCliente.JvFormStorageRestorePlacement(Sender: TObject); @@ -306,11 +303,8 @@ end; procedure TfEditorReciboCliente.PrevisualizarInterno; begin -AppFactuGES.ShowCapado; -{ inherited; FController.Preview(FRecibo); -} end; procedure TfEditorReciboCliente.SetController(const Value: IRecibosClienteController); diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.pas index 0cec9565..b53d2833 100644 --- a/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.pas +++ b/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.pas @@ -131,14 +131,12 @@ begin end; procedure TfEditorRecibosCliente.ImprimirInterno; -{ +var Respuesta : Integer; ARecibosCliente: IBizRecibosCliente; - } + AllItems: Boolean; + begin - inherited; - -{ ARecibosCliente := Nil; AllItems := False; @@ -167,19 +165,18 @@ begin ARecibosCliente := RecibosCliente; if Assigned(ARecibosCliente) then - FController.Preview(ARecibosCliente, AllItems); + FController.Print(ARecibosCliente, AllItems); end; end; end; end; -} end; procedure TfEditorRecibosCliente.ModificarInterno; begin inherited; FController.Ver(FRecibosCliente); - RefrescarInterno; + RefrescarInterno; end; procedure TfEditorRecibosCliente.NuevoInterno; @@ -197,14 +194,13 @@ begin end; procedure TfEditorRecibosCliente.PrevisualizarInterno; -{ - Respuesta : Integer; +var + Respuesta: Integer; ARecibosCliente: IBizRecibosCliente; - } -begin - inherited; + AllItems: Boolean; + +begin -{ ARecibosCliente := Nil; AllItems := False; @@ -238,7 +234,6 @@ begin end; end; end; -} end; procedure TfEditorRecibosCliente.SetController(const Value: IRecibosClienteController); diff --git a/Source/Modulos/Recibos de cliente/Views/uViewPagosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewPagosCliente.dfm index e302aad6..72ba95f2 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewPagosCliente.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uViewPagosCliente.dfm @@ -15,6 +15,7 @@ inherited frViewPagosCliente: TfrViewPagosCliente Align = alClient ParentBackground = True TabOrder = 0 + TabStop = False AutoContentSizes = [acsWidth, acsHeight] LookAndFeel = dxLayoutOfficeLookAndFeel1 object dxLayoutGroup1: TdxLayoutGroup @@ -31,6 +32,7 @@ inherited frViewPagosCliente: TfrViewPagosCliente Align = alClient ParentBackground = True TabOrder = 1 + TabStop = False AutoContentSizes = [acsWidth, acsHeight] LookAndFeel = dxLayoutOfficeLookAndFeel1 object ToolBar1: TToolBar diff --git a/Source/Modulos/Recibos de cliente/Views/uViewPagosCliente.pas b/Source/Modulos/Recibos de cliente/Views/uViewPagosCliente.pas index 82d7a07e..f88a520a 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewPagosCliente.pas +++ b/Source/Modulos/Recibos de cliente/Views/uViewPagosCliente.pas @@ -11,7 +11,13 @@ uses cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses, cxGridCustomView, cxGrid, uBizPagosCliente, ActnList, TB2Item, TBX, TB2Dock, TB2Toolbar, cxImageComboBox, dxLayoutLookAndFeels, ImgList, - PngImageList, ComCtrls, ToolWin, uDAInterfaces; + PngImageList, ComCtrls, ToolWin, uDAInterfaces, dxSkinsCore, dxSkinBlack, + dxSkinBlue, dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, + dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, + dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinOffice2007Blue, + dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver, + dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinXmas2008Blue, dxSkinsdxLCPainter, dxSkinscxPCPainter; type IViewPagosCliente = interface(IViewBase) diff --git a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliImportes.dfm b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliImportes.dfm index 445cafba..28a88283 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliImportes.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliImportes.dfm @@ -17,6 +17,7 @@ inherited frViewReciboCliImportes: TfrViewReciboCliImportes Align = alTop ParentBackground = True TabOrder = 0 + TabStop = False AutoContentSizes = [acsWidth, acsHeight] object eImporte: TcxDBCurrencyEdit Left = 93 diff --git a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliImportes.pas b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliImportes.pas index ce1327a5..56550434 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliImportes.pas +++ b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliImportes.pas @@ -8,7 +8,13 @@ uses cxTextEdit, cxMaskEdit, cxDropDownEdit, cxDBEdit, cxControls, cxContainer, cxEdit, cxLabel, cxDBLabel, cxCurrencyEdit, cxSpinEdit, ComCtrls, dxLayoutControl, dxLayoutLookAndFeels, cxLookupEdit, cxDBLookupEdit, - cxDBLookupComboBox, cxCheckBox; + cxDBLookupComboBox, cxCheckBox, dxSkinsCore, dxSkinBlack, dxSkinBlue, + dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian, + dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins, + dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green, + dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust, + dxSkinsDefaultPainters, dxSkinValentine, dxSkinXmas2008Blue, + dxSkinsdxLCPainter; type TfrViewReciboCliImportes = class(TfrViewBase) diff --git a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm index a7bb7656..566ad0d4 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm @@ -1,22 +1,23 @@ inherited frViewReciboCliente: TfrViewReciboCliente Width = 690 - Height = 307 + Height = 361 ExplicitWidth = 690 - ExplicitHeight = 307 + ExplicitHeight = 361 object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 Width = 690 - Height = 307 + Height = 361 Align = alClient ParentBackground = True TabOrder = 0 + TabStop = False AutoContentSizes = [acsWidth, acsHeight] LookAndFeel = dxLayoutOfficeLookAndFeel1 - ExplicitHeight = 259 + ExplicitHeight = 307 DesignSize = ( 690 - 307) + 361) object eReferencia: TcxDBTextEdit Left = 120 Top = 30 @@ -41,7 +42,7 @@ inherited frViewReciboCliente: TfrViewReciboCliente StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 0 - Width = 129 + Width = 216 end object eSituacion: TcxDBTextEdit Left = 120 @@ -89,11 +90,11 @@ inherited frViewReciboCliente: TfrViewReciboCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True TabOrder = 2 - Width = 129 + Width = 216 end object memObservaciones: TcxDBMemo Left = 22 - Top = 240 + Top = 267 Anchors = [akLeft, akTop, akRight, akBottom] DataBinding.DataField = 'OBSERVACIONES' DataBinding.DataSource = DADataSource @@ -105,9 +106,9 @@ inherited frViewReciboCliente: TfrViewReciboCliente StyleDisabled.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 6 + TabOrder = 7 Height = 49 - Width = 274 + Width = 314 end object eFechaEmision: TcxDBTextEdit Left = 440 @@ -132,8 +133,8 @@ inherited frViewReciboCliente: TfrViewReciboCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 7 - Width = 20 + TabOrder = 8 + Width = 228 end object eFormaPago: TcxDBTextEdit Left = 440 @@ -158,8 +159,8 @@ inherited frViewReciboCliente: TfrViewReciboCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 8 - Width = 42 + TabOrder = 9 + Width = 228 end object eImporteTotal: TcxDBCurrencyEdit Left = 440 @@ -189,9 +190,9 @@ inherited frViewReciboCliente: TfrViewReciboCliente StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 9 + TabOrder = 10 Height = 21 - Width = 182 + Width = 228 end object eNombreCliente: TcxDBTextEdit Left = 440 @@ -216,8 +217,8 @@ inherited frViewReciboCliente: TfrViewReciboCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 11 - Width = 171 + TabOrder = 12 + Width = 228 end object eNifCif: TcxDBTextEdit Left = 440 @@ -242,8 +243,8 @@ inherited frViewReciboCliente: TfrViewReciboCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 10 - Width = 147 + TabOrder = 11 + Width = 228 end object eEntidad: TcxDBTextEdit Left = 440 @@ -268,8 +269,8 @@ inherited frViewReciboCliente: TfrViewReciboCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 12 - Width = 90 + TabOrder = 13 + Width = 59 end object eSucursal: TcxDBTextEdit Left = 554 @@ -294,8 +295,8 @@ inherited frViewReciboCliente: TfrViewReciboCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 13 - Width = 75 + TabOrder = 14 + Width = 52 end object eDC: TcxDBTextEdit Left = 635 @@ -320,7 +321,7 @@ inherited frViewReciboCliente: TfrViewReciboCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 14 + TabOrder = 15 Width = 33 end object eCuenta: TcxDBTextEdit @@ -346,8 +347,8 @@ inherited frViewReciboCliente: TfrViewReciboCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 15 - Width = 83 + TabOrder = 16 + Width = 228 end object eRemesa: TcxDBTextEdit Left = 120 @@ -373,7 +374,7 @@ inherited frViewReciboCliente: TfrViewReciboCliente StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 4 - Width = 113 + Width = 216 end object edtFechaEmision: TcxDBDateEdit Left = 120 @@ -398,11 +399,11 @@ inherited frViewReciboCliente: TfrViewReciboCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True TabOrder = 1 - Width = 113 + Width = 216 end object rRefReciboCompensado: TcxDBTextEdit Left = 120 - Top = 189 + Top = 216 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'REFERENCIA_REC_COMPENSADO' DataBinding.DataSource = DADataSource @@ -423,8 +424,33 @@ inherited frViewReciboCliente: TfrViewReciboCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 6 + Width = 216 + end + object eConcepto: TcxDBTextEdit + Left = 120 + Top = 165 + Anchors = [akLeft, akTop, akRight] + DataBinding.DataField = 'DESCRIPCION' + DataBinding.DataSource = DADataSource + Properties.ReadOnly = False + Properties.ValidateOnEnter = True + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.Color = clInfoBk + Style.HotTrack = False + Style.LookAndFeel.Kind = lfStandard + Style.LookAndFeel.NativeStyle = True + StyleDisabled.Color = clMenuBar + StyleDisabled.LookAndFeel.Kind = lfStandard + StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.TextColor = clWindowText + StyleFocused.LookAndFeel.Kind = lfStandard + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.Kind = lfStandard + StyleHot.LookAndFeel.NativeStyle = True TabOrder = 5 - Width = 191 + Width = 216 end object dxLayoutControl1Group_Root: TdxLayoutGroup ShowCaption = False @@ -432,6 +458,8 @@ inherited frViewReciboCliente: TfrViewReciboCliente LayoutDirection = ldHorizontal ShowBorder = False object dxLayoutControl1Group3: TdxLayoutGroup + AutoAligns = [aaVertical] + AlignHorz = ahClient ShowCaption = False Hidden = True ShowBorder = False @@ -470,6 +498,11 @@ inherited frViewReciboCliente: TfrViewReciboCliente Control = eRemesa ControlOptions.ShowBorder = False end + object dxLayoutControl1Item6: TdxLayoutItem + Caption = 'Concepto:' + Control = eConcepto + ControlOptions.ShowBorder = False + end end object dxLayoutControl1Group2: TdxLayoutGroup Caption = 'Compensado en recibo' @@ -493,7 +526,6 @@ inherited frViewReciboCliente: TfrViewReciboCliente end object dxLayoutControl1Group8: TdxLayoutGroup AutoAligns = [aaVertical] - AlignHorz = ahClient Caption = 'New Group' ShowCaption = False ShowBorder = False diff --git a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.pas b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.pas index 0bba6e79..ba2ceba3 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.pas +++ b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.pas @@ -7,7 +7,13 @@ uses Dialogs, uViewBase, uBizRecibosCliente, DB, uDADataTable, dxLayoutControl, cxControls, cxCurrencyEdit, cxDBEdit, cxMemo, cxMaskEdit, cxDropDownEdit, cxCalendar, cxContainer, cxEdit, cxTextEdit, dxLayoutLookAndFeels, ExtCtrls, - uDAInterfaces; + uDAInterfaces, dxSkinsCore, dxSkinBlack, dxSkinBlue, dxSkinCaramel, + dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian, + dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins, + dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green, + dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust, + dxSkinsDefaultPainters, dxSkinValentine, dxSkinXmas2008Blue, + dxSkinsdxLCPainter; type IViewReciboCliente = interface(IViewBase) @@ -65,6 +71,8 @@ type rRefReciboCompensado: TcxDBTextEdit; dxLayoutControl1Group2: TdxLayoutGroup; dxLayoutControl1Group3: TdxLayoutGroup; + dxLayoutControl1Item6: TdxLayoutItem; + eConcepto: TcxDBTextEdit; private FRecibo : IBizRecibosCliente; function GetRecibo: IBizRecibosCliente; diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliCompensados.dfm b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliCompensados.dfm index 548859a8..6bca187a 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliCompensados.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliCompensados.dfm @@ -78,25 +78,15 @@ inherited frViewRecibosCliCompensados: TfrViewRecibosCliCompensados Width = 549 ExplicitWidth = 549 inherited ToolButton1: TToolButton - Top = 0 ExplicitWidth = 62 end inherited ToolButton4: TToolButton - Top = 0 ExplicitWidth = 74 end - inherited ToolButton5: TToolButton - Top = 0 - end inherited ToolButton2: TToolButton - Top = 0 ExplicitWidth = 67 end - inherited ToolButton6: TToolButton - Top = 0 - end inherited ToolButton7: TToolButton - Top = 0 ExplicitWidth = 117 end object ToolButton3: TToolButton diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliCompensados.pas b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliCompensados.pas index 7b7c6d21..47368ad0 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliCompensados.pas +++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliCompensados.pas @@ -10,7 +10,13 @@ uses cxGridTableView, cxGridDBTableView, cxClasses, cxControls, cxGridCustomView, cxGrid, cxImageComboBox, cxCurrencyEdit, uDataModuleRecibosCliente, uBizRecibosCliente, uRecibosClienteController, Grids, DBGrids, cxSpinEdit, - dxLayoutControl, uDAInterfaces; + dxLayoutControl, uDAInterfaces, dxSkinsCore, dxSkinBlack, dxSkinBlue, + dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans, dxSkiniMaginary, dxSkinLilian, + dxSkinLiquidSky, dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMoneyTwins, + dxSkinOffice2007Black, dxSkinOffice2007Blue, dxSkinOffice2007Green, + dxSkinOffice2007Pink, dxSkinOffice2007Silver, dxSkinSilver, dxSkinStardust, + dxSkinsDefaultPainters, dxSkinValentine, dxSkinXmas2008Blue, + dxSkinscxPCPainter; type IViewRecibosCompensados = interface diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm index 4418a283..708b1e40 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm @@ -52,11 +52,15 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente object cxGridViewID_RECIBO_COMPENSADO: TcxGridDBColumn Caption = 'Compensado' DataBinding.FieldName = 'ID_RECIBO_COMPENSADO' + Visible = False OnCustomDrawCell = cxGridViewID_RECIBO_COMPENSADOCustomDrawCell + VisibleForCustomization = False end object cxGridViewREFERENCIA_REC_COMPENSADO: TcxGridDBColumn Caption = 'Ref. recibo compensado' DataBinding.FieldName = 'REFERENCIA_REC_COMPENSADO' + Visible = False + VisibleForCustomization = False end object cxGridViewSITUACION: TcxGridDBColumn Caption = 'Situaci'#243'n'