Se arreglan las bonificaciones de los presupuestos

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@860 0c75b7a4-871f-7646-8a2f-f78d34cc349f

Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm

@@ -5,7 +5,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
   ClientHeight = 592
   ClientWidth = 764
   OnClose = CustomEditorClose
-  ExplicitTop = -78
+  ExplicitTop = -71
   ExplicitWidth = 772
   ExplicitHeight = 626
   PixelsPerInch = 96
@@ -170,27 +170,26 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
   end
   inherited pgPaginas: TPageControl
     Width = 758
-    Height = 426
+    Height = 366
     TabOrder = 1
     OnChanging = pgPaginasChanging
-    ExplicitLeft = -2
     ExplicitWidth = 758
-    ExplicitHeight = 429
+    ExplicitHeight = 426
     inherited pagGeneral: TTabSheet
       ExplicitLeft = 4
       ExplicitTop = 24
       ExplicitWidth = 750
-      ExplicitHeight = 338
+      ExplicitHeight = 398
     end
     object pagContenido: TTabSheet
       Caption = 'Contenido'
       ImageIndex = 1
-      ExplicitHeight = 338
+      ExplicitHeight = 398
       inline frViewDetallesPresupuestoCliente1: TfrViewDetallesPresupuestoCliente
         Left = 0
         Top = 0
         Width = 750
-        Height = 398
+        Height = 338
         Align = alClient
         BiDiMode = bdLeftToRight
         Font.Charset = DEFAULT_CHARSET
@@ -203,7 +202,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 750
-        ExplicitHeight = 338
+        ExplicitHeight = 398
         inherited ToolBar1: TToolBar
           Width = 750
           Height = 73
@@ -221,18 +220,15 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
           inherited ToolButton14: TToolButton [4]
             Left = 334
             Top = 0
-            Wrap = True
             ExplicitLeft = 334
             ExplicitTop = 0
           end
           inherited FontName: TJvFontComboBox [5]
             Left = 0
-            ExplicitLeft = 0
           end
           inherited FontSize: TEdit
             Left = 145
             Width = 200
-            ExplicitLeft = 145
             ExplicitWidth = 200
           end
           inherited UpDown1: TUpDown
@@ -277,10 +273,10 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         inherited cxGrid: TcxGrid
           Top = 99
           Width = 750
-          Height = 299
+          Height = 239
           ExplicitTop = 99
           ExplicitWidth = 750
-          ExplicitHeight = 239
+          ExplicitHeight = 299
         end
         inherited TBXDock1: TTBXDock
           Top = 73
@@ -305,15 +301,15 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
     object pagPortada: TTabSheet
       Caption = 'Portada'
       ImageIndex = 3
-      ExplicitHeight = 338
+      ExplicitHeight = 398
       object Panel1: TPanel
         Left = 0
         Top = 0
         Width = 145
-        Height = 398
+        Height = 338
         Align = alLeft
         TabOrder = 0
-        ExplicitHeight = 338
+        ExplicitHeight = 398
         object Image2: TImage
           Left = 16
           Top = 16
@@ -401,7 +397,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         Left = 145
         Top = 0
         Width = 605
-        Height = 398
+        Height = 338
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -413,7 +409,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         ReadOnly = False
         ExplicitLeft = 145
         ExplicitWidth = 605
-        ExplicitHeight = 338
+        ExplicitHeight = 398
         inherited TBXDock1: TTBXDock
           Width = 605
           ExplicitWidth = 605
@@ -429,8 +425,8 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
           DataBinding.DataSource = dsDataTable
           Style.IsFontAssigned = True
           ExplicitWidth = 605
-          ExplicitHeight = 312
-          Height = 372
+          ExplicitHeight = 372
+          Height = 312
           Width = 605
         end
       end
@@ -438,15 +434,15 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
     object pagMemoria: TTabSheet
       Caption = 'Memoria'
       ImageIndex = 4
-      ExplicitHeight = 338
+      ExplicitHeight = 398
       object Panel2: TPanel
         Left = 0
         Top = 0
         Width = 145
-        Height = 398
+        Height = 338
         Align = alLeft
         TabOrder = 0
-        ExplicitHeight = 338
+        ExplicitHeight = 398
         object Image3: TImage
           Left = 16
           Top = 16
@@ -705,7 +701,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         Left = 145
         Top = 0
         Width = 605
-        Height = 398
+        Height = 338
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -717,7 +713,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         ReadOnly = False
         ExplicitLeft = 145
         ExplicitWidth = 605
-        ExplicitHeight = 338
+        ExplicitHeight = 398
         inherited TBXDock1: TTBXDock
           Width = 605
           ExplicitWidth = 605
@@ -733,8 +729,8 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
           DataBinding.DataSource = dsDataTable
           Style.IsFontAssigned = True
           ExplicitWidth = 605
-          ExplicitHeight = 312
-          Height = 372
+          ExplicitHeight = 372
+          Height = 312
           Width = 605
         end
       end
@@ -742,12 +738,12 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
     object pagInicidencias: TTabSheet
       Caption = 'Incidencias'
       ImageIndex = 2
-      ExplicitHeight = 338
+      ExplicitHeight = 398
       inline frViewIncidenciasCli: TfrViewIncidencias
         Left = 0
         Top = 0
         Width = 750
-        Height = 398
+        Height = 338
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -758,7 +754,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 750
-        ExplicitHeight = 338
+        ExplicitHeight = 398
         inherited pnlSup: TPanel
           Width = 750
           ExplicitWidth = 750
@@ -768,13 +764,13 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         end
         inherited GroupBox1: TGroupBox
           Width = 750
-          Height = 370
+          Height = 310
           ExplicitWidth = 750
-          ExplicitHeight = 310
+          ExplicitHeight = 370
           inherited eIncidencias: TcxDBMemo
             ExplicitWidth = 727
-            ExplicitHeight = 277
-            Height = 337
+            ExplicitHeight = 337
+            Height = 277
             Width = 727
           end
         end
@@ -783,12 +779,12 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
     object pagDocumentos: TTabSheet
       Caption = 'Documentos'
       ImageIndex = 5
-      ExplicitHeight = 338
+      ExplicitHeight = 398
       inline frViewDocumentosPresupuestoCliente1: TfrViewDocumentosPresupuestoCliente
         Left = 0
         Top = 0
         Width = 750
-        Height = 398
+        Height = 338
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -799,16 +795,16 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 750
-        ExplicitHeight = 338
+        ExplicitHeight = 398
         inherited TBXDock: TTBXDock
           Width = 750
           ExplicitWidth = 750
         end
         inherited ListView1: TListView
           Width = 750
-          Height = 375
+          Height = 315
           ExplicitWidth = 750
-          ExplicitHeight = 315
+          ExplicitHeight = 375
         end
       end
     end
@@ -825,9 +821,9 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
   end
   inline frViewTotalesPresupuesto1: TfrViewTotalesPresupuesto [4]
     Left = 0
-    Top = 508
+    Top = 448
     Width = 764
-    Height = 65
+    Height = 125
     Align = alBottom
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
@@ -837,147 +833,136 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
     ParentFont = False
     TabOrder = 4
     ReadOnly = False
-    ExplicitTop = 508
+    ExplicitTop = 448
     ExplicitWidth = 764
-    ExplicitHeight = 65
+    ExplicitHeight = 125
     inherited dxLayoutControl1: TdxLayoutControl
       Width = 764
-      Height = 65
+      Height = 125
       AutoContentSizes = [acsWidth]
       ExplicitWidth = 764
-      ExplicitHeight = 125
+      ExplicitHeight = 65
       inherited Bevel3: TBevel
         Left = 429
-        Top = 29
+        Top = 83
         Height = 75
         ExplicitLeft = 429
