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

Se repasa hasta generar factura de cliente que falla la generación del recibo

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.AbetoDesign_FactuGES/trunk@8 93f398dd-4eb6-7a46-baf6-13f46f578da2
This commit is contained in:
roberto 2011-11-18 17:12:39 +00:00
parent 6863ef5be9
commit 63a865b1bc
75 changed files with 1439 additions and 827 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.

106
Database/RodaxSoftware.FactuGES.Database.proj Normal file
View File

@ -0,0 +1,106 @@
<Project DefaultTargets="Build" InitialTargets="CreateOutputPath" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- ASCII Constants -->
<PropertyGroup>
<DOUBLE_QUOTES>%22</DOUBLE_QUOTES>
</PropertyGroup>
<PropertyGroup>
<DBUser Condition=" '$(DBUser)' == '' ">sysdba</DBUser>
<DBPassword Condition=" '$(DBPassword)' == '' ">masterkey</DBPassword>
<DBServer Condition=" '$(SqlCmdRunner)' == '' ">localhost</DBServer>
<DeploymentBuild Condition=" '$(DeploymentBuild)' == '' ">false</DeploymentBuild>
<SqlScriptsFolder Condition=" '$(SqlScriptsFolder)' == '' ">$(MSBuildProjectDirectory)\Scripts</SqlScriptsFolder>
<ToolsFolder Condition=" '$(ToolsFolder)' == '' ">$(MSBuildProjectDirectory)\..\Tools</ToolsFolder>
<CodeOutputFolder Condition=" '$(CodeOutputFolder)' == '' ">$(MSBuildProjectDirectory)\..\Output</CodeOutputFolder>
<SqlCmdRunner Condition=" '$(SqlCmdRunner)' == '' ">$(ToolsFolder)\ISQL\isql.exe</SqlCmdRunner>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
</PropertyGroup>
<PropertyGroup Condition=" '|$(Configuration)|' == '|Debug|' ">
<OutputPath>$(CodeOutputFolder)\Debug\Database</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '|$(Configuration)|' == '|Release|' ">
<OutputPath>$(CodeOutputFolder)\Release\Database</OutputPath>
</PropertyGroup>
<ItemGroup>
<Sql Include="$(SqlScriptsFolder)\factuges.sql" />
<Sql Include="$(SqlScriptsFolder)\factuges_sysdata.sql" />
<Sql Include="$(SqlScriptsFolder)\factuges_sysdata_plan_general_contable.sql" />
<SqlOutput Include="$(OutputPath)\factuges.fdb" />
<SqlReplicador Include="$(SqlScriptsFolder)\replicador.sql" />
<SqlReplicador Include="$(SqlScriptsFolder)\replicador_sysdata.sql" />
<SqlReplicador Include="$(SqlScriptsFolder)\factuges_replicador.sql" />
<SqlOutputReplicador Include="$(OutputPath)\replicate.fdb" />
</ItemGroup>
<Target Name="CreateOutputPath">
<MakeDir Directories="$(OutputPath)" Condition="!Exists('$(OutputPath)')"/>
</Target>
<Target Name="Build"
DependsOnTargets="CreateDatabase;InsertSysData"/>
<Target Name="CreateDatabase"
Inputs="@(Sql)"
Outputs="@(SqlOutput)">
<Exec Command="$(DOUBLE_QUOTES)$(SqlCmdRunner)$(DOUBLE_QUOTES) -i $(DOUBLE_QUOTES)$(SqlScriptsFolder)\factuges.sql$(DOUBLE_QUOTES) -u $(DBUser) -p $(DBPassword) -q"
WorkingDirectory="$(OutputPath)" />
</Target>
<Target Name="InsertSysData">
<Exec Command="$(DOUBLE_QUOTES)$(SqlCmdRunner)$(DOUBLE_QUOTES) -i $(DOUBLE_QUOTES)$(SqlScriptsFolder)\factuges_sysdata.sql$(DOUBLE_QUOTES) -u $(DBUser) -p $(DBPassword) -q $(DOUBLE_QUOTES)$(OutputPath)\factuges.fdb$(DOUBLE_QUOTES)"
WorkingDirectory="$(OutputPath)" />
<Exec Command="$(DOUBLE_QUOTES)$(SqlCmdRunner)$(DOUBLE_QUOTES) -i $(DOUBLE_QUOTES)$(SqlScriptsFolder)\factuges_listaprovincias.sql$(DOUBLE_QUOTES) -u $(DBUser) -p $(DBPassword) -q $(DOUBLE_QUOTES)$(OutputPath)\factuges.fdb$(DOUBLE_QUOTES)"
WorkingDirectory="$(OutputPath)" />
<Exec Command="$(DOUBLE_QUOTES)$(SqlCmdRunner)$(DOUBLE_QUOTES) -i $(DOUBLE_QUOTES)$(SqlScriptsFolder)\factuges_listapoblaciones.sql$(DOUBLE_QUOTES) -u $(DBUser) -p $(DBPassword) -q $(DOUBLE_QUOTES)$(OutputPath)\factuges.fdb$(DOUBLE_QUOTES)"
WorkingDirectory="$(OutputPath)" />
<Exec Command="$(DOUBLE_QUOTES)$(SqlCmdRunner)$(DOUBLE_QUOTES) -i $(DOUBLE_QUOTES)$(SqlScriptsFolder)\factuges_sysdata_plan_general_contable.sql$(DOUBLE_QUOTES) -u $(DBUser) -p $(DBPassword) -q $(DOUBLE_QUOTES)$(OutputPath)\factuges.fdb$(DOUBLE_QUOTES)"
WorkingDirectory="$(OutputPath)" />
<Exec Command="$(DOUBLE_QUOTES)$(SqlCmdRunner)$(DOUBLE_QUOTES) -i $(DOUBLE_QUOTES)$(SqlScriptsFolder)\factuges_sysdata_plan_general_contable_acana.sql$(DOUBLE_QUOTES) -u $(DBUser) -p $(DBPassword) -q $(DOUBLE_QUOTES)$(OutputPath)\factuges.fdb$(DOUBLE_QUOTES)"
WorkingDirectory="$(OutputPath)" />
<Exec Command="$(DOUBLE_QUOTES)$(SqlCmdRunner)$(DOUBLE_QUOTES) -i $(DOUBLE_QUOTES)$(SqlScriptsFolder)\factuges_sysdata_presupuestos.sql$(DOUBLE_QUOTES) -u $(DBUser) -p $(DBPassword) -q $(DOUBLE_QUOTES)$(OutputPath)\factuges.fdb$(DOUBLE_QUOTES)"
WorkingDirectory="$(OutputPath)" />
</Target>
<Target Name="BuildReplicador"
Inputs="@(SqlReplicador)"
Outputs="@(SqlOutputReplicador)">
<Exec Command="$(DOUBLE_QUOTES)$(SqlCmdRunner)$(DOUBLE_QUOTES) -i $(DOUBLE_QUOTES)$(SqlScriptsFolder)\replicador.sql$(DOUBLE_QUOTES) -u $(DBUser) -p $(DBPassword) -q"
WorkingDirectory="$(OutputPath)" />
<Exec Command="$(DOUBLE_QUOTES)$(SqlCmdRunner)$(DOUBLE_QUOTES) -i $(DOUBLE_QUOTES)$(SqlScriptsFolder)\replicador_sysdata.sql$(DOUBLE_QUOTES) -u $(DBUser) -p $(DBPassword) -q $(DOUBLE_QUOTES)$(OutputPath)\replicate.fdb$(DOUBLE_QUOTES)"
WorkingDirectory="$(OutputPath)" />
<Exec Command="$(DOUBLE_QUOTES)$(SqlCmdRunner)$(DOUBLE_QUOTES) -i $(DOUBLE_QUOTES)$(SqlScriptsFolder)\factuges_replicador.sql$(DOUBLE_QUOTES) -u $(DBUser) -p $(DBPassword) -q $(DOUBLE_QUOTES)$(OutputPath)\factuges.fdb$(DOUBLE_QUOTES)"
WorkingDirectory="$(OutputPath)" />
</Target>
<Target Name="Extract"
Inputs="$(OutputPath)\factuges.fdb"
Outputs="$(OutputPath)\factuges_$(Configuration).sql">
<Exec Command="$(DOUBLE_QUOTES)$(SqlCmdRunner)$(DOUBLE_QUOTES) -a -d factuges.fdb -u $(DBUser) -p $(DBPassword) -o $(DOUBLE_QUOTES)$(OutputPath)\factuges_$(Configuration).sql$(DOUBLE_QUOTES) $(DOUBLE_QUOTES)$(OutputPath)\factuges.fdb$(DOUBLE_QUOTES) -b"
WorkingDirectory="$(OutputPath)" />
</Target>
<Target Name="Rebuild"
DependsOnTargets="Clean;Build"/>
<Target Name="Clean">
<Delete Files="@(SqlOutput)"/>
<Delete Files="@(SqlOutputReplicador)"/>
</Target>
</Project>

13
Database/scripts/config.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<Configuration>
<MinPasswordLength>3</MinPasswordLength>
<MaxLoginAttempts>3</MaxLoginAttempts>
<ForcePassword>TRUE</ForcePassword>
<MostrarBarraMenus>TRUE</MostrarBarraMenus>
<Clientes.RegimenIVA>General</Clientes.RegimenIVA>
<Clientes.FormaPago>CONTADO</Clientes.FormaPago>
<Clientes.TipoIVA>IVA18</Clientes.TipoIVA>
<Proveedores.RegimenIVA>General</Proveedores.RegimenIVA>
<Proveedores.FormaPago>CONTADO</Proveedores.FormaPago>
<Proveedores.TipoIVA>IVA18</Proveedores.TipoIVA>
</Configuration>

81
Database/scripts/factuges_sysdata.sql
View File

