From 347c202cb3ad645453418381e8ab95da24bcd087 Mon Sep 17 00:00:00 2001
From: roberto <rblanco@rodax-software.com>
Date: Tue, 3 Mar 2009 18:52:06 +0000
Subject: [PATCH] =?UTF-8?q?Arreglo=20en=20factura=20para=20que=20cuando=20?=
 =?UTF-8?q?a=C3=B1adimos=20una=20nueva=20y=20cerramos=20sin=20hacer=20nada?=
 =?UTF-8?q?=20no=20de=20error?=
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_FactuGES/trunk@313 c93665c3-c93d-084d-9b98-7d5f4a9c3376
---
 Database/FACTUGES.FDB                         | Bin 31383552 -> 31383552 bytes
 Source/Cliente/FactuGES.rc                    |   8 +-
 Source/Cliente/FactuGES.res                   | Bin 172140 -> 171932 bytes
 .../Views/uEditorFacturaCliente.dfm           |  77 ++++++++-------
 .../Views/uEditorFacturaCliente.pas           |  18 ++--
 .../Views/uEditorFacturaProveedor.dfm         |  92 +++++++++---------
 .../Views/uEditorFacturaProveedor.pas         |  17 ++--
 Source/Servidor/FactuGES_Server.rc            |   2 +-
 Source/Servidor/FactuGES_Server.res           | Bin 23340 -> 23336 bytes
 9 files changed, 112 insertions(+), 102 deletions(-)

diff --git a/Database/FACTUGES.FDB b/Database/FACTUGES.FDB
index 1be08996c5ddff385bc87585af9491ea8954c2eb..c76b0770110f8791583f6b85bad422f81fd49022 100644
GIT binary patch
delta 1732
zcmYMoV~`yN0L1aUTy){Zb}q)nw((-yww(*!#<p$!W81b-TWQlaZBy-+PIu-vv%Aq}
z-zSc?$UuzJQIEr7{GW&f(f`fcE_dwi{K#B^I}?MUU?3EX848Alg0Vuu*r8yYP%v&N
z81GOp{K(qCy`{0&g}+_+CV504Y~P@FiAA`GFA|7^B9ZWuL_~<BBAG}oQizlyl}Ihp
zh_oV|NG~#oj3SfBEV78KBAduAa)?NgQ{)o4MIMn?<P-Tt0Z~vC5>cYCC?blAVxqVx
zAxer;qO>R@%8GKLyr>{5ib|rgs3NM0YNEQRA!>?RqPD0b>WX?IDC&y_qM>Lc8jB{P
zsc0seix#4#XeC;UHlnR)C)$e+qNC^}I*Tr%tLP@Wiyoq<=p}lKKBBMaC;E#4VxSl#
z28$tLs2C=OixFa^7$ruFF=DJ3C&r5jB3euolf+~(MTCUJR549V7c<06F-y!AbHrRR
zPs|q!#6q!1EEY?|Qn5@d7c0a{u}Z8KYs6ZyPOKLj#7416Y!+L@R<TWN7dymGu}kb0
zd&FLW*eCXj1LB}KBo2!s;;1+#j*AoGq&Ou`i!<V^I491F3*w@<Brc09;;OhNu8SMu
zrnn_;i#y`3xF_z52jZc4Bp!<=;;DEho{JaarFbP?ix0$y;v?~~_(XgvJ`<mdFT|JP
zEAh4XMtm#26W@y;#2fLW_({AKKZ{?)ui~BfP5dtY5bwpG;xF;H_-6)zIRq@Gg;^|%
zZE-BF#j|jWZwV}+C9=ep#3C%IC9~v~!ctl)OKoW^t);W{mccSwCd+JDEURU+?3TkK
zEvMzO+?L1kT0YBf1+1VIvM4KTMXab5v*K35N?Iu^ZDp*im9z3z!75rMt87)Qs#UY<
zR>NvqEvs#Htgh9wpw+hq*3cSRV{2kft(i5q7S_^QS!-)!ZLOWPw+`0PI$3AyVqLA9
zb+;bY(|TEN>tlVbpY^u^HqZvyU>jmXZI}(W5jN6B*=QSMV{M#`w+R+)6K#@BwkZ}e
z*;Jcm(`|;$v{^RW=Ga`DXY*}=Ewn|p*p}E*TV~5`g{`zzw%XR%T3cu9ZG&yJO}5##
z*jC$S+ii#Kv|YB__Sjy-_St?rU<d7x9kwHO)Q;J4J7Fj7l%2LScGk|>dAnd2?UG%#
vD|Xec*>$^NH|>_)wmWv$?%92NU=Qt)J+>$I)SlUMdtoo_RbUUV15y71JCHp1

