Cambiar el sistema de descuentos por línea en presupuestos para sólo meterlo automáticamente cuando la línea tenga una cantidad.

git-svn-id: https://192.168.0.254/svn/Proyectos.AbetoDesign_FactuGES/trunk@61 93f398dd-4eb6-7a46-baf6-13f46f578da2
This commit is contained in:
David Arranz 2013-05-18 15:22:15 +00:00
parent 3924759cd9
commit e7a08da535
65 changed files with 378 additions and 411 deletions

Binary file not shown.

Binary file not shown.

View File

@ -46,9 +46,6 @@
<Borland.ProjectType>Package</Borland.ProjectType> <Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject> <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="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 Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages> <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="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 Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<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="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\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> <Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
@ -59,6 +56,43 @@
<DelphiCompile Include="ApplicationBase.dpk"> <DelphiCompile Include="ApplicationBase.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </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\cxDataD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD11.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\dxCoreD11.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\Jcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.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\JvJansD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvMMD11R.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\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\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\uConfiguracionController.pas" />
<DCCReference Include="Configuracion\Controller\Views\uIViewConfiguracionBase.pas" /> <DCCReference Include="Configuracion\Controller\Views\uIViewConfiguracionBase.pas" />
<DCCReference Include="Configuracion\Views\uEditorConfiguracion.pas"> <DCCReference Include="Configuracion\Views\uEditorConfiguracion.pas">
@ -83,43 +117,6 @@
<DCCReference Include="Ejercicios\Model\schEjerciciosClient_Intf.pas" /> <DCCReference Include="Ejercicios\Model\schEjerciciosClient_Intf.pas" />
<DCCReference Include="Ejercicios\Model\schEjerciciosServer_Intf.pas" /> <DCCReference Include="Ejercicios\Model\schEjerciciosServer_Intf.pas" />
<DCCReference Include="Ejercicios\Model\uBizEjercicios.pas" /> <DCCReference Include="Ejercicios\Model\uBizEjercicios.pas" />
<DCCReference Include="Ejercicios\Plugin\adortl.dcp" />
<DCCReference Include="Ejercicios\Plugin\Base.dcp" />
<DCCReference Include="Ejercicios\Plugin\ccpackD11.dcp" />
<DCCReference Include="Ejercicios\Plugin\cfpack_d11.dcp" />
<DCCReference Include="Ejercicios\Plugin\cxDataD11.dcp" />
<DCCReference Include="Ejercicios\Plugin\cxEditorsD11.dcp" />
<DCCReference Include="Ejercicios\Plugin\cxExtEditorsD11.dcp" />
<DCCReference Include="Ejercicios\Plugin\cxLibraryD11.dcp" />
<DCCReference Include="Ejercicios\Plugin\DataAbstract_Core_D11.dcp" />
<DCCReference Include="Ejercicios\Plugin\dbrtl.dcp" />
<DCCReference Include="Ejercicios\Plugin\designide.dcp" />
<DCCReference Include="Ejercicios\Plugin\dsnap.dcp" />
<DCCReference Include="Ejercicios\Plugin\dxCoreD11.dcp" />
<DCCReference Include="Ejercicios\Plugin\dxGDIPlusD11.dcp" />
<DCCReference Include="Ejercicios\Plugin\dxNavBarD11.dcp" />
<DCCReference Include="Ejercicios\Plugin\dxThemeD11.dcp" />
<DCCReference Include="Ejercicios\Plugin\GUIBase.dcp" />
<DCCReference Include="Ejercicios\Plugin\GUISDK_D11R.dcp" />
<DCCReference Include="Ejercicios\Plugin\Jcl.dcp" />
<DCCReference Include="Ejercicios\Plugin\JclVcl.dcp" />
<DCCReference Include="Ejercicios\Plugin\JvCoreD11R.dcp" />
<DCCReference Include="Ejercicios\Plugin\JvCtrlsD11R.dcp" />
<DCCReference Include="Ejercicios\Plugin\JvJansD11R.dcp" />
<DCCReference Include="Ejercicios\Plugin\JvMMD11R.dcp" />
<DCCReference Include="Ejercicios\Plugin\JvStdCtrlsD11R.dcp" />
<DCCReference Include="Ejercicios\Plugin\JvSystemD11R.dcp" />
<DCCReference Include="Ejercicios\Plugin\PluginSDK_D11R.dcp" />
<DCCReference Include="Ejercicios\Plugin\PngComponentsD10.dcp" />
<DCCReference Include="Ejercicios\Plugin\PNG_D10.dcp" />
<DCCReference Include="Ejercicios\Plugin\RemObjects_Core_D11.dcp" />
<DCCReference Include="Ejercicios\Plugin\rtl.dcp" />
<DCCReference Include="Ejercicios\Plugin\vcl.dcp" />
<DCCReference Include="Ejercicios\Plugin\vclactnband.dcp" />
<DCCReference Include="Ejercicios\Plugin\vcldb.dcp" />
<DCCReference Include="Ejercicios\Plugin\vcljpg.dcp" />
<DCCReference Include="Ejercicios\Plugin\vclx.dcp" />
<DCCReference Include="Ejercicios\Plugin\xmlrtl.dcp" />
<DCCReference Include="Ejercicios\Views\uEditorEjercicio.pas"> <DCCReference Include="Ejercicios\Views\uEditorEjercicio.pas">
<Form>fEditorEjercicio</Form> <Form>fEditorEjercicio</Form>
<DesignClass>TCustomEditor</DesignClass> <DesignClass>TCustomEditor</DesignClass>

View File

@ -58,55 +58,55 @@
<DelphiCompile Include="Base.dpk"> <DelphiCompile Include="Base.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\Modulos\Articulos\adortl.dcp" />
<DCCReference Include="..\Modulos\Articulos\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Articulos\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Articulos\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Articulos\cxGridD11.dcp" />
<DCCReference Include="..\Modulos\Articulos\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Articulos\cxPageControlD11.dcp" />
<DCCReference Include="..\Modulos\Articulos\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Articulos\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Articulos\dclIndyCore.dcp" />
<DCCReference Include="..\Modulos\Articulos\designide.dcp" />
<DCCReference Include="..\Modulos\Articulos\dsnap.dcp" />
<DCCReference Include="..\Modulos\Articulos\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Articulos\dxPSCoreD11.dcp" />
<DCCReference Include="..\Modulos\Articulos\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Articulos\GUISDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Articulos\IndyCore.dcp" />
<DCCReference Include="..\Modulos\Articulos\IndyProtocols.dcp" />
<DCCReference Include="..\Modulos\Articulos\IndySystem.dcp" />
<DCCReference Include="..\Modulos\Articulos\Jcl.dcp" />
<DCCReference Include="..\Modulos\Articulos\JclVcl.dcp" />
<DCCReference Include="..\Modulos\Articulos\JSDialog100.dcp" />
<DCCReference Include="..\Modulos\Articulos\JvCmpD11R.dcp" />
<DCCReference Include="..\Modulos\Articulos\JvCoreD11R.dcp" />
<DCCReference Include="..\Modulos\Articulos\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Articulos\JvDlgsD11R.dcp" />
<DCCReference Include="..\Modulos\Articulos\JvMMD11R.dcp" />
<DCCReference Include="..\Modulos\Articulos\JvNetD11R.dcp" />
<DCCReference Include="..\Modulos\Articulos\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Modulos\Articulos\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Articulos\JvSystemD11R.dcp" />
<DCCReference Include="..\Modulos\Articulos\pckMD5.dcp" />
<DCCReference Include="..\Modulos\Articulos\pckUCDataConnector.dcp" />
<DCCReference Include="..\Modulos\Articulos\pckUserControl_RT.dcp" />
<DCCReference Include="..\Modulos\Articulos\PluginSDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Articulos\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Articulos\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Articulos\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Articulos\rtl.dcp" />
<DCCReference Include="..\Modulos\Articulos\TB2k_D10.dcp" />
<DCCReference Include="..\Modulos\Articulos\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Articulos\vcl.dcp" />
<DCCReference Include="..\Modulos\Articulos\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Articulos\vcldb.dcp" />
<DCCReference Include="..\Modulos\Articulos\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Articulos\VclSmp.dcp" />
<DCCReference Include="..\Modulos\Articulos\vclx.dcp" />
<DCCReference Include="..\Modulos\Articulos\xmlrtl.dcp" />
<DCCReference Include="..\Servicios\FactuGES_Intf.pas" /> <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
<DCCReference Include="C:\Documents and Settings\Usuario\adortl.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\cxExtEditorsD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxGridD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD11.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\dxPSCoreD11.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"> <DCCReference Include="Conexion\uConfigurarConexion.pas">
<Form>fConfigurarConexion</Form> <Form>fConfigurarConexion</Form>
<DesignClass>TForm</DesignClass> <DesignClass>TForm</DesignClass>

