Acana_Interiorismo/FactuGES2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cambios para que salga bien el refresco de albaranes y la tienda a la que pertenece

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@337 f4e31baf-9722-1c47-927c-6f952f962d4b
This commit is contained in:
David Arranz 2008-11-26 12:57:27 +00:00
parent f180b9d68b
commit 08e376d8ae
7 changed files with 323 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Database/scripts/factuges.sql
View File

@ -1546,7 +1546,7 @@ SELECT
ALBARANES_CLIENTE.FECHA_ENVIO,
ALBARANES_CLIENTE.FECHA_RECEPCION,
ALBARANES_CLIENTE.ID_TIENDA,
EMPRESAS_TIENDAS.NOMBRE AS TIENDA
COALESCE(EMPRESAS_TIENDAS.NOMBRE, 'Todas') AS TIENDA
FROM
ALBARANES_CLIENTE
@ -1639,7 +1639,7 @@ SELECT
ALBARANES_PROVEEDOR.USUARIO,
ALBARANES_PROVEEDOR.ID_FORMA_PAGO,
ALBARANES_PROVEEDOR.ID_TIENDA,
EMPRESAS_TIENDAS.NOMBRE AS TIENDA
COALESCE(EMPRESAS_TIENDAS.NOMBRE, 'Todas') AS TIENDA
FROM
ALBARANES_PROVEEDOR
@ -3214,7 +3214,7 @@ SELECT
PEDIDOS_PROVEEDOR.IMPORTE_IVA,
PEDIDOS_PROVEEDOR.ID_FORMA_PAGO,
PEDIDOS_PROVEEDOR.ID_TIENDA,
EMPRESAS_TIENDAS.NOMBRE AS TIENDA
COALESCE(EMPRESAS_TIENDAS.NOMBRE, 'Todas') AS TIENDA
FROM
PEDIDOS_PROVEEDOR
INNER JOIN CONTACTOS ON (CONTACTOS.ID = PEDIDOS_PROVEEDOR.ID_PROVEEDOR)
@ -3308,7 +3308,7 @@ SELECT
PRESUPUESTOS_CLIENTE.IMPORTE_TOTAL,
PRESUPUESTOS_CLIENTE.ID_FORMA_PAGO,
PRESUPUESTOS_CLIENTE.id_tienda,
EMPRESAS_TIENDAS.NOMBRE AS TIENDA,
COALESCE(EMPRESAS_TIENDAS.NOMBRE, 'Todas') AS TIENDA,
PRESUPUESTOS_CLIENTE.ID_VENDEDOR,
CONTACTOS2.NOMBRE AS VENDEDOR

8
Source/Modulos/Albaranes de cliente/Data/uDataModuleAlbaranesCliente.dfm
View File

@ -50,6 +50,7 @@ inherited DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente
DataType = datString
Size = 255
DisplayLabel = 'Nombre del cliente'
ServerAutoRefresh = True
DictionaryEntry = 'AlbaranesCliente_NOMBRE'
end
item
@ -128,6 +129,7 @@ inherited DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente
DataType = datString
Size = 255
DisplayLabel = 'Calle'
ServerAutoRefresh = True
DictionaryEntry = 'AlbaranesCliente_CALLE'
end
item
@ -135,6 +137,7 @@ inherited DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente
DataType = datString
Size = 10
DisplayLabel = 'C'#243'd. postal'
ServerAutoRefresh = True
DictionaryEntry = 'AlbaranesCliente_CODIGO_POSTAL'
end
item
@ -142,6 +145,7 @@ inherited DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente
DataType = datString
Size = 255
DisplayLabel = 'Poblaci'#243'n'
ServerAutoRefresh = True
DictionaryEntry = 'AlbaranesCliente_POBLACION'
end
item
@ -149,6 +153,7 @@ inherited DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente
DataType = datString
Size = 255
DisplayLabel = 'Provincia'
ServerAutoRefresh = True
DictionaryEntry = 'AlbaranesCliente_PROVINCIA'
end
item
@ -156,6 +161,7 @@ inherited DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente
DataType = datString
Size = 255
DisplayLabel = 'Persona de contacto'
ServerAutoRefresh = True
DictionaryEntry = 'AlbaranesCliente_PERSONA_CONTACTO'
end
item
@ -163,6 +169,7 @@ inherited DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente
DataType = datString
Size = 25
DisplayLabel = 'Tel'#233'fono'
ServerAutoRefresh = True
DictionaryEntry = 'AlbaranesCliente_TELEFONO'
end
item
@ -285,6 +292,7 @@ inherited DataModuleAlbaranesCliente: TDataModuleAlbaranesCliente
Name = 'TIENDA'
DataType = datString
Size = 255
ServerAutoRefresh = True
end>
Params = <>
StreamingOptions = [soDisableEventsWhileStreaming]

