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

Source/Cliente/FactuGES.rc

@@ -1,7 +1,7 @@
 MAINICON ICON "c:\Codigo Luis Leon\Source\Iconos\Factuges.ico"
 1 VERSIONINFO
-FILEVERSION 3,0,2,0
+FILEVERSION 3,0,3,0
-PRODUCTVERSION 3,0,2,0
+PRODUCTVERSION 3,0,3,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,9 +13,9 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "3.0.2.0\0"
+              VALUE "FileVersion", "3.0.3.0\0"
               VALUE "InternalName", "FactuGES\0"
-              VALUE "ProductVersion", "3.0.2.0\0"
+              VALUE "ProductVersion", "3.0.3.0\0"
          END
     END
     BLOCK "VarFileInfo"

Source/FactuGES_Group.bdsgroup

@@ -19,11 +19,6 @@
       <Projects Name="Usuarios.bpl">Base\Usuarios\Usuarios.bdsproj</Projects>
       <Projects Name="Empresas_view.bpl">Modulos\Empresas\Views\Empresas_view.bdsproj</Projects>
       <Projects Name="Empresas_plugin.bpl">Modulos\Empresas\Plugin\Empresas_plugin.bdsproj</Projects>
-      <Projects Name="TiposIVA_model.bpl">Modulos\Tipos de IVA\Model\TiposIVA_model.bdsproj</Projects>
-      <Projects Name="TiposIVA_data.bpl">Modulos\Tipos de IVA\Data\TiposIVA_data.bdsproj</Projects>
-      <Projects Name="TiposIVA_controller.bpl">Modulos\Tipos de IVA\Controller\TiposIVA_controller.bdsproj</Projects>
-      <Projects Name="TiposIVA_view.bpl">Modulos\Tipos de IVA\Views\TiposIVA_view.bdsproj</Projects>
-      <Projects Name="TiposIVA_plugin.bpl">Modulos\Tipos de IVA\Plugin\TiposIVA_plugin.bdsproj</Projects>
       <Projects Name="Contactos_model.bpl">Modulos\Contactos\Model\Contactos_model.bdsproj</Projects>
       <Projects Name="Contactos_data.bpl">Modulos\Contactos\Data\Contactos_data.bdsproj</Projects>
       <Projects Name="Contactos_controller.bpl">Modulos\Contactos\Controller\Contactos_controller.bdsproj</Projects>
@@ -47,8 +42,6 @@
       <Projects Name="RemesasCliente_model.bpl">Modulos\Remesas de cliente\Model\RemesasCliente_model.bdsproj</Projects>
       <Projects Name="RemesasCliente_data.bpl">Modulos\Remesas de cliente\Data\RemesasCliente_data.bdsproj</Projects>
       <Projects Name="RemesasCliente_controller.bpl">Modulos\Remesas de cliente\Controller\RemesasCliente_controller.bdsproj</Projects>
-      <Projects Name="BancaElectronica_controller.bpl">Modulos\Banca electronica\Controller\BancaElectronica_controller.bdsproj</Projects>
-      <Projects Name="BancaElectronica_view.bpl">Modulos\Banca electronica\Views\BancaElectronica_view.bdsproj</Projects>
       <Projects Name="RemesasCliente_view.bpl">Modulos\Remesas de cliente\Views\RemesasCliente_view.bdsproj</Projects>
       <Projects Name="RemesasCliente_plugin.bpl">Modulos\Remesas de cliente\Plugin\RemesasCliente_plugin.bdsproj</Projects>
       <Projects Name="PedidosCliente_model.bpl">Modulos\Pedidos de cliente\Model\PedidosCliente_model.bdsproj</Projects>
@@ -83,12 +76,14 @@
       <Projects Name="PedidosProveedor_plugin.bpl">Modulos\Pedidos a proveedor\Plugin\PedidosProveedor_plugin.bdsproj</Projects>
       <Projects Name="AlbaranesProveedor_view.bpl">Modulos\Albaranes de proveedor\Views\AlbaranesProveedor_view.bdsproj</Projects>
       <Projects Name="AlbaranesProveedor_plugin.bpl">Modulos\Albaranes de proveedor\Plugin\AlbaranesProveedor_plugin.bdsproj</Projects>
