diff --git a/Build/Build.fbl6 b/Build/Build.fbl6 index da5e737..a9036f4 100644 Binary files a/Build/Build.fbl6 and b/Build/Build.fbl6 differ diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index c1f658d..09df5dc 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\TrueFalse4330FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.3.3.0FactuGESFactuGES4.3.3.0FactuGES.dprFalse +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4340FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.3.4.0FactuGESFactuGES4.3.4.0FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index 9949318..a40a741 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,3,0 -PRODUCTVERSION 4,3,3,0 +FILEVERSION 4,3,4,0 +PRODUCTVERSION 4,3,4,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.3.0\0" + VALUE "FileVersion", "4.3.4.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "4.3.3.0\0" + VALUE "ProductVersion", "4.3.4.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 3559276..573f40f 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Cliente/uBootStrap.pas b/Source/Cliente/uBootStrap.pas index 6ff6c6a..2080fa6 100644 --- a/Source/Cliente/uBootStrap.pas +++ b/Source/Cliente/uBootStrap.pas @@ -39,7 +39,7 @@ begin LoadModule('RecibosCliente_plugin.bpl'); LoadModule(MODULENAME_FACTURAS_CLIENTE); - LoadModule(MODULENAME_FACTURAS_PROFORMA); +// LoadModule(MODULENAME_FACTURAS_PROFORMA); LoadModule(MODULENAME_PEDIDOS_PROVEEDOR); LoadModule(MODULENAME_ALBARANES_PROVEEDOR); diff --git a/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas b/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas index 6ae8ab8..e434960 100644 --- a/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas +++ b/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas @@ -3,7 +3,7 @@ unit schContactosClient_Intf; interface uses - Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf; + Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf; const { Data table rules ids @@ -826,7 +826,7 @@ type end; { TContactosDataTableRules } - TContactosDataTableRules = class(TDADataTableRules, IContactos) + TContactosDataTableRules = class(TIntfObjectDADataTableRules, IContactos) private f_NOTAS: IROStrings; procedure NOTAS_OnChange(Sender: TObject); @@ -1000,7 +1000,7 @@ type end; { TGruposClienteDataTableRules } - TGruposClienteDataTableRules = class(TDADataTableRules, IGruposCliente) + TGruposClienteDataTableRules = class(TIntfObjectDADataTableRules, IGruposCliente) private protected { Property getters and setters } @@ -1089,7 +1089,7 @@ type end; { TDatosBancariosDataTableRules } - TDatosBancariosDataTableRules = class(TDADataTableRules, IDatosBancarios) + TDatosBancariosDataTableRules = class(TIntfObjectDADataTableRules, IDatosBancarios) private protected { Property getters and setters } @@ -1429,7 +1429,7 @@ type end; { TClientesDataTableRules } - TClientesDataTableRules = class(TDADataTableRules, IClientes) + TClientesDataTableRules = class(TIntfObjectDADataTableRules, IClientes) private f_NOTAS: IROStrings; procedure NOTAS_OnChange(Sender: TObject); @@ -1950,7 +1950,7 @@ type end; { TProveedoresDataTableRules } - TProveedoresDataTableRules = class(TDADataTableRules, IProveedores) + TProveedoresDataTableRules = class(TIntfObjectDADataTableRules, IProveedores) private f_NOTAS: IROStrings; procedure NOTAS_OnChange(Sender: TObject); @@ -2407,7 +2407,7 @@ type end; { TEmpleadosDataTableRules } - TEmpleadosDataTableRules = class(TDADataTableRules, IEmpleados) + TEmpleadosDataTableRules = class(TIntfObjectDADataTableRules, IEmpleados) private f_NOTAS: IROStrings; f_FORMACION_BASE: IROStrings; @@ -2734,7 +2734,7 @@ type end; { TDireccionesContactoDataTableRules } - TDireccionesContactoDataTableRules = class(TDADataTableRules, IDireccionesContacto) + TDireccionesContactoDataTableRules = class(TIntfObjectDADataTableRules, IDireccionesContacto) private f_NOTAS: IROStrings; procedure NOTAS_OnChange(Sender: TObject); @@ -2884,7 +2884,7 @@ type end; { TClientesDescuentosDataTableRules } - TClientesDescuentosDataTableRules = class(TDADataTableRules, IClientesDescuentos) + TClientesDescuentosDataTableRules = class(TIntfObjectDADataTableRules, IClientesDescuentos) private protected { Property getters and setters } @@ -2949,7 +2949,7 @@ type end; { TGruposProveedorDataTableRules } - TGruposProveedorDataTableRules = class(TDADataTableRules, IGruposProveedor) + TGruposProveedorDataTableRules = class(TIntfObjectDADataTableRules, IGruposProveedor) private protected { Property getters and setters } @@ -2996,7 +2996,7 @@ type end; { TGruposEmpleadoDataTableRules } - TGruposEmpleadoDataTableRules = class(TDADataTableRules, IGruposEmpleado) + TGruposEmpleadoDataTableRules = class(TIntfObjectDADataTableRules, IGruposEmpleado) private protected { Property getters and setters } @@ -3156,7 +3156,7 @@ type end; { TContactos_RefreshDataTableRules } - TContactos_RefreshDataTableRules = class(TDADataTableRules, IContactos_Refresh) + TContactos_RefreshDataTableRules = class(TIntfObjectDADataTableRules, IContactos_Refresh) private f_NOTAS: IROStrings; procedure NOTAS_OnChange(Sender: TObject); @@ -3312,7 +3312,7 @@ type end; { TContratosEmpleadosDataTableRules } - TContratosEmpleadosDataTableRules = class(TDADataTableRules, IContratosEmpleados) + TContratosEmpleadosDataTableRules = class(TIntfObjectDADataTableRules, IContratosEmpleados) private protected { Property getters and setters } @@ -3347,7 +3347,7 @@ type end; { TDescripcionesProveedoresDataTableRules } - TDescripcionesProveedoresDataTableRules = class(TDADataTableRules, IDescripcionesProveedores) + TDescripcionesProveedoresDataTableRules = class(TIntfObjectDADataTableRules, IDescripcionesProveedores) private protected { Property getters and setters } @@ -3436,7 +3436,7 @@ type end; { TPersonalContactoDataTableRules } - TPersonalContactoDataTableRules = class(TDADataTableRules, IPersonalContacto) + TPersonalContactoDataTableRules = class(TIntfObjectDADataTableRules, IPersonalContacto) private protected { Property getters and setters } @@ -3549,7 +3549,7 @@ type end; { TAgentes_ComisionesDataTableRules } - TAgentes_ComisionesDataTableRules = class(TDADataTableRules, IAgentes_Comisiones) + TAgentes_ComisionesDataTableRules = class(TIntfObjectDADataTableRules, IAgentes_Comisiones) private protected { Property getters and setters } @@ -3608,7 +3608,7 @@ type end; { TListaAnosObjetivosAlbDataTableRules } - TListaAnosObjetivosAlbDataTableRules = class(TDADataTableRules, IListaAnosObjetivosAlb) + TListaAnosObjetivosAlbDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosObjetivosAlb) private protected { Property getters and setters } @@ -3792,7 +3792,7 @@ type end; { TAgentesDataTableRules } - TAgentesDataTableRules = class(TDADataTableRules, IAgentes) + TAgentesDataTableRules = class(TIntfObjectDADataTableRules, IAgentes) private f_NOTAS: IROStrings; procedure NOTAS_OnChange(Sender: TObject); @@ -4026,7 +4026,7 @@ type end; { TClientesDescuentosArticulosDataTableRules } - TClientesDescuentosArticulosDataTableRules = class(TDADataTableRules, IClientesDescuentosArticulos) + TClientesDescuentosArticulosDataTableRules = class(TIntfObjectDADataTableRules, IClientesDescuentosArticulos) private protected { Property getters and setters } @@ -4145,7 +4145,7 @@ type end; { TAgentes_Objetivos_albaranesDataTableRules } - TAgentes_Objetivos_albaranesDataTableRules = class(TDADataTableRules, IAgentes_Objetivos_albaranes) + TAgentes_Objetivos_albaranesDataTableRules = class(TIntfObjectDADataTableRules, IAgentes_Objetivos_albaranes) private protected { Property getters and setters } @@ -4252,7 +4252,7 @@ type end; { TAgentes_Objetivos_facturasDataTableRules } - TAgentes_Objetivos_facturasDataTableRules = class(TDADataTableRules, IAgentes_Objetivos_facturas) + TAgentes_Objetivos_facturasDataTableRules = class(TIntfObjectDADataTableRules, IAgentes_Objetivos_facturas) private protected { Property getters and setters } @@ -4323,7 +4323,7 @@ type end; { TListaAnosObjetivosFacDataTableRules } - TListaAnosObjetivosFacDataTableRules = class(TDADataTableRules, IListaAnosObjetivosFac) + TListaAnosObjetivosFacDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosObjetivosFac) private protected { Property getters and setters } @@ -4364,7 +4364,7 @@ type end; { TTiposClienteDataTableRules } - TTiposClienteDataTableRules = class(TDADataTableRules, ITiposCliente) + TTiposClienteDataTableRules = class(TIntfObjectDADataTableRules, ITiposCliente) private protected { Property getters and setters } diff --git a/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm b/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm index be5c6da..bf0d0d6 100644 --- a/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm +++ b/Source/Modulos/Contactos/Plugin/uPluginContactos.dfm @@ -238,7 +238,7 @@ object PluginContactos: TPluginContactos OnUpdate = actEmpleadosUpdate end object actGruposCliente: TAction - Caption = 'Grupos de cliente' + Caption = 'Marcas de cliente' ImageIndex = 5 OnExecute = actGruposClienteExecute end diff --git a/Source/Modulos/Contactos/Views/Contactos_view.dproj b/Source/Modulos/Contactos/Views/Contactos_view.dproj index 29e3100..78c1e9a 100644 --- a/Source/Modulos/Contactos/Views/Contactos_view.dproj +++ b/Source/Modulos/Contactos/Views/Contactos_view.dproj @@ -49,58 +49,65 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fEditorAgente
@@ -194,7 +201,7 @@ TCustomEditor
-
fEditorEmpleado
+
fEditorTiposCliente
TCustomEditor
@@ -293,13 +300,6 @@
frViewProveedores
TCustomView
- - - - - - -