diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index 09d08d8..57397da 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -52,7 +52,7 @@
Delphi.Personality
VCLApplication
-FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse5530FalseFalseFalseFalseFalse30821252Rodax Software S.L.5.5.3.0FactuGESFactuGES5.5.3.0
+FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse5540FalseFalseFalseFalseFalse30821252Rodax Software S.L.5.5.4.0FactuGESFactuGES5.5.4.0
File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found
diff --git a/Source/Modulos/Contratos de cliente/Views/uEditorDireccionEntregaContratoCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uEditorDireccionEntregaContratoCliente.dfm
index 0fba221..da22c2e 100644
--- a/Source/Modulos/Contratos de cliente/Views/uEditorDireccionEntregaContratoCliente.dfm
+++ b/Source/Modulos/Contratos de cliente/Views/uEditorDireccionEntregaContratoCliente.dfm
@@ -170,7 +170,7 @@ object fEditorDireccionEntregaContratoCliente: TfEditorDireccionEntregaContratoC
object cbPais: TcxDBComboBox
Left = 134
Top = 167
- DataBinding.DataField = 'PAIS'
+ DataBinding.DataField = 'PAIS_ENVIO'
DataBinding.DataSource = dsDireccion
Properties.DropDownListStyle = lsEditFixedList
Properties.ImmediatePost = True
diff --git a/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.dfm
index 7d32090..a8fbbbb 100644
--- a/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.dfm
+++ b/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.dfm
@@ -1,5 +1,98 @@
inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente
+ Width = 1488
+ Height = 437
+ inherited ToolBar1: TToolBar
+ Width = 1488
+ Height = 24
+ ButtonWidth = 123
+ inherited ToolButton2: TToolButton
+ Left = 119
+ end
+ inherited ToolButton3: TToolButton
+ Left = 246
+ end
+ inherited ToolButton4: TToolButton
+ Left = 304
+ Wrap = False
+ ExplicitWidth = 57
+ end
+ inherited ToolButton14: TToolButton
+ Left = 361
+ Top = 0
+ ExplicitLeft = 361
+ ExplicitTop = 0
+ end
+ inherited FontName: TJvFontComboBox
+ Left = 395
+ Top = 0
+ ExplicitLeft = 395
+ ExplicitTop = 0
+ end
+ inherited FontSize: TEdit
+ Left = 540
+ Top = 0
+ ExplicitLeft = 540
+ ExplicitTop = 0
+ end
+ inherited UpDown1: TUpDown
+ Left = 582
+ Top = 0
+ ExplicitLeft = 582
+ ExplicitTop = 0
+ end
+ inherited ToolButton13: TToolButton
+ Left = 599
+ Top = 0
+ ExplicitLeft = 599
+ ExplicitTop = 0
+ end
+ inherited ToolButton6: TToolButton
+ Left = 607
+ Top = 0
+ ExplicitLeft = 607
+ ExplicitTop = 0
+ end
+ inherited ToolButton7: TToolButton
+ Left = 641
+ Top = 0
+ ExplicitLeft = 641
+ ExplicitTop = 0
+ end
+ inherited ToolButton8: TToolButton
+ Left = 675
+ Top = 0
+ ExplicitLeft = 675
+ ExplicitTop = 0
+ end
+ inherited ToolButton12: TToolButton
+ Left = 709
+ Top = 0
+ ExplicitLeft = 709
+ ExplicitTop = 0
+ end
+ inherited ToolButton9: TToolButton
+ Left = 717
+ Top = 0
+ ExplicitLeft = 717
+ ExplicitTop = 0
+ end
+ inherited ToolButton10: TToolButton
+ Left = 751
+ Top = 0
+ ExplicitLeft = 751
+ ExplicitTop = 0
+ end
+ inherited ToolButton11: TToolButton
+ Left = 785
+ Top = 0
+ ExplicitLeft = 785
+ ExplicitTop = 0
+ end
+ end
inherited cxGrid: TcxGrid
+ Top = 50
+ Width = 1488
+ Height = 387
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewPOSICION: TcxGridDBColumn
Caption = '-'
@@ -70,8 +163,10 @@ inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente
end
end
inherited TBXDock1: TTBXDock
+ Top = 24
+ Width = 1488
inherited TBXToolbar1: TTBXToolbar
- ExplicitWidth = 325
+ ExplicitWidth = 793
object TBXSubmenuItem1: TTBXSubmenuItem [0]
Caption = 'A'#241'adir cap'#237'tulo'
DisplayMode = nbdmImageAndText
@@ -134,6 +229,9 @@ inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente
end
object TBXSeparatorItem6: TTBXSeparatorItem [1]
end
+ object TBXItem30: TTBXItem [18]
+ Action = Action1
+ end
object TBXSeparatorItem9: TTBXSeparatorItem
end
object TBXItem18: TTBXItem
@@ -179,7 +277,7 @@ inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente
TabOrder = 2
end
object TBXToolbar2: TTBXToolbar
- Left = 325
+ Left = 1055
Top = 0
Align = alRight
Caption = 'TBXToolbar2'
@@ -384,6 +482,12 @@ inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente
Caption = 'Cap'#237'tulo interior de armario estructura de cristal'
OnExecute = actCapituloIntEstCristalExecute
end
+ object Action1: TAction
+ Caption = 'Exportar Excel'
+ Enabled = False
+ Visible = False
+ OnExecute = Action1Execute
+ end
end
inherited cxStyleRepository: TcxStyleRepository
inherited cxStyle_IMPORTETOTAL: TcxStyle
diff --git a/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.pas b/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.pas
index f321411..1aa1a5e 100644
--- a/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.pas
+++ b/Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.pas
@@ -79,6 +79,8 @@ type
edtDescuentoCapitulo: TcxDBCurrencyEdit;
actCapituloIntEstCristal: TAction;
TBXItem29: TTBXItem;
+ Action1: TAction;
+ TBXItem30: TTBXItem;
procedure actAsignarDescuentoExecute(Sender: TObject);
procedure actAsignarDescuentoUpdate(Sender: TObject);
procedure CustomViewShow(Sender: TObject);
@@ -105,6 +107,7 @@ type
procedure actCapituloServSuministroExecute(Sender: TObject);
procedure actCapituloServInstalacionExecute(Sender: TObject);
procedure actCapituloIntEstCristalExecute(Sender: TObject);
+ procedure Action1Execute(Sender: TObject);
private
procedure AnadirCapitulo(const Tipo: String;const Descripcion: String; const Descuento:Boolean = false; const ConstanteConfiguracion: String = '');
@@ -329,6 +332,16 @@ begin
AnadirCapitulo(TIPO_CAPITULO_V, 'VARIOS ', true);
end;
+procedure TfrViewDetallesContratoCliente.Action1Execute(Sender: TObject);
+var
+ AFileName: string;
+begin
+ inherited;
+//
+ if Assigned(_Grid) then
+ ExportGridToExcel('C:\Users\Usuario\Downloads\prueba.xls', _Grid);
+end;
+
function TfrViewDetallesContratoCliente.AnadirArticulo(pReferencia: String; TipoReferencia: TEnumReferencia): Boolean;
begin
Result := (Controller as IDetallesContratoClienteController).AnadirArticulo(Detalles, pReferencia, TipoReferencia, Contrato.Cliente.ID);