delta 1728
zcmYMoV{jb^0L1aWI<@UKHB#Hgt8LqMQ@pL)B(-h*YumPQwy)=&_RG!f%x`9QBhS4{
z7HQ#uSmh&@$BFfSQY4Q2Z$`O9TTFC#zCiTUU?>;}1!ISTaYDhkp<ujFFn%bQAQVh^
zI2d+xU0~6&c<aO72CD8KmLRzZ6NyA(kwhdF$%M}oBBe+rQj0Vqtw<-*iwq*8$Rsk0
zEF!DOCbEkhBB#hDa*I47T;vt`M1D~~6cmL-VNpaB6~#n^C@xBflA@F-Ey{?pqMRr%
zDu{}rlBg`Ih^nHRs4i-VnxdAdE$WE6qMoQP8i<CXkqC;$qKRlKnu+G3g=i^SiPoZx
zXe-)@_M(I6C_0JGqKoJ%x{2<hhv+GKiQb}*=qvh({$hX_C<ckaVu%<jhKb=~gcvDC
ziP2(=7%Rq!@nV9QC?<)?Vv2|qQ^hnfUCa<6Au&_T60^k|F;~nJ^Th(OP(+Dn5hE6f
z#bSwADwc`mVue^KR*BVOjaVzziS=TG*eEuM&0>q#Dz=I3Vu#o%c8T3$kJu~r3B-PJ
zKpYf@#9?tn92LjJadASN6sN>#aYmdK=frt&L0lA<#AR_sTou>Eb#X)76t~1}aYx)0
z_r!hiKs*$W#AES9JQdHxbMZpF6tBc<@kYES-WMN;55-5~WATajRD32r7hi}k#aH5M
z@s0Rad?&saKZqa2Tk(_lS^Oe?6~Bq!#UJ9G_*48P{ucktA+Uge#kM#W*Wy`xOJE5t
z%o15*OJYeanI*RrmeNvLYD;5jEuE#e43^O{S!T;(SuLAow;Yz!a#?Q6W8s$9@>zZ>
zU<Iv^6}BQ))QVYz6}J*r(n?urD`RD?oRzl<R?#Y1WvgOUt(sN08dlS4S#7Ihb*-M&
zw+7bG8d=a9TN7()&8)e#u$I=!T3Z`yYwfJPb+C@s$vRsX>uTMsyY;Z1*2{WZAM0!V
ztiKJgfi}nn+YlRS!)&;Xu#q;(M%x%0YvXLZO|XeJ$tK$ri?pdW&8FK73z=-D&9d1x
z$L88Rn{Nwjp+#A=#n>WSY)fpZEwkme!dBWUTWxD>t*x{5w!t>qCfjUVY^!av?Y6^q
z+AiB|du*@mGi<*du!DBU4%-nsYRBxjov@R3%1+xEJ8S3cyj`%1cF8W=6}xKJ?7H2s
on|8}?+a0@W_w2qsu!r`@9@`UpYR~Msy|9<|%3cTd@+J`RFGK}7D*ylh

diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index 22a224d2..2a920b2b 100644
--- a/Source/Cliente/FactuGES.rc
+++ b/Source/Cliente/FactuGES.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "c:\Codigo Luis Leon\Source\Iconos\Factuges.ico"
 1 VERSIONINFO
-FILEVERSION 3,3,1,0
-PRODUCTVERSION 3,3,1,0
+FILEVERSION 3,3,2,0
+PRODUCTVERSION 3,3,2,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,9 +13,9 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "3.3.1.0\0"
+              VALUE "FileVersion", "3.3.2.0\0"
               VALUE "InternalName", "FactuGES\0"