@ -2,15 +2,15 @@ SET SQL DIALECT 3;
SET NAMES ISO8859_1; SET NAMES ISO8859_1;
INSERT INTO EMPRESAS (ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, REGISTRO_MERCANTIL) VALUES (1, 'B85033132', 'Abeto Design S.L.', 'Abeto Design S.L.', 'Plaza San Juan de la Cruz, 8', 'Madrid', 'Madrid', '28003', '91 5331800', NULL, NULL, NULL, '91 5331809', 'tienda@abetodesign.com', NULL, 'www.abetodesign.com', NULL, NULL, NULL, 'Administrador', NULL, ''); INSERT INTO EMPRESAS (ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, FECHA_ALTA, FECHA_MODIFICACION, USUARIO, REGISTRO_MERCANTIL, ID_TIPO_IVA, ID_FORMA_PAGO, VALIDEZ_PRESUPUESTOS) VALUES (1, 'B85033132', 'ABETO DESIGN S.L.', 'Abeto Design S.L.', 'Plaza San Juan de la Cruz, 8', 'Madrid', 'Madrid', '28003', '91 533 18 00', NULL, NULL, NULL, '91 533 18 09', 'tienda@abetodesign.com', NULL, 'www.abetodesign.com', NULL, NULL, 'Administrador', 'Insc. en el Reg. Merc. de Madrid, Tomo 6.765, Folio 11, Sección 8, CIF: B85033132', 1, 1, 1);
INSERT INTO EMPRESAS (ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, REGISTRO_MERCANTIL) VALUES (2, 'BXXXXXXXX', 'Graden S.L.', 'Graden S.L.', 'Plaza San Juan de la Cruz, 8', 'Madrid', 'Madrid', '28003', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'Administrador', NULL, ''); INSERT INTO EMPRESAS (ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, FECHA_ALTA, FECHA_MODIFICACION, USUARIO, REGISTRO_MERCANTIL, ID_TIPO_IVA, ID_FORMA_PAGO, VALIDEZ_PRESUPUESTOS) VALUES (2, 'B80646540', 'Graden S.L.', 'Graden S.L.', 'Plaza San Juan de la Cruz, 8', 'Madrid', 'Madrid', '28003', '91 533 18 00', NULL, NULL, NULL, '91 533 18 09', 'tienda@abetodesign.com', NULL, 'www.abetodesign.com', NULL, NULL, 'Administrador', 'Insc. en el Reg. Merc. de Madrid, Tomo 6.765, Libro 0, Folio 11, Sección 8, Hoja M-448873 CIF: B80646540', 1, 1, 1);
INSERT INTO EMPRESAS (ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, REGISTRO_MERCANTIL) VALUES (3, Null, 'Abeto', 'Abeto', Null, Null, Null, Null, Null, NULL, NULL, NULL, Null, Null, NULL, Null, NULL, NULL, NULL, 'Administrador', NULL, ''); INSERT INTO EMPRESAS (ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, FECHA_ALTA, FECHA_MODIFICACION, USUARIO, REGISTRO_MERCANTIL, ID_TIPO_IVA, ID_FORMA_PAGO, VALIDEZ_PRESUPUESTOS) VALUES (3, NULL, 'Abeto', 'Abeto', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'Administrador', '', NULL, NULL, 1);
SET GENERATOR GEN_EMPRESAS_ID TO 4; SET GENERATOR GEN_EMPRESAS_ID TO 4;
COMMIT WORK; COMMIT WORK;
INSERT INTO EMPRESAS_TIENDAS (ID, ID_EMPRESA, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, PERSONA_CONTACTO, NOMBRE, TELEFONO, MOVIL, FAX, EMAIL, NOTAS, FECHA_ALTA, FECHA_MODIFICACION, CODIGO_CONTABLE) VALUES (1, 1, 'Armarios y Puertas', 'Madrid', 'Madrid', '28003', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '01'); INSERT INTO EMPRESAS_TIENDAS (ID, ID_EMPRESA, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, PERSONA_CONTACTO, NOMBRE, TELEFONO, MOVIL, FAX, EMAIL, FECHA_ALTA, FECHA_MODIFICACION, CODIGO_CONTABLE) VALUES (1, 1, 'Plaza San Juan de la Cruz, 8', 'Madrid', 'Madrid', '28003', NULL, 'Armarios y Puertas', NULL, NULL, NULL, NULL, NULL, NULL, '01');
INSERT INTO EMPRESAS_TIENDAS (ID, ID_EMPRESA, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, PERSONA_CONTACTO, NOMBRE, TELEFONO, MOVIL, FAX, EMAIL, NOTAS, FECHA_ALTA, FECHA_MODIFICACION, CODIGO_CONTABLE) VALUES (2, 2, 'Cocinas y Baños', 'Madrid', 'Madrid', '28003', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '02'); INSERT INTO EMPRESAS_TIENDAS (ID, ID_EMPRESA, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, PERSONA_CONTACTO, NOMBRE, TELEFONO, MOVIL, FAX, EMAIL, FECHA_ALTA, FECHA_MODIFICACION, CODIGO_CONTABLE) VALUES (2, 2, 'Plaza San Juan de la Cruz, 8', 'Madrid', 'Madrid', '28003', NULL, 'Cocinas y Baños', NULL, NULL, NULL, NULL, NULL, NULL, '02');
INSERT INTO EMPRESAS_TIENDAS (ID, ID_EMPRESA, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, PERSONA_CONTACTO, NOMBRE, TELEFONO, MOVIL, FAX, EMAIL, NOTAS, FECHA_ALTA, FECHA_MODIFICACION, CODIGO_CONTABLE) VALUES (3, 3, NULL, NULL, NULL, NULL, NULL, 'Abeto', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '03'); INSERT INTO EMPRESAS_TIENDAS (ID, ID_EMPRESA, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, PERSONA_CONTACTO, NOMBRE, TELEFONO, MOVIL, FAX, EMAIL, FECHA_ALTA, FECHA_MODIFICACION, CODIGO_CONTABLE) VALUES (3, 3, NULL, NULL, NULL, NULL, NULL, 'Abeto', NULL, NULL, NULL, NULL, NULL, NULL, '03');
SET GENERATOR GEN_EMPRESAS_TIENDAS_ID TO 4; SET GENERATOR GEN_EMPRESAS_TIENDAS_ID TO 4;
COMMIT WORK; COMMIT WORK;
@ -21,10 +21,50 @@ INSERT INTO CATEGORIAS (ID, CATEGORIA) VALUES (4, 'INSTALADOR');
SET GENERATOR GEN_CATEGORIAS_ID TO 5; SET GENERATOR GEN_CATEGORIAS_ID TO 5;
COMMIT WORK; COMMIT WORK;
INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (2, 'FORMA_PAGO_COCINA', '5', NULL);
INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (3, 'PLAZOS_ENTREGA_COCINA', '', NULL);
INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (4, 'OBSERVACIONES_COCINA', 'Queda excluido de este contrato cualquier tipo de trabajo de fontaneria, albañileria, o conexion de aparatos.', NULL);
INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (5, 'CONDICIONES_COCINA', '', NULL);
INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (6, 'FORMA_PAGO_ARMARIO', '6', NULL);
INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (7, 'PLAZOS_ENTREGA_ARMARIO', '30-35 días', NULL);
INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (8, 'OBSERVACIONES_ARMARIO', 'Incluye transporte e instalación.', NULL);
INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (9, 'CONDICIONES_ARMARIO', '', NULL);
INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (10, 'FORMA_PAGO_BANO', '7', NULL);
INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (11, 'PLAZOS_ENTREGA_BANO', '', NULL);
INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (12, 'OBSERVACIONES_BANO', '', NULL);
INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (13, 'CONDICIONES_BANO', '', NULL);
INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (14, 'FORMA_PAGO_ELECTRODOMESTICO', '8', NULL);
INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (15, 'PLAZOS_ENTREGA_ELECTRODOMESTICO', '', NULL);
INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (16, 'OBSERVACIONES_ELECTRODOMESTICO', '', NULL);
INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (17, 'CONDICIONES_ELECTRODOMESTICO', '', NULL);
INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (18, 'FORMA_PAGO_VARIOS', '9', NULL);
INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (19, 'PLAZOS_ENTREGA_VARIOS', '35 - 40 dias', NULL);
INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (20, 'OBSERVACIONES_VARIOS', 'Incluye transporte e instalación.', NULL);
INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (21, 'CONDICIONES_VARIOS', '', NULL);
INSERT INTO CONFIGURACION (ID, CODIGO, VALOR, ID_EMPRESA) VALUES (22, 'RUTA_DOCUMENTOS', 'C:\Codigo\Output\Debug\Servidor\DOCUMENTOS', NULL);
SET GENERATOR GEN_CONFIGURACION_ID TO 23;
COMMIT WORK;
INSERT INTO FORMAS_PAGO (ID, REFERENCIA, DESCRIPCION, TITULAR, ENTIDAD, SUCURSAL, DC, CUENTA) VALUES (1, 'CONTADO', 'CONTADO', NULL, NULL, NULL, NULL, NULL); INSERT INTO FORMAS_PAGO (ID, REFERENCIA, DESCRIPCION, TITULAR, ENTIDAD, SUCURSAL, DC, CUENTA) VALUES (1, 'CONTADO', 'CONTADO', NULL, NULL, NULL, NULL, NULL);
INSERT INTO FORMAS_PAGO (ID, REFERENCIA, DESCRIPCION, TITULAR, ENTIDAD, SUCURSAL, DC, CUENTA) VALUES (2, 'A30', 'A 30 DIAS', NULL, NULL, NULL, NULL, NULL); INSERT INTO FORMAS_PAGO (ID, REFERENCIA, DESCRIPCION, TITULAR, ENTIDAD, SUCURSAL, DC, CUENTA) VALUES (2, 'A30', 'A 30 DIAS', NULL, NULL, NULL, NULL, NULL);
INSERT INTO FORMAS_PAGO (ID, REFERENCIA, DESCRIPCION, TITULAR, ENTIDAD, SUCURSAL, DC, CUENTA) VALUES (3, 'A306090', 'A 30 60 90 DIAS', NULL, NULL, NULL, NULL, NULL); INSERT INTO FORMAS_PAGO (ID, REFERENCIA, DESCRIPCION, TITULAR, ENTIDAD, SUCURSAL, DC, CUENTA) VALUES (3, 'A306090', 'A 30 60 90 DIAS', NULL, NULL, NULL, NULL, NULL);
SET GENERATOR GEN_FORMAS_PAGO_ID TO 4; INSERT INTO FORMAS_PAGO (ID, REFERENCIA, DESCRIPCION, TITULAR, ENTIDAD, SUCURSAL, DC, CUENTA) VALUES (5, '30-60-10 Cocinas', '30% a la firma del contrato
60% a la entrega del material.
10% a la finalizacion de la obra.', NULL, NULL, NULL, NULL, NULL);
INSERT INTO FORMAS_PAGO (ID, REFERENCIA, DESCRIPCION, TITULAR, ENTIDAD, SUCURSAL, DC, CUENTA) VALUES (6, '40-60 Armarios', '40% a la firma del contrato.
60% a la finalizacion del montaje.
El pago se efectuara al instalador.', NULL, NULL, NULL, NULL, NULL);
INSERT INTO FORMAS_PAGO (ID, REFERENCIA, DESCRIPCION, TITULAR, ENTIDAD, SUCURSAL, DC, CUENTA) VALUES (7, '35-65 Baño', '35% a la firma del contrato
65% a la finalizacion montaje', NULL, NULL, NULL, NULL, NULL);
INSERT INTO FORMAS_PAGO (ID, REFERENCIA, DESCRIPCION, TITULAR, ENTIDAD, SUCURSAL, DC, CUENTA) VALUES (8, '30-70 Electrodomesticos', '30% a la firma de la propuesta
Resto a la entrega de los aparatos
Nota: Estos precios son con I.V.A. incluido', NULL, NULL, NULL, NULL, NULL);
INSERT INTO FORMAS_PAGO (ID, REFERENCIA, DESCRIPCION, TITULAR, ENTIDAD, SUCURSAL, DC, CUENTA) VALUES (9, '45-55 Varios', '45% a la firma del contrato
55% a la finalizacion de la obra.
FINANCIACION HASTA 12 MESES SIN INTERESES', NULL, NULL, NULL, NULL, NULL);
SET GENERATOR GEN_FORMAS_PAGO_ID TO 10;
COMMIT WORK; COMMIT WORK;
INSERT INTO FORMAS_PAGO_PLAZOS (ID, ID_FORMA_PAGO, NUM_DIAS, PORCENTAJE) VALUES (1, 1, 0, 100); INSERT INTO FORMAS_PAGO_PLAZOS (ID, ID_FORMA_PAGO, NUM_DIAS, PORCENTAJE) VALUES (1, 1, 0, 100);
@ -32,21 +72,32 @@ INSERT INTO FORMAS_PAGO_PLAZOS (ID, ID_FORMA_PAGO, NUM_DIAS, PORCENTAJE) VALUES
INSERT INTO FORMAS_PAGO_PLAZOS (ID, ID_FORMA_PAGO, NUM_DIAS, PORCENTAJE) VALUES (3, 3, 30, 33.3300018310547); INSERT INTO FORMAS_PAGO_PLAZOS (ID, ID_FORMA_PAGO, NUM_DIAS, PORCENTAJE) VALUES (3, 3, 30, 33.3300018310547);
INSERT INTO FORMAS_PAGO_PLAZOS (ID, ID_FORMA_PAGO, NUM_DIAS, PORCENTAJE) VALUES (4, 3, 60, 33.3300018310547); INSERT INTO FORMAS_PAGO_PLAZOS (ID, ID_FORMA_PAGO, NUM_DIAS, PORCENTAJE) VALUES (4, 3, 60, 33.3300018310547);
INSERT INTO FORMAS_PAGO_PLAZOS (ID, ID_FORMA_PAGO, NUM_DIAS, PORCENTAJE) VALUES (5, 3, 90, 33.3300018310547); INSERT INTO FORMAS_PAGO_PLAZOS (ID, ID_FORMA_PAGO, NUM_DIAS, PORCENTAJE) VALUES (5, 3, 90, 33.3300018310547);
SET GENERATOR GEN_FORMAS_PAGO_PLAZOS_ID TO 6; INSERT INTO FORMAS_PAGO_PLAZOS (ID, ID_FORMA_PAGO, NUM_DIAS, PORCENTAJE) VALUES (7, 5, 1, 30);
INSERT INTO FORMAS_PAGO_PLAZOS (ID, ID_FORMA_PAGO, NUM_DIAS, PORCENTAJE) VALUES (8, 5, 20, 60);
INSERT INTO FORMAS_PAGO_PLAZOS (ID, ID_FORMA_PAGO, NUM_DIAS, PORCENTAJE) VALUES (9, 5, 30, 10);
INSERT INTO FORMAS_PAGO_PLAZOS (ID, ID_FORMA_PAGO, NUM_DIAS, PORCENTAJE) VALUES (10, 6, 1, 40);
INSERT INTO FORMAS_PAGO_PLAZOS (ID, ID_FORMA_PAGO, NUM_DIAS, PORCENTAJE) VALUES (11, 6, 35, 60);
INSERT INTO FORMAS_PAGO_PLAZOS (ID, ID_FORMA_PAGO, NUM_DIAS, PORCENTAJE) VALUES (12, 7, 1, 35);
INSERT INTO FORMAS_PAGO_PLAZOS (ID, ID_FORMA_PAGO, NUM_DIAS, PORCENTAJE) VALUES (13, 7, 20, 65);
INSERT INTO FORMAS_PAGO_PLAZOS (ID, ID_FORMA_PAGO, NUM_DIAS, PORCENTAJE) VALUES (14, 8, 1, 30);
INSERT INTO FORMAS_PAGO_PLAZOS (ID, ID_FORMA_PAGO, NUM_DIAS, PORCENTAJE) VALUES (15, 8, 20, 70);
INSERT INTO FORMAS_PAGO_PLAZOS (ID, ID_FORMA_PAGO, NUM_DIAS, PORCENTAJE) VALUES (16, 9, 1, 45);
INSERT INTO FORMAS_PAGO_PLAZOS (ID, ID_FORMA_PAGO, NUM_DIAS, PORCENTAJE) VALUES (17, 9, 35, 55);
SET GENERATOR GEN_FORMAS_PAGO_PLAZOS_ID TO 18;
COMMIT WORK; COMMIT WORK;
INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (1, NULL, 1, 'REF_CLIENTE', 'ACL/000001', 'Ref. Cliente Armarios y Puertas'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (1, NULL, 1, 'REF_CLIENTE', 'ACL/000001', 'Ref. Cliente Armarios y Puertas');
INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (2, NULL, 2, 'REF_CLIENTE', 'GCL/000001', 'Ref. Cliente Cocinas y Baños'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (2, NULL, 2, 'REF_CLIENTE', 'GCL/000001', 'Ref. Cliente Cocinas y Baños');
INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (3, NULL, 0, 'REF_CLIENTE', 'CLI/000001', 'Ref. Cliente General'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (3, NULL, 3, 'REF_CLIENTE', 'CLI/000001', 'Ref. Cliente General');
INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (4, NULL, 1, 'REF_PROVEEDOR', 'APR/000001', 'Ref. Proveedor Armarios y Puertas'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (4, NULL, 1, 'REF_PROVEEDOR', 'APR/000001', 'Ref. Proveedor Armarios y Puertas');
INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (5, NULL, 2, 'REF_PROVEEDOR', 'GPR/000001', 'Ref. Proveedor Cocinas y Baños'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (5, NULL, 2, 'REF_PROVEEDOR', 'GPR/000001', 'Ref. Proveedor Cocinas y Baños');
INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (6, NULL, 0, 'REF_PROVEEDOR', 'PRO/000001', 'Ref. Proveedor General'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (6, NULL, 3, 'REF_PROVEEDOR', 'PRO/000001', 'Ref. Proveedor General');
INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (7, NULL, 1, 'REF_PRESUPUESTOS_CLIENTE', 'APR12/00001', 'Ref. Presupuesto de cliente Armarios y Puertas'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (7, NULL, 1, 'REF_PRESUPUESTOS_CLIENTE', 'APR12/00001', 'Ref. Presupuesto de cliente Armarios y Puertas');
INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (8, NULL, 2, 'REF_PRESUPUESTOS_CLIENTE', 'GPR12/00001', 'Ref. Presupuesto de cliente Cocinas y Baños'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (8, NULL, 2, 'REF_PRESUPUESTOS_CLIENTE', 'GPR12/00001', 'Ref. Presupuesto de cliente Cocinas y Baños');
INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (9, NULL, 0, 'REF_PRESUPUESTOS_CLIENTE', 'PRE12/00001', 'Ref. Presupuesto de cliente General'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (9, NULL, 3, 'REF_PRESUPUESTOS_CLIENTE', 'PRE12/00001', 'Ref. Presupuesto de cliente General');
INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (10, NULL, 1, 'REF_CONTRATOS_CLIENTE', 'ACO12/00001', 'Ref. Contrato de cliente Armarios y Puertas'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (10, NULL, 1, 'REF_CONTRATOS_CLIENTE', 'ACO12/00001', 'Ref. Contrato de cliente Armarios y Puertas');
INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (11, NULL, 2, 'REF_CONTRATOS_CLIENTE', 'GCO12/00001', 'Ref. Contrato de cliente Cocinas y Baños'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (11, NULL, 2, 'REF_CONTRATOS_CLIENTE', 'GCO12/00001', 'Ref. Contrato de cliente Cocinas y Baños');
INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (12, NULL, 0, 'REF_CONTRATOS_CLIENTE', 'CON12/00001', 'Ref. Contrato de cliente General'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (12, NULL, 3, 'REF_CONTRATOS_CLIENTE', 'CON12/00001', 'Ref. Contrato de cliente General');
INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (13, 1, 0, 'REF_ALBARANES_CLIENTE', 'ALB12/000001', 'Ref. Albaranes de cliente General'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (13, 1, 0, 'REF_ALBARANES_CLIENTE', 'ALB12/000001', 'Ref. Albaranes de cliente General');
INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (14, 1, 1, 'REF_ALBARANES_CLIENTE', 'AAL12/000001', 'Ref. Albaranes de cliente Armarios y Puertas'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (14, 1, 1, 'REF_ALBARANES_CLIENTE', 'AAL12/000001', 'Ref. Albaranes de cliente Armarios y Puertas');
@ -85,14 +136,12 @@ INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION)
INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (41, 1, NULL, 'REF_REMESAS_PROVEEDOR', 'RPRO/00001', 'Ref. remesas de proveedor'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (41, 1, NULL, 'REF_REMESAS_PROVEEDOR', 'RPRO/00001', 'Ref. remesas de proveedor');
INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (42, 2, NULL, 'REF_REMESAS_CLIENTE', 'RCLI/00001', 'Ref. remesas de cliente'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (42, 2, NULL, 'REF_REMESAS_CLIENTE', 'RCLI/00001', 'Ref. remesas de cliente');
INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (43, 2, NULL, 'REF_REMESAS_PROVEEDOR', 'BRPRO/0000', 'Ref. remesas de proveedor'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (43, 2, NULL, 'REF_REMESAS_PROVEEDOR', 'BRPRO/0000', 'Ref. remesas de proveedor');
COMMIT WORK; COMMIT WORK;
INSERT INTO TIPOS_IVA (ID, REFERENCIA, DESCRIPCION, IVA, RE) VALUES (1, 'IVA16', 'IVA16', 16, 4); INSERT INTO TIPOS_IVA (ID, REFERENCIA, DESCRIPCION, IVA, RE) VALUES (1, 'IVA18', 'IVA18', 18, 4);
INSERT INTO TIPOS_IVA (ID, REFERENCIA, DESCRIPCION, IVA, RE) VALUES (2, 'IVA4', 'IVA4', 4, 0.5); INSERT INTO TIPOS_IVA (ID, REFERENCIA, DESCRIPCION, IVA, RE) VALUES (2, 'IVA4', 'IVA4', 4, 0.5);
INSERT INTO TIPOS_IVA (ID, REFERENCIA, DESCRIPCION, IVA, RE) VALUES (3, 'IVA7', 'IVA7', 7, 1); INSERT INTO TIPOS_IVA (ID, REFERENCIA, DESCRIPCION, IVA, RE) VALUES (3, 'IVA8', 'IVA8', 8, 1);
INSERT INTO TIPOS_IVA (ID, REFERENCIA, DESCRIPCION, IVA, RE) VALUES (4, 'EXENTO', 'EXTRANJERO', 0, 0); INSERT INTO TIPOS_IVA (ID, REFERENCIA, DESCRIPCION, IVA, RE) VALUES (4, 'EXENTO', 'EXTRANJERO', 0, 0);
SET GENERATOR GEN_TIPOS_IVA_ID TO 5; SET GENERATOR GEN_TIPOS_IVA_ID TO 5;
COMMIT WORK; COMMIT WORK;

15
Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas
View File

@ -25,6 +25,7 @@ type
function ToStringList(AEmpresa : IBizEmpresa) : TStringList; function ToStringList(AEmpresa : IBizEmpresa) : TStringList;
function DarListaTiendas(AEmpresa : IBizEmpresa): TStringList; function DarListaTiendas(AEmpresa : IBizEmpresa): TStringList;
function DarTiendaEmpresa(AEmpresa : IBizEmpresa; const num: Integer): IBizEmpresaTienda;
function DarTiendaUsuario(AEmpresa: IBizEmpresa; const ID_USUARIO: Integer): IBizEmpresaTienda; function DarTiendaUsuario(AEmpresa: IBizEmpresa; const ID_USUARIO: Integer): IBizEmpresaTienda;
function GetTiendasController : ITiendasEmpresaController; function GetTiendasController : ITiendasEmpresaController;
@ -61,6 +62,7 @@ type
function ToStringList(AEmpresa : IBizEmpresa) : TStringList; virtual; function ToStringList(AEmpresa : IBizEmpresa) : TStringList; virtual;
function DarListaTiendas(AEmpresa : IBizEmpresa): TStringList; function DarListaTiendas(AEmpresa : IBizEmpresa): TStringList;
function DarTiendaEmpresa(AEmpresa : IBizEmpresa; const num: Integer): IBizEmpresaTienda;
function DarTiendaUsuario(AEmpresa: IBizEmpresa; const ID_USUARIO: Integer): IBizEmpresaTienda; function DarTiendaUsuario(AEmpresa: IBizEmpresa; const ID_USUARIO: Integer): IBizEmpresaTienda;
function DarListaFormasPago: TStringList; function DarListaFormasPago: TStringList;
function DarListaTiposIVA: TStringList; function DarListaTiposIVA: TStringList;
@ -182,6 +184,19 @@ begin
end; end;
end; end;
function TEmpresasController.DarTiendaEmpresa(AEmpresa: IBizEmpresa; const num: Integer): IBizEmpresaTienda;
//Esta función nos devuelve la tienda con numero de orden num (el orden de las tiendas será por id)
var
AListaTiendas: TStringList;
begin
Result := Nil;
AListaTiendas := DarListaTiendas(AEmpresa);
//Siempre nos dara en la lista de tiendas la opción Todas que evitamos
if (AListaTiendas.Count > 1) then
Result := FTiendasController.Buscar(StrToInt(AListaTiendas.ValueFromIndex[num+1]));
FreeAndNil(AListaTiendas);
end;
function TEmpresasController.DarTiendaUsuario(AEmpresa: IBizEmpresa; const ID_USUARIO: Integer): IBizEmpresaTienda; function TEmpresasController.DarTiendaUsuario(AEmpresa: IBizEmpresa; const ID_USUARIO: Integer): IBizEmpresaTienda;
var var
AIDTienda : Integer; AIDTienda : Integer;

56
Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm
View File

@ -87,7 +87,7 @@ inherited fEditorEmpresa: TfEditorEmpresa
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Width = 668 Width = 668
Height = 423 Height = 423
ExplicitTop = 109 ActivePage = pagDatosBancarios
ExplicitWidth = 668 ExplicitWidth = 668
ExplicitHeight = 423 ExplicitHeight = 423
inherited pagGeneral: TTabSheet inherited pagGeneral: TTabSheet
@ -160,95 +160,95 @@ inherited fEditorEmpresa: TfEditorEmpresa
Width = 100 Width = 100
end end
inherited eCodigoPostal: TcxDBTextEdit inherited eCodigoPostal: TcxDBTextEdit
Left = 351 Left = 354
Top = 270 Top = 270
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 = 351 ExplicitLeft = 354
ExplicitTop = 270 ExplicitTop = 270
end end
inherited ePaginaWeb: TcxDBTextEdit inherited ePaginaWeb: TcxDBTextEdit
Left = 539 Left = 542
Top = 216 Top = 216
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 = 539 ExplicitLeft = 542
ExplicitTop = 216 ExplicitTop = 216
ExplicitWidth = 165 ExplicitWidth = 165
Width = 165 Width = 165
end end
inherited eMailParticular: TcxDBTextEdit inherited eMailParticular: TcxDBTextEdit
Left = 539 Left = 542
Top = 189 Top = 189
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 = 539 ExplicitLeft = 542
ExplicitTop = 189 ExplicitTop = 189
ExplicitWidth = 165 ExplicitWidth = 165
Width = 165 Width = 165
end end
inherited eMailTrabajo: TcxDBTextEdit inherited eMailTrabajo: TcxDBTextEdit
Left = 539 Left = 542
Top = 162 Top = 162
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 = 539 ExplicitLeft = 542
ExplicitTop = 162 ExplicitTop = 162
ExplicitWidth = 129 ExplicitWidth = 129
Width = 129 Width = 129
end end
inherited eTlfParticular: TcxDBTextEdit inherited eTlfParticular: TcxDBTextEdit
Left = 539 Left = 542
Top = 57 Top = 57
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 = 539 ExplicitLeft = 542
ExplicitTop = 57 ExplicitTop = 57
ExplicitWidth = 91 ExplicitWidth = 91
Width = 91 Width = 91
end end
inherited eTlfTrabajo: TcxDBTextEdit inherited eTlfTrabajo: TcxDBTextEdit
Left = 539 Left = 542
Top = 30 Top = 30
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 = 539 ExplicitLeft = 542
ExplicitTop = 30 ExplicitTop = 30
ExplicitWidth = 127 ExplicitWidth = 127
Width = 127 Width = 127
end end
inherited eTlfMovil: TcxDBTextEdit inherited eTlfMovil: TcxDBTextEdit
Left = 539 Left = 542
Top = 84 Top = 84
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 = 539 ExplicitLeft = 542
ExplicitTop = 84 ExplicitTop = 84
ExplicitWidth = 155 ExplicitWidth = 155
Width = 155 Width = 155
end end
inherited eFax: TcxDBTextEdit inherited eFax: TcxDBTextEdit
Left = 539 Left = 542
Top = 111 Top = 111
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 = 539 ExplicitLeft = 542
ExplicitTop = 111 ExplicitTop = 111
ExplicitWidth = 121 ExplicitWidth = 121
Width = 121 Width = 121
@ -284,13 +284,13 @@ inherited fEditorEmpresa: TfEditorEmpresa
Width = 76 Width = 76
end end
inherited cxDBImage1: TcxDBImage inherited cxDBImage1: TcxDBImage
Left = 444 Left = 447
Top = 267 Top = 267
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 = 444 ExplicitLeft = 447
ExplicitTop = 267 ExplicitTop = 267
ExplicitWidth = 140 ExplicitWidth = 140
ExplicitHeight = 100 ExplicitHeight = 100
@ -326,6 +326,8 @@ inherited fEditorEmpresa: TfEditorEmpresa
ExplicitHeight = 150 ExplicitHeight = 150
inherited memObservaciones: TcxDBMemo inherited memObservaciones: TcxDBMemo
DataBinding.DataSource = frViewEmpresa1.DADataSource DataBinding.DataSource = frViewEmpresa1.DADataSource
ExplicitWidth = 397
ExplicitHeight = 31
Height = 150 Height = 150
Width = 521 Width = 521
end end
@ -388,7 +390,9 @@ inherited fEditorEmpresa: TfEditorEmpresa
end end
object pagTiendas: TTabSheet object pagTiendas: TTabSheet
Caption = 'Tiendas' Caption = 'Tiendas'
Enabled = False
ImageIndex = 2 ImageIndex = 2
TabVisible = False
inline frViewTiendas1: TfrViewTiendas inline frViewTiendas1: TfrViewTiendas
Left = 0 Left = 0
Top = 0 Top = 0
@ -409,7 +413,7 @@ inherited fEditorEmpresa: TfEditorEmpresa
Width = 660 Width = 660
Height = 370 Height = 370
ExplicitWidth = 660 ExplicitWidth = 660
ExplicitHeight = 400 ExplicitHeight = 370
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
inherited cxGridViewCODIGO_CONTABLE: TcxGridDBColumn inherited cxGridViewCODIGO_CONTABLE: TcxGridDBColumn
VisibleForCustomization = False VisibleForCustomization = False
@ -419,18 +423,6 @@ inherited fEditorEmpresa: TfEditorEmpresa
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Width = 660 Width = 660
ExplicitWidth = 660 ExplicitWidth = 660
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

5
Source/ApplicationBase/uFactuGES_App.pas
View File

@ -267,7 +267,10 @@ begin
//Nos devuelve el id de la tienda a la que pertenece el vendedor que tiene asignado //Nos devuelve el id de la tienda a la que pertenece el vendedor que tiene asignado
//el usuario con el que ha accedido a la aplicación. //el usuario con el que ha accedido a la aplicación.
//Esto funciona mientras la relación sea 1 a 1, cuando sea 1 a n (un usuario pertenece a varios vendedores deja de funcionar) //Esto funciona mientras la relación sea 1 a 1, cuando sea 1 a n (un usuario pertenece a varios vendedores deja de funcionar)
FTiendaActiva := EmpresasController.DarTiendaUsuario(EmpresaActiva, UsuarioActivo.ID); // FTiendaActiva := EmpresasController.DarTiendaUsuario(EmpresaActiva, UsuarioActivo.ID);
FTiendaActiva := EmpresasController.DarTiendaEmpresa(EmpresaActiva, 0);
Assert(Assigned(FTiendaActiva)); Assert(Assigned(FTiendaActiva));

2
Source/Cliente/uBootStrap.pas
View File

@ -40,7 +40,7 @@ begin
LoadModule('RecibosCliente_plugin.bpl'); LoadModule('RecibosCliente_plugin.bpl');
LoadModule('FacturasCliente_plugin.bpl'); LoadModule('FacturasCliente_plugin.bpl');
LoadModule('Comisiones_plugin.bpl'); // LoadModule('Comisiones_plugin.bpl');
{$IFDEF PEDIDOSPROVEEDOR} {$IFDEF PEDIDOSPROVEEDOR}
LoadModule('PedidosProveedor_plugin.bpl'); LoadModule('PedidosProveedor_plugin.bpl');

2
Source/FactuGES.inc
View File

@ -1,4 +1,4 @@
{$DEFINE MULTIEMPRESA} {$DEFINE MULTIEMPRESA}
{DEFINE ALMACEN} {DEFINE ALMACEN}
{DEFINE PEDIDOSPROVEEDOR} {DEFINE PEDIDOSPROVEEDOR}
{$DEFINE CONTABILIDAD} {DEFINE CONTABILIDAD}

56
Source/GUIBase/GUIBase.dproj
View File

@ -58,34 +58,34 @@
<DelphiCompile Include="GUIBase.dpk"> <DelphiCompile Include="GUIBase.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\Modulos\Contratos de cliente\Base.dcp" /> <DCCReference Include="..\Modulos\Contactos\Base.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\ccpackD11.dcp" /> <DCCReference Include="..\Modulos\Contactos\ccpackD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxDataD11.dcp" /> <DCCReference Include="..\Modulos\Contactos\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxEditorsD11.dcp" /> <DCCReference Include="..\Modulos\Contactos\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxExportD11.dcp" /> <DCCReference Include="..\Modulos\Contactos\cxExportD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxLibraryD11.dcp" /> <DCCReference Include="..\Modulos\Contactos\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dbrtl.dcp" /> <DCCReference Include="..\Modulos\Contactos\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxGDIPlusD11.dcp" /> <DCCReference Include="..\Modulos\Contactos\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxLayoutControlD11.dcp" /> <DCCReference Include="..\Modulos\Contactos\dxLayoutControlD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxPScxCommonD11.dcp" /> <DCCReference Include="..\Modulos\Contactos\dxPScxCommonD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxPScxGrid6LnkD11.dcp" /> <DCCReference Include="..\Modulos\Contactos\dxPScxGrid6LnkD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxThemeD11.dcp" /> <DCCReference Include="..\Modulos\Contactos\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\frx11.dcp" /> <DCCReference Include="..\Modulos\Contactos\frx11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\frxe11.dcp" /> <DCCReference Include="..\Modulos\Contactos\frxe11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\fs11.dcp" /> <DCCReference Include="..\Modulos\Contactos\fs11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvAppFrmD11R.dcp" /> <DCCReference Include="..\Modulos\Contactos\JvAppFrmD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvCtrlsD11R.dcp" /> <DCCReference Include="..\Modulos\Contactos\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvGlobusD11R.dcp" /> <DCCReference Include="..\Modulos\Contactos\JvGlobusD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\PngComponentsD10.dcp" /> <DCCReference Include="..\Modulos\Contactos\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\PNG_D10.dcp" /> <DCCReference Include="..\Modulos\Contactos\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\rtl.dcp" /> <DCCReference Include="..\Modulos\Contactos\rtl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\tb2k_d10.dcp" /> <DCCReference Include="..\Modulos\Contactos\tb2k_d10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\tbx_d10.dcp" /> <DCCReference Include="..\Modulos\Contactos\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vcl.dcp" /> <DCCReference Include="..\Modulos\Contactos\vcl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vclactnband.dcp" /> <DCCReference Include="..\Modulos\Contactos\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vcldb.dcp" /> <DCCReference Include="..\Modulos\Contactos\vcldb.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vcljpg.dcp" /> <DCCReference Include="..\Modulos\Contactos\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vclx.dcp" /> <DCCReference Include="..\Modulos\Contactos\vclx.dcp" />
<DCCReference Include="uDialogBase.pas"> <DCCReference Include="uDialogBase.pas">
<Form>fDialogBase</Form> <Form>fDialogBase</Form>
</DCCReference> </DCCReference>

BIN
Source/GUIBase/GUIBase.res
View File

Binary file not shown.

4
Source/GUIBase/uEditorGridBase.dfm
View File

@ -30,7 +30,7 @@ inherited fEditorGridBase: TfEditorGridBase
DockPos = 0 DockPos = 0
DragHandleStyle = dhDouble DragHandleStyle = dhDouble
TabOrder = 1 TabOrder = 1
ExplicitWidth = 543 ExplicitWidth = 457
inherited TBXItem29: TTBXItem inherited TBXItem29: TTBXItem
Visible = False Visible = False
end end
@ -243,6 +243,8 @@ inherited fEditorGridBase: TfEditorGridBase
object actExportarExcel: TAction object actExportarExcel: TAction
Category = 'Archivo' Category = 'Archivo'
Caption = 'Exportar a fichero Excel...' Caption = 'Exportar a fichero Excel...'
Enabled = False
Visible = False
OnExecute = actExportarExcelExecute OnExecute = actExportarExcelExecute
OnUpdate = actExportarExcelUpdate OnUpdate = actExportarExcelUpdate
end end

BIN
Source/Lib/ApplicationBase.dcp
View File

Binary file not shown.

BIN
Source/Lib/Base.dcp
View File

Binary file not shown.

BIN
Source/Lib/GUIBase.dcp
View File

Binary file not shown.

2
Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm
View File

@ -98,7 +98,9 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
Width = 68 Width = 68
end end
inherited cxGridViewDESCUENTO: TcxGridDBColumn inherited cxGridViewDESCUENTO: TcxGridDBColumn
Visible = False
HeaderAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify
VisibleForCustomization = False
Width = 29 Width = 29
end end
inherited cxGridViewIMPORTENETO: TcxGridDBColumn inherited cxGridViewIMPORTENETO: TcxGridDBColumn

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

@ -54,6 +54,7 @@ type
end; end;
implementation implementation
{$INCLUDE ..\..\..\FactuGES.inc}
uses uses
Forms, Classes, Windows, SysUtils, Controls, cxControls, uDialogUtils, uDataModuleClientes, uEditorRegistryUtils, Forms, Classes, Windows, SysUtils, Controls, cxControls, uDialogUtils, uDataModuleClientes, uEditorRegistryUtils,
@ -67,21 +68,30 @@ 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);
{$IFDEF CONTABILIDAD}
FiltrarEjercicio(Result); FiltrarEjercicio(Result);
{$ENDIF}
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);
{$IFDEF CONTABILIDAD}
FiltrarEjercicio(Result);
{$ENDIF}
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);
{$IFDEF CONTABILIDAD}
FiltrarEjercicio(Result);
{$ENDIF}
end; end;
constructor TClientesController.Create; constructor TClientesController.Create;
@ -251,7 +261,11 @@ var
begin begin
AContacto := (FDataModule as IDataModuleClientes).NewItem; AContacto := (FDataModule as IDataModuleClientes).NewItem;
FiltrarEmpresa(AContacto); FiltrarEmpresa(AContacto);
FiltrarEjercicio(Result);
{$IFDEF CONTABILIDAD}
FiltrarEjercicio(Result);
{$ENDIF}
AContacto.DataTable.Active := True; AContacto.DataTable.Active := True;
AContacto.Insert; AContacto.Insert;
Result := AContacto; Result := AContacto;

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

@ -46,6 +46,7 @@ type
end; end;
implementation implementation
{$INCLUDE ..\..\..\FactuGES.inc}
uses uses
Classes, SysUtils, cxControls, Dialogs, uDataModuleProveedores, uEditorRegistryUtils, Classes, SysUtils, cxControls, Dialogs, uDataModuleProveedores, uEditorRegistryUtils,
@ -59,21 +60,30 @@ 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);
{$IFDEF CONTABILIDAD}
FiltrarEjercicio(Result);
{$ENDIF}
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);
{$IFDEF CONTABILIDAD}
FiltrarEjercicio(Result);
{$ENDIF}
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);
{$IFDEF CONTABILIDAD}
FiltrarEjercicio(Result);
{$ENDIF}
end; end;
constructor TProveedoresController.Create; constructor TProveedoresController.Create;
@ -212,7 +222,11 @@ var
begin begin
AContacto := (FDataModule as IDataModuleProveedores).NewItem; AContacto := (FDataModule as IDataModuleProveedores).NewItem;
FiltrarEmpresa(AContacto); FiltrarEmpresa(AContacto);
FiltrarEjercicio(Result);
{$IFDEF CONTABILIDAD}
FiltrarEjercicio(Result);
{$ENDIF}
AContacto.DataTable.Active := True; AContacto.DataTable.Active := True;
AContacto.Insert; AContacto.Insert;
Result := AContacto; Result := AContacto;

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

@ -26,6 +26,7 @@ type
end; end;
implementation implementation
{$INCLUDE ..\..\..\FactuGES.inc}
uses uses
uDataModuleServer, uDAClasses, srvContabilidad_Impl, uDataModuleServer, uDAClasses, srvContabilidad_Impl,
@ -85,7 +86,7 @@ begin
if not AContabilidadService.TieneCuentaAsociada(AIDCliente, dsData.FieldValues[0]) then if not AContabilidadService.TieneCuentaAsociada(AIDCliente, dsData.FieldValues[0]) then
begin begin
//Por cada ino de las empresas que tiene asociadas el contacto se añade una subcuenta en su ejercicio activo //Por cada una de las empresas que tiene asociadas el contacto se añade una subcuenta en su ejercicio activo
while not dsData.EOF do while not dsData.EOF do
begin begin
AContabilidadService.AnadirSubCuentaCliente(AIDCliente, AIDTienda, dsData.FieldValues[0], ANombre); AContabilidadService.AnadirSubCuentaCliente(AIDCliente, AIDTienda, dsData.FieldValues[0], ANombre);
@ -186,13 +187,14 @@ begin
Execute; Execute;
end; end;
{$IFDEF CONTABILIDAD}
//En caso de no ignorar contabilidad se deberá dar de alta una cuenta para el cliente si el usuario no la ha asignado //En caso de no ignorar contabilidad se deberá dar de alta una cuenta para el cliente si el usuario no la ha asignado
if (aChange.NewValueByName[fld_ClientesIGNORAR_CONTABILIDAD] = 0) and if (aChange.NewValueByName[fld_ClientesIGNORAR_CONTABILIDAD] = 0) and
(aChange.NewValueByName[fld_ClientesTIENE_SUBCUENTA] = 0) then (aChange.NewValueByName[fld_ClientesTIENE_SUBCUENTA] = 0) then
begin begin
CrearCuentaContable(aChange); CrearCuentaContable(aChange);
end; end;
{$ENDIF}
finally finally
ACommand := NIL; ACommand := NIL;
@ -239,12 +241,14 @@ begin
Execute; Execute;
end; end;
{$IFDEF CONTABILIDAD}
//En caso de no ignorar contabilidad se deberá dar de alta una cuenta para el cliente si el usuario no la ha asignado //En caso de no ignorar contabilidad se deberá dar de alta una cuenta para el cliente si el usuario no la ha asignado
if (aChange.NewValueByName[fld_ClientesIGNORAR_CONTABILIDAD] = 0) and if (aChange.NewValueByName[fld_ClientesIGNORAR_CONTABILIDAD] = 0) and
(aChange.NewValueByName[fld_ClientesTIENE_SUBCUENTA] = 0) then (aChange.NewValueByName[fld_ClientesTIENE_SUBCUENTA] = 0) then
begin begin
CrearCuentaContable(aChange); CrearCuentaContable(aChange);
end; end;
{$ENDIF}
finally finally
ACommand := NIL; ACommand := NIL;

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

@ -26,6 +26,7 @@ type
end; end;
implementation implementation
{$INCLUDE ..\..\..\FactuGES.inc}
uses uses
uDataModuleServer, uDAClasses, srvContabilidad_Impl, uDataModuleServer, uDAClasses, srvContabilidad_Impl,
@ -185,12 +186,15 @@ begin
Execute; Execute;
end; end;
{$IFDEF CONTABILIDAD}
//En caso de no ignorar contabilidad se deberá dar de alta una cuenta para el cliente si el usuario no la ha asignado //En caso de no ignorar contabilidad se deberá dar de alta una cuenta para el cliente si el usuario no la ha asignado
if (aChange.NewValueByName[fld_ProveedoresIGNORAR_CONTABILIDAD] = 0) and if (aChange.NewValueByName[fld_ProveedoresIGNORAR_CONTABILIDAD] = 0) and
(aChange.NewValueByName[fld_ProveedoresTIENE_SUBCUENTA] = 0) then (aChange.NewValueByName[fld_ProveedoresTIENE_SUBCUENTA] = 0) then
begin begin
CrearCuentaContable(aChange); CrearCuentaContable(aChange);
end; end;
{$ENDIF}
finally finally
ACommand := NIL; ACommand := NIL;
end; end;
@ -236,12 +240,14 @@ begin
Execute; Execute;
end; end;
{$IFDEF CONTABILIDAD}
//En caso de no ignorar contabilidad se deberá dar de alta una cuenta para el cliente si el usuario no la ha asignado //En caso de no ignorar contabilidad se deberá dar de alta una cuenta para el cliente si el usuario no la ha asignado
if (aChange.NewValueByName[fld_ClientesIGNORAR_CONTABILIDAD] = 0) and if (aChange.NewValueByName[fld_ClientesIGNORAR_CONTABILIDAD] = 0) and
(aChange.NewValueByName[fld_ClientesTIENE_SUBCUENTA] = 0) then (aChange.NewValueByName[fld_ClientesTIENE_SUBCUENTA] = 0) then
begin begin
CrearCuentaContable(aChange); CrearCuentaContable(aChange);
end; end;
{$ENDIF}
finally finally
ACommand := NIL; ACommand := NIL;

4
Source/Modulos/Contactos/Plugin/uPluginContactos.dfm
View File

@ -286,12 +286,16 @@ object PluginContactos: TPluginContactos
end end
object actGruposCliente: TAction object actGruposCliente: TAction
Caption = 'Grupos de cliente' Caption = 'Grupos de cliente'
Enabled = False
ImageIndex = 5 ImageIndex = 5
Visible = False
OnExecute = actGruposClienteExecute OnExecute = actGruposClienteExecute
end end
object actGruposProveedor: TAction object actGruposProveedor: TAction
Caption = 'Grupos de proveedor' Caption = 'Grupos de proveedor'
Enabled = False
ImageIndex = 5 ImageIndex = 5
Visible = False
OnExecute = actGruposProveedorExecute OnExecute = actGruposProveedorExecute
end end
object actProcedenciasCliente: TAction object actProcedenciasCliente: TAction

68
Source/Modulos/Contactos/Views/Contactos_view.dproj
View File

@ -47,40 +47,40 @@
<DelphiCompile Include="Contactos_view.dpk"> <DelphiCompile Include="Contactos_view.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" /> <DCCReference Include="..\adortl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" /> <DCCReference Include="..\ApplicationBase.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" /> <DCCReference Include="..\Base.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\bdertl.dcp" /> <DCCReference Include="..\bdertl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Contactos_controller.dcp" /> <DCCReference Include="..\Contactos_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Contactos_model.dcp" /> <DCCReference Include="..\Contactos_model.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" /> <DCCReference Include="..\cxDataD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" /> <DCCReference Include="..\cxEditorsD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" /> <DCCReference Include="..\cxLibraryD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" /> <DCCReference Include="..\DataAbstract_Core_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" /> <DCCReference Include="..\dbrtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" /> <DCCReference Include="..\designide.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" /> <DCCReference Include="..\dsnap.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" /> <DCCReference Include="..\dxGDIPlusD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" /> <DCCReference Include="..\dxThemeD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\FormasPago_controller.dcp" /> <DCCReference Include="..\FormasPago_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\FormasPago_model.dcp" /> <DCCReference Include="..\FormasPago_model.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" /> <DCCReference Include="..\GUIBase.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11R.dcp" /> <DCCReference Include="..\GUISDK_D11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" /> <DCCReference Include="..\Jcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" /> <DCCReference Include="..\JclVcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" /> <DCCReference Include="..\JvCoreD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD11R.dcp" /> <DCCReference Include="..\JvGlobusD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" /> <DCCReference Include="..\JvSystemD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" /> <DCCReference Include="..\RemObjects_Core_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" /> <DCCReference Include="..\rtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\TiposIVA_controller.dcp" /> <DCCReference Include="..\TiposIVA_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\TiposIVA_model.dcp" /> <DCCReference Include="..\TiposIVA_model.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" /> <DCCReference Include="..\vcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" /> <DCCReference Include="..\vclactnband.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" /> <DCCReference Include="..\vcldb.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" /> <DCCReference Include="..\vcljpg.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" /> <DCCReference Include="..\vclx.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" /> <DCCReference Include="..\xmlrtl.dcp" />
<DCCReference Include="uContactosViewRegister.pas" /> <DCCReference Include="uContactosViewRegister.pas" />
<DCCReference Include="uEditorCliente.pas"> <DCCReference Include="uEditorCliente.pas">
<Form>fEditorCliente</Form> <Form>fEditorCliente</Form>

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

@ -52,7 +52,6 @@ inherited fEditorCliente: TfEditorCliente
Width = 896 Width = 896
ExplicitWidth = 896 ExplicitWidth = 896
inherited tbxMain: TTBXToolbar inherited tbxMain: TTBXToolbar
ExplicitWidth = 446
object TBXItem7: TTBXItem [7] object TBXItem7: TTBXItem [7]
Action = actGruposCliente Action = actGruposCliente
DisplayMode = nbdmImageAndText DisplayMode = nbdmImageAndText
@ -71,6 +70,7 @@ inherited fEditorCliente: TfEditorCliente
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Width = 890 Width = 890
Height = 514 Height = 514
ActivePage = pagDatosBancarios
ExplicitTop = 109 ExplicitTop = 109
ExplicitWidth = 890 ExplicitWidth = 890
ExplicitHeight = 514 ExplicitHeight = 514
@ -379,62 +379,44 @@ inherited fEditorCliente: TfEditorCliente
end end
end end
end end
inherited pagDatosBancarios: TTabSheet object pagDirecciones: TTabSheet [1]
ExplicitWidth = 882 Caption = 'Direcciones'
ExplicitHeight = 486 ImageIndex = 1
inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios inline frViewDireccionesEntrega1: TfrViewDireccionesEntrega
Left = 0
Top = 0
Width = 882 Width = 882
Height = 486 Height = 486
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = []
ParentFont = False
TabOrder = 0
ReadOnly = False
ExplicitWidth = 882 ExplicitWidth = 882
ExplicitHeight = 486 ExplicitHeight = 486
inherited dxLayoutControl1: TdxLayoutControl inherited cxGrid: TcxGrid
Width = 882 Width = 882
LookAndFeel = dxLayoutOfficeLookAndFeel Height = 461
ExplicitWidth = 882 ExplicitWidth = 882
inherited eEntidad: TcxDBTextEdit ExplicitHeight = 461
Style.LookAndFeel.SkinName = '' inherited cxGridView: TcxGridDBTableView
StyleDisabled.LookAndFeel.SkinName = '' inherited cxGridViewID: TcxGridDBColumn
StyleFocused.LookAndFeel.SkinName = '' SortIndex = 0
StyleHot.LookAndFeel.SkinName = '' SortOrder = soAscending
ExplicitWidth = 345 end
Width = 345
end
inherited eSucursal: TcxDBTextEdit
Left = 542
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 542
ExplicitWidth = 318
Width = 318
end
inherited eCuenta: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 622
Width = 622
end
inherited eDC: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
inherited eTitular: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 743
Width = 743
end end
end end
inherited ToolBar1: TToolBar
Width = 882
ExplicitWidth = 882
end
end end
end end
inherited pagPersonal: TTabSheet inherited pagPersonal: TTabSheet [2]
ExplicitWidth = 882 ExplicitWidth = 882
ExplicitHeight = 486 ExplicitHeight = 486
inherited frViewPersonalContacto1: TfrViewPersonalContacto inherited frViewPersonalContacto1: TfrViewPersonalContacto
@ -466,7 +448,7 @@ inherited fEditorCliente: TfEditorCliente
end end
end end
end end
object pagDatosComerciales: TTabSheet object pagDatosComerciales: TTabSheet [3]
Caption = 'Datos comerciales' Caption = 'Datos comerciales'
ImageIndex = 4 ImageIndex = 4
inline frViewClienteDatosComerciales1: TfrViewClienteDatosComerciales inline frViewClienteDatosComerciales1: TfrViewClienteDatosComerciales
@ -591,51 +573,57 @@ inherited fEditorCliente: TfEditorCliente
end end
end end
end end
object pagDirecciones: TTabSheet inherited pagDatosBancarios: TTabSheet [4]
Caption = 'Direcciones' ExplicitWidth = 882
ImageIndex = 1 ExplicitHeight = 486
inline frViewDireccionesEntrega1: TfrViewDireccionesEntrega inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios
Left = 0
Top = 0
Width = 882 Width = 882
Height = 486 Height = 486
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = []
ParentFont = False
TabOrder = 0
ReadOnly = False
ExplicitWidth = 882 ExplicitWidth = 882
ExplicitHeight = 486 ExplicitHeight = 486
inherited cxGrid: TcxGrid inherited dxLayoutControl1: TdxLayoutControl
Width = 882 Width = 882
Height = 461 LookAndFeel = dxLayoutOfficeLookAndFeel
ExplicitWidth = 882 ExplicitWidth = 882
ExplicitHeight = 491 inherited eEntidad: TcxDBTextEdit
inherited cxGridView: TcxGridDBTableView Style.LookAndFeel.SkinName = ''
inherited cxGridViewID: TcxGridDBColumn StyleDisabled.LookAndFeel.SkinName = ''
SortIndex = 0 StyleFocused.LookAndFeel.SkinName = ''
SortOrder = soAscending StyleHot.LookAndFeel.SkinName = ''
end ExplicitWidth = 345
Width = 345
end end
end inherited eSucursal: TcxDBTextEdit
inherited ToolBar1: TToolBar Left = 542
Width = 882 Style.LookAndFeel.SkinName = ''
ExplicitWidth = 882 StyleDisabled.LookAndFeel.SkinName = ''
inherited ToolButton1: TToolButton StyleFocused.LookAndFeel.SkinName = ''
ExplicitWidth = 113 StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 542
ExplicitWidth = 318
Width = 318
end end
inherited ToolButton4: TToolButton inherited eCuenta: TcxDBTextEdit
ExplicitWidth = 113 Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 622
Width = 622
end end
inherited ToolButton2: TToolButton inherited eDC: TcxDBTextEdit
ExplicitWidth = 113 Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end end
inherited ToolButton7: TToolButton inherited eTitular: TcxDBTextEdit
ExplicitWidth = 113 Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 743
Width = 743
end end
end end
end end
@ -664,7 +652,7 @@ inherited fEditorCliente: TfEditorCliente
Width = 882 Width = 882
Height = 461 Height = 461
ExplicitWidth = 882 ExplicitWidth = 882
ExplicitHeight = 491 ExplicitHeight = 461
end end
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Width = 882 Width = 882
@ -1286,7 +1274,9 @@ inherited fEditorCliente: TfEditorCliente
object actGruposCliente: TAction object actGruposCliente: TAction
Category = 'Acciones' Category = 'Acciones'
Caption = 'Grupos de cliente' Caption = 'Grupos de cliente'
Enabled = False
ImageIndex = 21 ImageIndex = 21
Visible = False
OnExecute = actGruposClienteExecute OnExecute = actGruposClienteExecute
end end
end end

14
Source/Modulos/Contactos/Views/uEditorClientes.dfm
View File

@ -84,6 +84,8 @@ inherited fEditorClientes: TfEditorClientes
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Width = 786 Width = 786
Height = 270 Height = 270
ExplicitWidth = 786
ExplicitHeight = 270
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
DataController.Summary.FooterSummaryItems = < DataController.Summary.FooterSummaryItems = <
item item
@ -102,15 +104,27 @@ inherited fEditorClientes: TfEditorClientes
Width = 786 Width = 786
ExplicitWidth = 786 ExplicitWidth = 786
inherited txtFiltroTodo: TcxTextEdit inherited txtFiltroTodo: TcxTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 457 ExplicitWidth = 457
Width = 457 Width = 457
end end
inherited edtFechaIniFiltro: TcxDateEdit inherited edtFechaIniFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 240 ExplicitWidth = 240
Width = 240 Width = 240
end end
inherited edtFechaFinFiltro: TcxDateEdit inherited edtFechaFinFiltro: TcxDateEdit
Left = 564 Left = 564
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 564 ExplicitLeft = 564
ExplicitWidth = 121 ExplicitWidth = 121
Width = 121 Width = 121

10
Source/Modulos/Contactos/Views/uEditorClientes.pas
View File

@ -24,7 +24,7 @@ type
procedure actGruposClienteExecute(Sender: TObject); procedure actGruposClienteExecute(Sender: TObject);
protected protected
procedure ImprimirInterno; override; procedure ImprimirInterno; override;
procedure PrevisualizarInterno; override; procedure PrevisualizarInterno; override;
procedure EliminarInterno; override; procedure EliminarInterno; override;
public public
constructor Create(AOwner: TComponent); override; constructor Create(AOwner: TComponent); override;
@ -120,6 +120,9 @@ var
AClientes: IBizCliente; AClientes: IBizCliente;
AllItems: Boolean; AllItems: Boolean;
begin begin
inherited;
//Desactivamos la impresion de etiquetas
{
AClientes := Nil; AClientes := Nil;
AllItems := False; AllItems := False;
@ -153,6 +156,7 @@ begin
end; end;
end; end;
end; end;
}
end; end;
procedure TfEditorClientes.PonerTitulos(const ATitulo: string); procedure TfEditorClientes.PonerTitulos(const ATitulo: string);
@ -169,6 +173,9 @@ var
AClientes: IBizCliente; AClientes: IBizCliente;
AllItems: Boolean; AllItems: Boolean;
begin begin
inherited;
//Desactivamos la impresion de etiquetas
{
AClientes := Nil; AClientes := Nil;
AllItems := False; AllItems := False;
@ -202,6 +209,7 @@ begin
end; end;
end; end;
end; end;
}
end; end;
end. end.

3
Source/Modulos/Contactos/Views/uEditorContactos.dfm
View File

@ -10,6 +10,9 @@ inherited fEditorContactos: TfEditorContactos
Caption = 'Lista de contactos' Caption = 'Lista de contactos'
end end
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock
inherited tbxMain: TTBXToolbar
ExplicitWidth = 543
end
inherited tbxFiltro: TTBXToolbar inherited tbxFiltro: TTBXToolbar
ExplicitWidth = 269 ExplicitWidth = 269
inherited tbxEditFiltro: TTBXEditItem inherited tbxEditFiltro: TTBXEditItem

146
Source/Modulos/Contactos/Views/uEditorProveedor.dfm
View File

@ -61,7 +61,7 @@ inherited fEditorProveedor: TfEditorProveedor
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Width = 642 Width = 642
Height = 459 Height = 459
ActivePage = pagGeneral ActivePage = pagDatosBancarios
ExplicitTop = 109 ExplicitTop = 109
ExplicitWidth = 642 ExplicitWidth = 642
ExplicitHeight = 459 ExplicitHeight = 459
@ -348,62 +348,38 @@ inherited fEditorProveedor: TfEditorProveedor
end end
end end
end end
inherited pagDatosBancarios: TTabSheet object pagDirecciones: TTabSheet [1]
ExplicitWidth = 634 Caption = 'Direcciones'
ExplicitHeight = 431 ImageIndex = 3
inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios inline frViewDireccionesEntrega1: TfrViewDireccionesEntrega
Left = 0
Top = 0
Width = 634 Width = 634
Height = 431 Height = 431
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = []
ParentFont = False
TabOrder = 0
ReadOnly = False
ExplicitWidth = 634 ExplicitWidth = 634
ExplicitHeight = 431 ExplicitHeight = 431
inherited dxLayoutControl1: TdxLayoutControl inherited cxGrid: TcxGrid
Width = 634
Height = 406
ExplicitWidth = 634
ExplicitHeight = 406
end
inherited ToolBar1: TToolBar
Width = 634 Width = 634
LookAndFeel = dxLayoutOfficeLookAndFeel
ExplicitWidth = 634 ExplicitWidth = 634
inherited eEntidad: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 114
Width = 114
end
inherited eSucursal: TcxDBTextEdit
Left = 323
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 323
ExplicitWidth = 270
Width = 270
end
inherited eCuenta: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 242
Width = 242
end
inherited eDC: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
inherited eTitular: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 363
Width = 363
end
end end
end end
end end
inherited pagPersonal: TTabSheet inherited pagPersonal: TTabSheet [2]
ExplicitWidth = 634 ExplicitWidth = 634
ExplicitHeight = 431 ExplicitHeight = 431
inherited frViewPersonalContacto1: TfrViewPersonalContacto inherited frViewPersonalContacto1: TfrViewPersonalContacto
@ -435,7 +411,7 @@ inherited fEditorProveedor: TfEditorProveedor
end end
end end
end end
object pagDatosComerciales: TTabSheet object pagDatosComerciales: TTabSheet [3]
Caption = 'Datos comerciales' Caption = 'Datos comerciales'
ImageIndex = 2 ImageIndex = 2
inline frViewProveedorDatosComerciales1: TfrViewProveedorDatosComerciales inline frViewProveedorDatosComerciales1: TfrViewProveedorDatosComerciales
@ -557,45 +533,57 @@ inherited fEditorProveedor: TfEditorProveedor
end end
end end
end end
object pagDirecciones: TTabSheet inherited pagDatosBancarios: TTabSheet [4]
Caption = 'Direcciones' ExplicitWidth = 634
ImageIndex = 3 ExplicitHeight = 431
inline frViewDireccionesEntrega1: TfrViewDireccionesEntrega inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios
Left = 0
Top = 0
Width = 634 Width = 634
Height = 431 Height = 431
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = []
ParentFont = False
TabOrder = 0
ReadOnly = False
ExplicitWidth = 634 ExplicitWidth = 634
ExplicitHeight = 431 ExplicitHeight = 431
inherited cxGrid: TcxGrid inherited dxLayoutControl1: TdxLayoutControl
Width = 634 Width = 634
Height = 406 LookAndFeel = dxLayoutOfficeLookAndFeel
ExplicitWidth = 634 ExplicitWidth = 634
ExplicitHeight = 436 inherited eEntidad: TcxDBTextEdit
end Style.LookAndFeel.SkinName = ''
inherited ToolBar1: TToolBar StyleDisabled.LookAndFeel.SkinName = ''
Width = 634 StyleFocused.LookAndFeel.SkinName = ''
ExplicitWidth = 634 StyleHot.LookAndFeel.SkinName = ''
inherited ToolButton1: TToolButton ExplicitWidth = 114
ExplicitWidth = 113 Width = 114
end end
inherited ToolButton4: TToolButton inherited eSucursal: TcxDBTextEdit
ExplicitWidth = 113 Left = 323
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 323
ExplicitWidth = 270
Width = 270
end end
inherited ToolButton2: TToolButton inherited eCuenta: TcxDBTextEdit
ExplicitWidth = 113 Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 242
Width = 242
end end
inherited ToolButton7: TToolButton inherited eDC: TcxDBTextEdit
ExplicitWidth = 113 Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
inherited eTitular: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 363
Width = 363
end end
end end
end end

22
Source/Modulos/Contactos/Views/uEditorProveedores.dfm
View File

@ -1,6 +1,5 @@
inherited fEditorProveedores: TfEditorProveedores inherited fEditorProveedores: TfEditorProveedores
Caption = 'fEditorProveedores' Caption = 'fEditorProveedores'
ExplicitWidth = 551
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader inherited JvNavPanelHeader: TJvNavPanelHeader
@ -41,6 +40,7 @@ inherited fEditorProveedores: TfEditorProveedores
end end
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock
inherited tbxMain: TTBXToolbar inherited tbxMain: TTBXToolbar
ExplicitWidth = 543
inherited TBXItem2: TTBXItem inherited TBXItem2: TTBXItem
Images = SmallImages Images = SmallImages
end end
@ -80,6 +80,14 @@ inherited fEditorProveedores: TfEditorProveedores
Visible = False Visible = False
VisibleForCustomization = False VisibleForCustomization = False
end end
inherited cxGridViewTIENDA: TcxGridDBColumn
Visible = False
VisibleForCustomization = False
end
inherited cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn
Visible = False
VisibleForCustomization = False
end
end end
end end
inherited frViewFiltroBase1: TfrViewFiltroBase inherited frViewFiltroBase1: TfrViewFiltroBase
@ -91,15 +99,27 @@ inherited fEditorProveedores: TfEditorProveedores
Width = 543 Width = 543
ExplicitWidth = 543 ExplicitWidth = 543
inherited txtFiltroTodo: TcxTextEdit inherited txtFiltroTodo: TcxTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 460 ExplicitWidth = 460
Width = 460 Width = 460
end end
inherited edtFechaIniFiltro: TcxDateEdit inherited edtFechaIniFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 207 ExplicitWidth = 207
Width = 207 Width = 207
end end
inherited edtFechaFinFiltro: TcxDateEdit inherited edtFechaFinFiltro: TcxDateEdit
Left = 323 Left = 323
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 323 ExplicitLeft = 323
ExplicitWidth = 201 ExplicitWidth = 201
Width = 201 Width = 201

8
Source/Modulos/Contactos/Views/uEditorProveedores.pas
View File

@ -99,6 +99,9 @@ var
AProveedores: IBizProveedor; AProveedores: IBizProveedor;
AllItems: Boolean; AllItems: Boolean;
begin begin
inherited;
//Desactivamos la impresion de etiquetas
{
AProveedores := Nil; AProveedores := Nil;
AllItems := False; AllItems := False;
@ -132,6 +135,7 @@ begin
end; end;
end; end;
end; end;
}
end; end;
procedure TfEditorProveedores.PonerTitulos(const ATitulo: string); procedure TfEditorProveedores.PonerTitulos(const ATitulo: string);
@ -148,6 +152,9 @@ var
AProveedores: IBizProveedor; AProveedores: IBizProveedor;
AllItems: Boolean; AllItems: Boolean;
begin begin
inherited;
//Desactivamos la impresion de etiquetas
{
AProveedores := Nil; AProveedores := Nil;
AllItems := False; AllItems := False;
@ -181,6 +188,7 @@ begin
end; end;
end; end;
end; end;
}
end; end;
end. end.

67
Source/Modulos/Contactos/Views/uViewCliente.dfm
View File

@ -9,18 +9,18 @@ inherited frViewCliente: TfrViewCliente
Width = 646 Width = 646
Height = 563 Height = 563
ExplicitWidth = 646 ExplicitWidth = 646
ExplicitHeight = 609 ExplicitHeight = 563
inherited PngSpeedButton1: TPngSpeedButton inherited PngSpeedButton1: TPngSpeedButton
Left = 601 Left = 584
ExplicitLeft = 601 ExplicitLeft = 584
end end
inherited PngSpeedButton2: TPngSpeedButton inherited PngSpeedButton2: TPngSpeedButton
Left = 601 Left = 584
ExplicitLeft = 601 ExplicitLeft = 584
end end
inherited PngSpeedButton3: TPngSpeedButton inherited PngSpeedButton3: TPngSpeedButton
Left = 601 Left = 584
ExplicitLeft = 601 ExplicitLeft = 584
end end
inherited eCalle: TcxDBTextEdit inherited eCalle: TcxDBTextEdit
Left = 132 Left = 132
@ -62,24 +62,24 @@ inherited frViewCliente: TfrViewCliente
Width = 213 Width = 213
end end
inherited eCodigoPostal: TcxDBTextEdit inherited eCodigoPostal: TcxDBTextEdit
Left = 268 Left = 259
Top = 247 Top = 247
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 9 TabOrder = 9
ExplicitLeft = 268 ExplicitLeft = 259
ExplicitTop = 247 ExplicitTop = 247
end end
inherited eTlfParticular: TcxDBTextEdit inherited eTlfParticular: TcxDBTextEdit
Left = 449 Left = 440
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 15 TabOrder = 15
ExplicitLeft = 449 ExplicitLeft = 440
ExplicitWidth = 233 ExplicitWidth = 233
Width = 233 Width = 233
end end
@ -88,6 +88,7 @@ inherited frViewCliente: TfrViewCliente
Top = 82 Top = 82
DataBinding.DataField = 'NOMBRE_COMERCIAL' DataBinding.DataField = 'NOMBRE_COMERCIAL'
DataBinding.DataSource = dsContacto DataBinding.DataSource = dsContacto
Enabled = False
Style.BorderColor = clWindowFrame Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D Style.BorderStyle = ebs3D
Style.Color = clWindow Style.Color = clWindow
@ -140,6 +141,7 @@ inherited frViewCliente: TfrViewCliente
Top = 136 Top = 136
DataBinding.DataField = 'GRUPO_CLIENTE' DataBinding.DataField = 'GRUPO_CLIENTE'
DataBinding.DataSource = dsContacto DataBinding.DataSource = dsContacto
Enabled = False
Properties.ImmediatePost = True Properties.ImmediatePost = True
Properties.OnInitPopup = cbGrupoClientePropertiesInitPopup Properties.OnInitPopup = cbGrupoClientePropertiesInitPopup
Properties.OnValidate = cbGrupoClientePropertiesValidate Properties.OnValidate = cbGrupoClientePropertiesValidate
@ -191,6 +193,7 @@ inherited frViewCliente: TfrViewCliente
Top = 109 Top = 109
DataBinding.DataField = 'CODIGO_ASIGNADO' DataBinding.DataField = 'CODIGO_ASIGNADO'
DataBinding.DataSource = dsContacto DataBinding.DataSource = dsContacto
Enabled = False
Style.BorderColor = clWindowFrame Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D Style.BorderStyle = ebs3D
Style.Color = clWindow Style.Color = clWindow
@ -239,35 +242,35 @@ inherited frViewCliente: TfrViewCliente
Width = 211 Width = 211
end end
inherited eTlfTrabajo: TcxDBTextEdit inherited eTlfTrabajo: TcxDBTextEdit
Left = 449 Left = 440
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 14 TabOrder = 14
ExplicitLeft = 449 ExplicitLeft = 440
ExplicitWidth = 233 ExplicitWidth = 233
Width = 233 Width = 233
end end
inherited eTlfMovil: TcxDBTextEdit inherited eTlfMovil: TcxDBTextEdit
Left = 449 Left = 440
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 16 TabOrder = 16
ExplicitLeft = 449 ExplicitLeft = 440
ExplicitWidth = 233 ExplicitWidth = 233
Width = 233 Width = 233
end end
inherited eFax: TcxDBTextEdit inherited eFax: TcxDBTextEdit
Left = 449 Left = 440
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 17 TabOrder = 17
ExplicitLeft = 449 ExplicitLeft = 440
ExplicitWidth = 233 ExplicitWidth = 233
Width = 233 Width = 233
end end
@ -282,47 +285,47 @@ inherited frViewCliente: TfrViewCliente
Width = 135 Width = 135
end end
inherited eNIFCIF: TcxDBTextEdit inherited eNIFCIF: TcxDBTextEdit
Left = 247 Left = 242
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 = 247 ExplicitLeft = 242
ExplicitWidth = 59 ExplicitWidth = 59
Width = 59 Width = 59
end end
inherited eMailTrabajo: TcxDBHyperLinkEdit inherited eMailTrabajo: TcxDBHyperLinkEdit
Left = 449 Left = 440
Properties.Prefix = 'mailto:' Properties.Prefix = 'mailto:'
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 18 TabOrder = 18
ExplicitLeft = 449 ExplicitLeft = 440
ExplicitWidth = 204 ExplicitWidth = 204
Width = 204 Width = 204
end end
inherited eMailParticular: TcxDBHyperLinkEdit inherited eMailParticular: TcxDBHyperLinkEdit
Left = 449 Left = 440
Properties.Prefix = 'mailto:' Properties.Prefix = 'mailto:'
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 19 TabOrder = 19
ExplicitLeft = 449 ExplicitLeft = 440
ExplicitWidth = 204 ExplicitWidth = 204
Width = 204 Width = 204
end end
inherited ePaginaWeb: TcxDBHyperLinkEdit inherited ePaginaWeb: TcxDBHyperLinkEdit
Left = 449 Left = 440
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
TabOrder = 20 TabOrder = 20
ExplicitLeft = 449 ExplicitLeft = 440
ExplicitWidth = 204 ExplicitWidth = 204
Width = 204 Width = 204
end end
@ -350,11 +353,12 @@ inherited frViewCliente: TfrViewCliente
Width = 256 Width = 256
end end
inherited frViewTienda1: TfrViewTienda inherited frViewTienda1: TfrViewTienda
Left = 354 Left = 345
Width = 270 Width = 270
AutoSize = True AutoSize = True
Enabled = False
TabOrder = 21 TabOrder = 21
ExplicitLeft = 354 ExplicitLeft = 345
ExplicitWidth = 270 ExplicitWidth = 270
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 270 Width = 270
@ -379,6 +383,8 @@ inherited frViewCliente: TfrViewCliente
ExplicitHeight = 127 ExplicitHeight = 127
inherited memObservaciones: TcxDBMemo inherited memObservaciones: TcxDBMemo
DataBinding.DataSource = dsContacto DataBinding.DataSource = dsContacto
ExplicitWidth = 585
ExplicitHeight = 127
Height = 127 Height = 127
Width = 585 Width = 585
end end
@ -390,11 +396,14 @@ inherited frViewCliente: TfrViewCliente
inherited dxLayoutControlContactoGroup1: TdxLayoutGroup inherited dxLayoutControlContactoGroup1: TdxLayoutGroup
object dxLayoutControlContactoItem24: TdxLayoutItem object dxLayoutControlContactoItem24: TdxLayoutItem
Caption = 'Nombre comercial:' Caption = 'Nombre comercial:'
Enabled = False
Visible = False
Control = eNombreComercial Control = eNombreComercial
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end
object dxLayoutControlContactoItem22: TdxLayoutItem object dxLayoutControlContactoItem22: TdxLayoutItem
Caption = 'C'#243'digo de proveedor:' Caption = 'C'#243'digo de proveedor:'
Enabled = False
Visible = False Visible = False
Control = eCodigoAsignado Control = eCodigoAsignado
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
@ -403,6 +412,8 @@ inherited frViewCliente: TfrViewCliente
AutoAligns = [aaVertical] AutoAligns = [aaVertical]
AlignHorz = ahClient AlignHorz = ahClient
Caption = 'Grupo de cliente:' Caption = 'Grupo de cliente:'
Enabled = False
Visible = False
Control = cbGrupoCliente Control = cbGrupoCliente
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end
@ -436,6 +447,8 @@ inherited frViewCliente: TfrViewCliente
inherited dxLayoutControlContactoGroup6: TdxLayoutGroup inherited dxLayoutControlContactoGroup6: TdxLayoutGroup
inherited dxLayoutControlContactoGroup100: TdxLayoutGroup inherited dxLayoutControlContactoGroup100: TdxLayoutGroup
Caption = 'El cliente pertenece a la tienda' Caption = 'El cliente pertenece a la tienda'
Enabled = False
Visible = False
end end
end end
end end

6
Source/Modulos/Contactos/Views/uViewClientes.dfm
View File

@ -45,8 +45,14 @@ inherited frViewClientes: TfrViewClientes
VisibleForCustomization = False VisibleForCustomization = False
Width = 22 Width = 22
end end
inherited cxGridViewTIENDA: TcxGridDBColumn
Visible = False
VisibleForCustomization = False
end
object cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn [6] object cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn [6]
DataBinding.FieldName = 'NOMBRE_COMERCIAL' DataBinding.FieldName = 'NOMBRE_COMERCIAL'
Visible = False
VisibleForCustomization = False
Width = 164 Width = 164
end end
object cxGridViewPERSONA_CONTACTO: TcxGridDBColumn [8] object cxGridViewPERSONA_CONTACTO: TcxGridDBColumn [8]

40
Source/Modulos/Contactos/Views/uViewConfiguracionContactos.dfm
View File

@ -1,26 +1,22 @@
inherited frViewConfiguracionContactos: TfrViewConfiguracionContactos inherited frViewConfiguracionContactos: TfrViewConfiguracionContactos
ExplicitWidth = 547 Height = 416
ExplicitHeight = 411
inherited Panel1: TPanel inherited Panel1: TPanel
Width = 537 ExplicitWidth = 424
ExplicitTop = 49
ExplicitWidth = 537
inherited Label3: TLabel inherited Label3: TLabel
Width = 166 Width = 429
Caption = 'Configuraci'#243'n para clientes' Caption = 'Configuraci'#243'n para clientes'
ExplicitWidth = 166 ExplicitWidth = 166
end end
end end
inherited JvGradientHeaderPanel1: TJvGradientHeaderPanel inherited JvGradientHeaderPanel1: TJvGradientHeaderPanel
Width = 547
LabelCaption = 'Configuraci'#243'n para contactos' LabelCaption = 'Configuraci'#243'n para contactos'
ExplicitWidth = 547 ExplicitWidth = 434
end end
object Panel3: TPanel object Panel3: TPanel
AlignWithMargins = True AlignWithMargins = True
Left = 5 Left = 5
Top = 68 Top = 68
Width = 537 Width = 441
Height = 133 Height = 133
Margins.Left = 5 Margins.Left = 5
Margins.Top = 0 Margins.Top = 0
@ -30,6 +26,7 @@ inherited frViewConfiguracionContactos: TfrViewConfiguracionContactos
BevelOuter = bvNone BevelOuter = bvNone
ParentColor = True ParentColor = True
TabOrder = 2 TabOrder = 2
ExplicitWidth = 424
object Label1: TLabel object Label1: TLabel
Left = 17 Left = 17
Top = 36 Top = 36
@ -64,7 +61,7 @@ inherited frViewConfiguracionContactos: TfrViewConfiguracionContactos
Width = 168 Width = 168
Height = 21 Height = 21
Style = csDropDownList Style = csDropDownList
ItemHeight = 0 ItemHeight = 13
TabOrder = 0 TabOrder = 0
end end
object cbRegimenIVA: TComboBox object cbRegimenIVA: TComboBox
@ -73,7 +70,7 @@ inherited frViewConfiguracionContactos: TfrViewConfiguracionContactos
Width = 168 Width = 168
Height = 21 Height = 21
Style = csDropDownList Style = csDropDownList
ItemHeight = 0 ItemHeight = 13
TabOrder = 1 TabOrder = 1
end end
object bFormasPago: TButton object bFormasPago: TButton
@ -100,7 +97,7 @@ inherited frViewConfiguracionContactos: TfrViewConfiguracionContactos
Width = 168 Width = 168
Height = 21 Height = 21
Style = csDropDownList Style = csDropDownList
ItemHeight = 0 ItemHeight = 13
TabOrder = 4 TabOrder = 4
end end
end end
@ -108,7 +105,7 @@ inherited frViewConfiguracionContactos: TfrViewConfiguracionContactos
AlignWithMargins = True AlignWithMargins = True
Left = 5 Left = 5
Top = 223 Top = 223
Width = 424 Width = 441
Height = 130 Height = 130
Margins.Left = 5 Margins.Left = 5
Margins.Top = 0 Margins.Top = 0
@ -118,7 +115,7 @@ inherited frViewConfiguracionContactos: TfrViewConfiguracionContactos
BevelOuter = bvNone BevelOuter = bvNone
ParentColor = True ParentColor = True
TabOrder = 3 TabOrder = 3
ExplicitWidth = 537 ExplicitWidth = 424
object Label7: TLabel object Label7: TLabel
Left = 17 Left = 17
Top = 37 Top = 37
@ -153,7 +150,7 @@ inherited frViewConfiguracionContactos: TfrViewConfiguracionContactos
Width = 168 Width = 168
Height = 21 Height = 21
Style = csDropDownList Style = csDropDownList
ItemHeight = 0 ItemHeight = 13
TabOrder = 0 TabOrder = 0
end end
object cbRegimenIVAProv: TComboBox object cbRegimenIVAProv: TComboBox
@ -162,7 +159,7 @@ inherited frViewConfiguracionContactos: TfrViewConfiguracionContactos
Width = 168 Width = 168
Height = 21 Height = 21
Style = csDropDownList Style = csDropDownList
ItemHeight = 0 ItemHeight = 13
TabOrder = 1 TabOrder = 1
end end
object Button1: TButton object Button1: TButton
@ -189,7 +186,7 @@ inherited frViewConfiguracionContactos: TfrViewConfiguracionContactos
Width = 168 Width = 168
Height = 21 Height = 21
Style = csDropDownList Style = csDropDownList
ItemHeight = 0 ItemHeight = 13
TabOrder = 4 TabOrder = 4
end end
end end
@ -197,7 +194,7 @@ inherited frViewConfiguracionContactos: TfrViewConfiguracionContactos
AlignWithMargins = True AlignWithMargins = True
Left = 5 Left = 5
Top = 201 Top = 201
Width = 424 Width = 441
Height = 22 Height = 22
Margins.Left = 5 Margins.Left = 5
Margins.Top = 0 Margins.Top = 0
@ -221,16 +218,15 @@ inherited frViewConfiguracionContactos: TfrViewConfiguracionContactos
ParentBackground = False ParentBackground = False
ParentFont = False ParentFont = False
TabOrder = 4 TabOrder = 4
ExplicitLeft = -1 ExplicitWidth = 424
ExplicitTop = 239
ExplicitWidth = 537
object Label6: TLabel object Label6: TLabel
Left = 6 Left = 6
Top = 4 Top = 4
Width = 196 Width = 429
Height = 14 Height = 14
Align = alTop Align = alTop
Caption = 'Configuraci'#243'n para proveedores' Caption = 'Configuraci'#243'n para proveedores'
ExplicitWidth = 196
end end
end end
end end

81
Source/Modulos/Contactos/Views/uViewProveedor.dfm
View File

@ -25,6 +25,10 @@ inherited frViewProveedor: TfrViewProveedor
inherited eCalle: TcxDBTextEdit inherited eCalle: TcxDBTextEdit
Left = 138 Left = 138
Top = 220 Top = 220
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 7 TabOrder = 7
ExplicitLeft = 138 ExplicitLeft = 138
ExplicitTop = 220 ExplicitTop = 220
@ -34,6 +38,10 @@ inherited frViewProveedor: TfrViewProveedor
inherited cbProvincia: TcxDBComboBox inherited cbProvincia: TcxDBComboBox
Left = 138 Left = 138
Top = 247 Top = 247
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 8 TabOrder = 8
ExplicitLeft = 138 ExplicitLeft = 138
ExplicitTop = 247 ExplicitTop = 247
@ -43,6 +51,10 @@ inherited frViewProveedor: TfrViewProveedor
inherited cbPoblacion: TcxDBComboBox inherited cbPoblacion: TcxDBComboBox
Left = 138 Left = 138
Top = 274 Top = 274
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 10 TabOrder = 10
ExplicitLeft = 138 ExplicitLeft = 138
ExplicitTop = 274 ExplicitTop = 274
@ -52,12 +64,20 @@ inherited frViewProveedor: TfrViewProveedor
inherited eCodigoPostal: TcxDBTextEdit inherited eCodigoPostal: TcxDBTextEdit
Left = 271 Left = 271
Top = 247 Top = 247
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 9 TabOrder = 9
ExplicitLeft = 271 ExplicitLeft = 271
ExplicitTop = 247 ExplicitTop = 247
end end
inherited eTlfParticular: TcxDBTextEdit inherited eTlfParticular: TcxDBTextEdit
Left = 452 Left = 452
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 15 TabOrder = 15
ExplicitLeft = 452 ExplicitLeft = 452
ExplicitWidth = 91 ExplicitWidth = 91
@ -69,6 +89,7 @@ inherited frViewProveedor: TfrViewProveedor
Caption = 'El proveedor est'#225' homologado' Caption = 'El proveedor est'#225' homologado'
DataBinding.DataField = 'HOMOLOGADO' DataBinding.DataField = 'HOMOLOGADO'
DataBinding.DataSource = dsContacto DataBinding.DataSource = dsContacto
Enabled = False
Properties.ImmediatePost = True Properties.ImmediatePost = True
Properties.NullStyle = nssUnchecked Properties.NullStyle = nssUnchecked
Properties.ValueChecked = 1 Properties.ValueChecked = 1
@ -92,6 +113,7 @@ inherited frViewProveedor: TfrViewProveedor
Top = 385 Top = 385
DataBinding.DataField = 'CERTIFICACION' DataBinding.DataField = 'CERTIFICACION'
DataBinding.DataSource = dsContacto DataBinding.DataSource = dsContacto
Enabled = False
Style.BorderColor = clWindowFrame Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D Style.BorderStyle = ebs3D
Style.HotTrack = False Style.HotTrack = False
@ -111,6 +133,7 @@ inherited frViewProveedor: TfrViewProveedor
Top = 163 Top = 163
DataBinding.DataField = 'GRUPO_PROVEEDOR' DataBinding.DataField = 'GRUPO_PROVEEDOR'
DataBinding.DataSource = dsContacto DataBinding.DataSource = dsContacto
Enabled = False
Properties.ImmediatePost = True Properties.ImmediatePost = True
Properties.OnInitPopup = cbGrupoProveedorPropertiesInitPopup Properties.OnInitPopup = cbGrupoProveedorPropertiesInitPopup
Properties.OnValidate = cbGrupoProveedorPropertiesValidate Properties.OnValidate = cbGrupoProveedorPropertiesValidate
@ -154,6 +177,7 @@ inherited frViewProveedor: TfrViewProveedor
Top = 136 Top = 136
DataBinding.DataField = 'CODIGO_ASIGNADO' DataBinding.DataField = 'CODIGO_ASIGNADO'
DataBinding.DataSource = dsContacto DataBinding.DataSource = dsContacto
Enabled = False
Style.BorderColor = clWindowFrame Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D Style.BorderStyle = ebs3D
Style.HotTrack = False Style.HotTrack = False
@ -170,6 +194,10 @@ inherited frViewProveedor: TfrViewProveedor
end end
inherited eTlfTrabajo: TcxDBTextEdit inherited eTlfTrabajo: TcxDBTextEdit
Left = 452 Left = 452
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 14 TabOrder = 14
ExplicitLeft = 452 ExplicitLeft = 452
ExplicitWidth = 127 ExplicitWidth = 127
@ -177,6 +205,10 @@ inherited frViewProveedor: TfrViewProveedor
end end
inherited eTlfMovil: TcxDBTextEdit inherited eTlfMovil: TcxDBTextEdit
Left = 452 Left = 452
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 16 TabOrder = 16
ExplicitLeft = 452 ExplicitLeft = 452
ExplicitWidth = 155 ExplicitWidth = 155
@ -184,6 +216,10 @@ inherited frViewProveedor: TfrViewProveedor
end end
inherited eFax: TcxDBTextEdit inherited eFax: TcxDBTextEdit
Left = 452 Left = 452
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 17 TabOrder = 17
ExplicitLeft = 452 ExplicitLeft = 452
ExplicitWidth = 121 ExplicitWidth = 121
@ -191,12 +227,20 @@ inherited frViewProveedor: TfrViewProveedor
end end
inherited eNombre: TcxDBTextEdit inherited eNombre: TcxDBTextEdit
Left = 138 Left = 138
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 138 ExplicitLeft = 138
ExplicitWidth = 221 ExplicitWidth = 221
Width = 221 Width = 221
end end
inherited eNIFCIF: TcxDBTextEdit inherited eNIFCIF: TcxDBTextEdit
Left = 211 Left = 211
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 211 ExplicitLeft = 211
ExplicitWidth = 205 ExplicitWidth = 205
Width = 205 Width = 205
@ -204,6 +248,10 @@ inherited frViewProveedor: TfrViewProveedor
inherited eMailTrabajo: TcxDBHyperLinkEdit inherited eMailTrabajo: TcxDBHyperLinkEdit
Left = 452 Left = 452
Properties.Prefix = 'mailto:' Properties.Prefix = 'mailto:'
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 18 TabOrder = 18
ExplicitLeft = 452 ExplicitLeft = 452
ExplicitWidth = 133 ExplicitWidth = 133
@ -214,6 +262,7 @@ inherited frViewProveedor: TfrViewProveedor
Top = 82 Top = 82
DataBinding.DataField = 'NOMBRE_COMERCIAL' DataBinding.DataField = 'NOMBRE_COMERCIAL'
DataBinding.DataSource = dsContacto DataBinding.DataSource = dsContacto
Enabled = False
Style.BorderColor = clWindowFrame Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D Style.BorderStyle = ebs3D
Style.Color = clWindow Style.Color = clWindow
@ -232,6 +281,10 @@ inherited frViewProveedor: TfrViewProveedor
inherited eMailParticular: TcxDBHyperLinkEdit inherited eMailParticular: TcxDBHyperLinkEdit
Left = 452 Left = 452
Properties.Prefix = 'mailto:' Properties.Prefix = 'mailto:'
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 19 TabOrder = 19
ExplicitLeft = 452 ExplicitLeft = 452
ExplicitWidth = 133 ExplicitWidth = 133
@ -239,6 +292,10 @@ inherited frViewProveedor: TfrViewProveedor
end end
inherited ePaginaWeb: TcxDBHyperLinkEdit inherited ePaginaWeb: TcxDBHyperLinkEdit
Left = 452 Left = 452
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 20 TabOrder = 20
ExplicitLeft = 452 ExplicitLeft = 452
ExplicitWidth = 133 ExplicitWidth = 133
@ -246,6 +303,10 @@ inherited frViewProveedor: TfrViewProveedor
end end
inherited eReferencia: TcxDBTextEdit inherited eReferencia: TcxDBTextEdit
Left = 138 Left = 138
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 138 ExplicitLeft = 138
ExplicitWidth = 38 ExplicitWidth = 38
Width = 38 Width = 38
@ -253,6 +314,10 @@ inherited frViewProveedor: TfrViewProveedor
inherited ePersonaContacto: TcxDBTextEdit inherited ePersonaContacto: TcxDBTextEdit
Left = 138 Left = 138
Top = 301 Top = 301
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 11 TabOrder = 11
ExplicitLeft = 138 ExplicitLeft = 138
ExplicitTop = 301 ExplicitTop = 301
@ -262,24 +327,32 @@ inherited frViewProveedor: TfrViewProveedor
inherited frViewTienda1: TfrViewTienda inherited frViewTienda1: TfrViewTienda
Left = 357 Left = 357
Width = 451 Width = 451
Enabled = False
TabOrder = 21 TabOrder = 21
ExplicitLeft = 357 ExplicitLeft = 357
ExplicitWidth = 451 ExplicitWidth = 451
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 451 Width = 451
inherited cbTienda: TcxComboBox inherited cbTienda: TcxComboBox
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 376 ExplicitWidth = 376
Width = 376 Width = 376
end end
end end
end end
inherited frViewObservaciones1: TfrViewObservaciones inherited frViewObservaciones1: TfrViewObservaciones
Top = 442
Width = 521 Width = 521
Height = 228 Height = 228
TabOrder = 22 TabOrder = 22
ExplicitTop = 442
ExplicitWidth = 521 ExplicitWidth = 521
ExplicitHeight = 228 ExplicitHeight = 228
inherited memObservaciones: TcxDBMemo inherited memObservaciones: TcxDBMemo
DataBinding.DataSource = dsContacto
Height = 228 Height = 228
Width = 521 Width = 521
end end
@ -290,6 +363,8 @@ inherited frViewProveedor: TfrViewProveedor
inherited dxLayoutControlContactoGroup1: TdxLayoutGroup inherited dxLayoutControlContactoGroup1: TdxLayoutGroup
object dxLayoutControlContactoItem27: TdxLayoutItem object dxLayoutControlContactoItem27: TdxLayoutItem
Caption = 'Nombre comercial:' Caption = 'Nombre comercial:'
Enabled = False
Visible = False
Control = eNombreComercial Control = eNombreComercial
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end
@ -300,18 +375,22 @@ inherited frViewProveedor: TfrViewProveedor
end end
object dxLayoutControlContactoItem24: TdxLayoutItem object dxLayoutControlContactoItem24: TdxLayoutItem
Caption = 'C'#243'digo de cliente:' Caption = 'C'#243'digo de cliente:'
Enabled = False
Visible = False Visible = False
Control = eCodigoAsignado Control = eCodigoAsignado
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end
object dxLayoutControlContactoItem20: TdxLayoutItem object dxLayoutControlContactoItem20: TdxLayoutItem
Caption = 'Grupo de proveedor' Caption = 'Grupo de proveedor'
Enabled = False
Visible = False
Control = cbGrupoProveedor Control = cbGrupoProveedor
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end
end end
object dxLayoutControlContactoGroup14: TdxLayoutGroup object dxLayoutControlContactoGroup14: TdxLayoutGroup
Caption = 'Homologaci'#243'n' Caption = 'Homologaci'#243'n'
Enabled = False
Visible = False Visible = False
object dxLayoutControlContactoItem22: TdxLayoutItem object dxLayoutControlContactoItem22: TdxLayoutItem
Caption = 'El proveedor est'#225' homologado' Caption = 'El proveedor est'#225' homologado'
@ -329,6 +408,8 @@ inherited frViewProveedor: TfrViewProveedor
inherited dxLayoutControlContactoGroup6: TdxLayoutGroup inherited dxLayoutControlContactoGroup6: TdxLayoutGroup
inherited dxLayoutControlContactoGroup100: TdxLayoutGroup inherited dxLayoutControlContactoGroup100: TdxLayoutGroup
Caption = 'El proveedor pertenece a la tienda' Caption = 'El proveedor pertenece a la tienda'
Enabled = False
Visible = False
end end
end end
end end

12
Source/Modulos/Contactos/Views/uViewProveedores.dfm
View File

@ -49,15 +49,27 @@ inherited frViewProveedores: TfrViewProveedores
Width = 483 Width = 483
ExplicitWidth = 483 ExplicitWidth = 483
inherited txtFiltroTodo: TcxTextEdit inherited txtFiltroTodo: TcxTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 386 ExplicitWidth = 386
Width = 386 Width = 386
end end
inherited edtFechaIniFiltro: TcxDateEdit inherited edtFechaIniFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 130 ExplicitWidth = 130
Width = 130 Width = 130
end end
inherited edtFechaFinFiltro: TcxDateEdit inherited edtFechaFinFiltro: TcxDateEdit
Left = 234 Left = 234
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 234 ExplicitLeft = 234
ExplicitWidth = 239 ExplicitWidth = 239
Width = 239 Width = 239

2
Source/Modulos/Contactos/Views/uViewProveedores.pas
View File

@ -12,7 +12,7 @@ uses
cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
cxClasses, cxControls, cxGridCustomView, cxGrid, dxPgsDlg, ActnList, TB2Item, cxClasses, cxControls, cxGridCustomView, cxGrid, dxPgsDlg, ActnList, TB2Item,
TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase, cxImageComboBox, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase, cxImageComboBox,
uDAInterfaces; uDAInterfaces, uCustomView, uViewBase;
type type
IViewProveedores = interface(IViewContactos) IViewProveedores = interface(IViewContactos)

42
Source/Modulos/Contratos de cliente/Controller/uContratosClienteController.pas
View File

@ -144,7 +144,7 @@ uses
uBizContactos, uDataTableUtils, uDataModuleUsuarios, uFactuGES_App, uBizContactos, uDataTableUtils, uDataModuleUsuarios, uFactuGES_App,
schContratosClienteClient_Intf, uDAInterfaces, uDateUtils, uIEditorContratoCliente, schContratosClienteClient_Intf, uDAInterfaces, uDateUtils, uIEditorContratoCliente,
uIEditorElegirContratosCliente, uIEditorDireccionEntregaContratoCliente, uIEditorElegirContratosCliente, uIEditorDireccionEntregaContratoCliente,
schContactosClient_Intf, uContratosClienteReportController, schContactosClient_Intf, uContratosClienteReportController, uFormasPagoController, uBizFormasPago,
uSistemaFunc, uEMailUtils, uDialogElegirEMail, Dialogs, uStringsUtils, uSistemaFunc, uEMailUtils, uDialogElegirEMail, Dialogs, uStringsUtils,
uIEditorContratosClienteBeneficios, uPresupuestosClienteController, uIEditorContratosClienteBeneficios, uPresupuestosClienteController,
uConfiguracionController, uBizDetallesPresupuestoCliente; uConfiguracionController, uBizDetallesPresupuestoCliente;
@ -731,14 +731,22 @@ begin
RecuperarCliente(AContrato); RecuperarCliente(AContrato);
end; end;
procedure TContratosClienteController.RellenarValoresDefecto( procedure TContratosClienteController.RellenarValoresDefecto(AContrato: IBizContratoCliente; ATipo: TEnumTiposContrato);
AContrato: IBizContratoCliente; ATipo: TEnumTiposContrato); var
AFormasPago : IBizFormaPago;
AFormasPagoController : IFormasPagoController;
begin begin
AFormasPagoController := TFormasPagoController.Create;
case ATipo of case ATipo of
teCocina: teCocina:
begin begin
AContrato.TIPO_CONTRATO := CTE_COCINA; AContrato.TIPO_CONTRATO := CTE_COCINA;
AContrato.FORMA_PAGO.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_COCINA)); AContrato.ID_FORMA_PAGO := StrToInt(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_COCINA));
AFormasPago := AFormasPagoController.Buscar(AContrato.ID_FORMA_PAGO);
AFormasPago.Open;
AContrato.FORMA_PAGO.Add(AFormasPago.DESCRIPCION);
AContrato.PLAZO_ENTREGA.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_COCINA)); AContrato.PLAZO_ENTREGA.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_COCINA));
AContrato.OBSERVACIONES.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_OBSERVACIONES_COCINA)); AContrato.OBSERVACIONES.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_OBSERVACIONES_COCINA));
(Self.DetallesController as IDetallesContratoClienteController).AnadirCapitulo(TIPO_CAPITULO_C, 'MUEBLES DE COCINA ', False, AContrato.Detalles); (Self.DetallesController as IDetallesContratoClienteController).AnadirCapitulo(TIPO_CAPITULO_C, 'MUEBLES DE COCINA ', False, AContrato.Detalles);
@ -748,6 +756,11 @@ begin
teArmario: teArmario:
begin begin
AContrato.TIPO_CONTRATO := CTE_ARMARIO; AContrato.TIPO_CONTRATO := CTE_ARMARIO;
AContrato.ID_FORMA_PAGO := StrToInt(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_ARMARIO));
AFormasPago := AFormasPagoController.Buscar(AContrato.ID_FORMA_PAGO);
AFormasPago.Open;
AContrato.FORMA_PAGO.Add(AFormasPago.DESCRIPCION);
AContrato.FORMA_PAGO.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_ARMARIO)); AContrato.FORMA_PAGO.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_ARMARIO));
AContrato.PLAZO_ENTREGA.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_ARMARIO)); AContrato.PLAZO_ENTREGA.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_ARMARIO));
AContrato.OBSERVACIONES.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_OBSERVACIONES_ARMARIO)); AContrato.OBSERVACIONES.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_OBSERVACIONES_ARMARIO));
@ -757,6 +770,11 @@ begin
teBano: teBano:
begin begin
AContrato.TIPO_CONTRATO := CTE_BANO; AContrato.TIPO_CONTRATO := CTE_BANO;
AContrato.ID_FORMA_PAGO := StrToInt(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_BANO));
AFormasPago := AFormasPagoController.Buscar(AContrato.ID_FORMA_PAGO);
AFormasPago.Open;
AContrato.FORMA_PAGO.Add(AFormasPago.DESCRIPCION);
AContrato.FORMA_PAGO.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_BANO)); AContrato.FORMA_PAGO.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_BANO));
AContrato.PLAZO_ENTREGA.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_BANO)); AContrato.PLAZO_ENTREGA.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_BANO));
AContrato.OBSERVACIONES.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_OBSERVACIONES_BANO)); AContrato.OBSERVACIONES.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_OBSERVACIONES_BANO));
@ -766,6 +784,11 @@ begin
teElectrodomestico: teElectrodomestico:
begin begin
AContrato.TIPO_CONTRATO := CTE_ELECTRODOMESTICO; AContrato.TIPO_CONTRATO := CTE_ELECTRODOMESTICO;
AContrato.ID_FORMA_PAGO := StrToInt(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_ELECTRODOMESTICO));
AFormasPago := AFormasPagoController.Buscar(AContrato.ID_FORMA_PAGO);
AFormasPago.Open;
AContrato.FORMA_PAGO.Add(AFormasPago.DESCRIPCION);
AContrato.FORMA_PAGO.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_ELECTRODOMESTICO)); AContrato.FORMA_PAGO.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_ELECTRODOMESTICO));
AContrato.PLAZO_ENTREGA.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_ELECTRODOMESTICO)); AContrato.PLAZO_ENTREGA.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_ELECTRODOMESTICO));
AContrato.OBSERVACIONES.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_OBSERVACIONES_ELECTRODOMESTICO)); AContrato.OBSERVACIONES.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_OBSERVACIONES_ELECTRODOMESTICO));
@ -774,16 +797,23 @@ begin
teVarios: teVarios:
begin begin
AContrato.TIPO_CONTRATO := CTE_VARIOS; AContrato.TIPO_CONTRATO := CTE_VARIOS;
AContrato.ID_FORMA_PAGO := StrToInt(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_VARIOS));
AFormasPago := AFormasPagoController.Buscar(AContrato.ID_FORMA_PAGO);
AFormasPago.Open;
AContrato.FORMA_PAGO.Add(AFormasPago.DESCRIPCION);
AContrato.FORMA_PAGO.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_VARIOS)); AContrato.FORMA_PAGO.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_VARIOS));
AContrato.PLAZO_ENTREGA.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_VARIOS)); AContrato.PLAZO_ENTREGA.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_VARIOS));
AContrato.OBSERVACIONES.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_OBSERVACIONES_VARIOS)); AContrato.OBSERVACIONES.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_OBSERVACIONES_VARIOS));
(Self.DetallesController as IDetallesContratoClienteController).AnadirCapitulo(TIPO_CAPITULO_V, 'VARIOS ', False, AContrato.Detalles); (Self.DetallesController as IDetallesContratoClienteController).AnadirCapitulo(TIPO_CAPITULO_V, 'VARIOS ', False, AContrato.Detalles);
end; end;
end; end;
AFormasPago:= Nil;
AFormasPagoController := Nil;
end; end;
procedure TContratosClienteController.RecuperarCliente( procedure TContratosClienteController.RecuperarCliente(AContrato: IBizContratoCliente);
AContrato: IBizContratoCliente);
begin begin
AContrato._Cliente := (FClienteController.Buscar(AContrato.ID_Cliente) as IBizCliente); AContrato._Cliente := (FClienteController.Buscar(AContrato.ID_Cliente) as IBizCliente);
end; end;

