Archivado/Noviseda_FactuGES2
Archived
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Arreglos varios

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.Noviseda_FactuGES2/trunk@113 f33bb606-9f5c-448d-9c99-757f00063c96
This commit is contained in:
roberto 2010-04-08 18:19:23 +00:00
parent 5f874e5bbf
commit 3654966994
18 changed files with 524 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Build/Build.fbl6
View File

Binary file not shown.

204
Source/GUIBase/uEditorColores.dfm
View File

@ -154,6 +154,210 @@ inherited fEditorColores: TfEditorColores
Width = 28 Width = 28
Height = 28 Height = 28
end end
object lColor1: TLabel
Left = 21
Top = 70
Width = 55
Height = 13
Alignment = taCenter
AutoSize = False
Caption = 'Color 1'
Font.Charset = DEFAULT_CHARSET
Font.Color = clGreen
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = [fsBold]
ParentFont = False
Visible = False
WordWrap = True
end
object lColor2: TLabel
Left = 82
Top = 70
Width = 55
Height = 13
Alignment = taCenter
AutoSize = False
Caption = 'Color 2'
Font.Charset = DEFAULT_CHARSET
Font.Color = clGreen
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = [fsBold]
ParentFont = False
Visible = False
WordWrap = True
end
object lColor3: TLabel
Left = 143
Top = 70
Width = 55
Height = 13
Alignment = taCenter
AutoSize = False
Caption = 'Color 3'
Font.Charset = DEFAULT_CHARSET
Font.Color = clGreen
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = [fsBold]
ParentFont = False
Visible = False
WordWrap = True
end
object lColor4: TLabel
Left = 204
Top = 70
Width = 55
Height = 13
Alignment = taCenter
AutoSize = False
Caption = 'Color 4'
Font.Charset = DEFAULT_CHARSET
Font.Color = clGreen
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = [fsBold]
ParentFont = False
Visible = False
WordWrap = True
end
object lColor5: TLabel
Left = 265
Top = 70
Width = 55
Height = 13
Alignment = taCenter
AutoSize = False
Caption = 'Color 5'
Font.Charset = DEFAULT_CHARSET
Font.Color = clGreen
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = [fsBold]
ParentFont = False
Visible = False
WordWrap = True
end
object lColor6: TLabel
Left = 326
Top = 70
Width = 55
Height = 13
Alignment = taCenter
AutoSize = False
Caption = 'Color 6'
Font.Charset = DEFAULT_CHARSET
Font.Color = clGreen
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = [fsBold]
ParentFont = False
Visible = False
WordWrap = True
end
object lColor7: TLabel
Left = 387
Top = 70
Width = 55
Height = 13
Alignment = taCenter
AutoSize = False
Caption = 'Color 7'
Font.Charset = DEFAULT_CHARSET
Font.Color = clGreen
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = [fsBold]
ParentFont = False
Visible = False
WordWrap = True
end
object lColor8: TLabel
Left = 448
Top = 70
Width = 55
Height = 13
Alignment = taCenter
AutoSize = False
Caption = 'Color 8'
Font.Charset = DEFAULT_CHARSET
Font.Color = clGreen
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = [fsBold]
ParentFont = False
Visible = False
WordWrap = True
end
object lColor9: TLabel
Left = 509
Top = 70
Width = 55
Height = 13
Alignment = taCenter
AutoSize = False
Caption = 'Color 9'
Font.Charset = DEFAULT_CHARSET
Font.Color = clGreen
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = [fsBold]
ParentFont = False
Visible = False
WordWrap = True
end
object lColor10: TLabel
Left = 570
Top = 70
Width = 55
Height = 13
Alignment = taCenter
AutoSize = False
Caption = 'Color 10'
Font.Charset = DEFAULT_CHARSET
Font.Color = clGreen
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = [fsBold]
ParentFont = False
Visible = False
WordWrap = True
end
object lColor11: TLabel
Left = 631
Top = 70
Width = 55
Height = 13
Alignment = taCenter
AutoSize = False
Caption = 'Color 11'
Font.Charset = DEFAULT_CHARSET
Font.Color = clGreen
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = [fsBold]
ParentFont = False
Visible = False
WordWrap = True
end
object lColor12: TLabel
Left = 692
Top = 70
Width = 55
Height = 13
Alignment = taCenter
AutoSize = False
Caption = 'Color 12'
Font.Charset = DEFAULT_CHARSET
Font.Color = clGreen
Font.Height = -11
Font.Name = 'Tahoma'
Font.Style = [fsBold]
ParentFont = False
Visible = False
WordWrap = True
end
object eColor1: TcxDBTextEdit object eColor1: TcxDBTextEdit
Left = 21 Left = 21
Top = 39 Top = 39

12
Source/GUIBase/uEditorColores.pas
View File

@ -37,6 +37,18 @@ type
Label13: TLabel; Label13: TLabel;
JvEnterAsTab1: TJvEnterAsTab; JvEnterAsTab1: TJvEnterAsTab;
RichEdit1: TRichEdit; RichEdit1: TRichEdit;
lColor1: TLabel;
lColor2: TLabel;
lColor3: TLabel;
lColor4: TLabel;
lColor5: TLabel;
lColor6: TLabel;
lColor7: TLabel;
lColor8: TLabel;
lColor9: TLabel;
lColor10: TLabel;
lColor11: TLabel;
lColor12: TLabel;
procedure actAceptarExecute(Sender: TObject); procedure actAceptarExecute(Sender: TObject);
procedure actCancelarExecute(Sender: TObject); procedure actCancelarExecute(Sender: TObject);
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);

