From ac3fa65c56ed611de478a4b515f74053b9a170d8 Mon Sep 17 00:00:00 2001 From: roberto Date: Thu, 28 Feb 2013 16:51:21 +0000 Subject: [PATCH] =?UTF-8?q?Version=204.2.9=20Tareas=20#1160:=20En=20los=20?= =?UTF-8?q?albaranes=20de=20proveedor=20no=20funciona=20bien=20refrescar?= =?UTF-8?q?=20los=20datos=20del=20cliente=20cuando=20se=20ha=20cambiado=20?= =?UTF-8?q?su=20ficha=20Tareas=20#1161:=20En=20un=20albar=C3=A1n=20de=20pr?= =?UTF-8?q?oveedor,=20si=20la=20direcci=C3=B3n=20del=20cliente=20es=20muy?= =?UTF-8?q?=20larga,=20no=20salen=20todos=20los=20datos=20al=20imprimir=20?= =?UTF-8?q?Tareas=20#1162:=20No=20sale=20el=20sumatorio=20de=20importe=20t?= =?UTF-8?q?otal=20en=20recibos=20de=20cliente=20(acordarse=20de=20ponerle?= =?UTF-8?q?=20a=20cristina=20el=20importe=20total)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ojo tambien se incluye solución a recargar datos del contacto cuando da al botón ver y los modifica git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES2/trunk@181 b2cfbe5a-eba1-4a0c-8b32-7feea0a119f2 --- Source/Cliente/FactuGES.dproj | 2 +- Source/Cliente/FactuGES.res | Bin 171984 -> 172156 bytes Source/Informes/1/InfAlbaranProveedor.fr3 | 2 +- Source/Informes/2/InfAlbaranProveedor.fr3 | 2 +- Source/Informes/4/InfAlbaranProveedor.fr3 | 2 +- Source/Informes/5/InfAlbaranProveedor.fr3 | 2 +- .../Model/uBizAlbaranesProveedor.pas | 15 +- .../Views/uEditorAlbaranProveedor.dfm | 64 +- ...ViewDatosYSeleccionClienteFinalAlbaran.pas | 3 + .../Model/Contactos_model.identcache | Bin 1813 -> 1813 bytes .../Contactos/Views/Contactos_view.dproj | 120 +-- .../Contactos/Views/Contactos_view.res | Bin 384 -> 4748 bytes .../Contactos/Views/uEditorProveedor.dfm | 38 +- Source/Servidor/FactuGES_Server.RES | Bin 23212 -> 23492 bytes Source/Servidor/FactuGES_Server.dproj | 807 +++++++++--------- 15 files changed, 533 insertions(+), 524 deletions(-) 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 60aea02d4b0a003babbff21be895160457c018c0..4622b5ba2be2cc782adcf17160a5d3c714787ffd 100644 GIT binary patch delta 488 zcmY+9y-EW?6otPTlek%fY?*Q)_}`?k5fOum1Qcx2CyPoFG#a9fRZ=MA0fcRmO`8X> z6)i0-t?hh=K)kcFF?eBi=5T)Q+0Qq3^6vH?)r(FIyPoIf_!~tI&jW=+BW-Srd>Sdx zzE5 zEE+$<61`rcbWBkgXv7E8sV7It3yREtXrROIq26B0N_FWk>HD$9)HO-}XA2qC06ag3FYsuZ=O190$YR{64rtCGzvt|ah#1~Ik80kQ|JdO0pFF~k8uK)l5 delta 318 zcmex!fa}73u7(!IElezP>kS0Bco^V-k%5OnK!AaPkwJnXgB3)>c`OVJObikd5V;d< z3=GV0UI!-w0}F$K0z_^F2Ll5uf(JB>jlsYGD#ypbz>eUlGQ=}*FgQ3sBsH8E7&sX` zJRrP|5C#S=hJ*yD#wiR8+zbs3P?a1YhcYmHU}RuW0Mh^e3ji^Y0|W*P2oHT=oc?Go zlZiS9(CI+;1MRX0s{uKe1?V|c5HQ_#9+NVo&h*52O!3p-%wy7Ew3seBpUHaqh51Yg KK(^rmCT{=?S1OPI 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 b81baab98985c20d951921b6caf3049f9ed62c55..58f81fcf28e1358d689218e8d1170f7923c3ed1b 100644 GIT binary patch delta 41 zcmV+^0M`GN4wVkD=K_;G1D%se0V MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fEditorAgente
@@ -206,7 +213,7 @@ TFrame -
frViewAgenteObjetivosAlbaranes
+
frViewAgenteObjetivosFacturas
TFrame @@ -289,13 +296,6 @@
frViewProveedores
TCustomView - - - - - - -