4
Source/Modulos/Contratos de cliente/Model/uBizContratosCliente.pas
View File

@ -345,8 +345,8 @@ begin
TELEFONO := FCliente.TELEFONO_1; TELEFONO := FCliente.TELEFONO_1;
MOVIL := FCliente.MOVIL_1; MOVIL := FCliente.MOVIL_1;
if FCliente.ID_FORMA_PAGO > 0 then // if FCliente.ID_FORMA_PAGO > 0 then
ID_FORMA_PAGO := FCliente.ID_FORMA_PAGO; // ID_FORMA_PAGO := FCliente.ID_FORMA_PAGO;
if FCliente.ID_TIPO_IVA > 0 then if FCliente.ID_TIPO_IVA > 0 then
ID_TIPO_IVA := FCliente.ID_TIPO_IVA; ID_TIPO_IVA := FCliente.ID_TIPO_IVA;
RECARGO_EQUIVALENCIA := FCliente.RECARGO_EQUIVALENCIA; RECARGO_EQUIVALENCIA := FCliente.RECARGO_EQUIVALENCIA;

66
Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.dfm
View File

@ -90,7 +90,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
end end
object cbFormaPago: TcxDBLookupComboBox object cbFormaPago: TcxDBLookupComboBox
Left = 104 Left = 104
Top = 109 Top = 166
DataBinding.DataField = 'ID_FORMA_PAGO' DataBinding.DataField = 'ID_FORMA_PAGO'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
Properties.KeyFieldNames = 'ID' Properties.KeyFieldNames = 'ID'
@ -115,16 +115,16 @@ inherited frViewContratoCliente: TfrViewContratoCliente
StyleFocused.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 4 TabOrder = 5
Width = 122 Width = 122
end end
object bFormasPago: TButton object bFormasPago: TButton
Left = 215 Left = 215
Top = 109 Top = 166
Width = 132 Width = 132
Height = 21 Height = 21
Caption = 'Ver las formas de pago...' Caption = 'Ver las formas de pago...'
TabOrder = 5 TabOrder = 6
OnClick = bFormasPagoClick OnClick = bFormasPagoClick
end end
object cbSituacion: TcxDBImageComboBox object cbSituacion: TcxDBImageComboBox
@ -253,7 +253,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
end end
object cbVendedor: TcxDBLookupComboBox object cbVendedor: TcxDBLookupComboBox
Left = 104 Left = 104
Top = 136 Top = 109
DataBinding.DataField = 'ID_VENDEDOR' DataBinding.DataField = 'ID_VENDEDOR'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
Properties.KeyFieldNames = 'ID' Properties.KeyFieldNames = 'ID'
@ -278,7 +278,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
StyleFocused.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 6 TabOrder = 4
Width = 27 Width = 27
end end
object cbTipoContrato: TcxDBComboBox object cbTipoContrato: TcxDBComboBox
@ -355,42 +355,36 @@ inherited frViewContratoCliente: TfrViewContratoCliente
Control = cbSituacion Control = cbSituacion
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end
object dxLayoutControl1Group5: TdxLayoutGroup object dxLayoutControl1Item11: TdxLayoutItem
ShowCaption = False Caption = 'Vendedor:'
Hidden = True Control = cbVendedor
ShowBorder = False ControlOptions.ShowBorder = False
object dxLayoutControl1Group9: TdxLayoutGroup
ShowCaption = False
Visible = False
Hidden = True
LayoutDirection = ldHorizontal
ShowBorder = False
object dxLayoutControl1Item4: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = 'Forma de pago:'
Control = cbFormaPago
ControlOptions.ShowBorder = False
end
object dxLayoutControl1Item5: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahRight
ShowCaption = False
Control = bFormasPago
ControlOptions.ShowBorder = False
end
end
object dxLayoutControl1Item11: TdxLayoutItem
Caption = 'Vendedor:'
Control = cbVendedor
ControlOptions.ShowBorder = False
end
end end
end end
object dxLayoutControl1Group6: TdxLayoutGroup object dxLayoutControl1Group6: TdxLayoutGroup
AutoAligns = [aaHorizontal] AutoAligns = [aaHorizontal]
AlignVert = avClient AlignVert = avClient
Caption = 'Forma de pago' Caption = 'Forma de pago'
object dxLayoutControl1Group9: TdxLayoutGroup
ShowCaption = False
Hidden = True
LayoutDirection = ldHorizontal
ShowBorder = False
object dxLayoutControl1Item4: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = 'Forma de pago:'
Control = cbFormaPago
ControlOptions.ShowBorder = False
end
object dxLayoutControl1Item5: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahRight
ShowCaption = False
Control = bFormasPago
ControlOptions.ShowBorder = False
end
end
object dxLayoutControl1Item8: TdxLayoutItem object dxLayoutControl1Item8: TdxLayoutItem
AutoAligns = [aaHorizontal] AutoAligns = [aaHorizontal]
AlignVert = avClient AlignVert = avClient