-      <Projects Name="FormasPago_controller.bpl">Modulos\Formas de pago\Controller\FormasPago_controller.bdsproj</Projects>
-      <Projects Name="FormasPago_view.bpl">Modulos\Formas de pago\Views\FormasPago_view.bdsproj</Projects>
       <Projects Name="FactuGES.exe">Cliente\FactuGES.bdsproj</Projects>
       <Projects Name="FactuGES_Server.exe">Servidor\FactuGES_Server.bdsproj</Projects>
-      <Projects Name="FormasPago_model.bpl">Modulos\Formas de pago\Model\FormasPago_model.bdsproj</Projects>
+      <Projects Name="Comisiones_model.bpl">Modulos\Comisiones\Model\Comisiones_model.bdsproj</Projects>
-      <Projects Name="Targets">DataAbstract_D10.bpl Base.bpl ControllerBase.bpl GUIBase.bpl Empresas_model.bpl Empresas_data.bpl Empresas_controller.bpl Usuarios.bpl Empresas_view.bpl Empresas_plugin.bpl TiposIVA_model.bpl TiposIVA_data.bpl TiposIVA_controller.bpl TiposIVA_view.bpl TiposIVA_plugin.bpl Contactos_model.bpl Contactos_data.bpl Contactos_controller.bpl Contactos_view.bpl Contactos_plugin.bpl Almacenes_model.bpl Almacenes_data.bpl Almacenes_controller.bpl Almacenes_view.bpl Almacenes_plugin.bpl Articulos_model.bpl Articulos_data.bpl Articulos_controller.bpl Articulos_view.bpl Articulos_plugin.bpl RecibosCliente_model.bpl RecibosCliente_data.bpl RecibosCliente_controller.bpl RecibosCliente_view.bpl RecibosCliente_plugin.bpl RemesasCliente_model.bpl RemesasCliente_data.bpl RemesasCliente_controller.bpl BancaElectronica_controller.bpl BancaElectronica_view.bpl RemesasCliente_view.bpl RemesasCliente_plugin.bpl PedidosCliente_model.bpl PedidosCliente_data.bpl PedidosCliente_controller.bpl AlbaranesCliente_model.bpl AlbaranesCliente_data.bpl AlbaranesCliente_controller.bpl FacturasCliente_model.bpl FacturasCliente_data.bpl FacturasCliente_controller.bpl PedidosProveedor_model.bpl PedidosProveedor_data.bpl PedidosProveedor_controller.bpl Inventario_model.bpl Inventario_data.bpl Inventario_controller.bpl AlbaranesProveedor_model.bpl AlbaranesProveedor_data.bpl AlbaranesProveedor_controller.bpl PedCli_PedProv_relation.bpl PedCli_AlbCli_relation.bpl PedidosCliente_view.bpl PedidosCliente_plugin.bpl AlbaranesCliente_view.bpl AlbaranesCliente_plugin.bpl FacturasCliente_view.bpl FacturasCliente_plugin.bpl Inventario_view.bpl Inventario_plugin.bpl PedidosProveedor_view.bpl PedidosProveedor_plugin.bpl AlbaranesProveedor_view.bpl AlbaranesProveedor_plugin.bpl FormasPago_controller.bpl FormasPago_view.bpl FactuGES.exe FactuGES_Server.exe FormasPago_model.bpl</Projects>
+      <Projects Name="Comisiones_data.bpl">Modulos\Comisiones\Data\Comisiones_data.bdsproj</Projects>
+      <Projects Name="Comisiones_controller.bpl">Modulos\Comisiones\Controller\Comisiones_controller.bdsproj</Projects>
+      <Projects Name="Comisiones_view.bpl">Modulos\Comisiones\Views\Comisiones_view.bdsproj</Projects>
+      <Projects Name="Comisiones_plugin.bpl">Modulos\Comisiones\Plugin\Comisiones_plugin.bdsproj</Projects>
+      <Projects Name="Targets">DataAbstract_D10.bpl Base.bpl ControllerBase.bpl GUIBase.bpl Empresas_model.bpl Empresas_data.bpl Empresas_controller.bpl Usuarios.bpl Empresas_view.bpl Empresas_plugin.bpl Contactos_model.bpl Contactos_data.bpl Contactos_controller.bpl Contactos_view.bpl Contactos_plugin.bpl Almacenes_model.bpl Almacenes_data.bpl Almacenes_controller.bpl Almacenes_view.bpl Almacenes_plugin.bpl Articulos_model.bpl Articulos_data.bpl Articulos_controller.bpl Articulos_view.bpl Articulos_plugin.bpl RecibosCliente_model.bpl RecibosCliente_data.bpl RecibosCliente_controller.bpl RecibosCliente_view.bpl RecibosCliente_plugin.bpl RemesasCliente_model.bpl RemesasCliente_data.bpl RemesasCliente_controller.bpl RemesasCliente_view.bpl RemesasCliente_plugin.bpl PedidosCliente_model.bpl PedidosCliente_data.bpl PedidosCliente_controller.bpl AlbaranesCliente_model.bpl AlbaranesCliente_data.bpl AlbaranesCliente_controller.bpl FacturasCliente_model.bpl FacturasCliente_data.bpl FacturasCliente_controller.bpl PedidosProveedor_model.bpl PedidosProveedor_data.bpl PedidosProveedor_controller.bpl Inventario_model.bpl Inventario_data.bpl Inventario_controller.bpl AlbaranesProveedor_model.bpl AlbaranesProveedor_data.bpl AlbaranesProveedor_controller.bpl PedCli_PedProv_relation.bpl PedCli_AlbCli_relation.bpl PedidosCliente_view.bpl PedidosCliente_plugin.bpl AlbaranesCliente_view.bpl AlbaranesCliente_plugin.bpl FacturasCliente_view.bpl FacturasCliente_plugin.bpl Inventario_view.bpl Inventario_plugin.bpl PedidosProveedor_view.bpl PedidosProveedor_plugin.bpl AlbaranesProveedor_view.bpl AlbaranesProveedor_plugin.bpl FactuGES.exe FactuGES_Server.exe Comisiones_model.bpl Comisiones_data.bpl Comisiones_controller.bpl Comisiones_view.bpl Comisiones_plugin.bpl</Projects>
     </Projects>
     <Dependencies/>
   </Default.Personality>

