Se arregla la generación de facturas a partir de un contrato, para que coja la tienda activa y no la tienda del contrato

git-svn-id: https://192.168.0.254/svn/Proyectos.AbetoDesign_FactuGES/trunk@32 93f398dd-4eb6-7a46-baf6-13f46f578da2
This commit is contained in:
roberto 2012-01-19 11:24:07 +00:00
parent 113630ed59
commit 170617cb44
7 changed files with 297 additions and 298 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -3,7 +3,7 @@ unit schRecibosClienteClient_Intf;
interface interface
uses uses
Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf; Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
const const
{ Data table rules ids { Data table rules ids
@ -245,7 +245,7 @@ type
end; end;
{ TListaAnosRecibosDataTableRules } { TListaAnosRecibosDataTableRules }
TListaAnosRecibosDataTableRules = class(TDADataTableRules, IListaAnosRecibos) TListaAnosRecibosDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosRecibos)
private private
protected protected
{ Property getters and setters } { Property getters and setters }
@ -508,7 +508,7 @@ type
end; end;
{ TRecibosClienteDataTableRules } { TRecibosClienteDataTableRules }
TRecibosClienteDataTableRules = class(TDADataTableRules, IRecibosCliente) TRecibosClienteDataTableRules = class(TIntfObjectDADataTableRules, IRecibosCliente)
private private
protected protected
{ Property getters and setters } { Property getters and setters }
@ -873,7 +873,7 @@ type
end; end;
{ TPagosClienteDataTableRules } { TPagosClienteDataTableRules }
TPagosClienteDataTableRules = class(TDADataTableRules, IPagosCliente) TPagosClienteDataTableRules = class(TIntfObjectDADataTableRules, IPagosCliente)
private private
protected protected
{ Property getters and setters } { Property getters and setters }
@ -1232,7 +1232,7 @@ type
end; end;
{ TRecibosCompensadosCliDataTableRules } { TRecibosCompensadosCliDataTableRules }
TRecibosCompensadosCliDataTableRules = class(TDADataTableRules, IRecibosCompensadosCli) TRecibosCompensadosCliDataTableRules = class(TIntfObjectDADataTableRules, IRecibosCompensadosCli)
private private
protected protected
{ Property getters and setters } { Property getters and setters }

View File

@ -23,7 +23,7 @@ uses
uDialogUtils, uBizDetallesContratoCliente, uBizDetallesFacturaCliente, uDialogUtils, uBizDetallesContratoCliente, uBizDetallesFacturaCliente,
uContratosClienteController, uFacturasClienteController, uClientesController, uContratosClienteController, uFacturasClienteController, uClientesController,
uDetallesFacturaClienteController, uControllerDetallesBase, uDetallesFacturaClienteController, uControllerDetallesBase,
uBizContactos, schFacturasClienteClient_Intf, uBizContactos, schFacturasClienteClient_Intf, uFactuGES_App,
schContratosClienteClient_Intf, uBizDetallesPresupuestoCliente; schContratosClienteClient_Intf, uBizDetallesPresupuestoCliente;
var var
@ -70,7 +70,7 @@ begin
AFactura.IVA := AContrato.IVA; AFactura.IVA := AContrato.IVA;
AFactura.IMPORTE_IVA := AContrato.IMPORTE_IVA; AFactura.IMPORTE_IVA := AContrato.IMPORTE_IVA;
AFactura.IMPORTE_TOTAL := AContrato.IMPORTE_TOTAL; AFactura.IMPORTE_TOTAL := AContrato.IMPORTE_TOTAL;
AFactura.ID_TIENDA := AContrato.ID_TIENDA; AFactura.ID_TIENDA := AppFactuGES.TiendaActiva.ID;
// AFactura.ID_VENDEDOR := AContrato.ID_VENDEDOR; // AFactura.ID_VENDEDOR := AContrato.ID_VENDEDOR;
AFactura.RECARGO_EQUIVALENCIA := AContrato.RECARGO_EQUIVALENCIA; AFactura.RECARGO_EQUIVALENCIA := AContrato.RECARGO_EQUIVALENCIA;
AFactura.RE := AContrato.RE; AFactura.RE := AContrato.RE;

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"> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid> <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
@ -29,7 +29,6 @@
<Borland.ProjectType/> <Borland.ProjectType/>
<BorlandProject> <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">4</VersionInfo><VersionInfo Name="Release">9</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.4.9.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.4.9.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 18 de enero de 2012 15:13</VersionInfoKeys></VersionInfoKeys><Excluded_Packages> <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">4</VersionInfo><VersionInfo Name="Release">9</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.4.9.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.4.9.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 18 de enero de 2012 15:13</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages> <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> </Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions> </ProjectExtensions>

Binary file not shown.