diff --git a/Source/Cliente/FactuGES.dpr b/Source/Cliente/FactuGES.dpr
index c094c23d..906bce24 100644
--- a/Source/Cliente/FactuGES.dpr
+++ b/Source/Cliente/FactuGES.dpr
@@ -2,7 +2,6 @@ program FactuGES;
uses
// ExceptionLog,
- ExceptionLog,
Forms,
Windows,
SysUtils,
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index 05236c4b..22391745 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -54,11 +54,7 @@
Delphi.Personality
VCLApplication
-FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1420FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.4.2.0FactuGESFactuGES1.4.2.0
-
-
-
-
+FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1430FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.4.3.0FactuGESFactuGES1.4.3.0
ExpressPrinting System by Developer Express Inc.
PluginSDK for Delphi 10 (Runtime)
Microsoft Office 2000 Sample Automation Server Wrapper Components
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index 5a9a7ca2..92f8bf36 100644
--- a/Source/Cliente/FactuGES.rc
+++ b/Source/Cliente/FactuGES.rc
@@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Factuges.ico"
1 VERSIONINFO
-FILEVERSION 1,4,2,0
-PRODUCTVERSION 1,4,2,0
+FILEVERSION 1,4,3,0
+PRODUCTVERSION 1,4,3,0
FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L
FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
BLOCK "0C0A04E4"
BEGIN
VALUE "CompanyName", "Rodax Software S.L.\0"
- VALUE "FileVersion", "1.4.2.0\0"
+ VALUE "FileVersion", "1.4.3.0\0"
VALUE "InternalName", "FactuGES\0"
VALUE "ProductName", "FactuGES\0"
- VALUE "ProductVersion", "1.4.2.0\0"
+ VALUE "ProductVersion", "1.4.3.0\0"
END
END
BLOCK "VarFileInfo"
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index 81496ea4..03b02ccd 100644
Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ
diff --git a/Source/Modulos/Almacenes/Model/Almacenes_model.res b/Source/Modulos/Almacenes/Model/Almacenes_model.res
index 1641339f..8b251f31 100644
Binary files a/Source/Modulos/Almacenes/Model/Almacenes_model.res and b/Source/Modulos/Almacenes/Model/Almacenes_model.res differ
diff --git a/Source/Modulos/Almacenes/Servidor/srvAlmacenes_Impl.dfm b/Source/Modulos/Almacenes/Servidor/srvAlmacenes_Impl.dfm
index 804b5343..2bdaf2c8 100644
--- a/Source/Modulos/Almacenes/Servidor/srvAlmacenes_Impl.dfm
+++ b/Source/Modulos/Almacenes/Servidor/srvAlmacenes_Impl.dfm
@@ -122,7 +122,7 @@ object srvAlmacenes: TsrvAlmacenes
Name = 'IBX'
SQL =
'Select ID, NOMBRE'#10'from ALMACENES'#10'where TIPO_ALMACEN = '#39'ALMACEN'#39#10 +
- #10
+ 'order by NOMBRE'#10#10
StatementType = stSQL
ColumnMappings = <
item
diff --git a/Source/Modulos/Almacenes/Servidor/srvAlmacenes_Impl.pas b/Source/Modulos/Almacenes/Servidor/srvAlmacenes_Impl.pas
index 47419719..5281af7b 100644
--- a/Source/Modulos/Almacenes/Servidor/srvAlmacenes_Impl.pas
+++ b/Source/Modulos/Almacenes/Servidor/srvAlmacenes_Impl.pas
@@ -87,7 +87,7 @@ begin
ALista := TStringList.Create;
try
dsData.Active := True;
- ALista.Sorted := True;
+// ALista.Sorted := True;
while not dsData.EOF do
begin
ALista.Add(Format('%s=%d', [dsData.Fields[1].AsString, dsData.Fields[0].AsInteger]));
diff --git a/Source/Modulos/Inventario/Model/uBizInventario.pas b/Source/Modulos/Inventario/Model/uBizInventario.pas
index dff2463a..6e503d3f 100644
--- a/Source/Modulos/Inventario/Model/uBizInventario.pas
+++ b/Source/Modulos/Inventario/Model/uBizInventario.pas
@@ -97,6 +97,7 @@ var
Contador: Integer;
begin
inherited;
+{
DesconectarTabla(Sender);
Sender.First;
Contador := 1;
@@ -109,7 +110,7 @@ begin
Sender.Next;
end;
ConectarTabla(Sender);
-
+}
//
end;
@@ -139,7 +140,7 @@ end;
procedure TBizInventario.OnCalcFields(Sender: TDADataTable);
begin
inherited;
- ID := Self.DataTable.RecIDValue;
+// ID := Self.DataTable.RecIDValue;
end;
procedure TBizInventario.OnNewRecord(Sender: TDADataTable);
diff --git a/Source/Modulos/Inventario/Views/uEditorInventario.dfm b/Source/Modulos/Inventario/Views/uEditorInventario.dfm
index 3ffd9f5e..7c7780aa 100644
--- a/Source/Modulos/Inventario/Views/uEditorInventario.dfm
+++ b/Source/Modulos/Inventario/Views/uEditorInventario.dfm
@@ -153,7 +153,6 @@ inherited fEditorInventario: TfEditorInventario
Width = 669
Height = 250
TabOrder = 2
- ExplicitTop = 143
ExplicitWidth = 669
ExplicitHeight = 250
inherited cxGridView: TcxGridDBTableView
@@ -273,8 +272,6 @@ inherited fEditorInventario: TfEditorInventario
end
inherited Panel1: TPanel
Width = 669
- ExplicitLeft = 0
- ExplicitTop = 102
ExplicitWidth = 669
end
inherited dxComponentPrinter: TdxComponentPrinter
diff --git a/Source/Modulos/Inventario/Views/uEditorInventario.pas b/Source/Modulos/Inventario/Views/uEditorInventario.pas
index 0fc49e83..de375ea2 100644
--- a/Source/Modulos/Inventario/Views/uEditorInventario.pas
+++ b/Source/Modulos/Inventario/Views/uEditorInventario.pas
@@ -89,7 +89,7 @@ implementation
{$R *.DFM}
uses
- cxControls, uGridStatusUtils, uDataModuleInventario, uDataModuleUsuarios,
+ Variants, cxControls, uGridStatusUtils, uDataModuleInventario, uDataModuleUsuarios,
uEditorBase, uDBSelectionListUtils, cxGridDBTableView, cxGridCustomTableView,
uAlmacenesController, uFactuGES_App, uGenerarAlbaranesProvUtils,
schInventarioClient_Intf, uBizObras;
@@ -111,19 +111,25 @@ begin
end;
function TfEditorInventario.DarIDAlmacenSeleccionado(Descripcion: String): Integer;
+var
+ IDAlmacen: Variant;
begin
- if (ViewGrid._Grid.ActiveLevel.Tag = -1) then
- Result := Seleccionar(Descripcion, tAlmacen)
+ IDAlmacen := (ViewGrid as IViewInventario).DarIDAlmacenObraSeleccionada;
+ if not VarIsNull(IDAlmacen) then
+ Result := IDAlmacen
else
- Result := ViewGrid._Grid.ActiveLevel.Tag;
+ Result := Seleccionar(Descripcion, tAlmacen)
end;
function TfEditorInventario.DarIDObraSeleccionada(Descripcion: String): Integer;
+var
+ IDObra: Variant;
begin
- if (ViewGrid._Grid.ActiveLevel.Tag = -1) then
- Result := Seleccionar(Descripcion, TObra)
+ IDObra := (ViewGrid as IViewInventario).DarIDAlmacenObraSeleccionada;
+ if not VarIsNull(IDObra) then
+ Result := IDObra
else
- Result := ViewGrid._Grid.ActiveLevel.Tag;
+ Result := Seleccionar(Descripcion, TObra)
end;
destructor TfEditorInventario.Destroy;
diff --git a/Source/Modulos/Inventario/Views/uViewInventario.dfm b/Source/Modulos/Inventario/Views/uViewInventario.dfm
index 408da42f..37d05cdf 100644
--- a/Source/Modulos/Inventario/Views/uViewInventario.dfm
+++ b/Source/Modulos/Inventario/Views/uViewInventario.dfm
@@ -1,13 +1,16 @@
inherited frViewInventario: TfrViewInventario
- Width = 674
+ Width = 678
Height = 607
- ExplicitWidth = 674
+ OnShow = CustomViewShow
+ ExplicitWidth = 678
ExplicitHeight = 607
inherited cxGrid: TcxGrid
Top = 143
- Width = 674
+ Width = 678
Height = 438
- RootLevelOptions.DetailTabsPosition = dtpTop
+ ExplicitTop = 143
+ ExplicitWidth = 674
+ ExplicitHeight = 438
inherited cxGridView: TcxGridDBTableView
DataController.Summary.DefaultGroupSummaryItems = <
item
@@ -51,9 +54,6 @@ inherited frViewInventario: TfrViewInventario
Kind = skSum
Column = cxGridViewPENDIENTE_RECEPCION
end>
- OptionsCustomize.ColumnGrouping = False
- OptionsCustomize.ColumnHidingOnGrouping = False
- OptionsCustomize.GroupBySorting = True
object cxGridViewID: TcxGridDBColumn
DataBinding.FieldName = 'ID'
Visible = False
@@ -164,21 +164,21 @@ inherited frViewInventario: TfrViewInventario
end
inherited cxGridLevel: TcxGridLevel
Tag = -1
- Caption = 'Todos los almacenes'
end
end
inherited frViewFiltroBase1: TfrViewFiltroBase
- Width = 674
+ Width = 678
+ ExplicitWidth = 674
inherited TBXDockablePanel1: TTBXDockablePanel
+ ExplicitWidth = 674
inherited dxLayoutControl1: TdxLayoutControl
- Width = 674
+ Width = 678
+ ExplicitWidth = 674
inherited txtFiltroTodo: TcxTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitWidth = 510
- Width = 510
end
inherited edtFechaIniFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
@@ -197,45 +197,63 @@ inherited frViewInventario: TfrViewInventario
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
- ExplicitWidth = 215
- Width = 215
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
- Width = 674
+ Width = 678
+ ExplicitWidth = 674
inherited tbxBotones: TTBXToolbar
- Width = 664
+ Width = 668
+ ExplicitWidth = 664
end
end
end
end
inherited pnlAgrupaciones: TTBXDockablePanel
Top = 581
+ ExplicitTop = 581
+ ExplicitWidth = 674
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
- Width = 674
+ Width = 678
+ ExplicitWidth = 674
inherited TBXToolbar1: TTBXToolbar
- Width = 664
+ Width = 668
+ ExplicitWidth = 664
end
end
end
object Panel1: TPanel [3]
Left = 0
Top = 102
- Width = 674
+ Width = 678
Height = 41
Align = alTop
TabOrder = 3
- ExplicitLeft = 160
- ExplicitTop = 96
- ExplicitWidth = 185
- object cxListaAlmacenesObras: TcxComboBox
+ ExplicitWidth = 674
+ DesignSize = (
+ 678
+ 41)
+ object eAlmacen: TLabel
Left = 10
+ Top = 16
+ Width = 71
+ Height = 13
+ Caption = 'Almac'#233'n:'
+ end
+ object cxListaAlmacenesObras: TcxComboBox
+ Left = 87
Top = 14
+ Anchors = [akLeft, akTop, akRight]
Properties.DropDownListStyle = lsEditFixedList
+ Properties.DropDownRows = 25
Properties.ImmediatePost = True
Properties.OnEditValueChanged = cxListaObrasPropertiesEditValueChanged
+ Style.LookAndFeel.NativeStyle = True
+ StyleDisabled.LookAndFeel.NativeStyle = True
+ StyleFocused.LookAndFeel.NativeStyle = True
+ StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 0
- Width = 587
+ Width = 581
end
end
inherited dxComponentPrinter: TdxComponentPrinter
diff --git a/Source/Modulos/Inventario/Views/uViewInventario.pas b/Source/Modulos/Inventario/Views/uViewInventario.pas
index 33a6acd5..1e695ec0 100644
--- a/Source/Modulos/Inventario/Views/uViewInventario.pas
+++ b/Source/Modulos/Inventario/Views/uViewInventario.pas
@@ -30,6 +30,7 @@ type
function GetObras: TStringList;
procedure SetObras(const Value: TStringList);
property Obras: TStringList read GetObras write SetObras;
+ function DarIDAlmacenObraSeleccionada: Variant;
end;
TfrViewInventario = class(TfrViewGrid, IViewInventario)
@@ -52,10 +53,12 @@ type
cxStyleArticuloConStock: TcxStyle;
Panel1: TPanel;
cxListaAlmacenesObras: TcxComboBox;
+ eAlmacen: TLabel;
procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; out
AStyle: TcxStyle);
procedure cxListaObrasPropertiesEditValueChanged(Sender: TObject);
+ procedure CustomViewShow(Sender: TObject);
private
//Filtros relativos a la vista
@@ -75,6 +78,7 @@ type
property Inventario: IBizInventario read GetInventario write SetInventario;
procedure AnadirOtrosFiltros; override;
destructor Destroy; override;
+ function DarIDAlmacenObraSeleccionada: Variant;
end;
implementation
@@ -85,20 +89,13 @@ uses uDataModuleInventario, schInventarioClient_Intf;
procedure TfrViewInventario.AnadirFiltroAlmacenesObras;
var
FFiltro : TcxFilterCriteriaItemList;
- CodigoAlmacen: String;
+ CodigoAlmacen: Variant;
begin
FFiltro := AddFilterGrid(fboAnd);
- //INV_ALMACENES
- if Assigned(FAlmacenes) then
- CodigoAlmacen := FAlmacenes.Values[cxListaAlmacenesObras.EditValue]
- //INV_OBRAS
- else if Assigned(FObras) then
- CodigoAlmacen := FObras.Values[cxListaAlmacenesObras.EditValue]
- else
- Raise Exception.Create('No se ha asignado ninguna lista de ALMACENES');
+ CodigoAlmacen := DarIDAlmacenObraSeleccionada;
- if CodigoAlmacen <> '' then
+ if not VarIsNull(CodigoAlmacen) then
begin
FFiltro.AddItem(cxGridViewID_ALMACEN, foEqual, CodigoAlmacen, CodigoAlmacen);
cxGridViewALMACEN.Visible := False;
@@ -120,6 +117,12 @@ begin
cxGrid.ActiveLevel.GridView := cxGridView;
end;
+procedure TfrViewInventario.CustomViewShow(Sender: TObject);
+begin
+ inherited;
+ cxListaAlmacenesObras.ItemIndex := 0;
+end;
+
procedure TfrViewInventario.cxGridViewStylesGetContentStyle(Sender:
TcxCustomGridTableView; ARecord: TcxCustomGridRecord; AItem:
TcxCustomGridTableItem; out AStyle: TcxStyle);
@@ -146,6 +149,18 @@ begin
RefrescarFiltro;
end;
+function TfrViewInventario.DarIDAlmacenObraSeleccionada: Variant;
+begin
+ //INV_ALMACENES
+ if Assigned(FAlmacenes) then
+ Result := FAlmacenes.Values[cxListaAlmacenesObras.EditValue]
+ //INV_OBRAS
+ else if Assigned(FObras) then
+ Result := FObras.Values[cxListaAlmacenesObras.EditValue]
+ else
+ Raise Exception.Create('No se ha asignado ninguna lista de ALMACENES');
+end;
+
destructor TfrViewInventario.Destroy;
begin
FAlmacenes := Nil;
@@ -175,6 +190,7 @@ var
i: integer;
begin
FAlmacenes := Value;
+ eAlmacen.Caption := 'Almacén';
if Assigned(FAlmacenes) then
begin
@@ -213,6 +229,7 @@ var
i: integer;
begin
FObras := Value;
+ eAlmacen.Caption := 'Obra';
if Assigned(FObras) then
begin
diff --git a/Source/Modulos/Obras/Servidor/srvObras_Impl.dfm b/Source/Modulos/Obras/Servidor/srvObras_Impl.dfm
index 6d2a8460..d2bf1ed6 100644
--- a/Source/Modulos/Obras/Servidor/srvObras_Impl.dfm
+++ b/Source/Modulos/Obras/Servidor/srvObras_Impl.dfm
@@ -39,11 +39,11 @@ object srvObras: TsrvObras
Top = 82
DiagramData =
''#13#10' '#13#10' '#13#10' '#13#10' '#13#10' ' +
- ''#13#10' '#13#10 +
+ 'idth="1202" Height="535">'#13#10' '#13#10' '#13#10' '#13#10' '#13#10' '#13#10 +
''#13#10
end
object DataDictionary: TDADataDictionary
@@ -403,7 +403,9 @@ object srvObras: TsrvObras
Default = True
TargetTable = 'OBRAS'
Name = 'IBX'
- SQL = 'Select ID, NOMBRE'#10'from ALMACENES'#10'where TIPO_ALMACEN = '#39'OBRA'#39#10#10
+ SQL =
+ 'Select ID, NOMBRE'#10'from ALMACENES'#10'where TIPO_ALMACEN = '#39'OBRA'#39#10'ord' +
+ 'er by NOMBRE'#10#10
StatementType = stSQL
ColumnMappings = <
item
diff --git a/Source/Modulos/Obras/Servidor/srvObras_Impl.pas b/Source/Modulos/Obras/Servidor/srvObras_Impl.pas
index 2ec52239..5b307b4b 100644
--- a/Source/Modulos/Obras/Servidor/srvObras_Impl.pas
+++ b/Source/Modulos/Obras/Servidor/srvObras_Impl.pas
@@ -426,7 +426,7 @@ begin
ALista := TStringList.Create;
try
dsData.Active := True;
- ALista.Sorted := True;
+// ALista.Sorted := True;
while not dsData.EOF do
begin
ALista.Add(Format('%s=%d', [dsData.Fields[1].AsString, dsData.Fields[0].AsInteger]));
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index a50fb055..a1774b31 100644
Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index e95b3c8c..1a477607 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -35,7 +35,7 @@
Delphi.Personality
- FalseTrueFalse/standaloneTrueFalse1420FalseFalseFalseFalseFalse308212521.4.2.01.4.2.0lunes, 03 de noviembre de 2008 12:55FactuGES_Server.dpr
+ FalseTrueFalse/standaloneTrueFalse1430FalseFalseFalseFalseFalse308212521.4.3.01.4.3.0martes, 04 de noviembre de 2008 20:22FactuGES_Server.dpr
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index d0f8aab4..18f6574a 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Servidor.ico"
1 VERSIONINFO
-FILEVERSION 1,4,2,0
-PRODUCTVERSION 1,4,2,0
+FILEVERSION 1,4,3,0
+PRODUCTVERSION 1,4,3,0
FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L
FILEOS 0x40004L
@@ -12,9 +12,9 @@ BEGIN
BEGIN
BLOCK "0C0A04E4"
BEGIN
- VALUE "FileVersion", "1.4.2.0\0"
- VALUE "ProductVersion", "1.4.2.0\0"
- VALUE "CompileDate", "martes, 04 de noviembre de 2008 20:22\0"
+ VALUE "FileVersion", "1.4.3.0\0"
+ VALUE "ProductVersion", "1.4.3.0\0"
+ VALUE "CompileDate", "miércoles, 05 de noviembre de 2008 20:14\0"
END
END
BLOCK "VarFileInfo"