Source/Modulos/Comisiones/Views/uEditorComisiones.dfm

@@ -56,10 +56,10 @@ inherited fEditorComisiones: TfEditorComisiones
     Width = 820
     ExplicitWidth = 820
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 552
+      ExplicitWidth = 561
     end
     inherited tbxFiltro: TTBXToolbar
-      ExplicitWidth = 260
+      ExplicitWidth = 269
       inherited tbxEditFiltro: TTBXEditItem
         EditOptions = [tboUseEditWhenVertical]
       end
@@ -77,6 +77,10 @@ inherited fEditorComisiones: TfEditorComisiones
         end
       end
     end
+    inherited TBXTMain2: TTBXToolbar
+      Left = 334
+      ExplicitLeft = 334
+    end
   end
   inherited StatusBar: TJvStatusBar
     Width = 820

Source/Modulos/Comisiones/Views/uEditorComisiones.pas

@@ -84,9 +84,9 @@ procedure TfEditorComisiones.ImprimirInterno;
 begin
 //  inherited;
   if (Application.MessageBox('¿Desea previsualizar la liquidación de comisiones sin desglosar?', 'Atención', MB_YESNO) = IDYES) then
-     FController.Print(Nil, False)
+     FController.Print(Comisiones, False)
   else
-     FController.Print(Nil, True);
+     FController.Print(Comisiones, True);
 end;
 
 function TfEditorComisiones.GetController: IComisionesController;
@@ -119,9 +119,9 @@ procedure TfEditorComisiones.PrevisualizarInterno;
 begin
 //  inherited;
   if (Application.MessageBox('¿Desea previsualizar la liquidación de comisiones sin desglosar?', 'Atención', MB_YESNO) = IDYES) then
-     FController.Preview(Nil, False)
+     FController.Preview(Comisiones, False)
   else
-     FController.Preview(Nil, True);
+     FController.Preview(Comisiones, True);
 end;
 
 procedure TfEditorComisiones.SetComisiones(const Value: IBizComisiones);

Source/Modulos/Impresion/Servidor/srvImpresiones_Impl.dfm

