diff --git a/Source/Cliente/uBootStrap.pas b/Source/Cliente/uBootStrap.pas
index 70f0ce8b..12c2bf9a 100644
--- a/Source/Cliente/uBootStrap.pas
+++ b/Source/Cliente/uBootStrap.pas
@@ -30,9 +30,8 @@ begin
{$IFDEF ALMACEN}
LoadModule('Almacenes_plugin.bpl');
- {$ENDIF}
-
LoadModule('Articulos_plugin.bpl');
+ {$ENDIF}
LoadModule('PresupuestosCliente_plugin.bpl');
LoadModule('AlbaranesCliente_plugin.bpl');
@@ -46,12 +45,14 @@ begin
LoadModule('RecibosProveedor_plugin.bpl');
LoadModule('FacturasProveedor_plugin.bpl');
- LoadModule('RemesasCliente_plugin.bpl');
+ LoadModule('RemesasCliente_plugin.bpl');
LoadModule('RemesasProveedor_plugin.bpl');
+ {$IFDEF ALMACEN}
LoadModule('Inventario_plugin.bpl');
LoadModule('HistoricoMovimientos_plugin.bpl');
-
+ {$ENDIF}
+
LoadModule('Ejercicios_plugin.bpl');
LoadModule('Contabilidad_plugin.bpl');
end;
diff --git a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas
index b401bbb7..5f021e48 100644
--- a/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas
+++ b/Source/Modulos/Albaranes de cliente/Controller/uAlbaranesClienteController.pas
@@ -464,24 +464,23 @@ begin
if (AAlbaran.IMPORTE_TOTAL < 0) then
raise Exception.Create('Un albarán no puede tener un importe total negativo');
- //En caso de ser una orden de devolución no podra tener un importe total positivo
- if (AAlbaran.TIPO = CTE_TIPO_ALBARAN_DEV) then
- begin
- if (AAlbaran.IMPORTE_TOTAL >= 0) then
- raise Exception.Create('Una orden de devolución no puede tener un importe total positivo');
+ {$IFDEF ALMACEN}
+ //En caso de ser una orden de devolución no podra tener un importe total positivo
+ if (AAlbaran.TIPO = CTE_TIPO_ALBARAN_DEV) then
+ begin
+ if (AAlbaran.IMPORTE_TOTAL >= 0) then
+ raise Exception.Create('Una orden de devolución no puede tener un importe total positivo');
+ //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');
- {$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;
- AAlbaran.FECHA_ENVIO := AAlbaran.FECHA_ALBARAN;
- AAlbaran.Post;
- end;
+ //Ponemos la fecha del albaran de devolución como fecha de envio para que se contabilice según dicha fecha
+ AAlbaran.Edit;
+ AAlbaran.FECHA_ENVIO := AAlbaran.FECHA_ALBARAN;
+ AAlbaran.Post;
+ end;
+ {$ENDIF}
//Validamos las fechas del albarán
// if not (EsFechaVacia(AAlbaran.FECHA_ENVIO)) then
@@ -498,7 +497,7 @@ begin
try
AAlbaran.USUARIO := AppFactuGES.UsuarioActivo.UserName;
-// Lo quitamos temporalmente si no hay mas fallos de cambio de cliente se quita en todos los sitios
+// Lo quitamos temporalmente si no hay mas fallos de cambio de cliente se quita en todos los sitios
// if Assigned(AAlbaran.Cliente)
// and (AAlbaran.ID_CLIENTE <> AAlbaran.Cliente.ID) then
// AAlbaran.ID_CLIENTE := AAlbaran.Cliente.ID;
diff --git a/Source/Modulos/Albaranes de cliente/Plugin/uPluginAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Plugin/uPluginAlbaranesCliente.dfm
index 51da0574..f7ad3283 100644
--- a/Source/Modulos/Albaranes de cliente/Plugin/uPluginAlbaranesCliente.dfm
+++ b/Source/Modulos/Albaranes de cliente/Plugin/uPluginAlbaranesCliente.dfm
@@ -260,7 +260,9 @@ object PluginAlbaranesCliente: TPluginAlbaranesCliente
object actAlbaranesDevCliente: TAction
Category = 'Ventas'
Caption = 'Ordenes de devoluci'#243'n'
+ Enabled = False
ImageIndex = 1
+ Visible = False
OnExecute = actAlbaranesDevClienteExecute
end
end
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm
index db46321e..3e1099f5 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm
@@ -145,8 +145,8 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
end
end
inherited pgPaginas: TPageControl
- Width = 765
- Height = 412
+ Width = 759
+ Height = 406
TabOrder = 1
OnChanging = pgPaginasChanging
ExplicitWidth = 765
@@ -163,8 +163,8 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
inline frViewDetallesAlbaranCliente1: TfrViewDetallesAlbaranCliente
Left = 0
Top = 0
- Width = 757
- Height = 384
+ Width = 751
+ Height = 378
Align = alClient
BiDiMode = bdLeftToRight
Font.Charset = DEFAULT_CHARSET
@@ -176,20 +176,20 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
ParentFont = False
TabOrder = 0
ReadOnly = False
- ExplicitWidth = 757
- ExplicitHeight = 384
+ ExplicitWidth = 751
+ ExplicitHeight = 378
inherited ToolBar1: TToolBar
- Width = 757
- ExplicitWidth = 757
+ Width = 751
+ ExplicitWidth = 751
end
inherited cxGrid: TcxGrid
- Width = 757
- Height = 312
- ExplicitWidth = 757
- ExplicitHeight = 312
+ Width = 751
+ Height = 306
+ ExplicitWidth = 751
+ ExplicitHeight = 306
end
inherited TBXDock1: TTBXDock
- Width = 757
+ Width = 751
ExplicitWidth = 757
inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 548
@@ -200,11 +200,15 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
object pagInicidencias: TTabSheet
Caption = 'Incidencias'
ImageIndex = 2
+ ExplicitLeft = 0
+ ExplicitTop = 0
+ ExplicitWidth = 0
+ ExplicitHeight = 0
inline frViewIncidenciasCli: TfrViewIncidencias
Left = 0
Top = 0
- Width = 757
- Height = 384
+ Width = 751
+ Height = 378
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -217,15 +221,15 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
ExplicitWidth = 757
ExplicitHeight = 384
inherited pnlSup: TPanel
- Width = 757
+ Width = 751
ExplicitWidth = 757
inherited eIncidenciaActiva: TcxDBCheckBox
ExplicitHeight = 21
end
end
inherited GroupBox1: TGroupBox
- Width = 757
- Height = 356
+ Width = 751
+ Height = 350
ExplicitWidth = 757
ExplicitHeight = 356
inherited eIncidencias: TcxDBMemo
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm
index d522d565..c83ab354 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm
@@ -123,9 +123,32 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
end
end
inherited pgPaginas: TPageControl
+ ExplicitLeft = 3
+ ExplicitTop = 79
+ ExplicitWidth = 759
+ ExplicitHeight = 406
+ inherited pagGeneral: TTabSheet
+ ExplicitWidth = 751
+ ExplicitHeight = 378
+ end
+ inherited pagContenido: TTabSheet
+ inherited frViewDetallesAlbaranCliente1: TfrViewDetallesAlbaranCliente
+ inherited TBXDock1: TTBXDock
+ ExplicitWidth = 751
+ end
+ end
+ end
inherited pagInicidencias: TTabSheet
+ ExplicitLeft = 4
+ ExplicitTop = 24
+ ExplicitWidth = 751
+ ExplicitHeight = 378
inherited frViewIncidenciasCli: TfrViewIncidencias
+ ExplicitWidth = 751
+ ExplicitHeight = 378
inherited GroupBox1: TGroupBox
+ ExplicitWidth = 751
+ ExplicitHeight = 350
inherited eIncidencias: TcxDBMemo
ExplicitWidth = 726
ExplicitHeight = 319
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm
index c3cd14b0..37cfa676 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm
@@ -1,25 +1,26 @@
inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Width = 822
- Height = 550
+ Height = 620
OnCreate = CustomViewCreate
OnDestroy = CustomViewDestroy
ExplicitWidth = 822
- ExplicitHeight = 550
+ ExplicitHeight = 620
object dxLayoutControl1: TdxLayoutControl
Left = 0
Top = 0
Width = 822
- Height = 550
+ Height = 620
Align = alClient
ParentBackground = True
TabOrder = 0
AutoContentSizes = [acsWidth, acsHeight]
+ ExplicitHeight = 550
DesignSize = (
822
- 550)
+ 620)
object Label1: TLabel
- Left = 22
- Top = 450
+ Left = 34
+ Top = 555
Width = 299
Height = 26
Caption =
@@ -54,8 +55,8 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Width = 119
end
object memObservaciones: TcxDBMemo
- Left = 440
- Top = 387
+ Left = 22
+ Top = 418
Anchors = [akLeft, akTop, akRight, akBottom]
DataBinding.DataField = 'OBSERVACIONES'
DataBinding.DataSource = DADataSource
@@ -67,7 +68,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
StyleDisabled.LookAndFeel.NativeStyle = True
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.NativeStyle = True
- TabOrder = 21
+ TabOrder = 19
Height = 253
Width = 186
end
@@ -110,7 +111,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Font.Name = 'Tahoma'
Font.Style = []
ParentFont = False
- TabOrder = 17
+ TabOrder = 15
ReadOnly = False
ExplicitLeft = 440
ExplicitTop = 28
@@ -378,21 +379,21 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- TabOrder = 20
+ TabOrder = 18
Width = 123
end
object cbConAlmacen: TCheckBox
- Left = 32
- Top = 418
+ Left = 44
+ Top = 523
Width = 179
Height = 21
Caption = 'Asociar este albar'#225'n al almac'#233'n:'
- TabOrder = 15
+ TabOrder = 20
OnClick = cbConAlmacenClick
end
object cbAlmacen: TcxDBLookupComboBox
- Left = 217
- Top = 418
+ Left = 229
+ Top = 523
DataBinding.DataField = 'ID_ALMACEN'
DataBinding.DataSource = DADataSource
Properties.KeyFieldNames = 'ID'
@@ -417,7 +418,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- TabOrder = 16
+ TabOrder = 21
Width = 69
end
object eRefFacturaCli: TcxDBTextEdit
@@ -470,7 +471,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- TabOrder = 18
+ TabOrder = 16
Width = 122
end
object eRefCliente: TcxDBTextEdit
@@ -520,156 +521,213 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- TabOrder = 19
+ TabOrder = 17
Width = 217
end
object dxLayoutControl1Group_Root: TdxLayoutGroup
ShowCaption = False
Hidden = True
- LayoutDirection = ldHorizontal
ShowBorder = False
- object dxLayoutControl1Group6: TdxLayoutGroup
- AutoAligns = [aaVertical]
- AlignHorz = ahClient
+ object dxLayoutControl1Group16: TdxLayoutGroup
ShowCaption = False
Hidden = True
+ LayoutDirection = ldHorizontal
ShowBorder = False
- object dxLayoutControl1Group1: TdxLayoutGroup
- AutoAligns = []
+ object dxLayoutControl1Group6: TdxLayoutGroup
+ AutoAligns = [aaVertical]
AlignHorz = ahClient
- Caption = 'Datos del albar'#225'n'
- object dxLayoutControl1Item3: TdxLayoutItem
- Caption = 'Referencia:'
- Control = eReferencia
- ControlOptions.ShowBorder = False
- end
- object dxLayoutControl1Item23: TdxLayoutItem
- Caption = 'Ref. cliente:'
- Control = eRefCliente
- ControlOptions.ShowBorder = False
- end
- object dxLayoutControl1Item2: TdxLayoutItem
- Caption = 'Fecha del albar'#225'n:'
- Control = edtFechaAlbaran
- ControlOptions.ShowBorder = False
- end
- object dxLayoutControl1Group5: TdxLayoutGroup
- ShowCaption = False
- Hidden = True
- ShowBorder = False
- object dxLayoutControl1Group14: TdxLayoutGroup
+ ShowCaption = False
+ Hidden = True
+ ShowBorder = False
+ object dxLayoutControl1Group1: TdxLayoutGroup
+ AutoAligns = []
+ AlignHorz = ahClient
+ Caption = 'Datos del albar'#225'n'
+ object dxLayoutControl1Item3: TdxLayoutItem
+ Caption = 'Referencia:'
+ Control = eReferencia
+ ControlOptions.ShowBorder = False
+ end
+ object dxLayoutControl1Item23: TdxLayoutItem
+ Caption = 'Ref. cliente:'
+ Control = eRefCliente
+ ControlOptions.ShowBorder = False
+ end
+ object dxLayoutControl1Item2: TdxLayoutItem
+ Caption = 'Fecha del albar'#225'n:'
+ Control = edtFechaAlbaran
+ ControlOptions.ShowBorder = False
+ end
+ object dxLayoutControl1Group5: TdxLayoutGroup
ShowCaption = False
- Visible = False
Hidden = True
- LayoutDirection = ldHorizontal
ShowBorder = False
- object dxLayoutControl1Item4: TdxLayoutItem
- AutoAligns = [aaVertical]
- AlignHorz = ahClient
- Caption = 'Forma de pago'
- Control = cbFormaPago
- ControlOptions.ShowBorder = False
- end
- object dxLayoutControl1Item15: TdxLayoutItem
- AutoAligns = [aaVertical]
- AlignHorz = ahRight
+ object dxLayoutControl1Group14: TdxLayoutGroup
ShowCaption = False
- Control = bFormasPago
- ControlOptions.ShowBorder = False
+ Visible = False
+ Hidden = True
+ LayoutDirection = ldHorizontal
+ ShowBorder = False
+ object dxLayoutControl1Item4: TdxLayoutItem
+ AutoAligns = [aaVertical]
+ AlignHorz = ahClient
+ Caption = 'Forma de pago'
+ Control = cbFormaPago
+ ControlOptions.ShowBorder = False
+ end
+ object dxLayoutControl1Item15: TdxLayoutItem
+ AutoAligns = [aaVertical]
+ AlignHorz = ahRight
+ ShowCaption = False
+ Control = bFormasPago
+ ControlOptions.ShowBorder = False
+ end
+ end
+ object dxLayoutControl1Group13: TdxLayoutGroup
+ ShowCaption = False
+ Hidden = True
+ ShowBorder = False
+ object dxLayoutControl1Group15: TdxLayoutGroup
+ ShowCaption = False
+ Hidden = True
+ LayoutDirection = ldHorizontal
+ ShowBorder = False
+ object dxLayoutControl1Item7: TdxLayoutItem
+ AutoAligns = [aaVertical]
+ AlignHorz = ahClient
+ Caption = 'Ref. del pedido:'
+ Control = eReferenciaPedidoCli
+ ControlOptions.ShowBorder = False
+ end
+ object dxLayoutControl1Item5: TdxLayoutItem
+ AutoAligns = [aaVertical]
+ AlignHorz = ahRight
+ Caption = 'Button1'
+ ShowCaption = False
+ Control = Button1
+ ControlOptions.ShowBorder = False
+ end
+ end
+ object dxLayoutControl1Item22: TdxLayoutItem
+ Caption = 'Ref. factura:'
+ Control = eRefFacturaCli
+ ControlOptions.ShowBorder = False
+ end
end
end
- object dxLayoutControl1Group13: TdxLayoutGroup
+ end
+ object dxLayoutControl1Group8: TdxLayoutGroup
+ AutoAligns = []
+ AlignHorz = ahClient
+ Caption = 'Direcci'#243'n de entrega'
+ object dxLayoutControl1Item8: TdxLayoutItem
+ Caption = 'Calle:'
+ Control = eCalle
+ ControlOptions.ShowBorder = False
+ end
+ object dxLayoutControl1Group4: TdxLayoutGroup
ShowCaption = False
Hidden = True
ShowBorder = False
- object dxLayoutControl1Group15: TdxLayoutGroup
+ object dxLayoutControl1Group9: TdxLayoutGroup
ShowCaption = False
Hidden = True
LayoutDirection = ldHorizontal
ShowBorder = False
- object dxLayoutControl1Item7: TdxLayoutItem
+ object dxLayoutControl1Item9: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
- Caption = 'Ref. del pedido:'
- Control = eReferenciaPedidoCli
+ Caption = 'Poblaci'#243'n:'
+ Control = ePoblacion
ControlOptions.ShowBorder = False
end
- object dxLayoutControl1Item5: TdxLayoutItem
+ object dxLayoutControl1Item10: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahRight
- Caption = 'Button1'
- ShowCaption = False
- Control = Button1
+ Caption = 'C.P.:'
+ Control = eCodigoPostal
ControlOptions.ShowBorder = False
end
end
- object dxLayoutControl1Item22: TdxLayoutItem
- Caption = 'Ref. factura:'
- Control = eRefFacturaCli
+ object dxLayoutControl1Item11: TdxLayoutItem
+ Caption = 'Provincia:'
+ Control = eProvincia
+ ControlOptions.ShowBorder = False
+ end
+ object dxLayoutControl1Item12: TdxLayoutItem
+ Caption = 'Pers. de contacto:'
+ Control = ePersonaContacto
+ ControlOptions.ShowBorder = False
+ end
+ object dxLayoutControl1Item13: TdxLayoutItem
+ Caption = 'Tel'#233'fono:'
+ Control = eTlfTrabajo
+ ControlOptions.ShowBorder = False
+ end
+ object dxLayoutControl1Item14: TdxLayoutItem
+ AutoAligns = [aaVertical]
+ AlignHorz = ahRight
+ ShowCaption = False
+ Control = bElegirDireccion
ControlOptions.ShowBorder = False
end
end
end
end
- object dxLayoutControl1Group8: TdxLayoutGroup
- AutoAligns = []
+ object dxLayoutControl1Group3: TdxLayoutGroup
+ AutoAligns = [aaVertical]
AlignHorz = ahClient
- Caption = 'Direcci'#243'n de entrega'
- object dxLayoutControl1Item8: TdxLayoutItem
- Caption = 'Calle:'
- Control = eCalle
- ControlOptions.ShowBorder = False
+ ShowCaption = False
+ Hidden = True
+ ShowBorder = False
+ object dxLayoutControl1Group2: TdxLayoutGroup
+ Caption = 'Datos del cliente'
+ object dxLayoutControl1Item1: TdxLayoutItem
+ Control = frViewClienteAlbaran
+ ControlOptions.AutoColor = True
+ ControlOptions.ShowBorder = False
+ end
end
- object dxLayoutControl1Group4: TdxLayoutGroup
- ShowCaption = False
- Hidden = True
- ShowBorder = False
- object dxLayoutControl1Group9: TdxLayoutGroup
- ShowCaption = False
- Hidden = True
- LayoutDirection = ldHorizontal
- ShowBorder = False
- object dxLayoutControl1Item9: TdxLayoutItem
- AutoAligns = [aaVertical]
- AlignHorz = ahClient
- Caption = 'Poblaci'#243'n:'
- Control = ePoblacion
- ControlOptions.ShowBorder = False
- end
- object dxLayoutControl1Item10: TdxLayoutItem
- AutoAligns = [aaVertical]
- AlignHorz = ahRight
- Caption = 'C.P.:'
- Control = eCodigoPostal
- ControlOptions.ShowBorder = False
- end
- end
- object dxLayoutControl1Item11: TdxLayoutItem
- Caption = 'Provincia:'
- Control = eProvincia
- ControlOptions.ShowBorder = False
- end
- object dxLayoutControl1Item12: TdxLayoutItem
- Caption = 'Pers. de contacto:'
- Control = ePersonaContacto
- ControlOptions.ShowBorder = False
- end
- object dxLayoutControl1Item13: TdxLayoutItem
- Caption = 'Tel'#233'fono:'
- Control = eTlfTrabajo
- ControlOptions.ShowBorder = False
- end
- object dxLayoutControl1Item14: TdxLayoutItem
+ object dxLayoutControl1Group12: TdxLayoutGroup
+ Caption = 'Fechas de envio y recepci'#243'n'
+ object dxLayoutControl1Item24: TdxLayoutItem
AutoAligns = [aaVertical]
- AlignHorz = ahRight
- ShowCaption = False
- Control = bElegirDireccion
+ AlignHorz = ahClient
+ Caption = 'Fecha prevista de envio:'
+ Offsets.Left = 10
+ Control = eFechaPrevista
+ ControlOptions.ShowBorder = False
+ end
+ object dxLayoutControl1Item21: TdxLayoutItem
+ Caption = 'Fecha de envio:'
+ Offsets.Left = 10
+ Control = eFechaEnvio
+ ControlOptions.ShowBorder = False
+ end
+ object dxLayoutControl1Item16: TdxLayoutItem
+ AutoAligns = []
+ AlignHorz = ahClient
+ Caption = 'Fecha de recepci'#243'n:'
+ Offsets.Left = 10
+ Control = eFechaRecepcion
ControlOptions.ShowBorder = False
end
end
end
+ end
+ object dxLayoutControl1Group7: TdxLayoutGroup
+ AutoAligns = [aaHorizontal]
+ AlignVert = avClient
+ Caption = 'Observaciones'
+ object dxLayoutControl1Item6: TdxLayoutItem
+ AutoAligns = [aaHorizontal]
+ AlignVert = avClient
+ Control = memObservaciones
+ ControlOptions.ShowBorder = False
+ end
object dxLayoutControl1Group11: TdxLayoutGroup
Caption = 'Almac'#233'n de origen'
+ Visible = False
object dxLayoutControl1Group10: TdxLayoutGroup
ShowCaption = False
Hidden = True
@@ -699,57 +757,6 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
end
end
end
- object dxLayoutControl1Group3: TdxLayoutGroup
- AutoAligns = [aaVertical]
- AlignHorz = ahClient
- ShowCaption = False
- Hidden = True
- ShowBorder = False
- object dxLayoutControl1Group2: TdxLayoutGroup
- Caption = 'Datos del cliente'
- object dxLayoutControl1Item1: TdxLayoutItem
- Control = frViewClienteAlbaran
- ControlOptions.AutoColor = True
- ControlOptions.ShowBorder = False
- end
- end
- object dxLayoutControl1Group12: TdxLayoutGroup
- Caption = 'Fechas de envio y recepci'#243'n'
- object dxLayoutControl1Item24: TdxLayoutItem
- AutoAligns = [aaVertical]
- AlignHorz = ahClient
- Caption = 'Fecha prevista de envio:'
- Offsets.Left = 10
- Control = eFechaPrevista
- ControlOptions.ShowBorder = False
- end
- object dxLayoutControl1Item21: TdxLayoutItem
- Caption = 'Fecha de envio:'
- Offsets.Left = 10
- Control = eFechaEnvio
- ControlOptions.ShowBorder = False
- end
- object dxLayoutControl1Item16: TdxLayoutItem
- AutoAligns = []
- AlignHorz = ahClient
- Caption = 'Fecha de recepci'#243'n:'
- Offsets.Left = 10
- Control = eFechaRecepcion
- ControlOptions.ShowBorder = False
- end
- end
- object dxLayoutControl1Group7: TdxLayoutGroup
- AutoAligns = [aaHorizontal]
- AlignVert = avClient
- Caption = 'Observaciones'
- object dxLayoutControl1Item6: TdxLayoutItem
- AutoAligns = [aaHorizontal]
- AlignVert = avClient
- Control = memObservaciones
- ControlOptions.ShowBorder = False
- end
- end
- end
end
end
object DADataSource: TDADataSource
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas
index 6ec24540..853bfb36 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas
@@ -99,6 +99,7 @@ type
eRefCliente: TcxDBTextEdit;
dxLayoutControl1Item21: TdxLayoutItem;
eFechaEnvio: TcxDBDateEdit;
+ dxLayoutControl1Group16: TdxLayoutGroup;
procedure CustomViewCreate(Sender: TObject);
procedure CustomViewDestroy(Sender: TObject);
procedure actElegirDireccionExecute(Sender: TObject);
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.dfm
index 1847ac0f..b03a4abe 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.dfm
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.dfm
@@ -73,6 +73,10 @@ inherited frViewAlbaranDevCliente: TfrViewAlbaranDevCliente
ExplicitWidth = 32
Width = 32
end
+ inherited eFechaRecepcion: TcxDBDateEdit
+ ExplicitWidth = 123
+ Width = 123
+ end
inherited cbAlmacen: TcxDBLookupComboBox
ExplicitWidth = 69
Width = 69
@@ -81,30 +85,48 @@ inherited frViewAlbaranDevCliente: TfrViewAlbaranDevCliente
ExplicitWidth = 207
Width = 207
end
+ inherited eFechaPrevista: TcxDBDateEdit
+ ExplicitWidth = 122
+ Width = 122
+ end
+ inherited eRefCliente: TcxDBTextEdit
+ ExplicitWidth = 284
+ Width = 284
+ end
+ inherited eFechaEnvio: TcxDBDateEdit
+ ExplicitWidth = 217
+ Width = 217
+ end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
- inherited dxLayoutControl1Group6: TdxLayoutGroup
- inherited dxLayoutControl1Group1: TdxLayoutGroup
- Caption = 'Datos de la orden'
- inherited dxLayoutControl1Item3: TdxLayoutItem
- Caption = 'Referencia:'
- end
- inherited dxLayoutControl1Item2: TdxLayoutItem
- Caption = 'Fecha de orden:'
- end
- inherited dxLayoutControl1Group5: TdxLayoutGroup
- inherited dxLayoutControl1Group13: TdxLayoutGroup
- inherited dxLayoutControl1Group15: TdxLayoutGroup
- Visible = False
- end
- inherited dxLayoutControl1Item22: TdxLayoutItem
- Caption = 'Ref. abono:'
+ inherited dxLayoutControl1Group16: TdxLayoutGroup
+ inherited dxLayoutControl1Group6: TdxLayoutGroup
+ inherited dxLayoutControl1Group1: TdxLayoutGroup
+ Caption = 'Datos de la orden'
+ inherited dxLayoutControl1Item2: TdxLayoutItem
+ Caption = 'Fecha de orden:'
+ end
+ inherited dxLayoutControl1Group5: TdxLayoutGroup
+ inherited dxLayoutControl1Group13: TdxLayoutGroup
+ inherited dxLayoutControl1Group15: TdxLayoutGroup
+ Visible = False
+ end
+ inherited dxLayoutControl1Item22: TdxLayoutItem
+ Caption = 'Ref. abono:'
+ end
end
end
end
+ inherited dxLayoutControl1Group8: TdxLayoutGroup
+ Visible = False
+ end
end
- inherited dxLayoutControl1Group8: TdxLayoutGroup
- Visible = False
+ inherited dxLayoutControl1Group3: TdxLayoutGroup
+ inherited dxLayoutControl1Group12: TdxLayoutGroup
+ Visible = False
+ end
end
+ end
+ inherited dxLayoutControl1Group7: TdxLayoutGroup
inherited dxLayoutControl1Group11: TdxLayoutGroup
Caption = 'Almac'#233'n de entrada'
inherited dxLayoutControl1Group10: TdxLayoutGroup
@@ -117,11 +139,6 @@ inherited frViewAlbaranDevCliente: TfrViewAlbaranDevCliente
end
end
end
- inherited dxLayoutControl1Group3: TdxLayoutGroup
- inherited dxLayoutControl1Group12: TdxLayoutGroup
- Visible = False
- end
- end
end
end
end
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.pas
index 7beeec26..0156044a 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.pas
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranDevCliente.pas
@@ -8,7 +8,7 @@ uses
dxLayoutControl, StdCtrls, cxDropDownEdit, cxLookupEdit, cxDBLookupEdit,
cxDBLookupComboBox, cxTextEdit, Buttons, uCustomView, uViewBase,
uViewDatosYSeleccionCliente, cxDBEdit, cxMemo, cxContainer, cxEdit,
- cxMaskEdit, cxCalendar, cxControls;
+ cxMaskEdit, cxCalendar, cxControls, uDAInterfaces;
type
TfrViewAlbaranDevCliente = class(TfrViewAlbaranCliente)
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewDireccionEntregaAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewDireccionEntregaAlbaranCliente.pas
index c857b8eb..9e9611e6 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewDireccionEntregaAlbaranCliente.pas
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewDireccionEntregaAlbaranCliente.pas
@@ -8,7 +8,7 @@ uses
cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxDropDownEdit, cxLookupEdit,
cxDBLookupEdit, cxDBLookupComboBox, StdCtrls, cxControls, DB, uDADataTable,
ActnList, uAlbaranesClienteController,
- Buttons, cxDBEdit;
+ Buttons, cxDBEdit, uDAInterfaces;
type
IViewDireccionEntregaAlbaranCliente = interface(IViewBase)
@@ -39,15 +39,11 @@ type
dxLayoutControl1Group1: TdxLayoutGroup;
dxLayoutControl1Group5: TdxLayoutGroup;
dxLayoutControl1Group4: TdxLayoutGroup;
- procedure cbListaPropertiesValidate(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
protected
-// FAlmacenesController : IAlmacenesController;
-// FAlmacenes: IBizAlmacen;
FAlbaran : IBizAlbaranCliente;
FController : IAlbaranesClienteController;
function GetAlbaranCliente: IBizAlbaranCliente;
procedure SetAlbaranCliente(const Value: IBizAlbaranCliente);
- procedure RefrescarDireccion;
public
property AlbaranCliente: IBizAlbaranCliente read GetAlbaranCliente write SetAlbaranCliente;
constructor Create(AOwner: TComponent); override;
@@ -61,43 +57,14 @@ implementation
uses
uEditorRegistryUtils;
-procedure TfrViewDireccionEntregaAlbaranCliente.cbListaPropertiesValidate(
- Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
- var Error: Boolean);
-begin
-{ if Assigned(FAlbaran) and (FAlbaran.ID_ALMACEN <> FAlmacenes.ID) then
- begin
- FAlbaran.Edit;
- FAlbaran.CALLE := FAlmacenes.CALLE;
- FAlbaran.POBLACION := FAlmacenes.POBLACION;
- FAlbaran.POBLACION := FAlmacenes.POBLACION;
- FAlbaran.PROVINCIA := FAlmacenes.PROVINCIA;
- FAlbaran.CODIGO_POSTAL := FAlmacenes.CODIGO_POSTAL;
- FAlbaran.PERSONA_CONTACTO := FAlmacenes.PERSONA_CONTACTO;
- FAlbaran.TELEFONO := FAlmacenes.TELEFONO;
- RefrescarDireccion;
- end;}
-end;
-
constructor TfrViewDireccionEntregaAlbaranCliente.Create(AOwner: TComponent);
begin
inherited;
FAlbaran := NIL;
-
- { FController := TAlbaranesClienteController.Create;
- FAlmacenesController := TAlmacenesController.Create;
- FAlmacenes := FAlmacenesController.BuscarTodos;
- FAlmacenes.DataTable.Active := True;
- dsAlmacenes.DataTable := FAlmacenes.DataTable;}
end;
destructor TfrViewDireccionEntregaAlbaranCliente.Destroy;
begin
-{ cbLista.Properties.OnValidate := Nil;
- FAlmacenesController := Nil;
- FAlmacenes := Nil;
- FController := NIL;
-}
FAlbaran := NIL;
inherited;
end;
@@ -107,38 +74,13 @@ begin
Result := FAlbaran;
end;
-procedure TfrViewDireccionEntregaAlbaranCliente.RefrescarDireccion;
+procedure TfrViewDireccionEntregaAlbaranCliente.SetAlbaranCliente(const Value: IBizAlbaranCliente);
begin
-{ memDireccion.Lines.Clear;
- if Assigned(FAlbaran) then
- begin
- memDireccion.Lines.Add(FAlbaran.CALLE);
- memDireccion.Lines.Add(FAlbaran.CODIGO_POSTAL + ' ' + FPedido.POBLACION);
- memDireccion.Lines.Add(FAlbaran.PROVINCIA);
- end;}
-end;
-
-procedure TfrViewDireccionEntregaAlbaranCliente.SetAlbaranCliente(
- const Value: IBizAlbaranCliente);
-begin
-
FAlbaran := Value;
if Assigned(FAlbaran) then
dsAlbaran.DataTable := FAlbaran.DataTable
else
dsAlbaran.DataTable := NIL;
-
-{ cbLista.Properties.OnValidate := NIL;
- dsAlbaran.DataTable := nil;
-
- FAlbaran := Value;
-
- if not FAlbaran.EsNuevo then
- RefrescarDireccion;
-
- // Esto al final para que no salten los eventos del cxComboBox
- dsAlbaran.DataTable := FAlbaran.DataTable;
- cbLista.Properties.OnValidate := cbListaPropertiesValidate;}
end;
end.
diff --git a/Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorController.pas b/Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorController.pas
index 8f33aa17..2639b0d2 100644
--- a/Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorController.pas
+++ b/Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorController.pas
@@ -122,6 +122,7 @@ type
end;
implementation
+{$INCLUDE ..\..\FactuGES.inc}
uses
uROTypes, Controls, cxControls, DB, uEditorRegistryUtils, uEditorPreview, DateUtils,
@@ -566,7 +567,11 @@ begin
raise Exception.Create('Debe indicar la fecha de este albarán');
if (Length(AAlbaran.CALLE) = 0) and (AAlbaran.ID_ALMACEN = 0) then
+ {$IFDEF ALMACEN}
raise Exception.Create('Debe indicar una dirección de entrega o almacén para este albarán');
+ {$ELSE}
+ raise Exception.Create('Debe indicar una dirección de entrega');
+ {$ENDIF}
//Tambien hacemos post de sus tablas hija
if (AAlbaran.Detalles.DataTable.RecordCount = 0) then
@@ -577,16 +582,18 @@ begin
if (AAlbaran.IMPORTE_TOTAL < 0) then
raise Exception.Create('Un albarán no puede tener un importe total negativo');
- //En caso de ser una orden de devolución no podra tener un importe total positivo
- if (AAlbaran.TIPO = CTE_TIPO_ALBARAN_DEV) then
- begin
- if (AAlbaran.IMPORTE_TOTAL >= 0) then
- raise Exception.Create('Una orden de devolución no puede tener un importe total positivo');
+ {$IFDEF ALMACEN}
+ //En caso de ser una orden de devolución no podra tener un importe total positivo
+ if (AAlbaran.TIPO = CTE_TIPO_ALBARAN_DEV) then
+ begin
+ if (AAlbaran.IMPORTE_TOTAL >= 0) then
+ raise Exception.Create('Una orden de devolución no puede tener un importe total positivo');
- //Una orden de devolución debe tener relleno el almacén de salida de material
- if (AAlbaran.ID_ALMACEN < 0) or (AAlbaran.ID_ALMACEN = 0) then
- raise Exception.Create('Debe indicar el almacén de salida de esta orden de devolución');
- end;
+ //Una orden de devolución debe tener relleno el almacén de salida de material
+ if (AAlbaran.ID_ALMACEN < 0) or (AAlbaran.ID_ALMACEN = 0) then
+ raise Exception.Create('Debe indicar el almacén de salida de esta orden de devolución');
+ end;
+ {$ENDIF}
{ Asegurarse de valores en campos "automáticos" tanto
en MODIFICACIÓN como en INSERCIÓN. }
diff --git a/Source/Modulos/Albaranes de proveedor/Plugin/uPluginAlbaranesProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Plugin/uPluginAlbaranesProveedor.dfm
index da32d192..e90fa209 100644
--- a/Source/Modulos/Albaranes de proveedor/Plugin/uPluginAlbaranesProveedor.dfm
+++ b/Source/Modulos/Albaranes de proveedor/Plugin/uPluginAlbaranesProveedor.dfm
@@ -260,7 +260,9 @@ object PluginAlbaranesProveedor: TPluginAlbaranesProveedor
object actDevolucionesProveedor: TAction
Category = 'Compras'
Caption = 'Ordenes de devoluci'#243'n'
+ Enabled = False
ImageIndex = 1
+ Visible = False
OnExecute = actDevolucionesProveedorExecute
end
end
diff --git a/Source/Modulos/Contactos/Views/Contactos_view.dproj b/Source/Modulos/Contactos/Views/Contactos_view.dproj
index ed0e1b4b..487fa7d0 100644
--- a/Source/Modulos/Contactos/Views/Contactos_view.dproj
+++ b/Source/Modulos/Contactos/Views/Contactos_view.dproj
@@ -49,18 +49,18 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Modulos/Contactos/Views/Contactos_view.res b/Source/Modulos/Contactos/Views/Contactos_view.res
index 8b251f31..1641339f 100644
Binary files a/Source/Modulos/Contactos/Views/Contactos_view.res and b/Source/Modulos/Contactos/Views/Contactos_view.res differ
diff --git a/Source/Modulos/Contactos/Views/uEditorCliente.dfm b/Source/Modulos/Contactos/Views/uEditorCliente.dfm
index a2685089..8b32f96c 100644
--- a/Source/Modulos/Contactos/Views/uEditorCliente.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorCliente.dfm
@@ -63,18 +63,21 @@ inherited fEditorCliente: TfEditorCliente
end
end
inherited pgPaginas: TPageControl
- Width = 656
- Height = 490
- ExplicitWidth = 656
- ExplicitHeight = 490
+ Width = 650
+ Height = 484
+ ActivePage = pagContabilidad
+ ExplicitLeft = 3
+ ExplicitTop = 79
+ ExplicitWidth = 650
+ ExplicitHeight = 484
inherited pagGeneral: TTabSheet
- ExplicitWidth = 648
- ExplicitHeight = 462
+ ExplicitWidth = 642
+ ExplicitHeight = 456
inline frViewCliente1: TfrViewCliente
Left = 0
Top = 0
- Width = 648
- Height = 462
+ Width = 642
+ Height = 456
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -84,63 +87,63 @@ inherited fEditorCliente: TfEditorCliente
ParentFont = False
TabOrder = 0
ReadOnly = False
- ExplicitWidth = 648
- ExplicitHeight = 462
+ ExplicitWidth = 642
+ ExplicitHeight = 456
inherited dxLayoutControlContacto: TdxLayoutControl
- Width = 648
- Height = 462
+ Width = 642
+ Height = 456
LookAndFeel = dxLayoutOfficeLookAndFeel
- ExplicitWidth = 648
- ExplicitHeight = 462
+ ExplicitWidth = 642
+ ExplicitHeight = 456
inherited PngSpeedButton1: TPngSpeedButton
- Left = 603
+ Left = 597
Top = 218
- ExplicitLeft = 603
+ ExplicitLeft = 597
ExplicitTop = 218
end
inherited PngSpeedButton2: TPngSpeedButton
- Left = 603
+ Left = 597
Top = 190
- ExplicitLeft = 603
+ ExplicitLeft = 597
ExplicitTop = 190
end
inherited PngSpeedButton3: TPngSpeedButton
- Left = 603
+ Left = 597
Top = 162
- ExplicitLeft = 603
+ ExplicitLeft = 597
ExplicitTop = 162
end
inherited Label1: TLabel
- Left = 432
+ Left = 431
Top = 270
Width = 269
- ExplicitLeft = 432
+ ExplicitLeft = 431
ExplicitTop = 270
ExplicitWidth = 269
end
inherited eCalle: TcxDBTextEdit
- Top = 294
- ExplicitTop = 294
+ Top = 216
+ ExplicitTop = 216
ExplicitWidth = 268
Width = 268
end
inherited eProvincia: TcxDBTextEdit
- Top = 348
- ExplicitTop = 348
+ Top = 270
+ ExplicitTop = 270
ExplicitWidth = 268
Width = 268
end
inherited ePoblacion: TcxDBTextEdit
- Top = 321
- ExplicitTop = 321
+ Top = 243
+ ExplicitTop = 243
ExplicitWidth = 78
Width = 78
end
inherited eCodigoPostal: TcxDBTextEdit
- Left = 339
- Top = 321
- ExplicitLeft = 339
- ExplicitTop = 321
+ Left = 338
+ Top = 243
+ ExplicitLeft = 338
+ ExplicitTop = 243
end
inherited eObservaciones: TcxDBMemo
Top = 399
@@ -157,8 +160,8 @@ inherited fEditorCliente: TfEditorCliente
Width = 265
end
inherited cbClienteBloqueado: TcxDBCheckBox
- Top = 189
- ExplicitTop = 189
+ Top = 321
+ ExplicitTop = 321
ExplicitWidth = 163
Width = 163
end
@@ -169,48 +172,47 @@ inherited fEditorCliente: TfEditorCliente
Width = 40
end
inherited eBloqueo: TcxDBTextEdit
- Top = 216
- ExplicitTop = 216
+ Top = 348
+ ExplicitTop = 348
ExplicitWidth = 205
Width = 205
end
inherited cxDBCheckBox1: TcxDBCheckBox
- Left = 432
+ Left = 431
Top = 315
- ExplicitLeft = 432
+ ExplicitLeft = 431
ExplicitTop = 315
- ExplicitWidth = 275
- ExplicitHeight = 21
- Width = 275
+ ExplicitWidth = 192
+ Width = 192
end
inherited eTlfParticular: TcxDBTextEdit
- Left = 527
+ Left = 526
Top = 57
- ExplicitLeft = 527
+ ExplicitLeft = 526
ExplicitTop = 57
ExplicitWidth = 91
Width = 91
end
inherited eTlfTrabajo: TcxDBTextEdit
- Left = 527
+ Left = 526
Top = 30
- ExplicitLeft = 527
+ ExplicitLeft = 526
ExplicitTop = 30
ExplicitWidth = 127
Width = 127
end
inherited eTlfMovil: TcxDBTextEdit
- Left = 527
+ Left = 526
Top = 84
- ExplicitLeft = 527
+ ExplicitLeft = 526
ExplicitTop = 84
ExplicitWidth = 157
Width = 157
end
inherited eFax: TcxDBTextEdit
- Left = 527
+ Left = 526
Top = 111
- ExplicitLeft = 527
+ ExplicitLeft = 526
ExplicitTop = 111
ExplicitWidth = 121
Width = 121
@@ -221,6 +223,12 @@ inherited fEditorCliente: TfEditorCliente
ExplicitWidth = 158
Width = 158
end
+ inherited eCodigoAsignado: TcxDBTextEdit
+ Top = 111
+ ExplicitTop = 111
+ ExplicitWidth = 227
+ Width = 227
+ end
inherited eNIFCIF: TcxDBTextEdit
Left = 226
Top = 30
@@ -230,33 +238,27 @@ inherited fEditorCliente: TfEditorCliente
Width = 268
end
inherited eMailTrabajo: TcxDBHyperLinkEdit
- Left = 527
+ Left = 526
Top = 162
Properties.Prefix = 'mailto:'
- ExplicitLeft = 527
+ ExplicitLeft = 526
ExplicitTop = 162
ExplicitWidth = 121
Width = 121
end
inherited eMailParticular: TcxDBHyperLinkEdit
- Left = 527
+ Left = 526
Top = 190
Properties.Prefix = 'mailto:'
- ExplicitLeft = 527
+ ExplicitLeft = 526
ExplicitTop = 190
ExplicitWidth = 121
Width = 121
end
- inherited eCodigoAsignado: TcxDBTextEdit
- Top = 111
- ExplicitTop = 111
- ExplicitWidth = 227
- Width = 227
- end
inherited ePaginaWeb: TcxDBHyperLinkEdit
- Left = 527
+ Left = 526
Top = 217
- ExplicitLeft = 527
+ ExplicitLeft = 526
ExplicitTop = 217
ExplicitWidth = 121
Width = 121
@@ -268,8 +270,8 @@ inherited fEditorCliente: TfEditorCliente
Width = 102
end
inherited ePersonaContacto: TcxDBTextEdit
- Top = 267
- ExplicitTop = 267
+ Top = 189
+ ExplicitTop = 189
ExplicitWidth = 253
Width = 253
end
@@ -281,24 +283,24 @@ inherited fEditorCliente: TfEditorCliente
end
end
inherited pagDatosBancarios: TTabSheet
- ExplicitWidth = 648
- ExplicitHeight = 462
+ ExplicitWidth = 642
+ ExplicitHeight = 456
inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios
- Width = 648
- Height = 462
- ExplicitWidth = 648
- ExplicitHeight = 462
+ Width = 642
+ Height = 456
+ ExplicitWidth = 642
+ ExplicitHeight = 456
inherited dxLayoutControl1: TdxLayoutControl
- Width = 648
+ Width = 642
LookAndFeel = dxLayoutOfficeLookAndFeel
- ExplicitWidth = 648
+ ExplicitWidth = 642
inherited eEntidad: TcxDBTextEdit
ExplicitWidth = 114
Width = 114
end
inherited eSucursal: TcxDBTextEdit
- Left = 418
- ExplicitLeft = 418
+ Left = 415
+ ExplicitLeft = 415
ExplicitWidth = 112
Width = 112
end
@@ -319,7 +321,7 @@ inherited fEditorCliente: TfEditorCliente
inline frViewClienteDatosComerciales1: TfrViewClienteDatosComerciales
Left = 0
Top = 0
- Width = 648
+ Width = 642
Height = 193
Align = alTop
Font.Charset = DEFAULT_CHARSET
@@ -330,27 +332,27 @@ inherited fEditorCliente: TfEditorCliente
ParentFont = False
TabOrder = 0
ReadOnly = False
- ExplicitWidth = 648
+ ExplicitWidth = 642
ExplicitHeight = 193
inherited dxLayoutControl1: TdxLayoutControl
- Width = 648
+ Width = 642
LookAndFeel = dxLayoutOfficeLookAndFeel
- ExplicitWidth = 648
+ ExplicitWidth = 642
inherited Label1: TLabel
- Left = 340
+ Left = 334
Top = 30
Width = 281
Caption =
'Puede indicar el d'#237'a del mes que el cliente desea realizar el pa' +
'go de sus recibos.'
- ExplicitLeft = 340
+ ExplicitLeft = 334
ExplicitTop = 30
ExplicitWidth = 281
end
inherited eDiasVencimiento: TcxDBSpinEdit
- Left = 466
+ Left = 460
Top = 62
- ExplicitLeft = 466
+ ExplicitLeft = 460
ExplicitTop = 62
ExplicitWidth = 160
Width = 160
@@ -374,9 +376,9 @@ inherited fEditorCliente: TfEditorCliente
Width = 121
end
inherited bFormasPago: TButton
- Left = 180
+ Left = 174
Top = 57
- ExplicitLeft = 180
+ ExplicitLeft = 174
ExplicitTop = 57
end
inherited eIVA: TcxDBLookupComboBox
@@ -386,9 +388,9 @@ inherited fEditorCliente: TfEditorCliente
Width = 121
end
inherited bTiposIVA: TButton
- Left = 180
+ Left = 174
Top = 84
- ExplicitLeft = 180
+ ExplicitLeft = 174
ExplicitTop = 84
end
inherited dxLayoutGroup1: TdxLayoutGroup
@@ -407,8 +409,8 @@ inherited fEditorCliente: TfEditorCliente
inline frViewDireccionesEntrega1: TfrViewDireccionesEntrega
Left = 0
Top = 0
- Width = 648
- Height = 462
+ Width = 642
+ Height = 456
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -418,13 +420,13 @@ inherited fEditorCliente: TfEditorCliente
ParentFont = False
TabOrder = 0
ReadOnly = False
- ExplicitWidth = 648
- ExplicitHeight = 462
+ ExplicitWidth = 642
+ ExplicitHeight = 456
inherited cxGrid: TcxGrid
- Width = 648
- Height = 437
- ExplicitWidth = 648
- ExplicitHeight = 437
+ Width = 642
+ Height = 431
+ ExplicitWidth = 642
+ ExplicitHeight = 431
inherited cxGridView: TcxGridDBTableView
inherited cxGridViewID: TcxGridDBColumn
SortIndex = 0
@@ -433,47 +435,20 @@ inherited fEditorCliente: TfEditorCliente
end
end
inherited ToolBar1: TToolBar
- Width = 648
- ExplicitWidth = 648
- inherited ToolButton1: TToolButton
- Top = 0
- ExplicitTop = 0
- ExplicitWidth = 62
- end
- inherited ToolButton4: TToolButton
- Top = 0
- ExplicitTop = 0
- ExplicitWidth = 74
- end
- inherited ToolButton5: TToolButton
- Top = 0
- ExplicitTop = 0
- end
- inherited ToolButton2: TToolButton
- Top = 0
- ExplicitTop = 0
- ExplicitWidth = 67
- end
- inherited ToolButton6: TToolButton
- Top = 0
- ExplicitTop = 0
- end
- inherited ToolButton7: TToolButton
- Top = 0
- ExplicitTop = 0
- ExplicitWidth = 117
- end
+ Width = 642
+ ExplicitWidth = 642
end
end
end
object pagDescuentos: TTabSheet
Caption = 'Descuentos'
ImageIndex = 2
+ TabVisible = False
inline frViewClienteDescuentos1: TfrViewClienteDescuentos
Left = 0
Top = 0
- Width = 648
- Height = 462
+ Width = 642
+ Height = 456
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -483,17 +458,17 @@ inherited fEditorCliente: TfEditorCliente
ParentFont = False
TabOrder = 0
ReadOnly = False
- ExplicitWidth = 648
- ExplicitHeight = 462
+ ExplicitWidth = 642
+ ExplicitHeight = 456
inherited cxGrid: TcxGrid
- Width = 648
- Height = 437
- ExplicitWidth = 648
- ExplicitHeight = 437
+ Width = 642
+ Height = 431
+ ExplicitWidth = 642
+ ExplicitHeight = 431
end
inherited ToolBar1: TToolBar
- Width = 648
- ExplicitWidth = 648
+ Width = 642
+ ExplicitWidth = 642
inherited ToolButton1: TToolButton
Top = 0
ExplicitTop = 0
@@ -531,8 +506,8 @@ inherited fEditorCliente: TfEditorCliente
inline frViewSubCuentaContacto1: TfrViewSubCuentaContacto
Left = 0
Top = 0
- Width = 648
- Height = 462
+ Width = 642
+ Height = 456
Align = alClient
AutoSize = True
Font.Charset = DEFAULT_CHARSET
@@ -543,32 +518,32 @@ inherited fEditorCliente: TfEditorCliente
ParentFont = False
TabOrder = 0
ReadOnly = False
- ExplicitWidth = 648
- ExplicitHeight = 462
+ ExplicitWidth = 642
+ ExplicitHeight = 456
inherited layoutApunte: TdxLayoutControl
- Width = 648
- Height = 462
- ExplicitWidth = 648
- ExplicitHeight = 462
+ Width = 642
+ Height = 456
+ ExplicitWidth = 642
+ ExplicitHeight = 456
inherited eRefSubCuenta: TcxDBTextEdit
ExplicitWidth = 346
Width = 346
end
inherited BitBtn3: TBitBtn
- Left = 401
- ExplicitLeft = 401
+ Left = 395
+ ExplicitLeft = 395
end
inherited eSubCuenta: TcxDBTextEdit
ExplicitWidth = 265
Width = 265
end
inherited BitBtn1: TBitBtn
- Left = 482
- ExplicitLeft = 482
+ Left = 476
+ ExplicitLeft = 476
end
inherited BitBtn2: TBitBtn
- Left = 563
- ExplicitLeft = 563
+ Left = 557
+ ExplicitLeft = 557
end
inherited cbIgnorarContabilidad: TcxDBCheckBox
DataBinding.DataSource = frViewCliente1.dsContacto
diff --git a/Source/Modulos/Contactos/Views/uEditorClientes.dfm b/Source/Modulos/Contactos/Views/uEditorClientes.dfm
index 3cfc7fc8..58e9dafc 100644
--- a/Source/Modulos/Contactos/Views/uEditorClientes.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorClientes.dfm
@@ -93,6 +93,14 @@ inherited fEditorClientes: TfEditorClientes
Kind = skCount
Column = frViewClientes1.cxGridViewTiendaWeb
end>
+ inherited cxGridViewBLOQUEADO: TcxGridDBColumn
+ Visible = False
+ VisibleForCustomization = False
+ end
+ inherited cxGridViewTiendaWeb: TcxGridDBColumn
+ Visible = False
+ VisibleForCustomization = False
+ end
end
end
inherited frViewFiltroBase1: TfrViewFiltroBase
@@ -131,6 +139,7 @@ inherited fEditorClientes: TfEditorClientes
inherited pnlAgrupaciones: TTBXDockablePanel
Top = 372
ExplicitTop = 372
+ ExplicitWidth = 786
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 786
ExplicitWidth = 786
@@ -142,7 +151,7 @@ inherited fEditorClientes: TfEditorClientes
end
inherited dxComponentPrinter: TdxComponentPrinter
inherited dxComponentPrinterLink: TdxGridReportLink
- ReportDocument.CreationDate = 39388.700534212960000000
+ ReportDocument.CreationDate = 39388.700534212970000000
BuiltInReportLink = True
end
end
diff --git a/Source/Modulos/Contactos/Views/uEditorContacto.dfm b/Source/Modulos/Contactos/Views/uEditorContacto.dfm
index 49fce0d6..892c66d9 100644
--- a/Source/Modulos/Contactos/Views/uEditorContacto.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorContacto.dfm
@@ -74,13 +74,12 @@ inherited fEditorContacto: TfEditorContacto
end
end
inherited pgPaginas: TPageControl
- Width = 632
+ Width = 626
ExplicitWidth = 632
inherited pagGeneral: TTabSheet
ExplicitLeft = 4
ExplicitTop = 24
ExplicitWidth = 624
- ExplicitHeight = 338
end
object pagDatosBancarios: TTabSheet
Caption = 'Datos bancarios'
@@ -88,8 +87,8 @@ inherited fEditorContacto: TfEditorContacto
inline frViewClienteDatosBancarios: TfrViewClienteDatosBancarios
Left = 0
Top = 0
- Width = 624
- Height = 338
+ Width = 618
+ Height = 332
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -99,12 +98,12 @@ inherited fEditorContacto: TfEditorContacto
ParentFont = False
TabOrder = 0
ReadOnly = False
- ExplicitWidth = 624
- ExplicitHeight = 338
+ ExplicitWidth = 618
+ ExplicitHeight = 332
inherited dxLayoutControl1: TdxLayoutControl
- Width = 624
+ Width = 618
LookAndFeel = dxLayoutOfficeLookAndFeel
- ExplicitWidth = 624
+ ExplicitWidth = 618
inherited eEntidad: TcxDBTextEdit
Top = 57
ExplicitTop = 57
@@ -112,9 +111,9 @@ inherited fEditorContacto: TfEditorContacto
Width = 114
end
inherited eSucursal: TcxDBTextEdit
- Left = 406
+ Left = 403
Top = 57
- ExplicitLeft = 406
+ ExplicitLeft = 403
ExplicitTop = 57
ExplicitWidth = 112
Width = 112
diff --git a/Source/Modulos/Contactos/Views/uEditorProveedores.dfm b/Source/Modulos/Contactos/Views/uEditorProveedores.dfm
index 334aa1ef..1e977279 100644
--- a/Source/Modulos/Contactos/Views/uEditorProveedores.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorProveedores.dfm
@@ -1,5 +1,6 @@
inherited fEditorProveedores: TfEditorProveedores
Caption = 'fEditorProveedores'
+ ExplicitWidth = 551
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -75,6 +76,10 @@ inherited fEditorProveedores: TfEditorProveedores
FieldName = 'NIF_CIF'
Column = frViewProveedores1.cxGridViewREFERENCIA
end>
+ inherited cxGridViewTIENDA_WEB: TcxGridDBColumn
+ Visible = False
+ VisibleForCustomization = False
+ end
end
end
inherited frViewFiltroBase1: TfrViewFiltroBase
diff --git a/Source/Modulos/Contactos/Views/uViewCliente.dfm b/Source/Modulos/Contactos/Views/uViewCliente.dfm
index 92177670..786d2824 100644
--- a/Source/Modulos/Contactos/Views/uViewCliente.dfm
+++ b/Source/Modulos/Contactos/Views/uViewCliente.dfm
@@ -23,7 +23,7 @@ inherited frViewCliente: TfrViewCliente
ExplicitLeft = 585
end
object Label1: TLabel [3]
- Left = 373
+ Left = 372
Top = 280
Width = 269
Height = 39
@@ -35,37 +35,37 @@ inherited frViewCliente: TfrViewCliente
end
inherited eCalle: TcxDBTextEdit
Left = 132
- Top = 304
- TabOrder = 9
+ Top = 220
+ TabOrder = 7
ExplicitLeft = 132
- ExplicitTop = 304
+ ExplicitTop = 220
ExplicitWidth = 175
Width = 175
end
inherited eProvincia: TcxDBTextEdit
Left = 132
- Top = 358
- TabOrder = 12
+ Top = 274
+ TabOrder = 10
ExplicitLeft = 132
- ExplicitTop = 358
+ ExplicitTop = 274
ExplicitWidth = 167
Width = 167
end
inherited ePoblacion: TcxDBTextEdit
Left = 132
- Top = 331
- TabOrder = 10
+ Top = 247
+ TabOrder = 8
ExplicitLeft = 132
- ExplicitTop = 331
+ ExplicitTop = 247
ExplicitWidth = 71
Width = 71
end
inherited eCodigoPostal: TcxDBTextEdit
- Left = 278
- Top = 331
- TabOrder = 11
- ExplicitLeft = 278
- ExplicitTop = 331
+ Left = 277
+ Top = 247
+ TabOrder = 9
+ ExplicitLeft = 277
+ ExplicitTop = 247
end
inherited eObservaciones: TcxDBMemo
Top = 415
@@ -98,7 +98,7 @@ inherited frViewCliente: TfrViewCliente
end
object cbClienteBloqueado: TcxDBCheckBox [10]
Left = 22
- Top = 193
+ Top = 331
Action = actBloqueoCliente
DataBinding.DataField = 'BLOQUEADO'
DataBinding.DataSource = dsContacto
@@ -117,7 +117,7 @@ inherited frViewCliente: TfrViewCliente
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- TabOrder = 6
+ TabOrder = 11
Width = 163
end
object cbGrupoCliente: TcxDBComboBox [11]
@@ -146,7 +146,7 @@ inherited frViewCliente: TfrViewCliente
end
object eBloqueo: TcxDBTextEdit [12]
Left = 132
- Top = 220
+ Top = 358
DataBinding.DataField = 'MOTIVO_BLOQUEO'
DataBinding.DataSource = dsContacto
Style.BorderColor = clWindowFrame
@@ -160,11 +160,11 @@ inherited frViewCliente: TfrViewCliente
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- TabOrder = 7
+ TabOrder = 12
Width = 113
end
object cxDBCheckBox1: TcxDBCheckBox [13]
- Left = 373
+ Left = 372
Top = 325
Caption = 'Permitir el acceso de este cliente a la tienda web'
DataBinding.DataField = 'TIENDA_WEB'
@@ -186,33 +186,33 @@ inherited frViewCliente: TfrViewCliente
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 20
- Width = 249
+ Width = 236
end
inherited eTlfParticular: TcxDBTextEdit
- Left = 468
+ Left = 467
TabOrder = 14
- ExplicitLeft = 468
+ ExplicitLeft = 467
ExplicitWidth = 157
Width = 157
end
inherited eTlfTrabajo: TcxDBTextEdit
- Left = 468
+ Left = 467
TabOrder = 13
- ExplicitLeft = 468
+ ExplicitLeft = 467
ExplicitWidth = 157
Width = 157
end
inherited eTlfMovil: TcxDBTextEdit
- Left = 468
+ Left = 467
TabOrder = 15
- ExplicitLeft = 468
+ ExplicitLeft = 467
ExplicitWidth = 157
Width = 157
end
inherited eFax: TcxDBTextEdit
- Left = 468
+ Left = 467
TabOrder = 16
- ExplicitLeft = 468
+ ExplicitLeft = 467
ExplicitWidth = 157
Width = 157
end
@@ -222,51 +222,7 @@ inherited frViewCliente: TfrViewCliente
ExplicitWidth = 135
Width = 135
end
- inherited eNIFCIF: TcxDBTextEdit
- Left = 259
- ExplicitLeft = 259
- ExplicitWidth = 58
- Width = 58
- end
- inherited eMailTrabajo: TcxDBHyperLinkEdit
- Left = 468
- Properties.Prefix = 'mailto:'
- TabOrder = 17
- ExplicitLeft = 468
- ExplicitWidth = 128
- Width = 128
- end
- inherited eMailParticular: TcxDBHyperLinkEdit
- Left = 468
- Properties.Prefix = 'mailto:'
- TabOrder = 18
- ExplicitLeft = 468
- ExplicitWidth = 128
- Width = 128
- end
- inherited ePaginaWeb: TcxDBHyperLinkEdit
- Left = 468
- TabOrder = 19
- ExplicitLeft = 468
- ExplicitWidth = 128
- Width = 128
- end
- inherited eReferencia: TcxDBTextEdit
- Left = 132
- ExplicitLeft = 132
- ExplicitWidth = 38
- Width = 38
- end
- inherited ePersonaContacto: TcxDBTextEdit
- Left = 132
- Top = 277
- TabOrder = 8
- ExplicitLeft = 132
- ExplicitTop = 277
- ExplicitWidth = 256
- Width = 256
- end
- object eCodigoAsignado: TcxDBTextEdit [25]
+ object eCodigoAsignado: TcxDBTextEdit [19]
Left = 132
Top = 109
DataBinding.DataField = 'CODIGO_ASIGNADO'
@@ -286,6 +242,46 @@ inherited frViewCliente: TfrViewCliente
TabOrder = 4
Width = 227
end
+ inherited eNIFCIF: TcxDBTextEdit
+ Left = 283
+ ExplicitLeft = 283
+ ExplicitWidth = 58
+ Width = 58
+ end
+ inherited eMailTrabajo: TcxDBHyperLinkEdit
+ Left = 467
+ Properties.Prefix = 'mailto:'
+ TabOrder = 17
+ ExplicitLeft = 467
+ ExplicitWidth = 128
+ Width = 128
+ end
+ inherited eMailParticular: TcxDBHyperLinkEdit
+ Left = 467
+ Properties.Prefix = 'mailto:'
+ TabOrder = 18
+ ExplicitLeft = 467
+ ExplicitWidth = 128
+ Width = 128
+ end
+ inherited ePaginaWeb: TcxDBHyperLinkEdit
+ Left = 467
+ TabOrder = 19
+ ExplicitLeft = 467
+ ExplicitWidth = 128
+ Width = 128
+ end
+ inherited eReferencia: TcxDBTextEdit
+ Left = 132
+ ExplicitLeft = 132
+ end
+ inherited ePersonaContacto: TcxDBTextEdit
+ Left = 132
+ Top = 193
+ TabOrder = 6
+ ExplicitLeft = 132
+ ExplicitTop = 193
+ end
inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup
AutoAligns = [aaHorizontal]
AlignVert = avBottom
@@ -294,11 +290,13 @@ inherited frViewCliente: TfrViewCliente
inherited dxLayoutControlContactoGroup1: TdxLayoutGroup
object dxLayoutControlContactoItem24: TdxLayoutItem
Caption = 'Nombre comercial:'
+ Visible = False
Control = eNombreComercial
ControlOptions.ShowBorder = False
end
object dxLayoutControlContactoItem22: TdxLayoutItem
Caption = 'C'#243'digo de proveedor:'
+ Visible = False
Control = eCodigoAsignado
ControlOptions.ShowBorder = False
end
@@ -310,8 +308,12 @@ inherited frViewCliente: TfrViewCliente
ControlOptions.ShowBorder = False
end
end
- object dxLayoutControlContactoGroup18: TdxLayoutGroup [1]
+ inherited dxLayoutControlContactoGroup3: TdxLayoutGroup
+ Caption = 'Domicilio fiscal'
+ end
+ object dxLayoutControlContactoGroup18: TdxLayoutGroup
Caption = 'Bloqueo'
+ Visible = False
object dxLayoutControlContactoItem26: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
@@ -326,9 +328,6 @@ inherited frViewCliente: TfrViewCliente
ControlOptions.ShowBorder = False
end
end
- inherited dxLayoutControlContactoGroup3: TdxLayoutGroup
- Caption = 'Domicilio fiscal'
- end
end
inherited dxLayoutControlContactoGroup6: TdxLayoutGroup
object dxLayoutControlContactoGroup10: TdxLayoutGroup
diff --git a/Source/Modulos/Contactos/Views/uViewProveedor.dfm b/Source/Modulos/Contactos/Views/uViewProveedor.dfm
index bf06d379..94f31c28 100644
--- a/Source/Modulos/Contactos/Views/uViewProveedor.dfm
+++ b/Source/Modulos/Contactos/Views/uViewProveedor.dfm
@@ -7,19 +7,19 @@ inherited frViewProveedor: TfrViewProveedor
Height = 454
ExplicitHeight = 454
inherited PngSpeedButton1: TPngSpeedButton
- Left = 612
- ExplicitLeft = 612
+ Left = 613
+ ExplicitLeft = 613
end
inherited PngSpeedButton2: TPngSpeedButton
- Left = 612
- ExplicitLeft = 612
+ Left = 613
+ ExplicitLeft = 613
end
inherited PngSpeedButton3: TPngSpeedButton
- Left = 612
- ExplicitLeft = 612
+ Left = 613
+ ExplicitLeft = 613
end
object Label1: TLabel [3]
- Left = 371
+ Left = 372
Top = 307
Width = 342
Height = 26
@@ -30,37 +30,37 @@ inherited frViewProveedor: TfrViewProveedor
end
inherited eCalle: TcxDBTextEdit
Left = 138
- Top = 304
- TabOrder = 9
+ Top = 220
+ TabOrder = 7
ExplicitLeft = 138
- ExplicitTop = 304
+ ExplicitTop = 220
ExplicitWidth = 264
Width = 264
end
inherited eProvincia: TcxDBTextEdit
Left = 138
- Top = 358
- TabOrder = 12
+ Top = 274
+ TabOrder = 10
ExplicitLeft = 138
- ExplicitTop = 358
+ ExplicitTop = 274
ExplicitWidth = 264
Width = 264
end
inherited ePoblacion: TcxDBTextEdit
Left = 138
- Top = 331
- TabOrder = 10
+ Top = 247
+ TabOrder = 8
ExplicitLeft = 138
- ExplicitTop = 331
+ ExplicitTop = 247
ExplicitWidth = 163
Width = 163
end
inherited eCodigoPostal: TcxDBTextEdit
- Left = 276
- Top = 331
- TabOrder = 11
- ExplicitLeft = 276
- ExplicitTop = 331
+ Left = 277
+ Top = 247
+ TabOrder = 9
+ ExplicitLeft = 277
+ ExplicitTop = 247
end
inherited eObservaciones: TcxDBMemo
Top = 415
@@ -70,7 +70,7 @@ inherited frViewProveedor: TfrViewProveedor
Height = 20
end
object cxDBCheckBox1: TcxDBCheckBox [9]
- Left = 371
+ Left = 372
Top = 280
Caption = 'Incluir este proveedor en la tienda web'
DataBinding.DataField = 'TIENDA_WEB'
@@ -96,7 +96,7 @@ inherited frViewProveedor: TfrViewProveedor
end
object cxDBCheckBox2: TcxDBCheckBox [10]
Left = 22
- Top = 193
+ Top = 331
Caption = 'El proveedor est'#225' homologado'
DataBinding.DataField = 'HOMOLOGADO'
DataBinding.DataSource = dsContacto
@@ -115,12 +115,12 @@ inherited frViewProveedor: TfrViewProveedor
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- TabOrder = 6
+ TabOrder = 11
Width = 326
end
object eCertificaciones: TcxDBTextEdit [11]
Left = 138
- Top = 220
+ Top = 358
DataBinding.DataField = 'CERTIFICACION'
DataBinding.DataSource = dsContacto
Style.BorderColor = clWindowFrame
@@ -134,7 +134,7 @@ inherited frViewProveedor: TfrViewProveedor
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- TabOrder = 7
+ TabOrder = 12
Width = 227
end
object cbGrupoProveedor: TcxDBComboBox [12]
@@ -200,30 +200,30 @@ inherited frViewProveedor: TfrViewProveedor
Width = 221
end
inherited eTlfParticular: TcxDBTextEdit
- Left = 466
+ Left = 467
TabOrder = 14
- ExplicitLeft = 466
+ ExplicitLeft = 467
ExplicitWidth = 91
Width = 91
end
inherited eTlfTrabajo: TcxDBTextEdit
- Left = 466
+ Left = 467
TabOrder = 13
- ExplicitLeft = 466
+ ExplicitLeft = 467
ExplicitWidth = 127
Width = 127
end
inherited eTlfMovil: TcxDBTextEdit
- Left = 466
+ Left = 467
TabOrder = 15
- ExplicitLeft = 466
+ ExplicitLeft = 467
ExplicitWidth = 155
Width = 155
end
inherited eFax: TcxDBTextEdit
- Left = 466
+ Left = 467
TabOrder = 16
- ExplicitLeft = 466
+ ExplicitLeft = 467
ExplicitWidth = 121
Width = 121
end
@@ -240,25 +240,25 @@ inherited frViewProveedor: TfrViewProveedor
Width = 205
end
inherited eMailTrabajo: TcxDBHyperLinkEdit
- Left = 466
+ Left = 467
Properties.Prefix = 'mailto:'
TabOrder = 17
- ExplicitLeft = 466
+ ExplicitLeft = 467
ExplicitWidth = 133
Width = 133
end
inherited eMailParticular: TcxDBHyperLinkEdit
- Left = 466
+ Left = 467
Properties.Prefix = 'mailto:'
TabOrder = 18
- ExplicitLeft = 466
+ ExplicitLeft = 467
ExplicitWidth = 133
Width = 133
end
inherited ePaginaWeb: TcxDBHyperLinkEdit
- Left = 466
+ Left = 467
TabOrder = 19
- ExplicitLeft = 466
+ ExplicitLeft = 467
ExplicitWidth = 133
Width = 133
end
@@ -270,10 +270,10 @@ inherited frViewProveedor: TfrViewProveedor
end
inherited ePersonaContacto: TcxDBTextEdit
Left = 138
- Top = 277
- TabOrder = 8
+ Top = 193
+ TabOrder = 6
ExplicitLeft = 138
- ExplicitTop = 277
+ ExplicitTop = 193
ExplicitWidth = 256
Width = 256
end
@@ -288,6 +288,7 @@ inherited frViewProveedor: TfrViewProveedor
end
object dxLayoutControlContactoItem24: TdxLayoutItem
Caption = 'C'#243'digo de cliente:'
+ Visible = False
Control = eCodigoAsignado
ControlOptions.ShowBorder = False
end
@@ -297,7 +298,7 @@ inherited frViewProveedor: TfrViewProveedor
ControlOptions.ShowBorder = False
end
end
- object dxLayoutControlContactoGroup14: TdxLayoutGroup [1]
+ object dxLayoutControlContactoGroup14: TdxLayoutGroup
Caption = 'Homologaci'#243'n'
Visible = False
object dxLayoutControlContactoItem22: TdxLayoutItem
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index bde294d0..3399da60 100644
Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 6747943a..c739286b 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -14,7 +14,7 @@ BEGIN
BEGIN
VALUE "FileVersion", "1.0.0.0\0"
VALUE "ProductVersion", "1.0.0.0\0"
- VALUE "CompileDate", "viernes, 04 de enero de 2008 11:17\0"
+ VALUE "CompileDate", "viernes, 04 de enero de 2008 12:34\0"
END
END
BLOCK "VarFileInfo"