14
Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteClient_Intf.pas
View File

@ -3,14 +3,14 @@ unit schAlbaranesClienteClient_Intf;
interface
uses
Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
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_AlbaranesCliente = '{A2240415-5E5C-4E2F-A97E-643B99B4CD29}';
RID_AlbaranesCliente_Detalles = '{8B7B188F-44AA-4760-9382-70A6A43C3D7A}';
RID_AlbaranesCliente = '{01F506EA-EABE-4F52-9EAA-43EC08B5F96F}';
RID_AlbaranesCliente_Detalles = '{88EE6D4A-FCA7-4055-952A-DFE5D4679C52}';
{ Data table names }
nme_AlbaranesCliente = 'AlbaranesCliente';
@ -137,7 +137,7 @@ const
type
{ IAlbaranesCliente }
IAlbaranesCliente = interface(IDAStronglyTypedDataTable)
['{32DF20F5-FC08-4CBF-81B4-59213CB85718}']
['{4F964B2D-8C90-492D-9267-F5E2B3DDFB63}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -389,7 +389,7 @@ type
end;
{ TAlbaranesClienteDataTableRules }
TAlbaranesClienteDataTableRules = class(TIntfObjectDADataTableRules, IAlbaranesCliente)
TAlbaranesClienteDataTableRules = class(TDADataTableRules, IAlbaranesCliente)
private
f_OBSERVACIONES: IROStrings;
f_INCIDENCIAS: IROStrings;
@ -652,7 +652,7 @@ type
{ IAlbaranesCliente_Detalles }
IAlbaranesCliente_Detalles = interface(IDAStronglyTypedDataTable)
['{F6AB138E-BC1E-46A1-BF4B-7C4E26732149}']
['{E8D3062A-A5CA-4AE5-828F-99FDD5587811}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -744,7 +744,7 @@ type
end;
{ TAlbaranesCliente_DetallesDataTableRules }
TAlbaranesCliente_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IAlbaranesCliente_Detalles)
TAlbaranesCliente_DetallesDataTableRules = class(TDADataTableRules, IAlbaranesCliente_Detalles)
private
protected
{ Property getters and setters }

8
Source/Modulos/Albaranes de cliente/Model/schAlbaranesClienteServer_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_AlbaranesClienteDelta = '{9EE53C2F-36F8-4535-97B4-77EA63F01E77}';
RID_AlbaranesCliente_DetallesDelta = '{E03CDCD0-93D0-4390-B863-03BEAD0CBDCF}';
RID_AlbaranesClienteDelta = '{63F763A7-8A93-4D0B-9931-17164BB987A7}';
RID_AlbaranesCliente_DetallesDelta = '{2D200945-9A98-464A-AB39-1C3FE7E78CFC}';
type
{ IAlbaranesClienteDelta }
IAlbaranesClienteDelta = interface(IAlbaranesCliente)
['{9EE53C2F-36F8-4535-97B4-77EA63F01E77}']
['{63F763A7-8A93-4D0B-9931-17164BB987A7}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer;
@ -531,7 +531,7 @@ type
{ IAlbaranesCliente_DetallesDelta }
IAlbaranesCliente_DetallesDelta = interface(IAlbaranesCliente_Detalles)
['{E03CDCD0-93D0-4390-B863-03BEAD0CBDCF}']
['{2D200945-9A98-464A-AB39-1C3FE7E78CFC}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_ALBARANValue : Integer;

17
Source/Modulos/Albaranes de cliente/Servidor/srvAlbaranesCliente_Impl.dfm
View File

@ -212,6 +212,7 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
Name = 'NOMBRE'
DataType = datString
Size = 255
ServerAutoRefresh = True
DictionaryEntry = 'AlbaranesCliente_NOMBRE'
end
item
@ -281,36 +282,42 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
Name = 'CALLE'
DataType = datString
Size = 255
ServerAutoRefresh = True
DictionaryEntry = 'AlbaranesCliente_CALLE'
end
item
Name = 'CODIGO_POSTAL'
DataType = datString
Size = 10
ServerAutoRefresh = True
DictionaryEntry = 'AlbaranesCliente_CODIGO_POSTAL'
end
item
Name = 'POBLACION'
DataType = datString
Size = 255
ServerAutoRefresh = True
DictionaryEntry = 'AlbaranesCliente_POBLACION'
end
item
Name = 'PROVINCIA'
DataType = datString
Size = 255
ServerAutoRefresh = True
DictionaryEntry = 'AlbaranesCliente_PROVINCIA'
end
item
Name = 'PERSONA_CONTACTO'
DataType = datString
Size = 255
ServerAutoRefresh = True
DictionaryEntry = 'AlbaranesCliente_PERSONA_CONTACTO'
end
item
Name = 'TELEFONO'
DataType = datString
Size = 25
ServerAutoRefresh = True
DictionaryEntry = 'AlbaranesCliente_TELEFONO'
end
item
@ -412,6 +419,7 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
Name = 'TIENDA'
DataType = datString
Size = 255
ServerAutoRefresh = True
end>
end
item
@ -1159,7 +1167,7 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
DeleteCommandName = 'Delete_AlbaranesCliente'
UpdateCommandName = 'Update_AlbaranesCliente'
ReferencedDataset = 'AlbaranesCliente'
ProcessorOptions = [poPrepareCommands]
ProcessorOptions = [poAutoGenerateRefreshDataset, poPrepareCommands]
UpdateMode = updWhereKeyOnly
Left = 200
Top = 24
@ -1200,6 +1208,7 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
DataType = datString
Size = 255
DisplayLabel = 'Nombre del cliente'
ServerAutoRefresh = True
end
item
Name = 'AlbaranesCliente_SITUACION'
@ -1212,36 +1221,42 @@ object srvAlbaranesCliente: TsrvAlbaranesCliente
DataType = datString
Size = 255
DisplayLabel = 'Calle'
ServerAutoRefresh = True
end
item
Name = 'AlbaranesCliente_CODIGO_POSTAL'
DataType = datString
Size = 10
DisplayLabel = 'C'#243'd. postal'
ServerAutoRefresh = True
end
item
Name = 'AlbaranesCliente_POBLACION'
DataType = datString
Size = 255
DisplayLabel = 'Poblaci'#243'n'
ServerAutoRefresh = True
end
item
Name = 'AlbaranesCliente_PROVINCIA'
DataType = datString
Size = 255
DisplayLabel = 'Provincia'
ServerAutoRefresh = True
end
item
Name = 'AlbaranesCliente_PERSONA_CONTACTO'
DataType = datString
Size = 255
DisplayLabel = 'Persona de contacto'
ServerAutoRefresh = True
end
item
Name = 'AlbaranesCliente_TELEFONO'
DataType = datString
Size = 25
DisplayLabel = 'Tel'#233'fono'
ServerAutoRefresh = True
end
item
Name = 'AlbaranesCliente_OBSERVACIONES'

6
Source/Servidor/FactuGES_Server.dpr
View File

@ -84,8 +84,6 @@ uses
uRptEtiquetasContacto_Server in '..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas' {RptEtiquetasContacto: TDataModule},
uRptFacturasCliente_Server in '..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas' {RptFacturasCliente: TDataModule},
uRptRecibosCliente_Server in '..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas' {RptRecibosCliente: TDataModule},
schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas',
schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas',
schAlbaranesProveedorClient_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas',
schAlbaranesProveedorServer_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas',
schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas',
@ -131,7 +129,9 @@ uses
schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas',
schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas',
schRemesasClienteClient_Intf in '..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas',
schRemesasClienteServer_Intf in '..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas';
schRemesasClienteServer_Intf in '..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas',
schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas',
schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas';
{$R *.res}
{$R ..\Servicios\RODLFile.res}

3
Source/Servidor/FactuGES_Server.dproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
@ -29,6 +29,7 @@
<Borland.ProjectType />
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">2</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">2.2.4.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.2.4.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 22 de julio de 2008 19:27</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions>