From 6d71fe0679d59d7d984f51f66ec8825c968213ef Mon Sep 17 00:00:00 2001
From: roberto <rblanco@rodax-software.com>
Date: Fri, 27 Mar 2015 16:40:02 +0000
Subject: [PATCH] =?UTF-8?q?SE=20cambia=20la=20clase=20de=20negocio=20de=20?=
 =?UTF-8?q?las=20facturas=20para=20que=20cuando=20cambie=20el=20cliente=20?=
 =?UTF-8?q?que=20no=20se=20cambie=20el=20iva=20del=20documento=20con=20el?=
 =?UTF-8?q?=20de=20cliente,=20as=C3=AD=20siempre=20prevalece=20el=20iva=20?=
 =?UTF-8?q?de=20la=20empresa?=
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.AbetoDesign_FactuGES/trunk@104 93f398dd-4eb6-7a46-baf6-13f46f578da2
---
 Source/GUIBase/GUIBase.dproj                  |  56 +++++++++---------
 Source/GUIBase/GUIBase.res                    | Bin 384 -> 4748 bytes
 .../Model/uBizFacturasCliente.pas             |   4 +-
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj
index 958a997..f44e3be 100644
--- a/Source/GUIBase/GUIBase.dproj
+++ b/Source/GUIBase/GUIBase.dproj
@@ -58,34 +58,34 @@
     <DelphiCompile Include="GUIBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Servidor\Base.dcp" />
-    <DCCReference Include="..\Servidor\ccpackD11.dcp" />
-    <DCCReference Include="..\Servidor\cxDataD11.dcp" />
-    <DCCReference Include="..\Servidor\cxEditorsD11.dcp" />
-    <DCCReference Include="..\Servidor\cxExportD11.dcp" />
-    <DCCReference Include="..\Servidor\cxLibraryD11.dcp" />
-    <DCCReference Include="..\Servidor\dbrtl.dcp" />
-    <DCCReference Include="..\Servidor\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\Servidor\dxLayoutControlD11.dcp" />
-    <DCCReference Include="..\Servidor\dxPScxCommonD11.dcp" />
-    <DCCReference Include="..\Servidor\dxPScxGrid6LnkD11.dcp" />
-    <DCCReference Include="..\Servidor\dxThemeD11.dcp" />
-    <DCCReference Include="..\Servidor\frx11.dcp" />
-    <DCCReference Include="..\Servidor\frxe11.dcp" />
-    <DCCReference Include="..\Servidor\fs11.dcp" />
-    <DCCReference Include="..\Servidor\JvAppFrmD11R.dcp" />
-    <DCCReference Include="..\Servidor\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Servidor\JvGlobusD11R.dcp" />
-    <DCCReference Include="..\Servidor\PngComponentsD10.dcp" />
-    <DCCReference Include="..\Servidor\PNG_D10.dcp" />
-    <DCCReference Include="..\Servidor\rtl.dcp" />
-    <DCCReference Include="..\Servidor\tb2k_d10.dcp" />
-    <DCCReference Include="..\Servidor\tbx_d10.dcp" />
-    <DCCReference Include="..\Servidor\vcl.dcp" />
-    <DCCReference Include="..\Servidor\vclactnband.dcp" />
-    <DCCReference Include="..\Servidor\vcldb.dcp" />
-    <DCCReference Include="..\Servidor\vcljpg.dcp" />
-    <DCCReference Include="..\Servidor\vclx.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\ccpackD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxExportD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxLayoutControlD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxCommonD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxGrid6LnkD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\frx11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\frxe11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\fs11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvAppFrmD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD11R.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\vcldb.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
     <DCCReference Include="uDialogBase.pas">
       <Form>fDialogBase</Form>
     </DCCReference>
diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.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/Facturas de cliente/Model/uBizFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas
index 6cef47b..4a672a0 100644
--- a/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas	
+++ b/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas	
@@ -341,8 +341,8 @@ begin
 // La forma de pago se establece desde el tipo de documento y aunque cambie de cliente no se cambia la formade pago ya que desde la vista se pregunta y se cambia si el usuario lo desea 
 //    if FCliente.ID_FORMA_PAGO > 0 then
 //       ID_FORMA_PAGO := FCliente.ID_FORMA_PAGO;
-    if FCliente.ID_TIPO_IVA > 0 then
-       ID_TIPO_IVA := FCliente.ID_TIPO_IVA;
+//    if FCliente.ID_TIPO_IVA > 0 then
+//       ID_TIPO_IVA := FCliente.ID_TIPO_IVA;
     RECARGO_EQUIVALENCIA := FCliente.RECARGO_EQUIVALENCIA;
 // Se establece un descuento especial general a petición de angelica
     DESCUENTO := FCliente.DESCUENTO;