From bbae3dd97a972f44bcb64a98d7689c26e7b4a303 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Sun, 18 Nov 2007 15:08:38 +0000
Subject: [PATCH] Rellenar los campos ID_EMPRESA y USUARIO con sus valores.

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@135 0c75b7a4-871f-7646-8a2f-f78d34cc349f
---
 .../Almacenes/Almacenes_Group.groupproj       | 104 ++++++++++++++++++
 .../Controller/uAlmacenesController.pas       |   9 +-
 .../Almacenes/Model/Almacenes_model.dpk       |   3 +-
 .../Almacenes/Model/Almacenes_model.dproj     |  22 +---
 .../Modulos/Almacenes/Model/uBizAlmacenes.pas |   9 +-
 .../Almacenes/Views/uEditorAlmacenes.pas      | Bin 4330 -> 4345 bytes
 .../Articulos/Articulos_Group.groupproj       | 104 ++++++++++++++++++
 .../Controller/uArticulosController.pas       |   8 +-
 .../Articulos/Model/Articulos_model.dpk       |   3 +-
 .../Articulos/Model/Articulos_model.dproj     |  63 +++--------
 .../Articulos/Model/Articulos_model.rc        |  22 ++++
 .../Articulos/Model/Articulos_model.res       | Bin 32 -> 384 bytes
 .../Modulos/Articulos/Model/uBizArticulos.pas | Bin 3088 -> 3108 bytes
 .../Articulos/Views/uEditorArticulos.pas      | Bin 5295 -> 5311 bytes
 14 files changed, 268 insertions(+), 79 deletions(-)
 create mode 100644 Source/Modulos/Almacenes/Almacenes_Group.groupproj
 create mode 100644 Source/Modulos/Articulos/Articulos_Group.groupproj
