diff --git a/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas b/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas index 662e8c76..a6ff573d 100644 --- a/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas +++ b/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas @@ -22,6 +22,8 @@ type procedure DescartarCambios(AEmpresa : IBizEmpresa); function Existe(const ID: Integer) : Boolean; function ToStringList(AEmpresa : IBizEmpresa) : TStringList; + + function DarListaTiendas(AEmpresa : IBizEmpresa): TStringList; end; TEmpresasController = class(TControllerBase, IEmpresasController) @@ -45,13 +47,15 @@ type procedure Ver(AEmpresa : IBizEmpresa); virtual; procedure VerTodos(AEmpresas: IBizEmpresa); virtual; function ToStringList(AEmpresa : IBizEmpresa) : TStringList; virtual; + + function DarListaTiendas(AEmpresa : IBizEmpresa): TStringList; end; implementation uses uEditorRegistryUtils, cxControls, DB, uFactuGES_App, - uDataModuleEmpresas, uIEditorEmpresa; + uDataModuleEmpresas, uIEditorEmpresa, uBizEmpresasTiendas; { TEmpresasController } @@ -75,10 +79,40 @@ begin FDataModule := TDataModuleEmpresas.Create(Nil); end; +function TEmpresasController.DarListaTiendas( + AEmpresa: IBizEmpresa): TStringList; +var + ATiendas: IBizEmpresasTiendas; + i : integer; +begin + if not Assigned(AEmpresa) then + raise Exception.Create ('Empresa no asignada (DarListaTiendas)'); + + ATiendas := AEmpresa.Tiendas; + ATiendas.DataTable.Active := True; + + Result := TStringList.Create; + try + with Result do + begin + Add(Format('%s=%d', [CTE_TODAS, CTE_ID_TODAS])); + + ATiendas.DataTable.First; + while not ATiendas.DataTable.EOF do + begin + Add(Format('%s=%d', [ATiendas.NOMBRE, ATiendas.ID])); + ATiendas.DataTable.Next; + end; + end; + finally + ATiendas := NIL; + end; +end; + procedure TEmpresasController.DescartarCambios(AEmpresa: IBizEmpresa); begin if not Assigned(AEmpresa) then - raise Exception.Create ('Empresa no asignada'); + raise Exception.Create ('Empresa no asignada (DescartarCambios)'); ShowHourglassCursor; try @@ -102,7 +136,7 @@ begin Result := False; if not Assigned(AEmpresa) then - raise Exception.Create ('Empresa no asignada'); + raise Exception.Create ('Empresa no asignada (Eliminar)'); ShowHourglassCursor; try @@ -184,7 +218,7 @@ begin Result := False; if not Assigned(AEmpresa) then - raise Exception.Create ('Empresa no asignada'); + raise Exception.Create ('Empresa no asignada (ValidarEmpresa)'); if (AEmpresa.DataTable.State in dsEditModes) then AEmpresa.DataTable.Post; diff --git a/Source/ApplicationBase/Empresas/Controller/uTiendasEmpresaController.pas b/Source/ApplicationBase/Empresas/Controller/uTiendasEmpresaController.pas index 83118bd0..1e6658f7 100644 --- a/Source/ApplicationBase/Empresas/Controller/uTiendasEmpresaController.pas +++ b/Source/ApplicationBase/Empresas/Controller/uTiendasEmpresaController.pas @@ -8,23 +8,17 @@ uses type ITiendasEmpresaController = interface - ['{9B6CB172-F32C-414F-A0E2-99920CAF88FB}'] -// procedure CopiarDireccionFiscal(AContacto: IBizContacto; ADireccion: IBizTiendasEmpresa; AAnadir : Boolean = True); - procedure Ver(ATienda : IBizEmpresasTiendas); -// function Localizar(ADirecciones: IBizTiendasEmpresa; const ID : Integer): Boolean; + ['{5DCF4163-7FA0-4560-9E5E-FA2A99EA4F59}'] + procedure VerTienda(ATienda : IBizEmpresasTiendas); function DarListaTiendas: TStringList; - function DarListaIDTiendas: TIntegerList; end; TTiendasEmpresaController = class(TInterfacedObject, ITiendasEmpresaController) private FDataModule : IDataModuleEmpresas; public -// procedure CopiarDireccionFiscal(AContacto: IBizContacto; ADireccion: IBizTiendasEmpresa; AAnadir : Boolean = True); - procedure Ver(ATienda : IBizEmpresasTiendas); + procedure VerTienda(ATienda : IBizEmpresasTiendas); function DarListaTiendas: TStringList; - function DarListaIDTiendas: TIntegerList; -// function Localizar(ADirecciones: IBizTiendasEmpresa; const ID : Integer): Boolean; constructor Create; virtual; destructor Destroy; override; end; @@ -37,71 +31,35 @@ uses uDataModuleEmpresas, schEmpresasClient_Intf, uIEditorTiendaEmpresa, uEditorRegistryUtils, cxControls, uFactuGES_App; -{ -procedure TTiendasEmpresaController.CopiarDireccionFiscal( - AContacto: IBizContacto; ADireccion: IBizTiendasEmpresa; - AAnadir: Boolean); -begin - if not Assigned(AContacto) then - raise Exception.Create ('Contacto no asignado (CopiarDireccionFiscal)'); - - if not Assigned(ADireccion) then - raise Exception.Create ('Dirección no asignada (CopiarDireccionFiscal)'); - - if AAnadir then - ADireccion.DataTable.Insert - else - ADireccion.DataTable.Edit; - try - with ADireccion do - begin - NOMBRE := 'Dirección de entrega'; - CALLE := AContacto.CALLE; - POBLACION := AContacto.POBLACION; - PROVINCIA := AContacto.PROVINCIA; - CODIGO_POSTAL := AContacto.CODIGO_POSTAL; - TELEFONO := AContacto.TELEFONO_1; - EMAIL := AContacto.EMAIL_1; - end; - finally - ADireccion.DataTable.Post; - end; -end; -} - constructor TTiendasEmpresaController.Create; begin inherited; FDataModule := TDataModuleEmpresas.Create(Nil); end; -function TTiendasEmpresaController.DarListaIDTiendas: TIntegerList; -begin - Result := TIntegerList.Create; - with Result do - begin - Add(CTE_ID_TODAS); //Todas las tiendas - AppFactuGES.EmpresaActiva.Tiendas.DataTable.First; - while not AppFactuGES.EmpresaActiva.Tiendas.DataTable.EOF do - begin - Add(AppFactuGES.EmpresaActiva.Tiendas.ID); - AppFactuGES.EmpresaActiva.Tiendas.DataTable.Next; - end; - end; -end; - function TTiendasEmpresaController.DarListaTiendas: TStringList; +var + ATiendas: IBizEmpresasTiendas; + i : integer; begin + ATiendas := AppFactuGES.EmpresaActiva.Tiendas; + ATiendas.DataTable.Active := True; + Result := TStringList.Create; - with Result do - begin - Append(CTE_TODAS); //Todas las tiendas - AppFactuGES.EmpresaActiva.Tiendas.DataTable.First; - while not AppFactuGES.EmpresaActiva.Tiendas.DataTable.EOF do + try + with Result do begin - Append(AppFactuGES.EmpresaActiva.Tiendas.NOMBRE); - AppFactuGES.EmpresaActiva.Tiendas.DataTable.Next; + Add(Format('%s=%d', [CTE_TODAS, CTE_ID_TODAS])); + + ATiendas.DataTable.First; + while not ATiendas.DataTable.EOF do + begin + Add(Format('%s=%d', [ATiendas.NOMBRE, ATiendas.ID])); + ATiendas.DataTable.Next; + end; end; + finally + ATiendas := NIL; end; end; @@ -111,28 +69,7 @@ begin inherited; end; -{ -function TTiendasEmpresaController.Localizar( - ADirecciones: IBizTiendasEmpresa; const ID: Integer): Boolean; -begin - Result := True; - ShowHourglassCursor; - try - with ADirecciones.DataTable do - begin - DisableControls; - First; - if not Locate(fld_TiendasEmpresaID, ID, []) then - Result := False; - EnableControls; - end; - finally - HideHourglassCursor; - end; -end; -} - -procedure TTiendasEmpresaController.Ver(ATienda: IBizEmpresasTiendas); +procedure TTiendasEmpresaController.VerTienda(ATienda: IBizEmpresasTiendas); var AEditor : IEditorTiendaEmpresa; begin diff --git a/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas b/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas index cb02913c..4b813fed 100644 --- a/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas +++ b/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas @@ -3,7 +3,7 @@ unit schEmpresasClient_Intf; interface uses - Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; + Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; const { Data table rules ids @@ -232,7 +232,7 @@ type end; { TEmpresasTiendasDataTableRules } - TEmpresasTiendasDataTableRules = class(TDADataTableRules, IEmpresasTiendas) + TEmpresasTiendasDataTableRules = class(TIntfObjectDADataTableRules, IEmpresasTiendas) private f_NOTAS: IROStrings; procedure NOTAS_OnChange(Sender: TObject); @@ -488,7 +488,7 @@ type end; { TEmpresasDataTableRules } - TEmpresasDataTableRules = class(TDADataTableRules, IEmpresas) + TEmpresasDataTableRules = class(TIntfObjectDADataTableRules, IEmpresas) private f_NOTAS: IROStrings; f_LOGOTIPO: IROStream; @@ -705,7 +705,7 @@ type end; { TEmpresasDatosBancoDataTableRules } - TEmpresasDatosBancoDataTableRules = class(TDADataTableRules, IEmpresasDatosBanco) + TEmpresasDatosBancoDataTableRules = class(TIntfObjectDADataTableRules, IEmpresasDatosBanco) private protected { Property getters and setters } diff --git a/Source/ApplicationBase/Empresas/Views/uViewTienda.dfm b/Source/ApplicationBase/Empresas/Views/uViewTienda.dfm index 40e854f5..19179540 100644 --- a/Source/ApplicationBase/Empresas/Views/uViewTienda.dfm +++ b/Source/ApplicationBase/Empresas/Views/uViewTienda.dfm @@ -1,16 +1,15 @@ inherited frViewTienda: TfrViewTienda Width = 451 - Height = 180 - Align = alBottom + Height = 41 OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy ExplicitWidth = 451 - ExplicitHeight = 180 + ExplicitHeight = 41 object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 Width = 451 - Height = 73 + Height = 41 Margins.Left = 0 Margins.Top = 0 Margins.Right = 0 @@ -21,14 +20,14 @@ inherited frViewTienda: TfrViewTienda AutoContentSizes = [acsWidth, acsHeight] DesignSize = ( 451 - 73) - object cbTienda: TcxDBComboBox + 41) + object cbTienda: TcxComboBox Left = 51 Top = 10 Anchors = [akLeft, akTop, akRight] - DataBinding.DataField = 'TIENDA' Properties.DropDownListStyle = lsFixedList Properties.ImmediatePost = True + Properties.OnValidate = cbTiendaPropertiesValidate Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D Style.HotTrack = False @@ -56,8 +55,4 @@ inherited frViewTienda: TfrViewTienda end end end - object dsVendedores: TDADataSource - Left = 400 - Top = 40 - end end diff --git a/Source/ApplicationBase/Empresas/Views/uViewTienda.pas b/Source/ApplicationBase/Empresas/Views/uViewTienda.pas index 52b819f0..62a147f6 100644 --- a/Source/ApplicationBase/Empresas/Views/uViewTienda.pas +++ b/Source/ApplicationBase/Empresas/Views/uViewTienda.pas @@ -5,27 +5,31 @@ interface uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, uViewBase, ExtCtrls, StdCtrls, DB, uDADataTable, cxGraphics, - cxTextEdit, cxMaskEdit, cxDropDownEdit, cxDBEdit, cxControls, - cxContainer, cxEdit, cxLabel, cxDBLabel, cxCurrencyEdit, cxSpinEdit, - cxCheckBox, cxMemo, uDAInterfaces, cxLookupEdit, cxDBLookupEdit, - cxDBLookupComboBox, dxLayoutControl, uTiendasEmpresaController, - uIntegerListUtils, uUsuariosController; + dxLayoutControl, cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxDropDownEdit, + cxControls; type - TfrViewTienda = class(TfrViewBase) - cbTienda: TcxDBComboBox; + IViewTienda = interface(IViewBase) + ['{9FD357AB-2E87-4CAF-8AEB-04368AD075AF}'] + end; + + TfrViewTienda = class(TfrViewBase, IViewTienda) + cbTienda: TcxComboBox; dxLayoutControl1Group_Root: TdxLayoutGroup; dxLayoutControl1: TdxLayoutControl; dxLayoutControl1Item1: TdxLayoutItem; - dsVendedores: TDADataSource; procedure CustomViewCreate(Sender: TObject); procedure CustomViewDestroy(Sender: TObject); - + procedure cbTiendaPropertiesValidate(Sender: TObject; + var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); private - FListaTiendas: TStringList; - FListaIDTiendas: TIntegerList; - + FDataItem : TDADataTable; + FListaTiendas : TStringList; + function GetDataItem: TDADataTable; + procedure SetDataItem(const Value: TDADataTable); public + property DataItem : TDADataTable read GetDataItem write SetDataItem; + procedure ElegirTienda(const AIDTienda : Integer); function getIDTienda: Integer; procedure SetIDTienda(const ID: Integer); @@ -33,57 +37,97 @@ type implementation + {$R *.dfm} -procedure TfrViewTienda.CustomViewCreate(Sender: TObject); +uses + uFactuGES_App; + +procedure TfrViewTienda.cbTiendaPropertiesValidate(Sender: TObject; + var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); +var + AIndex : integer; begin inherited; - FListaTiendas := Nil; - FListaIDTiendas := Nil; - with TTiendasEmpresaController.Create do - begin - FListaTiendas := DarListaTiendas; - FListaIDTiendas := DarListaIDTiendas; - end; - if Assigned(FListaTiendas) then - with cbTienda.Properties.Items do - begin - BeginUpdate; - try - Clear; - AddStrings(FListaTiendas); - finally - EndUpdate; - end; - cbTienda.ItemIndex := 0; - end; + if Assigned(FDataItem) and FDataItem.Active then + begin + AIndex := StrToInt(FListaTiendas.Values[DisplayValue]); + + FDataItem.Edit; + if Assigned(FDataItem.FindField('ID_TIENDA')) then + FDataItem.FieldByName('ID_TIENDA').AsInteger := AIndex; + + if Assigned(FDataItem.FindField('TIENDA')) then + FDataItem.FieldByName('TIENDA').AsString := DisplayValue; + end; +end; + +procedure TfrViewTienda.CustomViewCreate(Sender: TObject); +var + i : integer; +begin + inherited; + FListaTiendas := AppFactuGES.EmpresasController.DarListaTiendas(AppFactuGES.EmpresaActiva); + with cbTienda.Properties.Items do + begin + BeginUpdate; + try + Clear; + for i := 0 to FListaTiendas.Count - 1 do + Add(FListaTiendas.Names[i]); + finally + EndUpdate; + end; + end; end; procedure TfrViewTienda.CustomViewDestroy(Sender: TObject); begin inherited; - if Assigned(FListaTiendas) then - FreeAndNil(FListaTiendas); + FreeAndNIL(FListaTiendas); +end; - if Assigned(FListaIDTiendas) then - FreeAndNil(FListaIDTiendas); +procedure TfrViewTienda.ElegirTienda(const AIDTienda: Integer); +var + i : integer; +begin + for i := 0 to FListaTiendas.Count-1 do + begin + if FListaTiendas.ValueFromIndex[i] = IntToStr(AIDTienda) then + begin + cbTienda.Text := FListaTiendas.Names[i]; + Break; + end; + end; +end; + +function TfrViewTienda.GetDataItem: TDADataTable; +begin + Result := FDataItem; end; function TfrViewTienda.getIDTienda: Integer; begin - if FListaTiendas.IndexOf(cbTienda.Text) < 0 then +{ if FListaTiendas.IndexOf(cbTienda.Text) < 0 then Result := FListaTiendas.IndexOf(cbTienda.Text) else - Result := FListaIDTiendas.Integers[FListaTiendas.IndexOf(cbTienda.Text)]; + Result := FListaIDTiendas.Integers[FListaTiendas.IndexOf(cbTienda.Text)];} +end; + +procedure TfrViewTienda.SetDataItem(const Value: TDADataTable); +begin + FDataItem := Value; + if Assigned(FDataItem.FindField('ID_TIENDA')) then + ElegirTienda(FDataItem.FieldByName('ID_TIENDA').AsInteger); end; procedure TfrViewTienda.SetIDTienda(const ID: Integer); var AIndex: Integer; begin - if FListaIDTiendas.Find(ID, AIndex) then - cbTienda.Text := FListaTiendas.Strings[AIndex]; +{ if FListaIDTiendas.Find(ID, AIndex) then + cbTienda.Text := FListaTiendas.Strings[AIndex];} end; end. diff --git a/Source/ApplicationBase/Empresas/Views/uViewTiendas.pas b/Source/ApplicationBase/Empresas/Views/uViewTiendas.pas index a5df6b71..b284e095 100644 --- a/Source/ApplicationBase/Empresas/Views/uViewTiendas.pas +++ b/Source/ApplicationBase/Empresas/Views/uViewTiendas.pas @@ -52,7 +52,11 @@ begin try with TTiendasEmpresaController.Create do - Ver((dsDetalles.DataTable) as IBizEmpresasTiendas); + try + VerTienda((dsDetalles.DataTable) as IBizEmpresasTiendas); + finally + Free; + end; finally if (dsDetalles.DataTable.State in dsEditModes) then dsDetalles.DataTable.Post; @@ -69,7 +73,11 @@ procedure TfrViewTiendas.ModificarInterno; begin inherited; with TTiendasEmpresaController.Create do - Ver((dsDetalles.DataTable) as IBizEmpresasTiendas); + try + VerTienda((dsDetalles.DataTable) as IBizEmpresasTiendas); + finally + Free; + end; end; end. diff --git a/Source/ApplicationBase/Usuarios/Views/uViewUsuario.pas b/Source/ApplicationBase/Usuarios/Views/uViewUsuario.pas index 7343f126..98cf11f7 100644 --- a/Source/ApplicationBase/Usuarios/Views/uViewUsuario.pas +++ b/Source/ApplicationBase/Usuarios/Views/uViewUsuario.pas @@ -109,7 +109,6 @@ begin FUsuario.Edit; FUsuario.ID_PERFIL := AIndex; - FUsuario.Post; end; end; @@ -197,7 +196,7 @@ begin if FListaPerfiles.ValueFromIndex[i] = IntToStr(FUsuario.ID_PERFIL) then begin cbPerfil.Text := FListaPerfiles.Names[i]; - break; + Break; end; end; end; diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index c7c3b6b4..5df5fbb9 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -58,48 +58,48 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
TForm diff --git a/Source/Cliente/uBootStrap.pas b/Source/Cliente/uBootStrap.pas index 355eca5b..ee4f8280 100644 --- a/Source/Cliente/uBootStrap.pas +++ b/Source/Cliente/uBootStrap.pas @@ -28,10 +28,10 @@ begin LoadModule('Contactos_plugin.bpl'); {$IFDEF ALMACEN} - LoadModule('Familias_plugin.bpl'); +{ LoadModule('Familias_plugin.bpl'); LoadModule('UnidadesMedida_plugin.bpl'); LoadModule('Almacenes_plugin.bpl'); - LoadModule('Articulos_plugin.bpl'); + LoadModule('Articulos_plugin.bpl');} {$ENDIF} LoadModule('PresupuestosCliente_plugin.bpl'); @@ -41,8 +41,8 @@ begin LoadModule('FacturasCliente_plugin.bpl'); {$IFDEF PEDIDOSPROVEEDOR} - LoadModule('PedidosProveedor_plugin.bpl'); - LoadModule('AlbaranesProveedor_plugin.bpl'); +{ LoadModule('PedidosProveedor_plugin.bpl'); + LoadModule('AlbaranesProveedor_plugin.bpl');} {$ENDIF} LoadModule('RecibosProveedor_plugin.bpl'); @@ -52,10 +52,10 @@ begin LoadModule('RemesasProveedor_plugin.bpl'); {$IFDEF ALMACEN} - LoadModule('Inventario_plugin.bpl'); - LoadModule('HistoricoMovimientos_plugin.bpl'); +{ LoadModule('Inventario_plugin.bpl'); + LoadModule('HistoricoMovimientos_plugin.bpl');} {$ENDIF} - + LoadModule('Ejercicios_plugin.bpl'); LoadModule('Contabilidad_plugin.bpl'); end; diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm index 5f5482c3..6abc0ca9 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm @@ -6,7 +6,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente ClientWidth = 765 OnClose = CustomEditorClose ExplicitWidth = 773 - ExplicitHeight = 612 + ExplicitHeight = 619 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -149,6 +149,8 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente Height = 406 TabOrder = 1 OnChanging = pgPaginasChanging + ExplicitLeft = 3 + ExplicitTop = 79 ExplicitWidth = 759 ExplicitHeight = 406 inherited pagGeneral: TTabSheet @@ -190,7 +192,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente end inherited TBXDock1: TTBXDock Width = 751 - ExplicitWidth = 757 + ExplicitWidth = 751 inherited TBXToolbar1: TTBXToolbar ExplicitWidth = 548 end @@ -218,7 +220,7 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente ExplicitHeight = 378 inherited pnlSup: TPanel Width = 751 - ExplicitWidth = 757 + ExplicitWidth = 751 inherited eIncidenciaActiva: TcxDBCheckBox ExplicitHeight = 21 end @@ -281,20 +283,20 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente ExplicitWidth = 73 end inherited Bevel3: TBevel - Left = 369 + Left = 368 Top = 11 Width = 7 Height = 54 - ExplicitLeft = 369 + ExplicitLeft = 368 ExplicitTop = 11 ExplicitWidth = 7 ExplicitHeight = 54 end inherited Bevel4: TBevel - Left = 485 + Left = 484 Top = 92 Width = 192 - ExplicitLeft = 485 + ExplicitLeft = 484 ExplicitTop = 92 ExplicitWidth = 192 end @@ -308,20 +310,20 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente Width = 93 end inherited ImporteIVA: TcxDBCurrencyEdit - Left = 556 + Left = 555 Top = 38 DataBinding.DataField = '' Style.IsFontAssigned = True - ExplicitLeft = 556 + ExplicitLeft = 555 ExplicitTop = 38 ExplicitWidth = 137 Width = 137 end inherited ImporteTotal: TcxDBCurrencyEdit - Left = 486 + Left = 485 Top = 112 Style.IsFontAssigned = True - ExplicitLeft = 486 + ExplicitLeft = 485 ExplicitTop = 112 ExplicitWidth = 137 Width = 137 @@ -334,36 +336,36 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente ExplicitTop = 112 end inherited edtIVA: TcxDBSpinEdit - Left = 485 + Left = 484 Top = 38 DataBinding.DataField = '' Style.IsFontAssigned = True - ExplicitLeft = 485 + ExplicitLeft = 484 ExplicitTop = 38 end inherited ImporteBase: TcxDBCurrencyEdit - Left = 485 + Left = 484 Top = 11 Style.IsFontAssigned = True - ExplicitLeft = 485 + ExplicitLeft = 484 ExplicitTop = 11 ExplicitWidth = 92 Width = 92 end inherited edtRE: TcxDBSpinEdit - Left = 485 + Left = 484 Top = 65 DataBinding.DataField = '' Style.IsFontAssigned = True - ExplicitLeft = 485 + ExplicitLeft = 484 ExplicitTop = 65 end inherited ImporteRE: TcxDBCurrencyEdit - Left = 556 + Left = 555 Top = 65 DataBinding.DataField = '' Style.IsFontAssigned = True - ExplicitLeft = 556 + ExplicitLeft = 555 ExplicitTop = 65 ExplicitWidth = 56 Width = 56 @@ -397,9 +399,9 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente Width = 81 end inherited bTiposIVA: TButton - Left = 221 + Left = 220 Top = 38 - ExplicitLeft = 221 + ExplicitLeft = 220 ExplicitTop = 38 end inherited cbRecargoEquivalencia: TcxDBCheckBox diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas index 38ba2cb5..2e635e8f 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas @@ -133,8 +133,6 @@ begin end; procedure TfEditorAlbaranCliente.FormShow(Sender: TObject); -var -i:Integer; begin inherited; diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm index c83ab354..449e1e6f 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm @@ -123,32 +123,9 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente end end inherited pgPaginas: TPageControl - ExplicitLeft = 3 - ExplicitTop = 79 - ExplicitWidth = 759 - ExplicitHeight = 406 - inherited pagGeneral: TTabSheet - ExplicitWidth = 751 - ExplicitHeight = 378 - end - inherited pagContenido: TTabSheet - inherited frViewDetallesAlbaranCliente1: TfrViewDetallesAlbaranCliente - inherited TBXDock1: TTBXDock - ExplicitWidth = 751 - end - end - end inherited pagInicidencias: TTabSheet - ExplicitLeft = 4 - ExplicitTop = 24 - ExplicitWidth = 751 - ExplicitHeight = 378 inherited frViewIncidenciasCli: TfrViewIncidencias - ExplicitWidth = 751 - ExplicitHeight = 378 inherited GroupBox1: TGroupBox - ExplicitWidth = 751 - ExplicitHeight = 350 inherited eIncidencias: TcxDBMemo ExplicitWidth = 726 ExplicitHeight = 319 @@ -167,15 +144,15 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente ExplicitWidth = 73 end inherited Bevel3: TBevel - Left = 332 + Left = 331 Height = 54 - ExplicitLeft = 332 + ExplicitLeft = 331 ExplicitHeight = 54 end inherited Bevel4: TBevel - Left = 448 + Left = 447 Width = 285 - ExplicitLeft = 448 + ExplicitLeft = 447 ExplicitWidth = 285 end inherited ImporteDto: TcxDBCurrencyEdit @@ -184,16 +161,16 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente Width = 93 end inherited ImporteIVA: TcxDBCurrencyEdit - Left = 519 + Left = 518 Style.IsFontAssigned = True - ExplicitLeft = 519 + ExplicitLeft = 518 ExplicitWidth = 214 Width = 214 end inherited ImporteTotal: TcxDBCurrencyEdit - Left = 449 + Left = 448 Style.IsFontAssigned = True - ExplicitLeft = 449 + ExplicitLeft = 448 ExplicitWidth = 284 Width = 284 end @@ -201,26 +178,26 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente Style.IsFontAssigned = True end inherited edtIVA: TcxDBSpinEdit - Left = 448 + Left = 447 Style.IsFontAssigned = True - ExplicitLeft = 448 + ExplicitLeft = 447 end inherited ImporteBase: TcxDBCurrencyEdit - Left = 448 + Left = 447 Style.IsFontAssigned = True - ExplicitLeft = 448 + ExplicitLeft = 447 ExplicitWidth = 285 Width = 285 end inherited edtRE: TcxDBSpinEdit - Left = 448 + Left = 447 Style.IsFontAssigned = True - ExplicitLeft = 448 + ExplicitLeft = 447 end inherited ImporteRE: TcxDBCurrencyEdit - Left = 519 + Left = 518 Style.IsFontAssigned = True - ExplicitLeft = 519 + ExplicitLeft = 518 ExplicitWidth = 214 Width = 214 end @@ -239,8 +216,8 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente Width = 81 end inherited bTiposIVA: TButton - Left = 184 - ExplicitLeft = 184 + Left = 183 + ExplicitLeft = 183 end inherited cbRecargoEquivalencia: TcxDBCheckBox ExplicitWidth = 219 diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm index d4e41ffd..51b8b251 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.dfm @@ -14,7 +14,6 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente ParentBackground = True TabOrder = 0 AutoContentSizes = [acsWidth, acsHeight] - ExplicitWidth = 822 DesignSize = ( 825 620) @@ -56,7 +55,7 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente end object memObservaciones: TcxDBMemo Left = 22 - Top = 469 + Top = 464 Anchors = [akLeft, akTop, akRight, akBottom] DataBinding.DataField = 'OBSERVACIONES' DataBinding.DataSource = DADataSource @@ -527,9 +526,8 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente inline frViewTienda1: TfrViewTienda Left = 430 Top = 387 - Width = 822 - Height = 46 - Align = alBottom + Width = 451 + Height = 41 Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText Font.Height = -11 @@ -540,15 +538,10 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente ReadOnly = False ExplicitLeft = 430 ExplicitTop = 387 - ExplicitWidth = 822 inherited dxLayoutControl1: TdxLayoutControl - Width = 822 - ExplicitWidth = 822 - inherited cbTienda: TcxDBComboBox - DataBinding.DataSource = DADataSource - Properties.OnChange = frViewTienda1cbTiendaPropertiesChange - ExplicitWidth = 412 - Width = 412 + inherited cbTienda: TcxComboBox + ExplicitWidth = 376 + Width = 376 end end end @@ -742,6 +735,8 @@ inherited frViewAlbaranCliente: TfrViewAlbaranCliente object dxLayoutControl1Group17: TdxLayoutGroup Caption = 'El albar'#225'n pertenece a la tienda' object dxLayoutControl1Item17: TdxLayoutItem + Caption = 'New Item' + ShowCaption = False Control = frViewTienda1 ControlOptions.AutoColor = True ControlOptions.ShowBorder = False diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas index 3c3b254c..736efd57 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas +++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranCliente.pas @@ -105,9 +105,9 @@ type dxLayoutControl1Item21: TdxLayoutItem; eFechaEnvio: TcxDBDateEdit; dxLayoutControl1Group16: TdxLayoutGroup; - dxLayoutControl1Item17: TdxLayoutItem; - frViewTienda1: TfrViewTienda; dxLayoutControl1Group17: TdxLayoutGroup; + frViewTienda1: TfrViewTienda; + dxLayoutControl1Item17: TdxLayoutItem; procedure CustomViewCreate(Sender: TObject); procedure CustomViewDestroy(Sender: TObject); procedure actElegirDireccionExecute(Sender: TObject); @@ -127,7 +127,6 @@ type procedure frViewClienteAlbaranButton1Click(Sender: TObject); procedure frViewClienteAlbaranButton2Click(Sender: TObject); procedure frViewClienteAlbaranactAnadirContactoUpdate(Sender: TObject); - procedure frViewTienda1cbTiendaPropertiesChange(Sender: TObject); protected FAlbaran : IBizAlbaranCliente; @@ -161,7 +160,7 @@ implementation uses uClientesController, uBizDireccionesContacto, schAlbaranesClienteClient_Intf, uBizAlmacenes, uDateUtils, - uDialogUtils; + uDialogUtils, uFactuGES_App; procedure TfrViewAlbaranCliente.actElegirDireccionExecute(Sender: TObject); @@ -243,6 +242,8 @@ begin end; procedure TfrViewAlbaranCliente.CustomViewCreate(Sender: TObject); +var + i : integer; begin inherited; FFormasPago := Nil; @@ -358,16 +359,6 @@ begin frViewClienteAlbaran.actAnadirContacto.Execute; end; -procedure TfrViewAlbaranCliente.frViewTienda1cbTiendaPropertiesChange(Sender: TObject); -begin - inherited; - if assigned(Albaran) - and assigned(Controller) then - begin - Controller.SetID_Tienda(Albaran, frViewTienda1.getIDTienda); - end; -end; - function TfrViewAlbaranCliente.GetAlbaran: IBizAlbaranCliente; begin Result := FAlbaran; @@ -389,6 +380,7 @@ begin if Assigned(FAlbaran) then begin DADataSource.DataTable := FAlbaran.DataTable; + frViewTienda1.DataItem := FAlbaran.DataTable; frViewClienteAlbaran.Cliente := FAlbaran.Cliente; FFormasPago := FFormasPagoController.BuscarTodos; diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranDevProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranDevProveedor.dfm index f7ed3d57..5366f6b1 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranDevProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranDevProveedor.dfm @@ -123,17 +123,7 @@ inherited fEditorAlbaranDevProveedor: TfEditorAlbaranDevProveedor end end inherited pgPaginas: TPageControl - inherited pagGeneral: TTabSheet - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 - end inherited pagInicidencias: TTabSheet - ExplicitLeft = 4 - ExplicitTop = 24 - ExplicitWidth = 757 - ExplicitHeight = 432 inherited frViewIncidenciasCli: TfrViewIncidencias inherited GroupBox1: TGroupBox inherited eIncidencias: TcxDBMemo @@ -149,32 +139,14 @@ inherited fEditorAlbaranDevProveedor: TfEditorAlbaranDevProveedor inherited frViewTotales1: TfrViewTotales inherited dxLayoutControl1: TdxLayoutControl LookAndFeel = dxLayoutOfficeLookAndFeel1 - inherited Bevel1: TBevel - Width = 73 - ExplicitWidth = 73 - end - inherited Bevel3: TBevel - Height = 30 - ExplicitHeight = 30 - end - inherited Bevel4: TBevel - Width = 21 - ExplicitWidth = 21 - end inherited ImporteDto: TcxDBCurrencyEdit Style.IsFontAssigned = True - ExplicitWidth = 93 - Width = 93 end inherited ImporteIVA: TcxDBCurrencyEdit Style.IsFontAssigned = True - ExplicitWidth = 137 - Width = 137 end inherited ImporteTotal: TcxDBCurrencyEdit Style.IsFontAssigned = True - ExplicitWidth = 137 - Width = 137 end inherited edtDescuento: TcxDBSpinEdit Style.IsFontAssigned = True @@ -184,34 +156,18 @@ inherited fEditorAlbaranDevProveedor: TfEditorAlbaranDevProveedor end inherited ImporteBase: TcxDBCurrencyEdit Style.IsFontAssigned = True - ExplicitWidth = 92 - Width = 92 end inherited edtRE: TcxDBSpinEdit Style.IsFontAssigned = True end inherited ImporteRE: TcxDBCurrencyEdit Style.IsFontAssigned = True - ExplicitWidth = 56 - Width = 56 end inherited eImporteNeto: TcxDBCurrencyEdit Style.IsFontAssigned = True - ExplicitWidth = 147 - Width = 147 end inherited ePorte: TcxDBCurrencyEdit Style.IsFontAssigned = True - ExplicitWidth = 147 - Width = 147 - end - inherited eIVA: TcxDBLookupComboBox - ExplicitWidth = 81 - Width = 81 - end - inherited cbRecargoEquivalencia: TcxDBCheckBox - ExplicitWidth = 219 - Width = 219 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 e330d00f..52debd11 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranDevProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranDevProveedor.pas @@ -10,7 +10,8 @@ uses JvStatusBar, uViewIncidencias, uViewDetallesBase, uViewDetallesDTO, uViewDetallesArticulos, uViewDetallesAlbaranProveedor, uCustomView, uViewBase, uViewAlbaranProveedor, TBX, TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, - JvExControls, JvComponent, JvNavigationPane, uIEditorAlbaranDevProveedor; + JvExControls, JvComponent, JvNavigationPane, uIEditorAlbaranDevProveedor, + uDAInterfaces; type TfEditorAlbaranDevProveedor = class(TfEditorAlbaranProveedor, IEditorAlbaranDevProveedor) diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm index a23bea76..3c1b84a9 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.dfm @@ -6,7 +6,7 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor ClientWidth = 765 OnClose = CustomEditorClose ExplicitWidth = 773 - ExplicitHeight = 646 + ExplicitHeight = 653 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -147,16 +147,17 @@ inherited fEditorAlbaranProveedor: TfEditorAlbaranProveedor inherited pgPaginas: TPageControl Width = 759 Height = 454 - ActivePage = pagContenido TabOrder = 1 OnChanging = pgPaginasChanging + ExplicitLeft = 3 + ExplicitTop = 79 ExplicitWidth = 759 ExplicitHeight = 454 inherited pagGeneral: TTabSheet ExplicitLeft = 4 ExplicitTop = 24 - ExplicitWidth = 757 - ExplicitHeight = 432 + ExplicitWidth = 751 + ExplicitHeight = 426 end object pagContenido: TTabSheet Caption = 'Contenido' diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.pas index d54fd26a..e8066152 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorAlbaranProveedor.pas @@ -204,6 +204,7 @@ begin frViewDetallesAlbaranProveedor1.BeginUpdate; try bEsNuevo := FAlbaran.EsNuevo; + FController.SetID_Tienda(FAlbaran, TfrViewAlbaranProveedor(ViewAlbaran).frViewTienda1.getIDTienda); FController.Guardar(FAlbaran); finally frViewDetallesAlbaranProveedor1.EndUpdate; diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranDevProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranDevProveedor.dfm index 1d97ed99..51edff5e 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranDevProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranDevProveedor.dfm @@ -7,20 +7,14 @@ inherited frViewAlbaranDevProveedor: TfrViewAlbaranDevProveedor inherited edtFechaAlbaran: TcxDBDateEdit Left = 114 ExplicitLeft = 114 - ExplicitWidth = 119 - Width = 119 end inherited memObservaciones: TcxDBMemo - ExplicitWidth = 186 - ExplicitHeight = 162 - Height = 162 - Width = 186 + ExplicitHeight = 61 + Height = 61 end inherited eReferencia: TcxDBTextEdit Left = 114 ExplicitLeft = 114 - ExplicitWidth = 143 - Width = 143 end inherited frViewProveedorAlbaran: TfrViewDatosYSeleccionProveedor inherited dxLayoutControl1: TdxLayoutControl @@ -47,37 +41,13 @@ inherited frViewAlbaranDevProveedor: TfrViewAlbaranDevProveedor end end inherited frViewDireccionEntregaAlbaranProv1: TfrViewDireccionEntregaAlbaranProv - Width = 445 - Height = 175 - ExplicitWidth = 445 - ExplicitHeight = 175 inherited dxLayoutControl1: TdxLayoutControl - Width = 445 - Height = 175 - inherited rdxDestino1: TRadioButton - Width = 255 - ExplicitWidth = 255 - end - inherited rdxDestino2: TRadioButton - Width = 287 - ExplicitWidth = 287 - end - inherited cbLista: TcxDBLookupComboBox - ExplicitWidth = 425 - Width = 425 - end inherited bModificar: TBitBtn - Left = 109 + Left = 199 Top = 109 - ExplicitLeft = 109 + ExplicitLeft = 199 ExplicitTop = 109 end - inherited txtDireccion: TStaticText - Width = 549 - Height = 110 - ExplicitWidth = 549 - ExplicitHeight = 110 - end inherited dxLayoutGroup1: TdxLayoutGroup inherited dxLayoutItem1: TdxLayoutItem Visible = False @@ -97,8 +67,6 @@ inherited frViewAlbaranDevProveedor: TfrViewAlbaranDevProveedor inherited cbFormaPago: TcxDBLookupComboBox Left = 114 ExplicitLeft = 114 - ExplicitWidth = 90 - Width = 90 end inherited eReferenciaPedidoCli: TcxTextEdit Left = 114 @@ -107,16 +75,16 @@ inherited frViewAlbaranDevProveedor: TfrViewAlbaranDevProveedor Width = 69 end inherited eRefFactura: TcxDBTextEdit - ExplicitWidth = 172 - Width = 172 + ExplicitWidth = 262 + Width = 262 end inherited eReferenciaProveedor: TcxDBTextEdit - ExplicitWidth = 172 - Width = 172 + ExplicitWidth = 262 + Width = 262 end inherited eReferenciaFacturaProveedor: TcxDBTextEdit - ExplicitWidth = 172 - Width = 172 + ExplicitWidth = 262 + Width = 262 end inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group6: TdxLayoutGroup diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranDevProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranDevProveedor.pas index 31428187..bf45ec9a 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranDevProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranDevProveedor.pas @@ -8,7 +8,8 @@ uses dxLayoutControl, cxTextEdit, StdCtrls, cxDropDownEdit, cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, uViewDireccionEntregaAlbaranProv, uCustomView, uViewBase, uViewDatosYSeleccionProveedor, cxDBEdit, cxMemo, - cxContainer, cxEdit, cxMaskEdit, cxCalendar, cxControls; + cxContainer, cxEdit, cxMaskEdit, cxCalendar, cxControls, uDAInterfaces, + uViewTienda; type IViewAlbaranDevProveedor = interface(IViewAlbaranProveedor) diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm index 6ba7c909..83efeeb1 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.dfm @@ -14,7 +14,6 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor ParentBackground = True TabOrder = 0 AutoContentSizes = [acsWidth, acsHeight] - ExplicitWidth = 827 DesignSize = ( 723 585) @@ -41,7 +40,7 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor Width = 119 end object memObservaciones: TcxDBMemo - Left = 512 + Left = 416 Top = 276 Anchors = [akLeft, akTop, akRight, akBottom] DataBinding.DataField = 'OBSERVACIONES' @@ -81,7 +80,7 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor Width = 143 end inline frViewProveedorAlbaran: TfrViewDatosYSeleccionProveedor - Left = 512 + Left = 416 Top = 28 Width = 350 Height = 212 @@ -93,7 +92,7 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor ParentFont = False TabOrder = 11 ReadOnly = False - ExplicitLeft = 512 + ExplicitLeft = 416 ExplicitTop = 28 ExplicitHeight = 212 inherited dxLayoutControl1: TdxLayoutControl @@ -144,7 +143,7 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor end inline frViewDireccionEntregaAlbaranProv1: TfrViewDireccionEntregaAlbaranProv Left = 22 - Top = 331 + Top = 317 Width = 445 Height = 175 Font.Charset = DEFAULT_CHARSET @@ -156,7 +155,7 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor TabOrder = 10 ReadOnly = False ExplicitLeft = 22 - ExplicitTop = 331 + ExplicitTop = 317 ExplicitWidth = 445 ExplicitHeight = 175 inherited dxLayoutControl1: TdxLayoutControl @@ -177,10 +176,10 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor Width = 425 end inherited bModificar: TBitBtn - Left = 322 - Top = 197 - ExplicitLeft = 322 - ExplicitTop = 197 + Left = 226 + Top = 211 + ExplicitLeft = 226 + ExplicitTop = 211 end inherited txtDireccion: TStaticText Height = 110 @@ -223,7 +222,7 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor Width = 90 end object bFormasPago: TButton - Left = 350 + Left = 254 Top = 192 Width = 132 Height = 21 @@ -255,7 +254,7 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor Width = 122 end object Button1: TButton - Left = 350 + Left = 254 Top = 109 Width = 132 Height = 23 @@ -337,9 +336,8 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor inline frViewTienda1: TfrViewTienda Left = 22 Top = 249 - Width = 827 - Height = 46 - Align = alBottom + Width = 366 + Height = 32 Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText Font.Height = -11 @@ -350,15 +348,13 @@ inherited frViewAlbaranProveedor: TfrViewAlbaranProveedor ReadOnly = False ExplicitLeft = 22 ExplicitTop = 249 - ExplicitWidth = 827 + ExplicitWidth = 366 + ExplicitHeight = 32 inherited dxLayoutControl1: TdxLayoutControl - Width = 827 - ExplicitWidth = 827 - inherited cbTienda: TcxDBComboBox - DataBinding.DataSource = DADataSource - Properties.OnChange = frViewTienda1cbTiendaPropertiesChange - ExplicitWidth = 300 - Width = 300 + Width = 366 + inherited cbTienda: TcxComboBox + ExplicitWidth = 376 + Width = 376 end end end diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.pas index 81396f5c..7732f1df 100644 --- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.pas +++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranProveedor.pas @@ -86,7 +86,6 @@ type procedure frViewProveedorAlbaranactAnadirContactoUpdate(Sender: TObject); procedure actElegirDireccionUpdate(Sender: TObject); procedure actVerPedidoUpdate(Sender: TObject); - procedure frViewTienda1cbTiendaPropertiesChange(Sender: TObject); protected FAlbaran : IBizAlbaranProveedor; @@ -234,16 +233,6 @@ begin frViewProveedorAlbaran.actAnadirContacto.Execute; end; -procedure TfrViewAlbaranProveedor.frViewTienda1cbTiendaPropertiesChange(Sender: TObject); -begin - inherited; - if assigned(Albaran) - and assigned(Controller) then - begin - Controller.SetID_Tienda(Albaran, frViewTienda1.getIDTienda); - end; -end; - function TfrViewAlbaranProveedor.GetAlbaran: IBizAlbaranProveedor; begin Result := FAlbaran; @@ -265,6 +254,7 @@ begin if Assigned(FAlbaran) then begin DADataSource.DataTable := FAlbaran.DataTable; + frViewTienda1.DataItem := FAlbaran.DataTable; FFormasPago := FFormasPagoController.BuscarTodos; dsFormaPago.DataTable := FFormasPago.DataTable; diff --git a/Source/Modulos/Contactos/Controller/uEmpleadosController.pas b/Source/Modulos/Contactos/Controller/uEmpleadosController.pas index d02262d2..26cee6da 100644 --- a/Source/Modulos/Contactos/Controller/uEmpleadosController.pas +++ b/Source/Modulos/Contactos/Controller/uEmpleadosController.pas @@ -3,7 +3,7 @@ unit uEmpleadosController; interface uses - uCustomEditor, + Classes, uCustomEditor, uContactosController, uBizContactos, uIEditorEmpleados, uIEditorEmpleado, uIDataModuleContactos, uIDataModuleEmpleados; @@ -18,6 +18,7 @@ type procedure Preview(AEmpleado : IBizEmpleado; AllItems: Boolean = false); procedure Print(AEmpleado : IBizEmpleado; AllItems: Boolean = false); function BuscarVendedores: IBizContacto; + function DarListaVendedores : TStringList; end; TEmpleadosController = class(TContactosController, IEmpleadosController) @@ -33,6 +34,8 @@ type procedure Ver(AContacto : IBizContacto); override; procedure VerTodos(AContactos: IBizContacto); override; + function DarListaVendedores : TStringList; + function Eliminar(AEmpleado: IBizContacto; AllItems: Boolean = false): Boolean; overload; function EsEliminable(AEmpleado: IBizContacto): Boolean; @@ -43,7 +46,7 @@ type implementation uses - Classes, Windows, SysUtils, cxControls, Dialogs, uDataModuleEmpleados, uEditorRegistryUtils, + Windows, SysUtils, cxControls, Dialogs, uDataModuleEmpleados, uEditorRegistryUtils, uDataTableUtils, uDADataTable, DB, schContactosClient_Intf, uFichasEmpleadoReportController, uEditorGridBase, uDAInterfaces; @@ -90,6 +93,30 @@ begin FDataModule := TDataModuleEmpleados.Create(Nil); end; +function TEmpleadosController.DarListaVendedores: TStringList; +var + AVendedores: IBizContacto; + i : integer; +begin + AVendedores := BuscarVendedores; + AVendedores.DataTable.Active := True; + + Result := TStringList.Create; + try + with Result do + begin + AVendedores.DataTable.First; + while not AVendedores.DataTable.EOF do + begin + Add(Format('%s=%d', [AVendedores.NOMBRE, AVendedores.ID])); + AVendedores.DataTable.Next; + end; + end; + finally + AVendedores := NIL; + end; +end; + function TEmpleadosController.Duplicar(AContacto: IBizContacto): IBizContacto; begin Result := inherited Duplicar(AContacto); diff --git a/Source/Modulos/Contactos/Views/Contactos_view.dproj b/Source/Modulos/Contactos/Views/Contactos_view.dproj index 98fdad74..0f558ca0 100644 --- a/Source/Modulos/Contactos/Views/Contactos_view.dproj +++ b/Source/Modulos/Contactos/Views/Contactos_view.dproj @@ -49,31 +49,31 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +
fEditorCliente
diff --git a/Source/Modulos/Contactos/Views/uEditorCliente.dfm b/Source/Modulos/Contactos/Views/uEditorCliente.dfm index 08dab8af..364f8eb6 100644 --- a/Source/Modulos/Contactos/Views/uEditorCliente.dfm +++ b/Source/Modulos/Contactos/Views/uEditorCliente.dfm @@ -11,7 +11,7 @@ inherited fEditorCliente: TfEditorCliente inherited JvNavPanelHeader: TJvNavPanelHeader Width = 896 Caption = 'Ficha de cliente' - ExplicitWidth = 656 + ExplicitWidth = 896 inherited Image1: TImage Left = 869 Picture.Data = { @@ -50,7 +50,7 @@ inherited fEditorCliente: TfEditorCliente end inherited TBXDock: TTBXDock Width = 896 - ExplicitWidth = 656 + ExplicitWidth = 896 inherited tbxMain: TTBXToolbar ExplicitWidth = 446 object TBXItem7: TTBXItem [7] @@ -65,11 +65,11 @@ inherited fEditorCliente: TfEditorCliente inherited pgPaginas: TPageControl Width = 890 Height = 544 - ExplicitWidth = 650 - ExplicitHeight = 484 + ExplicitWidth = 890 + ExplicitHeight = 544 inherited pagGeneral: TTabSheet - ExplicitWidth = 642 - ExplicitHeight = 456 + ExplicitWidth = 882 + ExplicitHeight = 516 inline frViewCliente1: TfrViewCliente Left = 0 Top = 0 @@ -84,14 +84,14 @@ inherited fEditorCliente: TfEditorCliente ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 642 - ExplicitHeight = 456 + ExplicitWidth = 882 + ExplicitHeight = 516 inherited dxLayoutControlContacto: TdxLayoutControl Width = 882 Height = 516 LookAndFeel = dxLayoutOfficeLookAndFeel - ExplicitWidth = 642 - ExplicitHeight = 456 + ExplicitWidth = 882 + ExplicitHeight = 516 inherited PngSpeedButton1: TPngSpeedButton Left = 837 Top = 218 @@ -112,10 +112,10 @@ inherited fEditorCliente: TfEditorCliente end inherited Label1: TLabel Left = 586 - Top = 352 + Top = 341 Width = 269 ExplicitLeft = 586 - ExplicitTop = 352 + ExplicitTop = 341 ExplicitWidth = 269 end inherited eCalle: TcxDBTextEdit @@ -176,9 +176,9 @@ inherited fEditorCliente: TfEditorCliente end inherited cxDBCheckBox1: TcxDBCheckBox Left = 586 - Top = 397 + Top = 386 ExplicitLeft = 586 - ExplicitTop = 397 + ExplicitTop = 386 ExplicitWidth = 272 Width = 272 end @@ -284,11 +284,9 @@ inherited fEditorCliente: TfEditorCliente ExplicitLeft = 586 ExplicitTop = 270 inherited dxLayoutControl1: TdxLayoutControl - ExplicitWidth = 270 - inherited cbTienda: TcxDBComboBox - DataBinding.DataSource = frViewCliente1.dsContacto - ExplicitWidth = 412 - Width = 412 + inherited cbTienda: TcxComboBox + ExplicitWidth = 376 + Width = 376 end end end @@ -300,17 +298,17 @@ inherited fEditorCliente: TfEditorCliente end end inherited pagDatosBancarios: TTabSheet - ExplicitWidth = 642 - ExplicitHeight = 456 + ExplicitWidth = 882 + ExplicitHeight = 516 inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios Width = 882 Height = 516 - ExplicitWidth = 642 - ExplicitHeight = 456 + ExplicitWidth = 882 + ExplicitHeight = 516 inherited dxLayoutControl1: TdxLayoutControl Width = 882 LookAndFeel = dxLayoutOfficeLookAndFeel - ExplicitWidth = 642 + ExplicitWidth = 882 inherited eEntidad: TcxDBTextEdit ExplicitWidth = 114 Width = 114 @@ -335,8 +333,6 @@ inherited fEditorCliente: TfEditorCliente object pagDatosComerciales: TTabSheet Caption = 'Datos comerciales' ImageIndex = 4 - ExplicitWidth = 642 - ExplicitHeight = 456 inline frViewClienteDatosComerciales1: TfrViewClienteDatosComerciales Left = 0 Top = 0 @@ -351,12 +347,12 @@ inherited fEditorCliente: TfEditorCliente ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 642 + ExplicitWidth = 882 ExplicitHeight = 193 inherited dxLayoutControl1: TdxLayoutControl Width = 882 LookAndFeel = dxLayoutOfficeLookAndFeel - ExplicitWidth = 642 + ExplicitWidth = 882 inherited Label1: TLabel Left = 492 Top = 30 @@ -425,8 +421,6 @@ inherited fEditorCliente: TfEditorCliente object pagDirecciones: TTabSheet Caption = 'Direcciones' ImageIndex = 1 - ExplicitWidth = 642 - ExplicitHeight = 456 inline frViewDireccionesEntrega1: TfrViewDireccionesEntrega Left = 0 Top = 0 @@ -441,13 +435,13 @@ inherited fEditorCliente: TfEditorCliente ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 642 - ExplicitHeight = 456 + ExplicitWidth = 882 + ExplicitHeight = 516 inherited cxGrid: TcxGrid Width = 882 Height = 491 - ExplicitWidth = 642 - ExplicitHeight = 431 + ExplicitWidth = 882 + ExplicitHeight = 491 inherited cxGridView: TcxGridDBTableView inherited cxGridViewID: TcxGridDBColumn SortIndex = 0 @@ -457,7 +451,19 @@ inherited fEditorCliente: TfEditorCliente end inherited ToolBar1: TToolBar Width = 882 - ExplicitWidth = 642 + ExplicitWidth = 882 + inherited ToolButton1: TToolButton + ExplicitWidth = 113 + end + inherited ToolButton4: TToolButton + ExplicitWidth = 113 + end + inherited ToolButton2: TToolButton + ExplicitWidth = 113 + end + inherited ToolButton7: TToolButton + ExplicitWidth = 113 + end end end end @@ -465,8 +471,6 @@ inherited fEditorCliente: TfEditorCliente Caption = 'Descuentos' ImageIndex = 2 TabVisible = False - ExplicitWidth = 642 - ExplicitHeight = 456 inline frViewClienteDescuentos1: TfrViewClienteDescuentos Left = 0 Top = 0 @@ -481,43 +485,27 @@ inherited fEditorCliente: TfEditorCliente ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 642 - ExplicitHeight = 456 + ExplicitWidth = 882 + ExplicitHeight = 516 inherited cxGrid: TcxGrid Width = 882 Height = 491 - ExplicitWidth = 642 - ExplicitHeight = 431 + ExplicitWidth = 882 + ExplicitHeight = 491 end inherited ToolBar1: TToolBar Width = 882 - ExplicitWidth = 642 + ExplicitWidth = 882 inherited ToolButton1: TToolButton - Top = 0 - ExplicitTop = 0 ExplicitWidth = 62 end inherited ToolButton4: TToolButton - Top = 0 - ExplicitTop = 0 ExplicitWidth = 74 end - inherited ToolButton5: TToolButton - Top = 0 - ExplicitTop = 0 - end inherited ToolButton2: TToolButton - Top = 0 - ExplicitTop = 0 ExplicitWidth = 67 end - inherited ToolButton6: TToolButton - Top = 0 - ExplicitTop = 0 - end inherited ToolButton7: TToolButton - Top = 0 - ExplicitTop = 0 ExplicitWidth = 117 end end @@ -526,8 +514,6 @@ inherited fEditorCliente: TfEditorCliente object pagContabilidad: TTabSheet Caption = 'Contabilidad' ImageIndex = 5 - ExplicitWidth = 642 - ExplicitHeight = 456 inline frViewSubCuentaContacto1: TfrViewSubCuentaContacto Left = 0 Top = 0 @@ -543,13 +529,13 @@ inherited fEditorCliente: TfEditorCliente ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 642 - ExplicitHeight = 456 + ExplicitWidth = 882 + ExplicitHeight = 516 inherited layoutApunte: TdxLayoutControl Width = 882 Height = 516 - ExplicitWidth = 642 - ExplicitHeight = 456 + ExplicitWidth = 882 + ExplicitHeight = 516 inherited eRefSubCuenta: TcxDBTextEdit ExplicitWidth = 346 Width = 346 @@ -582,8 +568,8 @@ inherited fEditorCliente: TfEditorCliente inherited StatusBar: TJvStatusBar Top = 626 Width = 896 - ExplicitTop = 566 - ExplicitWidth = 656 + ExplicitTop = 626 + ExplicitWidth = 896 end inherited EditorActionList: TActionList object actGruposCliente: TAction diff --git a/Source/Modulos/Contactos/Views/uEditorContacto.pas b/Source/Modulos/Contactos/Views/uEditorContacto.pas index bc113598..5da23b45 100644 --- a/Source/Modulos/Contactos/Views/uEditorContacto.pas +++ b/Source/Modulos/Contactos/Views/uEditorContacto.pas @@ -53,7 +53,7 @@ implementation {$R *.dfm} uses - uFactuGES_App, uCustomEditor, uDataModuleContactos, + cxControls, uFactuGES_App, uCustomEditor, uDataModuleContactos, uDMBase, uDataModuleUsuarios; { @@ -77,8 +77,13 @@ end; procedure TfEditorContacto.GuardarInterno; begin inherited; - FController.Guardar(FContacto); - Modified := False; + ShowHourglassCursor; + try + FController.Guardar(FContacto); + Modified := False; + finally + HideHourglassCursor; + end; end; procedure TfEditorContacto.PonerTitulos(const ATitulo: string); diff --git a/Source/Modulos/Contactos/Views/uEditorDireccion.pas b/Source/Modulos/Contactos/Views/uEditorDireccion.pas index dd882276..480fa855 100644 --- a/Source/Modulos/Contactos/Views/uEditorDireccion.pas +++ b/Source/Modulos/Contactos/Views/uEditorDireccion.pas @@ -6,7 +6,7 @@ uses Windows, SysUtils, Classes, Graphics, Forms, Controls, StdCtrls, Buttons, ExtCtrls, Mask, DBCtrls, DB, uDADataTable, PngSpeedButton, cxControls, cxContainer, cxEdit, cxTextEdit, cxHyperLinkEdit, cxDBEdit, uIEditorDireccionContacto, uDireccionesContactoController, uBizDireccionesContacto, - cxCurrencyEdit; + cxCurrencyEdit, uDAInterfaces; type TfEditorDireccion = class(TForm, IEditorEditorDireccion) diff --git a/Source/Modulos/Contactos/Views/uEditorElegirProveedores.dfm b/Source/Modulos/Contactos/Views/uEditorElegirProveedores.dfm index 292bd0b9..8dfc0d23 100644 --- a/Source/Modulos/Contactos/Views/uEditorElegirProveedores.dfm +++ b/Source/Modulos/Contactos/Views/uEditorElegirProveedores.dfm @@ -3,7 +3,7 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores ClientHeight = 480 ClientWidth = 656 ExplicitWidth = 664 - ExplicitHeight = 507 + ExplicitHeight = 514 PixelsPerInch = 96 TextHeight = 13 object JvgWizardHeader1: TJvgWizardHeader [0] diff --git a/Source/Modulos/Contactos/Views/uEditorEmpleado.dfm b/Source/Modulos/Contactos/Views/uEditorEmpleado.dfm index 91136fca..e80821f5 100644 --- a/Source/Modulos/Contactos/Views/uEditorEmpleado.dfm +++ b/Source/Modulos/Contactos/Views/uEditorEmpleado.dfm @@ -60,7 +60,6 @@ inherited fEditorEmpleado: TfEditorEmpleado inherited pgPaginas: TPageControl Width = 670 Height = 475 - ActivePage = pagFormacion ExplicitWidth = 670 ExplicitHeight = 475 inherited pagGeneral: TTabSheet @@ -107,32 +106,32 @@ inherited fEditorEmpleado: TfEditorEmpleado ExplicitTop = 162 end inherited eCalle: TcxDBTextEdit - Top = 233 - ExplicitTop = 233 + Top = 236 + ExplicitTop = 236 ExplicitWidth = 174 Width = 174 end inherited eProvincia: TcxDBTextEdit - Top = 287 - ExplicitTop = 287 + Top = 290 + ExplicitTop = 290 ExplicitWidth = 174 Width = 174 end inherited ePoblacion: TcxDBTextEdit - Top = 260 - ExplicitTop = 260 + Top = 263 + ExplicitTop = 263 ExplicitWidth = 108 Width = 108 end inherited eCodigoPostal: TcxDBTextEdit - Left = 295 - Top = 260 - ExplicitLeft = 295 - ExplicitTop = 260 + Left = 242 + Top = 263 + ExplicitLeft = 242 + ExplicitTop = 263 end inherited eObservaciones: TcxDBMemo - Top = 338 - ExplicitTop = 338 + Top = 341 + ExplicitTop = 341 ExplicitWidth = 618 ExplicitHeight = 94 Height = 94 @@ -157,33 +156,33 @@ inherited fEditorEmpleado: TfEditorEmpleado Width = 225 end inherited eTlfParticular: TcxDBTextEdit - Left = 483 + Left = 430 Top = 57 - ExplicitLeft = 483 + ExplicitLeft = 430 ExplicitTop = 57 ExplicitWidth = 172 Width = 172 end inherited eTlfTrabajo: TcxDBTextEdit - Left = 483 + Left = 430 Top = 30 - ExplicitLeft = 483 + ExplicitLeft = 430 ExplicitTop = 30 ExplicitWidth = 172 Width = 172 end inherited eTlfMovil: TcxDBTextEdit - Left = 483 + Left = 430 Top = 84 - ExplicitLeft = 483 + ExplicitLeft = 430 ExplicitTop = 84 ExplicitWidth = 172 Width = 172 end inherited eFax: TcxDBTextEdit - Left = 483 + Left = 430 Top = 111 - ExplicitLeft = 483 + ExplicitLeft = 430 ExplicitTop = 111 ExplicitWidth = 172 Width = 172 @@ -195,35 +194,35 @@ inherited fEditorEmpleado: TfEditorEmpleado Width = 263 end inherited eNIFCIF: TcxDBTextEdit - Left = 211 + Left = 186 Top = 30 - ExplicitLeft = 211 + ExplicitLeft = 186 ExplicitTop = 30 ExplicitWidth = 194 Width = 194 end inherited eMailTrabajo: TcxDBHyperLinkEdit - Left = 483 + Left = 430 Top = 162 Properties.Prefix = 'mailto:' - ExplicitLeft = 483 + ExplicitLeft = 430 ExplicitTop = 162 ExplicitWidth = 129 Width = 129 end inherited eMailParticular: TcxDBHyperLinkEdit - Left = 483 + Left = 430 Top = 190 Properties.Prefix = 'mailto:' - ExplicitLeft = 483 + ExplicitLeft = 430 ExplicitTop = 190 ExplicitWidth = 165 Width = 165 end inherited ePaginaWeb: TcxDBHyperLinkEdit - Left = 483 + Left = 430 Top = 217 - ExplicitLeft = 483 + ExplicitLeft = 430 ExplicitTop = 217 ExplicitWidth = 165 Width = 165 @@ -235,26 +234,24 @@ inherited fEditorEmpleado: TfEditorEmpleado Width = 97 end inherited ePersonaContacto: TcxDBTextEdit - Top = 206 - ExplicitTop = 206 + Top = 209 + ExplicitTop = 209 ExplicitWidth = 256 Width = 256 end inherited frViewTienda1: TfrViewTienda - Left = 388 + Left = 335 Top = 270 - Width = 316 - Height = 42 - ExplicitLeft = 388 + Width = 451 + ExplicitLeft = 335 ExplicitTop = 270 - ExplicitWidth = 316 - ExplicitHeight = 42 + ExplicitWidth = 451 inherited dxLayoutControl1: TdxLayoutControl - Width = 316 - inherited cbTienda: TcxDBComboBox - DataBinding.DataSource = frViewEmpleado1.dsContacto - ExplicitWidth = 412 - Width = 412 + Width = 451 + ExplicitWidth = 451 + inherited cbTienda: TcxComboBox + ExplicitWidth = 376 + Width = 376 end end end diff --git a/Source/Modulos/Contactos/Views/uEditorEtiquetasContactosReport.dfm b/Source/Modulos/Contactos/Views/uEditorEtiquetasContactosReport.dfm index 6d9c73c1..1aa2aaa1 100644 --- a/Source/Modulos/Contactos/Views/uEditorEtiquetasContactosReport.dfm +++ b/Source/Modulos/Contactos/Views/uEditorEtiquetasContactosReport.dfm @@ -1,22 +1,11 @@ inherited fEditorEtiquetasContactosPreview: TfEditorEtiquetasContactosPreview Caption = 'Previsualizar la factura' - ExplicitWidth = 803 ExplicitHeight = 240 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader - ExplicitWidth = 795 inherited Image1: TImage - Left = 768 ExplicitLeft = 768 end end - inherited StatusBar: TJvStatusBar - ExplicitWidth = 795 - end - inherited frxReport1: TfrxReport - Datasets = <> - Variables = <> - Style = <> - end end diff --git a/Source/Modulos/Contactos/Views/uEditorEtiquetasContactosReport.pas b/Source/Modulos/Contactos/Views/uEditorEtiquetasContactosReport.pas index 66787211..6b344bbd 100644 --- a/Source/Modulos/Contactos/Views/uEditorEtiquetasContactosReport.pas +++ b/Source/Modulos/Contactos/Views/uEditorEtiquetasContactosReport.pas @@ -10,7 +10,8 @@ uses JvFormPlacement, ImgList, PngImageList, StdActns, ActnList, ComCtrls, TB2ExtItems, TBXExtItems, TBX, TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent, JvNavigationPane, uIEditorEtiquetasContactosPreview, - JvExComCtrls, JvStatusBar; + JvExComCtrls, JvStatusBar, frxExportText, frxExportRTF, frxExportMail, + frxExportXLS; type TfEditorEtiquetasContactosPreview = class(TfEditorPreview, IEditorEtiquetasContactosPreview) diff --git a/Source/Modulos/Contactos/Views/uEditorFichasEmpleadoReport.dfm b/Source/Modulos/Contactos/Views/uEditorFichasEmpleadoReport.dfm index 5ab584a3..b0fa4aef 100644 --- a/Source/Modulos/Contactos/Views/uEditorFichasEmpleadoReport.dfm +++ b/Source/Modulos/Contactos/Views/uEditorFichasEmpleadoReport.dfm @@ -1,22 +1,11 @@ inherited fEditorFichasEmpleadoPreview: TfEditorFichasEmpleadoPreview Caption = 'Previsualizar la factura' - ExplicitWidth = 803 ExplicitHeight = 240 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader - ExplicitWidth = 795 inherited Image1: TImage - Left = 768 ExplicitLeft = 768 end end - inherited StatusBar: TJvStatusBar - ExplicitWidth = 795 - end - inherited frxReport1: TfrxReport - Datasets = <> - Variables = <> - Style = <> - end end diff --git a/Source/Modulos/Contactos/Views/uEditorFichasEmpleadoReport.pas b/Source/Modulos/Contactos/Views/uEditorFichasEmpleadoReport.pas index 21e843f6..7e0f2b0e 100644 --- a/Source/Modulos/Contactos/Views/uEditorFichasEmpleadoReport.pas +++ b/Source/Modulos/Contactos/Views/uEditorFichasEmpleadoReport.pas @@ -10,7 +10,8 @@ uses JvFormPlacement, ImgList, PngImageList, StdActns, ActnList, ComCtrls, TB2ExtItems, TBXExtItems, TBX, TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent, JvNavigationPane, uIEditorFichasEmpleadoPreview, - JvExComCtrls, JvStatusBar; + JvExComCtrls, JvStatusBar, frxExportText, frxExportRTF, frxExportMail, + frxExportXLS; type TfEditorFichasEmpleadoPreview = class(TfEditorPreview, IEditorFichasEmpleadoPreview) diff --git a/Source/Modulos/Contactos/Views/uEditorGruposCliente.dfm b/Source/Modulos/Contactos/Views/uEditorGruposCliente.dfm index 9fc08089..9e15dfb8 100644 --- a/Source/Modulos/Contactos/Views/uEditorGruposCliente.dfm +++ b/Source/Modulos/Contactos/Views/uEditorGruposCliente.dfm @@ -48,6 +48,10 @@ object fEditorGruposCliente: TfEditorGruposCliente TabOrder = 0 object TabSheet1: TTabSheet Caption = 'Grupos de cliente' + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object Label1: TLabel Left = 10 Top = 12 diff --git a/Source/Modulos/Contactos/Views/uEditorGruposCliente.pas b/Source/Modulos/Contactos/Views/uEditorGruposCliente.pas index 602a9a42..a8dca274 100644 --- a/Source/Modulos/Contactos/Views/uEditorGruposCliente.pas +++ b/Source/Modulos/Contactos/Views/uEditorGruposCliente.pas @@ -29,7 +29,7 @@ uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, DB, StdCtrls, DBCtrls, uDADataTable, ActnList, uIEditorGruposCliente, uCustomEditor, uGUIBase, ExtCtrls, - ComCtrls, uBizGruposCliente, uGruposClienteController; + ComCtrls, uBizGruposCliente, uGruposClienteController, uDAInterfaces; type TfEditorGruposCliente = class(TCustomEditor, IEditorGruposCliente) diff --git a/Source/Modulos/Contactos/Views/uEditorGruposEmpleado.dfm b/Source/Modulos/Contactos/Views/uEditorGruposEmpleado.dfm index 2c7190b1..f54746f5 100644 --- a/Source/Modulos/Contactos/Views/uEditorGruposEmpleado.dfm +++ b/Source/Modulos/Contactos/Views/uEditorGruposEmpleado.dfm @@ -4,7 +4,7 @@ object fEditorGruposEmpleado: TfEditorGruposEmpleado ActiveControl = ListaGruposEmpleado BorderIcons = [biSystemMenu] BorderStyle = bsSingle - Caption = 'Administraci'#243'n de categorías de empleados' + Caption = 'Administraci'#243'n de categor'#237'as de empleados' ClientHeight = 499 ClientWidth = 404 Color = clBtnFace @@ -47,13 +47,17 @@ object fEditorGruposEmpleado: TfEditorGruposEmpleado ActivePage = TabSheet1 TabOrder = 0 object TabSheet1: TTabSheet - Caption = 'Categorías de empleado' + Caption = 'Categor'#237'as de empleado' + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object Label1: TLabel Left = 10 Top = 12 - Width = 121 + Width = 155 Height = 13 - Caption = 'Lista de categorías de empleado' + Caption = 'Lista de categor'#237'as de empleado' end object ListaGruposEmpleado: TDBLookupListBox Left = 8 diff --git a/Source/Modulos/Contactos/Views/uEditorGruposEmpleado.pas b/Source/Modulos/Contactos/Views/uEditorGruposEmpleado.pas index 4dc8ab9f..8b107862 100644 --- a/Source/Modulos/Contactos/Views/uEditorGruposEmpleado.pas +++ b/Source/Modulos/Contactos/Views/uEditorGruposEmpleado.pas @@ -29,7 +29,7 @@ uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, DB, StdCtrls, DBCtrls, uDADataTable, ActnList, uIEditorGruposEmpleado, uCustomEditor, uGUIBase, ExtCtrls, - ComCtrls, uBizGruposEmpleado, uGruposEmpleadoController; + ComCtrls, uBizGruposEmpleado, uGruposEmpleadoController, uDAInterfaces; type TfEditorGruposEmpleado = class(TCustomEditor, IEditorGruposEmpleado) diff --git a/Source/Modulos/Contactos/Views/uEditorGruposProveedor.dfm b/Source/Modulos/Contactos/Views/uEditorGruposProveedor.dfm index 7e214332..bdc5a9bd 100644 --- a/Source/Modulos/Contactos/Views/uEditorGruposProveedor.dfm +++ b/Source/Modulos/Contactos/Views/uEditorGruposProveedor.dfm @@ -48,10 +48,14 @@ object fEditorGruposProveedor: TfEditorGruposProveedor TabOrder = 0 object TabSheet1: TTabSheet Caption = 'Grupos de proveedor' + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object Label1: TLabel Left = 10 Top = 12 - Width = 121 + Width = 138 Height = 13 Caption = 'Lista de grupos de proveedor' end diff --git a/Source/Modulos/Contactos/Views/uEditorGruposProveedor.pas b/Source/Modulos/Contactos/Views/uEditorGruposProveedor.pas index 721f840d..ec6415ee 100644 --- a/Source/Modulos/Contactos/Views/uEditorGruposProveedor.pas +++ b/Source/Modulos/Contactos/Views/uEditorGruposProveedor.pas @@ -29,7 +29,7 @@ uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, DB, StdCtrls, DBCtrls, uDADataTable, ActnList, uIEditorGruposProveedor, uCustomEditor, uGUIBase, ExtCtrls, - ComCtrls, uBizGruposProveedor, uGruposProveedorController; + ComCtrls, uBizGruposProveedor, uGruposProveedorController, uDAInterfaces; type TfEditorGruposProveedor = class(TCustomEditor, IEditorGruposProveedor) diff --git a/Source/Modulos/Contactos/Views/uEditorProveedor.dfm b/Source/Modulos/Contactos/Views/uEditorProveedor.dfm index 17eeda57..cd5e29ec 100644 --- a/Source/Modulos/Contactos/Views/uEditorProveedor.dfm +++ b/Source/Modulos/Contactos/Views/uEditorProveedor.dfm @@ -53,18 +53,18 @@ inherited fEditorProveedor: TfEditorProveedor end end inherited pgPaginas: TPageControl - Width = 648 - Height = 495 - ExplicitWidth = 648 - ExplicitHeight = 495 + Width = 642 + Height = 489 + ExplicitWidth = 642 + ExplicitHeight = 489 inherited pagGeneral: TTabSheet - ExplicitWidth = 640 - ExplicitHeight = 467 + ExplicitWidth = 634 + ExplicitHeight = 461 inline frViewProveedor1: TfrViewProveedor Left = 0 Top = 0 - Width = 640 - Height = 467 + Width = 634 + Height = 461 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -74,89 +74,89 @@ inherited fEditorProveedor: TfEditorProveedor ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 640 - ExplicitHeight = 467 + ExplicitWidth = 634 + ExplicitHeight = 461 inherited dxLayoutControlContacto: TdxLayoutControl - Width = 640 - Height = 467 + Width = 634 + Height = 461 LookAndFeel = dxLayoutOfficeLookAndFeel - ExplicitWidth = 640 - ExplicitHeight = 467 + ExplicitWidth = 634 + ExplicitHeight = 461 inherited PngSpeedButton1: TPngSpeedButton - Left = 595 + Left = 589 Top = 218 - ExplicitLeft = 595 + ExplicitLeft = 589 ExplicitTop = 218 end inherited PngSpeedButton2: TPngSpeedButton - Left = 595 + Left = 589 Top = 190 - ExplicitLeft = 595 + ExplicitLeft = 589 ExplicitTop = 190 end inherited PngSpeedButton3: TPngSpeedButton - Left = 595 + Left = 589 Top = 162 - ExplicitLeft = 595 + ExplicitLeft = 589 ExplicitTop = 162 end inherited Label1: TLabel - Left = 395 - Top = 297 + Left = 391 + Top = 341 Width = 342 - ExplicitLeft = 395 - ExplicitTop = 297 + ExplicitLeft = 391 + ExplicitTop = 341 ExplicitWidth = 342 end inherited eCalle: TcxDBTextEdit - Top = 294 - ExplicitTop = 294 + Top = 241 + ExplicitTop = 241 ExplicitWidth = 174 Width = 174 end inherited eProvincia: TcxDBTextEdit - Top = 348 - ExplicitTop = 348 + Top = 295 + ExplicitTop = 295 ExplicitWidth = 174 Width = 174 end inherited ePoblacion: TcxDBTextEdit - Top = 321 - ExplicitTop = 321 + Top = 268 + ExplicitTop = 268 ExplicitWidth = 108 Width = 108 end inherited eCodigoPostal: TcxDBTextEdit - Left = 302 - Top = 321 - ExplicitLeft = 302 - ExplicitTop = 321 + Left = 298 + Top = 268 + ExplicitLeft = 298 + ExplicitTop = 268 end inherited eObservaciones: TcxDBMemo - Top = 399 - ExplicitTop = 399 + Top = 424 + ExplicitTop = 424 ExplicitWidth = 580 ExplicitHeight = 56 Height = 56 Width = 580 end inherited cxDBCheckBox1: TcxDBCheckBox - Left = 395 - Top = 270 - ExplicitLeft = 395 - ExplicitTop = 270 + Left = 391 + Top = 373 + ExplicitLeft = 391 + ExplicitTop = 373 ExplicitWidth = 310 Width = 310 end inherited cxDBCheckBox2: TcxDBCheckBox - Top = 189 - ExplicitTop = 189 + Top = 346 + ExplicitTop = 346 ExplicitWidth = 326 Width = 326 end inherited eCertificaciones: TcxDBTextEdit - Top = 216 - ExplicitTop = 216 + Top = 373 + ExplicitTop = 373 ExplicitWidth = 227 Width = 227 end @@ -179,33 +179,33 @@ inherited fEditorProveedor: TfEditorProveedor Width = 221 end inherited eTlfParticular: TcxDBTextEdit - Left = 490 + Left = 486 Top = 57 - ExplicitLeft = 490 + ExplicitLeft = 486 ExplicitTop = 57 ExplicitWidth = 172 Width = 172 end inherited eTlfTrabajo: TcxDBTextEdit - Left = 490 + Left = 486 Top = 30 - ExplicitLeft = 490 + ExplicitLeft = 486 ExplicitTop = 30 ExplicitWidth = 172 Width = 172 end inherited eTlfMovil: TcxDBTextEdit - Left = 490 + Left = 486 Top = 84 - ExplicitLeft = 490 + ExplicitLeft = 486 ExplicitTop = 84 ExplicitWidth = 172 Width = 172 end inherited eFax: TcxDBTextEdit - Left = 490 + Left = 486 Top = 111 - ExplicitLeft = 490 + ExplicitLeft = 486 ExplicitTop = 111 ExplicitWidth = 172 Width = 172 @@ -217,35 +217,35 @@ inherited fEditorProveedor: TfEditorProveedor Width = 263 end inherited eNIFCIF: TcxDBTextEdit - Left = 217 + Left = 215 Top = 30 - ExplicitLeft = 217 + ExplicitLeft = 215 ExplicitTop = 30 ExplicitWidth = 254 Width = 254 end inherited eMailTrabajo: TcxDBHyperLinkEdit - Left = 490 + Left = 486 Top = 162 Properties.Prefix = 'mailto:' - ExplicitLeft = 490 + ExplicitLeft = 486 ExplicitTop = 162 ExplicitWidth = 129 Width = 129 end inherited eMailParticular: TcxDBHyperLinkEdit - Left = 490 + Left = 486 Top = 190 Properties.Prefix = 'mailto:' - ExplicitLeft = 490 + ExplicitLeft = 486 ExplicitTop = 190 ExplicitWidth = 165 Width = 165 end inherited ePaginaWeb: TcxDBHyperLinkEdit - Left = 490 + Left = 486 Top = 217 - ExplicitLeft = 490 + ExplicitLeft = 486 ExplicitTop = 217 ExplicitWidth = 165 Width = 165 @@ -257,33 +257,45 @@ inherited fEditorProveedor: TfEditorProveedor Width = 100 end inherited ePersonaContacto: TcxDBTextEdit - Top = 267 - ExplicitTop = 267 + Top = 214 + ExplicitTop = 214 ExplicitWidth = 253 Width = 253 end + inherited frViewTienda1: TfrViewTienda + Left = 391 + Top = 270 + ExplicitLeft = 391 + ExplicitTop = 270 + inherited dxLayoutControl1: TdxLayoutControl + inherited cbTienda: TcxComboBox + ExplicitWidth = 376 + Width = 376 + end + end + end end end end inherited pagDatosBancarios: TTabSheet - ExplicitWidth = 640 - ExplicitHeight = 467 + ExplicitWidth = 634 + ExplicitHeight = 461 inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios - Width = 640 - Height = 467 - ExplicitWidth = 640 - ExplicitHeight = 467 + Width = 634 + Height = 461 + ExplicitWidth = 634 + ExplicitHeight = 461 inherited dxLayoutControl1: TdxLayoutControl - Width = 640 + Width = 634 LookAndFeel = dxLayoutOfficeLookAndFeel - ExplicitWidth = 640 + ExplicitWidth = 634 inherited eEntidad: TcxDBTextEdit ExplicitWidth = 114 Width = 114 end inherited eSucursal: TcxDBTextEdit - Left = 325 - ExplicitLeft = 325 + Left = 323 + ExplicitLeft = 323 ExplicitWidth = 270 Width = 270 end @@ -304,7 +316,7 @@ inherited fEditorProveedor: TfEditorProveedor inline frViewProveedorDatosComerciales1: TfrViewProveedorDatosComerciales Left = 0 Top = 0 - Width = 640 + Width = 634 Height = 121 Align = alTop Font.Charset = DEFAULT_CHARSET @@ -315,17 +327,17 @@ inherited fEditorProveedor: TfEditorProveedor ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 640 + ExplicitWidth = 634 ExplicitHeight = 121 inherited dxLayoutControl1: TdxLayoutControl - Width = 640 + Width = 634 LookAndFeel = dxLayoutOfficeLookAndFeel - ExplicitWidth = 640 + ExplicitWidth = 634 inherited Label1: TLabel - Left = 416 + Left = 412 Top = 30 Width = 190 - ExplicitLeft = 416 + ExplicitLeft = 412 ExplicitTop = 30 ExplicitWidth = 190 end @@ -342,9 +354,9 @@ inherited fEditorProveedor: TfEditorProveedor Width = 121 end inherited bFormasPago: TButton - Left = 256 + Left = 252 Top = 57 - ExplicitLeft = 256 + ExplicitLeft = 252 ExplicitTop = 57 end inherited eIVA: TcxDBLookupComboBox @@ -354,15 +366,15 @@ inherited fEditorProveedor: TfEditorProveedor Width = 121 end inherited bTiposIVA: TButton - Left = 256 + Left = 252 Top = 84 - ExplicitLeft = 256 + ExplicitLeft = 252 ExplicitTop = 84 end inherited eDescuento: TcxDBSpinEdit - Left = 460 + Left = 456 Top = 62 - ExplicitLeft = 460 + ExplicitLeft = 456 ExplicitTop = 62 ExplicitWidth = 73 Width = 73 @@ -376,8 +388,8 @@ inherited fEditorProveedor: TfEditorProveedor inline frViewDireccionesEntrega1: TfrViewDireccionesEntrega Left = 0 Top = 0 - Width = 640 - Height = 467 + Width = 634 + Height = 461 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -387,17 +399,29 @@ inherited fEditorProveedor: TfEditorProveedor ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 640 - ExplicitHeight = 467 + ExplicitWidth = 634 + ExplicitHeight = 461 inherited cxGrid: TcxGrid - Width = 640 - Height = 442 - ExplicitWidth = 640 - ExplicitHeight = 442 + Width = 634 + Height = 436 + ExplicitWidth = 634 + ExplicitHeight = 436 end inherited ToolBar1: TToolBar - Width = 640 + Width = 634 ExplicitWidth = 640 + inherited ToolButton1: TToolButton + ExplicitWidth = 113 + end + inherited ToolButton4: TToolButton + ExplicitWidth = 113 + end + inherited ToolButton2: TToolButton + ExplicitWidth = 113 + end + inherited ToolButton7: TToolButton + ExplicitWidth = 113 + end end end end @@ -407,8 +431,8 @@ inherited fEditorProveedor: TfEditorProveedor inline frViewSubCuentaContacto1: TfrViewSubCuentaContacto Left = 0 Top = 0 - Width = 640 - Height = 467 + Width = 634 + Height = 461 Align = alClient AutoSize = True Font.Charset = DEFAULT_CHARSET @@ -419,32 +443,32 @@ inherited fEditorProveedor: TfEditorProveedor ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 640 - ExplicitHeight = 467 + ExplicitWidth = 634 + ExplicitHeight = 461 inherited layoutApunte: TdxLayoutControl - Width = 640 - Height = 467 - ExplicitWidth = 640 - ExplicitHeight = 467 + Width = 634 + Height = 461 + ExplicitWidth = 634 + ExplicitHeight = 461 inherited eRefSubCuenta: TcxDBTextEdit ExplicitWidth = 346 Width = 346 end inherited BitBtn3: TBitBtn - Left = 393 - ExplicitLeft = 393 + Left = 292 + ExplicitLeft = 292 end inherited eSubCuenta: TcxDBTextEdit ExplicitWidth = 265 Width = 265 end inherited BitBtn1: TBitBtn - Left = 474 - ExplicitLeft = 474 + Left = 408 + ExplicitLeft = 408 end inherited BitBtn2: TBitBtn - Left = 555 - ExplicitLeft = 555 + Left = 534 + ExplicitLeft = 534 end inherited cbIgnorarContabilidad: TcxDBCheckBox DataBinding.DataSource = frViewProveedor1.dsContacto diff --git a/Source/Modulos/Contactos/Views/uViewCliente.dfm b/Source/Modulos/Contactos/Views/uViewCliente.dfm index 08923ec4..14b2aeca 100644 --- a/Source/Modulos/Contactos/Views/uViewCliente.dfm +++ b/Source/Modulos/Contactos/Views/uViewCliente.dfm @@ -24,7 +24,7 @@ inherited frViewCliente: TfrViewCliente end object Label1: TLabel [3] Left = 354 - Top = 361 + Top = 357 Width = 269 Height = 39 Margins.Bottom = 0 @@ -165,7 +165,7 @@ inherited frViewCliente: TfrViewCliente end object cxDBCheckBox1: TcxDBCheckBox [13] Left = 354 - Top = 406 + Top = 402 Caption = 'Permitir el acceso de este cliente a la tienda web' DataBinding.DataField = 'TIENDA_WEB' DataBinding.DataSource = dsContacto @@ -313,21 +313,16 @@ inherited frViewCliente: TfrViewCliente inherited frViewTienda1: TfrViewTienda Left = 354 Width = 270 - Height = 41 AutoSize = True TabOrder = 21 ExplicitLeft = 354 ExplicitWidth = 270 - ExplicitHeight = 41 inherited dxLayoutControl1: TdxLayoutControl Width = 270 - Height = 41 - ExplicitWidth = 262 - ExplicitHeight = 41 - inherited cbTienda: TcxDBComboBox - DataBinding.DataSource = dsContacto - ExplicitWidth = 412 - Width = 412 + ExplicitWidth = 270 + inherited cbTienda: TcxComboBox + ExplicitWidth = 376 + Width = 376 end end end diff --git a/Source/Modulos/Contactos/Views/uViewContacto.dfm b/Source/Modulos/Contactos/Views/uViewContacto.dfm index d38ce0ff..d92ffe49 100644 --- a/Source/Modulos/Contactos/Views/uViewContacto.dfm +++ b/Source/Modulos/Contactos/Views/uViewContacto.dfm @@ -157,7 +157,7 @@ inherited frViewContacto: TfrViewContacto Width = 111 end object eCodigoPostal: TcxDBTextEdit - Left = 248 + Left = 196 Top = 355 DataBinding.DataField = 'CODIGO_POSTAL' DataBinding.DataSource = dsContacto @@ -195,7 +195,7 @@ inherited frViewContacto: TfrViewContacto Width = 630 end object eTlfParticular: TcxDBTextEdit - Left = 438 + Left = 386 Top = 55 DataBinding.DataField = 'TELEFONO_2' DataBinding.DataSource = dsContacto @@ -213,7 +213,7 @@ inherited frViewContacto: TfrViewContacto Width = 91 end object eTlfTrabajo: TcxDBTextEdit - Left = 438 + Left = 386 Top = 28 DataBinding.DataField = 'TELEFONO_1' DataBinding.DataSource = dsContacto @@ -231,7 +231,7 @@ inherited frViewContacto: TfrViewContacto Width = 127 end object eTlfMovil: TcxDBTextEdit - Left = 438 + Left = 386 Top = 82 DataBinding.DataField = 'MOVIL_1' DataBinding.DataSource = dsContacto @@ -249,7 +249,7 @@ inherited frViewContacto: TfrViewContacto Width = 155 end object eFax: TcxDBTextEdit - Left = 438 + Left = 386 Top = 109 DataBinding.DataField = 'FAX' DataBinding.DataSource = dsContacto @@ -287,7 +287,7 @@ inherited frViewContacto: TfrViewContacto Width = 221 end object eNIFCIF: TcxDBTextEdit - Left = 234 + Left = 205 Top = 28 DataBinding.DataField = 'NIF_CIF' DataBinding.DataSource = dsContacto @@ -306,7 +306,7 @@ inherited frViewContacto: TfrViewContacto Width = 57 end object eMailTrabajo: TcxDBHyperLinkEdit - Left = 438 + Left = 386 Top = 166 DataBinding.DataField = 'EMAIL_1' DataBinding.DataSource = dsContacto @@ -328,7 +328,7 @@ inherited frViewContacto: TfrViewContacto Width = 133 end object eMailParticular: TcxDBHyperLinkEdit - Left = 438 + Left = 386 Top = 194 DataBinding.DataField = 'EMAIL_2' DataBinding.DataSource = dsContacto @@ -350,7 +350,7 @@ inherited frViewContacto: TfrViewContacto Width = 133 end object ePaginaWeb: TcxDBHyperLinkEdit - Left = 438 + Left = 386 Top = 221 DataBinding.DataField = 'PAGINA_WEB' DataBinding.DataSource = dsContacto @@ -411,11 +411,10 @@ inherited frViewContacto: TfrViewContacto Width = 256 end inline frViewTienda1: TfrViewTienda - Left = 343 + Left = 291 Top = 280 - Width = 311 - Height = 42 - Align = alTop + Width = 451 + Height = 41 Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText Font.Height = -11 @@ -424,19 +423,12 @@ inherited frViewContacto: TfrViewContacto ParentFont = False TabOrder = 15 ReadOnly = False - ExplicitLeft = 343 + ExplicitLeft = 291 ExplicitTop = 280 - ExplicitWidth = 311 - ExplicitHeight = 42 inherited dxLayoutControl1: TdxLayoutControl - Width = 311 - Height = 42 - ExplicitHeight = 42 - inherited cbTienda: TcxDBComboBox - DataBinding.DataSource = dsContacto - Properties.OnChange = frViewTienda1cbTiendaPropertiesChange - ExplicitWidth = 412 - Width = 412 + inherited cbTienda: TcxComboBox + ExplicitWidth = 376 + Width = 376 end end end @@ -633,8 +625,8 @@ inherited frViewContacto: TfrViewContacto AutoAligns = [aaHorizontal] Caption = 'El contacto pertenece a la tienda' object dxLayoutControlContactoItem16: TdxLayoutItem - AutoAligns = [aaHorizontal] - AlignVert = avClient + Caption = 'New Item' + ShowCaption = False Control = frViewTienda1 ControlOptions.AutoColor = True ControlOptions.ShowBorder = False diff --git a/Source/Modulos/Contactos/Views/uViewContacto.pas b/Source/Modulos/Contactos/Views/uViewContacto.pas index 0da682f6..736d774b 100644 --- a/Source/Modulos/Contactos/Views/uViewContacto.pas +++ b/Source/Modulos/Contactos/Views/uViewContacto.pas @@ -86,9 +86,9 @@ type dxLayoutControlContactoGroup16: TdxLayoutGroup; dxLayoutControlContactoItem167: TdxLayoutItem; ePersonaContacto: TcxDBTextEdit; - dxLayoutControlContactoItem16: TdxLayoutItem; - frViewTienda1: TfrViewTienda; dxLayoutControlContactoGroup100: TdxLayoutGroup; + frViewTienda1: TfrViewTienda; + dxLayoutControlContactoItem16: TdxLayoutItem; procedure eMailTrabajoPropertiesEditValueChanged(Sender: TObject); procedure actMandarCorreoParticularExecute(Sender: TObject); procedure actMandarCorreoTrabajoExecute(Sender: TObject); @@ -98,7 +98,6 @@ type procedure actVerPaginaWebUpdate(Sender: TObject); procedure eMailTrabajoPropertiesValidate(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); - procedure frViewTienda1cbTiendaPropertiesChange(Sender: TObject); protected FContacto: IBizContacto; FController: IContactosController; @@ -114,7 +113,8 @@ type implementation {$R *.dfm} -uses uFactuGES_App; +uses + uFactuGES_App; type THackcxDBHyperLinkEdit = class(TcxDBHyperLinkEdit); @@ -175,16 +175,6 @@ begin DisplayValue := StringReplace(DisplayValue, (Sender as TcxDBHyperLinkEdit).Properties.Prefix, '', []); end; -procedure TfrViewContacto.frViewTienda1cbTiendaPropertiesChange(Sender: TObject); -begin - inherited; - if assigned(Contacto) - and assigned(Controller) then - begin - Controller.SetID_Tienda(Contacto, frViewTienda1.getIDTienda); - end; -end; - function TfrViewContacto.GetContacto: IBizContacto; begin Result := FContacto; @@ -196,11 +186,14 @@ begin end; procedure TfrViewContacto.SetContacto(const Value: IBizContacto); +var + i : integer; begin FContacto := Value; if Assigned(FContacto) then begin dsContacto.DataTable := FContacto.DataTable; + frViewTienda1.DataItem := FContacto.DataTable; end else begin dsContacto.DataTable := Nil; diff --git a/Source/Modulos/Contactos/Views/uViewEmpleado.dfm b/Source/Modulos/Contactos/Views/uViewEmpleado.dfm index 7479b028..93ac53fa 100644 --- a/Source/Modulos/Contactos/Views/uViewEmpleado.dfm +++ b/Source/Modulos/Contactos/Views/uViewEmpleado.dfm @@ -1,8 +1,6 @@ inherited frViewEmpleado: TfrViewEmpleado Width = 642 Height = 578 - OnCreate = CustomViewCreate - OnDestroy = CustomViewDestroy ExplicitWidth = 642 ExplicitHeight = 578 inherited dxLayoutControlContacto: TdxLayoutControl @@ -50,10 +48,10 @@ inherited frViewEmpleado: TfrViewEmpleado Width = 51 end inherited eCodigoPostal: TcxDBTextEdit - Left = 261 + Left = 263 Top = 304 TabOrder = 8 - ExplicitLeft = 261 + ExplicitLeft = 263 ExplicitTop = 304 end inherited eObservaciones: TcxDBMemo @@ -121,27 +119,27 @@ inherited frViewEmpleado: TfrViewEmpleado StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 4 - Width = 225 + Width = 160 end inherited eTlfParticular: TcxDBTextEdit - Left = 451 + Left = 453 TabOrder = 11 - ExplicitLeft = 451 + ExplicitLeft = 453 end inherited eTlfTrabajo: TcxDBTextEdit - Left = 451 + Left = 453 TabOrder = 10 - ExplicitLeft = 451 + ExplicitLeft = 453 end inherited eTlfMovil: TcxDBTextEdit - Left = 451 + Left = 453 TabOrder = 12 - ExplicitLeft = 451 + ExplicitLeft = 453 end inherited eFax: TcxDBTextEdit - Left = 451 + Left = 453 TabOrder = 13 - ExplicitLeft = 451 + ExplicitLeft = 453 end inherited eNombre: TcxDBTextEdit Left = 121 @@ -156,25 +154,25 @@ inherited frViewEmpleado: TfrViewEmpleado Width = 100 end inherited eMailTrabajo: TcxDBHyperLinkEdit - Left = 451 + Left = 453 Properties.Prefix = 'mailto:' TabOrder = 14 - ExplicitLeft = 451 + ExplicitLeft = 453 ExplicitWidth = 129 Width = 129 end inherited eMailParticular: TcxDBHyperLinkEdit - Left = 451 + Left = 453 Properties.Prefix = 'mailto:' TabOrder = 15 - ExplicitLeft = 451 + ExplicitLeft = 453 ExplicitWidth = 165 Width = 165 end inherited ePaginaWeb: TcxDBHyperLinkEdit - Left = 451 + Left = 453 TabOrder = 16 - ExplicitLeft = 451 + ExplicitLeft = 453 ExplicitWidth = 165 Width = 165 end @@ -192,17 +190,14 @@ inherited frViewEmpleado: TfrViewEmpleado Width = 152 end inherited frViewTienda1: TfrViewTienda - Left = 356 + Left = 358 Width = 264 TabOrder = 17 - ExplicitLeft = 356 + ExplicitLeft = 358 ExplicitWidth = 264 inherited dxLayoutControl1: TdxLayoutControl Width = 264 ExplicitWidth = 316 - inherited cbTienda: TcxDBComboBox - DataBinding.DataSource = dsContacto - end end end inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup diff --git a/Source/Modulos/Contactos/Views/uViewEmpleado.pas b/Source/Modulos/Contactos/Views/uViewEmpleado.pas index cd2f3e1a..efa8b2db 100644 --- a/Source/Modulos/Contactos/Views/uViewEmpleado.pas +++ b/Source/Modulos/Contactos/Views/uViewEmpleado.pas @@ -85,8 +85,6 @@ procedure TfrViewEmpleado.CustomViewCreate(Sender: TObject); begin inherited; FGrupoController := TGruposEmpleadoController.Create; - frViewTienda1.dsVendedores.DataTable := AppFactuGES.UsuariosController.BuscarTodosUsuarios.DataTable; - frViewTienda1.dsVendedores.DataTable.Active := True; end; procedure TfrViewEmpleado.CustomViewDestroy(Sender: TObject); diff --git a/Source/Modulos/Contactos/Views/uViewProveedor.dfm b/Source/Modulos/Contactos/Views/uViewProveedor.dfm index cd765a98..5b953be8 100644 --- a/Source/Modulos/Contactos/Views/uViewProveedor.dfm +++ b/Source/Modulos/Contactos/Views/uViewProveedor.dfm @@ -24,7 +24,7 @@ inherited frViewProveedor: TfrViewProveedor end object Label1: TLabel [3] Left = 402 - Top = 358 + Top = 357 Width = 342 Height = 26 Caption = @@ -70,12 +70,14 @@ inherited frViewProveedor: TfrViewProveedor Top = 575 TabOrder = 22 ExplicitTop = 575 + ExplicitWidth = 630 ExplicitHeight = 20 Height = 20 + Width = 630 end object cxDBCheckBox1: TcxDBCheckBox [9] Left = 402 - Top = 390 + Top = 389 Caption = 'Incluir este proveedor en la tienda web' DataBinding.DataField = 'TIENDA_WEB' DataBinding.DataSource = dsContacto @@ -207,25 +209,35 @@ inherited frViewProveedor: TfrViewProveedor Left = 497 TabOrder = 14 ExplicitLeft = 497 + ExplicitWidth = 91 + Width = 91 end inherited eTlfTrabajo: TcxDBTextEdit Left = 497 TabOrder = 13 ExplicitLeft = 497 + ExplicitWidth = 127 + Width = 127 end inherited eTlfMovil: TcxDBTextEdit Left = 497 TabOrder = 15 ExplicitLeft = 497 + ExplicitWidth = 155 + Width = 155 end inherited eFax: TcxDBTextEdit Left = 497 TabOrder = 16 ExplicitLeft = 497 + ExplicitWidth = 121 + Width = 121 end inherited eNombre: TcxDBTextEdit Left = 138 ExplicitLeft = 138 + ExplicitWidth = 221 + Width = 221 end inherited eNIFCIF: TcxDBTextEdit Left = 211 @@ -238,21 +250,29 @@ inherited frViewProveedor: TfrViewProveedor Properties.Prefix = 'mailto:' TabOrder = 17 ExplicitLeft = 497 + ExplicitWidth = 133 + Width = 133 end inherited eMailParticular: TcxDBHyperLinkEdit Left = 497 Properties.Prefix = 'mailto:' TabOrder = 18 ExplicitLeft = 497 + ExplicitWidth = 133 + Width = 133 end inherited ePaginaWeb: TcxDBHyperLinkEdit Left = 497 TabOrder = 19 ExplicitLeft = 497 + ExplicitWidth = 133 + Width = 133 end inherited eReferencia: TcxDBTextEdit Left = 138 ExplicitLeft = 138 + ExplicitWidth = 38 + Width = 38 end inherited ePersonaContacto: TcxDBTextEdit Left = 138 @@ -260,18 +280,21 @@ inherited frViewProveedor: TfrViewProveedor TabOrder = 6 ExplicitLeft = 138 ExplicitTop = 353 + ExplicitWidth = 256 + Width = 256 end inherited frViewTienda1: TfrViewTienda Left = 402 Width = 290 - Align = alNone TabOrder = 20 ExplicitLeft = 402 ExplicitWidth = 290 inherited dxLayoutControl1: TdxLayoutControl Width = 290 - inherited cbTienda: TcxDBComboBox - DataBinding.DataSource = dsContacto + ExplicitWidth = 290 + inherited cbTienda: TcxComboBox + ExplicitWidth = 376 + Width = 376 end end end diff --git a/Source/Modulos/Contactos/Views/uViewSubCuentaContacto.dfm b/Source/Modulos/Contactos/Views/uViewSubCuentaContacto.dfm index 5cacbf1b..13ad0db2 100644 --- a/Source/Modulos/Contactos/Views/uViewSubCuentaContacto.dfm +++ b/Source/Modulos/Contactos/Views/uViewSubCuentaContacto.dfm @@ -1,5 +1,5 @@ inherited frViewSubCuentaContacto: TfrViewSubCuentaContacto - Width = 591 + Width = 451 Height = 304 Align = alClient AutoSize = True @@ -10,15 +10,15 @@ inherited frViewSubCuentaContacto: TfrViewSubCuentaContacto object layoutApunte: TdxLayoutControl Left = 0 Top = 0 - Width = 591 + Width = 451 Height = 304 Align = alClient ParentBackground = True TabOrder = 0 AutoContentSizes = [acsWidth, acsHeight] - ExplicitWidth = 451 + ExplicitWidth = 591 DesignSize = ( - 591 + 451 304) object eRefSubCuenta: TcxDBTextEdit Left = 93 @@ -41,7 +41,7 @@ inherited frViewSubCuentaContacto: TfrViewSubCuentaContacto Width = 346 end object BitBtn3: TBitBtn - Left = 249 + Left = 119 Top = 37 Width = 110 Height = 25 @@ -105,7 +105,7 @@ inherited frViewSubCuentaContacto: TfrViewSubCuentaContacto Width = 265 end object BitBtn1: TBitBtn - Left = 365 + Left = 235 Top = 37 Width = 120 Height = 25 @@ -149,7 +149,7 @@ inherited frViewSubCuentaContacto: TfrViewSubCuentaContacto E000E248D100E407DB00FF00FF00FF00FF00FF00FF00FF00FF00} end object BitBtn2: TBitBtn - Left = 491 + Left = 361 Top = 37 Width = 90 Height = 25 diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm index ccd78929..82c31c77 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm @@ -3,19 +3,19 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Top = 208 Caption = 'Nueva factura de cliente' ClientHeight = 642 - ClientWidth = 950 + ClientWidth = 813 Position = poScreenCenter OnClose = CustomEditorClose - ExplicitWidth = 958 - ExplicitHeight = 669 + ExplicitWidth = 821 + ExplicitHeight = 676 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader - Width = 950 + Width = 813 Caption = 'Nueva factura de cliente' - ExplicitWidth = 950 + ExplicitWidth = 813 inherited Image1: TImage - Left = 923 + Left = 786 Picture.Data = { 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 0000180806000000E0773DF80000000970485973000017120000171201679FD2 @@ -39,8 +39,8 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente end end inherited TBXDock: TTBXDock - Width = 950 - ExplicitWidth = 950 + Width = 813 + ExplicitWidth = 813 inherited tbxMain: TTBXToolbar ExplicitWidth = 488 inherited TBXItem2: TTBXItem @@ -54,7 +54,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente end end inherited tbxMenu: TTBXToolbar - ExplicitWidth = 950 + ExplicitWidth = 813 inherited TBXSubmenuItem4: TTBXSubmenuItem inherited TBXItem8: TTBXItem Visible = False @@ -69,22 +69,22 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente end end inherited pgPaginas: TPageControl - Width = 944 + Width = 807 Height = 378 OnChanging = pgPaginasChanging ExplicitLeft = 3 ExplicitTop = 79 - ExplicitWidth = 944 + ExplicitWidth = 807 ExplicitHeight = 378 inherited pagGeneral: TTabSheet ExplicitLeft = 4 ExplicitTop = 24 - ExplicitWidth = 936 + ExplicitWidth = 799 ExplicitHeight = 350 inline frViewFacturaCliente1: TfrViewFacturaCliente Left = 0 Top = 0 - Width = 936 + Width = 799 Height = 350 Align = alClient Font.Charset = DEFAULT_CHARSET @@ -95,41 +95,34 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 936 + ExplicitWidth = 799 ExplicitHeight = 350 inherited dxLayoutControl1: TdxLayoutControl - Width = 936 + Width = 799 Height = 350 - ExplicitWidth = 936 + ExplicitWidth = 799 ExplicitHeight = 350 - DesignSize = ( - 936 - 350) inherited eReferencia: TcxDBTextEdit - ExplicitWidth = 393 - Width = 393 + ExplicitWidth = 159 + Width = 159 end inherited edtFecha: TcxDBDateEdit - ExplicitWidth = 393 - Width = 393 + ExplicitWidth = 159 + Width = 159 end inherited memObservaciones: TcxDBMemo - ExplicitWidth = 473 - ExplicitHeight = 109 - Height = 109 - Width = 473 + ExplicitWidth = 301 + ExplicitHeight = 159 + Height = 159 + Width = 301 end inherited frViewClienteFactura: TfrViewDatosYSeleccionCliente - Left = 545 - Width = 332 - ExplicitLeft = 545 - ExplicitWidth = 332 + Width = 314 + ExplicitWidth = 314 inherited dxLayoutControl1: TdxLayoutControl - Width = 332 - ExplicitWidth = 332 + Width = 314 inherited edtlNombre: TcxDBTextEdit DataBinding.DataSource = frViewFacturaCliente1.DADataSource - Properties.OnChange = frViewClienteFacturaedtlNombrePropertiesChange ExplicitWidth = 224 Width = 224 end @@ -154,35 +147,25 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Width = 327 end inherited edtCodigoPostal: TcxDBTextEdit - Left = 261 + Left = 284 DataBinding.DataSource = frViewFacturaCliente1.DADataSource - ExplicitLeft = 261 + ExplicitLeft = 284 end inherited Button3: TBitBtn - Left = 151 - ExplicitLeft = 151 + Left = 174 + ExplicitLeft = 174 end end end inherited cbFormaPago: TcxDBLookupComboBox - ExplicitWidth = 255 - Width = 255 - end - inherited bFormasPago: TButton - Left = 385 - ExplicitLeft = 385 + ExplicitWidth = 78 + Width = 78 end inherited frViewTienda1: TfrViewTienda - Left = 556 - Width = 729 - ExplicitLeft = 556 - ExplicitWidth = 729 inherited dxLayoutControl1: TdxLayoutControl - Width = 729 - inherited cbTienda: TcxDBComboBox - DataBinding.DataSource = frViewFacturaCliente1.DADataSource - ExplicitWidth = 376 - Width = 376 + inherited cbTienda: TcxComboBox + ExplicitWidth = 399 + Width = 399 end end end @@ -195,7 +178,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente inline frViewDetallesFacturaCliente1: TfrViewDetallesFacturaCliente Left = 0 Top = 0 - Width = 936 + Width = 799 Height = 350 Align = alClient BiDiMode = bdLeftToRight @@ -208,104 +191,77 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 936 + ExplicitWidth = 799 ExplicitHeight = 350 inherited ToolBar1: TToolBar - Width = 936 - Height = 24 - ExplicitWidth = 936 - ExplicitHeight = 24 + Width = 799 + ExplicitWidth = 799 inherited ToolButton4: TToolButton Wrap = False end inherited ToolButton14: TToolButton Left = 334 Top = 0 + Wrap = True ExplicitLeft = 334 ExplicitTop = 0 end inherited FontName: TJvFontComboBox - Left = 368 - Top = 0 - ExplicitLeft = 368 - ExplicitTop = 0 + Left = 0 + ExplicitLeft = 0 end inherited FontSize: TEdit - Left = 513 - Top = 0 + Left = 145 Width = 57 - ExplicitLeft = 513 - ExplicitTop = 0 + ExplicitLeft = 145 ExplicitWidth = 57 end inherited UpDown1: TUpDown - Left = 570 - Top = 0 - ExplicitLeft = 570 - ExplicitTop = 0 + Left = 218 + ExplicitLeft = 218 end inherited ToolButton13: TToolButton - Left = 587 - Top = 0 - ExplicitLeft = 587 - ExplicitTop = 0 + Left = 235 + ExplicitLeft = 235 end inherited ToolButton6: TToolButton - Left = 595 - Top = 0 - ExplicitLeft = 595 - ExplicitTop = 0 + Left = 243 + ExplicitLeft = 243 end inherited ToolButton7: TToolButton - Left = 629 - Top = 0 - ExplicitLeft = 629 - ExplicitTop = 0 + Left = 277 + ExplicitLeft = 277 end inherited ToolButton8: TToolButton - Left = 663 - Top = 0 - ExplicitLeft = 663 - ExplicitTop = 0 + Left = 311 + ExplicitLeft = 311 end inherited ToolButton12: TToolButton - Left = 697 - Top = 0 - ExplicitLeft = 697 - ExplicitTop = 0 + Left = 345 + ExplicitLeft = 345 end inherited ToolButton9: TToolButton - Left = 705 - Top = 0 - ExplicitLeft = 705 - ExplicitTop = 0 + Left = 353 + ExplicitLeft = 353 end inherited ToolButton10: TToolButton - Left = 739 - Top = 0 - ExplicitLeft = 739 - ExplicitTop = 0 + Left = 387 + ExplicitLeft = 387 end inherited ToolButton11: TToolButton - Left = 773 - Top = 0 - ExplicitLeft = 773 - ExplicitTop = 0 + Left = 421 + ExplicitLeft = 421 end end inherited cxGrid: TcxGrid - Top = 50 - Width = 936 - Height = 300 - ExplicitTop = 50 - ExplicitWidth = 936 - ExplicitHeight = 300 + Width = 799 + Height = 278 + ExplicitWidth = 799 + ExplicitHeight = 278 end inherited TBXDock1: TTBXDock - Top = 24 - Width = 936 - ExplicitTop = 24 - ExplicitWidth = 936 + Width = 799 + ExplicitWidth = 799 inherited TBXToolbar1: TTBXToolbar ExplicitWidth = 548 end @@ -346,18 +302,18 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente end inherited StatusBar: TJvStatusBar Top = 623 - Width = 950 + Width = 813 Panels = < item Width = 200 end> ExplicitTop = 623 - ExplicitWidth = 950 + ExplicitWidth = 813 end inline frViewTotales1: TfrViewTotales [4] Left = 0 Top = 460 - Width = 950 + Width = 813 Height = 163 Align = alBottom Font.Charset = DEFAULT_CHARSET @@ -369,12 +325,12 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente TabOrder = 4 ReadOnly = False ExplicitTop = 460 - ExplicitWidth = 950 + ExplicitWidth = 813 ExplicitHeight = 163 inherited dxLayoutControl1: TdxLayoutControl - Width = 950 + Width = 813 LookAndFeel = frViewFacturaCliente1.dxLayoutOfficeLookAndFeel1 - ExplicitWidth = 950 + ExplicitWidth = 813 inherited Bevel1: TBevel Top = 111 Width = 73 @@ -382,18 +338,18 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ExplicitWidth = 73 end inherited Bevel3: TBevel - Left = 504 + Left = 433 Top = 30 Height = 122 - ExplicitLeft = 504 + ExplicitLeft = 433 ExplicitTop = 30 ExplicitHeight = 122 end inherited Bevel4: TBevel - Left = 616 + Left = 545 Top = 111 Width = 186 - ExplicitLeft = 616 + ExplicitLeft = 545 ExplicitTop = 111 ExplicitWidth = 186 end @@ -405,19 +361,19 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Width = 93 end inherited ImporteIVA: TcxDBCurrencyEdit - Left = 687 + Left = 616 Top = 57 Style.IsFontAssigned = True - ExplicitLeft = 687 + ExplicitLeft = 616 ExplicitTop = 57 ExplicitWidth = 137 Width = 137 end inherited ImporteTotal: TcxDBCurrencyEdit - Left = 617 + Left = 546 Top = 131 Style.IsFontAssigned = True - ExplicitLeft = 617 + ExplicitLeft = 546 ExplicitTop = 131 ExplicitWidth = 137 Width = 137 @@ -429,34 +385,34 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ExplicitTop = 131 end inherited edtIVA: TcxDBSpinEdit - Left = 616 + Left = 545 Top = 57 Style.IsFontAssigned = True - ExplicitLeft = 616 + ExplicitLeft = 545 ExplicitTop = 57 end inherited ImporteBase: TcxDBCurrencyEdit - Left = 616 + Left = 545 Top = 30 Style.IsFontAssigned = True - ExplicitLeft = 616 + ExplicitLeft = 545 ExplicitTop = 30 ExplicitWidth = 92 Width = 92 end inherited edtRE: TcxDBSpinEdit - Left = 616 + Left = 545 Top = 84 Properties.AssignedValues.MinValue = True Style.IsFontAssigned = True - ExplicitLeft = 616 + ExplicitLeft = 545 ExplicitTop = 84 end inherited ImporteRE: TcxDBCurrencyEdit - Left = 687 + Left = 616 Top = 84 Style.IsFontAssigned = True - ExplicitLeft = 687 + ExplicitLeft = 616 ExplicitTop = 84 ExplicitWidth = 56 Width = 56 @@ -487,10 +443,10 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Width = 134 end inherited bTiposIVA: TButton - Left = 356 + Left = 285 Top = 57 OnClick = frViewTotales1bTiposIVAClick - ExplicitLeft = 356 + ExplicitLeft = 285 ExplicitTop = 57 end inherited cbRecargoEquivalencia: TcxDBCheckBox diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas index f736a905..321bad56 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas @@ -257,6 +257,7 @@ begin frViewDetallesFacturaCliente1.BeginUpdate; // Para que no se mueva el foco try bEsNuevo := FFactura.EsNuevo; + FController.SetID_Tienda(FFactura, frViewFacturaCliente1.frViewTienda1.getIDTienda); FController.Guardar(FFactura); finally frViewDetallesFacturaCliente1.EndUpdate; diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm index b30fee4d..84cbc5cd 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm @@ -143,8 +143,6 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente inherited edtFechaFinFiltro: TcxDateEdit Left = 351 ExplicitLeft = 351 - ExplicitWidth = 273 - Width = 273 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas index 6de0b1e1..359c10fc 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas @@ -129,10 +129,10 @@ begin end; procedure TfEditorFacturasCliente.DuplicarInterno; -var - AFactura : IBizFacturaCliente; +{var + AFactura : IBizFacturaCliente;} begin -AppFactuGES.ShowCapado; + AppFactuGES.ShowCapado; { inherited; AFactura := FController.Duplicar(FFacturas); diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm index b59c61e4..01dde6c1 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm @@ -1,6 +1,6 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente - Width = 896 - Height = 476 + Width = 745 + Height = 458 Align = alClient OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy @@ -9,8 +9,8 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 - Width = 896 - Height = 476 + Width = 745 + Height = 458 Align = alClient ParentBackground = True TabOrder = 0 @@ -19,8 +19,8 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente ExplicitWidth = 451 ExplicitHeight = 304 DesignSize = ( - 896 - 476) + 745 + 458) object eReferencia: TcxDBTextEdit Left = 124 Top = 30 @@ -64,7 +64,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente end object memObservaciones: TcxDBMemo Left = 22 - Top = 137 + Top = 275 Anchors = [akLeft, akTop, akRight, akBottom] DataBinding.DataField = 'OBSERVACIONES' DataBinding.DataSource = DADataSource @@ -76,12 +76,12 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente StyleDisabled.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 4 + TabOrder = 6 Height = 159 Width = 301 end inline frViewClienteFactura: TfrViewDatosYSeleccionCliente - Left = 368 + Left = 401 Top = 30 Width = 314 Height = 215 @@ -93,7 +93,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente ParentFont = False TabOrder = 5 ReadOnly = False - ExplicitLeft = 368 + ExplicitLeft = 401 ExplicitTop = 30 ExplicitWidth = 314 ExplicitHeight = 215 @@ -128,13 +128,13 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 327 end inherited edtCodigoPostal: TcxDBTextEdit - Left = 414 + Left = 230 DataBinding.DataSource = DADataSource - ExplicitLeft = 414 + ExplicitLeft = 230 end inherited Button3: TBitBtn - Left = 304 - ExplicitLeft = 304 + Left = 120 + ExplicitLeft = 120 end end end @@ -170,7 +170,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 78 end object bFormasPago: TButton - Left = 208 + Left = 241 Top = 84 Width = 132 Height = 23 @@ -179,109 +179,115 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente OnClick = bFormasPagoClick end inline frViewTienda1: TfrViewTienda - Left = 379 - Top = 270 - Width = 729 - Height = 180 - Align = alBottom + Left = 22 + Top = 137 + Width = 351 + Height = 48 Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText Font.Height = -11 Font.Name = 'Tahoma' Font.Style = [] ParentFont = False - TabOrder = 6 + TabOrder = 4 ReadOnly = False - ExplicitLeft = 379 - ExplicitTop = 270 - ExplicitWidth = 729 + ExplicitLeft = 22 + ExplicitTop = 137 + ExplicitWidth = 351 + ExplicitHeight = 48 inherited dxLayoutControl1: TdxLayoutControl - Width = 729 - ExplicitWidth = 729 - inherited cbTienda: TcxDBComboBox - DataBinding.DataSource = DADataSource - Properties.OnChange = frViewTienda1cbTiendaPropertiesChange - ExplicitWidth = 376 - Width = 376 + Width = 351 + Height = 63 + ExplicitWidth = 351 + ExplicitHeight = 63 + inherited cbTienda: TcxComboBox + ExplicitWidth = 399 + Width = 399 end end end object dxLayoutControl1Group_Root: TdxLayoutGroup ShowCaption = False Hidden = True - LayoutDirection = ldHorizontal ShowBorder = False - object dxLayoutControl1Group6: TdxLayoutGroup + object dxLayoutControl1Group7: TdxLayoutGroup ShowCaption = False Hidden = True + LayoutDirection = ldHorizontal ShowBorder = False - object dxLayoutControl1Group1: TdxLayoutGroup - AutoAligns = [aaVertical] - AlignHorz = ahClient - Caption = 'Datos de la factura' - object dxLayoutControl1Item1: TdxLayoutItem - Caption = 'Referencia:' - Control = eReferencia - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item2: TdxLayoutItem - Caption = 'Fecha de la factura:' - Control = edtFecha - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Group3: TdxLayoutGroup - ShowCaption = False - Hidden = True - LayoutDirection = ldHorizontal - ShowBorder = False - object dxLayoutControl1Item4: TdxLayoutItem - AutoAligns = [aaVertical] - AlignHorz = ahClient - Caption = 'Forma de pago:' - Control = cbFormaPago + object dxLayoutControl1Group6: TdxLayoutGroup + ShowCaption = False + Hidden = True + ShowBorder = False + object dxLayoutControl1Group1: TdxLayoutGroup + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'Datos de la factura' + object dxLayoutControl1Item1: TdxLayoutItem + Caption = 'Referencia:' + Control = eReferencia ControlOptions.ShowBorder = False end - object dxLayoutControl1Item10: TdxLayoutItem + object dxLayoutControl1Item2: TdxLayoutItem + Caption = 'Fecha de la factura:' + Control = edtFecha + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Group3: TdxLayoutGroup ShowCaption = False - Control = bFormasPago + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControl1Item4: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'Forma de pago:' + Control = cbFormaPago + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item10: TdxLayoutItem + ShowCaption = False + Control = bFormasPago + ControlOptions.ShowBorder = False + end + end + end + object dxLayoutControl1Group4: TdxLayoutGroup + AutoAligns = [aaVertical] + Caption = 'La factura pertenece a la tienda' + object dxLayoutControl1Item3: TdxLayoutItem + Caption = 'New Item' + ShowCaption = False + Control = frViewTienda1 + ControlOptions.AutoColor = True ControlOptions.ShowBorder = False end end end - object dxLayoutControl1Group5: TdxLayoutGroup - AutoAligns = [aaHorizontal] + object dxLayoutControl1Group2: TdxLayoutGroup + AutoAligns = [] + AlignHorz = ahClient AlignVert = avClient - Caption = 'Observaciones' - LayoutDirection = ldHorizontal - object dxLayoutControl1Item5: TdxLayoutItem - AutoAligns = [] - AlignHorz = ahClient - AlignVert = avClient - Control = memObservaciones + Caption = 'Datos del cliente' + object dxLayoutControl1Item6: TdxLayoutItem + Control = frViewClienteFactura + ControlOptions.AutoColor = True ControlOptions.ShowBorder = False end end end - object dxLayoutControl1Group2: TdxLayoutGroup - AutoAligns = [] - AlignHorz = ahClient + object dxLayoutControl1Group5: TdxLayoutGroup + AutoAligns = [aaHorizontal] AlignVert = avClient - Caption = 'Datos del cliente' - object dxLayoutControl1Item6: TdxLayoutItem - Control = frViewClienteFactura - ControlOptions.AutoColor = True + Caption = 'Observaciones' + LayoutDirection = ldHorizontal + object dxLayoutControl1Item5: TdxLayoutItem + AutoAligns = [] + AlignHorz = ahClient + AlignVert = avClient + Control = memObservaciones ControlOptions.ShowBorder = False end - object dxLayoutControl1Group4: TdxLayoutGroup - Caption = 'New Group' - object dxLayoutControl1Item3: TdxLayoutItem - Caption = 'New Item' - ShowCaption = False - Control = frViewTienda1 - ControlOptions.AutoColor = True - ControlOptions.ShowBorder = False - end - end end end end diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas index da194899..edbc53a0 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas @@ -51,10 +51,10 @@ type frViewTienda1: TfrViewTienda; dxLayoutControl1Group4: TdxLayoutGroup; dxLayoutControl1Item3: TdxLayoutItem; + dxLayoutControl1Group7: TdxLayoutGroup; procedure bFormasPagoClick(Sender: TObject); procedure CustomViewDestroy(Sender: TObject); procedure CustomViewCreate(Sender: TObject); - procedure frViewTienda1cbTiendaPropertiesChange(Sender: TObject); protected FFactura : IBizFacturaCliente; FController : IFacturasClienteController; @@ -100,17 +100,6 @@ begin FFormasPagoController := NIL; end; -procedure TfrViewFacturaCliente.frViewTienda1cbTiendaPropertiesChange( - Sender: TObject); -begin - inherited; - if assigned(Factura) - and assigned(Controller) then - begin - Controller.SetID_Tienda(Factura, frViewTienda1.getIDTienda); - end; -end; - function TfrViewFacturaCliente.GetController: IFacturasClienteController; begin Result := FController; @@ -138,6 +127,8 @@ begin begin DADataSource.DataTable := FFactura.DataTable; + frViewTienda1.DataItem := FFactura.DataTable; + FFormasPago := FFormasPagoController.BuscarTodos; dsFormaPago.DataTable := FFormasPago.DataTable; dsFormaPago.DataTable.Active := True; diff --git a/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dproj b/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dproj index 8cd753e0..c30751c6 100644 --- a/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dproj +++ b/Source/Modulos/Facturas de proveedor/Views/FacturasProveedor_view.dproj @@ -41,6 +41,7 @@ FalseTrueFalseTrueFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 + RemObjects Pascal Script - RemObjects SDK 3.0 Integration FacturasProveedor_view.dpk diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm index f5ca80c7..011728cf 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm @@ -2,20 +2,20 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor Left = 454 Top = 208 Caption = 'Nueva factura de proveedor' - ClientHeight = 573 - ClientWidth = 788 + ClientHeight = 606 + ClientWidth = 746 Position = poScreenCenter OnClose = CustomEditorClose - ExplicitWidth = 796 - ExplicitHeight = 600 + ExplicitWidth = 754 + ExplicitHeight = 640 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader - Width = 788 + Width = 746 Caption = 'Nueva factura de proveedor' - ExplicitWidth = 788 + ExplicitWidth = 746 inherited Image1: TImage - Left = 761 + Left = 719 Picture.Data = { 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 0000180806000000E0773DF80000000970485973000017120000171201679FD2 @@ -39,8 +39,8 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor end end inherited TBXDock: TTBXDock - Width = 788 - ExplicitWidth = 788 + Width = 746 + ExplicitWidth = 746 inherited tbxMain: TTBXToolbar ExplicitWidth = 488 inherited TBXItem2: TTBXItem @@ -54,7 +54,7 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor end end inherited tbxMenu: TTBXToolbar - ExplicitWidth = 788 + ExplicitWidth = 746 inherited TBXSubmenuItem4: TTBXSubmenuItem inherited TBXItem8: TTBXItem Visible = False @@ -69,23 +69,23 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor end end inherited pgPaginas: TPageControl - Width = 782 - Height = 309 + Width = 740 + Height = 342 OnChanging = pgPaginasChanging ExplicitLeft = 3 ExplicitTop = 79 - ExplicitWidth = 782 - ExplicitHeight = 309 + ExplicitWidth = 740 + ExplicitHeight = 342 inherited pagGeneral: TTabSheet ExplicitLeft = 4 ExplicitTop = 24 - ExplicitWidth = 774 - ExplicitHeight = 281 + ExplicitWidth = 732 + ExplicitHeight = 314 inline frViewFacturaProveedor1: TfrViewFacturaProveedor Left = 0 Top = 0 - Width = 774 - Height = 281 + Width = 732 + Height = 314 Align = alClient Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -95,13 +95,15 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 774 - ExplicitHeight = 281 + ExplicitWidth = 732 + ExplicitHeight = 314 inherited dxLayoutControl1: TdxLayoutControl - Width = 774 - Height = 281 - ExplicitWidth = 774 - ExplicitHeight = 281 + Height = 314 + ExplicitWidth = 732 + ExplicitHeight = 314 + DesignSize = ( + 732 + 314) inherited eReferencia: TcxDBTextEdit ExplicitWidth = 159 Width = 159 @@ -117,54 +119,42 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor Width = 301 end inherited cbFormaPago: TcxDBLookupComboBox - ExplicitWidth = 78 - Width = 78 + ExplicitWidth = 169 + Width = 169 + end + inherited eReferenciaProveedor: TcxDBTextEdit + ExplicitWidth = 316 + Width = 316 end inherited frViewProveedorFactura: TfrViewDatosYSeleccionProveedor inherited dxLayoutControl1: TdxLayoutControl inherited edtlNombre: TcxDBTextEdit - DataBinding.DataSource = frViewFacturaProveedor1.DADataSource + ExplicitWidth = 276 + Width = 276 end inherited edtNIFCIF: TcxDBTextEdit - DataBinding.DataSource = frViewFacturaProveedor1.DADataSource ExplicitWidth = 562 Width = 562 end inherited edtCalle: TcxDBTextEdit - DataBinding.DataSource = frViewFacturaProveedor1.DADataSource ExplicitWidth = 562 Width = 562 end inherited edtPoblacion: TcxDBTextEdit - DataBinding.DataSource = frViewFacturaProveedor1.DADataSource - ExplicitWidth = 177 - Width = 177 + ExplicitWidth = 241 + Width = 241 end inherited edtProvincia: TcxDBTextEdit - DataBinding.DataSource = frViewFacturaProveedor1.DADataSource - ExplicitWidth = 327 - Width = 327 - end - inherited edtCodigoPostal: TcxDBTextEdit - Left = 322 - DataBinding.DataSource = frViewFacturaProveedor1.DADataSource - ExplicitLeft = 322 - end - inherited Button3: TBitBtn - Left = 206 - ExplicitLeft = 206 + ExplicitWidth = 289 + Width = 289 end end end inherited frViewTienda1: TfrViewTienda - Width = 694 - ExplicitWidth = 694 inherited dxLayoutControl1: TdxLayoutControl - Width = 694 - inherited cbTienda: TcxDBComboBox - DataBinding.DataSource = frViewFacturaProveedor1.DADataSource - ExplicitWidth = 412 - Width = 412 + inherited cbTienda: TcxComboBox + ExplicitWidth = 376 + Width = 376 end end end @@ -177,8 +167,8 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor inline frViewDetallesFacturaProveedor1: TfrViewDetallesFacturaProveedor Left = 0 Top = 0 - Width = 774 - Height = 281 + Width = 732 + Height = 314 Align = alClient BiDiMode = bdLeftToRight Font.Charset = DEFAULT_CHARSET @@ -190,11 +180,11 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ParentFont = False TabOrder = 0 ReadOnly = False - ExplicitWidth = 774 - ExplicitHeight = 281 + ExplicitWidth = 732 + ExplicitHeight = 314 inherited ToolBar1: TToolBar - Width = 774 - ExplicitWidth = 774 + Width = 732 + ExplicitWidth = 732 inherited ToolButton4: TToolButton Wrap = False end @@ -253,14 +243,14 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor end end inherited cxGrid: TcxGrid - Width = 774 - Height = 209 - ExplicitWidth = 774 - ExplicitHeight = 209 + Width = 732 + Height = 242 + ExplicitWidth = 732 + ExplicitHeight = 242 end inherited TBXDock1: TTBXDock - Width = 774 - ExplicitWidth = 774 + Width = 732 + ExplicitWidth = 732 inherited TBXToolbar1: TTBXToolbar ExplicitWidth = 548 end @@ -270,6 +260,10 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor object pagContabilidad: TTabSheet Caption = 'Contabilidad' ImageIndex = 2 + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object cbIgnorarContabilidad: TcxDBCheckBox Left = 16 Top = 12 @@ -296,19 +290,19 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor end end inherited StatusBar: TJvStatusBar - Top = 554 - Width = 788 + Top = 587 + Width = 746 Panels = < item Width = 200 end> - ExplicitTop = 554 - ExplicitWidth = 788 + ExplicitTop = 587 + ExplicitWidth = 746 end inline frViewTotales1: TfrViewTotales [4] Left = 0 - Top = 391 - Width = 788 + Top = 424 + Width = 746 Height = 163 Align = alBottom Font.Charset = DEFAULT_CHARSET @@ -319,12 +313,12 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ParentFont = False TabOrder = 4 ReadOnly = False - ExplicitTop = 391 - ExplicitWidth = 788 + ExplicitTop = 424 + ExplicitWidth = 746 ExplicitHeight = 163 inherited dxLayoutControl1: TdxLayoutControl - Width = 788 - ExplicitWidth = 788 + Width = 746 + ExplicitWidth = 746 inherited Bevel1: TBevel Top = 111 Width = 73 @@ -332,18 +326,18 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ExplicitWidth = 73 end inherited Bevel3: TBevel - Left = 420 + Left = 398 Top = 30 Height = 122 - ExplicitLeft = 420 + ExplicitLeft = 398 ExplicitTop = 30 ExplicitHeight = 122 end inherited Bevel4: TBevel - Left = 532 + Left = 510 Top = 111 Width = 186 - ExplicitLeft = 532 + ExplicitLeft = 510 ExplicitTop = 111 ExplicitWidth = 186 end @@ -355,19 +349,19 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor Width = 93 end inherited ImporteIVA: TcxDBCurrencyEdit - Left = 603 + Left = 581 Top = 57 Style.IsFontAssigned = True - ExplicitLeft = 603 + ExplicitLeft = 581 ExplicitTop = 57 ExplicitWidth = 137 Width = 137 end inherited ImporteTotal: TcxDBCurrencyEdit - Left = 533 + Left = 511 Top = 131 Style.IsFontAssigned = True - ExplicitLeft = 533 + ExplicitLeft = 511 ExplicitTop = 131 ExplicitWidth = 137 Width = 137 @@ -379,34 +373,34 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor ExplicitTop = 131 end inherited edtIVA: TcxDBSpinEdit - Left = 532 + Left = 510 Top = 57 Style.IsFontAssigned = True - ExplicitLeft = 532 + ExplicitLeft = 510 ExplicitTop = 57 end inherited ImporteBase: TcxDBCurrencyEdit - Left = 532 + Left = 510 Top = 30 Style.IsFontAssigned = True - ExplicitLeft = 532 + ExplicitLeft = 510 ExplicitTop = 30 ExplicitWidth = 92 Width = 92 end inherited edtRE: TcxDBSpinEdit - Left = 532 + Left = 510 Top = 84 Properties.AssignedValues.MinValue = True Style.IsFontAssigned = True - ExplicitLeft = 532 + ExplicitLeft = 510 ExplicitTop = 84 end inherited ImporteRE: TcxDBCurrencyEdit - Left = 603 + Left = 581 Top = 84 Style.IsFontAssigned = True - ExplicitLeft = 603 + ExplicitLeft = 581 ExplicitTop = 84 ExplicitWidth = 56 Width = 56 @@ -437,10 +431,10 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor Width = 134 end inherited bTiposIVA: TButton - Left = 272 + Left = 250 Top = 57 OnClick = frViewTotales1bTiposIVAClick - ExplicitLeft = 272 + ExplicitLeft = 250 ExplicitTop = 57 end inherited cbRecargoEquivalencia: TcxDBCheckBox diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas index 9f77474e..dcdc217a 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas +++ b/Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas @@ -246,6 +246,7 @@ begin frViewDetallesFacturaProveedor1.BeginUpdate; // Para que no se mueva el foco try bEsNuevo := FFactura.EsNuevo; + FController.SetID_Tienda(FFactura, frViewFacturaProveedor1.frViewTienda1.getIDTienda); FController.Guardar(FFactura); finally frViewDetallesFacturaProveedor1.EndUpdate; diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm index 0fad8022..02b118cd 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm +++ b/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.dfm @@ -1,6 +1,6 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor - Width = 694 - Height = 401 + Width = 732 + Height = 410 Align = alClient OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy @@ -9,8 +9,8 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 - Width = 694 - Height = 401 + Width = 732 + Height = 410 Align = alClient ParentBackground = True TabOrder = 0 @@ -19,8 +19,8 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor ExplicitWidth = 451 ExplicitHeight = 304 DesignSize = ( - 694 - 401) + 732 + 410) object eReferencia: TcxDBTextEdit Left = 136 Top = 30 @@ -28,7 +28,6 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor DataBinding.DataField = 'REFERENCIA' DataBinding.DataSource = DADataSource Enabled = False - Properties.ReadOnly = False Style.BorderColor = clWindowFrame Style.BorderStyle = ebs3D Style.Color = clInfoBk @@ -65,7 +64,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor end object memObservaciones: TcxDBMemo Left = 22 - Top = 164 + Top = 262 Anchors = [akLeft, akTop, akRight, akBottom] DataBinding.DataField = 'OBSERVACIONES' DataBinding.DataSource = DADataSource @@ -77,7 +76,7 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor StyleDisabled.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 5 + TabOrder = 7 Height = 159 Width = 301 end @@ -110,10 +109,10 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 3 - Width = 78 + Width = 169 end object bFormasPago: TButton - Left = 162 + Left = 210 Top = 111 Width = 132 Height = 23 @@ -139,12 +138,12 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True TabOrder = 1 - Width = 158 + Width = 316 end inline frViewProveedorFactura: TfrViewDatosYSeleccionProveedor - Left = 322 + Left = 370 Top = 30 - Width = 350 + Width = 340 Height = 202 Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -154,9 +153,12 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor ParentFont = False TabOrder = 6 ReadOnly = False - ExplicitLeft = 322 + ExplicitLeft = 370 ExplicitTop = 30 + ExplicitWidth = 340 inherited dxLayoutControl1: TdxLayoutControl + Width = 340 + ExplicitWidth = 340 inherited edtNIFCIF: TcxDBTextEdit ExplicitWidth = 562 Width = 562 @@ -166,124 +168,136 @@ inherited frViewFacturaProveedor: TfrViewFacturaProveedor Width = 562 end inherited edtPoblacion: TcxDBTextEdit - ExplicitWidth = 177 - Width = 177 + ExplicitWidth = 241 + Width = 241 end inherited edtProvincia: TcxDBTextEdit - ExplicitWidth = 327 - Width = 327 + ExplicitWidth = 289 + Width = 289 + end + inherited edtCodigoPostal: TcxDBTextEdit + Left = 248 + ExplicitLeft = 248 + end + inherited Button3: TBitBtn + Left = 132 + ExplicitLeft = 132 end end end inline frViewTienda1: TfrViewTienda - Left = 333 - Top = 257 - Width = 694 - Height = 46 - Align = alBottom + Left = 22 + Top = 164 + Width = 320 + Height = 36 Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText Font.Height = -11 Font.Name = 'Tahoma' Font.Style = [] ParentFont = False - TabOrder = 7 + TabOrder = 5 ReadOnly = False - ExplicitLeft = 333 - ExplicitTop = 257 - ExplicitWidth = 694 + ExplicitLeft = 22 + ExplicitTop = 164 + ExplicitWidth = 320 + ExplicitHeight = 36 inherited dxLayoutControl1: TdxLayoutControl - Width = 694 - ExplicitWidth = 694 - inherited cbTienda: TcxDBComboBox - DataBinding.DataSource = DADataSource - Properties.OnChange = frViewTienda1cbTiendaPropertiesChange - ExplicitWidth = 412 - Width = 412 + Width = 320 + ExplicitWidth = 210 + inherited cbTienda: TcxComboBox + ExplicitWidth = 376 + Width = 376 end end end object dxLayoutControl1Group_Root: TdxLayoutGroup ShowCaption = False Hidden = True - LayoutDirection = ldHorizontal ShowBorder = False - object dxLayoutControl1Group6: TdxLayoutGroup - AutoAligns = [aaVertical] - AlignHorz = ahClient + object dxLayoutControl1Group7: TdxLayoutGroup ShowCaption = False Hidden = True + LayoutDirection = ldHorizontal ShowBorder = False - object dxLayoutControl1Group1: TdxLayoutGroup + object dxLayoutControl1Group6: TdxLayoutGroup AutoAligns = [aaVertical] AlignHorz = ahClient - Caption = 'Datos de la factura' - object dxLayoutControl1Item1: TdxLayoutItem - Caption = 'Referencia:' - Control = eReferencia - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item6: TdxLayoutItem - Caption = 'Referencia proveedor:' - Control = eReferenciaProveedor - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Item2: TdxLayoutItem - Caption = 'Fecha de la factura:' - Control = edtFecha - ControlOptions.ShowBorder = False - end - object dxLayoutControl1Group3: TdxLayoutGroup - ShowCaption = False - Hidden = True - LayoutDirection = ldHorizontal - ShowBorder = False - object dxLayoutControl1Item4: TdxLayoutItem - AutoAligns = [aaVertical] - AlignHorz = ahClient - Caption = 'Forma de pago:' - Control = cbFormaPago + ShowCaption = False + Hidden = True + ShowBorder = False + object dxLayoutControl1Group1: TdxLayoutGroup + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'Datos de la factura' + object dxLayoutControl1Item1: TdxLayoutItem + Caption = 'Referencia:' + Control = eReferencia ControlOptions.ShowBorder = False end - object dxLayoutControl1Item10: TdxLayoutItem + object dxLayoutControl1Item6: TdxLayoutItem + Caption = 'Referencia proveedor:' + Control = eReferenciaProveedor + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item2: TdxLayoutItem + Caption = 'Fecha de la factura:' + Control = edtFecha + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Group3: TdxLayoutGroup ShowCaption = False - Control = bFormasPago + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControl1Item4: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'Forma de pago:' + Control = cbFormaPago + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item10: TdxLayoutItem + ShowCaption = False + Control = bFormasPago + ControlOptions.ShowBorder = False + end + end + end + object dxLayoutControl1Group4: TdxLayoutGroup + Caption = 'La factura pertenece a la tienda' + object dxLayoutControl1Item7: TdxLayoutItem + Control = frViewTienda1 + ControlOptions.AutoColor = True ControlOptions.ShowBorder = False end end end - object dxLayoutControl1Group5: TdxLayoutGroup - AutoAligns = [aaHorizontal] + object dxLayoutControl1Group2: TdxLayoutGroup + AutoAligns = [] + AlignHorz = ahClient AlignVert = avClient - Caption = 'Observaciones' - LayoutDirection = ldHorizontal - object dxLayoutControl1Item5: TdxLayoutItem - AutoAligns = [] - AlignHorz = ahClient - AlignVert = avClient - Control = memObservaciones + Caption = 'Datos del proveedor' + object dxLayoutControl1Item3: TdxLayoutItem + AutoAligns = [aaVertical] + Control = frViewProveedorFactura + ControlOptions.AutoColor = True ControlOptions.ShowBorder = False end end end - object dxLayoutControl1Group2: TdxLayoutGroup - AutoAligns = [] - AlignHorz = ahClient + object dxLayoutControl1Group5: TdxLayoutGroup + AutoAligns = [aaHorizontal] AlignVert = avClient - Caption = 'Datos del proveedor' - object dxLayoutControl1Item3: TdxLayoutItem - Control = frViewProveedorFactura - ControlOptions.AutoColor = True + Caption = 'Observaciones' + LayoutDirection = ldHorizontal + object dxLayoutControl1Item5: TdxLayoutItem + AutoAligns = [] + AlignHorz = ahClient + AlignVert = avClient + Control = memObservaciones ControlOptions.ShowBorder = False end - object dxLayoutControl1Group4: TdxLayoutGroup - Caption = 'La factura pertenece a la tienda' - object dxLayoutControl1Item7: TdxLayoutItem - Control = frViewTienda1 - ControlOptions.AutoColor = True - ControlOptions.ShowBorder = False - end - end end end end diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.pas b/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.pas index eef3b371..e2634d59 100644 --- a/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.pas +++ b/Source/Modulos/Facturas de proveedor/Views/uViewFacturaProveedor.pas @@ -50,15 +50,15 @@ type eReferenciaProveedor: TcxDBTextEdit; dxLayoutControl1Item3: TdxLayoutItem; frViewProveedorFactura: TfrViewDatosYSeleccionProveedor; + dxLayoutControl1Group4: TdxLayoutGroup; dxLayoutControl1Item7: TdxLayoutItem; frViewTienda1: TfrViewTienda; - dxLayoutControl1Group4: TdxLayoutGroup; + dxLayoutControl1Group7: TdxLayoutGroup; procedure bFormasPagoClick(Sender: TObject); procedure CustomViewDestroy(Sender: TObject); procedure CustomViewCreate(Sender: TObject); procedure frViewProveedorFacturaButton1Click(Sender: TObject); procedure frViewProveedorFacturaButton2Click(Sender: TObject); - procedure frViewTienda1cbTiendaPropertiesChange(Sender: TObject); protected FFactura : IBizFacturaProveedor; FFormasPago : IBizFormaPago; @@ -129,17 +129,6 @@ begin frViewProveedorFactura.actAnadirContacto.Execute; end; -procedure TfrViewFacturaProveedor.frViewTienda1cbTiendaPropertiesChange( - Sender: TObject); -begin - inherited; - if assigned(Factura) - and assigned(Controller) then - begin - Controller.SetID_Tienda(Factura, frViewTienda1.getIDTienda); - end; -end; - function TfrViewFacturaProveedor.GetController: IFacturasProveedorController; begin Result := FController; @@ -164,6 +153,7 @@ begin if Assigned(FFactura) then begin DADataSource.DataTable := FFactura.DataTable; + frViewTienda1.DataItem := FFactura.DataTable; FFormasPago := FFormasPagoController.BuscarTodos; dsFormaPago.DataTable := FFormasPago.DataTable; diff --git a/Source/Modulos/Presupuestos de cliente/Controller/uPresupuestosClienteController.pas b/Source/Modulos/Presupuestos de cliente/Controller/uPresupuestosClienteController.pas index 1e21e681..6b086fa4 100644 --- a/Source/Modulos/Presupuestos de cliente/Controller/uPresupuestosClienteController.pas +++ b/Source/Modulos/Presupuestos de cliente/Controller/uPresupuestosClienteController.pas @@ -641,20 +641,22 @@ begin if not APresupuesto.DataTable.Editing then APresupuesto.DataTable.Edit; - if ID_Tienda < 0 then + if (ID_Tienda < 0) then begin APresupuesto.DataTable.FieldByName(fld_PresupuestosClienteID_TIENDA).AsVariant := Null; APresupuesto.DataTable.FieldByName(fld_PresupuestosClienteTIENDA).AsVariant := Null end - else - begin + else begin APresupuesto.ID_TIENDA := ID_Tienda; - APresupuesto.TIENDA := Tienda; + APresupuesto.TIENDA := Tienda; end; -APresupuesto.DataTable.DisableControls; - APresupuesto.DataTable.Post; -APresupuesto.DataTable.EnableControls; + APresupuesto.DataTable.DisableControls; + try + APresupuesto.DataTable.Post; + finally + APresupuesto.DataTable.EnableControls; + end; if EnEdicion then APresupuesto.DataTable.Edit; diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm index abdf3c2d..59f504d8 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm @@ -6,7 +6,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente ClientWidth = 674 OnClose = CustomEditorClose ExplicitWidth = 682 - ExplicitHeight = 658 + ExplicitHeight = 665 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -149,6 +149,8 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente Height = 459 TabOrder = 1 OnChanging = pgPaginasChanging + ExplicitLeft = 3 + ExplicitTop = 79 ExplicitWidth = 668 ExplicitHeight = 459 inherited pagGeneral: TTabSheet @@ -230,7 +232,8 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente end inherited TBXDock1: TTBXDock Width = 660 - ExplicitWidth = 624 + ExplicitTop = 46 + ExplicitWidth = 660 inherited TBXToolbar1: TTBXToolbar ExplicitWidth = 548 end @@ -258,7 +261,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente ExplicitHeight = 431 inherited pnlSup: TPanel Width = 660 - ExplicitWidth = 624 + ExplicitWidth = 660 inherited eIncidenciaActiva: TcxDBCheckBox ExplicitHeight = 21 end diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas index 61a17c51..95a5463d 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas +++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas @@ -126,7 +126,7 @@ end; procedure TfEditorPresupuestoCliente.EliminarInterno; begin - if (ShowConfirmMessage('¿Desea borrar este Presupuesto de cliente?', '') = IDYES) then + if (ShowConfirmMessage('¿Desea borrar este presupuesto de cliente?', '') = IDYES) then begin FController.Eliminar(FPresupuesto); inherited @@ -141,7 +141,7 @@ begin raise Exception.Create('No hay ninguna vista asignada'); if not Assigned(Presupuesto) then - raise Exception.Create('No hay ningún Presupuesto asignado'); + raise Exception.Create('No hay ningún presupuesto asignado'); Presupuesto.DataTable.Active := True; pgPaginas.ActivePage := pagGeneral; @@ -187,6 +187,7 @@ begin frViewDetallesPresupuestoCliente1.BeginUpdate; try bEsNuevo := FPresupuesto.EsNuevo; + FController.SetID_Tienda(FPresupuesto, TfrViewPresupuestoCliente(FViewPresupuesto).frViewTienda1.getIDTienda, ''); FController.Guardar(FPresupuesto); finally frViewDetallesPresupuestoCliente1.EndUpdate; @@ -194,7 +195,7 @@ begin HideHourglassCursor; end; if bEsNuevo then - ShowInfoMessage('El Presupuesto se ha dado de alta con el código ' + FPresupuesto.REFERENCIA); + ShowInfoMessage('El presupuesto se ha dado de alta con el código ' + FPresupuesto.REFERENCIA); Modified := False; end; @@ -220,16 +221,18 @@ begin AClientesController := TClientesController.Create; try - if not AClientesController.TieneDatosBancarios(FPresupuesto.Cliente) then - MessageBox(0, 'Este cliente no tiene datos bancarios en su ficha', 'Atención', MB_ICONWARNING or MB_OK); + // No avisar si el cliente no tiene datos bancarios + {if not AClientesController.TieneDatosBancarios(FPresupuesto.Cliente) then + MessageBox(0, 'Este cliente no tiene datos bancarios en su ficha', 'Atención', MB_ICONWARNING or MB_OK);} case FPresupuesto.Cliente.Direcciones.RecordCount of - 0 : begin + // No avisar si el cliente no tiene direcciones + {0 : begin FController.QuitarDireccionEnvio(FPresupuesto); MessageBox(0, '¡Atención! Este cliente no tiene ' + #10#13 + 'ninguna dirección de envío en su ficha', 'Atención', MB_ICONWARNING or MB_OK); FPresupuesto.Edit; FPresupuesto.IMPORTE_PORTE := 0; - end; + end;} 1 : begin FController.CopiarDireccionEnvio(FPresupuesto.Cliente.Direcciones, FPresupuesto); FPresupuesto.Edit; @@ -266,7 +269,7 @@ begin inherited; if (not Assigned(FPresupuesto)) or (FPresupuesto.ID_CLIENTE = 0) then begin - ShowWarningMessage('Antes de introducir conceptos debe elegir un cliente para este Presupuesto'); + ShowWarningMessage('Antes de introducir conceptos debe elegir un cliente para este presupuesto'); AllowChange := False; end; end; diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm index 09c42e70..49e64d1b 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm @@ -1,21 +1,21 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente - Width = 985 + Width = 787 Height = 473 OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy - ExplicitWidth = 985 + ExplicitWidth = 787 ExplicitHeight = 473 object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 - Width = 985 + Width = 787 Height = 473 Align = alClient ParentBackground = True TabOrder = 0 AutoContentSizes = [acsWidth, acsHeight] DesignSize = ( - 985 + 787 473) object edtFechaPresupuesto: TcxDBDateEdit Left = 123 @@ -42,7 +42,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente end object memObservaciones: TcxDBMemo Left = 22 - Top = 351 + Top = 344 Anchors = [akLeft, akTop, akRight, akBottom] DataBinding.DataField = 'OBSERVACIONES' DataBinding.DataSource = DADataSource @@ -54,7 +54,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente StyleDisabled.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 10 + TabOrder = 11 Height = 100 Width = 941 end @@ -85,7 +85,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente Width = 143 end inline frViewClientePresupuesto: TfrViewDatosYSeleccionCliente - Left = 679 + Left = 477 Top = 28 Width = 350 Height = 212 @@ -95,9 +95,9 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente Font.Name = 'Tahoma' Font.Style = [] ParentFont = False - TabOrder = 9 + TabOrder = 10 ReadOnly = False - ExplicitLeft = 679 + ExplicitLeft = 477 ExplicitTop = 28 inherited dxLayoutControl1: TdxLayoutControl inherited edtlNombre: TcxDBTextEdit @@ -121,12 +121,12 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente Width = 327 end inherited edtCodigoPostal: TcxDBTextEdit - Left = 192 - ExplicitLeft = 192 + Left = 196 + ExplicitLeft = 196 end inherited Button3: TBitBtn - Left = 82 - ExplicitLeft = 82 + Left = 86 + ExplicitLeft = 86 end end inherited DADataSource: TDADataSource @@ -141,7 +141,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente end object cbFormaPago: TcxDBLookupComboBox Left = 123 - Top = 190 + Top = 217 DataBinding.DataField = 'ID_FORMA_PAGO' DataBinding.DataSource = DADataSource Properties.KeyFieldNames = 'ID' @@ -166,16 +166,16 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 6 + TabOrder = 7 Width = 101 end object bFormasPago: TButton - Left = 517 - Top = 190 + Left = 315 + Top = 217 Width = 132 Height = 21 Caption = 'Ver las formas de pago...' - TabOrder = 7 + TabOrder = 8 OnClick = bFormasPagoClick end object edtFechaDecision: TcxDBDateEdit @@ -275,55 +275,71 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True TabOrder = 5 - Width = 121 + Width = 412 end inline frViewTienda1: TfrViewTienda Left = 22 - Top = 247 - Width = 766 - Height = 46 - Align = alBottom + Top = 274 + Width = 425 + Height = 34 Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText Font.Height = -11 Font.Name = 'Tahoma' Font.Style = [] ParentFont = False - TabOrder = 8 + TabOrder = 9 ReadOnly = False ExplicitLeft = 22 - ExplicitTop = 247 - ExplicitWidth = 766 - ExplicitHeight = 46 + ExplicitTop = 274 + ExplicitWidth = 425 + ExplicitHeight = 34 inherited dxLayoutControl1: TdxLayoutControl - Width = 766 - Height = 46 - ExplicitWidth = 766 - ExplicitHeight = 46 - inherited cbTienda: TcxDBComboBox - DataBinding.DataSource = DADataSource - Properties.OnValidate = frViewTienda1cbTiendaPropertiesValidate - ExplicitWidth = 412 - Width = 412 - end - inherited cbVendedor: TcxDBLookupComboBox - DataBinding.DataSource = DADataSource + Width = 425 + ExplicitWidth = 425 + inherited cbTienda: TcxComboBox + Margins.Left = 0 + Margins.Top = 0 + Margins.Right = 0 + Margins.Bottom = 0 + ExplicitWidth = 62 + Width = 62 end end end + object cbVendedor: TcxDBComboBox + Left = 123 + Top = 190 + DataBinding.DataField = 'ID_VENDEDOR' + DataBinding.DataSource = DADataSource + Properties.DropDownListStyle = lsEditFixedList + Properties.ImmediatePost = True + Properties.ImmediateUpdateText = True + Properties.Sorted = True + Properties.OnValidate = cbVendedorPropertiesValidate + 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 = 6 + Width = 121 + end object dxLayoutControl1Group_Root: TdxLayoutGroup ShowCaption = False Hidden = True ShowBorder = False object dxLayoutControl1Group10: TdxLayoutGroup AutoAligns = [aaHorizontal] - AlignVert = avClient ShowCaption = False Hidden = True LayoutDirection = ldHorizontal ShowBorder = False object dxLayoutControl1Group4: TdxLayoutGroup - AutoAligns = [aaVertical] + AutoAligns = [] AlignHorz = ahClient ShowCaption = False Hidden = True @@ -362,6 +378,11 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente Control = cbSituacion ControlOptions.ShowBorder = False end + object dxLayoutControl1Item11: TdxLayoutItem + Caption = 'Vendedor:' + Control = cbVendedor + ControlOptions.ShowBorder = False + end object dxLayoutControl1Group5: TdxLayoutGroup ShowCaption = False Visible = False @@ -386,11 +407,12 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente end object dxLayoutControl1Group3: TdxLayoutGroup AutoAligns = [aaHorizontal] - AlignVert = avClient - Caption = 'El presupuesto pertenece al al tienda' + Caption = 'El presupuesto pertenece a la tienda' object dxLayoutControl1Item9: TdxLayoutItem AutoAligns = [aaHorizontal] AlignVert = avClient + Caption = 'Tienda:' + ShowCaption = False Control = frViewTienda1 ControlOptions.AutoColor = True ControlOptions.ShowBorder = False @@ -398,7 +420,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente end end object dxLayoutControl1Group2: TdxLayoutGroup - AutoAligns = [aaVertical] + AutoAligns = [] AlignHorz = ahClient Caption = 'Datos del cliente' object dxLayoutControl1Item1: TdxLayoutItem @@ -410,7 +432,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente end object dxLayoutControl1Group7: TdxLayoutGroup AutoAligns = [aaHorizontal] - AlignVert = avBottom + AlignVert = avClient Caption = 'Observaciones' object dxLayoutControl1Item6: TdxLayoutItem AutoAligns = [aaHorizontal] diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.pas index f531fc48..53456aeb 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.pas +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.pas @@ -66,6 +66,8 @@ type frViewTienda1: TfrViewTienda; dxLayoutControl1Group3: TdxLayoutGroup; dxLayoutControl1Group4: TdxLayoutGroup; + cbVendedor: TcxDBComboBox; + dxLayoutControl1Item11: TdxLayoutItem; procedure CustomViewCreate(Sender: TObject); procedure CustomViewDestroy(Sender: TObject); procedure actElegirDireccionExecute(Sender: TObject); @@ -73,15 +75,14 @@ type procedure bFormasPagoClick(Sender: TObject); procedure frViewClientePresupuestoButton1Click(Sender: TObject); procedure frViewClientePresupuestoButton2Click(Sender: TObject); - procedure frViewTienda1cbTiendaPropertiesValidate(Sender: TObject; + procedure cbVendedorPropertiesValidate(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); - procedure frViewTienda1cbTiendaPropertiesChange(Sender: TObject); protected FPresupuesto : IBizPresupuestoCliente; FController : IPresupuestosClienteController; FFormasPago : IBizFormaPago; FFormasPagoController : IFormasPagoController; - FEmpleadosController : IEmpleadosController; + FListaVendedores : TStringList; FViewClientePresupuesto : TfrViewDatosYSeleccionCliente; function GetPresupuesto: IBizPresupuestoCliente; @@ -104,7 +105,7 @@ implementation { TfrViewPresupuestoCliente } uses - uClientesController, uBizDireccionesContacto, uFactuGES_App; + uClientesController, uBizContactos, uBizDireccionesContacto, uFactuGES_App; procedure TfrViewPresupuestoCliente.actElegirDireccionExecute(Sender: TObject); @@ -118,7 +119,7 @@ begin APresupuestoController := TPresupuestosClienteController.Create; try ADireccion := AClientesController.ElegirDireccionEntrega(FPresupuesto.Cliente.Direcciones, - 'Seleccione la dirección del cliente que quiere utilizar como dirección de envio de este Presupuesto.'); + 'Seleccione la dirección del cliente que quiere utilizar como dirección de este presupuesto.'); if Assigned(ADireccion) then begin APresupuestoController.CopiarDireccionEnvio(ADireccion, FPresupuesto); @@ -152,21 +153,60 @@ begin FFormasPagoController.VerTodos(FFormasPago); end; -procedure TfrViewPresupuestoCliente.CustomViewCreate(Sender: TObject); +procedure TfrViewPresupuestoCliente.cbVendedorPropertiesValidate( + Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; + var Error: Boolean); +var + AIndex : integer; begin inherited; - FFormasPago := Nil; - FFormasPagoController := TFormasPagoController.Create; - FViewClientePresupuesto := frViewClientePresupuesto; - FViewClientePresupuesto.MsgElegirCliente := 'Elija el cliente al que se le realizará el Presupuesto.'; - FEmpleadosController := TEmpleadosController.Create; - frViewTienda1.dsVendedores.DataTable := FEmpleadosController.BuscarVendedores.DataTable; - frViewTienda1.dsVendedores.DataTable.Active := true; + if Assigned(FPresupuesto) and FPresupuesto.Active then + begin + AIndex := StrToInt(FListaVendedores.Values[DisplayValue]); + + FPresupuesto.Edit; + FPresupuesto.ID_VENDEDOR := AIndex; + end; +end; + +procedure TfrViewPresupuestoCliente.CustomViewCreate(Sender: TObject); +var + i : integer; +begin + inherited; + FListaVendedores := NIL; + + FFormasPago := NIL; + FFormasPagoController := TFormasPagoController.Create; + + FViewClientePresupuesto := frViewClientePresupuesto; + FViewClientePresupuesto.MsgElegirCliente := 'Elija el cliente al que se le realizará el presupuesto.'; + + with TEmpleadosController.Create do + begin + try + FListaVendedores := DarListaVendedores; + with cbVendedor.Properties.Items do + begin + BeginUpdate; + try + Clear; + for i := 0 to FListaVendedores.Count - 1 do + Add(FListaVendedores.Names[i]); + finally + EndUpdate; + end; + end; + finally + Free; + end; + end; end; procedure TfrViewPresupuestoCliente.CustomViewDestroy(Sender: TObject); begin + FreeAndNIL(FListaVendedores); FFormasPago := Nil; FFormasPagoController := NIL; FViewClientePresupuesto := NIL; @@ -178,7 +218,7 @@ begin if Assigned(Presupuesto) and Assigned(Presupuesto.Cliente) and Assigned (Presupuesto.Detalles) and (Presupuesto.Detalles.RecordCount > 0) then begin - if (Application.MessageBox('Los descuentos de los artículos del Presupuesto serán actualizados con los del nuevo cliente seleccionado, ¿Desea continuar?', 'Atención', MB_YESNO) = IDNO) then + if (Application.MessageBox('Los descuentos de los artículos del presupuesto serán actualizados con los del nuevo cliente seleccionado, ¿Desea continuar?', 'Atención', MB_YESNO) = IDNO) then Exit; end; frViewClientePresupuesto.actElegirContacto.Execute; @@ -189,37 +229,12 @@ begin if Assigned(Presupuesto) and Assigned(Presupuesto.Cliente) and Assigned (Presupuesto.Detalles) and (Presupuesto.Detalles.RecordCount > 0) then begin - if (Application.MessageBox('Los descuentos de los artículos del Presupuesto serán actualizados con los del nuevo cliente seleccionado, ¿Desea continuar?', 'Atención', MB_YESNO) = IDNO) then + if (Application.MessageBox('Los descuentos de los artículos del presupuesto serán actualizados con los del nuevo cliente seleccionado, ¿Desea continuar?', 'Atención', MB_YESNO) = IDNO) then Exit; end; frViewClientePresupuesto.actAnadirContacto.Execute; end; -procedure TfrViewPresupuestoCliente.frViewTienda1cbTiendaPropertiesChange( - Sender: TObject); -begin - inherited; -{ - if assigned(Presupuesto) - and assigned(Controller) then - begin - Controller.SetID_Tienda(Presupuesto, frViewTienda1.getIDTienda); - end; -} -end; - -procedure TfrViewPresupuestoCliente.frViewTienda1cbTiendaPropertiesValidate( - Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; - var Error: Boolean); -begin - inherited; - if assigned(Presupuesto) - and assigned(Controller) then - begin - Controller.SetID_Tienda(Presupuesto, frViewTienda1.getIDTienda, frViewTienda1.cbTienda.Text); - end; -end; - function TfrViewPresupuestoCliente.GetController: IPresupuestosClienteController; begin Result := FController; @@ -241,20 +256,29 @@ begin end; procedure TfrViewPresupuestoCliente.SetPresupuesto(const Value: IBizPresupuestoCliente); +var + i : integer; begin FPresupuesto := Value; if Assigned(FPresupuesto) then begin DADataSource.DataTable := FPresupuesto.DataTable; + cbVendedor.Text := ''; + for i := 0 to FListaVendedores.Count-1 do + begin + if FListaVendedores.ValueFromIndex[i] = IntToStr(FPresupuesto.ID_VENDEDOR) then + begin + cbVendedor.Text := FListaVendedores.Names[i]; + Break; + end; + end; FFormasPago := FFormasPagoController.BuscarTodos; dsFormaPago.DataTable := FFormasPago.DataTable; dsFormaPago.DataTable.Active := True; frViewClientePresupuesto.Cliente := FPresupuesto.Cliente; -//REPASAR - if FPresupuesto.EsNuevo then - frViewTienda1.SetIDTienda(FPresupuesto.ID_TIENDA); + frViewTienda1.DataItem := FPresupuesto.DataTable; end else begin DADataSource.DataTable := NIL; diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm index 1750d3d2..66b36429 100644 --- a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm +++ b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm @@ -23,7 +23,7 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente end> DataController.Summary.FooterSummaryItems = < item - Format = '0 pedidos' + Format = '0 presupuestos' Kind = skCount Column = cxGridViewREFERENCIA end @@ -151,14 +151,6 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente inherited dxLayoutControl1: TdxLayoutControl Width = 931 ExplicitWidth = 931 - inherited txtFiltroTodo: TcxTextEdit - ExplicitWidth = 273 - Width = 273 - end - inherited edtFechaIniFiltro: TcxDateEdit - ExplicitWidth = 121 - Width = 121 - end inherited edtFechaFinFiltro: TcxDateEdit Left = 383 ExplicitLeft = 383 diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 87b65fa1..8fffc111 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 1554da5d..13243bb1 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -1,252 +1,250 @@ - + - - {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} - FactuGES_Server.dpr - Debug - AnyCPU - DCC32 - ..\..\Output\Debug\Servidor\FactuGES_Server.exe - - - 7.0 - False - False - 0 - 3 - ..\..\Output\Release\Servidor - RELEASE - - - 7.0 - 3 - ..\..\Output\Debug\Servidor - DEBUG; - True - - - Delphi.Personality - - -FalseTrueFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.03.0.0.0lunes, 19 de noviembre de 2007 18:58 - - - RemObjects Pascal Script - RemObjects SDK 3.0 Integration - FactuGES_Server.dpr - - - - - MainSource - - - - - -
srvEjercicios
- TDataAbstractService - - - - -
srvEmpresas
- TDARemoteService - - - - - - - - - -
srvAlbaranesCliente
- TDataAbstractService - - - - - -
srvAlbaranesProveedor
- TDataAbstractService - - - - -
srvAlmacenes
- TDARemoteService - - - - - - - -
srvContabilidad
- TDataAbstractService - - - - - - - - -
RptEtiquetasContacto
- TDataModule - - -
RptFichasEmpleado
- TDataModule - - -
srvContactos
- TDARemoteService - - - - - -
RptFacturasCliente
- TDataModule - - -
srvFacturasCliente
- TDataAbstractService - - - - - -
srvFacturasProveedor
- TDataAbstractService - - - - - - - - - - -
srvHistoricoMovimientos
- TDataAbstractService - - - - -
srvInventario
- TDataAbstractService - - - - - -
srvPedidosProveedor
- TDataAbstractService - - - - - -
RptPresupuestosCliente
- - -
srvPresupuestosCliente
- TDataAbstractService - - - - - - -
RptRecibosCliente
- TDataModule - - -
srvRecibosCliente
- TDataAbstractService - - - - - -
srvRecibosProveedor
- TDataAbstractService - - -
srvReferencias
- TDataAbstractService - - - - - -
srvRemesasCliente
- TDataAbstractService - - - - - -
srvRemesasProveedor
- TDataAbstractService - - - - - - - -
srvUnidadesMedida
- TDataAbstractService - - - - -
srvConfiguracion
- TDataAbstractService - - -
frConexionBD
- TFrame - - -
frConfGeneral
- TFrame - - -
fConfiguracion
- TForm - - -
FrameConfiguracion
- TFrame - - -
srvLogin
- TDARemoteService - - -
fAcercaDe
- - -
dmServer
- TDataModule - - -
fServerForm
- - - - - - - - - - + + {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} + FactuGES_Server.dpr + Debug + AnyCPU + DCC32 + ..\..\Output\Debug\Servidor\FactuGES_Server.exe + + + 7.0 + False + False + 0 + 3 + ..\..\Output\Release\Servidor + RELEASE + + + 7.0 + 3 + ..\..\Output\Debug\Servidor + DEBUG; + True + + + Delphi.Personality + + + FalseTrueFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.03.0.0.0lunes, 19 de noviembre de 2007 18:58 + RemObjects Pascal Script - RemObjects SDK 3.0 Integration + FactuGES_Server.dpr + + + + + MainSource + + + + + +
srvEjercicios
+ TDataAbstractService + + + + +
srvEmpresas
+ TDARemoteService + + + + + + + + + +
srvAlbaranesCliente
+ TDataAbstractService + + + + + +
srvAlbaranesProveedor
+ TDataAbstractService + + + + +
srvAlmacenes
+ TDARemoteService + + + + + + + +
srvContabilidad
+ TDataAbstractService + + + + + + + + +
RptEtiquetasContacto
+ TDataModule + + +
RptFichasEmpleado
+ TDataModule + + +
srvContactos
+ TDARemoteService + + + + + +
RptFacturasCliente
+ TDataModule + + +
srvFacturasCliente
+ TDataAbstractService + + + + + +
srvFacturasProveedor
+ TDataAbstractService + + + + + + + + + + +
srvHistoricoMovimientos
+ TDataAbstractService + + + + +
srvInventario
+ TDataAbstractService + + + + + +
srvPedidosProveedor
+ TDataAbstractService + + + + + +
RptPresupuestosCliente
+ + +
srvPresupuestosCliente
+ TDataAbstractService + + + + + + +
RptRecibosCliente
+ TDataModule + + +
srvRecibosCliente
+ TDataAbstractService + + + + + +
srvRecibosProveedor
+ TDataAbstractService + + +
srvReferencias
+ TDataAbstractService + + + + + +
srvRemesasCliente
+ TDataAbstractService + + + + + +
srvRemesasProveedor
+ TDataAbstractService + + + + + + + +
srvUnidadesMedida
+ TDataAbstractService + + + + +
srvConfiguracion
+ TDataAbstractService + + +
frConexionBD
+ TFrame + + +
frConfGeneral
+ TFrame + + +
fConfiguracion
+ TForm + + +
FrameConfiguracion
+ TFrame + + +
srvLogin
+ TDARemoteService + + +
fAcercaDe
+ + +
dmServer
+ TDataModule + + +
fServerForm
+ + + + + + + + + +