diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index dd989a58..38396e11 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -52,9 +52,7 @@
Delphi.Personality
VCLApplication
-FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2930FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.9.3.0FactuGESFactuGES2.9.3.0
-
-
+FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2940FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.9.4.0FactuGESFactuGES2.9.4.0
File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found
FactuGES.dprFalse
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index 52ba14f2..3c0e5648 100644
--- a/Source/Cliente/FactuGES.rc
+++ b/Source/Cliente/FactuGES.rc
@@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Factuges.ico"
1 VERSIONINFO
-FILEVERSION 2,9,3,0
-PRODUCTVERSION 2,9,3,0
+FILEVERSION 2,9,4,0
+PRODUCTVERSION 2,9,4,0
FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L
FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
BLOCK "0C0A04E4"
BEGIN
VALUE "CompanyName", "Rodax Software S.L.\0"
- VALUE "FileVersion", "2.9.3.0\0"
+ VALUE "FileVersion", "2.9.4.0\0"
VALUE "InternalName", "FactuGES\0"
VALUE "ProductName", "FactuGES\0"
- VALUE "ProductVersion", "2.9.3.0\0"
+ VALUE "ProductVersion", "2.9.4.0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index c9054fcf..4090cea0 100644
Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ
diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj
index 4cf8df42..4054510a 100644
--- a/Source/GUIBase/GUIBase.dproj
+++ b/Source/GUIBase/GUIBase.dproj
@@ -58,34 +58,34 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res
index 1641339f..8b251f31 100644
Binary files a/Source/GUIBase/GUIBase.res and b/Source/GUIBase/GUIBase.res differ
diff --git a/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas b/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas
index eeca5fac..a1e4c97c 100644
--- a/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas
+++ b/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas
@@ -3,7 +3,7 @@ unit schContratosClienteClient_Intf;
interface
uses
- Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
+ Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
const
{ Data table rules ids
@@ -271,7 +271,7 @@ type
end;
{ TValoresDataTableRules }
- TValoresDataTableRules = class(TDADataTableRules, IValores)
+ TValoresDataTableRules = class(TIntfObjectDADataTableRules, IValores)
private
protected
{ Property getters and setters }
@@ -330,7 +330,7 @@ type
end;
{ TPropiedadesDataTableRules }
- TPropiedadesDataTableRules = class(TDADataTableRules, IPropiedades)
+ TPropiedadesDataTableRules = class(TIntfObjectDADataTableRules, IPropiedades)
private
protected
{ Property getters and setters }
@@ -377,7 +377,7 @@ type
end;
{ TListaAnosContratosDataTableRules }
- TListaAnosContratosDataTableRules = class(TDADataTableRules, IListaAnosContratos)
+ TListaAnosContratosDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosContratos)
private
protected
{ Property getters and setters }
@@ -496,7 +496,7 @@ type
end;
{ TContratosClienteBeneficiosDataTableRules }
- TContratosClienteBeneficiosDataTableRules = class(TDADataTableRules, IContratosClienteBeneficios)
+ TContratosClienteBeneficiosDataTableRules = class(TIntfObjectDADataTableRules, IContratosClienteBeneficios)
private
protected
{ Property getters and setters }
@@ -897,7 +897,7 @@ type
end;
{ TContratosClienteDataTableRules }
- TContratosClienteDataTableRules = class(TDADataTableRules, IContratosCliente)
+ TContratosClienteDataTableRules = class(TIntfObjectDADataTableRules, IContratosCliente)
private
f_FORMA_PAGO: IROStrings;
f_PLAZO_ENTREGA: IROStrings;
@@ -1259,7 +1259,7 @@ type
end;
{ TTiposCapitulosDataTableRules }
- TTiposCapitulosDataTableRules = class(TDADataTableRules, ITiposCapitulos)
+ TTiposCapitulosDataTableRules = class(TIntfObjectDADataTableRules, ITiposCapitulos)
private
protected
{ Property getters and setters }
@@ -1420,7 +1420,7 @@ type
end;
{ TContratosCliente_DetallesDataTableRules }
- TContratosCliente_DetallesDataTableRules = class(TDADataTableRules, IContratosCliente_Detalles)
+ TContratosCliente_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IContratosCliente_Detalles)
private
protected
{ Property getters and setters }
diff --git a/Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorController.pas b/Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorController.pas
index 6d58735a..7b5f51fe 100644
--- a/Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorController.pas
+++ b/Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorController.pas
@@ -638,13 +638,13 @@ begin
ShowHourglassCursor;
// solicita por José Luís que el asunto del correo y el documento adunto sean igual que la referencia del pedido impreso
- ATituloEnvio := Copy(APedido.REF_CON_CLIENTE, 8, 6) + '-' + APedido.REF_VENDEDOR + '-' + APedido.NOMBRE_CLIENTE + '-' + APedido.DESCRIPCION_GENERAL;
+ ATituloEnvio := 'Pedido ref.' + Copy(APedido.REF_CON_CLIENTE, 8, 6) + '-' + APedido.REF_VENDEDOR + '-' + APedido.NOMBRE_CLIENTE + '-' + APedido.DESCRIPCION_GENERAL;
AFicheroTMP := DarFicheroPDFTemporal(EscapeIllegalChars(ATituloEnvio));
AReportController := TPedidosProveedorReportController.Create;
try
AReportController.ExportToPDF(APedido.ID, AFicheroTMP);
- SendMailMAPI(ATituloEnvio, '', AFicheroTMP, '', '', APedido.Proveedor.NOMBRE, AEMail);
+ SendMailMAPI(ATituloEnvio, ATituloEnvio, AFicheroTMP, '', '', APedido.Proveedor.NOMBRE, AEMail);
finally
DeleteFile(AFicheroTMP);
AReportController := NIL;
diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm
index 6370f58c..631584cc 100644
--- a/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm
+++ b/Source/Modulos/Recibos de proveedor/Views/uEditorRecibosProveedor.dfm
@@ -41,7 +41,7 @@ inherited fEditorRecibosProveedor: TfEditorRecibosProveedor
Width = 638
ExplicitWidth = 638
inherited tbxMain: TTBXToolbar
- ExplicitWidth = 546
+ ExplicitWidth = 638
end
inherited tbxFiltro: TTBXToolbar
ExplicitWidth = 431
@@ -100,12 +100,14 @@ inherited fEditorRecibosProveedor: TfEditorRecibosProveedor
DataController.Summary.DefaultGroupSummaryItems = <
item
Format = ',0.00 '#8364';-,0.00 '#8364
+ Kind = skSum
Position = spFooter
Column = frViewRecibosProveedor1.cxGridViewIMPORTE_TOTAL
end>
DataController.Summary.FooterSummaryItems = <
item
Format = ',0.00 '#8364';-,0.00 '#8364
+ Kind = skSum
Column = frViewRecibosProveedor1.cxGridViewIMPORTE_TOTAL
end
item
@@ -134,31 +136,42 @@ inherited fEditorRecibosProveedor: TfEditorRecibosProveedor
Width = 638
ExplicitWidth = 638
inherited txtFiltroTodo: TcxTextEdit
+ Left = 109
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
+ ExplicitLeft = 109
ExplicitWidth = 541
Width = 541
end
inherited edtFechaIniFiltro: TcxDateEdit
+ Left = 109
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
+ ExplicitLeft = 109
ExplicitWidth = 190
Width = 190
end
inherited edtFechaFinFiltro: TcxDateEdit
- Left = 294
+ Left = 306
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 294
+ ExplicitLeft = 306
ExplicitWidth = 334
Width = 334
end
+ inherited dxLayoutControl1Group_Root: TdxLayoutGroup
+ inherited dxLayoutControl1Group1: TdxLayoutGroup
+ inherited dxLayoutControl1Item2: TdxLayoutItem
+ Caption = 'Entre la fecha vto.:'
+ end
+ end
+ end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 638
@@ -205,10 +218,10 @@ inherited fEditorRecibosProveedor: TfEditorRecibosProveedor
ImageIndex = 22
end
inherited actPrevisualizar: TAction
- Enabled = False
+ Visible = True
end
inherited actImprimir: TAction
- Enabled = False
+ Visible = True
end
inherited actDuplicar: TAction
Enabled = False
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index 54a055d5..5a5a7aae 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -1,299 +1,298 @@
-
+
-
- {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}
- FactuGES_Server.dpr
- Debug
- AnyCPU
- DCC32
- ..\..\Output\Debug\Servidor\FactuGES_Server.exe
-
-
- 7.0
- False
- False
- 0
- 3
- ..\..\Output\Release\Servidor
- RELEASE
-
-
- 7.0
- 3
- ..\..\Output\Debug\Servidor
- DEBUG;
- True
-
-
- Delphi.Personality
-
-
-FalseTrueFalseTrueFalse2930FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.9.3.0FactuGES (Servidor)2.9.3.0viernes, 17 de mayo de 2019 18:59
-
- File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found
- FactuGES_Server.dpr
-
-
-
-
- MainSource
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDARemoteService
-
-
-
- TRORemoteDataModule
-
-
-
-
-
-
-
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDARemoteService
-
-
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDARemoteService
-
-
-
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
-
-
- TDataAbstractService
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
- TDataModule
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
-
-
-
- TDataAbstractService
-
-
-
-
-
- TDataAbstractService
-
-
-
- TFrame
-
-
-
- TFrame
-
-
-
- TForm
-
-
-
- TFrame
-
-
-
- TDARemoteService
-
-
-
-
-
-
- TDataModule
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}
+ FactuGES_Server.dpr
+ Debug
+ AnyCPU
+ DCC32
+ ..\..\Output\Debug\Servidor\FactuGES_Server.exe
+
+
+ 7.0
+ False
+ False
+ 0
+ 3
+ ..\..\Output\Release\Servidor
+ RELEASE
+
+
+ 7.0
+ 3
+ ..\..\Output\Debug\Servidor
+ DEBUG;
+ True
+
+
+ Delphi.Personality
+
+
+ FalseTrueFalseTrueFalse2940FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.9.4.0FactuGES (Servidor)2.9.4.0jueves, 25 de julio de 2019 11:52
+ File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found
+ FactuGES_Server.dpr
+
+
+
+
+ MainSource
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDARemoteService
+
+
+
+ TRORemoteDataModule
+
+
+
+
+
+
+
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+ TDataModule
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+
+
+
+ TDataAbstractService
+
+
+
+
+
+ TDataAbstractService
+
+
+
+ TFrame
+
+
+
+ TFrame
+
+
+
+ TForm
+
+
+
+ TFrame
+
+
+
+ TDARemoteService
+
+
+
+
+
+
+ TDataModule
+
+
+
+
+
+
+
+
+
+
+
+
+