Se arregla la vista RDX_V_VENTASEDI_RESUELTAS para que se coja el valor y cantidad del articulo corregido

git-svn-id: https://192.168.0.254/svn/Proyectos.Varela_PuntosVenta/trunk@129 1c943782-d109-9647-9548-93b3ac332352

Database/2.2 - vistas ventas.sql

@@ -149,11 +149,13 @@ SELECT
   GRUPO_PRODUTO = ISNULL(PRODUTOS.GRUPO_PRODUTO, RDX_V_VENTASEDI.GRUPO_PRODUTO),
   PRODUTOS.COLECAO,
   DESC_COLECAO = ISNULL(COLECOES.DESC_COLECAO, RDX_V_VENTASEDI.DESC_COLECAO),       
-  RDX_V_VENTASEDI.VALVEN,
+  VALVEN = ISNULL(RDX_V_REFERENCIAS_RESUELTAS.VALVEN, RDX_V_VENTASEDI.VALVEN),
-  RDX_V_VENTASEDI.CANVEN,
+  CANVEN = ISNULL(RDX_V_REFERENCIAS_RESUELTAS.CANVEN, RDX_V_VENTASEDI.CANVEN),
   RDX_V_VENTASEDI.CANDEV,
-  RDX_V_VENTASEDI.CANVENNET,
+  CANVENNET = ISNULL(RDX_V_REFERENCIAS_RESUELTAS.CANVENNET, RDX_V_VENTASEDI.CANVENNET),  
-  RDX_V_VENTASEDI.CANESP
+  
+  CANESP = ISNULL(RDX_V_REFERENCIAS_RESUELTAS.CANESP, RDX_V_VENTASEDI.CANESP)
+    
 FROM RDX_V_VENTASEDI
 LEFT JOIN RDX_V_REFERENCIAS_RESUELTAS ON (
      (RDX_V_REFERENCIAS_RESUELTAS.NUMINF = RDX_V_VENTASEDI.NUMINF) AND

Database/2.3 - vistas stock.sql

@@ -94,8 +94,7 @@ FULL OUTER JOIN RDX_V_TRASPASOS_AJUSTES_DESGLOSADO ON
      (RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.CODIGO = RDX_V_INVENTARIOEDI.CODIGO) AND
      (RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.COLOR = RDX_V_INVENTARIOEDI.COLOR) AND
      (RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.TALLA = RDX_V_INVENTARIOEDI.TALLA) AND
-     (RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.FECHA = RDX_V_INVENTARIOEDI.FECHA) AND
+     (RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.FECHA = RDX_V_INVENTARIOEDI.FECHA) 
-     (RDX_V_TRASPASOS_AJUSTES_DESGLOSADO.TIPO = RDX_V_INVENTARIOEDI.TIPOCANT)
 FULL OUTER JOIN RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO ON
      (RDX_V_DEVOLUCION_AJUSTES_DESGLOSADO.CENTRO = RDX_V_INVENTARIOEDI.CENTRO) AND
      (RDX_V_INVENTARIOEDI.CENTRO = RDX_V_INVENTARIOEDI.CENTRO2) AND

Source/Base/Base.dproj

@@ -40,6 +40,12 @@
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">True</Package_Options></Package_Options><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">0</VersionInfo><VersionInfo Name="Release">0</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"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
+      
+      
+      
+      
+      
       <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>

Source/Base/Base.drc

@@ -29,4 +29,4 @@ END
 /* C:\Varela_D2007\Source\Base\uViewBarraSeleccion.dfm */
 /* C:\Varela_D2007\Source\Base\uViewGrid.dfm */
 /* C:\Varela_D2007\Source\Base\Base.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf32.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf2C.tmp */

Source/CargaEDI/CargaEDI.dproj

@@ -43,12 +43,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">1</VersionInfo><VersionInfo Name="Release">4</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"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.4.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.4.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">1</VersionInfo><VersionInfo Name="Release">6</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"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.6.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
-      
-      
-      
-      
       
       
       

Source/CargaEDI/CargaEDI.drc

@@ -15,4 +15,4 @@ END
 /* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\WindowsXP.res */
 /* C:\Varela_D2007\Source\CargaEDI\uCargaEDI.dfm */
 /* C:\Varela_D2007\Source\CargaEDI\CargaEDI.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf4C.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf46.tmp */

Source/CargaEDI/CargaEDI.rc

@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Varela_D2007\Resources\Iconos\CargaEDI.ico"
 1 VERSIONINFO
-FILEVERSION 2,1,4,0
+FILEVERSION 2,1,6,0
-PRODUCTVERSION 2,1,4,0
+PRODUCTVERSION 2,1,6,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -12,8 +12,8 @@ BEGIN
     BEGIN
          BLOCK "0C0A04E4"
          BEGIN
-              VALUE "FileVersion", "2.1.4.0\0"
+              VALUE "FileVersion", "2.1.6.0\0"
-              VALUE "ProductVersion", "2.1.4.0\0"
+              VALUE "ProductVersion", "2.1.6.0\0"
          END
     END
     BLOCK "VarFileInfo"

Source/Cliente/AdminPV.dproj

@@ -42,7 +42,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><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">4</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.1.4.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">Administración de puntos de venta</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Administración de puntos de venta</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.4.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 09 de mayo de 2008 11:23</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">1</VersionInfo><VersionInfo Name="Release">6</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.1.6.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">Administración de puntos de venta</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Administración de puntos de venta</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 16 de octubre de 2008 13:41</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
 						<Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
 						<Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
 						<Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>

Source/Cliente/AdminPV.drc

@@ -18,4 +18,4 @@ END
 /* C:\Varela_D2007\Source\Cliente\uAcercaDe.dfm */
 /* C:\Varela_D2007\Source\Cliente\uPantallaPrincipal.dfm */
 /* C:\Varela_D2007\Source\Cliente\AdminPV.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf4A.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf44.tmp */

Source/Cliente/AdminPV.rc

@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Varela_D2007\Resources\Iconos\Cliente.ico"
 1 VERSIONINFO
-FILEVERSION 2,1,4,0
+FILEVERSION 2,1,6,0
-PRODUCTVERSION 2,1,4,0
+PRODUCTVERSION 2,1,6,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,11 +13,11 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "2.1.4.0\0"
+              VALUE "FileVersion", "2.1.6.0\0"
               VALUE "InternalName", "Administración de puntos de venta\0"
               VALUE "ProductName", "Administración de puntos de venta\0"
-              VALUE "ProductVersion", "2.1.4.0\0"
+              VALUE "ProductVersion", "2.1.6.0\0"
-              VALUE "CompileDate", "lunes, 19 de mayo de 2008 16:33\0"
+              VALUE "CompileDate", "jueves, 16 de octubre de 2008 18:17\0"
          END
     END
     BLOCK "VarFileInfo"

Source/ControlesBase/ControlesBase.drc

@@ -26,4 +26,4 @@ END
 /* C:\Varela_D2007\Source\ControlesBase\Cliente\uEditorControlBase.dfm */
 /* C:\Varela_D2007\Source\ControlesBase\Cliente\uViewPeriodoFechas.dfm */
 /* C:\Varela_D2007\Source\ControlesBase\ControlesBase.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf34.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf2E.tmp */

Source/Modulos/Devoluciones/Cliente/Devoluciones.drc

@@ -18,4 +18,4 @@ END
 /* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\uPluginControllerDevoluciones.dfm */
 /* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\uEditorAjustarDevoluciones.dfm */
 /* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\Devoluciones.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf44.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3E.tmp */

Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.dfm

@@ -23,7 +23,7 @@ inherited frViewListaDevoluciones: TfrViewListaDevoluciones
           Column = cxGridViewDIFERENCIA
         end
         item
-          Format = 'Diferencia: ,0 unidades;Diferencia: -,0 unidades'
+          Format = ',0;-,0'
           Kind = skSum
           Column = cxGridViewDIFERENCIA
         end>

Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.pas

@@ -634,7 +634,7 @@ var
 begin
   inherited;
 
-  Val1 := Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewPRODUCTO.Index];
+  Val1 := AText + ' ' + Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewPRODUCTO.Index];
   Val2 := Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewCOLOR.Index];
   AText := 'Producto: ' + Val1 + ' - Color: ' + Val2;
 end;

Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc

@@ -18,4 +18,4 @@ END
 /* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\uEditorHistorialCargasEDI.dfm */
 /* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\uPluginControllerFicherosEDI.dfm */
 /* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\FicherosEDI.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3A.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf34.tmp */

Source/Modulos/Parametros/Cliente/Parametros.drc

@@ -17,4 +17,4 @@ END
 /* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\uViewParametrosColeccion.dfm */
 /* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\uViewParametrosFecha.dfm */
 /* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\Parametros.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf36.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf30.tmp */

Source/Modulos/Recepciones/Cliente/Recepciones.dpk

@@ -70,7 +70,10 @@ requires
   dxPSLnksD10,
   designide,
   vclshlctrls,
-  dclcxLibraryD10;
+  dclcxLibraryD10,
+  dxLayoutControlD10,
+  DataAbstract_Core_D11,
+  RemObjects_Core_D11;
 
 contains
   uPluginControllerRecepciones in 'uPluginControllerRecepciones.pas' {ModuleRecepciones: TModuleController},
@@ -79,6 +82,7 @@ contains
   uViewListaRecepciones in 'uViewListaRecepciones.pas' {frViewListaRecepciones: TCustomView},
   uEditorListaRecepciones in 'uEditorListaRecepciones.pas' {fEditorListaRecepciones: TCustomEditor},
   uViewListaRecepcionesAlbaran in 'uViewListaRecepcionesAlbaran.pas' {frViewListaRecepcionesAlbaran: TCustomView},