-        ExplicitTop = 29
+        ExplicitTop = 83
         ExplicitHeight = 75
       end
       inherited Bevel4: TBevel
         Left = 541
-        Top = 71
+        Top = 125
         Width = 192
         ExplicitLeft = 541
-        ExplicitTop = 71
+        ExplicitTop = 125
         ExplicitWidth = 192
       end
       inherited Bevel1: TBevel
         Left = 541
-        Top = 187
+        Top = 241
         Width = 73
         ExplicitLeft = 541
-        ExplicitTop = 187
+        ExplicitTop = 241
         ExplicitWidth = 73
       end
       inherited Bevel2: TBevel
         Left = 130
-        Top = 189
+        Top = 243
         Width = 368
         ExplicitLeft = 130
-        ExplicitTop = 189
+        ExplicitTop = 243
         ExplicitWidth = 368
       end
       inherited ImporteDto: TcxDBCurrencyEdit
         Left = 201
-        Top = 56
+        Top = 110
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 201
-        ExplicitTop = 56
+        ExplicitTop = 110
       end
       inherited ImporteIVA: TcxDBCurrencyEdit
         Left = 612
-        Top = 106
-        Style.LookAndFeel.SkinName = ''
-        Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 612
-        ExplicitTop = 106
-      end
-      inherited ImporteTotal: TcxDBCurrencyEdit
-        Left = 542
         Top = 160
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 542
+        ExplicitLeft = 612
         ExplicitTop = 160
       end
+      inherited ImporteTotal: TcxDBCurrencyEdit
+        Left = 542
+        Top = 214
+        Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitLeft = 542
+        ExplicitTop = 214
+      end
       inherited edtDescuento: TcxDBSpinEdit
         Left = 130
-        Top = 56
+        Top = 110
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 130
-        ExplicitTop = 56
+        ExplicitTop = 110
       end
       inherited edtIVA: TcxDBSpinEdit
         Left = 541
-        Top = 106
+        Top = 160
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 541
-        ExplicitTop = 106
+        ExplicitTop = 160
       end
       inherited ImporteBase: TcxDBCurrencyEdit
         Left = 541
-        Top = 29
+        Top = 83
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 541
-        ExplicitTop = 29
+        ExplicitTop = 83
       end
       inherited edtRE: TcxDBSpinEdit
         Left = 541
-        Top = 133
+        Top = 187
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 541
-        ExplicitTop = 133
+        ExplicitTop = 187
       end
       inherited ImporteRE: TcxDBCurrencyEdit
         Left = 612
-        Top = 133
+        Top = 187
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 612
-        ExplicitTop = 133
+        ExplicitTop = 187
       end
       inherited eImporteNeto: TcxDBCurrencyEdit
-        Left = 130
-        Top = 29
-        Style.LookAndFeel.SkinName = ''
-        Style.IsFontAssigned = True
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 130
-        ExplicitTop = 29
-      end
-      inherited ePorte: TcxDBCurrencyEdit
         Left = 130
         Top = 83
         Style.LookAndFeel.SkinName = ''
@@ -988,102 +973,112 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         ExplicitLeft = 130
         ExplicitTop = 83
       end
-      inherited eIVA: TcxDBLookupComboBox
+      inherited ePorte: TcxDBCurrencyEdit
         Left = 130
-        Top = 110
-        Style.LookAndFeel.SkinName = ''
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 130
-        ExplicitTop = 110
-      end
-      inherited bTiposIVA: TButton
-        Left = 281
-        Top = 110
-        ExplicitLeft = 281
-        ExplicitTop = 110
-      end
-      inherited eDescripcionBonificacion: TcxDBTextEdit
-        Left = 103
-        Top = 211
-        Style.LookAndFeel.SkinName = ''
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 103
-        ExplicitTop = 211
-      end
-      inherited eImporteBonificacion: TcxDBCurrencyEdit
-        Left = 103
-        Top = 238
+        Top = 137
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 103
-        ExplicitTop = 238
+        ExplicitLeft = 130
+        ExplicitTop = 137
       end
