diff --git a/Database/scripts/factuges_sysdata.sql b/Database/scripts/factuges_sysdata.sql index dc5c8b51..92a6ed71 100644 --- a/Database/scripts/factuges_sysdata.sql +++ b/Database/scripts/factuges_sysdata.sql @@ -2,14 +2,18 @@ SET SQL DIALECT 3; SET NAMES ISO8859_1; -INSERT INTO EMPRESAS (ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, REGISTRO_MERCANTIL, IVA) VALUES (1, 'B85274322', 'Acana Home S.L.', 'Acana Home S.L.', 'C/Alcalá, 295', 'Madrid', 'Madrid', '28027', '91 4054951', NULL, NULL, NULL, '91 4055163', 'info@acanahome.com', NULL, 'www.acanahome.com', NULL, NULL, NULL, 'Administrador', NULL, '', 16); -SET GENERATOR GEN_EMPRESAS_ID TO 2; +INSERT INTO EMPRESAS (ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, REGISTRO_MERCANTIL) VALUES (1, 'B85274322', 'Acana Home S.L.', 'Acana Home S.L.', 'C/Alcalá, 295', 'Madrid', 'Madrid', '28027', '91 4054951', NULL, NULL, NULL, '91 4055163', 'info@acanahome.com', NULL, 'www.acanahome.com', NULL, NULL, NULL, 'Administrador', NULL, ''); +INSERT INTO EMPRESAS (ID, NIF_CIF, NOMBRE, RAZON_SOCIAL, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, TELEFONO_1, TELEFONO_2, MOVIL_1, MOVIL_2, FAX, EMAIL_1, EMAIL_2, PAGINA_WEB, NOTAS, FECHA_ALTA, FECHA_MODIFICACION, USUARIO, LOGOTIPO, REGISTRO_MERCANTIL) VALUES (2, Null, 'Acana', 'Acana', Nul, Null, Null, Null, Null, NULL, NULL, NULL, Null, Null, NULL, Null, NULL, NULL, NULL, 'Administrador', NULL, ''); +SET GENERATOR GEN_EMPRESAS_ID TO 3; COMMIT WORK; INSERT INTO EMPRESAS_TIENDAS (ID, ID_EMPRESA, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, PERSONA_CONTACTO, NOMBRE, TELEFONO, MOVIL, FAX, EMAIL, NOTAS, FECHA_ALTA, FECHA_MODIFICACION, CODIGO_CONTABLE) VALUES (1, 1, 'C/ Alcalá, 295', 'Madrid', 'Madrid', '28027', 'Cristina Puerta', 'Alcalá', '91 405 49 51', '667 60 57 11', '91 405 51 63', NULL, NULL, NULL, NULL, '01'); INSERT INTO EMPRESAS_TIENDAS (ID, ID_EMPRESA, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, PERSONA_CONTACTO, NOMBRE, TELEFONO, MOVIL, FAX, EMAIL, NOTAS, FECHA_ALTA, FECHA_MODIFICACION, CODIGO_CONTABLE) VALUES (2, 1, 'Bulevar Indalecio Prieto Ed. 14', 'Madrid', 'Madrid', '28032', 'José Luis Puerta', 'Valdebernardo', '91 301 65 57', '618 31 09 40', '91 301 65 58', NULL, NULL, NULL, NULL, '02'); INSERT INTO EMPRESAS_TIENDAS (ID, ID_EMPRESA, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, PERSONA_CONTACTO, NOMBRE, TELEFONO, MOVIL, FAX, EMAIL, NOTAS, FECHA_ALTA, FECHA_MODIFICACION, CODIGO_CONTABLE) VALUES (3, 1, NULL, NULL, NULL, NULL, NULL, 'Abeto', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '03'); -SET GENERATOR GEN_EMPRESAS_TIENDAS_ID TO 4; +INSERT INTO EMPRESAS_TIENDAS (ID, ID_EMPRESA, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, PERSONA_CONTACTO, NOMBRE, TELEFONO, MOVIL, FAX, EMAIL, NOTAS, FECHA_ALTA, FECHA_MODIFICACION, CODIGO_CONTABLE) VALUES (4, 2, 'C/ Alcalá, 295', 'Madrid', 'Madrid', '28027', 'Cristina Puerta', 'Alcalá', '91 405 49 51', '667 60 57 11', '91 405 51 63', NULL, NULL, NULL, NULL, '01'); +INSERT INTO EMPRESAS_TIENDAS (ID, ID_EMPRESA, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, PERSONA_CONTACTO, NOMBRE, TELEFONO, MOVIL, FAX, EMAIL, NOTAS, FECHA_ALTA, FECHA_MODIFICACION, CODIGO_CONTABLE) VALUES (5, 2, 'Bulevar Indalecio Prieto Ed. 14', 'Madrid', 'Madrid', '28032', 'José Luis Puerta', 'Valdebernardo', '91 301 65 57', '618 31 09 40', '91 301 65 58', NULL, NULL, NULL, NULL, '02'); +INSERT INTO EMPRESAS_TIENDAS (ID, ID_EMPRESA, CALLE, POBLACION, PROVINCIA, CODIGO_POSTAL, PERSONA_CONTACTO, NOMBRE, TELEFONO, MOVIL, FAX, EMAIL, NOTAS, FECHA_ALTA, FECHA_MODIFICACION, CODIGO_CONTABLE) VALUES (6, 2, NULL, NULL, NULL, NULL, NULL, 'Abeto', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '03'); +SET GENERATOR GEN_EMPRESAS_TIENDAS_ID TO 7; COMMIT WORK; INSERT INTO CATEGORIAS (ID, CATEGORIA) VALUES (1, 'CLIENTE'); diff --git a/Source/Modulos/Contabilidad/Views/uEditorCuentas.dfm b/Source/Modulos/Contabilidad/Views/uEditorCuentas.dfm index a4d2f230..e1796db8 100644 --- a/Source/Modulos/Contabilidad/Views/uEditorCuentas.dfm +++ b/Source/Modulos/Contabilidad/Views/uEditorCuentas.dfm @@ -2,8 +2,6 @@ inherited fEditorCuentas: TfEditorCuentas Left = 489 Top = 325 Caption = 'Lista de cuentas' - ExplicitWidth = 320 - ExplicitHeight = 471 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -66,9 +64,6 @@ inherited fEditorCuentas: TfEditorCuentas end end inherited TBXDock: TTBXDock - inherited tbxMain: TTBXToolbar - ExplicitWidth = 474 - end inherited tbxFiltro: TTBXToolbar ExplicitWidth = 269 inherited tbxEditFiltro: TTBXEditItem @@ -107,12 +102,6 @@ inherited fEditorCuentas: TfEditorCuentas ExplicitWidth = 543 ExplicitHeight = 195 inherited cxGridView: TcxGridDBTableView - DataController.Summary.FooterSummaryItems = < - item - Format = '0 ejercicios' - Kind = skCount - Column = frViewCuentas1.cxGridViewREF_CUENTA - end> inherited cxGridViewID: TcxGridDBColumn IsCaptionAssigned = True end @@ -127,15 +116,27 @@ inherited fEditorCuentas: TfEditorCuentas Width = 543 ExplicitWidth = 543 inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 273 Width = 273 end inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 121 Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit Left = 337 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 337 ExplicitWidth = 121 Width = 121 diff --git a/Source/Modulos/Contabilidad/Views/uEditorDiario.dfm b/Source/Modulos/Contabilidad/Views/uEditorDiario.dfm index bd2b254e..d018bf17 100644 --- a/Source/Modulos/Contabilidad/Views/uEditorDiario.dfm +++ b/Source/Modulos/Contabilidad/Views/uEditorDiario.dfm @@ -2,8 +2,6 @@ inherited fEditorDiario: TfEditorDiario Left = 489 Top = 325 Caption = 'Libro de diario' - ExplicitWidth = 320 - ExplicitHeight = 240 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -33,9 +31,6 @@ inherited fEditorDiario: TfEditorDiario end end inherited TBXDock: TTBXDock - inherited tbxMain: TTBXToolbar - ExplicitWidth = 543 - end inherited tbxFiltro: TTBXToolbar ExplicitWidth = 269 inherited tbxEditFiltro: TTBXEditItem @@ -74,17 +69,6 @@ inherited fEditorDiario: TfEditorDiario ExplicitWidth = 543 ExplicitHeight = 195 inherited cxGridView: TcxGridDBTableView - DataController.Summary.FooterSummaryItems = < - item - Format = ',0.00 '#8364';-,0.00 '#8364 - Kind = skSum - Column = frViewDiario1.cxGridViewDEBE - end - item - Format = ',0.00 '#8364';-,0.00 '#8364 - Kind = skSum - Column = frViewDiario1.cxGridViewHABER - end> inherited cxGridViewID_ASIENTO: TcxGridDBColumn IsCaptionAssigned = True end @@ -99,15 +83,27 @@ inherited fEditorDiario: TfEditorDiario Width = 543 ExplicitWidth = 543 inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 273 Width = 273 end inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 121 Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit Left = 337 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 337 ExplicitWidth = 121 Width = 121 diff --git a/Source/Modulos/Contabilidad/Views/uEditorEpigrafes.dfm b/Source/Modulos/Contabilidad/Views/uEditorEpigrafes.dfm index f641d0de..91960442 100644 --- a/Source/Modulos/Contabilidad/Views/uEditorEpigrafes.dfm +++ b/Source/Modulos/Contabilidad/Views/uEditorEpigrafes.dfm @@ -2,8 +2,6 @@ inherited fEditorEpigrafes: TfEditorEpigrafes Left = 489 Top = 325 Caption = 'Lista de epigrafes' - ExplicitWidth = 320 - ExplicitHeight = 471 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -66,9 +64,6 @@ inherited fEditorEpigrafes: TfEditorEpigrafes end end inherited TBXDock: TTBXDock - inherited tbxMain: TTBXToolbar - ExplicitWidth = 474 - end inherited tbxFiltro: TTBXToolbar ExplicitWidth = 269 inherited tbxEditFiltro: TTBXEditItem @@ -107,12 +102,6 @@ inherited fEditorEpigrafes: TfEditorEpigrafes ExplicitWidth = 543 ExplicitHeight = 195 inherited cxGridView: TcxGridDBTableView - DataController.Summary.FooterSummaryItems = < - item - Format = '0 ejercicios' - Kind = skCount - Column = frViewEpigrafes1.cxGridViewREF_EPIGRAFE - end> inherited cxGridViewID: TcxGridDBColumn IsCaptionAssigned = True end @@ -127,15 +116,27 @@ inherited fEditorEpigrafes: TfEditorEpigrafes Width = 543 ExplicitWidth = 543 inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 273 Width = 273 end inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 121 Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit Left = 337 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 337 ExplicitWidth = 121 Width = 121 diff --git a/Source/Modulos/Contabilidad/Views/uEditorSubCuentas.dfm b/Source/Modulos/Contabilidad/Views/uEditorSubCuentas.dfm index a6df6170..0bcce29f 100644 --- a/Source/Modulos/Contabilidad/Views/uEditorSubCuentas.dfm +++ b/Source/Modulos/Contabilidad/Views/uEditorSubCuentas.dfm @@ -65,9 +65,6 @@ inherited fEditorSubCuentas: TfEditorSubCuentas end end inherited TBXDock: TTBXDock - inherited tbxMain: TTBXToolbar - ExplicitWidth = 474 - end inherited tbxFiltro: TTBXToolbar ExplicitWidth = 269 inherited tbxEditFiltro: TTBXEditItem @@ -106,12 +103,6 @@ inherited fEditorSubCuentas: TfEditorSubCuentas ExplicitWidth = 543 ExplicitHeight = 195 inherited cxGridView: TcxGridDBTableView - DataController.Summary.FooterSummaryItems = < - item - Format = '0 ejercicios' - Kind = skCount - Column = frViewSubCuentas1.cxGridViewREF_SUBCUENTA - end> inherited cxGridViewID: TcxGridDBColumn IsCaptionAssigned = True end @@ -125,9 +116,31 @@ inherited fEditorSubCuentas: TfEditorSubCuentas inherited dxLayoutControl1: TdxLayoutControl Width = 543 ExplicitWidth = 543 + inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 273 + Width = 273 + end + inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 121 + Width = 121 + end inherited edtFechaFinFiltro: TcxDateEdit Left = 337 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 337 + ExplicitWidth = 121 + Width = 121 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel diff --git a/Source/Modulos/Contabilidad/Views/uViewCuentas.dfm b/Source/Modulos/Contabilidad/Views/uViewCuentas.dfm index da85e1ea..8f1507b4 100644 --- a/Source/Modulos/Contabilidad/Views/uViewCuentas.dfm +++ b/Source/Modulos/Contabilidad/Views/uViewCuentas.dfm @@ -4,7 +4,7 @@ inherited frViewCuentas: TfrViewCuentas DataController.KeyFieldNames = 'ID' DataController.Summary.FooterSummaryItems = < item - Format = '0 ejercicios' + Format = '0 cuentas' Kind = skCount Column = cxGridViewREF_CUENTA end> @@ -51,14 +51,26 @@ inherited frViewCuentas: TfrViewCuentas inherited TBXDockablePanel1: TTBXDockablePanel inherited dxLayoutControl1: TdxLayoutControl inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 273 Width = 273 end inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 121 Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 121 Width = 121 end diff --git a/Source/Modulos/Contabilidad/Views/uViewDiario.dfm b/Source/Modulos/Contabilidad/Views/uViewDiario.dfm index 0935032f..4d0cf392 100644 --- a/Source/Modulos/Contabilidad/Views/uViewDiario.dfm +++ b/Source/Modulos/Contabilidad/Views/uViewDiario.dfm @@ -12,6 +12,11 @@ inherited frViewDiario: TfrViewDiario Format = ',0.00 '#8364';-,0.00 '#8364 Kind = skSum Column = cxGridViewHABER + end + item + Format = '0 apuntes' + Kind = skCount + Column = cxGridViewCONCEPTO end> OptionsBehavior.PullFocusing = True object cxGridViewID_ASIENTO: TcxGridDBColumn @@ -97,14 +102,26 @@ inherited frViewDiario: TfrViewDiario inherited TBXDockablePanel1: TTBXDockablePanel inherited dxLayoutControl1: TdxLayoutControl inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 273 Width = 273 end inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 121 Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 121 Width = 121 end diff --git a/Source/Modulos/Contabilidad/Views/uViewEpigrafes.dfm b/Source/Modulos/Contabilidad/Views/uViewEpigrafes.dfm index 10adb849..e523dfb6 100644 --- a/Source/Modulos/Contabilidad/Views/uViewEpigrafes.dfm +++ b/Source/Modulos/Contabilidad/Views/uViewEpigrafes.dfm @@ -8,7 +8,7 @@ inherited frViewEpigrafes: TfrViewEpigrafes DataController.KeyFieldNames = 'ID' DataController.Summary.FooterSummaryItems = < item - Format = '0 ejercicios' + Format = '0 epigrafes' Kind = skCount Column = cxGridViewREF_EPIGRAFE end> @@ -43,14 +43,26 @@ inherited frViewEpigrafes: TfrViewEpigrafes inherited TBXDockablePanel1: TTBXDockablePanel inherited dxLayoutControl1: TdxLayoutControl inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 273 Width = 273 end inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 121 Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 121 Width = 121 end @@ -60,7 +72,6 @@ inherited frViewEpigrafes: TfrViewEpigrafes inherited pnlAgrupaciones: TTBXDockablePanel Top = 423 ExplicitTop = 423 - ExplicitWidth = 554 end inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinterLink: TdxGridReportLink diff --git a/Source/Modulos/Contabilidad/Views/uViewSubCuentas.dfm b/Source/Modulos/Contabilidad/Views/uViewSubCuentas.dfm index 69467023..5601d233 100644 --- a/Source/Modulos/Contabilidad/Views/uViewSubCuentas.dfm +++ b/Source/Modulos/Contabilidad/Views/uViewSubCuentas.dfm @@ -4,7 +4,7 @@ inherited frViewSubCuentas: TfrViewSubCuentas DataController.KeyFieldNames = 'ID' DataController.Summary.FooterSummaryItems = < item - Format = '0 ejercicios' + Format = '0 subcuentas' Kind = skCount Column = cxGridViewREF_SUBCUENTA end> @@ -59,14 +59,26 @@ inherited frViewSubCuentas: TfrViewSubCuentas inherited TBXDockablePanel1: TTBXDockablePanel inherited dxLayoutControl1: TdxLayoutControl inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 273 Width = 273 end inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 121 Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 121 Width = 121 end diff --git a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas index f58cffc8..58569d01 100644 --- a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas +++ b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas @@ -648,7 +648,9 @@ begin if (AFactura.Detalles.DataTable.RecordCount = 0) then raise Exception.Create('La factura debe tener al menos un concepto en su contenido'); - if (AFactura.IGNORAR_CONTABILIDAD = 0) and (AFactura.Cliente.SubCuentas.ID < 1) then + if (AFactura.IGNORAR_CONTABILIDAD = 0) and ((AFactura.Cliente.SubCuentas.ID < 1) + //REPASAR + or (AFactura.Cliente.SubCuentas.ID_EJERCICIO <> AppFactuGES.EjercicioActivo.ID)) then raise Exception.Create('Para que la factura pueda pasar la parte contable es necesario que el proveedor tenga asignada una subcuenta'); //En caso de ser un Abono no podra tener un importe total positivo diff --git a/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas index 562e3212..c57643fa 100644 --- a/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas @@ -332,8 +332,10 @@ begin CODIGO_POSTAL := FCliente.CODIGO_POSTAL; PROVINCIA := FCliente.PROVINCIA; POBLACION := FCliente.POBLACION; - ID_FORMA_PAGO := FCliente.ID_FORMA_PAGO; - ID_TIPO_IVA := FCliente.ID_TIPO_IVA; + if FCliente.ID_FORMA_PAGO > 0 then + ID_FORMA_PAGO := FCliente.ID_FORMA_PAGO; + if FCliente.ID_TIPO_IVA > 0 then + ID_TIPO_IVA := FCliente.ID_TIPO_IVA; RECARGO_EQUIVALENCIA := FCliente.RECARGO_EQUIVALENCIA; Post; diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm index 86ef57e4..b9bad89c 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm @@ -71,6 +71,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente inherited pgPaginas: TPageControl Width = 854 Height = 398 + ActivePage = pagContabilidad OnChanging = pgPaginasChanging ExplicitLeft = 3 ExplicitTop = 79 diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas index 0ac19973..185fc59c 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas @@ -325,9 +325,9 @@ begin FFactura.DataTable.Edit; // Actualizar IVA y RE a partir del tipo de IVA del cliente. - Factura.IVA := ((frViewTotales1.dsTiposIVA.DataTable) as IBizTipoIVA).IVA; + Factura.IVA := FTiposIVA.IVA; //((frViewTotales1.dsTiposIVA.DataTable) as IBizTipoIVA).IVA; if FFactura.Cliente.RECARGO_EQUIVALENCIA = 1 then - Factura.RE := ((frViewTotales1.dsTiposIVA.DataTable) as IBizTipoIVA).RE + Factura.RE := FTiposIVA.RE else Factura.RE := 0; @@ -454,8 +454,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/Model/uBizFacturasProveedor.pas b/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas index d856f8aa..f4f68ffe 100644 --- a/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas +++ b/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas @@ -321,8 +321,10 @@ begin CODIGO_POSTAL := FProveedor.CODIGO_POSTAL; PROVINCIA := FProveedor.PROVINCIA; POBLACION := FProveedor.POBLACION; - ID_FORMA_PAGO := FProveedor.ID_FORMA_PAGO; - ID_TIPO_IVA := FProveedor.ID_TIPO_IVA; + if FProveedor.ID_FORMA_PAGO > 0 then + ID_FORMA_PAGO := FProveedor.ID_FORMA_PAGO; + if FProveedor.ID_TIPO_IVA > 0 then + ID_TIPO_IVA := FProveedor.ID_TIPO_IVA; // RECARGO_EQUIVALENCIA := FProveedor.RECARGO_EQUIVALENCIA; Post; diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm index af0c3344..39cf7b44 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm @@ -303,40 +303,40 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ExplicitWidth = 57 end inherited UpDown1: TUpDown - Left = 202 - ExplicitLeft = 202 + Left = 218 + ExplicitLeft = 218 end inherited ToolButton13: TToolButton - Left = 219 - ExplicitLeft = 219 + Left = 235 + ExplicitLeft = 235 end inherited ToolButton6: TToolButton - Left = 227 - ExplicitLeft = 227 + Left = 243 + ExplicitLeft = 243 end inherited ToolButton7: TToolButton - Left = 261 - ExplicitLeft = 261 + Left = 277 + ExplicitLeft = 277 end inherited ToolButton8: TToolButton - Left = 295 - ExplicitLeft = 295 + Left = 311 + ExplicitLeft = 311 end inherited ToolButton12: TToolButton - Left = 329 - ExplicitLeft = 329 + Left = 345 + ExplicitLeft = 345 end inherited ToolButton9: TToolButton - Left = 337 - ExplicitLeft = 337 + Left = 353 + ExplicitLeft = 353 end inherited ToolButton10: TToolButton - Left = 371 - ExplicitLeft = 371 + Left = 387 + ExplicitLeft = 387 end inherited ToolButton11: TToolButton - Left = 405 - ExplicitLeft = 405 + Left = 421 + ExplicitLeft = 421 end end inherited cxGrid: TcxGrid diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.dfm index c8faa588..54da2107 100644 Binary files a/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.dfm and b/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.dfm differ diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas index 8666912c..fd6a1f88 100644 --- a/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas +++ b/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas @@ -37,7 +37,7 @@ uses uViewRecibosCliente, uEditorRecibosCliente, uBizRecibosCliente, uIEditorElegirRecibosCliente, Buttons, cxRadioGroup, cxMaskEdit, cxDropDownEdit, cxCalendar, cxControls, - cxContainer, cxEdit, cxTextEdit, TBXDkPanels, JSDialog; + cxContainer, cxEdit, cxTextEdit, TBXDkPanels, JSDialog, uDAInterfaces; type diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorFechaPago.dfm b/Source/Modulos/Recibos de cliente/Views/uEditorFechaPago.dfm index a6c4ed31..b5b803ef 100644 --- a/Source/Modulos/Recibos de cliente/Views/uEditorFechaPago.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uEditorFechaPago.dfm @@ -58,7 +58,6 @@ object fEditorFechaPago: TfEditorFechaPago Height = 41 Align = alBottom TabOrder = 1 - ExplicitTop = 172 object bAceptar: TButton Left = 39 Top = 8 @@ -95,10 +94,18 @@ object fEditorFechaPago: TfEditorFechaPago 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 cliente/Views/uEditorFechaPago.pas b/Source/Modulos/Recibos de cliente/Views/uEditorFechaPago.pas index fddebf44..372b4bf5 100644 --- a/Source/Modulos/Recibos de cliente/Views/uEditorFechaPago.pas +++ b/Source/Modulos/Recibos de cliente/Views/uEditorFechaPago.pas @@ -46,7 +46,7 @@ implementation {$R *.dfm} {$INCLUDE ..\..\..\FactuGES.inc} -uses uDialogUtils; +uses uDialogUtils, uFactuGES_App; procedure TfEditorFechaPago.DeshabilitarContabilidad; begin @@ -95,6 +95,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 TfEditorFechaPago.GetFechaPago: TDateTime; diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm index 0166fd18..67faab5a 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm +++ b/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm @@ -51,13 +51,21 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor inherited TBXDock: TTBXDock Top = 171 Width = 654 + Height = 72 ExplicitTop = 171 ExplicitWidth = 654 + ExplicitHeight = 72 inherited tbxMain: TTBXToolbar - ExplicitWidth = 126 + ExplicitWidth = 269 + inherited TBXItem2: TTBXItem + Visible = False + end inherited TBXItem5: TTBXItem Visible = False end + inherited TBXItem4: TTBXItem + Visible = False + end inherited TBXItem6: TTBXItem Visible = False end @@ -66,12 +74,12 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor end end inherited tbxFiltro: TTBXToolbar - Left = 126 + Left = 269 Top = 23 DockPos = 104 DockRow = 1 Visible = False - ExplicitLeft = 126 + ExplicitLeft = 269 ExplicitTop = 23 inherited TBXItem34: TTBXItem Action = actQuitarFiltro2 @@ -82,7 +90,9 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor end inherited TBXTMain2: TTBXToolbar Left = 334 + Visible = False ExplicitLeft = 334 + ExplicitHeight = 23 end end inherited StatusBar: TJvStatusBar @@ -137,18 +147,18 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor end end inherited frViewRecibosProveedor1: TfrViewRecibosProveedor [5] - Top = 246 + Top = 243 Width = 654 - Height = 363 - ExplicitTop = 246 + Height = 366 + ExplicitTop = 243 ExplicitWidth = 654 - ExplicitHeight = 363 + ExplicitHeight = 366 inherited cxGrid: TcxGrid Width = 654 - Height = 235 + Height = 238 RootLevelOptions.DetailTabsPosition = dtpNone ExplicitWidth = 654 - ExplicitHeight = 235 + ExplicitHeight = 238 inherited cxGridView: TcxGridDBTableView DataController.Summary.DefaultGroupSummaryItems = < item @@ -178,29 +188,45 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor Width = 654 ExplicitWidth = 654 inherited txtFiltroTodo: TcxTextEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 273 Width = 273 end inherited edtFechaIniFiltro: TcxDateEdit + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 121 Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit + Left = 252 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 252 ExplicitWidth = 343 Width = 343 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 654 + ExplicitWidth = 654 inherited tbxBotones: TTBXToolbar Width = 644 + ExplicitWidth = 644 end end end end inherited pnlAgrupaciones: TTBXDockablePanel - Top = 337 - ExplicitTop = 337 + Top = 340 + ExplicitTop = 340 ExplicitWidth = 654 inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 654 @@ -375,7 +401,7 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor end inherited JvFormStorage: TJvFormStorage [13] end - inherited GridPopupMenu: TPopupMenu + inherited GridPopupMenu: TPopupMenu [14] Left = 80 Top = 192 end diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.pas b/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.pas index e8a727e3..df11a866 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.pas +++ b/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.pas @@ -1,4 +1,4 @@ -{ +{ =============================================================================== Copyright (©) 2007. Rodax Software. =============================================================================== @@ -37,7 +37,7 @@ uses uViewRecibosProveedor, uEditorRecibosProveedor, uBizRecibosProveedor, uIEditorElegirRecibosProveedor, Buttons, cxRadioGroup, cxMaskEdit, cxDropDownEdit, cxCalendar, cxControls, - cxContainer, cxEdit, cxTextEdit, TBXDkPanels, JSDialog; + cxContainer, cxEdit, cxTextEdit, TBXDkPanels, JSDialog, uDAInterfaces; type diff --git a/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.dfm b/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.dfm index 36661ced..ea6af110 100644 --- a/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.dfm +++ b/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.dfm @@ -12,6 +12,7 @@ inherited frViewRemesaCliente: TfrViewRemesaCliente Align = alClient ParentBackground = True TabOrder = 0 + TabStop = False AutoContentSizes = [acsWidth, acsHeight] LookAndFeel = dxLayoutOfficeLookAndFeel1 DesignSize = ( @@ -30,13 +31,17 @@ inherited frViewRemesaCliente: TfrViewRemesaCliente 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,12 +56,16 @@ inherited frViewRemesaCliente: TfrViewRemesaCliente 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 @@ -72,13 +81,17 @@ inherited frViewRemesaCliente: TfrViewRemesaCliente 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 +116,18 @@ inherited frViewRemesaCliente: TfrViewRemesaCliente 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,14 +142,18 @@ inherited frViewRemesaCliente: TfrViewRemesaCliente 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 = 121 end @@ -157,11 +178,19 @@ inherited frViewRemesaCliente: TfrViewRemesaCliente Width = 429 ExplicitWidth = 429 inherited cbSubCuentas: TcxComboBox + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 376 Width = 376 end inherited eContabilizar: TcxCheckBox Left = 276 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 276 ExplicitWidth = 203 Width = 203 diff --git a/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.pas b/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.pas index 629cc2a0..8907b274 100644 --- a/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.pas +++ b/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.pas @@ -120,6 +120,16 @@ begin dxlcCuentaBancaria.visible := true; 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 TfrViewRemesaCliente.GetController: IRemesasClienteController;