Uecko/AbetoDesign_FactuGES2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 2.5.0

Browse Source 
Tareas #784: Revisar recibos de cliente sus referencias porque no suma el contador
Tareas #785: Poder poner tipo de gasto en las facturas de proveedor para despues sacar un resumen por tipo de gasto
Tareas #792: Falla la generacion de factura de abeto B no encuentra referencia
Tareas #793: A la hora de compensar recibos deben salir tanto pendientes como pagados

git-svn-id: https://192.168.0.254/svn/Proyectos.AbetoDesign_FactuGES/trunk@38 93f398dd-4eb6-7a46-baf6-13f46f578da2
This commit is contained in:
roberto 2012-02-01 16:08:10 +00:00
parent f36e4bfca7
commit d2b4a4ee6b
9 changed files with 325 additions and 318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Build/Build.fbl6
View File

Binary file not shown.

32
Database/scripts/factuges.sql
View File

@ -963,7 +963,8 @@ CREATE TABLE FACTURAS_PROVEEDOR (
ID_TIPO_IVA TIPO_ID,
RECARGO_EQUIVALENCIA TIPO_BOOLEANO,
IGNORAR_CONTABILIDAD SMALLINT,
ID_TIENDA TIPO_ID
ID_TIENDA TIPO_ID,
ID_TIPO_FACTURA TIPO_ID
);
CREATE TABLE FACTURAS_PROVEEDOR_DETALLES (
@ -2520,7 +2521,9 @@ CREATE VIEW V_REC_CLI_PAGOS(
AS
SELECT RECIBOS_CLIENTE.ID,
CASE WHEN RECIBOS_CLIENTE.ID_RECIBO_COMPENSADO IS NULL THEN PAGOS_CLIENTE.ID_RECIBO
ELSE PAGOS_COMPENSADOS.ID_RECIBO
ELSE case when PAGOS_CLIENTE.ID_RECIBO is null then PAGOS_COMPENSADOS.ID_RECIBO
else PAGOS_CLIENTE.ID_RECIBO
end
END
FROM RECIBOS_CLIENTE
LEFT JOIN PAGOS_CLIENTE ON (PAGOS_CLIENTE.ID_RECIBO = RECIBOS_CLIENTE.ID)
@ -2802,7 +2805,8 @@ CREATE VIEW V_FACTURAS_PROVEEDOR(
SUBCUENTA,
ID_EJERCICIO,
ESTADO_EJERCICIO,
ASIENTO_PUNTEADO)
ASIENTO_PUNTEADO,
ID_TIPO_FACTURA)
AS
SELECT FACTURAS_PROVEEDOR.ID,
FACTURAS_PROVEEDOR.ID_EMPRESA,
@ -2847,7 +2851,8 @@ SELECT FACTURAS_PROVEEDOR.ID,
V_CONT_FAC_PRO_COMPRAS.SUBCUENTA,
V_CONT_FAC_PRO_COMPRAS.ID_EJERCICIO,
V_CONT_FAC_PRO_COMPRAS.ESTADO_EJERCICIO,
V_CONT_FAC_PRO_COMPRAS.ASIENTO_PUNTEADO
V_CONT_FAC_PRO_COMPRAS.ASIENTO_PUNTEADO,
FACTURAS_PROVEEDOR.ID_TIPO_FACTURA
FROM V_FAC_PRO_SITUACION
LEFT JOIN FACTURAS_PROVEEDOR
@ -2858,7 +2863,8 @@ SELECT FACTURAS_PROVEEDOR.ID,
ON (PROVEEDORES_DATOS.ID_PROVEEDOR = FACTURAS_PROVEEDOR.ID_PROVEEDOR)
LEFT JOIN EMPRESAS_TIENDAS
ON (EMPRESAS_TIENDAS.ID = FACTURAS_PROVEEDOR.ID_TIENDA)
LEFT JOIN V_CONT_FAC_PRO_COMPRAS ON (V_CONT_FAC_PRO_COMPRAS.ID_FACTURA = FACTURAS_PROVEEDOR.ID);
LEFT JOIN V_CONT_FAC_PRO_COMPRAS ON (V_CONT_FAC_PRO_COMPRAS.ID_FACTURA = FACTURAS_PROVEEDOR.ID)
;
/* Create view: V_COMISIONES */
@ -3890,7 +3896,9 @@ SELECT RECIBOS_CLIENTE.ID,
CASE
WHEN RECIBOS_CLIENTE.ID_RECIBO_COMPENSADO IS NULL
THEN TRIM(V_REC_CLI_SITUACION.SITUACION)
ELSE CASE WHEN (TRIM(V_REC_CLI_SITUACION.SITUACION)= 'COBRADO') THEN TRIM(V_REC_CLI_SITUACION.SITUACION)
ELSE TRIM(RECIBO_COMPENSADO2.SITUACION)
END
END,
RECIBOS_CLIENTE.ID_FACTURA,
FACTURAS_CLIENTE.FECHA_FACTURA,
@ -4760,14 +4768,16 @@ declare variable idcontacto integer;
declare variable concepto varchar(2000);
begin
/*BUSCAMOS EL PAGO PARA COMPROBAR SI HACER ASIENTO*/
SELECT PAGOS_CLIENTE.IGNORAR_CONTABILIDAD, RECIBOS_CLIENTE.ID_EMPRESA, RECIBOS_CLIENTE.ID_CLIENTE,
RECIBOS_CLIENTE.REFERENCIA || ': ' || RECIBOS_CLIENTE.NOMBRE,
SELECT PAGOS_CLIENTE.IGNORAR_CONTABILIDAD, V_RECIBOS_CLIENTE.ID_EMPRESA, V_RECIBOS_CLIENTE.ID_CLIENTE,
V_RECIBOS_CLIENTE.REFERENCIA || ': ' || V_RECIBOS_CLIENTE.NOMBRE,
PAGOS_CLIENTE.FECHA_PAGO, PAGOS_CLIENTE.TIPO,
PAGOS_CLIENTE.TIPO || ' ' || RECIBOS_CLIENTE.NOMBRE || '(' || CONTACTOS.REFERENCIA || ') ' || COALESCE(RECIBOS_CLIENTE.DESCRIPCION, 'No hay descripción'),
RECIBOS_CLIENTE.IMPORTE
PAGOS_CLIENTE.TIPO || ' ' || V_RECIBOS_CLIENTE.NOMBRE || '(' || CONTACTOS.REFERENCIA || ') ' || COALESCE(V_RECIBOS_CLIENTE.DESCRIPCION, 'No hay descripción'),
CASE WHEN (V_RECIBOS_CLIENTE.IMPORTE_SIN_COMPENSAR = 0) then V_RECIBOS_CLIENTE.IMPORTE
ELSE V_RECIBOS_CLIENTE.IMPORTE_SIN_COMPENSAR
END AS IMPORTE
FROM PAGOS_CLIENTE
LEFT JOIN RECIBOS_CLIENTE ON (RECIBOS_CLIENTE.ID = PAGOS_CLIENTE.ID_RECIBO)
LEFT JOIN CONTACTOS ON (CONTACTOS.ID = RECIBOS_CLIENTE.ID_CLIENTE)
LEFT JOIN V_RECIBOS_CLIENTE ON (V_RECIBOS_CLIENTE.ID = PAGOS_CLIENTE.ID_RECIBO)
LEFT JOIN CONTACTOS ON (CONTACTOS.ID = V_RECIBOS_CLIENTE.ID_CLIENTE)
WHERE PAGOS_CLIENTE.ID = :IDPAGO
INTO :IGNORARCONTABILIDAD, :IDEMPRESA, :IDCONTACTO, :REFERENCIARECIBO, :FECHAPAGO, :TIPOPAGO, :CONCEPTO, :IMPORTE;

2
Source/Cliente/FactuGES.dproj
View File

@ -51,7 +51,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">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">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.4.9.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">2</VersionInfo><VersionInfo Name="MinorVer">5</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">2.5.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">2.5.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></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><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>

BIN
Source/Cliente/FactuGES.res
View File

Binary file not shown.

8
Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas
View File

@ -3,7 +3,7 @@ unit schFacturasClienteClient_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
@ -173,7 +173,7 @@ type
end;
{ TListaAnosFacturasDataTableRules }
TListaAnosFacturasDataTableRules = class(TDADataTableRules, IListaAnosFacturas)
TListaAnosFacturasDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosFacturas)
private
protected
{ Property getters and setters }
@ -489,7 +489,7 @@ type
end;
{ TFacturasClienteDataTableRules }
TFacturasClienteDataTableRules = class(TDADataTableRules, IFacturasCliente)
TFacturasClienteDataTableRules = class(TIntfObjectDADataTableRules, IFacturasCliente)
private
f_OBSERVACIONES: IROStrings;
procedure OBSERVACIONES_OnChange(Sender: TObject);
@ -885,7 +885,7 @@ type
end;
{ TFacturasCliente_DetallesDataTableRules }
TFacturasCliente_DetallesDataTableRules = class(TDADataTableRules, IFacturasCliente_Detalles)
TFacturasCliente_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IFacturasCliente_Detalles)
private
protected
{ Property getters and setters }

