Tecistel/Tecsitel_FactuGES2
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ticket #74 -> La exportación de un presupuesto a word falla en produccion, sin embargo en la VM no falla

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@583 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
David Arranz 2008-09-10 16:49:09 +00:00
parent 6c4d3b03e0
commit daee8834d5
23 changed files with 165 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas
View File

@ -9,8 +9,8 @@ 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_Empresas = '{A8F0968B-4560-4FD7-BE09-BEC55C3721E1}';
RID_EmpresasDatosBanco = '{98CA76B7-E2D1-40CA-B5A4-B6F4B99E2B5B}';
RID_Empresas = '{9B1E99A5-EF96-4942-8C46-7505F5501BB3}';
RID_EmpresasDatosBanco = '{58EF2E5E-97CA-4654-87BD-C6DA7A2F911C}';
{ Data table names }
nme_Empresas = 'Empresas';
@ -99,7 +99,7 @@ const
type
{ IEmpresas }
IEmpresas = interface(IDAStronglyTypedDataTable)
['{550BD567-4A92-49E1-BC8B-2F778AF6F0F9}']
['{FADCCB5A-1903-4E8D-B84C-A0C0CFDE28B9}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -422,7 +422,7 @@ type
{ IEmpresasDatosBanco }
IEmpresasDatosBanco = interface(IDAStronglyTypedDataTable)
['{FFBC96B5-51B6-4442-B217-46FF792D7D5C}']
['{AEE9C7D1-61B3-470C-A774-1DB77C111243}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);

8
Source/ApplicationBase/Empresas/Model/schEmpresasServer_Intf.pas
View File

@ -9,13 +9,13 @@ 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_EmpresasDelta = '{2FA42162-1747-4229-9EFB-41D49D7A0177}';
RID_EmpresasDatosBancoDelta = '{AF1B9412-6CE5-479C-A1E3-FEFDF3EE87A6}';
RID_EmpresasDelta = '{BE38FBA7-1592-49D7-8ED6-C4C306CB7135}';
RID_EmpresasDatosBancoDelta = '{8A887444-4C23-4E13-A100-30A02D336255}';
type
{ IEmpresasDelta }
IEmpresasDelta = interface(IEmpresas)
['{2FA42162-1747-4229-9EFB-41D49D7A0177}']
['{BE38FBA7-1592-49D7-8ED6-C4C306CB7135}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldNIF_CIFValue : String;
@ -339,7 +339,7 @@ type
{ IEmpresasDatosBancoDelta }
IEmpresasDatosBancoDelta = interface(IEmpresasDatosBanco)
['{AF1B9412-6CE5-479C-A1E3-FEFDF3EE87A6}']
['{8A887444-4C23-4E13-A100-30A02D336255}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer;

102
Source/Base/Base.dproj
View File

@ -53,57 +53,57 @@
<DelphiCompile Include="Base.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\Informes\adortl.dcp" />
<DCCReference Include="..\Informes\cxDataD11.dcp" />
<DCCReference Include="..\Informes\cxEditorsD11.dcp" />
<DCCReference Include="..\Informes\cxExportD11.dcp" />
<DCCReference Include="..\Informes\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Informes\cxGridD11.dcp" />
<DCCReference Include="..\Informes\cxIntl6D11.dcp" />
<DCCReference Include="..\Informes\cxIntlPrintSys3D11.dcp" />
<DCCReference Include="..\Informes\cxLibraryD11.dcp" />
<DCCReference Include="..\Informes\cxPageControlD11.dcp" />
<DCCReference Include="..\Informes\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Informes\dbrtl.dcp" />
<DCCReference Include="..\Informes\dclIndyCore.dcp" />
<DCCReference Include="..\Informes\designide.dcp" />
<DCCReference Include="..\Informes\dsnap.dcp" />
<DCCReference Include="..\Informes\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Informes\dxPSCoreD11.dcp" />
<DCCReference Include="..\Informes\dxThemeD11.dcp" />
<DCCReference Include="..\Informes\GUISDK_D11.dcp" />
<DCCReference Include="..\Informes\IndyCore.dcp" />
<DCCReference Include="..\Informes\IndyProtocols.dcp" />
<DCCReference Include="..\Informes\IndySystem.dcp" />
<DCCReference Include="..\Informes\Jcl.dcp" />
<DCCReference Include="..\Informes\JclVcl.dcp" />
<DCCReference Include="..\Informes\JSDialog100.dcp" />
<DCCReference Include="..\Informes\JvCmpD11R.dcp" />
<DCCReference Include="..\Informes\JvCoreD11R.dcp" />
<DCCReference Include="..\Informes\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Informes\JvDlgsD11R.dcp" />
<DCCReference Include="..\Informes\JvMMD11R.dcp" />
<DCCReference Include="..\Informes\JvNetD11R.dcp" />
<DCCReference Include="..\Informes\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Informes\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Informes\JvSystemD11R.dcp" />
<DCCReference Include="..\Informes\pckMD5.dcp" />
<DCCReference Include="..\Informes\pckUCDataConnector.dcp" />
<DCCReference Include="..\Informes\pckUserControl_RT.dcp" />
<DCCReference Include="..\Informes\PngComponentsD10.dcp" />
<DCCReference Include="..\Informes\PNG_D10.dcp" />
<DCCReference Include="..\Informes\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Informes\RemObjects_Indy_D11.dcp" />
<DCCReference Include="..\Informes\rtl.dcp" />
<DCCReference Include="..\Informes\TB2k_D10.dcp" />
<DCCReference Include="..\Informes\tbx_d10.dcp" />
<DCCReference Include="..\Informes\vcl.dcp" />
<DCCReference Include="..\Informes\vclactnband.dcp" />
<DCCReference Include="..\Informes\vcldb.dcp" />
<DCCReference Include="..\Informes\vcljpg.dcp" />
<DCCReference Include="..\Informes\VclSmp.dcp" />
<DCCReference Include="..\Informes\vclx.dcp" />
<DCCReference Include="..\Informes\xmlrtl.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\adortl.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxExportD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxGridD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxIntl6D11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxIntlPrintSys3D11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxPageControlD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dclIndyCore.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\designide.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dsnap.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dxPSCoreD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\GUISDK_D11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\IndyCore.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\IndyProtocols.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\IndySystem.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\Jcl.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JclVcl.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JSDialog100.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvCmpD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvCoreD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvDlgsD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvMMD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvNetD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvSystemD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\pckMD5.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\pckUCDataConnector.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\pckUserControl_RT.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\RemObjects_Indy_D11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\rtl.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\TB2k_D10.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\vcl.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\vcldb.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\VclSmp.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\vclx.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\xmlrtl.dcp" />
<DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
<DCCReference Include="Conexion\uConfigurarConexion.pas">
<Form>fConfigurarConexion</Form>

6
Source/Cliente/FactuGES.dproj
View File

@ -54,11 +54,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">1</VersionInfo><VersionInfo Name="MinorVer">3</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.3.0.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">1.3.0.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">1</VersionInfo><VersionInfo Name="MinorVer">3</VersionInfo><VersionInfo Name="Release">1</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">1.3.1.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">1.3.1.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>

8
Source/Cliente/FactuGES.rc
View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Factuges.ico"
1 VERSIONINFO
FILEVERSION 1,3,0,0
PRODUCTVERSION 1,3,0,0
FILEVERSION 1,3,1,0
PRODUCTVERSION 1,3,1,0
FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L
FILEOS 0x40004L
@ -13,10 +13,10 @@ BEGIN
BLOCK "0C0A04E4"
BEGIN
VALUE "CompanyName", "Rodax Software S.L.\0"
VALUE "FileVersion", "1.3.0.0\0"
VALUE "FileVersion", "1.3.1.0\0"
VALUE "InternalName", "FactuGES\0"
VALUE "ProductName", "FactuGES\0"
VALUE "ProductVersion", "1.3.0.0\0"
VALUE "ProductVersion", "1.3.1.0\0"
END
END
BLOCK "VarFileInfo"

BIN
Source/Cliente/FactuGES.res
View File

Binary file not shown.

4
Source/Modulos/Albaranes de cliente/Reports/uRptWordAlbaranCliente.pas
View File

@ -81,12 +81,12 @@ begin
end;
FDocumento := TWordDoc.CreateOpenDoc (FWordApp, FPlantilla);
FWordApp.SaveActiveDocAs(FNombreFichero);
try
if not RellenarInforme then
RaiseError('Se producido un error al generar el informe en MS Word.');
FDocumento.SaveAs(FNombreFichero);
FWordApp.CloseApp(wdDoNotSaveChanges);
FWordApp.CloseApp(wdSaveChanges);
Result := True;
finally
FDocumento := NIL;

5
Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas
View File

@ -114,7 +114,7 @@ begin
end;
FDocumento := TWordDoc.CreateNewDoc(FWordApp, FPlantilla);
FWordApp.ScreenUpdating := False;
FWordApp.SaveActiveDocAs(FNombreFichero);
try
if not RellenarCabecera then
RaiseError('Se producido un error al generar la cabecera en MS Word.');
@ -122,8 +122,7 @@ begin
if not RellenarInforme then
RaiseError('Se producido un error al generar el informe en MS Word.');
FDocumento.SaveAs(FNombreFichero);
FWordApp.CloseApp(wdDoNotSaveChanges);
FWordApp.CloseApp(wdSaveChanges);
Result := True;
finally
FDocumento := NIL;

BIN
Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.res
View File

Binary file not shown.

7
Source/Modulos/Pedidos a proveedor/Controller/View/uIEditorPedidosProveedorPreview.pas
View File

@ -8,6 +8,13 @@ uses
type
IEditorPedidosProveedorPreview = interface(IEditorPreview)
['{9B638488-5156-4FDA-BD85-524DC1D6F6A6}']
procedure SetVerPrecios(const Value: Boolean);
function GetVerPrecios: Boolean;
property VerPrecios : Boolean read GetVerPrecios write SetVerPrecios;
function GetVerRefProveedor: Boolean;
procedure SetVerRefProveedor(const Value: Boolean);
property VerRefProveedor : Boolean read GetVerRefProveedor write SetVerRefProveedor;
end;

2
Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorReportController.pas
View File

@ -134,6 +134,8 @@ begin
try
AEditor.Controller := Self;
AEditor.ListaID := AListaID;
AEditor.VerPrecios := VerPrecios;
AEditor.VerRefProveedor := VerRefProveedor;
AEditor.Title := 'Pedido a proveedor - ' + AppFactuGES.EmpresaActiva.NOMBRE;
AEditor.LoadFromStream(AStream);
AEditor.Preview;

20
Source/Modulos/Pedidos a proveedor/Reports/uRptWordPedidoProveedor.dfm
View File

@ -28,10 +28,10 @@ object RptWordPedidoProveedor: TRptWordPedidoProveedor
'N,'#10' V_PEDIDOS_PROVEEDOR.POBLACION AS POBLACION_ALMACEN,'#10' V_PED' +
'IDOS_PROVEEDOR.PROVINCIA AS PROVINCIA_ALMACEN,'#10' V_PEDIDOS_PROVE' +
'EDOR.CODIGO_POSTAL AS CODIGO_POSTAL_ALMACEN,'#10' V_PEDIDOS_PROVEED' +
'OR.PERSONA_CONTACTO AS PERSONA_CONTACTO_ALMACEN'#10'FROM'#10' V_PEDIDOS' +
'_PROVEEDOR'#10' LEFT OUTER JOIN V_PROVEEDORES ON (V_PROVEEDORES.ID ' +
'= V_PEDIDOS_PROVEEDOR.ID_PROVEEDOR)'#10'WHERE V_PEDIDOS_PROVEEDOR.ID' +
' = :ID'#10#10
'OR.PERSONA_CONTACTO AS PERSONA_CONTACTO_ALMACEN,'#10' V_PEDIDOS_PRO' +
'VEEDOR.IMPORTE_TOTAL'#10'FROM'#10' V_PEDIDOS_PROVEEDOR'#10' LEFT OUTER JOI' +
'N V_PROVEEDORES ON (V_PROVEEDORES.ID = V_PEDIDOS_PROVEEDOR.ID_PR' +
'OVEEDOR)'#10'WHERE V_PEDIDOS_PROVEEDOR.ID = :ID'#10#10
StatementType = stSQL
ColumnMappings = <
item
@ -93,6 +93,10 @@ object RptWordPedidoProveedor: TRptWordPedidoProveedor
item
DatasetField = 'FECHA_ENTREGA'
TableField = 'FECHA_ENTREGA'
end
item
DatasetField = 'IMPORTE_TOTAL'
TableField = 'IMPORTE_TOTAL'
end>
end>
Name = 'Informe_Cabecera'
@ -166,6 +170,10 @@ object RptWordPedidoProveedor: TRptWordPedidoProveedor
Name = 'PERSONA_CONTACTO_ALMACEN'
DataType = datString
Size = 255
end
item
Name = 'IMPORTE_TOTAL'
DataType = datCurrency
end>
ReadOnly = True
end
@ -395,6 +403,10 @@ object RptWordPedidoProveedor: TRptWordPedidoProveedor
Name = 'PERSONA_CONTACTO_ALMACEN'
DataType = datString
Size = 255
end
item
Name = 'IMPORTE_TOTAL'
DataType = datCurrency
end>
Params = <
item

58
Source/Modulos/Pedidos a proveedor/Reports/uRptWordPedidoProveedor.pas
View File

@ -23,15 +23,14 @@ type
FDocumento : TWordDoc;
FCodigoPedido : string;
FNombreFichero : String;
FImportes : Boolean;
procedure InsertarConceptos(Tabla : Table);
function Generar : Boolean;
function Generar : Boolean;
function RellenarDatosPedido : Boolean;
function RellenarDatosDetalle : Boolean;
procedure _GenerarPedido(const AID: String);
public
ImprimirPrecio : Boolean;
ImprimirRefProveedor : Boolean;
function Exportar(Codigo, Fichero : String): Boolean;
constructor Create (AOwner : TComponent); override;
destructor Destroy; override;
@ -53,6 +52,8 @@ const
constructor TRptWordPedidoProveedor.Create(AOwner: TComponent);
begin
inherited;
ImprimirPrecio := False;
ImprimirRefProveedor := False;
FDocumento := NIL;
FPlantilla := DarRutaInformes + rptInforme;
end;
@ -97,7 +98,7 @@ begin
end;
FDocumento := TWordDoc.CreateNewDoc(FWordApp, FPlantilla);
FWordApp.ScreenUpdating := False;
FWordApp.SaveActiveDocAs(FNombreFichero);
try
if not RellenarDatosPedido then
RaiseError('Se producido un error al generar la cabecera en MS Word.');
@ -105,8 +106,7 @@ begin
if not RellenarDatosDetalle then
RaiseError('Se producido un error al generar el informe en MS Word.');
FDocumento.SaveAs(FNombreFichero);
FWordApp.CloseApp(wdDoNotSaveChanges);
FWordApp.CloseApp(wdSaveChanges);
Result := True;
finally
FDocumento := NIL;
@ -114,42 +114,6 @@ begin
end;
end;
procedure TRptWordPedidoProveedor.InsertarConceptos(Tabla : Table);
var
numRows, numCols, mergeSplit, shiftCells : OleVariant;
iContador : Integer;
TotalConceptos : Double;
begin
numRows := 2;
numCols := 1;
mergeSplit := False;
shiftCells := False;
iContador := 2; // Empezar en la 2ª fila de celdas. La primera es la
// cabecera de la tabla.
with Tabla, tbl_Detalles do
begin
while not EOF do
begin
if FieldByName('TIPO_DETALLE').AsString <> 'Concepto' then
Break;
// Partir la celda actual en 2 filas de 1 columna.
Rows.Item(iContador).Cells.Split (numRows, numCols, mergesplit);
Cell(iContador, 1).Range.Text := FieldByName('CONCEPTO').AsString;
Cell(iContador, 2).Range.Text := FieldByName('CANTIDAD').AsString;
Cell(iContador, 3).Range.Text := FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_UNIDAD').AsFloat);
Cell(iContador, 4).Range.Text := FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_TOTAL').AsFloat);
TotalConceptos := TotalConceptos + FieldByName('IMPORTE_TOTAL').AsFloat;
Next;
Inc (iContador);
end;
// Borrar la fila vacía que sobra
Rows.Item(iContador).Cells.Delete(shiftCells);
Cell(iContador, 1).Range.Text := 'Total: ' + FormatFloat(DISPLAY_EUROS2, TotalConceptos);
AutoFitBehavior(wdAutoFitWindow);
end;
end;
function TRptWordPedidoProveedor.RellenarDatosDetalle : Boolean;
var
@ -168,17 +132,19 @@ begin
while not tbl_Detalles.EOF do
begin
Rows.Item (iRowCount).Cells.Split (numRows, numCols, mergesplit);
if ImprimirRefProveedor then
Cell(iRowCount, 1).Range.Text := FieldByName('REFERENCIA_PROVEEDOR').AsString;
Cell(iRowCount, 2).Range.Text := FieldByName('REFERENCIA_FABRICANTE').AsString;
Cell(iRowCount, 3).Range.Text := FieldByName('CONCEPTO').AsString;
Cell(iRowCount, 4).Range.Text := FieldByName('CANTIDAD').AsString + ' ' + FieldByName('UNIDAD_MEDIDA').AsString;
if FImportes then
if ImprimirPrecio then
Cell(iRowCount, 5).Range.Text := FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_UNIDAD').AsFloat)
else
Cell(iRowCount, 5).Range.Text := '';
if FImportes then
if ImprimirPrecio then
Cell(iRowCount, 6).Range.Text := FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_TOTAL').AsFloat)
else
Cell(iRowCount, 6).Range.Text := '';
@ -257,7 +223,7 @@ begin
ReplaceBookmark('PersonaContactoProveedor', FieldByName('PERSONA_CONTACTO').AsString);
ReplaceBookmark('CodigoClienteProveedor', FieldByName('CODIGO_CLIENTE').AsString);
if FImportes then
if ImprimirPrecio then
ReplaceBookmark('ImporteTotal', FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_TOTAL').AsFloat))
else
ReplaceBookmark('ImporteTotal', '');

2
Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.pas
View File

@ -125,6 +125,8 @@ begin
AFicheroTMP := DarFicheroTemporal;
AReportGenerator := TRptWordPedidoProveedor.Create(nil);
try
AReportGenerator.ImprimirPrecio := ImprimirPrecio;
AReportGenerator.ImprimirRefProveedor := ImprimirRefProveedor;
if AReportGenerator.Exportar(IntToStr(ID), AFicheroTMP) then
begin
Result := Binary.Create;

3
Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedorReport.dfm
View File

@ -1,7 +1,6 @@
inherited fEditorPedidosProveedorPreview: TfEditorPedidosProveedorPreview
Caption = 'Previsualizar el pedidos proveedor'
ExplicitWidth = 320
ExplicitHeight = 240
ExplicitHeight = 492
PixelsPerInch = 96
TextHeight = 13
inherited TBXDock: TTBXDock

33
Source/Modulos/Pedidos a proveedor/Views/uEditorPedidosProveedorReport.pas
View File

@ -17,9 +17,16 @@ type
TBXItem58: TTBXItem;
procedure actExportarRTFExecute(Sender: TObject);
private
FVerPrecios : Boolean;
FVerRefProveedor : Boolean;
function GetVerPrecios: Boolean;
function GetVerRefProveedor: Boolean;
procedure SetVerPrecios(const Value: Boolean);
procedure SetVerRefProveedor(const Value: Boolean);
{ Private declarations }
public
{ Public declarations }
property VerPrecios : Boolean read GetVerPrecios write SetVerPrecios;
property VerRefProveedor : Boolean read GetVerRefProveedor write SetVerRefProveedor;
end;
@ -40,9 +47,31 @@ begin
raise Exception.Create('No se ha asignado el controlador necesario');
for I := 0 to ListaID.Count - 1 do
(Controller as IPedidosProveedorReportController).ExportToWord(ListaID[I]);
(Controller as IPedidosProveedorReportController).ExportToWord(ListaID[I], '',
FVerPrecios, FVerRefProveedor);
ShowInfoMessage('El pedido se ha exportado correctamente.');
end;
function TfEditorPedidosProveedorPreview.GetVerPrecios: Boolean;
begin
Result := FVerPrecios;
end;
function TfEditorPedidosProveedorPreview.GetVerRefProveedor: Boolean;
begin
Result := FVerRefProveedor;
end;
procedure TfEditorPedidosProveedorPreview.SetVerPrecios(const Value: Boolean);
begin
FVerPrecios := Value;
end;
procedure TfEditorPedidosProveedorPreview.SetVerRefProveedor(
const Value: Boolean);
begin
FVerRefProveedor := Value;
end;
end.

6
Source/Modulos/Presupuestos de cliente/Reports/uRptWordCertificadoTrabajo_Server.pas
View File

@ -106,17 +106,15 @@ begin
end;
FDocumento := TWordDoc.CreateNewDoc(FWordApp, FPlantilla);
FWordApp.ScreenUpdating := False;
FWordApp.SaveActiveDocAs(FNombreFichero);
try
if not RellenarInforme then
RaiseError('Se producido un error al generar el informe en MS Word.');
FDocumento.SaveAs(FNombreFichero);
FWordApp.CloseApp(wdSaveChanges);
Result := True;
finally
FDocumento.CloseDoc(wdDoNotSaveChanges);
FDocumento := NIL;
FWordApp.CloseApp(wdDoNotSaveChanges);
FWordApp := NIL;
end;
end;

6
Source/Modulos/Presupuestos de cliente/Reports/uRptWordPresupuestoCliente.pas
View File

@ -109,7 +109,8 @@ begin
end;
FDocumento := TWordDoc.CreateNewDoc(FWordApp, FPlantilla);
FWordApp.ScreenUpdating := False;
FWordApp.SaveActiveDocAs(FNombreFichero);
try
if not RellenarPortada then
RaiseError('Se producido un error al generar la portada del informe en MS Word.');
@ -129,8 +130,7 @@ begin
FDocumento.Document.Tables.Item(FDocumento.Document.Tables.Count-1).Delete;
end;
FDocumento.SaveAs(FNombreFichero);
FWordApp.CloseApp(wdDoNotSaveChanges);
FWordApp.CloseApp(wdSaveChanges);
Result := True;
finally
FDocumento := NIL;

7
Source/Modulos/Presupuestos de cliente/Servidor/srvPresupuestosCliente_Impl.pas
View File

@ -43,7 +43,7 @@ implementation
{$R *.dfm}
uses
Dialogs, uSistemaFunc,
Dialogs, uSistemaFunc, uROClasses,
{Generated:} FactuGES_Invk, uDataModuleServer, uDatabaseUtils,
schPresupuestosClienteClient_Intf, uRestriccionesUsuarioUtils,
uRptPresupuestosCliente_Server,
@ -134,12 +134,17 @@ begin
Result := NIL;
AFicheroTMP := DarFicheroTemporal;
AReportGenerator := TRptWordPresupuestoCliente.Create(nil);
try
try
if AReportGenerator.Exportar(IntToStr(ID), AFicheroTMP) then
begin
Result := Binary.Create;
Result.LoadFromFile(AFicheroTMP);
end;
except
on E: Exception do
RaiseError(E.Message);
end;
finally
FreeAndNIL(AReportGenerator);
end;

BIN
Source/Servidor/FactuGES_Server.RES
View File

Binary file not shown.

6
Source/Servidor/FactuGES_Server.dpr
View File

@ -102,8 +102,6 @@ uses
srvProvinciasPoblaciones_Impl in '..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas',
uBizArticulosServer in '..\Modulos\Articulos\Model\uBizArticulosServer.pas',
uBizEmpresasServer in '..\ApplicationBase\Empresas\Model\uBizEmpresasServer.pas',
schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas',
schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas',
schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas',
schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas',
schAlmacenesClient_Intf in '..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas',
@ -129,7 +127,9 @@ uses
schInventarioClient_Intf in '..\Modulos\Inventario\Model\schInventarioClient_Intf.pas',
schInventarioServer_Intf in '..\Modulos\Inventario\Model\schInventarioServer_Intf.pas',
schHistoricoMovimientosClient_Intf in '..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas',
schHistoricoMovimientosServer_Intf in '..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas';
schHistoricoMovimientosServer_Intf in '..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas',
schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas',
schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas';
{$R *.res}
{$R ..\Servicios\RODLFile.res}

2
Source/Servidor/FactuGES_Server.dproj
View File

@ -35,7 +35,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType/>
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">3</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.3.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.3.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 05 de septiembre de 2008 19:22</VersionInfoKeys></VersionInfoKeys><Excluded_Packages/><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">3</VersionInfo><VersionInfo Name="Release">1</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.3.1.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.3.1.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 05 de septiembre de 2008 19:22</VersionInfoKeys></VersionInfoKeys><Excluded_Packages/><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions>
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets"/>
<ItemGroup>

10
Source/Servidor/FactuGES_Server.rc
View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Servidor.ico"
1 VERSIONINFO
FILEVERSION 1,3,0,0
PRODUCTVERSION 1,3,0,0
FILEVERSION 1,3,1,0
PRODUCTVERSION 1,3,1,0
FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L
FILEOS 0x40004L
@ -12,9 +12,9 @@ BEGIN
BEGIN
BLOCK "0C0A04E4"
BEGIN
VALUE "FileVersion", "1.3.0.0\0"
VALUE "ProductVersion", "1.3.0.0\0"
VALUE "CompileDate", "lunes, 08 de septiembre de 2008 17:18\0"
VALUE "FileVersion", "1.3.1.0\0"
VALUE "ProductVersion", "1.3.1.0\0"
VALUE "CompileDate", "miércoles, 10 de septiembre de 2008 18:00\0"
END
END
BLOCK "VarFileInfo"