-      inherited cbBonificacion: TcxCheckBox
-        Left = 21
-        Top = 241
-        Style.LookAndFeel.SkinName = ''
-        StyleDisabled.LookAndFeel.SkinName = ''
-        StyleFocused.LookAndFeel.SkinName = ''
-        StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 21
-        ExplicitTop = 241
-        ExplicitHeight = 21
-      end
-      inherited cbRecargoEquivalencia: TcxDBCheckBox
+      inherited eIVA: TcxDBLookupComboBox
         Left = 130
-        Top = 137
+        Top = 164
         Style.LookAndFeel.SkinName = ''
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 130
-        ExplicitTop = 137
+        ExplicitTop = 164
+      end
+      inherited bTiposIVA: TButton
+        Left = 281
+        Top = 164
+        ExplicitLeft = 281
+        ExplicitTop = 164
+      end
+      inherited cbRecargoEquivalencia: TcxDBCheckBox
+        Left = 130
+        Top = 191
+        Style.LookAndFeel.SkinName = ''
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitLeft = 130
+        ExplicitTop = 191
         ExplicitWidth = 221
         Width = 221
       end
       inherited edtRetencion: TcxDBSpinEdit
         Left = 541
-        Top = 207
+        Top = 261
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 541
-        ExplicitTop = 207
+        ExplicitTop = 261
       end
       inherited edtImporteRetencion: TcxDBCurrencyEdit
         Left = 612
-        Top = 207
+        Top = 261
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 612
-        ExplicitTop = 207
+        ExplicitTop = 261
         ExplicitWidth = 180
         Width = 180
       end
       inherited edtFechaRetencion: TcxDBDateEdit
         Left = 130
-        Top = 209
+        Top = 263
         Style.LookAndFeel.SkinName = ''
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
         ExplicitLeft = 130
-        ExplicitTop = 209
+        ExplicitTop = 263
         ExplicitWidth = 280
         Width = 280
       end
+      inherited cbBonificacion: TcxCheckBox
+        Top = 10
+        Style.LookAndFeel.SkinName = ''
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitTop = 10
+        ExplicitWidth = 277
+        Width = 277
+      end
+      inherited eDescripcionBonificacion: TcxDBTextEdit
+        Top = 37
+        Style.LookAndFeel.SkinName = ''
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitTop = 37
+        ExplicitWidth = 325
+        Width = 325
+      end
+      inherited eImporteBonificacion: TcxDBCurrencyEdit
+        Left = 460
+        Top = 37
+        Style.LookAndFeel.SkinName = ''
+        Style.IsFontAssigned = True
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitLeft = 460
+        ExplicitTop = 37
+      end
       inherited dxLayoutControl1Group_Root: TdxLayoutGroup
         inherited dxLayoutControl1Group1: TdxLayoutGroup
           AlignVert = avBottom

Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.dfm

@@ -1,25 +1,33 @@
 inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
-  Height = 293
+  Width = 945
+  Height = 366
   OnDestroy = CustomViewDestroy
   OnShow = CustomViewShow
-  ExplicitHeight = 293
+  ExplicitWidth = 945
+  ExplicitHeight = 366
   inherited dxLayoutControl1: TdxLayoutControl
-    Height = 293
-    ExplicitWidth = 451
-    ExplicitHeight = 281
+    Width = 945
+    Height = 366
+    ExplicitHeight = 338
     DesignSize = (
-      451
-      293)
+      945
+      366)
     inherited Bevel3: TBevel
+      Left = 540
       Height = 122
+      ExplicitLeft = 540
       ExplicitHeight = 122
     end
     inherited Bevel4: TBevel
+      Left = 652
       Width = 192
+      ExplicitLeft = 652
       ExplicitWidth = 192
     end
     inherited Bevel1: TBevel
+      Left = 652
       Width = 73