diff --git a/Source/Modulos/Almacenes/Almacenes_Group.groupproj b/Source/Modulos/Almacenes/Almacenes_Group.groupproj
new file mode 100644
index 00000000..cc5e0b7e
--- /dev/null
+++ b/Source/Modulos/Almacenes/Almacenes_Group.groupproj
@@ -0,0 +1,104 @@
+ď»ż<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{d11a1db7-eff8-4cb6-8678-b1928036ff3f}</ProjectGuid>
+  </PropertyGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <Projects Include="..\..\ApplicationBase\ApplicationBase.dproj" />
+    <Projects Include="..\..\Base\Base.dproj" />
+    <Projects Include="..\..\GUIBase\GUIBase.dproj" />
+    <Projects Include="Controller\Almacenes_controller.dproj" />
+    <Projects Include="Data\Almacenes_data.dproj" />
+    <Projects Include="Model\Almacenes_model.dproj" />
+    <Projects Include="Plugin\Almacenes_plugin.dproj" />
+    <Projects Include="Views\Almacenes_view.dproj" />
+  </ItemGroup>
+  <ProjectExtensions>
+    <Borland.Personality>Default.Personality</Borland.Personality>
+    <Borland.ProjectType />
+    <BorlandProject>
+  <BorlandProject xmlns=""> <Default.Personality> </Default.Personality> </BorlandProject></BorlandProject>
+  </ProjectExtensions>
+  <Target Name="Base">
+    <MSBuild Projects="..\..\Base\Base.dproj" Targets="" />
+  </Target>
+  <Target Name="Base:Clean">
+    <MSBuild Projects="..\..\Base\Base.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Base:Make">
+    <MSBuild Projects="..\..\Base\Base.dproj" Targets="Make" />
+  </Target>
+  <Target Name="GUIBase">
+    <MSBuild Projects="..\..\GUIBase\GUIBase.dproj" Targets="" />
+  </Target>
+  <Target Name="GUIBase:Clean">
+    <MSBuild Projects="..\..\GUIBase\GUIBase.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="GUIBase:Make">
+    <MSBuild Projects="..\..\GUIBase\GUIBase.dproj" Targets="Make" />
+  </Target>
+  <Target Name="ApplicationBase">
+    <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="" />
+  </Target>
+  <Target Name="ApplicationBase:Clean">
+    <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="ApplicationBase:Make">
+    <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Almacenes_model">
+    <MSBuild Projects="Model\Almacenes_model.dproj" Targets="" />
+  </Target>
+  <Target Name="Almacenes_model:Clean">
+    <MSBuild Projects="Model\Almacenes_model.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Almacenes_model:Make">
+    <MSBuild Projects="Model\Almacenes_model.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Almacenes_data">
+    <MSBuild Projects="Data\Almacenes_data.dproj" Targets="" />
+  </Target>
+  <Target Name="Almacenes_data:Clean">
+    <MSBuild Projects="Data\Almacenes_data.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Almacenes_data:Make">
+    <MSBuild Projects="Data\Almacenes_data.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Almacenes_controller">
+    <MSBuild Projects="Controller\Almacenes_controller.dproj" Targets="" />
+  </Target>
+  <Target Name="Almacenes_controller:Clean">
+    <MSBuild Projects="Controller\Almacenes_controller.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Almacenes_controller:Make">
+    <MSBuild Projects="Controller\Almacenes_controller.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Almacenes_view">
+    <MSBuild Projects="Views\Almacenes_view.dproj" Targets="" />
+  </Target>
+  <Target Name="Almacenes_view:Clean">
+    <MSBuild Projects="Views\Almacenes_view.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Almacenes_view:Make">
+    <MSBuild Projects="Views\Almacenes_view.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Almacenes_plugin">
+    <MSBuild Projects="Plugin\Almacenes_plugin.dproj" Targets="" />
+  </Target>
+  <Target Name="Almacenes_plugin:Clean">
+    <MSBuild Projects="Plugin\Almacenes_plugin.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Almacenes_plugin:Make">
+    <MSBuild Projects="Plugin\Almacenes_plugin.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Build">
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Almacenes_model;Almacenes_data;Almacenes_controller;Almacenes_view;Almacenes_plugin" />
+  </Target>
+  <Target Name="Clean">
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Almacenes_model:Clean;Almacenes_data:Clean;Almacenes_controller:Clean;Almacenes_view:Clean;Almacenes_plugin:Clean" />
+  </Target>
+  <Target Name="Make">
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Almacenes_model:Make;Almacenes_data:Make;Almacenes_controller:Make;Almacenes_view:Make;Almacenes_plugin:Make" />
+  </Target>
+  <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
+</Project>
\ No newline at end of file
diff --git a/Source/Modulos/Almacenes/Controller/uAlmacenesController.pas b/Source/Modulos/Almacenes/Controller/uAlmacenesController.pas
index a9c3eb9a..e4bc4724 100644
--- a/Source/Modulos/Almacenes/Controller/uAlmacenesController.pas
+++ b/Source/Modulos/Almacenes/Controller/uAlmacenesController.pas
@@ -74,7 +74,7 @@ implementation
 uses
   cxControls, DB, uEditorRegistryUtils, schAlmacenesClient_Intf,
   uIEditorAlmacenes, uIEditorAlmacen, uDataModuleAlmacenes,
-  uDataModuleUsuarios, uDAInterfaces, uDataTableUtils,
+  uDataModuleUsuarios, uDAInterfaces, uDataTableUtils, uFactuGES_App,
   uDateUtils, uROTypes, DateUtils, Controls, Windows, uIEditorListaAlmacenes;
 
 { TAlmacenesController }
@@ -170,8 +170,8 @@ begin
     Result.Edit;
     with Result do
     begin
-//      ID_EMPRESA := dmUsuarios.IDEmpresaActual;
-//      USUARIO := dmUsuarios.LoginInfo.Usuario;
+      ID_EMPRESA := AppFactuGES.EmpresaActiva.ID;
+      USUARIO := AppFactuGES.UsuarioActivo.UserName;
     end;
 
     Result.Post;
@@ -190,7 +190,7 @@ begin
   // Asegurarse de valores en campos "automáticos"
   AAlmacen.Edit;
   try
-//    AAlmacen.USUARIO := dmUsuarios.LoginInfo.Usuario;
+    AAlmacen.USUARIO := AppFactuGES.UsuarioActivo.UserName;
 
     Result := True;
   finally
@@ -422,3 +422,4 @@ begin
 end;
 
 end.
+ 
\ No newline at end of file
diff --git a/Source/Modulos/Almacenes/Model/Almacenes_model.dpk b/Source/Modulos/Almacenes/Model/Almacenes_model.dpk
index 179f2365..fa9ae514 100644
--- a/Source/Modulos/Almacenes/Model/Almacenes_model.dpk
+++ b/Source/Modulos/Almacenes/Model/Almacenes_model.dpk
@@ -25,7 +25,8 @@ package Almacenes_model;
 {$IMPLICITBUILD ON}
 
 requires
