diff --git a/Build/Build.fbpInf b/Build/Build.fbpInf index aaee386..9b63b41 100644 --- a/Build/Build.fbpInf +++ b/Build/Build.fbpInf @@ -14,8 +14,8 @@ - 00:00:13 - 12/12/2013 10:39:51 - False + 00:00:01 + 14/01/2014 15:34:24 + True diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 2786300..1196fb2 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -53,7 +53,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4350FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.3.5.0FactuGESFactuGES4.3.5.0FactuGES.dprFalse +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4360FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.3.6.0FactuGESFactuGES4.3.6.0FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index 0e82a34..09c03f7 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 4,3,5,0 -PRODUCTVERSION 4,3,5,0 +FILEVERSION 4,3,6,0 +PRODUCTVERSION 4,3,6,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "4.3.5.0\0" + VALUE "FileVersion", "4.3.6.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "4.3.5.0\0" + VALUE "ProductVersion", "4.3.6.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 35ba4c7..2652a54 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj b/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj index bc2ba07..fa3500b 100644 --- a/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj +++ b/Source/Modulos/Albaranes de cliente/AlbaranesCliente_Group.groupproj @@ -16,6 +16,7 @@ + @@ -281,14 +282,23 @@ + + + + + + + + + - + - + - + \ No newline at end of file diff --git a/Source/Modulos/Contactos/Controller/uClientesController.pas b/Source/Modulos/Contactos/Controller/uClientesController.pas index 06b6d82..15d1757 100644 --- a/Source/Modulos/Contactos/Controller/uClientesController.pas +++ b/Source/Modulos/Contactos/Controller/uClientesController.pas @@ -14,7 +14,8 @@ type function BuscarTodosTiendaWeb: IBizCliente; function BuscarEtiquetadosFelicitacion: IBizCliente; function TieneDatosBancarios(ACliente: IBizCliente) : Boolean; - function TieneClienteCentral(ACliente: IBizCliente) : Boolean; + function TieneClienteCentral(ACliente: IBizCliente) : Boolean; overload; + function TieneClienteCentral(const IdCliente: Integer) : Boolean; overload; function ElegirDireccionEntrega(ACliente: IBizCliente; AMensaje: String): IBizDireccionesContacto; function EsEliminable(ACliente: IBizContacto): Boolean; function Eliminar(ACliente: IBizContacto; AllItems: Boolean = false): Boolean; overload; @@ -58,7 +59,8 @@ type procedure VerFacturasDeCliente(ACliente : IBizCliente); procedure VerRecibosDeCliente(ACliente : IBizCliente); function DarListaCuentasBancarias(const IdCliente: Integer): TStringList; - function TieneClienteCentral(ACliente: IBizCliente) : Boolean; + function TieneClienteCentral(ACliente: IBizCliente) : Boolean; overload; + function TieneClienteCentral(const IdCliente: Integer) : Boolean; overload; end; implementation @@ -372,6 +374,12 @@ begin Result := not ACliente.ID_CENTRALIsNull; end; +function TClientesController.TieneClienteCentral( + const IdCliente: Integer): Boolean; +begin + Result := TieneClienteCentral(Self.Buscar(IdCliente) as IBizCliente); +end; + function TClientesController.TieneDatosBancarios( ACliente: IBizCliente): Boolean; begin diff --git a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas index 9642e31..52269ef 100644 --- a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas +++ b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas @@ -6,7 +6,7 @@ interface uses Classes, SysUtils, uDADataTable, uControllerBase, uIDataModuleFacturasCliente, uClientesController, uDetallesFacturaClienteController, uBizAlbaranesCliente, - uBizFacturasCliente; + uBizFacturasCliente, uBizContactos; type IFacturasClienteController = interface(IControllerBase) @@ -147,7 +147,7 @@ implementation uses Windows, Controls, cxControls, DB, uEditorRegistryUtils, schFacturasClienteClient_Intf, - uBizContactos, uIEditorFacturasCliente, uIEditorFacturaCliente, uFactuGES_App, + uIEditorFacturasCliente, uIEditorFacturaCliente, uFactuGES_App, uDataModuleFacturasCliente, uBizDetallesFacturaCliente, uControllerDetallesBase, uDataModuleUsuarios, uDAInterfaces, uDataTableUtils, uDateUtils, uNumUtils, uAlbaranesClienteController, schAlbaranesClienteClient_Intf, uROTypes, uDetallesAlbaranClienteController, diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm index 13625ec..68c8eb2 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm @@ -123,9 +123,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente 290) inherited Label1: TLabel Left = 383 - Width = 311 ExplicitLeft = 383 - ExplicitWidth = 311 end inherited eReferencia: TcxDBTextEdit Style.LookAndFeel.SkinName = '' @@ -180,8 +178,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 383 - ExplicitWidth = 339 - Width = 339 end inherited bElegirClienteFinal: TButton Left = 736 @@ -224,8 +220,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 121 - Width = 121 end end end @@ -234,8 +228,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 275 - Width = 275 end end end @@ -243,10 +235,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente object pagContenido: TTabSheet Caption = 'Contenido' ImageIndex = 1 - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitWidth = 0 - ExplicitHeight = 0 inline frViewDetallesFacturaCliente1: TfrViewDetallesFacturaCliente Left = 0 Top = 0 @@ -267,9 +255,9 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ExplicitHeight = 290 inherited ToolBar1: TToolBar Width = 809 - Height = 46 + Height = 73 ExplicitWidth = 809 - ExplicitHeight = 46 + ExplicitHeight = 73 inherited ToolButton3: TToolButton Wrap = False end @@ -295,73 +283,73 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ExplicitTop = 22 ExplicitWidth = 296 end - inherited UpDown1: TUpDown - Left = 441 + inherited ToolButton13: TToolButton [7] + Left = 0 Top = 22 - ExplicitLeft = 441 + Wrap = True + ExplicitLeft = 0 ExplicitTop = 22 + ExplicitHeight = 27 end - inherited ToolButton13: TToolButton - Left = 458 - Top = 22 - ExplicitLeft = 458 - ExplicitTop = 22 + inherited UpDown1: TUpDown [8] + Left = 0 + Top = 49 + ExplicitLeft = 0 + ExplicitTop = 49 end inherited ToolButton6: TToolButton - Left = 466 - Top = 22 - ExplicitLeft = 466 - ExplicitTop = 22 + Left = 17 + Top = 49 + ExplicitLeft = 17 + ExplicitTop = 49 end inherited ToolButton7: TToolButton - Left = 532 - Top = 22 - ExplicitLeft = 532 - ExplicitTop = 22 + Left = 83 + Top = 49 + ExplicitLeft = 83 + ExplicitTop = 49 end inherited ToolButton8: TToolButton - Left = 599 - Top = 22 - ExplicitLeft = 599 - ExplicitTop = 22 + Left = 150 + Top = 49 + ExplicitLeft = 150 + ExplicitTop = 49 end inherited ToolButton12: TToolButton - Left = 682 - Top = 22 - ExplicitLeft = 682 - ExplicitTop = 22 + Left = 233 + Top = 49 + ExplicitLeft = 233 + ExplicitTop = 49 end inherited ToolButton9: TToolButton - Left = 690 - Top = 22 - ExplicitLeft = 690 - ExplicitTop = 22 + Left = 241 + Top = 49 + ExplicitLeft = 241 + ExplicitTop = 49 end inherited ToolButton10: TToolButton - Left = 835 - Top = 22 - ExplicitLeft = 835 - ExplicitTop = 22 + Left = 386 + Top = 49 + ExplicitLeft = 386 + ExplicitTop = 49 end inherited ToolButton11: TToolButton - Left = 960 - Top = 22 - ExplicitLeft = 960 - ExplicitTop = 22 + Left = 511 + Top = 49 + ExplicitLeft = 511 + ExplicitTop = 49 end end inherited cxGrid: TcxGrid - Top = 72 + Top = 99 Width = 809 - Height = 218 - ExplicitTop = 72 + Height = 191 ExplicitWidth = 809 ExplicitHeight = 191 end inherited TBXDock1: TTBXDock - Top = 46 + Top = 73 Width = 809 - ExplicitTop = 46 ExplicitWidth = 809 inherited TBXToolbar1: TTBXToolbar ExplicitWidth = 566 diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturaCliente.dfm index df3d85a..14fc3df 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 = 900 - Height = 585 + Width = 781 + Height = 347 Align = alClient OnCreate = CustomViewCreate OnDestroy = CustomViewDestroy @@ -9,8 +9,8 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente object dxLayoutControl1: TdxLayoutControl Left = 0 Top = 0 - Width = 900 - Height = 585 + Width = 781 + Height = 347 Align = alClient ParentBackground = True TabOrder = 0 @@ -20,10 +20,10 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente ExplicitWidth = 451 ExplicitHeight = 304 DesignSize = ( - 900 - 585) + 781 + 347) object Label1: TLabel - Left = 543 + Left = 464 Top = 225 Width = 311 Height = 26 @@ -142,7 +142,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 269 end object bFormasPago: TButton - Left = 361 + Left = 282 Top = 103 Width = 132 Height = 23 @@ -173,7 +173,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 165 end object cbClienteFinal: TcxDBTextEdit - Left = 543 + Left = 464 Top = 259 Anchors = [akLeft, akTop, akRight] DataBinding.DataField = 'CLIENTE_FINAL' @@ -201,7 +201,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 339 end object bElegirClienteFinal: TButton - Left = 844 + Left = 708 Top = 257 Width = 23 Height = 25 @@ -209,7 +209,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente TabOrder = 8 end inline frViewDatosYSeleccionClienteFacturaCliente1: TfrViewDatosYSeleccionClienteFacturaCliente - Left = 532 + Left = 453 Top = 30 Width = 346 Height = 170 @@ -221,7 +221,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente ParentFont = False TabOrder = 6 ReadOnly = False - ExplicitLeft = 532 + ExplicitLeft = 453 ExplicitTop = 30 ExplicitWidth = 346 ExplicitHeight = 170 @@ -229,7 +229,7 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 346 Height = 170 ExplicitWidth = 101 - ExplicitHeight = 138 + ExplicitHeight = 170 inherited edtlNombre: TcxDBTextEdit Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' @@ -239,22 +239,22 @@ inherited frViewFacturaCliente: TfrViewFacturaCliente Width = 277 end inherited edtNIFCIF: TcxDBTextEdit - Left = 233 + Left = 176 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 233 + ExplicitLeft = 176 end inherited Button3: TBitBtn - Left = 144 + Left = 87 Top = 135 - ExplicitLeft = 144 + ExplicitLeft = 87 ExplicitTop = 135 end inherited Button4: TButton - Left = 313 - ExplicitLeft = 313 + Left = 256 + ExplicitLeft = 256 end inherited edtDireccion: TcxMemo Style.LookAndFeel.SkinName = '' diff --git a/Source/Modulos/Relaciones/Albaranes de cliente - Facturas de cliente/AlbCli_FacCli_relation.dpk b/Source/Modulos/Relaciones/Albaranes de cliente - Facturas de cliente/AlbCli_FacCli_relation.dpk index 63bab40..723e7d6 100644 --- a/Source/Modulos/Relaciones/Albaranes de cliente - Facturas de cliente/AlbCli_FacCli_relation.dpk +++ b/Source/Modulos/Relaciones/Albaranes de cliente - Facturas de cliente/AlbCli_FacCli_relation.dpk @@ -29,6 +29,7 @@ requires AlbaranesCliente_controller, AlbaranesCliente_model, FacturasCliente_controller, + Contactos_controller, rtl, vcl, cxLibraryD11, @@ -45,6 +46,6 @@ requires contains uGenerarFacturasCliAlbCliUtils in 'uGenerarFacturasCliAlbCliUtils.pas' {dmGenerarFacturasCliAlbCli}, uGenerarAlbaranesCliFacCliUtils in 'uGenerarAlbaranesCliFacCliUtils.pas' {dmGenerarAlbaranesCli}, - uEditorFechaFactura in 'uEditorFechaFactura.pas'{frEditorFechaFactura:TForm}; + uEditorFechaFactura in 'uEditorFechaFactura.pas' {frEditorFechaFactura: F}; end. diff --git a/Source/Modulos/Relaciones/Albaranes de cliente - Facturas de cliente/AlbCli_FacCli_relation.dproj b/Source/Modulos/Relaciones/Albaranes de cliente - Facturas de cliente/AlbCli_FacCli_relation.dproj index d5b1ca5..aeb98fe 100644 --- a/Source/Modulos/Relaciones/Albaranes de cliente - Facturas de cliente/AlbCli_FacCli_relation.dproj +++ b/Source/Modulos/Relaciones/Albaranes de cliente - Facturas de cliente/AlbCli_FacCli_relation.dproj @@ -84,18 +84,23 @@ MainSource - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
frEditorFechaFactura
F @@ -106,10 +111,6 @@
dmGenerarFacturasCliAlbCli
 - - - -