1
Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.pas
View File

@ -43,7 +43,6 @@ type
cbFormaPago: TcxDBLookupComboBox; cbFormaPago: TcxDBLookupComboBox;
dxLayoutControl1Item5: TdxLayoutItem; dxLayoutControl1Item5: TdxLayoutItem;
bFormasPago: TButton; bFormasPago: TButton;
dxLayoutControl1Group5: TdxLayoutGroup;
dsFormaPago: TDADataSource; dsFormaPago: TDADataSource;
cbSituacion: TcxDBImageComboBox; cbSituacion: TcxDBImageComboBox;
dxLayoutControl1Item10: TdxLayoutItem; dxLayoutControl1Item10: TdxLayoutItem;

8
Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas
View File

@ -3,6 +3,7 @@ unit uFacturasClienteController;
interface interface
uses uses
Classes, SysUtils, Variants, uDADataTable, uControllerBase, uIDataModuleFacturasCliente, Classes, SysUtils, Variants, uDADataTable, uControllerBase, uIDataModuleFacturasCliente,
uClientesController, uDetallesFacturaClienteController, uBizAlbaranesCliente, uClientesController, uDetallesFacturaClienteController, uBizAlbaranesCliente,
@ -120,6 +121,7 @@ type
end; end;
implementation implementation
{$INCLUDE ..\..\..\FactuGES.inc}
uses uses
Windows, uDateUtils, uNumUtils, Controls, cxControls, DB, uEditorRegistryUtils, schFacturasClienteClient_Intf, Windows, uDateUtils, uNumUtils, Controls, cxControls, DB, uEditorRegistryUtils, schFacturasClienteClient_Intf,
@ -567,7 +569,7 @@ begin
FECHA_FACTURA := DateOf(Now); FECHA_FACTURA := DateOf(Now);
ID_COMISION_LIQUIDADA := 0; ID_COMISION_LIQUIDADA := 0;
//CONTABILIDAD {$IFDEF CONTABILIDAD}
ID_EJERCICIO := AppFactuGES.EjercicioActivo.ID; ID_EJERCICIO := AppFactuGES.EjercicioActivo.ID;
ESTADO_EJERCICIO := AppFactuGES.EjercicioActivo.ESTADO; ESTADO_EJERCICIO := AppFactuGES.EjercicioActivo.ESTADO;
ASIENTO_PUNTEADO := -1; ASIENTO_PUNTEADO := -1;
@ -577,6 +579,8 @@ begin
IGNORAR_CONTABILIDAD := 1; IGNORAR_CONTABILIDAD := 1;
ESTADO_EJERCICIO := ''; ESTADO_EJERCICIO := '';
end; end;
{$ENDIF}
end; end;
Result.Post; Result.Post;
@ -636,6 +640,7 @@ begin
end; end;
} }
{$IFDEF CONTABILIDAD}
if (AFactura.IGNORAR_CONTABILIDAD = 0) then if (AFactura.IGNORAR_CONTABILIDAD = 0) then
begin begin
if (AppFactuGES.EjercicioActivo.ESTADO = CTE_CERRADO) then if (AppFactuGES.EjercicioActivo.ESTADO = CTE_CERRADO) then
@ -644,6 +649,7 @@ begin
if ((AFactura.Cliente.SubCuentas.ID < 1) or (AFactura.Cliente.SubCuentas.ID_EJERCICIO <> AppFactuGES.EjercicioActivo.ID)) then if ((AFactura.Cliente.SubCuentas.ID < 1) or (AFactura.Cliente.SubCuentas.ID_EJERCICIO <> AppFactuGES.EjercicioActivo.ID)) then
raise Exception.Create('Para que la factura pueda pasar la parte contable es necesario que el cliente tenga asignada una subcuenta'); raise Exception.Create('Para que la factura pueda pasar la parte contable es necesario que el cliente tenga asignada una subcuenta');
end; end;
{$ENDIF}
//En caso de ser un Abono no podra tener un importe total positivo //En caso de ser un Abono no podra tener un importe total positivo
if (AFactura.TIPO = CTE_TIPO_ABONO) then if (AFactura.TIPO = CTE_TIPO_ABONO) then