-  Base;
+  Base,
+  ApplicationBase;
 
 contains
   uBizAlmacenes in 'uBizAlmacenes.pas',
diff --git a/Source/Modulos/Almacenes/Model/Almacenes_model.dproj b/Source/Modulos/Almacenes/Model/Almacenes_model.dproj
index 3e6d527e..a17ac897 100644
--- a/Source/Modulos/Almacenes/Model/Almacenes_model.dproj
+++ b/Source/Modulos/Almacenes/Model/Almacenes_model.dproj
@@ -41,18 +41,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <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><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</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">1.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><Source><Source Name="MainSource">Almacenes_model.dpk</Source></Source>  <Excluded_Packages>
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
+<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><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</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">1.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><Source><Source Name="MainSource">Almacenes_model.dpk</Source></Source><Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\vclhie100.bpl">Internet Explorer Hosting Support Package</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\applet100.bpl">CodeGear Control Panel Applet Package</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
@@ -64,18 +53,15 @@
       <Excluded_Packages Name="$(BDS)\bin\dclbcbsmp100.bpl">Borland Sample Controls Design Time Package</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\bcboffice2k100.bpl">CodeGear C++Builder Office 2000 Servers Package</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\bcbofficexp100.bpl">CodeGear C++Builder Office XP Servers Package</Excluded_Packages>
-    </Excluded_Packages>
-  </Delphi.Personality></BorlandProject></BorlandProject>
+    </Excluded_Packages></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
     <DelphiCompile Include="Almacenes_model.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
-    <DCCReference Include="Data\uIDataModuleAlmacenes.pas" />
-    <DCCReference Include="schAlmacenesClient_Intf.pas" />
-    <DCCReference Include="uBizAlmacenes.pas" />
+    <DCCReference Include="..\..\..\GUIBase\ApplicationBasecontainsuBizAlmacenesin.dcp" />
+    <DCCReference Include="..\..\..\GUIBase\Base.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
diff --git a/Source/Modulos/Almacenes/Model/uBizAlmacenes.pas b/Source/Modulos/Almacenes/Model/uBizAlmacenes.pas
index 7cd68fc6..a2200069 100644
--- a/Source/Modulos/Almacenes/Model/uBizAlmacenes.pas
+++ b/Source/Modulos/Almacenes/Model/uBizAlmacenes.pas
@@ -24,8 +24,8 @@ type
 
 implementation
 
-//uses
-//  uDataModuleUsuarios;
+uses
+	uFactuGES_App;
 
 { TBizAlmacen }
 
@@ -38,8 +38,8 @@ procedure TBizAlmacen.OnNewRecord(Sender: TDADataTable);
 begin
   inherited;
 //  ID := GetRecNo; // -1, -2, -3...
-  ID_EMPRESA := 1; // dmUsuarios.IDEmpresaActual;
-//  USUARIO := dmUsuarios.LoginInfo.Usuario;
+  ID_EMPRESA := AppFactuGES.EmpresaActiva.ID;
+  USUARIO := AppFactuGES.UsuarioActivo.UserName;
 end;
 
 initialization
@@ -48,4 +48,3 @@ initialization
 finalization
 
 end.
-
diff --git a/Source/Modulos/Almacenes/Views/uEditorAlmacenes.pas b/Source/Modulos/Almacenes/Views/uEditorAlmacenes.pas
index 225432494a61e160e428007afbfc8121f5df6129..792396ea174971118f8a8c006480ab8a4e227ea8 100644
GIT binary patch
delta 65
zcmaE*_)~F%J3C*gTVirask>`%ykkLu&SrOZS(eFZ-0G4*9!y5hHMgKBwK&l+xg@hJ
Nar07cS5_tl1_16o6@UN$

delta 49
zcmeyV_)2kuJNxEPc3BoCef`Nr-0Bi3xuM0SiA9<D#d@x}1x2aFiH^x7rHMJ4H*veN
F0syK&5k3F_

