diff --git a/Source/ApplicationBase/ApplicationBase.dproj b/Source/ApplicationBase/ApplicationBase.dproj index 79fc596..869b01a 100644 --- a/Source/ApplicationBase/ApplicationBase.dproj +++ b/Source/ApplicationBase/ApplicationBase.dproj @@ -55,10 +55,10 @@ MainSource - - - - + + + + diff --git a/Source/ApplicationBase/uPlugins_Intf.pas b/Source/ApplicationBase/uPlugins_Intf.pas index 35e0b76..a901f8c 100644 --- a/Source/ApplicationBase/uPlugins_Intf.pas +++ b/Source/ApplicationBase/uPlugins_Intf.pas @@ -2,18 +2,6 @@ unit uPlugins_Intf; interface -const - MODULENAME_PRESUPUESTOS_CLIENTE = 'PresupuestosCliente_plugin.bpl'; - MODULENAME_ALBARANES_CLIENTE = 'AlbaranesCliente_plugin.bpl'; - MODULENAME_FACTURAS_CLIENTE = 'FacturasCliente_plugin.bpl'; - MODULENAME_RECIBOS_CLIENTE = 'RecibosCliente_plugin.bpl'; - - MODULENAME_PEDIDOS_PROVEEDOR = 'PedidosProveedor_plugin.bpl'; - MODULENAME_ALBARANES_PROVEEDOR = 'AlbaranesProveedor_plugin.bpl'; - MODULENAME_FACTURAS_PROVEEDOR = 'FacturasProveedor_plugin.bpl'; - MODULENAME_RECIBOS_PROVEEDOR = 'RecibosProveedor_plugin.bpl'; - - type IMCPresupuestosCliente = interface(IInterface) ['{D09E6FFF-50C7-48E2-8380-4CB57B74BB93}'] diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 714b6e8..d7ad741 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -54,58 +54,58 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
TForm diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 1641339..8b251f3 100644 Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ diff --git a/Source/Base/Controladores/uControllerDetallesBase.pas b/Source/Base/Controladores/uControllerDetallesBase.pas index dbda2ed..f494be1 100644 --- a/Source/Base/Controladores/uControllerDetallesBase.pas +++ b/Source/Base/Controladores/uControllerDetallesBase.pas @@ -43,9 +43,9 @@ type private fUpdateCount: Integer; - function CalcularTotales(Modificar: boolean; DataTable: TDADataTable): Double; protected + function CalcularTotales(Modificar: boolean; DataTable: TDADataTable): Double; virtual; procedure Renumerar(DataTable: TDADataTable; LocalizaPosicion: Integer); function DesplazarNPosiciones(DataTable: TDADataTable; NumOrdenIni: Variant; NPosiciones: Variant): Integer; procedure Mover(DataTable: TDADataTable; Posicion: Integer; NumPosiciones: Integer); diff --git a/Source/Cliente/uBootStrap.pas b/Source/Cliente/uBootStrap.pas index 57c90bc..4f86586 100644 --- a/Source/Cliente/uBootStrap.pas +++ b/Source/Cliente/uBootStrap.pas @@ -21,15 +21,9 @@ begin with AppFactuGES.ModuleManager do begin LoadModule('Referencias_plugin.bpl'); - //LoadModule('FormasPago_plugin.bpl'); - //LoadModule('TiposIVA_plugin.bpl'); - //LoadModule('Familias_plugin.bpl'); - //LoadModule('Fabricantes_plugin.bpl'); LoadModule('UnidadesMedida_plugin.bpl'); LoadModule('Contactos_plugin.bpl'); LoadModule('Medicaciones_plugin.bpl'); - - //LoadModule(MODULENAME_ALBARANES_CLIENTE); end; end; diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index 3038af0..d805abc 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -59,30 +59,30 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res index 1641339..8b251f3 100644 Binary files a/Source/GUIBase/GUIBase.res and b/Source/GUIBase/GUIBase.res differ diff --git a/Source/GUIBase/uViewDetallesBase.dfm b/Source/GUIBase/uViewDetallesBase.dfm index e477316..60acd4e 100644 --- a/Source/GUIBase/uViewDetallesBase.dfm +++ b/Source/GUIBase/uViewDetallesBase.dfm @@ -10,7 +10,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase Left = 0 Top = 0 Width = 451 - Height = 68 + Height = 73 AutoSize = True ButtonWidth = 141 Caption = 'ToolBar1' @@ -42,30 +42,29 @@ inherited frViewDetallesBase: TfrViewDetallesBase Top = 0 Action = actSubir AutoSize = True - Wrap = True end object ToolButton4: TToolButton - Left = 0 - Top = 22 + Left = 184 + Top = 0 Action = actBajar AutoSize = True end object ToolButton14: TToolButton - Left = 56 - Top = 22 + Left = 240 + Top = 0 Action = FontEdit1 AutoSize = True Wrap = True end object FontName: TJvFontComboBox Left = 0 - Top = 44 + Top = 22 Width = 145 Height = 22 DroppedDownWidth = 145 MaxMRUCount = 0 FontName = 'Tahoma' - ItemIndex = 39 + ItemIndex = 42 Options = [foTrueTypeOnly, foNoOEMFonts, foScalableOnly, foWysiWyg] Sorted = True TabOrder = 2 @@ -75,7 +74,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object FontSize: TEdit Left = 145 - Top = 44 + Top = 22 Width = 26 Height = 22 Hint = 'Font Size|Select font size' @@ -86,7 +85,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object UpDown1: TUpDown Left = 171 - Top = 44 + Top = 22 Width = 16 Height = 22 Associate = FontSize @@ -95,7 +94,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object ToolButton13: TToolButton Left = 187 - Top = 44 + Top = 22 Width = 8 Caption = 'ToolButton13' ImageIndex = 10 @@ -103,54 +102,55 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object ToolButton6: TToolButton Left = 195 - Top = 44 + Top = 22 Action = RichEditBold1 AutoSize = True end object ToolButton7: TToolButton Left = 261 - Top = 44 + Top = 22 Action = RichEditItalic1 AutoSize = True end object ToolButton8: TToolButton Left = 328 - Top = 44 + Top = 22 Action = RichEditUnderline1 AutoSize = True end object ToolButton12: TToolButton - Left = 411 - Top = 44 + Left = 0 + Top = 22 Width = 8 Caption = 'ToolButton12' ImageIndex = 10 + Wrap = True Style = tbsSeparator end object ToolButton9: TToolButton - Left = 419 - Top = 44 + Left = 0 + Top = 49 Action = RichEditAlignLeft1 AutoSize = True end object ToolButton10: TToolButton - Left = 564 - Top = 44 + Left = 145 + Top = 49 Action = RichEditAlignCenter1 AutoSize = True end object ToolButton11: TToolButton - Left = 689 - Top = 44 + Left = 270 + Top = 49 Action = RichEditAlignRight1 AutoSize = True end end object cxGrid: TcxGrid Left = 0 - Top = 94 + Top = 99 Width = 451 - Height = 210 + Height = 205 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -161,8 +161,6 @@ inherited frViewDetallesBase: TfrViewDetallesBase TabOrder = 1 LookAndFeel.Kind = lfStandard LookAndFeel.NativeStyle = True - ExplicitTop = 99 - ExplicitHeight = 205 object cxGridView: TcxGridDBTableView OnKeyDown = cxGridViewKeyDown NavigatorButtons.ConfirmDelete = False @@ -346,12 +344,11 @@ inherited frViewDetallesBase: TfrViewDetallesBase end object TBXDock1: TTBXDock Left = 0 - Top = 68 + Top = 73 Width = 451 Height = 26 BackgroundOnToolbars = False UseParentBackground = True - ExplicitTop = 73 object TBXToolbar1: TTBXToolbar Left = 0 Top = 0 diff --git a/Source/Modulos/Articulos/Controller/uArticulosController.pas b/Source/Modulos/Articulos/Controller/uArticulosController.pas index 1cab2fe..c164729 100644 --- a/Source/Modulos/Articulos/Controller/uArticulosController.pas +++ b/Source/Modulos/Articulos/Controller/uArticulosController.pas @@ -81,10 +81,11 @@ var Condicion: TDAWhereExpression; begin ShowHourglassCursor; + Result := BuscarTodos; try with Result.DataTable.DynamicWhere do begin - Condicion := NewBinaryExpression(NewMacro('UpperCase('+fld_ArticulosREFERENCIA+')'), + Condicion := NewBinaryExpression(NewMacro('UpperCase', [NewField('', fld_ArticulosREFERENCIA)]), NewConstant(UpperCase(Ref), datString),dboEqual); if IsEmpty then Expression := Condicion diff --git a/Source/Modulos/Articulos/Data/Articulos_data.dproj b/Source/Modulos/Articulos/Data/Articulos_data.dproj index 12340c6..69efa6f 100644 --- a/Source/Modulos/Articulos/Data/Articulos_data.dproj +++ b/Source/Modulos/Articulos/Data/Articulos_data.dproj @@ -48,6 +48,8 @@ Package FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0Articulos_data.dpk + + Microsoft Office 2000 Sample Automation Server Wrapper Components Microsoft Office XP Sample Automation Server Wrapper Components diff --git a/Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm b/Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm index 8024383..d0e35f3 100644 --- a/Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm +++ b/Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm @@ -26,6 +26,14 @@ inherited DataModuleArticulos: TDataModuleArticulos object tbl_Articulos: TDAMemDataTable RemoteUpdatesOptions = [] Fields = < + item + Name = 'ID' + DataType = datInteger + LogChanges = False + DisplayLabel = 'Articulos_ID' + ReadOnly = True + DictionaryEntry = 'Articulos_ID' + end item Name = 'REFERENCIA' DataType = datString @@ -43,6 +51,15 @@ inherited DataModuleArticulos: TDataModuleArticulos DisplayLabel = 'Descripci'#243'n' ReadOnly = True DictionaryEntry = 'Articulos_DESCRIPCION' + end + item + Name = 'FAMILIA' + DataType = datString + Size = 25 + LogChanges = False + DisplayLabel = 'Familia' + ReadOnly = True + DictionaryEntry = 'Articulos_FAMILIA' end> Params = <> StreamingOptions = [soDisableEventsWhileStreaming] diff --git a/Source/Modulos/Articulos/Model/Articulos_model.dproj b/Source/Modulos/Articulos/Model/Articulos_model.dproj index 2db0f3f..fc51042 100644 --- a/Source/Modulos/Articulos/Model/Articulos_model.dproj +++ b/Source/Modulos/Articulos/Model/Articulos_model.dproj @@ -55,16 +55,16 @@ MainSource - - - - - - - - - - + + + + + + + + + + diff --git a/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm b/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm index 35ec127..9771ead 100644 --- a/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm +++ b/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm @@ -1,14 +1,14 @@ object srvArticulos: TsrvArticulos OldCreateOrder = True OnCreate = DARemoteServiceCreate - ConnectionName = 'IBX' + ConnectionName = 'FARMATIC' ServiceSchema = schArticulos ServiceDataStreamer = Bin2DataStreamer AllowWhereSQL = True ExportedDataTables = <> BeforeAcquireConnection = DataAbstractServiceBeforeAcquireConnection - Height = 229 - Width = 517 + Height = 194 + Width = 246 object DataDictionary: TDADataDictionary Fields = < item @@ -56,22 +56,17 @@ object srvArticulos: TsrvArticulos ConnectionType = 'MSSQL' Default = True SQL = - 'SELECT'#10' dbo.ARTICU.IdArticu as ID, dbo.ARTICU.IdArticu as R' + - 'EFERENCIA, dbo.ARTICU.Descripcion as DESCRIPCION, dbo.FAMILIA.De' + - 'scripcion as FAMILIA'#10'FROM'#10' dbo.ARTICU WITH (NOLOCK INDEX = id' + - 'x_descripcion)'#10'LEFT JOIN'#10' dbo.FAMILIA ON (dbo.FAMILIA.IdFami' + - 'lia = dbo.ARTICU.XFam_IdFamilia)'#10'WHERE {Where}'#10'ORDER BY IdArticu' + - #10#10 + 'SELECT'#10' dbo.ARTICU.IdArticu as ID, dbo.ARTICU.IdArticu, dbo' + + '.ARTICU.Descripcion as DESCRIPCION, dbo.FAMILIA.Descripcion as F' + + 'AMILIA'#10'FROM'#10' dbo.ARTICU WITH (NOLOCK INDEX = idx_descripcion)' + + #10'LEFT JOIN'#10' dbo.FAMILIA ON (dbo.FAMILIA.IdFamilia = dbo.ARTI' + + 'CU.XFam_IdFamilia)'#10'WHERE {Where}'#10'ORDER BY IdArticu'#10#10 StatementType = stSQL ColumnMappings = < item DatasetField = 'ID' TableField = 'ID' end - item - DatasetField = 'REFERENCIA' - TableField = 'REFERENCIA' - end item DatasetField = 'DESCRIPCION' TableField = 'DESCRIPCION' @@ -79,6 +74,10 @@ object srvArticulos: TsrvArticulos item DatasetField = 'FAMILIA' TableField = 'FAMILIA' + end + item + DatasetField = 'REFERENCIA' + TableField = 'IdArticu' end> end> Name = 'Articulos' diff --git a/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.pas b/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.pas index 869c824..86fad45 100644 --- a/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.pas +++ b/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.pas @@ -36,7 +36,8 @@ implementation {$R *.dfm} uses {Generated:} Etiquetas_Invk, uDataModuleServer, Variants, uStringsUtils, - uDatabaseUtils, schArticulosClient_Intf, uRestriccionesUsuarioUtils; + uDatabaseUtils, schArticulosClient_Intf, uRestriccionesUsuarioUtils, + Dialogs; procedure Create_srvArticulos(out anInstance : IUnknown); begin diff --git a/Source/Modulos/Articulos/Views/Articulos_view.dpk b/Source/Modulos/Articulos/Views/Articulos_view.dpk index d609cef..08296bb 100644 --- a/Source/Modulos/Articulos/Views/Articulos_view.dpk +++ b/Source/Modulos/Articulos/Views/Articulos_view.dpk @@ -78,7 +78,6 @@ contains uArticulosViewRegister in 'uArticulosViewRegister.pas', uEditorElegirArticulos in 'uEditorElegirArticulos.pas' {fEditorElegirArticulos: TfEditorElegirArticulos}, uViewDetallesArticulos in 'uViewDetallesArticulos.pas' {frViewDetallesArticulos: TFrame}, - uViewDetallesArticulosParaVenta in 'uViewDetallesArticulosParaVenta.pas' {frViewDetallesArticulosParaVenta: TCustomView}, uViewArticulos in 'uViewArticulos.pas' {frViewArticulos: TFrame}; end. diff --git a/Source/Modulos/Articulos/Views/Articulos_view.dproj b/Source/Modulos/Articulos/Views/Articulos_view.dproj index 0d81856..248f45c 100644 --- a/Source/Modulos/Articulos/Views/Articulos_view.dproj +++ b/Source/Modulos/Articulos/Views/Articulos_view.dproj @@ -55,68 +55,67 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fEditorElegirArticulos
TfEditorElegirArticulos - + +
frViewArticulos
+ TFrame +
frViewDetallesArticulos
TFrame - -
frViewDetallesArticulosParaVenta
- TCustomView -