+      ExplicitLeft = 652
       ExplicitWidth = 73
     end
     inherited Bevel2: TBevel
@@ -34,19 +42,23 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
       StyleHot.LookAndFeel.SkinName = ''
     end
     inherited ImporteIVA: TcxDBCurrencyEdit
+      Left = 723
       DataBinding.DataField = ''
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
+      ExplicitLeft = 723
     end
     inherited ImporteTotal: TcxDBCurrencyEdit
+      Left = 653
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
+      ExplicitLeft = 653
     end
     inherited edtDescuento: TcxDBSpinEdit
       Style.LookAndFeel.SkinName = ''
@@ -56,34 +68,42 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
       StyleHot.LookAndFeel.SkinName = ''
     end
     inherited edtIVA: TcxDBSpinEdit
+      Left = 652
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
+      ExplicitLeft = 652
     end
     inherited ImporteBase: TcxDBCurrencyEdit
+      Left = 652
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
+      ExplicitLeft = 652
     end
     inherited edtRE: TcxDBSpinEdit
+      Left = 652
       DataBinding.DataField = ''
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
+      ExplicitLeft = 652
     end
     inherited ImporteRE: TcxDBCurrencyEdit
+      Left = 723
       DataBinding.DataField = ''
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
+      ExplicitLeft = 723
     end
     inherited eImporteNeto: TcxDBCurrencyEdit
       Style.LookAndFeel.SkinName = ''
@@ -106,9 +126,78 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
     end
-    object eDescripcionBonificacion: TcxDBTextEdit [16]
-      Left = 104
-      Top = 210
+    inherited bTiposIVA: TButton
+      Left = 392
+      ExplicitLeft = 392
+    end
+    inherited cbRecargoEquivalencia: TcxDBCheckBox
+      DataBinding.DataField = ''
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      ExplicitWidth = 221
+      Width = 221
+    end
+    inherited edtRetencion: TcxDBSpinEdit
+      Left = 652
+      Style.LookAndFeel.SkinName = ''
+      Style.IsFontAssigned = True
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      ExplicitLeft = 652
+    end
+    inherited edtImporteRetencion: TcxDBCurrencyEdit
+      Left = 723
+      Style.LookAndFeel.SkinName = ''
+      Style.IsFontAssigned = True
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      ExplicitLeft = 723
+      ExplicitWidth = 180
+      Width = 180
+    end
+    inherited edtFechaRetencion: TcxDBDateEdit
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      ExplicitWidth = 280
+      Width = 280
+    end
+    object cbBonificacion: TcxCheckBox [20]
+      Left = 22
+      Top = 265
+      Caption = 'Incluir descuento por bonificaci'#243'n:'
+      Properties.DisplayChecked = '1'
+      Properties.DisplayUnchecked = '0'
+      Properties.ImmediatePost = True
+      Properties.NullStyle = nssUnchecked
+      Properties.ValueChecked = 1
+      Properties.ValueUnchecked = 0
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 16
+      Width = 200
+    end
+    object eDescripcionBonificacion: TcxDBTextEdit [21]
+      Left = 291
+      Top = 265
       Anchors = [akLeft, akTop, akRight]
       AutoSize = False
       DataBinding.DataField = 'DESCRIPCION_BONIFICACION'
@@ -131,15 +220,16 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
       Height = 21
       Width = 325
     end
-    object eImporteBonificacion: TcxDBCurrencyEdit [17]
-      Left = 104
-      Top = 237
+    object eImporteBonificacion: TcxDBCurrencyEdit [22]
+      Left = 646
+      Top = 265
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_BONIFICACION'
       DataBinding.DataSource = DADataSource
       Enabled = False
       ParentFont = False
       Properties.Alignment.Horz = taRightJustify
+      Properties.DisplayFormat = '- ,0.00 '#8364';,0.00 '#8364
       Properties.ReadOnly = False
       Properties.UseLeftAlignmentOnEditing = False
       Properties.UseThousandSeparator = True
