diff --git a/BaseDatos/TablaContratos.dfm b/BaseDatos/TablaContratos.dfm index 135452d..4f55a9d 100644 --- a/BaseDatos/TablaContratos.dfm +++ b/BaseDatos/TablaContratos.dfm @@ -1,7 +1,6 @@ object dmTablaContratos: TdmTablaContratos OldCreateOrder = True - Left = 215 - Top = 538 + Top = 526 Height = 200 - Width = 741 + Width = 640 end diff --git a/BaseDatos/TablaContratos.pas b/BaseDatos/TablaContratos.pas index 5f87006..7609f00 100644 --- a/BaseDatos/TablaContratos.pas +++ b/BaseDatos/TablaContratos.pas @@ -80,6 +80,8 @@ type ImporteDescuento : double; IVA : Integer; ImporteIVA : double; + Re : integer; + ImporteRe : double; ImporteTotal : double; Observaciones : string; PlazoEntrega : string; @@ -603,6 +605,18 @@ begin EditFormat := EDIT_EUROS4; end; + if FindField('RE') <> NIL then + with (FieldByName('RE') as TFloatField) do begin + DisplayFormat := DISPLAY_DTO; + EditFormat := EDIT_DTO; + end; + + if FindField('IMPORTERE') <> NIL then + with (FieldByName('IMPORTERE') as TIBBCDField) do begin + DisplayFormat := DISPLAY_EUROS2; + EditFormat := EDIT_EUROS2; + end; + if FindField('IMPORTETOTAL') <> NIL then with (FieldByName('IMPORTETOTAL') as TIBBCDField) do begin DisplayFormat := DISPLAY_EUROS2; @@ -806,6 +820,7 @@ begin Add(' BASEIMPONIBLE, DESCUENTO, '); Add(' IMPORTEDESCUENTO, '); Add(' IVA, IMPORTEIVA, '); + Add(' RE, IMPORTERE, '); Add(' IMPORTETOTAL, '); Add(' OBSERVACIONES, PLAZOENTREGA, '); Add(' FORMAPAGO) '); @@ -821,6 +836,7 @@ begin Add(' :BASEIMPONIBLE, :DESCUENTO, '); Add(' :IMPORTEDESCUENTO, '); Add(' :IVA, :IMPORTEIVA, '); + Add(' :RE, :IMPORTERE, '); Add(' :IMPORTETOTAL, '); Add(' :OBSERVACIONES, :PLAZOENTREGA, '); Add(' :FORMAPAGO) '); @@ -854,6 +870,8 @@ begin Add(' IMPORTEDESCUENTO = :IMPORTEDESCUENTO, '); Add(' IVA = :IVA, '); Add(' IMPORTEIVA = :IMPORTEIVA, '); + Add(' RE = :RE, '); + Add(' IMPORTERE = :IMPORTERE, '); Add(' IMPORTETOTAL = :IMPORTETOTAL, '); Add(' OBSERVACIONES = :OBSERVACIONES, '); Add(' PLAZOENTREGA = :PLAZOENTREGA, '); @@ -966,6 +984,7 @@ begin Add(' BASEIMPONIBLE, DESCUENTO, '); Add(' IMPORTEDESCUENTO, '); Add(' IVA, IMPORTEIVA, '); + Add(' RE, IMPORTERE, '); Add(' IMPORTETOTAL, '); Add(' OBSERVACIONES, PLAZOENTREGA, '); Add(' FORMAPAGO) '); @@ -981,6 +1000,7 @@ begin Add('BASEIMPONIBLE,'); Add('DESCUENTO, IMPORTEDESCUENTO,'); Add('IVA, IMPORTEIVA,'); + Add('RE, IMPORTERE,'); Add('IMPORTETOTAL, OBSERVACIONES, PLAZOENTREGA, FORMAPAGO '); Add('from PRESUPUESTOSCLIENTE '); Add('where CODIGO = :CODIGO'); @@ -1091,6 +1111,7 @@ begin Add(' BASEIMPONIBLE, DESCUENTO, '); Add(' IMPORTEDESCUENTO, '); Add(' IVA, IMPORTEIVA, '); + Add(' RE, IMPORTERE, '); Add(' IMPORTETOTAL, '); Add(' OBSERVACIONES, PLAZOENTREGA, '); Add(' FORMAPAGO) '); @@ -1101,7 +1122,7 @@ begin Add('CALLE, NUMERO, PISO, CODIGOPOSTAL,'); Add('POBLACION, PROVINCIA,'); Add('TELEFONO1, TELEFONO2, MOVIL1, MOVIL2, FAX, PERSONACONTACTO, BASEIMPONIBLE, DESCUENTO, IMPORTEDESCUENTO,'); - Add('IVA, IMPORTEIVA, IMPORTETOTAL, OBSERVACIONES, PLAZOENTREGA, '); + Add('IVA, IMPORTEIVA, RE, IMPORTERE, IMPORTETOTAL, OBSERVACIONES, PLAZOENTREGA, '); Add('FORMAPAGO from CONTRATOSCLIENTE '); Add('where CODIGO = :CODIGO'); end; @@ -1666,6 +1687,8 @@ begin ImporteDescuento := FieldByName('IMPORTEDESCUENTO').AsDouble; Iva := FieldByName('IVA').AsInteger; ImporteIva := FieldByName('IMPORTEIVA').AsDouble; + Re := FieldByName('RE').AsInteger; + ImporteRe := FieldByName('IMPORTERE').AsDouble; ImporteTotal := FieldByName('IMPORTETOTAL').AsDouble; PlazoEntrega := FieldByName('PLAZOENTREGA').AsString; FormaPago := FieldByName('FORMAPAGO').AsString; diff --git a/BaseDatos/TablaFacturasCliente.dfm b/BaseDatos/TablaFacturasCliente.dfm index 3880b5f..966aebf 100644 --- a/BaseDatos/TablaFacturasCliente.dfm +++ b/BaseDatos/TablaFacturasCliente.dfm @@ -1,7 +1,7 @@ object dmTablaFacturasCliente: TdmTablaFacturasCliente OldCreateOrder = False - Left = 504 - Top = 256 + Left = 507 + Top = 81 Height = 408 Width = 123 end diff --git a/BaseDatos/TablaPresupuestos.dfm b/BaseDatos/TablaPresupuestos.dfm index 985b028..eb72984 100644 --- a/BaseDatos/TablaPresupuestos.dfm +++ b/BaseDatos/TablaPresupuestos.dfm @@ -1,7 +1,6 @@ object dmTablaPresupuestos: TdmTablaPresupuestos OldCreateOrder = True - Left = 251 - Top = 416 + Top = 423 Height = 200 - Width = 741 + Width = 640 end diff --git a/BaseDatos/TablaPresupuestos.pas b/BaseDatos/TablaPresupuestos.pas index 66ad727..8598ce9 100644 --- a/BaseDatos/TablaPresupuestos.pas +++ b/BaseDatos/TablaPresupuestos.pas @@ -79,6 +79,8 @@ type ImporteDescuento : double; Iva : integer; ImporteIva : double; + Re : integer; + ImporteRe : double; ImporteTotal : double; VigenciaPresupuesto : TDateTime; PlazoEntrega : String; @@ -606,6 +608,18 @@ begin EditFormat := EDIT_EUROS4; end; + if FindField('RE') <> NIL then + with (FieldByName('RE') as TFloatField) do begin + DisplayFormat := DISPLAY_DTO; + EditFormat := EDIT_DTO; + end; + + if FindField('IMPORTERE') <> NIL then + with (FieldByName('IMPORTERE') as TIBBCDField) do begin + DisplayFormat := DISPLAY_EUROS2; + EditFormat := EDIT_EUROS2; + end; + if FindField('IMPORTETOTAL') <> NIL then with (FieldByName('IMPORTETOTAL') as TIBBCDField) do begin DisplayFormat := DISPLAY_EUROS2; @@ -760,7 +774,7 @@ begin Add('NUMERO, PISO, CODIGOPOSTAL, POBLACION, '); Add('PROVINCIA, TELEFONO1, TELEFONO2, MOVIL1, MOVIL2, FAX, PERSONACONTACTO, VENDEDOR, '); Add('BASEIMPONIBLE, DESCUENTO, '); - Add('IMPORTEDESCUENTO, IVA, IMPORTEIVA, '); + Add('IMPORTEDESCUENTO, IVA, IMPORTEIVA, RE, IMPORTERE, '); Add('IMPORTETOTAL, CODIGODOCUMENTO, VIGENCIAPRESUPUESTO, '); Add('OBSERVACIONES, PLAZOENTREGA, FORMAPAGO, DESGLOSES, AUMENTO) values ('); Add(':CODIGO, :FECHAALTA, :USUARIO, '); @@ -770,7 +784,7 @@ begin Add(':PISO, :CODIGOPOSTAL, :POBLACION, '); Add(':PROVINCIA, :TELEFONO1, :TELEFONO2, :MOVIL1, :MOVIL2, :FAX, :PERSONACONTACTO, :VENDEDOR, '); Add(':BASEIMPONIBLE, :DESCUENTO, '); - Add(':IMPORTEDESCUENTO, :IVA, :IMPORTEIVA, '); + Add(':IMPORTEDESCUENTO, :IVA, :IMPORTEIVA, :RE, :IMPORTERE,'); Add(':IMPORTETOTAL, :CODIGODOCUMENTO, :VIGENCIAPRESUPUESTO, '); Add(':OBSERVACIONES, :PLAZOENTREGA, :FORMAPAGO, :DESGLOSES, :AUMENTO) '); end; @@ -803,6 +817,8 @@ begin Add('IMPORTEDESCUENTO = :IMPORTEDESCUENTO, '); Add('IVA = :IVA, '); Add('IMPORTEIVA = :IMPORTEIVA, '); + Add('RE = :RE, '); + Add('IMPORTERE = :IMPORTERE, '); Add('IMPORTETOTAL = :IMPORTETOTAL, '); Add('VIGENCIAPRESUPUESTO = :VIGENCIAPRESUPUESTO, '); Add('OBSERVACIONES = :OBSERVACIONES, '); @@ -1072,7 +1088,7 @@ begin Add('OBSERVACIONES, VENDEDOR, '); Add('BASEIMPONIBLE, DESCUENTO, '); Add('IMPORTEDESCUENTO, IVA, '); - Add('IMPORTEIVA, IMPORTETOTAL, '); + Add('IMPORTEIVA, RE, IMPORTERE, IMPORTETOTAL, '); Add('VIGENCIAPRESUPUESTO, PLAZOENTREGA, '); Add('FORMAPAGO, DESGLOSES, AUMENTO) '); Add('SELECT ''' + CodigoAux + ''', current_date, '); @@ -1087,7 +1103,7 @@ begin Add('TELEFONO1, TELEFONO2, MOVIL1, MOVIL2, FAX, PERSONACONTACTO, '); Add('OBSERVACIONES, VENDEDOR, '); Add('BASEIMPONIBLE, DESCUENTO, IMPORTEDESCUENTO,'); - Add('IVA, IMPORTEIVA,'); + Add('IVA, IMPORTEIVA, RE, IMPORTERE,'); Add('IMPORTETOTAL, VIGENCIAPRESUPUESTO, PLAZOENTREGA, FORMAPAGO, '); Add('DESGLOSES, AUMENTO '); Add('from PRESUPUESTOSCLIENTE '); @@ -1386,6 +1402,8 @@ begin ImporteDescuento := FieldByName('IMPORTEDESCUENTO').AsDouble; Iva := FieldByName('IVA').AsInteger; ImporteIva := FieldByName('IMPORTEIVA').AsDouble; + Re := FieldByName('RE').AsInteger; + ImporteRe := FieldByName('IMPORTERE').AsDouble; ImporteTotal := FieldByName('IMPORTETOTAL').AsDouble; VigenciaPresupuesto := FieldByName('VIGENCIAPRESUPUESTO').AsDateTime; PlazoEntrega := FieldByName('PLAZOENTREGA').AsString; diff --git a/Clientes/ContratoCliente.dfm b/Clientes/ContratoCliente.dfm index 40aae50..81d1c5c 100644 --- a/Clientes/ContratoCliente.dfm +++ b/Clientes/ContratoCliente.dfm @@ -1,8 +1,8 @@ object frContratoCliente: TfrContratoCliente Left = 0 Top = 0 - Width = 853 - Height = 626 + Width = 630 + Height = 410 Color = 16383743 Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -17,7 +17,7 @@ object frContratoCliente: TfrContratoCliente object pnlTitulo: TRdxPanelTituloOperacion Left = 0 Top = 0 - Width = 853 + Width = 630 Height = 22 Caption = ' ' Color = 11590911 @@ -30,8 +30,8 @@ object frContratoCliente: TfrContratoCliente end object brSalir: TRdxBarraInferior Left = 0 - Top = 526 - Width = 853 + Top = 310 + Width = 630 Height = 50 Caption = ' ' ParentColor = True @@ -111,8 +111,8 @@ object frContratoCliente: TfrContratoCliente end object brGuardar: TRdxBarraInferior Left = 0 - Top = 576 - Width = 853 + Top = 360 + Width = 630 Height = 50 Caption = ' ' ParentColor = True @@ -265,8 +265,8 @@ object frContratoCliente: TfrContratoCliente object pnlCuerpo: TPanel Left = 0 Top = 22 - Width = 853 - Height = 504 + Width = 630 + Height = 288 Align = alClient BevelOuter = bvNone BorderWidth = 10 @@ -275,7 +275,7 @@ object frContratoCliente: TfrContratoCliente object pnlFactura: TAdvPanel Left = 10 Top = 10 - Width = 833 + Width = 610 Height = 79 Align = alTop BevelOuter = bvNone @@ -529,8 +529,8 @@ object frContratoCliente: TfrContratoCliente object pnlPaginas: TRdxPanel Left = 10 Top = 89 - Width = 833 - Height = 320 + Width = 610 + Height = 113 Caption = ' ' ParentColor = True ColorHighLight = 8623776 @@ -541,8 +541,8 @@ object frContratoCliente: TfrContratoCliente object Paginas: TRdxPagesControl Left = 0 Top = 0 - Width = 833 - Height = 320 + Width = 610 + Height = 113 ActivePage = pagContenido Align = alClient Font.Charset = DEFAULT_CHARSET @@ -1117,8 +1117,8 @@ object frContratoCliente: TfrContratoCliente object pnlGridArticulos: TPanel Left = 0 Top = 0 - Width = 825 - Height = 292 + Width = 602 + Height = 85 Align = alClient BevelOuter = bvNone BorderWidth = 5 @@ -1128,7 +1128,7 @@ object frContratoCliente: TfrContratoCliente object pnlBarraContenido: TRdxPanel Left = 5 Top = 31 - Width = 815 + Width = 592 Height = 26 Caption = ' ' ParentColor = True @@ -1246,8 +1246,8 @@ object frContratoCliente: TfrContratoCliente object gridDetalles: TcxGrid Left = 5 Top = 57 - Width = 815 - Height = 153 + Width = 592 + Height = 193 Align = alClient BevelInner = bvNone BevelKind = bkFlat @@ -1340,7 +1340,7 @@ object frContratoCliente: TfrContratoCliente object pnlBarraPropiedades: TRdxPanel Left = 5 Top = 5 - Width = 815 + Width = 592 Height = 26 Caption = ' ' ParentColor = True @@ -1543,8 +1543,8 @@ object frContratoCliente: TfrContratoCliente end object pnlObservaciones: TRdxPanel Left = 5 - Top = 210 - Width = 815 + Top = 3 + Width = 592 Height = 77 Caption = ' ' ParentColor = True @@ -1556,7 +1556,7 @@ object frContratoCliente: TfrContratoCliente object Label1: TLabel Left = 0 Top = 0 - Width = 815 + Width = 592 Height = 22 Align = alTop AutoSize = False @@ -1578,7 +1578,7 @@ object frContratoCliente: TfrContratoCliente TabOrder = 0 OnExit = ObservacionesExit Height = 55 - Width = 815 + Width = 592 end end end @@ -1763,7 +1763,7 @@ object frContratoCliente: TfrContratoCliente object pnlFormasPago: TPanel Left = 0 Top = 0 - Width = 825 + Width = 602 Height = 100 Align = alTop BevelOuter = bvNone @@ -1798,7 +1798,7 @@ object frContratoCliente: TfrContratoCliente object RdxPanel5: TPanel Left = 125 Top = 0 - Width = 700 + Width = 477 Height = 100 Align = alClient BevelOuter = bvNone @@ -1818,14 +1818,14 @@ object frContratoCliente: TfrContratoCliente Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoClaro TabOrder = 0 Height = 80 - Width = 680 + Width = 457 end end end object pnlPlazosEntrega: TPanel Left = 0 Top = 100 - Width = 825 + Width = 602 Height = 100 Align = alTop BevelOuter = bvNone @@ -1860,7 +1860,7 @@ object frContratoCliente: TfrContratoCliente object Panel3: TPanel Left = 125 Top = 0 - Width = 700 + Width = 477 Height = 100 Align = alClient BevelOuter = bvNone @@ -1880,14 +1880,14 @@ object frContratoCliente: TfrContratoCliente Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoClaro TabOrder = 0 Height = 80 - Width = 680 + Width = 457 end end end object pnlNota: TPanel Left = 0 Top = 200 - Width = 825 + Width = 602 Height = 100 Align = alTop BevelOuter = bvNone @@ -1922,7 +1922,7 @@ object frContratoCliente: TfrContratoCliente object Panel5: TPanel Left = 125 Top = 0 - Width = 700 + Width = 477 Height = 100 Align = alClient BevelOuter = bvNone @@ -1942,7 +1942,7 @@ object frContratoCliente: TfrContratoCliente Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoClaro TabOrder = 0 Height = 80 - Width = 680 + Width = 457 end end end @@ -2126,9 +2126,9 @@ object frContratoCliente: TfrContratoCliente end object pnlImportes: TAdvPanel Left = 10 - Top = 409 - Width = 833 - Height = 85 + Top = 202 + Width = 610 + Height = 76 Align = alBottom BevelOuter = bvNone Color = 16383743 @@ -2206,175 +2206,274 @@ object frContratoCliente: TfrContratoCliente TopIndent = 0 URLColor = clBlue FullHeight = 38 - object Label7: TLabel - Left = 66 - Top = 13 - Width = 74 - Height = 13 - Caption = 'Descuento(%):' - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - end - object Label8: TLabel - Left = 228 - Top = 13 - Width = 40 - Height = 13 - Alignment = taRightJustify - Caption = 'IVA(%):' - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - end - object Label5: TLabel - Left = 22 - Top = 39 - Width = 70 - Height = 13 - Alignment = taRightJustify - Caption = 'Base imponible' - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - end - object Label10: TLabel - Left = 133 - Top = 39 - Width = 72 - Height = 13 - Alignment = taRightJustify - Caption = 'Importe de dto' - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - end - object Label11: TLabel - Left = 228 - Top = 39 - Width = 73 - Height = 13 - Alignment = taRightJustify - Caption = 'Importe de IVA' - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - end - object Label9: TLabel - Left = 338 - Top = 39 - Width = 77 - Height = 13 - Alignment = taRightJustify - Caption = 'Importe total' - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [fsBold] - ParentFont = False - end - object Descuento: TcxDBTextEdit - Left = 145 - Top = 9 - DataBinding.DataField = 'DESCUENTO' - DataBinding.DataSource = dsContrato - ParentFont = False - Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro + object Panel1: TPanel + Left = 116 + Top = 0 + Width = 494 + Height = 76 + Align = alRight + BevelOuter = bvNone + BorderWidth = 5 + ParentColor = True TabOrder = 0 - Width = 57 + object RdxPanel1: TRdxPanel + Left = 5 + Top = 5 + Width = 484 + Height = 66 + BorderStyle = bsSingle + Caption = ' ' + BorderWidth = 1 + Color = 15726583 + ColorHighLight = 8623776 + ColorShadow = 8623776 + Align = alClient + TabOrder = 0 + UseDockManager = True + object Label5: TLabel + Left = 135 + Top = 10 + Width = 70 + Height = 13 + Alignment = taRightJustify + Caption = 'Base imponible' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + end + object Label9: TLabel + Left = 400 + Top = 10 + Width = 77 + Height = 13 + Alignment = taRightJustify + Caption = 'Importe total' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [fsBold] + ParentFont = False + end + object Label10: TLabel + Left = 29 + Top = 10 + Width = 76 + Height = 13 + Alignment = taRightJustify + Caption = 'Importe de dto.' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + end + object Label11: TLabel + Left = 234 + Top = 10 + Width = 73 + Height = 13 + Alignment = taRightJustify + Caption = 'Importe de IVA' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + end + object Shape2: TShape + Left = 16 + Top = 29 + Width = 465 + Height = 1 + end + object Label4: TLabel + Left = 319 + Top = 10 + Width = 69 + Height = 13 + Alignment = taRightJustify + Caption = 'Importe de RE' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + end + object BaseImponible: TcxDBTextEdit + Left = 95 + Top = 37 + TabStop = False + AutoSize = False + DataBinding.DataField = 'BASEIMPONIBLE' + DataBinding.DataSource = dsContrato + Properties.Alignment.Horz = taRightJustify + Properties.ReadOnly = True + Style.BorderStyle = ebsNone + Style.Color = 15726583 + Style.HotTrack = False + TabOrder = 0 + Height = 21 + Width = 110 + end + object ImporteDescuento: TcxDBTextEdit + Left = 26 + Top = 37 + TabStop = False + AutoSize = False + DataBinding.DataField = 'IMPORTEDESCUENTO' + DataBinding.DataSource = dsContrato + Properties.Alignment.Horz = taRightJustify + Properties.ReadOnly = True + Style.BorderStyle = ebsNone + Style.Color = 15726583 + Style.HotTrack = False + TabOrder = 1 + Height = 21 + Width = 79 + end + object ImporteIVA: TcxDBTextEdit + Left = 231 + Top = 37 + TabStop = False + AutoSize = False + DataBinding.DataField = 'IMPORTEIVA' + DataBinding.DataSource = dsContrato + Properties.Alignment.Horz = taRightJustify + Properties.ReadOnly = True + Style.BorderStyle = ebsNone + Style.Color = 15726583 + Style.HotTrack = False + TabOrder = 2 + Height = 21 + Width = 76 + end + object ImporteTotal: TcxDBTextEdit + Left = 380 + Top = 37 + TabStop = False + AutoSize = False + DataBinding.DataField = 'IMPORTETOTAL' + DataBinding.DataSource = dsContrato + ParentFont = False + Properties.Alignment.Horz = taRightJustify + Properties.ReadOnly = True + Style.BorderStyle = ebsNone + Style.Color = 15726583 + Style.Font.Charset = DEFAULT_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -11 + Style.Font.Name = 'Tahoma' + Style.Font.Style = [fsBold] + Style.HotTrack = False + Style.IsFontAssigned = True + TabOrder = 3 + Height = 21 + Width = 98 + end + object ImporteRE: TcxDBTextEdit + Left = 312 + Top = 37 + TabStop = False + AutoSize = False + DataBinding.DataField = 'IMPORTERE' + DataBinding.DataSource = dsContrato + Properties.Alignment.Horz = taRightJustify + Properties.ReadOnly = True + Style.BorderStyle = ebsNone + Style.Color = 15726583 + Style.HotTrack = False + TabOrder = 4 + Height = 21 + Width = 76 + end + end end - object IVA: TcxDBTextEdit - Left = 271 - Top = 9 - DataBinding.DataField = 'IVA' - DataBinding.DataSource = dsContrato - ParentFont = False - Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro + object Panel6: TPanel + Left = 0 + Top = 0 + Width = 116 + Height = 76 + Align = alClient + Alignment = taLeftJustify + BevelOuter = bvNone + ParentColor = True TabOrder = 1 - Width = 57 - end - object BaseImponible: TcxDBTextEdit - Left = 2 - Top = 59 - TabStop = False - DataBinding.DataField = 'BASEIMPONIBLE' - DataBinding.DataSource = dsContrato - Properties.Alignment.Horz = taRightJustify - Properties.AutoSelect = False - Properties.ReadOnly = True - Style.BorderStyle = ebsNone - Style.Color = 15726583 - Style.HotTrack = False - TabOrder = 2 - Width = 90 - end - object ImporteDescuento: TcxDBTextEdit - Left = 115 - Top = 59 - TabStop = False - DataBinding.DataField = 'IMPORTEDESCUENTO' - DataBinding.DataSource = dsContrato - Properties.Alignment.Horz = taRightJustify - Properties.AutoSelect = False - Properties.ReadOnly = True - Style.BorderStyle = ebsNone - Style.Color = 15726583 - Style.HotTrack = False - TabOrder = 3 - Width = 90 - end - object ImporteIVA: TcxDBTextEdit - Left = 211 - Top = 59 - TabStop = False - DataBinding.DataField = 'IMPORTEIVA' - DataBinding.DataSource = dsContrato - Properties.Alignment.Horz = taRightJustify - Properties.AutoSelect = False - Properties.ReadOnly = True - Style.BorderStyle = ebsNone - Style.Color = 15726583 - Style.HotTrack = False - TabOrder = 4 - Width = 90 - end - object ImporteTotal: TcxDBTextEdit - Left = 325 - Top = 59 - TabStop = False - DataBinding.DataField = 'IMPORTETOTAL' - DataBinding.DataSource = dsContrato - ParentFont = False - Properties.Alignment.Horz = taRightJustify - Properties.AutoSelect = False - Properties.ReadOnly = True - Style.BorderStyle = ebsNone - Style.Color = 15726583 - Style.Font.Charset = DEFAULT_CHARSET - Style.Font.Color = clWindowText - Style.Font.Height = -11 - Style.Font.Name = 'Tahoma' - Style.Font.Style = [fsBold] - Style.HotTrack = False - Style.IsFontAssigned = True - TabOrder = 5 - Width = 90 + object Label7: TLabel + Left = 8 + Top = 50 + Width = 74 + Height = 13 + Caption = 'Descuento(%):' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + end + object Label8: TLabel + Left = 157 + Top = 50 + Width = 40 + Height = 13 + Alignment = taRightJustify + Caption = 'IVA(%):' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + end + object cbRecargoEquivalencia: TcxCheckBox + Left = 8 + Top = 14 + Caption = 'Acogido al recargo de equivalencia' + ParentColor = False + ParentFont = False + Properties.NullStyle = nssUnchecked + Properties.OnChange = cbRecargoEquivalenciaPropertiesChange + Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoClaro + TabOrder = 0 + Width = 193 + end + object Descuento: TcxDBTextEdit + Left = 85 + Top = 46 + DataBinding.DataField = 'DESCUENTO' + DataBinding.DataSource = dsContrato + ParentFont = False + Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro + TabOrder = 1 + Width = 57 + end + object IVA: TcxDBTextEdit + Left = 203 + Top = 46 + DataBinding.DataField = 'IVA' + DataBinding.DataSource = dsContrato + ParentFont = False + Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro + TabOrder = 2 + Width = 57 + end + object RecargoEquivalencia: TcxDBTextEdit + Left = 203 + Top = 14 + DataBinding.DataField = 'RE' + DataBinding.DataSource = dsContrato + ParentFont = False + Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro + TabOrder = 3 + Width = 57 + end end end end diff --git a/Clientes/ContratoCliente.pas b/Clientes/ContratoCliente.pas index 728ed3f..fb7ec27 100644 --- a/Clientes/ContratoCliente.pas +++ b/Clientes/ContratoCliente.pas @@ -52,7 +52,7 @@ uses cxDBLookupEdit, cxDBLookupComboBox, TablaDocumentos, TablaPropiedades, RdxEmpresaActiva, am2000utils, cxCurrencyEdit, RXCtrls, Mask, dbcgrids, cxDataStorage, JvExForms, JvBaseThumbnail, JvThumbViews, JvExComCtrls, - JvComCtrls, Dialogs; + JvComCtrls, Dialogs, cxCheckBox; type TfrContratoCliente = class(TRdxFrameContratos) @@ -114,7 +114,6 @@ type FormasPago: TcxDBMemo; dsPropiedadesContrato: TDataSource; eDocumento: TLabel; - pnlImportes: TAdvPanel; cbxDocumento: TcxDBLookupComboBox; dsDocumentos: TDataSource; TablaDocumentos: TIBQuery; @@ -125,10 +124,6 @@ type TablaValores: TIBQuery; dsValores: TDataSource; dsPropiedades: TDataSource; - Label7: TLabel; - Descuento: TcxDBTextEdit; - Label8: TLabel; - IVA: TcxDBTextEdit; actAnadirPropiedad: TAction; actEliminarPropiedad: TAction; pnlBarraPropiedades: TRdxPanel; @@ -145,14 +140,6 @@ type DBEdit1: TDBEdit; DBEdit2: TDBEdit; pnlGrid: TRdxPanel; - Label5: TLabel; - Label10: TLabel; - Label11: TLabel; - Label9: TLabel; - BaseImponible: TcxDBTextEdit; - ImporteDescuento: TcxDBTextEdit; - ImporteIVA: TcxDBTextEdit; - ImporteTotal: TcxDBTextEdit; eSeccion: TLabel; Seccion: TcxComboBox; pnlObservaciones: TRdxPanel; @@ -190,6 +177,27 @@ type RdxBoton6: TRdxBoton; tvPlanos: TJvThumbView; OpenDialog1: TOpenDialog; + pnlImportes: TAdvPanel; + Panel1: TPanel; + RdxPanel1: TRdxPanel; + Label5: TLabel; + Label9: TLabel; + Label10: TLabel; + Label11: TLabel; + Shape2: TShape; + Label4: TLabel; + BaseImponible: TcxDBTextEdit; + ImporteDescuento: TcxDBTextEdit; + ImporteIVA: TcxDBTextEdit; + ImporteTotal: TcxDBTextEdit; + ImporteRE: TcxDBTextEdit; + Panel6: TPanel; + Label7: TLabel; + Label8: TLabel; + cbRecargoEquivalencia: TcxCheckBox; + Descuento: TcxDBTextEdit; + IVA: TcxDBTextEdit; + RecargoEquivalencia: TcxDBTextEdit; procedure bSalirClick(Sender: TObject); procedure bGuardarClick(Sender: TObject); procedure bCancelarClick(Sender: TObject); @@ -238,6 +246,7 @@ type procedure actAnadirPlanoUpdate(Sender: TObject); procedure tvPlanosDblClick(Sender: TObject); procedure JvTrackBar1Change(Sender: TObject); + procedure cbRecargoEquivalenciaPropertiesChange(Sender: TObject); private FRootPlanos: Variant; FDirectorio: Variant; @@ -275,6 +284,7 @@ type procedure ProvinciaSetText(Sender: TField; const Text: String); procedure IVASetText(Sender: TField; const Text: String); procedure DtoSetText(Sender: TField; const Text: String); + procedure RESetText(Sender: TField; const Text: String); procedure CodigoArticuloDetalleSetText(Sender: TField; const Text: String); procedure ReferenciaArticuloDetalleSetText(Sender: TField; const Text: String); procedure CantidadDetalleSetText(Sender: TField; const Text: String); @@ -365,6 +375,8 @@ begin CodCliente.Properties.Buttons[0].Visible := True; Poblacion.Properties.Buttons[0].Visible := True; Provincia.Properties.Buttons[0].Visible := True; + cbRecargoEquivalencia.Checked := False; + RecargoEquivalencia.Enabled := False; DesactivarEventosCampos; try @@ -421,7 +433,8 @@ begin dmTablaContratos.InicializarTablaContratos(@TablaContratos); dmTablaContratos.InicializarTablaDetalles(@TablaDetallesMem); - + cbRecargoEquivalencia.Properties.ReadOnly := False; + ActivarEdicionGridDetalles(VistaDetalles); cbxDocumento.DataBinding.Field.AsString := dmTablaDocumentos.DarCodigoDocumento(Entidad); @@ -525,6 +538,10 @@ begin DeshabilitarPlanos; end;} + cbRecargoEquivalencia.Checked := TablaContratos.FieldByName('RE').AsFloat > 0; + RecargoEquivalencia.Enabled := TablaContratos.FieldByName('RE').AsFloat > 0; + cbRecargoEquivalencia.Properties.ReadOnly := True; + FechaContrato.SetFocus; except on E : EIBError do @@ -592,6 +609,10 @@ begin DeshabilitarPlanos; end;} + cbRecargoEquivalencia.Checked := TablaContratos.FieldByName('RE').AsFloat > 0; + RecargoEquivalencia.Enabled := TablaContratos.FieldByName('RE').AsFloat > 0; + cbRecargoEquivalencia.Properties.ReadOnly := True; + Visible := True; except on E : EIBError do @@ -655,6 +676,10 @@ begin end; end; + cbRecargoEquivalencia.Checked := TablaContratos.FieldByName('RE').AsFloat > 0; + RecargoEquivalencia.Enabled := TablaContratos.FieldByName('RE').AsFloat > 0; + cbRecargoEquivalencia.Properties.ReadOnly := False; + ActivarEventosCampos; ConfigurarPantallaDocumento; Visible := True; @@ -841,13 +866,16 @@ end; procedure TfrContratoCliente.CalcularTotalContrato; var + ImporteNeto, BaseImponible, + ImporteRE, ImporteIVA, ImporteDto, ImporteTotal : Double; FDetallesBookmark : string; begin - BaseImponible := 0; + ImporteNeto := 0; //Total de los articulos + BaseImponible := 0; //Importe neto una vez aplicado el dto ImporteTotal := 0; with TablaDetallesMem do begin @@ -856,19 +884,22 @@ begin try First; while not EOF do begin - BaseImponible := BaseImponible + FieldByName('IMPORTETOTAL').AsFloat; + ImporteNeto := ImporteNeto + FieldByName('IMPORTETOTAL').AsFloat; Next; end; - ImporteDto := BaseImponible * (TablaContratos.FieldByName('DESCUENTO').AsFloat/100); - ImporteTotal := BaseImponible - ImporteDto; - ImporteIVA := ImporteTotal * (TablaContratos.FieldByName('IVA').AsFloat/100); - ImporteTotal := ImporteTotal + ImporteIVA; + ImporteDto := ImporteNeto * (TablaContratos.FieldByName('DESCUENTO').AsFloat/100); + BaseImponible := ImporteNeto - ImporteDto; + + ImporteRE := BaseImponible * (TablaContratos.FieldByName('RE').AsFloat/100); + ImporteIVA := BaseImponible * (TablaContratos.FieldByName('IVA').AsFloat/100); + ImporteTotal := BaseImponible + ImporteIVA + ImporteRE; TablaContratos.Edit; TablaContratos.FieldByName('BASEIMPONIBLE').AsFloat := BaseImponible; TablaContratos.FieldByName('IMPORTEDESCUENTO').AsFloat := ImporteDto; TablaContratos.FieldByName('IMPORTEIVA').AsFloat := ImporteIVA; + TablaContratos.FieldByName('IMPORTERE').AsFloat := ImporteRE; TablaContratos.FieldByName('IMPORTETOTAL').AsFloat := ImporteTotal; finally Bookmark := FDetallesBookmark; @@ -1467,11 +1498,14 @@ end; procedure TfrContratoCliente.ActivarEventosCampos; begin + cbRecargoEquivalencia.Properties.OnChange := cbRecargoEquivalenciaPropertiesChange; + with TablaContratos do begin FieldByName('CODIGOCLIENTE').OnSetText := CodCliSetText; FieldByName('IVA').OnSetText := IVASetText; FieldByName('DESCUENTO').OnSetText := DtoSetText; + FieldByName('RE').OnSetText := RESetText; end; with TablaDetallesMem do @@ -1931,6 +1965,8 @@ end; procedure TfrContratoCliente.DesactivarEventosCampos; begin + cbRecargoEquivalencia.Properties.OnChange := NIL; + with TablaContratos do begin if FindField('CODIGOCLIENTE') <> NIL then @@ -1939,6 +1975,8 @@ begin FieldByName('IVA').OnSetText := NIL; if FindField('DESCUENTO') <> NIL then FieldByName('DESCUENTO').OnSetText := NIL; + if FindField('RE') <> NIL then + FieldByName('RE').OnSetText := NIL; end; with TablaDetallesMem do @@ -2626,5 +2664,26 @@ begin gridDetalles.SetFocus; end; +procedure TfrContratoCliente.cbRecargoEquivalenciaPropertiesChange(Sender: TObject); +begin + RecargoEquivalencia.Enabled := cbRecargoEquivalencia.Checked; + if not cbRecargoEquivalencia.Checked then + begin + RecargoEquivalencia.DataBinding.Field.Value := Null; + CalcularTotalContrato; + end; +end; + +procedure TfrContratoCliente.RESetText(Sender: TField; const Text: String); +begin + if EsCadenaVacia(Text) then + Sender.AsString := '0' + else begin + ValidarDto(Text); + Sender.AsString := Text; + end; + CalcularTotalContrato; +end; + end. diff --git a/Clientes/FacturaCliente.dfm b/Clientes/FacturaCliente.dfm index 0cc77dd..8a51e8f 100644 --- a/Clientes/FacturaCliente.dfm +++ b/Clientes/FacturaCliente.dfm @@ -1,8 +1,8 @@ object frFacturaCliente: TfrFacturaCliente Left = 0 Top = 0 - Width = 954 - Height = 639 + Width = 630 + Height = 410 Color = 16383743 Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -17,7 +17,7 @@ object frFacturaCliente: TfrFacturaCliente object Titulo: TRdxPanelTituloOperacion Left = 0 Top = 0 - Width = 954 + Width = 630 Height = 22 Caption = ' ' Color = 11590911 @@ -30,8 +30,8 @@ object frFacturaCliente: TfrFacturaCliente end object brSalir: TRdxBarraInferior Left = 0 - Top = 539 - Width = 954 + Top = 310 + Width = 630 Height = 50 Caption = ' ' ParentColor = True @@ -111,8 +111,8 @@ object frFacturaCliente: TfrFacturaCliente end object brGuardar: TRdxBarraInferior Left = 0 - Top = 589 - Width = 954 + Top = 360 + Width = 630 Height = 50 Caption = ' ' ParentColor = True @@ -265,8 +265,8 @@ object frFacturaCliente: TfrFacturaCliente object pnlCuerpo: TPanel Left = 0 Top = 22 - Width = 954 - Height = 517 + Width = 630 + Height = 288 Align = alClient BevelOuter = bvNone BorderWidth = 10 @@ -275,7 +275,7 @@ object frFacturaCliente: TfrFacturaCliente object pnlDatosFactura: TAdvPanel Left = 10 Top = 10 - Width = 934 + Width = 610 Height = 121 Align = alTop BevelOuter = bvNone @@ -593,8 +593,8 @@ object frFacturaCliente: TfrFacturaCliente object pnlGrid: TAdvPanel Left = 10 Top = 131 - Width = 934 - Height = 300 + Width = 610 + Height = 71 Align = alClient BevelOuter = bvNone TabOrder = 1 @@ -660,8 +660,8 @@ object frFacturaCliente: TfrFacturaCliente object Paginas: TRdxPagesControl Left = 0 Top = 0 - Width = 934 - Height = 300 + Width = 610 + Height = 71 ActivePage = pagCliente Align = alClient Font.Charset = DEFAULT_CHARSET @@ -1236,8 +1236,8 @@ object frFacturaCliente: TfrFacturaCliente object pnlGridArticulos: TPanel Left = 0 Top = 0 - Width = 926 - Height = 272 + Width = 602 + Height = 43 Align = alClient BevelOuter = bvNone BorderWidth = 10 @@ -1247,7 +1247,7 @@ object frFacturaCliente: TfrFacturaCliente object pnlBarraGrid: TRdxPanel Left = 10 Top = 10 - Width = 906 + Width = 582 Height = 26 Caption = ' ' ParentColor = True @@ -1401,7 +1401,7 @@ object frFacturaCliente: TfrFacturaCliente object gridDetalles: TcxGrid Left = 10 Top = 36 - Width = 906 + Width = 582 Height = 226 Align = alClient BevelInner = bvNone @@ -1435,6 +1435,7 @@ object frFacturaCliente: TfrFacturaCliente OptionsView.GroupByBox = False OptionsView.HeaderEndEllipsis = True OptionsView.Indicator = True + OptionsView.NewItemRowInfoText = 'Click here to add a new row' OptionsView.RowSeparatorColor = 14280169 Styles.StyleSheet = dmConfiguracion.StyleSheetGrid end @@ -1447,6 +1448,7 @@ object frFacturaCliente: TfrFacturaCliente DataController.Summary.FooterSummaryItems = <> DataController.Summary.SummaryGroups = <> OptionsView.GroupByBox = False + OptionsView.NewItemRowInfoText = 'Click here to add a new row' Styles.StyleSheet = dmConfiguracion.StyleSheetGrid end object gridDetallesLevel1: TcxGridLevel @@ -1462,7 +1464,7 @@ object frFacturaCliente: TfrFacturaCliente Left = 0 Top = 0 Width = 125 - Height = 272 + Height = 43 Align = alLeft BevelOuter = bvNone Caption = ' ' @@ -1487,8 +1489,8 @@ object frFacturaCliente: TfrFacturaCliente object RdxPanel5: TPanel Left = 125 Top = 0 - Width = 801 - Height = 272 + Width = 477 + Height = 43 Align = alClient BevelOuter = bvNone BorderWidth = 10 @@ -1506,8 +1508,8 @@ object frFacturaCliente: TfrFacturaCliente Properties.ScrollBars = ssVertical Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoClaro TabOrder = 0 - Height = 252 - Width = 781 + Height = 23 + Width = 457 end end end @@ -1515,8 +1517,8 @@ object frFacturaCliente: TfrFacturaCliente end object pnlImportes: TAdvPanel Left = 10 - Top = 431 - Width = 934 + Top = 202 + Width = 610 Height = 76 Align = alBottom BevelOuter = bvNone @@ -1596,9 +1598,9 @@ object frFacturaCliente: TfrFacturaCliente URLColor = clBlue FullHeight = 38 object Panel1: TPanel - Left = 500 + Left = 116 Top = 0 - Width = 434 + Width = 494 Height = 76 Align = alRight BevelOuter = bvNone @@ -1608,7 +1610,7 @@ object frFacturaCliente: TfrFacturaCliente object RdxPanel1: TRdxPanel Left = 5 Top = 5 - Width = 424 + Width = 484 Height = 66 BorderStyle = bsSingle Caption = ' ' @@ -1620,7 +1622,7 @@ object frFacturaCliente: TfrFacturaCliente TabOrder = 0 UseDockManager = True object Label5: TLabel - Left = 52 + Left = 135 Top = 10 Width = 70 Height = 13 @@ -1634,7 +1636,7 @@ object frFacturaCliente: TfrFacturaCliente ParentFont = False end object Label9: TLabel - Left = 332 + Left = 400 Top = 10 Width = 77 Height = 13 @@ -1648,7 +1650,7 @@ object frFacturaCliente: TfrFacturaCliente ParentFont = False end object Label10: TLabel - Left = 145 + Left = 29 Top = 10 Width = 76 Height = 13 @@ -1662,7 +1664,7 @@ object frFacturaCliente: TfrFacturaCliente ParentFont = False end object Label11: TLabel - Left = 238 + Left = 234 Top = 10 Width = 73 Height = 13 @@ -1678,11 +1680,25 @@ object frFacturaCliente: TfrFacturaCliente object Shape2: TShape Left = 16 Top = 29 - Width = 394 + Width = 465 Height = 1 end + object Label4: TLabel + Left = 319 + Top = 10 + Width = 69 + Height = 13 + Alignment = taRightJustify + Caption = 'Importe de RE' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + end object BaseImponible: TcxDBTextEdit - Left = 12 + Left = 95 Top = 37 TabStop = False AutoSize = False @@ -1698,7 +1714,7 @@ object frFacturaCliente: TfrFacturaCliente Width = 110 end object ImporteDescuento: TcxDBTextEdit - Left = 142 + Left = 26 Top = 37 TabStop = False AutoSize = False @@ -1714,7 +1730,7 @@ object frFacturaCliente: TfrFacturaCliente Width = 79 end object ImporteIVA: TcxDBTextEdit - Left = 235 + Left = 231 Top = 37 TabStop = False AutoSize = False @@ -1730,7 +1746,7 @@ object frFacturaCliente: TfrFacturaCliente Width = 76 end object ImporteTotal: TcxDBTextEdit - Left = 312 + Left = 380 Top = 37 TabStop = False AutoSize = False @@ -1752,12 +1768,28 @@ object frFacturaCliente: TfrFacturaCliente Height = 21 Width = 98 end + object ImporteRE: TcxDBTextEdit + Left = 312 + Top = 37 + TabStop = False + AutoSize = False + DataBinding.DataField = 'IMPORTERE' + DataBinding.DataSource = dsFactura + Properties.Alignment.Horz = taRightJustify + Properties.ReadOnly = True + Style.BorderStyle = ebsNone + Style.Color = 15726583 + Style.HotTrack = False + TabOrder = 4 + Height = 21 + Width = 76 + end end end object Panel2: TPanel Left = 0 Top = 0 - Width = 500 + Width = 116 Height = 76 Align = alClient Alignment = taLeftJustify diff --git a/Clientes/FacturaCliente.pas b/Clientes/FacturaCliente.pas index 7fa439f..fe3ad59 100644 --- a/Clientes/FacturaCliente.pas +++ b/Clientes/FacturaCliente.pas @@ -167,6 +167,8 @@ type cbxTrimestres: TcxComboBox; eTrimestreCerrado: TLabel; cbComisiones: TcxDBCheckBox; + Label4: TLabel; + ImporteRE: TcxDBTextEdit; procedure bCancelarClick(Sender: TObject); procedure bSalirClick(Sender: TObject); procedure bGuardarClick(Sender: TObject); @@ -740,6 +742,7 @@ end; procedure TfrFacturaCliente.CalcularTotalFactura; var + ImporteNeto, BaseImponible, ImporteRE, ImporteIVA, @@ -747,7 +750,8 @@ var ImporteTotal : Double; FDetallesBookmark : string; begin - BaseImponible := 0; + ImporteNeto := 0; //Total de los articulos + BaseImponible := 0; //Importe neto una vez aplicado el dto ImporteTotal := 0; with TablaDetallesMem do begin @@ -756,15 +760,16 @@ begin try First; while not EOF do begin - BaseImponible := BaseImponible + FieldByName('IMPORTETOTAL').AsFloat; + ImporteNeto := ImporteNeto + FieldByName('IMPORTETOTAL').AsFloat; Next; end; + ImporteDto := ImporteNeto * (TablaFacturas.FieldByName('DESCUENTO').AsFloat/100); + BaseImponible := ImporteNeto - ImporteDto; + ImporteRE := BaseImponible * (TablaFacturas.FieldByName('RE').AsFloat/100); - ImporteDto := BaseImponible * (TablaFacturas.FieldByName('DESCUENTO').AsFloat/100); - ImporteTotal := BaseImponible - ImporteDto; - ImporteIVA := ImporteTotal * (TablaFacturas.FieldByName('IVA').AsFloat/100); - ImporteTotal := ImporteTotal + ImporteIVA + ImporteRE; + ImporteIVA := BaseImponible * (TablaFacturas.FieldByName('IVA').AsFloat/100); + ImporteTotal := BaseImponible + ImporteIVA + ImporteRE; TablaFacturas.FieldByName('BASEIMPONIBLE').AsFloat := BaseImponible; TablaFacturas.FieldByName('IMPORTEDESCUENTO').AsFloat := ImporteDto; diff --git a/Clientes/FacturaProforma.dfm b/Clientes/FacturaProforma.dfm index 1ffdcb4..0b0a4bb 100644 --- a/Clientes/FacturaProforma.dfm +++ b/Clientes/FacturaProforma.dfm @@ -1,8 +1,8 @@ object frFacturaProforma: TfrFacturaProforma Left = 0 Top = 0 - Width = 736 - Height = 643 + Width = 630 + Height = 410 Color = 16383743 Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -17,7 +17,7 @@ object frFacturaProforma: TfrFacturaProforma object Titulo: TRdxPanelTituloOperacion Left = 0 Top = 0 - Width = 736 + Width = 630 Height = 22 Caption = ' ' Color = 11590911 @@ -30,8 +30,8 @@ object frFacturaProforma: TfrFacturaProforma end object brSalir: TRdxBarraInferior Left = 0 - Top = 543 - Width = 736 + Top = 310 + Width = 630 Height = 50 Caption = ' ' ParentColor = True @@ -111,8 +111,8 @@ object frFacturaProforma: TfrFacturaProforma end object brGuardar: TRdxBarraInferior Left = 0 - Top = 593 - Width = 736 + Top = 360 + Width = 630 Height = 50 Caption = ' ' ParentColor = True @@ -265,8 +265,8 @@ object frFacturaProforma: TfrFacturaProforma object pnlCuerpo: TPanel Left = 0 Top = 22 - Width = 736 - Height = 521 + Width = 630 + Height = 288 Align = alClient BevelOuter = bvNone BorderWidth = 10 @@ -275,7 +275,7 @@ object frFacturaProforma: TfrFacturaProforma object pnlDatosFactura: TAdvPanel Left = 10 Top = 10 - Width = 716 + Width = 610 Height = 121 Align = alTop BevelOuter = bvNone @@ -488,8 +488,8 @@ object frFacturaProforma: TfrFacturaProforma object pnlGrid: TAdvPanel Left = 10 Top = 131 - Width = 716 - Height = 304 + Width = 610 + Height = 71 Align = alClient BevelOuter = bvNone TabOrder = 1 @@ -555,8 +555,8 @@ object frFacturaProforma: TfrFacturaProforma object Paginas: TRdxPagesControl Left = 0 Top = 0 - Width = 716 - Height = 304 + Width = 610 + Height = 71 ActivePage = pagContenido Align = alClient Font.Charset = DEFAULT_CHARSET @@ -1131,8 +1131,8 @@ object frFacturaProforma: TfrFacturaProforma object pnlGridArticulos: TPanel Left = 0 Top = 0 - Width = 708 - Height = 276 + Width = 602 + Height = 43 Align = alClient BevelOuter = bvNone BorderWidth = 10 @@ -1142,7 +1142,7 @@ object frFacturaProforma: TfrFacturaProforma object pnlBarraGrid: TPanel Left = 10 Top = 10 - Width = 688 + Width = 582 Height = 28 Align = alTop BevelOuter = bvNone @@ -1258,8 +1258,8 @@ object frFacturaProforma: TfrFacturaProforma object gridDetalles: TcxGrid Left = 10 Top = 38 - Width = 688 - Height = 228 + Width = 582 + Height = 250 Align = alClient BevelInner = bvNone BevelKind = bkFlat @@ -1307,7 +1307,7 @@ object frFacturaProforma: TfrFacturaProforma Left = 0 Top = 0 Width = 125 - Height = 276 + Height = 43 Align = alLeft BevelOuter = bvNone Caption = ' ' @@ -1332,8 +1332,8 @@ object frFacturaProforma: TfrFacturaProforma object RdxPanel5: TPanel Left = 125 Top = 0 - Width = 583 - Height = 276 + Width = 477 + Height = 43 Align = alClient BevelOuter = bvNone BorderWidth = 10 @@ -1351,8 +1351,8 @@ object frFacturaProforma: TfrFacturaProforma Properties.ScrollBars = ssVertical Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoClaro TabOrder = 0 - Height = 256 - Width = 563 + Height = 23 + Width = 457 end end end @@ -1360,8 +1360,8 @@ object frFacturaProforma: TfrFacturaProforma end object pnlImportes: TAdvPanel Left = 10 - Top = 435 - Width = 716 + Top = 202 + Width = 610 Height = 76 Align = alBottom BevelOuter = bvNone @@ -1441,9 +1441,9 @@ object frFacturaProforma: TfrFacturaProforma URLColor = clBlue FullHeight = 38 object Panel1: TPanel - Left = 282 + Left = 89 Top = 0 - Width = 434 + Width = 521 Height = 76 Align = alRight BevelOuter = bvNone @@ -1453,7 +1453,7 @@ object frFacturaProforma: TfrFacturaProforma object RdxPanel1: TRdxPanel Left = 5 Top = 5 - Width = 424 + Width = 511 Height = 66 BorderStyle = bsSingle Caption = ' ' @@ -1465,7 +1465,7 @@ object frFacturaProforma: TfrFacturaProforma TabOrder = 0 UseDockManager = True object Label5: TLabel - Left = 52 + Left = 131 Top = 10 Width = 70 Height = 13 @@ -1479,7 +1479,7 @@ object frFacturaProforma: TfrFacturaProforma ParentFont = False end object Label9: TLabel - Left = 332 + Left = 421 Top = 10 Width = 77 Height = 13 @@ -1493,7 +1493,7 @@ object frFacturaProforma: TfrFacturaProforma ParentFont = False end object Label10: TLabel - Left = 145 + Left = 18 Top = 10 Width = 76 Height = 13 @@ -1507,7 +1507,7 @@ object frFacturaProforma: TfrFacturaProforma ParentFont = False end object Label11: TLabel - Left = 238 + Left = 225 Top = 10 Width = 73 Height = 13 @@ -1523,11 +1523,25 @@ object frFacturaProforma: TfrFacturaProforma object Shape2: TShape Left = 16 Top = 29 - Width = 394 + Width = 484 Height = 1 end + object Label4: TLabel + Left = 325 + Top = 10 + Width = 69 + Height = 13 + Alignment = taRightJustify + Caption = 'Importe de RE' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + end object BaseImponible: TcxDBTextEdit - Left = 12 + Left = 91 Top = 37 TabStop = False AutoSize = False @@ -1543,7 +1557,7 @@ object frFacturaProforma: TfrFacturaProforma Width = 110 end object ImporteDescuento: TcxDBTextEdit - Left = 142 + Left = 15 Top = 37 TabStop = False AutoSize = False @@ -1559,7 +1573,7 @@ object frFacturaProforma: TfrFacturaProforma Width = 79 end object ImporteIVA: TcxDBTextEdit - Left = 235 + Left = 222 Top = 37 TabStop = False AutoSize = False @@ -1575,7 +1589,7 @@ object frFacturaProforma: TfrFacturaProforma Width = 76 end object ImporteTotal: TcxDBTextEdit - Left = 312 + Left = 401 Top = 37 TabStop = False AutoSize = False @@ -1597,12 +1611,28 @@ object frFacturaProforma: TfrFacturaProforma Height = 21 Width = 98 end + object ImporteRE: TcxDBTextEdit + Left = 318 + Top = 37 + TabStop = False + AutoSize = False + DataBinding.DataField = 'IMPORTERE' + DataBinding.DataSource = dsFactura + Properties.Alignment.Horz = taRightJustify + Properties.ReadOnly = True + Style.BorderStyle = ebsNone + Style.Color = 15726583 + Style.HotTrack = False + TabOrder = 4 + Height = 21 + Width = 76 + end end end object Panel2: TPanel Left = 0 Top = 0 - Width = 282 + Width = 89 Height = 76 Align = alClient BevelOuter = bvNone diff --git a/Clientes/FacturaProforma.pas b/Clientes/FacturaProforma.pas index bf02408..75e7827 100644 --- a/Clientes/FacturaProforma.pas +++ b/Clientes/FacturaProforma.pas @@ -137,6 +137,8 @@ type Descuento: TcxDBTextEdit; IVA: TcxDBTextEdit; RecargoEquivalencia: TcxDBTextEdit; + Label4: TLabel; + ImporteRE: TcxDBTextEdit; procedure bCancelarClick(Sender: TObject); procedure bSalirClick(Sender: TObject); procedure bGuardarClick(Sender: TObject); @@ -644,6 +646,7 @@ end; procedure TfrFacturaProforma.CalcularTotalFactura; var + ImporteNeto, BaseImponible, ImporteRE, ImporteIVA, @@ -651,7 +654,8 @@ var ImporteTotal : Double; FDetallesBookmark : string; begin - BaseImponible := 0; + ImporteNeto := 0; //Total de los articulos + BaseImponible := 0; //Importe neto una vez aplicado el dto ImporteTotal := 0; with TablaDetallesMem do begin @@ -660,15 +664,16 @@ begin try First; while not EOF do begin - BaseImponible := BaseImponible + FieldByName('IMPORTETOTAL').AsFloat; + ImporteNeto := ImporteNeto + FieldByName('IMPORTETOTAL').AsFloat; Next; end; + ImporteDto := ImporteNeto * (TablaFacturas.FieldByName('DESCUENTO').AsFloat/100); + BaseImponible := ImporteNeto - ImporteDto; + ImporteRE := BaseImponible * (TablaFacturas.FieldByName('RE').AsFloat/100); - ImporteDto := BaseImponible * (TablaFacturas.FieldByName('DESCUENTO').AsFloat/100); - ImporteTotal := BaseImponible - ImporteDto; - ImporteIVA := ImporteTotal * (TablaFacturas.FieldByName('IVA').AsFloat/100); - ImporteTotal := ImporteTotal + ImporteIVA + ImporteRE; + ImporteIVA := BaseImponible * (TablaFacturas.FieldByName('IVA').AsFloat/100); + ImporteTotal := BaseImponible + ImporteIVA + ImporteRE; TablaFacturas.FieldByName('BASEIMPONIBLE').AsFloat := BaseImponible; TablaFacturas.FieldByName('IMPORTEDESCUENTO').AsFloat := ImporteDto; diff --git a/Clientes/ImprimirFacturasCliente.dfm b/Clientes/ImprimirFacturasCliente.dfm index aefad8e..96c67e9 100644 --- a/Clientes/ImprimirFacturasCliente.dfm +++ b/Clientes/ImprimirFacturasCliente.dfm @@ -205,60 +205,47 @@ object frImprimirFacturasCliente: TfrImprimirFacturasCliente object CodCliente: TcxTextEdit Left = 152 Top = 58 - Width = 113 - Height = 21 + ParentFont = False Properties.ReadOnly = True Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro - StyleDisabled.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro - StyleFocused.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro - StyleHot.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro TabOrder = 0 Text = 'CodCliente' + Width = 113 end object NIFCIF: TcxTextEdit Left = 323 Top = 58 - Width = 121 - Height = 21 + ParentFont = False Properties.ReadOnly = True Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro - StyleDisabled.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro - StyleFocused.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro - StyleHot.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro TabOrder = 1 Text = 'NIFCIF' + Width = 121 end object FechaFactura: TcxTextEdit Left = 323 Top = 34 - Width = 121 - Height = 21 + ParentFont = False Properties.ReadOnly = True Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro - StyleDisabled.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro - StyleFocused.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro - StyleHot.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro TabOrder = 2 Text = 'FechaFactura' + Width = 121 end object Nombre: TcxTextEdit Left = 152 Top = 82 - Width = 292 - Height = 21 + ParentFont = False Properties.ReadOnly = True Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro - StyleDisabled.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro - StyleFocused.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro - StyleHot.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro TabOrder = 3 Text = 'Nombre' + Width = 292 end object Codigo: TcxButtonEdit Left = 152 Top = 35 - Width = 113 - Height = 21 + ParentFont = False Properties.Buttons = < item Default = True @@ -310,11 +297,9 @@ object frImprimirFacturasCliente: TfrImprimirFacturasCliente Properties.ReadOnly = True Properties.OnButtonClick = CodigoPropertiesButtonClick Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro - StyleDisabled.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro - StyleFocused.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro - StyleHot.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro TabOrder = 4 Text = 'Codigo' + Width = 113 end end end diff --git a/Clientes/PresupuestoCliente.dfm b/Clientes/PresupuestoCliente.dfm index ab6ff15..58fd0d6 100644 --- a/Clientes/PresupuestoCliente.dfm +++ b/Clientes/PresupuestoCliente.dfm @@ -1,8 +1,8 @@ object frPresupuestoCliente: TfrPresupuestoCliente Left = 0 Top = 0 - Width = 973 - Height = 704 + Width = 630 + Height = 410 Color = 16383743 Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -17,7 +17,7 @@ object frPresupuestoCliente: TfrPresupuestoCliente object pnlTitulo: TRdxPanelTituloOperacion Left = 0 Top = 0 - Width = 973 + Width = 630 Height = 22 Caption = ' ' Color = 11590911 @@ -30,8 +30,8 @@ object frPresupuestoCliente: TfrPresupuestoCliente end object brSalir: TRdxBarraInferior Left = 0 - Top = 604 - Width = 973 + Top = 310 + Width = 630 Height = 50 Caption = ' ' ParentColor = True @@ -111,8 +111,8 @@ object frPresupuestoCliente: TfrPresupuestoCliente end object brGuardar: TRdxBarraInferior Left = 0 - Top = 654 - Width = 973 + Top = 360 + Width = 630 Height = 50 Caption = ' ' ParentColor = True @@ -265,8 +265,8 @@ object frPresupuestoCliente: TfrPresupuestoCliente object pnlCuerpo: TPanel Left = 0 Top = 22 - Width = 973 - Height = 582 + Width = 630 + Height = 288 Align = alClient BevelOuter = bvNone BorderWidth = 10 @@ -275,7 +275,7 @@ object frPresupuestoCliente: TfrPresupuestoCliente object pnlFactura: TAdvPanel Left = 10 Top = 10 - Width = 953 + Width = 610 Height = 79 Align = alTop BevelOuter = bvNone @@ -656,8 +656,8 @@ object frPresupuestoCliente: TfrPresupuestoCliente object pnlPaginas: TRdxPanel Left = 10 Top = 89 - Width = 953 - Height = 398 + Width = 610 + Height = 113 Caption = ' ' ParentColor = True ColorHighLight = 8623776 @@ -668,8 +668,8 @@ object frPresupuestoCliente: TfrPresupuestoCliente object Paginas: TRdxPagesControl Left = 0 Top = 0 - Width = 953 - Height = 398 + Width = 610 + Height = 113 ActivePage = pagContenido Align = alClient Font.Charset = DEFAULT_CHARSET @@ -1244,8 +1244,8 @@ object frPresupuestoCliente: TfrPresupuestoCliente object pnlGridArticulos: TPanel Left = 0 Top = 0 - Width = 945 - Height = 352 + Width = 602 + Height = 67 Align = alClient BevelOuter = bvNone BorderWidth = 5 @@ -1255,7 +1255,7 @@ object frPresupuestoCliente: TfrPresupuestoCliente object pnlBarraContenido: TRdxPanel Left = 5 Top = 31 - Width = 935 + Width = 592 Height = 26 Caption = ' ' ParentColor = True @@ -1373,8 +1373,8 @@ object frPresupuestoCliente: TfrPresupuestoCliente object gridDetalles: TcxGrid Left = 5 Top = 57 - Width = 935 - Height = 223 + Width = 592 + Height = 232 Align = alClient BevelInner = bvNone BevelKind = bkFlat @@ -1514,7 +1514,7 @@ object frPresupuestoCliente: TfrPresupuestoCliente object pnlBarraPropiedades: TRdxPanel Left = 5 Top = 5 - Width = 935 + Width = 592 Height = 26 Caption = ' ' ParentColor = True @@ -1752,8 +1752,8 @@ object frPresupuestoCliente: TfrPresupuestoCliente end object pnlObservaciones: TRdxPanel Left = 5 - Top = 280 - Width = 935 + Top = -5 + Width = 592 Height = 67 Caption = ' ' ParentColor = True @@ -1765,7 +1765,7 @@ object frPresupuestoCliente: TfrPresupuestoCliente object Label1: TLabel Left = 0 Top = 0 - Width = 935 + Width = 592 Height = 25 Align = alTop AutoSize = False @@ -1787,7 +1787,7 @@ object frPresupuestoCliente: TfrPresupuestoCliente TabOrder = 0 OnExit = ObservacionesExit Height = 42 - Width = 935 + Width = 592 end end end @@ -1798,8 +1798,8 @@ object frPresupuestoCliente: TfrPresupuestoCliente object Panel1: TPanel Left = 0 Top = 0 - Width = 945 - Height = 352 + Width = 602 + Height = 67 Align = alClient BevelOuter = bvNone ParentColor = True @@ -1808,7 +1808,7 @@ object frPresupuestoCliente: TfrPresupuestoCliente Left = 0 Top = 0 Width = 125 - Height = 352 + Height = 67 Align = alLeft BevelOuter = bvNone Caption = ' ' @@ -1833,8 +1833,8 @@ object frPresupuestoCliente: TfrPresupuestoCliente object Panel7: TPanel Left = 125 Top = 0 - Width = 820 - Height = 352 + Width = 477 + Height = 67 Align = alClient BevelOuter = bvNone BorderWidth = 10 @@ -1858,8 +1858,8 @@ object frPresupuestoCliente: TfrPresupuestoCliente Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoClaro Style.IsFontAssigned = True TabOrder = 0 - Height = 332 - Width = 800 + Height = 47 + Width = 457 end end end @@ -2042,7 +2042,7 @@ object frPresupuestoCliente: TfrPresupuestoCliente Left = 0 Top = 0 Width = 125 - Height = 352 + Height = 67 Align = alLeft BevelOuter = bvNone Caption = ' ' @@ -2067,8 +2067,8 @@ object frPresupuestoCliente: TfrPresupuestoCliente object Panel13: TPanel Left = 125 Top = 0 - Width = 820 - Height = 352 + Width = 477 + Height = 67 Align = alClient BevelOuter = bvNone BorderWidth = 10 @@ -2092,8 +2092,8 @@ object frPresupuestoCliente: TfrPresupuestoCliente Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoClaro Style.IsFontAssigned = True TabOrder = 0 - Height = 332 - Width = 800 + Height = 47 + Width = 457 end end end @@ -2104,7 +2104,7 @@ object frPresupuestoCliente: TfrPresupuestoCliente object pnlFormasPago: TPanel Left = 0 Top = 0 - Width = 945 + Width = 602 Height = 100 Align = alTop BevelOuter = bvNone @@ -2139,7 +2139,7 @@ object frPresupuestoCliente: TfrPresupuestoCliente object RdxPanel5: TPanel Left = 125 Top = 0 - Width = 820 + Width = 477 Height = 100 Align = alClient BevelOuter = bvNone @@ -2159,14 +2159,14 @@ object frPresupuestoCliente: TfrPresupuestoCliente Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoClaro TabOrder = 0 Height = 80 - Width = 800 + Width = 457 end end end object pnlPlazosEntrega: TPanel Left = 0 Top = 100 - Width = 945 + Width = 602 Height = 100 Align = alTop BevelOuter = bvNone @@ -2201,7 +2201,7 @@ object frPresupuestoCliente: TfrPresupuestoCliente object Panel3: TPanel Left = 125 Top = 0 - Width = 820 + Width = 477 Height = 100 Align = alClient BevelOuter = bvNone @@ -2221,14 +2221,14 @@ object frPresupuestoCliente: TfrPresupuestoCliente Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoClaro TabOrder = 0 Height = 80 - Width = 800 + Width = 457 end end end object pnlNota: TPanel Left = 0 Top = 200 - Width = 945 + Width = 602 Height = 100 Align = alTop BevelOuter = bvNone @@ -2263,7 +2263,7 @@ object frPresupuestoCliente: TfrPresupuestoCliente object Panel5: TPanel Left = 125 Top = 0 - Width = 820 + Width = 477 Height = 100 Align = alClient BevelOuter = bvNone @@ -2283,7 +2283,7 @@ object frPresupuestoCliente: TfrPresupuestoCliente Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoClaro TabOrder = 0 Height = 80 - Width = 800 + Width = 457 end end end @@ -2624,9 +2624,9 @@ object frPresupuestoCliente: TfrPresupuestoCliente end object pnlImportes: TAdvPanel Left = 10 - Top = 487 - Width = 953 - Height = 85 + Top = 202 + Width = 610 + Height = 76 Align = alBottom BevelOuter = bvNone Color = 16383743 @@ -2704,175 +2704,274 @@ object frPresupuestoCliente: TfrPresupuestoCliente TopIndent = 0 URLColor = clBlue FullHeight = 38 - object Label7: TLabel - Left = 66 - Top = 13 - Width = 74 - Height = 13 - Caption = 'Descuento(%):' - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - end - object Label8: TLabel - Left = 228 - Top = 13 - Width = 40 - Height = 13 - Alignment = taRightJustify - Caption = 'IVA(%):' - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - end - object Label5: TLabel - Left = 22 - Top = 39 - Width = 70 - Height = 13 - Alignment = taRightJustify - Caption = 'Base imponible' - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - end - object Label10: TLabel - Left = 133 - Top = 39 - Width = 72 - Height = 13 - Alignment = taRightJustify - Caption = 'Importe de dto' - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - end - object Label11: TLabel - Left = 228 - Top = 39 - Width = 73 - Height = 13 - Alignment = taRightJustify - Caption = 'Importe de IVA' - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [] - ParentFont = False - end - object Label9: TLabel - Left = 338 - Top = 39 - Width = 77 - Height = 13 - Alignment = taRightJustify - Caption = 'Importe total' - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -11 - Font.Name = 'Tahoma' - Font.Style = [fsBold] - ParentFont = False - end - object Descuento: TcxDBTextEdit - Left = 145 - Top = 9 - DataBinding.DataField = 'DESCUENTO' - DataBinding.DataSource = dsPresupuesto - ParentFont = False - Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro + object Panel15: TPanel + Left = 116 + Top = 0 + Width = 494 + Height = 76 + Align = alRight + BevelOuter = bvNone + BorderWidth = 5 + ParentColor = True TabOrder = 0 - Width = 57 + object RdxPanel1: TRdxPanel + Left = 5 + Top = 5 + Width = 484 + Height = 66 + BorderStyle = bsSingle + Caption = ' ' + BorderWidth = 1 + Color = 15726583 + ColorHighLight = 8623776 + ColorShadow = 8623776 + Align = alClient + TabOrder = 0 + UseDockManager = True + object Label5: TLabel + Left = 135 + Top = 10 + Width = 70 + Height = 13 + Alignment = taRightJustify + Caption = 'Base imponible' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + end + object Label9: TLabel + Left = 400 + Top = 10 + Width = 77 + Height = 13 + Alignment = taRightJustify + Caption = 'Importe total' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [fsBold] + ParentFont = False + end + object Label10: TLabel + Left = 29 + Top = 10 + Width = 76 + Height = 13 + Alignment = taRightJustify + Caption = 'Importe de dto.' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + end + object Label11: TLabel + Left = 234 + Top = 10 + Width = 73 + Height = 13 + Alignment = taRightJustify + Caption = 'Importe de IVA' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + end + object Shape2: TShape + Left = 16 + Top = 29 + Width = 465 + Height = 1 + end + object Label7: TLabel + Left = 319 + Top = 10 + Width = 69 + Height = 13 + Alignment = taRightJustify + Caption = 'Importe de RE' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + end + object BaseImponible: TcxDBTextEdit + Left = 95 + Top = 37 + TabStop = False + AutoSize = False + DataBinding.DataField = 'BASEIMPONIBLE' + DataBinding.DataSource = dsPresupuesto + Properties.Alignment.Horz = taRightJustify + Properties.ReadOnly = True + Style.BorderStyle = ebsNone + Style.Color = 15726583 + Style.HotTrack = False + TabOrder = 0 + Height = 21 + Width = 110 + end + object ImporteDescuento: TcxDBTextEdit + Left = 26 + Top = 37 + TabStop = False + AutoSize = False + DataBinding.DataField = 'IMPORTEDESCUENTO' + DataBinding.DataSource = dsPresupuesto + Properties.Alignment.Horz = taRightJustify + Properties.ReadOnly = True + Style.BorderStyle = ebsNone + Style.Color = 15726583 + Style.HotTrack = False + TabOrder = 1 + Height = 21 + Width = 79 + end + object ImporteIVA: TcxDBTextEdit + Left = 231 + Top = 37 + TabStop = False + AutoSize = False + DataBinding.DataField = 'IMPORTEIVA' + DataBinding.DataSource = dsPresupuesto + Properties.Alignment.Horz = taRightJustify + Properties.ReadOnly = True + Style.BorderStyle = ebsNone + Style.Color = 15726583 + Style.HotTrack = False + TabOrder = 2 + Height = 21 + Width = 76 + end + object ImporteTotal: TcxDBTextEdit + Left = 380 + Top = 37 + TabStop = False + AutoSize = False + DataBinding.DataField = 'IMPORTETOTAL' + DataBinding.DataSource = dsPresupuesto + ParentFont = False + Properties.Alignment.Horz = taRightJustify + Properties.ReadOnly = True + Style.BorderStyle = ebsNone + Style.Color = 15726583 + Style.Font.Charset = DEFAULT_CHARSET + Style.Font.Color = clWindowText + Style.Font.Height = -11 + Style.Font.Name = 'Tahoma' + Style.Font.Style = [fsBold] + Style.HotTrack = False + Style.IsFontAssigned = True + TabOrder = 3 + Height = 21 + Width = 98 + end + object ImporteRE: TcxDBTextEdit + Left = 312 + Top = 37 + TabStop = False + AutoSize = False + DataBinding.DataField = 'IMPORTERE' + DataBinding.DataSource = dsPresupuesto + Properties.Alignment.Horz = taRightJustify + Properties.ReadOnly = True + Style.BorderStyle = ebsNone + Style.Color = 15726583 + Style.HotTrack = False + TabOrder = 4 + Height = 21 + Width = 76 + end + end end - object IVA: TcxDBTextEdit - Left = 271 - Top = 9 - DataBinding.DataField = 'IVA' - DataBinding.DataSource = dsPresupuesto - ParentFont = False - Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro + object Panel16: TPanel + Left = 0 + Top = 0 + Width = 116 + Height = 76 + Align = alClient + Alignment = taLeftJustify + BevelOuter = bvNone + ParentColor = True TabOrder = 1 - Width = 57 - end - object BaseImponible: TcxDBTextEdit - Left = 2 - Top = 59 - TabStop = False - DataBinding.DataField = 'BASEIMPONIBLE' - DataBinding.DataSource = dsPresupuesto - Properties.Alignment.Horz = taRightJustify - Properties.AutoSelect = False - Properties.ReadOnly = True - Style.BorderStyle = ebsNone - Style.Color = 15726583 - Style.HotTrack = False - TabOrder = 2 - Width = 90 - end - object ImporteDescuento: TcxDBTextEdit - Left = 115 - Top = 59 - TabStop = False - DataBinding.DataField = 'IMPORTEDESCUENTO' - DataBinding.DataSource = dsPresupuesto - Properties.Alignment.Horz = taRightJustify - Properties.AutoSelect = False - Properties.ReadOnly = True - Style.BorderStyle = ebsNone - Style.Color = 15726583 - Style.HotTrack = False - TabOrder = 3 - Width = 90 - end - object ImporteIVA: TcxDBTextEdit - Left = 211 - Top = 59 - TabStop = False - DataBinding.DataField = 'IMPORTEIVA' - DataBinding.DataSource = dsPresupuesto - Properties.Alignment.Horz = taRightJustify - Properties.AutoSelect = False - Properties.ReadOnly = True - Style.BorderStyle = ebsNone - Style.Color = 15726583 - Style.HotTrack = False - TabOrder = 4 - Width = 90 - end - object ImporteTotal: TcxDBTextEdit - Left = 325 - Top = 59 - TabStop = False - DataBinding.DataField = 'IMPORTETOTAL' - DataBinding.DataSource = dsPresupuesto - ParentFont = False - Properties.Alignment.Horz = taRightJustify - Properties.AutoSelect = False - Properties.ReadOnly = True - Style.BorderStyle = ebsNone - Style.Color = 15726583 - Style.Font.Charset = DEFAULT_CHARSET - Style.Font.Color = clWindowText - Style.Font.Height = -11 - Style.Font.Name = 'Tahoma' - Style.Font.Style = [fsBold] - Style.HotTrack = False - Style.IsFontAssigned = True - TabOrder = 5 - Width = 90 + object Label8: TLabel + Left = 8 + Top = 50 + Width = 74 + Height = 13 + Caption = 'Descuento(%):' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + end + object Label12: TLabel + Left = 157 + Top = 50 + Width = 40 + Height = 13 + Alignment = taRightJustify + Caption = 'IVA(%):' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + end + object cbRecargoEquivalencia: TcxCheckBox + Left = 8 + Top = 14 + Caption = 'Acogido al recargo de equivalencia' + ParentColor = False + ParentFont = False + Properties.NullStyle = nssUnchecked + Properties.OnChange = cbRecargoEquivalenciaPropertiesChange + Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoClaro + TabOrder = 0 + Width = 193 + end + object Descuento: TcxDBTextEdit + Left = 85 + Top = 46 + DataBinding.DataField = 'DESCUENTO' + DataBinding.DataSource = dsPresupuesto + ParentFont = False + Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro + TabOrder = 1 + Width = 57 + end + object IVA: TcxDBTextEdit + Left = 203 + Top = 46 + DataBinding.DataField = 'IVA' + DataBinding.DataSource = dsPresupuesto + ParentFont = False + Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro + TabOrder = 2 + Width = 57 + end + object RecargoEquivalencia: TcxDBTextEdit + Left = 203 + Top = 14 + DataBinding.DataField = 'RE' + DataBinding.DataSource = dsPresupuesto + ParentFont = False + Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro + TabOrder = 3 + Width = 57 + end end end end diff --git a/Clientes/PresupuestoCliente.pas b/Clientes/PresupuestoCliente.pas index dec2a25..2d8a62b 100644 --- a/Clientes/PresupuestoCliente.pas +++ b/Clientes/PresupuestoCliente.pas @@ -61,7 +61,7 @@ uses SysUtils, JvExMask, JvToolEdit, ShlObj, cxShellCommon, cxShellListView, JvComponent, JvChangeNotify, JvExForms, JvBaseThumbnail, JvThumbViews, JvExComCtrls, JvComCtrls, JvComponentBase, cxRichEdit, cxDBRichEdit, - ToolWin, ImgList; + ToolWin, ImgList, cxCheckBox; type TfrPresupuestoCliente = class(TRdxFramePresupuestos) @@ -108,7 +108,6 @@ type FormasPago: TcxDBMemo; dsPropiedadesPresupuesto: TDataSource; eDocumento: TLabel; - pnlImportes: TAdvPanel; pagDesgloses: TTabSheet; pagDocumentos: TTabSheet; eVigencia: TLabel; @@ -123,10 +122,6 @@ type TablaValores: TIBQuery; dsValores: TDataSource; dsPropiedades: TDataSource; - Label7: TLabel; - Descuento: TcxDBTextEdit; - Label8: TLabel; - IVA: TcxDBTextEdit; actAnadirPropiedad: TAction; actEliminarPropiedad: TAction; pnlBarraPropiedades: TRdxPanel; @@ -143,14 +138,6 @@ type DBEdit1: TDBEdit; DBEdit2: TDBEdit; pnlGrid: TRdxPanel; - Label5: TLabel; - Label10: TLabel; - Label11: TLabel; - Label9: TLabel; - BaseImponible: TcxDBTextEdit; - ImporteDescuento: TcxDBTextEdit; - ImporteIVA: TcxDBTextEdit; - ImporteTotal: TcxDBTextEdit; eSeccion: TLabel; Seccion: TcxComboBox; pnlObservaciones: TRdxPanel; @@ -239,6 +226,27 @@ type RdxBoton6: TRdxBoton; bEliminarTodoFiltrado: TRdxBoton; actEliminarTodoPropiedad: TAction; + pnlImportes: TAdvPanel; + Panel15: TPanel; + RdxPanel1: TRdxPanel; + Label5: TLabel; + Label9: TLabel; + Label10: TLabel; + Label11: TLabel; + Shape2: TShape; + Label7: TLabel; + BaseImponible: TcxDBTextEdit; + ImporteDescuento: TcxDBTextEdit; + ImporteIVA: TcxDBTextEdit; + ImporteTotal: TcxDBTextEdit; + ImporteRE: TcxDBTextEdit; + Panel16: TPanel; + Label8: TLabel; + Label12: TLabel; + cbRecargoEquivalencia: TcxCheckBox; + Descuento: TcxDBTextEdit; + IVA: TcxDBTextEdit; + RecargoEquivalencia: TcxDBTextEdit; procedure bSalirClick(Sender: TObject); procedure bGuardarClick(Sender: TObject); procedure bCancelarClick(Sender: TObject); @@ -302,6 +310,7 @@ type procedure actAnadirPlanoUpdate(Sender: TObject); procedure actEliminarTodoPropiedadExecute(Sender: TObject); procedure actEliminarTodoPropiedadUpdate(Sender: TObject); + procedure cbRecargoEquivalenciaPropertiesChange(Sender: TObject); private FRootDocumentos: Variant; FRootPlanos: Variant; @@ -351,6 +360,7 @@ type procedure ProvinciaSetText(Sender: TField; const Text: String); procedure IVASetText(Sender: TField; const Text: String); procedure DtoSetText(Sender: TField; const Text: String); + procedure RESetText(Sender: TField; const Text: String); procedure CodigoArticuloDetalleSetText(Sender: TField; const Text: String); procedure ReferenciaArticuloDetalleSetText(Sender: TField; const Text: String); procedure CantidadDetalleSetText(Sender: TField; const Text: String); @@ -442,6 +452,8 @@ begin CodCliente.Properties.Buttons[0].Visible := True; Poblacion.Properties.Buttons[0].Visible := True; Provincia.Properties.Buttons[0].Visible := True; + cbRecargoEquivalencia.Checked := False; + RecargoEquivalencia.Enabled := False; DesactivarEventosCampos; try @@ -499,6 +511,8 @@ begin dmTablaPresupuestos.InicializarTablaPresupuestos(@TablaPresupuestos); dmTablaPresupuestos.InicializarTablaDetalles(@TablaDetallesMem); + cbRecargoEquivalencia.Properties.ReadOnly := False; + ActivarEdicionGridDetalles(VistaDetalles); cbxDocumento.DataBinding.Field.AsString := dmTablaDocumentos.DarCodigoDocumento(Entidad); CargarDatosDocumento(cbxDocumento.DataBinding.Field.AsString); @@ -632,6 +646,9 @@ begin else DeshabilitarPlanos; end;} + cbRecargoEquivalencia.Checked := TablaPresupuestos.FieldByName('RE').AsFloat > 0; + RecargoEquivalencia.Enabled := TablaPresupuestos.FieldByName('RE').AsFloat > 0; + cbRecargoEquivalencia.Properties.ReadOnly := True; FechaPresupuesto.SetFocus; except @@ -709,6 +726,10 @@ begin DeshabilitarPlanos; end;} + cbRecargoEquivalencia.Checked := TablaPresupuestos.FieldByName('RE').AsFloat > 0; + RecargoEquivalencia.Enabled := TablaPresupuestos.FieldByName('RE').AsFloat > 0; + cbRecargoEquivalencia.Properties.ReadOnly := True; + except on E : EIBError do TratarExcepcion(E); @@ -771,6 +792,10 @@ begin end; end; + cbRecargoEquivalencia.Checked := TablaPresupuestos.FieldByName('RE').AsFloat > 0; + RecargoEquivalencia.Enabled := TablaPresupuestos.FieldByName('RE').AsFloat > 0; + cbRecargoEquivalencia.Properties.ReadOnly := False; + ActivarEventosCampos; ConfigurarPantallaDocumento; Visible := True; @@ -962,13 +987,16 @@ end; procedure TfrPresupuestoCliente.CalcularTotalPresupuesto; var + ImporteNeto, BaseImponible, ImporteIVA, + ImporteRE, ImporteDto, ImporteTotal : Double; FDetallesBookmark : string; begin - BaseImponible := 0; + ImporteNeto := 0; //Total de los articulos + BaseImponible := 0; //Importe neto una vez aplicado el dto ImporteTotal := 0; with TablaDetallesMem do begin @@ -977,19 +1005,22 @@ begin try First; while not EOF do begin - BaseImponible := BaseImponible + FieldByName('IMPORTETOTAL').AsFloat; + ImporteNeto := ImporteNeto + FieldByName('IMPORTETOTAL').AsFloat; Next; end; - ImporteDto := BaseImponible * (TablaPresupuestos.FieldByName('DESCUENTO').AsFloat/100); - ImporteTotal := BaseImponible - ImporteDto; - ImporteIVA := ImporteTotal * (TablaPresupuestos.FieldByName('IVA').AsFloat/100); - ImporteTotal := ImporteTotal + ImporteIVA; + ImporteDto := ImporteNeto * (TablaPresupuestos.FieldByName('DESCUENTO').AsFloat/100); + BaseImponible := ImporteNeto - ImporteDto; + + ImporteRE := BaseImponible * (TablaPresupuestos.FieldByName('RE').AsFloat/100); + ImporteIVA := BaseImponible * (TablaPresupuestos.FieldByName('IVA').AsFloat/100); + ImporteTotal := BaseImponible + ImporteIVA + ImporteRE; TablaPresupuestos.Edit; TablaPresupuestos.FieldByName('BASEIMPONIBLE').AsFloat := BaseImponible; TablaPresupuestos.FieldByName('IMPORTEDESCUENTO').AsFloat := ImporteDto; TablaPresupuestos.FieldByName('IMPORTEIVA').AsFloat := ImporteIVA; + TablaPresupuestos.FieldByName('IMPORTERE').AsFloat := ImporteRE; TablaPresupuestos.FieldByName('IMPORTETOTAL').AsFloat := ImporteTotal; finally Bookmark := FDetallesBookmark; @@ -1618,11 +1649,14 @@ end; procedure TfrPresupuestoCliente.ActivarEventosCampos; begin + cbRecargoEquivalencia.Properties.OnChange := cbRecargoEquivalenciaPropertiesChange; + with TablaPresupuestos do begin FieldByName('CODIGOCLIENTE').OnSetText := CodCliSetText; FieldByName('IVA').OnSetText := IVASetText; FieldByName('DESCUENTO').OnSetText := DtoSetText; + FieldByName('RE').OnSetText := RESetText; end; with TablaDetallesMem do @@ -2116,6 +2150,8 @@ end; procedure TfrPresupuestoCliente.DesactivarEventosCampos; begin + cbRecargoEquivalencia.Properties.OnChange := NIL; + with TablaPresupuestos do begin if FindField('CODIGOCLIENTE') <> NIL then @@ -2124,6 +2160,8 @@ begin FieldByName('IVA').OnSetText := NIL; if FindField('DESCUENTO') <> NIL then FieldByName('DESCUENTO').OnSetText := NIL; + if FindField('RE') <> NIL then + FieldByName('RE').OnSetText := NIL; end; with TablaDetallesMem do @@ -3032,5 +3070,28 @@ begin (Sender as TAction).Enabled := not (VistaPropiedades.ViewData.RecordCount = 0); end; +procedure TfrPresupuestoCliente.cbRecargoEquivalenciaPropertiesChange( + Sender: TObject); +begin + RecargoEquivalencia.Enabled := cbRecargoEquivalencia.Checked; + if not cbRecargoEquivalencia.Checked then + begin + RecargoEquivalencia.DataBinding.Field.Value := Null; + CalcularTotalPresupuesto; + end; +end; + +procedure TfrPresupuestoCliente.RESetText(Sender: TField; + const Text: String); +begin + if EsCadenaVacia(Text) then + Sender.AsString := '0' + else begin + ValidarDto(Text); + Sender.AsString := Text; + end; + CalcularTotalPresupuesto; +end; + end. diff --git a/Factuges.dof b/Factuges.dof index a7b95f9..336bd89 100644 --- a/Factuges.dof +++ b/Factuges.dof @@ -114,7 +114,7 @@ IncludeVerInfo=1 AutoIncBuild=0 MajorVer=3 MinorVer=2 -Release=6 +Release=7 Build=0 Debug=0 PreRelease=0 @@ -126,13 +126,13 @@ CodePage=1252 [Version Info Keys] CompanyName= FileDescription= -FileVersion=3.2.6.0 +FileVersion=3.2.7.0 InternalName= LegalCopyright= LegalTrademarks= OriginalFilename= ProductName= -ProductVersion=3.2.6.0 +ProductVersion=3.2.7.0 Comments= [Excluded Packages] C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxLibraryVCLD7.bpl=Express Cross Platform Library (VCL Edition) by Developer Express Inc. diff --git a/Factuges.dsk b/Factuges.dsk index 1d8e24e..f7be5cf 100644 --- a/Factuges.dsk +++ b/Factuges.dsk @@ -1,20 +1,83 @@ [Closed Files] File_0=SourceModule,'C:\Codigo Abeto\Libreria\Literales.pas',0,1,10,51,34,0,0 File_1=SourceModule,'c:\archivos de programa\borland\delphi7\source\rtl\common\ComObj.pas',0,1,1256,1,1269,0,0 -File_2=SourceModule,'C:\Codigo Abeto\Informes\InformeBase.pas',0,1,46,15,46,1,0 -File_3=SourceModule,'C:\Codigo Abeto\Informes\InformeFacturaCliente.pas',0,1,31,1,43,0,0 -File_4=SourceModule,'C:\Codigo Abeto\Informes\InformePresupuestoCliente.pas',0,1,43,1,56,1,0 -File_5=SourceModule,'C:\Codigo Abeto\Principal.pas',0,1,363,2,385,1,0 -File_6=SourceModule,'C:\Codigo Abeto\Libreria\RdxEmpresaActiva.pas',0,1,1,1,1,0,0 -File_7=SourceModule,'C:\Codigo Abeto\BaseDatos\TablaEmpresas.pas',0,1,379,1,390,0,0 -File_8=SourceModule,'C:\Codigo Abeto\Informes\InformeAlbaranCliente.pas',0,1,51,38,68,0,0 -File_9=SourceModule,'C:\Codigo Abeto\Informes\InformeContratoCliente.pas',0,1,45,1,58,0,0 +File_2=SourceModule,'C:\Codigo Abeto\Informes\InformePresupuestoCliente.pas',0,1,43,1,56,1,0 +File_3=SourceModule,'C:\Codigo Abeto\Principal.pas',0,1,363,2,385,1,0 +File_4=SourceModule,'C:\Codigo Abeto\Libreria\RdxEmpresaActiva.pas',0,1,1,1,1,0,0 +File_5=SourceModule,'C:\Codigo Abeto\BaseDatos\TablaEmpresas.pas',0,1,379,1,390,0,0 +File_6=SourceModule,'C:\Codigo Abeto\Informes\InformeAlbaranCliente.pas',0,1,51,38,68,0,0 [Modules] -Module0=C:\Codigo Abeto\Factuges.dpr -Count=1 +Module0=C:\Codigo Abeto\Informes\InformeFacturaCliente.pas +Module1=C:\Codigo Abeto\Clientes\ContratoCliente.pas +Module2=C:\Codigo Abeto\Informes\InformeContratoCliente.pas +Module3=C:\Codigo Abeto\Clientes\FacturaProforma.pas +Module4=C:\Codigo Abeto\Clientes\PresupuestoCliente.pas +Module5=C:\Codigo Abeto\Clientes\FacturaCliente.pas +Module6=C:\Codigo Abeto\BaseDatos\TablaPresupuestos.pas +Module7=C:\Codigo Abeto\BaseDatos\TablaFacturasCliente.pas +Module8=C:\Codigo Abeto\Clientes\ImprimirFacturasCliente.pas +Module9=C:\Codigo Abeto\Informes\InformeTrimestralVentas.pas +Module10=C:\Codigo Abeto\BaseDatos\TablaContratos.pas +Module11=C:\Codigo Abeto\Factuges.dpr +Count=12 EditWindowCount=1 +[C:\Codigo Abeto\Informes\InformeFacturaCliente.pas] +ModuleType=SourceModule +FormState=1 +FormOnTop=0 + +[C:\Codigo Abeto\Clientes\ContratoCliente.pas] +ModuleType=SourceModule +FormState=1 +FormOnTop=0 + +[C:\Codigo Abeto\Informes\InformeContratoCliente.pas] +ModuleType=SourceModule +FormState=1 +FormOnTop=1 + +[C:\Codigo Abeto\Clientes\FacturaProforma.pas] +ModuleType=SourceModule +FormState=1 +FormOnTop=0 + +[C:\Codigo Abeto\Clientes\PresupuestoCliente.pas] +ModuleType=SourceModule +FormState=1 +FormOnTop=0 + +[C:\Codigo Abeto\Clientes\FacturaCliente.pas] +ModuleType=SourceModule +FormState=1 +FormOnTop=0 + +[C:\Codigo Abeto\BaseDatos\TablaPresupuestos.pas] +ModuleType=SourceModule +FormState=1 +FormOnTop=0 + +[C:\Codigo Abeto\BaseDatos\TablaFacturasCliente.pas] +ModuleType=SourceModule +FormState=1 +FormOnTop=0 + +[C:\Codigo Abeto\Clientes\ImprimirFacturasCliente.pas] +ModuleType=SourceModule +FormState=1 +FormOnTop=0 + +[C:\Codigo Abeto\Informes\InformeTrimestralVentas.pas] +ModuleType=SourceModule +FormState=1 +FormOnTop=1 + +[C:\Codigo Abeto\BaseDatos\TablaContratos.pas] +ModuleType=SourceModule +FormState=0 +FormOnTop=0 + [C:\Codigo Abeto\Factuges.dpr] ModuleType=SourceModule FormState=0 @@ -24,32 +87,51 @@ FormOnTop=0 FormState=0 FormOnTop=0 +[C:\Codigo Abeto\Informes\InformeBase.pas] +FormState=0 +FormOnTop=0 + +[C:\Codigo Abeto\Libreria\Configuracion.pas] +FormState=0 +FormOnTop=0 + [C:\Codigo Abeto\Frames\RdxFrame.pas] FormState=0 FormOnTop=0 [EditWindow0] -ViewCount=1 -CurrentView=0 +ViewCount=12 +CurrentView=7 View0=0 +View1=1 +View2=2 +View3=3 +View4=4 +View5=5 +View6=6 +View7=7 +View8=8 +View9=9 +View10=10 +View11=11 CodeExplorer=CodeExplorer@EditWindow0 MessageView=MessageView@EditWindow0 Create=1 Visible=1 State=0 -Left=447 -Top=139 -Width=1219 -Height=720 -MaxLeft=-1 -MaxTop=-1 -ClientWidth=1211 -ClientHeight=686 +Left=437 +Top=118 +Width=1244 +Height=872 +MaxLeft=-4 +MaxTop=104 +ClientWidth=1236 +ClientHeight=838 LeftPanelSize=140 LeftPanelClients=CodeExplorer@EditWindow0 LeftPanelData=000004000000000000000000000000000000000000000000000100000000000000000C000000436F64654578706C6F726572FFFFFFFF RightPanelSize=0 -BottomPanelSize=158 +BottomPanelSize=249 BottomPanelClients=MessageView@EditWindow0 BottomPanelData=000004000000000000000000000000000000000000000000000100000000000000000B0000004D65737361676556696577FFFFFFFF @@ -60,13 +142,90 @@ CursorY=1 TopLine=1 LeftCol=1 +[View1] +Module=C:\Codigo Abeto\BaseDatos\TablaPresupuestos.pas +CursorX=16 +CursorY=768 +TopLine=777 +LeftCol=1 + +[View2] +Module=C:\Codigo Abeto\Clientes\FacturaCliente.pas +CursorX=67 +CursorY=776 +TopLine=764 +LeftCol=1 + +[View3] +Module=C:\Codigo Abeto\Clientes\FacturaProforma.pas +CursorX=1 +CursorY=657 +TopLine=668 +LeftCol=1 + +[View4] +Module=C:\Codigo Abeto\Informes\InformeTrimestralVentas.pas +CursorX=70 +CursorY=134 +TopLine=119 +LeftCol=1 + +[View5] +Module=C:\Codigo Abeto\Clientes\PresupuestoCliente.pas +CursorX=24 +CursorY=1023 +TopLine=1009 +LeftCol=1 + +[View6] +Module=C:\Codigo Abeto\Clientes\ImprimirFacturasCliente.pas +CursorX=34 +CursorY=9 +TopLine=22 +LeftCol=1 + +[View7] +Module=C:\Codigo Abeto\Informes\InformeFacturaCliente.pas +CursorX=1 +CursorY=1 +TopLine=1 +LeftCol=1 + +[View8] +Module=C:\Codigo Abeto\Informes\InformeContratoCliente.pas +CursorX=87 +CursorY=14 +TopLine=217 +LeftCol=1 + +[View9] +Module=C:\Codigo Abeto\Clientes\ContratoCliente.pas +CursorX=44 +CursorY=902 +TopLine=888 +LeftCol=1 + +[View10] +Module=C:\Codigo Abeto\BaseDatos\TablaContratos.pas +CursorX=1 +CursorY=1 +TopLine=1 +LeftCol=1 + +[View11] +Module=C:\Codigo Abeto\BaseDatos\TablaFacturasCliente.pas +CursorX=14 +CursorY=103 +TopLine=184 +LeftCol=1 + [Watches] Count=2 Watch0='EmpresaActiva.Restricciones.strings[1]',256,0,18,1,0,'Watches' Watch1='EmpresaActiva.Restricciones.strings[0]',256,0,18,1,0,'Watches' [WatchWindow] -WatchColumnWidth=235 +WatchColumnWidth=100 WatchShowColumnHeaders=1 Create=1 Visible=1 @@ -95,13 +254,13 @@ Visible=1 State=2 Left=0 Top=0 -Width=1676 +Width=1680 Height=112 MaxLeft=-1 MaxTop=-1 -MaxWidth=1684 +MaxWidth=1688 MaxHeight=112 -ClientWidth=1676 +ClientWidth=1680 ClientHeight=78 [ProjectManager] @@ -183,7 +342,7 @@ LRDockWidth=317 Dockable=1 SplitPos=201 ArrangeBy=Name -SelectedItem= +SelectedItem=Name ExpandedItems=ActiveTranslateStringEngine,Anchors,AppStorage,BevelEdges,Brush,Constraints,DataBinding,DataController,DataController.Filter,DataController.Options,DataController.Summary,DataController.Summary.Options,Filtering,HTTPOptions,LookAndFeel.AssignedValues,NavigatorButtons.Cancel,NavigatorButtons.Delete,NavigatorButtons.Edit,Options,OptionsBehavior,OptionsData,OptionsSelection,OptionsView,Preview,Properties,Properties.Alignment,Properties.SpinButtons,StorageOptions,Style,Styles,VertScrollBar HiddenCategories= @@ -321,8 +480,8 @@ ShowChecked=1 Create=1 Visible=0 State=0 -Left=419 -Top=319 +Left=360 +Top=259 Width=457 Height=250 MaxLeft=-1 @@ -376,11 +535,11 @@ State=0 Left=0 Top=12 Width=140 -Height=513 +Height=574 MaxLeft=-1 MaxTop=-1 ClientWidth=140 -ClientHeight=513 +ClientHeight=574 TBDockHeight=305 LRDockWidth=140 Dockable=1 @@ -391,13 +550,13 @@ Visible=1 State=0 Left=12 Top=0 -Width=1199 -Height=158 +Width=1224 +Height=249 MaxLeft=-1 MaxTop=-1 -ClientWidth=1199 -ClientHeight=158 -TBDockHeight=158 +ClientWidth=1224 +ClientHeight=249 +TBDockHeight=249 LRDockWidth=443 Dockable=1 diff --git a/Factuges.res b/Factuges.res index 917522e..528307b 100644 Binary files a/Factuges.res and b/Factuges.res differ diff --git a/Informes/InformeBase.dfm b/Informes/InformeBase.dfm index 5b412a4..0344627 100644 --- a/Informes/InformeBase.dfm +++ b/Informes/InformeBase.dfm @@ -1,7 +1,7 @@ object dmInformeBase: TdmInformeBase OldCreateOrder = False - Left = 845 - Top = 400 + Left = 837 + Top = 406 Height = 246 Width = 321 object FReport: TfrReport diff --git a/Informes/InformeContratoCliente.dfm b/Informes/InformeContratoCliente.dfm index 1c9b59a..a3c0d85 100644 --- a/Informes/InformeContratoCliente.dfm +++ b/Informes/InformeContratoCliente.dfm @@ -1,7 +1,7 @@ inherited dmInformeContratoCliente: TdmInformeContratoCliente OldCreateOrder = True - Left = 464 - Top = 265 + Left = 242 + Top = 64 Height = 416 Width = 548 inherited FReport: TfrReport diff --git a/Informes/InformeFacturaCliente.dfm b/Informes/InformeFacturaCliente.dfm index 6858c02..42e50b2 100644 --- a/Informes/InformeFacturaCliente.dfm +++ b/Informes/InformeFacturaCliente.dfm @@ -1,7 +1,7 @@ inherited dmInformeFacturaCliente: TdmInformeFacturaCliente OldCreateOrder = True - Left = 569 - Top = 300 + Left = 572 + Top = 306 Width = 344 inherited FReport: TfrReport Dataset = TablaCab diff --git a/Informes/InformeTrimestralVentas.dfm b/Informes/InformeTrimestralVentas.dfm index 37725a4..134ef7f 100644 --- a/Informes/InformeTrimestralVentas.dfm +++ b/Informes/InformeTrimestralVentas.dfm @@ -1,7 +1,7 @@ inherited dmInformeTrimestralVentas: TdmInformeTrimestralVentas OldCreateOrder = True - Left = 715 - Top = 174 + Left = 719 + Top = 180 Width = 344 inherited FReport: TfrReport Dataset = TablaCab diff --git a/Libreria/Configuracion.dfm b/Libreria/Configuracion.dfm index 8ec005f..e044666 100644 Binary files a/Libreria/Configuracion.dfm and b/Libreria/Configuracion.dfm differ diff --git a/Temp/Factuges.exe b/Temp/Factuges.exe index 47d7698..84ce2de 100644 Binary files a/Temp/Factuges.exe and b/Temp/Factuges.exe differ diff --git a/Temp/Informes/ContratoArmarios(Con logo).frf b/Temp/Informes/ContratoArmarios(Con logo).frf index 31b6f69..30615ae 100644 Binary files a/Temp/Informes/ContratoArmarios(Con logo).frf and b/Temp/Informes/ContratoArmarios(Con logo).frf differ diff --git a/Temp/Informes/ContratoArmarios.frf b/Temp/Informes/ContratoArmarios.frf index acd1147..5e42cf3 100644 Binary files a/Temp/Informes/ContratoArmarios.frf and b/Temp/Informes/ContratoArmarios.frf differ diff --git a/Temp/Informes/ContratoBano(Con logo).frf b/Temp/Informes/ContratoBano(Con logo).frf index 9e6fb4e..64cb891 100644 Binary files a/Temp/Informes/ContratoBano(Con logo).frf and b/Temp/Informes/ContratoBano(Con logo).frf differ diff --git a/Temp/Informes/ContratoBano.frf b/Temp/Informes/ContratoBano.frf index 81ef93b..df8e506 100644 Binary files a/Temp/Informes/ContratoBano.frf and b/Temp/Informes/ContratoBano.frf differ diff --git a/Temp/Informes/ContratoCliente(Con logo).frf b/Temp/Informes/ContratoCliente(Con logo).frf index 43daea8..ab10a61 100644 Binary files a/Temp/Informes/ContratoCliente(Con logo).frf and b/Temp/Informes/ContratoCliente(Con logo).frf differ diff --git a/Temp/Informes/ContratoCliente.frf b/Temp/Informes/ContratoCliente.frf index 6d306d6..3369180 100644 Binary files a/Temp/Informes/ContratoCliente.frf and b/Temp/Informes/ContratoCliente.frf differ diff --git a/Temp/Informes/ContratoCocina(Con logo).frf b/Temp/Informes/ContratoCocina(Con logo).frf index 14456e3..373b982 100644 Binary files a/Temp/Informes/ContratoCocina(Con logo).frf and b/Temp/Informes/ContratoCocina(Con logo).frf differ diff --git a/Temp/Informes/ContratoCocina.frf b/Temp/Informes/ContratoCocina.frf index 57185c8..89e0327 100644 Binary files a/Temp/Informes/ContratoCocina.frf and b/Temp/Informes/ContratoCocina.frf differ diff --git a/Temp/Informes/FacturaCliente(Con logo).frf b/Temp/Informes/FacturaCliente(Con logo).frf index 5763aac..79b9ee6 100644 Binary files a/Temp/Informes/FacturaCliente(Con logo).frf and b/Temp/Informes/FacturaCliente(Con logo).frf differ diff --git a/Temp/Informes/FacturaCliente.frf b/Temp/Informes/FacturaCliente.frf index 39b113e..18fad16 100644 Binary files a/Temp/Informes/FacturaCliente.frf and b/Temp/Informes/FacturaCliente.frf differ diff --git a/Temp/Informes/PresupuestoArmarios(Con logo).frf b/Temp/Informes/PresupuestoArmarios(Con logo).frf index e44f57d..80265eb 100644 Binary files a/Temp/Informes/PresupuestoArmarios(Con logo).frf and b/Temp/Informes/PresupuestoArmarios(Con logo).frf differ diff --git a/Temp/Informes/PresupuestoArmarios.frf b/Temp/Informes/PresupuestoArmarios.frf index 66ea29f..ed1cf02 100644 Binary files a/Temp/Informes/PresupuestoArmarios.frf and b/Temp/Informes/PresupuestoArmarios.frf differ diff --git a/Temp/Informes/PresupuestoBano(Con logo).frf b/Temp/Informes/PresupuestoBano(Con logo).frf index 5be790e..93e7fa2 100644 Binary files a/Temp/Informes/PresupuestoBano(Con logo).frf and b/Temp/Informes/PresupuestoBano(Con logo).frf differ diff --git a/Temp/Informes/PresupuestoBano.frf b/Temp/Informes/PresupuestoBano.frf index 88cf373..cf9ca05 100644 Binary files a/Temp/Informes/PresupuestoBano.frf and b/Temp/Informes/PresupuestoBano.frf differ diff --git a/Temp/Informes/PresupuestoCliente(Con logo).frf b/Temp/Informes/PresupuestoCliente(Con logo).frf index 1be506e..0dbab25 100644 Binary files a/Temp/Informes/PresupuestoCliente(Con logo).frf and b/Temp/Informes/PresupuestoCliente(Con logo).frf differ diff --git a/Temp/Informes/PresupuestoCliente.frf b/Temp/Informes/PresupuestoCliente.frf index b989bdc..56ed0e5 100644 Binary files a/Temp/Informes/PresupuestoCliente.frf and b/Temp/Informes/PresupuestoCliente.frf differ diff --git a/bd/ABETO.GDB b/bd/ABETO.GDB index d48324b..01e0a61 100644 Binary files a/bd/ABETO.GDB and b/bd/ABETO.GDB differ