34
Source/Modulos/Inventario/Controller/uArticulosInventarioController.pas
View File

@ -8,13 +8,11 @@ uses
type type
IArticulosInventarioController = interface(IArticulosController) IArticulosInventarioController = interface(IArticulosController)
['{33B26E09-ABE8-45A4-B9B3-E0E48F8EBB3E}'] ['{33B26E09-ABE8-45A4-B9B3-E0E48F8EBB3E}']
procedure ModificarCantidadColores(ADetalles: IDAStronglyTypedDataTable);
end; end;
TArticulosInventarioController = class(TArticulosController, IArticulosInventarioController) TArticulosInventarioController = class(TArticulosController, IArticulosInventarioController)
public public
function ElegirArticulos(AArticulos : IBizArticulo; AMensaje: String; AMultiSelect: Boolean): IBizArticulo; override; function ElegirArticulos(AArticulos : IBizArticulo; AMensaje: String; AMultiSelect: Boolean): IBizArticulo; override;
procedure ModificarCantidadColores(ADetalles: IDAStronglyTypedDataTable);
end; end;
implementation implementation
@ -43,36 +41,4 @@ begin
end; end;
end; end;
procedure TArticulosInventarioController.ModificarCantidadColores(ADetalles: IDAStronglyTypedDataTable);
var
ADetallesAux: IBizInventario;
begin
if Assigned(ADetalles) then
begin
ADetallesAux := (ADetalles as IBizInventario);
with TfEditorColores.Create(NIL) do
try
dsDataTable.DataTable := ADetallesAux.DetalleColores.DataTable;
Referencia := ADetallesAux.REFERENCIA;
Descripcion := ADetallesAux.DESCRIPCION;
if (ShowModal = mrOK) then
begin
if ADetallesAux.DetalleColores.DataTable.Editing then
ADetallesAux.DetalleColores.DataTable.Post;
if not ADetallesAux.DataTable.Editing then
ADetallesAux.DataTable.Edit;
ADetallesAux.CANTIDAD := Total;
if ADetallesAux.DataTable.Editing then
ADetallesAux.DataTable.post;
end
else
ADetallesAux.DetalleColores.DataTable.Cancel;
finally
Release;
end;
end;
end;
end. end.

77
Source/Modulos/Inventario/Controller/uInventarioController.pas
View File

