Arreglos varios antes de subida

git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@435 f4e31baf-9722-1c47-927c-6f952f962d4b
This commit is contained in:
roberto 2009-09-22 09:10:49 +00:00
parent b9e9ddd5ea
commit 53bc10cca6
28 changed files with 230 additions and 139 deletions

View File

@ -643,7 +643,7 @@ CREATE TABLE COMISIONES_LIQUIDADAS (
CREATE TABLE CONFIGURACION (
ID TIPO_ID NOT NULL,
CODIGO VARCHAR(50) NOT NULL,
VALOR VARCHAR(255) NOT NULL,
VALOR TIPO_CONCEPTO NOT NULL,
ID_EMPRESA TIPO_ID
);

View File

@ -49,6 +49,12 @@
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\DataAbstract_SQLiteDriver_D11.bpl">RemObjects Data Abstract - SQLite Driver</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
@ -59,31 +65,31 @@
<DelphiCompile Include="ApplicationBase.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\ccpackD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cfpack_d11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxNavBarD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvJansD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
<DCCReference Include="Configuracion\Controller\uConfiguracionController.pas" />
<DCCReference Include="Configuracion\Controller\Views\uIViewConfiguracionBase.pas" />
<DCCReference Include="Configuracion\Data\adortl.dcp" />
<DCCReference Include="Configuracion\Data\Base.dcp" />
<DCCReference Include="Configuracion\Data\ccpackD11.dcp" />
<DCCReference Include="Configuracion\Data\cfpack_d11.dcp" />
<DCCReference Include="Configuracion\Data\cxLibraryD11.dcp" />
<DCCReference Include="Configuracion\Data\DataAbstract_Core_D11.dcp" />
<DCCReference Include="Configuracion\Data\dbrtl.dcp" />
<DCCReference Include="Configuracion\Data\designide.dcp" />
<DCCReference Include="Configuracion\Data\dsnap.dcp" />
<DCCReference Include="Configuracion\Data\dxGDIPlusD11.dcp" />
<DCCReference Include="Configuracion\Data\dxNavBarD11.dcp" />
<DCCReference Include="Configuracion\Data\dxThemeD11.dcp" />
<DCCReference Include="Configuracion\Data\GUIBase.dcp" />
<DCCReference Include="Configuracion\Data\GUISDK_D11R.dcp" />
<DCCReference Include="Configuracion\Data\JvJansD11R.dcp" />
<DCCReference Include="Configuracion\Data\RemObjects_Core_D11.dcp" />
<DCCReference Include="Configuracion\Data\rtl.dcp" />
<DCCReference Include="Configuracion\Data\vcl.dcp" />
<DCCReference Include="Configuracion\Data\vclactnband.dcp" />
<DCCReference Include="Configuracion\Data\vcldb.dcp" />
<DCCReference Include="Configuracion\Data\vcljpg.dcp" />
<DCCReference Include="Configuracion\Data\vclx.dcp" />
<DCCReference Include="Configuracion\Data\xmlrtl.dcp" />
<DCCReference Include="Configuracion\Views\uEditorConfiguracion.pas">
<Form>fConfiguracionEditor</Form>
</DCCReference>

View File

@ -35,6 +35,10 @@ type
function GetModuleManager : THostManager;
function GetTerminated: Boolean;
function GetConfiguracionController : IConfiguracionController;
function GetFormaPagoDocumentos: String;
function GetObservacionesDocumentos: String;
procedure SetFormaPagoDocumentos(const Value: String);
procedure SetObservacionesDocumentos(const Value: String);
function GetLoadModulesEvent : TAppFactuGES_Event;
procedure SetLoadModulesEvent (ALoadModulesEvent : TAppFactuGES_Event);
@ -78,6 +82,8 @@ type
property DoRefreshMainFormEvent : TAppFactuGES_Event read GetDoRefreshMainFormEvent write SetDoRefreshMainFormEvent;
property Terminated : Boolean read GetTerminated;
property Configuracion : IConfiguracionController read GetConfiguracionController;
property FormaPagoDocumentos : String read GetFormaPagoDocumentos write SetFormaPagoDocumentos;
property ObservacionesDocumentos : String read GetObservacionesDocumentos write SetObservacionesDocumentos;
end;
@ -89,6 +95,8 @@ type
FTiendaActiva: IBizEmpresaTienda;
FEjercicioActivo: IBizEjercicio;
FConfiguracionController : IConfiguracionController;
FFormaPagoDocumentos: String;
FObservacionesDocumentos: String;
FAppSplashForm : IAppSplashForm;
FHostManager : THostManager;
@ -111,6 +119,10 @@ type
function GetModuleManager : THostManager;
function GetTerminated: Boolean;
function GetConfiguracionController : IConfiguracionController;
function GetFormaPagoDocumentos: String;
function GetObservacionesDocumentos: String;
procedure SetFormaPagoDocumentos(const Value: String);
procedure SetObservacionesDocumentos(const Value: String);
function GetLoadModulesEvent : TAppFactuGES_Event;
procedure SetLoadModulesEvent (ALoadModulesEvent : TAppFactuGES_Event);
@ -127,10 +139,11 @@ type
procedure AfterLoadModule(Sender: TObject; AModuleInfo: TModuleInfo);
procedure RegisterModule(AModuleInfo : TModuleInfo);
procedure BuscarTiendaPorDefecto;
protected
procedure DoMainForm;
procedure DoRefreshMainForm;
procedure CargarModulos;
procedure ShowSplashForm;
procedure HideSplashForm;
@ -167,6 +180,8 @@ type
property DoRefreshMainFormEvent : TAppFactuGES_Event read GetDoRefreshMainFormEvent write SetDoRefreshMainFormEvent;
property Terminated : Boolean read GetTerminated;
property Configuracion : IConfiguracionController read GetConfiguracionController;
property FormaPagoDocumentos : String read GetFormaPagoDocumentos write SetFormaPagoDocumentos;
property ObservacionesDocumentos : String read GetObservacionesDocumentos write SetObservacionesDocumentos;
end;
var
@ -373,6 +388,11 @@ begin
Result := FEmpresasController;
end;
function TAppFactuGES.GetFormaPagoDocumentos: String;
begin
Result := FFormaPagoDocumentos;
end;
function TAppFactuGES.GetLoadModulesEvent: TAppFactuGES_Event;
begin
Result := FDoLoadModulesEvent;
@ -383,6 +403,11 @@ begin
Result := FHostManager;
end;
function TAppFactuGES.GetObservacionesDocumentos: String;
begin
Result := FObservacionesDocumentos;
end;
function TAppFactuGES.GetTerminated: Boolean;
begin
Result := FTerminated;
@ -457,6 +482,11 @@ begin
FDoRefreshMainFormEvent := ARefreshMainFormEvent;
end;
procedure TAppFactuGES.SetFormaPagoDocumentos(const Value: String);
begin
FFormaPagoDocumentos := Value;
end;
procedure TAppFactuGES.SeleccionarEmpresa;
var
JsDialog: TJSDialog;
@ -511,6 +541,11 @@ begin
FDoLoadModulesEvent := ALoadModulesEvent;
end;
procedure TAppFactuGES.SetObservacionesDocumentos(const Value: String);
begin
FObservacionesDocumentos:= Value;
end;
{procedure TAppFactuGES.setVAR_IDTIENDA(AValue: Integer);
begin
FVAR_IDTIENDA := Avalue;

View File

@ -44,20 +44,6 @@
<Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">Libreria base de FactuGES</Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="$(BDS)\Bin\dclintraweb_90_100.bpl">VCL for the Web Design Package for CodeGear RAD Studio</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
@ -72,52 +58,52 @@
<DelphiCompile Include="Base.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\Modulos\Lib\adortl.dcp" />
<DCCReference Include="..\Modulos\Lib\cxIntl6D11.dcp" />
<DCCReference Include="..\Modulos\Lib\cxIntlPrintSys3D11.dcp" />
<DCCReference Include="..\Modulos\Lib\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Lib\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Lib\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Lib\dclIndyCore.dcp" />
<DCCReference Include="..\Modulos\Lib\designide.dcp" />
<DCCReference Include="..\Modulos\Lib\dsnap.dcp" />
<DCCReference Include="..\Modulos\Lib\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Lib\dxNavBarD11.dcp" />
<DCCReference Include="..\Modulos\Lib\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Lib\GUISDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Lib\IndyCore.dcp" />
<DCCReference Include="..\Modulos\Lib\IndyProtocols.dcp" />
<DCCReference Include="..\Modulos\Lib\IndySystem.dcp" />
<DCCReference Include="..\Modulos\Lib\Jcl.dcp" />
<DCCReference Include="..\Modulos\Lib\JclVcl.dcp" />
<DCCReference Include="..\Modulos\Lib\JSDialog100.dcp" />
<DCCReference Include="..\Modulos\Lib\JvCmpD11R.dcp" />
<DCCReference Include="..\Modulos\Lib\JvCoreD11R.dcp" />
<DCCReference Include="..\Modulos\Lib\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Lib\JvDlgsD11R.dcp" />
<DCCReference Include="..\Modulos\Lib\JvMMD11R.dcp" />
<DCCReference Include="..\Modulos\Lib\JvNetD11R.dcp" />
<DCCReference Include="..\Modulos\Lib\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Modulos\Lib\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Lib\JvSystemD11R.dcp" />
<DCCReference Include="..\Modulos\Lib\pckMD5.dcp" />
<DCCReference Include="..\Modulos\Lib\pckUCDataConnector.dcp" />
<DCCReference Include="..\Modulos\Lib\pckUserControl_RT.dcp" />
<DCCReference Include="..\Modulos\Lib\PluginSDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Lib\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Lib\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Lib\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Lib\rtl.dcp" />
<DCCReference Include="..\Modulos\Lib\TB2k_D10.dcp" />
<DCCReference Include="..\Modulos\Lib\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Lib\vcl.dcp" />
<DCCReference Include="..\Modulos\Lib\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Lib\vcldb.dcp" />
<DCCReference Include="..\Modulos\Lib\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Lib\VclSmp.dcp" />
<DCCReference Include="..\Modulos\Lib\vclx.dcp" />
<DCCReference Include="..\Modulos\Lib\xmlrtl.dcp" />
<DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
<DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxIntl6D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxIntlPrintSys3D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dclIndyCore.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxNavBarD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\IndyCore.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\IndyProtocols.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\IndySystem.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JSDialog100.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCmpD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvDlgsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvMMD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvNetD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\pckMD5.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\pckUCDataConnector.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\pckUserControl_RT.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PluginSDK_D11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\TB2k_D10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\VclSmp.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
<DCCReference Include="Conexion\uConfigurarConexion.pas">
<Form>fConfigurarConexion</Form>
<DesignClass>TForm</DesignClass>

View File

@ -9,6 +9,8 @@ uses
const
SERVER_URL = 'http://localhost:8099/bin';
CTE_FORMA_PAGO = 'FORMA_PAGO';
CTE_OBSERVACIONES = 'OBSERVACIONES';
type
TdmConfiguracion = class(TDataModule)

View File

@ -65,6 +65,9 @@ begin
LoadModule('GestorInformes_plugin.bpl');
end;
AppFactuGES.FormaPagoDocumentos := dmConfiguracion.DarValor(CTE_FORMA_PAGO);
AppFactuGES.ObservacionesDocumentos := dmConfiguracion.DarValor(CTE_OBSERVACIONES);
end;
procedure DoRefreshMainForm;

View File

@ -58,38 +58,38 @@
<DelphiCompile Include="GUIBase.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\ccpackD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxExportD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxTreeListD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxBarD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxBarExtItemsD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxLayoutControlD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxPScxCommonD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxPScxGrid6LnkD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxPsPrVwAdvD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\frx11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\frxe11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\fs11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvAppFrmD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\tb2k_d10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\Base.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\ccpackD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\cxExportD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\cxTreeListD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\dxBarD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\dxBarExtItemsD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\dxLayoutControlD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\dxPScxCommonD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\dxPScxGrid6LnkD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\dxPsPrVwAdvD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\frx11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\frxe11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\fs11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\JvAppFrmD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\JvGlobusD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\rtl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\tb2k_d10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\vcl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\vcldb.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Model\vclx.dcp" />
<DCCReference Include="uDialogBase.pas">
<Form>fDialogBase</Form>
</DCCReference>

View File

@ -152,6 +152,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase
Height = 232
Align = alClient
TabOrder = 1
LookAndFeel.Kind = lfStandard
LookAndFeel.NativeStyle = True
object cxGridView: TcxGridDBTableView
OnKeyDown = cxGridViewKeyDown
NavigatorButtons.ConfirmDelete = False

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -13,4 +13,4 @@ BEGIN
END
/* C:\Codigo Acana\Source\Modulos\Contratos de cliente\Controller\ContratosCliente_controller.res */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf4DF.tmp */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf872.tmp */

View File

@ -14,4 +14,4 @@ END
/* C:\Codigo Acana\Source\Modulos\Contratos de cliente\Data\uDataModuleContratosCliente.dfm */
/* C:\Codigo Acana\Source\Modulos\Contratos de cliente\Data\ContratosCliente_data.res */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf4DD.tmp */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf870.tmp */

View File

@ -13,4 +13,4 @@ BEGIN
END
/* C:\Codigo Acana\Source\Modulos\Contratos de cliente\Model\ContratosCliente_model.res */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf4DB.tmp */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf86E.tmp */

View File

@ -256,6 +256,9 @@ begin
ID_TIENDA := AppFactuGES.TiendaActiva.ID;
TIENDA := AppFactuGES.TiendaActiva.NOMBRE;
Self.DataTable.FieldByName(fld_ContratosClienteFORMA_PAGO).AsString := AppFactuGES.FormaPagoDocumentos;
Self.DataTable.FieldByName(fld_ContratosClienteOBSERVACIONES).AsString := AppFactuGES.ObservacionesDocumentos;
end;
procedure TBizContratoCliente.IVAOnChange(Sender: TDACustomField);

View File

@ -14,4 +14,4 @@ END
/* C:\Codigo Acana\Source\Modulos\Contratos de cliente\Plugin\uPluginContratosCliente.dfm */
/* C:\Codigo Acana\Source\Modulos\Contratos de cliente\Plugin\ContratosCliente_plugin.res */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf527.tmp */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf8BA.tmp */

View File

@ -25,4 +25,4 @@ END
/* C:\Codigo Acana\Source\Modulos\Contratos de cliente\Views\uEditorElegirArticulosContratoCliente.dfm */
/* C:\Codigo Acana\Source\Modulos\Contratos de cliente\Views\uEditorContratosClienteReport.dfm */
/* C:\Codigo Acana\Source\Modulos\Contratos de cliente\Views\ContratosCliente_view.res */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf525.tmp */
/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf8B8.tmp */

View File

@ -1957,7 +1957,9 @@ inherited fEditorContratosCliente: TfEditorContratosCliente
inherited GridPopupMenu: TPopupMenu
object Generarcertificado1: TMenuItem [6]
Caption = 'Generar certificado'
Enabled = False
ImageIndex = 26
Visible = False
end
object Generar2: TMenuItem [7]
Caption = 'Generar factura'

View File

@ -62,6 +62,8 @@ inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente
end
object cxGridViewTIPO_ARTICULO: TcxGridDBColumn [4]
DataBinding.FieldName = 'TIPO_ARTICULO'
Visible = False
VisibleForCustomization = False
end
object cxGridViewID_PROPIEDAD: TcxGridDBColumn [5]
Caption = 'Propiedad'
@ -111,21 +113,31 @@ inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente
inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 451
object TBXSubmenuItem1: TTBXSubmenuItem [0]
Caption = 'A'#241'adir ...'
Caption = 'A'#241'adir cap'#237'tulo'
DisplayMode = nbdmImageAndText
DropdownCombo = True
ImageIndex = 12
object TBXItem14: TTBXItem
Action = actCapituloArmarioF
end
object TBXItem17: TTBXItem
Action = actCapituloArmarioI
end
object TBXSeparatorItem10: TTBXSeparatorItem
end
object TBXItem15: TTBXItem
Action = actCapituloBano
end
object TBXSeparatorItem8: TTBXSeparatorItem
end
object TBXItem16: TTBXItem
Action = actCapituloCocina
end
object TBXSeparatorItem7: TTBXSeparatorItem
end
object TBXItem19: TTBXItem
Action = actCapituloElectrodomesticos
Caption = 'Cap'#237'tulo de electrodom'#233'sticos'
end
object TBXItem20: TTBXItem
Action = actCapituloVarios
@ -185,6 +197,8 @@ inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente
object actAsignarDescuento: TAction
Category = 'Operaciones'
Caption = 'Asignar descuento'
Enabled = False
Visible = False
OnExecute = actAsignarDescuentoExecute
OnUpdate = actAsignarDescuentoUpdate
end

View File

@ -49,6 +49,9 @@ type
actCapituloVarios: TAction;
TBXItem19: TTBXItem;
TBXItem20: TTBXItem;
TBXSeparatorItem7: TTBXSeparatorItem;
TBXSeparatorItem8: TTBXSeparatorItem;
TBXSeparatorItem10: TTBXSeparatorItem;
procedure actAsignarDescuentoExecute(Sender: TObject);
procedure actAsignarDescuentoUpdate(Sender: TObject);
procedure CustomViewShow(Sender: TObject);

View File

@ -259,6 +259,9 @@ begin
ID_TIENDA := AppFactuGES.TiendaActiva.ID;
TIENDA := AppFactuGES.TiendaActiva.NOMBRE;
Self.DataTable.FieldByName(fld_PresupuestosClienteFORMA_PAGO).AsString := AppFactuGES.FormaPagoDocumentos;
Self.DataTable.FieldByName(fld_PresupuestosClienteOBSERVACIONES).AsString := AppFactuGES.ObservacionesDocumentos;
end;
procedure TBizPresupuestoCliente.IVAOnChange(Sender: TDACustomField);

View File

@ -129,7 +129,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 848
ExplicitWidth = 848
inherited tbxMain: TTBXToolbar
ExplicitWidth = 613
ExplicitWidth = 488
inherited TBXItem2: TTBXItem
Visible = False
end
@ -148,8 +148,10 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
object TBXItem33: TTBXItem [13]
Caption = 'Generar certificado'
DisplayMode = nbdmImageAndText
Enabled = False
Hint = 'Generar certificado de trabajos'
ImageIndex = 21
Visible = False
end
end
inherited tbxMenu: TTBXToolbar
@ -303,7 +305,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitTop = 24
ExplicitWidth = 834
inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 614
ExplicitWidth = 564
end
end
inherited cxLookupComboBox1: TcxLookupComboBox

View File

@ -1977,19 +1977,28 @@ inherited fEditorPresupuestosCliente: TfEditorPresupuestosCliente
inherited dsDataTable: TDADataSource [8]
end
inherited GridPopupMenu: TPopupMenu
object Generarcertificado1: TMenuItem [6]
Caption = 'Generar certificado'
ImageIndex = 26
object Aceptar1: TMenuItem [6]
Action = actAceptar
end
object Generar2: TMenuItem [7]
Caption = 'Generar factura'
ImageIndex = 26
OnClick = actGenerarExecute
object Anular1: TMenuItem [7]
Action = actAnular
end
object N4: TMenuItem [8]
object N3: TMenuItem [8]
Caption = '-'
end
object Enviarporemail1: TMenuItem [9]
object Generarcertificado1: TMenuItem [9]
Caption = 'Generar certificado'
Enabled = False
ImageIndex = 26
Visible = False
end
object Generar2: TMenuItem [10]
Action = actGenerarContrato
end
object N4: TMenuItem [11]
Caption = '-'
end
object Enviarporemail1: TMenuItem [12]
Action = actEnviarEMail
end
end

View File

@ -44,6 +44,9 @@ type
TBXItem46: TTBXItem;
JSInformesDialog: TJSDialog;
TBXItem47: TTBXItem;
Aceptar1: TMenuItem;
Anular1: TMenuItem;
N3: TMenuItem;
procedure FormShow(Sender: TObject);
procedure actGenerarAlbaranCliExecute(Sender: TObject);
procedure actEliminarUpdate(Sender: TObject);

View File

@ -62,6 +62,8 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
end
object cxGridViewTIPO_ARTICULO: TcxGridDBColumn [4]
DataBinding.FieldName = 'TIPO_ARTICULO'
Visible = False
VisibleForCustomization = False
end
object cxGridViewID_PROPIEDAD: TcxGridDBColumn [5]
Caption = 'Propiedad'
@ -109,29 +111,40 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
end
inherited TBXDock1: TTBXDock
inherited TBXToolbar1: TTBXToolbar
DockPos = 0
ExplicitWidth = 451
object TBXSubmenuItem1: TTBXSubmenuItem [0]
Caption = 'A'#241'adir ...'
Caption = 'A'#241'adir cap'#237'tulo'
DisplayMode = nbdmImageAndText
DropdownCombo = True
ImageIndex = 12
object TBXItem14: TTBXItem
Action = actCapituloArmarioF
end
object TBXItem17: TTBXItem
Action = actCapituloArmarioI
end
object TBXSeparatorItem8: TTBXSeparatorItem
end
object TBXItem15: TTBXItem
Action = actCapituloBano
end
object TBXSeparatorItem7: TTBXSeparatorItem
end
object TBXItem16: TTBXItem
Action = actCapituloCocina
end
object TBXSeparatorItem10: TTBXSeparatorItem
end
object TBXItem19: TTBXItem
Action = actCapituloElectrodomesticos
Caption = 'Cap'#237'tulo de electrodom'#233'sticos'
end
object TBXItem20: TTBXItem
Action = actCapituloVarios
end
end
object TBXSeparatorItem6: TTBXSeparatorItem [1]
object TBXSeparatorItem6: TTBXSeparatorItem [3]
end
object TBXSeparatorItem9: TTBXSeparatorItem
end
@ -185,6 +198,8 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
object actAsignarDescuento: TAction
Category = 'Operaciones'
Caption = 'Asignar descuento'
Enabled = False
Visible = False
OnExecute = actAsignarDescuentoExecute
OnUpdate = actAsignarDescuentoUpdate
end

View File

@ -49,6 +49,9 @@ type
actCapituloVarios: TAction;
TBXItem19: TTBXItem;
TBXItem20: TTBXItem;
TBXSeparatorItem7: TTBXSeparatorItem;
TBXSeparatorItem8: TTBXSeparatorItem;
TBXSeparatorItem10: TTBXSeparatorItem;
procedure actAsignarDescuentoExecute(Sender: TObject);
procedure actAsignarDescuentoUpdate(Sender: TObject);
procedure CustomViewShow(Sender: TObject);

Binary file not shown.

View File

@ -16,7 +16,7 @@ BEGIN
VALUE "FileVersion", "2.3.5.0\0"
VALUE "ProductName", "FactuGES (Servidor)\0"
VALUE "ProductVersion", "2.3.5.0\0"
VALUE "CompileDate", "jueves, 17 de septiembre de 2009 16:57\0"
VALUE "CompileDate", "lunes, 21 de septiembre de 2009 19:40\0"
END
END
BLOCK "VarFileInfo"