Version 4.7.6 Se modifica el DarReferencia del servidor para que al modificar si no esta sígnado se asigne e incremente (pedidos web)

git-svn-id: https://192.168.0.254/svn/Proyectos.AbetoDesign_FactuGES/trunk@199 93f398dd-4eb6-7a46-baf6-13f46f578da2

Installer/UpdateClient/check_updater.bat

@@ -1,11 +1,11 @@
-@echo off
+@echo off
 set "programa=factuges_updater.exe"
 
 REM Verifica si el programa está en ejecución
 tasklist /FI "IMAGENAME eq %programa%" 2>NUL | find /I /N "%programa%">NUL
 if "%ERRORLEVEL%"=="1" (
     REM El programa no está en ejecución. Iniciando...
-    start "" /MIN "%programa%" /Tray  REM Inicia el programa si no está en ejecución con el parámetro /Tray
+    start "" /MIN "c:\cliente\%programa%" /Tray  REM Inicia el programa si no está en ejecución con el parámetro /Tray
 ) else (
     REM El programa ya está en ejecución.
 )

Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.dfm

@@ -203,6 +203,18 @@ inherited DataModuleEmpresas: TDataModuleEmpresas
       item
         Name = 'ID_PERFIL'
         DataType = datInteger
+      end
+      item
+        Name = 'DESCUENTO_LINEA'
+        DataType = datFloat
+      end
+      item
+        Name = 'DESCUENTO_CAPITULO'
+        DataType = datFloat
+      end
+      item
+        Name = 'DESCUENTO_GENERAL'
+        DataType = datFloat
       end>
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]

Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas

@@ -9,10 +9,10 @@ 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_EmpresasTiendas = '{7846BBE0-04FC-42FE-B6E1-87982D99298D}';
-  RID_DarNombre = '{30F80B13-9686-43DF-AD79-CF2BA063FC0D}';
-  RID_Empresas = '{3DD75D7B-B6BF-4F23-8315-A79A8D0FEBF1}';
-  RID_EmpresasDatosBanco = '{8F6E24FD-A920-4DF1-A800-33A13DAAA5A9}';
+  RID_EmpresasTiendas = '{4C4FA7F6-204A-438F-82C2-AF65734D61B0}';
+  RID_DarNombre = '{1B3D70B2-DD90-4609-A25F-754C97E09ED5}';
+  RID_Empresas = '{5F373B9A-CA15-4D2E-B260-9EDE5F248296}';
+  RID_EmpresasDatosBanco = '{39ABFFCC-227F-479F-9AB7-49F94878185B}';
 
   { Data table names }
   nme_EmpresasTiendas = 'EmpresasTiendas';
@@ -91,6 +91,9 @@ const
   fld_EmpresasVALIDEZ_PRESUPUESTOS = 'VALIDEZ_PRESUPUESTOS';
   fld_EmpresasPRECIO_PUNTO = 'PRECIO_PUNTO';
   fld_EmpresasID_PERFIL = 'ID_PERFIL';
+  fld_EmpresasDESCUENTO_LINEA = 'DESCUENTO_LINEA';
+  fld_EmpresasDESCUENTO_CAPITULO = 'DESCUENTO_CAPITULO';
+  fld_EmpresasDESCUENTO_GENERAL = 'DESCUENTO_GENERAL';
 
   { Empresas field indexes }
   idx_EmpresasID = 0;
@@ -121,6 +124,9 @@ const
   idx_EmpresasVALIDEZ_PRESUPUESTOS = 25;
   idx_EmpresasPRECIO_PUNTO = 26;
   idx_EmpresasID_PERFIL = 27;
+  idx_EmpresasDESCUENTO_LINEA = 28;
+  idx_EmpresasDESCUENTO_CAPITULO = 29;
+  idx_EmpresasDESCUENTO_GENERAL = 30;
 
   { EmpresasDatosBanco fields }
   fld_EmpresasDatosBancoID = 'ID';
@@ -147,7 +153,7 @@ const
 type
   { IEmpresasTiendas }
   IEmpresasTiendas = interface(IDAStronglyTypedDataTable)
-  ['{29F8DDC0-32B5-4D18-889E-7CD5295C4768}']
+  ['{8E1E9E05-E47F-4291-BE76-D7F259D77914}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -362,7 +368,7 @@ type
 
   { IDarNombre }
   IDarNombre = interface(IDAStronglyTypedDataTable)
-  ['{F9833C20-3E16-439F-AF60-1188C3F7FA77}']
+  ['{AB4CA25B-32EB-42F9-911F-BE1EDC6A1B5A}']
     { Property getters and setters }
     function GetNOMBREValue: String;
     procedure SetNOMBREValue(const aValue: String);
@@ -397,7 +403,7 @@ type
 
   { IEmpresas }
   IEmpresas = interface(IDAStronglyTypedDataTable)
-  ['{2E98270D-135A-465B-B784-E826CFED21AD}']
+  ['{4AEFB8E8-4B06-4D1C-BF6E-32BB0D8A5651}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -509,6 +515,18 @@ type
     procedure SetID_PERFILValue(const aValue: Integer);
     function GetID_PERFILIsNull: Boolean;
     procedure SetID_PERFILIsNull(const aValue: Boolean);
+    function GetDESCUENTO_LINEAValue: Float;
+    procedure SetDESCUENTO_LINEAValue(const aValue: Float);
+    function GetDESCUENTO_LINEAIsNull: Boolean;
+    procedure SetDESCUENTO_LINEAIsNull(const aValue: Boolean);
+    function GetDESCUENTO_CAPITULOValue: Float;
+    procedure SetDESCUENTO_CAPITULOValue(const aValue: Float);
+    function GetDESCUENTO_CAPITULOIsNull: Boolean;
+    procedure SetDESCUENTO_CAPITULOIsNull(const aValue: Boolean);
+    function GetDESCUENTO_GENERALValue: Float;
+    procedure SetDESCUENTO_GENERALValue(const aValue: Float);
+    function GetDESCUENTO_GENERALIsNull: Boolean;
+    procedure SetDESCUENTO_GENERALIsNull(const aValue: Boolean);
 
 
     { Properties }
@@ -568,6 +586,12 @@ type
     property PRECIO_PUNTOIsNull: Boolean read GetPRECIO_PUNTOIsNull write SetPRECIO_PUNTOIsNull;
     property ID_PERFIL: Integer read GetID_PERFILValue write SetID_PERFILValue;
     property ID_PERFILIsNull: Boolean read GetID_PERFILIsNull write SetID_PERFILIsNull;
+    property DESCUENTO_LINEA: Float read GetDESCUENTO_LINEAValue write SetDESCUENTO_LINEAValue;
+    property DESCUENTO_LINEAIsNull: Boolean read GetDESCUENTO_LINEAIsNull write SetDESCUENTO_LINEAIsNull;
+    property DESCUENTO_CAPITULO: Float read GetDESCUENTO_CAPITULOValue write SetDESCUENTO_CAPITULOValue;
+    property DESCUENTO_CAPITULOIsNull: Boolean read GetDESCUENTO_CAPITULOIsNull write SetDESCUENTO_CAPITULOIsNull;
+    property DESCUENTO_GENERAL: Float read GetDESCUENTO_GENERALValue write SetDESCUENTO_GENERALValue;
+    property DESCUENTO_GENERALIsNull: Boolean read GetDESCUENTO_GENERALIsNull write SetDESCUENTO_GENERALIsNull;
   end;
 
   { TEmpresasDataTableRules }
@@ -689,6 +713,18 @@ type
     procedure SetID_PERFILValue(const aValue: Integer); virtual;
     function GetID_PERFILIsNull: Boolean; virtual;
     procedure SetID_PERFILIsNull(const aValue: Boolean); virtual;
+    function GetDESCUENTO_LINEAValue: Float; virtual;
+    procedure SetDESCUENTO_LINEAValue(const aValue: Float); virtual;
+    function GetDESCUENTO_LINEAIsNull: Boolean; virtual;
+    procedure SetDESCUENTO_LINEAIsNull(const aValue: Boolean); virtual;
+    function GetDESCUENTO_CAPITULOValue: Float; virtual;
+    procedure SetDESCUENTO_CAPITULOValue(const aValue: Float); virtual;
+    function GetDESCUENTO_CAPITULOIsNull: Boolean; virtual;
+    procedure SetDESCUENTO_CAPITULOIsNull(const aValue: Boolean); virtual;
+    function GetDESCUENTO_GENERALValue: Float; virtual;
+    procedure SetDESCUENTO_GENERALValue(const aValue: Float); virtual;
+    function GetDESCUENTO_GENERALIsNull: Boolean; virtual;
+    procedure SetDESCUENTO_GENERALIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -747,6 +783,12 @@ type
     property PRECIO_PUNTOIsNull: Boolean read GetPRECIO_PUNTOIsNull write SetPRECIO_PUNTOIsNull;
     property ID_PERFIL: Integer read GetID_PERFILValue write SetID_PERFILValue;
     property ID_PERFILIsNull: Boolean read GetID_PERFILIsNull write SetID_PERFILIsNull;
+    property DESCUENTO_LINEA: Float read GetDESCUENTO_LINEAValue write SetDESCUENTO_LINEAValue;
+    property DESCUENTO_LINEAIsNull: Boolean read GetDESCUENTO_LINEAIsNull write SetDESCUENTO_LINEAIsNull;
+    property DESCUENTO_CAPITULO: Float read GetDESCUENTO_CAPITULOValue write SetDESCUENTO_CAPITULOValue;
+    property DESCUENTO_CAPITULOIsNull: Boolean read GetDESCUENTO_CAPITULOIsNull write SetDESCUENTO_CAPITULOIsNull;
+    property DESCUENTO_GENERAL: Float read GetDESCUENTO_GENERALValue write SetDESCUENTO_GENERALValue;
+    property DESCUENTO_GENERALIsNull: Boolean read GetDESCUENTO_GENERALIsNull write SetDESCUENTO_GENERALIsNull;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -756,7 +798,7 @@ type
 
   { IEmpresasDatosBanco }
   IEmpresasDatosBanco = interface(IDAStronglyTypedDataTable)
-  ['{7933C562-157E-4235-85D5-849DCC1B27E3}']
+  ['{3F059FA8-12F1-4A1D-AE6F-FC2170CBBCCA}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1893,6 +1935,69 @@ begin
     DataTable.Fields[idx_EmpresasID_PERFIL].AsVariant := Null;
 end;
 
+function TEmpresasDataTableRules.GetDESCUENTO_LINEAValue: Float;
+begin
+  result := DataTable.Fields[idx_EmpresasDESCUENTO_LINEA].AsFloat;
+end;
+
+procedure TEmpresasDataTableRules.SetDESCUENTO_LINEAValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_EmpresasDESCUENTO_LINEA].AsFloat := aValue;
+end;
+
+function TEmpresasDataTableRules.GetDESCUENTO_LINEAIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_EmpresasDESCUENTO_LINEA].IsNull;
+end;
+
+procedure TEmpresasDataTableRules.SetDESCUENTO_LINEAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_EmpresasDESCUENTO_LINEA].AsVariant := Null;
+end;
+
+function TEmpresasDataTableRules.GetDESCUENTO_CAPITULOValue: Float;
+begin
+  result := DataTable.Fields[idx_EmpresasDESCUENTO_CAPITULO].AsFloat;
+end;
+
+procedure TEmpresasDataTableRules.SetDESCUENTO_CAPITULOValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_EmpresasDESCUENTO_CAPITULO].AsFloat := aValue;
+end;
+
+function TEmpresasDataTableRules.GetDESCUENTO_CAPITULOIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_EmpresasDESCUENTO_CAPITULO].IsNull;
+end;
+
+procedure TEmpresasDataTableRules.SetDESCUENTO_CAPITULOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_EmpresasDESCUENTO_CAPITULO].AsVariant := Null;
+end;
+
+function TEmpresasDataTableRules.GetDESCUENTO_GENERALValue: Float;
+begin
+  result := DataTable.Fields[idx_EmpresasDESCUENTO_GENERAL].AsFloat;
+end;
+
+procedure TEmpresasDataTableRules.SetDESCUENTO_GENERALValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_EmpresasDESCUENTO_GENERAL].AsFloat := aValue;
+end;
+
+function TEmpresasDataTableRules.GetDESCUENTO_GENERALIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_EmpresasDESCUENTO_GENERAL].IsNull;
+end;
+
+procedure TEmpresasDataTableRules.SetDESCUENTO_GENERALIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_EmpresasDESCUENTO_GENERAL].AsVariant := Null;
+end;
+
 
 { TEmpresasDatosBancoDataTableRules }
 constructor TEmpresasDatosBancoDataTableRules.Create(aDataTable: TDADataTable);

