diff --git a/Source/ApplicationBase/ApplicationBase.dproj b/Source/ApplicationBase/ApplicationBase.dproj
index a56c7d01..127b24b4 100644
--- a/Source/ApplicationBase/ApplicationBase.dproj
+++ b/Source/ApplicationBase/ApplicationBase.dproj
@@ -49,9 +49,6 @@
-
-
-
RemObjects Data Abstract - SQLite Driver
Microsoft Office 2000 Sample Automation Server Wrapper Components
Microsoft Office XP Sample Automation Server Wrapper Components
@@ -62,29 +59,29 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm
index e079b8b9..2799675c 100644
--- a/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm
+++ b/Source/ApplicationBase/Empresas/Views/uEditorEmpresa.dfm
@@ -74,23 +74,32 @@ inherited fEditorEmpresa: TfEditorEmpresa
end
end
end
+ inherited StatusBar: TJvStatusBar
+ Top = 535
+ Width = 674
+ Panels = <
+ item
+ Width = 200
+ end>
+ ExplicitTop = 535
+ ExplicitWidth = 674
+ end
inherited pgPaginas: TPageControl
Width = 668
- Height = 453
- ExplicitLeft = 3
- ExplicitTop = 79
+ Height = 423
+ ExplicitTop = 109
ExplicitWidth = 668
- ExplicitHeight = 453
+ ExplicitHeight = 423
inherited pagGeneral: TTabSheet
ExplicitLeft = 4
ExplicitTop = 24
ExplicitWidth = 660
- ExplicitHeight = 425
+ ExplicitHeight = 395
inline frViewEmpresa1: TfrViewEmpresa
Left = 0
Top = 0
Width = 660
- Height = 425
+ Height = 395
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -101,13 +110,13 @@ inherited fEditorEmpresa: TfEditorEmpresa
TabOrder = 0
ReadOnly = False
ExplicitWidth = 660
- ExplicitHeight = 425
+ ExplicitHeight = 395
inherited dxLayoutControl1: TdxLayoutControl
Width = 660
- Height = 425
+ Height = 395
LookAndFeel = dxLayoutOfficeLookAndFeel1
ExplicitWidth = 660
- ExplicitHeight = 425
+ ExplicitHeight = 395
inherited PngSpeedButton1: TPngSpeedButton
Left = 615
Top = 295
@@ -121,137 +130,125 @@ inherited fEditorEmpresa: TfEditorEmpresa
ExplicitTop = 267
end
inherited eCalle: TcxDBTextEdit
- Top = 189
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
- ExplicitTop = 189
- ExplicitWidth = 84
- Width = 84
- end
- inherited cbProvincia: TcxDBComboBox
Top = 216
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 216
- ExplicitWidth = 106
- Width = 106
+ ExplicitWidth = 84
+ Width = 84
end
- inherited cbPoblacion: TcxDBComboBox
+ inherited cbProvincia: TcxDBComboBox
Top = 243
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 243
+ ExplicitWidth = 106
+ Width = 106
+ end
+ inherited cbPoblacion: TcxDBComboBox
+ Top = 270
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitTop = 270
ExplicitWidth = 100
Width = 100
end
inherited eCodigoPostal: TcxDBTextEdit
- Left = 345
- Top = 216
+ Left = 351
+ Top = 243
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 345
- ExplicitTop = 216
+ ExplicitLeft = 351
+ ExplicitTop = 243
end
inherited ePaginaWeb: TcxDBTextEdit
- Left = 533
+ Left = 539
Top = 216
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 533
+ ExplicitLeft = 539
ExplicitTop = 216
ExplicitWidth = 165
Width = 165
end
inherited eMailParticular: TcxDBTextEdit
- Left = 533
+ Left = 539
Top = 189
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 533
+ ExplicitLeft = 539
ExplicitTop = 189
ExplicitWidth = 165
Width = 165
end
inherited eMailTrabajo: TcxDBTextEdit
- Left = 533
+ Left = 539
Top = 162
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 533
+ ExplicitLeft = 539
ExplicitTop = 162
ExplicitWidth = 129
Width = 129
end
- inherited cxDBMemo1: TcxDBMemo
- Top = 294
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
- ExplicitTop = 294
- ExplicitWidth = 107
- ExplicitHeight = 234
- Height = 234
- Width = 107
- end
inherited eTlfParticular: TcxDBTextEdit
- Left = 533
+ Left = 539
Top = 57
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 533
+ ExplicitLeft = 539
ExplicitTop = 57
ExplicitWidth = 91
Width = 91
end
inherited eTlfTrabajo: TcxDBTextEdit
- Left = 533
+ Left = 539
Top = 30
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 533
+ ExplicitLeft = 539
ExplicitTop = 30
ExplicitWidth = 127
Width = 127
end
inherited eTlfMovil: TcxDBTextEdit
- Left = 533
+ Left = 539
Top = 84
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 533
+ ExplicitLeft = 539
ExplicitTop = 84
ExplicitWidth = 155
Width = 155
end
inherited eFax: TcxDBTextEdit
- Left = 533
+ Left = 539
Top = 111
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 533
+ ExplicitLeft = 539
ExplicitTop = 111
ExplicitWidth = 121
Width = 121
@@ -287,13 +284,13 @@ inherited fEditorEmpresa: TfEditorEmpresa
Width = 76
end
inherited cxDBImage1: TcxDBImage
- Left = 438
+ Left = 444
Top = 267
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 438
+ ExplicitLeft = 444
ExplicitTop = 267
ExplicitWidth = 140
ExplicitHeight = 100
@@ -301,14 +298,37 @@ inherited fEditorEmpresa: TfEditorEmpresa
Width = 140
end
inherited cbFormaPago: TcxComboBox
+ Top = 165
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitTop = 165
+ ExplicitWidth = 359
+ Width = 359
+ end
+ inherited cbTipoIVA: TcxComboBox
Top = 138
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 138
- ExplicitWidth = 359
- Width = 359
+ ExplicitWidth = 202
+ Width = 202
+ end
+ inherited frViewObservaciones1: TfrViewObservaciones
+ Top = 321
+ Width = 521
+ Height = 150
+ ExplicitTop = 321
+ ExplicitWidth = 521
+ ExplicitHeight = 150
+ inherited memObservaciones: TcxDBMemo
+ DataBinding.DataSource = frViewEmpresa1.DADataSource
+ Height = 150
+ Width = 521
+ end
end
end
end
@@ -320,7 +340,7 @@ inherited fEditorEmpresa: TfEditorEmpresa
Left = 0
Top = 0
Width = 660
- Height = 425
+ Height = 395
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -331,12 +351,12 @@ inherited fEditorEmpresa: TfEditorEmpresa
TabOrder = 0
ReadOnly = False
ExplicitWidth = 660
- ExplicitHeight = 425
+ ExplicitHeight = 395
inherited cxGrid: TcxGrid
Width = 660
- Height = 400
+ Height = 370
ExplicitWidth = 660
- ExplicitHeight = 400
+ ExplicitHeight = 370
end
inherited ToolBar1: TToolBar
Width = 660
@@ -363,7 +383,7 @@ inherited fEditorEmpresa: TfEditorEmpresa
Left = 0
Top = 0
Width = 660
- Height = 425
+ Height = 395
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -374,10 +394,10 @@ inherited fEditorEmpresa: TfEditorEmpresa
TabOrder = 0
ReadOnly = False
ExplicitWidth = 660
- ExplicitHeight = 425
+ ExplicitHeight = 395
inherited cxGrid: TcxGrid
Width = 660
- Height = 400
+ Height = 370
ExplicitWidth = 660
ExplicitHeight = 400
inherited cxGridView: TcxGridDBTableView
@@ -405,35 +425,33 @@ inherited fEditorEmpresa: TfEditorEmpresa
end
end
end
- inherited StatusBar: TJvStatusBar
- Top = 535
+ inherited PnlComentario: TPanel
Width = 674
- Panels = <
- item
- Width = 200
- end>
- ExplicitTop = 535
ExplicitWidth = 674
+ inherited lbComentario: TLabel
+ Width = 664
+ Height = 25
+ end
end
inherited EditorActionList: TActionList
Top = 128
end
- inherited SmallImages: TPngImageList
- Left = 403
- Top = 176
- end
inherited dsDataTable: TDADataSource [6]
Left = 168
Top = 120
end
- inherited LargeImages: TPngImageList [7]
+ inherited LargeImages: TPngImageList
Left = 435
Top = 176
end
- inherited JvFormStorage: TJvFormStorage [8]
+ inherited JvFormStorage: TJvFormStorage
Left = 408
Top = 208
end
+ inherited SmallImages: TPngImageList [9]
+ Left = 403
+ Top = 176
+ end
inherited JvAppRegistryStorage: TJvAppRegistryStorage
Left = 440
Top = 208
diff --git a/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm b/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm
index 1478411f..68257a6f 100644
--- a/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm
+++ b/Source/ApplicationBase/Empresas/Views/uViewEmpresa.dfm
@@ -1,24 +1,25 @@
inherited frViewEmpresa: TfrViewEmpresa
- Width = 590
- Height = 385
+ Width = 861
+ Height = 517
OnShow = CustomViewShow
- ExplicitWidth = 590
- ExplicitHeight = 385
+ ExplicitWidth = 861
+ ExplicitHeight = 517
object dxLayoutControl1: TdxLayoutControl
Left = 0
Top = 0
- Width = 590
- Height = 385
+ Width = 861
+ Height = 517
Align = alClient
ParentBackground = True
TabOrder = 0
TabStop = False
AutoContentSizes = [acsWidth, acsHeight]
+ ExplicitWidth = 681
DesignSize = (
- 590
- 385)
+ 861
+ 517)
object PngSpeedButton1: TPngSpeedButton
- Left = 545
+ Left = 816
Top = 305
Width = 23
Height = 22
@@ -26,7 +27,7 @@ inherited frViewEmpresa: TfrViewEmpresa
PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled]
end
object PngSpeedButton2: TPngSpeedButton
- Left = 545
+ Left = 816
Top = 277
Width = 23
Height = 22
@@ -106,7 +107,7 @@ inherited frViewEmpresa: TfrViewEmpresa
Width = 100
end
object eCodigoPostal: TcxDBTextEdit
- Left = 299
+ Left = 364
Top = 247
DataBinding.DataField = 'CODIGO_POSTAL'
DataBinding.DataSource = DADataSource
@@ -128,7 +129,7 @@ inherited frViewEmpresa: TfrViewEmpresa
Width = 65
end
object ePaginaWeb: TcxDBTextEdit
- Left = 489
+ Left = 554
Top = 220
DataBinding.DataField = 'PAGINA_WEB'
DataBinding.DataSource = DADataSource
@@ -150,7 +151,7 @@ inherited frViewEmpresa: TfrViewEmpresa
Width = 165
end
object eMailParticular: TcxDBTextEdit
- Left = 489
+ Left = 554
Top = 193
DataBinding.DataField = 'EMAIL_2'
DataBinding.DataSource = DADataSource
@@ -172,7 +173,7 @@ inherited frViewEmpresa: TfrViewEmpresa
Width = 165
end
object eMailTrabajo: TcxDBTextEdit
- Left = 489
+ Left = 554
Top = 166
DataBinding.DataField = 'EMAIL_1'
DataBinding.DataSource = DADataSource
@@ -193,31 +194,8 @@ inherited frViewEmpresa: TfrViewEmpresa
TabOrder = 14
Width = 129
end
- object cxDBMemo1: TcxDBMemo
- Left = 22
- Top = 331
- DataBinding.DataField = 'NOTAS'
- DataBinding.DataSource = DADataSource
- Style.BorderColor = clWindowFrame
- Style.BorderStyle = ebs3D
- Style.LookAndFeel.Kind = lfStandard
- Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.Kind = lfStandard
- StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.Kind = lfStandard
- StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.Kind = lfStandard
- StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 9
- Height = 234
- Width = 107
- end
object eTlfParticular: TcxDBTextEdit
- Left = 489
+ Left = 554
Top = 55
DataBinding.DataField = 'TELEFONO_2'
DataBinding.DataSource = DADataSource
@@ -239,7 +217,7 @@ inherited frViewEmpresa: TfrViewEmpresa
Width = 91
end
object eTlfTrabajo: TcxDBTextEdit
- Left = 489
+ Left = 554
Top = 28
DataBinding.DataField = 'TELEFONO_1'
DataBinding.DataSource = DADataSource
@@ -261,7 +239,7 @@ inherited frViewEmpresa: TfrViewEmpresa
Width = 127
end
object eTlfMovil: TcxDBTextEdit
- Left = 489
+ Left = 554
Top = 82
DataBinding.DataField = 'MOVIL_1'
DataBinding.DataSource = DADataSource
@@ -283,7 +261,7 @@ inherited frViewEmpresa: TfrViewEmpresa
Width = 155
end
object eFax: TcxDBTextEdit
- Left = 489
+ Left = 554
Top = 109
DataBinding.DataField = 'FAX'
DataBinding.DataSource = DADataSource
@@ -302,7 +280,7 @@ inherited frViewEmpresa: TfrViewEmpresa
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 13
- Width = 121
+ Width = 391
end
object eNombre: TcxDBTextEdit
Left = 162
@@ -375,7 +353,7 @@ inherited frViewEmpresa: TfrViewEmpresa
Width = 76
end
object cxDBImage1: TcxDBImage
- Left = 394
+ Left = 459
Top = 277
DataBinding.DataSource = DADataSource
Properties.Stretch = True
@@ -448,6 +426,26 @@ inherited frViewEmpresa: TfrViewEmpresa
TabOrder = 3
Width = 202
end
+ inline frViewObservaciones1: TfrViewObservaciones
+ Left = 22
+ Top = 331
+ Width = 521
+ Height = 150
+ Font.Charset = DEFAULT_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -11
+ Font.Name = 'Tahoma'
+ Font.Style = []
+ ParentFont = False
+ TabOrder = 9
+ ReadOnly = False
+ ExplicitLeft = 22
+ ExplicitTop = 331
+ inherited memObservaciones: TcxDBMemo
+ DataBinding.DataField = 'NOTAS'
+ DataBinding.DataSource = DADataSource
+ end
+ end
object dxLayoutControl1Group_Root: TdxLayoutGroup
ShowCaption = False
Hidden = True
@@ -462,7 +460,6 @@ inherited frViewEmpresa: TfrViewEmpresa
object dxLayoutControl1Group1: TdxLayoutGroup
AutoAligns = []
AlignHorz = ahClient
- AlignVert = avClient
Caption = 'Datos generales'
object dxLayoutControl1Item13: TdxLayoutItem
Caption = 'Nombre:'
@@ -535,9 +532,10 @@ inherited frViewEmpresa: TfrViewEmpresa
object dxLayoutControl1Item8: TdxLayoutItem
AutoAligns = [aaHorizontal]
AlignVert = avClient
- Caption = 'cxDBMemo1'
+ Caption = 'New Item'
ShowCaption = False
- Control = cxDBMemo1
+ Control = frViewObservaciones1
+ ControlOptions.AutoColor = True
ControlOptions.ShowBorder = False
end
end
diff --git a/Source/ApplicationBase/Empresas/Views/uViewEmpresa.pas b/Source/ApplicationBase/Empresas/Views/uViewEmpresa.pas
index 46f2f449..96b756dc 100644
--- a/Source/ApplicationBase/Empresas/Views/uViewEmpresa.pas
+++ b/Source/ApplicationBase/Empresas/Views/uViewEmpresa.pas
@@ -10,7 +10,7 @@ uses
cxDBEdit, dxLayoutControl, dxLayoutLookAndFeels, cxMemo, cxMaskEdit,
cxSpinEdit, cxImage, JvExControls, JvBitmapButton, ActnList, ImgList,
PngImageList, TB2Item, TBX, TB2Dock, TB2Toolbar, PngSpeedButton, uDAInterfaces,
- cxGraphics, cxDropDownEdit, uEmpresasController;
+ cxGraphics, cxDropDownEdit, uEmpresasController, uViewObservaciones;
type
IViewEmpresa = interface(IViewBase)
@@ -48,8 +48,6 @@ type
eMailParticular: TcxDBTextEdit;
dxLayoutControl1Item7: TdxLayoutItem;
eMailTrabajo: TcxDBTextEdit;
- cxDBMemo1: TcxDBMemo;
- dxLayoutControl1Item8: TdxLayoutItem;
dxLayoutControl1Item9: TdxLayoutItem;
eTlfParticular: TcxDBTextEdit;
dxLayoutControl1Item10: TdxLayoutItem;
@@ -84,6 +82,8 @@ type
cbFormaPago: TcxComboBox;
dxLayoutControl1Item16: TdxLayoutItem;
cbTipoIVA: TcxComboBox;
+ frViewObservaciones1: TfrViewObservaciones;
+ dxLayoutControl1Item8: TdxLayoutItem;
procedure actAnadirExecute(Sender: TObject);
procedure actEliminarExecute(Sender: TObject);
procedure actEliminarUpdate(Sender: TObject);
diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index 6a5592b9..de550ec9 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -44,13 +44,6 @@
Package
FalseTrueFalseLibreria base de FactuGESFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0
-
-
-
-
-
-
-
VCL for the Web Design Package for CodeGear RAD Studio
CodeGear WebSnap Components
CodeGear SOAP Components
@@ -65,52 +58,52 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
TForm
diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj
index 49001543..37aa08af 100644
--- a/Source/GUIBase/GUIBase.dproj
+++ b/Source/GUIBase/GUIBase.dproj
@@ -58,38 +58,38 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/GUIBase/uViewObservaciones.dfm b/Source/GUIBase/uViewObservaciones.dfm
index f0b06091..9c81ab5d 100644
--- a/Source/GUIBase/uViewObservaciones.dfm
+++ b/Source/GUIBase/uViewObservaciones.dfm
@@ -1,46 +1,88 @@
inherited frViewObservaciones: TfrViewObservaciones
- Width = 300
- DesignSize = (
- 300
- 226)
- object Label5: TLabel
- Left = 8
- Top = 8
- Width = 85
- Height = 13
- Caption = 'Observaciones'
- Font.Charset = DEFAULT_CHARSET
- Font.Color = clActiveCaption
- Font.Height = -11
- Font.Name = 'MS Sans Serif'
- Font.Style = [fsBold]
- ParentFont = False
- end
- object Bevel1: TBevel
- Left = 96
- Top = 8
- Width = 192
- Height = 9
- Anchors = [akLeft, akTop, akRight]
- Shape = bsBottomLine
- end
+ Width = 521
+ Height = 150
+ ExplicitWidth = 521
+ ExplicitHeight = 150
object memObservaciones: TcxDBMemo
- Left = 16
- Top = 32
- Anchors = [akLeft, akTop, akRight, akBottom]
- DataBinding.DataField = 'OBSERVACIONES'
- DataBinding.DataSource = DADataSource
+ Left = 0
+ Top = 0
+ Align = alClient
+ PopupMenu = PopupMenuObservaciones
Properties.ScrollBars = ssVertical
Style.LookAndFeel.NativeStyle = True
StyleDisabled.LookAndFeel.NativeStyle = True
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 0
- Height = 179
- Width = 269
+ ExplicitHeight = 228
+ Height = 150
+ Width = 521
end
- object DADataSource: TDADataSource
- Left = 16
+ object ActionListObservaciones: TActionList
+ Left = 48
Top = 48
+ object EditCut1: TEditCut
+ Category = 'Edicion'
+ Caption = 'C&ortar'
+ ImageIndex = 0
+ ShortCut = 16472
+ end
+ object EditCopy1: TEditCopy
+ Category = 'Edicion'
+ Caption = '&Copiar'
+ ImageIndex = 1
+ ShortCut = 16451
+ end
+ object EditPaste1: TEditPaste
+ Category = 'Edicion'
+ Caption = '&Pegar'
+ ImageIndex = 2
+ ShortCut = 16470
+ end
+ object EditSelectAll1: TEditSelectAll
+ Category = 'Edicion'
+ Caption = 'Seleccionar todo'
+ ShortCut = 16449
+ end
+ object EditUndo1: TEditUndo
+ Category = 'Edicion'
+ Caption = '&Deshacer'
+ ImageIndex = 3
+ ShortCut = 16474
+ end
+ object EditDelete1: TEditDelete
+ Category = 'Edicion'
+ Caption = '&Borrar'
+ ImageIndex = 5
+ ShortCut = 46
+ end
+ end
+ object PopupMenuObservaciones: TPopupMenu
+ Left = 80
+ Top = 48
+ object Copy1: TMenuItem
+ Action = EditCopy1
+ end
+ object Cut1: TMenuItem
+ Action = EditCut1
+ end
+ object Delete1: TMenuItem
+ Action = EditPaste1
+ end
+ object N1: TMenuItem
+ Caption = '-'
+ end
+ object Delete2: TMenuItem
+ Action = EditDelete1
+ end
+ object N2: TMenuItem
+ Caption = '-'
+ end
+ object SelectAll1: TMenuItem
+ Action = EditSelectAll1
+ end
+ object Undo1: TMenuItem
+ Action = EditUndo1
+ end
end
end
diff --git a/Source/GUIBase/uViewObservaciones.pas b/Source/GUIBase/uViewObservaciones.pas
index 2430ebac..481225cc 100644
--- a/Source/GUIBase/uViewObservaciones.pas
+++ b/Source/GUIBase/uViewObservaciones.pas
@@ -5,14 +5,27 @@ interface
uses
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs, uViewBase, DB, uDADataTable, cxMemo, cxDBEdit, cxControls,
- cxContainer, cxEdit, cxTextEdit, ExtCtrls, StdCtrls;
+ cxContainer, cxEdit, cxTextEdit, ExtCtrls, StdCtrls, Menus, StdActns, ActnList;
type
TfrViewObservaciones = class(TfrViewBase)
- Label5: TLabel;
- Bevel1: TBevel;
memObservaciones: TcxDBMemo;
- DADataSource: TDADataSource;
+ ActionListObservaciones: TActionList;
+ EditCut1: TEditCut;
+ EditCopy1: TEditCopy;
+ EditPaste1: TEditPaste;
+ EditSelectAll1: TEditSelectAll;
+ EditUndo1: TEditUndo;
+ EditDelete1: TEditDelete;
+ PopupMenuObservaciones: TPopupMenu;
+ Copy1: TMenuItem;
+ Cut1: TMenuItem;
+ Delete1: TMenuItem;
+ N1: TMenuItem;
+ Delete2: TMenuItem;
+ N2: TMenuItem;
+ SelectAll1: TMenuItem;
+ Undo1: TMenuItem;
private
{ Private declarations }
public
diff --git a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj
index 89e30269..2f756bc7 100644
--- a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj
+++ b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj
@@ -43,18 +43,6 @@
Package
FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0
-
-
-
-
-
-
-
-
-
-
-
-
File c:\archivos de programa\borland\delphi10\Bin\dclIntraweb_80_100.bpl not found
File c:\archivos de programa\borland\delphi10\Bin\dclnet100.bpl not found
File c:\archivos de programa\borland\delphi10\Bin\dclsoap100.bpl not found
@@ -66,14 +54,14 @@
MainSource
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm
index a200a952..d26c1a50 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm
@@ -192,42 +192,6 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
inherited ToolBar1: TToolBar
Width = 751
ExplicitWidth = 751
- inherited UpDown1: TUpDown
- Left = 237
- ExplicitLeft = 237
- end
- inherited ToolButton13: TToolButton
- Left = 254
- ExplicitLeft = 254
- end
- inherited ToolButton6: TToolButton
- Left = 262
- ExplicitLeft = 262
- end
- inherited ToolButton7: TToolButton
- Left = 296
- ExplicitLeft = 296
- end
- inherited ToolButton8: TToolButton
- Left = 330
- ExplicitLeft = 330
- end
- inherited ToolButton12: TToolButton
- Left = 364
- ExplicitLeft = 364
- end
- inherited ToolButton9: TToolButton
- Left = 372
- ExplicitLeft = 372
- end
- inherited ToolButton10: TToolButton
- Left = 406
- ExplicitLeft = 406
- end
- inherited ToolButton11: TToolButton
- Left = 440
- ExplicitLeft = 440
- end
end
inherited cxGrid: TcxGrid
Width = 751
@@ -330,11 +294,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
inherited ImporteDto: TcxDBCurrencyEdit
Left = 164
Top = 38
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 164
ExplicitTop = 38
ExplicitWidth = 188
@@ -344,11 +304,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Left = 555
Top = 88
DataBinding.DataField = ''
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 555
ExplicitTop = 88
ExplicitWidth = 182
@@ -357,11 +313,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
inherited ImporteTotal: TcxDBCurrencyEdit
Left = 485
Top = 142
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 485
ExplicitTop = 142
ExplicitWidth = 252
@@ -370,11 +322,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
inherited edtDescuento: TcxDBSpinEdit
Left = 93
Top = 38
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 93
ExplicitTop = 38
end
@@ -382,22 +330,14 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Left = 484
Top = 88
DataBinding.DataField = ''
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 484
ExplicitTop = 88
end
inherited ImporteBase: TcxDBCurrencyEdit
Left = 484
Top = 11
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 484
ExplicitTop = 11
ExplicitWidth = 253
@@ -407,11 +347,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Left = 484
Top = 115
DataBinding.DataField = ''
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 484
ExplicitTop = 115
end
@@ -419,11 +355,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Left = 555
Top = 115
DataBinding.DataField = ''
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 555
ExplicitTop = 115
ExplicitWidth = 182
@@ -432,11 +364,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
inherited eImporteNeto: TcxDBCurrencyEdit
Left = 93
Top = 11
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 93
ExplicitTop = 11
ExplicitWidth = 259
@@ -446,11 +374,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Left = 93
Top = 65
Properties.OnValidate = frViewTotales1ePortePropertiesValidate
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 93
ExplicitTop = 65
ExplicitWidth = 259
@@ -460,10 +384,6 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Left = 93
Top = 92
DataBinding.DataField = ''
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 93
ExplicitTop = 92
ExplicitWidth = 121
@@ -480,10 +400,6 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Top = 119
DataBinding.DataField = ''
DataBinding.DataSource = nil
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 93
ExplicitTop = 119
ExplicitWidth = 259
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm
index cdf652b8..3c30604a 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm
@@ -141,9 +141,7 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
LookAndFeel = dxLayoutOfficeLookAndFeel1
inherited Bevel3: TBevel
Left = 331
- Height = 54
ExplicitLeft = 331
- ExplicitHeight = 54
end
inherited Bevel4: TBevel
Left = 447
@@ -152,106 +150,62 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
ExplicitWidth = 285
end
inherited ImporteDto: TcxDBCurrencyEdit
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 93
Width = 93
end
inherited ImporteIVA: TcxDBCurrencyEdit
Left = 518
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 518
ExplicitWidth = 214
Width = 214
end
inherited ImporteTotal: TcxDBCurrencyEdit
Left = 448
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 448
ExplicitWidth = 284
Width = 284
end
inherited edtDescuento: TcxDBSpinEdit
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
end
inherited edtIVA: TcxDBSpinEdit
Left = 447
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 447
end
inherited ImporteBase: TcxDBCurrencyEdit
Left = 447
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 447
ExplicitWidth = 285
Width = 285
end
inherited edtRE: TcxDBSpinEdit
Left = 447
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 447
end
inherited ImporteRE: TcxDBCurrencyEdit
Left = 518
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 518
ExplicitWidth = 214
Width = 214
end
inherited eImporteNeto: TcxDBCurrencyEdit
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 147
Width = 147
end
inherited ePorte: TcxDBCurrencyEdit
- Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 147
Width = 147
end
inherited eIVA: TcxDBLookupComboBox
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 81
Width = 81
end
@@ -260,10 +214,6 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
ExplicitLeft = 183
end
inherited cbRecargoEquivalencia: TcxDBCheckBox
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 219
Width = 219
end
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm
index ed2affca..4a43fe47 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm
@@ -15,12 +15,11 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
TabOrder = 0
TabStop = False
AutoContentSizes = [acsWidth, acsHeight]
- ExplicitHeight = 677
DesignSize = (
825
650)
object Label1: TLabel
- Left = 428
+ Left = 351
Top = 597
Width = 299
Height = 26
@@ -42,45 +41,19 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
Style.Shadow = False
Style.ButtonStyle = bts3D
Style.ButtonTransparency = ebtNone
Style.PopupBorderStyle = epbsFrame3D
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 2
Width = 284
end
- object memObservaciones: TcxDBMemo
- Left = 22
- Top = 301
- Anchors = [akLeft, akTop, akRight, akBottom]
- DataBinding.DataField = 'OBSERVACIONES'
- DataBinding.DataSource = DADataSource
- Properties.ScrollBars = ssVertical
- Style.BorderColor = clWindowFrame
- Style.BorderStyle = ebs3D
- Style.HotTrack = False
- Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
- TabOrder = 9
- Height = 35
- Width = 781
- end
object eReferencia: TcxDBTextEdit
Left = 116
Top = 28
@@ -96,23 +69,19 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
StyleDisabled.Color = clMenuBar
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleDisabled.TextColor = clWindowText
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 0
Width = 284
end
inline frViewClienteAlbaran: TfrViewDatosYSeleccionClienteAlbaran
- Left = 428
+ Left = 351
Top = 28
Width = 771
Height = 196
@@ -124,53 +93,35 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
ParentFont = False
TabOrder = 10
ReadOnly = False
- ExplicitLeft = 428
+ ExplicitLeft = 351
ExplicitTop = 28
ExplicitWidth = 771
inherited dxLayoutControl1: TdxLayoutControl
Width = 771
ExplicitWidth = 771
inherited edtlNombre: TcxDBTextEdit
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 224
Width = 224
end
inherited edtNIFCIF: TcxDBTextEdit
- Left = 263
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 263
+ Left = 339
+ ExplicitLeft = 339
end
inherited Button3: TBitBtn
- Left = 174
- ExplicitLeft = 174
+ Left = 250
+ ExplicitLeft = 250
end
inherited edtPersonaContacto: TcxDBTextEdit
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 283
Width = 283
end
- inherited edtDireccion: TcxMemo
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
- end
inherited Button4: TButton
- Left = 343
- ExplicitLeft = 343
+ Left = 419
+ ExplicitLeft = 419
end
inherited Button5: TButton
- Left = 343
- ExplicitLeft = 343
+ Left = 419
+ ExplicitLeft = 419
end
end
inherited ActionList1: TActionList
@@ -181,7 +132,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
end
end
object eCalle: TcxDBTextEdit
- Left = 522
+ Left = 445
Top = 371
DataBinding.DataField = 'CALLE'
DataBinding.DataSource = DADataSource
@@ -190,21 +141,17 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 14
Width = 284
end
object ePoblacion: TcxDBTextEdit
- Left = 522
+ Left = 445
Top = 398
DataBinding.DataField = 'POBLACION'
DataBinding.DataSource = DADataSource
@@ -213,21 +160,17 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 15
Width = 61
end
object eCodigoPostal: TcxDBTextEdit
- Left = 739
+ Left = 738
Top = 398
DataBinding.DataField = 'CODIGO_POSTAL'
DataBinding.DataSource = DADataSource
@@ -236,21 +179,17 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 16
Width = 65
end
object eProvincia: TcxDBTextEdit
- Left = 522
+ Left = 445
Top = 425
DataBinding.DataField = 'PROVINCIA'
DataBinding.DataSource = DADataSource
@@ -259,21 +198,17 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 17
Width = 406
end
object ePersonaContacto: TcxDBTextEdit
- Left = 522
+ Left = 445
Top = 452
DataBinding.DataField = 'PERSONA_CONTACTO'
DataBinding.DataSource = DADataSource
@@ -283,21 +218,17 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 18
Width = 284
end
object eTlfTrabajo: TcxDBTextEdit
- Left = 522
+ Left = 445
Top = 479
DataBinding.DataField = 'TELEFONO'
DataBinding.DataSource = DADataSource
@@ -306,21 +237,17 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 19
Width = 284
end
object bElegirDireccion: TBitBtn
- Left = 632
+ Left = 631
Top = 506
Width = 172
Height = 23
@@ -329,7 +256,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
TabOrder = 20
end
object Button1: TButton
- Left = 266
+ Left = 189
Top = 138
Width = 132
Height = 23
@@ -349,17 +276,13 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleDisabled.TextColor = clWindowText
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 5
Width = 146
end
@@ -383,23 +306,19 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
Style.ButtonStyle = bts3D
Style.PopupBorderStyle = epbsFrame3D
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 3
Width = 146
end
object bFormasPago: TButton
- Left = 266
+ Left = 189
Top = 109
Width = 132
Height = 23
@@ -408,7 +327,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
OnClick = bFormasPagoClick
end
object eFechaRecepcion: TcxDBDateEdit
- Left = 562
+ Left = 485
Top = 314
Anchors = [akLeft, akTop, akRight]
DataBinding.DataField = 'FECHA_RECEPCION'
@@ -421,23 +340,19 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
Style.ButtonStyle = bts3D
Style.PopupBorderStyle = epbsFrame3D
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 13
Width = 239
end
object cbConAlmacen: TCheckBox
- Left = 438
+ Left = 361
Top = 565
Width = 179
Height = 21
@@ -446,7 +361,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
OnClick = cbConAlmacenClick
end
object cbAlmacen: TcxDBLookupComboBox
- Left = 623
+ Left = 546
Top = 565
DataBinding.DataField = 'ID_ALMACEN'
DataBinding.DataSource = DADataSource
@@ -464,18 +379,14 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
Style.ButtonStyle = bts3D
Style.PopupBorderStyle = epbsFrame3D
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 22
Width = 586
end
@@ -494,23 +405,19 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
StyleDisabled.Color = clMenuBar
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleDisabled.TextColor = clWindowText
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 7
Width = 284
end
object eFechaPrevista: TcxDBDateEdit
- Left = 562
+ Left = 485
Top = 260
Anchors = [akLeft, akTop, akRight]
DataBinding.DataField = 'FECHA_PREVISTA_ENVIO'
@@ -523,20 +430,16 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
Style.Shadow = False
Style.ButtonStyle = bts3D
Style.ButtonTransparency = ebtNone
Style.PopupBorderStyle = epbsFrame3D
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 11
Width = 239
end
@@ -554,23 +457,19 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
StyleDisabled.Color = clMenuBar
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleDisabled.TextColor = clWindowText
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 1
Width = 284
end
object eFechaEnvio: TcxDBDateEdit
- Left = 562
+ Left = 485
Top = 287
Anchors = [akLeft, akTop, akRight]
DataBinding.DataField = 'FECHA_ENVIO'
@@ -583,18 +482,14 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
- Style.LookAndFeel.SkinName = ''
Style.ButtonStyle = bts3D
Style.PopupBorderStyle = epbsFrame3D
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
- StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
- StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
- StyleHot.LookAndFeel.SkinName = ''
TabOrder = 12
Width = 239
end
@@ -618,15 +513,31 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
Width = 373
ExplicitWidth = 373
inherited cbTienda: TcxComboBox
- Style.LookAndFeel.SkinName = ''
- StyleDisabled.LookAndFeel.SkinName = ''
- StyleFocused.LookAndFeel.SkinName = ''
- StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 312
Width = 312
end
end
end
+ inline frViewObservaciones1: TfrViewObservaciones
+ Left = 22
+ Top = 301
+ Width = 521
+ Height = 228
+ Font.Charset = DEFAULT_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -11
+ Font.Name = 'Tahoma'
+ Font.Style = []
+ ParentFont = False
+ TabOrder = 9
+ ReadOnly = False
+ ExplicitLeft = 22
+ ExplicitTop = 301
+ inherited memObservaciones: TcxDBMemo
+ DataBinding.DataField = 'OBSERVACIONES'
+ DataBinding.DataSource = DADataSource
+ end
+ end
object dxLayoutControl1Group_Root: TdxLayoutGroup
ShowCaption = False
Hidden = True
@@ -733,7 +644,10 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente
object dxLayoutControl1Item6: TdxLayoutItem
AutoAligns = [aaHorizontal]
AlignVert = avClient
- Control = memObservaciones
+ Caption = 'New Item'
+ ShowCaption = False
+ Control = frViewObservaciones1
+ ControlOptions.AutoColor = True
ControlOptions.ShowBorder = False
end
end
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas
index c33ea64b..55727d2c 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas
@@ -37,8 +37,6 @@ type
edtFechaAlbaran: TcxDBDateEdit;
dxLayoutControl1Group1: TdxLayoutGroup;
dxLayoutControl1Group2: TdxLayoutGroup;
- dxLayoutControl1Item6: TdxLayoutItem;
- memObservaciones: TcxDBMemo;
dxLayoutControl1Item3: TdxLayoutItem;
eReferencia: TcxDBTextEdit;
dxLayoutControl1Group6: TdxLayoutGroup;
@@ -102,6 +100,8 @@ type
dxLayoutControl1Group17: TdxLayoutGroup;
frViewTienda1: TfrViewTienda;
dxLayoutControl1Item17: TdxLayoutItem;
+ frViewObservaciones1: TfrViewObservaciones;
+ dxLayoutControl1Item6: TdxLayoutItem;
procedure CustomViewCreate(Sender: TObject);
procedure CustomViewDestroy(Sender: TObject);
procedure actVerPedidoCliExecute(Sender: TObject);
diff --git a/Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.dproj b/Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.dproj
index 4e523cbc..5d140c4e 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.dproj
+++ b/Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.dproj
@@ -41,19 +41,19 @@
Delphi.Personality
Package
-FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0AlbaranesProveedor_view.dpk
+FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0AlbaranesProveedor_view.dpk
MainSource
-
-
-
-
-
-
+
+
+
+
+
+
@@ -117,7 +117,6 @@
-