@ -24,6 +24,7 @@ type
procedure VerTodos(AInventario: IBizInventario; const pTipoInventario: String); procedure VerTodos(AInventario: IBizInventario; const pTipoInventario: String);
procedure VerReservas(AArticulo: IBizInventario; const ATipoReservas: String; Const IdAlmacenObra: Integer); procedure VerReservas(AArticulo: IBizInventario; const ATipoReservas: String; Const IdAlmacenObra: Integer);
procedure VerDetallesColor(const AInventario: IBizInventario); procedure VerDetallesColor(const AInventario: IBizInventario);
procedure ModificarCantidadColores(ADetalles: IDAStronglyTypedDataTable);
function BuscarTodos: IBizInventario; function BuscarTodos: IBizInventario;
function BuscarTodosAlmacenes: IBizInventario; function BuscarTodosAlmacenes: IBizInventario;
@ -119,6 +120,7 @@ type
function BuscarTodos: IBizInventario; function BuscarTodos: IBizInventario;
function BuscarTodosAlmacenes: IBizInventario; function BuscarTodosAlmacenes: IBizInventario;
function BuscarTodosObras: IBizInventario; function BuscarTodosObras: IBizInventario;
function BuscarDetallesColor(const ID_ALMACEN, ID_ARTICULO:Integer): IBizInventarioColor;
function BuscarDetalleReservas: IBizDetalleReservas; function BuscarDetalleReservas: IBizDetalleReservas;
function ElegirArticulos(AArticulos : IBizInventario; AMensaje: String; AMultiSelect: Boolean): IBizInventario; function ElegirArticulos(AArticulos : IBizInventario; AMensaje: String; AMultiSelect: Boolean): IBizInventario;
function ExtraerSeleccionados(AArticulos: IBizInventario) : IBizInventario; overload; function ExtraerSeleccionados(AArticulos: IBizInventario) : IBizInventario; overload;
@ -141,6 +143,7 @@ type
procedure VerReservas(AArticulo: IBizInventario; const ATipoReservas: String; Const IdAlmacenObra: Integer); procedure VerReservas(AArticulo: IBizInventario; const ATipoReservas: String; Const IdAlmacenObra: Integer);
procedure VerDetallesColor(const AInventario: IBizInventario); procedure VerDetallesColor(const AInventario: IBizInventario);
procedure ModificarCantidadColores(ADetalles: IDAStronglyTypedDataTable);
function Guardar(AArticulos : IBizInventario; const FechaMovimiento: TDateTime; const CausaMovimiento: String; AValidar:Boolean = True): Boolean; function Guardar(AArticulos : IBizInventario; const FechaMovimiento: TDateTime; const CausaMovimiento: String; AValidar:Boolean = True): Boolean;
@ -213,6 +216,13 @@ begin
FiltrarEmpresa(Result); FiltrarEmpresa(Result);
end; end;
function TInventarioController.BuscarDetallesColor(const ID_ALMACEN, ID_ARTICULO: Integer): IBizInventarioColor;
begin
Result := FDataModule.GetInventarioColor(ID_ALMACEN, ID_ARTICULO);
Result.DataTable.ReadOnly := True;
Result.DataTable.Active := True;
end;
function TInventarioController.BuscarTodos: IBizInventario; function TInventarioController.BuscarTodos: IBizInventario;
begin begin
Result := FDataModule.GetItems; Result := FDataModule.GetItems;
@ -557,9 +567,9 @@ var
begin begin
if Assigned(AInventario) then if Assigned(AInventario) then
begin begin
ADetallesColor := FDataModule.GetInventarioColor(AInventario.ID_ALMACEN, AInventario.ID_ARTICULO);
ADetallesColor.DataTable.ReadOnly := True; ADetallesColor := BuscarDetallesColor(AInventario.ID_ALMACEN, AInventario.ID_ARTICULO);
ADetallesColor.DataTable.Active := True; // ADetallesColor := FDataModule.GetInventarioColor(AInventario.ID_ALMACEN, AInventario.ID_ARTICULO);
with TfEditorColores.Create(NIL) do with TfEditorColores.Create(NIL) do
try try
@ -1142,6 +1152,67 @@ begin
end; end;
procedure TInventarioController.ModificarCantidadColores(ADetalles: IDAStronglyTypedDataTable);
var
ADetallesAux: IBizInventario;
ADetallesColor : IBizInventarioColor;
begin
if Assigned(ADetalles) then
begin
ADetallesAux := (ADetalles as IBizInventario);
with TfEditorColores.Create(NIL) do
try
ADetallesColor := BuscarDetallesColor(ADetallesAux.ID_ALMACEN, ADetallesAux.ID_ARTICULO);
lColor1.Caption := IntToStr(ADetallesColor.COLOR1);
lColor2.Caption := IntToStr(ADetallesColor.COLOR2);
lColor3.Caption := IntToStr(ADetallesColor.COLOR3);
lColor4.Caption := IntToStr(ADetallesColor.COLOR4);
lColor5.Caption := IntToStr(ADetallesColor.COLOR5);
lColor6.Caption := IntToStr(ADetallesColor.COLOR6);
lColor7.Caption := IntToStr(ADetallesColor.COLOR7);
lColor8.Caption := IntToStr(ADetallesColor.COLOR8);
lColor9.Caption := IntToStr(ADetallesColor.COLOR9);
lColor10.Caption := IntToStr(ADetallesColor.COLOR10);
lColor11.Caption := IntToStr(ADetallesColor.COLOR11);
lColor12.Caption := IntToStr(ADetallesColor.COLOR12);
lColor1.Visible := True;
lColor2.Visible := True;
lColor3.Visible := True;
lColor4.Visible := True;
lColor5.Visible := True;
lColor6.Visible := True;
lColor7.Visible := True;
lColor8.Visible := True;
lColor9.Visible := True;
lColor10.Visible := True;
lColor11.Visible := True;
lColor12.Visible := True;
dsDataTable.DataTable := ADetallesAux.DetalleColores.DataTable;
Referencia := ADetallesAux.REFERENCIA;
Descripcion := ADetallesAux.DESCRIPCION;
if (ShowModal = mrOK) then
begin
if ADetallesAux.DetalleColores.DataTable.Editing then
ADetallesAux.DetalleColores.DataTable.Post;
if not ADetallesAux.DataTable.Editing then
ADetallesAux.DataTable.Edit;
ADetallesAux.CANTIDAD := Total;
if ADetallesAux.DataTable.Editing then
ADetallesAux.DataTable.post;
end
else
ADetallesAux.DetalleColores.DataTable.Cancel;
finally
Release;
end;
end;
end;
procedure TInventarioController.DeshabilitarOnCalcFields(Sender: TDADataTable); procedure TInventarioController.DeshabilitarOnCalcFields(Sender: TDADataTable);
begin begin
// Deshabilita el devolver RECID para la localización unica de tuplas de inventario // Deshabilita el devolver RECID para la localización unica de tuplas de inventario

285
Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.dfm
View File