Source/ApplicationBase/Empresas/Model/schEmpresasServer_Intf.pas

@@ -9,15 +9,15 @@ 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_EmpresasTiendasDelta = '{5F6B8574-3D34-4053-9C3D-C9D54E35385B}';
-  RID_DarNombreDelta = '{0FE165AC-2657-4B35-8198-CA4352B14F63}';
-  RID_EmpresasDelta = '{ED3707F2-AED9-42AA-A712-2982BE6DE6E7}';
-  RID_EmpresasDatosBancoDelta = '{86C78EE4-9661-47CA-B3DB-ECF4F3A8DD27}';
+  RID_EmpresasTiendasDelta = '{618E8840-4B86-4EE9-88FE-4FA9C2445473}';
+  RID_DarNombreDelta = '{D2935D05-E8BE-43D9-85C8-70DC72FB4162}';
+  RID_EmpresasDelta = '{ACD89FCF-13DA-4466-9A1F-BBBAD5DD4061}';
+  RID_EmpresasDatosBancoDelta = '{AD2EEB97-FA9B-4280-8BEA-C3EC24371A05}';
 
 type
   { IEmpresasTiendasDelta }
   IEmpresasTiendasDelta = interface(IEmpresasTiendas)
-  ['{5F6B8574-3D34-4053-9C3D-C9D54E35385B}']
+  ['{618E8840-4B86-4EE9-88FE-4FA9C2445473}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -232,7 +232,7 @@ type
 
   { IDarNombreDelta }
   IDarNombreDelta = interface(IDarNombre)
-  ['{0FE165AC-2657-4B35-8198-CA4352B14F63}']
+  ['{D2935D05-E8BE-43D9-85C8-70DC72FB4162}']
     { Property getters and setters }
     function GetOldNOMBREValue : String;
 
@@ -266,7 +266,7 @@ type
 
   { IEmpresasDelta }
   IEmpresasDelta = interface(IEmpresas)
-  ['{ED3707F2-AED9-42AA-A712-2982BE6DE6E7}']
+  ['{ACD89FCF-13DA-4466-9A1F-BBBAD5DD4061}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldNIF_CIFValue : String;
@@ -296,6 +296,9 @@ type
     function GetOldVALIDEZ_PRESUPUESTOSValue : SmallInt;
     function GetOldPRECIO_PUNTOValue : Currency;
     function GetOldID_PERFILValue : Integer;
+    function GetOldDESCUENTO_LINEAValue : Float;
+    function GetOldDESCUENTO_CAPITULOValue : Float;
+    function GetOldDESCUENTO_GENERALValue : Float;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -326,6 +329,9 @@ type
     property OldVALIDEZ_PRESUPUESTOS : SmallInt read GetOldVALIDEZ_PRESUPUESTOSValue;
     property OldPRECIO_PUNTO : Currency read GetOldPRECIO_PUNTOValue;
     property OldID_PERFIL : Integer read GetOldID_PERFILValue;
+    property OldDESCUENTO_LINEA : Float read GetOldDESCUENTO_LINEAValue;
+    property OldDESCUENTO_CAPITULO : Float read GetOldDESCUENTO_CAPITULOValue;
+    property OldDESCUENTO_GENERAL : Float read GetOldDESCUENTO_GENERALValue;
   end;
 
   { TEmpresasBusinessProcessorRules }
@@ -503,6 +509,24 @@ type
     function GetOldID_PERFILIsNull: Boolean; virtual;
     procedure SetID_PERFILValue(const aValue: Integer); virtual;
     procedure SetID_PERFILIsNull(const aValue: Boolean); virtual;
+    function GetDESCUENTO_LINEAValue: Float; virtual;
+    function GetDESCUENTO_LINEAIsNull: Boolean; virtual;
+    function GetOldDESCUENTO_LINEAValue: Float; virtual;
+    function GetOldDESCUENTO_LINEAIsNull: Boolean; virtual;
+    procedure SetDESCUENTO_LINEAValue(const aValue: Float); virtual;
+    procedure SetDESCUENTO_LINEAIsNull(const aValue: Boolean); virtual;
+    function GetDESCUENTO_CAPITULOValue: Float; virtual;
+    function GetDESCUENTO_CAPITULOIsNull: Boolean; virtual;
+    function GetOldDESCUENTO_CAPITULOValue: Float; virtual;
+    function GetOldDESCUENTO_CAPITULOIsNull: Boolean; virtual;
+    procedure SetDESCUENTO_CAPITULOValue(const aValue: Float); virtual;
+    procedure SetDESCUENTO_CAPITULOIsNull(const aValue: Boolean); virtual;
+    function GetDESCUENTO_GENERALValue: Float; virtual;
+    function GetDESCUENTO_GENERALIsNull: Boolean; virtual;
+    function GetOldDESCUENTO_GENERALValue: Float; virtual;
+    function GetOldDESCUENTO_GENERALIsNull: Boolean; virtual;
+    procedure SetDESCUENTO_GENERALValue(const aValue: Float); virtual;
+    procedure SetDESCUENTO_GENERALIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -617,6 +641,18 @@ type
     property ID_PERFILIsNull : Boolean read GetID_PERFILIsNull write SetID_PERFILIsNull;
     property OldID_PERFIL : Integer read GetOldID_PERFILValue;
     property OldID_PERFILIsNull : Boolean read GetOldID_PERFILIsNull;
+    property DESCUENTO_LINEA : Float read GetDESCUENTO_LINEAValue write SetDESCUENTO_LINEAValue;
+    property DESCUENTO_LINEAIsNull : Boolean read GetDESCUENTO_LINEAIsNull write SetDESCUENTO_LINEAIsNull;
+    property OldDESCUENTO_LINEA : Float read GetOldDESCUENTO_LINEAValue;
+    property OldDESCUENTO_LINEAIsNull : Boolean read GetOldDESCUENTO_LINEAIsNull;
+    property DESCUENTO_CAPITULO : Float read GetDESCUENTO_CAPITULOValue write SetDESCUENTO_CAPITULOValue;
+    property DESCUENTO_CAPITULOIsNull : Boolean read GetDESCUENTO_CAPITULOIsNull write SetDESCUENTO_CAPITULOIsNull;
+    property OldDESCUENTO_CAPITULO : Float read GetOldDESCUENTO_CAPITULOValue;
+    property OldDESCUENTO_CAPITULOIsNull : Boolean read GetOldDESCUENTO_CAPITULOIsNull;
+    property DESCUENTO_GENERAL : Float read GetDESCUENTO_GENERALValue write SetDESCUENTO_GENERALValue;
+    property DESCUENTO_GENERALIsNull : Boolean read GetDESCUENTO_GENERALIsNull write SetDESCUENTO_GENERALIsNull;
+    property OldDESCUENTO_GENERAL : Float read GetOldDESCUENTO_GENERALValue;
+    property OldDESCUENTO_GENERALIsNull : Boolean read GetOldDESCUENTO_GENERALIsNull;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -626,7 +662,7 @@ type
 
   { IEmpresasDatosBancoDelta }
   IEmpresasDatosBancoDelta = interface(IEmpresasDatosBanco)
-  ['{86C78EE4-9661-47CA-B3DB-ECF4F3A8DD27}']
+  ['{AD2EEB97-FA9B-4280-8BEA-C3EC24371A05}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -2216,6 +2252,99 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasID_PERFIL] := Null;
 end;
 
+function TEmpresasBusinessProcessorRules.GetDESCUENTO_LINEAValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasDESCUENTO_LINEA];
+end;
+
+function TEmpresasBusinessProcessorRules.GetDESCUENTO_LINEAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasDESCUENTO_LINEA]);
+end;
+
+function TEmpresasBusinessProcessorRules.GetOldDESCUENTO_LINEAValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_EmpresasDESCUENTO_LINEA];
+end;
+
+function TEmpresasBusinessProcessorRules.GetOldDESCUENTO_LINEAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_EmpresasDESCUENTO_LINEA]);
+end;
+
+procedure TEmpresasBusinessProcessorRules.SetDESCUENTO_LINEAValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasDESCUENTO_LINEA] := aValue;
+end;
+
+procedure TEmpresasBusinessProcessorRules.SetDESCUENTO_LINEAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasDESCUENTO_LINEA] := Null;
+end;
+
+function TEmpresasBusinessProcessorRules.GetDESCUENTO_CAPITULOValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasDESCUENTO_CAPITULO];
+end;
+
+function TEmpresasBusinessProcessorRules.GetDESCUENTO_CAPITULOIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasDESCUENTO_CAPITULO]);
+end;
+
+function TEmpresasBusinessProcessorRules.GetOldDESCUENTO_CAPITULOValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_EmpresasDESCUENTO_CAPITULO];
+end;
+
+function TEmpresasBusinessProcessorRules.GetOldDESCUENTO_CAPITULOIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_EmpresasDESCUENTO_CAPITULO]);
+end;
+
+procedure TEmpresasBusinessProcessorRules.SetDESCUENTO_CAPITULOValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasDESCUENTO_CAPITULO] := aValue;
+end;
+
+procedure TEmpresasBusinessProcessorRules.SetDESCUENTO_CAPITULOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasDESCUENTO_CAPITULO] := Null;
+end;
+
+function TEmpresasBusinessProcessorRules.GetDESCUENTO_GENERALValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasDESCUENTO_GENERAL];
+end;
+
+function TEmpresasBusinessProcessorRules.GetDESCUENTO_GENERALIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasDESCUENTO_GENERAL]);
+end;
+
+function TEmpresasBusinessProcessorRules.GetOldDESCUENTO_GENERALValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_EmpresasDESCUENTO_GENERAL];
+end;
+
+function TEmpresasBusinessProcessorRules.GetOldDESCUENTO_GENERALIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_EmpresasDESCUENTO_GENERAL]);
+end;
+
+procedure TEmpresasBusinessProcessorRules.SetDESCUENTO_GENERALValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasDESCUENTO_GENERAL] := aValue;
+end;
+
+procedure TEmpresasBusinessProcessorRules.SetDESCUENTO_GENERALIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasDESCUENTO_GENERAL] := Null;
+end;
+
 
 { TEmpresasDatosBancoBusinessProcessorRules }
 constructor TEmpresasDatosBancoBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);

Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm

@@ -335,6 +335,18 @@ object srvEmpresas: TsrvEmpresas
               item
                 DatasetField = 'ID_PERFIL'
                 TableField = 'ID_PERFIL'
+              end
+              item
+                DatasetField = 'DESCUENTO_CAPITULO'
+                TableField = 'DESCUENTO_CAPITULO'
+              end
+              item
+                DatasetField = 'DESCUENTO_GENERAL'
+                TableField = 'DESCUENTO_GENERAL'
+              end
+              item
+                DatasetField = 'DESCUENTO_LINEA'
+                TableField = 'DESCUENTO_LINEA'
               end>
           end>
         Name = 'Empresas'
@@ -493,6 +505,18 @@ object srvEmpresas: TsrvEmpresas
           item
             Name = 'ID_PERFIL'
             DataType = datInteger
+          end
+          item
+            Name = 'DESCUENTO_LINEA'
+            DataType = datFloat
+          end
+          item
+            Name = 'DESCUENTO_CAPITULO'
+            DataType = datFloat
+          end
+          item
+            Name = 'DESCUENTO_GENERAL'
+            DataType = datFloat
           end>
       end
       item
@@ -752,6 +776,21 @@ object srvEmpresas: TsrvEmpresas
             Name = 'PRECIO_PUNTO'
             DataType = datCurrency
             Value = ''
+          end
+          item
+            Name = 'DESCUENTO_LINEA'
+            DataType = datFloat
+            Value = ''
+          end
+          item
+            Name = 'DESCUENTO_CAPITULO'
+            DataType = datFloat
+            Value = ''
+          end
+          item
+            Name = 'DESCUENTO_GENERAL'
+            DataType = datFloat
+            Value = ''
           end>
         Statements = <
           item
@@ -764,13 +803,15 @@ object srvEmpresas: TsrvEmpresas
               'FONO_2, MOVIL_1, MOVIL_2, '#10'     FAX, EMAIL_1, EMAIL_2, PAGINA_WE' +
               'B, NOTAS, FECHA_ALTA, '#10'     FECHA_MODIFICACION, USUARIO, LOGOTIP' +
               'O, REGISTRO_MERCANTIL, '#10'     ID_TIPO_IVA, ID_FORMA_PAGO, VALIDEZ' +
-              '_PRESUPUESTOS, PRECIO_PUNTO'#10'     )'#10'  VALUES'#10'    (:ID, :NIF_CIF, ' +
-              ':NOMBRE, :RAZON_SOCIAL, :CALLE, :POBLACION,'#10'     :PROVINCIA, :CO' +
-              'DIGO_POSTAL, :TELEFONO_1, :TELEFONO_2, '#10'     :MOVIL_1, :MOVIL_2,' +
-              ' :FAX, :EMAIL_1, :EMAIL_2, :PAGINA_WEB, '#10'     :NOTAS, :FECHA_ALT' +
-              'A, :FECHA_MODIFICACION, :USUARIO, '#10'     :LOGOTIPO, :REGISTRO_MER' +
-              'CANTIL, :ID_TIPO_IVA, :ID_FORMA_PAGO, '#10'     :VALIDEZ_PRESUPUESTO' +
-              'S, :PRECIO_PUNTO)'#10
+              '_PRESUPUESTOS, PRECIO_PUNTO,'#10'     DESCUENTO_LINEA, DESCUENTO_CAP' +
+              'ITULO, DESCUENTO_GENERAL'#10'     )'#10'  VALUES'#10'    (:ID, :NIF_CIF, :NO' +
+              'MBRE, :RAZON_SOCIAL, :CALLE, :POBLACION,'#10'     :PROVINCIA, :CODIG' +
+              'O_POSTAL, :TELEFONO_1, :TELEFONO_2, '#10'     :MOVIL_1, :MOVIL_2, :F' +
+              'AX, :EMAIL_1, :EMAIL_2, :PAGINA_WEB, '#10'     :NOTAS, :FECHA_ALTA, ' +
+              ':FECHA_MODIFICACION, :USUARIO, '#10'     :LOGOTIPO, :REGISTRO_MERCAN' +
+              'TIL, :ID_TIPO_IVA, :ID_FORMA_PAGO, '#10'     :VALIDEZ_PRESUPUESTOS, ' +
+              ':PRECIO_PUNTO, :DESCUENTO_LINEA,'#10'     :DESCUENTO_CAPITULO, :DESC' +
+              'UENTO_GENERAL)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -938,6 +979,21 @@ object srvEmpresas: TsrvEmpresas
             DataType = datCurrency
             Value = ''
           end
+          item
+            Name = 'DESCUENTO_LINEA'
+            DataType = datFloat
+            Value = ''
+          end
+          item
+            Name = 'DESCUENTO_CAPITULO'
+            DataType = datFloat
+            Value = ''
+          end
+          item
+            Name = 'DESCUENTO_GENERAL'
+            DataType = datFloat
+            Value = ''
+          end
           item
             Name = 'OLD_ID'
             Value = ''
@@ -960,7 +1016,9 @@ object srvEmpresas: TsrvEmpresas
               'TIPO, '#10'    REGISTRO_MERCANTIL = :REGISTRO_MERCANTIL, '#10'    ID_TIP' +
               'O_IVA = :ID_TIPO_IVA, '#10'    ID_FORMA_PAGO = :ID_FORMA_PAGO, '#10'    ' +
               'VALIDEZ_PRESUPUESTOS = :VALIDEZ_PRESUPUESTOS, '#10'    PRECIO_PUNTO ' +
-              '= :PRECIO_PUNTO'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
+              '= :PRECIO_PUNTO,'#10'    DESCUENTO_LINEA = :DESCUENTO_LINEA,'#10'    DES' +
+              'CUENTO_CAPITULO = :DESCUENTO_CAPITULO,'#10'    DESCUENTO_GENERAL = :' +
+              'DESCUENTO_GENERAL'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>

Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm

@@ -88,7 +88,6 @@ inherited fEditorEmpresa: TfEditorEmpresa
   inherited pgPaginas: TPageControl
     Width = 668
     Height = 420
-    ActivePage = pagTiendas
     ExplicitTop = 112
     ExplicitWidth = 668
     ExplicitHeight = 420
@@ -121,233 +120,265 @@ inherited fEditorEmpresa: TfEditorEmpresa
           ExplicitHeight = 392
           inherited PngSpeedButton1: TPngSpeedButton
             Left = 596
-            Top = 276
+            Top = 295
             ExplicitLeft = 596
-            ExplicitTop = 276
+            ExplicitTop = 295
           end
           inherited PngSpeedButton2: TPngSpeedButton
             Left = 596
-            Top = 248
+            Top = 267
             ExplicitLeft = 596
-            ExplicitTop = 248
+            ExplicitTop = 267
           end
           inherited eCalle: TcxDBTextEdit
