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

Se adapta la contabiulidad para poder hacer cierres anuales

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@393 f4e31baf-9722-1c47-927c-6f952f962d4b
This commit is contained in:
roberto 2009-02-06 11:22:56 +00:00
parent 423818ddfc
commit 641f8d84a6
18 changed files with 418 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
Database/scripts/factuges.sql
View File

@ -4019,9 +4019,9 @@ end
^ ^
ALTER PROCEDURE PROC_NEW_ASIENTO_FACTURA_CLI ( ALTER PROCEDURE PROC_NEW_ASIENTO_FACTURA_CLI (
IDFACTURA INTEGER, idfactura integer,
ID_SUBCUENTA_VENTA INTEGER) id_subcuenta_venta integer)
AS as
declare variable ignorarcontabilidad integer; declare variable ignorarcontabilidad integer;
declare variable referenciafactura varchar(255); declare variable referenciafactura varchar(255);
declare variable razon varchar(255); declare variable razon varchar(255);
@ -4034,15 +4034,30 @@ declare variable orden integer;
declare variable importetotal numeric(11,2); declare variable importetotal numeric(11,2);
declare variable importeiva numeric(11,2); declare variable importeiva numeric(11,2);
declare variable importere numeric(11,2); declare variable importere numeric(11,2);
declare variable idempresa integer;
declare variable idcontacto integer;
begin begin
/*BUSCAMOS LA FACTURA DE LA QUE COMPROBAR SI HACER ASIENTO*/ /*BUSCAMOS LA FACTURA DE LA QUE COMPROBAR SI HACER ASIENTO*/
SELECT FACTURAS_CLIENTE.IGNORAR_CONTABILIDAD, FACTURAS_CLIENTE.REFERENCIA, FACTURAS_CLIENTE.NOMBRE, FACTURAS_CLIENTE.FECHA_FACTURA, SELECT FACTURAS_CLIENTE.ID_EMPRESA, FACTURAS_CLIENTE.IGNORAR_CONTABILIDAD, FACTURAS_CLIENTE.REFERENCIA,
FACTURAS_CLIENTE.BASE_IMPONIBLE, FACTURAS_CLIENTE.IMPORTE_IVA, FACTURAS_CLIENTE.IMPORTE_RE, FACTURAS_CLIENTE.IMPORTE_TOTAL, FACTURAS_CLIENTE.ID_CLIENTE, FACTURAS_CLIENTE.NOMBRE, FACTURAS_CLIENTE.FECHA_FACTURA,
CONT_SUBCUENTAS.ID, CONT_SUBCUENTAS.ID_EJERCICIO FACTURAS_CLIENTE.BASE_IMPONIBLE, FACTURAS_CLIENTE.IMPORTE_IVA, FACTURAS_CLIENTE.IMPORTE_RE, FACTURAS_CLIENTE.IMPORTE_TOTAL
FROM FACTURAS_CLIENTE FROM FACTURAS_CLIENTE
LEFT JOIN CONT_SUBCUENTAS ON (CONT_SUBCUENTAS.ID_CONTACTO = FACTURAS_CLIENTE.ID_CLIENTE) WHERE FACTURAS_CLIENTE.ID = :IDFACTURA INTO :IDEMPRESA, :IGNORARCONTABILIDAD, :REFERENCIAFACTURA,
WHERE FACTURAS_CLIENTE.ID = :IDFACTURA INTO :IGNORARCONTABILIDAD, :REFERENCIAFACTURA, :RAZON, :IDCONTACTO, :RAZON, :FECHAFACTURA, :BASEIMPONIBLE, :IMPORTEIVA, :IMPORTERE, :IMPORTETOTAL;
:FECHAFACTURA, :BASEIMPONIBLE, :IMPORTEIVA, :IMPORTERE, :IMPORTETOTAL, :IDSUBCUENTA, :IDEJERCICIO;
/*BUSCAMOS EL EJERCICIO ACTIVO PARA LA EMPRESA DE LA FACTURA*/
SELECT ID
FROM CONT_EJERCICIOS
WHERE ID_EMPRESA = :IDEMPRESA
AND ACTIVO = 1
INTO :IDEJERCICIO;
/*BUSCAMOS LA SUBCUENTA DEL EJERCICIO ACTIVO DE LA EMPRESA DE LA FACTURA PARA EL CLIENTE DE LA FACTURA*/
SELECT ID
FROM CONT_SUBCUENTAS
WHERE ID_CONTACTO = :IDCONTACTO
AND ID_EJERCICIO = :IDEJERCICIO
INTO :IDSUBCUENTA;
SELECT ID FROM CONT_ASIENTOS SELECT ID FROM CONT_ASIENTOS
WHERE ID_FACTURA = :IDFACTURA WHERE ID_FACTURA = :IDFACTURA
@ -4160,9 +4175,9 @@ end
^ ^
ALTER PROCEDURE PROC_NEW_ASIENTO_FACTURA_PROV ( ALTER PROCEDURE PROC_NEW_ASIENTO_FACTURA_PROV (
IDFACTURA INTEGER, idfactura integer,
ID_SUBCUENTA_COMPRA INTEGER) id_subcuenta_compra integer)
AS as
declare variable ignorarcontabilidad integer; declare variable ignorarcontabilidad integer;
declare variable referenciafactura varchar(255); declare variable referenciafactura varchar(255);
declare variable razon varchar(255); declare variable razon varchar(255);
@ -4175,15 +4190,30 @@ declare variable orden integer;
declare variable importetotal numeric(11,2); declare variable importetotal numeric(11,2);
declare variable importeiva numeric(11,2); declare variable importeiva numeric(11,2);
declare variable importere numeric(11,2); declare variable importere numeric(11,2);
declare variable idempresa integer;
declare variable idcontacto integer;
begin begin
/*BUSCAMOS LA FACTURA DE LA QUE COMPROBAR SI HACER ASIENTO*/ /*BUSCAMOS LA FACTURA DE LA QUE COMPROBAR SI HACER ASIENTO*/
SELECT FACTURAS_PROVEEDOR.IGNORAR_CONTABILIDAD, FACTURAS_PROVEEDOR.REFERENCIA, FACTURAS_PROVEEDOR.NOMBRE, FACTURAS_PROVEEDOR.FECHA_FACTURA, SELECT FACTURAS_PROVEEDOR.ID_EMPRESA, FACTURAS_PROVEEDOR.IGNORAR_CONTABILIDAD,
FACTURAS_PROVEEDOR.BASE_IMPONIBLE, FACTURAS_PROVEEDOR.IMPORTE_IVA, FACTURAS_PROVEEDOR.IMPORTE_RE, FACTURAS_PROVEEDOR.IMPORTE_TOTAL, FACTURAS_PROVEEDOR.REFERENCIA, FACTURAS_PROVEEDOR.ID_PROVEEDOR, FACTURAS_PROVEEDOR.NOMBRE, FACTURAS_PROVEEDOR.FECHA_FACTURA,
CONT_SUBCUENTAS.ID, CONT_SUBCUENTAS.ID_EJERCICIO FACTURAS_PROVEEDOR.BASE_IMPONIBLE, FACTURAS_PROVEEDOR.IMPORTE_IVA, FACTURAS_PROVEEDOR.IMPORTE_RE, FACTURAS_PROVEEDOR.IMPORTE_TOTAL
FROM FACTURAS_PROVEEDOR FROM FACTURAS_PROVEEDOR
LEFT JOIN CONT_SUBCUENTAS ON (CONT_SUBCUENTAS.ID_CONTACTO = FACTURAS_PROVEEDOR.ID_PROVEEDOR) WHERE FACTURAS_PROVEEDOR.ID = :IDFACTURA INTO :IDEMPRESA, :IGNORARCONTABILIDAD, :REFERENCIAFACTURA,
WHERE FACTURAS_PROVEEDOR.ID = :IDFACTURA INTO :IGNORARCONTABILIDAD, :REFERENCIAFACTURA, :RAZON, :IDCONTACTO, :RAZON, :FECHAFACTURA, :BASEIMPONIBLE, :IMPORTEIVA, :IMPORTERE, :IMPORTETOTAL;
:FECHAFACTURA, :BASEIMPONIBLE, :IMPORTEIVA, :IMPORTERE, :IMPORTETOTAL, :IDSUBCUENTA, :IDEJERCICIO;
/*BUSCAMOS EL EJERCICIO ACTIVO PARA LA EMPRESA DE LA FACTURA*/
SELECT ID
FROM CONT_EJERCICIOS
WHERE ID_EMPRESA = :IDEMPRESA
AND ACTIVO = 1
INTO :IDEJERCICIO;
/*BUSCAMOS LA SUBCUENTA DEL EJERCICIO ACTIVO DE LA EMPRESA DE LA FACTURA PARA EL CLIENTE DE LA FACTURA*/
SELECT ID
FROM CONT_SUBCUENTAS
WHERE ID_CONTACTO = :IDCONTACTO
AND ID_EJERCICIO = :IDEJERCICIO
INTO :IDSUBCUENTA;
SELECT ID FROM CONT_ASIENTOS SELECT ID FROM CONT_ASIENTOS
WHERE ID_FACTURA = :IDFACTURA WHERE ID_FACTURA = :IDFACTURA
@ -4301,9 +4331,9 @@ end
^ ^
ALTER PROCEDURE PROC_NEW_ASIENTO_PAGO_CLI ( ALTER PROCEDURE PROC_NEW_ASIENTO_PAGO_CLI (
IDPAGO INTEGER, idpago integer,
IDSUBCUENTAPAGO INTEGER) idsubcuentapago integer)
AS as
declare variable ignorarcontabilidad integer; declare variable ignorarcontabilidad integer;
declare variable referenciarecibo varchar(255); declare variable referenciarecibo varchar(255);
declare variable fechapago date; declare variable fechapago date;
@ -4315,19 +4345,34 @@ declare variable idejercicio integer;
declare variable orden integer; declare variable orden integer;
declare variable debe numeric(11,2); declare variable debe numeric(11,2);
declare variable haber numeric(11,2); declare variable haber numeric(11,2);
declare variable idempresa integer;
declare variable idcontacto integer;
begin begin
/*BUSCAMOS EL PAGO PARA COMPROBAR SI HACER ASIENTO*/ /*BUSCAMOS EL PAGO PARA COMPROBAR SI HACER ASIENTO*/
SELECT PAGOS_CLIENTE.IGNORAR_CONTABILIDAD, SELECT PAGOS_CLIENTE.IGNORAR_CONTABILIDAD, RECIBOS_CLIENTE.ID_EMPRESA, RECIBOS_CLIENTE.ID_CLIENTE,
RECIBOS_CLIENTE.REFERENCIA || ': ' || RECIBOS_CLIENTE.NOMBRE, RECIBOS_CLIENTE.REFERENCIA || ': ' || RECIBOS_CLIENTE.NOMBRE,
PAGOS_CLIENTE.FECHA_PAGO, PAGOS_CLIENTE.FECHA_PAGO,
PAGOS_CLIENTE.TIPO || ': ' || RECIBOS_CLIENTE.DESCRIPCION, PAGOS_CLIENTE.TIPO || ': ' || RECIBOS_CLIENTE.DESCRIPCION,
RECIBOS_CLIENTE.IMPORTE, CONT_SUBCUENTAS.ID, CONT_SUBCUENTAS.ID_EJERCICIO RECIBOS_CLIENTE.IMPORTE
FROM PAGOS_CLIENTE FROM PAGOS_CLIENTE
LEFT JOIN RECIBOS_CLIENTE ON (RECIBOS_CLIENTE.ID = PAGOS_CLIENTE.ID_RECIBO) LEFT JOIN RECIBOS_CLIENTE ON (RECIBOS_CLIENTE.ID = PAGOS_CLIENTE.ID_RECIBO)
/* LEFT JOIN FACTURAS_CLIENTE ON (FACTURAS_CLIENTE.ID = RECIBOS_CLIENTE.ID_FACTURA) (ya no esta atado a las facturas)*/ WHERE PAGOS_CLIENTE.ID = :IDPAGO
LEFT JOIN CONT_SUBCUENTAS ON (CONT_SUBCUENTAS.ID_CONTACTO = RECIBOS_CLIENTE.ID_CLIENTE) INTO :IGNORARCONTABILIDAD, :IDEMPRESA, :IDCONTACTO, :REFERENCIARECIBO, :FECHAPAGO, :TIPOPAGO, :IMPORTE;
WHERE PAGOS_CLIENTE.ID = :IDPAGO INTO :IGNORARCONTABILIDAD, :REFERENCIARECIBO,
:FECHAPAGO, :TIPOPAGO, :IMPORTE, :IDSUBCUENTA, :IDEJERCICIO; /*BUSCAMOS EL EJERCICIO ACTIVO PARA LA EMPRESA DE LA FACTURA*/
SELECT ID
FROM CONT_EJERCICIOS
WHERE ID_EMPRESA = :IDEMPRESA
AND ACTIVO = 1
INTO :IDEJERCICIO;
/*BUSCAMOS LA SUBCUENTA DEL EJERCICIO ACTIVO DE LA EMPRESA DE LA FACTURA PARA EL CLIENTE DE LA FACTURA*/
SELECT ID
FROM CONT_SUBCUENTAS
WHERE ID_CONTACTO = :IDCONTACTO
AND ID_EJERCICIO = :IDEJERCICIO
INTO :IDSUBCUENTA;
SELECT ID FROM CONT_ASIENTOS SELECT ID FROM CONT_ASIENTOS
WHERE ID_PAGO = :IDPAGO WHERE ID_PAGO = :IDPAGO
@ -4391,9 +4436,9 @@ end
^ ^
ALTER PROCEDURE PROC_NEW_ASIENTO_PAGO_PROV ( ALTER PROCEDURE PROC_NEW_ASIENTO_PAGO_PROV (
IDPAGO INTEGER, idpago integer,
IDSUBCUENTAPAGO INTEGER) idsubcuentapago integer)
AS as
declare variable ignorarcontabilidad integer; declare variable ignorarcontabilidad integer;
declare variable referenciarecibo varchar(255); declare variable referenciarecibo varchar(255);
declare variable fechapago date; declare variable fechapago date;
@ -4405,19 +4450,33 @@ declare variable idejercicio integer;
declare variable orden integer; declare variable orden integer;
declare variable debe numeric(11,2); declare variable debe numeric(11,2);
declare variable haber numeric(11,2); declare variable haber numeric(11,2);
declare variable idempresa integer;
declare variable idcontacto integer;
begin begin
/*BUSCAMOS EL PAGO PARA COMPROBAR SI HACER ASIENTO*/ /*BUSCAMOS EL PAGO PARA COMPROBAR SI HACER ASIENTO*/
SELECT PAGOS_PROVEEDOR.IGNORAR_CONTABILIDAD, SELECT PAGOS_PROVEEDOR.IGNORAR_CONTABILIDAD, RECIBOS_PROVEEDOR.ID_EMPRESA, RECIBOS_PROVEEDOR.ID_PROVEEDOR,
RECIBOS_PROVEEDOR.REFERENCIA || ': ' || RECIBOS_PROVEEDOR.NOMBRE, RECIBOS_PROVEEDOR.REFERENCIA || ': ' || RECIBOS_PROVEEDOR.NOMBRE,
PAGOS_PROVEEDOR.FECHA_PAGO, PAGOS_PROVEEDOR.FECHA_PAGO,
PAGOS_PROVEEDOR.TIPO || ': ' || RECIBOS_PROVEEDOR.DESCRIPCION, PAGOS_PROVEEDOR.TIPO || ': ' || RECIBOS_PROVEEDOR.DESCRIPCION,
RECIBOS_PROVEEDOR.IMPORTE, CONT_SUBCUENTAS.ID, CONT_SUBCUENTAS.ID_EJERCICIO RECIBOS_PROVEEDOR.IMPORTE
FROM PAGOS_PROVEEDOR FROM PAGOS_PROVEEDOR
LEFT JOIN RECIBOS_PROVEEDOR ON (RECIBOS_PROVEEDOR.ID = PAGOS_PROVEEDOR.ID_RECIBO) LEFT JOIN RECIBOS_PROVEEDOR ON (RECIBOS_PROVEEDOR.ID = PAGOS_PROVEEDOR.ID_RECIBO)
/* LEFT JOIN FACTURAS_PROVEEDOR ON (FACTURAS_PROVEEDOR.ID = RECIBOS_PROVEEDOR.ID_FACTURA) (ya no esta atado a las facturas)*/ WHERE PAGOS_PROVEEDOR.ID = :IDPAGO
LEFT JOIN CONT_SUBCUENTAS ON (CONT_SUBCUENTAS.ID_CONTACTO = RECIBOS_PROVEEDOR.ID_PROVEEDOR) INTO :IGNORARCONTABILIDAD, :IDEMPRESA, :IDCONTACTO, :REFERENCIARECIBO, :FECHAPAGO, :TIPOPAGO, :IMPORTE;
WHERE PAGOS_PROVEEDOR.ID = :IDPAGO INTO :IGNORARCONTABILIDAD, :REFERENCIARECIBO,
:FECHAPAGO, :TIPOPAGO, :IMPORTE, :IDSUBCUENTA, :IDEJERCICIO; /*BUSCAMOS EL EJERCICIO ACTIVO PARA LA EMPRESA DE LA FACTURA*/
SELECT ID
FROM CONT_EJERCICIOS
WHERE ID_EMPRESA = :IDEMPRESA
AND ACTIVO = 1
INTO :IDEJERCICIO;
/*BUSCAMOS LA SUBCUENTA DEL EJERCICIO ACTIVO DE LA EMPRESA DE LA FACTURA PARA EL CLIENTE DE LA FACTURA*/
SELECT ID
FROM CONT_SUBCUENTAS
WHERE ID_CONTACTO = :IDCONTACTO
AND ID_EJERCICIO = :IDEJERCICIO
INTO :IDSUBCUENTA;
SELECT ID FROM CONT_ASIENTOS SELECT ID FROM CONT_ASIENTOS
WHERE ID_PAGO = :IDPAGO WHERE ID_PAGO = :IDPAGO

