From 8f371006d1def5026b0bdaa8a137fb21de520b98 Mon Sep 17 00:00:00 2001
From: roberto <rblanco@rodax-software.com>
Date: Tue, 12 Jun 2007 15:30:27 +0000
Subject: [PATCH] Arreglo error al agrupar en pedidos de cliente

git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES/trunk@19 c93665c3-c93d-084d-9b98-7d5f4a9c3376
---
 Source/Cliente/FactuGES.bdsproj               |   4 ++--
 Source/Cliente/FactuGES.dpr                   |   1 +
 Source/Cliente/FactuGES.res                   | Bin 171980 -> 172152 bytes
 Source/Modulos/Lib/PedidosCliente_view.dcp    | Bin 136724 -> 136826 bytes
 .../Views/uViewPedidosCliente.dfm             |  11 +++++++++++
 .../Views/uViewPedidosCliente.pas             |  15 +++++++--------
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/Source/Cliente/FactuGES.bdsproj b/Source/Cliente/FactuGES.bdsproj
index acc02027..e8116a92 100644
--- a/Source/Cliente/FactuGES.bdsproj
+++ b/Source/Cliente/FactuGES.bdsproj
@@ -125,7 +125,7 @@
 			<Directories Name="PackageDCPOutputDir">.\</Directories>
 			<Directories Name="SearchPath">..\Lib;..\Modulos\Lib</Directories>
 			<Directories Name="Packages">PluginSDK_D10R;GUISDK_D10;DataAbstract_D10;Base;GUIBase;Usuarios;Contactos_plugin;Empresas_plugin;Empresas_controller;Empresas_model;rtl</Directories>
-			<Directories Name="Conditionals">_VER6;</Directories>
+			<Directories Name="Conditionals">_VER6;EUREKALOG;EUREKALOG_VER5</Directories>
 			<Directories Name="DebugSourceDirs"></Directories>
 			<Directories Name="UsePackages">True</Directories>
 		</Directories>
@@ -180,7 +180,7 @@
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=519
-Activate=0
+Activate=1
 Activate Handle=0
 Save Log File=1
 Foreground Tab=0
diff --git a/Source/Cliente/FactuGES.dpr b/Source/Cliente/FactuGES.dpr
index f9a5d38b..01cb7fad 100644
--- a/Source/Cliente/FactuGES.dpr
+++ b/Source/Cliente/FactuGES.dpr
@@ -1,6 +1,7 @@
 program FactuGES;
 
 uses
+  ExceptionLog,
   Forms,
   Windows,
   SysUtils,
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index ba02f955409f5c7c98dee09e230f2350d4d94ee2..5ed73614e1950c5347cbd450fc4807c7f18ff513 100644
GIT binary patch
delta 265
zcmX@JpX<i~u7(!IEldaID$QVGU{GLSVEF%E0EiiZECvPx1}+{j14ztZn*L}mlZP+^
z14Irc&cN_vy6rqBWyUMh6X!9-Yia@I85!IdG8u9hQW;!;xR@cCp$Nz?U?>5S`3!jw
zt<(3;V@j`A11t9dDobZb1Zr^xDkxy61ZzlV$N*}A0En>&bs<0%i3}+~eYrroh#?zj
f4Gcik`a{jg1X>6(8RjGqFBhl}45lm3XIcpWW41A-

delta 95
zcmexyfa}bDu7(!IEldaID!pN3U{GLSVEF%E0EmGcATVIy;sG;&#2d!xkLEIY2(vIi
i<Y3|q3_jCs=P@ZWYD`a@#}q&P%{-=*=@;fRtpEVd;uw(t