-            Top = 251
+            Top = 351
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitTop = 251
+            ExplicitTop = 351
             ExplicitWidth = 84
             Width = 84
           end
           inherited cbProvincia: TcxDBComboBox
-            Top = 278
+            Top = 378
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitTop = 278
+            ExplicitTop = 378
             ExplicitWidth = 106
             Width = 106
           end
           inherited cbPoblacion: TcxDBComboBox
-            Top = 305
+            Top = 405
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitTop = 305
+            ExplicitTop = 405
             ExplicitWidth = 100
             Width = 100
           end
           inherited eCodigoPostal: TcxDBTextEdit
-            Left = 341
-            Top = 278
+            Left = 356
+            Top = 378
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 341
-            ExplicitTop = 278
+            ExplicitLeft = 356
+            ExplicitTop = 378
           end
           inherited ePaginaWeb: TcxDBTextEdit
-            Left = 529
-            Top = 197
+            Left = 544
+            Top = 216
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 529
-            ExplicitTop = 197
+            ExplicitLeft = 544
+            ExplicitTop = 216
             ExplicitWidth = 165
             Width = 165
           end
           inherited eMailParticular: TcxDBTextEdit
-            Left = 529
-            Top = 170
+            Left = 544
+            Top = 189
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 529
-            ExplicitTop = 170
+            ExplicitLeft = 544
+            ExplicitTop = 189
             ExplicitWidth = 165
             Width = 165
           end
           inherited eMailTrabajo: TcxDBTextEdit
-            Left = 529
-            Top = 143
+            Left = 544
+            Top = 162
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 529
-            ExplicitTop = 143
+            ExplicitLeft = 544
+            ExplicitTop = 162
             ExplicitWidth = 129
             Width = 129
           end
           inherited eTlfParticular: TcxDBTextEdit
-            Left = 529
-            Top = 38
+            Left = 544
+            Top = 57
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 529
-            ExplicitTop = 38
+            ExplicitLeft = 544
+            ExplicitTop = 57
             ExplicitWidth = 91
             Width = 91
           end
           inherited eTlfTrabajo: TcxDBTextEdit
-            Left = 529
-            Top = 11
+            Left = 544
+            Top = 30
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 529
-            ExplicitTop = 11
+            ExplicitLeft = 544
+            ExplicitTop = 30
             ExplicitWidth = 127
             Width = 127
           end
           inherited eTlfMovil: TcxDBTextEdit
-            Left = 529
-            Top = 65
+            Left = 544
+            Top = 84
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 529
-            ExplicitTop = 65
+            ExplicitLeft = 544
+            ExplicitTop = 84
             ExplicitWidth = 155
             Width = 155
           end
           inherited eFax: TcxDBTextEdit
-            Left = 529
-            Top = 92
+            Left = 544
+            Top = 111
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 529
-            ExplicitTop = 92
+            ExplicitLeft = 544
+            ExplicitTop = 111
             ExplicitWidth = 121
             Width = 121
           end
           inherited eNombre: TcxDBTextEdit
-            Top = 11
+            Top = 30
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitTop = 11
+            ExplicitTop = 30
             ExplicitWidth = 108
             Width = 108
           end
           inherited eNIFCIF: TcxDBTextEdit
-            Top = 38
+            Top = 57
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitTop = 38
+            ExplicitTop = 57
             ExplicitWidth = 108
             Width = 108
           end
           inherited memRegistroMercantil: TcxDBMemo
-            Top = 65
+            Top = 84
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitTop = 65
+            ExplicitTop = 84
             ExplicitWidth = 76
             Width = 76
           end
           inherited cxDBImage1: TcxDBImage
-            Left = 434
-            Top = 248
+            Left = 449
+            Top = 267
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 434
-            ExplicitTop = 248
+            ExplicitLeft = 449
+            ExplicitTop = 267
             ExplicitWidth = 140
             ExplicitHeight = 100
             Height = 100
             Width = 140
           end
           inherited cbFormaPago: TcxComboBox
-            Top = 146
+            Top = 165
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitTop = 146
+            ExplicitTop = 165
             ExplicitWidth = 359
             Width = 359
           end
           inherited cbTipoIVA: TcxComboBox
-            Top = 119
+            Top = 138
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitTop = 119
+            ExplicitTop = 138
             ExplicitWidth = 202
             Width = 202
           end
           inherited frViewObservaciones1: TfrViewObservaciones
-            Top = 356
+            Top = 456
             Width = 521
             Height = 150
-            ExplicitTop = 356
+            ExplicitTop = 456
             ExplicitWidth = 521
             ExplicitHeight = 150
             inherited memObservaciones: TcxDBMemo
               DataBinding.DataSource = frViewEmpresa1.DADataSource
+              ExplicitWidth = 399
+              ExplicitHeight = 20
               Height = 150
               Width = 521
             end
           end
           inherited eValidez: TcxDBSpinEdit
-            Top = 173
+            Top = 192
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitTop = 173
+            ExplicitTop = 192
             ExplicitWidth = 121
             Width = 121
           end
           inherited ePrecioPunto: TcxDBCurrencyEdit
-            Top = 200
-            ExplicitTop = 200
+            Top = 219
+            ExplicitTop = 219
             ExplicitWidth = 121
             Width = 121
           end
+          inherited eDescuento: TcxDBSpinEdit
+            Top = 246
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitTop = 246
+            ExplicitWidth = 865
+            Width = 865
+          end
+          inherited eDescuentoLinea: TcxDBSpinEdit
+            Top = 300
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitTop = 300
+            ExplicitWidth = 865
+            Width = 865
+          end
+          inherited eDescuentoCapitulo: TcxDBSpinEdit
+            Top = 273
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitTop = 273
+            ExplicitWidth = 865
+            Width = 865
+          end
         end
       end
     end
@@ -406,11 +437,6 @@ inherited fEditorEmpresa: TfEditorEmpresa
           Height = 367
           ExplicitWidth = 660
           ExplicitHeight = 367
-          inherited cxGridView: TcxGridDBTableView
-            inherited cxGridViewCODIGO_CONTABLE: TcxGridDBColumn
-              VisibleForCustomization = False
-            end
-          end
         end
         inherited ToolBar1: TToolBar
           Width = 660

Source/ApplicationBase/Empresas/Views/uEditorEmpresa.pas

@@ -58,7 +58,7 @@ implementation
 {$INCLUDE ..\..\..\FactuGES.inc}
 
 uses