@@ -0,0 +1,194 @@
+object srvImpresiones: TsrvImpresiones
+  OldCreateOrder = True
+  OnCreate = DARemoteServiceCreate
+  RequiresSession = True
+  SessionManager = dmServer.SessionManager
+  AcquireConnection = True
+  ServiceSchema = schImpresiones
+  ServiceAdapter = DABINAdapter
+  OnBeforeAcquireConnection = DARemoteServiceBeforeAcquireConnection
+  Height = 202
+  Width = 392
+  object Diagrams: TDADiagrams
+    Left = 150
+    Top = 90
+    DiagramData = '<Diagrams>'#13#10'</Diagrams>'#13#10
+  end
+  object DataDictionary: TDADataDictionary
+    Fields = <
+      item
+        Name = 'Referencias_CODIGO'
+        DataType = datString
+        Size = 50
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'CODIGO'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'Referencias_DESCRIPCION'
+        DataType = datString
+        Size = 255
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'Referencias'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'Referencias_VALOR'
+        DataType = datString
+        Size = 255
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'C'#243'digo'
+        Alignment = taLeftJustify
+      end
+      item
+        Name = 'Referencias_ID_EMPRESA'
+        DataType = datInteger
+        BlobType = dabtUnknown
+        DisplayWidth = 0
+        DisplayLabel = 'ID_EMPRESA'
+        Alignment = taLeftJustify
+      end>
+    Left = 150
+    Top = 24
+  end
+  object schImpresiones: TDASchema
+    ConnectionManager = dmServer.ConnectionManager
+    DataDictionary = DataDictionary
+    Diagrams = Diagrams
+    Datasets = <
+      item
+        Params = <>
+        Statements = <
+          item
+            Connection = 'IBX'
+            TargetTable = 'REFERENCIAS'
+            SQL = 
+              'SELECT '#10'    CODIGO, DESCRIPCION, VALOR, ID_EMPRESA'#10'  FROM'#10'    RE' +
+              'FERENCIAS'
+            StatementType = stSQL
+            ColumnMappings = <
+              item
+                DatasetField = 'DESCRIPCION'
+                TableField = 'DESCRIPCION'
+              end
+              item
+                DatasetField = 'CODIGO'
+                TableField = 'CODIGO'
+              end
+              item
+                DatasetField = 'VALOR'
+                TableField = 'VALOR'
+              end
+              item
+                DatasetField = 'ID_EMPRESA'
+                TableField = 'ID_EMPRESA'
+              end>
+          end>
+        Name = 'Referencias'
+        Fields = <
+          item
+            Name = 'CODIGO'
+            DataType = datString
+            Size = 50
+            BlobType = dabtUnknown
+            DictionaryEntry = 'Referencias_CODIGO'
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
+          end
+          item
+            Name = 'DESCRIPCION'
+            DataType = datString
+            Size = 255
+            BlobType = dabtUnknown
+            DictionaryEntry = 'Referencias_DESCRIPCION'
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
+          end
+          item
+            Name = 'VALOR'
+            DataType = datString
+            Size = 255
+            BlobType = dabtUnknown
+            DictionaryEntry = 'Referencias_VALOR'
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
+          end
+          item
+            Name = 'ID_EMPRESA'
+            DataType = datInteger
+            BlobType = dabtUnknown
+            DictionaryEntry = 'Referencias_ID_EMPRESA'
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
+          end>
+        BusinessRulesClient.ScriptLanguage = rslPascalScript
+        BusinessRulesServer.ScriptLanguage = rslPascalScript
+      end>
+    Commands = <
+      item
+        Params = <
+          item
+            Name = 'VALOR'
+            DataType = datString
+            Size = 255
+            BlobType = dabtUnknown
+            Value = ''
+            ParamType = daptInput
+          end
+          item
+            Name = 'OLD_CODIGO'
+            DataType = datString
+            Size = 50
+            BlobType = dabtUnknown
+            Value = ''
+            ParamType = daptInput
+          end
+          item
+            Name = 'OLD_ID_EMPRESA'
+            DataType = datInteger
+            BlobType = dabtUnknown
+            Value = ''
+            ParamType = daptInput
+          end>
+        Statements = <
+          item
+            Connection = 'IBX'
+            TargetTable = 'REFERENCIAS'
+            SQL = 
+              'UPDATE REFERENCIAS'#10'  SET '#10'    VALOR = :VALOR'#10'  WHERE'#10'    (CODIGO' +
+              ' = :OLD_CODIGO)'#10'    AND (ID_EMPRESA = :OLD_ID_EMPRESA)'
+            StatementType = stSQL
+            ColumnMappings = <>
+          end>
+        Name = 'Update_Referencias'
+      end>
+    RelationShips = <>
+    UpdateRules = <>
+    Left = 48
+    Top = 24
+  end
+  object DABINAdapter: TDABINAdapter
+    Left = 48
+    Top = 90
+  end
+  object bpImpresiones: TDABusinessProcessor
+    Schema = schImpresiones
+    UpdateCommandName = 'Update_Referencias'
+    ReferencedDataset = 'Referencias'
+    ProcessorOptions = [poAutoGenerateRefreshDataset, poPrepareCommands]
+    UpdateMode = updWhereKeyOnly
+    Left = 248
+    Top = 24
+  end
+end