5
Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas
View File

@ -96,6 +96,7 @@ type
end; end;
implementation implementation
{$INCLUDE ..\..\..\FactuGES.inc}
uses uses
SysUtils, uDataTableUtils, DB, uDateUtils, DateUtils, uDataModuleUsuarios, SysUtils, uDataTableUtils, DB, uDateUtils, DateUtils, uDataModuleUsuarios,
@ -265,11 +266,13 @@ begin
ID_TIENDA := AppFactuGES.TiendaActiva.ID; ID_TIENDA := AppFactuGES.TiendaActiva.ID;
TIENDA := AppFactuGES.TiendaActiva.NOMBRE; TIENDA := AppFactuGES.TiendaActiva.NOMBRE;
//CONTABILIDAD {$IFDEF CONTABILIDAD}
if Assigned(AppFactuGES.EjercicioActivo) then if Assigned(AppFactuGES.EjercicioActivo) then
IGNORAR_CONTABILIDAD := 0 IGNORAR_CONTABILIDAD := 0
else else
IGNORAR_CONTABILIDAD := 1; IGNORAR_CONTABILIDAD := 1;
{$ENDIF}
end; end;
procedure TBizFacturaCliente.IVAOnChange(Sender: TDACustomField); procedure TBizFacturaCliente.IVAOnChange(Sender: TDACustomField);

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

@ -262,6 +262,10 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
object pagContenido: TTabSheet object pagContenido: TTabSheet
Caption = 'Contenido' Caption = 'Contenido'
ImageIndex = 1 ImageIndex = 1
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
inline frViewDetallesFacturaCliente1: TfrViewDetallesFacturaCliente inline frViewDetallesFacturaCliente1: TfrViewDetallesFacturaCliente
Left = 0 Left = 0
Top = 0 Top = 0
@ -282,97 +286,56 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
ExplicitHeight = 340 ExplicitHeight = 340
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Width = 846 Width = 846
Height = 24
ExplicitWidth = 846 ExplicitWidth = 846
ExplicitHeight = 24
inherited ToolButton4: TToolButton
Wrap = False
end
inherited ToolButton14: TToolButton
Left = 334
Top = 0
ExplicitLeft = 334
ExplicitTop = 0
end
inherited FontName: TJvFontComboBox
Left = 368
Top = 0
ExplicitLeft = 368
ExplicitTop = 0
end
inherited FontSize: TEdit inherited FontSize: TEdit
Left = 513
Top = 0
Width = 57 Width = 57
ExplicitLeft = 513
ExplicitTop = 0
ExplicitWidth = 57 ExplicitWidth = 57
end end
inherited UpDown1: TUpDown inherited UpDown1: TUpDown
Left = 570 Left = 236
Top = 0 ExplicitLeft = 236
ExplicitLeft = 570
ExplicitTop = 0
end end
inherited ToolButton13: TToolButton inherited ToolButton13: TToolButton
Left = 587 Left = 253
Top = 0 ExplicitLeft = 253
ExplicitLeft = 587
ExplicitTop = 0
end end
inherited ToolButton6: TToolButton inherited ToolButton6: TToolButton
Left = 595 Left = 261
Top = 0 ExplicitLeft = 261
ExplicitLeft = 595
ExplicitTop = 0
end end
inherited ToolButton7: TToolButton inherited ToolButton7: TToolButton
Left = 629 Left = 295
Top = 0 ExplicitLeft = 295
ExplicitLeft = 629
ExplicitTop = 0
end end
inherited ToolButton8: TToolButton inherited ToolButton8: TToolButton
Left = 663 Left = 329
Top = 0 ExplicitLeft = 329
ExplicitLeft = 663
ExplicitTop = 0
end end
inherited ToolButton12: TToolButton inherited ToolButton12: TToolButton
Left = 697 Left = 363
Top = 0 ExplicitLeft = 363
ExplicitLeft = 697
ExplicitTop = 0
end end
inherited ToolButton9: TToolButton inherited ToolButton9: TToolButton
Left = 705 Left = 371
Top = 0 ExplicitLeft = 371
ExplicitLeft = 705
ExplicitTop = 0
end end
inherited ToolButton10: TToolButton inherited ToolButton10: TToolButton
Left = 739 Left = 405
Top = 0 ExplicitLeft = 405
ExplicitLeft = 739
ExplicitTop = 0
end end
inherited ToolButton11: TToolButton inherited ToolButton11: TToolButton
Left = 773 Left = 439
Top = 0 ExplicitLeft = 439
ExplicitLeft = 773
ExplicitTop = 0
end end
end end
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Top = 50
Width = 846 Width = 846
Height = 290 Height = 268
ExplicitTop = 50 ExplicitTop = 50
ExplicitWidth = 846 ExplicitWidth = 846
ExplicitHeight = 290 ExplicitHeight = 290
end end
inherited TBXDock1: TTBXDock inherited TBXDock1: TTBXDock
Top = 24
Width = 846 Width = 846
ExplicitTop = 24 ExplicitTop = 24
ExplicitWidth = 846 ExplicitWidth = 846
@ -434,10 +397,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Width = 860 Width = 860
TabOrder = 5 TabOrder = 5
ExplicitWidth = 860 ExplicitWidth = 860
inherited lbComentario: TLabel
Width = 850
Height = 25
end
end end
inline frViewTotales1: TfrViewTotales [5] inline frViewTotales1: TfrViewTotales [5]
Left = 0 Left = 0
@ -644,11 +603,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Visible = False Visible = False
end end
end end
inherited dxLayoutControl1Group8: TdxLayoutGroup
inherited dxLayoutControl1Item7: TdxLayoutItem
Visible = True
end
end
end end
end end
end end

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