16
Source/Modulos/Contactos/Contactos_Group.groupproj
View File

@ -13,6 +13,7 @@
<Projects Include="..\Contabilidad\Data\Contabilidad_data.dproj" /> <Projects Include="..\Contabilidad\Data\Contabilidad_data.dproj" />
<Projects Include="..\Contabilidad\Model\Contabilidad_model.dproj" /> <Projects Include="..\Contabilidad\Model\Contabilidad_model.dproj" />
<Projects Include="..\Contabilidad\Views\Contabilidad_view.dproj" /> <Projects Include="..\Contabilidad\Views\Contabilidad_view.dproj" />
<Projects Include="..\Facturas de cliente\Views\FacturasCliente_view.dproj" />
<Projects Include="Controller\Contactos_controller.dproj" /> <Projects Include="Controller\Contactos_controller.dproj" />
<Projects Include="Data\Contactos_data.dproj" /> <Projects Include="Data\Contactos_data.dproj" />
<Projects Include="Model\Contactos_model.dproj" /> <Projects Include="Model\Contactos_model.dproj" />
@ -151,14 +152,23 @@
<Target Name="FactuGES_Server:Make"> <Target Name="FactuGES_Server:Make">
<MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" /> <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" />
</Target> </Target>
<Target Name="FacturasCliente_view">
<MSBuild Projects="..\Facturas de cliente\Views\FacturasCliente_view.dproj" Targets="" />
</Target>
<Target Name="FacturasCliente_view:Clean">
<MSBuild Projects="..\Facturas de cliente\Views\FacturasCliente_view.dproj" Targets="Clean" />
</Target>
<Target Name="FacturasCliente_view:Make">
<MSBuild Projects="..\Facturas de cliente\Views\FacturasCliente_view.dproj" Targets="Make" />
</Target>
<Target Name="Build"> <Target Name="Build">
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contabilidad_model;Contabilidad_data;Contabilidad_controller;Contactos_controller;Contactos_view;Contactos_plugin;Contabilidad_view;FactuGES;FactuGES_Server" /> <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contabilidad_model;Contabilidad_data;Contabilidad_controller;Contactos_controller;Contactos_view;Contactos_plugin;Contabilidad_view;FactuGES;FactuGES_Server;FacturasCliente_view" />
</Target> </Target>
<Target Name="Clean"> <Target Name="Clean">
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contabilidad_model:Clean;Contabilidad_data:Clean;Contabilidad_controller:Clean;Contactos_controller:Clean;Contactos_view:Clean;Contactos_plugin:Clean;Contabilidad_view:Clean;FactuGES:Clean;FactuGES_Server:Clean" /> <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contabilidad_model:Clean;Contabilidad_data:Clean;Contabilidad_controller:Clean;Contactos_controller:Clean;Contactos_view:Clean;Contactos_plugin:Clean;Contabilidad_view:Clean;FactuGES:Clean;FactuGES_Server:Clean;FacturasCliente_view:Clean" />
</Target> </Target>
<Target Name="Make"> <Target Name="Make">
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contabilidad_model:Make;Contabilidad_data:Make;Contabilidad_controller:Make;Contactos_controller:Make;Contactos_view:Make;Contactos_plugin:Make;Contabilidad_view:Make;FactuGES:Make;FactuGES_Server:Make" /> <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contabilidad_model:Make;Contabilidad_data:Make;Contabilidad_controller:Make;Contactos_controller:Make;Contactos_view:Make;Contactos_plugin:Make;Contabilidad_view:Make;FactuGES:Make;FactuGES_Server:Make;FacturasCliente_view:Make" />
</Target> </Target>
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" /> <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
</Project> </Project>

