Archivado/LuisLeon_FactuGES2
Archived
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Versión 4.2.2

Browse Source 
Tareas #795: Los objetivos quedan comunes a albaranes y facturas. Coger los objetivos por defecto que tenga luis leon
Tareas #796: Falla al filtrar el informe de objetivos por agente
Tareas #797: Falla al poner fecha de baja del agente no la almacena 

git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES2/trunk@155 b2cfbe5a-eba1-4a0c-8b32-7feea0a119f2
This commit is contained in:
roberto 2012-02-14 16:38:57 +00:00
parent 86c8421d3b
commit eb89599aa5
28 changed files with 522 additions and 432 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.

93
Database/scripts/factuges.sql
View File

@ -4561,7 +4561,44 @@ left join contactos on (contactos.id = clientes_datos.id_agente)
where ((ARTICULOS.COMISIONABLE = 1) and (albaranes_cliente.FECHA_ALBARAN is not null))
;
CREATE VIEW V_INF_OBJETIVOS_FACTURAS_AUX(
ID_EMPRESA,
ID_AGENTE,
AGENTE,
ANO,
MES,
CANTIDAD_CONSEGUIDA,
CANTIDAD_DEVUELTA,
IMPORTE_CONSEGUIDO,
IMPORTE_DEVUELTO)
AS
select
facturas_cliente.ID_EMPRESA,
coalesce (clientes_datos.id_agente, -1) as ID_AGENTE,
coalesce (contactos.nombre, 'N/A') as AGENTE,
EXTRACT(YEAR FROM facturas_cliente.FECHA_FACTURA) as ANO,
EXTRACT(MONTH FROM facturas_cliente.FECHA_FACTURA) as MES,
case when (facturas_cliente_detalles.cantidad > 0) then facturas_cliente_detalles.cantidad
else 0
end as cantidad,
case when (facturas_cliente_detalles.cantidad < 0) then facturas_cliente_detalles.cantidad
else 0
end as cantidad_dev,
case when (facturas_cliente_detalles.importe_total > 0) then facturas_cliente_detalles.importe_total
else 0
end as importe_total,
case when (facturas_cliente_detalles.importe_total < 0) then facturas_cliente_detalles.importe_total
else 0
end as importe_total_dev
from facturas_cliente_detalles
left join facturas_cliente on (facturas_cliente.id = facturas_cliente_detalles.id_factura)
left join articulos on (articulos.id = facturas_cliente_detalles.id_articulo)
left join clientes_datos on (clientes_datos.id_cliente = facturas_cliente.id_cliente)
left join contactos on (contactos.id = clientes_datos.id_agente)
where ((ARTICULOS.COMISIONABLE = 1) and (facturas_cliente.FECHA_FACTURA is not null))
;
CREATE VIEW V_INF_OBJETIVOS_ALBARANES(
ID_EMPRESA,
@ -4593,6 +4630,35 @@ from v_inf_objetivos_albaranes_aux
group by 1,2,3,4,5,6,7
;
CREATE VIEW V_INF_OBJETIVOS_FACTURAS(
ID_EMPRESA,
ID_AGENTE,
AGENTE,
ANO,
SEMESTRE,
TRIMESTRE,
MES,
CANTIDAD_CONSEGUIDA,
CANTIDAD_DEVUELTA,
IMPORTE_CONSEGUIDO,
IMPORTE_DEVUELTO)
AS
select
ID_EMPRESA,
ID_AGENTE,
AGENTE,
ANO,
CAST((DIV(MES,7)+1) AS SMALLINT) as SEMESTRE,
CAST((DIV((MES+2),3)) AS SMALLINT) as TRIMESTRE,
MES,
sum(cantidad_conseguida),
sum(cantidad_devuelta),
sum(importe_conseguido),
sum(importe_devuelto)
from v_inf_objetivos_facturas_aux
group by 1,2,3,4,5,6,7
;
CREATE VIEW V_INF_OBJETIVOS_ALB_AGENTES(
ID_AGENTE,
@ -4980,6 +5046,13 @@ BEGIN
SUSPEND;
END^
CREATE PROCEDURE PRO_ANADIR_OBJETIVOS_AGENTES (
ano integer)
as
BEGIN
SUSPEND;
END^
/******************************************************************************/
/**** Stored Procedures ****/
/******************************************************************************/
@ -5403,3 +5476,23 @@ end
end^
SET TERM ; ^
ALTER PROCEDURE PRO_ANADIR_OBJETIVOS_AGENTES (
ano integer)
as
declare variable idagente integer;
begin
/* Existe el presupuesto? */
for select ID
from V_AGENTES
into :idAgente
do
begin
execute procedure pro_anadir_objetivos (:idAgente, :ANO);
end
suspend;
end^
SET TERM ; ^

BIN
Source/Base/Base.RES
View File

Binary file not shown.

2
Source/Cliente/FactuGES.dproj
View File

@ -53,7 +53,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">4</VersionInfo><VersionInfo Name="MinorVer">2</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">4.2.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">4.2.1.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></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">4</VersionInfo><VersionInfo Name="MinorVer">2</VersionInfo><VersionInfo Name="Release">2</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">4.2.2.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">4.2.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
</ProjectExtensions>
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup>

8
Source/Cliente/FactuGES.rc
View File

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

BIN
Source/Cliente/FactuGES.res
View File

Binary file not shown.

BIN
Source/Modulos/Contactos/Model/Contactos_model.identcache
View File

Binary file not shown.

BIN
Source/Modulos/Contactos/Views/Contactos_view.identcache
View File

Binary file not shown.

BIN
Source/Modulos/Gestor de informes/Views/GestorInformes_view.res
View File

Binary file not shown.

2
Source/Modulos/Informe margen por articulo/Data/InfMargenArticulo_data.drc
View File

@ -14,4 +14,4 @@ END
/* C:\Codigo\Source\Modulos\Informe margen por articulo\Data\uDataModuleInfMargenArticulo.dfm */
/* C:\Codigo\Source\Modulos\Informe margen por articulo\Data\InfMargenArticulo_data.res */
/* c:\temp\dtf228.tmp */
/* c:\temp\dtf1D2.tmp */

2
Source/Modulos/Informe margen por articulo/Model/InfMargenArticulo_model.drc
View File

@ -13,4 +13,4 @@ BEGIN
END
/* C:\Codigo\Source\Modulos\Informe margen por articulo\Model\InfMargenArticulo_model.res */
/* c:\temp\dtf226.tmp */
/* c:\temp\dtf1D0.tmp */

2
Source/Modulos/Informe margen por articulo/Views/InfMargenArticulo_view.drc
View File

@ -16,4 +16,4 @@ END
/* C:\Codigo\Source\Modulos\Informe margen por articulo\Views\uViewInfMargenArticulo.dfm */
/* C:\Codigo\Source\Modulos\Informe margen por articulo\Views\uEditorInfMargenArticulo.dfm */
/* C:\Codigo\Source\Modulos\Informe margen por articulo\Views\InfMargenArticulo_view.res */
/* c:\temp\dtf22C.tmp */
/* c:\temp\dtf1D6.tmp */

2
Source/Modulos/Informe ventas por articulo/Data/InfVentasArticulo_data.drc
View File

@ -14,4 +14,4 @@ END
/* C:\Codigo\Source\Modulos\Informe ventas por articulo\Data\uDataModuleInfVentasArticulo.dfm */
/* C:\Codigo\Source\Modulos\Informe ventas por articulo\Data\InfVentasArticulo_data.res */
/* c:\temp\dtf21E.tmp */
/* c:\temp\dtf1C8.tmp */

2
Source/Modulos/Informe ventas por articulo/Model/InfVentasArticulo_model.drc
View File

@ -13,4 +13,4 @@ BEGIN
END
/* C:\Codigo\Source\Modulos\Informe ventas por articulo\Model\InfVentasArticulo_model.res */
/* c:\temp\dtf21C.tmp */
/* c:\temp\dtf1C6.tmp */

2
Source/Modulos/Informe ventas por articulo/Views/InfVentasArticulo_view.drc
View File

@ -19,4 +19,4 @@ END
/* C:\Codigo\Source\Modulos\Informe ventas por articulo\Views\uViewInfVentasAlbArticulo.dfm */
/* C:\Codigo\Source\Modulos\Informe ventas por articulo\Views\uEditorInfVentasAlbArticulo.dfm */
/* C:\Codigo\Source\Modulos\Informe ventas por articulo\Views\InfVentasArticulo_view.res */
/* c:\temp\dtf222.tmp */
/* c:\temp\dtf1CC.tmp */

2
Source/Modulos/Informes base/Controller/InformesBase_controller.drc
View File

@ -13,4 +13,4 @@ BEGIN
END
/* C:\Codigo\Source\Modulos\Informes base\Controller\InformesBase_controller.res */
/* c:\temp\dtf212.tmp */
/* c:\temp\dtf1BC.tmp */

2
Source/Modulos/Informes base/Data/Informes_data.drc
View File

@ -14,4 +14,4 @@ END
/* C:\Codigo\Source\Modulos\Informes base\Data\uDataModuleInformes.dfm */
/* C:\Codigo\Source\Modulos\Informes base\Data\Informes_data.res */
/* c:\temp\dtf20E.tmp */
/* c:\temp\dtf1B8.tmp */

2
Source/Modulos/Informes base/Model/Informes_model.drc
View File

@ -13,4 +13,4 @@ BEGIN
END
/* C:\Codigo\Source\Modulos\Informes base\Model\Informes_model.res */
/* c:\temp\dtf20C.tmp */
/* c:\temp\dtf1B6.tmp */

2
Source/Modulos/Informes base/Views/Informes_view.drc
View File

@ -15,4 +15,4 @@ END
/* C:\Codigo\Source\Modulos\Informes base\Views\uViewInformes.dfm */
/* C:\Codigo\Source\Modulos\Informes base\Views\uEditorInformes.dfm */
/* C:\Codigo\Source\Modulos\Informes base\Views\Informes_view.res */
/* c:\temp\dtf216.tmp */
/* c:\temp\dtf1C0.tmp */

2
Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc
View File

@ -13,4 +13,4 @@ BEGIN
END
/* C:\Codigo\Source\Modulos\Pedidos de cliente\Controller\PedidosCliente_controller.RES */
/* c:\temp\dtf24C.tmp */
/* c:\temp\dtf1F6.tmp */

2
Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc
View File

@ -14,4 +14,4 @@ END
/* C:\Codigo\Source\Modulos\Pedidos de cliente\Data\uDataModulePedidosCliente.dfm */
/* C:\Codigo\Source\Modulos\Pedidos de cliente\Data\PedidosCliente_data.RES */
/* c:\temp\dtf24A.tmp */
/* c:\temp\dtf1F4.tmp */

2
Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc
View File

@ -13,4 +13,4 @@ BEGIN
END
/* C:\Codigo\Source\Modulos\Pedidos de cliente\Model\PedidosCliente_model.RES */
/* c:\temp\dtf248.tmp */
/* c:\temp\dtf1F2.tmp */

2
Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc
View File

@ -14,4 +14,4 @@ END
/* C:\Codigo\Source\Modulos\Pedidos de cliente\Plugin\uPluginPedidosCliente.dfm */
/* C:\Codigo\Source\Modulos\Pedidos de cliente\Plugin\PedidosCliente_plugin.RES */
/* c:\temp\dtf2B4.tmp */
/* c:\temp\dtf25E.tmp */

2
Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc
View File

@ -26,4 +26,4 @@ END
/* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\uEditorElegirArticulosPedidoCliente.dfm */
/* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\uEditorDireccionEntregaPedidoCliente.dfm */
/* C:\Codigo\Source\Modulos\Pedidos de cliente\Views\PedidosCliente_view.RES */
/* c:\temp\dtf2B2.tmp */
/* c:\temp\dtf25C.tmp */

2
Source/Modulos/Tienda web/Data/TiendaWeb_data.drc
View File

@ -14,4 +14,4 @@ END
/* C:\Codigo\Source\Modulos\Tienda web\Data\uDataModuleTiendaWeb.dfm */
/* C:\Codigo\Source\Modulos\Tienda web\Data\TiendaWeb_data.res */
/* c:\temp\dtf262.tmp */
/* c:\temp\dtf20C.tmp */

BIN
Source/Servidor/FactuGES_Server.RES
View File

Binary file not shown.

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>
@ -35,10 +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">4</VersionInfo><VersionInfo Name="MinorVer">2</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">4.2.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">4.2.1.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 31 de enero de 2012 10:21</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<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">4</VersionInfo><VersionInfo Name="MinorVer">2</VersionInfo><VersionInfo Name="Release">2</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">4.2.2.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">4.2.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 14 de febrero de 2012 15:51</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
</ProjectExtensions>

10
Source/Servidor/FactuGES_Server.rc
View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo\Resources\Iconos\Servidor.ico"
1 VERSIONINFO
FILEVERSION 4,2,1,0
PRODUCTVERSION 4,2,1,0
FILEVERSION 4,2,2,0
PRODUCTVERSION 4,2,2,0
FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L
FILEOS 0x40004L
@ -12,9 +12,9 @@ BEGIN
BEGIN
BLOCK "0C0A04E4"
BEGIN
VALUE "FileVersion", "4.2.1.0\0"
VALUE "ProductVersion", "4.2.1.0\0"
VALUE "CompileDate", "viernes, 03 de febrero de 2012 10:41\0"
VALUE "FileVersion", "4.2.2.0\0"
VALUE "ProductVersion", "4.2.2.0\0"
VALUE "CompileDate", "martes, 14 de febrero de 2012 16:03\0"
END
END
BLOCK "VarFileInfo"