diff --git a/Source/Modulos/Lib/PedidosCliente_view.dcp b/Source/Modulos/Lib/PedidosCliente_view.dcp
index 998555c67969b965e97b5c68f51283a31a4195db..9ccce8314c256538688ab9414ea114778aeed975 100644
GIT binary patch
delta 1794
zcmY*Zc}x^n7=OncJ5(5s9d=|{WXrNB0xlFZC|J$~DkLaqqfM1-Nim$u5~&xGwo<^7
z;%gm9!Gmb6(YDwr-D=vjL}L>JRcrBpYBgySXlzmvjmAjrn`v-$|Je6^zu))1>wVvR
zbjtAflwtS;=7PG%mbY&vUt$~C!tlhoDbRnY0D%AD*}n7SA+{ouMOixqP5xayKBkbY
zW?uDAIPF7>q>Hhls8A*IH)!)8x#nXE$!*4}`{!73;XVOA^MAQ21Kc~C0pfnl0E@{e
zD=QTO3<(5)FY+1vvyIfSkw^l{(?Vz#0T^ockz-_pwW5Y*<<KyVdSKAU93=v0MUDi;
zF$kmRt=ngPTr1hEaSqbXS^P_``iLrWk`g(IO5zl>__s{@7@0hxjHjNM`7pnxEC8O;
zA8p;Md<s9fcWgOoG?C0rA$&q(c{A=FBbRzo)Qf!mf~EG-%GNx0O;u@mMXf8_Ra?8E
z#<i`WzPceH&*jmGb*{<=cU5TJts%ACIA{{Y&+ge}7ZWRy(R4{Q$IURP9g#ipCi45T
zm(<0HTLY5~`CJ+@q6n14EZ_>!0u;t^+CK_L4yK|Pp}#TM&o}{C%)JIcvYVvfjpRaR
zBtC=3$xP--cucir36N#L)?TbSvN5!d;t6~c-@@@6;FyC0XK)d_jspWnKTXwu!w1LJ
z(wut8itn>s9pqeYeEJFeHVY6Cx0=R>cCml~zfQiV19JUxQ>P}~>D6^W8}PAa@PtK!
z8j=kRWRbIwXXbDUN=3xuT+fP6JXt1k(OJTZ-`!0yk%&AqD-QJ3Mw69!S<(?)mPD-u
zd<;L(eP*{bd&mcQ#qcJ%oo88lgc4SoCuqUFco0W(G+GNjftPT=0CrJCGf3oUY>=XH
z-{Vo7uB(}vI!<fP#R$#O`g1jShLq<28R7_R43@Zj&dTK*tX$u}5;skX3ev^tocY(E
z?E^@nLnJ9%+99i|1=Ud~ua=nW?1FfH&Mv1jv7w~5B2?W{R}{{QprEpqeBNng#lzW;
zC2~oVrr(;C$o<ZftawMm4tEW)qT_X1x3k;EineuBs_)*xiggXeZt_=mF)O;8ZB6Q`
zeTz`Q(U+f3L`e)mX7!yOuZ;LEl6E{!5X%fP@*Ii{C%vb_)qTgW8R#O=*SLwaTC1&$
z){tn1cA&m7UQ@*BcQ;0mUBj(@9ntfy)u+STCDied?6{CDh?f_}$ek$GM%qVh>ePi_
z0w5w^Oe|r=uScSS$&HCae%F(p-E6<MI}GtP1kT#%R4<8<*W*|tIep)#X3nBeRDhKn
z9`2?+_%JG1Imbh5DOj(i5s$7Qj%JvOBn<TPO+CA~Kca%mH7OTOAdOf{&p`dG(G5x(
z+@3m3a-kL-D6gq4QsNEJ!iwPsXpl8jME;RVjR9T?*pWS-srHUa(^4pT-w+^Y7x*HM
zIl|dP6O>syl$5q*P!Po7v>3UcuBDE7k1d1SWmYWrlslEke7KPnoi+7U-tGC&NVlZ8
zF)Y}-zW|zWz$eKsM7c5r!}V$L-YA5R7YTeD&y4bROM(JjFg!Suh3Mz9)fGu%_?j5`
z42})gaj&foJ_=&RjM9oE#nJ{BGCTl*%8E9)loe4ybB<Ek28&p6XI++6Io$?V&|xca
z)haV>@D+^vkk_&Y2El;)<`;6Aoq|zbI=LQ`z(*Mv7-)}9P=flQ?La>iSn>RZ7}@LJ
z4~<MfzU76BcfW!*Z^<BRl~G=oGCl(7WRz9M$PegbC{5o|GX5L5iV<7n=dYRRrkK6^
z&%!dv&~e?sjB@q}Vy!bNfj>cBulxroX=i{q))FI+pjeBxIXdTcUWNw|*S=YQCkO4I
zm%9odaei#tynn?o2_qD%4N5|lyIT7;Gj3hw+^*)vy<=X_BpgUZ9f{sxBc1;L04hB)
AZ2$lO

delta 1644
zcmYjSdrVVT7(cIjZ_6x*v^)wOR9i%Z5)fEWP@q7;SQRT~A`=<Z1t)LV@WsPKD+(s{
zs8<x6UEGY(Iq*jA&@3BS7~6DCHZ>dWp;=~P#+Ec=n;}zoZVA@=$M>D@`+bk!Ip4kK
zPG3|Vy{H;EkNLAluBW@p>4(^a!qwvVJ*d;{F9Kl3?L9F`|HVec#fZk+Fif-Iupeor
z%gG9jcfjw-qz8$SmJ=1V4Mqh4&~(?2HPfGo5t%p&Ic-F$8a{9ExGEb=Ud;vxpJszN
zI>PA?2FHJdp@HwM@&|>t(rPXS0U%b`VI(UZ-{}XZ=oL<BD~O{*Fj`~i_d_?Rnm3||
zB_h-!v!?2*A2~xeGXy}|$s07^f9nUj=>-OGL<|l=2F>&jek7Yd=8bqV(jxvc59tCI
z05Gp47l3E%VF$QENE3qG*V9pbm~x6CV!~dSBz-LGngdOAWLb!AL$&kmqS~!>7MruV
zsJ6=4dfHmnB~@zs!&J7R6%Hqf*U{pII_c$vM+6x#y`D5*TAaLXF5yc_EA7oOg#3oV
z5mEp^9KRBP)JB?tU!z~<#Na_ZN+)xc!hUICt{P$lwn=GL42{G1Ydntc;6xtq<aFO4
zwsY%v(0BIz48?Kg^r*BkuNFc;Z{#N?dGHPnuoK?H0RnDM?DH92ioEakt&b_de;n%f
zSv0+1m70Ho(@+NL!L+NOgw^@Az`^7)TO^a4Y`MX`cuNX-g4MVm|2>m+*|xTQ92*Eg
zPjC*_@k+-CMK)jqBgIrN3pOgt7Tkl6VKdLVwqOrl!~+%B!#qkrJ}zYidT_F@K$;SB
z1rOsapP8eWqipZ_7_q23IA3u;z(-G3bJ+mU9fdz>3+L9))A6OekuOyl`G-$+d<~-2
zMOgv2@@6M04HWHLpdPEm#KXsiS*W`*G&qNY=nXE!ohf{g?Z_hWp^8`9U1N`8JHFXv
zWOAy@NNkTx(Nur%0yDol_%0E8F579tArrA>vc<_myO>|!y%qwgt~(k9oti(}(t83R
zJ*^;mNj@xxBUd-AKbJtp8gd+x=iEOkmew~A!Q|C})_}d{*(@n@aHmc!OcN3;#F{PC
zGj7r-L_eCW{5@{$K(0gbem)(@(kAaLQaay#CtxJydGcp>+w^MJn;h{7u{sN__iE{8
zubSBQTOHDNuRat4@qhr^n0iSCjSz{6D#&&#u4XDo6H~)R37n`!QAq4iK|?ff6E=YJ
zXb_DfWdI{6P8s(o>Q#b(IHH2z%x$pFGEg?HZ4rx8V2CWKAs>reYs70w(5xC8%5(Ix
z&q8#Yp-z691b2qB#(N6kMhN74g-{ELFlAaNPZhy19JDX>#fp)>n?g>r!)MWISEoQm
zgjj<`Ox_Knd{ex+W%=tVuKs+-FpiJ%xn)-kd>kAJ1{IduKR_nNx$)t8_Wm}u4bL$5
zw8O=W!FW5gGqs=tzQR;_2VBDV9P5C=FyODqSrYO<Cp;B~TxQYU3sVK*)dI&KC|=AO
zgl73tFPy}IHp6VJas<b<$RywBhppl2v2K+@*K85*UxqWYM3??7){hn29CG^*tR#WW
z;V<Tj#aa|4&$$M-=#VfW*4~1N#8p`6kk8zLpCIHemn*)5;ld_;=8IWc%UWkubyZ!H
zb$hk5w%J+!7Q3O2^B}V^!Me08Z;iFYp5K;SR?^f`(O6wqW?i$opvcA?>zy_AWmU~v
nQ&Q6{%{BGP{YM(b2bECAH#(cxk3*iAfPEQANR?Z)><#!IGWQk+

diff --git a/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.dfm b/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.dfm
index 4aa66cb3..9cb3ea70 100644
--- a/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.dfm	
+++ b/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.dfm	
@@ -163,9 +163,20 @@ inherited frViewPedidosCliente: TfrViewPedidosCliente
         ExplicitWidth = 596
         inherited dxLayoutControl1: TdxLayoutControl
           Width = 592
+          ExplicitWidth = 592
+          inherited txtFiltroTodo: TcxTextEdit
+            ExplicitWidth = 273
+            Width = 273
+          end
+          inherited edtFechaIniFiltro: TcxDateEdit
+            ExplicitWidth = 121
+            Width = 121
+          end
           inherited edtFechaFinFiltro: TcxDateEdit
             Left = 367
             ExplicitLeft = 367
+            ExplicitWidth = 121
+            Width = 121
           end
         end
         inherited TBXAlignmentPanel1: TTBXAlignmentPanel
diff --git a/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.pas b/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.pas
index 0544188b..c9a589fb 100644
--- a/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.pas	
+++ b/Source/Modulos/Pedidos de cliente/Views/uViewPedidosCliente.pas	
@@ -223,14 +223,13 @@ var
   R : TRect;
 begin
   inherited;
-
-  if not VarIsNull(  _FocusedView.DataController.Values[AViewInfo.RecordViewInfo.Index, AViewInfo.Item.Index]) then
-  begin
-    R := AViewInfo.ContentBounds;
-    ACanvas.FillRect(R);
-    ACanvas.DrawImage(PngImageList, R.Left, R.Top, 4);
-    ADone := True;
-  end;
+    if (AViewInfo.GridRecord.DisplayTexts[cxGridViewTIENDAWEB.Index] <> '') then
+    begin
+      R := AViewInfo.ContentBounds;
+      ACanvas.FillRect(R);
+      ACanvas.DrawImage(PngImageList, R.Left, R.Top, 4);
+      ADone := True;
+    end;
 end;
 
 function TfrViewPedidosCliente.GetPedidos: IBizPedidoCliente;