-              VALUE "ProductVersion", "3.3.1.0\0"
+              VALUE "ProductVersion", "3.3.2.0\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index 5b2709518d65151a9a4c0996a0f6b885908baf60..874decd39f428d0ec6766a5839c5b2812b8f1757 100644
GIT binary patch
delta 285
zcmY+9F$%&!5JlgviN+WtV3WckAcAEsAOx!%z*<EtJc6AmEOG#08;z|8uncJFIjmD!
z*u|BE1V0SJ<IfE9^M`%9+wno%q;cK{uI*4u;NZF-@YtHaUXuY5&nvxW8(K9bT`=(d
z(z{w<Hl(k$34+S&L#LrJODw{$G$%9Y5=A8?bFf*hs>LJph~sL~`aKGn0AKf_aCK?W
j3TOglLcPv18W=jrzlLg>%8~q_)~Q^mJe3>uzR2AdIOitq

delta 488
zcmY+9y-vbV7>1u70ZS#Oi3^)28jU*j226+=)4`|%vw}YXq6k4891I;87#K~uNL{%A
zSED1>;mkeY*PbHrO-|2w^ZtBa-@csbw-fZO50x49T-Pb^2a5u(3l=u@Y<wH0sb@e@
zEE;W+gQb*d26@P!wb8~lWK*UYOIr@lOSM&4PMK(1T*{zQDHb(52aw124I7lfp;9qy
z{0b`sLF%;QMPaCr9L#2}97|r{vG}2(3V%k*UyD=!F%9=4wW%gnconIO-90f_9Mj;Q
zTaM&Ba!p5go34CYJeYj=8L3)tJF%aLtwvQMhhk{+oCIprC1PM|7rwGMs@zDfDR+lE
q88e6Ro~0cP85lRuSBhCvatSmW$pYtMZb{vf?AqmYVF}mY)ypp@4@30;

diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
index 8742c76c..d44da54f 100644
--- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm	
+++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm	
@@ -209,40 +209,40 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
             ExplicitWidth = 58
           end
           inherited UpDown1: TUpDown
-            Left = 237
-            ExplicitLeft = 237
+            Left = 252
+            ExplicitLeft = 252
           end
           inherited ToolButton13: TToolButton
-            Left = 254
-            ExplicitLeft = 254
+            Left = 269
+            ExplicitLeft = 269
           end
           inherited ToolButton6: TToolButton
-            Left = 262
-            ExplicitLeft = 262
+            Left = 277
+            ExplicitLeft = 277
           end
           inherited ToolButton7: TToolButton
-            Left = 296
-            ExplicitLeft = 296
+            Left = 311
+            ExplicitLeft = 311
           end
           inherited ToolButton8: TToolButton
-            Left = 330
-            ExplicitLeft = 330
+            Left = 345
+            ExplicitLeft = 345
           end
           inherited ToolButton12: TToolButton
-            Left = 364
-            ExplicitLeft = 364
+            Left = 379
+            ExplicitLeft = 379
           end
           inherited ToolButton9: TToolButton
-            Left = 372
-            ExplicitLeft = 372
+            Left = 387
+            ExplicitLeft = 387
           end
           inherited ToolButton10: TToolButton
-            Left = 406
-            ExplicitLeft = 406
+            Left = 421
+            ExplicitLeft = 421
           end
           inherited ToolButton11: TToolButton
-            Left = 440
-            ExplicitLeft = 440
+            Left = 455
+            ExplicitLeft = 455
           end
         end
         inherited cxGrid: TcxGrid
@@ -299,18 +299,18 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
         ExplicitWidth = 73
       end
       inherited Bevel3: TBevel
-        Left = 420
+        Left = 441
         Top = 30
         Height = 122
-        ExplicitLeft = 420
+        ExplicitLeft = 441
         ExplicitTop = 30
         ExplicitHeight = 122
       end
       inherited Bevel4: TBevel
-        Left = 532
+        Left = 553
         Top = 111
         Width = 186
-        ExplicitLeft = 532
+        ExplicitLeft = 553
         ExplicitTop = 111
         ExplicitWidth = 186
       end
@@ -322,19 +322,19 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
         Width = 93
       end
       inherited ImporteIVA: TcxDBCurrencyEdit
-        Left = 603
+        Left = 624
         Top = 57
         Style.IsFontAssigned = True
-        ExplicitLeft = 603
+        ExplicitLeft = 624
         ExplicitTop = 57
         ExplicitWidth = 137
         Width = 137
       end
       inherited ImporteTotal: TcxDBCurrencyEdit
-        Left = 533
+        Left = 554
         Top = 131
         Style.IsFontAssigned = True
-        ExplicitLeft = 533
+        ExplicitLeft = 554
         ExplicitTop = 131
         ExplicitWidth = 137
         Width = 137
@@ -346,34 +346,34 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
         ExplicitTop = 131
       end
       inherited edtIVA: TcxDBSpinEdit
-        Left = 532
+        Left = 553
         Top = 57
         Style.IsFontAssigned = True
-        ExplicitLeft = 532
+        ExplicitLeft = 553
         ExplicitTop = 57
       end
       inherited ImporteBase: TcxDBCurrencyEdit
-        Left = 532
+        Left = 553
         Top = 30
         Style.IsFontAssigned = True
-        ExplicitLeft = 532
+        ExplicitLeft = 553
         ExplicitTop = 30
         ExplicitWidth = 92
         Width = 92
       end
       inherited edtRE: TcxDBSpinEdit
-        Left = 532
+        Left = 553
         Top = 84
         Properties.AssignedValues.MinValue = True
         Style.IsFontAssigned = True
-        ExplicitLeft = 532
+        ExplicitLeft = 553
         ExplicitTop = 84
       end
       inherited ImporteRE: TcxDBCurrencyEdit
-        Left = 603
+        Left = 624
         Top = 84
         Style.IsFontAssigned = True
-        ExplicitLeft = 603
+        ExplicitLeft = 624
         ExplicitTop = 84
         ExplicitWidth = 56
         Width = 56
@@ -404,18 +404,17 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
         Width = 134
       end
       inherited bTiposIVA: TButton
-        Left = 272
+        Left = 293
         Top = 57
         OnClick = frViewTotales1bTiposIVAClick
-        ExplicitLeft = 272
+        ExplicitLeft = 293
         ExplicitTop = 57
       end
       inherited cbRecargoEquivalencia: TcxDBCheckBox
         Top = 84
-        Properties.OnEditValueChanged = frViewTotales1cbRecargoEquivalenciaPropertiesEditValueChanged
         ExplicitTop = 84
-        ExplicitWidth = 219
-        Width = 219
+        ExplicitWidth = 314
+        Width = 314
       end
       inherited dxLayoutControl1Group_Root: TdxLayoutGroup
         inherited dxLayoutControl1Group1: TdxLayoutGroup
diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas
index 7bce291d..9b5c9955 100644
--- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas	
+++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas	
@@ -40,14 +40,15 @@ type
     procedure frViewTotales1bTiposIVAClick(Sender: TObject);
     procedure frViewTotales1eIVAPropertiesValidate(Sender: TObject;
       var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
-    procedure frViewTotales1cbRecargoEquivalenciaPropertiesEditValueChanged(
-      Sender: TObject);
     procedure frViewTotales1ePortePropertiesValidate(Sender: TObject;
       var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
     procedure frViewTotales1ePorteEditing(Sender: TObject;
       var CanEdit: Boolean);
     procedure actEnviarEMailExecute(Sender: TObject);
     procedure actEnviarEMailUpdate(Sender: TObject);
+    procedure OnRecargoEquivalenciaPropertiesValidate(
+      Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
+      var Error: Boolean);
   private
     procedure RecalcularPortePorUnidad;
 
@@ -121,14 +122,15 @@ begin
   inherited;
   dsDataTable.DataTable := NIL;
   frViewTotales1.DADataSource.DataTable := NIL;
+  frViewTotales1.cbRecargoEquivalencia.Properties.OnValidate := Nil;
 
   FViewFactura := NIL;
   FFactura := NIL;
+  FTiposIVAController := NIL;  
 end;
 
 destructor TfEditorFacturaCliente.Destroy;
 begin
-  FTiposIVAController := NIL;
   inherited;
 end;
 
@@ -167,6 +169,7 @@ begin
   if not Assigned(Factura) then
     raise Exception.Create('No hay ninguna factura asignada');
 
+  frViewTotales1.cbRecargoEquivalencia.Properties.OnValidate := OnRecargoEquivalenciaPropertiesValidate;
   Factura.DataTable.Active := True;
 end;
 
@@ -190,14 +193,15 @@ begin
   FTiposIVAController.VerTodos((frViewTotales1.dsTiposIVA.DataTable) as IBizTipoIVA);
 end;
 
-procedure TfEditorFacturaCliente.frViewTotales1cbRecargoEquivalenciaPropertiesEditValueChanged(
-  Sender: TObject);
+procedure TfEditorFacturaCliente.OnRecargoEquivalenciaPropertiesValidate(
+  Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
+  var Error: Boolean);
 begin
   inherited;
-{  if frViewTotales1.cbRecargoEquivalencia.Checked then
+  if frViewTotales1.cbRecargoEquivalencia.Checked then
     Factura.RECARGO_EQUIVALENCIA := 1
   else
-    Factura.RECARGO_EQUIVALENCIA := 0;}
+    Factura.RECARGO_EQUIVALENCIA := 0;
 end;
 
 procedure TfEditorFacturaCliente.frViewTotales1edtDescuentoPropertiesValidate(
diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm
index 8f959be8..d7153299 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm	
+++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm	
@@ -71,7 +71,6 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
   inherited pgPaginas: TPageControl
     Width = 788
     Height = 315
-    ActivePage = pagContenido
     OnChanging = pgPaginasChanging
     ExplicitWidth = 788
     ExplicitHeight = 315
@@ -102,22 +101,22 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
           ExplicitWidth = 780
           ExplicitHeight = 287
           inherited eReferencia: TcxDBTextEdit
-            ExplicitWidth = 159
-            Width = 159
+            ExplicitWidth = 230
+            Width = 230
           end
           inherited edtFecha: TcxDBDateEdit
-            ExplicitWidth = 159
-            Width = 159
+            ExplicitWidth = 230
+            Width = 230
           end
           inherited memObservaciones: TcxDBMemo
-            ExplicitWidth = 301
-            ExplicitHeight = 159
-            Height = 159
-            Width = 301
+            ExplicitWidth = 344
+            ExplicitHeight = 107
+            Height = 107
+            Width = 344
           end
           inherited cbFormaPago: TcxDBLookupComboBox
-            ExplicitWidth = 78
-            Width = 78
+            ExplicitWidth = 92
+            Width = 92
           end
           inherited bFormasPago: TButton
             Left = 234
@@ -125,35 +124,35 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
           end
           inherited frViewProveedorFactura: TfrViewDatosYSeleccionProveedor
             Left = 394
-            Width = 350
+            Width = 364
             ExplicitLeft = 394
-            ExplicitWidth = 350
+            ExplicitWidth = 364
             inherited dxLayoutControl1: TdxLayoutControl
-              Width = 350
+              Width = 364
               inherited edtlNombre: TcxDBTextEdit
                 DataBinding.DataSource = frViewFacturaProveedor1.DADataSource
-                ExplicitWidth = 276
-                Width = 276
+                ExplicitWidth = 290
+                Width = 290
               end
               inherited edtNIFCIF: TcxDBTextEdit
                 DataBinding.DataSource = frViewFacturaProveedor1.DADataSource
-                ExplicitWidth = 562
-                Width = 562
+                ExplicitWidth = 290
+                Width = 290
               end
               inherited edtCalle: TcxDBTextEdit
                 DataBinding.DataSource = frViewFacturaProveedor1.DADataSource
-                ExplicitWidth = 562
-                Width = 562
+                ExplicitWidth = 290
+                Width = 290
               end
               inherited edtPoblacion: TcxDBTextEdit
                 DataBinding.DataSource = frViewFacturaProveedor1.DADataSource
-                ExplicitWidth = 177
-                Width = 177
+                ExplicitWidth = 172
+                Width = 172
               end
               inherited edtProvincia: TcxDBTextEdit
                 DataBinding.DataSource = frViewFacturaProveedor1.DADataSource
-                ExplicitWidth = 327
-                Width = 327
+                ExplicitWidth = 290
+                Width = 290
               end
               inherited edtCodigoPostal: TcxDBTextEdit
                 Left = 272
@@ -166,6 +165,10 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
               end
             end
           end
+          inherited eReferenciaProveedor: TcxDBTextEdit
+            ExplicitWidth = 230
+            Width = 230
+          end
         end
       end
     end
@@ -303,18 +306,18 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         ExplicitWidth = 73
       end
       inherited Bevel3: TBevel
-        Left = 420
+        Left = 441
         Top = 30
         Height = 122
-        ExplicitLeft = 420
+        ExplicitLeft = 441
         ExplicitTop = 30
         ExplicitHeight = 122
       end
       inherited Bevel4: TBevel
-        Left = 532
+        Left = 553
         Top = 111
         Width = 186
-        ExplicitLeft = 532
+        ExplicitLeft = 553
         ExplicitTop = 111
         ExplicitWidth = 186
       end
@@ -326,19 +329,19 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         Width = 93
       end
       inherited ImporteIVA: TcxDBCurrencyEdit
-        Left = 603
+        Left = 624
         Top = 57
         Style.IsFontAssigned = True
-        ExplicitLeft = 603
+        ExplicitLeft = 624
         ExplicitTop = 57
         ExplicitWidth = 137
         Width = 137
       end
       inherited ImporteTotal: TcxDBCurrencyEdit
-        Left = 533
+        Left = 554
         Top = 131
         Style.IsFontAssigned = True
-        ExplicitLeft = 533
+        ExplicitLeft = 554
         ExplicitTop = 131
         ExplicitWidth = 137
         Width = 137
@@ -350,34 +353,34 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         ExplicitTop = 131
       end
       inherited edtIVA: TcxDBSpinEdit
-        Left = 532
+        Left = 553
         Top = 57
         Style.IsFontAssigned = True
-        ExplicitLeft = 532
+        ExplicitLeft = 553
         ExplicitTop = 57
       end
       inherited ImporteBase: TcxDBCurrencyEdit
-        Left = 532
+        Left = 553
         Top = 30
         Style.IsFontAssigned = True
-        ExplicitLeft = 532
+        ExplicitLeft = 553
         ExplicitTop = 30
         ExplicitWidth = 92
         Width = 92
       end
       inherited edtRE: TcxDBSpinEdit
-        Left = 532
+        Left = 553
         Top = 84
         Properties.AssignedValues.MinValue = True
         Style.IsFontAssigned = True
-        ExplicitLeft = 532
+        ExplicitLeft = 553
         ExplicitTop = 84
       end
       inherited ImporteRE: TcxDBCurrencyEdit
-        Left = 603
+        Left = 624
         Top = 84
         Style.IsFontAssigned = True
-        ExplicitLeft = 603
+        ExplicitLeft = 624
         ExplicitTop = 84
         ExplicitWidth = 56
         Width = 56
@@ -408,18 +411,17 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         Width = 134
       end
       inherited bTiposIVA: TButton
-        Left = 272
+        Left = 293
         Top = 57
         OnClick = frViewTotales1bTiposIVAClick
-        ExplicitLeft = 272
+        ExplicitLeft = 293
         ExplicitTop = 57
       end
       inherited cbRecargoEquivalencia: TcxDBCheckBox
         Top = 84
-        Properties.OnEditValueChanged = frViewTotales1cbRecargoEquivalenciaPropertiesEditValueChanged
         ExplicitTop = 84
-        ExplicitWidth = 219
-        Width = 219
+        ExplicitWidth = 314
+        Width = 314
       end
       inherited dxLayoutControl1Group_Root: TdxLayoutGroup
         LookAndFeel = frViewFacturaProveedor1.dxLayoutOfficeLookAndFeel1
diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas
index af758048..3a9f8480 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas	
+++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas	
@@ -33,10 +33,12 @@ type
     procedure frViewTotales1bTiposIVAClick(Sender: TObject);
     procedure frViewTotales1eIVAPropertiesValidate(Sender: TObject;
       var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
-    procedure frViewTotales1cbRecargoEquivalenciaPropertiesEditValueChanged(Sender: TObject);
     procedure frViewTotales1ePortePropertiesValidate(Sender: TObject;
       var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
     procedure frViewTotales1ePorteEditing(Sender: TObject; var CanEdit: Boolean);
+    procedure OnRecargoEquivalenciaPropertiesValidate(
+      Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
+      var Error: Boolean);
   private
     procedure RecalcularPortePorUnidad;
 
@@ -98,14 +100,15 @@ begin
   inherited;
   dsDataTable.DataTable := NIL;
   frViewTotales1.DADataSource.DataTable := NIL;
+  frViewTotales1.cbRecargoEquivalencia.Properties.OnValidate := Nil;
 
   FViewFactura := NIL;
   FFactura := NIL;
+  FTiposIVAController := NIL;
 end;
 
 destructor TfEditorFacturaProveedor.Destroy;
 begin
-  FTiposIVAController := NIL;
   inherited;
 end;
 
@@ -144,6 +147,7 @@ begin
   if not Assigned(Factura) then
     raise Exception.Create('No hay ninguna factura asignada');
 
+  frViewTotales1.cbRecargoEquivalencia.Properties.OnValidate := OnRecargoEquivalenciaPropertiesValidate;
   Factura.DataTable.Active := True;
 end;
 
@@ -167,14 +171,15 @@ begin
   FTiposIVAController.VerTodos((frViewTotales1.dsTiposIVA.DataTable) as IBizTipoIVA);
 end;
 
-procedure TfEditorFacturaProveedor.frViewTotales1cbRecargoEquivalenciaPropertiesEditValueChanged(
-  Sender: TObject);
+procedure TfEditorFacturaProveedor.OnRecargoEquivalenciaPropertiesValidate(
+  Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
+  var Error: Boolean);
 begin
   inherited;
-{  if frViewTotales1.cbRecargoEquivalencia.Checked then
+  if frViewTotales1.cbRecargoEquivalencia.Checked then
     Factura.RECARGO_EQUIVALENCIA := 1
   else
-    Factura.RECARGO_EQUIVALENCIA := 0;}
+    Factura.RECARGO_EQUIVALENCIA := 0;
 end;
 
 procedure TfEditorFacturaProveedor.frViewTotales1edtDescuentoPropertiesValidate(
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 2e35fe87..0bc504ad 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -16,7 +16,7 @@ BEGIN
               VALUE "FileVersion", "3.3.1.0\0"
               VALUE "ProductName", "FactuGES Server\0"
               VALUE "ProductVersion", "3.3.1.0\0"
-              VALUE "CompileDate", "jueves, 26 de febrero de 2009 16:23\0"
+              VALUE "CompileDate", "martes, 03 de marzo de 2009 19:36\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res
index d167972f4c9a6a31534cd6db3704a015cfb4a82d..08c2f190393b89d2d3b9429ad3a3242c09e91c1b 100644
GIT binary patch
delta 136
zcmZ3pjd8^`#tnBO7<DG!jgSYDe<Pw9dnQLlDl=wmu8m}7OiW==Vqj!&X2@sAWhh|C
zWXNGiWpH6gWGDgBAdm}W7lC=j3_1)73<eCwKr#g=s{oa&0_uf{7y;!C7%YK&Lm+7d
LRBJZ*X_Pwvfjb?{

delta 140
zcmZ3njd9I3#tnBO7!4-hjgSYDe<Pw9CrplvRA$WCTpP*En3}<$!obMj%#hEJ%TU0O
z$&ka4%HYC~$WQ{LK_H8v6v!$A;$j9J1_cHq1~VX;0^}<&qyfn!h9V$Y1k?``HDWLT
TLQ5du5UAD)sKa>j!zgzE3RWJX