diff --git a/Build/Build.fbl6 b/Build/Build.fbl6 index 47eb33e..804fd31 100644 Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ diff --git a/Database/RodaxSoftware.FactuGES.Database.proj b/Database/RodaxSoftware.FactuGES.Database.proj index ec710b5..8ad91e8 100644 --- a/Database/RodaxSoftware.FactuGES.Database.proj +++ b/Database/RodaxSoftware.FactuGES.Database.proj @@ -27,7 +27,7 @@ - + @@ -62,10 +62,7 @@ - - - MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
diff --git a/Source/Lib/ApplicationBase.dcp b/Source/Lib/ApplicationBase.dcp index ebd8089..bd3bd90 100644 Binary files a/Source/Lib/ApplicationBase.dcp and b/Source/Lib/ApplicationBase.dcp differ diff --git a/Source/Lib/Base.dcp b/Source/Lib/Base.dcp index de05af4..0c86d17 100644 Binary files a/Source/Lib/Base.dcp and b/Source/Lib/Base.dcp differ diff --git a/Source/Lib/GUIBase.dcp b/Source/Lib/GUIBase.dcp index 1ed6821..d1f131b 100644 Binary files a/Source/Lib/GUIBase.dcp and b/Source/Lib/GUIBase.dcp differ diff --git a/Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.dfm b/Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.dfm index 1714f95..ceeb35e 100644 --- a/Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.dfm +++ b/Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.dfm @@ -613,28 +613,36 @@ object PluginContabilidad: TPluginContabilidad object actEpigrafes: TAction Category = 'Contabilidad' Caption = 'Epigrafes' + Enabled = False ImageIndex = 3 + Visible = False OnExecute = actEpigrafesExecute OnUpdate = actEpigrafesUpdate end object actBalances: TAction Category = 'Contabilidad' Caption = 'Balances' + Enabled = False ImageIndex = 5 + Visible = False OnExecute = actBalancesExecute OnUpdate = actBalancesUpdate end object actCuentasEspeciales: TAction Category = 'Contabilidad' Caption = 'Cuentas especiales' + Enabled = False ImageIndex = 6 + Visible = False OnExecute = actCuentasEspecialesExecute OnUpdate = actCuentasEspecialesUpdate end object actCuentas: TAction Category = 'Contabilidad' Caption = 'Cuentas' + Enabled = False ImageIndex = 2 + Visible = False OnExecute = actCuentasExecute OnUpdate = actCuentasUpdate end @@ -648,7 +656,9 @@ object PluginContabilidad: TPluginContabilidad object actDiario: TAction Category = 'Contabilidad' Caption = 'Libro de diario' + Enabled = False ImageIndex = 0 + Visible = False OnExecute = actDiarioExecute OnUpdate = actDiarioUpdate end diff --git a/Source/Modulos/Contabilidad/Views/uEditorDiario.dfm b/Source/Modulos/Contabilidad/Views/uEditorDiario.dfm index 7c84ab9..f211a1b 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,6 +31,9 @@ inherited fEditorDiario: TfEditorDiario end end inherited TBXDock: TTBXDock + inherited tbxMain: TTBXToolbar + ExplicitWidth = 543 + end inherited tbxFiltro: TTBXToolbar ExplicitWidth = 269 inherited tbxEditFiltro: TTBXEditItem @@ -47,7 +48,6 @@ inherited fEditorDiario: TfEditorDiario DockPos = 275 Visible = True ExplicitLeft = 275 - ExplicitWidth = 176 object TBXItem38: TTBXItem Action = actPuntear DisplayMode = nbdmImageAndText @@ -110,15 +110,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 @@ -179,7 +191,9 @@ inherited fEditorDiario: TfEditorDiario object actPuntear: TAction Category = 'OperacionesEspeciales' Caption = 'Puntear/Despuntear asiento' + Enabled = False ImageIndex = 24 + Visible = False OnExecute = actPuntearExecute OnUpdate = actPuntearUpdate end diff --git a/Source/Modulos/Contabilidad/Views/uViewCuentas.pas b/Source/Modulos/Contabilidad/Views/uViewCuentas.pas index 81dc6df..9a216a2 100644 --- a/Source/Modulos/Contabilidad/Views/uViewCuentas.pas +++ b/Source/Modulos/Contabilidad/Views/uViewCuentas.pas @@ -14,7 +14,7 @@ uses dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces, cxCalendar, - cxImageComboBox, cxTextEdit; + cxImageComboBox, cxTextEdit, uCustomView, uViewBase; type IViewCuentas = interface(IViewGrid) diff --git a/Source/Modulos/Contabilidad/Views/uViewDiario.dfm b/Source/Modulos/Contabilidad/Views/uViewDiario.dfm index 82bfc18..6cfcc19 100644 --- a/Source/Modulos/Contabilidad/Views/uViewDiario.dfm +++ b/Source/Modulos/Contabilidad/Views/uViewDiario.dfm @@ -32,6 +32,8 @@ inherited frViewDiario: TfrViewDiario ImageIndex = 1 Value = 1 end> + Visible = False + VisibleForCustomization = False IsCaptionAssigned = True end object cxGridViewID_ASIENTO: TcxGridDBColumn @@ -143,9 +145,6 @@ inherited frViewDiario: TfrViewDiario end end end - inherited pnlAgrupaciones: TTBXDockablePanel - ExplicitWidth = 554 - end inherited dxComponentPrinter: TdxComponentPrinter inherited dxComponentPrinterLink: TdxGridReportLink ReportDocument.CreationDate = 38673.842406053240000000 diff --git a/Source/Modulos/Contabilidad/Views/uViewDiario.pas b/Source/Modulos/Contabilidad/Views/uViewDiario.pas index bb0a9b8..5d877bd 100644 --- a/Source/Modulos/Contabilidad/Views/uViewDiario.pas +++ b/Source/Modulos/Contabilidad/Views/uViewDiario.pas @@ -14,7 +14,7 @@ uses dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk, cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces, cxCalendar, - cxImageComboBox, cxTextEdit, cxCurrencyEdit; + cxImageComboBox, cxTextEdit, cxCurrencyEdit, uCustomView, uViewBase; type IViewDiario = interface(IViewGrid) diff --git a/Source/Modulos/Contactos/Model/uBizContactos.pas b/Source/Modulos/Contactos/Model/uBizContactos.pas index 9108c72..8bc91b6 100644 --- a/Source/Modulos/Contactos/Model/uBizContactos.pas +++ b/Source/Modulos/Contactos/Model/uBizContactos.pas @@ -743,11 +743,11 @@ begin RECARGO_EQUIVALENCIA := CLIENTE_RECARGO_EQUIVALENCIA; REGIMEN_IVA := AppFactuGES.Configuracion.GetSettingAsString(teXML, 'Clientes.RegimenIVA', CLIENTE_REGIMEN_IVA); - //CONTABILIDAD - if Assigned(AppFactuGES.EjercicioActivo) then - IGNORAR_CONTABILIDAD := 0 - else - IGNORAR_CONTABILIDAD := 1; +//CONTABILIDAD +// if Assigned(AppFactuGES.EjercicioActivo) then +// IGNORAR_CONTABILIDAD := 0 +// else + IGNORAR_CONTABILIDAD := 1; TIENE_SUBCUENTA := 0; ID_FORMA_PAGO := AppFactuGES.EmpresaActiva.ID_FORMA_PAGO; @@ -829,9 +829,9 @@ begin REGIMEN_IVA := AppFactuGES.Configuracion.GetSettingAsString(teXML, 'Proveedores.RegimenIVA', PROVEEDOR_REGIMEN_IVA); //CONTABILIDAD - if Assigned(AppFactuGES.EjercicioActivo) then - IGNORAR_CONTABILIDAD := 0 - else +// if Assigned(AppFactuGES.EjercicioActivo) then +// IGNORAR_CONTABILIDAD := 0 +// else IGNORAR_CONTABILIDAD := 1; TIENE_SUBCUENTA := 0; ES_ACREEDOR := 0; diff --git a/Source/Modulos/Contactos/Views/uEditorCliente.dfm b/Source/Modulos/Contactos/Views/uEditorCliente.dfm index 67181a1..bd8b9b3 100644 --- a/Source/Modulos/Contactos/Views/uEditorCliente.dfm +++ b/Source/Modulos/Contactos/Views/uEditorCliente.dfm @@ -675,6 +675,7 @@ inherited fEditorCliente: TfEditorCliente object pagContabilidad: TTabSheet Caption = 'Contabilidad' ImageIndex = 5 + TabVisible = False inline frViewSubCuentaContacto1: TfrViewSubCuentaContacto Left = 0 Top = 0 diff --git a/Source/Modulos/Contactos/Views/uEditorCliente.pas b/Source/Modulos/Contactos/Views/uEditorCliente.pas index bb8924d..84b7cf3 100644 --- a/Source/Modulos/Contactos/Views/uEditorCliente.pas +++ b/Source/Modulos/Contactos/Views/uEditorCliente.pas @@ -71,7 +71,8 @@ begin ViewContacto := frViewCliente1; {$IFDEF CONTABILIDAD} - pagContabilidad.TabVisible := true; +// pagContabilidad.TabVisible := true; + pagContabilidad.TabVisible := false; {$ELSE} pagContabilidad.TabVisible := false; {$ENDIF} diff --git a/Source/Modulos/Contactos/Views/uEditorProveedor.dfm b/Source/Modulos/Contactos/Views/uEditorProveedor.dfm index f850e7d..a346588 100644 --- a/Source/Modulos/Contactos/Views/uEditorProveedor.dfm +++ b/Source/Modulos/Contactos/Views/uEditorProveedor.dfm @@ -341,6 +341,8 @@ inherited fEditorProveedor: TfEditorProveedor ExplicitHeight = 228 inherited memObservaciones: TcxDBMemo DataBinding.DataSource = frViewProveedor1.dsContacto + ExplicitWidth = 573 + ExplicitHeight = 20 Height = 228 Width = 521 end @@ -376,6 +378,18 @@ 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 @@ -591,6 +605,7 @@ inherited fEditorProveedor: TfEditorProveedor object PagContabilidad: TTabSheet Caption = 'Contabilidad' ImageIndex = 4 + TabVisible = False inline frViewSubCuentaContacto1: TfrViewSubCuentaContacto Left = 0 Top = 0 diff --git a/Source/Modulos/Contactos/Views/uEditorProveedor.pas b/Source/Modulos/Contactos/Views/uEditorProveedor.pas index 6b44293..4a2c5ff 100644 --- a/Source/Modulos/Contactos/Views/uEditorProveedor.pas +++ b/Source/Modulos/Contactos/Views/uEditorProveedor.pas @@ -67,7 +67,8 @@ begin ViewContacto := frViewProveedor1; {$IFDEF CONTABILIDAD} - pagContabilidad.TabVisible := true; +// pagContabilidad.TabVisible := true; + pagContabilidad.TabVisible := false; {$ELSE} pagContabilidad.TabVisible := false; {$ENDIF} diff --git a/Source/Modulos/Contratos de cliente/ContratosCliente_Group.groupproj b/Source/Modulos/Contratos de cliente/ContratosCliente_Group.groupproj index 022cfd0..a4a4c9f 100644 --- a/Source/Modulos/Contratos de cliente/ContratosCliente_Group.groupproj +++ b/Source/Modulos/Contratos de cliente/ContratosCliente_Group.groupproj @@ -16,6 +16,7 @@ + @@ -211,14 +212,23 @@ + + + + + + + + + - + - + - + \ No newline at end of file diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.dfm index 939d4cc..289df76 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.dfm @@ -93,6 +93,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente Top = 166 DataBinding.DataField = 'ID_FORMA_PAGO' DataBinding.DataSource = DADataSource + Properties.ImmediatePost = True Properties.KeyFieldNames = 'ID' Properties.ListColumns = < item @@ -102,6 +103,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente Properties.ListOptions.ShowHeader = False Properties.ListOptions.SyncMode = True Properties.ListSource = dsFormaPago + Properties.OnValidate = cbFormaPagoPropertiesValidate Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D Style.HotTrack = False @@ -344,6 +346,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente AutoAligns = [aaVertical] AlignHorz = ahClient Caption = 'Tipo contrato:' + Visible = False Control = cbTipoContrato ControlOptions.ShowBorder = False end diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.pas b/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.pas index 9ee5d48..547c631 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.pas +++ b/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.pas @@ -68,6 +68,8 @@ type procedure bFormasPagoClick(Sender: TObject); procedure frViewClienteContratoButton1Click(Sender: TObject); procedure frViewClienteContratoButton2Click(Sender: TObject); + procedure cbFormaPagoPropertiesValidate(Sender: TObject; + var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); protected FContrato : IBizContratoCliente; FFormasPago : IBizFormaPago; @@ -79,7 +81,7 @@ type function GetContrato: IBizContratoCliente; procedure SetContrato(const Value: IBizContratoCliente); virtual; function GetViewClienteContrato: IViewDatosYSeleccionClienteContrato; - + public property Contrato: IBizContratoCliente read GetContrato write SetContrato; property ViewClienteContrato: IViewDatosYSeleccionClienteContrato read GetViewClienteContrato; @@ -92,7 +94,7 @@ implementation { TfrViewContratoCliente } uses - uClientesController, uBizDireccionesContacto, uContratosClienteController; + schContratosClienteClient_Intf, uClientesController, uBizDireccionesContacto, uContratosClienteController; procedure TfrViewContratoCliente.bFormasPagoClick(Sender: TObject); @@ -102,6 +104,13 @@ begin FFormasPagoController.VerTodos(FFormasPago); end; +procedure TfrViewContratoCliente.cbFormaPagoPropertiesValidate(Sender: TObject; + var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); +begin + inherited; + Contrato.DataTable.FieldByName(fld_ContratosClienteFORMA_PAGO).AsString := FFormasPago.DESCRIPCION; +end; + procedure TfrViewContratoCliente.CustomViewCreate(Sender: TObject); begin inherited; diff --git a/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas index d712d86..0d66e56 100644 --- a/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas @@ -267,9 +267,9 @@ begin TIENDA := AppFactuGES.TiendaActiva.NOMBRE; {$IFDEF CONTABILIDAD} - if Assigned(AppFactuGES.EjercicioActivo) then - IGNORAR_CONTABILIDAD := 0 - else +// if Assigned(AppFactuGES.EjercicioActivo) then +// IGNORAR_CONTABILIDAD := 0 +// else IGNORAR_CONTABILIDAD := 1; {$ENDIF} diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm index c383a03..e25f808 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm @@ -81,6 +81,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente inherited pgPaginas: TPageControl Width = 854 Height = 368 + ActivePage = pagContenido OnChanging = pgPaginasChanging ExplicitWidth = 854 ExplicitHeight = 368 @@ -262,10 +263,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente object pagContenido: TTabSheet Caption = 'Contenido' ImageIndex = 1 - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 inline frViewDetallesFacturaCliente1: TfrViewDetallesFacturaCliente Left = 0 Top = 0 @@ -286,56 +283,97 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ExplicitHeight = 340 inherited ToolBar1: TToolBar Width = 846 + Height = 24 ExplicitWidth = 846 + ExplicitHeight = 24 + inherited ToolButton4: TToolButton + Wrap = False + end + inherited ToolButton14: TToolButton + Left = 334 + Top = 0 + ExplicitLeft = 334 + ExplicitTop = 0 + end + inherited FontName: TJvFontComboBox + Left = 368 + Top = 0 + ExplicitLeft = 368 + ExplicitTop = 0 + end inherited FontSize: TEdit + Left = 513 + Top = 0 Width = 57 + ExplicitLeft = 513 + ExplicitTop = 0 ExplicitWidth = 57 end inherited UpDown1: TUpDown - Left = 236 - ExplicitLeft = 236 + Left = 570 + Top = 0 + ExplicitLeft = 570 + ExplicitTop = 0 end inherited ToolButton13: TToolButton - Left = 253 - ExplicitLeft = 253 + Left = 587 + Top = 0 + ExplicitLeft = 587 + ExplicitTop = 0 end inherited ToolButton6: TToolButton - Left = 261 - ExplicitLeft = 261 + Left = 595 + Top = 0 + ExplicitLeft = 595 + ExplicitTop = 0 end inherited ToolButton7: TToolButton - Left = 295 - ExplicitLeft = 295 + Left = 629 + Top = 0 + ExplicitLeft = 629 + ExplicitTop = 0 end inherited ToolButton8: TToolButton - Left = 329 - ExplicitLeft = 329 + Left = 663 + Top = 0 + ExplicitLeft = 663 + ExplicitTop = 0 end inherited ToolButton12: TToolButton - Left = 363 - ExplicitLeft = 363 + Left = 697 + Top = 0 + ExplicitLeft = 697 + ExplicitTop = 0 end inherited ToolButton9: TToolButton - Left = 371 - ExplicitLeft = 371 + Left = 705 + Top = 0 + ExplicitLeft = 705 + ExplicitTop = 0 end inherited ToolButton10: TToolButton - Left = 405 - ExplicitLeft = 405 + Left = 739 + Top = 0 + ExplicitLeft = 739 + ExplicitTop = 0 end inherited ToolButton11: TToolButton - Left = 439 - ExplicitLeft = 439 + Left = 773 + Top = 0 + ExplicitLeft = 773 + ExplicitTop = 0 end end inherited cxGrid: TcxGrid + Top = 50 Width = 846 - Height = 268 + Height = 290 ExplicitTop = 50 ExplicitWidth = 846 ExplicitHeight = 290 end inherited TBXDock1: TTBXDock + Top = 24 Width = 846 ExplicitTop = 24 ExplicitWidth = 846 @@ -345,6 +383,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente object pagContabilidad: TTabSheet Caption = 'Contabilidad' ImageIndex = 2 + TabVisible = False inline frViewListaSubcuentas1: TfrViewListaSubcuentas Left = 0 Top = 0 @@ -397,6 +436,10 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Width = 860 TabOrder = 5 ExplicitWidth = 860 + inherited lbComentario: TLabel + Width = 850 + Height = 25 + end end inline frViewTotales1: TfrViewTotales [5] Left = 0 diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm index 0669f9a..0578e87 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm @@ -1,6 +1,6 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente - Width = 937 - Height = 382 + Width = 451 + Height = 304 Align = alClient OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy @@ -9,19 +9,17 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 - Width = 937 - Height = 382 + Width = 451 + Height = 304 Align = alClient ParentBackground = True TabOrder = 0 TabStop = False AutoContentSizes = [acsWidth, acsHeight] LookAndFeel = dxLayoutOfficeLookAndFeel1 - ExplicitWidth = 451 - ExplicitHeight = 304 DesignSize = ( - 937 - 382) + 451 + 304) object eReferencia: TcxDBTextEdit Left = 135 Top = 30 @@ -98,7 +96,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 78 end object bFormasPago: TButton - Left = 336 + Left = 241 Top = 108 Width = 132 Height = 23 @@ -111,6 +109,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Top = 188 Width = 351 Height = 48 + Enabled = False Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText Font.Height = -11 @@ -135,7 +134,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente end end inline frViewClienteFactura1: TfrViewClienteFactura - Left = 496 + Left = 401 Top = 30 Width = 398 Height = 265 @@ -147,14 +146,14 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente ParentFont = False TabOrder = 7 ReadOnly = False - ExplicitLeft = 496 + ExplicitLeft = 401 ExplicitTop = 30 ExplicitWidth = 398 ExplicitHeight = 265 inherited dxLayoutControl1: TdxLayoutControl Width = 398 Height = 265 - ExplicitWidth = 398 + ExplicitWidth = 101 ExplicitHeight = 265 inherited edtlNombre: TcxDBTextEdit ExplicitWidth = 276 @@ -177,12 +176,12 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 276 end inherited edtCodigoPostal: TcxDBTextEdit - Left = 327 - ExplicitLeft = 327 + Left = 192 + ExplicitLeft = 192 end inherited Button3: TBitBtn - Left = 217 - ExplicitLeft = 217 + Left = 82 + ExplicitLeft = 82 end inherited cxDBTextEdit1: TcxDBTextEdit ExplicitWidth = 283 @@ -231,7 +230,8 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente inherited memObservaciones: TcxDBMemo DataBinding.DataField = 'OBSERVACIONES' DataBinding.DataSource = DADataSource - ExplicitHeight = 228 + ExplicitWidth = 480 + ExplicitHeight = 20 Height = 228 end end @@ -241,6 +241,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Caption = ' No acogida a comisiones' DataBinding.DataField = 'SIN_COMISION' DataBinding.DataSource = DADataSource + Enabled = False Properties.DisplayChecked = '1' Properties.DisplayUnchecked = '0' Properties.ImmediatePost = True @@ -324,6 +325,8 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente object dxLayoutControl1Group4: TdxLayoutGroup AutoAligns = [aaVertical] Caption = 'La factura pertenece a la tienda' + Enabled = False + Visible = False object dxLayoutControl1Item3: TdxLayoutItem Caption = 'New Item' ShowCaption = False @@ -334,6 +337,8 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente end object dxLayoutControl1Group9: TdxLayoutGroup Caption = 'Comisiones' + Enabled = False + Visible = False object dxLayoutControl1Item7: TdxLayoutItem ShowCaption = False Control = cbRecargoEquivalencia diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm index 1c981fb..dc0188b 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm @@ -8,7 +8,7 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente Height = 269 RootLevelOptions.DetailTabsPosition = dtpTop OnActiveTabChanged = cxGridActiveTabChanged - ExplicitWidth = 531 + ExplicitWidth = 802 ExplicitHeight = 269 inherited cxGridView: TcxGridDBTableView DataController.KeyFieldNames = 'ID' @@ -37,6 +37,8 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente object cxGridViewTIENDA: TcxGridDBColumn Caption = 'Tienda' DataBinding.FieldName = 'TIENDA' + Visible = False + VisibleForCustomization = False end object cxGridViewREFERENCIA: TcxGridDBColumn DataBinding.FieldName = 'REFERENCIA' @@ -58,6 +60,7 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente Caption = 'Nombre comercial' DataBinding.FieldName = 'NOMBRE_COMERCIAL_CLIENTE' Visible = False + VisibleForCustomization = False end object cxGridViewNOMBRE_CLIENTE: TcxGridDBColumn Caption = 'Cliente' @@ -170,12 +173,12 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente end inherited frViewFiltroBase1: TfrViewFiltroBase Width = 802 - ExplicitWidth = 531 + ExplicitWidth = 802 inherited TBXDockablePanel1: TTBXDockablePanel - ExplicitWidth = 531 + ExplicitWidth = 802 inherited dxLayoutControl1: TdxLayoutControl Width = 802 - ExplicitWidth = 531 + ExplicitWidth = 802 inherited txtFiltroTodo: TcxTextEdit Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' @@ -205,10 +208,10 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 802 - ExplicitWidth = 531 + ExplicitWidth = 802 inherited tbxBotones: TTBXToolbar Width = 792 - ExplicitWidth = 521 + ExplicitWidth = 792 end end end @@ -217,13 +220,13 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente Top = 371 Visible = True ExplicitTop = 371 - ExplicitWidth = 531 + ExplicitWidth = 802 inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 802 - ExplicitWidth = 531 + ExplicitWidth = 802 inherited TBXToolbar1: TTBXToolbar Width = 792 - ExplicitWidth = 521 + ExplicitWidth = 792 object TBXSeparatorItem2: TTBXSeparatorItem end object TBXItem3: TTBXItem diff --git a/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas b/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas index 6daa19e..3b4a722 100644 --- a/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas +++ b/Source/Modulos/Facturas de proveedor/Model/uBizFacturasProveedor.pas @@ -292,9 +292,9 @@ begin TIENDA := AppFactuGES.TiendaActiva.NOMBRE; {$IFDEF CONTABILIDAD} - if Assigned(AppFactuGES.EjercicioActivo) then - IGNORAR_CONTABILIDAD := 0 - else +// if Assigned(AppFactuGES.EjercicioActivo) then +// IGNORAR_CONTABILIDAD := 0 +// else IGNORAR_CONTABILIDAD := 1; {$ENDIF} diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm index 7ae4340..8c185fe 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm @@ -262,40 +262,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 @@ -344,6 +344,7 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor object pagContabilidad: TTabSheet Caption = 'Contabilidad' ImageIndex = 3 + TabVisible = False inline frViewListaSubcuentas1: TfrViewListaSubcuentas Left = 0 Top = 0 diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm index 5b11117..0490100 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm @@ -1,6 +1,6 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor - Width = 758 - Height = 521 + Width = 648 + Height = 554 Align = alClient OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy @@ -9,8 +9,8 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 - Width = 758 - Height = 521 + Width = 648 + Height = 554 Align = alClient ParentBackground = True TabOrder = 0 @@ -20,8 +20,8 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor ExplicitWidth = 451 ExplicitHeight = 304 DesignSize = ( - 758 - 521) + 648 + 554) object eReferencia: TcxDBTextEdit Left = 124 Top = 30 @@ -97,7 +97,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor Width = 169 end object bFormasPago: TButton - Left = 264 + Left = 154 Top = 135 Width = 132 Height = 23 @@ -130,6 +130,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor Top = 215 Width = 320 Height = 36 + Enabled = False Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText Font.Height = -11 @@ -144,7 +145,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor ExplicitHeight = 36 inherited dxLayoutControl1: TdxLayoutControl Width = 320 - ExplicitWidth = 320 + ExplicitWidth = 260 inherited cbTienda: TcxComboBox ExplicitWidth = 376 Width = 376 @@ -173,7 +174,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor Width = 158 end inline frViewProveedorFactura1: TfrViewProveedorFactura - Left = 424 + Left = 314 Top = 30 Width = 312 Height = 260 @@ -185,7 +186,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor ParentFont = False TabOrder = 7 ReadOnly = False - ExplicitLeft = 424 + ExplicitLeft = 314 ExplicitTop = 30 ExplicitWidth = 312 ExplicitHeight = 260 @@ -245,9 +246,13 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor ReadOnly = False ExplicitLeft = 22 ExplicitTop = 320 + ExplicitHeight = 228 inherited memObservaciones: TcxDBMemo DataBinding.DataField = 'OBSERVACIONES' DataBinding.DataSource = DADataSource + ExplicitWidth = 600 + ExplicitHeight = 20 + Height = 228 end end object dxLayoutControl1Group_Root: TdxLayoutGroup @@ -314,6 +319,8 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor end object dxLayoutControl1Group4: TdxLayoutGroup Caption = 'La factura pertenece a la tienda' + Enabled = False + Visible = False object dxLayoutControl1Item7: TdxLayoutItem Control = frViewTienda1 ControlOptions.AutoColor = True diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm index 5f64d5d..0a3c956 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm @@ -74,6 +74,8 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor object cxGridViewTIENDA: TcxGridDBColumn Caption = 'Tienda' DataBinding.FieldName = 'TIENDA' + Visible = False + VisibleForCustomization = False end object cxGridViewREFERENCIA: TcxGridDBColumn DataBinding.FieldName = 'REFERENCIA' @@ -107,6 +109,8 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor object cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn Caption = 'Nombre comercial' DataBinding.FieldName = 'NOMBRE_COMERCIAL' + Visible = False + VisibleForCustomization = False end object cxGridViewNIF_CIF: TcxGridDBColumn DataBinding.FieldName = 'NIF_CIF' diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestosCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestosCliente.dfm index c39e81b..9ad1041 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestosCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestosCliente.dfm @@ -124,7 +124,7 @@ inherited fEditorPresupuestosCliente: TfEditorPresupuestosCliente Width = 805 ExplicitWidth = 805 inherited tbxMain: TTBXToolbar - ExplicitWidth = 775 + ExplicitWidth = 632 object TBXSubmenuItem3: TTBXSubmenuItem [0] Caption = 'Nuevo' DisplayMode = nbdmImageAndText diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestosCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestosCliente.pas index b940bc5..ef27a90 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestosCliente.pas +++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestosCliente.pas @@ -219,8 +219,8 @@ begin else APresupuestos := Self.Presupuestos; - if (Application.MessageBox('¿Está seguro que desea generar el/los contrato/s de los presupuesto/s seleccionado/s?', 'Atención', MB_YESNO) = IDYES) then - begin +// if (Application.MessageBox('¿Está seguro que desea generar el/los contrato/s de los presupuesto/s seleccionado/s?', 'Atención', MB_YESNO) = IDYES) then +// begin if not AllItems then GenerarContratoCli(APresupuestos.ID) else @@ -237,7 +237,7 @@ begin actRefrescar.Execute; if AllItems then ShowInfoMessage('Se han generado los contratos'); - end +// end end; procedure TfEditorPresupuestosCliente.actGenerarContratoUpdate(Sender: TObject); diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm index 365a0b8..d308a8e 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm @@ -230,10 +230,6 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente Height = 224 ExplicitWidth = 320 ExplicitHeight = 224 - inherited edtlNombre: TcxDBTextEdit - ExplicitWidth = 224 - Width = 224 - end inherited edtNIFCIF: TcxDBTextEdit Left = 328 ExplicitLeft = 328 @@ -242,10 +238,6 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente Left = 239 ExplicitLeft = 239 end - inherited edtPersonaContacto: TcxDBTextEdit - ExplicitWidth = 283 - Width = 283 - end inherited edtDireccion: TcxMemo ExplicitWidth = 121 Width = 121 @@ -258,10 +250,6 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente Left = 408 ExplicitLeft = 408 end - inherited edtTelefonos: TcxTextEdit - ExplicitWidth = 363 - Width = 363 - end end end object memFormaPago: TcxDBMemo @@ -396,6 +384,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente AutoAligns = [aaVertical] AlignHorz = ahClient Caption = 'Tipo presup.:' + Visible = False Control = cbTipoPresupuesto ControlOptions.ShowBorder = False end diff --git a/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.pas index 9d24e79..b73f0f1 100644 --- a/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.pas +++ b/Source/Modulos/Recibos de cliente/Data/uDataModuleRecibosCliente.pas @@ -187,7 +187,7 @@ begin with Result.DataTable.DynamicWhere do begin // (ID = :ID) - Condicion := NewBinaryExpression(NewField('', fld_RecibosClienteID), NewConstant(ID, datInteger), dboEqual); + Condicion := NewBinaryExpression(NewField('V_RECIBOS_CLIENTE', fld_RecibosClienteID), NewConstant(ID, datInteger), dboEqual); if IsEmpty then Expression := Condicion diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorFechaPago.dfm b/Source/Modulos/Recibos de cliente/Views/uEditorFechaPago.dfm index a3ef4b9..f560bd0 100644 --- a/Source/Modulos/Recibos de cliente/Views/uEditorFechaPago.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uEditorFechaPago.dfm @@ -4,7 +4,7 @@ object fEditorFechaPago: TfEditorFechaPago BorderStyle = bsDialog Caption = 'Fecha del cobro / devoluci'#243'n' ClientHeight = 234 - ClientWidth = 560 + ClientWidth = 402 Color = clWindow Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -46,6 +46,7 @@ object fEditorFechaPago: TfEditorFechaPago object eFechaPago: TcxDateEdit Left = 121 Top = 84 + Properties.ImmediatePost = True Properties.OnEditValueChanged = eFechaPagoPropertiesEditValueChanged Style.LookAndFeel.Kind = lfStandard Style.LookAndFeel.NativeStyle = True @@ -61,7 +62,7 @@ object fEditorFechaPago: TfEditorFechaPago inline frViewListaSubcuentas1: TfrViewListaSubcuentas Left = 0 Top = 143 - Width = 560 + Width = 402 Height = 50 Align = alBottom Font.Charset = DEFAULT_CHARSET @@ -73,11 +74,11 @@ object fEditorFechaPago: TfEditorFechaPago TabOrder = 1 ReadOnly = False ExplicitTop = 143 - ExplicitWidth = 560 + ExplicitWidth = 425 ExplicitHeight = 50 inherited dxLayoutControl1: TdxLayoutControl - Width = 560 - ExplicitWidth = 560 + Width = 402 + ExplicitWidth = 425 inherited cbSubCuentas: TcxComboBox Left = 122 Style.LookAndFeel.SkinName = '' @@ -89,12 +90,13 @@ object fEditorFechaPago: TfEditorFechaPago Width = 376 end inherited eContabilizar: TcxCheckBox - Left = 393 + Left = 282 + Enabled = False Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 393 + ExplicitLeft = 282 ExplicitWidth = 203 Width = 203 end @@ -102,13 +104,17 @@ object fEditorFechaPago: TfEditorFechaPago inherited dxLayoutControl1Item1: TdxLayoutItem Caption = ' Caja/Banco: ' end + inherited dxLayoutControl1Item2: TdxLayoutItem + Enabled = False + Visible = False + end end end end object PnlComentario: TPanel Left = 0 Top = 0 - Width = 560 + Width = 402 Height = 45 Align = alTop Alignment = taLeftJustify @@ -117,27 +123,31 @@ object fEditorFechaPago: TfEditorFechaPago ParentBackground = False TabOrder = 2 VerticalAlignment = taAlignTop + ExplicitWidth = 425 object lbComentario: TLabel AlignWithMargins = True Left = 6 Top = 4 - Width = 55 - Height = 13 + Width = 392 + Height = 40 Margins.Left = 5 Align = alClient Caption = 'Comentario' WordWrap = True + ExplicitWidth = 55 + ExplicitHeight = 13 end end object Panel1: TPanel Left = 0 Top = 193 - Width = 560 + Width = 402 Height = 41 Align = alBottom TabOrder = 3 + ExplicitWidth = 425 object bAceptar: TButton - Left = 347 + Left = 213 Top = 8 Width = 75 Height = 25 @@ -146,7 +156,7 @@ object fEditorFechaPago: TfEditorFechaPago TabOrder = 0 end object bCancelar: TButton - Left = 445 + Left = 311 Top = 8 Width = 75 Height = 25 diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas index 32ff7e8..24b09d0 100644 --- a/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas +++ b/Source/Modulos/Recibos de cliente/Views/uEditorReciboCliente.pas @@ -182,6 +182,10 @@ begin end; end; + // Se cancela la operación + if Length(AFechaPago) = 0 then + Exit; + FController.AnadirPago(Recibo, AFechaPago, AIgnorarContabilidad, AIdSubCuenta, ASubCuenta); //Solo podremos modificar el recibo si esta pendiente o devuelto diff --git a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm index 95cc09a..0f26092 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uViewReciboCliente.dfm @@ -14,7 +14,6 @@ inherited frViewReciboCliente: TfrViewReciboCliente TabStop = False AutoContentSizes = [acsWidth, acsHeight] LookAndFeel = dxLayoutOfficeLookAndFeel1 - ExplicitHeight = 509 DesignSize = ( 925 471) @@ -353,6 +352,7 @@ inherited frViewReciboCliente: TfrViewReciboCliente Top = 240 Width = 327 Height = 41 + Enabled = False Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText Font.Height = -11 @@ -565,6 +565,8 @@ inherited frViewReciboCliente: TfrViewReciboCliente end object dxLayoutControl1Group5: TdxLayoutGroup Caption = 'El recibo pertenece a la tienda' + Enabled = False + Visible = False object dxLayoutControl1Item18: TdxLayoutItem Caption = 'Tienda:' Control = frViewTienda1 diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm index 833d6c4..8bca77c 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm @@ -8,8 +8,8 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente Height = 317 RootLevelOptions.DetailTabsPosition = dtpTop OnActiveTabChanged = cxGridActiveTabChanged - ExplicitWidth = 531 - ExplicitHeight = 259 + ExplicitWidth = 686 + ExplicitHeight = 317 inherited cxGridView: TcxGridDBTableView DataController.KeyFieldNames = 'ID' DataController.Options = [dcoAnsiSort, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoGroupsAlwaysExpanded] @@ -58,7 +58,9 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente object cxGridViewTIENDA: TcxGridDBColumn Caption = 'Tienda' DataBinding.FieldName = 'TIENDA' + Visible = False BestFitMaxWidth = 60 + VisibleForCustomization = False end object cxGridViewID_RECIBO_COMPENSADO: TcxGridDBColumn Caption = 'Compensado' @@ -214,22 +216,34 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente end inherited frViewFiltroBase1: TfrViewFiltroBase Width = 686 - ExplicitWidth = 531 + ExplicitWidth = 686 inherited TBXDockablePanel1: TTBXDockablePanel - ExplicitWidth = 531 + ExplicitWidth = 686 inherited dxLayoutControl1: TdxLayoutControl Width = 686 - ExplicitWidth = 531 + ExplicitWidth = 686 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 = 183 Width = 183 end inherited edtFechaFinFiltro: TcxDateEdit Left = 367 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 367 ExplicitWidth = 234 Width = 234 @@ -237,10 +251,10 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 686 - ExplicitWidth = 531 + ExplicitWidth = 686 inherited tbxBotones: TTBXToolbar Width = 676 - ExplicitWidth = 521 + ExplicitWidth = 676 end end end @@ -248,14 +262,14 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente inherited pnlAgrupaciones: TTBXDockablePanel Top = 419 Visible = True - ExplicitTop = 361 - ExplicitWidth = 531 + ExplicitTop = 419 + ExplicitWidth = 686 inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 686 - ExplicitWidth = 531 + ExplicitWidth = 686 inherited TBXToolbar1: TTBXToolbar Width = 676 - ExplicitWidth = 521 + ExplicitWidth = 676 object TBXSeparatorItem1: TTBXSeparatorItem end object TBXItem2: TTBXItem diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorFechaPagoProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uEditorFechaPagoProveedor.dfm index fd6dc69..981e7a7 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uEditorFechaPagoProveedor.dfm +++ b/Source/Modulos/Recibos de proveedor/Views/uEditorFechaPagoProveedor.dfm @@ -4,7 +4,7 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor BorderStyle = bsDialog Caption = 'Fecha del cobro / devoluci'#243'n' ClientHeight = 217 - ClientWidth = 563 + ClientWidth = 415 Color = clWindow Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -61,12 +61,13 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor object Panel1: TPanel Left = 0 Top = 176 - Width = 563 + Width = 415 Height = 41 Align = alBottom TabOrder = 1 + ExplicitWidth = 563 object bAceptar: TButton - Left = 368 + Left = 236 Top = 6 Width = 75 Height = 25 @@ -75,7 +76,7 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor TabOrder = 0 end object bCancelar: TButton - Left = 459 + Left = 327 Top = 6 Width = 75 Height = 25 @@ -87,7 +88,7 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor inline frViewListaSubcuentas1: TfrViewListaSubcuentas Left = 0 Top = 136 - Width = 563 + Width = 415 Height = 40 Align = alBottom Font.Charset = DEFAULT_CHARSET @@ -102,7 +103,7 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor ExplicitWidth = 563 ExplicitHeight = 40 inherited dxLayoutControl1: TdxLayoutControl - Width = 563 + Width = 415 ExplicitWidth = 563 inherited cbSubCuentas: TcxComboBox Left = 128 @@ -115,12 +116,13 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor Width = 440 end inherited eContabilizar: TcxCheckBox - Left = 410 + Left = 301 + Enabled = False Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 410 + ExplicitLeft = 301 ExplicitWidth = 203 Width = 203 end @@ -128,13 +130,17 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor inherited dxLayoutControl1Item1: TdxLayoutItem Caption = ' Caja/Banco: ' end + inherited dxLayoutControl1Item2: TdxLayoutItem + Enabled = False + Visible = False + end end end end object PnlComentario: TPanel Left = 0 Top = 0 - Width = 563 + Width = 415 Height = 45 Align = alTop Alignment = taLeftJustify @@ -143,16 +149,19 @@ object fEditorFechaPagoProveedor: TfEditorFechaPagoProveedor ParentBackground = False TabOrder = 3 VerticalAlignment = taAlignTop + ExplicitWidth = 563 object lbComentario: TLabel AlignWithMargins = True Left = 6 Top = 4 - Width = 55 - Height = 13 + Width = 405 + Height = 40 Margins.Left = 5 Align = alClient Caption = 'Comentario' WordWrap = True + ExplicitWidth = 55 + ExplicitHeight = 13 end end end diff --git a/Source/Modulos/Recibos de proveedor/Views/uViewReciboProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uViewReciboProveedor.dfm index 287dc7c..62ff516 100644 --- a/Source/Modulos/Recibos de proveedor/Views/uViewReciboProveedor.dfm +++ b/Source/Modulos/Recibos de proveedor/Views/uViewReciboProveedor.dfm @@ -14,7 +14,6 @@ inherited frViewReciboProveedor: TfrViewReciboProveedor TabStop = False AutoContentSizes = [acsWidth, acsHeight] LookAndFeel = dxLayoutOfficeLookAndFeel1 - ExplicitWidth = 811 DesignSize = ( 858 524) @@ -351,6 +350,7 @@ inherited frViewReciboProveedor: TfrViewReciboProveedor Top = 267 Width = 268 Height = 41 + Enabled = False Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText Font.Height = -11 @@ -627,6 +627,8 @@ inherited frViewReciboProveedor: TfrViewReciboProveedor end object dxLayoutControl1Group3: TdxLayoutGroup Caption = 'El recibo pertenece a la tienda' + Enabled = False + Visible = False object dxLayoutControl1Item17: TdxLayoutItem Caption = 'Tienda:' Control = frViewTienda1 diff --git a/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.dfm b/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.dfm index ea6af11..e36c50c 100644 --- a/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.dfm +++ b/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.dfm @@ -178,23 +178,35 @@ inherited frViewRemesaCliente: TfrViewRemesaCliente Width = 429 ExplicitWidth = 429 inherited cbSubCuentas: TcxComboBox + Left = 80 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 80 ExplicitWidth = 376 Width = 376 end inherited eContabilizar: TcxCheckBox - Left = 276 + Left = 278 + Enabled = False Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 276 + ExplicitLeft = 278 ExplicitWidth = 203 Width = 203 end + inherited dxLayoutControl1Group_Root: TdxLayoutGroup + inherited dxLayoutControl1Item1: TdxLayoutItem + Caption = 'Caja / Banco:' + end + inherited dxLayoutControl1Item2: TdxLayoutItem + Enabled = False + Visible = False + end + end end end object dxLayoutControlRemesaClienteGroup_Root: TdxLayoutGroup diff --git a/Source/Modulos/Remesas de proveedor/Servidor/srvRemesasProveedor_Impl.dfm b/Source/Modulos/Remesas de proveedor/Servidor/srvRemesasProveedor_Impl.dfm index 1905d95..20fa352 100644 --- a/Source/Modulos/Remesas de proveedor/Servidor/srvRemesasProveedor_Impl.dfm +++ b/Source/Modulos/Remesas de proveedor/Servidor/srvRemesasProveedor_Impl.dfm @@ -473,9 +473,8 @@ object srvRemesasProveedor: TsrvRemesasProveedor InsertCommandName = 'Insert_RemesasProveedor' DeleteCommandName = 'Delete_RemesasProveedor' UpdateCommandName = 'Update_RemesasProveedor' - RefreshDatasetName = 'RemesasProveedor_Refresh' ReferencedDataset = 'RemesasProveedor' - ProcessorOptions = [poPrepareCommands] + ProcessorOptions = [poAutoGenerateRefreshDataset, poPrepareCommands] UpdateMode = updWhereKeyOnly Left = 248 Top = 24 diff --git a/Source/Modulos/Remesas de proveedor/Views/uViewRemesaProveedor.dfm b/Source/Modulos/Remesas de proveedor/Views/uViewRemesaProveedor.dfm index 0e16a1d..5cddb14 100644 --- a/Source/Modulos/Remesas de proveedor/Views/uViewRemesaProveedor.dfm +++ b/Source/Modulos/Remesas de proveedor/Views/uViewRemesaProveedor.dfm @@ -15,8 +15,6 @@ inherited frViewRemesaProveedor: TfrViewRemesaProveedor TabStop = False AutoContentSizes = [acsWidth, acsHeight] LookAndFeel = dxLayoutOfficeLookAndFeel1 - ExplicitWidth = 485 - ExplicitHeight = 230 DesignSize = ( 451 304) @@ -180,23 +178,35 @@ inherited frViewRemesaProveedor: TfrViewRemesaProveedor Width = 407 ExplicitWidth = 407 inherited cbSubCuentas: TcxComboBox + Left = 80 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 80 ExplicitWidth = 376 Width = 376 end inherited eContabilizar: TcxCheckBox - Left = 276 + Left = 278 + Enabled = False Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 276 + ExplicitLeft = 278 ExplicitWidth = 203 Width = 203 end + inherited dxLayoutControl1Group_Root: TdxLayoutGroup + inherited dxLayoutControl1Item1: TdxLayoutItem + Caption = 'Caja / Banco:' + end + inherited dxLayoutControl1Item2: TdxLayoutItem + Enabled = False + Visible = False + end + end end end object dxLayoutControlRemesaProveedorGroup_Root: TdxLayoutGroup