33
Source/Modulos/Contactos/Controller/uClientesController.pas
View File

@ -25,6 +25,8 @@ type
protected protected
FDireccionesController : IDireccionesContactoController; FDireccionesController : IDireccionesContactoController;
function ValidarContacto(AContacto: IBizContacto): Boolean; override; function ValidarContacto(AContacto: IBizContacto): Boolean; override;
procedure FiltrarEjercicio(AContacto : IBizContacto); virtual;
public public
constructor Create; override; constructor Create; override;
destructor Destroy; override; destructor Destroy; override;
@ -54,7 +56,7 @@ implementation
uses uses
Forms, Classes, Windows, SysUtils, Controls, cxControls, uDialogUtils, uDataModuleClientes, uEditorRegistryUtils, Forms, Classes, Windows, SysUtils, Controls, cxControls, uDialogUtils, uDataModuleClientes, uEditorRegistryUtils,
uDataTableUtils, uDADataTable, DB, schContactosClient_Intf, uEtiquetasContactosReportController, uDataTableUtils, uDADataTable, DB, schContactosClient_Intf, uEtiquetasContactosReportController,
uIEditorElegirClientes, uEditorGridBase, uIEditorElegirClientes, uEditorGridBase, uDAInterfaces, uFactuGES_App,
Dialogs; Dialogs;
{ TClientesController } { TClientesController }
@ -63,18 +65,21 @@ function TClientesController.Buscar(const ID: Integer): IBizContacto;
begin begin
Result := (FDataModule as IDataModuleClientes).GetItem(ID); Result := (FDataModule as IDataModuleClientes).GetItem(ID);
FiltrarEmpresa(Result); FiltrarEmpresa(Result);
FiltrarEjercicio(Result);
end; end;
function TClientesController.BuscarTodos: IBizContacto; function TClientesController.BuscarTodos: IBizContacto;
begin begin
Result := (FDataModule as IDataModuleClientes).GetItems; Result := (FDataModule as IDataModuleClientes).GetItems;
FiltrarEmpresa(Result); FiltrarEmpresa(Result);
FiltrarEjercicio(Result);
end; end;
function TClientesController.BuscarTodosTiendaWeb: IBizCliente; function TClientesController.BuscarTodosTiendaWeb: IBizCliente;
begin begin
Result := (FDataModule as IDataModuleClientes).GetItemsTiendaWeb; Result := (FDataModule as IDataModuleClientes).GetItemsTiendaWeb;
FiltrarEmpresa(Result); FiltrarEmpresa(Result);
FiltrarEjercicio(Result);
end; end;
constructor TClientesController.Create; constructor TClientesController.Create;
@ -184,6 +189,31 @@ begin
Result := True; Result := True;
end; end;
procedure TClientesController.FiltrarEjercicio(AContacto: IBizContacto);
var
Condicion: TDAWhereExpression;
begin
if Assigned(AContacto)
and Assigned((AContacto as IBizCliente).SubCuentas) then
begin
if (AContacto as IBizCliente).SubCuentas.DataTable.Active then
(AContacto as IBizCliente).SubCuentas.DataTable.Active := False;
// Filtrar los presupuestos actuales por empresa
with (AContacto as IBizCliente).SubCuentas.DataTable.DynamicWhere do
begin
// (ID_EMPRESA >= ID)
Condicion := NewBinaryExpression(NewField('', fld_SubCuentasContactoID_EJERCICIO), NewConstant(AppFactuGES.EjercicioActivo.ID, datInteger), dboEqual);
if IsEmpty then
Expression := Condicion
else
Expression := NewBinaryExpression(Expression, Condicion, dboAnd);
end;
end;
end;
function TClientesController.Guardar(AContacto: IBizContacto): Boolean; function TClientesController.Guardar(AContacto: IBizContacto): Boolean;
begin begin
Result := inherited Guardar(AContacto); Result := inherited Guardar(AContacto);
@ -196,6 +226,7 @@ var
begin begin
AContacto := (FDataModule as IDataModuleClientes).NewItem; AContacto := (FDataModule as IDataModuleClientes).NewItem;
FiltrarEmpresa(AContacto); FiltrarEmpresa(AContacto);
FiltrarEjercicio(Result);
AContacto.DataTable.Active := True; AContacto.DataTable.Active := True;
AContacto.Insert; AContacto.Insert;
Result := AContacto; Result := AContacto;