@ -105,8 +105,10 @@ begin
ViewFacturaCliente := frViewFacturaCliente1; ViewFacturaCliente := frViewFacturaCliente1;
FTiposIVAController := TTiposIVAController.Create; FTiposIVAController := TTiposIVAController.Create;
//CONTABILIDAD {$IFDEF CONTABILIDAD}
frViewListaSubcuentas1.TipoSubCuenta := tVentas; frViewListaSubcuentas1.TipoSubCuenta := tVentas;
{$ENDIF}
end; end;
procedure TfEditorFacturaCliente.CustomEditorClose(Sender: TObject; procedure TfEditorFacturaCliente.CustomEditorClose(Sender: TObject;

5
Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas
View File

@ -131,6 +131,7 @@ type
end; end;
implementation implementation
{$INCLUDE ..\..\..\FactuGES.inc}
uses uses
Windows, Controls, cxControls, DB, uEditorRegistryUtils, schFacturasProveedorClient_Intf, Windows, Controls, cxControls, DB, uEditorRegistryUtils, schFacturasProveedorClient_Intf,
@ -621,7 +622,7 @@ begin
SITUACION := CTE_PENDIENTE; //Una factura nueva debe estar pendiente SITUACION := CTE_PENDIENTE; //Una factura nueva debe estar pendiente
FECHA_FACTURA := DateOf(Now); FECHA_FACTURA := DateOf(Now);
//CONTABILIDAD {$IFDEF CONTABILIDAD}
ID_EJERCICIO := AppFactuGES.EjercicioActivo.ID; ID_EJERCICIO := AppFactuGES.EjercicioActivo.ID;
ESTADO_EJERCICIO := AppFactuGES.EjercicioActivo.ESTADO; ESTADO_EJERCICIO := AppFactuGES.EjercicioActivo.ESTADO;
ASIENTO_PUNTEADO := -1; ASIENTO_PUNTEADO := -1;
@ -631,6 +632,8 @@ begin
IGNORAR_CONTABILIDAD := 1; IGNORAR_CONTABILIDAD := 1;
ESTADO_EJERCICIO := ''; ESTADO_EJERCICIO := '';
end; end;
{$ENDIF}
end; end;
Result.Post; Result.Post;

5
Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas
View File

@ -100,6 +100,7 @@ type
end; end;
implementation implementation
{$INCLUDE ..\..\..\FactuGES.inc}
uses uses
SysUtils, uDataTableUtils, DB, uDateUtils, DateUtils, uDataModuleUsuarios, SysUtils, uDataTableUtils, DB, uDateUtils, DateUtils, uDataModuleUsuarios,
@ -290,11 +291,13 @@ begin
ID_TIENDA := AppFactuGES.TiendaActiva.ID; ID_TIENDA := AppFactuGES.TiendaActiva.ID;
TIENDA := AppFactuGES.TiendaActiva.NOMBRE; TIENDA := AppFactuGES.TiendaActiva.NOMBRE;
//CONTABILIDAD {$IFDEF CONTABILIDAD}
if Assigned(AppFactuGES.EjercicioActivo) then if Assigned(AppFactuGES.EjercicioActivo) then
IGNORAR_CONTABILIDAD := 0 IGNORAR_CONTABILIDAD := 0
else else
IGNORAR_CONTABILIDAD := 1; IGNORAR_CONTABILIDAD := 1;
{$ENDIF}
end; end;
procedure TBizFacturaProveedor.IVAOnChange(Sender: TDACustomField); procedure TBizFacturaProveedor.IVAOnChange(Sender: TDACustomField);

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

@ -208,6 +208,8 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
ExplicitHeight = 228 ExplicitHeight = 228
inherited memObservaciones: TcxDBMemo inherited memObservaciones: TcxDBMemo
DataBinding.DataSource = frViewFacturaProveedor1.DADataSource DataBinding.DataSource = frViewFacturaProveedor1.DADataSource
ExplicitWidth = 671
ExplicitHeight = 20
Height = 228 Height = 228
Width = 671 Width = 671
end end
@ -218,10 +220,6 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
object pagContenido: TTabSheet object pagContenido: TTabSheet
Caption = 'Contenido' Caption = 'Contenido'
ImageIndex = 1 ImageIndex = 1
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
inline frViewDetallesFacturaProveedor1: TfrViewDetallesFacturaProveedor inline frViewDetallesFacturaProveedor1: TfrViewDetallesFacturaProveedor
Left = 0 Left = 0
Top = 0 Top = 0
@ -340,18 +338,6 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Width = 732 Width = 732
ExplicitWidth = 732 ExplicitWidth = 732
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
@ -625,6 +611,10 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
inherited PnlComentario: TPanel [5] inherited PnlComentario: TPanel [5]
Width = 746 Width = 746
ExplicitWidth = 746 ExplicitWidth = 746
inherited lbComentario: TLabel
Width = 736
Height = 25
end
end end
inherited EditorActionList: TActionList [9] inherited EditorActionList: TActionList [9]
Left = 8 Left = 8

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

@ -102,8 +102,10 @@ begin
ViewFacturaProveedor := frViewFacturaProveedor1; ViewFacturaProveedor := frViewFacturaProveedor1;
FTiposIVAController := TTiposIVAController.Create; FTiposIVAController := TTiposIVAController.Create;
//CONTABILIDAD {$IFDEF CONTABILIDAD}
frViewListaSubcuentas1.TipoSubCuenta := tCompras; frViewListaSubcuentas1.TipoSubCuenta := tCompras;
{$ENDIF}
end; end;
procedure TfEditorFacturaProveedor.CustomEditorClose(Sender: TObject; procedure TfEditorFacturaProveedor.CustomEditorClose(Sender: TObject;

17
Source/Modulos/Formas de pago/Views/FormasPago_view.dproj
View File

@ -41,25 +41,26 @@
<Borland.Personality>Delphi.Personality</Borland.Personality> <Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>Package</Borland.ProjectType> <Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject> <BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</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"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.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">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">FormasPago_view.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</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"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.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">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">FormasPago_view.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup> <ItemGroup>
<DelphiCompile Include="FormasPago_view.dpk"> <DelphiCompile Include="FormasPago_view.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" /> <DCCReference Include="..\..\..\Cliente\ApplicationBase.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" /> <DCCReference Include="..\..\..\Cliente\Base.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\FormasPago_controller.dcp" /> <DCCReference Include="..\..\..\Cliente\FormasPago_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" /> <DCCReference Include="..\..\..\Cliente\GUIBase.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCmpD11R.dcp" /> <DCCReference Include="..\..\..\Cliente\JvCmpD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" /> <DCCReference Include="..\..\..\Cliente\rtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" /> <DCCReference Include="..\..\..\Cliente\vcl.dcp" />
<DCCReference Include="uEditorFormaPago.pas"> <DCCReference Include="uEditorFormaPago.pas">
<Form>fEditorFormaPago</Form> <Form>fEditorFormaPago</Form>
</DCCReference> </DCCReference>
<DCCReference Include="uEditorFormasPago.pas"> <DCCReference Include="uEditorFormasPago.pas">
<Form>fEditorFormasPago</Form> <Form>fEditorFormasPago</Form>
<DesignClass>TfEditorFormasPago</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="uFormasPagoViewRegister.pas" /> <DCCReference Include="uFormasPagoViewRegister.pas" />
</ItemGroup> </ItemGroup>

67
Source/Modulos/Formas de pago/Views/uEditorFormaPago.dfm
View File

@ -5,8 +5,8 @@ object fEditorFormaPago: TfEditorFormaPago
BorderIcons = [biSystemMenu] BorderIcons = [biSystemMenu]
BorderStyle = bsSingle BorderStyle = bsSingle
Caption = 'Forma de pago' Caption = 'Forma de pago'
ClientHeight = 352 ClientHeight = 448
ClientWidth = 404 ClientWidth = 408
Color = clBtnFace Color = clBtnFace
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -39,7 +39,7 @@ object fEditorFormaPago: TfEditorFormaPago
Shape = bsBottomLine Shape = bsBottomLine
end end
object Label2: TLabel object Label2: TLabel
Left = 62 Left = 32
Top = 43 Top = 43
Width = 55 Width = 55
Height = 13 Height = 13
@ -47,7 +47,7 @@ object fEditorFormaPago: TfEditorFormaPago
Caption = 'Referencia:' Caption = 'Referencia:'
end end
object Label3: TLabel object Label3: TLabel
Left = 58 Left = 28
Top = 71 Top = 71
Width = 59 Width = 59
Height = 13 Height = 13
@ -56,7 +56,7 @@ object fEditorFormaPago: TfEditorFormaPago
end end
object Label11: TLabel object Label11: TLabel
Left = 16 Left = 16
Top = 112 Top = 209
Width = 91 Width = 91
Height = 13 Height = 13
Caption = 'Plazos del pago' Caption = 'Plazos del pago'
@ -69,83 +69,84 @@ object fEditorFormaPago: TfEditorFormaPago
end end
object Bevel3: TBevel object Bevel3: TBevel
Left = 113 Left = 113
Top = 112 Top = 209
Width = 272 Width = 272
Height = 10 Height = 10
Shape = bsBottomLine Shape = bsBottomLine
end end
object Bevel4: TBevel object Bevel4: TBevel
Left = 8 Left = 8
Top = 290 Top = 387
Width = 388 Width = 388
Height = 10 Height = 10
Shape = bsBottomLine Shape = bsBottomLine
end end
object JvEnterAsTab1: TJvEnterAsTab object JvEnterAsTab1: TJvEnterAsTab
Left = 137 Left = 137
Top = 306 Top = 403
Width = 28 Width = 28
Height = 28 Height = 28
end end
object eDescripcion: TDBMemo
Left = 93
Top = 67
Width = 292
Height = 136
Color = clInfoBk
DataField = 'DESCRIPCION'
DataSource = dsFormaPago
ScrollBars = ssVertical
TabOrder = 6
end
object bAceptar: TButton object bAceptar: TButton
Left = 234 Left = 234
Top = 314 Top = 411
Width = 75 Width = 75
Height = 23 Height = 23
Action = actAceptar Action = actAceptar
TabOrder = 5 TabOrder = 4
end end
object bCancelar: TButton object bCancelar: TButton
Left = 319 Left = 319
Top = 314 Top = 411
Width = 75 Width = 75
Height = 23 Height = 23
Action = actCancelar Action = actCancelar
Cancel = True Cancel = True
TabOrder = 6 TabOrder = 5
end end
object eReferencia: TDBEdit object eReferencia: TDBEdit
Left = 123 Left = 93
Top = 40 Top = 40
Width = 118 Width = 148
Height = 21 Height = 21
Color = clInfoBk Color = clInfoBk
DataField = 'REFERENCIA' DataField = 'REFERENCIA'
DataSource = dsFormaPago DataSource = dsFormaPago
TabOrder = 0 TabOrder = 0
end end
object eDescripcion: TDBEdit
Left = 123
Top = 68
Width = 262
Height = 21
Color = clInfoBk
DataField = 'DESCRIPCION'
DataSource = dsFormaPago
TabOrder = 1
end
object bAnadir: TButton object bAnadir: TButton
Left = 290 Left = 290
Top = 134 Top = 231
Width = 95 Width = 95
Height = 23 Height = 23
Action = actAnadir Action = actAnadir
TabOrder = 3 TabOrder = 2
end end
object bEliminar: TButton object bEliminar: TButton
Left = 290 Left = 290
Top = 163 Top = 260
Width = 95 Width = 95
Height = 23 Height = 23
Action = actEliminar Action = actEliminar
TabOrder = 4 TabOrder = 3
end end
object ListaFormasPago: TcxGrid object ListaFormasPago: TcxGrid
Left = 32 Left = 32
Top = 134 Top = 231
Width = 252 Width = 252
Height = 150 Height = 150
TabOrder = 2 TabOrder = 1
LookAndFeel.Kind = lfStandard LookAndFeel.Kind = lfStandard
LookAndFeel.NativeStyle = True LookAndFeel.NativeStyle = True
object ListaFormasPagoDBTableView1: TcxGridDBTableView object ListaFormasPagoDBTableView1: TcxGridDBTableView
@ -185,7 +186,7 @@ object fEditorFormaPago: TfEditorFormaPago
end end
object ActionList1: TActionList object ActionList1: TActionList
Left = 88 Left = 88
Top = 300 Top = 397
object actAnadir: TAction object actAnadir: TAction
Caption = '&A'#241'adir' Caption = '&A'#241'adir'
OnExecute = actAnadirExecute OnExecute = actAnadirExecute
@ -214,10 +215,10 @@ object fEditorFormaPago: TfEditorFormaPago
end end
object dsFormaPago: TDADataSource object dsFormaPago: TDADataSource
Left = 48 Left = 48
Top = 300 Top = 397
end end
object dsPlazos: TDADataSource object dsPlazos: TDADataSource
Left = 8 Left = 8
Top = 300 Top = 397
end end
end end

2
Source/Modulos/Formas de pago/Views/uEditorFormaPago.pas
View File

@ -49,7 +49,6 @@ type
actCerrar: TAction; actCerrar: TAction;
actModificar: TAction; actModificar: TAction;
eReferencia: TDBEdit; eReferencia: TDBEdit;
eDescripcion: TDBEdit;
dsPlazos: TDADataSource; dsPlazos: TDADataSource;
Label1: TLabel; Label1: TLabel;
Bevel1: TBevel; Bevel1: TBevel;
@ -66,6 +65,7 @@ type
ListaFormasPago: TcxGrid; ListaFormasPago: TcxGrid;
ListaFormasPagoDBTableView1NUM_DIAS: TcxGridDBColumn; ListaFormasPagoDBTableView1NUM_DIAS: TcxGridDBColumn;
ListaFormasPagoDBTableView1PORCENTAJE: TcxGridDBColumn; ListaFormasPagoDBTableView1PORCENTAJE: TcxGridDBColumn;
eDescripcion: TDBMemo;
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
procedure actAnadirExecute(Sender: TObject); procedure actAnadirExecute(Sender: TObject);

6
Source/Modulos/Formas de pago/Views/uEditorFormasPago.dfm
View File

@ -94,15 +94,15 @@ object fEditorFormasPago: TfEditorFormasPago
Expanded = False Expanded = False
FieldName = 'REFERENCIA' FieldName = 'REFERENCIA'
Title.Caption = 'Referencia' Title.Caption = 'Referencia'
Width = 110 Width = 269
Visible = True Visible = True
end end
item item
Expanded = False Expanded = False
FieldName = 'DESCRIPCION' FieldName = 'DESCRIPCION'
Title.Caption = 'Descripci'#243'n' Title.Caption = 'Descripci'#243'n'
Width = 154 Width = -1
Visible = True Visible = False
end> end>
end end
end end

44
Source/Modulos/Presupuestos de cliente/Controller/uPresupuestosClienteController.pas
View File

@ -185,7 +185,7 @@ uses
uBizContactos, uDataTableUtils, uDataModuleUsuarios, uFactuGES_App, uConfiguracionController, uBizContactos, uDataTableUtils, uDataModuleUsuarios, uFactuGES_App, uConfiguracionController,
schPresupuestosClienteClient_Intf, uDAInterfaces, uDateUtils, uIEditorPresupuestoCliente, schPresupuestosClienteClient_Intf, uDAInterfaces, uDateUtils, uIEditorPresupuestoCliente,
uIEditorElegirPresupuestosCliente, uIEditorDireccionEntregaPresupuestoCliente, uIEditorElegirPresupuestosCliente, uIEditorDireccionEntregaPresupuestoCliente,
schContactosClient_Intf, uPresupuestosClienteReportController, schContactosClient_Intf, uPresupuestosClienteReportController, uFormasPagoController, uBizFormasPago,
uSistemaFunc, uEMailUtils, uDialogElegirEMail, Dialogs, uStringsUtils; uSistemaFunc, uEMailUtils, uDialogElegirEMail, Dialogs, uStringsUtils;
{ TPresupuestosClienteController } { TPresupuestosClienteController }
@ -763,9 +763,7 @@ begin
if not Assigned(APresupuesto) then if not Assigned(APresupuesto) then
raise Exception.Create ('Presupuesto no asignado (EsModificable)'); raise Exception.Create ('Presupuesto no asignado (EsModificable)');
//Result := (APresupuesto.SITUACION = SITUACION_PRESUPUESTO_PENDIENTE); Result := (APresupuesto.SITUACION = SITUACION_PRESUPUESTO_PENDIENTE) OR (APresupuesto.SITUACION = SITUACION_PRESUPUESTO_ANULADO);
Result := True;
end; end;
procedure TPresupuestosClienteController.RecalcularImportes( procedure TPresupuestosClienteController.RecalcularImportes(
@ -881,12 +879,21 @@ begin
end; end;
procedure TPresupuestosClienteController.RellenarValoresDefecto(APresupuesto: IBizPresupuestoCliente; ATipo: TEnumTiposPresupuesto); procedure TPresupuestosClienteController.RellenarValoresDefecto(APresupuesto: IBizPresupuestoCliente; ATipo: TEnumTiposPresupuesto);
var
AFormasPago : IBizFormaPago;
AFormasPagoController : IFormasPagoController;
begin begin
AFormasPagoController := TFormasPagoController.Create;
case ATipo of case ATipo of
teCocina: teCocina:
begin begin
APresupuesto.TIPO_PRESUPUESTO := CTE_COCINA; APresupuesto.TIPO_PRESUPUESTO := CTE_COCINA;
APresupuesto.FORMA_PAGO.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_COCINA)); APresupuesto.ID_FORMA_PAGO := StrToInt(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_COCINA));
AFormasPago := AFormasPagoController.Buscar(APresupuesto.ID_FORMA_PAGO);
AFormasPago.Open;
APresupuesto.FORMA_PAGO.Add(AFormasPago.DESCRIPCION);
APresupuesto.PLAZO_ENTREGA.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_COCINA)); APresupuesto.PLAZO_ENTREGA.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_COCINA));
APresupuesto.OBSERVACIONES.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_OBSERVACIONES_COCINA)); APresupuesto.OBSERVACIONES.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_OBSERVACIONES_COCINA));
(Self.DetallesController as IDetallesPresupuestoClienteController).AnadirCapitulo(TIPO_CAPITULO_C_VACIO, 'MUEBLES DE COCINA ', False, APresupuesto.Detalles); (Self.DetallesController as IDetallesPresupuestoClienteController).AnadirCapitulo(TIPO_CAPITULO_C_VACIO, 'MUEBLES DE COCINA ', False, APresupuesto.Detalles);
@ -896,7 +903,11 @@ begin
teArmario: teArmario:
begin begin
APresupuesto.TIPO_PRESUPUESTO := CTE_ARMARIO; APresupuesto.TIPO_PRESUPUESTO := CTE_ARMARIO;
APresupuesto.FORMA_PAGO.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_ARMARIO)); APresupuesto.ID_FORMA_PAGO := StrToInt(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_ARMARIO));
AFormasPago := AFormasPagoController.Buscar(APresupuesto.ID_FORMA_PAGO);
AFormasPago.Open;
APresupuesto.FORMA_PAGO.Add(AFormasPago.DESCRIPCION);
APresupuesto.PLAZO_ENTREGA.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_ARMARIO)); APresupuesto.PLAZO_ENTREGA.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_ARMARIO));
APresupuesto.OBSERVACIONES.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_OBSERVACIONES_ARMARIO)); APresupuesto.OBSERVACIONES.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_OBSERVACIONES_ARMARIO));
(Self.DetallesController as IDetallesPresupuestoClienteController).AnadirCapitulo(TIPO_CAPITULO_AF, 'FRENTE DE ARMARIO Nº ', False, APresupuesto.Detalles); (Self.DetallesController as IDetallesPresupuestoClienteController).AnadirCapitulo(TIPO_CAPITULO_AF, 'FRENTE DE ARMARIO Nº ', False, APresupuesto.Detalles);
@ -905,7 +916,11 @@ begin
teBano: teBano:
begin begin
APresupuesto.TIPO_PRESUPUESTO := CTE_BANO; APresupuesto.TIPO_PRESUPUESTO := CTE_BANO;
APresupuesto.FORMA_PAGO.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_BANO)); APresupuesto.ID_FORMA_PAGO := StrToInt(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_BANO));
AFormasPago := AFormasPagoController.Buscar(APresupuesto.ID_FORMA_PAGO);
AFormasPago.Open;
APresupuesto.FORMA_PAGO.Add(AFormasPago.DESCRIPCION);
APresupuesto.PLAZO_ENTREGA.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_BANO)); APresupuesto.PLAZO_ENTREGA.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_BANO));
APresupuesto.OBSERVACIONES.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_OBSERVACIONES_BANO)); APresupuesto.OBSERVACIONES.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_OBSERVACIONES_BANO));
(Self.DetallesController as IDetallesPresupuestoClienteController).AnadirCapitulo(TIPO_CAPITULO_B, 'MUEBLE DE BAÑO Nº ', False, APresupuesto.Detalles); (Self.DetallesController as IDetallesPresupuestoClienteController).AnadirCapitulo(TIPO_CAPITULO_B, 'MUEBLE DE BAÑO Nº ', False, APresupuesto.Detalles);
@ -914,7 +929,11 @@ begin
teElectrodomestico: teElectrodomestico:
begin begin
APresupuesto.TIPO_PRESUPUESTO := CTE_ELECTRODOMESTICO; APresupuesto.TIPO_PRESUPUESTO := CTE_ELECTRODOMESTICO;
APresupuesto.FORMA_PAGO.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_ELECTRODOMESTICO)); APresupuesto.ID_FORMA_PAGO := StrToInt(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_ELECTRODOMESTICO));
AFormasPago := AFormasPagoController.Buscar(APresupuesto.ID_FORMA_PAGO);
AFormasPago.Open;
APresupuesto.FORMA_PAGO.Add(AFormasPago.DESCRIPCION);
APresupuesto.PLAZO_ENTREGA.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_ELECTRODOMESTICO)); APresupuesto.PLAZO_ENTREGA.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_ELECTRODOMESTICO));
APresupuesto.OBSERVACIONES.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_OBSERVACIONES_ELECTRODOMESTICO)); APresupuesto.OBSERVACIONES.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_OBSERVACIONES_ELECTRODOMESTICO));
(Self.DetallesController as IDetallesPresupuestoClienteController).AnadirCapitulo(TIPO_CAPITULO_E, 'ELECTRODOMÉSTICOS ', False, APresupuesto.Detalles); (Self.DetallesController as IDetallesPresupuestoClienteController).AnadirCapitulo(TIPO_CAPITULO_E, 'ELECTRODOMÉSTICOS ', False, APresupuesto.Detalles);
@ -922,12 +941,19 @@ begin
teVarios: teVarios:
begin begin
APresupuesto.TIPO_PRESUPUESTO := CTE_VARIOS; APresupuesto.TIPO_PRESUPUESTO := CTE_VARIOS;
APresupuesto.FORMA_PAGO.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_VARIOS)); APresupuesto.ID_FORMA_PAGO := StrToInt(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_FORMA_PAGO_VARIOS));
AFormasPago := AFormasPagoController.Buscar(APresupuesto.ID_FORMA_PAGO);
AFormasPago.Open;
APresupuesto.FORMA_PAGO.Add(AFormasPago.DESCRIPCION);
APresupuesto.PLAZO_ENTREGA.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_VARIOS)); APresupuesto.PLAZO_ENTREGA.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_VARIOS));
APresupuesto.OBSERVACIONES.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_OBSERVACIONES_VARIOS)); APresupuesto.OBSERVACIONES.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_OBSERVACIONES_VARIOS));
(Self.DetallesController as IDetallesPresupuestoClienteController).AnadirCapitulo(TIPO_CAPITULO_V, 'VARIOS ', False, APresupuesto.Detalles); (Self.DetallesController as IDetallesPresupuestoClienteController).AnadirCapitulo(TIPO_CAPITULO_V, 'VARIOS ', False, APresupuesto.Detalles);
end; end;
end; end;
AFormasPago:= Nil;
AFormasPagoController := Nil;
end; end;
procedure TPresupuestosClienteController.FiltrarEmpresa(APresupuesto: IBizPresupuestoCliente); procedure TPresupuestosClienteController.FiltrarEmpresa(APresupuesto: IBizPresupuestoCliente);

7
Source/Modulos/Presupuestos de cliente/Model/uBizPresupuestosCliente.pas
View File

@ -260,7 +260,7 @@ procedure TBizPresupuestoCliente.IniciarValoresPresupuestoNuevo;
begin begin
ID_EMPRESA := AppFactuGES.EmpresaActiva.ID; ID_EMPRESA := AppFactuGES.EmpresaActiva.ID;
USUARIO := AppFactuGES.UsuarioActivo.UserName; USUARIO := AppFactuGES.UsuarioActivo.UserName;
ID_FORMA_PAGO := AppFactuGES.EmpresaActiva.ID_FORMA_PAGO; // ID_FORMA_PAGO := AppFactuGES.EmpresaActiva.ID_FORMA_PAGO;
ID_TIPO_IVA := AppFactuGES.EmpresaActiva.ID_TIPO_IVA; ID_TIPO_IVA := AppFactuGES.EmpresaActiva.ID_TIPO_IVA;
FECHA_PRESUPUESTO := DateOf(Date); FECHA_PRESUPUESTO := DateOf(Date);
@ -333,8 +333,9 @@ begin
DataTable.Edit; DataTable.Edit;
ID_CLIENTE := FCliente.ID; ID_CLIENTE := FCliente.ID;
if FCliente.ID_FORMA_PAGO > 0 then // La forma de pago se establece desde el tipo de documento y aunque cambie de cliente no se cambia la formade pago
ID_FORMA_PAGO := FCliente.ID_FORMA_PAGO; // if FCliente.ID_FORMA_PAGO > 0 then
// ID_FORMA_PAGO := FCliente.ID_FORMA_PAGO;
// En acana la ficha de cliente no tiene descuento aplicado por defecto // En acana la ficha de cliente no tiene descuento aplicado por defecto
// DESCUENTO := FCliente.DESCUENTO; // DESCUENTO := FCliente.DESCUENTO;

58
Source/Modulos/Presupuestos de cliente/Views/PresupuestosCliente_view.dproj
View File

@ -49,30 +49,34 @@
<DelphiCompile Include="PresupuestosCliente_view.dpk"> <DelphiCompile Include="PresupuestosCliente_view.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="ApplicationBase.dcp" /> <DCCReference Include="..\ApplicationBase.dcp" />
<DCCReference Include="Articulos_view.dcp" /> <DCCReference Include="..\Articulos_view.dcp" />
<DCCReference Include="Base.dcp" /> <DCCReference Include="..\Base.dcp" />
<DCCReference Include="cxDataD11.dcp" /> <DCCReference Include="..\cxDataD11.dcp" />
<DCCReference Include="cxEditorsD11.dcp" /> <DCCReference Include="..\cxEditorsD11.dcp" />
<DCCReference Include="cxExtEditorsD11.dcp" /> <DCCReference Include="..\cxExtEditorsD11.dcp" />
<DCCReference Include="cxLibraryD11.dcp" /> <DCCReference Include="..\cxLibraryD11.dcp" />
<DCCReference Include="dbrtl.dcp" /> <DCCReference Include="..\dbrtl.dcp" />
<DCCReference Include="dxCoreD11.dcp" /> <DCCReference Include="..\dxCoreD11.dcp" />
<DCCReference Include="dxGDIPlusD11.dcp" /> <DCCReference Include="..\dxGDIPlusD11.dcp" />
<DCCReference Include="dxThemeD11.dcp" /> <DCCReference Include="..\dxThemeD11.dcp" />
<DCCReference Include="GestorInformes_controller.dcp" /> <DCCReference Include="..\GestorInformes_controller.dcp" />
<DCCReference Include="GUIBase.dcp" /> <DCCReference Include="..\GUIBase.dcp" />
<DCCReference Include="Jcl.dcp" /> <DCCReference Include="..\Jcl.dcp" />
<DCCReference Include="JclVcl.dcp" /> <DCCReference Include="..\JclVcl.dcp" />
<DCCReference Include="JvCoreD11R.dcp" /> <DCCReference Include="..\JvCoreD11R.dcp" />
<DCCReference Include="JvCtrlsD11R.dcp" /> <DCCReference Include="..\JvCtrlsD11R.dcp" />
<DCCReference Include="JvMMD11R.dcp" /> <DCCReference Include="..\JvMMD11R.dcp" />
<DCCReference Include="JvStdCtrlsD11R.dcp" /> <DCCReference Include="..\JvStdCtrlsD11R.dcp" />
<DCCReference Include="JvSystemD11R.dcp" /> <DCCReference Include="..\JvSystemD11R.dcp" />
<DCCReference Include="PreCli_ConCli_relation.dcp" /> <DCCReference Include="..\PreCli_ConCli_relation.dcp" />
<DCCReference Include="PresupuestosCliente_controller.dcp" /> <DCCReference Include="..\PresupuestosCliente_controller.dcp" />
<DCCReference Include="PresupuestosCliente_model.dcp" /> <DCCReference Include="..\PresupuestosCliente_model.dcp" />
<DCCReference Include="rtl.dcp" /> <DCCReference Include="..\rtl.dcp" />
<DCCReference Include="..\vcl.dcp" />
<DCCReference Include="..\vcldb.dcp" />
<DCCReference Include="..\vcljpg.dcp" />
<DCCReference Include="..\vclx.dcp" />
<DCCReference Include="uEditorAsignarDescuento.pas"> <DCCReference Include="uEditorAsignarDescuento.pas">
<Form>fEditorAsignarDescuento</Form> <Form>fEditorAsignarDescuento</Form>
</DCCReference> </DCCReference>
@ -101,7 +105,7 @@
</DCCReference> </DCCReference>
<DCCReference Include="uPresupuestosClienteViewRegister.pas" /> <DCCReference Include="uPresupuestosClienteViewRegister.pas" />
<DCCReference Include="uViewConfiguracionDocArmario.pas"> <DCCReference Include="uViewConfiguracionDocArmario.pas">
<Form>frViewPresupuestoCliente</Form> <Form>frViewConfiguracionDocArmario</Form>
<DesignClass>TFrame</DesignClass> <DesignClass>TFrame</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="uViewConfiguracionDocBano.pas"> <DCCReference Include="uViewConfiguracionDocBano.pas">
@ -152,10 +156,6 @@
<Form>frViewTotalesPresupuesto</Form> <Form>frViewTotalesPresupuesto</Form>
<DesignClass>TFrame</DesignClass> <DesignClass>TFrame</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="vcl.dcp" />
<DCCReference Include="vcldb.dcp" />
<DCCReference Include="vcljpg.dcp" />
<DCCReference Include="vclx.dcp" />
</ItemGroup> </ItemGroup>
</Project> </Project>
<!-- EurekaLog First Line <!-- EurekaLog First Line

72
Source/Modulos/Presupuestos de cliente/Views/uViewConfiguracionDocArmario.dfm
View File

@ -1,43 +1,43 @@
inherited frViewConfiguracionDocArmario: TfrViewConfiguracionDocArmario inherited frViewConfiguracionDocArmario: TfrViewConfiguracionDocArmario
Width = 679 Width = 559
Height = 530 Height = 467
object Label1: TLabel [0] object Label2: TLabel [0]
Left = 11 Left = 11
Top = 79 Top = 140
Width = 76
Height = 13
Caption = 'Forma de pago:'
end
object Label2: TLabel [1]
Left = 11
Top = 204
Width = 90 Width = 90
Height = 13 Height = 13
Caption = 'Plazos de entrega:' Caption = 'Plazos de entrega:'
end end
object Label4: TLabel [2] object Label4: TLabel [1]
Left = 11 Left = 11
Top = 326 Top = 262
Width = 75 Width = 75
Height = 13 Height = 13
Caption = 'Observaciones:' Caption = 'Observaciones:'
end end
object Label5: TLabel [2]
Left = 11
Top = 100
Width = 76
Height = 13
Caption = 'Forma de pago:'
end
inherited Panel1: TPanel inherited Panel1: TPanel
Width = 669 Width = 549
TabOrder = 2 TabOrder = 2
ExplicitWidth = 530 ExplicitWidth = 530
inherited Label3: TLabel inherited Label3: TLabel
Width = 657 Width = 537
end end
end end
inherited JvGradientHeaderPanel1: TJvGradientHeaderPanel inherited JvGradientHeaderPanel1: TJvGradientHeaderPanel
Width = 679 Width = 559
LabelCaption = 'Configuraci'#243'n de los documentos de armario' LabelCaption = 'Configuraci'#243'n de los documentos de armario'
ExplicitWidth = 540 ExplicitWidth = 540
end end
object eCondiciones: TcxRichEdit object eCondiciones: TcxRichEdit
Left = 11 Left = 11
Top = 448 Top = 384
Properties.ScrollBars = ssVertical Properties.ScrollBars = ssVertical
Lines.Strings = ( Lines.Strings = (
'eCondiciones') 'eCondiciones')
@ -48,7 +48,7 @@ inherited frViewConfiguracionDocArmario: TfrViewConfiguracionDocArmario
end end
object ePlazosEntrega: TMemo object ePlazosEntrega: TMemo
Left = 11 Left = 11
Top = 225 Top = 161
Width = 529 Width = 529
Height = 90 Height = 90
BevelInner = bvNone BevelInner = bvNone
@ -58,19 +58,9 @@ inherited frViewConfiguracionDocArmario: TfrViewConfiguracionDocArmario
ScrollBars = ssVertical ScrollBars = ssVertical
TabOrder = 3 TabOrder = 3
end end
object eFormaPago: TMemo
Left = 11
Top = 100
Width = 529
Height = 90
Ctl3D = True
ParentCtl3D = False
ScrollBars = ssVertical
TabOrder = 4
end
object eObservaciones: TMemo object eObservaciones: TMemo
Left = 11 Left = 11
Top = 346 Top = 282
Width = 529 Width = 529
Height = 90 Height = 90
BevelInner = bvNone BevelInner = bvNone
@ -78,6 +68,30 @@ inherited frViewConfiguracionDocArmario: TfrViewConfiguracionDocArmario
Ctl3D = True Ctl3D = True
ParentCtl3D = False ParentCtl3D = False
ScrollBars = ssVertical ScrollBars = ssVertical
TabOrder = 4
end
object bFormasPago: TButton
Left = 277
Top = 97
Width = 132
Height = 21
Caption = 'Ver las formas de pago...'
TabOrder = 5 TabOrder = 5
end end
object cbFormaPago: TcxLookupComboBox
Left = 93
Top = 97
Properties.KeyFieldNames = 'ID'
Properties.ListColumns = <
item
FieldName = 'REFERENCIA'
end>
Properties.ListSource = dsFormaPago
TabOrder = 6
Width = 178
end
object dsFormaPago: TDADataSource
Left = 424
Top = 88
end
end end

38
Source/Modulos/Presupuestos de cliente/Views/uViewConfiguracionDocArmario.pas
View File

@ -5,22 +5,32 @@ interface
uses uses
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs, uViewConfiguracionBase, cxControls, cxContainer, cxEdit, cxTextEdit, cxMemo, Dialogs, uViewConfiguracionBase, cxControls, cxContainer, cxEdit, cxTextEdit, cxMemo,
cxRichEdit, uViewBase, JvExControls, JvGradientHeaderPanel, StdCtrls, ExtCtrls; cxRichEdit, uViewBase, JvExControls, JvGradientHeaderPanel, StdCtrls, ExtCtrls,
cxGraphics, DB, uDAInterfaces, uDADataTable, cxMaskEdit, cxDropDownEdit,
cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, uFormasPagoController, uBizFormasPago;
type type
TfrViewConfiguracionDocArmario = class(TfrViewConfiguracionBase) TfrViewConfiguracionDocArmario = class(TfrViewConfiguracionBase)
eCondiciones: TcxRichEdit; eCondiciones: TcxRichEdit;
ePlazosEntrega: TMemo; ePlazosEntrega: TMemo;
eFormaPago: TMemo;
eObservaciones: TMemo; eObservaciones: TMemo;
Label1: TLabel;
Label2: TLabel; Label2: TLabel;
Label4: TLabel; Label4: TLabel;
bFormasPago: TButton;
cbFormaPago: TcxLookupComboBox;
Label5: TLabel;
dsFormaPago: TDADataSource;
protected
FFormasPago : IBizFormaPago;
FFormasPagoController : IFormasPagoController;
public public
class function GetViewClass : TClass; override; class function GetViewClass : TClass; override;
class function DarEtiqueta : String; override; class function DarEtiqueta : String; override;
procedure CargarValores; override; procedure CargarValores; override;
procedure GuardarValores; override; procedure GuardarValores; override;
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
end; end;
var var
@ -35,8 +45,11 @@ uses uFactuGES_App, uConfiguracionController, uPresupuestosClienteController;
procedure TfrViewConfiguracionDocArmario.CargarValores; procedure TfrViewConfiguracionDocArmario.CargarValores;
begin begin
inherited; inherited;
eFormaPago.Lines.Clear; FFormasPago := FFormasPagoController.BuscarTodos;
eFormaPago.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_FORMA_PAGO_ARMARIO); dsFormaPago.DataTable := FFormasPago.DataTable;
dsFormaPago.DataTable.Active := True;
cbFormaPago.EditValue := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_FORMA_PAGO_ARMARIO);
ePlazosEntrega.Lines.Clear; ePlazosEntrega.Lines.Clear;
ePlazosEntrega.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_PLAZOS_ENTREGA_ARMARIO); ePlazosEntrega.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_PLAZOS_ENTREGA_ARMARIO);
eObservaciones.Lines.Clear; eObservaciones.Lines.Clear;
@ -45,11 +58,24 @@ begin
eCondiciones.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_CONDICIONES_ARMARIO); eCondiciones.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_CONDICIONES_ARMARIO);
end; end;
constructor TfrViewConfiguracionDocArmario.Create(AOwner: TComponent);
begin
inherited;
FFormasPagoController := TFormasPagoController.Create;
end;
class function TfrViewConfiguracionDocArmario.DarEtiqueta: String; class function TfrViewConfiguracionDocArmario.DarEtiqueta: String;
begin begin
Result := 'Documentos armario'; Result := 'Documentos armario';
end; end;
destructor TfrViewConfiguracionDocArmario.Destroy;
begin
FFormasPago := Nil;
FFormasPagoController := NIL;
inherited;
end;
class function TfrViewConfiguracionDocArmario.GetViewClass: TClass; class function TfrViewConfiguracionDocArmario.GetViewClass: TClass;
begin begin
Result := TfrViewConfiguracionDocARMARIO; Result := TfrViewConfiguracionDocARMARIO;
@ -58,7 +84,7 @@ end;
procedure TfrViewConfiguracionDocArmario.GuardarValores; procedure TfrViewConfiguracionDocArmario.GuardarValores;
begin begin
inherited; inherited;
AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_FORMA_PAGO_ARMARIO, eFormaPago.Text); AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_FORMA_PAGO_ARMARIO, cbFormaPago.EditValue);
AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_ARMARIO, ePlazosEntrega.Text); AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_ARMARIO, ePlazosEntrega.Text);
AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_OBSERVACIONES_ARMARIO, eObservaciones.Text); AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_OBSERVACIONES_ARMARIO, eObservaciones.Text);
AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_CONDICIONES_ARMARIO, eCondiciones.Text); AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_CONDICIONES_ARMARIO, eCondiciones.Text);