@ -2,21 +2,21 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
Left = 387 Left = 387
Top = 196 Top = 196
Caption = 'Entrada de art'#237'culos en almac'#233'n' Caption = 'Entrada de art'#237'culos en almac'#233'n'
ClientHeight = 556 ClientHeight = 535
ClientWidth = 704 ClientWidth = 902
OnClose = CustomEditorClose OnClose = CustomEditorClose
ExplicitWidth = 712 ExplicitWidth = 910
ExplicitHeight = 590 ExplicitHeight = 569
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader inherited JvNavPanelHeader: TJvNavPanelHeader
Top = 177 Top = 177
Width = 704 Width = 902
Caption = 'Entrada de art'#237'culos en ' Caption = 'Entrada de art'#237'culos en '
ExplicitTop = 177 ExplicitTop = 177
ExplicitWidth = 853 ExplicitWidth = 908
inherited Image1: TImage inherited Image1: TImage
Left = 571 Left = 769
Picture.Data = { Picture.Data = {
0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800
0000180806000000E0773DF80000000970485973000017120000171201679FD2 0000180806000000E0773DF80000000970485973000017120000171201679FD2
@ -37,15 +37,15 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
ExplicitLeft = 625 ExplicitLeft = 625
end end
inherited lblDesbloquear: TcxLabel inherited lblDesbloquear: TcxLabel
Left = 606 Left = 804
ExplicitLeft = 755 ExplicitLeft = 810
AnchorX = 651 AnchorX = 849
AnchorY = 14 AnchorY = 14
end end
end end
inherited TBXDock: TSpTBXDock inherited TBXDock: TSpTBXDock
Width = 704 Width = 902
ExplicitWidth = 853 ExplicitWidth = 908
inherited tbxMain: TSpTBXToolbar inherited tbxMain: TSpTBXToolbar
ExplicitWidth = 164 ExplicitWidth = 164
object TBXItem7: TSpTBXItem [16] object TBXItem7: TSpTBXItem [16]
@ -55,7 +55,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
end end
end end
inherited tbxMenu: TSpTBXToolbar inherited tbxMenu: TSpTBXToolbar
ExplicitWidth = 704 ExplicitWidth = 902
inherited TBXSubmenuItem4: TSpTBXSubmenuItem inherited TBXSubmenuItem4: TSpTBXSubmenuItem
object TBXItem33: TSpTBXItem [11] object TBXItem33: TSpTBXItem [11]
Action = actGuardarCerrar Action = actGuardarCerrar
@ -68,36 +68,36 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
end end
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Top = 295 Top = 295
Width = 698 Width = 896
Height = 239 Height = 218
MultiLine = True MultiLine = True
TabOrder = 1 TabOrder = 1
Visible = False Visible = False
ExplicitTop = 324 ExplicitTop = 295
ExplicitWidth = 847 ExplicitWidth = 902
ExplicitHeight = 210 ExplicitHeight = 218
inherited pagGeneral: TTabSheet inherited pagGeneral: TTabSheet
ExplicitLeft = 4 ExplicitLeft = 4
ExplicitTop = 24 ExplicitTop = 24
ExplicitWidth = 839 ExplicitWidth = 894
ExplicitHeight = 182 ExplicitHeight = 190
end end
end end
inherited StatusBar: TJvStatusBar inherited StatusBar: TJvStatusBar
Top = 537 Top = 516
Width = 704 Width = 902
Panels = < Panels = <
item item
Width = 200 Width = 200
end> end>
ExplicitTop = 537 ExplicitTop = 516
ExplicitWidth = 853 ExplicitWidth = 908
end end
object ToolBar1: TToolBar [4] object ToolBar1: TToolBar [4]
AlignWithMargins = True AlignWithMargins = True
Left = 5 Left = 5
Top = 262 Top = 262
Width = 694 Width = 892
Height = 30 Height = 30
Margins.Left = 5 Margins.Left = 5
Margins.Top = 2 Margins.Top = 2
@ -115,8 +115,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
ShowHint = True ShowHint = True
TabOrder = 3 TabOrder = 3
Transparent = True Transparent = True
ExplicitTop = 291 ExplicitWidth = 898
ExplicitWidth = 843
object ToolButton1: TToolButton object ToolButton1: TToolButton
Left = 0 Left = 0
Top = 0 Top = 0
@ -147,8 +146,8 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
inline frViewEntradaSalidaArticulos1: TfrViewEntradaSalidaArticulos [5] inline frViewEntradaSalidaArticulos1: TfrViewEntradaSalidaArticulos [5]
Left = 0 Left = 0
Top = 292 Top = 292
Width = 704 Width = 902
Height = 245 Height = 224
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -158,14 +157,14 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
ParentFont = False ParentFont = False
TabOrder = 5 TabOrder = 5
ReadOnly = False ReadOnly = False
ExplicitTop = 321 ExplicitTop = 292
ExplicitWidth = 853 ExplicitWidth = 908
ExplicitHeight = 216 ExplicitHeight = 224
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Width = 688 Width = 886
Height = 101 Height = 80
ExplicitWidth = 837 ExplicitWidth = 892
ExplicitHeight = 72 ExplicitHeight = 80
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
DataController.KeyFieldNames = 'RecID' DataController.KeyFieldNames = 'RecID'
inherited cxGridViewSTOCK: TcxGridDBColumn inherited cxGridViewSTOCK: TcxGridDBColumn
@ -174,14 +173,14 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
end end
end end
inherited frViewFiltroBase1: TfrViewFiltroBase inherited frViewFiltroBase1: TfrViewFiltroBase
Width = 704 Width = 902
ExplicitWidth = 853 ExplicitWidth = 908
inherited TBXDockablePanel1: TSpTBXDockablePanel inherited TBXDockablePanel1: TSpTBXDockablePanel
Width = 704 Width = 902
ExplicitWidth = 853 ExplicitWidth = 908
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 704 Width = 902
ExplicitWidth = 853 ExplicitWidth = 908
inherited txtFiltroTodo: TcxTextEdit inherited txtFiltroTodo: TcxTextEdit
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
@ -197,45 +196,45 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
end end
inherited edtFechaFinFiltro: TcxDateEdit inherited edtFechaFinFiltro: TcxDateEdit
Left = 207 Left = 259
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 207 ExplicitLeft = 259
end end
inherited eLista: TcxComboBox inherited eLista: TcxComboBox
Left = 352 Left = 440
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 352 ExplicitLeft = 440
ExplicitWidth = 380 ExplicitWidth = 380
Width = 380 Width = 380
end end
end end
inherited TBXAlignmentPanel1: TSpTBXDockablePanel inherited TBXAlignmentPanel1: TSpTBXDockablePanel
Width = 694 Width = 892
ExplicitWidth = 843 ExplicitWidth = 898
inherited tbxBotones: TSpTBXToolbar inherited tbxBotones: TSpTBXToolbar
Width = 694 Width = 892
ExplicitWidth = 843 ExplicitWidth = 898
end end
end end
end end
end end
inherited pnlAgrupaciones: TSpTBXDockablePanel inherited pnlAgrupaciones: TSpTBXDockablePanel
Top = 219 Top = 198
Width = 704 Width = 902
ExplicitTop = 190 ExplicitTop = 198
ExplicitWidth = 853 ExplicitWidth = 908
inherited TBXAlignmentPanel1: TSpTBXDockablePanel inherited TBXAlignmentPanel1: TSpTBXDockablePanel
Width = 704 Width = 902
ExplicitWidth = 853 ExplicitWidth = 908
inherited TBXToolbar1: TSpTBXToolbar inherited TBXToolbar1: TSpTBXToolbar
Width = 704 Width = 902
ExplicitWidth = 853 ExplicitWidth = 908
end end
end end
end end
@ -260,7 +259,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
object pnlEntradaPedido: TSpTBXDockablePanel [6] object pnlEntradaPedido: TSpTBXDockablePanel [6]
Left = 0 Left = 0
Top = 49 Top = 49
Width = 704 Width = 902
Height = 128 Height = 128
Caption = 'Filtrar' Caption = 'Filtrar'
Align = alTop Align = alTop
@ -269,7 +268,7 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
TabOrder = 0 TabOrder = 0
Visible = False Visible = False
ShowCaptionWhenDocked = False ShowCaptionWhenDocked = False
ExplicitWidth = 853 ExplicitWidth = 908
object Label3: TLabel object Label3: TLabel
Left = 202 Left = 202
Top = 17 Top = 17
@ -370,69 +369,119 @@ inherited fEditorEntradaSalidaArticulos: TfEditorEntradaSalidaArticulos
object pnlMovimiento: TPanel [7] object pnlMovimiento: TPanel [7]
Left = 0 Left = 0
Top = 204 Top = 204
Width = 704 Width = 902
Height = 56 Height = 56
Align = alTop Align = alTop
BevelOuter = bvNone BevelOuter = bvNone
TabOrder = 7 TabOrder = 7
ExplicitTop = 289 ExplicitWidth = 908
ExplicitWidth = 853 object dxLayoutControl1: TdxLayoutControl
DesignSize = ( Left = 0
704 Top = 0
56) Width = 902
object Label2: TLabel Height = 56
Left = 12 Align = alClient
Top = 17 ParentBackground = True
Width = 107
Height = 13
Margins.Bottom = 0
Caption = 'Fecha del movimiento:'
end
object Label1: TLabel
Left = 266
Top = 17
Width = 36
Height = 13
Margins.Bottom = 0
Caption = 'Motivo:'
end
object eFechaMovimiento: TcxDateEdit
Left = 126
Top = 14
Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
Style.ButtonStyle = bts3D
Style.PopupBorderStyle = epbsFrame3D
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 0 TabOrder = 0
Width = 121 TabStop = False
end ExplicitLeft = 8
object eCausa: TcxTextEdit ExplicitTop = 40
Left = 308 ExplicitWidth = 300
Top = 14 ExplicitHeight = 250
Anchors = [akLeft, akTop, akRight] object Label1: TLabel
Style.BorderColor = clWindowFrame Left = 250
Style.BorderStyle = ebs3D Top = 10
Style.HotTrack = False Width = 36
Style.LookAndFeel.Kind = lfStandard Height = 13
Style.LookAndFeel.NativeStyle = True Margins.Bottom = 0
StyleDisabled.LookAndFeel.Kind = lfStandard Caption = 'Motivo:'
StyleDisabled.LookAndFeel.NativeStyle = True end
StyleFocused.LookAndFeel.Kind = lfStandard object Label2: TLabel
StyleFocused.LookAndFeel.NativeStyle = True Left = 10
StyleHot.LookAndFeel.Kind = lfStandard Top = 10
StyleHot.LookAndFeel.NativeStyle = True Width = 107
TabOrder = 1 Height = 13
ExplicitWidth = 535 Margins.Bottom = 0
Width = 386 Caption = 'Fecha del movimiento:'
end
object eCausa: TcxTextEdit
Left = 292
Top = 10
Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 1
Width = 590
end
object eFechaMovimiento: TcxDateEdit
Left = 123
Top = 10
Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
Style.ButtonStyle = bts3D
Style.PopupBorderStyle = epbsFrame3D
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 0
Width = 121
end
object dxLayoutControl1Group_Root: TdxLayoutGroup
AlignHorz = ahClient
AlignVert = avClient
ButtonOptions.Buttons = <>
Hidden = True
LayoutDirection = ldHorizontal
ShowBorder = False
object dxLayoutControl1Group1: TdxLayoutGroup
AlignHorz = ahClient
CaptionOptions.Text = 'New Group'
ButtonOptions.Buttons = <>
LayoutDirection = ldHorizontal
ShowBorder = False
object dxLayoutControl1Item2: TdxLayoutItem
CaptionOptions.Text = 'New Item'
CaptionOptions.Visible = False
Control = Label2
ControlOptions.AutoColor = True
ControlOptions.ShowBorder = False
end
object dxLayoutControl1Item4: TdxLayoutItem
CaptionOptions.Text = 'New Item'
CaptionOptions.Visible = False
Control = eFechaMovimiento
ControlOptions.ShowBorder = False
end
object dxLayoutControl1Item1: TdxLayoutItem
CaptionOptions.Text = 'New Item'
CaptionOptions.Visible = False
Control = Label1
ControlOptions.AutoColor = True
ControlOptions.ShowBorder = False
end
object dxLayoutControl1Item3: TdxLayoutItem
AlignHorz = ahClient
CaptionOptions.Text = 'New Item'
CaptionOptions.Visible = False
Control = eCausa
ControlOptions.ShowBorder = False
end
end
end
end end
end end
inherited SmallImages: TPngImageList inherited SmallImages: TPngImageList

10
Source/Modulos/Inventario/Views/uEditorEntradaSalidaArticulos.pas
View File

@ -14,7 +14,8 @@ uses
JvStatusBar, Grids, DBGrids, cxLabel, cxControls, cxContainer, cxEdit, JvStatusBar, Grids, DBGrids, cxLabel, cxControls, cxContainer, cxEdit,
cxTextEdit, cxMaskEdit, cxDropDownEdit, cxCalendar, cxMemo, ToolWin, cxTextEdit, cxMaskEdit, cxDropDownEdit, cxCalendar, cxMemo, ToolWin,
dxLayoutControl, cxStyles, StdCtrls, Buttons, SpTBXDkPanels, uBizPedidosProveedor, dxLayoutControl, cxStyles, StdCtrls, Buttons, SpTBXDkPanels, uBizPedidosProveedor,
uDAInterfaces, cxGraphics, cxLookAndFeels, cxLookAndFeelPainters; uDAInterfaces, cxGraphics, cxLookAndFeels, cxLookAndFeelPainters,
dxLayoutcxEditAdapters;
type type
TfEditorEntradaSalidaArticulos = class(TfEditorDBItem, IEditorEntradaSalidaArticulos) TfEditorEntradaSalidaArticulos = class(TfEditorDBItem, IEditorEntradaSalidaArticulos)
@ -43,6 +44,13 @@ type
eFechaMovimiento: TcxDateEdit; eFechaMovimiento: TcxDateEdit;
Label1: TLabel; Label1: TLabel;
eCausa: TcxTextEdit; eCausa: TcxTextEdit;
dxLayoutControl1Group_Root: TdxLayoutGroup;
dxLayoutControl1: TdxLayoutControl;
dxLayoutControl1Item1: TdxLayoutItem;
dxLayoutControl1Group1: TdxLayoutGroup;
dxLayoutControl1Item2: TdxLayoutItem;
dxLayoutControl1Item3: TdxLayoutItem;
dxLayoutControl1Item4: TdxLayoutItem;
procedure CustomEditorClose(Sender: TObject; var Action: TCloseAction); procedure CustomEditorClose(Sender: TObject; var Action: TCloseAction);
procedure actAnadirInventarioExecute(Sender: TObject); procedure actAnadirInventarioExecute(Sender: TObject);
procedure actEliminarInventarioExecute(Sender: TObject); procedure actEliminarInventarioExecute(Sender: TObject);

8
Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.dfm
View File

@ -79,10 +79,7 @@ inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos
object cxGridViewSTOCK: TcxGridDBColumn object cxGridViewSTOCK: TcxGridDBColumn
Caption = 'Stock actual' Caption = 'Stock actual'
DataBinding.FieldName = 'STOCK' DataBinding.FieldName = 'STOCK'
PropertiesClassName = 'TcxSpinEditProperties' PropertiesClassName = 'TcxTextEditProperties'
Properties.DisplayFormat = ',0.##;-,0.##'
Properties.EditFormat = ',0.##;-,0.##'
Properties.ReadOnly = True
HeaderAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify
Width = 94 Width = 94
end end
@ -194,6 +191,9 @@ inherited frViewEntradaSalidaArticulos: TfrViewEntradaSalidaArticulos
BuiltInReportLink = True BuiltInReportLink = True
end end
end end
inherited dxPSEngineController1: TdxPSEngineController
Active = True
end
inherited cxStyleRepository1: TcxStyleRepository inherited cxStyleRepository1: TcxStyleRepository
object cxStyle_CANTIDAD_IMPAR: TcxStyle object cxStyle_CANTIDAD_IMPAR: TcxStyle
AssignedValues = [svColor] AssignedValues = [svColor]

8
Source/Modulos/Inventario/Views/uViewEntradaSalidaArticulos.pas
View File

@ -56,7 +56,7 @@ type
procedure CustomViewCreate(Sender: TObject); procedure CustomViewCreate(Sender: TObject);
private private
FArticulosInventarioController : IArticulosInventarioController; FInventarioController : IInventarioController;
FInventario: IBizInventario; FInventario: IBizInventario;
function GetInventario: IBizInventario; function GetInventario: IBizInventario;
procedure SetInventario(const Value: IBizInventario); procedure SetInventario(const Value: IBizInventario);
@ -108,13 +108,13 @@ end;}
procedure TfrViewEntradaSalidaArticulos.CustomViewCreate(Sender: TObject); procedure TfrViewEntradaSalidaArticulos.CustomViewCreate(Sender: TObject);
begin begin
inherited; inherited;
FArticulosInventarioController := TArticulosInventarioController.Create; FInventarioController := TInventarioController.Create;
end; end;
procedure TfrViewEntradaSalidaArticulos.CustomViewDestroy(Sender: TObject); procedure TfrViewEntradaSalidaArticulos.CustomViewDestroy(Sender: TObject);
begin begin
FInventario := Nil; FInventario := Nil;
FArticulosInventarioController := Nil; FInventarioController := Nil;
inherited; inherited;
end; end;
@ -123,7 +123,7 @@ procedure TfrViewEntradaSalidaArticulos.cxGridViewCANTIDAD2PropertiesButtonClick
Sender: TObject; AButtonIndex: Integer); Sender: TObject; AButtonIndex: Integer);
begin begin
inherited; inherited;
(FArticulosInventarioController as IArticulosInventarioController).ModificarCantidadColores(FInventario); (FInventarioController as IInventarioController).ModificarCantidadColores(FInventario);
end; end;
procedure TfrViewEntradaSalidaArticulos.cxGridViewStylesGetContentStyle( procedure TfrViewEntradaSalidaArticulos.cxGridViewStylesGetContentStyle(

79
Source/Modulos/Pedidos a proveedor/Views/uViewDetallesPedidoProveedor.dfm
View File

@ -1,51 +1,43 @@
inherited frViewDetallesPedidoProveedor: TfrViewDetallesPedidoProveedor inherited frViewDetallesPedidoProveedor: TfrViewDetallesPedidoProveedor
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Height = 73 Height = 95
ExplicitHeight = 73 ExplicitHeight = 95
inherited ToolButton3: TToolButton inherited FontName: TJvFontComboBox [4]
Wrap = False Left = 56
end
inherited ToolButton4: TToolButton
Left = 278
Top = 0
ExplicitLeft = 278
ExplicitTop = 0
end
inherited ToolButton14: TToolButton
Left = 334
Top = 0
ExplicitLeft = 334
ExplicitTop = 0
end
inherited FontName: TJvFontComboBox
Top = 22 Top = 22
ExplicitLeft = 56
ExplicitTop = 22 ExplicitTop = 22
end end
inherited ToolButton14: TToolButton [5]
Left = 201
Wrap = False
ExplicitLeft = 201
end
inherited FontSize: TEdit inherited FontSize: TEdit
Left = 266
Top = 22 Top = 22
ExplicitLeft = 266
ExplicitTop = 22 ExplicitTop = 22
end end
inherited UpDown1: TUpDown inherited UpDown1: TUpDown
Left = 308
Top = 22 Top = 22
ExplicitLeft = 308
ExplicitTop = 22 ExplicitTop = 22
end end
inherited ToolButton13: TToolButton inherited ToolButton13: TToolButton
Left = 325
Top = 22 Top = 22
ExplicitLeft = 325
ExplicitTop = 22 ExplicitTop = 22
end end
inherited ToolButton6: TToolButton inherited ToolButton11: TToolButton [9]
Left = 333
Top = 22 Top = 22
ExplicitLeft = 333
ExplicitTop = 22 ExplicitTop = 22
end end
inherited ToolButton7: TToolButton inherited ToolButton12: TToolButton [10]
Top = 22
ExplicitTop = 22
end
inherited ToolButton8: TToolButton
Top = 22
ExplicitTop = 22
end
inherited ToolButton12: TToolButton
Left = 0 Left = 0
Top = 22 Top = 22
Wrap = True Wrap = True
@ -53,28 +45,43 @@ inherited frViewDetallesPedidoProveedor: TfrViewDetallesPedidoProveedor
ExplicitTop = 22 ExplicitTop = 22
ExplicitHeight = 27 ExplicitHeight = 27
end end
inherited ToolButton9: TToolButton inherited ToolButton9: TToolButton [11]
Left = 0 Left = 0
Top = 49 Top = 49
ExplicitLeft = 0 ExplicitLeft = 0
ExplicitTop = 49 ExplicitTop = 49
end end
inherited ToolButton10: TToolButton inherited ToolButton10: TToolButton [12]
Left = 145 Left = 145
Top = 49 Top = 49
ExplicitLeft = 145 ExplicitLeft = 145
ExplicitTop = 49 ExplicitTop = 49
end end
inherited ToolButton11: TToolButton inherited ToolButton6: TToolButton [13]
Left = 270 Left = 270
Top = 49 Top = 49
ExplicitLeft = 270 ExplicitLeft = 270
ExplicitTop = 49 ExplicitTop = 49
end end
inherited ToolButton7: TToolButton [14]
Left = 336
Top = 49
Wrap = True
ExplicitLeft = 336
ExplicitTop = 49
end
inherited ToolButton8: TToolButton [15]
Left = 0
Top = 71
ExplicitLeft = 0
ExplicitTop = 71
end
end end
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Top = 99 Top = 121
Height = 205 Height = 183
ExplicitTop = 99
ExplicitHeight = 210
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
inherited cxGridViewTIPO: TcxGridDBColumn inherited cxGridViewTIPO: TcxGridDBColumn
Visible = False Visible = False
@ -111,15 +118,15 @@ inherited frViewDetallesPedidoProveedor: TfrViewDetallesPedidoProveedor
end end
end end
inherited TBXDock1: TSpTBXDock inherited TBXDock1: TSpTBXDock
Top = 73 Top = 95
ExplicitTop = 73 ExplicitTop = 68
inherited TBXToolbar1: TSpTBXToolbar inherited TBXToolbar1: TSpTBXToolbar
inherited TBXSubmenuItem1: TSpTBXSubmenuItem inherited TBXSubmenuItem1: TSpTBXSubmenuItem
Visible = False Visible = False
end end
object TBXItem18: TSpTBXItem [1] object TBXItem18: TSpTBXItem [1]
Action = actAnadirArticulos
Caption = 'A'#241'adir art'#237'culos...' Caption = 'A'#241'adir art'#237'culos...'
Action = actAnadirArticulos
DisplayMode = nbdmImageAndText DisplayMode = nbdmImageAndText
end end
end end

2
Source/Modulos/Pedidos a proveedor/Views/uViewDetallesPedidoProveedor.pas
View File

@ -13,7 +13,7 @@ uses
JvExStdCtrls, JvCombobox, JvColorCombo, TB2Item, SpTBXItem, TB2Dock, TB2Toolbar, JvExStdCtrls, JvCombobox, JvColorCombo, TB2Item, SpTBXItem, TB2Dock, TB2Toolbar,
uControllerDetallesArticulos, uBizPedidosProveedor, uDAInterfaces, uControllerDetallesArticulos, uBizPedidosProveedor, uDAInterfaces,
cxButtonEdit, cxDropDownEdit, Menus, cxGridCustomPopupMenu, cxGridPopupMenu, cxButtonEdit, cxDropDownEdit, Menus, cxGridCustomPopupMenu, cxGridPopupMenu,
cxEditRepositoryItems; cxEditRepositoryItems, cxLookAndFeels, cxLookAndFeelPainters;
type type
IViewDetallesPedidoProveedor = interface(IViewDetallesArticulos) IViewDetallesPedidoProveedor = interface(IViewDetallesArticulos)

2
Source/Modulos/Pedidos de cliente/Controller/PedidosCliente_controller.drc
View File

@ -13,4 +13,4 @@ BEGIN
END END
/* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Controller\PedidosCliente_controller.res */ /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Controller\PedidosCliente_controller.res */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtfA0.tmp */ /* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1B7.tmp */

2
Source/Modulos/Pedidos de cliente/Data/PedidosCliente_data.drc
View File

@ -14,4 +14,4 @@ END
/* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Data\uDataModulePedidosCliente.dfm */ /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Data\uDataModulePedidosCliente.dfm */
/* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Data\PedidosCliente_data.res */ /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Data\PedidosCliente_data.res */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf9E.tmp */ /* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1B5.tmp */

2
Source/Modulos/Pedidos de cliente/Model/PedidosCliente_model.drc
View File

@ -13,4 +13,4 @@ BEGIN
END END
/* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Model\PedidosCliente_model.res */ /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Model\PedidosCliente_model.res */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf9C.tmp */ /* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf1B3.tmp */

2
Source/Modulos/Pedidos de cliente/Plugin/PedidosCliente_plugin.drc
View File

@ -14,4 +14,4 @@ END
/* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Plugin\uPluginPedidosCliente.dfm */ /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Plugin\uPluginPedidosCliente.dfm */
/* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Plugin\PedidosCliente_plugin.res */ /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Plugin\PedidosCliente_plugin.res */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf110.tmp */ /* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf227.tmp */

2
Source/Modulos/Pedidos de cliente/Views/PedidosCliente_view.drc
View File

@ -25,4 +25,4 @@ END
/* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Views\uEditorElegirArticulosPedidoCliente.dfm */ /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Views\uEditorElegirArticulosPedidoCliente.dfm */
/* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Views\uEditorPedidosClienteReport.dfm */ /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Views\uEditorPedidosClienteReport.dfm */
/* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Views\PedidosCliente_view.res */ /* C:\Codigo noviseda\Source\Modulos\Pedidos de cliente\Views\PedidosCliente_view.res */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf10E.tmp */ /* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf225.tmp */

BIN
Source/Servidor/FactuGES_Server.RES
View File

Binary file not shown.

2
Source/Servidor/FactuGES_Server.rc
View File

@ -17,7 +17,7 @@ BEGIN
VALUE "InternalName", "FactuGES Servidor\0" VALUE "InternalName", "FactuGES Servidor\0"
VALUE "ProductName", "FactuGES Servidor\0" VALUE "ProductName", "FactuGES Servidor\0"
VALUE "ProductVersion", "1.0.2.0\0" VALUE "ProductVersion", "1.0.2.0\0"
VALUE "CompileDate", "jueves, 08 de abril de 2010 18:09\0" VALUE "CompileDate", "jueves, 08 de abril de 2010 19:11\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"