33
Source/Modulos/Contactos/Controller/uProveedoresController.pas
View File

@ -23,6 +23,7 @@ type
protected protected
FDireccionesController : IDireccionesContactoController; FDireccionesController : IDireccionesContactoController;
function ValidarContacto(AContacto: IBizContacto): Boolean; override; function ValidarContacto(AContacto: IBizContacto): Boolean; override;
procedure FiltrarEjercicio(AContacto : IBizContacto); virtual;
public public
constructor Create; override; constructor Create; override;
destructor Destroy; override; destructor Destroy; override;
@ -49,7 +50,8 @@ implementation
uses uses
Classes, SysUtils, cxControls, Dialogs, uDataModuleProveedores, uEditorRegistryUtils, Classes, SysUtils, cxControls, Dialogs, uDataModuleProveedores, uEditorRegistryUtils,
uDataTableUtils, uDADataTable, DB, schContactosClient_Intf, uEtiquetasContactosReportController, uDataTableUtils, uDADataTable, DB, schContactosClient_Intf, uEtiquetasContactosReportController,
uIEditorElegirProveedores, Controls, uEditorGridBase, JSDialogs, JSDialog, Windows; uIEditorElegirProveedores, Controls, uEditorGridBase, JSDialogs, JSDialog,
uDAInterfaces, uFactuGES_App, Windows;
{ TProveedoresController } { TProveedoresController }
@ -57,18 +59,21 @@ function TProveedoresController.Buscar(const ID: Integer): IBizContacto;
begin begin
Result := (FDataModule as IDataModuleProveedores).GetItem(ID); Result := (FDataModule as IDataModuleProveedores).GetItem(ID);
FiltrarEmpresa(Result); FiltrarEmpresa(Result);
FiltrarEjercicio(Result);
end; end;
function TProveedoresController.BuscarTodos: IBizContacto; function TProveedoresController.BuscarTodos: IBizContacto;
begin begin
Result := (FDataModule as IDataModuleProveedores).GetItems; Result := (FDataModule as IDataModuleProveedores).GetItems;
FiltrarEmpresa(Result); FiltrarEmpresa(Result);
FiltrarEjercicio(Result);
end; end;
function TProveedoresController.BuscarTodosTiendaWeb: IBizProveedor; function TProveedoresController.BuscarTodosTiendaWeb: IBizProveedor;
begin begin
Result := (FDataModule as IDataModuleProveedores).GetItemsTiendaWeb; Result := (FDataModule as IDataModuleProveedores).GetItemsTiendaWeb;
FiltrarEmpresa(Result); FiltrarEmpresa(Result);
FiltrarEjercicio(Result);
end; end;
constructor TProveedoresController.Create; constructor TProveedoresController.Create;
@ -170,6 +175,31 @@ begin
Result := True; Result := True;
end; end;
procedure TProveedoresController.FiltrarEjercicio(AContacto: IBizContacto);
var
Condicion: TDAWhereExpression;
begin
if Assigned(AContacto)
and Assigned((AContacto as IBizProveedor).SubCuentas) then
begin
if (AContacto as IBizProveedor).SubCuentas.DataTable.Active then
(AContacto as IBizProveedor).SubCuentas.DataTable.Active := False;
// Filtrar los presupuestos actuales por empresa
with (AContacto as IBizProveedor).SubCuentas.DataTable.DynamicWhere do
begin
// (ID_EMPRESA >= ID)
Condicion := NewBinaryExpression(NewField('', fld_SubCuentasContactoID_EJERCICIO), NewConstant(AppFactuGES.EjercicioActivo.ID, datInteger), dboEqual);
if IsEmpty then
Expression := Condicion
else
Expression := NewBinaryExpression(Expression, Condicion, dboAnd);
end;
end;
end;
function TProveedoresController.Guardar(AContacto: IBizContacto): Boolean; function TProveedoresController.Guardar(AContacto: IBizContacto): Boolean;
begin begin
Result := inherited Guardar(AContacto); Result := inherited Guardar(AContacto);
@ -182,6 +212,7 @@ var
begin begin
AContacto := (FDataModule as IDataModuleProveedores).NewItem; AContacto := (FDataModule as IDataModuleProveedores).NewItem;
FiltrarEmpresa(AContacto); FiltrarEmpresa(AContacto);
FiltrarEjercicio(Result);
AContacto.DataTable.Active := True; AContacto.DataTable.Active := True;
AContacto.Insert; AContacto.Insert;
Result := AContacto; Result := AContacto;

31
Source/Modulos/Contactos/Model/uBizClientesServer.pas
View File