View File

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

View File

@ -21,7 +21,7 @@ inherited fEditorDBItem: TfEditorDBItem
Width = 650 Width = 650
ExplicitWidth = 650 ExplicitWidth = 650
inherited tbxMain: TTBXToolbar inherited tbxMain: TTBXToolbar
ExplicitWidth = 650 ExplicitWidth = 605
inherited TBXItem26: TTBXItem inherited TBXItem26: TTBXItem
Visible = False Visible = False
end end
@ -77,14 +77,12 @@ inherited fEditorDBItem: TfEditorDBItem
object pgPaginas: TPageControl [3] object pgPaginas: TPageControl [3]
AlignWithMargins = True AlignWithMargins = True
Left = 3 Left = 3
Top = 112 Top = 109
Width = 644 Width = 644
Height = 325 Height = 328
ActivePage = pagGeneral ActivePage = pagGeneral
Align = alClient Align = alClient
TabOrder = 2 TabOrder = 2
ExplicitTop = 109
ExplicitHeight = 328
object pagGeneral: TTabSheet object pagGeneral: TTabSheet
Caption = 'General' Caption = 'General'
ExplicitLeft = 0 ExplicitLeft = 0
@ -95,7 +93,7 @@ inherited fEditorDBItem: TfEditorDBItem
end end
object PnlComentario: TPanel [4] object PnlComentario: TPanel [4]
Left = 0 Left = 0
Top = 79 Top = 76
Width = 650 Width = 650
Height = 30 Height = 30
Align = alTop Align = alTop
@ -105,7 +103,6 @@ inherited fEditorDBItem: TfEditorDBItem
ParentBackground = False ParentBackground = False
TabOrder = 4 TabOrder = 4
VerticalAlignment = taAlignTop VerticalAlignment = taAlignTop
ExplicitTop = 76
object lbComentario: TLabel object lbComentario: TLabel
AlignWithMargins = True AlignWithMargins = True
Left = 6 Left = 6

View File

@ -56,6 +56,11 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO
end end
end end
end end
inherited TBXDock1: TTBXDock
inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 447
end
end
inherited ActionListContenido: TActionList inherited ActionListContenido: TActionList
inherited actAnadir: TAction inherited actAnadir: TAction
Caption = 'A'#241'adir concepto' Caption = 'A'#241'adir concepto'

View File

@ -1,14 +1,14 @@
inherited frViewTotales: TfrViewTotales inherited frViewTotales: TfrViewTotales
Width = 860 Width = 451
Height = 404 Height = 404
Align = alBottom Align = alBottom
ExplicitWidth = 825 ExplicitWidth = 451
ExplicitHeight = 404 ExplicitHeight = 404
object dxLayoutControl1: TdxLayoutControl object dxLayoutControl1: TdxLayoutControl
AlignWithMargins = True AlignWithMargins = True
Left = 0 Left = 0
Top = 0 Top = 0
Width = 860 Width = 451
Height = 233 Height = 233
Margins.Left = 0 Margins.Left = 0
Margins.Top = 0 Margins.Top = 0
@ -19,16 +19,16 @@ inherited frViewTotales: TfrViewTotales
TabOrder = 0 TabOrder = 0
TabStop = False TabStop = False
AutoContentSizes = [acsWidth, acsHeight] AutoContentSizes = [acsWidth, acsHeight]
ExplicitWidth = 451 ExplicitWidth = 860
object Bevel3: TBevel object Bevel3: TBevel
Left = 423 Left = 278
Top = 28 Top = 28
Width = 3 Width = 3
Height = 122 Height = 122
Shape = bsRightLine Shape = bsRightLine
end end
object Bevel4: TBevel object Bevel4: TBevel
Left = 535 Left = 390
Top = 70 Top = 70
Width = 210 Width = 210
Height = 9 Height = 9
@ -66,7 +66,7 @@ inherited frViewTotales: TfrViewTotales
Width = 93 Width = 93
end end
object ImporteIVA: TcxDBCurrencyEdit object ImporteIVA: TcxDBCurrencyEdit
Left = 606 Left = 461
Top = 105 Top = 105
AutoSize = False AutoSize = False
DataBinding.DataField = 'IMPORTE_IVA' DataBinding.DataField = 'IMPORTE_IVA'
@ -97,7 +97,7 @@ inherited frViewTotales: TfrViewTotales
Width = 137 Width = 137
end end
object ImporteTotal: TcxDBCurrencyEdit object ImporteTotal: TcxDBCurrencyEdit
Left = 536 Left = 391
Top = 186 Top = 186
AutoSize = False AutoSize = False
DataBinding.DataField = 'IMPORTE_TOTAL' DataBinding.DataField = 'IMPORTE_TOTAL'
@ -159,7 +159,7 @@ inherited frViewTotales: TfrViewTotales
Width = 65 Width = 65
end end
object edtIVA: TcxDBSpinEdit object edtIVA: TcxDBSpinEdit
Left = 535 Left = 390
Top = 105 Top = 105
AutoSize = False AutoSize = False
DataBinding.DataField = 'IVA' DataBinding.DataField = 'IVA'
@ -196,7 +196,7 @@ inherited frViewTotales: TfrViewTotales
Width = 65 Width = 65
end end
object ImporteBase: TcxDBCurrencyEdit object ImporteBase: TcxDBCurrencyEdit
Left = 535 Left = 390
Top = 28 Top = 28
AutoSize = False AutoSize = False
DataBinding.DataField = 'BASE_IMPONIBLE' DataBinding.DataField = 'BASE_IMPONIBLE'
@ -226,7 +226,7 @@ inherited frViewTotales: TfrViewTotales
Width = 92 Width = 92
end end
object edtRE: TcxDBSpinEdit object edtRE: TcxDBSpinEdit
Left = 535 Left = 390
Top = 159 Top = 159
AutoSize = False AutoSize = False
DataBinding.DataField = 'RE' DataBinding.DataField = 'RE'
@ -263,7 +263,7 @@ inherited frViewTotales: TfrViewTotales
Width = 65 Width = 65
end end
object edtIRPF: TcxDBSpinEdit object edtIRPF: TcxDBSpinEdit
Left = 535 Left = 390
Top = 132 Top = 132
AutoSize = False AutoSize = False
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -299,7 +299,7 @@ inherited frViewTotales: TfrViewTotales
Width = 65 Width = 65
end end
object ImporteRE: TcxDBCurrencyEdit object ImporteRE: TcxDBCurrencyEdit
Left = 606 Left = 461
Top = 159 Top = 159
AutoSize = False AutoSize = False
DataBinding.DataField = 'IMPORTE_RE' DataBinding.DataField = 'IMPORTE_RE'
@ -330,7 +330,7 @@ inherited frViewTotales: TfrViewTotales
Width = 56 Width = 56
end end
object ImporteIRPF: TcxDBCurrencyEdit object ImporteIRPF: TcxDBCurrencyEdit
Left = 606 Left = 461
Top = 132 Top = 132
AutoSize = False AutoSize = False
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -453,7 +453,7 @@ inherited frViewTotales: TfrViewTotales
Width = 81 Width = 81
end end
object bTiposIVA: TButton object bTiposIVA: TButton
Left = 275 Left = 130
Top = 109 Top = 109
Width = 132 Width = 132
Height = 21 Height = 21