69
Source/Modulos/Presupuestos de cliente/Views/uViewConfiguracionDocBano.dfm
View File

@ -1,42 +1,43 @@
inherited frViewConfiguracionDocBano: TfrViewConfiguracionDocBano inherited frViewConfiguracionDocBano: TfrViewConfiguracionDocBano
Height = 503 Width = 555
object Label1: TLabel [0] Height = 462
object Label2: TLabel [0]
Left = 11 Left = 11
Top = 79 Top = 140
Width = 76
Height = 13
Caption = 'Forma de pago:'
end
object Label2: TLabel [1]
Left = 11
Top = 204
Width = 90 Width = 90
Height = 13 Height = 13
Caption = 'Plazos de entrega:' Caption = 'Plazos de entrega:'
end end
object Label4: TLabel [2] object Label4: TLabel [1]
Left = 11 Left = 11
Top = 326 Top = 262
Width = 75 Width = 75
Height = 13 Height = 13
Caption = 'Observaciones:' Caption = 'Observaciones:'
end end
object Label5: TLabel [2]
Left = 11
Top = 100
Width = 76
Height = 13
Caption = 'Forma de pago:'
end
inherited Panel1: TPanel inherited Panel1: TPanel
Width = 530 Width = 545
TabOrder = 2 TabOrder = 2
ExplicitWidth = 530 ExplicitWidth = 530
inherited Label3: TLabel inherited Label3: TLabel
Width = 518 Width = 533
end end
end end
inherited JvGradientHeaderPanel1: TJvGradientHeaderPanel inherited JvGradientHeaderPanel1: TJvGradientHeaderPanel
Width = 540 Width = 555
LabelCaption = 'Configuraci'#243'n de los documentos de ba'#241'o' LabelCaption = 'Configuraci'#243'n de los documentos de ba'#241'o'
ExplicitWidth = 540 ExplicitWidth = 540
end end
object eCondiciones: TcxRichEdit object eCondiciones: TcxRichEdit
Left = 11 Left = 11
Top = 448 Top = 384
Properties.ScrollBars = ssVertical Properties.ScrollBars = ssVertical
Lines.Strings = ( Lines.Strings = (
'eCondiciones') 'eCondiciones')
@ -47,7 +48,7 @@ inherited frViewConfiguracionDocBano: TfrViewConfiguracionDocBano
end end
object ePlazosEntrega: TMemo object ePlazosEntrega: TMemo
Left = 11 Left = 11
Top = 225 Top = 161
Width = 529 Width = 529
Height = 90 Height = 90
Ctl3D = True Ctl3D = True
@ -55,9 +56,9 @@ inherited frViewConfiguracionDocBano: TfrViewConfiguracionDocBano
ScrollBars = ssVertical ScrollBars = ssVertical
TabOrder = 3 TabOrder = 3
end end
object eFormaPago: TMemo object eObservaciones: TMemo
Left = 11 Left = 11
Top = 100 Top = 282
Width = 529 Width = 529
Height = 90 Height = 90
Ctl3D = True Ctl3D = True
@ -65,14 +66,28 @@ inherited frViewConfiguracionDocBano: TfrViewConfiguracionDocBano
ScrollBars = ssVertical ScrollBars = ssVertical
TabOrder = 4 TabOrder = 4
end end
object eObservaciones: TMemo object bFormasPago: TButton
Left = 11 Left = 277
Top = 346 Top = 97
Width = 529 Width = 132
Height = 90 Height = 21
Ctl3D = True Caption = 'Ver las formas de pago...'
ParentCtl3D = False
ScrollBars = ssVertical
TabOrder = 5 TabOrder = 5
end end
object cbFormaPago: TcxLookupComboBox
Left = 93
Top = 97
Properties.KeyFieldNames = 'ID'
Properties.ListColumns = <
item
FieldName = 'REFERENCIA'
end>
Properties.ListSource = dsFormaPago
TabOrder = 6
Width = 178
end
object dsFormaPago: TDADataSource
Left = 424
Top = 88
end
end end

38
Source/Modulos/Presupuestos de cliente/Views/uViewConfiguracionDocBano.pas
View File

@ -5,22 +5,32 @@ interface
uses uses
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs, uViewConfiguracionBase, cxControls, cxContainer, cxEdit, cxTextEdit, cxMemo, Dialogs, uViewConfiguracionBase, cxControls, cxContainer, cxEdit, cxTextEdit, cxMemo,
cxRichEdit, uViewBase, JvExControls, JvGradientHeaderPanel, StdCtrls, ExtCtrls; cxRichEdit, uViewBase, JvExControls, JvGradientHeaderPanel, StdCtrls, ExtCtrls,
cxGraphics, DB, uDAInterfaces, uDADataTable, cxMaskEdit, cxDropDownEdit,
cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, uFormasPagoController, uBizFormasPago;
type type
TfrViewConfiguracionDocBano = class(TfrViewConfiguracionBase) TfrViewConfiguracionDocBano = class(TfrViewConfiguracionBase)
eCondiciones: TcxRichEdit; eCondiciones: TcxRichEdit;
ePlazosEntrega: TMemo; ePlazosEntrega: TMemo;
eFormaPago: TMemo;
eObservaciones: TMemo; eObservaciones: TMemo;
Label1: TLabel;
Label2: TLabel; Label2: TLabel;
Label4: TLabel; Label4: TLabel;
bFormasPago: TButton;
cbFormaPago: TcxLookupComboBox;
Label5: TLabel;
dsFormaPago: TDADataSource;
protected
FFormasPago : IBizFormaPago;
FFormasPagoController : IFormasPagoController;
public public
class function GetViewClass : TClass; override; class function GetViewClass : TClass; override;
class function DarEtiqueta : String; override; class function DarEtiqueta : String; override;
procedure CargarValores; override; procedure CargarValores; override;
procedure GuardarValores; override; procedure GuardarValores; override;
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
end; end;
var var
@ -35,8 +45,11 @@ uses uFactuGES_App, uConfiguracionController, uPresupuestosClienteController;
procedure TfrViewConfiguracionDocBano.CargarValores; procedure TfrViewConfiguracionDocBano.CargarValores;
begin begin
inherited; inherited;
eFormaPago.Lines.Clear; FFormasPago := FFormasPagoController.BuscarTodos;
eFormaPago.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_FORMA_PAGO_BANO); dsFormaPago.DataTable := FFormasPago.DataTable;
dsFormaPago.DataTable.Active := True;
cbFormaPago.EditValue := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_FORMA_PAGO_BANO);
ePlazosEntrega.Lines.Clear; ePlazosEntrega.Lines.Clear;
ePlazosEntrega.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_PLAZOS_ENTREGA_BANO); ePlazosEntrega.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_PLAZOS_ENTREGA_BANO);
eObservaciones.Lines.Clear; eObservaciones.Lines.Clear;
@ -45,11 +58,24 @@ begin
eCondiciones.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_CONDICIONES_BANO); eCondiciones.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_CONDICIONES_BANO);
end; end;
constructor TfrViewConfiguracionDocBano.Create(AOwner: TComponent);
begin
inherited;
FFormasPagoController := TFormasPagoController.Create;
end;
class function TfrViewConfiguracionDocBano.DarEtiqueta: String; class function TfrViewConfiguracionDocBano.DarEtiqueta: String;
begin begin
Result := 'Documentos baño'; Result := 'Documentos baño';
end; end;
destructor TfrViewConfiguracionDocBano.Destroy;
begin
FFormasPago := Nil;
FFormasPagoController := NIL;
inherited;
end;
class function TfrViewConfiguracionDocBano.GetViewClass: TClass; class function TfrViewConfiguracionDocBano.GetViewClass: TClass;
begin begin
Result := TfrViewConfiguracionDocBANO; Result := TfrViewConfiguracionDocBANO;
@ -58,7 +84,7 @@ end;
procedure TfrViewConfiguracionDocBano.GuardarValores; procedure TfrViewConfiguracionDocBano.GuardarValores;
begin begin
inherited; inherited;
AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_FORMA_PAGO_BANO, eFormaPago.Text); AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_FORMA_PAGO_BANO, cbFormaPago.EditValue);
AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_BANO, ePlazosEntrega.Text); AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_BANO, ePlazosEntrega.Text);
AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_OBSERVACIONES_BANO, eObservaciones.Text); AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_OBSERVACIONES_BANO, eObservaciones.Text);
AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_CONDICIONES_BANO, eCondiciones.Text); AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_CONDICIONES_BANO, eCondiciones.Text);

69
Source/Modulos/Presupuestos de cliente/Views/uViewConfiguracionDocCocina.dfm
View File

@ -1,42 +1,43 @@
inherited frViewConfiguracionDocCocina: TfrViewConfiguracionDocCocina inherited frViewConfiguracionDocCocina: TfrViewConfiguracionDocCocina
Height = 496 Width = 568
object Label1: TLabel [0] Height = 463
object Label2: TLabel [0]
Left = 11 Left = 11
Top = 79 Top = 140
Width = 76
Height = 13
Caption = 'Forma de pago:'
end
object Label2: TLabel [1]
Left = 11
Top = 204
Width = 90 Width = 90
Height = 13 Height = 13
Caption = 'Plazos de entrega:' Caption = 'Plazos de entrega:'
end end
object Label4: TLabel [2] object Label4: TLabel [1]
Left = 11 Left = 11
Top = 326 Top = 262
Width = 75 Width = 75
Height = 13 Height = 13
Caption = 'Observaciones:' Caption = 'Observaciones:'
end end
object Label5: TLabel [2]
Left = 11
Top = 100
Width = 76
Height = 13
Caption = 'Forma de pago:'
end
inherited Panel1: TPanel inherited Panel1: TPanel
Width = 530 Width = 558
TabOrder = 2 TabOrder = 2
ExplicitWidth = 530 ExplicitWidth = 530
inherited Label3: TLabel inherited Label3: TLabel
Width = 518 Width = 546
end end
end end
inherited JvGradientHeaderPanel1: TJvGradientHeaderPanel inherited JvGradientHeaderPanel1: TJvGradientHeaderPanel
Width = 540 Width = 568
LabelCaption = 'Configuraci'#243'n de los documentos de cocina' LabelCaption = 'Configuraci'#243'n de los documentos de cocina'
ExplicitWidth = 540 ExplicitWidth = 540
end end
object eCondiciones: TcxRichEdit object eCondiciones: TcxRichEdit
Left = 11 Left = 11
Top = 448 Top = 384
Properties.ScrollBars = ssVertical Properties.ScrollBars = ssVertical
Lines.Strings = ( Lines.Strings = (
'eCondiciones') 'eCondiciones')
@ -47,7 +48,7 @@ inherited frViewConfiguracionDocCocina: TfrViewConfiguracionDocCocina
end end
object ePlazosEntrega: TMemo object ePlazosEntrega: TMemo
Left = 11 Left = 11
Top = 225 Top = 161
Width = 529 Width = 529
Height = 90 Height = 90
Ctl3D = True Ctl3D = True
@ -55,9 +56,9 @@ inherited frViewConfiguracionDocCocina: TfrViewConfiguracionDocCocina
ScrollBars = ssVertical ScrollBars = ssVertical
TabOrder = 3 TabOrder = 3
end end
object eFormaPago: TMemo object eObservaciones: TMemo
Left = 11 Left = 11
Top = 100 Top = 282
Width = 529 Width = 529
Height = 90 Height = 90
Ctl3D = True Ctl3D = True
@ -65,14 +66,28 @@ inherited frViewConfiguracionDocCocina: TfrViewConfiguracionDocCocina
ScrollBars = ssVertical ScrollBars = ssVertical
TabOrder = 4 TabOrder = 4
end end
object eObservaciones: TMemo object bFormasPago: TButton
Left = 11 Left = 277
Top = 346 Top = 97
Width = 529 Width = 132
Height = 90 Height = 21
Ctl3D = True Caption = 'Ver las formas de pago...'
ParentCtl3D = False
ScrollBars = ssVertical
TabOrder = 5 TabOrder = 5
end end
object cbFormaPago: TcxLookupComboBox
Left = 93
Top = 97
Properties.KeyFieldNames = 'ID'
Properties.ListColumns = <
item
FieldName = 'REFERENCIA'
end>
Properties.ListSource = dsFormaPago
TabOrder = 6
Width = 178
end
object dsFormaPago: TDADataSource
Left = 424
Top = 88
end
end end

38
Source/Modulos/Presupuestos de cliente/Views/uViewConfiguracionDocCocina.pas
View File

@ -5,22 +5,32 @@ interface
uses uses
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs, uViewConfiguracionBase, cxControls, cxContainer, cxEdit, cxTextEdit, cxMemo, Dialogs, uViewConfiguracionBase, cxControls, cxContainer, cxEdit, cxTextEdit, cxMemo,
cxRichEdit, uViewBase, JvExControls, JvGradientHeaderPanel, StdCtrls, ExtCtrls; cxRichEdit, uViewBase, JvExControls, JvGradientHeaderPanel, StdCtrls, ExtCtrls,
cxGraphics, DB, uDAInterfaces, uDADataTable, cxMaskEdit, cxDropDownEdit,
cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, uFormasPagoController, uBizFormasPago;
type type
TfrViewConfiguracionDocCocina = class(TfrViewConfiguracionBase) TfrViewConfiguracionDocCocina = class(TfrViewConfiguracionBase)
eCondiciones: TcxRichEdit; eCondiciones: TcxRichEdit;
ePlazosEntrega: TMemo; ePlazosEntrega: TMemo;
eFormaPago: TMemo;
eObservaciones: TMemo; eObservaciones: TMemo;
Label1: TLabel;
Label2: TLabel; Label2: TLabel;
Label4: TLabel; Label4: TLabel;
bFormasPago: TButton;
cbFormaPago: TcxLookupComboBox;
Label5: TLabel;
dsFormaPago: TDADataSource;
protected
FFormasPago : IBizFormaPago;
FFormasPagoController : IFormasPagoController;
public public
class function GetViewClass : TClass; override; class function GetViewClass : TClass; override;
class function DarEtiqueta : String; override; class function DarEtiqueta : String; override;
procedure CargarValores; override; procedure CargarValores; override;
procedure GuardarValores; override; procedure GuardarValores; override;
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
end; end;
var var
@ -35,8 +45,11 @@ uses uFactuGES_App, uConfiguracionController, uPresupuestosClienteController;
procedure TfrViewConfiguracionDocCocina.CargarValores; procedure TfrViewConfiguracionDocCocina.CargarValores;
begin begin
inherited; inherited;
eFormaPago.Lines.Clear; FFormasPago := FFormasPagoController.BuscarTodos;
eFormaPago.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_FORMA_PAGO_COCINA); dsFormaPago.DataTable := FFormasPago.DataTable;
dsFormaPago.DataTable.Active := True;
cbFormaPago.EditValue := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_FORMA_PAGO_COCINA);
ePlazosEntrega.Lines.Clear; ePlazosEntrega.Lines.Clear;
ePlazosEntrega.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_PLAZOS_ENTREGA_COCINA); ePlazosEntrega.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_PLAZOS_ENTREGA_COCINA);
eObservaciones.Lines.Clear; eObservaciones.Lines.Clear;
@ -45,11 +58,24 @@ begin
eCondiciones.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_CONDICIONES_COCINA); eCondiciones.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_CONDICIONES_COCINA);
end; end;
constructor TfrViewConfiguracionDocCocina.Create(AOwner: TComponent);
begin
inherited;
FFormasPagoController := TFormasPagoController.Create;
end;
class function TfrViewConfiguracionDocCocina.DarEtiqueta: String; class function TfrViewConfiguracionDocCocina.DarEtiqueta: String;
begin begin
Result := 'Documentos cocina'; Result := 'Documentos cocina';
end; end;
destructor TfrViewConfiguracionDocCocina.Destroy;
begin
FFormasPago := Nil;
FFormasPagoController := NIL;
inherited;
end;
class function TfrViewConfiguracionDocCocina.GetViewClass: TClass; class function TfrViewConfiguracionDocCocina.GetViewClass: TClass;
begin begin
Result := TfrViewConfiguracionDocCocina; Result := TfrViewConfiguracionDocCocina;
@ -58,7 +84,7 @@ end;
procedure TfrViewConfiguracionDocCocina.GuardarValores; procedure TfrViewConfiguracionDocCocina.GuardarValores;
begin begin
inherited; inherited;
AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_FORMA_PAGO_COCINA, eFormaPago.Text); AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_FORMA_PAGO_COCINA, cbFormaPago.EditValue);
AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_COCINA, ePlazosEntrega.Text); AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_COCINA, ePlazosEntrega.Text);
AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_OBSERVACIONES_COCINA, eObservaciones.Text); AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_OBSERVACIONES_COCINA, eObservaciones.Text);
AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_CONDICIONES_COCINA, eCondiciones.Text); AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_CONDICIONES_COCINA, eCondiciones.Text);

69
Source/Modulos/Presupuestos de cliente/Views/uViewConfiguracionDocElectrodomestico.dfm
View File

@ -1,42 +1,43 @@
inherited frViewConfiguracionDocElectrodomestico: TfrViewConfiguracionDocElectrodomestico inherited frViewConfiguracionDocElectrodomestico: TfrViewConfiguracionDocElectrodomestico
Height = 533 Width = 558
object Label1: TLabel [0] Height = 493
object Label2: TLabel [0]
Left = 11 Left = 11
Top = 79 Top = 148
Width = 76
Height = 13
Caption = 'Forma de pago:'
end
object Label2: TLabel [1]
Left = 11
Top = 204
Width = 90 Width = 90
Height = 13 Height = 13
Caption = 'Plazos de entrega:' Caption = 'Plazos de entrega:'
end end
object Label4: TLabel [2] object Label4: TLabel [1]
Left = 11 Left = 11
Top = 326 Top = 270
Width = 75 Width = 75
Height = 13 Height = 13
Caption = 'Observaciones:' Caption = 'Observaciones:'
end end
object Label5: TLabel [2]
Left = 11
Top = 100
Width = 76
Height = 13
Caption = 'Forma de pago:'
end
inherited Panel1: TPanel inherited Panel1: TPanel
Width = 530 Width = 548
TabOrder = 2 TabOrder = 2
ExplicitWidth = 530 ExplicitWidth = 530
inherited Label3: TLabel inherited Label3: TLabel
Width = 518 Width = 536
end end
end end
inherited JvGradientHeaderPanel1: TJvGradientHeaderPanel inherited JvGradientHeaderPanel1: TJvGradientHeaderPanel
Width = 540 Width = 558
LabelCaption = 'Configuraci'#243'n de los documentos de electrodom'#233'sticos' LabelCaption = 'Configuraci'#243'n de los documentos de electrodom'#233'sticos'
ExplicitWidth = 540 ExplicitWidth = 540
end end
object eCondiciones: TcxRichEdit object eCondiciones: TcxRichEdit
Left = 11 Left = 11
Top = 448 Top = 392
Properties.ScrollBars = ssVertical Properties.ScrollBars = ssVertical
Lines.Strings = ( Lines.Strings = (
'eCondiciones') 'eCondiciones')
@ -47,7 +48,7 @@ inherited frViewConfiguracionDocElectrodomestico: TfrViewConfiguracionDocElectro
end end
object ePlazosEntrega: TMemo object ePlazosEntrega: TMemo
Left = 11 Left = 11
Top = 225 Top = 169
Width = 529 Width = 529
Height = 90 Height = 90
Ctl3D = True Ctl3D = True
@ -55,9 +56,9 @@ inherited frViewConfiguracionDocElectrodomestico: TfrViewConfiguracionDocElectro
ScrollBars = ssVertical ScrollBars = ssVertical
TabOrder = 3 TabOrder = 3
end end
object eFormaPago: TMemo object eObservaciones: TMemo
Left = 11 Left = 11
Top = 100 Top = 290
Width = 529 Width = 529
Height = 90 Height = 90
Ctl3D = True Ctl3D = True
@ -65,14 +66,28 @@ inherited frViewConfiguracionDocElectrodomestico: TfrViewConfiguracionDocElectro
ScrollBars = ssVertical ScrollBars = ssVertical
TabOrder = 4 TabOrder = 4
end end
object eObservaciones: TMemo object bFormasPago: TButton
Left = 11 Left = 277
Top = 346 Top = 97
Width = 529 Width = 132
Height = 90 Height = 21
Ctl3D = True Caption = 'Ver las formas de pago...'
ParentCtl3D = False
ScrollBars = ssVertical
TabOrder = 5 TabOrder = 5
end end
object cbFormaPago: TcxLookupComboBox
Left = 93
Top = 97
Properties.KeyFieldNames = 'ID'
Properties.ListColumns = <
item
FieldName = 'REFERENCIA'
end>
Properties.ListSource = dsFormaPago
TabOrder = 6
Width = 178
end
object dsFormaPago: TDADataSource
Left = 424
Top = 88
end
end end

38
Source/Modulos/Presupuestos de cliente/Views/uViewConfiguracionDocElectrodomestico.pas
View File

@ -5,22 +5,32 @@ interface
uses uses
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs, uViewConfiguracionBase, cxControls, cxContainer, cxEdit, cxTextEdit, cxMemo, Dialogs, uViewConfiguracionBase, cxControls, cxContainer, cxEdit, cxTextEdit, cxMemo,
cxRichEdit, uViewBase, JvExControls, JvGradientHeaderPanel, StdCtrls, ExtCtrls; cxRichEdit, uViewBase, JvExControls, JvGradientHeaderPanel, StdCtrls, ExtCtrls,
cxGraphics, DB, uDAInterfaces, uDADataTable, cxMaskEdit, cxDropDownEdit,
cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, uFormasPagoController, uBizFormasPago;
type type
TfrViewConfiguracionDocElectrodomestico = class(TfrViewConfiguracionBase) TfrViewConfiguracionDocElectrodomestico = class(TfrViewConfiguracionBase)
eCondiciones: TcxRichEdit; eCondiciones: TcxRichEdit;
ePlazosEntrega: TMemo; ePlazosEntrega: TMemo;
eFormaPago: TMemo;
eObservaciones: TMemo; eObservaciones: TMemo;
Label1: TLabel;
Label2: TLabel; Label2: TLabel;
Label4: TLabel; Label4: TLabel;
bFormasPago: TButton;
cbFormaPago: TcxLookupComboBox;
Label5: TLabel;
dsFormaPago: TDADataSource;
protected
FFormasPago : IBizFormaPago;
FFormasPagoController : IFormasPagoController;
public public
class function GetViewClass : TClass; override; class function GetViewClass : TClass; override;
class function DarEtiqueta : String; override; class function DarEtiqueta : String; override;
procedure CargarValores; override; procedure CargarValores; override;
procedure GuardarValores; override; procedure GuardarValores; override;
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
end; end;
var var
@ -35,8 +45,11 @@ uses uFactuGES_App, uConfiguracionController, uPresupuestosClienteController;
procedure TfrViewConfiguracionDocElectrodomestico.CargarValores; procedure TfrViewConfiguracionDocElectrodomestico.CargarValores;
begin begin
inherited; inherited;
eFormaPago.Lines.Clear; FFormasPago := FFormasPagoController.BuscarTodos;
eFormaPago.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_FORMA_PAGO_ELECTRODOMESTICO); dsFormaPago.DataTable := FFormasPago.DataTable;
dsFormaPago.DataTable.Active := True;
cbFormaPago.EditValue := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_FORMA_PAGO_ELECTRODOMESTICO);
ePlazosEntrega.Lines.Clear; ePlazosEntrega.Lines.Clear;
ePlazosEntrega.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_PLAZOS_ENTREGA_ELECTRODOMESTICO); ePlazosEntrega.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_PLAZOS_ENTREGA_ELECTRODOMESTICO);
eObservaciones.Lines.Clear; eObservaciones.Lines.Clear;
@ -45,11 +58,24 @@ begin
eCondiciones.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_CONDICIONES_ELECTRODOMESTICO); eCondiciones.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_CONDICIONES_ELECTRODOMESTICO);
end; end;
constructor TfrViewConfiguracionDocElectrodomestico.Create(AOwner: TComponent);
begin
inherited;
FFormasPagoController := TFormasPagoController.Create;
end;
class function TfrViewConfiguracionDocElectrodomestico.DarEtiqueta: String; class function TfrViewConfiguracionDocElectrodomestico.DarEtiqueta: String;
begin begin
Result := 'Documentos electrodoméstico'; Result := 'Documentos electrodoméstico';
end; end;
destructor TfrViewConfiguracionDocElectrodomestico.Destroy;
begin
FFormasPago := Nil;
FFormasPagoController := NIL;
inherited;
end;
class function TfrViewConfiguracionDocElectrodomestico.GetViewClass: TClass; class function TfrViewConfiguracionDocElectrodomestico.GetViewClass: TClass;
begin begin
Result := TfrViewConfiguracionDocELECTRODOMESTICO; Result := TfrViewConfiguracionDocELECTRODOMESTICO;
@ -58,7 +84,7 @@ end;
procedure TfrViewConfiguracionDocElectrodomestico.GuardarValores; procedure TfrViewConfiguracionDocElectrodomestico.GuardarValores;
begin begin
inherited; inherited;
AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_FORMA_PAGO_ELECTRODOMESTICO, eFormaPago.Text); AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_FORMA_PAGO_ELECTRODOMESTICO, cbFormaPago.EditValue);
AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_ELECTRODOMESTICO, ePlazosEntrega.Text); AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_ELECTRODOMESTICO, ePlazosEntrega.Text);
AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_OBSERVACIONES_ELECTRODOMESTICO, eObservaciones.Text); AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_OBSERVACIONES_ELECTRODOMESTICO, eObservaciones.Text);
AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_CONDICIONES_ELECTRODOMESTICO, eCondiciones.Text); AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_CONDICIONES_ELECTRODOMESTICO, eCondiciones.Text);

71
Source/Modulos/Presupuestos de cliente/Views/uViewConfiguracionDocVarios.dfm
View File

