Se arreglan las bonificaciones de los presupuestos

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@861 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
roberto 2009-01-22 10:07:07 +00:00
parent 1057ae5285
commit b715c7fc55
2 changed files with 180 additions and 136 deletions

View File

@ -174,17 +174,16 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
TabOrder = 1
OnChanging = pgPaginasChanging
ExplicitWidth = 758
ExplicitHeight = 426
ExplicitHeight = 366
inherited pagGeneral: TTabSheet
ExplicitLeft = 4
ExplicitTop = 24
ExplicitWidth = 750
ExplicitHeight = 398
ExplicitHeight = 338
end
object pagContenido: TTabSheet
Caption = 'Contenido'
ImageIndex = 1
ExplicitHeight = 398
inline frViewDetallesPresupuestoCliente1: TfrViewDetallesPresupuestoCliente
Left = 0
Top = 0
@ -202,12 +201,12 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
TabOrder = 0
ReadOnly = False
ExplicitWidth = 750
ExplicitHeight = 398
ExplicitHeight = 338
inherited ToolBar1: TToolBar
Width = 750
Height = 73
Height = 78
ExplicitWidth = 750
ExplicitHeight = 73
ExplicitHeight = 78
inherited ToolButton3: TToolButton
Wrap = False
end
@ -217,71 +216,98 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitLeft = 278
ExplicitTop = 0
end
inherited ToolButton14: TToolButton [4]
inherited ToolButton14: TToolButton
Left = 334
Top = 0
Wrap = False
ExplicitLeft = 334
ExplicitTop = 0
end
inherited FontName: TJvFontComboBox [5]
Left = 0
inherited FontName: TJvFontComboBox
Left = 399
Top = 0
ExplicitLeft = 399
ExplicitTop = 0
end
inherited FontSize: TEdit
Left = 145
inherited ToolButton13: TToolButton [6]
Left = 0
Top = 0
Wrap = True
ExplicitLeft = 0
ExplicitTop = 0
ExplicitHeight = 27
end
inherited FontSize: TEdit [7]
Left = 0
Top = 27
Width = 200
ExplicitLeft = 0
ExplicitTop = 27
ExplicitWidth = 200
end
inherited UpDown1: TUpDown
Left = 345
ExplicitLeft = 345
inherited UpDown1: TUpDown [8]
Left = 200
Top = 27
ExplicitLeft = 200
ExplicitTop = 27
end
inherited ToolButton13: TToolButton
Left = 362
ExplicitLeft = 362
inherited ToolButton6: TToolButton
Left = 217
Top = 27
ExplicitLeft = 217
ExplicitTop = 27
end
inherited ToolButton6: TToolButton [9]
Left = 370
Top = 22
ExplicitLeft = 370
ExplicitTop = 22
inherited ToolButton7: TToolButton
Left = 283
Top = 27
ExplicitLeft = 283
ExplicitTop = 27
end
inherited ToolButton7: TToolButton [10]
Left = 436
Top = 22
ExplicitLeft = 436
ExplicitTop = 22
inherited ToolButton8: TToolButton
Left = 350
Top = 27
ExplicitLeft = 350
ExplicitTop = 27
end
inherited ToolButton8: TToolButton [11]
Left = 503
Top = 22
ExplicitLeft = 503
ExplicitTop = 22
inherited ToolButton12: TToolButton
Left = 0
Top = 27
Wrap = True
ExplicitLeft = 0
ExplicitTop = 27
ExplicitHeight = 27
end
inherited ToolButton12: TToolButton [12]
inherited ToolButton9: TToolButton
Left = 0
Top = 54
ExplicitLeft = 0
ExplicitTop = 54
end
inherited ToolButton9: TToolButton [13]
inherited ToolButton10: TToolButton
Left = 145
Top = 54
ExplicitLeft = 145
ExplicitTop = 54
end
inherited ToolButton10: TToolButton [14]
end
inherited ToolButton11: TToolButton [15]
inherited ToolButton11: TToolButton
Left = 270
Top = 49
Top = 54
ExplicitLeft = 270
ExplicitTop = 49
ExplicitTop = 54
end
end
inherited cxGrid: TcxGrid
Top = 99
Top = 104
Width = 750
Height = 239
ExplicitTop = 99
Height = 234
ExplicitTop = 104
ExplicitWidth = 750
ExplicitHeight = 299
ExplicitHeight = 234
end
inherited TBXDock1: TTBXDock
Top = 73
Top = 78
Width = 750
ExplicitTop = 73
ExplicitTop = 78
ExplicitWidth = 750
inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 750
@ -301,7 +327,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
object pagPortada: TTabSheet
Caption = 'Portada'
ImageIndex = 3
ExplicitHeight = 398
object Panel1: TPanel
Left = 0
Top = 0
@ -409,7 +434,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ReadOnly = False
ExplicitLeft = 145
ExplicitWidth = 605
ExplicitHeight = 398
ExplicitHeight = 338
inherited TBXDock1: TTBXDock
Width = 605
ExplicitWidth = 605
@ -425,7 +450,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
DataBinding.DataSource = dsDataTable
Style.IsFontAssigned = True
ExplicitWidth = 605
ExplicitHeight = 372
ExplicitHeight = 312
Height = 312
Width = 605
end
@ -434,7 +459,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
object pagMemoria: TTabSheet
Caption = 'Memoria'
ImageIndex = 4
ExplicitHeight = 398
object Panel2: TPanel
Left = 0
Top = 0
@ -713,7 +737,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ReadOnly = False
ExplicitLeft = 145
ExplicitWidth = 605
ExplicitHeight = 398
ExplicitHeight = 338
inherited TBXDock1: TTBXDock
Width = 605
ExplicitWidth = 605
@ -729,7 +753,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
DataBinding.DataSource = dsDataTable
Style.IsFontAssigned = True
ExplicitWidth = 605
ExplicitHeight = 372
ExplicitHeight = 312
Height = 312
Width = 605
end
@ -738,7 +762,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
object pagInicidencias: TTabSheet
Caption = 'Incidencias'
ImageIndex = 2
ExplicitHeight = 398
inline frViewIncidenciasCli: TfrViewIncidencias
Left = 0
Top = 0
@ -754,7 +777,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
TabOrder = 0
ReadOnly = False
ExplicitWidth = 750
ExplicitHeight = 398
ExplicitHeight = 338
inherited pnlSup: TPanel
Width = 750
ExplicitWidth = 750
@ -766,10 +789,10 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 750
Height = 310
ExplicitWidth = 750
ExplicitHeight = 370
ExplicitHeight = 310
inherited eIncidencias: TcxDBMemo
ExplicitWidth = 727
ExplicitHeight = 337
ExplicitHeight = 277
Height = 277
Width = 727
end
@ -779,7 +802,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
object pagDocumentos: TTabSheet
Caption = 'Documentos'
ImageIndex = 5
ExplicitHeight = 398
inline frViewDocumentosPresupuestoCliente1: TfrViewDocumentosPresupuestoCliente
Left = 0
Top = 0
@ -795,7 +817,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
TabOrder = 0
ReadOnly = False
ExplicitWidth = 750
ExplicitHeight = 398
ExplicitHeight = 338
inherited TBXDock: TTBXDock
Width = 750
ExplicitWidth = 750
@ -841,243 +863,263 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Height = 125
AutoContentSizes = [acsWidth]
ExplicitWidth = 764
ExplicitHeight = 65
ExplicitHeight = 125
inherited Bevel3: TBevel
Left = 429
Top = 83
Top = 80
Height = 75
ExplicitLeft = 429
ExplicitTop = 83
ExplicitTop = 80
ExplicitHeight = 75
end
inherited Bevel4: TBevel
Left = 541
Top = 125
Top = 122
Width = 192
ExplicitLeft = 541
ExplicitTop = 125
ExplicitTop = 122
ExplicitWidth = 192
end
inherited Bevel1: TBevel
Left = 541
Top = 241
Top = 238
Width = 73
ExplicitLeft = 541
ExplicitTop = 241
ExplicitTop = 238
ExplicitWidth = 73
end
inherited Bevel2: TBevel
Left = 130
Top = 243
Top = 240
Width = 368
ExplicitLeft = 130
ExplicitTop = 243
ExplicitTop = 240
ExplicitWidth = 368
end
inherited ImporteDto: TcxDBCurrencyEdit
Left = 201
Top = 110
Top = 107
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 201
ExplicitTop = 110
ExplicitTop = 107
ExplicitWidth = 87
Width = 87
end
inherited ImporteIVA: TcxDBCurrencyEdit
Left = 612
Top = 160
Top = 157
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 612
ExplicitTop = 160
ExplicitTop = 157
ExplicitWidth = 20
Width = 20
end
inherited ImporteTotal: TcxDBCurrencyEdit
Left = 542
Top = 214
Top = 211
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 542
ExplicitTop = 214
ExplicitTop = 211
ExplicitWidth = 90
Width = 90
end
inherited edtDescuento: TcxDBSpinEdit
Left = 130
Top = 110
Top = 107
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 130
ExplicitTop = 110
ExplicitTop = 107
end
inherited edtIVA: TcxDBSpinEdit
Left = 541
Top = 160
Top = 157
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 541
ExplicitTop = 160
ExplicitTop = 157
end
inherited ImporteBase: TcxDBCurrencyEdit
Left = 541
Top = 83
Top = 80
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 541
ExplicitTop = 83
ExplicitTop = 80
ExplicitWidth = 91
Width = 91
end
inherited edtRE: TcxDBSpinEdit
Left = 541
Top = 187
Top = 184
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 541
ExplicitTop = 187
ExplicitTop = 184
end
inherited ImporteRE: TcxDBCurrencyEdit
Left = 612
Top = 187
Top = 184
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 612
ExplicitTop = 187
ExplicitTop = 184
ExplicitWidth = 20
Width = 20
end
inherited eImporteNeto: TcxDBCurrencyEdit
Left = 130
Top = 83
Top = 80
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 130
ExplicitTop = 83
ExplicitTop = 80
ExplicitWidth = 158
Width = 158
end
inherited ePorte: TcxDBCurrencyEdit
Left = 130
Top = 137
Top = 134
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 130
ExplicitTop = 137
ExplicitTop = 134
ExplicitWidth = 158
Width = 158
end
inherited eIVA: TcxDBLookupComboBox
Left = 130
Top = 164
Top = 161
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 130
ExplicitTop = 164
ExplicitTop = 161
ExplicitWidth = 20
Width = 20
end
inherited bTiposIVA: TButton
Left = 281
Top = 164
Top = 161
ExplicitLeft = 281
ExplicitTop = 164
ExplicitTop = 161
end
inherited cbRecargoEquivalencia: TcxDBCheckBox
Left = 130
Top = 191
Top = 188
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 130
ExplicitTop = 191
ExplicitTop = 188
ExplicitWidth = 221
Width = 221
end
inherited edtRetencion: TcxDBSpinEdit
Left = 541
Top = 261
Top = 258
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 541
ExplicitTop = 261
ExplicitTop = 258
end
inherited edtImporteRetencion: TcxDBCurrencyEdit
Left = 612
Top = 261
Top = 258
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 612
ExplicitTop = 261
ExplicitTop = 258
ExplicitWidth = 180
Width = 180
end
inherited edtFechaRetencion: TcxDBDateEdit
Left = 130
Top = 263
Top = 260
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 130
ExplicitTop = 263
ExplicitTop = 260
ExplicitWidth = 280
Width = 280
end
inherited cbBonificacion: TcxCheckBox
Top = 10
Left = 21
Top = 29
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 10
ExplicitLeft = 21
ExplicitTop = 29
ExplicitWidth = 277
Width = 277
end
inherited eDescripcionBonificacion: TcxDBTextEdit
Top = 37
Left = 367
Top = 29
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 37
ExplicitLeft = 367
ExplicitTop = 29
ExplicitWidth = 325
Width = 325
end
inherited eImporteBonificacion: TcxDBCurrencyEdit
Left = 460
Top = 37
Left = 449
Top = 29
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 460
ExplicitTop = 37
ExplicitLeft = 449
ExplicitTop = 29
end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
inherited dxLayoutControl1Group1: TdxLayoutGroup
@ -1094,6 +1136,9 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
end
end
end
inherited dxLayoutControl1Group13: TdxLayoutGroup
LookAndFeel = dxLayoutOfficeLookAndFeel1
end
end
end
end

