diff --git a/Source/ApplicationBase/Ejercicios/Data/uDataModuleEjercicios.pas b/Source/ApplicationBase/Ejercicios/Data/uDataModuleEjercicios.pas index 1fed1528..7ecfea17 100644 --- a/Source/ApplicationBase/Ejercicios/Data/uDataModuleEjercicios.pas +++ b/Source/ApplicationBase/Ejercicios/Data/uDataModuleEjercicios.pas @@ -31,7 +31,7 @@ uses FactuGES_Intf, uDataModuleConexion, uDataTableUtils, cxControls, schEjerciciosClient_Intf; -{ TdmAlmacens } +{ TdmEjercicios } procedure TDataModuleEjercicios.DAClientDataModuleCreate(Sender: TObject); begin diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 1641339f..8b251f31 100644 Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ diff --git a/Source/Cliente/uBootStrap.pas b/Source/Cliente/uBootStrap.pas index ba07021b..70f0ce8b 100644 --- a/Source/Cliente/uBootStrap.pas +++ b/Source/Cliente/uBootStrap.pas @@ -11,6 +11,7 @@ procedure Run; procedure Terminate; implementation +{$INCLUDE ..\FactuGES.inc} uses uDMBase, uDataModuleConexion, uDataModuleConfiguracion, @@ -24,10 +25,13 @@ begin LoadModule('TiposIVA_plugin.bpl'); LoadModule('Familias_plugin.bpl'); LoadModule('UnidadesMedida_plugin.bpl'); - + LoadModule('Contactos_plugin.bpl'); + {$IFDEF ALMACEN} LoadModule('Almacenes_plugin.bpl'); + {$ENDIF} + LoadModule('Articulos_plugin.bpl'); LoadModule('PresupuestosCliente_plugin.bpl'); diff --git a/Source/GUIBase/uViewTotales.dfm b/Source/GUIBase/uViewTotales.dfm index d3e8b6e6..6fc989bd 100644 --- a/Source/GUIBase/uViewTotales.dfm +++ b/Source/GUIBase/uViewTotales.dfm @@ -1,14 +1,14 @@ inherited frViewTotales: TfrViewTotales - Width = 451 - Height = 350 + Width = 751 + Height = 227 Align = alBottom - ExplicitWidth = 451 - ExplicitHeight = 350 + ExplicitWidth = 751 + ExplicitHeight = 227 object dxLayoutControl1: TdxLayoutControl AlignWithMargins = True Left = 0 Top = 0 - Width = 451 + Width = 751 Height = 217 Margins.Left = 0 Margins.Top = 0 @@ -18,6 +18,7 @@ inherited frViewTotales: TfrViewTotales ParentBackground = True TabOrder = 0 AutoContentSizes = [acsWidth, acsHeight] + ExplicitWidth = 451 object Bevel1: TBevel Left = 104 Top = 109 @@ -26,14 +27,14 @@ inherited frViewTotales: TfrViewTotales Shape = bsBottomLine end object Bevel3: TBevel - Left = 278 + Left = 372 Top = 28 Width = 3 Height = 122 Shape = bsRightLine end object Bevel4: TBevel - Left = 390 + Left = 484 Top = 109 Width = 192 Height = 9 @@ -71,7 +72,7 @@ inherited frViewTotales: TfrViewTotales Width = 93 end object ImporteIVA: TcxDBCurrencyEdit - Left = 461 + Left = 555 Top = 55 AutoSize = False DataBinding.DataField = 'IMPORTE_IVA' @@ -102,7 +103,7 @@ inherited frViewTotales: TfrViewTotales Width = 137 end object ImporteTotal: TcxDBCurrencyEdit - Left = 391 + Left = 485 Top = 129 AutoSize = False DataBinding.DataField = 'IMPORTE_TOTAL' @@ -164,7 +165,7 @@ inherited frViewTotales: TfrViewTotales Width = 65 end object edtIVA: TcxDBSpinEdit - Left = 390 + Left = 484 Top = 55 AutoSize = False DataBinding.DataField = 'IVA' @@ -201,7 +202,7 @@ inherited frViewTotales: TfrViewTotales Width = 65 end object ImporteBase: TcxDBCurrencyEdit - Left = 390 + Left = 484 Top = 28 AutoSize = False DataBinding.DataField = 'BASE_IMPONIBLE' @@ -232,7 +233,7 @@ inherited frViewTotales: TfrViewTotales Width = 92 end object edtRE: TcxDBSpinEdit - Left = 390 + Left = 484 Top = 82 AutoSize = False DataBinding.DataField = 'RE' @@ -269,7 +270,7 @@ inherited frViewTotales: TfrViewTotales Width = 65 end object ImporteRE: TcxDBCurrencyEdit - Left = 461 + Left = 555 Top = 82 AutoSize = False DataBinding.DataField = 'IMPORTE_RE' @@ -365,7 +366,6 @@ inherited frViewTotales: TfrViewTotales Top = 55 DataBinding.DataField = 'ID_TIPO_IVA' DataBinding.DataSource = DADataSource - Properties.GridMode = True Properties.ImmediatePost = True Properties.KeyFieldNames = 'ID' Properties.ListColumns = < @@ -374,6 +374,7 @@ inherited frViewTotales: TfrViewTotales end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsTiposIVA Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -392,7 +393,7 @@ inherited frViewTotales: TfrViewTotales Width = 81 end object bTiposIVA: TButton - Left = 130 + Left = 224 Top = 55 Width = 132 Height = 21 diff --git a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas index c802ca0b..b401bbb7 100644 --- a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas +++ b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas @@ -139,6 +139,7 @@ type end; implementation +{$INCLUDE ..\..\FactuGES.inc} uses uROTypes, Controls, cxControls, DB, uEditorRegistryUtils, uEditorPreview, DateUtils, @@ -469,9 +470,12 @@ begin if (AAlbaran.IMPORTE_TOTAL >= 0) then raise Exception.Create('Una orden de devolución no puede tener un importe total positivo'); + + {$IFDEF ALMACEN} //Una orden de devolución debe tener relleno el almacén de entrada de material if (AAlbaran.ID_ALMACEN < 0) or (AAlbaran.ID_ALMACEN = 0) then raise Exception.Create('Debe indicar el almacén de entrada de esta orden de devolución'); + {$ENDIF} //Ponemos la fecha del albaran de devolución como fecha de envio para que se contabilice según dicha fecha AAlbaran.Edit; diff --git a/Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas index 66123dad..b38f40d7 100644 --- a/Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas @@ -191,7 +191,7 @@ begin REFERENCIA := ''; TIPO := CTE_TIPO_ALBARAN; // ALMACÉN PUESTO A CAPÓN Y PROVISIONAL - ID_ALMACEN := 2; + ID_ALMACEN := 1; end; procedure TBizAlbaranCliente.IVAOnChange(Sender: TDACustomField); diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm index 1b7177a7..c3cd14b0 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm @@ -329,6 +329,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsFormaPago Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -401,6 +402,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsAlmacenes Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm index 2cad9133..3139a5f8 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm @@ -110,6 +110,8 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente end object cxGridViewNOMBRE_ALMACEN: TcxGridDBColumn DataBinding.FieldName = 'NOMBRE_ALMACEN' + Visible = False + VisibleForCustomization = False Width = 63 end object cxGridViewCALLE: TcxGridDBColumn @@ -172,6 +174,14 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente inherited dxLayoutControl1: TdxLayoutControl Width = 596 ExplicitWidth = 596 + inherited txtFiltroTodo: TcxTextEdit + ExplicitWidth = 273 + Width = 273 + end + inherited edtFechaIniFiltro: TcxDateEdit + ExplicitWidth = 121 + Width = 121 + end inherited edtFechaFinFiltro: TcxDateEdit Left = 251 ExplicitLeft = 251 @@ -260,6 +270,8 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente end object actAlmacenes: TAction Caption = 'Almacenes' + Enabled = False + Visible = False OnExecute = actAlmacenesExecute OnUpdate = actAlmacenesUpdate end diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas index 075265f2..e584389a 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas @@ -12,7 +12,8 @@ uses uDADataTable, cxGridLevel, cxClasses, cxControls, cxGridCustomView, Classes, cxGrid, uBizAlbaranesCliente, cxCurrencyEdit, Forms, uViewFiltroBase, ComCtrls, Tabs, - cxPC, ActnList, TB2Item, TBX, TB2Dock, TB2Toolbar, TBXDkPanels, dxPgsDlg; + cxPC, ActnList, TB2Item, TBX, TB2Dock, TB2Toolbar, TBXDkPanels, dxPgsDlg, + uDAInterfaces; type IViewAlbaranesCliente = interface(IViewGrid) diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm index 667de217..750ccd84 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm @@ -203,6 +203,7 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsFormaPago Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D diff --git a/Source/Modulos/Almacenes/Views/uEditorListaAlmacenes.dfm b/Source/Modulos/Almacenes/Views/uEditorListaAlmacenes.dfm index c596580c..2defb1b8 100644 --- a/Source/Modulos/Almacenes/Views/uEditorListaAlmacenes.dfm +++ b/Source/Modulos/Almacenes/Views/uEditorListaAlmacenes.dfm @@ -54,6 +54,7 @@ object fEditorListaAlmacenes: TfEditorListaAlmacenes Properties.ListOptions.AnsiSort = True Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = DADataSource Style.LookAndFeel.NativeStyle = True StyleDisabled.LookAndFeel.NativeStyle = True diff --git a/Source/Modulos/Almacenes/Views/uListaAlmacenes.dfm b/Source/Modulos/Almacenes/Views/uListaAlmacenes.dfm index 2459930d..00a9695e 100644 --- a/Source/Modulos/Almacenes/Views/uListaAlmacenes.dfm +++ b/Source/Modulos/Almacenes/Views/uListaAlmacenes.dfm @@ -53,6 +53,7 @@ object fListaAlmacenes: TfListaAlmacenes Properties.ListOptions.AnsiSort = True Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = DADataSource Style.LookAndFeel.NativeStyle = True StyleDisabled.LookAndFeel.NativeStyle = True diff --git a/Source/Modulos/Comisiones/Views/uViewComision.dfm b/Source/Modulos/Comisiones/Views/uViewComision.dfm index 5983e1a4..0a0ffc35 100644 --- a/Source/Modulos/Comisiones/Views/uViewComision.dfm +++ b/Source/Modulos/Comisiones/Views/uViewComision.dfm @@ -90,7 +90,6 @@ inherited frViewComision: TfrViewComision Top = 57 DataBinding.DataField = 'ID_AGENTE' DataBinding.DataSource = dsDataTable - Properties.GridMode = True Properties.ImmediatePost = True Properties.KeyFieldNames = 'ID' Properties.ListColumns = < @@ -99,6 +98,7 @@ inherited frViewComision: TfrViewComision end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsAgentes Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D diff --git a/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm b/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm index feb8174c..1fc96da4 100644 --- a/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm +++ b/Source/Modulos/Contactos/Views/uViewClienteDatosComerciales.dfm @@ -109,6 +109,7 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsFormaPago Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -148,6 +149,7 @@ inherited frViewClienteDatosComerciales: TfrViewClienteDatosComerciales end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsTiposIVA Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D diff --git a/Source/Modulos/Contactos/Views/uViewClienteDescuentos.dfm b/Source/Modulos/Contactos/Views/uViewClienteDescuentos.dfm index e9d751c8..3415f3a1 100644 --- a/Source/Modulos/Contactos/Views/uViewClienteDescuentos.dfm +++ b/Source/Modulos/Contactos/Views/uViewClienteDescuentos.dfm @@ -22,6 +22,7 @@ inherited frViewClienteDescuentos: TfrViewClienteDescuentos end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsProveedores end object cxGridViewDESCUENTO: TcxGridDBColumn diff --git a/Source/Modulos/Contactos/Views/uViewProveedorDatosComerciales.dfm b/Source/Modulos/Contactos/Views/uViewProveedorDatosComerciales.dfm index d684b2a4..89f35c7c 100644 --- a/Source/Modulos/Contactos/Views/uViewProveedorDatosComerciales.dfm +++ b/Source/Modulos/Contactos/Views/uViewProveedorDatosComerciales.dfm @@ -62,6 +62,7 @@ inherited frViewProveedorDatosComerciales: TfrViewProveedorDatosComerciales end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsFormaPago Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -100,6 +101,7 @@ inherited frViewProveedorDatosComerciales: TfrViewProveedorDatosComerciales end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsTiposIVA Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm index 6136347d..aa07de36 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm @@ -71,7 +71,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente inherited pgPaginas: TPageControl Width = 782 Height = 311 - ActivePage = pagContabilidad OnChanging = pgPaginasChanging ExplicitLeft = 3 ExplicitTop = 79 diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm index ef350f91..1c54c042 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 = 451 - Height = 304 + Width = 914 + Height = 445 Align = alClient OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy @@ -9,16 +9,18 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 - Width = 451 - Height = 304 + Width = 914 + Height = 445 Align = alClient ParentBackground = True TabOrder = 0 AutoContentSizes = [acsWidth, acsHeight] LookAndFeel = dxLayoutOfficeLookAndFeel1 + ExplicitWidth = 451 + ExplicitHeight = 304 DesignSize = ( - 451 - 304) + 914 + 445) object eReferencia: TcxDBTextEdit Left = 124 Top = 30 @@ -79,7 +81,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 301 end inline frViewClienteFactura: TfrViewDatosYSeleccionCliente - Left = 310 + Left = 474 Top = 30 Width = 314 Height = 215 @@ -91,14 +93,14 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente ParentFont = False TabOrder = 5 ReadOnly = False - ExplicitLeft = 310 + ExplicitLeft = 474 ExplicitTop = 30 ExplicitWidth = 314 ExplicitHeight = 215 inherited dxLayoutControl1: TdxLayoutControl Width = 314 Height = 215 - ExplicitWidth = 314 + ExplicitWidth = 119 ExplicitHeight = 215 inherited edtlNombre: TcxDBTextEdit DataBinding.DataSource = DADataSource @@ -126,13 +128,13 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 327 end inherited edtCodigoPostal: TcxDBTextEdit - Left = 192 + Left = 326 DataBinding.DataSource = DADataSource - ExplicitLeft = 192 + ExplicitLeft = 326 end inherited Button3: TBitBtn - Left = 82 - ExplicitLeft = 82 + Left = 216 + ExplicitLeft = 216 end end end @@ -141,7 +143,6 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Top = 84 DataBinding.DataField = 'ID_FORMA_PAGO' DataBinding.DataSource = DADataSource - Properties.GridMode = True Properties.ImmediatePost = True Properties.KeyFieldNames = 'ID' Properties.ListColumns = < @@ -150,6 +151,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsFormaPago Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D @@ -168,7 +170,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 78 end object bFormasPago: TButton - Left = 150 + Left = 314 Top = 84 Width = 132 Height = 23 diff --git a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas index a4fa0284..4637c232 100644 --- a/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas +++ b/Source/Modulos/Facturas de proveedor/Model/schFacturasProveedorClient_Intf.pas @@ -3,7 +3,7 @@ unit schFacturasProveedorClient_Intf; interface uses - Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; + Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; const { Data table rules ids @@ -318,7 +318,7 @@ type end; { TFacturasProveedorDataTableRules } - TFacturasProveedorDataTableRules = class(TDADataTableRules, IFacturasProveedor) + TFacturasProveedorDataTableRules = class(TIntfObjectDADataTableRules, IFacturasProveedor) private f_OBSERVACIONES: IROStrings; procedure OBSERVACIONES_OnChange(Sender: TObject); @@ -618,7 +618,7 @@ type end; { TFacturasProveedor_DetallesDataTableRules } - TFacturasProveedor_DetallesDataTableRules = class(TDADataTableRules, IFacturasProveedor_Detalles) + TFacturasProveedor_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IFacturasProveedor_Detalles) private protected { Property getters and setters } diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm index b11ff59d..347b4431 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm @@ -86,7 +86,6 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor Top = 111 DataBinding.DataField = 'ID_FORMA_PAGO' DataBinding.DataSource = DADataSource - Properties.GridMode = True Properties.ImmediatePost = True Properties.KeyFieldNames = 'ID' Properties.ListColumns = < @@ -95,6 +94,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsFormaPago Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.dfm b/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.dfm index d59bf99e..c752e99c 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.dfm @@ -39,7 +39,6 @@ inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv DataBinding.DataField = 'ID_ALMACEN' DataBinding.DataSource = dsPedido Properties.DropDownListStyle = lsFixedList - Properties.GridMode = True Properties.ImmediatePost = True Properties.KeyFieldNames = 'ID' Properties.ListColumns = < @@ -48,6 +47,7 @@ inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv end> Properties.ListOptions.AnsiSort = True Properties.ListOptions.GridLines = glNone + Properties.ListOptions.SyncMode = True Properties.ListOptions.ShowHeader = False Properties.ListSource = dsAlmacenes Properties.PostPopupValueOnTab = True diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm index fd609269..19dad514 100644 --- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm +++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm @@ -236,6 +236,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsFormaPago Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm index 1c0902c9..982447c9 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm @@ -153,6 +153,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsFormaPago Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D diff --git a/Source/Modulos/Recibos de proveedor/Model/schRecibosProveedorClient_Intf.pas b/Source/Modulos/Recibos de proveedor/Model/schRecibosProveedorClient_Intf.pas index 23f3f096..baca72a9 100644 --- a/Source/Modulos/Recibos de proveedor/Model/schRecibosProveedorClient_Intf.pas +++ b/Source/Modulos/Recibos de proveedor/Model/schRecibosProveedorClient_Intf.pas @@ -3,7 +3,7 @@ unit schRecibosProveedorClient_Intf; interface uses - Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; + Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; const { Data table rules ids @@ -377,7 +377,7 @@ type end; { TRecibosCompensadosProvDataTableRules } - TRecibosCompensadosProvDataTableRules = class(TDADataTableRules, IRecibosCompensadosProv) + TRecibosCompensadosProvDataTableRules = class(TIntfObjectDADataTableRules, IRecibosCompensadosProv) private protected { Property getters and setters } @@ -772,7 +772,7 @@ type end; { TRecibosProveedorDataTableRules } - TRecibosProveedorDataTableRules = class(TDADataTableRules, IRecibosProveedor) + TRecibosProveedorDataTableRules = class(TIntfObjectDADataTableRules, IRecibosProveedor) private protected { Property getters and setters } @@ -1059,7 +1059,7 @@ type end; { TPagosProveedorDataTableRules } - TPagosProveedorDataTableRules = class(TDADataTableRules, IPagosProveedor) + TPagosProveedorDataTableRules = class(TIntfObjectDADataTableRules, IPagosProveedor) private protected { Property getters and setters } diff --git a/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.dfm b/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.dfm index c092ea3b..c72bee01 100644 --- a/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.dfm +++ b/Source/Modulos/Remesas de cliente/Views/uViewRemesaCliente.dfm @@ -88,7 +88,6 @@ inherited frViewRemesaCliente: TfrViewRemesaCliente Top = 57 DataBinding.DataField = 'ID_DATOS_BANCO' DataBinding.DataSource = dsDataTable - Properties.GridMode = True Properties.ImmediatePost = True Properties.KeyFieldNames = 'ID' Properties.ListColumns = < @@ -97,6 +96,7 @@ inherited frViewRemesaCliente: TfrViewRemesaCliente end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsDatosBanco Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D diff --git a/Source/Modulos/Remesas de proveedor/Views/uViewRemesaProveedor.dfm b/Source/Modulos/Remesas de proveedor/Views/uViewRemesaProveedor.dfm index 84afe021..d1c7c4f9 100644 --- a/Source/Modulos/Remesas de proveedor/Views/uViewRemesaProveedor.dfm +++ b/Source/Modulos/Remesas de proveedor/Views/uViewRemesaProveedor.dfm @@ -88,7 +88,6 @@ inherited frViewRemesaProveedor: TfrViewRemesaProveedor Top = 57 DataBinding.DataField = 'ID_DATOS_BANCO' DataBinding.DataSource = dsDataTable - Properties.GridMode = True Properties.ImmediatePost = True Properties.KeyFieldNames = 'ID' Properties.ListColumns = < @@ -97,6 +96,7 @@ inherited frViewRemesaProveedor: TfrViewRemesaProveedor end> Properties.ListOptions.GridLines = glNone Properties.ListOptions.ShowHeader = False + Properties.ListOptions.SyncMode = True Properties.ListSource = dsDatosBanco Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index b3daf852..bde294d0 100644 Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 3aed2d80..8c5fccf3 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -1,238 +1,233 @@ - + - - {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} - FactuGES_Server.dpr - Debug - AnyCPU - DCC32 - ..\..\Output\Debug\Servidor\FactuGES_Server.exe - - - 7.0 - False - False - 0 - 3 - ..\..\Output\Release\Servidor - RELEASE - - - 7.0 - 3 - ..\..\Output\Debug\Servidor - DEBUG; - True - - - Delphi.Personality - - -FalseTrueFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.03.0.0.0lunes, 19 de noviembre de 2007 18:58 - - - - - - RemObjects Pascal Script - RemObjects SDK 3.0 Integration - FactuGES_Server.dpr - - - - - MainSource - - - - - -
srvEjercicios
- TDataAbstractService -
- - - -
srvEmpresas
- TDARemoteService -
- - - - - - - - -
srvAlbaranesCliente
- TDataAbstractService -
- - - - -
srvAlbaranesProveedor
- TDataAbstractService -
- - - -
srvAlmacenes
- TDARemoteService -
- - - - - - -
srvContabilidad
- TDataAbstractService -
- - - - - - - -
srvContactos
- TDARemoteService -
- - - - -
srvFacturasCliente
- TDataAbstractService -
- - - - -
srvFacturasProveedor
- TDataAbstractService -
- - - - - - - - - -
srvHistoricoMovimientos
- TDataAbstractService -
- - - -
srvInventario
- TDataAbstractService -
- - - - -
srvPedidosProveedor
- TDataAbstractService -
- - - - -
RptPresupuestosCliente
-
- -
srvPresupuestosCliente
- TDataAbstractService -
- - - - -
srvRecibosCliente
- TDataAbstractService -
- - - - -
srvRecibosProveedor
- TDataAbstractService -
- - - - -
srvRemesasCliente
- TDataAbstractService -
- - - - -
srvRemesasProveedor
- TDataAbstractService -
- - - - - - -
srvUnidadesMedida
- TDataAbstractService -
- - - -
srvConfiguracion
- TDataAbstractService -
- -
frConexionBD
- TFrame -
- -
frConfGeneral
- TFrame -
- -
fConfiguracion
- TForm -
- -
FrameConfiguracion
- TFrame -
- -
srvLogin
- TDARemoteService -
- -
srvReferencias
- TDataAbstractService -
- -
fAcercaDe
-
- -
dmServer
- TDataModule -
- -
fServerForm
-
- - - - - - - - -
+ + {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} + FactuGES_Server.dpr + Debug + AnyCPU + DCC32 + ..\..\Output\Debug\Servidor\FactuGES_Server.exe + + + 7.0 + False + False + 0 + 3 + ..\..\Output\Release\Servidor + RELEASE + + + 7.0 + 3 + ..\..\Output\Debug\Servidor + DEBUG; + True + + + Delphi.Personality + + + FalseTrueFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.03.0.0.0lunes, 19 de noviembre de 2007 18:58 + RemObjects Pascal Script - RemObjects SDK 3.0 Integration + FactuGES_Server.dpr + + + + + MainSource + + + + + +
srvEjercicios
+ TDataAbstractService +
+ + + +
srvEmpresas
+ TDARemoteService +
+ + + + + + + + +
srvAlbaranesCliente
+ TDataAbstractService +
+ + + + +
srvAlbaranesProveedor
+ TDataAbstractService +
+ + + +
srvAlmacenes
+ TDARemoteService +
+ + + + + + +
srvContabilidad
+ TDataAbstractService +
+ + + + + + + +
srvContactos
+ TDARemoteService +
+ + + + +
srvFacturasCliente
+ TDataAbstractService +
+ + + + +
srvFacturasProveedor
+ TDataAbstractService +
+ + + + + + + + + +
srvHistoricoMovimientos
+ TDataAbstractService +
+ + + +
srvInventario
+ TDataAbstractService +
+ + + + +
srvPedidosProveedor
+ TDataAbstractService +
+ + + + +
RptPresupuestosCliente
+
+ +
srvPresupuestosCliente
+ TDataAbstractService +
+ + + + +
srvRecibosCliente
+ TDataAbstractService +
+ + + + +
srvRecibosProveedor
+ TDataAbstractService +
+ + + + +
srvRemesasCliente
+ TDataAbstractService +
+ + + + +
srvRemesasProveedor
+ TDataAbstractService +
+ + + + + + +
srvUnidadesMedida
+ TDataAbstractService +
+ + + +
srvConfiguracion
+ TDataAbstractService +
+ +
frConexionBD
+ TFrame +
+ +
frConfGeneral
+ TFrame +
+ +
fConfiguracion
+ TForm +
+ +
FrameConfiguracion
+ TFrame +
+ +
srvLogin
+ TDARemoteService +
+ +
srvReferencias
+ TDataAbstractService +
+ +
fAcercaDe
+
+ +
dmServer
+ TDataModule +
+ +
fServerForm
+
+ + + + + + + + +