Source/Modulos/Impresion/Servidor/srvImpresiones_Impl.pas

@@ -0,0 +1,130 @@
+unit srvImpresiones_Impl;
+
+{----------------------------------------------------------------------------}
+{ This unit was automatically generated by the RemObjects SDK after reading  }
+{ the RODL file associated with this project .                               }
+{                                                                            }
+{ This is where you are supposed to code the implementation of your objects. }
+{----------------------------------------------------------------------------}
+
+interface
+
+uses
+  {vcl:} Classes, SysUtils,
+  {RemObjects:} uROClientIntf, uROTypes, uROServer, uROServerIntf, uROSessions,
+  {Ancestor Implementation:} DARemoteService_Impl,
+  {Used RODLs:} DataAbstract_Intf,
+  {Generated:} FactuGES_Intf, uDADataTable, uDABINAdapter, uDAClasses,
+  uDAScriptingProvider, uDABusinessProcessor;
+
+type
+  { TsrvImpresiones }
+  TsrvImpresiones = class(TDARemoteService, IsrvImpresiones)
+    Diagrams: TDADiagrams;
+    DABINAdapter: TDABINAdapter;
+    bpImpresiones: TDABusinessProcessor;
+    schImpresiones: TDASchema;
+    DataDictionary: TDADataDictionary;
+    procedure DARemoteServiceCreate(Sender: TObject);
+    procedure DARemoteServiceBeforeAcquireConnection(Sender: TDARemoteService;
+      var ConnectionName: string);
+  protected
+    { IsrvImpresiones methods }
+    function InsertarMarcaImpresion(const NombreTabla: String; const IdTabla: Integer): Boolean;
+    function IncrementarMarcaImpresion(const IdMarcaImpresion: Integer): Boolean;
+  end;
+
+implementation
+
+{$R *.dfm}
+uses
+  {Generated:} FactuGES_Invk, uDataModuleServer, uDatabaseUtils;
+
+procedure Create_srvImpresiones(out anInstance : IUnknown);
+begin
+  anInstance := TsrvImpresiones.Create(NIL);
+end;
+
+{ srvImpresiones }
+procedure TsrvImpresiones.DARemoteServiceBeforeAcquireConnection(
+  Sender: TDARemoteService; var ConnectionName: string);
+begin
+  ConnectionName := dmServer.ConnectionName;
+end;
+
+procedure TsrvImpresiones.DARemoteServiceCreate(Sender: TObject);
+begin
+  SessionManager := dmServer.SessionManager;
+end;
+
+function TsrvImpresiones.IncrementarMarcaImpresion(
+  const IdMarcaImpresion: Integer): Boolean;
+begin
+//
+end;
+
+function TsrvImpresiones.InsertarMarcaImpresion(const NombreTabla: String;
+  const IdTabla: Integer): Boolean;
+begin
+var
+  ASchema : TDASchema;
+  AConn : IDAConnection;
+  dsData: IDADataset;
+
+  AWhere : TDAWhereExpression;
+  AWhereExpr1: TDAWhereExpression;
+  AWhereExpr2: TDAWhereExpression;
+begin
+  Result := '';
+
+  { Construir la expresión del Where a partir de los parámetros
+    que se reciban.
+  }
+  with TDAWhereBuilder.Create do
+    try
+      AWhereExpr1 := NewBinaryExpression(NewField('', 'CODIGO'),
+                      NewConstant(NombreReferencia, datString),
+                      dboEqual);
+      if (EmpresaID <> -1) then
+      begin
+        AWhereExpr2 := NewBinaryExpression(NewField('', 'ID_EMPRESA'),
+                        NewConstant(EmpresaID, datInteger),
+                        dboEqual);
+
+        AWhere := NewBinaryExpression(AWhereExpr1, AWhereExpr2, dboAnd);
+      end
+      else
+        AWhere := AWhereExpr1;
+    finally
+      Free;
+    end;
+
+  ASchema := schReferencias;
+  AConn := dmServer.ConnectionManager.NewConnection(dmServer.ConnectionManager.GetDefaultConnectionName);
+
+  try
+    try
+      dsData := ASchema.NewDataset(AConn, 'Referencias', ['VALOR'], '', '', False, True);
+      dsData.DynamicWhere.Expression := AWhere;
+    except
+      RaiseError('No existe la tabla REFERENCIAS');
+    end;
+
+    dsData.Active := True;
+
+    if dsData.IsEmpty then
+      RaiseError('No existe la referencia ' + NombreReferencia + ' en la tabla REFERENCIAS.');
+
+    Result := dsData.FieldByName('VALOR').AsString;
+  finally
+    dsData := NIL;
+  end;
+
+end;
+
+initialization
+  TROClassFactory.Create('srvImpresiones', Create_srvImpresiones, TsrvImpresiones_Invoker);
+
+finalization
+
+end.