4
Source/Modulos/Recibos de cliente/Controller/uRecibosClienteController.pas
View File

@ -289,7 +289,7 @@ begin
else
Expression := NewBinaryExpression(Expression, Condicion, dboAnd);
end;
{
with Result.DataTable.DynamicWhere do
begin
//No podrá compensarse recibos que estan cobrados
@ -300,7 +300,7 @@ begin
else
Expression := NewBinaryExpression(Expression, Condicion, dboAnd);
end;
}
finally
HideHourglassCursor;
end;

10
Source/Modulos/Recibos de cliente/Model/schRecibosClienteClient_Intf.pas
View File

@ -3,7 +3,7 @@ unit schRecibosClienteClient_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
@ -245,7 +245,7 @@ type
end;
{ TListaAnosRecibosDataTableRules }
TListaAnosRecibosDataTableRules = class(TDADataTableRules, IListaAnosRecibos)
TListaAnosRecibosDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosRecibos)
private
protected
{ Property getters and setters }
@ -508,7 +508,7 @@ type
end;
{ TRecibosClienteDataTableRules }
TRecibosClienteDataTableRules = class(TDADataTableRules, IRecibosCliente)
TRecibosClienteDataTableRules = class(TIntfObjectDADataTableRules, IRecibosCliente)
private
protected
{ Property getters and setters }
@ -873,7 +873,7 @@ type
end;
{ TPagosClienteDataTableRules }
TPagosClienteDataTableRules = class(TDADataTableRules, IPagosCliente)
TPagosClienteDataTableRules = class(TIntfObjectDADataTableRules, IPagosCliente)
private
protected
{ Property getters and setters }
@ -1232,7 +1232,7 @@ type
end;
{ TRecibosCompensadosCliDataTableRules }
TRecibosCompensadosCliDataTableRules = class(TDADataTableRules, IRecibosCompensadosCli)
TRecibosCompensadosCliDataTableRules = class(TIntfObjectDADataTableRules, IRecibosCompensadosCli)
private
protected
{ Property getters and setters }

7
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>
@ -28,10 +28,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><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">5</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">2.5.0.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.5.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 01 de febrero de 2012 15:46</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><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions>

BIN
Source/Servidor/FactuGES_Server.res
View File

Binary file not shown.