@ -59,22 +59,45 @@ var
Intf : IInterface; Intf : IInterface;
AClientID : TGUID; AClientID : TGUID;
ASchema : TDASchema;
ACurrentConn : IDAConnection;
dsData: IDADataset;
i: Integer;
ANombre: string; ANombre: string;
AIDEmpresa: Integer;
AIDCliente: Integer; AIDCliente: Integer;
AIDTienda: Integer; AIDTienda: Integer;
begin begin
AIDCliente := aChange.NewValueByName[fld_ClientesID]; AIDCliente := aChange.NewValueByName[fld_ClientesID];
AIDTienda := aChange.NewValueByName[fld_ClientesID_TIENDA]; AIDTienda := aChange.NewValueByName[fld_ClientesID_TIENDA];
AIDEmpresa := aChange.NewValueByName[fld_ClientesID_EMPRESA];
ANombre := aChange.NewValueByName[fld_ClientesNOMBRE]; ANombre := aChange.NewValueByName[fld_ClientesNOMBRE];
CreateGUID(AClientID); CreateGUID(AClientID);
GetClassFactory('srvContabilidad').CreateInstance(AClientID, Intf); GetClassFactory('srvContabilidad').CreateInstance(AClientID, Intf);
AContabilidadService := Intf as IsrvContabilidad; AContabilidadService := Intf as IsrvContabilidad;
if not AContabilidadService.TieneCuentaAsociada(AIDCliente, AIDEmpresa) then ASchema := BusinessProcessor.Schema;
AContabilidadService.AnadirSubCuentaCliente(AIDCliente, AIDTienda, AIDEmpresa, ANombre); ACurrentConn := GetBusinessProcessorConnection(BusinessProcessor);
try
dsData := ASchema.NewDataset(ACurrentConn, 'DarEmpresasContacto', ['ID_CONTACTO'], [AIDCliente]);
dsData.Active := True;
if not AContabilidadService.TieneCuentaAsociada(AIDCliente, dsData.FieldValues[0]) then
begin
//Por cada ino de las empresas que tiene asociadas el contacto se añade una subcuenta en su ejercicio activo
while not dsData.EOF do
begin
AContabilidadService.AnadirSubCuentaCliente(AIDCliente, AIDTienda, dsData.FieldValues[0], ANombre);
dsData.Next;
end;
end;
finally
dsData := NIL;
ACurrentConn := NIL;
end;
end; end;
procedure TBizClienteServer.BeforeProcessDelta(Sender: TDABusinessProcessor; const aDelta: IDADelta); procedure TBizClienteServer.BeforeProcessDelta(Sender: TDABusinessProcessor; const aDelta: IDADelta);

30
Source/Modulos/Contactos/Model/uBizProveedoresServer.pas
View File

@ -58,7 +58,11 @@ var
AIDProveedor: Integer; AIDProveedor: Integer;
bEsAcreedor: Integer; bEsAcreedor: Integer;
ANombre: string; ANombre: string;
AIDEmpresa: Integer;
ASchema : TDASchema;
ACurrentConn : IDAConnection;
dsData: IDADataset;
i: Integer;
Intf: IInterface; Intf: IInterface;
AContabilidadService: IsrvContabilidad; AContabilidadService: IsrvContabilidad;
@ -66,15 +70,33 @@ var
begin begin
AIDProveedor := aChange.NewValueByName[fld_ProveedoresID]; AIDProveedor := aChange.NewValueByName[fld_ProveedoresID];
bEsAcreedor := aChange.NewValueByName[fld_ProveedoresES_ACREEDOR]; bEsAcreedor := aChange.NewValueByName[fld_ProveedoresES_ACREEDOR];
AIDEmpresa := aChange.NewValueByName[fld_ProveedoresID_EMPRESA];
ANombre := aChange.NewValueByName[fld_ProveedoresNOMBRE]; ANombre := aChange.NewValueByName[fld_ProveedoresNOMBRE];
CreateGUID(AClientID); CreateGUID(AClientID);
GetClassFactory('srvContabilidad').CreateInstance(AClientID, Intf); GetClassFactory('srvContabilidad').CreateInstance(AClientID, Intf);
AContabilidadService := Intf as IsrvContabilidad; AContabilidadService := Intf as IsrvContabilidad;
if not AContabilidadService.TieneCuentaAsociada(AIDProveedor, AIDEmpresa) then ASchema := BusinessProcessor.Schema;
AContabilidadService.AnadirSubCuentaProveedor(AIDProveedor, bEsAcreedor, AIDEmpresa, ANombre); ACurrentConn := GetBusinessProcessorConnection(BusinessProcessor);
try
dsData := ASchema.NewDataset(ACurrentConn, 'DarEmpresasContacto', ['ID_CONTACTO'], [AIDProveedor]);
dsData.Active := True;
if not AContabilidadService.TieneCuentaAsociada(AIDProveedor, dsData.FieldValues[0]) then
begin
//Por cada ino de las empresas que tiene asociadas el contacto se añade una subcuenta en su ejercicio activo
while not dsData.EOF do
begin
AContabilidadService.AnadirSubCuentaProveedor(AIDProveedor, bEsAcreedor, dsData.FieldValues[0], ANombre);
dsData.Next;
end;
end;
finally
dsData := NIL;
ACurrentConn := NIL;
end;
end; end;

30
Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm
View File

@ -14,6 +14,36 @@ object srvContactos: TsrvContactos
DataDictionary = DataDictionary DataDictionary = DataDictionary
Diagrams = Diagrams Diagrams = Diagrams
Datasets = < Datasets = <
item
Params = <
item
Name = 'ID_CONTACTO'
Value = ''
ParamType = daptInput
end>
Statements = <
item
Connection = 'IBX'
ConnectionType = 'Interbase'
Default = True
Name = 'IBX'
SQL =
'select ID_EMPRESA'#10'from empresas_contactos'#10'where ID_CONTACTO = :I' +
'D_CONTACTO'#10
StatementType = stSQL
ColumnMappings = <
item
DatasetField = 'ID_EMPRESA'
TableField = 'ID_EMPRESA'
end>
end>
Name = 'DarEmpresasContacto'
Fields = <
item
Name = 'ID_EMPRESA'
DataType = datInteger
end>
end
item item
Params = <> Params = <>
Statements = < Statements = <

3
Source/Modulos/Contactos/Servidor/srvContactos_Impl.pas
View File

@ -16,8 +16,7 @@ uses
{Ancestor Implementation:} DataAbstractService_Impl, {Ancestor Implementation:} DataAbstractService_Impl,
{Used RODLs:} DataAbstract4_Intf, {Used RODLs:} DataAbstract4_Intf,
{Generated:} uDABusinessProcessor, uDABin2DataStreamer, uDADataStreamer, {Generated:} uDABusinessProcessor, uDABin2DataStreamer, uDADataStreamer,
uDAScriptingProvider, uDAClasses, uDAScriptingProvider, uDAClasses, FactuGES_Intf, uDAInterfaces;
FactuGES_Intf, uDAInterfaces;
type type
{ TsrvContactos } { TsrvContactos }

49
Source/Modulos/Contactos/Views/uEditorCliente.dfm
View File

@ -65,7 +65,7 @@ inherited fEditorCliente: TfEditorCliente
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Width = 890 Width = 890
Height = 544 Height = 544
ActivePage = pagDatosComerciales ActivePage = pagContabilidad
ExplicitWidth = 890 ExplicitWidth = 890
ExplicitHeight = 544 ExplicitHeight = 544
inherited pagGeneral: TTabSheet inherited pagGeneral: TTabSheet
@ -487,8 +487,22 @@ inherited fEditorCliente: TfEditorCliente
ExplicitWidth = 882 ExplicitWidth = 882
ExplicitHeight = 193 ExplicitHeight = 193
inherited Label1: TLabel inherited Label1: TLabel
Left = 575
Top = 30
Width = 277
ExplicitLeft = 575
ExplicitTop = 30
ExplicitWidth = 277
end end
inherited eDiasVencimiento: TcxDBSpinEdit inherited eDiasVencimiento: TcxDBSpinEdit
Left = 647
Top = 62
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 647
ExplicitTop = 62
end end
inherited cbRegimenIVA: TcxDBComboBox inherited cbRegimenIVA: TcxDBComboBox
Top = 30 Top = 30
@ -542,6 +556,26 @@ inherited fEditorCliente: TfEditorCliente
ExplicitLeft = 415 ExplicitLeft = 415
ExplicitTop = 84 ExplicitTop = 84
end end
inherited cxDBSpinEdit1: TcxDBSpinEdit
Left = 647
Top = 89
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 647
ExplicitTop = 89
end
inherited cxDBSpinEdit2: TcxDBSpinEdit
Left = 647
Top = 116
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 647
ExplicitTop = 116
end
inherited dxLayoutGroup1: TdxLayoutGroup inherited dxLayoutGroup1: TdxLayoutGroup
inherited dxLayoutControl1Group5: TdxLayoutGroup inherited dxLayoutControl1Group5: TdxLayoutGroup
inherited dxLayoutControl1Item2: TdxLayoutItem inherited dxLayoutControl1Item2: TdxLayoutItem
@ -707,6 +741,19 @@ inherited fEditorCliente: TfEditorCliente
end end
end end
end end
object DBGrid1: TDBGrid
Left = 93
Top = 192
Width = 786
Height = 120
DataSource = frViewSubCuentaContacto1.DADataSource
TabOrder = 1
TitleFont.Charset = DEFAULT_CHARSET
TitleFont.Color = clWindowText
TitleFont.Height = -11
TitleFont.Name = 'Tahoma'
TitleFont.Style = []
end
end end
end end
inherited StatusBar: TJvStatusBar inherited StatusBar: TJvStatusBar