View File

@ -19,7 +19,7 @@ type
function AnadirArticulo(ADetalles: IDAStronglyTypedDataTable; IDArticulo: Integer; AClienteID: Integer = -1; const ACantidad: Float = 1): Boolean; overload; function AnadirArticulo(ADetalles: IDAStronglyTypedDataTable; IDArticulo: Integer; AClienteID: Integer = -1; const ACantidad: Float = 1): Boolean; overload;
procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo); overload; procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo); overload;
procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; ADescuento: Float); overload; procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; ADescuento: Float; const AAll: Boolean = False); overload;
procedure CambiarSignoDetalles(ADetalles: IDAStronglyTypedDataTable; const AAll: Boolean = True); procedure CambiarSignoDetalles(ADetalles: IDAStronglyTypedDataTable; const AAll: Boolean = True);
procedure AnadirConceptoInicial(ADetalles: IDAStronglyTypedDataTable; AConcepto: String); procedure AnadirConceptoInicial(ADetalles: IDAStronglyTypedDataTable; AConcepto: String);
end; end;
@ -44,7 +44,7 @@ type
function AnadirArticulo(ADetalles: IDAStronglyTypedDataTable; IDArticulo: Integer; AClienteID: Integer = -1; const ACantidad: Float = 1): Boolean; overload; function AnadirArticulo(ADetalles: IDAStronglyTypedDataTable; IDArticulo: Integer; AClienteID: Integer = -1; const ACantidad: Float = 1): Boolean; overload;
procedure AnadirArticulos(ADetalles: IDAStronglyTypedDataTable; const ANuevaFila :Boolean = True); procedure AnadirArticulos(ADetalles: IDAStronglyTypedDataTable; const ANuevaFila :Boolean = True);
procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo); overload; procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; AArticulos: IBizArticulo); overload;
procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; ADescuento: Float); overload; procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; ADescuento: Float; const AAll: Boolean = False); overload;
procedure CambiarSignoDetalles(ADetalles: IDAStronglyTypedDataTable; const AAll: Boolean = True); procedure CambiarSignoDetalles(ADetalles: IDAStronglyTypedDataTable; const AAll: Boolean = True);
procedure AnadirConceptoInicial(ADetalles: IDAStronglyTypedDataTable; AConcepto: String); procedure AnadirConceptoInicial(ADetalles: IDAStronglyTypedDataTable; AConcepto: String);
@ -102,9 +102,11 @@ begin
end; end;
end; end;
procedure TControllerDetallesArticulos.ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; ADescuento: Float); procedure TControllerDetallesArticulos.ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; ADescuento: Float; const AAll: Boolean = False);
// AAll => True -> cambiar los descuento en todas los conceptos, False -> sólo en los conceptos con cantidades/importe
var var
ACantidad: Float; ACantidad: Float;
ACambiar : Boolean;
begin begin
if Assigned(ADetalles) then if Assigned(ADetalles) then
begin begin
@ -115,16 +117,25 @@ begin
begin begin
while not EOF do while not EOF do
begin begin
Edit; ACambiar := True;
try if (ADetalles.DataTable.FieldByName(CAMPO_TIPO).AsString = TIPO_DETALLE_CONCEPTO) then
if (ADetalles.DataTable.FieldByName(CAMPO_TIPO).AsString = TIPO_DETALLE_CONCEPTO) then begin
if (not AAll) and (ADetalles.DataTable.FieldByName('CANTIDAD').IsNull and ADetalles.DataTable.FieldByName('IMPORTE_UNIDAD').IsNull) then
ACambiar := False;
if ACambiar then
begin begin
//Para mantener la cantidad que ya tuviera el detalle se debe guardar y volver a poner Edit;
ADetalles.DataTable.FieldByName('DESCUENTO').AsFloat := ADescuento; try
// Cuando el descuento es 0, quitar cualquier valor en el campo.
if (ADescuento <> 0) then
ADetalles.DataTable.FieldByName('DESCUENTO').AsFloat := ADescuento
else
ADetalles.DataTable.FieldByName('DESCUENTO').Clear;
except
on E: Exception do
ShowMessage(E.Message);
end;
end; end;
except
on E: Exception do
ShowMessage(E.Message);
end; end;
Next; Next;
end; end;

View File

@ -54,12 +54,12 @@
<DelphiCompile Include="Articulos_view.dpk"> <DelphiCompile Include="Articulos_view.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\..\Contratos de cliente\Articulos_controller.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Articulos_controller.dcp" />
<DCCReference Include="..\..\Contratos de cliente\Articulos_model.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Articulos_model.dcp" />
<DCCReference Include="..\..\Contratos de cliente\Contactos_view.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_view.dcp" />
<DCCReference Include="..\..\Contratos de cliente\Familias_controller.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Familias_controller.dcp" />
<DCCReference Include="..\..\Contratos de cliente\GUIBase.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
<DCCReference Include="..\..\Contratos de cliente\SubFamilias_controller.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\SubFamilias_controller.dcp" />
<DCCReference Include="uArticulosViewRegister.pas" /> <DCCReference Include="uArticulosViewRegister.pas" />
<DCCReference Include="uEditorArticulo.pas"> <DCCReference Include="uEditorArticulo.pas">
<Form>fEditorArticulo</Form> <Form>fEditorArticulo</Form>

View File