Source/Servicios/FactuGES.RODL

@@ -1,4 +1,8 @@
 <Library Name="FactuGES" UID="{99553DD5-13B5-40EB-B7E6-D2B9A7C1B4D6}" Version="3.0">
+<Groups>
+<Group Name="General" UID="{E062357C-11F0-4929-9F72-7C62D89F7912}">
+</Group>
+</Groups>
 <Services>
 <Service Name="srvContactos" UID="{A7EF4DF4-CE77-42ED-B157-F5FAC249AAD8}" Ancestor="DARemoteService">
 <Interfaces>
@@ -622,6 +626,32 @@
 </Interface>
 </Interfaces>
 </Service>
+<Service Name="srvImpresiones" UID="{FB192E4F-F42F-4AA5-81A5-30C18953573E}" Ancestor="DARemoteService">
+<Interfaces>
+<Interface Name="Default" UID="{7610E29E-D4FD-4253-A519-A3559D111663}">
+<Operations>
+<Operation Name="InsertarMarcaImpresion" UID="{DD25FF77-F1F7-4CD4-ADC0-0097FDABE47A}">
+<Parameters>
+<Parameter Name="Result" DataType="Boolean" Flag="Result">
+</Parameter>
+<Parameter Name="NombreTabla" DataType="String" Flag="In" >
+</Parameter>
+<Parameter Name="IdTabla" DataType="Integer" Flag="In" >
+</Parameter>
+</Parameters>
+</Operation>
+<Operation Name="IncrementarMarcaImpresion" UID="{309EB080-E7A6-4C23-919D-D9AD59BEAAAA}">
+<Parameters>
+<Parameter Name="Result" DataType="Boolean" Flag="Result">
+</Parameter>
+<Parameter Name="IdMarcaImpresion" DataType="Integer" Flag="In" >
+</Parameter>
+</Parameters>
+</Operation>
+</Operations>
+</Interface>
+</Interfaces>
+</Service>
 </Services>
 <Structs>
 <Struct Name="TRdxLoginInfo" UID="{9F208C71-2B14-4C46-949C-42D84960FC58}" AutoCreateParams="1">

Source/Servicios/FactuGES_Intf.pas

@@ -47,6 +47,7 @@ const
   IsrvInformes_IID : TGUID = '{2E96455F-58CB-4DE2-9D3C-D590DAEA6DB4}';
   IsrvInfVentasArticulo_IID : TGUID = '{31CD7B1B-CA98-4F92-A6D5-B3B02360613F}';
   IsrvInfMargenArticulo_IID : TGUID = '{EB5F3994-838B-41A7-B19A-D49C9B9495C2}';
