diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj
index 0b8bcd4a..84da3814 100644
--- a/Source/GUIBase/GUIBase.dproj
+++ b/Source/GUIBase/GUIBase.dproj
@@ -59,30 +59,30 @@
MainSource
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/GUIBase/uViewDetallesBase.dfm b/Source/GUIBase/uViewDetallesBase.dfm
index a65ad50a..ff1cdc6c 100644
--- a/Source/GUIBase/uViewDetallesBase.dfm
+++ b/Source/GUIBase/uViewDetallesBase.dfm
@@ -1,5 +1,5 @@
inherited frViewDetallesBase: TfrViewDetallesBase
- Width = 451
+ Width = 586
Height = 304
Align = alClient
OnCreate = CustomViewCreate
@@ -9,7 +9,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
object ToolBar1: TToolBar
Left = 0
Top = 0
- Width = 451
+ Width = 586
Height = 73
AutoSize = True
ButtonWidth = 141
@@ -25,6 +25,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
TabOrder = 0
Transparent = True
Visible = False
+ ExplicitWidth = 451
object ToolButton1: TToolButton
Left = 0
Top = 0
@@ -149,7 +150,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
object cxGrid: TcxGrid
Left = 0
Top = 99
- Width = 451
+ Width = 586
Height = 205
Align = alClient
Font.Charset = DEFAULT_CHARSET
@@ -161,6 +162,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
TabOrder = 1
LookAndFeel.Kind = lfStandard
LookAndFeel.NativeStyle = True
+ ExplicitWidth = 451
object cxGridView: TcxGridDBTableView
OnKeyDown = cxGridViewKeyDown
NavigatorButtons.ConfirmDelete = False
@@ -344,10 +346,11 @@ inherited frViewDetallesBase: TfrViewDetallesBase
object TBXDock1: TTBXDock
Left = 0
Top = 73
- Width = 451
+ Width = 586
Height = 26
BackgroundOnToolbars = False
UseParentBackground = True
+ ExplicitWidth = 451
object TBXToolbar1: TTBXToolbar
Left = 0
Top = 0
@@ -433,6 +436,9 @@ inherited frViewDetallesBase: TfrViewDetallesBase
Action = actAnchoAutomatico
DisplayMode = nbdmImageAndText
end
+ object TBXItem17: TTBXItem
+ Action = actExportar
+ end
end
end
object ActionListContenido: TActionList
@@ -586,6 +592,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
object actExportar: TAction
Category = 'Editar'
Caption = 'Exportar a Microsoft Excel'
+ OnExecute = actExportarExecute
end
object actSeleccionarTodo: TAction
Category = 'Editar'
diff --git a/Source/GUIBase/uViewDetallesBase.pas b/Source/GUIBase/uViewDetallesBase.pas
index 53b54d21..e56839d8 100644
--- a/Source/GUIBase/uViewDetallesBase.pas
+++ b/Source/GUIBase/uViewDetallesBase.pas
@@ -145,6 +145,7 @@ type
actSeleccionarTodo: TAction;
Seleccionartodo1: TMenuItem;
cxStyle_TITULO_OPCIONAL: TcxStyle;
+ TBXItem17: TTBXItem;
procedure actAnadirExecute(Sender: TObject);
procedure actEliminarExecute(Sender: TObject);
procedure actSubirExecute(Sender: TObject);
@@ -198,6 +199,7 @@ type
procedure cxGridViewFocusedRecordChanged(Sender: TcxCustomGridTableView;
APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord;
ANewItemRecordFocusingChanged: Boolean);
+ procedure actExportarExecute(Sender: TObject);
private
FController : IControllerDetallesBase;
@@ -252,7 +254,7 @@ implementation
uses
uDMBase, uCalculosUtils, dxOffice11, uSistemaFunc, uGridClipboardUtils,
- Clipbrd;
+ Clipbrd, cxGridExportLink;
type
TOnPaste = procedure(Sender: TObject; AText: string) of object;
@@ -508,6 +510,16 @@ begin
and (not DADataSource.DataTable.IsEmpty)
end;
+procedure TfrViewDetallesBase.actExportarExecute(Sender: TObject);
+var
+ AFileName : String;
+
+begin
+ inherited;
+ if PreguntarFicheroExcelExportar(AFileName) then
+ ExportGridToExcel(AFileName, cxGrid);
+end;
+
procedure TfrViewDetallesBase.actSubirUpdate(Sender: TObject);
begin
inherited;
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm
index 3fa685ae..53793098 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm
@@ -163,6 +163,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
inherited pgPaginas: TPageControl
Width = 759
Height = 406
+ ActivePage = pagContenido
TabOrder = 1
OnChanging = pgPaginasChanging
ExplicitWidth = 759
@@ -196,27 +197,15 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
ExplicitHeight = 378
inherited ToolBar1: TToolBar
Width = 751
- Height = 46
+ Height = 51
ExplicitWidth = 751
- ExplicitHeight = 46
- inherited ToolButton3: TToolButton
- Wrap = False
- end
- inherited ToolButton4: TToolButton
- Left = 278
- Top = 0
- Wrap = True
- ExplicitLeft = 278
- ExplicitTop = 0
- end
+ ExplicitHeight = 51
inherited ToolButton14: TToolButton
- Left = 0
Wrap = False
- ExplicitLeft = 0
end
inherited FontName: TJvFontComboBox
- Left = 65
- Top = 22
+ Left = 399
+ Top = 0
ExplicitLeft = 399
ExplicitTop = 0
end
@@ -226,13 +215,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
ExplicitLeft = 544
ExplicitTop = 0
end
- inherited UpDown1: TUpDown
- Left = 586
- Top = 0
- ExplicitLeft = 586
- ExplicitTop = 0
- end
- inherited ToolButton13: TToolButton
+ inherited ToolButton13: TToolButton [7]
Left = 0
Top = 0
Wrap = True
@@ -240,46 +223,54 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
ExplicitTop = 0
ExplicitHeight = 27
end
- inherited ToolButton6: TToolButton
+ inherited UpDown1: TUpDown [8]
Left = 0
Top = 27
ExplicitLeft = 0
ExplicitTop = 27
end
- inherited ToolButton7: TToolButton
- Left = 66
+ inherited ToolButton6: TToolButton
+ Left = 17
Top = 27
- ExplicitLeft = 66
+ ExplicitLeft = 17
+ ExplicitTop = 27
+ end
+ inherited ToolButton7: TToolButton
+ Left = 83
+ Top = 27
+ ExplicitLeft = 83
ExplicitTop = 27
end
inherited ToolButton8: TToolButton
- Left = 133
+ Left = 150
Top = 27
- ExplicitLeft = 133
+ ExplicitLeft = 150
ExplicitTop = 27
end
inherited ToolButton12: TToolButton
- Left = 216
+ Left = 233
Top = 27
- ExplicitLeft = 216
+ Wrap = False
+ ExplicitLeft = 233
ExplicitTop = 27
+ ExplicitHeight = 22
end
inherited ToolButton9: TToolButton
- Left = 224
+ Left = 241
Top = 27
- ExplicitLeft = 224
+ ExplicitLeft = 241
ExplicitTop = 27
end
inherited ToolButton10: TToolButton
- Left = 369
+ Left = 386
Top = 27
- ExplicitLeft = 369
+ ExplicitLeft = 386
ExplicitTop = 27
end
inherited ToolButton11: TToolButton
- Left = 494
+ Left = 511
Top = 27
- ExplicitLeft = 494
+ ExplicitLeft = 511
ExplicitTop = 27
end
end
@@ -297,7 +288,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
ExplicitTop = 51
ExplicitWidth = 751
inherited TBXToolbar1: TTBXToolbar
- ExplicitWidth = 745
+ ExplicitWidth = 751
end
end
inherited cxGridPopupMenu: TcxGridPopupMenu
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm
index 652f9169..f652cc68 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm
@@ -36,48 +36,18 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
end
end
inherited pgPaginas: TPageControl
+ inherited pagGeneral: TTabSheet
+ ExplicitLeft = 0
+ ExplicitTop = 0
+ ExplicitWidth = 0
+ ExplicitHeight = 0
+ end
inherited pagContenido: TTabSheet
inherited frViewDetallesAlbaranCliente1: TfrViewDetallesAlbaranCliente
inherited ToolBar1: TToolBar
inherited FontSize: TEdit
- Width = 74
- ExplicitWidth = 74
- end
- inherited ToolButton13: TToolButton [7]
- end
- inherited UpDown1: TUpDown [8]
- Left = 0
- Top = 27
- ExplicitLeft = 0
- ExplicitTop = 27
- end
- inherited ToolButton6: TToolButton
- Left = 17
- ExplicitLeft = 17
- end
- inherited ToolButton7: TToolButton
- Left = 83
- ExplicitLeft = 83
- end
- inherited ToolButton8: TToolButton
- Left = 150
- ExplicitLeft = 150
- end
- inherited ToolButton12: TToolButton
- Left = 233
- ExplicitLeft = 233
- end
- inherited ToolButton9: TToolButton
- Left = 241
- ExplicitLeft = 241
- end
- inherited ToolButton10: TToolButton
- Left = 386
- ExplicitLeft = 386
- end
- inherited ToolButton11: TToolButton
- Left = 511
- ExplicitLeft = 511
+ Width = 90
+ ExplicitWidth = 90
end
end
inherited cxGridPopupMenu: TcxGridPopupMenu
@@ -107,87 +77,131 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
inherited frViewTotales1: TfrViewTotales
inherited dxLayoutControl1: TdxLayoutControl
LookAndFeel = dxLayoutOfficeLookAndFeel1
- inherited Bevel1: TBevel
- Width = 73
- ExplicitWidth = 73
- end
inherited Bevel3: TBevel
- Left = 331
+ Left = 351
Height = 54
- ExplicitLeft = 331
+ ExplicitLeft = 351
ExplicitHeight = 54
end
inherited Bevel4: TBevel
- Left = 447
+ Left = 467
Width = 285
- ExplicitLeft = 447
+ ExplicitLeft = 467
ExplicitWidth = 285
end
inherited ImporteDto: TcxDBCurrencyEdit
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 151
Width = 151
end
inherited ImporteIVA: TcxDBCurrencyEdit
- Left = 518
+ Left = 538
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- ExplicitLeft = 518
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitLeft = 538
ExplicitWidth = 219
Width = 219
end
inherited ImporteTotal: TcxDBCurrencyEdit
- Left = 448
+ Left = 468
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- ExplicitLeft = 448
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitLeft = 468
ExplicitWidth = 289
Width = 289
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
+ Left = 467
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- ExplicitLeft = 447
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitLeft = 467
end
inherited ImporteBase: TcxDBCurrencyEdit
- Left = 447
+ Left = 467
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- ExplicitLeft = 447
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitLeft = 467
ExplicitWidth = 290
Width = 290
end
inherited edtRE: TcxDBSpinEdit
- Left = 447
+ Left = 467
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- ExplicitLeft = 447
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitLeft = 467
end
inherited ImporteRE: TcxDBCurrencyEdit
- Left = 518
+ Left = 538
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
- ExplicitLeft = 518
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ ExplicitLeft = 538
ExplicitWidth = 219
Width = 219
end
inherited eImporteNeto: TcxDBCurrencyEdit
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 222
Width = 222
end
inherited ePorte: TcxDBCurrencyEdit
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 222
Width = 222
end
inherited eIVA: TcxDBLookupComboBox
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 84
Width = 84
end
inherited bTiposIVA: TButton
- Left = 183
- ExplicitLeft = 183
+ Left = 203
+ ExplicitLeft = 203
end
inherited cbRecargoEquivalencia: TcxDBCheckBox
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 222
Width = 222
end
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.pas
index ead80dfc..5faf1cfc 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.pas
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.pas
@@ -11,7 +11,7 @@ uses
uViewDetallesDTO, uViewDetallesArticulos, uViewDetallesAlbaranCliente, TBX,
TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent,
JvNavigationPane, uIEditorAlbaranDevCliente, uDAInterfaces, dxGDIPlusClasses,
- uViewDetallesArticulosParaVenta;
+ uViewDetallesArticulosParaVenta, cxControls, cxContainer, cxEdit, cxLabel;
type
TfEditorAlbaranDevCliente = class(TfEditorAlbaranCliente, IEditorAlbaranDevCliente)
diff --git a/Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.dproj b/Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.dproj
index 07a87432..51d6ee1c 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.dproj
+++ b/Source/Modulos/Albaranes de proveedor/Views/AlbaranesProveedor_view.dproj
@@ -49,14 +49,14 @@
MainSource
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranDevProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranDevProveedor.dfm
index a1991955..ef373cf9 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranDevProveedor.dfm
+++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranDevProveedor.dfm
@@ -1,5 +1,7 @@
inherited fEditorAlbaranDevProveedor: TfEditorAlbaranDevProveedor
Caption = 'Nueva orden de devoluci'#243'n de proveedor'
+ ExplicitWidth = 320
+ ExplicitHeight = 240
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -36,52 +38,44 @@ inherited fEditorAlbaranDevProveedor: TfEditorAlbaranDevProveedor
end
end
inherited pgPaginas: TPageControl
+ inherited pagGeneral: TTabSheet
+ ExplicitLeft = 0
+ ExplicitTop = 0
+ ExplicitWidth = 0
+ ExplicitHeight = 0
+ end
inherited pagContenido: TTabSheet
inherited frViewDetallesAlbaranProveedor1: TfrViewDetallesAlbaranProveedor
inherited ToolBar1: TToolBar
- inherited UpDown1: TUpDown [7]
- Left = 602
- Top = 0
- ExplicitLeft = 602
- ExplicitTop = 0
+ inherited FontSize: TEdit [1]
+ Left = 109
+ ExplicitLeft = 109
end
- inherited ToolButton13: TToolButton [8]
+ inherited UpDown1: TUpDown [2]
+ Left = 199
+ ExplicitLeft = 199
end
- inherited ToolButton11: TToolButton
- Left = 0
- ExplicitLeft = 0
+ inherited ToolButton2: TToolButton [3]
+ Left = 216
end
- inherited ToolButton12: TToolButton
- Left = 141
- ExplicitLeft = 141
+ inherited ToolButton3: TToolButton [4]
+ Left = 330
+ Wrap = False
end
- inherited ToolButton9: TToolButton
- Left = 149
- ExplicitLeft = 149
+ inherited ToolButton14: TToolButton [5]
+ Left = 385
+ ExplicitLeft = 385
end
- inherited ToolButton10: TToolButton
- Left = 294
- ExplicitLeft = 294
+ inherited FontName: TJvFontComboBox [6]
+ Left = 450
+ ExplicitLeft = 450
end
- inherited ToolButton6: TToolButton
- Left = 419
- ExplicitLeft = 419
- end
- inherited ToolButton7: TToolButton
- Left = 485
- ExplicitLeft = 485
- end
- inherited ToolButton8: TToolButton
- Left = 552
- ExplicitLeft = 552
+ inherited ToolButton4: TToolButton
+ ExplicitTop = 27
end
end
inherited cxGrid: TcxGrid
- ExplicitTop = 99
- ExplicitHeight = 327
- end
- inherited TBXDock1: TTBXDock
- ExplicitTop = 73
+ ExplicitTop = 72
end
inherited cxGridPopupMenu: TcxGridPopupMenu
PopupMenus = <
@@ -123,34 +117,86 @@ inherited fEditorAlbaranDevProveedor: TfEditorAlbaranDevProveedor
ExplicitWidth = 21
end
inherited ImporteDto: TcxDBCurrencyEdit
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
end
inherited ImporteIVA: TcxDBCurrencyEdit
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
end
inherited ImporteTotal: TcxDBCurrencyEdit
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
end
inherited edtDescuento: TcxDBSpinEdit
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
end
inherited edtIVA: TcxDBSpinEdit
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
end
inherited ImporteBase: TcxDBCurrencyEdit
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
end
inherited edtRE: TcxDBSpinEdit
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
end
inherited ImporteRE: TcxDBCurrencyEdit
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
end
inherited eImporteNeto: TcxDBCurrencyEdit
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
end
inherited ePorte: TcxDBCurrencyEdit
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ end
+ inherited eIVA: TcxDBLookupComboBox
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
+ end
+ inherited cbRecargoEquivalencia: TcxDBCheckBox
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
inherited dxLayoutControl1Group1: TdxLayoutGroup
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranDevProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranDevProveedor.pas
index fe74566a..ee3892de 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranDevProveedor.pas
+++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranDevProveedor.pas
@@ -11,7 +11,7 @@ uses
uViewDetallesArticulos, uViewDetallesAlbaranProveedor, uCustomView, uViewBase,
uViewAlbaranProveedor, TBX, TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls,
JvExControls, JvComponent, JvNavigationPane, uIEditorAlbaranDevProveedor,
- uDAInterfaces, dxGDIPlusClasses;
+ uDAInterfaces, dxGDIPlusClasses, cxControls, cxContainer, cxEdit, cxLabel;
type
TfEditorAlbaranDevProveedor = class(TfEditorAlbaranProveedor, IEditorAlbaranDevProveedor)
@@ -31,7 +31,7 @@ implementation
{$R *.dfm}
uses
- cxControls, uDataTableUtils, uDialogUtils, uViewAlbaranDevProveedor;
+ uDataTableUtils, uDialogUtils, uViewAlbaranDevProveedor;
{ TfEditorAlbaranDevProveedor }
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm
index a04b2e05..d1ce38b8 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm
+++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm
@@ -14,7 +14,7 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
Caption = 'Nuevo albar'#225'n de proveedor'
ExplicitWidth = 765
inherited Image1: TImage
- Left = 738
+ Left = 632
Picture.Data = {
0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800
0000180806000000E0773DF80000000970485973000017120000171201679FD2
@@ -124,6 +124,10 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
0000000049454E44AE426082}
ExplicitLeft = 735
end
+ inherited lblDesbloquear: TcxLabel
+ Left = 667
+ ExplicitLeft = 667
+ end
end
inherited TBXDock: TTBXDock
Width = 765
@@ -147,7 +151,6 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
inherited pgPaginas: TPageControl
Width = 759
Height = 454
- ActivePage = pagContenido
TabOrder = 1
OnChanging = pgPaginasChanging
ExplicitWidth = 759
@@ -161,6 +164,10 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
object pagContenido: TTabSheet
Caption = 'Contenido'
ImageIndex = 1
+ ExplicitLeft = 0
+ ExplicitTop = 0
+ ExplicitWidth = 0
+ ExplicitHeight = 0
inline frViewDetallesAlbaranProveedor1: TfrViewDetallesAlbaranProveedor
Left = 0
Top = 0
@@ -184,34 +191,31 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
Height = 51
ExplicitWidth = 751
ExplicitHeight = 51
- inherited ToolButton3: TToolButton
- Wrap = False
- end
- inherited ToolButton4: TToolButton
+ inherited ToolButton14: TToolButton [3]
Left = 278
Top = 0
ExplicitLeft = 278
ExplicitTop = 0
end
- inherited ToolButton14: TToolButton [4]
- Left = 334
+ inherited FontName: TJvFontComboBox
+ Left = 343
Top = 0
- ExplicitLeft = 334
+ ExplicitLeft = 343
ExplicitTop = 0
end
- inherited FontName: TJvFontComboBox [5]
- Left = 399
+ inherited FontSize: TEdit [5]
+ Left = 488
Top = 0
- ExplicitLeft = 399
+ Width = 90
+ ExplicitLeft = 488
ExplicitTop = 0
+ ExplicitWidth = 90
end
- inherited FontSize: TEdit
- Left = 544
+ inherited UpDown1: TUpDown [6]
+ Left = 578
Top = 0
- Width = 74
- ExplicitLeft = 544
+ ExplicitLeft = 578
ExplicitTop = 0
- ExplicitWidth = 74
end
inherited ToolButton13: TToolButton [7]
Left = 0
@@ -221,53 +225,52 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
ExplicitTop = 0
ExplicitHeight = 27
end
- inherited UpDown1: TUpDown [8]
- Left = 0
+ inherited ToolButton4: TToolButton [8]
Top = 27
- ExplicitLeft = 0
- ExplicitTop = 27
end
inherited ToolButton6: TToolButton [9]
- Left = 17
+ Left = 56
Top = 27
- ExplicitLeft = 17
+ ExplicitLeft = 56
ExplicitTop = 27
end
inherited ToolButton7: TToolButton [10]
- Left = 83
+ Left = 122
Top = 27
- ExplicitLeft = 83
+ Wrap = False
+ ExplicitLeft = 122
ExplicitTop = 27
end
inherited ToolButton8: TToolButton [11]
- Left = 150
+ Left = 189
Top = 27
- ExplicitLeft = 150
+ ExplicitLeft = 189
ExplicitTop = 27
end
inherited ToolButton12: TToolButton [12]
- Left = 233
+ Left = 272
Top = 27
- ExplicitLeft = 233
+ Wrap = False
+ ExplicitLeft = 272
ExplicitTop = 27
ExplicitHeight = 22
end
inherited ToolButton9: TToolButton [13]
- Left = 241
+ Left = 280
Top = 27
- ExplicitLeft = 241
+ ExplicitLeft = 280
ExplicitTop = 27
end
inherited ToolButton10: TToolButton [14]
- Left = 386
+ Left = 425
Top = 27
- ExplicitLeft = 386
+ ExplicitLeft = 425
ExplicitTop = 27
end
inherited ToolButton11: TToolButton [15]
- Left = 511
+ Left = 550
Top = 27
- ExplicitLeft = 511
+ ExplicitLeft = 550
ExplicitTop = 27
end
end
@@ -285,7 +288,7 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
ExplicitTop = 51
ExplicitWidth = 751
inherited TBXToolbar1: TTBXToolbar
- ExplicitWidth = 745
+ ExplicitWidth = 751
end
end
inherited cxGridPopupMenu: TcxGridPopupMenu
@@ -302,6 +305,10 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
object pagInicidencias: TTabSheet
Caption = 'Incidencias'
ImageIndex = 2
+ ExplicitLeft = 0
+ ExplicitTop = 0
+ ExplicitWidth = 0
+ ExplicitHeight = 0
inline frViewIncidenciasCli: TfrViewIncidencias
Left = 0
Top = 0
@@ -398,7 +405,11 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
inherited ImporteDto: TcxDBCurrencyEdit
Left = 164
Top = 112
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 164
ExplicitTop = 112
ExplicitWidth = 199
@@ -407,7 +418,11 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
inherited ImporteIVA: TcxDBCurrencyEdit
Left = 562
Top = 38
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 562
ExplicitTop = 38
ExplicitWidth = 192
@@ -416,7 +431,11 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
inherited ImporteTotal: TcxDBCurrencyEdit
Left = 492
Top = 112
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 492
ExplicitTop = 112
ExplicitWidth = 262
@@ -426,7 +445,11 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
Left = 93
Top = 112
Properties.OnValidate = frViewTotales1edtDescuentoPropertiesValidate
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 93
ExplicitTop = 112
end
@@ -434,14 +457,22 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
Left = 491
Top = 38
Properties.OnValidate = frViewTotales1edtIVAPropertiesValidate
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 491
ExplicitTop = 38
end
inherited ImporteBase: TcxDBCurrencyEdit
Left = 491
Top = 11
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 491
ExplicitTop = 11
ExplicitWidth = 263
@@ -452,7 +483,11 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
Top = 65
DataBinding.DataField = ''
DataBinding.DataSource = nil
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 491
ExplicitTop = 65
end
@@ -461,7 +496,11 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
Top = 65
DataBinding.DataField = ''
DataBinding.DataSource = nil
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 562
ExplicitTop = 65
ExplicitWidth = 192
@@ -470,7 +509,11 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
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 = 270
@@ -480,7 +523,11 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
Left = 93
Top = 139
Properties.OnValidate = frViewTotales1ePortePropertiesValidate
+ Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 93
ExplicitTop = 139
ExplicitWidth = 270
@@ -491,6 +538,10 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
Top = 38
DataBinding.DataField = ''
DataBinding.DataSource = nil
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 93
ExplicitTop = 38
ExplicitWidth = 132
@@ -506,9 +557,14 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor
Left = 93
Top = 65
DataBinding.DataField = ''
+ Style.LookAndFeel.SkinName = ''
+ StyleDisabled.LookAndFeel.SkinName = ''
+ StyleFocused.LookAndFeel.SkinName = ''
+ StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 93
ExplicitTop = 65
ExplicitWidth = 270
+ ExplicitHeight = 0
Width = 270
end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.pas
index e3734eb3..1e254108 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.pas
+++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.pas
@@ -15,7 +15,7 @@ uses
uViewDetallesBase, uViewDetallesAlbaranProveedor,
dxLayoutLookAndFeels, JvExComCtrls, JvStatusBar, uViewTotales,
uIEditorAlbaranProveedor, uBizAlbaranesProveedor, uViewAlbaranProveedor,
- uViewDetallesDTO, uViewDetallesArticulos, uDAInterfaces;
+ uViewDetallesDTO, uViewDetallesArticulos, uDAInterfaces, cxLabel;
type
TfEditorAlbaranProveedor = class(TfEditorDBItem, IEditorAlbaranProveedor)
diff --git a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm
index 57a51744..5049d52e 100644
--- a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm
+++ b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm
@@ -28,22 +28,6 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
Left = 345
ExplicitLeft = 345
end
- inherited ToolButton12: TToolButton
- Left = 428
- ExplicitLeft = 428
- end
- inherited ToolButton9: TToolButton
- Left = 436
- ExplicitLeft = 436
- end
- inherited ToolButton10: TToolButton
- Left = 581
- ExplicitLeft = 581
- end
- inherited ToolButton11: TToolButton
- Left = 706
- ExplicitLeft = 706
- end
end
inherited cxGrid: TcxGrid
inherited cxGridView: TcxGridDBTableView
@@ -134,7 +118,6 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
end
end
inherited TBXDock1: TTBXDock
- ExplicitTop = 68
inherited TBXToolbar1: TTBXToolbar
inherited TBXSubmenuItem1: TTBXSubmenuItem
object TBXSeparatorItem8: TTBXSeparatorItem [4]
@@ -143,9 +126,6 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
Enabled = False
Visible = False
end
- object TBXItem17: TTBXItem
- Action = actAnadirArticulos
- end
end
end
end
diff --git a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas
index c12b339e..bf864657 100644
--- a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas
+++ b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas
@@ -28,7 +28,6 @@ type
cxGridViewUNIDAD_MEDIDA: TcxGridDBColumn;
actBuscarArticulo: TAction;
TBXSeparatorItem8: TTBXSeparatorItem;
- TBXItem17: TTBXItem;
cxGridViewREFERENCIA_FABRICANTE: TcxGridDBColumn;
cxEditRepository1: TcxEditRepository;
cxEditRepositoryComboBox_IMPORTEUNIDAD: TcxEditRepositoryComboBoxItem;
diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
index 216d466d..37e84d00 100644
--- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
+++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
@@ -120,8 +120,10 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
798
316)
inherited Label1: TLabel
- Left = 604
- ExplicitLeft = 604
+ Left = 351
+ Width = 311
+ ExplicitLeft = 351
+ ExplicitWidth = 311
end
inherited eReferencia: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
@@ -158,8 +160,8 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Width = 111
end
inherited bFormasPago: TButton
- Left = 433
- ExplicitLeft = 433
+ Left = 180
+ ExplicitLeft = 180
end
inherited cbCuentaBancaria: TcxDBComboBox
Style.LookAndFeel.SkinName = ''
@@ -170,38 +172,57 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Width = 249
end
inherited cbClienteFinal: TcxDBTextEdit
- Left = 604
+ Left = 351
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitLeft = 604
+ ExplicitLeft = 351
+ ExplicitWidth = 339
+ Width = 339
end
inherited bElegirClienteFinal: TButton
Left = 725
ExplicitLeft = 725
end
inherited frViewDatosYSeleccionClienteFacturaCliente1: TfrViewDatosYSeleccionClienteFacturaCliente
- Left = 593
- ExplicitLeft = 593
+ Left = 340
+ Width = 505
+ ExplicitLeft = 340
+ ExplicitWidth = 505
inherited dxLayoutControl1: TdxLayoutControl
+ Width = 505
inherited edtlNombre: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
+ ExplicitWidth = 224
+ Width = 224
end
inherited edtNIFCIF: TcxDBTextEdit
+ Left = 306
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
+ ExplicitLeft = 306
+ end
+ inherited Button3: TBitBtn
+ Left = 217
+ ExplicitLeft = 217
end
inherited edtDireccion: TcxTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
+ ExplicitWidth = 121
+ Width = 121
+ end
+ inherited Button4: TButton
+ Left = 386
+ ExplicitLeft = 386
end
end
end
@@ -234,34 +255,22 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Height = 51
ExplicitWidth = 798
ExplicitHeight = 51
- inherited ToolButton3: TToolButton
+ inherited ToolButton14: TToolButton
Wrap = False
end
- inherited ToolButton4: TToolButton
- Left = 278
- Top = 0
- ExplicitLeft = 278
- ExplicitTop = 0
- end
inherited FontName: TJvFontComboBox
- Left = 334
+ Left = 399
Top = 0
- ExplicitLeft = 334
+ ExplicitLeft = 399
ExplicitTop = 0
end
- inherited FontSize: TEdit [5]
- Left = 479
+ inherited FontSize: TEdit
+ Left = 544
Top = 0
- Width = 152
- ExplicitLeft = 479
- ExplicitTop = 0
- ExplicitWidth = 152
- end
- inherited UpDown1: TUpDown [6]
- Left = 631
- Top = 0
- ExplicitLeft = 631
+ Width = 168
+ ExplicitLeft = 544
ExplicitTop = 0
+ ExplicitWidth = 168
end
inherited ToolButton13: TToolButton [7]
Left = 0
@@ -271,54 +280,54 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
ExplicitTop = 0
ExplicitHeight = 27
end
- inherited ToolButton6: TToolButton [8]
+ inherited UpDown1: TUpDown [8]
Left = 0
Top = 27
ExplicitLeft = 0
ExplicitTop = 27
end
- inherited ToolButton7: TToolButton [9]
- Left = 66
+ inherited ToolButton6: TToolButton
+ Left = 17
Top = 27
- Wrap = False
- ExplicitLeft = 66
+ ExplicitLeft = 17
ExplicitTop = 27
end
- inherited ToolButton14: TToolButton [10]
- Left = 133
+ inherited ToolButton7: TToolButton
+ Left = 83
Top = 27
- ExplicitLeft = 133
- end
- inherited ToolButton8: TToolButton [11]
- Left = 198
- Top = 27
- ExplicitLeft = 198
+ ExplicitLeft = 83
ExplicitTop = 27
end
- inherited ToolButton12: TToolButton [12]
- Left = 281
+ inherited ToolButton8: TToolButton
+ Left = 150
+ Top = 27
+ ExplicitLeft = 150
+ ExplicitTop = 27
+ end
+ inherited ToolButton12: TToolButton
+ Left = 233
Top = 27
Wrap = False
- ExplicitLeft = 281
+ ExplicitLeft = 233
ExplicitTop = 27
ExplicitHeight = 22
end
- inherited ToolButton9: TToolButton [13]
- Left = 289
+ inherited ToolButton9: TToolButton
+ Left = 241
Top = 27
- ExplicitLeft = 289
+ ExplicitLeft = 241
ExplicitTop = 27
end
- inherited ToolButton10: TToolButton [14]
- Left = 434
+ inherited ToolButton10: TToolButton
+ Left = 386
Top = 27
- ExplicitLeft = 434
+ ExplicitLeft = 386
ExplicitTop = 27
end
- inherited ToolButton11: TToolButton [15]
- Left = 559
+ inherited ToolButton11: TToolButton
+ Left = 511
Top = 27
- ExplicitLeft = 559
+ ExplicitLeft = 511
ExplicitTop = 27
end
end
@@ -336,7 +345,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
ExplicitTop = 51
ExplicitWidth = 798
inherited TBXToolbar1: TTBXToolbar
- ExplicitWidth = 702
+ ExplicitWidth = 798
end
end
inherited cxGridPopupMenu: TcxGridPopupMenu
diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm
index d22abbf9..a3e6c3fe 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm
+++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm
@@ -75,7 +75,6 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
inherited pgPaginas: TPageControl
Width = 813
Height = 369
- ActivePage = pagContenido
OnChanging = pgPaginasChanging
ExplicitWidth = 813
ExplicitHeight = 369
@@ -257,21 +256,8 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
Height = 51
ExplicitWidth = 805
ExplicitHeight = 51
- inherited ToolButton3: TToolButton
- Wrap = False
- end
- inherited ToolButton4: TToolButton
- Left = 278
- Top = 0
- ExplicitLeft = 278
- ExplicitTop = 0
- end
inherited ToolButton14: TToolButton
- Left = 334
- Top = 0
Wrap = False
- ExplicitLeft = 334
- ExplicitTop = 0
end
inherited FontName: TJvFontComboBox
Left = 399
@@ -282,10 +268,10 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
inherited FontSize: TEdit
Left = 544
Top = 0
- Width = 152
+ Width = 168
ExplicitLeft = 544
ExplicitTop = 0
- ExplicitWidth = 152
+ ExplicitWidth = 168
end
inherited ToolButton13: TToolButton [7]
Left = 0
@@ -322,8 +308,10 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
inherited ToolButton12: TToolButton
Left = 233
Top = 27
+ Wrap = False
ExplicitLeft = 233
ExplicitTop = 27
+ ExplicitHeight = 22
end
inherited ToolButton9: TToolButton
Left = 241
@@ -358,7 +346,7 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
ExplicitTop = 51
ExplicitWidth = 805
inherited TBXToolbar1: TTBXToolbar
- ExplicitWidth = 702
+ ExplicitWidth = 805
end
end
inherited cxGridPopupMenu: TcxGridPopupMenu
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm
index 723b1fee..adc7928b 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm
+++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm
@@ -115,25 +115,19 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
Height = 46
ExplicitWidth = 865
ExplicitHeight = 46
- inherited ToolButton3: TToolButton
- Wrap = False
- end
inherited ToolButton4: TToolButton
- Left = 278
- Top = 0
Wrap = True
- ExplicitLeft = 278
- ExplicitTop = 0
- end
- inherited FontName: TJvFontComboBox
- Left = 0
- ExplicitLeft = 334
- ExplicitTop = 0
end
inherited ToolButton14: TToolButton
- Left = 479
- Top = 0
- ExplicitLeft = 479
+ Left = 0
+ Top = 22
+ Wrap = False
+ ExplicitLeft = 0
+ ExplicitTop = 22
+ end
+ inherited FontName: TJvFontComboBox
+ Left = 65
+ ExplicitLeft = 399
ExplicitTop = 0
end
inherited FontSize: TEdit
@@ -158,49 +152,48 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
ExplicitTop = 0
ExplicitHeight = 27
end
- inherited ToolButton11: TToolButton
+ inherited ToolButton6: TToolButton
Left = 0
Top = 27
ExplicitLeft = 0
ExplicitTop = 27
end
+ inherited ToolButton7: TToolButton
+ Left = 66
+ Top = 27
+ ExplicitLeft = 66
+ ExplicitTop = 27
+ end
+ inherited ToolButton8: TToolButton
+ Left = 133
+ Top = 27
+ ExplicitLeft = 133
+ ExplicitTop = 27
+ end
inherited ToolButton12: TToolButton
- Left = 141
+ Left = 216
Top = 27
Wrap = False
- ExplicitLeft = 141
+ ExplicitLeft = 216
ExplicitTop = 27
ExplicitHeight = 22
end
inherited ToolButton9: TToolButton
- Left = 149
+ Left = 224
Top = 27
- ExplicitLeft = 149
+ ExplicitLeft = 224
ExplicitTop = 27
end
inherited ToolButton10: TToolButton
- Left = 294
+ Left = 369
Top = 27
- ExplicitLeft = 294
+ ExplicitLeft = 369
ExplicitTop = 27
end
- inherited ToolButton6: TToolButton
- Left = 419
+ inherited ToolButton11: TToolButton
+ Left = 494
Top = 27
- ExplicitLeft = 419
- ExplicitTop = 27
- end
- inherited ToolButton7: TToolButton
- Left = 485
- Top = 27
- Wrap = False
- ExplicitLeft = 485
- ExplicitTop = 27
- end
- inherited ToolButton8: TToolButton
- Left = 552
- Top = 27
- ExplicitLeft = 552
+ ExplicitLeft = 494
ExplicitTop = 27
end
end
@@ -218,7 +211,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
ExplicitTop = 51
ExplicitWidth = 865
inherited TBXToolbar1: TTBXToolbar
- ExplicitWidth = 745
+ ExplicitWidth = 865
end
end
inherited cxGridPopupMenu: TcxGridPopupMenu
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm
index 2c1163ed..abd0b226 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm
+++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm
@@ -5,7 +5,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ClientHeight = 615
ClientWidth = 764
OnClose = CustomEditorClose
- ExplicitTop = -101
ExplicitWidth = 772
ExplicitHeight = 649
PixelsPerInch = 96
@@ -174,17 +173,16 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
TabOrder = 1
OnChanging = pgPaginasChanging
ExplicitWidth = 758
- ExplicitHeight = 402
+ ExplicitHeight = 238
inherited pagGeneral: TTabSheet
ExplicitLeft = 4
ExplicitTop = 24
ExplicitWidth = 750
- ExplicitHeight = 374
+ ExplicitHeight = 210
end
object pagContenido: TTabSheet
Caption = 'Contenido'
ImageIndex = 1
- ExplicitHeight = 374
inline frViewDetallesPresupuestoCliente1: TfrViewDetallesPresupuestoCliente
Left = 0
Top = 0
@@ -202,77 +200,93 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
TabOrder = 0
ReadOnly = False
ExplicitWidth = 750
- ExplicitHeight = 374
+ ExplicitHeight = 210
inherited ToolBar1: TToolBar
Width = 750
- Height = 73
+ Height = 78
ExplicitWidth = 750
- ExplicitHeight = 73
- inherited ToolButton3: TToolButton
+ ExplicitHeight = 78
+ inherited ToolButton14: TToolButton
Wrap = False
end
- inherited ToolButton4: TToolButton
- Left = 278
- Top = 0
- ExplicitLeft = 278
- ExplicitTop = 0
- end
inherited FontName: TJvFontComboBox
- Left = 334
+ Left = 399
Top = 0
- ExplicitLeft = 334
+ ExplicitLeft = 399
ExplicitTop = 0
end
- inherited ToolButton14: TToolButton
- Left = 479
+ inherited ToolButton13: TToolButton [6]
+ Left = 0
Top = 0
Wrap = True
- ExplicitLeft = 479
+ ExplicitLeft = 0
ExplicitTop = 0
+ ExplicitHeight = 27
end
- inherited FontSize: TEdit
+ inherited FontSize: TEdit [7]
Left = 0
+ Top = 27
Width = 200
ExplicitLeft = 0
+ ExplicitTop = 27
ExplicitWidth = 200
end
- inherited UpDown1: TUpDown
- Left = 216
- ExplicitLeft = 216
+ inherited UpDown1: TUpDown [8]
+ Left = 200
+ Top = 27
+ ExplicitLeft = 200
+ ExplicitTop = 27
end
- inherited ToolButton13: TToolButton
- Left = 233
- ExplicitLeft = 233
- end
- inherited ToolButton11: TToolButton
- Left = 241
- ExplicitLeft = 241
+ inherited ToolButton6: TToolButton
+ Left = 217
+ Top = 27
+ ExplicitLeft = 217
+ ExplicitTop = 27
end
inherited ToolButton7: TToolButton
- Wrap = False
+ Left = 283
+ Top = 27
+ ExplicitLeft = 283
+ ExplicitTop = 27
end
inherited ToolButton8: TToolButton
- Left = 403
- Top = 49
- ExplicitLeft = 403
- ExplicitTop = 49
+ Left = 350
+ Top = 27
+ ExplicitLeft = 350
+ ExplicitTop = 27
+ end
+ inherited ToolButton12: TToolButton
+ Top = 27
+ ExplicitTop = 27
+ end
+ inherited ToolButton9: TToolButton
+ Top = 54
+ ExplicitTop = 54
+ end
+ inherited ToolButton10: TToolButton
+ Top = 54
+ ExplicitTop = 54
+ end
+ inherited ToolButton11: TToolButton
+ Top = 54
+ ExplicitTop = 54
end
end
inherited cxGrid: TcxGrid
- Top = 99
+ Top = 104
Width = 750
- Height = 111
- ExplicitTop = 99
+ Height = 106
+ ExplicitTop = 104
ExplicitWidth = 750
- ExplicitHeight = 275
+ ExplicitHeight = 106
end
inherited TBXDock1: TTBXDock
- Top = 73
+ Top = 78
Width = 750
- ExplicitTop = 73
+ ExplicitTop = 78
ExplicitWidth = 750
inherited TBXToolbar1: TTBXToolbar
- ExplicitWidth = 702
+ ExplicitWidth = 750
end
end
inherited cxGridPopupMenu: TcxGridPopupMenu
@@ -289,7 +303,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
object pagPortada: TTabSheet
Caption = 'Portada'
ImageIndex = 3
- ExplicitHeight = 374
object Panel1: TPanel
Left = 0
Top = 0
@@ -397,7 +410,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ReadOnly = False
ExplicitLeft = 145
ExplicitWidth = 605
- ExplicitHeight = 374
+ ExplicitHeight = 210
inherited TBXDock1: TTBXDock
Width = 605
ExplicitWidth = 605
@@ -413,7 +426,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
DataBinding.DataSource = dsDataTable
Style.IsFontAssigned = True
ExplicitWidth = 605
- ExplicitHeight = 348
+ ExplicitHeight = 184
Height = 184
Width = 605
end
@@ -422,7 +435,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
object pagMemoria: TTabSheet
Caption = 'Memoria'
ImageIndex = 4
- ExplicitHeight = 374
object Panel2: TPanel
Left = 0
Top = 0
@@ -701,7 +713,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ReadOnly = False
ExplicitLeft = 145
ExplicitWidth = 605
- ExplicitHeight = 374
+ ExplicitHeight = 210
inherited TBXDock1: TTBXDock
Width = 605
ExplicitWidth = 605
@@ -717,7 +729,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
DataBinding.DataSource = dsDataTable
Style.IsFontAssigned = True
ExplicitWidth = 605
- ExplicitHeight = 348
+ ExplicitHeight = 184
Height = 184
Width = 605
end
@@ -726,7 +738,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
object pagInicidencias: TTabSheet
Caption = 'Incidencias'
ImageIndex = 2
- ExplicitHeight = 374
inline frViewIncidenciasCli: TfrViewIncidencias
Left = 0
Top = 0
@@ -742,7 +753,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
TabOrder = 0
ReadOnly = False
ExplicitWidth = 750
- ExplicitHeight = 374
+ ExplicitHeight = 210
inherited pnlSup: TPanel
Width = 750
ExplicitWidth = 750
@@ -754,10 +765,10 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 750
Height = 182
ExplicitWidth = 750
- ExplicitHeight = 346
+ ExplicitHeight = 182
inherited eIncidencias: TcxDBMemo
ExplicitWidth = 727
- ExplicitHeight = 313
+ ExplicitHeight = 149
Height = 149
Width = 727
end
@@ -767,7 +778,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
object pagDocumentos: TTabSheet
Caption = 'Documentos'
ImageIndex = 5
- ExplicitHeight = 374
inline frViewDocumentosPresupuestoCliente1: TfrViewDocumentosPresupuestoCliente
Left = 0
Top = 0
@@ -783,7 +793,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
TabOrder = 0
ReadOnly = False
ExplicitWidth = 750
- ExplicitHeight = 374
+ ExplicitHeight = 210
inherited TBXDock: TTBXDock
Width = 750
ExplicitWidth = 750
@@ -849,8 +859,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitWidth = 87
- Width = 87
end
inherited ImporteIVA: TcxDBCurrencyEdit
Left = 624
@@ -860,8 +868,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 624
- ExplicitWidth = 20
- Width = 20
end
inherited ImporteTotal: TcxDBCurrencyEdit
Left = 554
@@ -871,8 +877,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 554
- ExplicitWidth = 90
- Width = 90
end
inherited edtDescuento: TcxDBSpinEdit
Style.LookAndFeel.SkinName = ''
@@ -898,8 +902,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 553
- ExplicitWidth = 91
- Width = 91
end
inherited edtRE: TcxDBSpinEdit
Left = 553
@@ -918,8 +920,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 624
- ExplicitWidth = 20
- Width = 20
end
inherited eImporteNeto: TcxDBCurrencyEdit
Style.LookAndFeel.SkinName = ''
@@ -927,8 +927,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitWidth = 158
- Width = 158
end
inherited ePorte: TcxDBCurrencyEdit
Style.LookAndFeel.SkinName = ''
@@ -936,16 +934,12 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitWidth = 158
- Width = 158
end
inherited eIVA: TcxDBLookupComboBox
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitWidth = 20
- Width = 20
end
inherited bTiposIVA: TButton
Left = 293
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index 9fe331dd..04bac6b2 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 d4c3dd48..3d7ecb2a 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -14,7 +14,7 @@ BEGIN
BEGIN
VALUE "FileVersion", "1.4.6.0\0"
VALUE "ProductVersion", "1.4.6.0\0"
- VALUE "CompileDate", "jueves, 13 de noviembre de 2008 11:42\0"
+ VALUE "CompileDate", "jueves, 13 de noviembre de 2008 17:55\0"
END
END
BLOCK "VarFileInfo"