@ -28,11 +28,13 @@ type
procedure CustomViewDestroy(Sender: TObject); procedure CustomViewDestroy(Sender: TObject);
procedure actAnadirArticulosExecute(Sender: TObject); procedure actAnadirArticulosExecute(Sender: TObject);
procedure actAnadirArticulosUpdate(Sender: TObject); procedure actAnadirArticulosUpdate(Sender: TObject);
procedure OnValidateCantidad(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
procedure OnValidateReferencia(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); procedure OnValidateReferencia(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
procedure OnValidateReferenciaProveedor(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); procedure OnValidateReferenciaProveedor(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
procedure CustomViewShow(Sender: TObject); procedure CustomViewShow(Sender: TObject);
protected protected
procedure ValidarCantidadInterno(var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); virtual;
procedure AnadirArticulosInterno; virtual; procedure AnadirArticulosInterno; virtual;
procedure RellenarArticulosInterno; virtual; procedure RellenarArticulosInterno; virtual;
function AnadirArticulo(pReferencia: String; TipoReferencia: TEnumReferencia): Boolean; virtual; function AnadirArticulo(pReferencia: String; TipoReferencia: TEnumReferencia): Boolean; virtual;
@ -68,6 +70,7 @@ begin
inherited; inherited;
cxGridViewREFERENCIA.Properties.OnValidate := OnValidateReferencia; cxGridViewREFERENCIA.Properties.OnValidate := OnValidateReferencia;
cxGridViewREFERENCIA_PROVEEDOR.Properties.OnValidate := OnValidateReferenciaProveedor; cxGridViewREFERENCIA_PROVEEDOR.Properties.OnValidate := OnValidateReferenciaProveedor;
cxGridViewCANTIDAD.Properties.OnValidate := OnValidateCantidad;
end; end;
procedure TfrViewDetallesArticulos.CustomViewDestroy(Sender: TObject); procedure TfrViewDetallesArticulos.CustomViewDestroy(Sender: TObject);
@ -75,6 +78,7 @@ begin
inherited; inherited;
cxGridViewREFERENCIA.Properties.OnValidate := Nil; cxGridViewREFERENCIA.Properties.OnValidate := Nil;
cxGridViewREFERENCIA_PROVEEDOR.Properties.OnValidate := Nil; cxGridViewREFERENCIA_PROVEEDOR.Properties.OnValidate := Nil;
cxGridViewCANTIDAD.Properties.OnValidate := Nil;
end; end;
procedure TfrViewDetallesArticulos.CustomViewShow(Sender: TObject); procedure TfrViewDetallesArticulos.CustomViewShow(Sender: TObject);
@ -83,6 +87,12 @@ begin
SeleccionarRowActual; SeleccionarRowActual;
end; end;
procedure TfrViewDetallesArticulos.OnValidateCantidad(Sender: TObject;
var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
begin
Self.ValidarCantidadInterno(DisplayValue, ErrorText, Error);
end;
procedure TfrViewDetallesArticulos.OnValidateReferencia(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); procedure TfrViewDetallesArticulos.OnValidateReferencia(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
var var
lsReferencia : String; lsReferencia : String;
@ -127,6 +137,14 @@ begin
(Controller as IControllerDetallesArticulos).AnadirArticulos(Detalles, False); (Controller as IControllerDetallesArticulos).AnadirArticulos(Detalles, False);
end; end;
procedure TfrViewDetallesArticulos.ValidarCantidadInterno(
var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
begin
// Este procedimiento sirve para hacer cosas cuando la CANTIDAD cambia.
// Por ejemplo, meter automáticamente el descuento de línea.
// Se sobreescribe en herencia.
end;
procedure TfrViewDetallesArticulos.actAnadirArticulosUpdate(Sender: TObject); procedure TfrViewDetallesArticulos.actAnadirArticulosUpdate(Sender: TObject);
begin begin
inherited; inherited;

View File

@ -47,41 +47,41 @@
<DelphiCompile Include="Contactos_view.dpk"> <DelphiCompile Include="Contactos_view.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\..\Lib\adortl.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
<DCCReference Include="..\..\Lib\ApplicationBase.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" />
<DCCReference Include="..\..\Lib\Base.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
<DCCReference Include="..\..\Lib\bdertl.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\bdertl.dcp" />
<DCCReference Include="..\..\Lib\Contactos_controller.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_controller.dcp" />
<DCCReference Include="..\..\Lib\Contactos_model.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_model.dcp" />
<DCCReference Include="..\..\Lib\cxDataD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
<DCCReference Include="..\..\Lib\cxEditorsD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
<DCCReference Include="..\..\Lib\cxLibraryD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
<DCCReference Include="..\..\Lib\DataAbstract_Core_D11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\..\Lib\dbrtl.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
<DCCReference Include="..\..\Lib\designide.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
<DCCReference Include="..\..\Lib\dsnap.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
<DCCReference Include="..\..\Lib\dxGDIPlusD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
<DCCReference Include="..\..\Lib\dxThemeD11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
<DCCReference Include="..\..\Lib\FormasPago_controller.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\FormasPago_controller.dcp" />
<DCCReference Include="..\..\Lib\FormasPago_model.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\FormasPago_model.dcp" />
<DCCReference Include="..\..\Lib\GestorInformes_controller.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\GestorInformes_controller.dcp" />
<DCCReference Include="..\..\Lib\GUIBase.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
<DCCReference Include="..\..\Lib\GUISDK_D11R.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11R.dcp" />
<DCCReference Include="..\..\Lib\Jcl.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
<DCCReference Include="..\..\Lib\JclVcl.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
<DCCReference Include="..\..\Lib\JvCoreD11R.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
<DCCReference Include="..\..\Lib\JvGlobusD11R.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD11R.dcp" />
<DCCReference Include="..\..\Lib\JvSystemD11R.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
<DCCReference Include="..\..\Lib\RemObjects_Core_D11.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\..\Lib\rtl.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
<DCCReference Include="..\..\Lib\TiposIVA_controller.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\TiposIVA_controller.dcp" />
<DCCReference Include="..\..\Lib\TiposIVA_model.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\TiposIVA_model.dcp" />
<DCCReference Include="..\..\Lib\vcl.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
<DCCReference Include="..\..\Lib\vclactnband.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
<DCCReference Include="..\..\Lib\vcldb.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
<DCCReference Include="..\..\Lib\vcljpg.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
<DCCReference Include="..\..\Lib\vclx.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
<DCCReference Include="..\..\Lib\xmlrtl.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
<DCCReference Include="uContactosViewRegister.pas" /> <DCCReference Include="uContactosViewRegister.pas" />
<DCCReference Include="uEditorCliente.pas"> <DCCReference Include="uEditorCliente.pas">
<Form>fEditorCliente</Form> <Form>fEditorCliente</Form>

View File

@ -49,18 +49,18 @@
<DelphiCompile Include="ContratosCliente_controller.dpk"> <DelphiCompile Include="ContratosCliente_controller.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="C:\Documents and Settings\Usuario\Articulos_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Contactos_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\ContratosCliente_data.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\ContratosCliente_model.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\GestorDocumentos_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PresupuestosCliente_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PresupuestosCliente_model.dcp" />
<DCCReference Include="uArticulosContratoClienteController.pas" /> <DCCReference Include="uArticulosContratoClienteController.pas" />
<DCCReference Include="uContratosClienteController.pas" /> <DCCReference Include="uContratosClienteController.pas" />
<DCCReference Include="uContratosClienteReportController.pas" /> <DCCReference Include="uContratosClienteReportController.pas" />
<DCCReference Include="uDetallesContratoClienteController.pas" /> <DCCReference Include="uDetallesContratoClienteController.pas" />
<DCCReference Include="View\Articulos_controller.dcp" />
<DCCReference Include="View\Contactos_controller.dcp" />
<DCCReference Include="View\ContratosCliente_data.dcp" />
<DCCReference Include="View\ContratosCliente_model.dcp" />
<DCCReference Include="View\GestorDocumentos_controller.dcp" />
<DCCReference Include="View\GUIBase.dcp" />
<DCCReference Include="View\PresupuestosCliente_controller.dcp" />
<DCCReference Include="View\PresupuestosCliente_model.dcp" />
<DCCReference Include="View\uIEditorContratoCliente.pas" /> <DCCReference Include="View\uIEditorContratoCliente.pas" />
<DCCReference Include="View\uIEditorContratosCliente.pas" /> <DCCReference Include="View\uIEditorContratosCliente.pas" />
<DCCReference Include="View\uIEditorContratosClienteBeneficios.pas" /> <DCCReference Include="View\uIEditorContratosClienteBeneficios.pas" />

View File

@ -3,7 +3,7 @@ unit schContratosClienteClient_Intf;
interface interface
uses uses
Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf; Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
const const
{ Data table rules ids { Data table rules ids
@ -261,7 +261,7 @@ type
end; end;
{ TValoresDataTableRules } { TValoresDataTableRules }
TValoresDataTableRules = class(TDADataTableRules, IValores) TValoresDataTableRules = class(TIntfObjectDADataTableRules, IValores)
private private
protected protected
{ Property getters and setters } { Property getters and setters }
@ -320,7 +320,7 @@ type
end; end;
{ TPropiedadesDataTableRules } { TPropiedadesDataTableRules }
TPropiedadesDataTableRules = class(TDADataTableRules, IPropiedades) TPropiedadesDataTableRules = class(TIntfObjectDADataTableRules, IPropiedades)
private private
protected protected
{ Property getters and setters } { Property getters and setters }
@ -367,7 +367,7 @@ type
end; end;
{ TListaAnosContratosDataTableRules } { TListaAnosContratosDataTableRules }
TListaAnosContratosDataTableRules = class(TDADataTableRules, IListaAnosContratos) TListaAnosContratosDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosContratos)
private private
protected protected
{ Property getters and setters } { Property getters and setters }
@ -480,7 +480,7 @@ type
end; end;
{ TContratosClienteBeneficiosDataTableRules } { TContratosClienteBeneficiosDataTableRules }
TContratosClienteBeneficiosDataTableRules = class(TDADataTableRules, IContratosClienteBeneficios) TContratosClienteBeneficiosDataTableRules = class(TIntfObjectDADataTableRules, IContratosClienteBeneficios)
private private
protected protected
{ Property getters and setters } { Property getters and setters }
@ -859,7 +859,7 @@ type
end; end;
{ TContratosClienteDataTableRules } { TContratosClienteDataTableRules }
TContratosClienteDataTableRules = class(TDADataTableRules, IContratosCliente) TContratosClienteDataTableRules = class(TIntfObjectDADataTableRules, IContratosCliente)
private private
f_FORMA_PAGO: IROStrings; f_FORMA_PAGO: IROStrings;
f_PLAZO_ENTREGA: IROStrings; f_PLAZO_ENTREGA: IROStrings;
@ -1201,7 +1201,7 @@ type
end; end;
{ TTiposCapitulosDataTableRules } { TTiposCapitulosDataTableRules }
TTiposCapitulosDataTableRules = class(TDADataTableRules, ITiposCapitulos) TTiposCapitulosDataTableRules = class(TIntfObjectDADataTableRules, ITiposCapitulos)
private private
protected protected
{ Property getters and setters } { Property getters and setters }
@ -1356,7 +1356,7 @@ type
end; end;
{ TContratosCliente_DetallesDataTableRules } { TContratosCliente_DetallesDataTableRules }
TContratosCliente_DetallesDataTableRules = class(TDADataTableRules, IContratosCliente_Detalles) TContratosCliente_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IContratosCliente_Detalles)
private private
protected protected
{ Property getters and setters } { Property getters and setters }

View File

@ -49,9 +49,9 @@
<DelphiCompile Include="GestorDocumentos_controller.dpk"> <DelphiCompile Include="GestorDocumentos_controller.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\..\Presupuestos de cliente\Views\GestorDocumentos_data.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\GestorDocumentos_data.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\Views\GUIBase.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\Views\rtl.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
<DCCReference Include="uGestorDocumentosController.pas" /> <DCCReference Include="uGestorDocumentosController.pas" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -49,7 +49,7 @@
<DelphiCompile Include="GestorDocumentos_data.dpk"> <DelphiCompile Include="GestorDocumentos_data.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\..\Presupuestos de cliente\Views\Base.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
<DCCReference Include="uDataModuleGestorDocumentos.pas"> <DCCReference Include="uDataModuleGestorDocumentos.pas">
<Form>DataModuleGestorDocumentos</Form> <Form>DataModuleGestorDocumentos</Form>
</DCCReference> </DCCReference>

View File

@ -38,10 +38,10 @@
<DelphiCompile Include="GestorInformes_controller.dpk"> <DelphiCompile Include="GestorInformes_controller.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\GestorInformes_data.dcp" />
<DCCReference Include="uGestorInformesController.pas" /> <DCCReference Include="uGestorInformesController.pas" />
<DCCReference Include="View\ApplicationBase.dcp" />
<DCCReference Include="View\Base.dcp" />
<DCCReference Include="View\GestorInformes_data.dcp" />
<DCCReference Include="View\uIEditorInformeBase.pas" /> <DCCReference Include="View\uIEditorInformeBase.pas" />
<DCCReference Include="View\uIEditorInformeFacturasClientePendientesReport.pas" /> <DCCReference Include="View\uIEditorInformeFacturasClientePendientesReport.pas" />
<DCCReference Include="View\uIEditorInformeFacturasClienteReport.pas" /> <DCCReference Include="View\uIEditorInformeFacturasClienteReport.pas" />

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -49,12 +49,12 @@
<DelphiCompile Include="PresupuestosCliente_controller.dpk"> <DelphiCompile Include="PresupuestosCliente_controller.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\Views\Articulos_controller.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Articulos_controller.dcp" />
<DCCReference Include="..\Views\Contactos_controller.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_controller.dcp" />
<DCCReference Include="..\Views\GestorDocumentos_controller.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\GestorDocumentos_controller.dcp" />
<DCCReference Include="..\Views\GUIBase.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
<DCCReference Include="..\Views\PresupuestosCliente_data.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\PresupuestosCliente_data.dcp" />
<DCCReference Include="..\Views\PresupuestosCliente_model.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\PresupuestosCliente_model.dcp" />
<DCCReference Include="uArticulosPresupuestoClienteController.pas" /> <DCCReference Include="uArticulosPresupuestoClienteController.pas" />
<DCCReference Include="uDetallesPresupuestoClienteController.pas" /> <DCCReference Include="uDetallesPresupuestoClienteController.pas" />
<DCCReference Include="uPresupuestosClienteController.pas" /> <DCCReference Include="uPresupuestosClienteController.pas" />

View File

@ -59,28 +59,18 @@ type
implementation implementation
uses DB, Controls, SysUtils, Dialogs, uDAInterfaces, uDialogUtils, Variants, uDataModulePresupuestosCliente, uses
uArticulosPresupuestoClienteController, schPresupuestosClienteClient_Intf, DB, Controls, SysUtils, Dialogs, uDAInterfaces, uDialogUtils, Variants, uDataModulePresupuestosCliente,
uDataTableUtils, uCalculosUtils, uIEditorAsignarDescuento, uEditorRegistryUtils, uArticulosPresupuestoClienteController, schPresupuestosClienteClient_Intf,
uFactuGES_App; uDataTableUtils, uCalculosUtils, uIEditorAsignarDescuento, uEditorRegistryUtils,
uFactuGES_App, Windows;
{ TDetallesPresupuestoClienteController } { TDetallesPresupuestoClienteController }
procedure TDetallesPresupuestoClienteController.ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; ACliente: IBizCliente); procedure TDetallesPresupuestoClienteController.ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; ACliente: IBizCliente);
var
AArticulos : IBizArticulo;
begin begin
if Assigned(ADetalles) then if Assigned(ADetalles) then
begin ActualizarDetalles(ADetalles, ACliente.DESCUENTO_LINEA);
try
// AArticulos := (FArticulosController.BuscarTodos(ACliente) as IBizArticulo);
// ActualizarDetalles(ADetalles, AArticulos);
ActualizarDetalles(ADetalles, ACliente.DESCUENTO_LINEA);
ShowInfoMessage('Se ha actualizado el descuento para el cliente seleccionado');
finally
AArticulos := Nil;
end;
end;
end; end;
procedure TDetallesPresupuestoClienteController.AnadirArticulos(ADetalles: IDAStronglyTypedDataTable; ACliente: IBizCliente; const ANuevaFila :Boolean); procedure TDetallesPresupuestoClienteController.AnadirArticulos(ADetalles: IDAStronglyTypedDataTable; ACliente: IBizCliente; const ANuevaFila :Boolean);

View File

@ -49,7 +49,7 @@
<DelphiCompile Include="PresupuestosCliente_data.dpk"> <DelphiCompile Include="PresupuestosCliente_data.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\..\..\Servidor\PresupuestosCliente_model.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\PresupuestosCliente_model.dcp" />
<DCCReference Include="uDataModulePresupuestosCliente.pas"> <DCCReference Include="uDataModulePresupuestosCliente.pas">
<Form>DataModulePresupuestosCliente</Form> <Form>DataModulePresupuestosCliente</Form>
</DCCReference> </DCCReference>

View File

@ -43,10 +43,6 @@
<Borland.ProjectType>Package</Borland.ProjectType> <Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject> <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="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 Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages> <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="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 Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages> <Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
<Excluded_Packages Name="C:\Archivos de programa\EurekaLog 5\Delphi10\ExceptionExpert10.bpl">EurekaLog 5.1.9</Excluded_Packages> <Excluded_Packages Name="C:\Archivos de programa\EurekaLog 5\Delphi10\ExceptionExpert10.bpl">EurekaLog 5.1.9</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">PresupuestosCliente_model.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> </Excluded_Packages><Source><Source Name="MainSource">PresupuestosCliente_model.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
@ -56,21 +52,21 @@
<DelphiCompile Include="PresupuestosCliente_model.dpk"> <DelphiCompile Include="PresupuestosCliente_model.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="adortl.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
<DCCReference Include="Base.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
<DCCReference Include="Contactos_controller.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_controller.dcp" />
<DCCReference Include="Contactos_model.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_model.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dsnap.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\vcldb.dcp" />
<DCCReference Include="Data\uIDataModulePresupuestosCliente.pas" /> <DCCReference Include="Data\uIDataModulePresupuestosCliente.pas" />
<DCCReference Include="Data\uIDataModulePresupuestosClienteReport.pas" /> <DCCReference Include="Data\uIDataModulePresupuestosClienteReport.pas" />
<DCCReference Include="dbrtl.dcp" />
<DCCReference Include="dsnap.dcp" />
<DCCReference Include="rtl.dcp" />
<DCCReference Include="schPresupuestosClienteClient_Intf.pas" /> <DCCReference Include="schPresupuestosClienteClient_Intf.pas" />
<DCCReference Include="schPresupuestosClienteServer_Intf.pas" /> <DCCReference Include="schPresupuestosClienteServer_Intf.pas" />
<DCCReference Include="uBizDetallesPresupuestoCliente.pas" /> <DCCReference Include="uBizDetallesPresupuestoCliente.pas" />
<DCCReference Include="uBizPresupuestosCliente.pas" /> <DCCReference Include="uBizPresupuestosCliente.pas" />
<DCCReference Include="vcl.dcp" />
<DCCReference Include="vcldb.dcp" />
</ItemGroup> </ItemGroup>
</Project> </Project>
<!-- EurekaLog First Line <!-- EurekaLog First Line

View File

@ -105,12 +105,13 @@ begin
inherited; inherited;
VISIBLE := 1; VISIBLE := 1;
AMasterTable := DataTable.GetMasterDataTable; {AMasterTable := DataTable.GetMasterDataTable;
// if (TIPO_DETALLE = TIPO_DETALLE_CONCEPTO)
// if (TIPO_DETALLE = TIPO_DETALLE_CONCEPTO)
if Assigned(AMasterTable) if Assigned(AMasterTable)
and Assigned((AMasterTable as IBizPresupuestoCliente).Cliente) and Assigned((AMasterTable as IBizPresupuestoCliente).Cliente)
and ((AMasterTable as IBizPresupuestoCliente).Cliente.DESCUENTO_LINEA > 0) then and ((AMasterTable as IBizPresupuestoCliente).Cliente.DESCUENTO_LINEA > 0) then
DESCUENTO := (AMasterTable as IBizPresupuestoCliente).Cliente.DESCUENTO_LINEA; DESCUENTO := (AMasterTable as IBizPresupuestoCliente).Cliente.DESCUENTO_LINEA;}
end; end;
{ TBizPropiedades } { TBizPropiedades }

View File

@ -42,14 +42,6 @@
<Borland.ProjectType>Package</Borland.ProjectType> <Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject> <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="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 Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages> <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="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 Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</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> <Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">PresupuestosCliente_plugin.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> </Excluded_Packages><Source><Source Name="MainSource">PresupuestosCliente_plugin.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>

View File

@ -6,7 +6,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ClientWidth = 848 ClientWidth = 848
OnClose = CustomEditorClose OnClose = CustomEditorClose
ExplicitWidth = 856 ExplicitWidth = 856
ExplicitHeight = 714 ExplicitHeight = 710
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader inherited JvNavPanelHeader: TJvNavPanelHeader
@ -129,7 +129,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 848 Width = 848
ExplicitWidth = 848 ExplicitWidth = 848
inherited tbxMain: TTBXToolbar inherited tbxMain: TTBXToolbar
ExplicitWidth = 551 ExplicitWidth = 488
inherited TBXItem2: TTBXItem inherited TBXItem2: TTBXItem
Visible = False Visible = False
end end
@ -176,12 +176,12 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
end end
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Width = 842 Width = 842
Height = 314 Height = 317
ActivePage = pagContenido ActivePage = pagContenido
TabOrder = 1 TabOrder = 1
OnChanging = pgPaginasChanging OnChanging = pgPaginasChanging
ExplicitWidth = 842 ExplicitWidth = 842
ExplicitHeight = 314 ExplicitHeight = 317
inherited pagGeneral: TTabSheet inherited pagGeneral: TTabSheet
ExplicitLeft = 4 ExplicitLeft = 4
ExplicitTop = 24 ExplicitTop = 24
@ -195,7 +195,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 834 Width = 834
Height = 286 Height = 289
Align = alClient Align = alClient
BiDiMode = bdLeftToRight BiDiMode = bdLeftToRight
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
@ -208,7 +208,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 834 ExplicitWidth = 834
ExplicitHeight = 286 ExplicitHeight = 289
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Width = 834 Width = 834
Height = 24 Height = 24
@ -289,10 +289,10 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Top = 50 Top = 50
Width = 834 Width = 834
Height = 236 Height = 239
ExplicitTop = 50 ExplicitTop = 50
ExplicitWidth = 834 ExplicitWidth = 834
ExplicitHeight = 236 ExplicitHeight = 239
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
inherited cxGridViewPROPIEDAD: TcxGridDBColumn inherited cxGridViewPROPIEDAD: TcxGridDBColumn
IsCaptionAssigned = True IsCaptionAssigned = True
@ -305,7 +305,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitTop = 24 ExplicitTop = 24
ExplicitWidth = 834 ExplicitWidth = 834
inherited TBXToolbar1: TTBXToolbar inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 753 ExplicitWidth = 665
end end
end end
inherited cxLookupComboBox1: TcxLookupComboBox inherited cxLookupComboBox1: TcxLookupComboBox
@ -326,7 +326,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 834 Width = 834
Height = 286 Height = 289
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -337,7 +337,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 834 ExplicitWidth = 834
ExplicitHeight = 286 ExplicitHeight = 289
inherited pnlSup: TPanel inherited pnlSup: TPanel
Width = 834 Width = 834
ExplicitWidth = 834 ExplicitWidth = 834
@ -347,13 +347,13 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
end end
inherited GroupBox1: TGroupBox inherited GroupBox1: TGroupBox
Width = 834 Width = 834
Height = 258 Height = 261
ExplicitWidth = 834 ExplicitWidth = 834
ExplicitHeight = 258 ExplicitHeight = 261
inherited eIncidencias: TcxDBMemo inherited eIncidencias: TcxDBMemo
ExplicitWidth = 830 ExplicitWidth = 830
ExplicitHeight = 241 ExplicitHeight = 244
Height = 241 Height = 244
Width = 830 Width = 830
end end
end end
@ -366,7 +366,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 834 Width = 834
Height = 286 Height = 289
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -377,14 +377,14 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 834 ExplicitWidth = 834
ExplicitHeight = 286 ExplicitHeight = 289
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock
Width = 834 Width = 834
ExplicitWidth = 834 ExplicitWidth = 834
end end
inherited ListView1: TListView inherited ListView1: TListView
Width = 834 Width = 834
Height = 260 Height = 266
ExplicitWidth = 834 ExplicitWidth = 834
ExplicitHeight = 266 ExplicitHeight = 266
end end

View File

@ -297,13 +297,23 @@ begin
end; end;
procedure TfEditorPresupuestoCliente.OnClienteChanged(Sender: TObject); procedure TfEditorPresupuestoCliente.OnClienteChanged(Sender: TObject);
var
APrimerCliente : Boolean;
begin begin
if Assigned(FPresupuesto) then if Assigned(FPresupuesto) then
begin begin
APrimerCliente := (FPresupuesto.Cliente.ID = 0);
FPresupuesto.Cliente := ViewPresupuesto.ViewClientePresupuesto.Cliente; FPresupuesto.Cliente := ViewPresupuesto.ViewClientePresupuesto.Cliente;
if (FPresupuesto.Detalles.RecordCount > 0) then if (not APrimerCliente) and (FPresupuesto.Detalles.RecordCount > 0) then begin
FController.DetallesController.ActualizarDetalles(FPresupuesto.Detalles, FPresupuesto.Cliente); if (ShowConfirmMessage('Actualizar los descuentos de las líneas',
'¿Desea actualizar las líneas de detalle con el descuento del cliente?' + #10#13 +
'Sólo se cambiarán las líneas que tengan cantidades.') = IDYES) then
begin
FController.DetallesController.ActualizarDetalles(FPresupuesto.Detalles, FPresupuesto.Cliente);
ShowInfoMessage('Se han actualizado las líneas con el descuento del cliente seleccionado');
end;
end;
end; end;
end; end;

View File

@ -59,6 +59,7 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
inherited cxGridViewTIPO: TcxGridDBColumn inherited cxGridViewTIPO: TcxGridDBColumn
Visible = True Visible = True
Width = 32
end end
inherited cxGridViewID_ARTICULO: TcxGridDBColumn inherited cxGridViewID_ARTICULO: TcxGridDBColumn
Width = 57 Width = 57
@ -71,13 +72,14 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
inherited cxGridViewVISIBLE: TcxGridDBColumn [5] inherited cxGridViewVISIBLE: TcxGridDBColumn [5]
Caption = #191'Valorado?' Caption = #191'Valorado?'
Visible = True Visible = True
Width = 30
end end
object cxGridViewPROPIEDAD: TcxGridDBColumn [6] object cxGridViewPROPIEDAD: TcxGridDBColumn [6]
DataBinding.FieldName = 'PROPIEDAD' DataBinding.FieldName = 'PROPIEDAD'
PropertiesClassName = 'TcxRichEditProperties' PropertiesClassName = 'TcxRichEditProperties'
OnGetPropertiesForEdit = cxGridViewPROPIEDADGetPropertiesForEdit OnGetPropertiesForEdit = cxGridViewPROPIEDADGetPropertiesForEdit
BestFitMaxWidth = 150 BestFitMaxWidth = 150
Width = 150 Width = 29
IsCaptionAssigned = True IsCaptionAssigned = True
end end
inherited cxGridViewREFERENCIA: TcxGridDBColumn [7] inherited cxGridViewREFERENCIA: TcxGridDBColumn [7]
@ -87,18 +89,18 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
end end
inherited cxGridViewDESCRIPCION: TcxGridDBColumn [9] inherited cxGridViewDESCRIPCION: TcxGridDBColumn [9]
OnGetPropertiesForEdit = cxGridViewDESCRIPCIONGetPropertiesForEdit OnGetPropertiesForEdit = cxGridViewDESCRIPCIONGetPropertiesForEdit
Width = 243 Width = 403
end end
inherited cxGridViewCANTIDAD: TcxGridDBColumn [10] inherited cxGridViewCANTIDAD: TcxGridDBColumn [10]
VisibleForCustomization = False VisibleForCustomization = False
Width = 25 Width = 41
end end
inherited cxGridViewIMPORTEUNIDAD: TcxGridDBColumn [11] inherited cxGridViewIMPORTEUNIDAD: TcxGridDBColumn [11]
VisibleForCustomization = False VisibleForCustomization = False
Width = 34 Width = 56
end end
inherited cxGridViewDESCUENTO: TcxGridDBColumn [12] inherited cxGridViewDESCUENTO: TcxGridDBColumn [12]
Width = 20 Width = 33
end end
inherited cxGridViewIMPORTENETO: TcxGridDBColumn [13] inherited cxGridViewIMPORTENETO: TcxGridDBColumn [13]
Visible = False Visible = False
@ -109,7 +111,7 @@ inherited frViewDetallesPresupuestoCliente: TfrViewDetallesPresupuestoCliente
end end
inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn [15] inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn [15]
VisibleForCustomization = False VisibleForCustomization = False
Width = 29 Width = 48
end end
end end
end end

View File

@ -84,6 +84,7 @@ type
function GetPresupuesto: IBizPresupuestoCliente; function GetPresupuesto: IBizPresupuestoCliente;
procedure SetPresupuesto(const Value: IBizPresupuestoCliente); procedure SetPresupuesto(const Value: IBizPresupuestoCliente);
procedure ValidarCantidadInterno(var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); override;
procedure AnadirArticulosInterno; override; procedure AnadirArticulosInterno; override;
procedure RellenarArticulosInterno; override; procedure RellenarArticulosInterno; override;
function AnadirArticulo(pReferencia: String; TipoReferencia: TEnumReferencia): Boolean; override; function AnadirArticulo(pReferencia: String; TipoReferencia: TEnumReferencia): Boolean; override;
@ -375,4 +376,30 @@ begin
FPresupuesto := Value; FPresupuesto := Value;
end; end;
procedure TfrViewDetallesPresupuestoCliente.ValidarCantidadInterno(
var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
begin
if not VarIsNull(FPresupuesto.Cliente.DESCUENTO_LINEA) then
begin
_FocusedView.BeginUpdate;
try
if (VarIsNull(DisplayValue)) then
begin
cxGridView.DataController.GetItemByFieldName(CAMPO_DESCUENTO).EditValue := Null;
end
else begin
if VarIsNull(cxGridView.DataController.GetItemByFieldName(CAMPO_DESCUENTO).EditValue) then
begin
if (FPresupuesto.Cliente.DESCUENTO_LINEA <> 0) then
cxGridView.DataController.GetItemByFieldName(CAMPO_DESCUENTO).EditValue := FPresupuesto.Cliente.DESCUENTO_LINEA
else
cxGridView.DataController.GetItemByFieldName(CAMPO_DESCUENTO).EditValue := NULL;
end;
end;
finally
_FocusedView.EndUpdate;
end;
end;
end;
end. end.

View File

@ -230,10 +230,6 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
Height = 224 Height = 224
ExplicitWidth = 320 ExplicitWidth = 320
ExplicitHeight = 224 ExplicitHeight = 224
inherited edtlNombre: TcxDBTextEdit
ExplicitWidth = 224
Width = 224
end
inherited edtNIFCIF: TcxDBTextEdit inherited edtNIFCIF: TcxDBTextEdit
Left = 324 Left = 324
ExplicitLeft = 324 ExplicitLeft = 324
@ -242,10 +238,6 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
Left = 235 Left = 235
ExplicitLeft = 235 ExplicitLeft = 235
end end
inherited edtPersonaContacto: TcxDBTextEdit
ExplicitWidth = 283
Width = 283
end
inherited edtDireccion: TcxMemo inherited edtDireccion: TcxMemo
ExplicitWidth = 121 ExplicitWidth = 121
Width = 121 Width = 121
@ -258,10 +250,6 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
Left = 404 Left = 404
ExplicitLeft = 404 ExplicitLeft = 404
end end
inherited edtTelefonos: TcxTextEdit
ExplicitWidth = 363
Width = 363
end
end end
end end
object memFormaPago: TcxDBMemo object memFormaPago: TcxDBMemo

View File

@ -2,14 +2,10 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
Height = 247 Height = 247
ExplicitHeight = 247 ExplicitHeight = 247
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Height = 233
ExplicitWidth = 451 ExplicitWidth = 451
ExplicitHeight = 233
inherited Bevel3: TBevel inherited Bevel3: TBevel
Top = 55 Top = 55
Height = 122
ExplicitTop = 55 ExplicitTop = 55
ExplicitHeight = 122
end end
inherited Bevel4: TBevel inherited Bevel4: TBevel
Top = 86 Top = 86
@ -34,10 +30,10 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
Width = 137 Width = 137
end end
inherited ImporteTotal: TcxDBCurrencyEdit inherited ImporteTotal: TcxDBCurrencyEdit
Top = 160 Top = 187
Style.IsFontAssigned = True Style.IsFontAssigned = True
TabOrder = 13 TabOrder = 15
ExplicitTop = 160 ExplicitTop = 187
ExplicitWidth = 137 ExplicitWidth = 137
Width = 137 Width = 137
end end
@ -62,16 +58,26 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
Width = 92 Width = 92
end end
inherited edtRE: TcxDBSpinEdit inherited edtRE: TcxDBSpinEdit
Top = 133 Top = 160
Style.IsFontAssigned = True
TabOrder = 13
ExplicitTop = 160
end
inherited edtIRPF: TcxDBSpinEdit
Style.IsFontAssigned = True Style.IsFontAssigned = True
TabOrder = 11 TabOrder = 11
ExplicitTop = 133
end end
inherited ImporteRE: TcxDBCurrencyEdit inherited ImporteRE: TcxDBCurrencyEdit
Top = 133 Top = 160
Style.IsFontAssigned = True
TabOrder = 14
ExplicitTop = 160
ExplicitWidth = 56
Width = 56
end
inherited ImporteIRPF: TcxDBCurrencyEdit
Style.IsFontAssigned = True Style.IsFontAssigned = True
TabOrder = 12 TabOrder = 12
ExplicitTop = 133
ExplicitWidth = 56 ExplicitWidth = 56
Width = 56 Width = 56
end end
@ -98,18 +104,6 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
ExplicitWidth = 81 ExplicitWidth = 81
Width = 81 Width = 81
end end
inherited bTiposIVA: TButton
Top = 136
TabOrder = 6
ExplicitTop = 136
end
inherited cbRecargoEquivalencia: TcxDBCheckBox
Top = 163
TabOrder = 7
ExplicitTop = 163
ExplicitWidth = 219
Width = 219
end
object cbValorado: TcxDBCheckBox [15] object cbValorado: TcxDBCheckBox [15]
Left = 10 Left = 10
Top = 10 Top = 10
@ -136,6 +130,18 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
TabOrder = 0 TabOrder = 0
Width = 207 Width = 207
end end
inherited bTiposIVA: TButton
Top = 136
TabOrder = 6
ExplicitTop = 136
end
inherited cbRecargoEquivalencia: TcxDBCheckBox
Top = 163
TabOrder = 7
ExplicitTop = 163
ExplicitWidth = 219
Width = 219
end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup inherited dxLayoutControl1Group_Root: TdxLayoutGroup
object cxValorado: TdxLayoutItem [0] object cxValorado: TdxLayoutItem [0]
ShowCaption = False ShowCaption = False

View File

@ -40,78 +40,6 @@
<Borland.ProjectType>Package</Borland.ProjectType> <Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject> <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="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 Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages> <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="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 Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclsmp100.bpl">Borland Sample Components</Excluded_Packages> <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclsmp100.bpl">Borland Sample Components</Excluded_Packages>
<Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dcl31w100.bpl">Delphi 1.0 Compatibility Components</Excluded_Packages> <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dcl31w100.bpl">Delphi 1.0 Compatibility Components</Excluded_Packages>
<Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclmid100.bpl">Borland MyBase DataAccess Components</Excluded_Packages> <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclmid100.bpl">Borland MyBase DataAccess Components</Excluded_Packages>
@ -155,15 +83,14 @@
<DelphiCompile Include="ConCli_AlbCli_relation.dpk"> <DelphiCompile Include="ConCli_AlbCli_relation.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="AlbaranesCliente_controller.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\AlbaranesCliente_controller.dcp" />
<DCCReference Include="AlbaranesCliente_model.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\AlbaranesCliente_model.dcp" />
<DCCReference Include="Base.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
<DCCReference Include="Contactos_controller.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_controller.dcp" />
<DCCReference Include="Contactos_model.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_model.dcp" />
<DCCReference Include="ContratosCliente_controller.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\ContratosCliente_controller.dcp" />
<DCCReference Include="ContratosCliente_model.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\ContratosCliente_model.dcp" />
<DCCReference Include="ControllerBase.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
<DCCReference Include="rtl.dcp" />
<DCCReference Include="uGenerarAlbaranesCliUtils.pas" /> <DCCReference Include="uGenerarAlbaranesCliUtils.pas" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -66,7 +66,7 @@ begin
AAlbaran.IMPORTE_TOTAL := AContrato.IMPORTE_TOTAL; AAlbaran.IMPORTE_TOTAL := AContrato.IMPORTE_TOTAL;
AAlbaran.DataTable.FieldByName(fld_AlbaranesClienteOBSERVACIONES).AsVariant := AContrato.DataTable.FieldByName(fld_ContratosClienteOBSERVACIONES).AsVariant; AAlbaran.DataTable.FieldByName(fld_AlbaranesClienteOBSERVACIONES).AsVariant := AContrato.DataTable.FieldByName(fld_ContratosClienteOBSERVACIONES).AsVariant;
AAlbaran.ID_FORMA_PAGO := AContrato.ID_FORMA_PAGO; AAlbaran.ID_FORMA_PAGO := AContrato.ID_FORMA_PAGO;
AAlbaran.REFERENCIA_CLIENTE = AContrato.REFERENCIA_CLIENTE; AAlbaran.REFERENCIA_CLIENTE := AContrato.REFERENCIA_CLIENTE;
end; end;
procedure CopiarDetallesAAlbaran( procedure CopiarDetallesAAlbaran(

View File

@ -83,13 +83,13 @@
<DelphiCompile Include="PreCli_ConCli_relation.dpk"> <DelphiCompile Include="PreCli_ConCli_relation.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\..\Presupuestos de cliente\Views\Base.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\Views\Contactos_controller.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_controller.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\Views\Contactos_model.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_model.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\Views\ContratosCliente_controller.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\ContratosCliente_controller.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\Views\ContratosCliente_model.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\ContratosCliente_model.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\Views\PresupuestosCliente_controller.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\PresupuestosCliente_controller.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\Views\PresupuestosCliente_model.dcp" /> <DCCReference Include="C:\Documents and Settings\Usuario\PresupuestosCliente_model.dcp" />
<DCCReference Include="uGenerarContratosCliUtils.pas"> <DCCReference Include="uGenerarContratosCliUtils.pas">
<Form>dmGenerarContratosCli</Form> <Form>dmGenerarContratosCli</Form>
</DCCReference> </DCCReference>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.