diff --git a/Source/Modulos/Articulos/Articulos_Group.groupproj b/Source/Modulos/Articulos/Articulos_Group.groupproj
new file mode 100644
index 00000000..1c5d448e
--- /dev/null
+++ b/Source/Modulos/Articulos/Articulos_Group.groupproj
@@ -0,0 +1,104 @@
+ď»ż<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{6fa7160e-0b4c-4f7c-9c55-08938cd225c4}</ProjectGuid>
+  </PropertyGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <Projects Include="..\..\ApplicationBase\ApplicationBase.dproj" />
+    <Projects Include="..\..\Base\Base.dproj" />
+    <Projects Include="..\..\GUIBase\GUIBase.dproj" />
+    <Projects Include="Controller\Articulos_controller.dproj" />
+    <Projects Include="Data\Articulos_data.dproj" />
+    <Projects Include="Model\Articulos_model.dproj" />
+    <Projects Include="Plugin\Articulos_plugin.dproj" />
+    <Projects Include="Views\Articulos_view.dproj" />
+  </ItemGroup>
+  <ProjectExtensions>
+    <Borland.Personality>Default.Personality</Borland.Personality>
+    <Borland.ProjectType />
+    <BorlandProject>
+  <BorlandProject xmlns=""> <Default.Personality> </Default.Personality> </BorlandProject></BorlandProject>
+  </ProjectExtensions>
+  <Target Name="Base">
+    <MSBuild Projects="..\..\Base\Base.dproj" Targets="" />
+  </Target>
+  <Target Name="Base:Clean">
+    <MSBuild Projects="..\..\Base\Base.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Base:Make">
+    <MSBuild Projects="..\..\Base\Base.dproj" Targets="Make" />
+  </Target>
+  <Target Name="GUIBase">
+    <MSBuild Projects="..\..\GUIBase\GUIBase.dproj" Targets="" />
+  </Target>
+  <Target Name="GUIBase:Clean">
+    <MSBuild Projects="..\..\GUIBase\GUIBase.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="GUIBase:Make">
+    <MSBuild Projects="..\..\GUIBase\GUIBase.dproj" Targets="Make" />
+  </Target>
+  <Target Name="ApplicationBase">
+    <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="" />
+  </Target>
+  <Target Name="ApplicationBase:Clean">
+    <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="ApplicationBase:Make">
+    <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Articulos_model">
+    <MSBuild Projects="Model\Articulos_model.dproj" Targets="" />
+  </Target>
+  <Target Name="Articulos_model:Clean">
+    <MSBuild Projects="Model\Articulos_model.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Articulos_model:Make">
+    <MSBuild Projects="Model\Articulos_model.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Articulos_data">
+    <MSBuild Projects="Data\Articulos_data.dproj" Targets="" />
+  </Target>
+  <Target Name="Articulos_data:Clean">
+    <MSBuild Projects="Data\Articulos_data.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Articulos_data:Make">
+    <MSBuild Projects="Data\Articulos_data.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Articulos_controller">
+    <MSBuild Projects="Controller\Articulos_controller.dproj" Targets="" />
+  </Target>
+  <Target Name="Articulos_controller:Clean">
+    <MSBuild Projects="Controller\Articulos_controller.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Articulos_controller:Make">
+    <MSBuild Projects="Controller\Articulos_controller.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Articulos_view">
+    <MSBuild Projects="Views\Articulos_view.dproj" Targets="" />
+  </Target>
+  <Target Name="Articulos_view:Clean">
+    <MSBuild Projects="Views\Articulos_view.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Articulos_view:Make">
+    <MSBuild Projects="Views\Articulos_view.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Articulos_plugin">
+    <MSBuild Projects="Plugin\Articulos_plugin.dproj" Targets="" />
+  </Target>
+  <Target Name="Articulos_plugin:Clean">
+    <MSBuild Projects="Plugin\Articulos_plugin.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Articulos_plugin:Make">
+    <MSBuild Projects="Plugin\Articulos_plugin.dproj" Targets="Make" />
+  </Target>
+  <Target Name="Build">
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Articulos_model;Articulos_data;Articulos_controller;Articulos_view;Articulos_plugin" />
+  </Target>
+  <Target Name="Clean">
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Articulos_model:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;Articulos_plugin:Clean" />
+  </Target>
+  <Target Name="Make">
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Articulos_model:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;Articulos_plugin:Make" />
+  </Target>
+  <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
+</Project>
\ No newline at end of file
diff --git a/Source/Modulos/Articulos/Controller/uArticulosController.pas b/Source/Modulos/Articulos/Controller/uArticulosController.pas
index 4e87b7f2..127c8007 100644
--- a/Source/Modulos/Articulos/Controller/uArticulosController.pas
+++ b/Source/Modulos/Articulos/Controller/uArticulosController.pas
@@ -97,7 +97,7 @@ type
 implementation
 
 uses