-  uEditorListaRecepcionesAlbaran in 'uEditorListaRecepcionesAlbaran.pas' {fEditorListaRecepcionesAlbaran: TCustomEditor};
+  uEditorListaRecepcionesAlbaran in 'uEditorListaRecepcionesAlbaran.pas' {fEditorListaRecepcionesAlbaran: TCustomEditor},
+  uEditorAjustarRecepciones in 'uEditorAjustarRecepciones.pas' {fEditorAjustarRecepciones: TCustomEditor};
 
 end.

Source/Modulos/Recepciones/Cliente/Recepciones.dproj

@@ -1,4 +1,5 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{5990f68e-d16f-46ae-93db-ba7d141d4021}</ProjectGuid>
     <MainSource>Recepciones.dpk</MainSource>
@@ -46,8 +47,6 @@
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><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">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">3</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"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.3.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
-      
       <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclIntraweb_80_100.bpl">Intraweb 8.0 Design Package for Borland Development Studio 2006</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">Recepciones.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
@@ -57,55 +56,52 @@
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
     <DCCReference Include="..\Reglas\uBizRecepciones.pas" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
+    <DCCReference Include="adortl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
+    <DCCReference Include="Base.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\bdertl.dcp" />
+    <DCCReference Include="bdertl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\ControlesBase.dcp" />
+    <DCCReference Include="ControlesBase.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD10.dcp" />
+    <DCCReference Include="cxDataD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD10.dcp" />
+    <DCCReference Include="cxEditorsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxExportD10.dcp" />
+    <DCCReference Include="cxExportD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD10.dcp" />
+    <DCCReference Include="cxExtEditorsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxGridD10.dcp" />
+    <DCCReference Include="cxGridD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD10.dcp" />
+    <DCCReference Include="cxLibraryD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD10.dcp" />
+    <DCCReference Include="cxPageControlD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxTreeListD10.dcp" />
+    <DCCReference Include="cxTreeListD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
+    <DCCReference Include="DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dclcxLibraryD10.dcp" />
+    <DCCReference Include="dbrtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
+    <DCCReference Include="dclcxLibraryD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
+    <DCCReference Include="designide.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxComnD10.dcp" />
+    <DCCReference Include="dsnap.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPSCoreD10.dcp" />
+    <DCCReference Include="dxComnD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxCommonD10.dcp" />
+    <DCCReference Include="dxLayoutControlD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxGridLnkD10.dcp" />
+    <DCCReference Include="dxPSCoreD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPSLnksD10.dcp" />
+    <DCCReference Include="dxPScxCommonD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD10.dcp" />
+    <DCCReference Include="dxPScxGridLnkD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11.dcp" />
+    <DCCReference Include="dxPSLnksD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
+    <DCCReference Include="dxThemeD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
+    <DCCReference Include="GUISDK_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
+    <DCCReference Include="Jcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCustomD11R.dcp" />
+    <DCCReference Include="JclVcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD11R.dcp" />
+    <DCCReference Include="JvCoreD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD11R.dcp" />
+    <DCCReference Include="JvCustomD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="JvGlobusD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
+    <DCCReference Include="JvPageCompsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Parametros.dcp" />
+    <DCCReference Include="JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PluginSDK_D11R.dcp" />
+    <DCCReference Include="JvSystemD11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
+    <DCCReference Include="Parametros.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
+    <DCCReference Include="PluginSDK_D11R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="PngComponentsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tb2k_D10.dcp" />
+    <DCCReference Include="PNG_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_D10.dcp" />
+    <DCCReference Include="RemObjects_Core_D11.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="rtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
+    <DCCReference Include="tb2k_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
+    <DCCReference Include="tbx_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclshlctrls.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\VclSmp.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
     <DCCReference Include="uDataModuleRecepciones.pas">
       <Form>dmRecepciones</Form>
       <DesignClass>TDAClientDataModule</DesignClass>
     </DCCReference>
