From b94099840491d68d2326dd982343b0ac5e6f923a Mon Sep 17 00:00:00 2001
From: roberto <rblanco@rodax-software.com>
Date: Wed, 13 Aug 2014 10:04:27 +0000
Subject: [PATCH] =?UTF-8?q?Tarea=20#1351=20->=20En=20los=20art=C3=ADculos,?=
 =?UTF-8?q?=20poder=20indicar=20un=20precio=20final=20(precio=20neto)=20y?=
 =?UTF-8?q?=20que=20se=20calculo=20el=20descuento=20apropiado?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES2/trunk@230 b2cfbe5a-eba1-4a0c-8b32-7feea0a119f2
---
 Source/Cliente/FactuGES.dproj                 |   2 +-
 Source/Cliente/FactuGES.res                   | Bin 171984 -> 172156 bytes
 .../Articulos/Views/Articulos_view.dpk        |  12 +-
 .../Articulos/Views/Articulos_view.dproj      |  62 +++++-----
 .../Articulos/Views/Articulos_view.res        | Bin 384 -> 4748 bytes
 .../Modulos/Articulos/Views/uViewArticulo.dfm |  18 +--
 .../Views/uViewProveedorArticulo.dfm          |   3 +-
 .../Views/uViewProveedorArticulo.pas          | 112 ++++++++++++++++--
 Source/Servidor/FactuGES_Server.RES           | Bin 23200 -> 23204 bytes
 Source/Servidor/FactuGES_Server.rc            |   2 +-
 10 files changed, 157 insertions(+), 54 deletions(-)

diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index 9e39f1f..c7dd853 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -53,7 +53,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">4</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.4.1.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">4.4.1.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">4</VersionInfo><VersionInfo Name="Release">2</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.4.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">4.4.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index 67256882c48005ce6b046e319406a8aa4411dc8f..7a42eece0fc18e9a9d5c45e7c53fa30c46b20524 100644
GIT binary patch
delta 488
zcmY+9PfG$p7{-4ysjZvD9z8Bd|1T2VB9e*_3c7gLr9!1Fu`ZqTP~Zm$_M+?6570I0
z*s){hZhZ&A-q~4`UYMPIc>cW4e7?DpcenSbUUX{M^*lGn-zai;9w;0dX>(iT(@23P
zpSRpc1{M<J)6YT*-?!Y@fpmg=#*&tySWLKOSWJ*`D^z7ssbol>^#jOKE?d;EfJ?1r
z(fApb==Bn%V~WB+BR-f;JvmDLpve3|108-3_0F1>deUDWupetoU6b^GCgEPB3+gKj
zB3<3s6kc&mlWQ(Hl5@v79l>qx<$KGGwTG{f-csA)Po#IdtFh};)O7-J9*VBbL+q>5
w5T_lRKG#)55pW^CmfRh#WZP`4_AJS0%3hN^Yi3YOeDQ>Zkq)HG(@3BE0x~#6l>h($

delta 318
zcmY+9v1-Cl6o$Wh8f}cBWDzn3iqyd&f}50zli=de-MIM{X6WDp2zN4e>;t&BqodE@
z+`$JZ*b@^H{NZrU$A9kSKYu^o>Dx;`%t4&pIu1OaN(P@G07J;Ck@t!m5W=wVj!k%|
zXww3RC@Q=!7aBF`Z%yL3^q%0crY;Ly#^b{5O`yeeTF~YlJd&h*xP>-pT5h^|P`DU~
zv|q1*mVzp#KImfXc_+gcqwzGqp7VCw$>Tao_nO<+OrA~OE;Cu!-%NUDU^{ym+0$MU
Jod=&X`v(YLDs}(>

diff --git a/Source/Modulos/Articulos/Views/Articulos_view.dpk b/Source/Modulos/Articulos/Views/Articulos_view.dpk
index 92f8883..ae282d9 100644
--- a/Source/Modulos/Articulos/Views/Articulos_view.dpk
+++ b/Source/Modulos/Articulos/Views/Articulos_view.dpk
@@ -51,7 +51,14 @@ requires
   RemObjects_Core_D11,
   dxLayoutControlD11,
   dxComnD11,
-  Contactos_model;
+  Contactos_model,
+  PngComponentsD10,
+  PNG_D10,
+  vclactnband,
+  cxGridD11,
+  cxPageControlD11,
+  cxExtEditorsD11,
+  cxExportD11;
 
 contains
   uViewArticulos in 'uViewArticulos.pas' {frViewArticulos: TFrame},
@@ -65,6 +72,7 @@ contains
   uViewDetallesArticulosParaVenta in 'uViewDetallesArticulosParaVenta.pas' {frViewDetallesArticulosParaVenta: TCustomView},
   uEditorArticulos in 'uEditorArticulos.pas' {fEditorArticulos: TfEditorArticulo},
   uViewProveedorArticulo in 'uViewProveedorArticulo.pas' {frViewProveedorArticulo: TFrame},
-  uViewParametrosPrecio in 'uViewParametrosPrecio.pas' {frViewParametrosPrecio: TFrame};
+  uViewParametrosPrecio in 'uViewParametrosPrecio.pas' {frViewParametrosPrecio: TFrame},
+  uViewArticulosProveedores in 'uViewArticulosProveedores.pas';
 
 end.
diff --git a/Source/Modulos/Articulos/Views/Articulos_view.dproj b/Source/Modulos/Articulos/Views/Articulos_view.dproj
index 15eb4c4..b8999c7 100644
--- a/Source/Modulos/Articulos/Views/Articulos_view.dproj
+++ b/Source/Modulos/Articulos/Views/Articulos_view.dproj
@@ -55,33 +55,34 @@
     <DelphiCompile Include="Articulos_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\Facturas de proveedor\adortl.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\Articulos_controller.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\Articulos_model.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\Contactos_model.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\Contactos_view.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\cxDataD11.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\cxEditorsD11.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\cxLibraryD11.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\dbrtl.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\dsnap.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\dxComnD11.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\dxCoreD11.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\dxLayoutControlD11.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\dxThemeD11.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\Fabricantes_controller.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\Familias_controller.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\GUIBase.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\GUISDK_D11R.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\rtl.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\UnidadesMedida_controller.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\vcl.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\vcldb.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\vcljpg.dcp" />
-    <DCCReference Include="..\..\Facturas de proveedor\vclx.dcp" />
+    <DCCReference Include="adortl.dcp" />
+    <DCCReference Include="Articulos_controller.dcp" />
+    <DCCReference Include="Articulos_model.dcp" />
+    <DCCReference Include="Contactos_model.dcp" />
+    <DCCReference Include="Contactos_view.dcp" />
+    <DCCReference Include="cxDataD11.dcp" />
+    <DCCReference Include="cxEditorsD11.dcp" />
+    <DCCReference Include="cxExportD11.dcp" />
+    <DCCReference Include="cxExtEditorsD11.dcp" />
+    <DCCReference Include="cxGridD11.dcp" />
+    <DCCReference Include="cxLibraryD11.dcp" />
+    <DCCReference Include="cxPageControlD11.dcp" />
+    <DCCReference Include="DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="dbrtl.dcp" />
+    <DCCReference Include="dsnap.dcp" />
+    <DCCReference Include="dxComnD11.dcp" />
+    <DCCReference Include="dxCoreD11.dcp" />
+    <DCCReference Include="dxGDIPlusD11.dcp" />
+    <DCCReference Include="dxLayoutControlD11.dcp" />
+    <DCCReference Include="dxThemeD11.dcp" />
+    <DCCReference Include="Fabricantes_controller.dcp" />
+    <DCCReference Include="Familias_controller.dcp" />
+    <DCCReference Include="GUIBase.dcp" />
+    <DCCReference Include="GUISDK_D11R.dcp" />
+    <DCCReference Include="PngComponentsD10.dcp" />
+    <DCCReference Include="PNG_D10.dcp" />
+    <DCCReference Include="RemObjects_Core_D11.dcp" />
+    <DCCReference Include="rtl.dcp" />
     <DCCReference Include="uArticulosViewRegister.pas" />
     <DCCReference Include="uEditorArticulo.pas">
       <Form>fEditorArticulo</Form>
@@ -95,6 +96,7 @@
       <Form>fEditorElegirArticulos</Form>
       <DesignClass>TfEditorElegirArticulos</DesignClass>
     </DCCReference>
+    <DCCReference Include="UnidadesMedida_controller.dcp" />
     <DCCReference Include="uViewArticulo.pas">
       <Form>frViewArticulo</Form>
       <DesignClass>TFrame</DesignClass>
@@ -107,6 +109,7 @@
       <Form>frViewArticulosPorProveedor</Form>
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
+    <DCCReference Include="uViewArticulosProveedores.pas" />
     <DCCReference Include="uViewDetallesArticulos.pas">
       <Form>frViewDetallesArticulos</Form>
       <DesignClass>TFrame</DesignClass>
@@ -127,6 +130,11 @@
       <Form>frViewProveedoresArticulo</Form>
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
+    <DCCReference Include="vcl.dcp" />
+    <DCCReference Include="vclactnband.dcp" />
+    <DCCReference Include="vcldb.dcp" />
+    <DCCReference Include="vcljpg.dcp" />
+    <DCCReference Include="vclx.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
diff --git a/Source/Modulos/Articulos/Views/Articulos_view.res b/Source/Modulos/Articulos/Views/Articulos_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/Articulos/Views/uViewArticulo.dfm b/Source/Modulos/Articulos/Views/uViewArticulo.dfm
index b126ab7..20bb7b0 100644
--- a/Source/Modulos/Articulos/Views/uViewArticulo.dfm
+++ b/Source/Modulos/Articulos/Views/uViewArticulo.dfm
@@ -1,6 +1,6 @@
 inherited frViewArticulo: TfrViewArticulo
-  Width = 451
-  Height = 304
+  Width = 719
+  Height = 451
   Align = alClient
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
@@ -9,18 +9,20 @@ inherited frViewArticulo: TfrViewArticulo
   object dxLayoutControlArticulo: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 451
-    Height = 304
+    Width = 719
+    Height = 451
     Align = alClient
     ParentBackground = True
     TabOrder = 0
     TabStop = False
     AutoContentSizes = [acsWidth]
+    ExplicitWidth = 451
+    ExplicitHeight = 304
     DesignSize = (
-      451
-      304)
+      719
+      451)
     object PngSpeedButton2: TPngSpeedButton
-      Left = 389
+      Left = 674
       Top = 331
       Width = 23
       Height = 22
@@ -47,7 +49,7 @@ inherited frViewArticulo: TfrViewArticulo
       PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled]
     end
     object PngSpeedButton1: TPngSpeedButton
-      Left = 389
+      Left = 674
       Top = 359
       Width = 23
       Height = 22
diff --git a/Source/Modulos/Articulos/Views/uViewProveedorArticulo.dfm b/Source/Modulos/Articulos/Views/uViewProveedorArticulo.dfm
index 57d63ff..5d48dca 100644
--- a/Source/Modulos/Articulos/Views/uViewProveedorArticulo.dfm
+++ b/Source/Modulos/Articulos/Views/uViewProveedorArticulo.dfm
@@ -119,10 +119,9 @@ inherited frViewProveedorArticulo: TfrViewProveedorArticulo
       Top = 163
       DataBinding.DataField = 'PRECIO_NETO'
       Properties.Alignment.Horz = taRightJustify
-      Properties.ReadOnly = True
+      Properties.ReadOnly = False
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D
-      Style.Color = clBtnFace
       Style.HotTrack = False
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
diff --git a/Source/Modulos/Articulos/Views/uViewProveedorArticulo.pas b/Source/Modulos/Articulos/Views/uViewProveedorArticulo.pas
index f7c17a8..f2e401a 100644
--- a/Source/Modulos/Articulos/Views/uViewProveedorArticulo.pas
+++ b/Source/Modulos/Articulos/Views/uViewProveedorArticulo.pas
@@ -33,11 +33,15 @@ type
     procedure CustomViewCreate(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
     procedure OnProveedorChange(Sender: TObject);
+    procedure PrecioCosteChanged(Sender: TObject);
+    procedure DescuentoChanged(Sender: TObject);
     procedure PrecioNetoChanged(Sender: TObject);
     procedure CustomViewShow(Sender: TObject);
   protected
     FProveedoresController : IProveedoresController;
     FProveedores : IBizProveedor;
+    procedure DesactivarEventos;
+    procedure ActivarEventos;
   public
     { Public declarations }
   end;
@@ -48,6 +52,17 @@ var
 implementation
 {$R *.dfm}
 
+uses
+  Math;
+
+procedure TfrViewProveedorArticulo.ActivarEventos;
+begin
+  eProveedor.Properties.OnEditValueChanged := OnProveedorChange;
+  ePrecioCoste.Properties.OnEditValueChanged := PrecioCosteChanged;
+  eDescuento.Properties.OnEditValueChanged := DescuentoChanged;
+  ePrecioNeto.Properties.OnEditValueChanged := PrecioNetoChanged;
+end;
+
 procedure TfrViewProveedorArticulo.CustomViewCreate(Sender: TObject);
 begin
   inherited;
@@ -62,9 +77,7 @@ end;
 
 procedure TfrViewProveedorArticulo.CustomViewDestroy(Sender: TObject);
 begin
-  ePrecioCoste.Properties.OnEditValueChanged := NIL;
-  eDescuento.Properties.OnEditValueChanged := NIL;
-  eProveedor.Properties.OnEditValueChanged := NIL;
+  DesactivarEventos;
   FProveedoresController := NIL;
   FProveedores := NIL;
   inherited;
@@ -73,9 +86,41 @@ end;
 procedure TfrViewProveedorArticulo.CustomViewShow(Sender: TObject);
 begin
   inherited;
-  eProveedor.Properties.OnEditValueChanged := OnProveedorChange;
-  ePrecioCoste.Properties.OnEditValueChanged := PrecioNetoChanged;
-  eDescuento.Properties.OnEditValueChanged := PrecioNetoChanged;
+  ActivarEventos;
+end;
+
+procedure TfrViewProveedorArticulo.DesactivarEventos;
+begin
+  ePrecioNeto.Properties.OnEditValueChanged := NIL;
+  ePrecioCoste.Properties.OnEditValueChanged := NIL;
+  eDescuento.Properties.OnEditValueChanged := NIL;
+  eProveedor.Properties.OnEditValueChanged := NIL;
+end;
+
+procedure TfrViewProveedorArticulo.DescuentoChanged(Sender: TObject);
+var
+  APrecioCoste: Double;
+  ADescuento: Double;
+begin
+  APrecioCoste := 0;
+  ADescuento := 0;
+
+  if eDescuento.EditModified then
+  begin
+    if not varIsNull(ePrecioCoste.DataBinding.Field.AsFloat) then
+       APrecioCoste := ePrecioCoste.DataBinding.Field.AsFloat;
+
+    if not varIsNull(eDescuento.DataBinding.Field.AsFloat) then
+       ADescuento := eDescuento.DataBinding.Field.AsFloat;
+
+    DesactivarEventos;
+    try
+      ePrecioNeto.DataBinding.DataSource.Edit;
+      ePrecioNeto.DataBinding.Field.AsFloat := APrecioCoste - ((APrecioCoste * ADescuento)/100)
+    finally
+      ActivarEventos;
+    end;
+  end;
 end;
 
 procedure TfrViewProveedorArticulo.OnProveedorChange(Sender: TObject);
@@ -84,12 +129,12 @@ begin
   FProveedores.first;
   if FProveedores.Locate('ID', eProveedor.EditValue) then
   begin
-    eDescuento.EditValue := FProveedores.DESCUENTO;
+    eDescuento.DataBinding.Field.AsFloat := FProveedores.DESCUENTO;
     cbTiendaWeb.DataBinding.Field.AsInteger := FProveedores.TIENDA_WEB;
   end;
 end;
 
-procedure TfrViewProveedorArticulo.PrecioNetoChanged(Sender: TObject);
+procedure TfrViewProveedorArticulo.PrecioCosteChanged(Sender: TObject);
 var
   APrecioCoste: Double;
   ADescuento: Double;
@@ -97,13 +142,54 @@ begin
   APrecioCoste := 0;
   ADescuento := 0;
 
-  if not varIsNull(ePrecioCoste.EditValue) then
-     APrecioCoste := ePrecioCoste.EditValue;
+  if ePrecioCoste.EditModified then
+  begin
+    if not varIsNull(ePrecioCoste.DataBinding.Field.AsFloat) then
+       APrecioCoste := ePrecioCoste.DataBinding.Field.AsFloat;
 
-  if not varIsNull(eDescuento.EditValue) then
-     ADescuento := eDescuento.EditValue;
+    if not varIsNull(eDescuento.DataBinding.Field.AsFloat) then
+       ADescuento := eDescuento.DataBinding.Field.AsFloat;
 
-  ePrecioNeto.EditValue := APrecioCoste - ((APrecioCoste * ADescuento)/100)
+    DesactivarEventos;
+    try
+      ePrecioNeto.DataBinding.DataSource.Edit;
+      ePrecioNeto.DataBinding.Field.AsFloat := APrecioCoste - ((APrecioCoste * ADescuento)/100);
+    finally
+      ActivarEventos;
+    end;
+  end;
+end;
+
+procedure TfrViewProveedorArticulo.PrecioNetoChanged(Sender: TObject);
+var
+  APrecioCoste: Double;
+  APrecioNeto: Double;
+  ADescuento : Double;
+begin
+  APrecioCoste := 0;
+  APrecioNeto := 0;
+  ADescuento := 0;
+
+  if ePrecioNeto.EditModified then
+  begin
+    if not varIsNull(ePrecioCoste.EditValue) then
+       APrecioCoste := ePrecioCoste.EditValue;
+
+    if not varIsNull(ePrecioNeto.EditValue) then
+       APrecioNeto := ePrecioNeto.EditValue;
+
+    if (APrecioCoste <> 0) then
+       ADescuento := ((APrecioCoste - APrecioNeto) * 100) / APrecioCoste;
+
+
+    DesactivarEventos;
+    try
+      eDescuento.DataBinding.DataSource.Edit;
+      eDescuento.DataBinding.Field.AsFloat := RoundTo(ADescuento, -2);
+    finally
+      ActivarEventos;
+    end;
+  end;
 end;
 
 end.
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index 1d495303457fd7532d3f3e11e934d74b88f20d48..b5f1e13f0939cca16bb986a9b33b79e99691544a 100644
GIT binary patch
delta 115
zcmZ3mm2t^d#tnBO7*|Zb8zB!Q|3*YJa!ihlRAziKxi+$zIfFrE^6yAl*D{7ohE#?k
zhCCoy%%H=dz+k{&0VGp^d<BL?hIEE}pm+(8gozmeRTwgu0QrUt<_uO0rVJ*NBct2_
DEfO5@

delta 93
zcmZ3om2tsV#tnBO7?(`G8zB!Q|3*YJGEI(*RA#(4xi+$zIf+4W^6yAl#T<rGhCGH;
thGGUC1_cHK26G^p0^}<&WC3Mz7&0f@M~QP9GFUMfF_<tgOpc9m2LR3+8Ych%

diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 693d683..5ef7332 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "4.4.0.0\0"
               VALUE "ProductVersion", "4.4.0.0\0"
-              VALUE "CompileDate", "lunes, 07 de julio de 2014 11:24\0"
+              VALUE "CompileDate", "viernes, 08 de agosto de 2014 17:54\0"
          END
     END
     BLOCK "VarFileInfo"