diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql index 42ab588f..599ad441 100644 --- a/Database/scripts/factuges.sql +++ b/Database/scripts/factuges.sql @@ -2391,46 +2391,46 @@ SELECT FACTURAS_CLIENTE.ID, /* Create view: V_FACTURAS_PROVEEDOR*/ CREATE VIEW V_FACTURAS_PROVEEDOR( -ID, -ID_EMPRESA, -REFERENCIA, -TIPO, -REFERENCIA_PROVEEDOR, -FECHA_FACTURA, -FECHA_VENCIMIENTO, -SITUACION, -BASE_IMPONIBLE, -DESCUENTO, -IMPORTE_DESCUENTO, -IVA, -IMPORTE_IVA, -RE, -IMPORTE_RE, -IMPORTE_TOTAL, -OBSERVACIONES, -ID_PROVEEDOR, -NOMBRE_PROVEEDOR, -NOMBRE_COMERCIAL_PROVEEDOR, -NIF_CIF, -NOMBRE, -CALLE, -POBLACION, -PROVINCIA, -CODIGO_POSTAL, -FECHA_ALTA, -FECHA_MODIFICACION, -USUARIO, -ID_FORMA_PAGO, -RECARGO_EQUIVALENCIA, -ID_TIPO_IVA, -IMPORTE_NETO, -IMPORTE_PORTE, -IGNORAR_CONTABILIDAD, -ID_TIENDA, -TIENDA, -ID_SUBCUENTA, -SUBCUENTA) - AS + ID, + ID_EMPRESA, + REFERENCIA, + TIPO, + REFERENCIA_PROVEEDOR, + FECHA_FACTURA, + FECHA_VENCIMIENTO, + SITUACION, + BASE_IMPONIBLE, + DESCUENTO, + IMPORTE_DESCUENTO, + IVA, + IMPORTE_IVA, + RE, + IMPORTE_RE, + IMPORTE_TOTAL, + OBSERVACIONES, + ID_PROVEEDOR, + NOMBRE_PROVEEDOR, + NOMBRE_COMERCIAL_PROVEEDOR, + NIF_CIF, + NOMBRE, + CALLE, + POBLACION, + PROVINCIA, + CODIGO_POSTAL, + FECHA_ALTA, + FECHA_MODIFICACION, + USUARIO, + ID_FORMA_PAGO, + RECARGO_EQUIVALENCIA, + ID_TIPO_IVA, + IMPORTE_NETO, + IMPORTE_PORTE, + IGNORAR_CONTABILIDAD, + ID_TIENDA, + TIENDA, + ID_SUBCUENTA, + SUBCUENTA) +AS SELECT FACTURAS_PROVEEDOR.ID, FACTURAS_PROVEEDOR.ID_EMPRESA, FACTURAS_PROVEEDOR.REFERENCIA, @@ -2474,11 +2474,14 @@ SELECT FACTURAS_PROVEEDOR.ID, FROM V_FAC_PRO_SITUACION LEFT JOIN FACTURAS_PROVEEDOR ON (FACTURAS_PROVEEDOR.ID = V_FAC_PRO_SITUACION.ID_FACTURA) - INNER JOIN CONTACTOS ON (CONTACTOS.ID = FACTURAS_PROVEEDOR.ID_PROVEEDOR) - INNER JOIN PROVEEDORES_DATOS ON (PROVEEDORES_DATOS.ID_PROVEEDOR = FACTURAS_PROVEEDOR.ID_PROVEEDOR) + LEFT JOIN CONTACTOS + ON (CONTACTOS.ID = FACTURAS_PROVEEDOR.ID_PROVEEDOR) + LEFT JOIN PROVEEDORES_DATOS + ON (PROVEEDORES_DATOS.ID_PROVEEDOR = FACTURAS_PROVEEDOR.ID_PROVEEDOR) LEFT JOIN EMPRESAS_TIENDAS ON (EMPRESAS_TIENDAS.ID = FACTURAS_PROVEEDOR.ID_TIENDA) LEFT JOIN V_CONT_FAC_PRO_COMPRAS ON (V_CONT_FAC_PRO_COMPRAS.ID_FACTURA = FACTURAS_PROVEEDOR.ID); + /* Create view: V_COMISIONES */ CREATE VIEW V_COMISIONES( diff --git a/Database/scripts/factuges_sysdata.sql b/Database/scripts/factuges_sysdata.sql index a1c175d3..dc5c8b51 100644 --- a/Database/scripts/factuges_sysdata.sql +++ b/Database/scripts/factuges_sysdata.sql @@ -55,17 +55,17 @@ INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (6, 1, NULL, 'REF_REMESAS_CLIENTE', 'RCLI/00009', 'Ref. remesas de cliente'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (7, 1, NULL, 'REF_COMISIONES', '00001', 'Ref. liquidaciones de comision'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (8, 1, 0, 'REF_FACTURAS_PROVEEDOR', 'FPAC08/000000', 'Ref. facturas de proveedor'); -INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (46, 1, 3, 'REF_PROVEEDOR', 'PAB/000000', 'Ref. proveedor Abeto'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (46, NULL, 3, 'REF_PROVEEDOR', 'PAB/000000', 'Ref. proveedor Abeto'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (11, 1, NULL, 'REF_REMESAS_PROVEEDOR', 'RPRO/00001', 'Ref. remesas de proveedor'); -INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (32, 1, 1, 'REF_CLIENTE', 'CLI/007000', 'Ref. clientes Alcalá'); -INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (33, 1, 2, 'REF_CLIENTE', 'VCL/007000', 'Ref. clientes Valdebernardo'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (32, NULL, 1, 'REF_CLIENTE', 'CLI/007000', 'Ref. clientes Alcalá'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (33, NULL, 2, 'REF_CLIENTE', 'VCL/007000', 'Ref. clientes Valdebernardo'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (15, 1, 1, 'REF_RECIBOS_CLIENTE', 'RAL/00000049', 'Ref. recibos de cliente Alcalá'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (16, 1, 0, 'REF_RECIBOS_PROVEEDOR', 'RPAC/00000000', 'Ref. recibos de proveedor General'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (17, 1, 2, 'REF_FACTURAS_CLIENTE', 'FVA08/000008', 'Ref. facturas de cliente Valdebernardo'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (18, 1, 3, 'REF_FACTURAS_CLIENTE', 'FAB08/000000', 'Ref. facturas de cliente Abeto'); -INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (35, 1, 0, 'REF_CLIENTE', 'CAC/000000', 'Ref. cliente General'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (35, NULL, 0, 'REF_CLIENTE', 'CAC/000000', 'Ref. cliente General'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (23, 1, 1, 'REF_FACTURAS_PROVEEDOR', 'FPAL08/000109', 'Ref. facturas de proveedor Alcalá'); -INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (34, 1, 3, 'REF_CLIENTE', 'CAB/000000', 'Ref. cliente Abeto'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (34, NULL, 3, 'REF_CLIENTE', 'CAB/000000', 'Ref. cliente Abeto'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (19, 1, 0, 'REF_FACTURAS_CLIENTE', 'FAC08/000000', 'Ref. facturas de cliente General'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (24, 1, 2, 'REF_FACTURAS_PROVEEDOR', 'FPVA08/000000', 'Ref. facturas de proveedor Valdebernardo '); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (25, 1, 3, 'REF_FACTURAS_PROVEEDOR', 'FPAB08/000000', 'Ref. facturas de proveedor Abeto'); @@ -75,13 +75,42 @@ INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (29, 1, 1, 'REF_RECIBOS_PROVEEDOR', 'RPAL/00000000', 'Ref. recibos de proveedor Alcalá'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (30, 1, 2, 'REF_RECIBOS_PROVEEDOR', 'RPVA/00000000', 'Ref. recibos de proveedor Valdebernardo'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (31, 1, 3, 'REF_RECIBOS_PROVEEDOR', 'RPAB/00000000', 'Ref. recibos de proveedor Valdebernardo'); -INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (38, 1, 1, 'REF_PROVEEDOR', 'PRO/001000', 'Ref. proveedor Alcalá'); -INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (37, 1, 2, 'REF_PROVEEDOR', 'VPR/001000', 'Ref. proveedor Valdebernardo'); -INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (36, 1, 0, 'REF_PROVEEDOR', 'PAC/000000', 'Ref. proveedor General'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (38, NULL, 1, 'REF_PROVEEDOR', 'PRO/001000', 'Ref. proveedor Alcalá'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (37, NULL, 2, 'REF_PROVEEDOR', 'VPR/001000', 'Ref. proveedor Valdebernardo'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (36, NULL, 0, 'REF_PROVEEDOR', 'PAC/000000', 'Ref. proveedor General'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (42, 1, 3, 'REF_PRESUPUESTOS_CLIENTE', 'PRAB08/00000', 'Ref. presupuesto de cliente Abeto'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (43, 1, 1, 'REF_ALBARANES_CLIENTE', 'AAL/000000', 'Ref. albaranes de cliente Alcalá'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (44, 1, 2, 'REF_ALBARANES_CLIENTE', 'AVA/000000', 'Ref. albaranes de cliente Valdebernardo'); INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (45, 1, 3, 'REF_ALBARANES_CLIENTE', 'AAB/000000', 'Ref. albaranes de cliente Abeto'); + +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (46, 2, 1, 'REF_FACTURAS_CLIENTE', 'BFAL08/00000', 'Ref. facturas de cliente Alcalá'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (47, 2, 2, 'REF_PRESUPUESTOS_CLIENTE', 'BPRVA08/0000', 'Ref. presupuesto de cliente Valdebernardo'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (48, 2, 0, 'REF_PRESUPUESTOS_CLIENTE', 'BPRAC08/0000', 'Ref. presupuesto de cliente General'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (49, 2, 0, 'REF_ALBARANES_CLIENTE', 'BAAC/00000', 'Ref. albaranes de cliente General'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (50, 2, 1, 'REF_PRESUPUESTOS_CLIENTE', 'BPRAL08/0000', 'Ref. presupuesto de cliente Alcalá'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (51, 2, NULL, 'REF_REMESAS_CLIENTE', 'RCLI/00000', 'Ref. remesas de cliente'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (52, 2, NULL, 'REF_COMISIONES', 'B/00000', 'Ref. liquidaciones de comision'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (53, 2, 0, 'REF_FACTURAS_PROVEEDOR', 'BFPAC08/00000', 'Ref. facturas de proveedor'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (54, 2, NULL, 'REF_REMESAS_PROVEEDOR', 'BRPRO/0000', 'Ref. remesas de proveedor'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (55, 2, 1, 'REF_RECIBOS_CLIENTE', 'BRAL/0000049', 'Ref. recibos de cliente Alcalá'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (56, 2, 0, 'REF_RECIBOS_PROVEEDOR', 'BRPAC/0000000', 'Ref. recibos de proveedor General'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (57, 2, 2, 'REF_FACTURAS_CLIENTE', 'BFVA08/00000', 'Ref. facturas de cliente Valdebernardo'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (58, 2, 3, 'REF_FACTURAS_CLIENTE', 'BFAB08/00000', 'Ref. facturas de cliente Abeto'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (59, 2, 1, 'REF_FACTURAS_PROVEEDOR', 'BFPAL08/00000', 'Ref. facturas de proveedor Alcalá'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (60, 2, 0, 'REF_FACTURAS_CLIENTE', 'BFAC08/00000', 'Ref. facturas de cliente General'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (61, 2, 2, 'REF_FACTURAS_PROVEEDOR', 'BFPVA08/00000', 'Ref. facturas de proveedor Valdebernardo '); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (62, 2, 3, 'REF_FACTURAS_PROVEEDOR', 'BFPAB08/00000', 'Ref. facturas de proveedor Abeto'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (63, 2, 0, 'REF_RECIBOS_CLIENTE', 'BRAC/0000000', 'Ref. recibos de cliente General'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (64, 2, 2, 'REF_RECIBOS_CLIENTE', 'BRVA/0000000', 'Ref. recibos de cliente Valdebernardo'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (65, 2, 3, 'REF_RECIBOS_CLIENTE', 'BRAB/0000000', 'Ref. recibos de cliente Abeto'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (66, 2, 1, 'REF_RECIBOS_PROVEEDOR', 'BRPAL/0000000', 'Ref. recibos de proveedor Alcalá'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (67, 2, 2, 'REF_RECIBOS_PROVEEDOR', 'BRPVA/0000000', 'Ref. recibos de proveedor Valdebernardo'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (68, 2, 3, 'REF_RECIBOS_PROVEEDOR', 'BRPAB/0000000', 'Ref. recibos de proveedor Valdebernardo'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (69, 2, 3, 'REF_PRESUPUESTOS_CLIENTE', 'BPRAB08/0000', 'Ref. presupuesto de cliente Abeto'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (70, 2, 1, 'REF_ALBARANES_CLIENTE', 'BAAL/00000', 'Ref. albaranes de cliente Alcalá'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (71, 2, 2, 'REF_ALBARANES_CLIENTE', 'BAVA/00000', 'Ref. albaranes de cliente Valdebernardo'); +INSERT INTO REFERENCIAS (ID, ID_EMPRESA, ID_TIENDA, CODIGO, VALOR, DESCRIPCION) VALUES (72, 2, 3, 'REF_ALBARANES_CLIENTE', 'BAAB/00000', 'Ref. albaranes de cliente Abeto'); + COMMIT WORK; diff --git a/Source/ApplicationBase/uFactuGES_App.pas b/Source/ApplicationBase/uFactuGES_App.pas index e2122aaf..d5cbdf44 100644 --- a/Source/ApplicationBase/uFactuGES_App.pas +++ b/Source/ApplicationBase/uFactuGES_App.pas @@ -183,7 +183,9 @@ begin begin Aux.DataTable.Active := True; if not Aux.IsEmpty then - FEjercicioActivo := Aux; + FEjercicioActivo := Aux + else + FEjercicioActivo := Nil; end; finally AEjerciciosController := Nil; diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 4042672c..fd40c0bc 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -44,6 +44,27 @@ Package FalseTrueFalseLibreria base de FactuGESFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 + + + + + + + + + + + + + + + + + + + + + VCL for the Web Design Package for CodeGear RAD Studio CodeGear WebSnap Components CodeGear SOAP Components diff --git a/Source/Modulos/Contabilidad/Controller/uSubCuentasController.pas b/Source/Modulos/Contabilidad/Controller/uSubCuentasController.pas index 786c1878..267bf34d 100644 --- a/Source/Modulos/Contabilidad/Controller/uSubCuentasController.pas +++ b/Source/Modulos/Contabilidad/Controller/uSubCuentasController.pas @@ -572,7 +572,7 @@ begin ASubCuenta.DataTable.Active := False; if not Assigned(AppFactuGES.EjercicioActivo) then - raise Exception.Create('No se ha definido ningún ejercicio activo'); + raise Exception.Create('No se ha definido ningún ejercicio activo'); // Filtrar los SubCuentas actuales por SubCuenta activo with ASubCuenta.DataTable.DynamicWhere do diff --git a/Source/Modulos/Contabilidad/Views/uViewListaSubCuentas.dfm b/Source/Modulos/Contabilidad/Views/uViewListaSubCuentas.dfm index c7b9f24b..6e829200 100644 --- a/Source/Modulos/Contabilidad/Views/uViewListaSubCuentas.dfm +++ b/Source/Modulos/Contabilidad/Views/uViewListaSubCuentas.dfm @@ -35,14 +35,18 @@ inherited frViewListaSubcuentas: TfrViewListaSubcuentas Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 0 Width = 376 end @@ -54,6 +58,10 @@ inherited frViewListaSubcuentas: TfrViewListaSubcuentas Properties.ValueUnchecked = 0 Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 1 Width = 203 end diff --git a/Source/Modulos/Contabilidad/Views/uViewListaSubCuentas.pas b/Source/Modulos/Contabilidad/Views/uViewListaSubCuentas.pas index 2a0fbdc8..e75a96a3 100644 --- a/Source/Modulos/Contabilidad/Views/uViewListaSubCuentas.pas +++ b/Source/Modulos/Contabilidad/Views/uViewListaSubCuentas.pas @@ -76,8 +76,20 @@ end; procedure TfrViewListaSubcuentas.CustomViewShow(Sender: TObject); begin inherited; - cbSubCuentas.Properties.OnValidate := cbCajaBancoPropertiesValidate; - eContabilizar.Properties.OnEditValueChanged := eContabilizarPropertiesEditValueChanged; + if Assigned(AppFactuGES.EjercicioActivo) then + begin + cbSubCuentas.Enabled := True; + eContabilizar.Enabled := True; + cbSubCuentas.Properties.OnValidate := cbCajaBancoPropertiesValidate; + eContabilizar.Properties.OnEditValueChanged := eContabilizarPropertiesEditValueChanged; + end + else + begin + cbSubCuentas.Enabled := False; + eContabilizar.Enabled := False; + cbSubCuentas.Properties.OnValidate := Nil; + eContabilizar.Properties.OnEditValueChanged := Nil; + end; end; procedure TfrViewListaSubcuentas.eContabilizarPropertiesEditValueChanged(Sender: TObject); @@ -90,14 +102,16 @@ procedure TfrViewListaSubcuentas.ElegirSubCuenta(const AIdSubCuenta: Integer); var i : integer; begin - for i := 0 to FListaSubCuentas.Count-1 do - begin - if FListaSubCuentas.ValueFromIndex[i] = IntToStr(AIdSubCuenta) then - begin - cbSubCuentas.Text := FListaSubCuentas.Names[i]; - Break; - end; - end; + //Si no hay ejercicio activo se desactivará la funcionalidad de contabilidad + if Assigned(AppFactuGES.EjercicioActivo) then + for i := 0 to FListaSubCuentas.Count-1 do + begin + if FListaSubCuentas.ValueFromIndex[i] = IntToStr(AIdSubCuenta) then + begin + cbSubCuentas.Text := FListaSubCuentas.Names[i]; + Break; + end; + end; end; function TfrViewListaSubcuentas.getIDCajaBanco: Integer; @@ -131,27 +145,31 @@ var begin FTipoSubCuenta := Value; - with TSubCuentasController.create do + //Si no hay ejercicio activo se desactivará la funcionalidad de contabilidad + if Assigned(AppFactuGES.EjercicioActivo) then begin - - FListaSubCuentas := DarLista(FTipoSubCuenta); - with cbSubCuentas.Properties.Items do + with TSubCuentasController.create do begin - BeginUpdate; - try - Clear; - for i := 0 to FListaSubCuentas.Count - 1 do - Add(FListaSubCuentas.Names[i]); - finally - EndUpdate; - end; - end; - Free; - end; - //Ponemos la primera por defecto - cbSubCuentas.ItemIndex := 0; - FIdSubCuenta := StrToInt(FListaSubCuentas.Values[cbSubCuentas.Text]); //Refrescamos el valor + FListaSubCuentas := DarLista(FTipoSubCuenta); + with cbSubCuentas.Properties.Items do + begin + BeginUpdate; + try + Clear; + for i := 0 to FListaSubCuentas.Count - 1 do + Add(FListaSubCuentas.Names[i]); + finally + EndUpdate; + end; + end; + Free; + end; + + //Ponemos la primera por defecto + cbSubCuentas.ItemIndex := 0; + FIdSubCuenta := StrToInt(FListaSubCuentas.Values[cbSubCuentas.Text]); //Refrescamos el valor + end; end; end. diff --git a/Source/Modulos/Contactos/Model/uBizContactos.pas b/Source/Modulos/Contactos/Model/uBizContactos.pas index 53f51a8f..11dfa9c6 100644 --- a/Source/Modulos/Contactos/Model/uBizContactos.pas +++ b/Source/Modulos/Contactos/Model/uBizContactos.pas @@ -658,13 +658,12 @@ begin RECARGO_EQUIVALENCIA := CLIENTE_RECARGO_EQUIVALENCIA; REGIMEN_IVA := AppFactuGES.Configuracion.GetSettingAsString('Clientes.RegimenIVA', CLIENTE_REGIMEN_IVA); - {$IFDEF CONTABILIDAD} - IGNORAR_CONTABILIDAD := 0; - TIENE_SUBCUENTA := 0; - {$ELSE} + //CONTABILIDAD + if Assigned(AppFactuGES.EjercicioActivo) then + IGNORAR_CONTABILIDAD := 0 + else IGNORAR_CONTABILIDAD := 1; - TIENE_SUBCUENTA := 0; - {$ENDIF} + TIENE_SUBCUENTA := 0; AFormaPagoController := TFormasPagoController.Create; try @@ -743,15 +742,13 @@ begin ID_CATEGORIA := CATEGORIA_PROVEEDOR; REGIMEN_IVA := AppFactuGES.Configuracion.GetSettingAsString('Proveedores.RegimenIVA', PROVEEDOR_REGIMEN_IVA); - {$IFDEF CONTABILIDAD} - IGNORAR_CONTABILIDAD := 0; - TIENE_SUBCUENTA := 0; - ES_ACREEDOR := 0; - {$ELSE} + //CONTABILIDAD + if Assigned(AppFactuGES.EjercicioActivo) then + IGNORAR_CONTABILIDAD := 0 + else IGNORAR_CONTABILIDAD := 1; - TIENE_SUBCUENTA := 0; - ES_ACREEDOR := 0; - {$ENDIF} + TIENE_SUBCUENTA := 0; + ES_ACREEDOR := 0; AFormaPagoController := TFormasPagoController.Create; try diff --git a/Source/Modulos/Contactos/Model/uBizContactosServer.pas b/Source/Modulos/Contactos/Model/uBizContactosServer.pas index 1d96b5fd..c9fb911d 100644 --- a/Source/Modulos/Contactos/Model/uBizContactosServer.pas +++ b/Source/Modulos/Contactos/Model/uBizContactosServer.pas @@ -241,7 +241,7 @@ begin GetClassFactory('srvReferencias').CreateInstance(AClientID, Intf); AReferenciasService := Intf as IsrvReferencias; - Result := AReferenciasService.DarNuevaReferencia(ATipo, ID_EMPRESA, ID_TIENDA) + Result := AReferenciasService.DarNuevaReferencia(ATipo, -1, ID_TIENDA) end; function TBizContactosServer._IncrementarReferenciaInterna( @@ -255,7 +255,7 @@ begin GetClassFactory('srvReferencias').CreateInstance(AClientID, Intf); AReferenciasService := Intf as IsrvReferencias; - Result := AReferenciasService.IncrementarValorReferencia(ATipo, Self.REFERENCIA, ID_EMPRESA, ID_TIENDA) + Result := AReferenciasService.IncrementarValorReferencia(ATipo, Self.REFERENCIA, -1, ID_TIENDA) end; initialization diff --git a/Source/Modulos/Contactos/Views/uEditorCliente.dfm b/Source/Modulos/Contactos/Views/uEditorCliente.dfm index c4c89767..78614fa7 100644 --- a/Source/Modulos/Contactos/Views/uEditorCliente.dfm +++ b/Source/Modulos/Contactos/Views/uEditorCliente.dfm @@ -65,7 +65,7 @@ inherited fEditorCliente: TfEditorCliente inherited pgPaginas: TPageControl Width = 890 Height = 544 - ActivePage = pagDatosComerciales + ActivePage = pagContabilidad ExplicitWidth = 890 ExplicitHeight = 544 inherited pagGeneral: TTabSheet @@ -113,18 +113,30 @@ inherited fEditorCliente: TfEditorCliente end inherited eCalle: TcxDBTextEdit Top = 243 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 243 ExplicitWidth = 428 Width = 428 end inherited cbProvincia: TcxDBComboBox Top = 270 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 270 ExplicitWidth = 336 Width = 336 end inherited cbPoblacion: TcxDBComboBox Top = 297 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 297 ExplicitWidth = 428 Width = 428 @@ -132,11 +144,19 @@ inherited fEditorCliente: TfEditorCliente inherited eCodigoPostal: TcxDBTextEdit Left = 504 Top = 270 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 504 ExplicitTop = 270 end inherited eObservaciones: TcxDBMemo Top = 426 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 426 ExplicitWidth = 838 ExplicitHeight = 74 @@ -145,36 +165,60 @@ inherited fEditorCliente: TfEditorCliente end inherited eNombreComercial: TcxDBTextEdit Top = 84 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 84 ExplicitWidth = 428 Width = 428 end inherited cbClienteBloqueado: TcxDBCheckBox Top = 348 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 348 ExplicitWidth = 538 Width = 538 end inherited cbGrupoCliente: TcxDBComboBox Top = 138 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 138 ExplicitWidth = 428 Width = 428 end inherited eBloqueo: TcxDBTextEdit Top = 375 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 375 ExplicitWidth = 428 Width = 428 end inherited eCodigoAsignado: TcxDBTextEdit Top = 111 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 111 ExplicitWidth = 428 Width = 428 end inherited cbProcedenciaCliente: TcxDBComboBox Top = 165 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 165 ExplicitWidth = 428 Width = 428 @@ -182,6 +226,10 @@ inherited fEditorCliente: TfEditorCliente inherited eTlfParticular: TcxDBTextEdit Left = 683 Top = 57 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 683 ExplicitTop = 57 ExplicitWidth = 177 @@ -190,6 +238,10 @@ inherited fEditorCliente: TfEditorCliente inherited eTlfTrabajo: TcxDBTextEdit Left = 683 Top = 30 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 683 ExplicitTop = 30 ExplicitWidth = 177 @@ -198,6 +250,10 @@ inherited fEditorCliente: TfEditorCliente inherited eTlfMovil: TcxDBTextEdit Left = 683 Top = 84 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 683 ExplicitTop = 84 ExplicitWidth = 177 @@ -206,6 +262,10 @@ inherited fEditorCliente: TfEditorCliente inherited eFax: TcxDBTextEdit Left = 683 Top = 111 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 683 ExplicitTop = 111 ExplicitWidth = 177 @@ -213,6 +273,10 @@ inherited fEditorCliente: TfEditorCliente end inherited eNombre: TcxDBTextEdit Top = 57 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 57 ExplicitWidth = 428 Width = 428 @@ -220,6 +284,10 @@ inherited fEditorCliente: TfEditorCliente inherited eNIFCIF: TcxDBTextEdit Left = 289 Top = 30 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 289 ExplicitTop = 30 ExplicitWidth = 271 @@ -229,6 +297,10 @@ inherited fEditorCliente: TfEditorCliente Left = 683 Top = 162 Properties.Prefix = 'mailto:' + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 683 ExplicitTop = 162 ExplicitWidth = 148 @@ -238,6 +310,10 @@ inherited fEditorCliente: TfEditorCliente Left = 683 Top = 190 Properties.Prefix = 'mailto:' + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 683 ExplicitTop = 190 ExplicitWidth = 148 @@ -246,6 +322,10 @@ inherited fEditorCliente: TfEditorCliente inherited ePaginaWeb: TcxDBHyperLinkEdit Left = 683 Top = 217 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 683 ExplicitTop = 217 ExplicitWidth = 148 @@ -253,12 +333,20 @@ inherited fEditorCliente: TfEditorCliente end inherited eReferencia: TcxDBTextEdit Top = 30 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 30 ExplicitWidth = 104 Width = 104 end inherited ePersonaContacto: TcxDBTextEdit Top = 216 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 216 ExplicitWidth = 428 Width = 428 @@ -270,6 +358,10 @@ inherited fEditorCliente: TfEditorCliente ExplicitTop = 270 inherited dxLayoutControl1: TdxLayoutControl inherited cbTienda: TcxComboBox + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 229 Width = 229 end @@ -295,20 +387,42 @@ inherited fEditorCliente: TfEditorCliente LookAndFeel = dxLayoutOfficeLookAndFeel ExplicitWidth = 882 inherited eEntidad: TcxDBTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 345 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 @@ -354,6 +468,10 @@ inherited fEditorCliente: TfEditorCliente inherited eDiasVencimiento: TcxDBSpinEdit Left = 696 Top = 62 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 696 ExplicitTop = 62 ExplicitWidth = 160 @@ -361,18 +479,30 @@ inherited fEditorCliente: TfEditorCliente end inherited cbRegimenIVA: TcxDBComboBox Top = 30 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 30 ExplicitWidth = 427 Width = 427 end inherited cbRecargoEquivalencia: TcxDBCheckBox Top = 111 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 111 ExplicitWidth = 427 Width = 427 end inherited cbFormaPago: TcxDBLookupComboBox Top = 57 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 57 ExplicitWidth = 289 Width = 289 @@ -385,6 +515,10 @@ inherited fEditorCliente: TfEditorCliente end inherited eIVA: TcxDBLookupComboBox Top = 84 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 84 ExplicitWidth = 289 Width = 289 @@ -439,18 +573,6 @@ inherited fEditorCliente: TfEditorCliente inherited ToolBar1: TToolBar Width = 882 ExplicitWidth = 882 - 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 @@ -527,6 +649,10 @@ inherited fEditorCliente: TfEditorCliente 882 516) inherited eRefSubCuenta: TcxDBTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 441 Width = 441 end @@ -535,6 +661,10 @@ inherited fEditorCliente: TfEditorCliente ExplicitLeft = 540 end inherited eSubCuenta: TcxDBTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 779 Width = 779 end @@ -548,9 +678,16 @@ inherited fEditorCliente: TfEditorCliente end inherited cbIgnorarContabilidad: TcxDBCheckBox DataBinding.DataSource = frViewCliente1.dsContacto + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 862 Width = 862 end + inherited rdTipoSubcuenta: TDBRadioGroup + Visible = False + end end end end diff --git a/Source/Modulos/Contactos/Views/uEditorCliente.pas b/Source/Modulos/Contactos/Views/uEditorCliente.pas index 4ce93e99..ebcdb4c5 100644 --- a/Source/Modulos/Contactos/Views/uEditorCliente.pas +++ b/Source/Modulos/Contactos/Views/uEditorCliente.pas @@ -86,7 +86,6 @@ procedure TfEditorCliente.FormShow(Sender: TObject); begin inherited; pgPaginas.ActivePageIndex := 0; - end; procedure TfEditorCliente.GuardarInterno; diff --git a/Source/Modulos/Contactos/Views/uEditorProveedor.dfm b/Source/Modulos/Contactos/Views/uEditorProveedor.dfm index fa717a84..ae3f96b6 100644 --- a/Source/Modulos/Contactos/Views/uEditorProveedor.dfm +++ b/Source/Modulos/Contactos/Views/uEditorProveedor.dfm @@ -55,6 +55,7 @@ inherited fEditorProveedor: TfEditorProveedor inherited pgPaginas: TPageControl Width = 642 Height = 489 + ActivePage = PagContabilidad ExplicitWidth = 642 ExplicitHeight = 489 inherited pagGeneral: TTabSheet @@ -102,18 +103,30 @@ inherited fEditorProveedor: TfEditorProveedor end inherited eCalle: TcxDBTextEdit Top = 243 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 243 ExplicitWidth = 174 Width = 174 end inherited cbProvincia: TcxDBComboBox Top = 270 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 270 ExplicitWidth = 175 Width = 175 end inherited cbPoblacion: TcxDBComboBox Top = 297 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 297 ExplicitWidth = 267 Width = 267 @@ -121,11 +134,19 @@ inherited fEditorProveedor: TfEditorProveedor inherited eCodigoPostal: TcxDBTextEdit Left = 310 Top = 270 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 310 ExplicitTop = 270 end inherited eObservaciones: TcxDBMemo Top = 426 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 426 ExplicitWidth = 580 ExplicitHeight = 56 @@ -134,30 +155,50 @@ inherited fEditorProveedor: TfEditorProveedor end inherited cxDBCheckBox2: TcxDBCheckBox Top = 348 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 348 ExplicitWidth = 326 Width = 326 end inherited eCertificaciones: TcxDBTextEdit Top = 375 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 375 ExplicitWidth = 227 Width = 227 end inherited cbGrupoProveedor: TcxDBComboBox Top = 165 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 165 ExplicitWidth = 227 Width = 227 end inherited eDescripcionProveedor: TcxDBTextEdit Top = 111 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 111 ExplicitWidth = 221 Width = 221 end inherited eCodigoAsignado: TcxDBTextEdit Top = 138 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 138 ExplicitWidth = 221 Width = 221 @@ -165,6 +206,10 @@ inherited fEditorProveedor: TfEditorProveedor inherited eTlfParticular: TcxDBTextEdit Left = 489 Top = 57 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 489 ExplicitTop = 57 ExplicitWidth = 172 @@ -173,6 +218,10 @@ inherited fEditorProveedor: TfEditorProveedor inherited eTlfTrabajo: TcxDBTextEdit Left = 489 Top = 30 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 489 ExplicitTop = 30 ExplicitWidth = 172 @@ -181,14 +230,32 @@ inherited fEditorProveedor: TfEditorProveedor inherited eTlfMovil: TcxDBTextEdit Left = 489 Top = 84 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 489 ExplicitTop = 84 ExplicitWidth = 172 Width = 172 end + inherited eNombreComercial: TcxDBTextEdit + Top = 84 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitTop = 84 + ExplicitWidth = 192 + Width = 192 + end inherited eFax: TcxDBTextEdit Left = 489 Top = 111 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 489 ExplicitTop = 111 ExplicitWidth = 172 @@ -196,6 +263,10 @@ inherited fEditorProveedor: TfEditorProveedor end inherited eNombre: TcxDBTextEdit Top = 57 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 57 ExplicitWidth = 263 Width = 263 @@ -203,21 +274,23 @@ inherited fEditorProveedor: TfEditorProveedor inherited eNIFCIF: TcxDBTextEdit Left = 216 Top = 30 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 216 ExplicitTop = 30 ExplicitWidth = 254 Width = 254 end - inherited eNombreComercial: TcxDBTextEdit - Top = 84 - ExplicitTop = 84 - ExplicitWidth = 192 - Width = 192 - end inherited eMailTrabajo: TcxDBHyperLinkEdit Left = 489 Top = 162 Properties.Prefix = 'mailto:' + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 489 ExplicitTop = 162 ExplicitWidth = 129 @@ -227,6 +300,10 @@ inherited fEditorProveedor: TfEditorProveedor Left = 489 Top = 190 Properties.Prefix = 'mailto:' + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 489 ExplicitTop = 190 ExplicitWidth = 165 @@ -235,6 +312,10 @@ inherited fEditorProveedor: TfEditorProveedor inherited ePaginaWeb: TcxDBHyperLinkEdit Left = 489 Top = 217 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 489 ExplicitTop = 217 ExplicitWidth = 165 @@ -242,12 +323,20 @@ inherited fEditorProveedor: TfEditorProveedor end inherited eReferencia: TcxDBTextEdit Top = 30 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 30 ExplicitWidth = 100 Width = 100 end inherited ePersonaContacto: TcxDBTextEdit Top = 216 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 216 ExplicitWidth = 253 Width = 253 @@ -263,6 +352,10 @@ inherited fEditorProveedor: TfEditorProveedor Width = 290 ExplicitWidth = 290 inherited cbTienda: TcxComboBox + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 250 Width = 250 end @@ -284,20 +377,42 @@ inherited fEditorProveedor: TfEditorProveedor LookAndFeel = dxLayoutOfficeLookAndFeel 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 @@ -337,12 +452,20 @@ inherited fEditorProveedor: TfEditorProveedor end inherited cbRegimenIVA: TcxDBComboBox Top = 30 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 30 ExplicitWidth = 121 Width = 121 end inherited cbFormaPago: TcxDBLookupComboBox Top = 57 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 57 ExplicitWidth = 121 Width = 121 @@ -355,6 +478,10 @@ inherited fEditorProveedor: TfEditorProveedor end inherited eIVA: TcxDBLookupComboBox Top = 84 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 84 ExplicitWidth = 121 Width = 121 @@ -368,6 +495,10 @@ inherited fEditorProveedor: TfEditorProveedor inherited eDescuento: TcxDBSpinEdit Left = 456 Top = 62 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 456 ExplicitTop = 62 ExplicitWidth = 73 @@ -404,18 +535,6 @@ inherited fEditorProveedor: TfEditorProveedor inherited ToolBar1: TToolBar Width = 634 ExplicitWidth = 634 - 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 @@ -445,6 +564,10 @@ inherited fEditorProveedor: TfEditorProveedor ExplicitWidth = 634 ExplicitHeight = 461 inherited eRefSubCuenta: TcxDBTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 346 Width = 346 end @@ -453,6 +576,10 @@ inherited fEditorProveedor: TfEditorProveedor ExplicitLeft = 292 end inherited eSubCuenta: TcxDBTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 265 Width = 265 end @@ -466,29 +593,19 @@ inherited fEditorProveedor: TfEditorProveedor end inherited cbIgnorarContabilidad: TcxDBCheckBox DataBinding.DataSource = frViewProveedor1.dsContacto + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 300 Width = 300 end + inherited rdTipoSubcuenta: TDBRadioGroup + DataField = 'ES_ACREEDOR' + DataSource = dsDataTable + end end end - object rdTipoSubcuenta: TDBRadioGroup - Left = 93 - Top = 111 - Width = 212 - Height = 58 - Caption = 'Tipo subcuenta' - Columns = 2 - DataField = 'ES_ACREEDOR' - DataSource = dsDataTable - Items.Strings = ( - 'Proveedor' - 'Acreedor') - ParentBackground = True - TabOrder = 1 - Values.Strings = ( - '0' - '1') - end end end inherited StatusBar: TJvStatusBar diff --git a/Source/Modulos/Contactos/Views/uEditorProveedor.pas b/Source/Modulos/Contactos/Views/uEditorProveedor.pas index 616f3e4f..64023043 100644 --- a/Source/Modulos/Contactos/Views/uEditorProveedor.pas +++ b/Source/Modulos/Contactos/Views/uEditorProveedor.pas @@ -26,7 +26,6 @@ type actGruposProveedor: TAction; PagContabilidad: TTabSheet; frViewSubCuentaContacto1: TfrViewSubCuentaContacto; - rdTipoSubcuenta: TDBRadioGroup; procedure actGruposProveedorExecute(Sender: TObject); protected procedure GuardarInterno; override; @@ -90,7 +89,7 @@ begin (Controller as IProveedoresController).SetTieneSubCuenta(Contacto as IBizProveedor, False); (Contacto as IBizProveedor).Edit; - (Contacto as IBizProveedor).ES_ACREEDOR := StrToInt(rdTipoSubcuenta.Value); + (Contacto as IBizProveedor).ES_ACREEDOR := StrToInt(frViewSubCuentaContacto1.rdTipoSubcuenta.Value); //Evitamos que cada vez que se añada un proveedor te pregunta por defecto se crea y punto. //Otro caso es al modificar que si que hay que preguntar por si acaso desea asignar el manualmente una subcuenta existente @@ -128,7 +127,7 @@ begin frViewSubCuentaContacto1.Contacto := Contacto; if Contacto.EsNuevo then - rdTipoSubcuenta.ItemIndex := 0; + frViewSubCuentaContacto1.rdTipoSubcuenta.ItemIndex := 0; end else begin diff --git a/Source/Modulos/Contactos/Views/uViewSubCuentaContacto.dfm b/Source/Modulos/Contactos/Views/uViewSubCuentaContacto.dfm index ffca8a9b..19fa8d0b 100644 --- a/Source/Modulos/Contactos/Views/uViewSubCuentaContacto.dfm +++ b/Source/Modulos/Contactos/Views/uViewSubCuentaContacto.dfm @@ -5,6 +5,7 @@ inherited frViewSubCuentaContacto: TfrViewSubCuentaContacto AutoSize = True OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy + OnShow = CustomViewShow ExplicitWidth = 451 ExplicitHeight = 304 object layoutApunte: TdxLayoutControl @@ -17,8 +18,6 @@ inherited frViewSubCuentaContacto: TfrViewSubCuentaContacto TabOrder = 0 TabStop = False AutoContentSizes = [acsWidth, acsHeight] - ExplicitWidth = 577 - ExplicitHeight = 143 DesignSize = ( 451 304) @@ -36,9 +35,13 @@ inherited frViewSubCuentaContacto: TfrViewSubCuentaContacto Style.Color = 14745599 Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 1 Width = 346 end @@ -100,9 +103,13 @@ inherited frViewSubCuentaContacto: TfrViewSubCuentaContacto Style.Color = 14745599 Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 5 Width = 265 end @@ -174,15 +181,36 @@ inherited frViewSubCuentaContacto: TfrViewSubCuentaContacto Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 0 Width = 300 end + object rdTipoSubcuenta: TDBRadioGroup + Left = 10 + Top = 95 + Width = 212 + Height = 58 + Caption = 'Tipo subcuenta' + Columns = 2 + DataSource = DADataSource + Items.Strings = ( + 'Proveedor' + 'Acreedor') + ParentBackground = True + TabOrder = 6 + Values.Strings = ( + '0' + '1') + end object layoutApunteGroup_Root: TdxLayoutGroup ShowCaption = False Hidden = True @@ -237,6 +265,13 @@ inherited frViewSubCuentaContacto: TfrViewSubCuentaContacto Control = eSubCuenta ControlOptions.ShowBorder = False end + object layoutApunteItem7: TdxLayoutItem + AutoAligns = [aaVertical] + ShowCaption = False + Control = rdTipoSubcuenta + ControlOptions.AutoColor = True + ControlOptions.ShowBorder = False + end end end end diff --git a/Source/Modulos/Contactos/Views/uViewSubCuentaContacto.pas b/Source/Modulos/Contactos/Views/uViewSubCuentaContacto.pas index 79a1ca14..302b1683 100644 --- a/Source/Modulos/Contactos/Views/uViewSubCuentaContacto.pas +++ b/Source/Modulos/Contactos/Views/uViewSubCuentaContacto.pas @@ -43,6 +43,8 @@ type cbIgnorarContabilidad: TcxDBCheckBox; layoutApunteGroup2: TdxLayoutGroup; SmallImages: TPngImageList; + layoutApunteItem7: TdxLayoutItem; + rdTipoSubcuenta: TDBRadioGroup; procedure CustomViewCreate(Sender: TObject); procedure CustomViewDestroy(Sender: TObject); procedure actElegirSubCuentaExecute(Sender: TObject); @@ -52,12 +54,13 @@ type procedure actElegirSubCuentaUpdate(Sender: TObject); procedure actAnadirSubcuentaUpdate(Sender: TObject); procedure actVerSubcuentaUpdate(Sender: TObject); - + procedure CustomViewShow(Sender: TObject); protected FController : ISubcuentasController; FContacto: IBizContacto; function GetContacto: IBizContacto; procedure SetContacto(const Value: IBizContacto); + public property Contacto: IBizContacto read GetContacto write SetContacto; end; @@ -65,6 +68,7 @@ type implementation {$R *.dfm} +uses uFactuGes_App; { TfrViewSubCuenta } @@ -153,18 +157,37 @@ begin inherited; end; +procedure TfrViewSubCuentaContacto.CustomViewShow(Sender: TObject); +begin + inherited; + //Solo se activará la vista de contabilidad si existe un ejercicio activo + if Assigned(AppFactuGES.EjercicioActivo) then + begin + layoutApunte.Enabled := True; + actLista.State := asNormal; + cbIgnorarContabilidad.Enabled := True; + BitBtn1.Enabled := True; + BitBtn2.Enabled := True; + BitBtn3.Enabled := True; + rdTipoSubcuenta.Enabled := True; + end + else + begin + layoutApunte.Enabled := False; + actLista.State := asSuspended; + cbIgnorarContabilidad.Enabled := False; + BitBtn1.Enabled := False; + BitBtn2.Enabled := False; + BitBtn3.Enabled := False; + rdTipoSubcuenta.Enabled := False; + end; +end; + function TfrViewSubCuentaContacto.GetContacto: IBizContacto; begin Result := FContacto; end; -{ -procedure TfrViewApunte.SetController(const Value: IApuntesController); -begin - FController := Value; -end; -} - procedure TfrViewSubCuentaContacto.SetContacto(const Value: IBizContacto); begin FContacto := Value; diff --git a/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm b/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm index aff3952a..f1237af4 100644 --- a/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Data/uDataModuleFacturasProveedor.dfm @@ -147,11 +147,13 @@ inherited DataModuleFacturasProveedor: TDataModuleFacturasProveedor Name = 'NOMBRE_PROVEEDOR' DataType = datString Size = 255 + ServerAutoRefresh = True end item Name = 'NOMBRE_COMERCIAL_PROVEEDOR' DataType = datString Size = 255 + ServerAutoRefresh = True end item Name = 'NIF_CIF' @@ -165,6 +167,7 @@ inherited DataModuleFacturasProveedor: TDataModuleFacturasProveedor DataType = datString Size = 100 DisplayLabel = 'Cliente' + ServerAutoRefresh = True DictionaryEntry = 'FacturasProveedor_NOMBRE' end item diff --git a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas index 5d69d47b..31ffbf50 100644 --- a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas +++ b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas @@ -3,14 +3,14 @@ unit schFacturasProveedorClient_Intf; interface uses - Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; + Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; const { Data table rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_FacturasProveedor = '{C1A41E2D-D6D0-4C5E-81A9-721D4AFFE1F4}'; - RID_FacturasProveedor_Detalles = '{30413551-703B-40FA-8212-2B1312AF4F45}'; + RID_FacturasProveedor = '{0EF26853-CA11-423C-A717-4B46C60A1D1B}'; + RID_FacturasProveedor_Detalles = '{55ADC035-4592-4CDA-968B-F19217917CD1}'; { Data table names } nme_FacturasProveedor = 'FacturasProveedor'; @@ -133,7 +133,7 @@ const type { IFacturasProveedor } IFacturasProveedor = interface(IDAStronglyTypedDataTable) - ['{4BDA0973-DD80-4CEF-AEA6-34D91B8A485F}'] + ['{83594315-B925-4468-8505-380368A507A6}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -374,7 +374,7 @@ type end; { TFacturasProveedorDataTableRules } - TFacturasProveedorDataTableRules = class(TIntfObjectDADataTableRules, IFacturasProveedor) + TFacturasProveedorDataTableRules = class(TDADataTableRules, IFacturasProveedor) private f_OBSERVACIONES: IROStrings; procedure OBSERVACIONES_OnChange(Sender: TObject); @@ -624,7 +624,7 @@ type { IFacturasProveedor_Detalles } IFacturasProveedor_Detalles = interface(IDAStronglyTypedDataTable) - ['{A98F227B-0E99-4F1B-9D14-57E3B766C981}'] + ['{D0DDC85A-B7D6-4471-8F74-08884C18C78C}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -716,7 +716,7 @@ type end; { TFacturasProveedor_DetallesDataTableRules } - TFacturasProveedor_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IFacturasProveedor_Detalles) + TFacturasProveedor_DetallesDataTableRules = class(TDADataTableRules, IFacturasProveedor_Detalles) private protected { Property getters and setters } diff --git a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas index c263e6a1..def1e139 100644 --- a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas +++ b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorServer_Intf.pas @@ -9,13 +9,13 @@ const { Delta rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_FacturasProveedorDelta = '{FC1B803A-C284-40C6-B1DB-9CBB0EFFA393}'; - RID_FacturasProveedor_DetallesDelta = '{6277ABDB-ACDE-4763-AAE1-E74B4A1BA48E}'; + RID_FacturasProveedorDelta = '{0F97D038-E9E1-454B-9E40-B4E22FA5BDDE}'; + RID_FacturasProveedor_DetallesDelta = '{2DA1017B-00B9-4125-B47A-1D65D934DFE7}'; type { IFacturasProveedorDelta } IFacturasProveedorDelta = interface(IFacturasProveedor) - ['{FC1B803A-C284-40C6-B1DB-9CBB0EFFA393}'] + ['{0F97D038-E9E1-454B-9E40-B4E22FA5BDDE}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -506,7 +506,7 @@ type { IFacturasProveedor_DetallesDelta } IFacturasProveedor_DetallesDelta = interface(IFacturasProveedor_Detalles) - ['{6277ABDB-ACDE-4763-AAE1-E74B4A1BA48E}'] + ['{2DA1017B-00B9-4125-B47A-1D65D934DFE7}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_FACTURAValue : Integer; diff --git a/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas b/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas index c3cadec0..8e20c331 100644 --- a/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas +++ b/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas @@ -266,7 +266,12 @@ begin SITUACION := CTE_PENDIENTE; ID_TIENDA := AppFactuGES.TiendaActiva.ID; TIENDA := AppFactuGES.TiendaActiva.NOMBRE; - IGNORAR_CONTABILIDAD := 0; + + //CONTABILIDAD + if Assigned(AppFactuGES.EjercicioActivo) then + IGNORAR_CONTABILIDAD := 0 + else + IGNORAR_CONTABILIDAD := 1; end; procedure TBizFacturaProveedor.IVAOnChange(Sender: TDACustomField); diff --git a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm index 30773193..1a189dbc 100644 --- a/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm +++ b/Source/Modulos/Facturas de proveedor/Servidor/srvFacturasProveedor_Impl.dfm @@ -282,11 +282,13 @@ object srvFacturasProveedor: TsrvFacturasProveedor Name = 'NOMBRE_PROVEEDOR' DataType = datString Size = 255 + ServerAutoRefresh = True end item Name = 'NOMBRE_COMERCIAL_PROVEEDOR' DataType = datString Size = 255 + ServerAutoRefresh = True end item Name = 'NIF_CIF' @@ -298,6 +300,7 @@ object srvFacturasProveedor: TsrvFacturasProveedor Name = 'NOMBRE' DataType = datString Size = 100 + ServerAutoRefresh = True DictionaryEntry = 'FacturasProveedor_NOMBRE' end item @@ -1275,6 +1278,7 @@ object srvFacturasProveedor: TsrvFacturasProveedor DataType = datString Size = 100 DisplayLabel = 'Cliente' + ServerAutoRefresh = True end item Name = 'FacturasProveedor_CALLE' @@ -1472,7 +1476,7 @@ object srvFacturasProveedor: TsrvFacturasProveedor DeleteCommandName = 'Delete_FacturasProveedor' UpdateCommandName = 'Update_FacturasProveedor' ReferencedDataset = 'FacturasProveedor' - ProcessorOptions = [poPrepareCommands] + ProcessorOptions = [poAutoGenerateRefreshDataset, poPrepareCommands] UpdateMode = updWhereKeyOnly Left = 280 Top = 16 diff --git a/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.res b/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.res index 1641339f..8b251f31 100644 Binary files a/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.res and b/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.res differ diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm index f6576efb..af0c3344 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm @@ -71,6 +71,7 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor inherited pgPaginas: TPageControl Width = 740 Height = 342 + ActivePage = pagContabilidad OnChanging = pgPaginasChanging ExplicitLeft = 3 ExplicitTop = 79 @@ -106,18 +107,36 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor 732 314) inherited eReferencia: TcxDBTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 191 Width = 191 end inherited edtFecha: TcxDBDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 191 Width = 191 end inherited memObservaciones: TcxDBMemo + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 671 + ExplicitHeight = 170 + Height = 170 Width = 671 end inherited cbFormaPago: TcxDBLookupComboBox + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 53 Width = 53 end @@ -126,6 +145,10 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ExplicitLeft = 183 end inherited eReferenciaProveedor: TcxDBTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 191 Width = 191 end @@ -134,13 +157,22 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ExplicitWidth = 293 inherited dxLayoutControl1: TdxLayoutControl Width = 293 + ExplicitWidth = 293 inherited cbTienda: TcxComboBox + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 232 Width = 232 end end end inherited edtFechaVencimiento: TcxDBDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 191 Width = 191 end @@ -158,31 +190,55 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor end inherited edtlNombre: TcxDBTextEdit DataBinding.DataSource = dsDataTable + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 259 Width = 259 end inherited edtNIFCIF: TcxDBTextEdit DataBinding.DataSource = dsDataTable + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 259 Width = 259 end inherited edtCalle: TcxDBTextEdit DataBinding.DataSource = dsDataTable + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 259 Width = 259 end inherited edtPoblacion: TcxDBTextEdit DataBinding.DataSource = dsDataTable + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 141 Width = 141 end inherited edtProvincia: TcxDBTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 259 Width = 259 end inherited edtCodigoPostal: TcxDBTextEdit Left = 258 DataBinding.DataSource = dsDataTable + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 258 end inherited Button3: TBitBtn @@ -190,6 +246,10 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ExplicitLeft = 142 end inherited cxDBTextEdit1: TcxDBTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 259 Width = 259 end @@ -317,12 +377,20 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ExplicitWidth = 732 inherited cbSubCuentas: TcxComboBox Left = 92 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 92 ExplicitWidth = 407 Width = 407 end inherited eContabilizar: TcxCheckBox Left = 505 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 505 ExplicitWidth = 217 Width = 217 @@ -390,7 +458,11 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor end inherited ImporteDto: TcxDBCurrencyEdit Top = 131 + Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 131 ExplicitWidth = 207 Width = 207 @@ -398,7 +470,11 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor inherited ImporteIVA: TcxDBCurrencyEdit Left = 581 Top = 57 + Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 581 ExplicitTop = 57 ExplicitWidth = 143 @@ -407,7 +483,11 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor inherited ImporteTotal: TcxDBCurrencyEdit Left = 511 Top = 131 + Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 511 ExplicitTop = 131 ExplicitWidth = 213 @@ -416,20 +496,32 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor inherited edtDescuento: TcxDBSpinEdit Top = 131 Properties.OnValidate = frViewTotales1edtDescuentoPropertiesValidate + Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 131 end inherited edtIVA: TcxDBSpinEdit Left = 510 Top = 57 + Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 510 ExplicitTop = 57 end inherited ImporteBase: TcxDBCurrencyEdit Left = 510 Top = 30 + Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 510 ExplicitTop = 30 ExplicitWidth = 214 @@ -439,14 +531,22 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor Left = 510 Top = 84 Properties.AssignedValues.MinValue = True + Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 510 ExplicitTop = 84 end inherited ImporteRE: TcxDBCurrencyEdit Left = 581 Top = 84 + Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 581 ExplicitTop = 84 ExplicitWidth = 143 @@ -454,7 +554,11 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor end inherited eImporteNeto: TcxDBCurrencyEdit Top = 30 + Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 30 ExplicitWidth = 278 Width = 278 @@ -463,7 +567,11 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor Top = 158 DataBinding.DataSource = dsDataTable Properties.OnValidate = frViewTotales1ePortePropertiesValidate + Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' OnEditing = frViewTotales1ePorteEditing ExplicitTop = 158 ExplicitWidth = 278 @@ -473,6 +581,10 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor Top = 57 Properties.OnValidate = frViewTotales1eIVAPropertiesValidate Style.Color = clInfoBk + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 57 ExplicitWidth = 140 Width = 140 @@ -487,6 +599,10 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor inherited cbRecargoEquivalencia: TcxDBCheckBox Top = 84 Properties.OnEditValueChanged = frViewTotales1cbRecargoEquivalenciaPropertiesEditValueChanged + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitTop = 84 ExplicitWidth = 278 Width = 278 diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas index 2c0408d1..c913ddad 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas +++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas @@ -433,8 +433,8 @@ begin end; {$IFDEF CONTABILIDAD} - frViewListaSubCuentas1.eContabilizar.EditValue := FFactura.IGNORAR_CONTABILIDAD; - frViewListaSubCuentas1.ElegirSubCuenta(FFactura.ID_SUBCUENTA); + frViewListaSubCuentas1.eContabilizar.EditValue := FFactura.IGNORAR_CONTABILIDAD; + frViewListaSubCuentas1.ElegirSubCuenta(FFactura.ID_SUBCUENTA); {$ENDIF} end diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm index 2568eb2e..96a773de 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm @@ -78,6 +78,10 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor Caption = 'Proveedor' DataBinding.FieldName = 'NOMBRE_PROVEEDOR' end + object cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn + Caption = 'Nombre comercial' + DataBinding.FieldName = 'NOMBRE_COMERCIAL' + end object cxGridViewNIF_CIF: TcxGridDBColumn DataBinding.FieldName = 'NIF_CIF' Visible = False @@ -149,9 +153,6 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor DataBinding.FieldName = 'REFERENCIA_COMISION' Visible = False end - object cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn - DataBinding.FieldName = 'NOMBRE_COMERCIAL' - end end inherited cxGridLevel: TcxGridLevel Caption = 'Todas' @@ -175,15 +176,27 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor Width = 531 ExplicitWidth = 531 inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 434 Width = 434 end inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 130 Width = 130 end inherited edtFechaFinFiltro: TcxDateEdit Left = 234 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 234 ExplicitWidth = 287 Width = 287 diff --git a/Source/Modulos/Recibos de proveedor/Data/uDataModuleRecibosProveedor.dfm b/Source/Modulos/Recibos de proveedor/Data/uDataModuleRecibosProveedor.dfm index 11f4fce4..8c992717 100644 --- a/Source/Modulos/Recibos de proveedor/Data/uDataModuleRecibosProveedor.dfm +++ b/Source/Modulos/Recibos de proveedor/Data/uDataModuleRecibosProveedor.dfm @@ -371,6 +371,7 @@ inherited DataModuleRecibosProveedor: TDataModuleRecibosProveedor Name = 'SITUACION' DataType = datString Size = 9 + ServerAutoRefresh = True DictionaryEntry = 'RecibosProveedor_SITUACION' end item @@ -453,6 +454,7 @@ inherited DataModuleRecibosProveedor: TDataModuleRecibosProveedor Name = 'IMPORTE_TOTAL' DataType = datCurrency Alignment = taRightJustify + ServerAutoRefresh = True DictionaryEntry = 'RecibosProveedor_IMPORTE_TOTAL' end item @@ -471,6 +473,7 @@ inherited DataModuleRecibosProveedor: TDataModuleRecibosProveedor DataType = datString Size = 255 DisplayLabel = 'RecibosProveedor_NOMBRE_PROVEEDOR' + ServerAutoRefresh = True DictionaryEntry = 'RecibosProveedor_NOMBRE_PROVEEDOR' end item diff --git a/Source/Modulos/Recibos de proveedor/Model/schRecibosProveedorClient_Intf.pas b/Source/Modulos/Recibos de proveedor/Model/schRecibosProveedorClient_Intf.pas index 13ef2769..b1880ae7 100644 --- a/Source/Modulos/Recibos de proveedor/Model/schRecibosProveedorClient_Intf.pas +++ b/Source/Modulos/Recibos de proveedor/Model/schRecibosProveedorClient_Intf.pas @@ -3,15 +3,15 @@ unit schRecibosProveedorClient_Intf; interface uses - Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; + Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; const { Data table rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_RecibosCompensadosProv = '{E2472472-0602-480F-B0B3-4A244220F39B}'; - RID_RecibosProveedor = '{F9A79E58-48A5-498C-879C-A227E869D2F7}'; - RID_PagosProveedor = '{B7B59894-9E45-461C-87FE-0B7C6F770A6F}'; + RID_RecibosCompensadosProv = '{A4D4F8FA-E771-4944-8F36-16B6A52DF602}'; + RID_RecibosProveedor = '{3B0F5C4B-BA5A-4503-9B85-D3F31A9B204E}'; + RID_PagosProveedor = '{F079C5BF-44B6-4E92-98E8-EE630E2A27C9}'; { Data table names } nme_RecibosCompensadosProv = 'RecibosCompensadosProv'; @@ -211,7 +211,7 @@ const type { IRecibosCompensadosProv } IRecibosCompensadosProv = interface(IDAStronglyTypedDataTable) - ['{DD89E7A5-C9AE-42DB-B722-15E108E9A89E}'] + ['{8CDC61D9-4223-4C3D-8DE2-93F8140FE4BC}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -447,7 +447,7 @@ type end; { TRecibosCompensadosProvDataTableRules } - TRecibosCompensadosProvDataTableRules = class(TIntfObjectDADataTableRules, IRecibosCompensadosProv) + TRecibosCompensadosProvDataTableRules = class(TDADataTableRules, IRecibosCompensadosProv) private protected { Property getters and setters } @@ -690,7 +690,7 @@ type { IRecibosProveedor } IRecibosProveedor = interface(IDAStronglyTypedDataTable) - ['{E2ED1264-BBB0-4DB5-89AC-C62CBEA6E7CB}'] + ['{A3089684-8FDA-44D5-A5B2-3327D4894A6F}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -926,7 +926,7 @@ type end; { TRecibosProveedorDataTableRules } - TRecibosProveedorDataTableRules = class(TIntfObjectDADataTableRules, IRecibosProveedor) + TRecibosProveedorDataTableRules = class(TDADataTableRules, IRecibosProveedor) private protected { Property getters and setters } @@ -1169,7 +1169,7 @@ type { IPagosProveedor } IPagosProveedor = interface(IDAStronglyTypedDataTable) - ['{5A522745-E1FA-45A1-BB4E-A5875022F5F3}'] + ['{1C8D1CBD-87BA-47CF-ADDA-ECDF8BAF5F4E}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1255,7 +1255,7 @@ type end; { TPagosProveedorDataTableRules } - TPagosProveedorDataTableRules = class(TIntfObjectDADataTableRules, IPagosProveedor) + TPagosProveedorDataTableRules = class(TDADataTableRules, IPagosProveedor) private protected { Property getters and setters } diff --git a/Source/Modulos/Recibos de proveedor/Model/schRecibosProveedorServer_Intf.pas b/Source/Modulos/Recibos de proveedor/Model/schRecibosProveedorServer_Intf.pas index 80ddfbc0..7593beac 100644 --- a/Source/Modulos/Recibos de proveedor/Model/schRecibosProveedorServer_Intf.pas +++ b/Source/Modulos/Recibos de proveedor/Model/schRecibosProveedorServer_Intf.pas @@ -9,14 +9,14 @@ const { Delta rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_RecibosCompensadosProvDelta = '{D05965BE-7A62-4E86-A945-847A4E347F75}'; - RID_RecibosProveedorDelta = '{54B83AC6-612E-4184-9293-1216286F261E}'; - RID_PagosProveedorDelta = '{2BDCF56A-4D48-45E2-87B9-F1D0E3E35738}'; + RID_RecibosCompensadosProvDelta = '{E95FB3AF-C9FA-4D99-89BD-57C6A4876A41}'; + RID_RecibosProveedorDelta = '{33917437-C0D3-47D1-B9D6-4F5690CA0B91}'; + RID_PagosProveedorDelta = '{A624BF64-9338-42F1-A371-05E83CD550D8}'; type { IRecibosCompensadosProvDelta } IRecibosCompensadosProvDelta = interface(IRecibosCompensadosProv) - ['{D05965BE-7A62-4E86-A945-847A4E347F75}'] + ['{E95FB3AF-C9FA-4D99-89BD-57C6A4876A41}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_RECIBO_COMPENSADOValue : Integer; @@ -494,7 +494,7 @@ type { IRecibosProveedorDelta } IRecibosProveedorDelta = interface(IRecibosProveedor) - ['{54B83AC6-612E-4184-9293-1216286F261E}'] + ['{33917437-C0D3-47D1-B9D6-4F5690CA0B91}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_RECIBO_COMPENSADOValue : Integer; @@ -972,7 +972,7 @@ type { IPagosProveedorDelta } IPagosProveedorDelta = interface(IPagosProveedor) - ['{2BDCF56A-4D48-45E2-87B9-F1D0E3E35738}'] + ['{A624BF64-9338-42F1-A371-05E83CD550D8}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_RECIBOValue : Integer; diff --git a/Source/Modulos/Recibos de proveedor/Servidor/srvRecibosProveedor_Impl.dfm b/Source/Modulos/Recibos de proveedor/Servidor/srvRecibosProveedor_Impl.dfm index c7addbc3..20e52442 100644 --- a/Source/Modulos/Recibos de proveedor/Servidor/srvRecibosProveedor_Impl.dfm +++ b/Source/Modulos/Recibos de proveedor/Servidor/srvRecibosProveedor_Impl.dfm @@ -551,6 +551,7 @@ object srvRecibosProveedor: TsrvRecibosProveedor Name = 'SITUACION' DataType = datString Size = 9 + ServerAutoRefresh = True DictionaryEntry = 'RecibosProveedor_SITUACION' end item @@ -626,6 +627,7 @@ object srvRecibosProveedor: TsrvRecibosProveedor item Name = 'IMPORTE_TOTAL' DataType = datCurrency + ServerAutoRefresh = True DictionaryEntry = 'RecibosProveedor_IMPORTE_TOTAL' end item @@ -642,6 +644,7 @@ object srvRecibosProveedor: TsrvRecibosProveedor Name = 'NOMBRE_PROVEEDOR' DataType = datString Size = 255 + ServerAutoRefresh = True DictionaryEntry = 'RecibosProveedor_NOMBRE_PROVEEDOR' end item @@ -1420,7 +1423,7 @@ object srvRecibosProveedor: TsrvRecibosProveedor DeleteCommandName = 'Delete_RecibosProveedor' UpdateCommandName = 'Update_RecibosProveedor' ReferencedDataset = 'RecibosProveedor' - ProcessorOptions = [poPrepareCommands] + ProcessorOptions = [poAutoGenerateRefreshDataset, poPrepareCommands] UpdateMode = updWhereKeyOnly Left = 192 Top = 24 @@ -1435,6 +1438,7 @@ object srvRecibosProveedor: TsrvRecibosProveedor Name = 'RecibosProveedor_NOMBRE_PROVEEDOR' DataType = datString Size = 255 + ServerAutoRefresh = True end item Name = 'RecibosProveedor_NIF_CIF_PROVEEDOR' @@ -1550,6 +1554,7 @@ object srvRecibosProveedor: TsrvRecibosProveedor DataType = datString Size = 9 DisplayLabel = 'SITUACION' + ServerAutoRefresh = True end item Name = 'RecibosProveedor_ID_FACTURA' @@ -1595,6 +1600,7 @@ object srvRecibosProveedor: TsrvRecibosProveedor DataType = datCurrency DisplayLabel = 'IMPORTE_TOTAL' Alignment = taRightJustify + ServerAutoRefresh = True end item Name = 'RecibosProveedor_FECHA_FACTURA' diff --git a/Source/Modulos/Recibos de proveedor/Views/RecibosProveedor_view.res b/Source/Modulos/Recibos de proveedor/Views/RecibosProveedor_view.res index 1641339f..8b251f31 100644 Binary files a/Source/Modulos/Recibos de proveedor/Views/RecibosProveedor_view.res and b/Source/Modulos/Recibos de proveedor/Views/RecibosProveedor_view.res differ diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorFechaPagoProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uEditorFechaPagoProveedor.dfm index 8c21093d..7f374d70 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uEditorFechaPagoProveedor.dfm +++ b/Source/Modulos/Recibos de proveedor/Views/uEditorFechaPagoProveedor.dfm @@ -58,8 +58,6 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor Height = 41 Align = alBottom TabOrder = 1 - ExplicitTop = 248 - ExplicitWidth = 409 object bAceptar: TButton Left = 38 Top = 8 @@ -96,10 +94,18 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor ExplicitTop = 80 inherited dxLayoutControl1: TdxLayoutControl inherited cbSubCuentas: TcxComboBox + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 376 Width = 376 end inherited eContabilizar: TcxCheckBox + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 203 Width = 203 end diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorFechaPagoProveedor.pas b/Source/Modulos/Recibos de proveedor/Views/uEditorFechaPagoProveedor.pas index 59d73a8c..ee3bf710 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uEditorFechaPagoProveedor.pas +++ b/Source/Modulos/Recibos de proveedor/Views/uEditorFechaPagoProveedor.pas @@ -43,7 +43,7 @@ implementation {$R *.dfm} {$INCLUDE ..\..\..\FactuGES.inc} -uses uDialogUtils; +uses uDialogUtils, uFactuGES_App; procedure TfEditorFechaPagoProveedor.DeshabilitarContabilidad; begin @@ -92,6 +92,16 @@ begin {$ELSE} frViewListaSubCuentas1.Visible := false; {$ENDIF} + + //Contabilidad + if Assigned(AppFactuGES.EjercicioActivo) then + begin + frViewListaSubcuentas1.eContabilizar.Checked := False; + end + else + begin + frViewListaSubcuentas1.eContabilizar.Checked := True; + end; end; function TfEditorFechaPagoProveedor.GetFechaPago: TDateTime; diff --git a/Source/Modulos/Remesas de proveedor/Views/uEditorRemesaProveedor.dfm b/Source/Modulos/Remesas de proveedor/Views/uEditorRemesaProveedor.dfm index 56bdeab0..482f265b 100644 --- a/Source/Modulos/Remesas de proveedor/Views/uEditorRemesaProveedor.dfm +++ b/Source/Modulos/Remesas de proveedor/Views/uEditorRemesaProveedor.dfm @@ -176,34 +176,64 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor ExplicitWidth = 685 ExplicitHeight = 210 inherited eReferencia: TcxDBTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 164 Width = 164 end inherited eDescripcion: TcxDBTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 108 Width = 108 end inherited edtFechaRemesa: TcxDBDateEdit Left = 419 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 419 ExplicitWidth = 170 Width = 170 end inherited cbCuentaBancaria: TcxDBLookupComboBox + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 39 Width = 39 end + inherited cbTipo: TcxDBImageComboBox + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + end inherited frViewListaSubcuentas1: TfrViewListaSubcuentas Width = 453 ExplicitWidth = 453 inherited dxLayoutControl1: TdxLayoutControl Width = 453 inherited cbSubCuentas: TcxComboBox + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 376 Width = 376 end inherited eContabilizar: TcxCheckBox Left = 424 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 424 ExplicitWidth = 203 Width = 203 @@ -272,7 +302,11 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor Left = 163 Top = 111 DataBinding.DataField = '' + Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 163 ExplicitTop = 111 ExplicitWidth = 93 @@ -282,7 +316,11 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor Left = 530 Top = 37 DataBinding.DataField = '' + Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 530 ExplicitTop = 37 ExplicitWidth = 137 @@ -291,7 +329,11 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor inherited ImporteTotal: TcxDBCurrencyEdit Left = 460 Top = 111 + Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 460 ExplicitTop = 111 ExplicitWidth = 137 @@ -301,7 +343,11 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor Left = 92 Top = 111 DataBinding.DataField = '' + Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 92 ExplicitTop = 111 end @@ -309,7 +355,11 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor Left = 459 Top = 37 DataBinding.DataField = '' + Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 459 ExplicitTop = 37 end @@ -317,7 +367,11 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor Left = 459 Top = 10 DataBinding.DataField = '' + Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 459 ExplicitTop = 10 ExplicitWidth = 92 @@ -327,7 +381,11 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor Left = 459 Top = 64 DataBinding.DataField = '' + Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 459 ExplicitTop = 64 end @@ -335,7 +393,11 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor Left = 530 Top = 64 DataBinding.DataField = '' + Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 530 ExplicitTop = 64 ExplicitWidth = 56 @@ -345,7 +407,11 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor Left = 92 Top = 10 DataBinding.DataField = '' + Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 92 ExplicitTop = 10 ExplicitWidth = 147 @@ -355,7 +421,11 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor Left = 92 Top = 138 DataBinding.DataField = '' + Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 92 ExplicitTop = 138 ExplicitWidth = 147 @@ -365,6 +435,10 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor Left = 92 Top = 37 DataBinding.DataField = '' + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 92 ExplicitTop = 37 ExplicitWidth = 81 @@ -380,6 +454,10 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor Left = 92 Top = 64 DataBinding.DataField = '' + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 92 ExplicitTop = 64 ExplicitWidth = 219 diff --git a/Source/Modulos/Remesas de proveedor/Views/uViewRemesaProveedor.dfm b/Source/Modulos/Remesas de proveedor/Views/uViewRemesaProveedor.dfm index f26ee470..dc70c142 100644 --- a/Source/Modulos/Remesas de proveedor/Views/uViewRemesaProveedor.dfm +++ b/Source/Modulos/Remesas de proveedor/Views/uViewRemesaProveedor.dfm @@ -1,22 +1,25 @@ inherited frViewRemesaProveedor: TfrViewRemesaProveedor - Width = 451 - Height = 304 + Width = 485 + Height = 230 Align = alClient ExplicitWidth = 451 ExplicitHeight = 304 object dxLayoutControlRemesaProveedor: TdxLayoutControl Left = 0 Top = 0 - Width = 451 - Height = 304 + Width = 485 + Height = 230 Align = alClient ParentBackground = True TabOrder = 0 + TabStop = False AutoContentSizes = [acsWidth, acsHeight] LookAndFeel = dxLayoutOfficeLookAndFeel1 + ExplicitWidth = 451 + ExplicitHeight = 304 DesignSize = ( - 451 - 304) + 485 + 230) object eReferencia: TcxDBTextEdit Left = 110 Top = 30 @@ -30,13 +33,17 @@ inherited frViewRemesaProveedor: TfrViewRemesaProveedor Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.TextColor = clWindowText StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 0 Width = 164 end @@ -51,17 +58,21 @@ inherited frViewRemesaProveedor: TfrViewRemesaProveedor Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 4 Width = 108 end object edtFechaRemesa: TcxDBDateEdit - Left = 311 + Left = 328 Top = 30 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'FECHA_REMESA' @@ -72,13 +83,17 @@ inherited frViewRemesaProveedor: TfrViewRemesaProveedor Style.Color = clInfoBk Style.HotTrack = False Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.Shadow = False Style.ButtonStyle = bts3D Style.ButtonTransparency = ebtNone Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 1 Width = 170 end @@ -103,14 +118,18 @@ inherited frViewRemesaProveedor: TfrViewRemesaProveedor Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 2 Width = 39 end @@ -125,22 +144,26 @@ inherited frViewRemesaProveedor: TfrViewRemesaProveedor Style.HotTrack = False Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True + Style.LookAndFeel.SkinName = '' Style.ButtonStyle = bts3D Style.PopupBorderStyle = epbsFrame3D StyleDisabled.LookAndFeel.Kind = lfStandard StyleDisabled.LookAndFeel.NativeStyle = True + StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.Kind = lfStandard StyleFocused.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.SkinName = '' TabOrder = 3 Width = 319 end inline frViewListaSubcuentas1: TfrViewListaSubcuentas Left = 22 Top = 162 - Width = 453 - Height = 69 + Width = 407 + Height = 45 Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText Font.Height = -11 @@ -151,16 +174,24 @@ inherited frViewRemesaProveedor: TfrViewRemesaProveedor ReadOnly = False ExplicitLeft = 22 ExplicitTop = 162 + ExplicitWidth = 407 + ExplicitHeight = 45 inherited dxLayoutControl1: TdxLayoutControl + Width = 407 + ExplicitWidth = 407 inherited cbSubCuentas: TcxComboBox - ExplicitWidth = 376 - Width = 376 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' end inherited eContabilizar: TcxCheckBox - Left = 276 - ExplicitLeft = 276 - ExplicitWidth = 203 - Width = 203 + Left = 299 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 299 end end end diff --git a/Source/Modulos/Remesas de proveedor/Views/uViewRemesaProveedor.pas b/Source/Modulos/Remesas de proveedor/Views/uViewRemesaProveedor.pas index ee775a8a..41cb9da3 100644 --- a/Source/Modulos/Remesas de proveedor/Views/uViewRemesaProveedor.pas +++ b/Source/Modulos/Remesas de proveedor/Views/uViewRemesaProveedor.pas @@ -121,6 +121,15 @@ begin dxlcCuentaContable.Visible := false; {$ENDIF} + //Contabilidad + if Assigned(AppFactuGES.EjercicioActivo) then + begin + frViewListaSubcuentas1.eContabilizar.Checked := False; + end + else + begin + frViewListaSubcuentas1.eContabilizar.Checked := True; + end; end; function TfrViewRemesaProveedor.GetController: IRemesasProveedorController; diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index b34d8158..52baa3d5 100644 Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr index b6c956ec..f14ededc 100644 --- a/Source/Servidor/FactuGES_Server.dpr +++ b/Source/Servidor/FactuGES_Server.dpr @@ -99,14 +99,10 @@ uses schReferenciasServer_Intf in '..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas', uBizRecibosProveedorServer in '..\Modulos\Recibos de proveedor\Model\uBizRecibosProveedorServer.pas', uRptAlbaranesCliente_Server in '..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas', - schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas', - schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas', schRecibosClienteClient_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas', schRecibosClienteServer_Intf in '..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas', schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas', schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas', - schRecibosProveedorClient_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas', - schRecibosProveedorServer_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas', uBizAsientosServer in '..\Modulos\Contabilidad\Model\uBizAsientosServer.pas', schContabilidadClient_Intf in '..\Modulos\Contabilidad\Model\schContabilidadClient_Intf.pas', schContabilidadServer_Intf in '..\Modulos\Contabilidad\Model\schContabilidadServer_Intf.pas', @@ -131,7 +127,11 @@ uses uSistemaFunc in '..\Base\Utiles\uSistemaFunc.pas', srvGestorInformes_Impl in '..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas' {srvGestorInformes: TDataAbstractService}, uRptFacturasProveedor_Server in '..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas' {RptFacturasProveedor: TDataModule}, - uRptRecibosProveedor_Server in '..\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.pas' {RptRecibosProveedor: TDataModule}; + uRptRecibosProveedor_Server in '..\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.pas' {RptRecibosProveedor: TDataModule}, + schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas', + schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas', + schRecibosProveedorClient_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas', + schRecibosProveedorServer_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas'; {$R *.res} {$R ..\Servicios\RODLFile.res} diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index b5b4edf7..d8a0bd67 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -16,7 +16,7 @@ BEGIN VALUE "FileVersion", "2.2.4.0\0" VALUE "ProductName", "FactuGES (Servidor)\0" VALUE "ProductVersion", "2.2.4.0\0" - VALUE "CompileDate", "lunes, 17 de noviembre de 2008 17:12\0" + VALUE "CompileDate", "miércoles, 19 de noviembre de 2008 17:04\0" END END BLOCK "VarFileInfo"