-  cxControls, DB, uEditorRegistryUtils, schArticulosClient_Intf,
+  cxControls, DB, uEditorRegistryUtils, schArticulosClient_Intf, uFactuGES_App,
   uIEditorArticulos, uIEditorArticulo, uIEditorElegirArticulos,
   uDataModuleArticulos, uDataModuleUsuarios, uDAInterfaces,
   uDataTableUtils, uDateUtils, uROTypes, DateUtils, Controls, Windows;
@@ -319,8 +319,8 @@ begin
     Result.Edit;
     with Result do
     begin
-//      ID_EMPRESA := dmUsuarios.IDEmpresaActual;
-//      USUARIO := dmUsuarios.LoginInfo.Usuario;
+	  ID_EMPRESA := AppFactuGES.EmpresaActiva.ID;	
+      USUARIO := AppFactuGES.UsuarioActivo.UserName;
     end;
 
     Result.Post;
@@ -345,7 +345,7 @@ begin
   // Asegurarse de valores en campos "automáticos"
   AArticulo.Edit;
   try
-//    AArticulo.USUARIO := dmUsuarios.LoginInfo.Usuario;
+	AArticulo.USUARIO := AppFactuGES.UsuarioActivo.UserName;
 
     Result := True;
   finally
diff --git a/Source/Modulos/Articulos/Model/Articulos_model.dpk b/Source/Modulos/Articulos/Model/Articulos_model.dpk
index deb5ce20..6526bfc6 100644
--- a/Source/Modulos/Articulos/Model/Articulos_model.dpk
+++ b/Source/Modulos/Articulos/Model/Articulos_model.dpk
@@ -25,7 +25,8 @@ package Articulos_model;
 {$IMPLICITBUILD ON}
 
 requires
-  Base;
+  Base,
+  ApplicationBase;
 
 contains
   uBizArticulos in 'uBizArticulos.pas',
diff --git a/Source/Modulos/Articulos/Model/Articulos_model.dproj b/Source/Modulos/Articulos/Model/Articulos_model.dproj
index 7b1bfa05..1a8a11dc 100644
--- a/Source/Modulos/Articulos/Model/Articulos_model.dproj
+++ b/Source/Modulos/Articulos/Model/Articulos_model.dproj
@@ -42,68 +42,39 @@
     <DCC_ResourcePath>..\..\..\Lib;..\..\Lib</DCC_ResourcePath>
     <DCC_ObjPath>..\..\..\Lib;..\..\Lib</DCC_ObjPath>
     <DCC_IncludePath>..\..\..\Lib;..\..\Lib</DCC_IncludePath>
-    <DCC_Define>DEBUG</DCC_Define>
   </PropertyGroup>
   <ProjectExtensions>
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject xmlns=""> <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>
-    <VersionInfo>
-      <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
-      <VersionInfo Name="AutoIncBuild">False</VersionInfo>
-      <VersionInfo Name="MajorVer">1</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">1.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>
-    <Source>
-      <Source Name="MainSource">Articulos_model.dpk</Source>
-    </Source>
-  </Delphi.Personality> </BorlandProject></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><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</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">1.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><Source><Source Name="MainSource">Articulos_model.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
-  <ItemGroup />
+  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
     <DelphiCompile Include="Articulos_model.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="Base.dcp" />
+    <DCCReference Include="..\..\..\ApplicationBase\A.dcp" />
+    <DCCReference Include="..\..\..\ApplicationBase\Ap.dcp" />
+    <DCCReference Include="..\..\..\ApplicationBase\App.dcp" />
+    <DCCReference Include="..\..\..\ApplicationBase\Appl.dcp" />
+    <DCCReference Include="..\..\..\ApplicationBase\Appli.dcp" />
+    <DCCReference Include="..\..\..\ApplicationBase\Applic.dcp" />
+    <DCCReference Include="..\..\..\ApplicationBase\Applica.dcp" />
+    <DCCReference Include="..\..\..\ApplicationBase\Applicat.dcp" />
+    <DCCReference Include="..\..\..\ApplicationBase\Applicati.dcp" />
+    <DCCReference Include="..\..\..\ApplicationBase\Applicatio.dcp" />
+    <DCCReference Include="..\..\..\ApplicationBase\Application.dcp" />
+    <DCCReference Include="..\..\..\ApplicationBase\ApplicationB.dcp" />
+    <DCCReference Include="..\..\..\ApplicationBase\ApplicationBa.dcp" />
+    <DCCReference Include="..\..\..\ApplicationBase\ApplicationBas.dcp" />
+    <DCCReference Include="..\..\..\ApplicationBase\Base.dcp" />
     <DCCReference Include="Data\uIDataModuleArticulos.pas" />
     <DCCReference Include="schArticulosClient_Intf.pas" />
     <DCCReference Include="schArticulosServer_Intf.pas" />
     <DCCReference Include="uBizArticulos.pas" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
 </Project>
