From 5923c8c27c29568206ddf50c6062e141f00dc984 Mon Sep 17 00:00:00 2001
From: roberto <rblanco@rodax-software.com>
Date: Tue, 25 Jun 2019 14:30:40 +0000
Subject: [PATCH] Se arregla la carga dela direccion del cliente en pedidos de
 provedeedor

git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@678 f4e31baf-9722-1c47-927c-6f952f962d4b
---
 .../Views/PedidosProveedor_view.dproj         |  42 +++++++++---------
 .../Views/PedidosProveedor_view.res           | Bin 384 -> 4748 bytes
 .../Views/uEditorPedidoProveedor.dfm          |   5 ---
 .../Views/uEditorPedidoProveedor.pas          |   3 +-
 .../Views/uViewDireccionEntregaPedidoProv.pas |   2 +-
 5 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dproj b/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dproj
index e9a428d4..f58c19ec 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dproj	
+++ b/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dproj	
@@ -49,27 +49,27 @@
     <DelphiCompile Include="PedidosProveedor_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\Contratos de cliente\Almacenes_controller.dcp" />
-    <DCCReference Include="..\..\Contratos de cliente\Almacenes_model.dcp" />
-    <DCCReference Include="..\..\Contratos de cliente\Articulos_view.dcp" />
-    <DCCReference Include="..\..\Contratos de cliente\Contactos_view.dcp" />
-    <DCCReference Include="..\..\Contratos de cliente\ContratosCliente_controller.dcp" />
-    <DCCReference Include="..\..\Contratos de cliente\ContratosCliente_model.dcp" />
-    <DCCReference Include="..\..\Contratos de cliente\cxLibraryD11.dcp" />
-    <DCCReference Include="..\..\Contratos de cliente\dxCoreD11.dcp" />
-    <DCCReference Include="..\..\Contratos de cliente\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\..\Contratos de cliente\dxThemeD11.dcp" />
-    <DCCReference Include="..\..\Contratos de cliente\GUIBase.dcp" />
-    <DCCReference Include="..\..\Contratos de cliente\PedidosProveedor_controller.dcp" />
-    <DCCReference Include="..\..\Contratos de cliente\PedidosProveedor_model.dcp" />
-    <DCCReference Include="..\..\Contratos de cliente\PngComponentsD10.dcp" />
-    <DCCReference Include="..\..\Contratos de cliente\PNG_D10.dcp" />
-    <DCCReference Include="..\..\Contratos de cliente\rtl.dcp" />
-    <DCCReference Include="..\..\Contratos de cliente\tb2k_d10.dcp" />
-    <DCCReference Include="..\..\Contratos de cliente\tbx_d10.dcp" />
-    <DCCReference Include="..\..\Contratos de cliente\vcl.dcp" />
-    <DCCReference Include="..\..\Contratos de cliente\vclactnband.dcp" />
-    <DCCReference Include="..\..\Contratos de cliente\vclx.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Almacenes_controller.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Almacenes_model.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Articulos_view.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_view.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\ContratosCliente_controller.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\ContratosCliente_model.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxCoreD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PedidosProveedor_controller.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PedidosProveedor_model.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\tb2k_d10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
     <DCCReference Include="uEditorDireccionEntregaPedidoProveedor.pas">
       <Form>fEditorDireccionEntregaPedidoProveedor </Form>
       <DesignClass>TfEditorDireccionEntregaPedidoProveedor</DesignClass>