@ -1,43 +1,43 @@
inherited frViewConfiguracionDocVarios: TfrViewConfiguracionDocVarios inherited frViewConfiguracionDocVarios: TfrViewConfiguracionDocVarios
Width = 551 Width = 633
Height = 448 Height = 474
object Label1: TLabel [0] object Label2: TLabel [0]
Left = 11 Left = 11
Top = 79 Top = 132
Width = 76
Height = 13
Caption = 'Forma de pago:'
end
object Label2: TLabel [1]
Left = 11
Top = 204
Width = 90 Width = 90
Height = 13 Height = 13
Caption = 'Plazos de entrega:' Caption = 'Plazos de entrega:'
end end
object Label4: TLabel [2] object Label4: TLabel [1]
Left = 11 Left = 11
Top = 326 Top = 254
Width = 75 Width = 75
Height = 13 Height = 13
Caption = 'Observaciones:' Caption = 'Observaciones:'
end end
object Label5: TLabel [2]
Left = 11
Top = 100
Width = 76
Height = 13
Caption = 'Forma de pago:'
end
inherited Panel1: TPanel inherited Panel1: TPanel
Width = 541 Width = 623
TabOrder = 2 TabOrder = 2
ExplicitWidth = 530 ExplicitWidth = 530
inherited Label3: TLabel inherited Label3: TLabel
Width = 529 Width = 611
end end
end end
inherited JvGradientHeaderPanel1: TJvGradientHeaderPanel inherited JvGradientHeaderPanel1: TJvGradientHeaderPanel
Width = 551 Width = 633
LabelCaption = 'Configuraci'#243'n de los documentos de varios' LabelCaption = 'Configuraci'#243'n de los documentos de varios'
ExplicitWidth = 540 ExplicitWidth = 540
end end
object eCondiciones: TcxRichEdit object eCondiciones: TcxRichEdit
Left = 11 Left = 11
Top = 448 Top = 376
Properties.ScrollBars = ssVertical Properties.ScrollBars = ssVertical
Lines.Strings = ( Lines.Strings = (
'eCondiciones') 'eCondiciones')
@ -48,7 +48,7 @@ inherited frViewConfiguracionDocVarios: TfrViewConfiguracionDocVarios
end end
object ePlazosEntrega: TMemo object ePlazosEntrega: TMemo
Left = 11 Left = 11
Top = 225 Top = 153
Width = 529 Width = 529
Height = 90 Height = 90
Ctl3D = True Ctl3D = True
@ -56,9 +56,9 @@ inherited frViewConfiguracionDocVarios: TfrViewConfiguracionDocVarios
ScrollBars = ssVertical ScrollBars = ssVertical
TabOrder = 3 TabOrder = 3
end end
object eFormaPago: TMemo object eObservaciones: TMemo
Left = 11 Left = 11
Top = 100 Top = 274
Width = 529 Width = 529
Height = 90 Height = 90
Ctl3D = True Ctl3D = True
@ -66,14 +66,29 @@ inherited frViewConfiguracionDocVarios: TfrViewConfiguracionDocVarios
ScrollBars = ssVertical ScrollBars = ssVertical
TabOrder = 4 TabOrder = 4
end end
object eObservaciones: TMemo object bFormasPago: TButton
Left = 11 Left = 277
Top = 346 Top = 97
Width = 529 Width = 132
Height = 90 Height = 21
Ctl3D = True Caption = 'Ver las formas de pago...'
ParentCtl3D = False
ScrollBars = ssVertical
TabOrder = 5 TabOrder = 5
OnClick = bFormasPagoClick
end
object cbFormaPago: TcxLookupComboBox
Left = 93
Top = 97
Properties.KeyFieldNames = 'ID'
Properties.ListColumns = <
item
FieldName = 'REFERENCIA'
end>
Properties.ListSource = dsFormaPago
TabOrder = 6
Width = 178
end
object dsFormaPago: TDADataSource
Left = 424
Top = 88
end end
end end

46
Source/Modulos/Presupuestos de cliente/Views/uViewConfiguracionDocVarios.pas
View File

@ -5,22 +5,33 @@ interface
uses uses
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs, uViewConfiguracionBase, cxControls, cxContainer, cxEdit, cxTextEdit, cxMemo, Dialogs, uViewConfiguracionBase, cxControls, cxContainer, cxEdit, cxTextEdit, cxMemo,
cxRichEdit, uViewBase, JvExControls, JvGradientHeaderPanel, StdCtrls, ExtCtrls; cxRichEdit, uViewBase, JvExControls, JvGradientHeaderPanel, StdCtrls, ExtCtrls,
uFormasPagoController, uBizFormasPago, cxGraphics, cxMaskEdit, cxDropDownEdit,
cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, DB, uDAInterfaces,
uDADataTable;
type type
TfrViewConfiguracionDocVarios = class(TfrViewConfiguracionBase) TfrViewConfiguracionDocVarios = class(TfrViewConfiguracionBase)
eCondiciones: TcxRichEdit; eCondiciones: TcxRichEdit;
ePlazosEntrega: TMemo; ePlazosEntrega: TMemo;
eFormaPago: TMemo;
eObservaciones: TMemo; eObservaciones: TMemo;
Label1: TLabel;
Label2: TLabel; Label2: TLabel;
Label4: TLabel; Label4: TLabel;
Label5: TLabel;
bFormasPago: TButton;
dsFormaPago: TDADataSource;
cbFormaPago: TcxLookupComboBox;
procedure bFormasPagoClick(Sender: TObject);
protected
FFormasPago : IBizFormaPago;
FFormasPagoController : IFormasPagoController;
public public
class function GetViewClass : TClass; override; class function GetViewClass : TClass; override;
class function DarEtiqueta : String; override; class function DarEtiqueta : String; override;
procedure CargarValores; override; procedure CargarValores; override;
procedure GuardarValores; override; procedure GuardarValores; override;
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
end; end;
var var
@ -32,11 +43,21 @@ implementation
uses uFactuGES_App, uConfiguracionController, uPresupuestosClienteController; uses uFactuGES_App, uConfiguracionController, uPresupuestosClienteController;
procedure TfrViewConfiguracionDocVarios.bFormasPagoClick(Sender: TObject);
begin
inherited;
if Assigned(FFormasPago) then
FFormasPagoController.VerTodos(FFormasPago);
end;
procedure TfrViewConfiguracionDocVarios.CargarValores; procedure TfrViewConfiguracionDocVarios.CargarValores;
begin begin
inherited; inherited;
eFormaPago.Lines.Clear; FFormasPago := FFormasPagoController.BuscarTodos;
eFormaPago.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_FORMA_PAGO_VARIOS); dsFormaPago.DataTable := FFormasPago.DataTable;
dsFormaPago.DataTable.Active := True;
cbFormaPago.EditValue := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_FORMA_PAGO_VARIOS);
ePlazosEntrega.Lines.Clear; ePlazosEntrega.Lines.Clear;
ePlazosEntrega.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_PLAZOS_ENTREGA_VARIOS); ePlazosEntrega.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_PLAZOS_ENTREGA_VARIOS);
eObservaciones.Lines.Clear; eObservaciones.Lines.Clear;
@ -45,11 +66,24 @@ begin
eCondiciones.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_CONDICIONES_VARIOS); eCondiciones.Text := AppFactuGES.Configuracion.GetSettingAsString(teBD,CTE_CONDICIONES_VARIOS);
end; end;
constructor TfrViewConfiguracionDocVarios.Create(AOwner: TComponent);
begin
inherited;
FFormasPagoController := TFormasPagoController.Create;
end;
class function TfrViewConfiguracionDocVarios.DarEtiqueta: String; class function TfrViewConfiguracionDocVarios.DarEtiqueta: String;
begin begin
Result := 'Documentos varios'; Result := 'Documentos varios';
end; end;
destructor TfrViewConfiguracionDocVarios.Destroy;
begin
FFormasPago := Nil;
FFormasPagoController := NIL;
inherited;
end;
class function TfrViewConfiguracionDocVarios.GetViewClass: TClass; class function TfrViewConfiguracionDocVarios.GetViewClass: TClass;
begin begin
Result := TfrViewConfiguracionDocVARIOS; Result := TfrViewConfiguracionDocVARIOS;
@ -58,7 +92,7 @@ end;
procedure TfrViewConfiguracionDocVarios.GuardarValores; procedure TfrViewConfiguracionDocVarios.GuardarValores;
begin begin
inherited; inherited;
AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_FORMA_PAGO_VARIOS, eFormaPago.Text); AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_FORMA_PAGO_VARIOS, cbFormaPago.EditValue);
AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_VARIOS, ePlazosEntrega.Text); AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_PLAZOS_ENTREGA_VARIOS, ePlazosEntrega.Text);
AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_OBSERVACIONES_VARIOS, eObservaciones.Text); AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_OBSERVACIONES_VARIOS, eObservaciones.Text);
AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_CONDICIONES_VARIOS, eCondiciones.Text); AppFactuGES.Configuracion.SetSettingAsString(teBD, CTE_CONDICIONES_VARIOS, eCondiciones.Text);

82
Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm
View File

@ -90,9 +90,10 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
end end
object cbFormaPago: TcxDBLookupComboBox object cbFormaPago: TcxDBLookupComboBox
Left = 103 Left = 103
Top = 136 Top = 193
DataBinding.DataField = 'ID_FORMA_PAGO' DataBinding.DataField = 'ID_FORMA_PAGO'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
Properties.ImmediatePost = True
Properties.KeyFieldNames = 'ID' Properties.KeyFieldNames = 'ID'
Properties.ListColumns = < Properties.ListColumns = <
item item
@ -102,6 +103,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
Properties.ListOptions.ShowHeader = False Properties.ListOptions.ShowHeader = False
Properties.ListOptions.SyncMode = True Properties.ListOptions.SyncMode = True
Properties.ListSource = dsFormaPago Properties.ListSource = dsFormaPago
Properties.OnValidate = cbFormaPagoPropertiesValidate
Style.BorderColor = clWindowFrame Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D Style.BorderStyle = ebs3D
Style.HotTrack = False Style.HotTrack = False
@ -115,16 +117,16 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
StyleFocused.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 6 TabOrder = 7
Width = 122 Width = 122
end end
object bFormasPago: TButton object bFormasPago: TButton
Left = 270 Left = 270
Top = 136 Top = 193
Width = 132 Width = 132
Height = 21 Height = 21
Caption = 'Ver las formas de pago...' Caption = 'Ver las formas de pago...'
TabOrder = 7 TabOrder = 8
OnClick = bFormasPagoClick OnClick = bFormasPagoClick
end end
object edtFechaDecision: TcxDBDateEdit object edtFechaDecision: TcxDBDateEdit
@ -228,6 +230,10 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
Height = 224 Height = 224
ExplicitWidth = 320 ExplicitWidth = 320
ExplicitHeight = 224 ExplicitHeight = 224
inherited edtlNombre: TcxDBTextEdit
ExplicitWidth = 224
Width = 224
end
inherited edtNIFCIF: TcxDBTextEdit inherited edtNIFCIF: TcxDBTextEdit
Left = 328 Left = 328
ExplicitLeft = 328 ExplicitLeft = 328
@ -236,6 +242,10 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
Left = 239 Left = 239
ExplicitLeft = 239 ExplicitLeft = 239
end end
inherited edtPersonaContacto: TcxDBTextEdit
ExplicitWidth = 283
Width = 283
end
inherited edtDireccion: TcxMemo inherited edtDireccion: TcxMemo
ExplicitWidth = 121 ExplicitWidth = 121
Width = 121 Width = 121
@ -248,6 +258,10 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
Left = 408 Left = 408
ExplicitLeft = 408 ExplicitLeft = 408
end end
inherited edtTelefonos: TcxTextEdit
ExplicitWidth = 363
Width = 363
end
end end
end end
object memFormaPago: TcxDBMemo object memFormaPago: TcxDBMemo
@ -274,7 +288,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
end end
object memPlazoEntrega: TcxDBMemo object memPlazoEntrega: TcxDBMemo
Left = 22 Left = 22
Top = 348 Top = 358
Anchors = [akLeft, akTop, akRight, akBottom] Anchors = [akLeft, akTop, akRight, akBottom]
DataBinding.DataField = 'PLAZO_ENTREGA' DataBinding.DataField = 'PLAZO_ENTREGA'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -296,7 +310,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
end end
object cbVendedor: TcxDBLookupComboBox object cbVendedor: TcxDBLookupComboBox
Left = 103 Left = 103
Top = 163 Top = 136
DataBinding.DataField = 'ID_VENDEDOR' DataBinding.DataField = 'ID_VENDEDOR'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
Properties.KeyFieldNames = 'ID' Properties.KeyFieldNames = 'ID'
@ -321,7 +335,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
StyleFocused.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 8 TabOrder = 6
Width = 27 Width = 27
end end
object cbTipoPresupuesto: TcxDBComboBox object cbTipoPresupuesto: TcxDBComboBox
@ -411,42 +425,36 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
Control = cbSituacion Control = cbSituacion
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end
object dxLayoutControl1Group5: TdxLayoutGroup object dxLayoutControl1Item11: TdxLayoutItem
ShowCaption = False Caption = 'Vendedor:'
Hidden = True Control = cbVendedor
ShowBorder = False ControlOptions.ShowBorder = False
object dxLayoutControl1Group9: TdxLayoutGroup
ShowCaption = False
Visible = False
Hidden = True
LayoutDirection = ldHorizontal
ShowBorder = False
object dxLayoutControl1Item4: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = 'Forma de pago:'
Control = cbFormaPago
ControlOptions.ShowBorder = False
end
object dxLayoutControl1Item5: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahRight
ShowCaption = False
Control = bFormasPago
ControlOptions.ShowBorder = False
end
end
object dxLayoutControl1Item11: TdxLayoutItem
Caption = 'Vendedor:'
Control = cbVendedor
ControlOptions.ShowBorder = False
end
end end
end end
object dxLayoutControl1Group6: TdxLayoutGroup object dxLayoutControl1Group6: TdxLayoutGroup
AutoAligns = [aaHorizontal] AutoAligns = [aaHorizontal]
AlignVert = avClient AlignVert = avClient
Caption = 'Forma de pago' Caption = 'Forma de pago'
object dxLayoutControl1Group9: TdxLayoutGroup
ShowCaption = False
Hidden = True
LayoutDirection = ldHorizontal
ShowBorder = False
object dxLayoutControl1Item4: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = 'Forma de pago:'
Control = cbFormaPago
ControlOptions.ShowBorder = False
end
object dxLayoutControl1Item5: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahRight
ShowCaption = False
Control = bFormasPago
ControlOptions.ShowBorder = False
end
end
object dxLayoutControl1Item8: TdxLayoutItem object dxLayoutControl1Item8: TdxLayoutItem
AutoAligns = [aaHorizontal] AutoAligns = [aaHorizontal]
AlignVert = avClient AlignVert = avClient

13
Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.pas
View File

@ -43,7 +43,6 @@ type
cbFormaPago: TcxDBLookupComboBox; cbFormaPago: TcxDBLookupComboBox;
dxLayoutControl1Item5: TdxLayoutItem; dxLayoutControl1Item5: TdxLayoutItem;
bFormasPago: TButton; bFormasPago: TButton;
dxLayoutControl1Group5: TdxLayoutGroup;
dsFormaPago: TDADataSource; dsFormaPago: TDADataSource;
dxLayoutControl1Item7: TdxLayoutItem; dxLayoutControl1Item7: TdxLayoutItem;
edtFechaDecision: TcxDBDateEdit; edtFechaDecision: TcxDBDateEdit;
@ -74,6 +73,8 @@ type
procedure bFormasPagoClick(Sender: TObject); procedure bFormasPagoClick(Sender: TObject);
procedure frViewClientePresupuestoButton1Click(Sender: TObject); procedure frViewClientePresupuestoButton1Click(Sender: TObject);
procedure frViewClientePresupuestoButton2Click(Sender: TObject); procedure frViewClientePresupuestoButton2Click(Sender: TObject);
procedure cbFormaPagoPropertiesValidate(Sender: TObject;
var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
protected protected
FPresupuesto : IBizPresupuestoCliente; FPresupuesto : IBizPresupuestoCliente;
FFormasPago : IBizFormaPago; FFormasPago : IBizFormaPago;
@ -97,7 +98,7 @@ implementation
{ TfrViewPresupuestoCliente } { TfrViewPresupuestoCliente }
uses uses
uClientesController, uBizDireccionesContacto, uPresupuestosClienteController; schPresupuestosClienteClient_Intf, uClientesController, uBizDireccionesContacto, uPresupuestosClienteController;
procedure TfrViewPresupuestoCliente.bFormasPagoClick(Sender: TObject); procedure TfrViewPresupuestoCliente.bFormasPagoClick(Sender: TObject);
@ -107,6 +108,14 @@ begin
FFormasPagoController.VerTodos(FFormasPago); FFormasPagoController.VerTodos(FFormasPago);
end; end;
procedure TfrViewPresupuestoCliente.cbFormaPagoPropertiesValidate(
Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
var Error: Boolean);
begin
inherited;
Presupuesto.DataTable.FieldByName(fld_PresupuestosClienteFORMA_PAGO).AsString := FFormasPago.DESCRIPCION;
end;
procedure TfrViewPresupuestoCliente.CustomViewCreate(Sender: TObject); procedure TfrViewPresupuestoCliente.CustomViewCreate(Sender: TObject);
begin begin
inherited; inherited;

4
Source/Modulos/Recibos de cliente/Model/uBizPagosCliente.pas
View File

@ -48,6 +48,7 @@ type
end; end;
implementation implementation
{$INCLUDE ..\..\..\FactuGES.inc}
uses uses
DB, uFactuGES_App; DB, uFactuGES_App;
@ -66,11 +67,12 @@ end;
procedure TBizPagosCliente.IniciarValoresIBizPagosClienteNuevo; procedure TBizPagosCliente.IniciarValoresIBizPagosClienteNuevo;
begin begin
//CONTABILIDAD {$IFDEF CONTABILIDAD}
if Assigned(AppFactuGES.EjercicioActivo) then if Assigned(AppFactuGES.EjercicioActivo) then
IGNORAR_CONTABILIDAD := 0 IGNORAR_CONTABILIDAD := 0
else else
IGNORAR_CONTABILIDAD := 1; IGNORAR_CONTABILIDAD := 1;
{$ENDIF}
end; end;
procedure TBizPagosCliente.OnNewRecord(Sender: TDADataTable); procedure TBizPagosCliente.OnNewRecord(Sender: TDADataTable);

6
Source/Modulos/Recibos de cliente/Views/uEditorFechaPago.dfm
View File

@ -121,14 +121,12 @@ object fEditorFechaPago: TfEditorFechaPago
AlignWithMargins = True AlignWithMargins = True
Left = 6 Left = 6
Top = 4 Top = 4
Width = 550 Width = 55
Height = 40 Height = 13
Margins.Left = 5 Margins.Left = 5
Align = alClient Align = alClient
Caption = 'Comentario' Caption = 'Comentario'
WordWrap = True WordWrap = True
ExplicitWidth = 55
ExplicitHeight = 13
end end
end end
object Panel1: TPanel object Panel1: TPanel

20
Source/Modulos/Recibos de cliente/Views/uEditorFechaPago.pas
View File

@ -113,19 +113,19 @@ begin
{$IFDEF CONTABILIDAD} {$IFDEF CONTABILIDAD}
frViewListaSubCuentas1.Visible := true; frViewListaSubCuentas1.Visible := true;
if Assigned(AppFactuGES.EjercicioActivo) then
begin
frViewListaSubcuentas1.eContabilizar.Checked := False;
end
else
begin
frViewListaSubcuentas1.eContabilizar.Checked := True;
end;
{$ELSE} {$ELSE}
frViewListaSubCuentas1.Visible := false; frViewListaSubCuentas1.Visible := false;
{$ENDIF} {$ENDIF}
//Contabilidad
if Assigned(AppFactuGES.EjercicioActivo) then
begin
frViewListaSubcuentas1.eContabilizar.Checked := False;
end
else
begin
frViewListaSubcuentas1.eContabilizar.Checked := True;
end;
end; end;
function TfEditorFechaPago.GetComentario: Variant; function TfEditorFechaPago.GetComentario: Variant;

4
Source/Modulos/Recibos de proveedor/Model/uBizPagosProveedor.pas
View File

@ -48,6 +48,7 @@ type
end; end;
implementation implementation
{$INCLUDE ..\..\..\FactuGES.inc}
uses uses
DB, uFactuGES_App; DB, uFactuGES_App;
@ -66,11 +67,12 @@ end;
procedure TBizPagosProveedor.IniciarValoresPagosProveedorNuevo; procedure TBizPagosProveedor.IniciarValoresPagosProveedorNuevo;
begin begin
//CONTABILIDAD {$IFDEF CONTABILIDAD}
if Assigned(AppFactuGES.EjercicioActivo) then if Assigned(AppFactuGES.EjercicioActivo) then
IGNORAR_CONTABILIDAD := 0 IGNORAR_CONTABILIDAD := 0
else else
IGNORAR_CONTABILIDAD := 1; IGNORAR_CONTABILIDAD := 1;
{$ENDIF}
end; end;
procedure TBizPagosProveedor.OnNewRecord(Sender: TDADataTable); procedure TBizPagosProveedor.OnNewRecord(Sender: TDADataTable);

6
Source/Modulos/Recibos de proveedor/Views/uEditorFechaPagoProveedor.dfm
View File

@ -147,14 +147,12 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor
AlignWithMargins = True AlignWithMargins = True
Left = 6 Left = 6
Top = 4 Top = 4
Width = 553 Width = 55
Height = 40 Height = 13
Margins.Left = 5 Margins.Left = 5
Align = alClient Align = alClient
Caption = 'Comentario' Caption = 'Comentario'
WordWrap = True WordWrap = True
ExplicitWidth = 55
ExplicitHeight = 13
end end
end end
end end

20
Source/Modulos/Recibos de proveedor/Views/uEditorFechaPagoProveedor.pas
View File

@ -111,19 +111,19 @@ begin
{$IFDEF CONTABILIDAD} {$IFDEF CONTABILIDAD}
frViewListaSubCuentas1.Visible := true; frViewListaSubCuentas1.Visible := true;
if Assigned(AppFactuGES.EjercicioActivo) then
begin
frViewListaSubcuentas1.eContabilizar.Checked := False;
end
else
begin
frViewListaSubcuentas1.eContabilizar.Checked := True;
end;
{$ELSE} {$ELSE}
frViewListaSubCuentas1.Visible := false; frViewListaSubCuentas1.Visible := false;
{$ENDIF} {$ENDIF}
//Contabilidad
if Assigned(AppFactuGES.EjercicioActivo) then
begin
frViewListaSubcuentas1.eContabilizar.Checked := False;
end
else
begin
frViewListaSubcuentas1.eContabilizar.Checked := True;
end;
end; end;
function TfEditorFechaPagoProveedor.GetComentario: Variant; function TfEditorFechaPagoProveedor.GetComentario: Variant;

19
Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.pas
View File

@ -116,20 +116,21 @@ begin
frViewListaSubcuentas1.TipoSubCuenta := tCajas; frViewListaSubcuentas1.TipoSubCuenta := tCajas;
dxlcCuentaBancaria.visible := false; dxlcCuentaBancaria.visible := false;
dxlcCuentaContable.Visible := true; dxlcCuentaContable.Visible := true;
if Assigned(AppFactuGES.EjercicioActivo) then
begin
frViewListaSubcuentas1.eContabilizar.Checked := False;
end
else
begin
frViewListaSubcuentas1.eContabilizar.Checked := True;
end;
{$ELSE} {$ELSE}
dxlcCuentaBancaria.visible := true; dxlcCuentaBancaria.visible := true;
dxlcCuentaContable.Visible := false; dxlcCuentaContable.Visible := false;
{$ENDIF} {$ENDIF}
//Contabilidad
if Assigned(AppFactuGES.EjercicioActivo) then
begin
frViewListaSubcuentas1.eContabilizar.Checked := False;
end
else
begin
frViewListaSubcuentas1.eContabilizar.Checked := True;
end;
end; end;
function TfrViewRemesaCliente.GetController: IRemesasClienteController; function TfrViewRemesaCliente.GetController: IRemesasClienteController;

26
Source/Modulos/Remesas de proveedor/Views/uViewRemesaProveedor.dfm
View File

@ -1,25 +1,25 @@
inherited frViewRemesaProveedor: TfrViewRemesaProveedor inherited frViewRemesaProveedor: TfrViewRemesaProveedor
Width = 485 Width = 451
Height = 230 Height = 304
Align = alClient Align = alClient
ExplicitWidth = 451 ExplicitWidth = 451
ExplicitHeight = 304 ExplicitHeight = 304
object dxLayoutControlRemesaProveedor: TdxLayoutControl object dxLayoutControlRemesaProveedor: TdxLayoutControl
Left = 0 Left = 0
Top = 0 Top = 0
Width = 485 Width = 451
Height = 230 Height = 304
Align = alClient Align = alClient
ParentBackground = True ParentBackground = True
TabOrder = 0 TabOrder = 0
TabStop = False TabStop = False
AutoContentSizes = [acsWidth, acsHeight] AutoContentSizes = [acsWidth, acsHeight]
LookAndFeel = dxLayoutOfficeLookAndFeel1 LookAndFeel = dxLayoutOfficeLookAndFeel1
ExplicitWidth = 451 ExplicitWidth = 485
ExplicitHeight = 304 ExplicitHeight = 230
DesignSize = ( DesignSize = (
485 451
230) 304)
object eReferencia: TcxDBTextEdit object eReferencia: TcxDBTextEdit
Left = 110 Left = 110
Top = 30 Top = 30
@ -72,7 +72,7 @@ inherited frViewRemesaProveedor: TfrViewRemesaProveedor
Width = 108 Width = 108
end end
object edtFechaRemesa: TcxDBDateEdit object edtFechaRemesa: TcxDBDateEdit
Left = 328 Left = 311
Top = 30 Top = 30
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
DataBinding.DataField = 'FECHA_REMESA' DataBinding.DataField = 'FECHA_REMESA'
@ -184,14 +184,18 @@ inherited frViewRemesaProveedor: TfrViewRemesaProveedor
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 376
Width = 376
end end
inherited eContabilizar: TcxCheckBox inherited eContabilizar: TcxCheckBox
Left = 299 Left = 276
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 = 299 ExplicitLeft = 276
ExplicitWidth = 203
Width = 203
end end
end end
end end

20
Source/Modulos/Remesas de proveedor/Views/uViewRemesaProveedor.pas
View File

@ -116,20 +116,20 @@ begin
frViewListaSubcuentas1.TipoSubCuenta := tCajas; frViewListaSubcuentas1.TipoSubCuenta := tCajas;
dxlcCuentaBancaria.visible := false; dxlcCuentaBancaria.visible := false;
dxlcCuentaContable.Visible := true; dxlcCuentaContable.Visible := true;
if Assigned(AppFactuGES.EjercicioActivo) then
begin
frViewListaSubcuentas1.eContabilizar.Checked := False;
end
else
begin
frViewListaSubcuentas1.eContabilizar.Checked := True;
end;
{$ELSE} {$ELSE}
dxlcCuentaBancaria.visible := true; dxlcCuentaBancaria.visible := true;
dxlcCuentaContable.Visible := false; dxlcCuentaContable.Visible := false;
{$ENDIF} {$ENDIF}
//Contabilidad
if Assigned(AppFactuGES.EjercicioActivo) then
begin
frViewListaSubcuentas1.eContabilizar.Checked := False;
end
else
begin
frViewListaSubcuentas1.eContabilizar.Checked := True;
end;
end; end;
function TfrViewRemesaProveedor.GetController: IRemesasProveedorController; function TfrViewRemesaProveedor.GetController: IRemesasProveedorController;