diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index 0f9ef67..8076ee1 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -53,7 +53,7 @@
Delphi.Personality
VCLApplication
-FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4280FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.2.8.0FactuGESFactuGES4.2.8.0FactuGES.dprFalse
+FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4290FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.2.9.0FactuGESFactuGES4.2.9.0FactuGES.dprFalse
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index 60aea02..4622b5b 100644
Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ
diff --git a/Source/Informes/1/InfAlbaranProveedor.fr3 b/Source/Informes/1/InfAlbaranProveedor.fr3
index 3a075ba..9a11f67 100644
--- a/Source/Informes/1/InfAlbaranProveedor.fr3
+++ b/Source/Informes/1/InfAlbaranProveedor.fr3
@@ -1,5 +1,5 @@
-
+
diff --git a/Source/Informes/2/InfAlbaranProveedor.fr3 b/Source/Informes/2/InfAlbaranProveedor.fr3
index 3a075ba..84af24c 100644
--- a/Source/Informes/2/InfAlbaranProveedor.fr3
+++ b/Source/Informes/2/InfAlbaranProveedor.fr3
@@ -1,5 +1,5 @@
-
+
diff --git a/Source/Informes/4/InfAlbaranProveedor.fr3 b/Source/Informes/4/InfAlbaranProveedor.fr3
index 5e8b58e..536d4de 100644
--- a/Source/Informes/4/InfAlbaranProveedor.fr3
+++ b/Source/Informes/4/InfAlbaranProveedor.fr3
@@ -1,5 +1,5 @@
-
+
diff --git a/Source/Informes/5/InfAlbaranProveedor.fr3 b/Source/Informes/5/InfAlbaranProveedor.fr3
index 3a075ba..90ad618 100644
--- a/Source/Informes/5/InfAlbaranProveedor.fr3
+++ b/Source/Informes/5/InfAlbaranProveedor.fr3
@@ -1,5 +1,5 @@
-
+
diff --git a/Source/Modulos/Albaranes de proveedor/Model/uBizAlbaranesProveedor.pas b/Source/Modulos/Albaranes de proveedor/Model/uBizAlbaranesProveedor.pas
index e82ae1e..d5e85c4 100644
--- a/Source/Modulos/Albaranes de proveedor/Model/uBizAlbaranesProveedor.pas
+++ b/Source/Modulos/Albaranes de proveedor/Model/uBizAlbaranesProveedor.pas
@@ -356,19 +356,28 @@ begin
if not FClienteFinal.DataTable.Active then
FClienteFinal.DataTable.Active := True;
- if Self.ID_CLIENTE_FINAL <> FClienteFinal.ID then
- begin
+// if Self.ID_CLIENTE_FINAL <> FClienteFinal.ID then
+// begin
bEnEdicion := (DataTable.State in dsEditModes);
if not bEnEdicion then
DataTable.Edit;
Self.ID_CLIENTE_FINAL := FClienteFinal.ID;
+ Self.CALLE := FClienteFinal.CALLE;
+ Self.POBLACION := FClienteFinal.POBLACION;
+ Self.POBLACION := FClienteFinal.POBLACION;
+ Self.PROVINCIA := FClienteFinal.PROVINCIA;
+ Self.CODIGO_POSTAL := FClienteFinal.CODIGO_POSTAL;
+ Self.PERSONA_CONTACTO := FClienteFinal.PERSONA_CONTACTO;
+ Self.TELEFONO := FClienteFinal.TELEFONO_1;
+
+
DataTable.Post; //Muy importante ya que es necesario hacer un post de la cabecera antes de añadir detalles
//si se quita el id de la cabecera y los detalles se desincroniza
if bEnEdicion then
DataTable.Edit;
- end;
+// end;
end;
end;
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm
index 33f9f78..7501fc0 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm
+++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm
@@ -198,25 +198,25 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
ExplicitLeft = 278
ExplicitTop = 0
end
- inherited FontName: TJvFontComboBox
+ inherited ToolButton14: TToolButton [4]
Left = 334
Top = 0
ExplicitLeft = 334
ExplicitTop = 0
end
- inherited ToolButton14: TToolButton
- Left = 479
+ inherited FontName: TJvFontComboBox [5]
+ Left = 399
Top = 0
- ExplicitLeft = 479
+ ExplicitLeft = 399
ExplicitTop = 0
end
inherited FontSize: TEdit
Left = 544
Top = 0
- Width = 154
+ Width = 170
ExplicitLeft = 544
ExplicitTop = 0
- ExplicitWidth = 154
+ ExplicitWidth = 170
end
inherited ToolButton13: TToolButton [7]
Left = 0
@@ -232,49 +232,49 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
ExplicitLeft = 0
ExplicitTop = 27
end
- inherited ToolButton11: TToolButton
+ inherited ToolButton6: TToolButton [9]
Left = 17
Top = 27
ExplicitLeft = 17
ExplicitTop = 27
end
- inherited ToolButton12: TToolButton
- Left = 158
+ inherited ToolButton7: TToolButton [10]
+ Left = 83
Top = 27
Wrap = False
- ExplicitLeft = 158
+ ExplicitLeft = 83
+ ExplicitTop = 27
+ end
+ inherited ToolButton8: TToolButton [11]
+ Left = 150
+ Top = 27
+ ExplicitLeft = 150
+ ExplicitTop = 27
+ end
+ inherited ToolButton12: TToolButton [12]
+ Left = 233
+ Top = 27
+ Wrap = False
+ ExplicitLeft = 233
ExplicitTop = 27
ExplicitHeight = 22
end
- inherited ToolButton9: TToolButton
- Left = 166
+ inherited ToolButton9: TToolButton [13]
+ Left = 241
Top = 27
- ExplicitLeft = 166
+ ExplicitLeft = 241
ExplicitTop = 27
end
- inherited ToolButton10: TToolButton
- Left = 311
+ inherited ToolButton10: TToolButton [14]
+ Left = 386
Top = 27
- ExplicitLeft = 311
+ ExplicitLeft = 386
ExplicitTop = 27
end
- inherited ToolButton6: TToolButton
- Left = 436
+ inherited ToolButton11: TToolButton [15]
+ Left = 511
Top = 27
- ExplicitLeft = 436
- ExplicitTop = 27
- end
- inherited ToolButton7: TToolButton
- Left = 502
- Top = 27
- Wrap = False
- ExplicitLeft = 502
- ExplicitTop = 27
- end
- inherited ToolButton8: TToolButton
- Left = 569
- Top = 27
- ExplicitLeft = 569
+ ExplicitLeft = 511
ExplicitTop = 27
end
end
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewDatosYSeleccionClienteFinalAlbaran.pas b/Source/Modulos/Albaranes de proveedor/Views/uViewDatosYSeleccionClienteFinalAlbaran.pas
index 91c9bda..68c0ea9 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uViewDatosYSeleccionClienteFinalAlbaran.pas
+++ b/Source/Modulos/Albaranes de proveedor/Views/uViewDatosYSeleccionClienteFinalAlbaran.pas
@@ -438,6 +438,9 @@ begin
ShowErrorMessage('No se ha indicado un cliente', 'El presupuesto no tiene ningún cliente asociado a mostrar.')
else begin
FClientesController.Ver(Cliente);
+
+ if (ShowConfirmMessage('¿Desea recargar los datos del cliente?', '') = IDYES) then
+ Self.Cliente := Cliente;
end;
end;
diff --git a/Source/Modulos/Contactos/Model/Contactos_model.identcache b/Source/Modulos/Contactos/Model/Contactos_model.identcache
index b81baab..58f81fc 100644
Binary files a/Source/Modulos/Contactos/Model/Contactos_model.identcache and b/Source/Modulos/Contactos/Model/Contactos_model.identcache differ
diff --git a/Source/Modulos/Contactos/Views/Contactos_view.dproj b/Source/Modulos/Contactos/Views/Contactos_view.dproj
index c48f484..9d33182 100644
--- a/Source/Modulos/Contactos/Views/Contactos_view.dproj
+++ b/Source/Modulos/Contactos/Views/Contactos_view.dproj
@@ -49,58 +49,65 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -206,7 +213,7 @@
TFrame
-
+
TFrame
@@ -289,13 +296,6 @@
TCustomView
-
-
-
-
-
-
-