From 4a73655e14f0e0b87c9baca0d534e4108d1ccd16 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Fri, 23 Oct 2015 11:14:59 +0000
Subject: [PATCH] =?UTF-8?q?Arreglada=20la=20direcci=C3=B3n=20de=20entrega?=
 =?UTF-8?q?=20que=20aparece=20en=20el=20informe=20de=20los=20pedidos=20a?=
 =?UTF-8?q?=20proveedor.?=
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.Acana_FactuGES2/trunk@631 f4e31baf-9722-1c47-927c-6f952f962d4b
---
 Source/Cliente/FactuGES.dproj                 |   3 +-
 Source/Cliente/FactuGES.rc                    |   8 ++--
 Source/Cliente/FactuGES.res                   | Bin 171984 -> 171984 bytes
 Source/GUIBase/GUIBase.res                    | Bin 4748 -> 384 bytes
 .../Reports/uRptPedidosProveedor_Server.dfm   |  36 ++++++++++--------
 Source/Servidor/FactuGES_Server.dproj         |   2 +-
 Source/Servidor/FactuGES_Server.rc            |  10 ++---
 Source/Servidor/FactuGES_Server.res           | Bin 23356 -> 23352 bytes
 8 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index df278206..3a440b7f 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -52,8 +52,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">2</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">7</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">2.6.7.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">2.6.7.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
+<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">2</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">8</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">2.6.8.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">2.6.8.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
       
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index d8f55323..65099b0f 100644
--- a/Source/Cliente/FactuGES.rc
+++ b/Source/Cliente/FactuGES.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Factuges.ico"
 1 VERSIONINFO
-FILEVERSION 2,6,7,0
-PRODUCTVERSION 2,6,7,0
+FILEVERSION 2,6,8,0
+PRODUCTVERSION 2,6,8,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "2.6.7.0\0"
+              VALUE "FileVersion", "2.6.8.0\0"
               VALUE "InternalName", "FactuGES\0"
               VALUE "ProductName", "FactuGES\0"