3
Source/Modulos/Contactos/Views/uEditorCliente.pas
View File

@ -15,7 +15,7 @@ uses
uViewDireccionesEntrega, uViewDetallesGenerico, uViewClienteDescuentos, uViewDireccionesEntrega, uViewDetallesGenerico, uViewClienteDescuentos,
uViewContactoDatosBancarios, dxLayoutLookAndFeels, uViewContactoDatosBancarios, dxLayoutLookAndFeels,
uViewClienteDatosComerciales, uDAInterfaces, uViewSubCuentaContacto, uViewClienteDatosComerciales, uDAInterfaces, uViewSubCuentaContacto,
uViewPersonalContacto; uViewPersonalContacto, Grids, DBGrids;
type type
TfEditorCliente = class(TfEditorContacto, IEditorCliente) TfEditorCliente = class(TfEditorContacto, IEditorCliente)
@ -30,6 +30,7 @@ type
frViewClienteDatosComerciales1: TfrViewClienteDatosComerciales; frViewClienteDatosComerciales1: TfrViewClienteDatosComerciales;
pagContabilidad: TTabSheet; pagContabilidad: TTabSheet;
frViewSubCuentaContacto1: TfrViewSubCuentaContacto; frViewSubCuentaContacto1: TfrViewSubCuentaContacto;
DBGrid1: TDBGrid;
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
procedure actGruposClienteExecute(Sender: TObject); procedure actGruposClienteExecute(Sender: TObject);
protected protected

19
Source/Modulos/Contactos/Views/uEditorContacto.dfm
View File

@ -7,6 +7,7 @@ inherited fEditorContacto: TfEditorContacto
ClientWidth = 632 ClientWidth = 632
Scaled = False Scaled = False
ExplicitWidth = 640 ExplicitWidth = 640
ExplicitHeight = 240
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader inherited JvNavPanelHeader: TJvNavPanelHeader
@ -178,13 +179,29 @@ inherited fEditorContacto: TfEditorContacto
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitTop = -134 ExplicitWidth = 618
ExplicitHeight = 330
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Width = 618 Width = 618
Height = 305 Height = 305
ExplicitWidth = 618
ExplicitHeight = 305
end end
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Width = 618 Width = 618
ExplicitWidth = 618
inherited ToolButton1: TToolButton
ExplicitWidth = 113
end
inherited ToolButton4: TToolButton
ExplicitWidth = 113
end
inherited ToolButton2: TToolButton
ExplicitWidth = 113
end
inherited ToolButton7: TToolButton
ExplicitWidth = 113
end
end end
end end
end end

111
Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
View File