-  uCustomEditor, uDataModuleEmpresas;
+  uCustomEditor, uDataModuleEmpresas, uFactuGES_App;
 
 {
 ******************************* TfEditorEmpresa *******************************
@@ -143,6 +143,11 @@ begin
   if not Assigned(Empresa) then
     raise Exception.Create('No hay ningún Empresa asignado');
 
+  if (AppFactuGES.UsuarioActivo.ID_PERFIL <> CTE_PERFIL_ADMINISTRADOR) then
+  begin
+    pagTiendas.TabVisible := False;
+  end;
+
   Empresa.DataTable.Active := True;
   pgPaginas.ActivePage := pagGeneral;
 //  frViewEmpresa1.cbFormaPago.Properties.OnEditValueChanged := frViewEmpresa1.FormaPagoEditValueChanged;

Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm

@@ -35,7 +35,7 @@ inherited frViewEmpresa: TfrViewEmpresa
     end
     object eCalle: TcxDBTextEdit
       Left = 195
-      Top = 274
+      Top = 355
       DataBinding.DataField = 'CALLE'
       DataBinding.DataSource = DADataSource
       Style.BorderColor = clWindowFrame
@@ -52,12 +52,12 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 7
+      TabOrder = 10
       Width = 84
     end
     object cbProvincia: TcxDBComboBox
       Left = 195
-      Top = 301
+      Top = 382
       DataBinding.DataField = 'PROVINCIA'
       DataBinding.DataSource = DADataSource
       Properties.OnInitPopup = eProvinciaPropertiesInitPopup
@@ -77,12 +77,12 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 8
+      TabOrder = 11
       Width = 106
     end
     object cbPoblacion: TcxDBComboBox
       Left = 195
-      Top = 328
+      Top = 409
       DataBinding.DataField = 'POBLACION'
       DataBinding.DataSource = DADataSource
       Properties.OnInitPopup = ePoblacionPropertiesInitPopup
@@ -102,12 +102,12 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 10
+      TabOrder = 13
       Width = 100
     end
     object eCodigoPostal: TcxDBTextEdit
-      Left = 369
-      Top = 301
+      Left = 497
+      Top = 382
       DataBinding.DataField = 'CODIGO_POSTAL'
       DataBinding.DataSource = DADataSource
       Style.BorderColor = clWindowFrame
@@ -124,11 +124,11 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 9
+      TabOrder = 12
       Width = 65
     end
     object ePaginaWeb: TcxDBTextEdit
-      Left = 559
+      Left = 687
       Top = 220
       DataBinding.DataField = 'PAGINA_WEB'
       DataBinding.DataSource = DADataSource
@@ -146,11 +146,11 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 18
+      TabOrder = 21
       Width = 165
     end
     object eMailParticular: TcxDBTextEdit
-      Left = 559
+      Left = 687
       Top = 193
       DataBinding.DataField = 'EMAIL_2'
       DataBinding.DataSource = DADataSource
@@ -168,11 +168,11 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 17
+      TabOrder = 20
       Width = 165
     end
     object eMailTrabajo: TcxDBTextEdit
-      Left = 559
+      Left = 687
       Top = 166
       DataBinding.DataField = 'EMAIL_1'
       DataBinding.DataSource = DADataSource
@@ -190,11 +190,11 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 16
+      TabOrder = 19
       Width = 129
     end
     object eTlfParticular: TcxDBTextEdit
-      Left = 559
+      Left = 687
       Top = 55
       DataBinding.DataField = 'TELEFONO_2'
       DataBinding.DataSource = DADataSource
@@ -212,11 +212,11 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 13
+      TabOrder = 16
       Width = 91
     end
     object eTlfTrabajo: TcxDBTextEdit
-      Left = 559
+      Left = 687
       Top = 28
       DataBinding.DataField = 'TELEFONO_1'
       DataBinding.DataSource = DADataSource
@@ -234,11 +234,11 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 12
+      TabOrder = 15
       Width = 127
     end
     object eTlfMovil: TcxDBTextEdit
-      Left = 559
+      Left = 687
       Top = 82
       DataBinding.DataField = 'MOVIL_1'
       DataBinding.DataSource = DADataSource
@@ -256,11 +256,11 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 14
+      TabOrder = 17
       Width = 155
     end
     object eFax: TcxDBTextEdit
-      Left = 559
+      Left = 687
       Top = 109
       DataBinding.DataField = 'FAX'
       DataBinding.DataSource = DADataSource
@@ -278,7 +278,7 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 15
+      TabOrder = 18
       Width = 391
     end
     object eNombre: TcxDBTextEdit
@@ -352,7 +352,7 @@ inherited frViewEmpresa: TfrViewEmpresa
       Width = 76
     end
     object cxDBImage1: TcxDBImage
-      Left = 464
+      Left = 592
       Top = 277
       DataBinding.DataSource = DADataSource
       Properties.Stretch = True
@@ -367,7 +367,7 @@ inherited frViewEmpresa: TfrViewEmpresa
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 19
+      TabOrder = 22
       Height = 100
       Width = 140
     end
@@ -427,7 +427,7 @@ inherited frViewEmpresa: TfrViewEmpresa
     end
     inline frViewObservaciones1: TfrViewObservaciones
       Left = 22
-      Top = 385
+      Top = 466
       Width = 521
       Height = 150
       Font.Charset = DEFAULT_CHARSET
@@ -436,10 +436,10 @@ inherited frViewEmpresa: TfrViewEmpresa
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 11
+      TabOrder = 14
       ReadOnly = False
       ExplicitLeft = 22
-      ExplicitTop = 385
+      ExplicitTop = 466
       inherited memObservaciones: TcxDBMemo
         DataBinding.DataField = 'NOTAS'
         DataBinding.DataSource = DADataSource
@@ -477,6 +477,94 @@ inherited frViewEmpresa: TfrViewEmpresa
       TabOrder = 6
       Width = 121
     end
+    object eDescuento: TcxDBSpinEdit
+      Left = 195
+      Top = 244
+      DataBinding.DataField = 'DESCUENTO_GENERAL'
+      DataBinding.DataSource = DADataSource
+      Properties.Alignment.Horz = taRightJustify
+      Properties.AssignedValues.MinValue = True
+      Properties.DisplayFormat = ',0.00 %;-,0.00 %'
+      Properties.MaxValue = 100.000000000000000000
+      Properties.UseLeftAlignmentOnEditing = False
+      Properties.ValueType = vtFloat
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      Style.ButtonStyle = bts3D
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 7
+      Width = 865
+    end
+    object eDescuentoLinea: TcxDBSpinEdit
+      Left = 195
+      Top = 298
+      DataBinding.DataField = 'DESCUENTO_LINEA'
+      DataBinding.DataSource = DADataSource
+      Properties.Alignment.Horz = taRightJustify
+      Properties.DisplayFormat = ',0.00 %;-,0.00 %'
+      Properties.MaxValue = 100.000000000000000000
+      Properties.UseLeftAlignmentOnEditing = False
+      Properties.ValueType = vtFloat
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      Style.ButtonStyle = bts3D
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 9
+      Width = 865
+    end
+    object eDescuentoCapitulo: TcxDBSpinEdit
+      Left = 195
+      Top = 271
+      DataBinding.DataField = 'DESCUENTO_CAPITULO'
+      DataBinding.DataSource = DADataSource
+      Properties.Alignment.Horz = taRightJustify
+      Properties.DisplayFormat = ',0.00 %;-,0.00 %'
+      Properties.MaxValue = 100.000000000000000000
+      Properties.UseLeftAlignmentOnEditing = False
+      Properties.ValueType = vtFloat
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      Style.ButtonStyle = bts3D
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 8
+      Width = 865
+    end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
@@ -528,6 +616,21 @@ inherited frViewEmpresa: TfrViewEmpresa
             Control = ePrecioPunto
             ControlOptions.ShowBorder = False
           end
+          object dxLayoutControl1Item23: TdxLayoutItem
+            Caption = 'Descuento especial general:'
+            Control = eDescuento
+            ControlOptions.ShowBorder = False
+          end
+          object dxLayoutControl1Item25: TdxLayoutItem
+            Caption = 'Descuento cap'#237'tulo:'
+            Control = eDescuentoCapitulo
+            ControlOptions.ShowBorder = False
+          end
+          object dxLayoutControl1Item24: TdxLayoutItem
+            Caption = 'Descuento linea:'
+            Control = eDescuentoLinea
+            ControlOptions.ShowBorder = False
+          end
         end
         object dxLayoutControl1Group3: TdxLayoutGroup
           AutoAligns = [aaHorizontal]

Source/ApplicationBase/Empresas/Views/uViewEmpresa.pas

@@ -89,6 +89,12 @@ type
     dxLayoutControl1Item21: TdxLayoutItem;
     ePrecioPunto: TcxDBCurrencyEdit;
     dxLayoutControl1Item22: TdxLayoutItem;
+    dxLayoutControl1Item23: TdxLayoutItem;
+    eDescuento: TcxDBSpinEdit;
+    dxLayoutControl1Item24: TdxLayoutItem;
+    eDescuentoLinea: TcxDBSpinEdit;
+    dxLayoutControl1Item25: TdxLayoutItem;
+    eDescuentoCapitulo: TcxDBSpinEdit;
     procedure actAnadirExecute(Sender: TObject);
     procedure actEliminarExecute(Sender: TObject);
     procedure actEliminarUpdate(Sender: TObject);

Source/ApplicationBase/uFactuGES_App.pas

@@ -10,20 +10,26 @@ uses
 const
   CTE_PERFIL_ADMINISTRADOR = 3;
   CTE_PERFIL_GERENCIA = 2;
-  CTE_PERFIL_VENDEDOR_GRADEN = 7;
-  CTE_PERFIL_VENDEDOR_MARBELLA = 9;
-  CTE_PERFIL_VENDEDOR_DONOSTI = 10;
-  CTE_PERFIL_VENDEDOR_BILBAO = 11;
-  CTE_PERFIL_VENDEDOR_GRADEN_UECKO = 6;
   CTE_PERFIL_VENDEDOR_GRADEN_UECKO2 = 12;
   CTE_PERFIL_COMPRAS = 8;
-  CTE_PERFIL_USUARIO = 5;
 
   CTE_EMPRESA_ABETO = 1;
   CTE_EMPRESA_GRADEN = 2;
+
   CTE_EMPRESA_GRADEN_MARBELLA = 6;
   CTE_EMPRESA_GRADEN_DONOSTI = 10;
   CTE_EMPRESA_GRADEN_BILBAO = 15;
+  CTE_EMPRESA_GRADEN_BARCELONA = 20;
+  CTE_EMPRESA_GUNNI = 30;  
+
+  CTE_PERFIL_TODO_INI = 40;
+  CTE_PERFIL_TODO_FIN = 49;
+
+  CTE_PERFIL_PRESUPUESTOS_INI = 30;
+  CTE_PERFIL_PRESUPUESTOS_FIN = 39;
+
+  CTE_PERFIL_VENDEDOR_INI = 50;
+  CTE_PERFIL_VENDEDOR_FIN = 69;
 
 type
   TAppFactuGES_Event = procedure;

Source/Base/Base.dproj

@@ -58,55 +58,55 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Modulos\Contratos de cliente\adortl.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\cxDataD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\cxEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\cxExtEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\cxGridD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\cxLibraryD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\cxPageControlD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\dbrtl.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\dclIndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\designide.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\dsnap.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\dxPSCoreD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\dxThemeD11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\GUISDK_D11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\IndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\IndyProtocols.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\IndySystem.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\Jcl.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\JclVcl.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\JSDialog100.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\JvCmpD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\JvCoreD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\JvDlgsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\JvMMD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\JvNetD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\JvSystemD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\pckMD5.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\pckUCDataConnector.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\pckUserControl_RT.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\PluginSDK_D11R.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\PngComponentsD10.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\PNG_D10.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\rtl.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\TB2k_D10.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\tbx_d10.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\vcl.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\vclactnband.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\vcldb.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\vcljpg.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\VclSmp.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\vclx.dcp" />
-    <DCCReference Include="..\Modulos\Contratos de cliente\xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxGridD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dclIndyCore.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxPSCoreD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\IndyCore.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\IndyProtocols.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\IndySystem.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JSDialog100.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvCmpD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvDlgsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvMMD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvNetD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\pckMD5.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\pckUCDataConnector.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\pckUserControl_RT.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PluginSDK_D11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\TB2k_D10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\VclSmp.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
       <DesignClass>TForm</DesignClass>

Source/Base/Utiles/uSistemaFunc.pas

@@ -48,8 +48,10 @@ function GetSpecialFolderPath(folder : integer) : string;
 function PreguntarRuta(const ATitulo: String; const AComentario: String; var ARuta: String): Boolean;
 function PreguntarFicheroWordExportar (var Fichero : String) : Boolean;
 function PreguntarFicheroExcelExportar (var Fichero : String) : Boolean;
+function PreguntarFicheroPDFExportar (var Fichero : String) : Boolean;
 function EscapeIllegalChars(AFileName: string): string;
 function FindFile(const filespec: TFileName; attributes: integer = faReadOnly Or faHidden Or faSysFile Or faArchive): TStringList;
+function ExecAndWait(sCommandLine: string): Boolean;
 
 //Directorios informes: EMPRESA, TIENDA, IDIOMA
 function DarRutaFichero(const ARutaIni: String; const AFichero: String; const ADirectorio1: String = ''; const ADirectorio2: String = ''; const ADirectorio3: String = ''): Variant;
@@ -68,6 +70,36 @@ uses
   cxLookAndFeels, uStringsUtils;
 
 
+function ExecAndWait(sCommandLine: string): Boolean;
+var
+  dwExitCode: DWORD;
+  tpiProcess: TProcessInformation;
+  tsiStartup: TStartupInfo;
+begin
+  Result := False;
+  FillChar(tsiStartup, SizeOf(TStartupInfo), 0);
+  tsiStartup.cb := SizeOf(TStartupInfo);
+  if CreateProcess(nil, PChar(sCommandLine), nil, nil, False, 0,
+    nil, nil, tsiStartup, tpiProcess) then
+  begin
+    if WAIT_OBJECT_0 = WaitForSingleObject(tpiProcess.hProcess, INFINITE) then
+    begin
+      if GetExitCodeProcess(tpiProcess.hProcess, dwExitCode) then
+      begin
+        if dwExitCode = 0 then
+          Result := True
+        else
+          SetLastError(dwExitCode + $2000);
+      end;
+    end;
+    dwExitCode := GetLastError;
+    CloseHandle(tpiProcess.hProcess);
+    CloseHandle(tpiProcess.hThread);
+    SetLastError(dwExitCode);
+  end;
+end;
+
+
 function GetSpecialFolderPath(folder : integer) : string;
 const
   SHGFP_TYPE_CURRENT = 0;
@@ -254,6 +286,27 @@ begin
   end;
 end;
 
+function PreguntarFicheroPDFExportar (var Fichero : String) : Boolean;
+var
+  DialogoSalvar : TSaveDialog;
+begin
+  DialogoSalvar := TSaveDialog.Create(NIL);
+  try
+    with DialogoSalvar do
+    begin
+      DefaultExt := 'pdf';
+      Filter := 'Documento pdf (*.pdf)|*.pdf';
+      FileName := Fichero;
+      FilterIndex := 0;
+      Options := [ofOverwritePrompt, ofHideReadOnly, ofPathMustExist, ofEnableSizing];
+    end;
+    Result := DialogoSalvar.Execute;
+    if Result then
+      Fichero := DialogoSalvar.FileName;
+  finally
+    DialogoSalvar.Free;
+  end;
+end;
 
 function DarVersionFichero (Executable : String) : String;
 var

Source/Cliente/FactuGES.dproj

@@ -52,8 +52,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">5</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">4.5.4.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.5.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">4</VersionInfo><VersionInfo Name="MinorVer">7</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">4.7.6.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.7.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
       
       
       

Source/Cliente/uPantallaPrincipal.dfm

@@ -267,12 +267,16 @@ object fPantallaPrincipal: TfPantallaPrincipal
     object actMenuCompras: TAction
       Category = 'Menus'
       Caption = 'Compras'
+      Enabled = False
+      Visible = False
       OnExecute = actMenuComprasExecute
       OnUpdate = actMenuComprasUpdate
     end
     object actMenuLogistica: TAction
       Category = 'Menus'
       Caption = 'Log'#237'stica'
+      Enabled = False
+      Visible = False
       OnExecute = actMenuLogisticaExecute
     end
     object actMenuVentas: TAction
@@ -296,22 +300,30 @@ object fPantallaPrincipal: TfPantallaPrincipal
     object actConfigurar: TAction
       Category = 'Opciones'
       Caption = 'Configurar FactuGES...'
+      Enabled = False
+      Visible = False
       OnExecute = actConfigurarExecute
     end
     object actMenuContabilidad: TAction
       Category = 'Menus'
       Caption = 'Contabilidad'
+      Enabled = False
+      Visible = False
       OnExecute = actMenuContabilidadExecute
       OnUpdate = actMenuComprasUpdate
     end
     object actMenuEmpresa: TAction
       Category = 'Menus'
       Caption = 'Empresa'
+      Enabled = False
+      Visible = False
       OnExecute = actMenuEmpresaExecute
     end
     object actMenuInformes: TAction
       Category = 'Menus'
       Caption = 'Informes'
+      Enabled = False
+      Visible = False
       OnExecute = actMenuInformesExecute
       OnUpdate = actMenuComprasUpdate
     end
@@ -618,6 +630,8 @@ object fPantallaPrincipal: TfPantallaPrincipal
       object Administracin1: TMenuItem
         Tag = 1
         Caption = 'Administraci'#243'n'
+        Enabled = False
+        Visible = False
         object Usuarios1: TMenuItem
           Caption = 'Usuarios'
           OnClick = Usuarios1Click
@@ -654,8 +668,12 @@ object fPantallaPrincipal: TfPantallaPrincipal
         Tag = 200
         Caption = '-'
       end
+      object N11: TMenuItem
+        Tag = 400
+        Caption = '-'
+      end
       object N6: TMenuItem
-        Tag = 300
+        Tag = 1100
         Caption = '-'
       end
     end

Source/Cliente/uPantallaPrincipal.pas

@@ -95,6 +95,7 @@ type
     actMenuInformes: TAction;
     actInformacionEmpresa: TAction;
     cxLocalizer1: TcxLocalizer;
+    N11: TMenuItem;
     procedure FormCreate(Sender: TObject);
     procedure Salir1Click(Sender: TObject);
     procedure actSalirExecute(Sender: TObject);
@@ -194,64 +195,93 @@ end;
 
 procedure TfPantallaPrincipal.FormShow(Sender: TObject);
 begin
+
+  //Los usuarios SOLO PRESUPUESTOS verán solo clientes y presupuestos de la empresa asignada o todas
+  if ((AppFactuGES.UsuarioActivo.ID_PERFIL >= CTE_PERFIL_PRESUPUESTOS_INI)
+  and (AppFactuGES.UsuarioActivo.ID_PERFIL <= CTE_PERFIL_PRESUPUESTOS_FIN)) then
+  begin
+  //no verá nada más que presupuestos
+  end;
+
+  //Los usuarios SOLO VENDEDOR verán solo ventas y caja
+  if ((AppFactuGES.UsuarioActivo.ID_PERFIL >= CTE_PERFIL_VENDEDOR_INI)
+  and (AppFactuGES.UsuarioActivo.ID_PERFIL <= CTE_PERFIL_VENDEDOR_FIN)) then
+  begin
+    actMenuContabilidad.Visible := True;
+    actMenuContabilidad.Enabled := True;
+  end;
+
+
   //El usuario vendedor de graden solo podrá ver ventas y caja (Graden-Vendedor(2))
-  if (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_VENDEDOR_GRADEN)
-  or (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_VENDEDOR_MARBELLA)
-  or (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_VENDEDOR_DONOSTI)
-  or (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_VENDEDOR_BILBAO)
-  or (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_VENDEDOR_GRADEN_UECKO)
-  or (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_VENDEDOR_GRADEN_UECKO2) then
+  if (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_VENDEDOR_GRADEN_UECKO2) then
   begin
-    Compras1.Enabled := False;
-    Compras1.Visible := False;
-    Logistica1.Enabled := False;
-    Logistica1.Visible := False;
-    ConfigurarFactuGES1.Enabled := False;
-    ConfigurarFactuGES1.Visible := False;
-  end
-  //El usuario normal de uecko solo no verá contabilidad
-  else if (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_USUARIO) then
+    actMenuLogistica.Visible := True;
+    actMenuLogistica.Enabled := True;
+    actMenuContabilidad.Visible := True;
+    actMenuContabilidad.Enabled := True;
+  end;
+
+  //Los usuarios TOTAL verán todo menos contabilidad, informes y logística
+  if ((AppFactuGES.UsuarioActivo.ID_PERFIL >= CTE_PERFIL_TODO_INI)
+  and (AppFactuGES.UsuarioActivo.ID_PERFIL <= CTE_PERFIL_TODO_FIN)) then
   begin
-    Contabilidad1.Enabled := False;
-    Contabilidad1.Visible := False;
-    ConfigurarFactuGES1.Enabled := False;
-    ConfigurarFactuGES1.Visible := False;
+    actMenuCompras.Visible := True;
+    actMenuCompras.Enabled := True;
+    actMenuEmpresa.Visible := True;
+    actMenuEmpresa.Enabled := True;
+    actMenuEmpresa.Visible := True;
+    actMenuEmpresa.Enabled := True;
   end;
 
   //El usuario COMPRAS
   if (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_COMPRAS) then
   begin
-    Contabilidad1.Enabled := False;
-    Contabilidad1.Visible := False;
-    Ventas1.Enabled := False;
-    Ventas1.Visible := False;
-    ConfigurarFactuGES1.Enabled := False;
-    ConfigurarFactuGES1.Visible := False;
+    //Esta condición tiene que ser dinámica ya que solo será visible en la empresa abeto ya que en graden no tiene sentido
+    //se mete en RefrescarUI
+    {if (AppFactuGES.EmpresaActiva.ID = CTE_EMPRESA_ABETO) then
+    begin
+      actMenuLogistica.Visible := True;
+      actMenuLogistica.Enabled := True;
+    end;}
+
+    actMenuCompras.Visible := True;
+    actMenuCompras.Enabled := True;
+    actMenuVentas.Visible := False;
+    actMenuVentas.Enabled := False;
   end;
 
   //El usuario GERENCIA)
   if (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_GERENCIA)
   or (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR) then
   begin
-    Informes1.Enabled := True;
-    Informes1.Visible := True;
-  end
-  else
-  begin
-    Informes1.Enabled := False;
-    Informes1.Visible := False;
-  end;
-
-
-  InicializarUI;
-
-  //Solo verá administracion de usuarios el perfil Administrador(3), están en la tabla usuarios
-  if (AppFactuGES.UsuarioActivo.ID_PERFIL <> CTE_PERFIL_ADMINISTRADOR) then
-  begin
-//    Perfiles1.Visible := False;
-    Administracin1.Visible := False;
+    //Esta condición tiene que ser dinámica ya que solo será visible en la empresa abeto ya que en graden no tiene sentido
+    //se mete en RefrescarUI
+    {if (AppFactuGES.EmpresaActiva.ID = CTE_EMPRESA_ABETO) then
+    begin
+      actMenuLogistica.Visible := True;
+      actMenuLogistica.Enabled := True;
+    end;}
+
+    actMenuCompras.Visible := True;
+    actMenuCompras.Enabled := True;
+    actMenuInformes.Visible := True;
+    actMenuInformes.Enabled := True;
+    actMenuContabilidad.Visible := True;
+    actMenuContabilidad.Enabled := True;
+    actMenuEmpresa.Visible := True;
+    actMenuEmpresa.Enabled := True;
+
+    //SOLO ADMINISTRADOR
+    if (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR) then
+    begin
+      actConfigurar.Visible := True;
+      actConfigurar.Enabled := True;
+      Administracin1.Visible := True;
+      Administracin1.Enabled := True;
+    end;
   end;
 
+  InicializarUI;  
 end;
 
 procedure TfPantallaPrincipal.RefrescarUI;
@@ -265,8 +295,13 @@ begin
   begin
     ATitulo := AppFactuGES.EmpresaActiva.NOMBRE + ' - ' + ATitulo;
 
-    actMenuLogistica.Enabled := AppFactuGES.EmpresaActiva.ID = CTE_EMPRESA_ABETO;
-    actMenuLogistica.Visible := AppFactuGES.EmpresaActiva.ID = CTE_EMPRESA_ABETO;
+    //AQUI MENUS DINAMICOS SEGUN EMPRESA Y PERFIL
+    actMenuLogistica.Visible := (AppFactuGES.EmpresaActiva.ID = CTE_EMPRESA_ABETO)
+    and ((AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_COMPRAS)
+      or (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_GERENCIA)
+      or (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR));
+
+    actMenuLogistica.Enabled := actMenuLogistica.Visible;
   end;
 
 

Source/GUIBase/GUIBase.dproj

@@ -58,34 +58,34 @@
     <DelphiCompile Include="GUIBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Modulos\Contactos\Base.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\ccpackD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\cxDataD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\cxEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\cxExportD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\cxLibraryD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\dbrtl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\dxLayoutControlD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\dxPScxCommonD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\dxPScxGrid6LnkD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\dxThemeD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\frx11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\frxe11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\fs11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JvAppFrmD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JvGlobusD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\PngComponentsD10.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\PNG_D10.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\rtl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\tb2k_d10.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\tbx_d10.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\vcl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\vclactnband.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\vcldb.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\vcljpg.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\vclx.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\ccpackD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxExportD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxLayoutControlD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxCommonD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxGrid6LnkD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\frx11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\frxe11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\fs11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvAppFrmD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\tb2k_d10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
     <DCCReference Include="uDialogBase.pas">
       <Form>fDialogBase</Form>
     </DCCReference>

Source/GUIBase/uViewDetallesBase.dfm

@@ -845,5 +845,9 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       Font.Name = 'Lucida Console'
       Font.Style = []
     end
+    object cxStyleEdicion: TcxStyle
+      AssignedValues = [svColor]
+      Color = 13303807
+    end
   end
 end

Source/GUIBase/uViewDetallesBase.pas

@@ -109,6 +109,7 @@ type
     cxStyle_DESCUENTO: TcxStyle;
     cxStyleDesactivado: TcxStyle;
     cxGridViewVALORADO: TcxGridDBColumn;
+    cxStyleEdicion: TcxStyle;
 
     procedure actAnadirExecute(Sender: TObject);
     procedure actEliminarExecute(Sender: TObject);
@@ -426,6 +427,10 @@ begin
       else
         if Length(AEditValue) = 0 then
            CurEdit.DefAttributes.Assign(FuentePorDefecto);
+
+      //Establecemos un color de edición único para evitar el fallo de color verde en conceptos
+      CurEdit.Style.Color := cxStyleEdicion.Color;
+           
     finally
       FreeAndNil(FuentePorDefecto);
     end;

Source/Informes/1/InfComision.fr3

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TfrxReport Version="4.8.11" DotMatrixReport="False" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="45251,6521062963" ReportOptions.Description.Text="" ReportOptions.LastChange="45323,4172423264" ScriptLanguage="PascalScript" ScriptText.Text="procedure DetailData1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if &#60;AllDetails&#62; then&#13;&#10;    DetailData1.visible := True                                           &#13;&#10; else&#13;&#10;    DetailData1.visible := False;       &#13;&#10;end;&#13;&#10;&#13;&#10;procedure earticuloOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if &#60;AllDetails&#62; then&#13;&#10; begin&#13;&#10;    earticulo.Visible := true;                                                                                                                         &#13;&#10;    econcepto.Visible := true;&#13;&#10;    ecantidad.Visible := true;        &#13;&#10;    eimp1.Visible := true;&#13;&#10;    eimp2.Visible := true;        &#13;&#10; end                    &#13;&#10; else&#13;&#10; begin             &#13;&#10;    earticulo.Visible := false;                                                                                                                         &#13;&#10;    econcepto.Visible := false;&#13;&#10;    ecantidad.Visible := false;        &#13;&#10;    eimp1.Visible := false;&#13;&#10;    eimp2.Visible := false;        &#13;&#10; end&#13;&#10;  &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;end.          " ShowProgress="False" StoreInDFM="False" PropData="044C65667403A90003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C65732200010C1D00000020446174615365744E616D653D226672784442446574616C6C657333220000095661726961626C657301010C10000000204E616D653D222070726F706961732200010C12000000204E616D653D22416C6C44657461696C73220000055374796C650100">
+<TfrxReport Version="4.8.11" DotMatrixReport="False" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="45251,6521062963" ReportOptions.Description.Text="" ReportOptions.LastChange="45504,798218669" ScriptLanguage="PascalScript" ScriptText.Text="procedure DetailData1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if &#60;AllDetails&#62; then&#13;&#10;    DetailData1.visible := True                                           &#13;&#10; else&#13;&#10;    DetailData1.visible := False;       &#13;&#10;end;&#13;&#10;&#13;&#10;procedure earticuloOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if &#60;AllDetails&#62; then&#13;&#10; begin&#13;&#10;    earticulo.Visible := true;                                                                                                                         &#13;&#10;    econcepto.Visible := true;&#13;&#10;    ecantidad.Visible := true;        &#13;&#10;    eimp1.Visible := true;&#13;&#10;    eimp2.Visible := true;        &#13;&#10; end                    &#13;&#10; else&#13;&#10; begin             &#13;&#10;    earticulo.Visible := false;                                                                                                                         &#13;&#10;    econcepto.Visible := false;&#13;&#10;    ecantidad.Visible := false;        &#13;&#10;    eimp1.Visible := false;&#13;&#10;    eimp2.Visible := false;        &#13;&#10; end&#13;&#10;  &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;end.          " ShowProgress="False" StoreInDFM="False" PropData="044C65667403A90003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C65732200010C3600000020446174615365743D226672784442446574616C6C6573332220446174615365744E616D653D226672784442446574616C6C657333220000095661726961626C657301010C10000000204E616D653D222070726F706961732200010C12000000204E616D653D22416C6C44657461696C73220000055374796C650100">
   <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
   <TfrxReportPage Name="Page1" PaperWidth="210" PaperHeight="297" PaperSize="9" LeftMargin="10,00125" RightMargin="10,00125" TopMargin="10,00125" BottomMargin="10,00125" ColumnWidth="0" ColumnPositions.Text="" HGuides.Text="" VGuides.Text="">
     <TfrxMasterData Name="MasterData1" Height="46" Left="0" Top="163" Width="718,101251175" ColumnWidth="0" ColumnGap="0" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" RowCount="0">
@@ -24,11 +24,11 @@
       <TfrxMemoView Name="Memo15" Left="3" Top="74" Width="366" Height="28" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="10921638" Font.Height="-20" Font.Name="Arial" Font.Style="1" Frame.Color="14211288" ParentFont="False" VAlign="vaCenter" Text="LIQUIDACIÓN DE COMISIONES"/>
       <TfrxMemoView Name="Memo10" Align="baRight" Left="458,101251175" Top="93" Width="260" Height="22" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 € " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Arial" Font.Style="1" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="Total comisión: [frxDBCabecera.&#34;IMPORTE_TOTAL&#34;]"/>
     </TfrxHeader>
-    <TfrxDetailData Name="DetailData1" Height="22" Left="0" Top="229" Width="718,101251175" OnBeforePrint="DetailData1OnBeforePrint" ColumnWidth="0" ColumnGap="0" DataSetName="frxDBDetalles3" RowCount="0" Stretched="True">
+    <TfrxDetailData Name="DetailData1" Height="22" Left="0" Top="229" Width="718,101251175" OnBeforePrint="DetailData1OnBeforePrint" ColumnWidth="0" ColumnGap="0" DataSet="frxDBDetalles3" DataSetName="frxDBDetalles3" RowCount="0" Stretched="True">
       <TfrxMemoView Name="Memo3" Align="baLeft" Left="200" Top="2" Width="200" Height="20" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Arial" Font.Style="0" Frame.Typ="1" GapX="4" GapY="4" ParentFont="False" WordBreak="True" Text="[frxDBDetalles3.&#34;CONCEPTO_FACTURA&#34;]"/>
       <TfrxMemoView Name="Memo4" Align="baLeft" Left="0" Top="2" Width="200" Height="20" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Arial" Font.Style="0" GapX="4" GapY="4" ParentFont="False" WordBreak="True" Text="[frxDBDetalles3.&#34;ARTICULO&#34;]"/>
       <TfrxMemoView Name="MemCantidad" Align="baLeft" Left="400" Top="2" Width="55" Height="20" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2f" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-9" Font.Name="Arial" Font.Style="0" GapY="3" HAlign="haCenter" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles3.&#34;CANTIDAD&#34;] "/>
-      <TfrxMemoView Name="MemPrecio" Align="baLeft" Left="455" Top="2" Width="130" Height="20" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 € " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-9" Font.Name="Arial" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles3.&#34;IMPORTE_TOTAL&#34;]"/>
+      <TfrxMemoView Name="MemPrecio" Align="baLeft" Left="455" Top="2" Width="130" Height="20" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 € " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-9" Font.Name="Arial" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles3.&#34;IMPORTE_COMISIONABLE&#34;]"/>
       <TfrxMemoView Name="Memo16" Align="baLeft" Left="585" Top="2" Width="130" Height="20" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 € " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-9" Font.Name="Arial" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles3.&#34;IMPORTE_COMISION&#34;]"/>
     </TfrxDetailData>
   </TfrxReportPage>

Source/Informes/1/firma.bat

@@ -0,0 +1,48 @@
+@ECHO off
+title firmadocumento
+cls
+
+set LOGFILE=D:\RODAX\FACTUGES\Servidor\Informes\1\log.txt
+
+set ARCHIVO=%1
+set city=FUENLABRADA
+set province=MADRID
+set postalcode=28946
+set PositionOnPageLowerLeftX=420
+set PositionOnPageLowerLeftY=140
+set PositionOnPageUpperRightX=570
+set PositionOnPageUpperRigthY=210
+set signaturePage=-1
+set signatureRubricImage="D:\RODAX\FACTUGES\Servidor\Informes\1\sello.jpg"
+set layer2text="Firmado digitalmente por $$ORGANIZATION$$   Fecha: $$SIGNDATE=dd/MM/yyyy$$"
+SET l2FontColor=black
+SET l2FontSize=7
+SET l2FontFamily=1
+SET l2FontStyle=0
+
+REM Asegura que autofirma no muestra ninguna GUI
+set headless=true
+
+REM incluir únicamente el certificado del firmante
+set "includeOnlySignningCertificate=true"
+
+REM Siempre creará una revisión al firmar. Requiere que el documento cumpla PDF 1.7 (ISO 32000-1:2008)
+REM "alwaysCreateRevision=true"
+
+REM set "CONFIG=signatureProductionCity=MADRID\nsignatureProductionProvince=MADRID\nsignatureProductionPostalCode=28053\nsignatureProductionCountry=ESPAÑA\nsignaturePage3=%signaturePage3%\nPositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nPositionPageLowerLeftY=%PositionPageLowerLeftY%\nPositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nPositionOnPageUpperRigthY=%PositionOnPageUpperRigthY%\nsignatureRubricImage=%signatureRubricImage%\nlayer2text=%layer2text=%"
+REM \nsignaturePage=%signaturePage%
+
+
+set "CONFIG=headless=%headless%\nlayer2Text=%layer2text%\nsignatureProductionCity=%city%\nsignatureProductionProvince=%province%\nsignatureProductionPostalCode=%postalcode%\nsignatureProductionCountry=ESPAÑA\nsignaturePositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nsignaturePositionOnPageLowerLeftY=%PositionOnPageLowerLeftY%\nsignaturePositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nsignaturePositionOnPageUpperRightY=%PositionOnPageUpperRigthY%\nsignaturePage=-1\nsignatureRubricImage=%signatureRubricImage%\nincludeOnlySignningCertificate=true"
+
+
+REM echo %CONFIG% > %LOGFILE%
+REM echo %ARCHIVO% > %LOGFILE%
+echo %TEMP% > %LOGFILE%
+
+call :FIRMA >> %LOGFILE%
+exit /b
+
+:FIRMA
+"C:\Program Files (x86)\AutoFirma\AutoFirma\AutoFirmaCommandLine.exe" sign -i %ARCHIVO% -o %ARCHIVO% -store pkcs12:"D:\DATOS2\FINANZAS\CERTIFICADOS\abeto.pfx" -password %PASSABETO% -filter subject.contains:850331 -config %CONFIG%
+

Source/Informes/15/firma.bat

@@ -0,0 +1,45 @@
+@ECHO off
+title firmadocumento
+cls
+
+set LOGFILE=D:\RODAX\FACTUGES\Servidor\Informes\2\log.txt
+
+set ARCHIVO=%1
+set city=MADRID
+set province=MADRID
+set postalcode=28002
+set PositionOnPageLowerLeftX=420
+set PositionOnPageLowerLeftY=140
+set PositionOnPageUpperRightX=570
+set PositionOnPageUpperRigthY=210
+set signaturePage=-1
+set signatureRubricImage="D:\RODAX\FACTUGES\Servidor\Informes\2\sello.jpg"
+set layer2text="Firmado digitalmente por $$ORGANIZATION$$   Fecha: $$SIGNDATE=dd/MM/yyyy$$"
+SET l2FontColor=black
+SET l2FontSize=7
+SET l2FontFamily=1
+SET l2FontStyle=0
+
+REM Asegura que autofirma no muestra ninguna GUI
+set headless=true
+
+REM incluir únicamente el certificado del firmante
+set "includeOnlySignningCertificate=true"
+
+REM Siempre creará una revisión al firmar. Requiere que el documento cumpla PDF 1.7 (ISO 32000-1:2008)
+REM "alwaysCreateRevision=true"
+
+REM set "CONFIG=signatureProductionCity=MADRID\nsignatureProductionProvince=MADRID\nsignatureProductionPostalCode=28053\nsignatureProductionCountry=ESPAÑA\nsignaturePage3=%signaturePage3%\nPositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nPositionPageLowerLeftY=%PositionPageLowerLeftY%\nPositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nPositionOnPageUpperRigthY=%PositionOnPageUpperRigthY%\nsignatureRubricImage=%signatureRubricImage%\nlayer2text=%layer2text=%"
+REM \nsignaturePage=%signaturePage%
+
+
+set "CONFIG=headless=%headless%\nlayer2Text=%layer2text%\nsignatureProductionCity=%city%\nsignatureProductionProvince=%province%\nsignatureProductionPostalCode=%postalcode%\nsignatureProductionCountry=ESPAÑA\nsignaturePositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nsignaturePositionOnPageLowerLeftY=%PositionOnPageLowerLeftY%\nsignaturePositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nsignaturePositionOnPageUpperRightY=%PositionOnPageUpperRigthY%\nsignaturePage=-1\nsignatureRubricImage=%signatureRubricImage%\nincludeOnlySignningCertificate=true\nownerPassword=uecko24"
+
+REM echo %CONFIG% > %LOGFILE%
+
+call :FIRMA >> %LOGFILE%
+exit /b
+
+:FIRMA
+"C:\Program Files (x86)\AutoFirma\AutoFirma\AutoFirmaCommandLine.exe" sign -i %ARCHIVO% -o %ARCHIVO% -store pkcs12:"D:\DATOS2\FINANZAS\CERTIFICADOS\graden.pfx" -password %PASSGRADEN% -filter subject.contains:806465 -config %CONFIG%
+

Source/Informes/2/firma.bat

@@ -0,0 +1,45 @@
+@ECHO off
+title firmadocumento
+cls
+
+set LOGFILE=D:\RODAX\FACTUGES\Servidor\Informes\2\log.txt
+
+set ARCHIVO=%1
+set city=MADRID
+set province=MADRID
+set postalcode=28002
+set PositionOnPageLowerLeftX=420
+set PositionOnPageLowerLeftY=140
+set PositionOnPageUpperRightX=570
+set PositionOnPageUpperRigthY=210
+set signaturePage=-1
+set signatureRubricImage="D:\RODAX\FACTUGES\Servidor\Informes\2\sello.jpg"
+set layer2text="Firmado digitalmente por $$ORGANIZATION$$   Fecha: $$SIGNDATE=dd/MM/yyyy$$"
+SET l2FontColor=black
+SET l2FontSize=7
+SET l2FontFamily=1
+SET l2FontStyle=0
+
+REM Asegura que autofirma no muestra ninguna GUI
+set headless=true
+
+REM incluir únicamente el certificado del firmante
+set "includeOnlySignningCertificate=true"
+
+REM Siempre creará una revisión al firmar. Requiere que el documento cumpla PDF 1.7 (ISO 32000-1:2008)
+REM "alwaysCreateRevision=true"
+
+REM set "CONFIG=signatureProductionCity=MADRID\nsignatureProductionProvince=MADRID\nsignatureProductionPostalCode=28053\nsignatureProductionCountry=ESPAÑA\nsignaturePage3=%signaturePage3%\nPositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nPositionPageLowerLeftY=%PositionPageLowerLeftY%\nPositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nPositionOnPageUpperRigthY=%PositionOnPageUpperRigthY%\nsignatureRubricImage=%signatureRubricImage%\nlayer2text=%layer2text=%"
+REM \nsignaturePage=%signaturePage%
+
+
+set "CONFIG=headless=%headless%\nlayer2Text=%layer2text%\nsignatureProductionCity=%city%\nsignatureProductionProvince=%province%\nsignatureProductionPostalCode=%postalcode%\nsignatureProductionCountry=ESPAÑA\nsignaturePositionOnPageLowerLeftX=%PositionOnPageLowerLeftX%\nsignaturePositionOnPageLowerLeftY=%PositionOnPageLowerLeftY%\nsignaturePositionOnPageUpperRightX=%PositionOnPageUpperRightX%\nsignaturePositionOnPageUpperRightY=%PositionOnPageUpperRigthY%\nsignaturePage=-1\nsignatureRubricImage=%signatureRubricImage%\nincludeOnlySignningCertificate=true\nownerPassword=uecko24"
+
+REM echo %CONFIG% > %LOGFILE%
+
+call :FIRMA >> %LOGFILE%
+exit /b
+
+:FIRMA
+"C:\Program Files (x86)\AutoFirma\AutoFirma\AutoFirmaCommandLine.exe" sign -i %ARCHIVO% -o %ARCHIVO% -store pkcs12:"D:\DATOS2\FINANZAS\CERTIFICADOS\graden.pfx" -password %PASSGRADEN% -filter subject.contains:806465 -config %CONFIG%
+