-              VALUE "ProductVersion", "2.6.7.0\0"
+              VALUE "ProductVersion", "2.6.8.0\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index 9e5262455476ded4c746c63a3cfc5cd7da60df1c..2ffd4b1660232f39f537c30d45bc93d57dce9b8b 100644
GIT binary patch
delta 42
xcmcbxpX<VYu7(!IElgtbI5`;D7?>Cs7&xZO&tp2tXfgfeJf_(|s&zh-Hvk`k4Hp0a

delta 42
xcmcbxpX<VYu7(!IElgtbIN2H47?>Cs7}%%F&tp2tXg>YrJf_(|s&zh-Hvk_$4HEzW

diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res
index 1641339fcc482e7e3492d1b45813a86619622c33..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644
GIT binary patch
delta 11
ScmeBCZD5|Duvteife`=|>;pCc

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

diff --git a/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm b/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm
index 2f881345..e24e7c7d 100644
--- a/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm	
@@ -93,21 +93,27 @@ object RptPedidosProveedor: TRptPedidosProveedor
               '_PEDIDO,'#10'  V_PEDIDOS_PROVEEDOR.FECHA_ENTREGA,'#10'  V_PEDIDOS_PROVEE' +
               'DOR.FECHA_ENVIO,'#10'  V_PEDIDOS_PROVEEDOR.OBSERVACIONES,'#10'  V_PEDIDO' +
               'S_PROVEEDOR.VENDEDOR,'#10'  V_PROVEEDORES.NOMBRE,'#10'  V_PROVEEDORES.FA' +
-              'X,'#10#10#10'  V_CONTRATOS_CLIENTE.NOMBRE AS NOMBRE_CLIENTE,'#10'  V_CONTRAT' +
-              'OS_CLIENTE.CALLE,'#10'  V_CONTRATOS_CLIENTE.POBLACION,'#10'  V_CONTRATOS' +
-              '_CLIENTE.PROVINCIA,'#10'  V_CONTRATOS_CLIENTE.CODIGO_POSTAL,'#10'  V_CON' +
-              'TRATOS_CLIENTE.PERSONA_CONTACTO,'#10'  V_CONTRATOS_CLIENTE.TELEFONO,' +
-              #10#10'  EMPRESAS.NIF_CIF AS NIF_CIF_EMPRESA,'#10'  EMPRESAS.NOMBRE AS NO' +
-              'MBRE_EMPRESA,'#10'  EMPRESAS.RAZON_SOCIAL AS RAZON_SOCIAL_EMPRESA,'#10' ' +
-              ' EMPRESAS.TELEFONO_1 AS TELEFONO_1_EMPRESA,'#10'  EMPRESAS.FAX AS FA' +
-              'X_EMPRESA,'#10'  EMPRESAS.MOVIL_1 AS MOVIL_1_EMPRESA,'#10'  EMPRESAS.EMA' +
-              'IL_1 AS EMAIL_1_EMPRESA,'#10'  EMPRESAS.PAGINA_WEB AS PAGINA_WEB_EMP' +
-              'RESA'#10'FROM'#10'  V_PEDIDOS_PROVEEDOR'#10'  LEFT OUTER JOIN V_PROVEEDORES ' +
-              'ON (V_PROVEEDORES.ID = V_PEDIDOS_PROVEEDOR.ID_PROVEEDOR)'#10'  LEFT ' +
-              'OUTER JOIN V_CONTRATOS_CLIENTE ON (V_CONTRATOS_CLIENTE.ID = V_PE' +
-              'DIDOS_PROVEEDOR.ID_CONTRATO_CLIENTE)'#10'  LEFT OUTER JOIN EMPRESAS ' +
-              'ON (EMPRESAS.ID = V_PEDIDOS_PROVEEDOR.ID_EMPRESA)'#10'WHERE V_PEDIDO' +
-              'S_PROVEEDOR.ID = :ID'#10
+              'X,'#10#10'  '#39#39' AS NOMBRE_CLIENTE,'#10#10'  IIF ((V_PEDIDOS_PROVEEDOR.ID_ALMA' +
+              'CEN = 0), V_PEDIDOS_PROVEEDOR.CALLE, ALMACENES.CALLE) AS CALLE,'#10 +
+              '  IIF ((V_PEDIDOS_PROVEEDOR.ID_ALMACEN = 0), V_PEDIDOS_PROVEEDOR' +
+              '.POBLACION, ALMACENES.POBLACION) AS POBLACION,'#10'  IIF ((V_PEDIDOS' +
+              '_PROVEEDOR.ID_ALMACEN = 0), V_PEDIDOS_PROVEEDOR.PROVINCIA, ALMAC' +
+              'ENES.PROVINCIA) AS PROVINCIA,'#10'  IIF ((V_PEDIDOS_PROVEEDOR.ID_ALM' +
+              'ACEN = 0), V_PEDIDOS_PROVEEDOR.CODIGO_POSTAL, ALMACENES.CODIGO_P' +
+              'OSTAL) AS CODIGO_POSTAL,'#10'  IIF ((V_PEDIDOS_PROVEEDOR.ID_ALMACEN ' +
+              '= 0), V_PEDIDOS_PROVEEDOR.PERSONA_CONTACTO, ALMACENES.PERSONA_CO' +
+              'NTACTO) AS PERSONA_CONTACTO,'#10'  IIF ((V_PEDIDOS_PROVEEDOR.ID_ALMA' +
+              'CEN = 0), V_PEDIDOS_PROVEEDOR.TELEFONO, ALMACENES.TELEFONO) AS T' +
+              'ELEFONO,'#10#10'  EMPRESAS.NIF_CIF AS NIF_CIF_EMPRESA,'#10'  EMPRESAS.NOMB' +
+              'RE AS NOMBRE_EMPRESA,'#10'  EMPRESAS.RAZON_SOCIAL AS RAZON_SOCIAL_EM' +
+              'PRESA,'#10'  EMPRESAS.TELEFONO_1 AS TELEFONO_1_EMPRESA,'#10'  EMPRESAS.F' +
+              'AX AS FAX_EMPRESA,'#10'  EMPRESAS.MOVIL_1 AS MOVIL_1_EMPRESA,'#10'  EMPR' +
+              'ESAS.EMAIL_1 AS EMAIL_1_EMPRESA,'#10'  EMPRESAS.PAGINA_WEB AS PAGINA' +
+              '_WEB_EMPRESA'#10'FROM'#10'  V_PEDIDOS_PROVEEDOR'#10'  LEFT OUTER JOIN V_PROV' +
+              'EEDORES ON (V_PROVEEDORES.ID = V_PEDIDOS_PROVEEDOR.ID_PROVEEDOR)' +
+              #10'  LEFT OUTER JOIN EMPRESAS ON (EMPRESAS.ID = V_PEDIDOS_PROVEEDO' +
+              'R.ID_EMPRESA)'#10'  LEFT OUTER JOIN ALMACENES ON (ALMACENES.ID = V_P' +
+              'EDIDOS_PROVEEDOR.ID_ALMACEN)'#10'WHERE V_PEDIDOS_PROVEEDOR.ID = :ID'#10
             StatementType = stSQL
             ColumnMappings = <
               item
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index 78a519b1..4af83476 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -28,7 +28,7 @@
 		<Borland.Personality>Delphi.Personality</Borland.Personality>
 		<Borland.ProjectType/>
 		<BorlandProject>
-			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">7</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">2.6.7.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.6.7.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 09 de octubre de 2015 13:21</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">9</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">2.6.9.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.6.9.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 22 de octubre de 2015 19:37</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
 						<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
 					</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
 	</ProjectExtensions>
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index bd6628ca..1e2a870d 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico"
 1 VERSIONINFO
-FILEVERSION 2,6,7,0
-PRODUCTVERSION 2,6,7,0
+FILEVERSION 2,6,9,0
+PRODUCTVERSION 2,6,9,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "2.6.7.0\0"
+              VALUE "FileVersion", "2.6.9.0\0"
               VALUE "ProductName", "FactuGES (Servidor)\0"
-              VALUE "ProductVersion", "2.6.7.0\0"
-              VALUE "CompileDate", "miércoles, 14 de octubre de 2015 16:04\0"
+              VALUE "ProductVersion", "2.6.9.0\0"
+              VALUE "CompileDate", "viernes, 23 de octubre de 2015 12:35\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res
index cd7b3e66bac91b1187571ed4a6f83716972a4ffa..b7f2857d797e17006efb926304420dce2a23fd3a 100644
GIT binary patch
delta 107
zcmdn9jd8~|#tnBO7;PrsjgSYDe<MseIT_d(m>3usI44_2$}-NH92u$1ST?yfvYpX#
zGHX;dw<Uufg8@)Ji$QgAca*GX8AB#RDnk)N9*`_%&|y$uFk&#Cd@xFz-H5@8!I;5x
I^5-Z|0EQSGA^-pY

delta 111
zcmdn7jd9O5#tnBO7#$|xjgSYDe<Mse*%{avm>3us*e6>@$}-NI92u$1ST(sevYpX<
zGHX;dw>g6zg8@)Jk3oHMca*GTE<+~6ONJtbWQKf(9EMbeVg?-s1qMR~lgWFdwAsxV
NtbnRbCclsJ1ON+;9d`f#