View File

@ -1,33 +1,32 @@
inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
Width = 945
Width = 925
Height = 366
OnDestroy = CustomViewDestroy
OnShow = CustomViewShow
ExplicitWidth = 945
ExplicitHeight = 366
inherited dxLayoutControl1: TdxLayoutControl
Width = 945
Width = 925
Height = 366
ExplicitHeight = 338
ExplicitHeight = 366
DesignSize = (
945
925
366)
inherited Bevel3: TBevel
Left = 540
Left = 529
Height = 122
ExplicitLeft = 540
ExplicitLeft = 529
ExplicitHeight = 122
end
inherited Bevel4: TBevel
Left = 652
Left = 641
Width = 192
ExplicitLeft = 652
ExplicitLeft = 641
ExplicitWidth = 192
end
inherited Bevel1: TBevel
Left = 652
Left = 641
Width = 73
ExplicitLeft = 652
ExplicitLeft = 641
ExplicitWidth = 73
end
inherited Bevel2: TBevel
@ -42,23 +41,23 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
StyleHot.LookAndFeel.SkinName = ''
end
inherited ImporteIVA: TcxDBCurrencyEdit
Left = 723
Left = 712
DataBinding.DataField = ''
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 723
ExplicitLeft = 712
end
inherited ImporteTotal: TcxDBCurrencyEdit
Left = 653
Left = 642
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 653
ExplicitLeft = 642
end
inherited edtDescuento: TcxDBSpinEdit
Style.LookAndFeel.SkinName = ''
@ -68,42 +67,42 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
StyleHot.LookAndFeel.SkinName = ''
end
inherited edtIVA: TcxDBSpinEdit
Left = 652
Left = 641
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 652
ExplicitLeft = 641
end
inherited ImporteBase: TcxDBCurrencyEdit
Left = 652
Left = 641
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 652
ExplicitLeft = 641
end
inherited edtRE: TcxDBSpinEdit
Left = 652
Left = 641
DataBinding.DataField = ''
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 652
ExplicitLeft = 641
end
inherited ImporteRE: TcxDBCurrencyEdit
Left = 723
Left = 712
DataBinding.DataField = ''
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 723
ExplicitLeft = 712
end
inherited eImporteNeto: TcxDBCurrencyEdit
Style.LookAndFeel.SkinName = ''
@ -127,8 +126,8 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
StyleHot.LookAndFeel.SkinName = ''
end
inherited bTiposIVA: TButton
Left = 392
ExplicitLeft = 392
Left = 381
ExplicitLeft = 381
end
inherited cbRecargoEquivalencia: TcxDBCheckBox
DataBinding.DataField = ''
@ -140,22 +139,22 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
Width = 221
end
inherited edtRetencion: TcxDBSpinEdit
Left = 652
Left = 641
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 652
ExplicitLeft = 641
end
inherited edtImporteRetencion: TcxDBCurrencyEdit
Left = 723
Left = 712
Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 723
ExplicitLeft = 712
ExplicitWidth = 180
Width = 180
end
@ -221,7 +220,7 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
Width = 325
end
object eImporteBonificacion: TcxDBCurrencyEdit [22]
Left = 646
Left = 626
Top = 265
AutoSize = False
DataBinding.DataField = 'IMPORTE_BONIFICACION'