From 938622c77ab33630bec95e85d503b98713f05128 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 16 Jun 2010 11:10:03 +0000 Subject: [PATCH] =?UTF-8?q?Recibos=20de=20cliente/proveedor:=20cambiar=20t?= =?UTF-8?q?=C3=ADtulo=20en=20el=20editor=20para=20que=20saque=20si=20es=20?= =?UTF-8?q?un=20recibo=20libre=20o=20asociado=20a=20una=20factura.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@516 f4e31baf-9722-1c47-927c-6f952f962d4b --- .../Views/uEditorReciboCliente.dfm | 93 +----------------- .../Views/uEditorReciboCliente.pas | 15 ++- .../Views/uEditorReciboProveedor.dfm | 97 ------------------- .../Views/uEditorReciboProveedor.pas | 27 ++++-- 4 files changed, 32 insertions(+), 200 deletions(-) diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm index 3bd1de83..abe064f0 100644 --- a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.dfm @@ -62,7 +62,6 @@ inherited fEditorReciboCliente: TfEditorReciboCliente Width = 879 Height = 331 OnChanging = pgPaginasChanging - ExplicitTop = 109 ExplicitWidth = 879 ExplicitHeight = 331 inherited pagGeneral: TTabSheet @@ -95,102 +94,58 @@ inherited fEditorReciboCliente: TfEditorReciboCliente 871 303) inherited eReferencia: TcxDBTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 201 Width = 201 end inherited eSituacion: TcxDBTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 201 Width = 201 end inherited edtFechaVencimiento: TcxDBDateEdit Left = 326 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 326 ExplicitWidth = 67 Width = 67 end inherited eFechaEmision: TcxDBTextEdit Left = 588 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 588 ExplicitWidth = 286 Width = 286 end inherited eImporteTotal: TcxDBCurrencyEdit Left = 588 - Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 588 ExplicitWidth = 286 Width = 286 end inherited eNombreCliente: TcxDBTextEdit Left = 588 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 588 ExplicitWidth = 286 Width = 286 end inherited eNifCif: TcxDBTextEdit Left = 588 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 588 ExplicitWidth = 286 Width = 286 end inherited eRemesa: TcxDBTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 201 Width = 201 end inherited edtFechaEmision: TcxDBDateEdit DataBinding.DataField = 'FECHA_EMISION' - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 62 Width = 62 end inherited rRefReciboCompensado: TcxDBTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 201 Width = 201 end inherited eDescripcion: TcxDBTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 201 Width = 201 end @@ -201,10 +156,6 @@ inherited fEditorReciboCliente: TfEditorReciboCliente Width = 201 ExplicitWidth = 201 inherited cbTienda: TcxComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 181 Width = 181 end @@ -224,56 +175,32 @@ inherited fEditorReciboCliente: TfEditorReciboCliente end inherited edtlNombre: TcxDBTextEdit DataBinding.DataSource = frViewReciboCliente1.DADataSource - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 271 Width = 271 end inherited edtNIFCIF: TcxDBTextEdit DataBinding.DataSource = frViewReciboCliente1.DADataSource - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 271 Width = 271 end inherited edtCalle: TcxDBTextEdit DataBinding.DataSource = frViewReciboCliente1.DADataSource - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 271 Width = 271 end inherited edtPoblacion: TcxDBTextEdit DataBinding.DataSource = frViewReciboCliente1.DADataSource - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 153 Width = 153 end inherited edtProvincia: TcxDBTextEdit DataBinding.DataSource = frViewReciboCliente1.DADataSource - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 271 Width = 271 end inherited edtCodigoPostal: TcxDBTextEdit Left = 228 DataBinding.DataSource = frViewReciboCliente1.DADataSource - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 228 end inherited Button3: TBitBtn @@ -281,10 +208,6 @@ inherited fEditorReciboCliente: TfEditorReciboCliente ExplicitLeft = 118 end inherited cxDBTextEdit1: TcxDBTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 271 Width = 271 end @@ -297,8 +220,8 @@ inherited fEditorReciboCliente: TfEditorReciboCliente ExplicitHeight = 150 inherited memObservaciones: TcxDBMemo DataBinding.DataSource = frViewReciboCliente1.DADataSource - ExplicitWidth = 462 - ExplicitHeight = 126 + ExplicitWidth = 521 + ExplicitHeight = 150 Height = 150 Width = 521 end @@ -449,25 +372,13 @@ inherited fEditorReciboCliente: TfEditorReciboCliente inherited eImporte: TcxDBCurrencyEdit DataBinding.DataSource = dsDataTable Properties.OnEditValueChanged = frViewReciboCliImportes1eImportePropertiesEditValueChanged - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 150 Width = 150 end inherited eOtrosGastos: TcxDBCurrencyEdit DataBinding.DataSource = dsDataTable - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' end inherited eImporteTotalRecibo: TcxCurrencyEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 366 Width = 366 end diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas index 3baa6951..a0fabb87 100644 --- a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas +++ b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas @@ -431,9 +431,18 @@ begin if Assigned(Recibo) then begin if Recibo.EsNuevo then - FTitulo := 'Nuevo recibo de cliente' - else - FTitulo := 'Recibo de cliente'; + begin + if Recibo.SinFactura then + FTitulo := 'Nuevo recibo libre de cliente' + else + FTitulo := 'Nuevo recibo de factura de cliente' + end + else begin + if Recibo.SinFactura then + FTitulo := 'Recibo libre de cliente' + else + FTitulo := 'Recibo de factura de cliente' + end; if (Recibo.ID_RECIBO_COMPENSADO > 0) then FTitulo := FTitulo + ' (compensado)'; diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorReciboProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uEditorReciboProveedor.dfm index a69d6fb9..1daf6986 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uEditorReciboProveedor.dfm +++ b/Source/Modulos/Recibos de proveedor/Views/uEditorReciboProveedor.dfm @@ -62,7 +62,6 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor Width = 685 Height = 323 ActivePage = pagPagos - ExplicitTop = 109 ExplicitWidth = 685 ExplicitHeight = 323 inherited pagGeneral: TTabSheet @@ -95,101 +94,57 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor 677 295) inherited eReferencia: TcxDBTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 112 Width = 112 end inherited eSituacion: TcxDBTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 112 Width = 112 end inherited edtFechaVencimiento: TcxDBDateEdit Left = 228 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 228 ExplicitWidth = 20 Width = 20 end inherited eFechaEmision: TcxDBTextEdit Left = 384 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 384 ExplicitWidth = 255 Width = 255 end inherited eImporteTotal: TcxDBCurrencyEdit Left = 384 - Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 384 ExplicitWidth = 255 Width = 255 end inherited eNombreCliente: TcxDBTextEdit Left = 384 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 384 ExplicitWidth = 255 Width = 255 end inherited eRemesa: TcxDBTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 112 Width = 112 end inherited edtFechaEmision: TcxDBDateEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 20 Width = 20 end inherited eReferenciaProveedor: TcxDBTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 112 Width = 112 end inherited rReferenciaFacturaProv: TcxDBTextEdit Left = 384 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 384 ExplicitWidth = 255 Width = 255 end inherited rRefReciboCompensado: TcxDBTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 112 Width = 112 end @@ -200,29 +155,17 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor Width = 112 ExplicitWidth = 112 inherited cbTienda: TcxComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 92 Width = 92 end end end inherited eDescripcion: TcxDBTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 112 Width = 112 end inherited eNifCif: TcxDBTextEdit Left = 384 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 384 ExplicitWidth = 255 Width = 255 @@ -241,56 +184,32 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor end inherited edtlNombre: TcxDBTextEdit DataBinding.DataSource = frViewReciboProveedor1.DADataSource - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 283 Width = 283 end inherited edtNIFCIF: TcxDBTextEdit DataBinding.DataSource = frViewReciboProveedor1.DADataSource - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 283 Width = 283 end inherited edtCalle: TcxDBTextEdit DataBinding.DataSource = frViewReciboProveedor1.DADataSource - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 283 Width = 283 end inherited edtPoblacion: TcxDBTextEdit DataBinding.DataSource = frViewReciboProveedor1.DADataSource - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 165 Width = 165 end inherited edtProvincia: TcxDBTextEdit DataBinding.DataSource = frViewReciboProveedor1.DADataSource - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 283 Width = 283 end inherited edtCodigoPostal: TcxDBTextEdit Left = 282 DataBinding.DataSource = frViewReciboProveedor1.DADataSource - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 282 end inherited Button3: TBitBtn @@ -298,10 +217,6 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor ExplicitLeft = 166 end inherited cxDBTextEdit1: TcxDBTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 283 Width = 283 end @@ -469,25 +384,13 @@ inherited fEditorReciboProveedor: TfEditorReciboProveedor inherited eImporte: TcxDBCurrencyEdit DataBinding.DataSource = dsDataTable Properties.OnEditValueChanged = frViewReciboProvImportes1eImportePropertiesEditValueChanged - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 150 Width = 150 end inherited eOtrosGastos: TcxDBCurrencyEdit DataBinding.DataSource = dsDataTable - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' end inherited eImporteTotalRecibo: TcxCurrencyEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 315 Width = 315 end diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorReciboProveedor.pas b/Source/Modulos/Recibos de proveedor/Views/uEditorReciboProveedor.pas index 77ea267e..aad79aa8 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uEditorReciboProveedor.pas +++ b/Source/Modulos/Recibos de proveedor/Views/uEditorReciboProveedor.pas @@ -395,17 +395,26 @@ begin if Assigned(Recibo) then begin if Recibo.EsNuevo then - FTitulo := 'Nuevo recibo de proveedor' - else - FTitulo := 'Recibo de proveedor'; + begin + if Recibo.SinFactura then + FTitulo := 'Nuevo recibo libre de proveedor' + else + FTitulo := 'Nuevo recibo de factura de proveedor' + end + else begin + if Recibo.SinFactura then + FTitulo := 'Recibo libre de cliente' + else + FTitulo := 'Recibo de factura de cliente' + end; + + if (Recibo.ID_RECIBO_COMPENSADO > 0) then + FTitulo := FTitulo + ' (compensado)'; + + if Length(Recibo.NOMBRE_PROVEEDOR) > 0 then + FTitulo := FTitulo + ' - ' + Recibo.NOMBRE_PROVEEDOR; end; - if (Recibo.ID_RECIBO_COMPENSADO > 0) then - FTitulo := FTitulo + ' (compensado)'; - - if Length(Recibo.NOMBRE_PROVEEDOR) > 0 then - FTitulo := FTitulo + ' - ' + Recibo.NOMBRE_PROVEEDOR; - inherited PonerTitulos(FTitulo); end;