+    <DCCReference Include="uEditorAjustarRecepciones.pas" />
     <DCCReference Include="uEditorListaRecepciones.pas">
       <Form>fEditorListaRecepciones</Form>
       <DesignClass>TCustomEditor</DesignClass>
@@ -126,6 +122,13 @@
       <Form>frViewListaRecepcionesAlbaran</Form>
       <DesignClass>TCustomView</DesignClass>
     </DCCReference>
+    <DCCReference Include="vcl.dcp" />
+    <DCCReference Include="vclactnband.dcp" />
+    <DCCReference Include="vcldb.dcp" />
+    <DCCReference Include="vcljpg.dcp" />
+    <DCCReference Include="vclshlctrls.dcp" />
+    <DCCReference Include="VclSmp.dcp" />
+    <DCCReference Include="vclx.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line

Source/Modulos/Recepciones/Cliente/Recepciones.drc

@@ -18,5 +18,6 @@ END
 /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uViewListaRecepcionesAlbaran.dfm */
 /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uEditorListaRecepcionesAlbaran.dfm */
 /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uPluginControllerRecepciones.dfm */
+/* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\uEditorAjustarRecepciones.dfm */
 /* C:\Varela_D2007\Source\Modulos\Recepciones\Cliente\Recepciones.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf42.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3C.tmp */

Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.dfm

@@ -4,6 +4,7 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
   Caption = 'Control de recepciones'
   ClientHeight = 664
   ClientWidth = 816
+  ExplicitTop = -106
   ExplicitWidth = 824
   ExplicitHeight = 691
   PixelsPerInch = 96
@@ -117,7 +118,7 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
             Column = frViewListaRecepciones1.cxGridBandedViewDIFERENCIA
           end
           item
-            Format = 'Diferencia: ,0 unidades;Diferencia: -,0 unidades'
+            Format = ',0;-,0'
             Kind = skSum
             Column = frViewListaRecepciones1.cxGridBandedViewDIFERENCIA
           end>
@@ -1634,7 +1635,7 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
   inherited dsDataTable: TDADataSource [10]
     Top = 136
   end
-  inherited GridPopupMenu: TPopupMenu
+  inherited GridPopupMenu: TPopupMenu [11]
     Left = 112
     Top = 128
     object Cambiarelestado1: TMenuItem [3]

Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.dfm

