git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES2/trunk@104 b2cfbe5a-eba1-4a0c-8b32-7feea0a119f2

Build/Build.fbpInf

@@ -14,8 +14,8 @@
     <Notes>
       <![CDATA[]]>
     </Notes>
-    <LastBuildRun>00:00:01</LastBuildRun>
+    <LastBuildRun>00:05:38</LastBuildRun>
-    <LastBuildStart>01/10/2010 18:26:31</LastBuildStart>
+    <LastBuildStart>18/11/2010 20:09:33</LastBuildStart>
     <LastBuildState>True</LastBuildState>
   </properties>
 </project>

Source/Cliente/FactuGES.dproj

@@ -53,7 +53,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">4</VersionInfo><VersionInfo Name="MinorVer">0</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">4.0.9.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">4.0.9.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></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">4</VersionInfo><VersionInfo Name="MinorVer">1</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">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.1.0.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">4.1.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>

Source/Cliente/FactuGES.rc

@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo\Resources\Iconos\Factuges.ico"
 1 VERSIONINFO
-FILEVERSION 4,0,9,0
+FILEVERSION 4,1,0,0
-PRODUCTVERSION 4,0,9,0
+PRODUCTVERSION 4,1,0,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "4.0.9.0\0"
+              VALUE "FileVersion", "4.1.0.0\0"
               VALUE "InternalName", "FactuGES\0"
               VALUE "ProductName", "FactuGES\0"
-              VALUE "ProductVersion", "4.0.9.0\0"
+              VALUE "ProductVersion", "4.1.0.0\0"
          END
     END
     BLOCK "VarFileInfo"

Source/Modulos/Informe margen por articulo/Data/InfMargenArticulo_data.drc

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo\Source\Modulos\Informe margen por articulo\Data\uDataModuleInfMargenArticulo.DFM */
+/* C:\Codigo\Source\Modulos\Informe margen por articulo\Data\uDataModuleInfMargenArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe margen por articulo\Data\InfMargenArticulo_data.res */
-/* C:\Codigo\Source\Modulos\Informe margen por articulo\Data\InfMargenArticulo_data.drf */
+/* c:\temp\dtfC11.tmp */

Source/Modulos/Informe margen por articulo/Model/InfMargenArticulo_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Informe margen por articulo\Model\InfMargenArticulo_model.res */
-/* C:\Codigo\Source\Modulos\Informe margen por articulo\Model\InfMargenArticulo_model.drf */
+/* c:\temp\dtfC0F.tmp */

Source/Modulos/Informe margen por articulo/Model/schInfMargenArticuloClient_Intf.pas

@@ -3,7 +3,7 @@ unit schInfMargenArticuloClient_Intf;
 interface
 
 uses