-
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=6006
diff --git a/Source/Modulos/Articulos/Model/Articulos_model.rc b/Source/Modulos/Articulos/Model/Articulos_model.rc
index e69de29b..153736af 100644
--- a/Source/Modulos/Articulos/Model/Articulos_model.rc
+++ b/Source/Modulos/Articulos/Model/Articulos_model.rc
@@ -0,0 +1,22 @@
+1 VERSIONINFO
+FILEVERSION 1,0,0,0
+PRODUCTVERSION 1,0,0,0
+FILEFLAGSMASK 0x3FL
+FILEFLAGS 0x00L
+FILEOS 0x40004L
+FILETYPE 0x1L
+FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+         BLOCK "0C0A04E4"
+         BEGIN
+              VALUE "FileVersion", "1.0.0.0\0"
+              VALUE "ProductVersion", "1.0.0.0\0"
+         END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+         VALUE "Translation", 0x0C0A, 1252
+    END
+END
diff --git a/Source/Modulos/Articulos/Model/Articulos_model.res b/Source/Modulos/Articulos/Model/Articulos_model.res
index 36f26e234a8ac66a47e95cec6d496cf2f1442471..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644
GIT binary patch
literal 384
zcmZ9HOA3Ne6ox;+L5PEv(4cV`IIrjdPAV##hV&wc1g%+%X(R2Xc{`~7t6e0Ioa?#%
zkMj%AQhz>WYy7LeWAUaqx~Kv?-;(-Hs4-^ATIZOBrid9+-6Ne7&88mi>kUR<df0cb
zK*7~xk>4lo#jxZ;#*s4zxg9yNlk=H9sqkCD2^cEXKpiTBNfgkKpXJBWWaLt(Qkv@0
w5yv*t82((Wlr2{_+FDoDHKW2QCXvc+s**ul{{$<ciMHlSp2)Sz;Q3GY3%t`XzW@LL

delta 5
McmZo*R+yjw00c1sQ~&?~

diff --git a/Source/Modulos/Articulos/Model/uBizArticulos.pas b/Source/Modulos/Articulos/Model/uBizArticulos.pas
index 4dbc517cbcc35eda78af4ae54274071fec9eaf9d..18e118178b93449969e3445454eb365440ba31df 100644
GIT binary patch
delta 134
zcmbOru|#6SMHXJS#N?7vch}%}$ASW#&F5K^SacK=JYC{leFK7AgB=yDY!!eqFjac4
zxdlb3#fgr|C7ET3dY&$mWjP!46%;~)Lmh)W{n1s27MCU#W#)rb=j(+Qrxy7o=B7@r
O=2F`Hic^h=kpTdB2P=yJ

delta 113
zcmZ1?F+pO(MV8GESQJ=v^z{`KJYC{leFK7AgB=yDY!y;+LyJoji!$?z^*mi%a|?=6
yixVA_OG*=SChKrEXn{0@28TKZdHSQN_Q_Ar%=64k%h!V#Fu9jYdGlXRH6{Q#`X$f+

diff --git a/Source/Modulos/Articulos/Views/uEditorArticulos.pas b/Source/Modulos/Articulos/Views/uEditorArticulos.pas
index 14328d501a09ca3a73d8a82048df2c3551b7a64d..f5bc7da68f6648f8d3b9ae7673ae4eb44bc5c3ea 100644
GIT binary patch
delta 65
zcmZ3lxnFaGJqMpcsas-lNvXSQaJ*wd!Dc&-jVzNt@~BG!IWP%5*W7}l)Z#?P<dV#?
N#LWi0_3TUx3;^~W73lx~

delta 49
zcmdn5xn6UFJ;!E0jtwkK`udaq@u*9r<c1cPCKhGp7wfs^78IoxCpspVlqTkEw&Sg5
F2LQZM5w-vT

