diff --git a/Build/Build.fbl6 b/Build/Build.fbl6 index d27c06d..34e9056 100644 Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ diff --git a/Source/Informes/1/InfFacturaCliente.fr3 b/Source/Informes/1/InfFacturaCliente.fr3 index cca6503..5ed7e1d 100644 --- a/Source/Informes/1/InfFacturaCliente.fr3 +++ b/Source/Informes/1/InfFacturaCliente.fr3 @@ -1,9 +1,9 @@ - + - + @@ -14,26 +14,26 @@ - + - + - + - + - + @@ -62,8 +62,8 @@ - - + + @@ -76,7 +76,7 @@ - + diff --git a/Source/Informes/2/InfAlbaranCliente.fr3 b/Source/Informes/2/InfAlbaranCliente.fr3 deleted file mode 100644 index cf6b2f8..0000000 --- a/Source/Informes/2/InfAlbaranCliente.fr3 +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Informes/1/InfAlbaranCliente.fr3 b/Source/Informes/InfAlbaranCliente.fr3 similarity index 58% rename from Source/Informes/1/InfAlbaranCliente.fr3 rename to Source/Informes/InfAlbaranCliente.fr3 index cf6b2f8..6c64448 100644 --- a/Source/Informes/1/InfAlbaranCliente.fr3 +++ b/Source/Informes/InfAlbaranCliente.fr3 @@ -1,41 +1,41 @@ - + - - - + + + - - - + + + - - - + + + - + - - - + + + - - - - - + + + + + - + - - - + + + @@ -50,8 +50,8 @@ - - + + diff --git a/Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas index 4f41e51..dcfc28b 100644 --- a/Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas @@ -102,7 +102,7 @@ begin if not Self.DataTable.Editing then Edit; IMPORTE_DESCUENTO := IMPORTE_NETO * (DESCUENTO/100); - IMPORTE_DESCUENTO2 := IMPORTE_NETO * (DESCUENTO2/100); + IMPORTE_DESCUENTO2 := (IMPORTE_NETO - IMPORTE_DESCUENTO) * (DESCUENTO2/100); BASE_IMPONIBLE := IMPORTE_NETO - IMPORTE_DESCUENTO - IMPORTE_DESCUENTO2 + IMPORTE_PORTE; end; diff --git a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas index d420744..d9aa4c1 100644 --- a/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas +++ b/Source/Modulos/Albaranes de cliente/Reports/uRptAlbaranesCliente_Server.pas @@ -159,7 +159,7 @@ begin tbl_Cabecera.Active := True; tbl_Detalles.Active := True; - AInforme := DarRutaFichero(DarRutaInformes, rptInforme, tbl_Cabecera.FieldByName('ID_EMPRESA').AsString); + AInforme := DarRutaFichero(DarRutaInformes, rptInforme); //, tbl_Cabecera.FieldByName('ID_EMPRESA').AsString); Albaranes comunes a todas las empresas if VarIsNull(AInforme) then raise Exception.Create (('Error Servidor: _GenerarFactura, no encuentra informe ' + rptInforme)); diff --git a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas index 6b11829..caf47d9 100644 --- a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas +++ b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas @@ -42,8 +42,8 @@ type function Duplicar(AFactura: IBizFacturaCliente): IBizFacturaCliente; function GenerarAbono(AFactura: IBizFacturaCliente): IBizFacturaCliente; - procedure Preview(AFactura : IBizFacturaCliente; AllItems: Boolean = false; const Marca: Integer = 0); - procedure Print(AFactura : IBizFacturaCliente; AllItems: Boolean = false; const Marca: Integer = 0); + procedure Preview(AFactura : IBizFacturaCliente; const AOriginal, ACopia, AContabilidad: Integer; AllItems: Boolean = false); + procedure Print(AFactura : IBizFacturaCliente; const AOriginal, ACopia, AContabilidad: Integer; AllItems: Boolean = false); procedure RecalcularImportes(AFactura: IBizFacturaCliente); function EsModificable(AFactura: IBizFacturaCliente): Boolean; @@ -108,8 +108,8 @@ type function GenerarAbono(AFactura: IBizFacturaCliente): IBizFacturaCliente; procedure RecuperarCliente(AFactura : IBizFacturaCliente); - procedure Preview(AFactura : IBizFacturaCliente; AllItems: Boolean = false; const Marca: Integer = 0); - procedure Print(AFactura : IBizFacturaCliente; AllItems: Boolean = false; const Marca: Integer = 0); + procedure Preview(AFactura : IBizFacturaCliente; const AOriginal, ACopia, AContabilidad: Integer; AllItems: Boolean = false); + procedure Print(AFactura : IBizFacturaCliente; const AOriginal, ACopia, AContabilidad: Integer; AllItems: Boolean = false); procedure RecalcularImportes(AFactura: IBizFacturaCliente); function EsModificable(AFactura: IBizFacturaCliente): Boolean; @@ -1040,7 +1040,7 @@ begin Result := AFactura; end; -procedure TFacturasClienteController.Preview(AFactura: IBizFacturaCliente; AllItems: Boolean = false; const Marca: Integer = 0); +procedure TFacturasClienteController.Preview(AFactura: IBizFacturaCliente; const AOriginal, ACopia, AContabilidad: Integer; AllItems: Boolean = false); var AReportController : IFacturasClienteReportController; ID_Facturas: TIntegerList; @@ -1067,7 +1067,7 @@ begin else ID_Facturas.Add(AFactura.ID); - AReportController.Preview(ID_Facturas, Marca); + AReportController.Preview(ID_Facturas, AOriginal, ACopia, AContabilidad); finally AReportController := NIL; @@ -1075,7 +1075,7 @@ begin end; end; -procedure TFacturasClienteController.Print(AFactura: IBizFacturaCliente; AllItems: Boolean = false; Const Marca: Integer = 0); +procedure TFacturasClienteController.Print(AFactura: IBizFacturaCliente; Const AOriginal, ACopia, AContabilidad: Integer; AllItems: Boolean = false); var AReportController : IFacturasClienteReportController; ID_Facturas: TIntegerList; @@ -1102,7 +1102,7 @@ begin else ID_Facturas.Add(AFactura.ID); - AReportController.Print(ID_Facturas, Marca); + AReportController.Print(ID_Facturas, AOriginal, ACopia, AContabilidad); finally AReportController := NIL; diff --git a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteReportController.pas b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteReportController.pas index 4b7d1d9..0ef178e 100644 --- a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteReportController.pas +++ b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteReportController.pas @@ -10,8 +10,8 @@ uses type IFacturasClienteReportController = interface(IControllerBase) ['{A0F41767-4FF6-4BAE-9FC9-894DD721D756}'] - procedure Preview(const AListaID : TIntegerList; const Marca: Integer); - procedure Print(const AListaID : TIntegerList; const Marca: Integer); + procedure Preview(const AListaID : TIntegerList; const AOriginal, ACopia, AContabilidad: Integer); + procedure Print(const AListaID : TIntegerList; const AOriginal, ACopia, AContabilidad: Integer); end; TFacturasClienteReportController = class(TControllerBase, IFacturasClienteReportController) @@ -22,8 +22,8 @@ type constructor Create; override; destructor Destroy; override; - procedure Preview(const AListaID : TIntegerList; const Marca: Integer); - procedure Print(const AListaID : TIntegerList; const Marca: Integer); + procedure Preview(const AListaID : TIntegerList; const AOriginal, ACopia, AContabilidad: Integer); + procedure Print(const AListaID : TIntegerList; const AOriginal, ACopia, AContabilidad: Integer); end; @@ -55,7 +55,7 @@ begin inherited; end; -procedure TFacturasClienteReportController.Preview(const AListaID : TIntegerList; const Marca: Integer); +procedure TFacturasClienteReportController.Preview(const AListaID : TIntegerList; const AOriginal, ACopia, AContabilidad: Integer); var AStream: Binary; AEditor : IEditorFacturasClientePreview; @@ -64,7 +64,7 @@ begin ShowHourglassCursor; try - AStream := FDataModule.GetRptFacturas(AListaID, Marca); + AStream := FDataModule.GetRptFacturas(AListaID, AOriginal, ACopia, AContabilidad); try CreateEditor('EditorFacturasClientePreview', IEditorFacturasClientePreview, AEditor); if Assigned(AEditor) then @@ -85,7 +85,7 @@ begin end; end; -procedure TFacturasClienteReportController.Print(const AListaID : TIntegerList; const Marca: Integer); +procedure TFacturasClienteReportController.Print(const AListaID : TIntegerList; const AOriginal, ACopia, AContabilidad: Integer); var AStream: Binary; AEditor : IEditorFacturasClientePreview; @@ -94,7 +94,7 @@ begin ShowHourglassCursor; try - AStream := FDataModule.GetRptFacturas(AListaID, Marca); + AStream := FDataModule.GetRptFacturas(AListaID, AOriginal, ACopia, AContabilidad); try CreateEditor('EditorFacturasClientePreview', IEditorFacturasClientePreview, AEditor); if Assigned(AEditor) then diff --git a/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.pas index 8a9e760..b27f8e3 100644 --- a/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.pas @@ -33,7 +33,7 @@ type function NewItem : IBizFacturaCliente; // Report - function GetRptFacturas(const AListaID: TIntegerList; const Marca: Integer): Binary; + function GetRptFacturas(const AListaID: TIntegerList; const AOriginal, ACopia, AContabilidad: Integer): Binary; end; implementation @@ -52,13 +52,13 @@ begin RORemoteService.Message := dmConexion.Message; end; -function TDataModuleFacturasCliente.GetRptFacturas(const AListaID: TIntegerList; const Marca: Integer): Binary; +function TDataModuleFacturasCliente.GetRptFacturas(const AListaID: TIntegerList; const AOriginal, ACopia, AContabilidad: Integer): Binary; var AParam : TIntegerArray; begin AParam := AListaID.ToIntegerArray; try - Result := (RORemoteService as IsrvFacturasCliente).GenerarInforme(AParam, Marca); + Result := (RORemoteService as IsrvFacturasCliente).GenerarInforme(AParam, AOriginal, ACopia, AContabilidad); finally // FreeANDNIL(AParam); end; diff --git a/Source/Modulos/Facturas de cliente/Model/Data/uIDataModuleFacturasClienteReport.pas b/Source/Modulos/Facturas de cliente/Model/Data/uIDataModuleFacturasClienteReport.pas index 3ed53a5..965bccd 100644 --- a/Source/Modulos/Facturas de cliente/Model/Data/uIDataModuleFacturasClienteReport.pas +++ b/Source/Modulos/Facturas de cliente/Model/Data/uIDataModuleFacturasClienteReport.pas @@ -8,7 +8,7 @@ uses type IDataModuleFacturasClienteReport = interface ['{D241A912-78C6-4C65-AEBF-8DDEFE35F511}'] - function GetRptFacturas(const AListaID: TIntegerList; const Marca: Integer): Binary; + function GetRptFacturas(const AListaID: TIntegerList; const AOriginal, ACopia, AContabilidad: Integer): Binary; end; implementation diff --git a/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas index 2a480c1..dcb4a0d 100644 --- a/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas @@ -137,7 +137,7 @@ begin if not Self.DataTable.Editing then Edit; IMPORTE_DESCUENTO := IMPORTE_NETO * (DESCUENTO/100); - IMPORTE_DESCUENTO2 := IMPORTE_NETO * (DESCUENTO2/100); + IMPORTE_DESCUENTO2 := (IMPORTE_NETO - IMPORTE_DESCUENTO) * (DESCUENTO2/100); BASE_IMPONIBLE := IMPORTE_NETO - IMPORTE_DESCUENTO - IMPORTE_DESCUENTO2 + IMPORTE_PORTE; end; diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm index c3992b3..dd9a371 100644 --- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm +++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm @@ -30,20 +30,21 @@ object RptFacturasCliente: TRptFacturasCliente 'e.importe_re, v_facturas_cliente.importe_total,'#10' v_facturas_cl' + 'iente.observaciones, v_facturas_cliente.nif_cif,'#10' contactos.RE' + 'FERENCIA as REF_CLIENTE,'#10' contactos.PERSONA_CONTACTO,'#10' conta' + - 'ctos2.nombre as nombre_vendedor,'#10' v_facturas_cliente.id_client' + - 'e, v_facturas_cliente.nombre,'#10' v_facturas_cliente.calle, v_fac' + - 'turas_cliente.provincia,'#10' v_facturas_cliente.poblacion, v_fact' + - 'uras_cliente.codigo_postal,'#10' v_facturas_cliente.recargo_equiva' + - 'lencia, v_facturas_cliente.importe_neto,'#10' v_facturas_cliente.i' + - 'mporte_porte, formas_pago.descripcion as FORMA_PAGO,'#10' v_factur' + - 'as_cliente.DATOS_BANCARIOS, v_facturas_cliente.RETENCION, v_fact' + - 'uras_cliente.IMPORTE_RETENCION'#10'from v_facturas_cliente'#10' left o' + - 'uter join contactos on (contactos.id = v_facturas_cliente.id_cli' + - 'ente)'#10' left outer join formas_pago on (formas_pago.id = v_fact' + - 'uras_cliente.id_forma_pago)'#10' left outer join clientes_datos on' + - ' (clientes_datos.id_cliente = v_facturas_cliente.id_cliente)'#10' ' + - 'left outer join contactos contactos2 on (contactos2.id = cliente' + - 's_datos.id_agente)'#10'WHERE V_FACTURAS_CLIENTE.ID = :ID'#10 + 'ctos2.REFERENCIA as REF_VENDEDOR,'#10' contactos2.nombre as nombre' + + '_vendedor,'#10' v_facturas_cliente.id_cliente, v_facturas_cliente.' + + 'nombre,'#10' v_facturas_cliente.calle, v_facturas_cliente.provinci' + + 'a,'#10' v_facturas_cliente.poblacion, v_facturas_cliente.codigo_po' + + 'stal,'#10' v_facturas_cliente.recargo_equivalencia, v_facturas_cli' + + 'ente.importe_neto,'#10' v_facturas_cliente.importe_porte, formas_p' + + 'ago.descripcion as FORMA_PAGO,'#10' v_facturas_cliente.DATOS_BANCA' + + 'RIOS, v_facturas_cliente.RETENCION, v_facturas_cliente.IMPORTE_R' + + 'ETENCION'#10'from v_facturas_cliente'#10' left outer join contactos on' + + ' (contactos.id = v_facturas_cliente.id_cliente)'#10' left outer jo' + + 'in formas_pago on (formas_pago.id = v_facturas_cliente.id_forma_' + + 'pago)'#10' left outer join clientes_datos on (clientes_datos.id_cl' + + 'iente = v_facturas_cliente.id_cliente)'#10' left outer join contac' + + 'tos contactos2 on (contactos2.id = clientes_datos.id_agente)'#10'WHE' + + 'RE V_FACTURAS_CLIENTE.ID = :ID'#10 StatementType = stSQL ColumnMappings = < item @@ -185,6 +186,10 @@ object RptFacturasCliente: TRptFacturasCliente item DatasetField = 'NOMBRE_VENDEDOR' TableField = 'NOMBRE_VENDEDOR' + end + item + DatasetField = 'REF_VENDEDOR' + TableField = 'REF_VENDEDOR' end> end> Name = 'InformeFacturasCliente' @@ -292,6 +297,11 @@ object RptFacturasCliente: TRptFacturasCliente DataType = datString Size = 255 end + item + Name = 'REF_VENDEDOR' + DataType = datString + Size = 255 + end item Name = 'NOMBRE_VENDEDOR' DataType = datString @@ -1535,180 +1545,7 @@ object RptFacturasCliente: TRptFacturasCliente end object tbl_Cabecera: TDAMemDataTable RemoteUpdatesOptions = [] - Fields = < - item - Name = 'ID' - DataType = datInteger - DictionaryEntry = 'FacturasCliente_ID' - InPrimaryKey = True - end - item - Name = 'ID_EMPRESA' - DataType = datInteger - DictionaryEntry = 'FacturasCliente_ID_EMPRESA' - end - item - Name = 'REFERENCIA' - DataType = datString - Size = 255 - DictionaryEntry = 'FacturasCliente_REFERENCIA' - end - item - Name = 'TIPO' - DataType = datString - Size = 1 - end - item - Name = 'FECHA_FACTURA' - DataType = datDateTime - DictionaryEntry = 'FacturasCliente_FECHA_FACTURA' - end - item - Name = 'FECHA_VENCIMIENTO' - DataType = datDateTime - end - item - Name = 'BASE_IMPONIBLE' - DataType = datCurrency - DictionaryEntry = 'FacturasCliente_BASE_IMPONIBLE' - end - item - Name = 'SITUACION' - DataType = datString - Size = 19 - end - item - Name = 'DESCUENTO' - DataType = datCurrency - DictionaryEntry = 'FacturasCliente_DESCUENTO' - end - item - Name = 'DESCUENTO2' - DataType = datCurrency - end - item - Name = 'IMPORTE_DESCUENTO' - DataType = datCurrency - DictionaryEntry = 'FacturasCliente_IMPORTE_DESCUENTO' - end - item - Name = 'IMPORTE_DESCUENTO2' - DataType = datCurrency - end - item - Name = 'IVA' - DataType = datCurrency - DictionaryEntry = 'FacturasCliente_IVA' - end - item - Name = 'IMPORTE_IVA' - DataType = datCurrency - DictionaryEntry = 'FacturasCliente_IMPORTE_IVA' - end - item - Name = 'RE' - DataType = datCurrency - end - item - Name = 'IMPORTE_RE' - DataType = datCurrency - end - item - Name = 'IMPORTE_TOTAL' - DataType = datCurrency - DictionaryEntry = 'FacturasCliente_IMPORTE_TOTAL' - end - item - Name = 'OBSERVACIONES' - DataType = datMemo - DictionaryEntry = 'FacturasCliente_OBSERVACIONES' - end - item - Name = 'NIF_CIF' - DataType = datString - Size = 15 - DictionaryEntry = 'FacturasCliente_NIF_CIF' - end - item - Name = 'REF_CLIENTE' - DataType = datString - Size = 255 - end - item - Name = 'PERSONA_CONTACTO' - DataType = datString - Size = 255 - end - item - Name = 'NOMBRE_VENDEDOR' - DataType = datString - Size = 255 - end - item - Name = 'ID_CLIENTE' - DataType = datInteger - DictionaryEntry = 'FacturasCliente_ID_CLIENTE' - end - item - Name = 'NOMBRE' - DataType = datString - Size = 255 - DictionaryEntry = 'FacturasCliente_NOMBRE' - end - item - Name = 'CALLE' - DataType = datString - Size = 255 - DictionaryEntry = 'FacturasCliente_CALLE' - end - item - Name = 'PROVINCIA' - DataType = datString - Size = 255 - DictionaryEntry = 'FacturasCliente_PROVINCIA' - end - item - Name = 'POBLACION' - DataType = datString - Size = 255 - DictionaryEntry = 'FacturasCliente_POBLACION' - end - item - Name = 'CODIGO_POSTAL' - DataType = datString - Size = 10 - DictionaryEntry = 'FacturasCliente_CODIGO_POSTAL' - end - item - Name = 'RECARGO_EQUIVALENCIA' - DataType = datSmallInt - end - item - Name = 'IMPORTE_NETO' - DataType = datCurrency - end - item - Name = 'IMPORTE_PORTE' - DataType = datCurrency - end - item - Name = 'FORMA_PAGO' - DataType = datString - Size = 255 - end - item - Name = 'DATOS_BANCARIOS' - DataType = datString - Size = 255 - end - item - Name = 'RETENCION' - DataType = datCurrency - end - item - Name = 'IMPORTE_RETENCION' - DataType = datCurrency - end> + Fields = <> Params = < item Name = 'ID' @@ -1755,7 +1592,7 @@ object RptFacturasCliente: TRptFacturasCliente Top = 392 end object frxReport: TfrxReport - Version = '4.7.71' + Version = '4.8.11' DotMatrixReport = False EngineOptions.DoublePass = True IniFile = '\Software\Fast Reports' @@ -1764,66 +1601,8 @@ object RptFacturasCliente: TRptFacturasCliente PrintOptions.Printer = 'Por defecto' PrintOptions.PrintOnSheet = 0 ReportOptions.CreateDate = 39065.872423495400000000 - ReportOptions.LastChange = 40197.447447002300000000 + ReportOptions.LastChange = 40210.690281921300000000 ScriptLanguage = 'PascalScript' - ScriptText.Strings = ( - 'var' - ' Pagina: Variant;' - '' - '' - 'procedure Memo2OnBeforePrint(Sender: TfrxComponent);' - 'begin' - ' Memo2.Lines.Clear;' - ' if (StrToFloat() < 0) then' - ' Memo2.Lines.Add('#39'ORDEN DE DEVOLUCI'#211'N'#39')' - ' else' - ' Memo2.Lines.Add('#39'ALBAR'#193'N DE CLIENTE'#39')' - 'end;' - '' - 'procedure Memo5OnBeforePrint(Sender: TfrxComponent);' - 'begin' - ' if (StrToFloat() < 0) then' - ' begin' - ' Memo5.Lines.Clear;' - ' Memo5.Lines.Add('#39'N'#186' orden:'#39');' - ' end;' - 'end;' - '' - 'procedure Memo9OnBeforePrint(Sender: TfrxComponent);' - 'begin' - ' if (StrToFloat() < 0) then' - ' begin' - ' Memo9.Lines.Clear;' - ' Memo9.Lines.Add('#39'Fecha orden:'#39');' - ' end;' - 'end;' - '' - 'procedure PageHeader1OnBeforePrint(Sender: TfrxComponent);' - 'begin' - ' if not Engine.FinalPass then' - ' Set('#39'TotalPaginas'#39', ( + 1));' - '' - ' if Engine.FinalPass then' - ' Set('#39'Pagina'#39', ( + 1));' - '' - ' if Marca = 1 then' - ' eCopia.Visible := True;' - ' ' - ' if Marca = 2 then' - - ' eContabilidad.Visible := True; ' + - ' ' - 'end;' - '' - 'procedure frxReportOnStartReport(Sender: TfrxComponent);' - 'begin' - ' Set('#39'Pagina'#39', 0);' - ' Set('#39'TotalPaginas'#39', 0);' - 'end;' - '' - 'begin' - '' - 'end.') ShowProgress = False StoreInDFM = False OnStartReport = 'frxReportOnStartReport' diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas index 4713cce..244339f 100644 --- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas +++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas @@ -8,7 +8,7 @@ uses uDADataTable, uDACDSDataTable, DB, uDAClasses, frxChart, frxGradient, frxChBox, frxCross, frxOLE, frxBarcode, frxRich, uDABINAdapter, uROTypes, uDAInterfaces, uDADataStreamer, IBCustomDataSet, IBQuery, IBDatabase, - uDAMemDataTable, FactuGES_Intf, frxExportPDF, uDABin2DataStreamer; + uDAMemDataTable, FactuGES_Intf, frxExportPDF, uDABin2DataStreamer, uROClient; type TRptFacturasCliente = class(TDataModule) @@ -115,7 +115,7 @@ type procedure RecuperarNombresClientes; public - function GenerarFactura(const ListaID : TIntegerArray; const Marca: Integer): Binary; + function GenerarFactura(const ListaID : TIntegerArray; const Original: Integer; const Copia: Integer; const Contabilidad: Integer): Binary; function GenerarInformeIVA(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary; function GenerarInformeListadoFacturas(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const FechaVenInicio: Variant; const FechaVenFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary; function GenerarInformeListadoFacturasPendientes(const IdEmpresa: Integer; const FechaInicio: Variant; const FechaFin: Variant; const FechaVenInicio: Variant; const FechaVenFin: Variant; const ListaIDClientes: TIntegerArray; const Desglosado: Boolean; const ImporteMinimo: Currency): Binary; @@ -172,7 +172,7 @@ begin FreeANDNIL(FListaNombresClientes); end; -function TRptFacturasCliente.GenerarFactura(const ListaID: TIntegerArray; const Marca: Integer): Binary; +function TRptFacturasCliente.GenerarFactura(const ListaID: TIntegerArray; const Original: Integer; const Copia: Integer; const Contabilidad: Integer): Binary; var i: Integer; begin @@ -180,7 +180,16 @@ begin try //Vamos generando todos y cada una de las facturas recibidas for i := 0 to ListaID.Count - 1 do - _GenerarFactura(ListaID.Items[i], Marca); + begin + if (Original = 1) then + _GenerarFactura(ListaID.Items[i], 1); + + if (Copia = 1) then + _GenerarFactura(ListaID.Items[i], 2); + + if (Contabilidad = 1) then + _GenerarFactura(ListaID.Items[i], 3); + end; frxReport.PreviewPages.SaveToStream(Result); finally diff --git a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.pas b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.pas index 740ee09..030298b 100644 --- a/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.pas +++ b/Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.pas @@ -34,7 +34,7 @@ type private protected { IsrvFacturasCliente methods } - function GenerarInforme(const ListaID: TIntegerArray; const Marca: Integer): Binary; + function GenerarInforme(const ListaID: TIntegerArray; const Original: Integer; const Copia: Integer; const Contabilidad: Integer): Binary; end; implementation @@ -81,13 +81,13 @@ begin ConnectionName := dmServer.ConnectionName; end; -function TsrvFacturasCliente.GenerarInforme(const ListaID: TIntegerArray; const Marca: Integer): Binary; +function TsrvFacturasCliente.GenerarInforme(const ListaID: TIntegerArray; const Original: Integer; const Copia: Integer; const Contabilidad: Integer): Binary; var AReportGenerator : TRptFacturasCliente; begin AReportGenerator := TRptFacturasCliente.Create(nil); try - Result := AReportGenerator.GenerarFactura(ListaID, Marca); + Result := AReportGenerator.GenerarFactura(ListaID, Original, Copia, Contabilidad); finally FreeAndNIL(AReportGenerator); end; diff --git a/Source/Modulos/Facturas de cliente/Views/uDialogOpcionesImpresionFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uDialogOpcionesImpresionFacturasCliente.dfm index e29c635..6fb3613 100644 --- a/Source/Modulos/Facturas de cliente/Views/uDialogOpcionesImpresionFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uDialogOpcionesImpresionFacturasCliente.dfm @@ -1,79 +1,75 @@ inherited fDialogOpcionesImpresionFacturasCliente: TfDialogOpcionesImpresionFacturasCliente Caption = 'Opciones para facturas de cliente' ClientHeight = 240 - ClientWidth = 418 - ExplicitWidth = 424 + ClientWidth = 366 + ExplicitWidth = 372 ExplicitHeight = 272 PixelsPerInch = 96 TextHeight = 13 inherited Bevel2: TBevel - Width = 418 + Width = 366 ExplicitWidth = 418 end inherited Bevel3: TBevel Top = 196 - Width = 418 + Width = 366 ExplicitTop = 196 ExplicitWidth = 418 end inherited pnlBotones: TPanel Top = 198 - Width = 418 + Width = 366 ExplicitTop = 198 ExplicitWidth = 418 inherited btnAceptar: TButton - Left = 254 - ExplicitLeft = 254 + Left = 193 + ExplicitLeft = 193 end inherited btnCancelar: TButton - Left = 333 - ExplicitLeft = 333 + Left = 272 + ExplicitLeft = 272 end end inherited pnlHeader: TPanel - Width = 418 + Width = 366 ExplicitWidth = 418 inherited lblInstruccion: TLabel - Width = 368 + Width = 317 Margins.Bottom = 10 Caption = 'Indique las siguiente opciones para la factura de cliente:' ExplicitWidth = 317 end inherited Label2: TLabel Top = 31 - Width = 343 - Height = 25 Visible = False ExplicitTop = 31 end end inherited pnlCuerpo: TPanel - Width = 418 + Width = 366 Height = 130 ExplicitWidth = 418 ExplicitHeight = 130 - object opcion1: TcxRadioButton + object cbOriginal: TCheckBox Left = 50 Top = 16 - Width = 113 + Width = 97 Height = 17 Caption = 'ORIGINAL' - Checked = True TabOrder = 0 - TabStop = True end - object opcion2: TcxRadioButton + object cbCopia: TCheckBox Left = 50 - Top = 50 - Width = 113 + Top = 51 + Width = 97 Height = 17 Caption = 'COPIA' TabOrder = 1 end - object opcion3: TcxRadioButton + object cbContabilidad: TCheckBox Left = 50 - Top = 87 - Width = 113 + Top = 88 + Width = 97 Height = 17 Caption = 'CONTABILIDAD' TabOrder = 2 diff --git a/Source/Modulos/Facturas de cliente/Views/uDialogOpcionesImpresionFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Views/uDialogOpcionesImpresionFacturasCliente.pas index c9ee1d1..efc6a95 100644 --- a/Source/Modulos/Facturas de cliente/Views/uDialogOpcionesImpresionFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uDialogOpcionesImpresionFacturasCliente.pas @@ -8,9 +8,9 @@ uses type TfDialogOpcionesImpresionFacturasCliente = class(TfDialogBase) - opcion1: TcxRadioButton; - opcion2: TcxRadioButton; - opcion3: TcxRadioButton; + cbOriginal: TCheckBox; + cbCopia: TCheckBox; + cbContabilidad: TCheckBox; procedure actAceptarExecute(Sender: TObject); procedure actCancelarExecute(Sender: TObject); private @@ -19,13 +19,13 @@ type { Public declarations } end; - function ElegirOpcionesImpresionFacturaCliente(var AMarca : Integer): Boolean; + function ElegirOpcionesImpresionFacturaCliente(var AOriginal, ACopia, AContabilidad : Integer): Boolean; implementation {$R *.dfm} -function ElegirOpcionesImpresionFacturaCliente(var AMarca : Integer): Boolean; +function ElegirOpcionesImpresionFacturaCliente(var AOriginal, ACopia, AContabilidad : Integer): Boolean; var AEditor : TfDialogOpcionesImpresionFacturasCliente; begin @@ -36,12 +36,14 @@ begin begin if True then begin - if AEditor.opcion1.Checked then - AMarca := 1 - else if AEditor.opcion2.Checked then - AMarca := 2 - else if AEditor.opcion3.Checked then - AMarca := 3 + if AEditor.cbOriginal.Checked then + AOriginal := 1; + + if AEditor.cbCopia.Checked then + ACopia := 1; + + if AEditor.cbContabilidad.Checked then + AContabilidad := 1; end; end; finally diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm index 17e46b1..f1ba2d1 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm @@ -357,6 +357,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente inherited TBXDock1: TSpTBXDock Top = 46 Width = 888 + ExplicitTop = 46 ExplicitWidth = 798 inherited TBXToolbar1: TSpTBXToolbar ExplicitWidth = 762 @@ -411,10 +412,12 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ExplicitLeft = 472 end inherited Bevel4: TBevel - Left = 584 + Left = 585 Width = 317 - ExplicitLeft = 584 + Height = 9 + ExplicitLeft = 585 ExplicitWidth = 317 + ExplicitHeight = 9 end inherited ImporteDto: TcxDBCurrencyEdit Style.LookAndFeel.SkinName = '' @@ -424,13 +427,13 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente StyleHot.LookAndFeel.SkinName = '' end inherited ImporteIVA: TcxDBCurrencyEdit - Left = 655 + Left = 656 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 655 + ExplicitLeft = 656 end inherited ImporteTotal: TcxDBCurrencyEdit Left = 585 @@ -440,6 +443,8 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 585 + ExplicitWidth = 90 + Width = 90 end inherited edtDescuento: TcxDBSpinEdit Style.LookAndFeel.SkinName = '' @@ -449,40 +454,40 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente StyleHot.LookAndFeel.SkinName = '' end inherited edtIVA: TcxDBSpinEdit - Left = 584 + Left = 585 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 584 + ExplicitLeft = 585 end inherited ImporteBase: TcxDBCurrencyEdit - Left = 584 + Left = 585 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 584 + ExplicitLeft = 585 end inherited edtRE: TcxDBSpinEdit - Left = 584 + Left = 585 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 584 + ExplicitLeft = 585 end inherited ImporteRE: TcxDBCurrencyEdit - Left = 655 + Left = 656 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 655 + ExplicitLeft = 656 end inherited eImporteNeto: TcxDBCurrencyEdit Style.LookAndFeel.SkinName = '' diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas index 52363c8..24b2bf2 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas @@ -17,7 +17,8 @@ uses uViewDetallesFacturaCliente, dxLayoutLookAndFeels, JvExComCtrls, JvStatusBar, uViewDetallesDTO, uViewDetallesArticulos, uTiposIVAController, uDAInterfaces, cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit, Grids, DBGrids, - uViewDetallesArticulosParaVenta, cxLabel, uViewTotalesFactura; + uViewDetallesArticulosParaVenta, cxLabel, uViewTotalesFactura, cxGraphics, + cxLookAndFeels, cxLookAndFeelPainters; type @@ -330,16 +331,17 @@ end; procedure TfEditorFacturaCliente.ImprimirInterno; var AllItems: Boolean; - AMarca: Integer; + AOriginal: Integer; + ACopia: Integer; + AContabilidad: Integer; begin inherited; AllItems := False; - AMarca := 0; //Preguntamos si desea que en las facturas se vea el Sello - if ElegirOpcionesImpresionFacturaCliente(AMarca) then - FController.Print(FFactura, AllItems, AMarca); + if ElegirOpcionesImpresionFacturaCliente(AOriginal, ACopia, AContabilidad) then + FController.Print(FFactura, AOriginal, ACopia, AContabilidad, AllItems); end; procedure TfEditorFacturaCliente.OnClienteChanged(Sender: TObject); @@ -418,16 +420,17 @@ end; procedure TfEditorFacturaCliente.PrevisualizarInterno; var AllItems: Boolean; - AMarca: Integer; + AOriginal: Integer; + ACopia: Integer; + AContabilidad: Integer; begin inherited; AllItems := False; - AMarca := 0; //Preguntamos si desea que en las facturas se vea el Sello - if ElegirOpcionesImpresionFacturaCliente(AMarca) then - FController.Preview(FFactura, AllItems, AMarca); + if ElegirOpcionesImpresionFacturaCliente(AOriginal, ACopia, AContabilidad) then + FController.Preview(FFactura, AOriginal, ACopia, AContabilidad, AllItems); end; procedure TfEditorFacturaCliente.RecalcularPortePorUnidad; diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm index 0b50ee4..02491e1 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm @@ -45,12 +45,12 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente ImageIndex = 22 Images = SmallImages object TBXItem39: TSpTBXItem - Action = actNuevaFactura Caption = 'Nueva factura...' + Action = actNuevaFactura end object TBXItem38: TSpTBXItem - Action = actNuevoAbono Caption = 'Nuevo abono...' + Action = actNuevoAbono end end inherited TBXItem2: TSpTBXItem @@ -62,24 +62,26 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente end end inherited tbxFiltro: TSpTBXToolbar - ExplicitWidth = 427 + ExplicitWidth = 435 inherited lblAno: TSpTBXLabelItem Visible = True end - inherited cbxListaAnos: TSpTBXComboBox - Visible = True - end inherited sepAno: TSpTBXSeparatorItem Visible = True end + inherited cbxListaAnos: TSpTBXComboBox + Left = 33 + Visible = True + ExplicitLeft = 33 + end end inherited tbxMenu: TSpTBXToolbar DockPos = 0 ExplicitWidth = 842 end inherited TBXTMain2: TSpTBXToolbar - Left = 427 - ExplicitLeft = 427 + Left = 435 + ExplicitLeft = 435 object TBXItem41: TSpTBXItem Action = actInformes end @@ -152,6 +154,7 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente Width = 842 ExplicitWidth = 842 inherited TBXDockablePanel1: TSpTBXDockablePanel + Width = 842 ExplicitWidth = 842 inherited dxLayoutControl1: TdxLayoutControl Width = 842 @@ -194,8 +197,8 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente end end inherited TBXAlignmentPanel1: TSpTBXDockablePanel - Width = 842 - ExplicitWidth = 842 + Width = 832 + ExplicitWidth = 832 inherited tbxBotones: TSpTBXToolbar Width = 832 ExplicitWidth = 832 @@ -205,14 +208,15 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente end inherited pnlAgrupaciones: TSpTBXDockablePanel Top = 519 + Width = 842 ExplicitTop = 519 ExplicitWidth = 842 inherited TBXAlignmentPanel1: TSpTBXDockablePanel Width = 842 ExplicitWidth = 842 inherited TBXToolbar1: TSpTBXToolbar - Width = 832 - ExplicitWidth = 832 + Width = 842 + ExplicitWidth = 842 end end end @@ -222,6 +226,9 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente BuiltInReportLink = True end end + inherited dxPSEngineController1: TdxPSEngineController + Active = True + end inherited cxViewGridPopupMenu: TcxGridPopupMenu PopupMenus = < item diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas index 44b6e41..9e5b8de 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas @@ -17,7 +17,8 @@ uses cxGraphics, cxFilter, cxData, cxDataStorage, cxEdit, cxDBData, cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGrid, StdCtrls, cxContainer, cxTextEdit, - cxMaskEdit, cxDropDownEdit, cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox; + cxMaskEdit, cxDropDownEdit, cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, + TntStdCtrls, SpTBXEditors; type @@ -303,12 +304,13 @@ var Respuesta : Integer; AFacturas: IBizFacturaCliente; AllItems: Boolean; - AMarca: Integer; + AOriginal: Integer; + ACopia: Integer; + AContabilidad: Integer; begin AFacturas := Nil; AllItems := False; - AMarca := 0; if MultiSelect and Assigned(ViewGrid) then AllItems := (ViewGrid.NumSeleccionados > 1); @@ -335,9 +337,9 @@ begin AFacturas := Facturas; //Preguntamos si desea que en las facturas se vea el Sello - if ElegirOpcionesImpresionFacturaCliente(AMarca) then + if ElegirOpcionesImpresionFacturaCliente(AOriginal, ACopia, AContabilidad) then if Assigned(AFacturas) then - FController.Print(AFacturas, AllItems, AMarca); + FController.Print(AFacturas, AOriginal, ACopia, AContabilidad, AllItems); end; end; end; @@ -397,12 +399,13 @@ var Respuesta : Integer; AFacturas: IBizFacturaCliente; AllItems: Boolean; - AMarca: Integer; + AOriginal: Integer; + ACopia: Integer; + AContabilidad: Integer; begin AFacturas := Nil; AllItems := False; - AMarca := 0; if MultiSelect and Assigned(ViewGrid) then AllItems := (ViewGrid.NumSeleccionados > 1); @@ -429,9 +432,9 @@ begin AFacturas := Facturas; //Preguntamos si desea que en las facturas se vea el Sello - if ElegirOpcionesImpresionFacturaCliente(AMarca) then + if ElegirOpcionesImpresionFacturaCliente(AOriginal, ACopia, AContabilidad) then if Assigned(AFacturas) then - FController.Preview(AFacturas, AllItems, AMarca); + FController.Preview(AFacturas, AOriginal, ACopia, AContabilidad, AllItems); end; end; end; diff --git a/Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.dfm index 15beb62..8409aa1 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.dfm @@ -16,7 +16,6 @@ inherited frViewDatosYSeleccionClienteFacturaCliente: TfrViewDatosYSeleccionClie ParentBackground = True TabOrder = 0 TabStop = False - AutoContentSizes = [acsWidth, acsHeight] DesignSize = ( 634 193) @@ -27,7 +26,6 @@ inherited frViewDatosYSeleccionClienteFacturaCliente: TfrViewDatosYSeleccionClie AutoSize = False DataBinding.DataField = 'NOMBRE' DataBinding.DataSource = dsCliente - Enabled = False ParentFont = False Properties.ReadOnly = True Properties.UseLeftAlignmentOnEditing = False @@ -54,7 +52,6 @@ inherited frViewDatosYSeleccionClienteFacturaCliente: TfrViewDatosYSeleccionClie AutoSize = False DataBinding.DataField = 'NIF_CIF' DataBinding.DataSource = dsCliente - Enabled = False ParentFont = False Properties.ReadOnly = True Properties.UseLeftAlignmentOnEditing = False @@ -272,92 +269,97 @@ inherited frViewDatosYSeleccionClienteFacturaCliente: TfrViewDatosYSeleccionClie Width = 403 end object dxLayoutControl1Group_Root: TdxLayoutGroup - ShowCaption = False + AlignHorz = ahParentManaged + AlignVert = avParentManaged + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> Hidden = True ShowBorder = False object dxLayoutControl1Group1: TdxLayoutGroup - ShowCaption = False + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> Hidden = True LayoutDirection = ldHorizontal ShowBorder = False object dxLayoutControl1Item7: TdxLayoutItem - Caption = 'Button1' - ShowCaption = False + CaptionOptions.Text = 'Button1' + CaptionOptions.Visible = False Control = Button1 ControlOptions.ShowBorder = False end object dxLayoutControl1Item8: TdxLayoutItem - Caption = 'Button2' - ShowCaption = False + CaptionOptions.Text = 'Button2' + CaptionOptions.Visible = False Control = Button2 ControlOptions.ShowBorder = False end end object dxLayoutControl1Group2: TdxLayoutGroup - ShowCaption = False + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> Hidden = True ShowBorder = False object dxLayoutControl1Group4: TdxLayoutGroup - ShowCaption = False + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> Hidden = True LayoutDirection = ldHorizontal ShowBorder = False object dxLayoutControl1Item1: TdxLayoutItem - AutoAligns = [aaVertical] AlignHorz = ahClient - Caption = 'Nombre:' + CaptionOptions.Text = 'Nombre:' Control = edtlNombre ControlOptions.ShowBorder = False end object dxLayoutControl1Item2: TdxLayoutItem - AutoAligns = [aaVertical] AlignHorz = ahRight - Caption = 'NIF/CIF:' + CaptionOptions.Text = 'NIF/CIF:' Control = edtNIFCIF ControlOptions.ShowBorder = False end end object dxLayoutControl1Group3: TdxLayoutGroup - ShowCaption = False + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> Hidden = True ShowBorder = False object dxLayoutControl1Group5: TdxLayoutGroup - ShowCaption = False + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> Hidden = True LayoutDirection = ldHorizontal ShowBorder = False object dxLayoutControl1Item4: TdxLayoutItem - AutoAligns = [aaVertical] AlignHorz = ahClient - Caption = 'Direcci'#243'n:' + CaptionOptions.Text = 'Direcci'#243'n:' Control = edtDireccion ControlOptions.ShowBorder = False end object dxLayoutControl1Item5: TdxLayoutItem - AutoAligns = [aaVertical] - Caption = 'Button4' + AlignHorz = ahLeft + CaptionOptions.Text = 'Button4' + CaptionOptions.Visible = False Enabled = False - ShowCaption = False Visible = False Control = Button4 ControlOptions.ShowBorder = False end end object dxLayoutControl1Group6: TdxLayoutGroup - ShowCaption = False + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> Hidden = True LayoutDirection = ldHorizontal ShowBorder = False object dxLayoutControl1Item3: TdxLayoutItem - AutoAligns = [aaVertical] AlignHorz = ahClient - Caption = 'Contacto:' + CaptionOptions.Text = 'Contacto:' Control = edtPersonaContacto ControlOptions.ShowBorder = False end object dxLayoutControl1Item6: TdxLayoutItem + CaptionOptions.Visible = False Enabled = False - ShowCaption = False Visible = False Control = Button5 ControlOptions.ShowBorder = False @@ -366,10 +368,9 @@ inherited frViewDatosYSeleccionClienteFacturaCliente: TfrViewDatosYSeleccionClie end end object dxLayoutControl1Item9: TdxLayoutItem - AutoAligns = [aaVertical] AlignHorz = ahRight - Caption = 'Button3' - ShowCaption = False + CaptionOptions.Text = 'Button3' + CaptionOptions.Visible = False Control = Button3 ControlOptions.ShowBorder = False end diff --git a/Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.pas index b59d8ec..7129950 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uViewDatosYSeleccionClienteFacturaCliente.pas @@ -11,7 +11,7 @@ uses DBCtrls, uClientesController, dxLayoutControl, Buttons, uDAInterfaces, cxMaskEdit, cxButtonEdit, uBizFacturasCliente, uBizDireccionesContacto, uDireccionesContactoController, Menus, cxLookAndFeelPainters, cxButtons, - cxMemo; + cxMemo, cxGraphics, cxLookAndFeels, dxLayoutcxEditAdapters; type IViewDatosYSeleccionClienteFacturaCliente = interface(IViewBase) diff --git a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm index fff0267..a66f2e0 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.dfm @@ -1,51 +1,43 @@ inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente inherited ToolBar1: TToolBar - Height = 73 - ExplicitHeight = 73 - inherited ToolButton3: TToolButton - Wrap = False - end - inherited ToolButton4: TToolButton - Left = 278 - Top = 0 - ExplicitLeft = 278 - ExplicitTop = 0 - end - inherited ToolButton14: TToolButton - Left = 334 - Top = 0 - ExplicitLeft = 334 - ExplicitTop = 0 - end - inherited FontName: TJvFontComboBox + Height = 95 + ExplicitHeight = 95 + inherited FontName: TJvFontComboBox [4] + Left = 56 Top = 22 + ExplicitLeft = 56 ExplicitTop = 22 end + inherited ToolButton14: TToolButton [5] + Left = 201 + Wrap = False + ExplicitLeft = 201 + end inherited FontSize: TEdit + Left = 266 Top = 22 + ExplicitLeft = 266 ExplicitTop = 22 end inherited UpDown1: TUpDown + Left = 308 Top = 22 + ExplicitLeft = 308 ExplicitTop = 22 end inherited ToolButton13: TToolButton + Left = 325 Top = 22 + ExplicitLeft = 325 ExplicitTop = 22 end - inherited ToolButton6: TToolButton + inherited ToolButton11: TToolButton [9] + Left = 333 Top = 22 + ExplicitLeft = 333 ExplicitTop = 22 end - inherited ToolButton7: TToolButton - Top = 22 - ExplicitTop = 22 - end - inherited ToolButton8: TToolButton - Top = 22 - ExplicitTop = 22 - end - inherited ToolButton12: TToolButton + inherited ToolButton12: TToolButton [10] Left = 0 Top = 22 Wrap = True @@ -53,28 +45,41 @@ inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente ExplicitTop = 22 ExplicitHeight = 27 end - inherited ToolButton9: TToolButton + inherited ToolButton9: TToolButton [11] Left = 0 Top = 49 ExplicitLeft = 0 ExplicitTop = 49 end - inherited ToolButton10: TToolButton + inherited ToolButton10: TToolButton [12] Left = 145 Top = 49 ExplicitLeft = 145 ExplicitTop = 49 end - inherited ToolButton11: TToolButton + inherited ToolButton6: TToolButton [13] Left = 270 Top = 49 ExplicitLeft = 270 ExplicitTop = 49 end + inherited ToolButton7: TToolButton [14] + Left = 336 + Top = 49 + Wrap = True + ExplicitLeft = 336 + ExplicitTop = 49 + end + inherited ToolButton8: TToolButton [15] + Left = 0 + Top = 71 + ExplicitLeft = 0 + ExplicitTop = 71 + end end inherited cxGrid: TcxGrid - Top = 99 - Height = 205 + Top = 121 + Height = 183 ExplicitTop = 99 ExplicitHeight = 205 inherited cxGridView: TcxGridDBTableView @@ -82,9 +87,6 @@ inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente Visible = False VisibleForCustomization = False end - inherited cxGridViewCANTIDAD: TcxGridDBColumn - Properties.ReadOnly = True - end inherited cxGridViewUNIDAD_MEDIDA: TcxGridDBColumn Visible = False VisibleForCustomization = False @@ -92,8 +94,8 @@ inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente end end inherited TBXDock1: TSpTBXDock - Top = 73 - ExplicitTop = 73 + Top = 95 + ExplicitTop = 68 inherited TBXToolbar1: TSpTBXToolbar DockPos = 0 inherited TBXSubmenuItem1: TSpTBXSubmenuItem diff --git a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.pas index e24346f..04c85d7 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uViewDetallesFacturaCliente.pas @@ -13,7 +13,8 @@ uses JvExStdCtrls, JvCombobox, JvColorCombo, TB2Item, SpTBXItem, TB2Dock, TB2Toolbar, uControllerDetallesArticulos, uViewDetallesArticulos, uBizFacturasCliente, uDAInterfaces, cxDropDownEdit, cxButtonEdit, Menus, cxGridCustomPopupMenu, - cxGridPopupMenu, cxEditRepositoryItems, uViewDetallesArticulosParaVenta; + cxGridPopupMenu, cxEditRepositoryItems, uViewDetallesArticulosParaVenta, + cxLookAndFeels, cxLookAndFeelPainters; type IViewDetallesFacturaCliente = interface(IViewDetallesArticulos) diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm index 01dc2a3..2a4a28e 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm @@ -1,6 +1,6 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente - Width = 882 - Height = 522 + Width = 451 + Height = 304 Align = alClient OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy @@ -9,26 +9,22 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 - Width = 882 - Height = 522 + Width = 451 + Height = 304 Align = alClient ParentBackground = True TabOrder = 0 TabStop = False - AutoContentSizes = [acsWidth, acsHeight] - LookAndFeel = dxLayoutOfficeLookAndFeel1 - ExplicitWidth = 451 - ExplicitHeight = 304 + LayoutLookAndFeel = dxLayoutOfficeLookAndFeel1 DesignSize = ( - 882 - 522) + 451 + 304) object eReferencia: TcxDBTextEdit Left = 124 Top = 30 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'REFERENCIA' DataBinding.DataSource = DADataSource - Enabled = False Properties.ReadOnly = False Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -132,7 +128,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 269 end object bFormasPago: TButton - Left = 404 + Left = 172 Top = 103 Width = 132 Height = 23 @@ -163,7 +159,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 165 end inline frViewDatosYSeleccionClienteFacturaCliente1: TfrViewDatosYSeleccionClienteFacturaCliente - Left = 575 + Left = 343 Top = 30 Width = 295 Height = 200 @@ -175,7 +171,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente ParentFont = False TabOrder = 6 ReadOnly = False - ExplicitLeft = 575 + ExplicitLeft = 343 ExplicitTop = 30 ExplicitWidth = 295 ExplicitHeight = 200 @@ -189,32 +185,36 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 224 + Width = 224 end inherited edtNIFCIF: TcxDBTextEdit - Left = 172 + Left = 171 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 172 + ExplicitLeft = 171 end inherited Button3: TBitBtn - Left = 83 - ExplicitLeft = 83 + Left = 82 + ExplicitLeft = 82 end inherited Button4: TButton - Left = 252 - ExplicitLeft = 252 + Left = 251 + ExplicitLeft = 251 end inherited edtPersonaContacto: TcxDBTextEdit Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 403 + Width = 403 end inherited Button5: TButton - Left = 252 - ExplicitLeft = 252 + Left = 251 + ExplicitLeft = 251 end inherited edtDireccion: TcxMemo Style.LookAndFeel.SkinName = '' @@ -266,58 +266,62 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 275 end object dxLayoutControl1Group_Root: TdxLayoutGroup - ShowCaption = False + AlignHorz = ahParentManaged + AlignVert = avParentManaged + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> Hidden = True ShowBorder = False object dxLayoutControl1Group9: TdxLayoutGroup - ShowCaption = False + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> Hidden = True LayoutDirection = ldHorizontal ShowBorder = False object dxLayoutControl1Group1: TdxLayoutGroup - AutoAligns = [aaVertical] AlignHorz = ahClient - Caption = 'Datos de la factura' + CaptionOptions.Text = 'Datos de la factura' + ButtonOptions.Buttons = <> object dxLayoutControl1Item1: TdxLayoutItem - AutoAligns = [aaVertical] AlignHorz = ahClient - Caption = 'Referencia:' + CaptionOptions.Text = 'Referencia:' Control = eReferencia ControlOptions.ShowBorder = False end object dxLayoutControl1Item2: TdxLayoutItem - AutoAligns = [aaVertical] AlignHorz = ahClient - Caption = 'Fecha de la factura:' + CaptionOptions.Text = 'Fecha de la factura:' Control = edtFecha ControlOptions.ShowBorder = False end object dxLayoutControl1Group6: TdxLayoutGroup - Caption = 'Forma de pago' + CaptionOptions.Text = 'Forma de pago' + ButtonOptions.Buttons = <> object dxLayoutControl1Group4: TdxLayoutGroup - ShowCaption = False + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> Hidden = True ShowBorder = False object dxLayoutControl1Group3: TdxLayoutGroup - ShowCaption = False + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> Hidden = True LayoutDirection = ldHorizontal ShowBorder = False object dxLayoutControl1Item4: TdxLayoutItem - AutoAligns = [aaVertical] AlignHorz = ahClient - Caption = 'Forma de pago:' + CaptionOptions.Text = 'Forma de pago:' Control = cbFormaPago ControlOptions.ShowBorder = False end object dxLayoutControl1Item10: TdxLayoutItem - ShowCaption = False + CaptionOptions.Visible = False Control = bFormasPago ControlOptions.ShowBorder = False end end object ledtFechaVencimiento: TdxLayoutItem - Caption = 'Fecha de vencimiento:' + CaptionOptions.Text = 'Fecha de vencimiento:' Enabled = False Visible = False Control = edtFechaVemcimiento @@ -325,20 +329,20 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente end end object dxLayoutControl1Item3: TdxLayoutItem - Caption = 'Cuenta bancaria:' + CaptionOptions.Text = 'Cuenta bancaria:' Control = cbCuentaBancaria ControlOptions.ShowBorder = False end end end object dxLayoutControl1Group2: TdxLayoutGroup - AutoAligns = [] AlignHorz = ahClient AlignVert = avClient - Caption = 'Datos del cliente' + CaptionOptions.Text = 'Datos del cliente' + ButtonOptions.Buttons = <> object dxLayoutControl1Item6: TdxLayoutItem - Caption = 'frViewDatosYSeleccionClienteFacturaCliente1' - ShowCaption = False + CaptionOptions.Text = 'frViewDatosYSeleccionClienteFacturaCliente1' + CaptionOptions.Visible = False Control = frViewDatosYSeleccionClienteFacturaCliente1 ControlOptions.AutoColor = True ControlOptions.ShowBorder = False @@ -346,13 +350,12 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente end end object dxLayoutControl1Group5: TdxLayoutGroup - AutoAligns = [] AlignHorz = ahClient AlignVert = avClient - Caption = 'Observaciones' + CaptionOptions.Text = 'Observaciones' + ButtonOptions.Buttons = <> LayoutDirection = ldHorizontal object dxLayoutControl1Item5: TdxLayoutItem - AutoAligns = [] AlignHorz = ahClient AlignVert = avClient Control = memObservaciones diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas index 80658d1..ab62e61 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas @@ -10,7 +10,8 @@ uses cxMemo, cxMaskEdit, cxDropDownEdit, cxCalendar, cxSpinEdit, StdCtrls, Mask, DBCtrls, cxGraphics, dxLayoutLookAndFeels, cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, uFormasPagoController, uDAInterfaces, uBizFormasPago, - ActnList, uViewDatosYSeleccionClienteFacturaCliente, uFacturasClienteController; + ActnList, uViewDatosYSeleccionClienteFacturaCliente, uFacturasClienteController, + cxLookAndFeels, cxLookAndFeelPainters, dxLayoutcxEditAdapters; type IViewFacturaCliente = interface(IViewBase) diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm index 8a3d2e7..aff92db 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm @@ -144,6 +144,7 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente Width = 665 ExplicitWidth = 665 inherited TBXDockablePanel1: TSpTBXDockablePanel + Width = 665 ExplicitWidth = 665 inherited dxLayoutControl1: TdxLayoutControl Width = 665 @@ -186,7 +187,7 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente end end inherited TBXAlignmentPanel1: TSpTBXDockablePanel - Width = 665 + Width = 655 ExplicitWidth = 665 inherited tbxBotones: TSpTBXToolbar Width = 655 @@ -197,6 +198,7 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente end inherited pnlAgrupaciones: TSpTBXDockablePanel Top = 392 + Width = 665 Visible = True ExplicitTop = 392 ExplicitWidth = 665 @@ -204,7 +206,7 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente Width = 665 ExplicitWidth = 665 inherited TBXToolbar1: TSpTBXToolbar - Width = 655 + Width = 665 ExplicitWidth = 655 object TBXSeparatorItem2: TSpTBXSeparatorItem end diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas index d8e7e59..694a265 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas @@ -14,7 +14,9 @@ uses cxImage, Grids, DBGrids, uBizFacturasCliente, cxGridCustomPopupMenu, cxGridPopupMenu, cxCalendar, cxCurrencyEdit, uViewFiltroBase, TB2Item, SpTBXItem, TB2Toolbar, SpTBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces, uCustomView, - uViewBase; + uViewBase, cxLookAndFeels, cxLookAndFeelPainters, dxPSPDFExportCore, + dxPSPDFExport, cxDrawTextUtils, dxPSPrVwStd, dxPSPrVwAdv, + dxPScxEditorProducers, dxPScxExtEditorProducers, dxPScxPageControlProducer; type IViewFacturasCliente = interface(IViewGrid) diff --git a/Source/Modulos/Facturas de cliente/Views/uViewTotalesFactura.dfm b/Source/Modulos/Facturas de cliente/Views/uViewTotalesFactura.dfm index d4ff12f..480a3d1 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewTotalesFactura.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewTotalesFactura.dfm @@ -14,12 +14,14 @@ inherited frViewTotalesFactura: TfrViewTotalesFactura ExplicitHeight = 156 end inherited Bevel4: TBevel - Left = 388 + Left = 389 Top = 52 Width = 317 - ExplicitLeft = 388 + Height = 9 + ExplicitLeft = 389 ExplicitTop = 52 ExplicitWidth = 317 + ExplicitHeight = 9 end inherited ImporteDto: TcxDBCurrencyEdit Left = 173 @@ -34,7 +36,7 @@ inherited frViewTotalesFactura: TfrViewTotalesFactura ExplicitTop = 37 end inherited ImporteIVA: TcxDBCurrencyEdit - Left = 459 + Left = 460 Top = 87 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True @@ -42,7 +44,7 @@ inherited frViewTotalesFactura: TfrViewTotalesFactura StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' TabOrder = 11 - ExplicitLeft = 459 + ExplicitLeft = 460 ExplicitTop = 87 end inherited ImporteTotal: TcxDBCurrencyEdit @@ -56,6 +58,8 @@ inherited frViewTotalesFactura: TfrViewTotalesFactura TabOrder = 14 ExplicitLeft = 389 ExplicitTop = 141 + ExplicitWidth = 90 + Width = 90 end inherited edtDescuento: TcxDBSpinEdit Left = 102 @@ -69,7 +73,7 @@ inherited frViewTotalesFactura: TfrViewTotalesFactura ExplicitTop = 37 end inherited edtIVA: TcxDBSpinEdit - Left = 388 + Left = 389 Top = 87 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True @@ -77,11 +81,11 @@ inherited frViewTotalesFactura: TfrViewTotalesFactura StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' TabOrder = 10 - ExplicitLeft = 388 + ExplicitLeft = 389 ExplicitTop = 87 end inherited ImporteBase: TcxDBCurrencyEdit - Left = 388 + Left = 389 Top = 10 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True @@ -89,11 +93,11 @@ inherited frViewTotalesFactura: TfrViewTotalesFactura StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' TabOrder = 9 - ExplicitLeft = 388 + ExplicitLeft = 389 ExplicitTop = 10 end inherited edtRE: TcxDBSpinEdit - Left = 388 + Left = 389 Top = 114 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True @@ -101,11 +105,11 @@ inherited frViewTotalesFactura: TfrViewTotalesFactura StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' TabOrder = 12 - ExplicitLeft = 388 + ExplicitLeft = 389 ExplicitTop = 114 end inherited ImporteRE: TcxDBCurrencyEdit - Left = 459 + Left = 460 Top = 114 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True @@ -113,7 +117,7 @@ inherited frViewTotalesFactura: TfrViewTotalesFactura StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' TabOrder = 13 - ExplicitLeft = 459 + ExplicitLeft = 460 ExplicitTop = 114 end inherited eImporteNeto: TcxDBCurrencyEdit @@ -244,7 +248,7 @@ inherited frViewTotalesFactura: TfrViewTotalesFactura end inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group1: TdxLayoutGroup - ShowCaption = False + CaptionOptions.Visible = False ShowBorder = False inherited dxLayoutControl1Group2: TdxLayoutGroup inherited dxLayoutControl1Item8: TdxLayoutItem @@ -253,24 +257,24 @@ inherited frViewTotalesFactura: TfrViewTotalesFactura inherited dxLayoutControl1Group7: TdxLayoutGroup inherited dxLayoutControl1Group10: TdxLayoutGroup inherited dxLayoutControl1Item4: TdxLayoutItem - Caption = 'Dto. cliente (%):' + CaptionOptions.Text = 'Dto. cliente (%):' end inherited dxLayoutControl1Item1: TdxLayoutItem Enabled = False end end object dxLayoutControl1Group12: TdxLayoutGroup [1] - ShowCaption = False + CaptionOptions.Visible = False + ButtonOptions.Buttons = <> Hidden = True LayoutDirection = ldHorizontal ShowBorder = False object dxLayoutControl1Item20: TdxLayoutItem - Caption = 'Dto. pronto pago:' + CaptionOptions.Text = 'Dto. pronto pago:' Control = eDescuento2 ControlOptions.ShowBorder = False end object dxLayoutControl1Item22: TdxLayoutItem - AutoAligns = [aaVertical] AlignHorz = ahClient Enabled = False Control = eImporteDto2 diff --git a/Source/Modulos/Facturas de cliente/Views/uViewTotalesFactura.pas b/Source/Modulos/Facturas de cliente/Views/uViewTotalesFactura.pas index d0a5158..3186ffc 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewTotalesFactura.pas +++ b/Source/Modulos/Facturas de cliente/Views/uViewTotalesFactura.pas @@ -8,7 +8,8 @@ uses uDADataTable, dxLayoutControl, cxDropDownEdit, cxCalendar, cxDBEdit, cxCheckBox, StdCtrls, cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, cxMaskEdit, cxSpinEdit, cxContainer, cxEdit, cxTextEdit, cxCurrencyEdit, - cxControls, ExtCtrls; + cxControls, ExtCtrls, cxLookAndFeels, cxLookAndFeelPainters, + dxLayoutcxEditAdapters; type TfrViewTotalesFactura = class(TfrViewTotales) diff --git a/Source/Servicios/FactuGES.RODL b/Source/Servicios/FactuGES.RODL index f46fabc..df2c84c 100644 --- a/Source/Servicios/FactuGES.RODL +++ b/Source/Servicios/FactuGES.RODL @@ -254,7 +254,11 @@ - + + + + + diff --git a/Source/Servicios/FactuGES_Intf.pas b/Source/Servicios/FactuGES_Intf.pas index c2e446b..b6e518b 100644 --- a/Source/Servicios/FactuGES_Intf.pas +++ b/Source/Servicios/FactuGES_Intf.pas @@ -502,7 +502,7 @@ type { IsrvFacturasCliente } IsrvFacturasCliente = interface(IDataAbstractService) ['{56B4FFF0-AB1B-46B2-BA16-ABD5360F6311}'] - function GenerarInforme(const ListaID: TIntegerArray; const Marca: Integer): Binary; + function GenerarInforme(const ListaID: TIntegerArray; const Original: Integer; const Copia: Integer; const Contabilidad: Integer): Binary; end; { CosrvFacturasCliente } @@ -515,7 +515,7 @@ type protected function __GetInterfaceName:string; override; - function GenerarInforme(const ListaID: TIntegerArray; const Marca: Integer): Binary; + function GenerarInforme(const ListaID: TIntegerArray; const Original: Integer; const Copia: Integer; const Contabilidad: Integer): Binary; end; { IsrvFacturasProveedor } @@ -1678,13 +1678,15 @@ begin result := 'srvFacturasCliente'; end; -function TsrvFacturasCliente_Proxy.GenerarInforme(const ListaID: TIntegerArray; const Marca: Integer): Binary; +function TsrvFacturasCliente_Proxy.GenerarInforme(const ListaID: TIntegerArray; const Original: Integer; const Copia: Integer; const Contabilidad: Integer): Binary; begin try result := nil; __Message.InitializeRequestMessage(__TransportChannel, 'FactuGES', __InterfaceName, 'GenerarInforme'); __Message.Write('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []); - __Message.Write('Marca', TypeInfo(Integer), Marca, []); + __Message.Write('Original', TypeInfo(Integer), Original, []); + __Message.Write('Copia', TypeInfo(Integer), Copia, []); + __Message.Write('Contabilidad', TypeInfo(Integer), Contabilidad, []); __Message.Finalize; __TransportChannel.Dispatch(__Message); diff --git a/Source/Servicios/FactuGES_Invk.pas b/Source/Servicios/FactuGES_Invk.pas index e32dbee..2b2fce2 100644 --- a/Source/Servicios/FactuGES_Invk.pas +++ b/Source/Servicios/FactuGES_Invk.pas @@ -791,10 +791,12 @@ begin end; procedure TsrvFacturasCliente_Invoker.Invoke_GenerarInforme(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions); -{ function GenerarInforme(const ListaID: TIntegerArray; const Marca: Integer): Binary; } +{ function GenerarInforme(const ListaID: TIntegerArray; const Original: Integer; const Copia: Integer; const Contabilidad: Integer): Binary; } var ListaID: FactuGES_Intf.TIntegerArray; - Marca: Integer; + Original: Integer; + Copia: Integer; + Contabilidad: Integer; lResult: Binary; __lObjectDisposer: TROObjectDisposer; begin @@ -802,9 +804,11 @@ begin lResult := nil; try __Message.Read('ListaID', TypeInfo(FactuGES_Intf.TIntegerArray), ListaID, []); - __Message.Read('Marca', TypeInfo(Integer), Marca, []); + __Message.Read('Original', TypeInfo(Integer), Original, []); + __Message.Read('Copia', TypeInfo(Integer), Copia, []); + __Message.Read('Contabilidad', TypeInfo(Integer), Contabilidad, []); - lResult := (__Instance as IsrvFacturasCliente).GenerarInforme(ListaID, Marca); + lResult := (__Instance as IsrvFacturasCliente).GenerarInforme(ListaID, Original, Copia, Contabilidad); __Message.InitializeResponseMessage(__Transport, 'FactuGES', 'srvFacturasCliente', 'GenerarInformeResponse'); __Message.Write('Result', TypeInfo(Binary), lResult, []); diff --git a/Source/Servicios/RODLFILE.res b/Source/Servicios/RODLFILE.res index 1c4fcb8..48eeeb7 100644 Binary files a/Source/Servicios/RODLFILE.res and b/Source/Servicios/RODLFILE.res differ diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 28f44d3..12f4c8d 100644 Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index 7c2d5aa..153e32d 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -14,7 +14,7 @@ BEGIN BEGIN VALUE "FileVersion", "1.0.0.0\0" VALUE "ProductVersion", "1.0.0.0\0" - VALUE "CompileDate", "viernes, 29 de enero de 2010 18:04\0" + VALUE "CompileDate", "lunes, 01 de febrero de 2010 13:18\0" END END BLOCK "VarFileInfo"