diff --git a/Source/ApplicationBase/ApplicationBase.res b/Source/ApplicationBase/ApplicationBase.res index 1641339f..8b251f31 100644 Binary files a/Source/ApplicationBase/ApplicationBase.res and b/Source/ApplicationBase/ApplicationBase.res differ diff --git a/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas b/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas index ca41267f..327e4e33 100644 --- a/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas +++ b/Source/ApplicationBase/Empresas/Controller/uEmpresasController.pas @@ -23,6 +23,7 @@ type function Existe(const ID: Integer) : Boolean; function ToStringList(AEmpresa : IBizEmpresa) : TStringList; function DarListaCuentasBancarias(AEmpresa : IBizEmpresa): TStringList; + function DarListaCuentasBancariasIBAN(AEmpresa : IBizEmpresa): TStringList; end; TEmpresasController = class(TControllerBase, IEmpresasController) @@ -34,8 +35,8 @@ type destructor Destroy; override; function Eliminar(const ID : Integer): Boolean; overload; - function Eliminar(AEmpresa : IBizEmpresa): Boolean; overload; - function Guardar(AEmpresa : IBizEmpresa): Boolean; + function Eliminar(AEmpresa : IBizEmpresa): Boolean; overload; + function Guardar(AEmpresa : IBizEmpresa): Boolean; procedure DescartarCambios(AEmpresa : IBizEmpresa); virtual; function Existe(const ID: Integer) : Boolean; virtual; procedure Anadir(AEmpresa : IBizEmpresa); virtual; @@ -47,6 +48,7 @@ type procedure VerTodos(AEmpresas: IBizEmpresa); virtual; function ToStringList(AEmpresa : IBizEmpresa) : TStringList; virtual; function DarListaCuentasBancarias(AEmpresa : IBizEmpresa): TStringList; + function DarListaCuentasBancariasIBAN(AEmpresa : IBizEmpresa): TStringList; end; implementation @@ -90,7 +92,7 @@ begin ADatosBancarios.DataTable.Active := True; Result := TStringList.Create; - ShowHourglassCursor; + ShowHourglassCursor; try with Result do begin @@ -105,7 +107,37 @@ begin end; finally ADatosBancarios := NIL; - HideHourglassCursor; + HideHourglassCursor; + end; +end; + +function TEmpresasController.DarListaCuentasBancariasIBAN(AEmpresa: IBizEmpresa): TStringList; +var + ADatosBancarios: IBizEmpresasDatosBancarios; + Aux : String; +begin + if not Assigned(AEmpresa) then + raise Exception.Create ('Empresa no asignada (DarListaCuentasBancariasIBAN)'); + + ADatosBancarios := AEmpresa.DatosBancarios; + ADatosBancarios.DataTable.Active := True; + + Result := TStringList.Create; + ShowHourglassCursor; + try + with Result do + begin + ADatosBancarios.DataTable.First; + while not ADatosBancarios.DataTable.EOF do + begin + Aux := Format('%s - %s', [ADatosBancarios.IBAN, ADatosBancarios.SWIFT]); + Add(Format('%s=%d', [Aux, ADatosBancarios.ID])); + ADatosBancarios.DataTable.Next; + end; + end; + finally + ADatosBancarios := NIL; + HideHourglassCursor; end; end; diff --git a/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas b/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas index 32290ac8..ef67b9b9 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 @@ -239,7 +239,7 @@ type end; { TEmpresasDataTableRules } - TEmpresasDataTableRules = class(TDADataTableRules, IEmpresas) + TEmpresasDataTableRules = class(TIntfObjectDADataTableRules, IEmpresas) private f_NOTAS: IROStrings; f_LOGOTIPO: IROStream; @@ -468,7 +468,7 @@ type end; { TEmpresasDatosBancoDataTableRules } - TEmpresasDatosBancoDataTableRules = class(TDADataTableRules, IEmpresasDatosBanco) + TEmpresasDatosBancoDataTableRules = class(TIntfObjectDADataTableRules, IEmpresasDatosBanco) private protected { Property getters and setters } diff --git a/Source/Informes/Presupuesto.rdx b/Source/Informes/Presupuesto.rdx index c0541080..70d2bc57 100644 Binary files a/Source/Informes/Presupuesto.rdx and b/Source/Informes/Presupuesto.rdx differ diff --git a/Source/Modulos/Facturas de cliente/FacturasCliente_Group.groupproj b/Source/Modulos/Facturas de cliente/FacturasCliente_Group.groupproj index 380a3278..ca82446e 100644 --- a/Source/Modulos/Facturas de cliente/FacturasCliente_Group.groupproj +++ b/Source/Modulos/Facturas de cliente/FacturasCliente_Group.groupproj @@ -11,8 +11,12 @@ + + + + @@ -54,6 +58,24 @@ + + + + + + + + + + + + + + + + + + @@ -72,6 +94,24 @@ + + + + + + + + + + + + + + + + + + @@ -172,13 +212,13 @@ - + - + - + \ No newline at end of file diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm index f770f63a..bf6a288e 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm @@ -100,7 +100,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente inherited dxLayoutControl1: TdxLayoutControl Width = 112 Height = 215 - ExplicitWidth = 270 + ExplicitWidth = 112 ExplicitHeight = 215 inherited edtlNombre: TcxDBTextEdit DataBinding.DataSource = DADataSource diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas index 52e52dc6..8b3f56bb 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.pas @@ -107,11 +107,13 @@ procedure TfrViewFacturaCliente.RellenarCuentasBancarias; var AController : IEmpresasController; ALista : TStringList; + AListaIBAN : TStringList; i : integer; begin AController := TEmpresasController.Create; try ALista := AController.DarListaCuentasBancarias(AppFactuGES.EmpresaActiva); + AListaIBAN := AController.DarListaCuentasBancariasIBAN(AppFactuGES.EmpresaActiva); try with cbCuentaBancaria.Properties.Items do begin @@ -120,13 +122,17 @@ begin Clear; Add(''); for i := 0 to ALista.Count - 1 do + begin Add(ALista.Names[i]); + Add(AListaIBAN.Names[i]); + end; finally EndUpdate; end; end; finally FreeANDNIL(ALista); + FreeANDNIL(AListaIBAN); end; finally AController := NIL; diff --git a/Source/Modulos/Remesas de cliente/Views/uEditorRemesaCliente.dfm b/Source/Modulos/Remesas de cliente/Views/uEditorRemesaCliente.dfm index 2370aff1..3a97b9b5 100644 --- a/Source/Modulos/Remesas de cliente/Views/uEditorRemesaCliente.dfm +++ b/Source/Modulos/Remesas de cliente/Views/uEditorRemesaCliente.dfm @@ -8,7 +8,6 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente ClientWidth = 676 Scaled = False OnClose = CustomEditorClose - ExplicitLeft = -49 ExplicitWidth = 684 ExplicitHeight = 617 PixelsPerInch = 96 @@ -143,46 +142,26 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente 662 160) inherited eReferencia: TcxDBTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 326 - Width = 326 + ExplicitWidth = 292 + Width = 292 end inherited eDescripcion: TcxDBTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 540 - Width = 540 + ExplicitWidth = 530 + Width = 530 end inherited edtFechaRemesa: TcxDBDateEdit Left = 491 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 491 - ExplicitWidth = 170 - Width = 170 + ExplicitWidth = 149 + Width = 149 end inherited cbCuentaBancaria: TcxDBLookupComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 39 - Width = 39 + ExplicitWidth = 530 + Width = 530 end inherited cbTipo: TcxDBImageComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 121 - Width = 121 + ExplicitWidth = 530 + Width = 530 end end inherited dsDataTable: TDADataSource @@ -218,14 +197,19 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente Width = 632 Height = 223 ExplicitLeft = 15 - ExplicitWidth = 638 - ExplicitHeight = 208 + ExplicitWidth = 632 + ExplicitHeight = 223 inherited cxGridView: TcxGridDBTableView DataController.Summary.FooterSummaryItems = < item Format = ',0.00 '#8364';-,0.00 '#8364 Kind = skSum Column = frViewRecibosRemesaCliente1.cxGridViewIMPORTE_TOTAL + end + item + Format = '0 Recibos' + Kind = skCount + Column = frViewRecibosRemesaCliente1.cxGridViewREFERENCIA end> DataController.Summary.OnAfterSummary = frViewRecibosRemesaCliente1cxGridViewDataControllerSummaryAfterSummary inherited cxGridViewIMPORTE_TOTAL: TcxGridDBColumn @@ -237,19 +221,7 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente Left = 15 Width = 632 ExplicitLeft = 15 - ExplicitWidth = 638 - inherited ToolButton1: TToolButton - ExplicitWidth = 113 - end - inherited ToolButton4: TToolButton - ExplicitWidth = 113 - end - inherited ToolButton2: TToolButton - ExplicitWidth = 113 - end - inherited ToolButton7: TToolButton - ExplicitWidth = 113 - end + ExplicitWidth = 632 end end end @@ -261,7 +233,7 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente item Width = 200 end> - ExplicitTop = 519 + ExplicitTop = 564 ExplicitWidth = 676 end inline frViewTotales1: TfrViewTotales [4] @@ -278,7 +250,7 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente ParentFont = False TabOrder = 4 ReadOnly = False - ExplicitTop = 473 + ExplicitTop = 518 ExplicitWidth = 676 ExplicitHeight = 46 inherited dxLayoutControl1: TdxLayoutControl @@ -312,52 +284,36 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente Left = 163 Top = 111 DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 163 ExplicitTop = 111 - ExplicitWidth = 93 - Width = 93 + ExplicitWidth = 157 + Width = 157 end inherited ImporteIVA: TcxDBCurrencyEdit Left = 519 Top = 37 DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 519 ExplicitTop = 37 - ExplicitWidth = 137 - Width = 137 + ExplicitWidth = 147 + Width = 147 end inherited ImporteTotal: TcxDBCurrencyEdit Left = 449 Top = 111 - Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 449 ExplicitTop = 111 - ExplicitWidth = 137 - Width = 137 + ExplicitWidth = 217 + Width = 217 end inherited edtDescuento: TcxDBSpinEdit Left = 92 Top = 111 DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 92 ExplicitTop = 111 end @@ -365,11 +321,7 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente Left = 448 Top = 37 DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 448 ExplicitTop = 37 end @@ -377,25 +329,17 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente Left = 448 Top = 10 DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 448 ExplicitTop = 10 - ExplicitWidth = 92 - Width = 92 + ExplicitWidth = 218 + Width = 218 end inherited edtRE: TcxDBSpinEdit Left = 448 Top = 64 DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 448 ExplicitTop = 64 end @@ -403,56 +347,40 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente Left = 519 Top = 64 DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 519 ExplicitTop = 64 - ExplicitWidth = 56 - Width = 56 + ExplicitWidth = 147 + Width = 147 end inherited eImporteNeto: TcxDBCurrencyEdit Left = 92 Top = 10 DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 92 ExplicitTop = 10 - ExplicitWidth = 147 - Width = 147 + ExplicitWidth = 228 + Width = 228 end inherited ePorte: TcxDBCurrencyEdit Left = 92 Top = 138 DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 92 ExplicitTop = 138 - ExplicitWidth = 147 - Width = 147 + ExplicitWidth = 228 + Width = 228 end inherited eIVA: TcxDBLookupComboBox Left = 92 Top = 37 DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 92 ExplicitTop = 37 - ExplicitWidth = 81 - Width = 81 + ExplicitWidth = 90 + Width = 90 end inherited bTiposIVA: TButton Left = 188 @@ -464,14 +392,10 @@ inherited fEditorRemesaCliente: TfEditorRemesaCliente Left = 92 Top = 64 DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 92 ExplicitTop = 64 - ExplicitWidth = 219 - Width = 219 + ExplicitWidth = 228 + Width = 228 end inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group1: TdxLayoutGroup diff --git a/Source/Modulos/Remesas de proveedor/Views/uEditorRemesaProveedor.dfm b/Source/Modulos/Remesas de proveedor/Views/uEditorRemesaProveedor.dfm index fbdb33cd..086f47e2 100644 --- a/Source/Modulos/Remesas de proveedor/Views/uEditorRemesaProveedor.dfm +++ b/Source/Modulos/Remesas de proveedor/Views/uEditorRemesaProveedor.dfm @@ -15,7 +15,7 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor inherited JvNavPanelHeader: TJvNavPanelHeader Width = 690 Caption = 'Remesa de pago' - ExplicitWidth = 676 + ExplicitWidth = 690 inherited Image1: TImage Left = 663 Picture.Data = { @@ -47,7 +47,7 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor end inherited TBXDock: TTBXDock Width = 690 - ExplicitWidth = 676 + ExplicitWidth = 690 inherited tbxMain: TTBXToolbar ExplicitWidth = 488 inherited TBXItem2: TTBXItem @@ -136,33 +136,26 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor inherited cxGrid: TcxGrid Width = 676 Height = 249 - ExplicitWidth = 668 - ExplicitHeight = 199 + ExplicitWidth = 676 + ExplicitHeight = 249 inherited cxGridView: TcxGridDBTableView DataController.Summary.FooterSummaryItems = < item Format = ',0.00 '#8364';-,0.00 '#8364 Kind = skSum Column = frViewRecibosRemesaProveedor1.cxGridViewIMPORTE_TOTAL + end + item + Format = '0 Recibos' + Kind = skCount + Column = frViewRecibosRemesaProveedor1.cxGridViewREFERENCIA end> DataController.Summary.OnAfterSummary = frViewRecibosRemesaProveedor1cxGridViewDataControllerSummaryAfterSummary end end inherited ToolBar1: TToolBar Width = 676 - ExplicitWidth = 668 - inherited ToolButton1: TToolButton - ExplicitWidth = 113 - end - inherited ToolButton4: TToolButton - ExplicitWidth = 113 - end - inherited ToolButton2: TToolButton - ExplicitWidth = 113 - end - inherited ToolButton7: TToolButton - ExplicitWidth = 113 - end + ExplicitWidth = 676 end end inline frViewRemesaProveedor1: TfrViewRemesaProveedor @@ -187,44 +180,26 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor ExplicitWidth = 676 ExplicitHeight = 155 inherited eReferencia: TcxDBTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 164 - Width = 164 + ExplicitWidth = 224 + Width = 224 end inherited eDescripcion: TcxDBTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 108 - Width = 108 + ExplicitWidth = 544 + Width = 544 end inherited edtFechaRemesa: TcxDBDateEdit Left = 423 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 423 - ExplicitWidth = 170 - Width = 170 + ExplicitWidth = 231 + Width = 231 end inherited cbCuentaBancaria: TcxDBLookupComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 39 - Width = 39 + ExplicitWidth = 544 + Width = 544 end inherited cbTipo: TcxDBImageComboBox - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' + ExplicitWidth = 544 + Width = 544 end end end @@ -237,8 +212,8 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor item Width = 200 end> - ExplicitTop = 519 - ExplicitWidth = 676 + ExplicitTop = 585 + ExplicitWidth = 690 end inline frViewTotales1: TfrViewTotales [4] Left = 0 @@ -254,12 +229,12 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor ParentFont = False TabOrder = 4 ReadOnly = False - ExplicitTop = 473 - ExplicitWidth = 676 + ExplicitTop = 539 + ExplicitWidth = 690 ExplicitHeight = 46 inherited dxLayoutControl1: TdxLayoutControl Width = 690 - ExplicitWidth = 676 + ExplicitWidth = 690 inherited Bevel1: TBevel Left = 92 Top = 91 @@ -288,52 +263,36 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor Left = 163 Top = 111 DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 163 ExplicitTop = 111 - ExplicitWidth = 93 - Width = 93 + ExplicitWidth = 164 + Width = 164 end inherited ImporteIVA: TcxDBCurrencyEdit Left = 526 Top = 37 DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 526 ExplicitTop = 37 - ExplicitWidth = 137 - Width = 137 + ExplicitWidth = 154 + Width = 154 end inherited ImporteTotal: TcxDBCurrencyEdit Left = 456 Top = 111 - Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 456 ExplicitTop = 111 - ExplicitWidth = 137 - Width = 137 + ExplicitWidth = 224 + Width = 224 end inherited edtDescuento: TcxDBSpinEdit Left = 92 Top = 111 DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 92 ExplicitTop = 111 end @@ -341,11 +300,7 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor Left = 455 Top = 37 DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 455 ExplicitTop = 37 end @@ -353,25 +308,17 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor Left = 455 Top = 10 DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 455 ExplicitTop = 10 - ExplicitWidth = 92 - Width = 92 + ExplicitWidth = 225 + Width = 225 end inherited edtRE: TcxDBSpinEdit Left = 455 Top = 64 DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 455 ExplicitTop = 64 end @@ -379,56 +326,40 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor Left = 526 Top = 64 DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 526 ExplicitTop = 64 - ExplicitWidth = 56 - Width = 56 + ExplicitWidth = 154 + Width = 154 end inherited eImporteNeto: TcxDBCurrencyEdit Left = 92 Top = 10 DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 92 ExplicitTop = 10 - ExplicitWidth = 147 - Width = 147 + ExplicitWidth = 235 + Width = 235 end inherited ePorte: TcxDBCurrencyEdit Left = 92 Top = 138 DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 92 ExplicitTop = 138 - ExplicitWidth = 147 - Width = 147 + ExplicitWidth = 235 + Width = 235 end inherited eIVA: TcxDBLookupComboBox Left = 92 Top = 37 DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 92 ExplicitTop = 37 - ExplicitWidth = 81 - Width = 81 + ExplicitWidth = 97 + Width = 97 end inherited bTiposIVA: TButton Left = 195 @@ -440,14 +371,10 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor Left = 92 Top = 64 DataBinding.DataField = '' - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 92 ExplicitTop = 64 - ExplicitWidth = 219 - Width = 219 + ExplicitWidth = 235 + Width = 235 end inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group1: TdxLayoutGroup diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 677710a4..c19b48b8 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 c04561bf..b67b4065 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -1,280 +1,280 @@ - + - - {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} - FactuGES_Server.dpr - Debug - AnyCPU - DCC32 - ..\..\Output\Debug\Servidor\FactuGES_Server.exe - vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100 - - - 7.0 - False - False - 0 - 3 - ..\..\Output\Release\Servidor - RELEASE - - - 7.0 - 3 - ..\..\Output\Debug\Servidor - DEBUG; - True - True - True - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - - - Delphi.Personality - - -FalseTrueFalse/standaloneTrueFalse1070FalseFalseFalseFalseFalse308212521.0.7.01.0.7.0jueves, 05 de junio de 2008 20:23FactuGES_Server.dpr - - - - - MainSource - - - - -
srvEmpresas
- TDARemoteService -
- - - - - - - - - - - -
RptAlbaranesCliente
- TDataModule -
- -
RptWordAlbaranCliente
- TDataModule -
- -
srvAlbaranesCliente
- TDataAbstractService -
- - - - -
srvAlbaranesProveedor
- TDataAbstractService -
- - - -
srvAlmacenes
- TDARemoteService -
- - - - - - - - - - -
RptEtiquetasContacto
- TDataModule -
- -
RptFichasEmpleado
- TDataModule -
- -
srvContactos
- TDARemoteService -
- - - -
srvFabricantes
- TDataAbstractService -
- - - - -
RptFacturasCliente
- TDataModule -
- -
RptWordFacturaCliente
- TDataModule -
- -
srvFacturasCliente
- TDataAbstractService -
- - - - -
srvFacturasProveedor
- TDataAbstractService -
- - - - - - - - - - -
srvHistoricoMovimientos
- TDataAbstractService -
- - - -
srvInventario
- TDataAbstractService -
- - - - - - - - -
RptPedidosProveedor
- TDataModule -
- -
RptWordPedidoProveedor
- TDataModule -
- -
srvPedidosProveedor
- TDataAbstractService -
- - - - -
RptPresupuestosCliente
-
- -
RptWordPresupuestoCliente
- TDataModule -
- -
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 + vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100 + + + 7.0 + False + False + 0 + 3 + ..\..\Output\Release\Servidor + RELEASE + + + 7.0 + 3 + ..\..\Output\Debug\Servidor + DEBUG; + True + True + True + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + + + Delphi.Personality + + + FalseTrueFalse/standaloneTrueFalse1070FalseFalseFalseFalseFalse308212521.0.7.01.0.7.0jueves, 05 de junio de 2008 20:23FactuGES_Server.dpr + + + + + MainSource + + + + +
srvEmpresas
+ TDARemoteService +
+ + + + + + + + + + + +
RptAlbaranesCliente
+ TDataModule +
+ +
RptWordAlbaranCliente
+ TDataModule +
+ +
srvAlbaranesCliente
+ TDataAbstractService +
+ + + + +
srvAlbaranesProveedor
+ TDataAbstractService +
+ + + +
srvAlmacenes
+ TDARemoteService +
+ + + + + + + + + + +
RptEtiquetasContacto
+ TDataModule +
+ +
RptFichasEmpleado
+ TDataModule +
+ +
srvContactos
+ TDARemoteService +
+ + + +
srvFabricantes
+ TDataAbstractService +
+ + + + +
RptFacturasCliente
+ TDataModule +
+ +
RptWordFacturaCliente
+ TDataModule +
+ +
srvFacturasCliente
+ TDataAbstractService +
+ + + + +
srvFacturasProveedor
+ TDataAbstractService +
+ + + + + + + + + + +
srvHistoricoMovimientos
+ TDataAbstractService +
+ + + +
srvInventario
+ TDataAbstractService +
+ + + + + + + + +
RptPedidosProveedor
+ TDataModule +
+ +
RptWordPedidoProveedor
+ TDataModule +
+ +
srvPedidosProveedor
+ TDataAbstractService +
+ + + + +
RptPresupuestosCliente
+
+ +
RptWordPresupuestoCliente
+ TDataModule +
+ +
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
+
+ + + + + + + + + +