+  IsrvImpresiones_IID : TGUID = '{7610E29E-D4FD-4253-A519-A3559D111663}';
 
   { Event ID's }
 
@@ -79,6 +80,7 @@ type
   IsrvInformes = interface;
   IsrvInfVentasArticulo = interface;
   IsrvInfMargenArticulo = interface;
+  IsrvImpresiones = interface;
 
   TRdxEmpresasArray = class;
 
@@ -699,6 +701,27 @@ type
     function GetSchema(const DatasetName: String; const Columns: String): Binary;
   end;
 
+  { IsrvImpresiones }
+  IsrvImpresiones = interface(IDARemoteService)
+    ['{7610E29E-D4FD-4253-A519-A3559D111663}']
+    function InsertarMarcaImpresion(const NombreTabla: String; const IdTabla: Integer): Boolean;
+    function IncrementarMarcaImpresion(const IdMarcaImpresion: Integer): Boolean;
+  end;
+
+  { CosrvImpresiones }
+  CosrvImpresiones = class
+    class function Create(const aMessage: IROMessage; aTransportChannel: IROTransportChannel): IsrvImpresiones;
+  end;
+
+  { TsrvImpresiones_Proxy }
+  TsrvImpresiones_Proxy = class(TDARemoteService_Proxy, IsrvImpresiones)
+  protected
+    function __GetInterfaceName:string; override;
+
+    function InsertarMarcaImpresion(const NombreTabla: String; const IdTabla: Integer): Boolean;
+    function IncrementarMarcaImpresion(const IdMarcaImpresion: Integer): Boolean;
+  end;
+
 implementation
 
 uses
@@ -2350,6 +2373,67 @@ begin
   end
 end;
 
+{ CosrvImpresiones }
+
+class function CosrvImpresiones.Create(const aMessage: IROMessage; aTransportChannel: IROTransportChannel): IsrvImpresiones;
+begin
+  result := TsrvImpresiones_Proxy.Create(aMessage, aTransportChannel);
+end;
+
+{ TsrvImpresiones_Proxy }
+
+function TsrvImpresiones_Proxy.__GetInterfaceName:string;
+begin
+  result := 'srvImpresiones';
+end;
+
+function TsrvImpresiones_Proxy.InsertarMarcaImpresion(const NombreTabla: String; const IdTabla: Integer): Boolean;
+var
+  __request, __response : TMemoryStream;
+begin
+  __request := TMemoryStream.Create;
+  __response := TMemoryStream.Create;
+
+  try
+     __Message.Initialize(__TransportChannel, 'FactuGES', __InterfaceName, 'InsertarMarcaImpresion');
+     __Message.Write('NombreTabla', TypeInfo(String), NombreTabla, []);
+     __Message.Write('IdTabla', TypeInfo(Integer), IdTabla, []);
+     __Message.Finalize;
+
+     __Message.WriteToStream(__request);
+     __TransportChannel.Dispatch(__request, __response);
+     __Message.ReadFromStream(__response);
+
+     __Message.Read('Result', TypeInfo(Boolean), result, []);
+  finally
+    __request.Free;
+    __response.Free;
+  end
+end;
+
+function TsrvImpresiones_Proxy.IncrementarMarcaImpresion(const IdMarcaImpresion: Integer): Boolean;
+var
+  __request, __response : TMemoryStream;
+begin
+  __request := TMemoryStream.Create;
+  __response := TMemoryStream.Create;
+
+  try
+     __Message.Initialize(__TransportChannel, 'FactuGES', __InterfaceName, 'IncrementarMarcaImpresion');
+     __Message.Write('IdMarcaImpresion', TypeInfo(Integer), IdMarcaImpresion, []);
+     __Message.Finalize;
+
+     __Message.WriteToStream(__request);
+     __TransportChannel.Dispatch(__request, __response);
+     __Message.ReadFromStream(__response);
+
+     __Message.Read('Result', TypeInfo(Boolean), result, []);
+  finally
+    __request.Free;
+    __response.Free;
+  end
+end;
+
 initialization
   RegisterROClass(TRdxLoginInfo);
   RegisterROClass(TRdxEmpresasArray);
@@ -2380,6 +2464,7 @@ initialization
   RegisterProxyClass(IsrvInformes_IID, TsrvInformes_Proxy);
   RegisterProxyClass(IsrvInfVentasArticulo_IID, TsrvInfVentasArticulo_Proxy);
   RegisterProxyClass(IsrvInfMargenArticulo_IID, TsrvInfMargenArticulo_Proxy);
+  RegisterProxyClass(IsrvImpresiones_IID, TsrvImpresiones_Proxy);
 
 
 finalization
@@ -2412,5 +2497,6 @@ finalization
   UnregisterProxyClass(IsrvInformes_IID);
   UnregisterProxyClass(IsrvInfVentasArticulo_IID);
   UnregisterProxyClass(IsrvInfMargenArticulo_IID);
+  UnregisterProxyClass(IsrvImpresiones_IID);
 
 end.

Source/Servicios/FactuGES_Invk.pas

@@ -227,6 +227,14 @@ type
     procedure Invoke_GetSchema(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
   end;
 
+  TsrvImpresiones_Invoker = class(TDARemoteService_Invoker)
+  private
+  protected
+  published
+    procedure Invoke_InsertarMarcaImpresion(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
+    procedure Invoke_IncrementarMarcaImpresion(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
+  end;
+
 implementation
 
 uses
@@ -1379,4 +1387,46 @@ begin
   end;
 end;
 
+{ TsrvImpresiones_Invoker }
+
+procedure TsrvImpresiones_Invoker.Invoke_InsertarMarcaImpresion(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
+{ function InsertarMarcaImpresion(const NombreTabla: String; const IdTabla: Integer): Boolean; }
+var
+  NombreTabla: String;
+  IdTabla: Integer;
+  lResult: Boolean;
+begin
+  try
+    __Message.Read('NombreTabla', TypeInfo(String), NombreTabla, []);
+    __Message.Read('IdTabla', TypeInfo(Integer), IdTabla, []);
+
+    lResult := (__Instance as IsrvImpresiones).InsertarMarcaImpresion(NombreTabla, IdTabla);
+
+    __Message.Initialize(__Transport, 'FactuGES', 'srvImpresiones', 'InsertarMarcaImpresionResponse');
+    __Message.Write('Result', TypeInfo(Boolean), lResult, []);
+    __Message.Finalize;
+
+  finally
+  end;
+end;
+
+procedure TsrvImpresiones_Invoker.Invoke_IncrementarMarcaImpresion(const __Instance:IInterface; const __Message:IROMessage; const __Transport:IROTransport; out __oResponseOptions:TROResponseOptions);
+{ function IncrementarMarcaImpresion(const IdMarcaImpresion: Integer): Boolean; }
+var
+  IdMarcaImpresion: Integer;
+  lResult: Boolean;
+begin
+  try
+    __Message.Read('IdMarcaImpresion', TypeInfo(Integer), IdMarcaImpresion, []);
+
+    lResult := (__Instance as IsrvImpresiones).IncrementarMarcaImpresion(IdMarcaImpresion);
+
+    __Message.Initialize(__Transport, 'FactuGES', 'srvImpresiones', 'IncrementarMarcaImpresionResponse');
+    __Message.Write('Result', TypeInfo(Boolean), lResult, []);
+    __Message.Finalize;
+
+  finally
+  end;
+end;
+
 end.

Source/Servidor/FactuGES_Server.bdsproj

@@ -175,16 +175,7 @@
 			<VersionInfoKeys Name="ProductName">FactuGES Server</VersionInfoKeys>
 			<VersionInfoKeys Name="ProductVersion">3.0.3.0</VersionInfoKeys>
 			<VersionInfoKeys Name="Comments"></VersionInfoKeys>
-			<VersionInfoKeys Name="CompileDate">jueves, 26 de junio de 2008 11:49</VersionInfoKeys></VersionInfoKeys>  
+			<VersionInfoKeys Name="CompileDate">jueves, 26 de junio de 2008 11:49</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>
   </Delphi.Personality>

Source/Servidor/FactuGES_Server.dpr

@@ -4,7 +4,6 @@ program FactuGES_Server;
 
 uses
   uROComInit,
-//  uROComboService,
   Forms,
   uServerMainForm in 'uServerMainForm.pas' {fServerForm},
   uAcercaDe in 'uAcercaDe.pas' {fAcercaDe},
@@ -133,7 +132,8 @@ uses
   schInfMargenArticuloServer_Intf in '..\Modulos\Informe margen por articulo\Model\schInfMargenArticuloServer_Intf.pas',
   schArticulosClient_Intf in '..\Modulos\Articulos\Model\schArticulosClient_Intf.pas',
   schArticulosServer_Intf in '..\Modulos\Articulos\Model\schArticulosServer_Intf.pas',
-  uCheckPrevious in 'Utiles\uCheckPrevious.pas';
+  uCheckPrevious in 'Utiles\uCheckPrevious.pas',
+  srvImpresiones_Impl in '..\Modulos\Impresion\Servidor\srvImpresiones_Impl.pas' {srvImpresiones: TDARemoteService};
 
 {$R *.res}
 {$R ..\Servicios\RODLFile.res}

Source/Servidor/FactuGES_Server.rc

@@ -1,7 +1,7 @@
 MAINICON ICON "c:\Codigo Luis Leon\Source\Iconos\Servidor.ico"
 1 VERSIONINFO
-FILEVERSION 3,0,2,0
+FILEVERSION 3,0,3,1
-PRODUCTVERSION 3,0,2,0
+PRODUCTVERSION 3,0,3,1
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "3.0.2.0\0"
+              VALUE "FileVersion", "3.0.3.1\0"
               VALUE "ProductName", "FactuGES Server\0"
-              VALUE "ProductVersion", "3.0.2.0\0"
+              VALUE "ProductVersion", "3.0.3.1\0"
-              VALUE "CompileDate", "jueves, 26 de junio de 2008 11:49\0"
+              VALUE "CompileDate", "miércoles, 09 de julio de 2008 13:53\0"
          END
     END
     BLOCK "VarFileInfo"