@@ -166,67 +256,6 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
       Height = 21
       Width = 277
     end
-    object cbBonificacion: TcxCheckBox [18]
-      Left = 22
-      Top = 183
-      Caption = 'Incluir descuento por bonificaci'#243'n:'
-      Properties.DisplayChecked = '1'
-      Properties.DisplayUnchecked = '0'
-      Properties.ImmediatePost = True
-      Properties.NullStyle = nssUnchecked
-      Properties.ValueChecked = 1
-      Properties.ValueUnchecked = 0
-      Style.BorderColor = clWindowFrame
-      Style.BorderStyle = ebs3D
-      Style.HotTrack = False
-      Style.LookAndFeel.Kind = lfStandard
-      Style.LookAndFeel.NativeStyle = True
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.Kind = lfStandard
-      StyleDisabled.LookAndFeel.NativeStyle = True
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.Kind = lfStandard
-      StyleFocused.LookAndFeel.NativeStyle = True
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.Kind = lfStandard
-      StyleHot.LookAndFeel.NativeStyle = True
-      StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 16
-      Width = 277
-    end
-    inherited cbRecargoEquivalencia: TcxDBCheckBox
-      DataBinding.DataField = ''
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      ExplicitWidth = 221
-      Width = 221
-    end
-    inherited edtRetencion: TcxDBSpinEdit
-      Style.LookAndFeel.SkinName = ''
-      Style.IsFontAssigned = True
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-    end
-    inherited edtImporteRetencion: TcxDBCurrencyEdit
-      Style.LookAndFeel.SkinName = ''
-      Style.IsFontAssigned = True
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      ExplicitWidth = 180
-      Width = 180
-    end
-    inherited edtFechaRetencion: TcxDBDateEdit
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      ExplicitWidth = 280
-      Width = 280
-    end
     inherited dxLayoutControl1Group_Root: TdxLayoutGroup
       inherited dxLayoutControl1Group1: TdxLayoutGroup
         inherited dxLayoutControl1Group2: TdxLayoutGroup
@@ -269,6 +298,29 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
           end
         end
       end
+      object dxLayoutControl1Group13: TdxLayoutGroup
+        Caption = 'Bonificaci'#243'n'
+        LayoutDirection = ldHorizontal
+        object dxLayoutControl1Item20: TdxLayoutItem
+          ShowCaption = False
+          Control = cbBonificacion
+          ControlOptions.ShowBorder = False
+        end
+        object dxLayoutControl1Item22: TdxLayoutItem
+          AutoAligns = [aaVertical]
+          AlignHorz = ahClient
+          Caption = 'Descripci'#243'n:'
+          Control = eDescripcionBonificacion
+          ControlOptions.ShowBorder = False
+        end
+        object dxLayoutControl1Item23: TdxLayoutItem
+          AutoAligns = [aaVertical]
+          AlignHorz = ahRight
+          Caption = 'Importe:'
+          Control = eImporteBonificacion
+          ControlOptions.ShowBorder = False
+        end
+      end
     end
   end
 end

Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.pas

@@ -12,9 +12,13 @@ uses
 
 type
   TfrViewTotalesPresupuesto = class(TfrViewTotales)
-    eDescripcionBonificacion: TcxDBTextEdit;
-    eImporteBonificacion: TcxDBCurrencyEdit;
+    dxLayoutControl1Item20: TdxLayoutItem;
     cbBonificacion: TcxCheckBox;
+    dxLayoutControl1Item22: TdxLayoutItem;
+    eDescripcionBonificacion: TcxDBTextEdit;
+    dxLayoutControl1Item23: TdxLayoutItem;
+    eImporteBonificacion: TcxDBCurrencyEdit;
+    dxLayoutControl1Group13: TdxLayoutGroup;
     procedure CustomViewDestroy(Sender: TObject);
     procedure CustomViewShow(Sender: TObject);
     procedure OnBonificacionPropertiesEditValueChanged(Sender: TObject);