git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES/trunk@112 c93665c3-c93d-084d-9b98-7d5f4a9c3376

Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas

@@ -9,9 +9,9 @@ const
   { Data table rules ids
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_Articulos = '{9AAD4D21-615D-4BE2-B2E8-3BF830A2479D}';
+  RID_Articulos = '{CD3F7AC8-2E99-468B-A2B4-DDCB9DF05381}';
-  RID_Articulos_Refresh = '{967630B5-0B84-4880-AE01-B46476C58DBA}';
+  RID_Articulos_Refresh = '{992EF741-76AC-4B91-A1A5-BDEC941728C0}';
-  RID_ArticulosParaCliente = '{A240E121-C16A-4429-9334-534EAC01A64F}';
+  RID_ArticulosParaCliente = '{4666CBEF-C5F0-4DA1-9E9D-0BE39BE9D21E}';
 
   { Data table names }
   nme_Articulos = 'Articulos';
@@ -109,6 +109,7 @@ const
   fld_ArticulosParaClienteID_PROVEEDOR = 'ID_PROVEEDOR';
   fld_ArticulosParaClienteINVENTARIABLE = 'INVENTARIABLE';
   fld_ArticulosParaClienteNOMBRE_PROVEEDOR = 'NOMBRE_PROVEEDOR';
+  fld_ArticulosParaClienteELIMINADO = 'ELIMINADO';
 
   { ArticulosParaCliente field indexes }
   idx_ArticulosParaClienteID = 0;
@@ -129,11 +130,12 @@ const
   idx_ArticulosParaClienteID_PROVEEDOR = 15;
   idx_ArticulosParaClienteINVENTARIABLE = 16;
   idx_ArticulosParaClienteNOMBRE_PROVEEDOR = 17;
+  idx_ArticulosParaClienteELIMINADO = 18;
 
 type
   { IArticulos }
   IArticulos = interface(IDAStronglyTypedDataTable)
-  ['{F386AF9A-07F2-46B7-A1C5-D2894A4999F9}']
+  ['{CA8B6ED7-3DFA-47B8-B5D0-31D191D38B20}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -270,7 +272,7 @@ type
 
   { IArticulos_Refresh }
   IArticulos_Refresh = interface(IDAStronglyTypedDataTable)
-  ['{708A0430-C17A-49B6-9C0D-7F604E77420E}']
+  ['{3F6FFE15-16A8-4FC3-869E-0465A8C2B083}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -371,7 +373,7 @@ type
 
   { IArticulosParaCliente }
   IArticulosParaCliente = interface(IDAStronglyTypedDataTable)
-  ['{696D0B00-6A67-46B0-AABC-1D2936C0F368}']
+  ['{E86734CD-8850-47A1-9A1F-DF10538B5379}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -409,6 +411,8 @@ type
     procedure SetINVENTARIABLEValue(const aValue: Integer);
     function GetNOMBRE_PROVEEDORValue: String;
     procedure SetNOMBRE_PROVEEDORValue(const aValue: String);
+    function GetELIMINADOValue: Integer;
+    procedure SetELIMINADOValue(const aValue: Integer);
 
 
     { Properties }
@@ -430,6 +434,7 @@ type
     property ID_PROVEEDOR: Integer read GetID_PROVEEDORValue write SetID_PROVEEDORValue;
     property INVENTARIABLE: Integer read GetINVENTARIABLEValue write SetINVENTARIABLEValue;
     property NOMBRE_PROVEEDOR: String read GetNOMBRE_PROVEEDORValue write SetNOMBRE_PROVEEDORValue;
+    property ELIMINADO: Integer read GetELIMINADOValue write SetELIMINADOValue;
   end;
 
   { TArticulosParaClienteDataTableRules }
@@ -473,6 +478,8 @@ type
     procedure SetINVENTARIABLEValue(const aValue: Integer); virtual;
     function GetNOMBRE_PROVEEDORValue: String; virtual;
     procedure SetNOMBRE_PROVEEDORValue(const aValue: String); virtual;
+    function GetELIMINADOValue: Integer; virtual;
+    procedure SetELIMINADOValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -493,6 +500,7 @@ type
     property ID_PROVEEDOR: Integer read GetID_PROVEEDORValue write SetID_PROVEEDORValue;
     property INVENTARIABLE: Integer read GetINVENTARIABLEValue write SetINVENTARIABLEValue;
     property NOMBRE_PROVEEDOR: String read GetNOMBRE_PROVEEDORValue write SetNOMBRE_PROVEEDORValue;
+    property ELIMINADO: Integer read GetELIMINADOValue write SetELIMINADOValue;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -1041,6 +1049,16 @@ begin
   DataTable.Fields[idx_ArticulosParaClienteNOMBRE_PROVEEDOR].AsString := aValue;
 end;
 
+function TArticulosParaClienteDataTableRules.GetELIMINADOValue: Integer;
+begin
+  result := DataTable.Fields[idx_ArticulosParaClienteELIMINADO].AsInteger;
+end;
+
+procedure TArticulosParaClienteDataTableRules.SetELIMINADOValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_ArticulosParaClienteELIMINADO].AsInteger := aValue;
+end;
+
 
 initialization
   RegisterDataTableRules(RID_Articulos, TArticulosDataTableRules);

Source/Modulos/Articulos/Model/schArticulosServer_Intf.pas

@@ -9,14 +9,14 @@ const
   { Delta rules ids 
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_ArticulosDelta = '{396DBBBF-56A0-489F-86EC-2BE6CA6C8B65}';
+  RID_ArticulosDelta = '{43530E4A-4CC7-4251-9AA8-0061B8C9C052}';
-  RID_Articulos_RefreshDelta = '{69DB90A1-014F-41FC-9B91-8432EA3F95C9}';
+  RID_Articulos_RefreshDelta = '{115B6297-C598-4900-92EA-D308C93328E8}';
-  RID_ArticulosParaClienteDelta = '{5629F1BB-3C94-4F82-9BDC-09D1A8405E47}';
+  RID_ArticulosParaClienteDelta = '{5CC30710-52CC-49FF-AC98-37F07D612A35}';
 
 type
   { IArticulosDelta }
   IArticulosDelta = interface(IArticulos)
-  ['{396DBBBF-56A0-489F-86EC-2BE6CA6C8B65}']
+  ['{43530E4A-4CC7-4251-9AA8-0061B8C9C052}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -171,7 +171,7 @@ type
 
   { IArticulos_RefreshDelta }
   IArticulos_RefreshDelta = interface(IArticulos_Refresh)
-  ['{69DB90A1-014F-41FC-9B91-8432EA3F95C9}']
+  ['{115B6297-C598-4900-92EA-D308C93328E8}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -284,7 +284,7 @@ type
 
   { IArticulosParaClienteDelta }
   IArticulosParaClienteDelta = interface(IArticulosParaCliente)
-  ['{5629F1BB-3C94-4F82-9BDC-09D1A8405E47}']
+  ['{5CC30710-52CC-49FF-AC98-37F07D612A35}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -304,6 +304,7 @@ type
     function GetOldID_PROVEEDORValue : Integer;
     function GetOldINVENTARIABLEValue : Integer;
     function GetOldNOMBRE_PROVEEDORValue : String;
+    function GetOldELIMINADOValue : Integer;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -324,6 +325,7 @@ type
     property OldID_PROVEEDOR : Integer read GetOldID_PROVEEDORValue;
     property OldINVENTARIABLE : Integer read GetOldINVENTARIABLEValue;
     property OldNOMBRE_PROVEEDOR : String read GetOldNOMBRE_PROVEEDORValue;
+    property OldELIMINADO : Integer read GetOldELIMINADOValue;
   end;
 
   { TArticulosParaClienteBusinessProcessorRules }
@@ -385,6 +387,9 @@ type
     function GetNOMBRE_PROVEEDORValue: String; virtual;
     function GetOldNOMBRE_PROVEEDORValue: String; virtual;
     procedure SetNOMBRE_PROVEEDORValue(const aValue: String); virtual;
+    function GetELIMINADOValue: Integer; virtual;
+    function GetOldELIMINADOValue: Integer; virtual;
+    procedure SetELIMINADOValue(const aValue: Integer); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -423,6 +428,8 @@ type
     property OldINVENTARIABLE : Integer read GetOldINVENTARIABLEValue;
     property NOMBRE_PROVEEDOR : String read GetNOMBRE_PROVEEDORValue write SetNOMBRE_PROVEEDORValue;
     property OldNOMBRE_PROVEEDOR : String read GetOldNOMBRE_PROVEEDORValue;
+    property ELIMINADO : Integer read GetELIMINADOValue write SetELIMINADOValue;
+    property OldELIMINADO : Integer read GetOldELIMINADOValue;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -1224,6 +1231,21 @@ begin
   BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteNOMBRE_PROVEEDOR] := aValue;
 end;
 
+function TArticulosParaClienteBusinessProcessorRules.GetELIMINADOValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteELIMINADO];
+end;
+
+function TArticulosParaClienteBusinessProcessorRules.GetOldELIMINADOValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosParaClienteELIMINADO];
+end;
+
+procedure TArticulosParaClienteBusinessProcessorRules.SetELIMINADOValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteELIMINADO] := aValue;
+end;
+
 
 initialization
   RegisterBusinessProcessorRules(RID_ArticulosDelta, TArticulosBusinessProcessorRules);

Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm

@@ -738,10 +738,10 @@ object srvArticulos: TsrvArticulos
               'E,'#10'       V_ARTICULOS.PRECIO_PORTE,'#10'       CLIENTES_DTOS_PROVEED' +
               'ORES.DESCUENTO,'#10'       V_ARTICULOS.PRECIO_NETO,'#10'       V_ARTICUL' +
               'OS.INVENTARIABLE,'#10'       V_ARTICULOS.ID_PROVEEDOR,'#10'       V_ARTI' +
-              'CULOS.NOMBRE_PROVEEDOR'#10'FROM V_ARTICULOS'#10'LEFT OUTER JOIN CLIENTES' +
+              'CULOS.NOMBRE_PROVEEDOR,'#10'       V_ARTICULOS.ELIMINADO'#10'FROM V_ARTI' +
-              '_DTOS_PROVEEDORES'#10'ON ((CLIENTES_DTOS_PROVEEDORES.ID_PROVEEDOR = ' +
+              'CULOS'#10'LEFT OUTER JOIN CLIENTES_DTOS_PROVEEDORES'#10'ON ((CLIENTES_DT' +
-              'V_ARTICULOS.ID_PROVEEDOR)'#10'AND (CLIENTES_DTOS_PROVEEDORES.ID_CLIE' +
+              'OS_PROVEEDORES.ID_PROVEEDOR = V_ARTICULOS.ID_PROVEEDOR)'#10'AND (CLI' +
-              'NTE = :ID_CLIENTE))'
+              'ENTES_DTOS_PROVEEDORES.ID_CLIENTE = :ID_CLIENTE))'
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -815,6 +815,10 @@ object srvArticulos: TsrvArticulos
               item
                 DatasetField = 'INVENTARIABLE'
                 TableField = 'INVENTARIABLE'
+              end
+              item
+                DatasetField = 'ELIMINADO'
+                TableField = 'ELIMINADO'
               end>
           end>
         Name = 'ArticulosParaCliente'
@@ -1022,6 +1026,18 @@ object srvArticulos: TsrvArticulos
             Calculated = False
             Lookup = False
             LookupCache = False
+          end
+          item
+            Name = 'ELIMINADO'
+            DataType = datInteger
+            BlobType = dabtUnknown
+            DisplayWidth = 0
+            DisplayLabel = 'Eliminado'
+            Alignment = taLeftJustify
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
           end>
         BusinessRulesClient.ScriptLanguage = rslPascalScript
         BusinessRulesServer.ScriptLanguage = rslPascalScript

Source/Servidor/FactuGES_Server.bdsproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<PersonalityInfo>
 		<Option>
@@ -175,13 +175,12 @@
 			<VersionInfoKeys Name="ProductName"></VersionInfoKeys>
 			<VersionInfoKeys Name="ProductVersion">2.1.3.0</VersionInfoKeys>
 			<VersionInfoKeys Name="Comments"></VersionInfoKeys>
-			<VersionInfoKeys Name="CompileDate">miércoles, 18 de julio de 2007 12:33</VersionInfoKeys></VersionInfoKeys>
+			<VersionInfoKeys Name="CompileDate">miércoles, 18 de julio de 2007 12:33</VersionInfoKeys></VersionInfoKeys>  <Excluded_Packages>
-		<Excluded_Packages>
+      <Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
-			<Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
+    </Excluded_Packages>
-		</Excluded_Packages>
+  </Delphi.Personality>
-	</Delphi.Personality>
 	<ModelSupport>False</ModelSupport>
-	<!-- EurekaLog First Line
+<!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=519
 Activate=1