@ -136,6 +136,10 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
ExplicitWidth = 78 ExplicitWidth = 78
Width = 78 Width = 78
end end
inherited bFormasPago: TButton
Left = 289
ExplicitLeft = 289
end
inherited frViewTienda1: TfrViewTienda inherited frViewTienda1: TfrViewTienda
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
inherited cbTienda: TcxComboBox inherited cbTienda: TcxComboBox
@ -149,7 +153,9 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
end end
end end
inherited frViewClienteFactura1: TfrViewClienteFactura inherited frViewClienteFactura1: TfrViewClienteFactura
Left = 449
Width = 398 Width = 398
ExplicitLeft = 449
ExplicitWidth = 398 ExplicitWidth = 398
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 398 Width = 398
@ -198,16 +204,16 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Width = 276 Width = 276
end end
inherited edtCodigoPostal: TcxDBTextEdit inherited edtCodigoPostal: TcxDBTextEdit
Left = 259 Left = 283
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 259 ExplicitLeft = 283
end end
inherited Button3: TBitBtn inherited Button3: TBitBtn
Left = 149 Left = 173
ExplicitLeft = 149 ExplicitLeft = 173
end end
inherited cxDBTextEdit1: TcxDBTextEdit inherited cxDBTextEdit1: TcxDBTextEdit
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -224,6 +230,8 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 310
Width = 310
end end
end end
end end
@ -278,57 +286,57 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
ExplicitWidth = 57 ExplicitWidth = 57
end end
inherited UpDown1: TUpDown inherited UpDown1: TUpDown
Left = 570 Left = 586
Top = 0 Top = 0
ExplicitLeft = 570 ExplicitLeft = 586
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton13: TToolButton inherited ToolButton13: TToolButton
Left = 587 Left = 603
Top = 0 Top = 0
ExplicitLeft = 587 ExplicitLeft = 603
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton6: TToolButton inherited ToolButton6: TToolButton
Left = 595 Left = 611
Top = 0 Top = 0
ExplicitLeft = 595 ExplicitLeft = 611
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton7: TToolButton inherited ToolButton7: TToolButton
Left = 629 Left = 645
Top = 0 Top = 0
ExplicitLeft = 629 ExplicitLeft = 645
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton8: TToolButton inherited ToolButton8: TToolButton
Left = 663 Left = 679
Top = 0 Top = 0
ExplicitLeft = 663 ExplicitLeft = 679
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton12: TToolButton inherited ToolButton12: TToolButton
Left = 697 Left = 713
Top = 0 Top = 0
ExplicitLeft = 697 ExplicitLeft = 713
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton9: TToolButton inherited ToolButton9: TToolButton
Left = 705 Left = 721
Top = 0 Top = 0
ExplicitLeft = 705 ExplicitLeft = 721
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton10: TToolButton inherited ToolButton10: TToolButton
Left = 739 Left = 755
Top = 0 Top = 0
ExplicitLeft = 739 ExplicitLeft = 755
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton11: TToolButton inherited ToolButton11: TToolButton
Left = 773 Left = 789
Top = 0 Top = 0
ExplicitLeft = 773 ExplicitLeft = 789
ExplicitTop = 0 ExplicitTop = 0
end end
end end
@ -433,12 +441,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Width = 860 Width = 860
LookAndFeel = frViewFacturaCliente1.dxLayoutOfficeLookAndFeel1 LookAndFeel = frViewFacturaCliente1.dxLayoutOfficeLookAndFeel1
ExplicitWidth = 860 ExplicitWidth = 860
inherited Bevel1: TBevel
Top = 111
Width = 73
ExplicitTop = 111
ExplicitWidth = 73
end
inherited Bevel3: TBevel inherited Bevel3: TBevel
Left = 457 Left = 457
Top = 30 Top = 30
@ -449,69 +451,69 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
end end
inherited Bevel4: TBevel inherited Bevel4: TBevel
Left = 569 Left = 569
Top = 111 Top = 72
Width = 186 Width = 186
ExplicitLeft = 569 ExplicitLeft = 569
ExplicitTop = 111 ExplicitTop = 72
ExplicitWidth = 186 ExplicitWidth = 186
end end
inherited ImporteDto: TcxDBCurrencyEdit inherited ImporteDto: TcxDBCurrencyEdit
Top = 131 Top = 57
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 131 ExplicitTop = 57
ExplicitWidth = 220 ExplicitWidth = 220
Width = 220 Width = 220
end end
inherited ImporteIVA: TcxDBCurrencyEdit inherited ImporteIVA: TcxDBCurrencyEdit
Left = 640 Left = 640
Top = 57 Top = 107
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 640 ExplicitLeft = 640
ExplicitTop = 57 ExplicitTop = 107
ExplicitWidth = 155 ExplicitWidth = 155
Width = 155 Width = 155
end end
inherited ImporteTotal: TcxDBCurrencyEdit inherited ImporteTotal: TcxDBCurrencyEdit
Left = 570 Left = 570
Top = 131 Top = 161
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 570 ExplicitLeft = 570
ExplicitTop = 131 ExplicitTop = 161
ExplicitWidth = 225 ExplicitWidth = 225
Width = 225 Width = 225
end end
inherited edtDescuento: TcxDBSpinEdit inherited edtDescuento: TcxDBSpinEdit
Top = 131 Top = 57
Properties.OnValidate = frViewTotales1edtDescuentoPropertiesValidate Properties.OnValidate = frViewTotales1edtDescuentoPropertiesValidate
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 131 ExplicitTop = 57
end end
inherited edtIVA: TcxDBSpinEdit inherited edtIVA: TcxDBSpinEdit
Left = 569 Left = 569
Top = 57 Top = 107
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 569 ExplicitLeft = 569
ExplicitTop = 57 ExplicitTop = 107
end end
inherited ImporteBase: TcxDBCurrencyEdit inherited ImporteBase: TcxDBCurrencyEdit
Left = 569 Left = 569
@ -528,7 +530,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
end end
inherited edtRE: TcxDBSpinEdit inherited edtRE: TcxDBSpinEdit
Left = 569 Left = 569
Top = 84 Top = 134
Properties.AssignedValues.MinValue = True Properties.AssignedValues.MinValue = True
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
@ -536,18 +538,18 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 569 ExplicitLeft = 569
ExplicitTop = 84 ExplicitTop = 134
end end
inherited ImporteRE: TcxDBCurrencyEdit inherited ImporteRE: TcxDBCurrencyEdit
Left = 640 Left = 640
Top = 84 Top = 134
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 640 ExplicitLeft = 640
ExplicitTop = 84 ExplicitTop = 134
ExplicitWidth = 155 ExplicitWidth = 155
Width = 155 Width = 155
end end
@ -563,7 +565,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Width = 291 Width = 291
end end
inherited ePorte: TcxDBCurrencyEdit inherited ePorte: TcxDBCurrencyEdit
Top = 158 Top = 84
DataBinding.DataSource = dsDataTable DataBinding.DataSource = dsDataTable
Properties.OnValidate = frViewTotales1ePortePropertiesValidate Properties.OnValidate = frViewTotales1ePortePropertiesValidate
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -572,47 +574,42 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
OnEditing = frViewTotales1ePorteEditing OnEditing = frViewTotales1ePorteEditing
ExplicitTop = 158 ExplicitTop = 84
ExplicitWidth = 291 ExplicitWidth = 291
Width = 291 Width = 291
end end
inherited eIVA: TcxDBLookupComboBox inherited eIVA: TcxDBLookupComboBox
Top = 57 Top = 111
Properties.OnValidate = frViewTotales1eIVAPropertiesValidate Properties.OnValidate = frViewTotales1eIVAPropertiesValidate
Style.Color = clInfoBk Style.Color = clInfoBk
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 57 ExplicitTop = 111
ExplicitWidth = 153 ExplicitWidth = 153
Width = 153 Width = 153
end end
inherited bTiposIVA: TButton inherited bTiposIVA: TButton
Left = 309 Left = 309
Top = 57 Top = 111
OnClick = frViewTotales1bTiposIVAClick OnClick = frViewTotales1bTiposIVAClick
ExplicitLeft = 309 ExplicitLeft = 309
ExplicitTop = 57 ExplicitTop = 111
end end
inherited cbRecargoEquivalencia: TcxDBCheckBox inherited cbRecargoEquivalencia: TcxDBCheckBox
Top = 84 Top = 138
Properties.OnEditValueChanged = frViewTotales1cbRecargoEquivalenciaPropertiesEditValueChanged Properties.OnEditValueChanged = frViewTotales1cbRecargoEquivalenciaPropertiesEditValueChanged
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 84 ExplicitTop = 138
ExplicitWidth = 291 ExplicitWidth = 291
Width = 291 Width = 291
end end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group_Root: TdxLayoutGroup
inherited dxLayoutControl1Group1: TdxLayoutGroup inherited dxLayoutControl1Group1: TdxLayoutGroup
inherited dxLayoutControl1Group2: TdxLayoutGroup
inherited dxLayoutControl1Item10: TdxLayoutItem
Visible = False
end
end
inherited dxLayoutControl1Group5: TdxLayoutGroup inherited dxLayoutControl1Group5: TdxLayoutGroup
inherited dxLayoutControl1Group3: TdxLayoutGroup inherited dxLayoutControl1Group3: TdxLayoutGroup
inherited dxLayoutControl1Group8: TdxLayoutGroup inherited dxLayoutControl1Group8: TdxLayoutGroup

4
Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas
View File

@ -324,12 +324,14 @@ begin
if not (FFactura.DataTable.State in dsEditModes) then if not (FFactura.DataTable.State in dsEditModes) then
FFactura.DataTable.Edit; FFactura.DataTable.Edit;
//En el caso de Acana no se cambia para que el IVA y la FORMA DE PAGO por defecto sea el de la empresa.
// Actualizar IVA y RE a partir del tipo de IVA del cliente. // Actualizar IVA y RE a partir del tipo de IVA del cliente.
Factura.IVA := FTiposIVA.IVA; //((frViewTotales1.dsTiposIVA.DataTable) as IBizTipoIVA).IVA; { Factura.IVA := FTiposIVA.IVA; //((frViewTotales1.dsTiposIVA.DataTable) as IBizTipoIVA).IVA;
if FFactura.Cliente.RECARGO_EQUIVALENCIA = 1 then if FFactura.Cliente.RECARGO_EQUIVALENCIA = 1 then
Factura.RE := FTiposIVA.RE Factura.RE := FTiposIVA.RE
else else
Factura.RE := 0; Factura.RE := 0;
}
// En el caso de tener direcciones asociadas, se debe dar la posibilidad de elegir la dirección principal o las secundarias para la factura // En el caso de tener direcciones asociadas, se debe dar la posibilidad de elegir la dirección principal o las secundarias para la factura
AClientesController := TClientesController.Create; AClientesController := TClientesController.Create;

70
Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm
View File