diff --git a/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.res b/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.res
index 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644
GIT binary patch
literal 4748
zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg
zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?<w4U-ol;S2jC7
zx4(byej2@_#)0HWvg0i^wC4Xli+W*aXJ^(njceK|Kb@c3qFNX>p${kR>3GhM`oH*q
zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W
zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7
z{BT%G%irdMe*|oDJmgvJ<ltI;x5J<Oc>aA2`9B<Z5Toyra?r{a4$fnJHGXo6Pmcq8
z{JGCD500t1h4|yI?-f&xoj9;YT&Ch&JLO*X#NC3sCI0Xmc<f_vh`jn-1E!?th$%QM
znzGM|)$vl3f7;nE+9qR}|A?C$H3K&BFdq9?uxrIqHIne#5?8G@da2ybWLGKA686M2
z*LJMMMk4<U`dzFC9}HrSxLfOGll{P#??xir)$c2}C;ql+y-&Wa(LP{PgPk1E1@{uR
zIMCNz;u9;r(axhQvEx%?i#p<Vn=Z!SK%f10?4_`0@RY8lXRM3(t(nFSzJ$4kJr6&x
ze)~B%biu*TY$HDstHD=|UGxJceYiUQQa0Gu(p3og@%ZJ><6Xi*?M~Q;)@Sbfwf3uf
zVaWkbU<NjR3%=~AdoZbkXp`f@b0%GBT^$^V5e(n|#O(?P)hBbF)4n%2cw6U#adPM!
zz(!`V|Bfl{aH0)Y&w;SK7R4<z{p;Gwz1D%l86L3ZFZQ&=pB$<&esXT|OZ?=AGaWoe
z{>jU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv
zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N|
z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc
z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0
zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38=
zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W
zVvPDBKHh;i=RU4J_ta3E;)M<P+=2X7;VbzliQZ=IHV#+fr#{!(ukt%UJMS8=332qg
z7jD)rSbpCW+^j*cd6LUEe8#9n&v!NEJM(@?SHvB$=h@|)fjw|&qD?NQ5A&R>n>Y+L
zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m
z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJu<OVP
zzHjp+hnwo*3NQE$JTA(agu~silV5T`du+GJgWGi_7mAy`Nk8fLt~%GF$;XXcE-ri?
zyIglyyzA`K-);4Eem2MZm07RBza@W3UP)d`Rz=RFk-I);`s{$L%yyBNX0OTjo5Gk0
zs}g44uXg*l%xo^{`#0=kd*2?}Cz22Bv2;Gu?;3o~(D#gk1OKYQSCAb$(&vu@_pvWO
z>gbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T
z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC
zy(^m((;DnQmDQ<zX+PK(Lfu@ox#mOnbZjSDl}IBqv$qwK+2@))5$ba>Katmw!@c`|
G?EMQ&4NnpP

delta 11
ScmeBCZD5|Duvteife`=|>;pCc

diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm
index bfe35109..c09f1246 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm	
@@ -111,7 +111,6 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
             ExplicitWidth = 357
             inherited dxLayoutControl1: TdxLayoutControl
               Width = 357
-              ExplicitWidth = 318
               inherited edtlNombre: TcxDBTextEdit
                 ExplicitWidth = 283
                 Width = 283
@@ -166,8 +165,6 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
             inherited dxLayoutControl1: TdxLayoutControl
               Width = 273
               Height = 166
-              ExplicitWidth = 499
-              ExplicitHeight = 20
               inherited rdxDestino1: TRadioButton
                 Width = 253
                 ExplicitWidth = 253
@@ -227,7 +224,6 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
             ExplicitWidth = 357
             inherited dxLayoutControl1: TdxLayoutControl
               Width = 357
-              ExplicitWidth = 318
               inherited cbTienda: TcxComboBox
                 ExplicitWidth = 390
                 Width = 390
@@ -239,7 +235,6 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
             ExplicitWidth = 422
             inherited memObservaciones: TcxDBMemo
               DataBinding.DataSource = frViewPedidoProveedor1.DADataSource
-              ExplicitWidth = 363
               Width = 422
             end
           end
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas
index 1d759174..07ce0e33 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas	
@@ -151,7 +151,8 @@ begin
   Pedido.DataTable.Active := True;
   pgPaginas.ActivePage := pagGeneral;
 
-  frViewPedidoProveedor1.frViewDireccionEntregaPedidoProv1.CambioDireccionAlmacen;
+  if Assigned(Pedido) and not Pedido.ID_ALMACENIsNull then
+     frViewPedidoProveedor1.frViewDireccionEntregaPedidoProv1.CambioDireccionAlmacen;
 end;
 
 procedure TfEditorPedidoProveedor.frViewTotales1ePortePropertiesValidate(
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.pas b/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.pas
index 457ab169..0e47b0b0 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.pas	
@@ -93,7 +93,7 @@ procedure TfrViewDireccionEntregaPedidoProv.actListaClienteExecute(
 begin
   inherited;
   actListaCliente.Checked := True;
-  RefrescarDireccion;
+  CambioDireccionCliente;
 end;
 
 procedure TfrViewDireccionEntregaPedidoProv.actListaExecute(Sender: TObject);