-  Classes, DB, SysUtils, uROClasses, uDADataTable;
+  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable;
 
 const
   { Data table rules ids
@@ -399,7 +399,7 @@ type
   end;
 
   { TInfMargenPorClienteDataTableRules }
-  TInfMargenPorClienteDataTableRules = class(TDADataTableRules, IInfMargenPorCliente)
+  TInfMargenPorClienteDataTableRules = class(TIntfObjectDADataTableRules, IInfMargenPorCliente)
   private
   protected
     { Property getters and setters }
@@ -656,7 +656,7 @@ type
   end;
 
   { TInfMargenPorArticuloDataTableRules }
-  TInfMargenPorArticuloDataTableRules = class(TDADataTableRules, IInfMargenPorArticulo)
+  TInfMargenPorArticuloDataTableRules = class(TIntfObjectDADataTableRules, IInfMargenPorArticulo)
   private
   protected
     { Property getters and setters }
@@ -901,7 +901,7 @@ type
   end;
 
   { TInfMargenPorFacturaDataTableRules }
-  TInfMargenPorFacturaDataTableRules = class(TDADataTableRules, IInfMargenPorFactura)
+  TInfMargenPorFacturaDataTableRules = class(TIntfObjectDADataTableRules, IInfMargenPorFactura)
   private
   protected
     { Property getters and setters }

Source/Modulos/Informe margen por articulo/Views/InfMargenArticulo_view.drc

@@ -16,4 +16,4 @@ END
 /* C:\Codigo\Source\Modulos\Informe margen por articulo\Views\uViewInfMargenArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe margen por articulo\Views\uEditorInfMargenArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe margen por articulo\Views\InfMargenArticulo_view.res */
-/* C:\Codigo\Source\Modulos\Informe margen por articulo\Views\InfMargenArticulo_view.drf */
+/* c:\temp\dtfC15.tmp */

Source/Modulos/Informe ventas por articulo/Data/InfVentasArticulo_data.drc

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo\Source\Modulos\Informe ventas por articulo\Data\uDataModuleInfVentasArticulo.DFM */
+/* C:\Codigo\Source\Modulos\Informe ventas por articulo\Data\uDataModuleInfVentasArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe ventas por articulo\Data\InfVentasArticulo_data.res */
-/* C:\Codigo\Source\Modulos\Informe ventas por articulo\Data\InfVentasArticulo_data.drf */
+/* c:\temp\dtfC07.tmp */

Source/Modulos/Informe ventas por articulo/Model/InfVentasArticulo_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Informe ventas por articulo\Model\InfVentasArticulo_model.res */
-/* C:\Codigo\Source\Modulos\Informe ventas por articulo\Model\InfVentasArticulo_model.drf */
+/* c:\temp\dtfC05.tmp */

Source/Modulos/Informe ventas por articulo/Views/InfVentasArticulo_view.drc

@@ -16,4 +16,4 @@ END
 /* C:\Codigo\Source\Modulos\Informe ventas por articulo\Views\uViewInfVentasArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe ventas por articulo\Views\uEditorInfVentasArticulo.dfm */
 /* C:\Codigo\Source\Modulos\Informe ventas por articulo\Views\InfVentasArticulo_view.res */
-/* C:\Codigo\Source\Modulos\Informe ventas por articulo\Views\InfVentasArticulo_view.drf */
+/* c:\temp\dtfC0B.tmp */

Source/Modulos/Informes base/Controller/InformesBase_controller.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Informes base\Controller\InformesBase_controller.res */
-/* C:\Codigo\Source\Modulos\Informes base\Controller\InformesBase_controller.drf */
+/* c:\temp\dtfBFB.tmp */

Source/Modulos/Informes base/Data/Informes_data.drc

@@ -12,6 +12,6 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Codigo\Source\Modulos\Informes base\Data\uDataModuleInformes.DFM */
+/* C:\Codigo\Source\Modulos\Informes base\Data\uDataModuleInformes.dfm */
 /* C:\Codigo\Source\Modulos\Informes base\Data\Informes_data.res */
-/* C:\Codigo\Source\Modulos\Informes base\Data\Informes_data.drf */
+/* c:\temp\dtfBF7.tmp */

Source/Modulos/Informes base/Model/Informes_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Informes base\Model\Informes_model.res */
-/* C:\Codigo\Source\Modulos\Informes base\Model\Informes_model.drf */
+/* c:\temp\dtfBF5.tmp */

Source/Modulos/Informes base/Views/Informes_view.drc

@@ -15,4 +15,4 @@ END
 /* C:\Codigo\Source\Modulos\Informes base\Views\uViewInformes.dfm */
 /* C:\Codigo\Source\Modulos\Informes base\Views\uEditorInformes.dfm */
 /* C:\Codigo\Source\Modulos\Informes base\Views\Informes_view.res */
-/* C:\Codigo\Source\Modulos\Informes base\Views\Informes_view.drf */
+/* c:\temp\dtfBFF.tmp */

Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Controller\PedidosCliente_controller.RES */
-/* c:\temp\dtf96F.tmp */
+/* c:\temp\dtfC45.tmp */

Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Data\uDataModulePedidosCliente.dfm */
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Data\PedidosCliente_data.RES */
-/* c:\temp\dtf96D.tmp */
+/* c:\temp\dtfC43.tmp */

Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc

@@ -13,4 +13,4 @@ BEGIN
 END
 
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Model\PedidosCliente_model.RES */
-/* c:\temp\dtf96B.tmp */
+/* c:\temp\dtfC41.tmp */

Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Plugin\uPluginPedidosCliente.dfm */
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Plugin\PedidosCliente_plugin.RES */
-/* c:\temp\dtf9D3.tmp */
+/* c:\temp\dtfCA9.tmp */

Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc

@@ -26,4 +26,4 @@ END
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\uEditorElegirArticulosPedidoCliente.dfm */
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\uEditorDireccionEntregaPedidoCliente.dfm */
 /* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\PedidosCliente_view.RES */
-/* c:\temp\dtf9D1.tmp */
+/* c:\temp\dtfCA7.tmp */

Source/Modulos/Tienda web/Data/TiendaWeb_data.drc

@@ -14,4 +14,4 @@ END
 
 /* C:\Codigo\Source\Modulos\Tienda web\Data\uDataModuleTiendaWeb.dfm */
 /* C:\Codigo\Source\Modulos\Tienda web\Data\TiendaWeb_data.res */
-/* c:\temp\dtf985.tmp */
+/* c:\temp\dtfC5B.tmp */

Source/Servidor/FactuGES_Server.dproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
@@ -35,9 +35,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 Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">0</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"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.0.9.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">4.0.9.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 11 de noviembre de 2010 13:08</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">1</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">4.1.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">4.1.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 25 de noviembre de 2010 13:51</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
-      
 						<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
 					</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
 	</ProjectExtensions>

Source/Servidor/FactuGES_Server.rc

@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo\Resources\Iconos\Servidor.ico"
 1 VERSIONINFO
-FILEVERSION 4,0,9,0
+FILEVERSION 4,1,0,0
-PRODUCTVERSION 4,0,9,0
+PRODUCTVERSION 4,1,0,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -12,9 +12,9 @@ BEGIN
     BEGIN
          BLOCK "0C0A04E4"
          BEGIN
-              VALUE "FileVersion", "4.0.9.0\0"
+              VALUE "FileVersion", "4.1.0.0\0"
-              VALUE "ProductVersion", "4.0.9.0\0"
+              VALUE "ProductVersion", "4.1.0.0\0"
-              VALUE "CompileDate", "jueves, 18 de noviembre de 2010 20:09\0"
+              VALUE "CompileDate", "jueves, 25 de noviembre de 2010 17:46\0"
          END
     END
     BLOCK "VarFileInfo"