@@ -23,7 +23,7 @@ inherited frViewListaRecepciones: TfrViewListaRecepciones
           Column = cxGridBandedViewDIFERENCIA
         end
         item
-          Format = 'Diferencia: ,0 unidades;Diferencia: -,0 unidades'
+          Format = ',0;-,0'
           Kind = skSum
           Column = cxGridBandedViewDIFERENCIA
         end>

Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc

@@ -18,4 +18,4 @@ END
 /* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\uPluginControllerReferenciaGenerica.dfm */
 /* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\uEditorCambioReferenciaGenerica.dfm */
 /* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\ReferenciaGenerica.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf40.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3A.tmp */

Source/Modulos/Stock/Cliente/Stock.drc

@@ -21,4 +21,4 @@ END
 /* C:\Varela_D2007\Source\Modulos\Stock\Cliente\uEditorControlStockVARELA.dfm */
 /* C:\Varela_D2007\Source\Modulos\Stock\Cliente\uPluginControllerStock.dfm */
 /* C:\Varela_D2007\Source\Modulos\Stock\Cliente\Stock.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf48.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf42.tmp */

Source/Modulos/Traspasos/Cliente/Traspasos.drc

@@ -18,4 +18,4 @@ END
 /* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\uPluginControllerTraspasos.dfm */
 /* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\uEditorAjustarTraspasos.dfm */
 /* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\Traspasos.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf46.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf40.tmp */

Source/Modulos/Traspasos/Cliente/uViewListaTraspasos.pas

@@ -581,7 +581,7 @@ var
 begin
   inherited;
 
-  Val1 := Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewPRODUCTO.Index];
+  Val1 := AText + ' ' + Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewPRODUCTO.Index];
   Val2 := Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewCOLOR.Index];
   AText := 'Producto: ' + Val1 + ' - Color: ' + Val2;
 end;

Source/Modulos/VentasProceso/Cliente/VentasProceso.drc

@@ -20,4 +20,4 @@ END
 /* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\uViewControlVentaProceso.dfm */
 /* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\uEditorControlVentaProceso.dfm */
 /* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\VentasProceso.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3E.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf38.tmp */

Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc

@@ -22,4 +22,4 @@ END
 /* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\uPluginControllerVentasTerminadas.dfm */
 /* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\uEditorControlVentasTerminadas.dfm */
 /* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\VentasTerminadas.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3C.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf36.tmp */

Source/Servidor/AdminPV_Server.dproj

@@ -44,7 +44,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">1</VersionInfo><VersionInfo Name="Release">4</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.1.4.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">AdminPV_Server</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.4.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 09 de mayo de 2008 11:23</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">AdminPV_Server.dpr</Source></Source><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">1</VersionInfo><VersionInfo Name="Release">4</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.1.4.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">AdminPV_Server</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.4.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 16 de octubre de 2008 13:41</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">AdminPV_Server.dpr</Source></Source><Excluded_Packages>
 						<Excluded_Packages Name="C:\Varela_D2007\Lib\DevExpressVCL\dxPSCoreD10.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
 						<Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
 						<Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>

Source/Servidor/AdminPV_Server.drc

@@ -2995,4 +2995,4 @@ END
 /* C:\Varela_D2007\Source\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.dfm */
 /* C:\Varela_D2007\Source\Servidor\AdminPV_Server.res */
 /* C:\Varela_D2007\Source\Servidor\RODLFILE.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf4E.tmp */
+/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf48.tmp */

Source/Servidor/AdminPV_Server.rc

@@ -16,7 +16,7 @@ BEGIN
               VALUE "FileVersion", "2.1.4.0\0"
               VALUE "ProductName", "AdminPV_Server\0"
               VALUE "ProductVersion", "2.1.4.0\0"
-              VALUE "CompileDate", "lunes, 19 de mayo de 2008 16:33\0"
+              VALUE "CompileDate", "jueves, 16 de octubre de 2008 18:17\0"
          END
     END
     BLOCK "VarFileInfo"