@ -71,7 +71,6 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Width = 740 Width = 740
Height = 342 Height = 342
ActivePage = pagContabilidad
OnChanging = pgPaginasChanging OnChanging = pgPaginasChanging
ExplicitLeft = 3 ExplicitLeft = 3
ExplicitTop = 79 ExplicitTop = 79
@ -434,12 +433,6 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 746 Width = 746
ExplicitWidth = 746 ExplicitWidth = 746
inherited Bevel1: TBevel
Top = 111
Width = 73
ExplicitTop = 111
ExplicitWidth = 73
end
inherited Bevel3: TBevel inherited Bevel3: TBevel
Left = 398 Left = 398
Top = 30 Top = 30
@ -450,69 +443,69 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
end end
inherited Bevel4: TBevel inherited Bevel4: TBevel
Left = 510 Left = 510
Top = 111 Top = 72
Width = 186 Width = 186
ExplicitLeft = 510 ExplicitLeft = 510
ExplicitTop = 111 ExplicitTop = 72
ExplicitWidth = 186 ExplicitWidth = 186
end end
inherited ImporteDto: TcxDBCurrencyEdit inherited ImporteDto: TcxDBCurrencyEdit
Top = 131 Top = 57
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 131 ExplicitTop = 57
ExplicitWidth = 207 ExplicitWidth = 207
Width = 207 Width = 207
end end
inherited ImporteIVA: TcxDBCurrencyEdit inherited ImporteIVA: TcxDBCurrencyEdit
Left = 581 Left = 581
Top = 57 Top = 107
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 581 ExplicitLeft = 581
ExplicitTop = 57 ExplicitTop = 107
ExplicitWidth = 143 ExplicitWidth = 143
Width = 143 Width = 143
end end
inherited ImporteTotal: TcxDBCurrencyEdit inherited ImporteTotal: TcxDBCurrencyEdit
Left = 511 Left = 511
Top = 131 Top = 161
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 511 ExplicitLeft = 511
ExplicitTop = 131 ExplicitTop = 161
ExplicitWidth = 213 ExplicitWidth = 213
Width = 213 Width = 213
end end
inherited edtDescuento: TcxDBSpinEdit inherited edtDescuento: TcxDBSpinEdit
Top = 131 Top = 57
Properties.OnValidate = frViewTotales1edtDescuentoPropertiesValidate Properties.OnValidate = frViewTotales1edtDescuentoPropertiesValidate
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 131 ExplicitTop = 57
end end
inherited edtIVA: TcxDBSpinEdit inherited edtIVA: TcxDBSpinEdit
Left = 510 Left = 510
Top = 57 Top = 107
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 510 ExplicitLeft = 510
ExplicitTop = 57 ExplicitTop = 107
end end
inherited ImporteBase: TcxDBCurrencyEdit inherited ImporteBase: TcxDBCurrencyEdit
Left = 510 Left = 510
@ -529,7 +522,7 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
end end
inherited edtRE: TcxDBSpinEdit inherited edtRE: TcxDBSpinEdit
Left = 510 Left = 510
Top = 84 Top = 134
Properties.AssignedValues.MinValue = True Properties.AssignedValues.MinValue = True
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
@ -537,18 +530,18 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 510 ExplicitLeft = 510
ExplicitTop = 84 ExplicitTop = 134
end end
inherited ImporteRE: TcxDBCurrencyEdit inherited ImporteRE: TcxDBCurrencyEdit
Left = 581 Left = 581
Top = 84 Top = 134
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 581 ExplicitLeft = 581
ExplicitTop = 84 ExplicitTop = 134
ExplicitWidth = 143 ExplicitWidth = 143
Width = 143 Width = 143
end end
@ -564,7 +557,7 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
Width = 278 Width = 278
end end
inherited ePorte: TcxDBCurrencyEdit inherited ePorte: TcxDBCurrencyEdit
Top = 158 Top = 84
DataBinding.DataSource = dsDataTable DataBinding.DataSource = dsDataTable
Properties.OnValidate = frViewTotales1ePortePropertiesValidate Properties.OnValidate = frViewTotales1ePortePropertiesValidate
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -573,37 +566,37 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
OnEditing = frViewTotales1ePorteEditing OnEditing = frViewTotales1ePorteEditing
ExplicitTop = 158 ExplicitTop = 84
ExplicitWidth = 278 ExplicitWidth = 278
Width = 278 Width = 278
end end
inherited eIVA: TcxDBLookupComboBox inherited eIVA: TcxDBLookupComboBox
Top = 57 Top = 111
Properties.OnValidate = frViewTotales1eIVAPropertiesValidate Properties.OnValidate = frViewTotales1eIVAPropertiesValidate
Style.Color = clInfoBk Style.Color = clInfoBk
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 57 ExplicitTop = 111
ExplicitWidth = 140 ExplicitWidth = 140
Width = 140 Width = 140
end end
inherited bTiposIVA: TButton inherited bTiposIVA: TButton
Left = 250 Left = 250
Top = 57 Top = 111
OnClick = frViewTotales1bTiposIVAClick OnClick = frViewTotales1bTiposIVAClick
ExplicitLeft = 250 ExplicitLeft = 250
ExplicitTop = 57 ExplicitTop = 111
end end
inherited cbRecargoEquivalencia: TcxDBCheckBox inherited cbRecargoEquivalencia: TcxDBCheckBox
Top = 84 Top = 138
Properties.OnEditValueChanged = frViewTotales1cbRecargoEquivalenciaPropertiesEditValueChanged Properties.OnEditValueChanged = frViewTotales1cbRecargoEquivalenciaPropertiesEditValueChanged
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 84 ExplicitTop = 138
ExplicitWidth = 278 ExplicitWidth = 278
Width = 278 Width = 278
end end
@ -611,16 +604,15 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
LookAndFeel = frViewFacturaProveedor1.dxLayoutOfficeLookAndFeel1 LookAndFeel = frViewFacturaProveedor1.dxLayoutOfficeLookAndFeel1
inherited dxLayoutControl1Group1: TdxLayoutGroup inherited dxLayoutControl1Group1: TdxLayoutGroup
inherited dxLayoutControl1Group2: TdxLayoutGroup inherited dxLayoutControl1Group2: TdxLayoutGroup
inherited dxLayoutControl1Item10: TdxLayoutItem
Visible = False
end
inherited dxLayoutControl1Group7: TdxLayoutGroup inherited dxLayoutControl1Group7: TdxLayoutGroup
Visible = False Visible = False
inherited dxLayoutControl1Item4: TdxLayoutItem inherited dxLayoutControl1Group10: TdxLayoutGroup
Visible = False inherited dxLayoutControl1Item4: TdxLayoutItem
end Visible = False
inherited dxLayoutControl1Item1: TdxLayoutItem end
Visible = False inherited dxLayoutControl1Item1: TdxLayoutItem
Visible = False
end
end end
end end
end end

5
Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas
View File

@ -302,13 +302,14 @@ begin
if not (FFactura.DataTable.State in dsEditModes) then if not (FFactura.DataTable.State in dsEditModes) then
FFactura.DataTable.Edit; FFactura.DataTable.Edit;
//En el caso de Acana no se cambia para que el IVA y la FORMA DE PAGO por defecto sea el de la empresa.
// Actualizar IVA y RE a partir del tipo de IVA del proveedor. // Actualizar IVA y RE a partir del tipo de IVA del proveedor.
Factura.IVA := FTiposIVA.IVA; //((frViewTotales1.dsTiposIVA.DataTable) as IBizTipoIVA).IVA; { Factura.IVA := FTiposIVA.IVA; //((frViewTotales1.dsTiposIVA.DataTable) as IBizTipoIVA).IVA;
// if FFactura.Proveedor.RECARGO_EQUIVALENCIA = 1 then // if FFactura.Proveedor.RECARGO_EQUIVALENCIA = 1 then
// Factura.RE := ((frViewTotales1.dsTiposIVA.DataTable) as IBizTipoIVA).RE // Factura.RE := ((frViewTotales1.dsTiposIVA.DataTable) as IBizTipoIVA).RE
// else // else
// Factura.RE := 0; // Factura.RE := 0;
}
// En el caso de tener direcciones asociadas, se debe dar la posibilidad de elegir la dirección principal o las secundarias para la factura // En el caso de tener direcciones asociadas, se debe dar la posibilidad de elegir la dirección principal o las secundarias para la factura
AProveedoresController := TProveedoresController.Create; AProveedoresController := TProveedoresController.Create;
try try

BIN
Source/Servidor/FactuGES_Server.RES
View File

Binary file not shown.

2
Source/Servidor/FactuGES_Server.rc
View File

@ -16,7 +16,7 @@ BEGIN
VALUE "FileVersion", "2.2.8.0\0" VALUE "FileVersion", "2.2.8.0\0"
VALUE "ProductName", "FactuGES (Servidor)\0" VALUE "ProductName", "FactuGES (Servidor)\0"
VALUE "ProductVersion", "2.2.8.0\0" VALUE "ProductVersion", "2.2.8.0\0"
VALUE "CompileDate", "martes, 03 de febrero de 2009 20:01\0" VALUE "CompileDate", "viernes, 06 de febrero de 2009 12:01\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"