Uecko/AbetoDesign_FactuGES2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Se añade PRECIO_PUNTO a ficha cliente, se adaptan informes y se añaden pedidos a proveedor

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.AbetoDesign_FactuGES/trunk@158 93f398dd-4eb6-7a46-baf6-13f46f578da2
This commit is contained in:
roberto 2022-03-12 10:40:36 +00:00
parent 7d913cce91
commit 80e2878fd5
228 changed files with 4826 additions and 2425 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/ApplicationBase/Configuracion/Controller/uConfiguracionController.pas
View File

@ -5,11 +5,9 @@ interface
uses
Classes, SysUtils, uDADataTable, uControllerBase, uIViewConfiguracionBase,
uViewConfiguracionBase, uClassRegistryUtils, JvAppXMLStorage,
uROTypes, uDataModuleConfiguracion;
uROTypes, uDataModuleConfiguracion, uTypesConstConfiguration;
type
TEnumAlmacen = (teXML, teBD);
IPluginConfigurable = interface
['{30063608-BFD2-47B9-80FA-F10A5067AF82}']
function GetVistaConfiguracion : TClass;

15
Source/ApplicationBase/Configuracion/Views/uViewConfiguracionBase.dfm
View File

@ -1,16 +1,18 @@
object frViewConfiguracionBase: TfrViewConfiguracionBase
Left = 0
Top = 0
Width = 451
Height = 304
Width = 729
Height = 506
Align = alClient
AutoScroll = True
TabOrder = 0
ExplicitWidth = 451
ExplicitHeight = 304
object Panel1: TPanel
AlignWithMargins = True
Left = 5
Top = 46
Width = 441
Width = 719
Height = 22
Margins.Left = 5
Margins.Top = 0
@ -34,19 +36,21 @@ object frViewConfiguracionBase: TfrViewConfiguracionBase
ParentBackground = False
ParentFont = False
TabOrder = 0
ExplicitWidth = 441
object Label3: TLabel
Left = 6
Top = 4
Width = 85
Width = 707
Height = 14
Align = alTop
Caption = 'Configuraci'#243'n'
ExplicitWidth = 85
end
end
object JvGradientHeaderPanel1: TJvGradientHeaderPanel
Left = 0
Top = 0
Width = 451
Width = 729
Height = 46
GradientStartColor = clInactiveCaptionText
GradientEndColor = clNone
@ -65,5 +69,6 @@ object frViewConfiguracionBase: TfrViewConfiguracionBase
BevelOuter = bvNone
DoubleBuffered = True
TabOrder = 1
ExplicitWidth = 451
end
end

29
Source/ApplicationBase/Configuracion/Views/uViewConfiguracionGeneral.dfm
View File

@ -1,19 +1,24 @@
inherited frViewConfiguracionGeneral: TfrViewConfiguracionGeneral
ExplicitWidth = 859
ExplicitHeight = 433
inherited Panel1: TPanel
Width = 424
Width = 849
ExplicitWidth = 422
inherited Label3: TLabel
Width = 63
Caption = 'Apariencia'
ExplicitWidth = 63
end
end
inherited JvGradientHeaderPanel1: TJvGradientHeaderPanel
Width = 434
Width = 859
ExplicitWidth = 432
end
object Panel2: TPanel
AlignWithMargins = True
Left = 5
Top = 142
Width = 424
Width = 849
Height = 22
Margins.Left = 5
Margins.Top = 0
@ -37,21 +42,21 @@ inherited frViewConfiguracionGeneral: TfrViewConfiguracionGeneral
ParentBackground = False
ParentFont = False
TabOrder = 2
ExplicitWidth = 422
object Label2: TLabel
Left = 6
Top = 4
Width = 412
Width = 62
Height = 14
Align = alTop
Caption = 'Seguridad'
ExplicitWidth = 62
end
end
object Panel3: TPanel
AlignWithMargins = True
Left = 5
Top = 68
Width = 424
Width = 849
Height = 74
Margins.Left = 5
Margins.Top = 0
@ -61,6 +66,7 @@ inherited frViewConfiguracionGeneral: TfrViewConfiguracionGeneral
BevelOuter = bvNone
ParentColor = True
TabOrder = 3
ExplicitWidth = 422
object Label1: TLabel
Left = 17
Top = 14
@ -75,7 +81,7 @@ inherited frViewConfiguracionGeneral: TfrViewConfiguracionGeneral
Width = 202
Height = 21
Style = csDropDownList
ItemHeight = 13
ItemHeight = 0
TabOrder = 0
Visible = False
end
@ -92,7 +98,7 @@ inherited frViewConfiguracionGeneral: TfrViewConfiguracionGeneral
AlignWithMargins = True
Left = 5
Top = 164
Width = 424
Width = 422
Height = 72
Margins.Left = 5
Margins.Top = 0
@ -140,7 +146,7 @@ inherited frViewConfiguracionGeneral: TfrViewConfiguracionGeneral
AlignWithMargins = True
Left = 5
Top = 236
Width = 424
Width = 422
Height = 22
Margins.Left = 5
Margins.Top = 0
@ -167,18 +173,17 @@ inherited frViewConfiguracionGeneral: TfrViewConfiguracionGeneral
object Label5: TLabel
Left = 6
Top = 4
Width = 412
Width = 51
Height = 14
Align = alTop
Caption = 'Usuarios'
ExplicitWidth = 51
end
end
object Panel6: TPanel
AlignWithMargins = True
Left = 5
Top = 258
Width = 424
Width = 422
Height = 72
Margins.Left = 5
Margins.Top = 0

9
Source/ApplicationBase/Configuracion/Views/uViewConfiguracionGeneral.pas
View File

@ -5,12 +5,7 @@ interface
uses
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs, uViewConfiguracionBase, StdCtrls, ExtCtrls, dxGDIPlusClasses,
JvExControls, JvGradientHeaderPanel, Mask,
JvExControls, JvGradientHeaderPanel, Mask, uDataModuleConfiguracion,
cxControls, cxContainer, cxEdit, cxTextEdit, cxMaskEdit,
cxSpinEdit;
@ -44,7 +39,7 @@ type
implementation
uses
uFactuGES_App, uDMBase, uConfiguracionController;
uFactuGES_App, uDMBase, uTypesConstConfiguration;
{$R *.dfm}

2
Source/ApplicationBase/Empresas/Model/uBizEmpresas.pas
View File

@ -69,7 +69,7 @@ implementation
uses
uDataTableUtils, DateUtils, SysUtils, Dialogs,
uFactuGES_App, uConfiguracionController;
uFactuGES_App, uTypesConstConfiguration;
{ TBizEmpresa }

3
Source/ApplicationBase/Usuarios/Controller/uUsuariosController.pas
View File

@ -175,7 +175,8 @@ uses
uDAInterfaces, uDataTableUtils, uDialogUtils, uFactuGES_App, Dialogs,
uDateUtils, uROTypes, DateUtils, Controls, Windows, uIEditorLogin,
uIEditorUsuarios, uIEditorUsuario, uIEditorPerfilesUsuario,
uIEditorPerfilUsuario, uEditorCambiarPassword, uConfiguracionController;
uIEditorPerfilUsuario, uEditorCambiarPassword, uTypesConstConfiguration,
uDataModuleConfiguracion;
{ TUsuariosController }

1
Source/ApplicationBase/uFactuGES_App.pas
View File

@ -10,6 +10,7 @@ uses
const
CTE_PERFIL_ADMINISTRADOR = 3;
CTE_PERFIL_VENDEDOR = 7;
CTE_PERFIL_COMPRAS = 8;
CTE_PERFIL_USUARIO = 5;
type

3
Source/Base/Base.dpk
View File

@ -108,7 +108,8 @@ contains
uEMailUtils in 'Utiles\uEMailUtils.pas',
IBANMetrics in 'Utiles\TIBAN\IBANMetrics.pas',
IBAN in 'Utiles\TIBAN\IBAN.pas',
uIBANUtils in 'Utiles\uIBANUtils.pas';
uIBANUtils in 'Utiles\uIBANUtils.pas',
uTypesConstConfiguration in 'Configuracion\uTypesConstConfiguration.pas';
end.

118
Source/Base/Base.dproj
View File

@ -51,6 +51,27 @@
<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>
@ -65,55 +86,55 @@
<DelphiCompile Include="Base.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\Modulos\Inventario\adortl.dcp" />
<DCCReference Include="..\Modulos\Inventario\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\cxGridD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\cxPageControlD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Inventario\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Inventario\dclIndyCore.dcp" />
<DCCReference Include="..\Modulos\Inventario\designide.dcp" />
<DCCReference Include="..\Modulos\Inventario\dsnap.dcp" />
<DCCReference Include="..\Modulos\Inventario\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\dxPSCoreD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Inventario\GUISDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Inventario\IndyCore.dcp" />
<DCCReference Include="..\Modulos\Inventario\IndyProtocols.dcp" />
<DCCReference Include="..\Modulos\Inventario\IndySystem.dcp" />
<DCCReference Include="..\Modulos\Inventario\Jcl.dcp" />
<DCCReference Include="..\Modulos\Inventario\JclVcl.dcp" />
<DCCReference Include="..\Modulos\Inventario\JSDialog100.dcp" />
<DCCReference Include="..\Modulos\Inventario\JvCmpD11R.dcp" />
<DCCReference Include="..\Modulos\Inventario\JvCoreD11R.dcp" />
<DCCReference Include="..\Modulos\Inventario\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Inventario\JvDlgsD11R.dcp" />
<DCCReference Include="..\Modulos\Inventario\JvMMD11R.dcp" />
<DCCReference Include="..\Modulos\Inventario\JvNetD11R.dcp" />
<DCCReference Include="..\Modulos\Inventario\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Modulos\Inventario\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Inventario\JvSystemD11R.dcp" />
<DCCReference Include="..\Modulos\Inventario\pckMD5.dcp" />
<DCCReference Include="..\Modulos\Inventario\pckUCDataConnector.dcp" />
<DCCReference Include="..\Modulos\Inventario\pckUserControl_RT.dcp" />
<DCCReference Include="..\Modulos\Inventario\PluginSDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Inventario\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Inventario\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Inventario\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Inventario\rtl.dcp" />
<DCCReference Include="..\Modulos\Inventario\TB2k_D10.dcp" />
<DCCReference Include="..\Modulos\Inventario\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Inventario\vcl.dcp" />
<DCCReference Include="..\Modulos\Inventario\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Inventario\vcldb.dcp" />
<DCCReference Include="..\Modulos\Inventario\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Inventario\VclSmp.dcp" />
<DCCReference Include="..\Modulos\Inventario\vclx.dcp" />
<DCCReference Include="..\Modulos\Inventario\xmlrtl.dcp" />
<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">
<Form>fConfigurarConexion</Form>
<DesignClass>TForm</DesignClass>
@ -126,6 +147,7 @@
<Form>dmConfiguracion</Form>
<DesignClass>TDataModule</DesignClass>
</DCCReference>
<DCCReference Include="Configuracion\uTypesConstConfiguration.pas" />
<DCCReference Include="Controladores\uControllerBase.pas" />
<DCCReference Include="Controladores\uControllerDetallesBase.pas" />
<DCCReference Include="schBase_Intf.pas" />

2
Source/Base/Controladores/uControllerDetallesBase.pas
View File

@ -842,6 +842,8 @@ begin
FieldByName(CAMPO_CANTIDAD).AsVariant := Null;
FieldByName(CAMPO_IMPORTE_UNIDAD).AsVariant := Null;
FieldByName(CAMPO_IMPORTE_TOTAL).AsVariant := Null;
FieldByName(CAMPO_INCREMENTO).AsVariant := Null;
FieldByName(CAMPO_DECREMENTO).AsVariant := Null;
FieldByName(CAMPO_DESCUENTO).AsVariant := Null;
FieldByName(CAMPO_IMPORTE_PORTE).AsVariant := Null;

60
Source/Base/Utiles/uCalculosUtils.pas
View File

@ -15,6 +15,8 @@ const
CAMPO_IMPORTE_UNIDAD = 'IMPORTE_UNIDAD';
CAMPO_IMPORTE_TOTAL = 'IMPORTE_TOTAL';
CAMPO_DESCUENTO = 'DESCUENTO';
CAMPO_INCREMENTO = 'INCREMENTO';
CAMPO_DECREMENTO = 'DECREMENTO';
CAMPO_IMPORTE_PORTE = 'IMPORTE_PORTE';
CAMPO_VISIBLE = 'VISIBLE';
CAMPO_VALORADO = 'VALORADO';
@ -25,27 +27,65 @@ const
procedure DesglosarPorte(ImportePorte: Currency; ADetalles: IDAStronglyTypedDataTable);
function DarTotalPorte(ADetalles: IDAStronglyTypedDataTable): Double;
function CalcularImporteNeto (const ImporteUnidad: Double = 0; const Incremento: Double = 0; const Decremento: Double = 0): Double;
implementation
uses
SysUtils, DB, Variants, cxControls;
SysUtils, DB, Variants, cxControls, uNumUtils;
function CalcularImporteNeto (const ImporteUnidad: Double = 0; const Incremento: Double = 0; const Decremento: Double = 0): Double;
var
ValorAIncrementar: Double;
ImporteNeto1: Double;
ValorADecrementar: Double;
begin
//Se solicita cambio de calculo 06/10/2021 po Mónica
//Importe-unidad(100) incremento(10%) valor_a_incrementar (10) = Importe_neto1(110)
//Importe_neto1(110) decremento(10%) valor_a_decrementar(11) = Importe_neto2(99)
ValorAIncrementar := ImporteUnidad * (Incremento/100);
ImporteNeto1 := ImporteUnidad + ValorAIncrementar;
ValorADecrementar := ImporteNeto1 * (Decremento/100);
Result := RoundCurrency((ImporteNeto1 - ValorADecrementar));
end;
function CalcularLineaConcepto (const ADataTable : TDADataTable): Double;
var
ImporteTotal : Double;
AField: TDAField;
ImporteTotal, ImporteNeto, Incremento, Decremento, Descuento, ImportePorte : Double;
begin
with ADataTable do
begin
if (VarIsNull(FieldByName(CAMPO_DESCUENTO).AsVariant)) then
ImporteTotal := FieldByName(CAMPO_CANTIDAD).asFloat * FieldByName(CAMPO_IMPORTE_UNIDAD).AsFloat
else
ImporteTotal := FieldByName(CAMPO_CANTIDAD).asFloat * (FieldByName(CAMPO_IMPORTE_UNIDAD).AsFloat - (FieldByName(CAMPO_IMPORTE_UNIDAD).AsFloat * (FieldByName(CAMPO_DESCUENTO).AsFloat/100)));
Incremento := 0;
Decremento := 0;
Descuento := 0;
ImportePorte := 0;
ImporteNeto := FieldByName(CAMPO_IMPORTE_UNIDAD).AsFloat;
if (VarIsNull(FieldByName(CAMPO_IMPORTE_PORTE).AsVariant)) then
ImporteTotal := ImporteTotal
else
ImporteTotal := ImporteTotal + (FieldByName(CAMPO_CANTIDAD).asFloat * FieldByName(CAMPO_IMPORTE_PORTE).AsFloat);
//Validamos la existencia del campo incremento, por si no está activo en otros módulos que no sean (presupuestos y contratos)
AField := FindField(CAMPO_INCREMENTO);
if Assigned(AField) then
if (not VarIsNull(AField.AsVariant)) then
Incremento := AField.AsFloat;
//Validamos la existencia del campo decremento, por si no está activo en otros módulos que no sean (presupuestos y contratos)
AField := FindField(CAMPO_DECREMENTO);
if Assigned(AField) then
if (not VarIsNull(AField.AsVariant)) then
Decremento := AField.AsFloat;
ImporteNeto := CalcularImporteNeto(ImporteNeto, Incremento, Decremento);
if (not VarIsNull(FieldByName(CAMPO_DESCUENTO).AsVariant)) then
Descuento := ImporteNeto * (FieldByName(CAMPO_DESCUENTO).AsFloat/100);
if (not VarIsNull(FieldByName(CAMPO_IMPORTE_PORTE).AsVariant)) then
ImportePorte := FieldByName(CAMPO_CANTIDAD).asFloat * FieldByName(CAMPO_IMPORTE_PORTE).AsFloat;
ImporteTotal := (RoundCurrency(ImporteNeto - Descuento) * FieldByName(CAMPO_CANTIDAD).asFloat) + ImportePorte;
end;
Result := ImporteTotal;

2
Source/Cliente/FactuGES.dproj
View File

@ -51,7 +51,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
<BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">3</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">5</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">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">3.0.5.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.0.5.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><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">3</VersionInfo><VersionInfo Name="MinorVer">5</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">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">3.5.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">3.5.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\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>

BIN
Source/Cliente/FactuGES.res
View File

Binary file not shown.

1
Source/Cliente/uBootStrap.pas
View File

@ -25,6 +25,7 @@ begin
// LoadModule('TiposVenta_plugin.bpl');
LoadModule('FormasPago_plugin.bpl');
LoadModule('TiposIVA_plugin.bpl');
LoadModule('TiposOperacionCompra_plugin.bpl');
LoadModule('Contactos_plugin.bpl');
{$IFDEF ALMACEN}

16
Source/Cliente/uPantallaPrincipal.pas
View File

@ -204,14 +204,30 @@ begin
Contabilidad1.Visible := False;
Compras1.Enabled := False;
Compras1.Visible := False;
Logistica1.Enabled := False;
Logistica1.Visible := False;
end
//El usuario normal de uecko solo no verá los bancos
else if (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_USUARIO) then
begin
Informes1.Enabled := False;
Informes1.Visible := False;
Contabilidad1.Enabled := False;
Contabilidad1.Visible := False;
end;
//El usuario COMPRAS
if (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_COMPRAS) then
begin
Informes1.Enabled := False;
Informes1.Visible := False;
Contabilidad1.Enabled := False;
Contabilidad1.Visible := False;
Ventas1.Enabled := False;
Ventas1.Visible := False;
end;
InicializarUI;
//Solo verá administracion de usuarios el perfil Administrador(3), están en la tabla usuarios

56
Source/GUIBase/GUIBase.dproj
View File

@ -58,34 +58,34 @@
<DelphiCompile Include="GUIBase.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\Modulos\Contratos de cliente\Views\Base.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\ccpackD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\cxExportD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\dxLayoutControlD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\dxPScxCommonD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\dxPScxGrid6LnkD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\frx11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\frxe11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\fs11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\JvAppFrmD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\JvGlobusD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\rtl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\tb2k_d10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\vcl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\vcldb.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Views\vclx.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\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\dbrtl.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\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="uDialogBase.pas">
<Form>fDialogBase</Form>
</DCCReference>

70
Source/GUIBase/uViewDetallesBase.dfm
View File

@ -1,6 +1,6 @@
inherited frViewDetallesBase: TfrViewDetallesBase
Width = 451
Height = 304
Width = 707
Height = 421
Align = alClient
OnCreate = CustomViewCreate
OnDestroy = CustomViewDestroy
@ -9,8 +9,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase
object ToolBar1: TToolBar
Left = 0
Top = 0
Width = 451
Height = 46
Width = 707
Height = 24
AutoSize = True
ButtonWidth = 63
Caption = 'ToolBar1'
@ -25,6 +25,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase
TabOrder = 0
Transparent = True
Visible = False
ExplicitWidth = 451
ExplicitHeight = 46
object ToolButton1: TToolButton
Left = 0
Top = 0
@ -54,11 +56,10 @@ inherited frViewDetallesBase: TfrViewDetallesBase
Top = 0
Action = FontEdit1
AutoSize = True
Wrap = True
end
object FontName: TJvFontComboBox
Left = 0
Top = 22
Left = 274
Top = 0
Width = 145
Height = 22
DroppedDownWidth = 145
@ -73,8 +74,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase
OnClick = FontNameChange
end
object FontSize: TEdit
Left = 145
Top = 22
Left = 419
Top = 0
Width = 26
Height = 22
Hint = 'Font Size|Select font size'
@ -84,8 +85,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase
OnChange = FontSizeChange
end
object UpDown1: TUpDown
Left = 171
Top = 22
Left = 445
Top = 0
Width = 16
Height = 22
Associate = FontSize
@ -93,67 +94,70 @@ inherited frViewDetallesBase: TfrViewDetallesBase
Visible = False
end
object ToolButton13: TToolButton
Left = 187
Top = 22
Left = 461
Top = 0
Width = 8
Caption = 'ToolButton13'
ImageIndex = 10
Style = tbsSeparator
end
object ToolButton6: TToolButton
Left = 195
Top = 22
Left = 469
Top = 0
Action = RichEditBold1
AutoSize = True
end
object ToolButton7: TToolButton
Left = 229
Top = 22
Left = 503
Top = 0
Action = RichEditItalic1
AutoSize = True
end
object ToolButton8: TToolButton
Left = 263
Top = 22
Left = 537
Top = 0
Action = RichEditUnderline1
AutoSize = True
end
object ToolButton12: TToolButton
Left = 297
Top = 22
Left = 571
Top = 0
Width = 8
Caption = 'ToolButton12'
ImageIndex = 10
Style = tbsSeparator
end
object ToolButton9: TToolButton
Left = 305
Top = 22
Left = 579
Top = 0
Action = RichEditAlignLeft1
AutoSize = True
end
object ToolButton10: TToolButton
Left = 339
Top = 22
Left = 613
Top = 0
Action = RichEditAlignCenter1
AutoSize = True
end
object ToolButton11: TToolButton
Left = 373
Top = 22
Left = 647
Top = 0
Action = RichEditAlignRight1
AutoSize = True
end
end
object cxGrid: TcxGrid
Left = 0
Top = 72
Width = 451
Height = 232
Top = 50
Width = 707
Height = 371
Align = alClient
TabOrder = 1
LookAndFeel.Kind = lfStandard
LookAndFeel.NativeStyle = True
ExplicitTop = 72
ExplicitWidth = 451
ExplicitHeight = 232
object cxGridView: TcxGridDBTableView
OnKeyDown = cxGridViewKeyDown
NavigatorButtons.ConfirmDelete = False
@ -386,11 +390,13 @@ inherited frViewDetallesBase: TfrViewDetallesBase
end
object TBXDock1: TTBXDock
Left = 0
Top = 46
Width = 451
Top = 24
Width = 707
Height = 26
BackgroundOnToolbars = False
UseParentBackground = True
ExplicitTop = 46
ExplicitWidth = 451
object TBXToolbar1: TTBXToolbar
Left = 0
Top = 0

57
Source/GUIBase/uViewDetallesDTO.dfm
View File

@ -24,16 +24,28 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO
end
inherited cxGrid: TcxGrid
inherited cxGridView: TcxGridDBTableView
object cxGridViewDESCUENTO: TcxGridDBColumn [6]
Caption = 'Dto'
DataBinding.FieldName = 'DESCUENTO'
object cxGridViewINCREMENTO: TcxGridDBColumn [6]
Caption = 'Incremento'
PropertiesClassName = 'TcxCurrencyEditProperties'
Properties.Alignment.Horz = taRightJustify
Properties.DisplayFormat = ',0.00 %;-,0.00 %'
Properties.EditFormat = ',0.00;-,0.00'
Properties.MaxValue = 100.000000000000000000
Properties.ReadOnly = False
Visible = False
VisibleForCustomization = False
end
object cxGridViewIMPORTENETO: TcxGridDBColumn [7]
object cxGridViewDECREMENTO: TcxGridDBColumn [7]
Caption = 'Decremento'
PropertiesClassName = 'TcxCurrencyEditProperties'
Properties.Alignment.Horz = taRightJustify
Properties.DisplayFormat = ',0.00 %;-,0.00 %'
Properties.EditFormat = ',0.00;-,0.00'
Properties.ReadOnly = False
Visible = False
HeaderAlignmentHorz = taRightJustify
VisibleForCustomization = False
end
object cxGridViewIMPORTENETO: TcxGridDBColumn [8]
Caption = 'Importe neto'
DataBinding.ValueType = 'Currency'
PropertiesClassName = 'TcxCurrencyEditProperties'
@ -42,11 +54,36 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO
Properties.EditFormat = ',0.00 '#8364';-,0.00 '#8364
Properties.ReadOnly = True
Properties.OnValidate = cxGridViewIMPORTENETOPropertiesValidate
Visible = False
OnGetDisplayText = cxGridViewIMPORTENETOGetDisplayText
HeaderAlignmentHorz = taRightJustify
Options.Editing = False
VisibleForCustomization = False
end
object cxGridViewIMPORTEPORTE: TcxGridDBColumn [8]
object cxGridViewDESCUENTO: TcxGridDBColumn [9]
Caption = 'Dto'
DataBinding.FieldName = 'DESCUENTO'
PropertiesClassName = 'TcxCurrencyEditProperties'
Properties.Alignment.Horz = taRightJustify
Properties.DisplayFormat = ',0.00 %;-,0.00 %'
Properties.EditFormat = ',0.00;-,0.00'
Properties.MaxValue = 100.000000000000000000
end
object cxGridViewIMP_UNIDAD_DTO: TcxGridDBColumn [10]
Caption = 'Importe u. con dto'
DataBinding.ValueType = 'Currency'
PropertiesClassName = 'TcxCurrencyEditProperties'
Properties.Alignment.Horz = taRightJustify
Properties.DecimalPlaces = 2
Properties.DisplayFormat = ',0.00 '#8364';-,0.00 '#8364
Properties.EditFormat = ',0.00 '#8364';-,0.00 '#8364
Properties.ReadOnly = True
OnGetDisplayText = cxGridViewIMP_UNIDAD_DTOGetDisplayText
GroupSummaryAlignment = taRightJustify
HeaderAlignmentHorz = taRightJustify
Options.Editing = False
end
object cxGridViewIMPORTEPORTE: TcxGridDBColumn [11]
Caption = 'Importe porte'
DataBinding.FieldName = 'IMPORTE_PORTE'
PropertiesClassName = 'TcxCurrencyEditProperties'
@ -54,11 +91,9 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO
Properties.EditFormat = ',0.00 '#8364';-,0.00 '#8364
HeaderAlignmentHorz = taRightJustify
end
end
end
inherited TBXDock1: TTBXDock
inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 447
inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn
Properties.EditFormat = ',0.00 '#8364';-,0.00 '#8364
end
end
end
inherited ActionListContenido: TActionList

68
Source/GUIBase/uViewDetallesDTO.pas
View File

@ -21,10 +21,16 @@ type
cxGridViewDESCUENTO: TcxGridDBColumn;
cxGridViewIMPORTEPORTE: TcxGridDBColumn;
cxGridViewIMPORTENETO: TcxGridDBColumn;
cxGridViewDECREMENTO: TcxGridDBColumn;
cxGridViewINCREMENTO: TcxGridDBColumn;
cxGridViewIMP_UNIDAD_DTO: TcxGridDBColumn;
procedure cxGridViewIMPORTENETOGetDisplayText(Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
var AText: string);
procedure cxGridViewIMPORTENETOPropertiesValidate(Sender: TObject;
var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
procedure cxGridViewIMP_UNIDAD_DTOGetDisplayText(
Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
var AText: string);
protected
function HayQueRecalcular(AItem: TcxCustomGridTableItem): Boolean; override;
end;
@ -32,21 +38,33 @@ type
implementation
{$R *.dfm}
uses uNumUtils, uCalculosUtils;
{ TfrViewDetallesDTO }
procedure TfrViewDetallesDTO.cxGridViewIMPORTENETOGetDisplayText(Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
var AText: string);
var
ImporteNeto : Double;
ImporteNeto, Incremento, Decremento : Double;
begin
//Se encarga de mostrar el campo calculado de importe neto
ImporteNeto := -1;
Incremento := 0;
Decremento := 0;
if not VarIsNull(ARecord.Values[cxGridViewIMPORTEUNIDAD.Index]) then
if not VarIsNull(ARecord.Values[cxGridViewDESCUENTO.Index]) then
ImporteNeto := ARecord.Values[cxGridViewIMPORTEUNIDAD.Index] - ((ARecord.Values[cxGridViewIMPORTEUNIDAD.Index] * ARecord.Values[cxGridViewDESCUENTO.Index])/100)
else
ImporteNeto := ARecord.Values[cxGridViewIMPORTEUNIDAD.Index];
begin
ImporteNeto := ARecord.Values[cxGridViewIMPORTEUNIDAD.Index];
if not VarIsNull(ARecord.Values[cxGridViewINCREMENTO.Index]) then
Incremento := ARecord.Values[cxGridViewINCREMENTO.Index];
if not VarIsNull(ARecord.Values[cxGridViewDECREMENTO.Index]) then
Decremento := ARecord.Values[cxGridViewDECREMENTO.Index];
ImporteNeto := CalcularImporteNeto(ARecord.Values[cxGridViewIMPORTEUNIDAD.Index], Incremento, Decremento);
end;
if (ImporteNeto <> -1) then
begin
@ -58,18 +76,54 @@ procedure TfrViewDetallesDTO.cxGridViewIMPORTENETOPropertiesValidate(Sender: TOb
var Error: Boolean);
begin
inherited;
if not VarIsNull(DisplayValue) then
{ if not VarIsNull(DisplayValue) then
begin
cxGridViewDESCUENTO.DataBinding.Field.Value := ((cxGridViewIMPORTEUNIDAD.DataBinding.Field.Value - DisplayValue) * 100) / cxGridViewIMPORTEUNIDAD.DataBinding.Field.Value;
Controller.ActualizarTotales(Detalles);
end;
}
end;
procedure TfrViewDetallesDTO.cxGridViewIMP_UNIDAD_DTOGetDisplayText( Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
var AText: string);
var
ImporteUnidadDTO, ImporteNeto, Incremento, Decremento, Descuento : Double;
begin
//Se encarga de mostrar el campo calculado de importe neto
ImporteNeto := -1;
Incremento := 0;
Decremento := 0;
Descuento := 0;
if not VarIsNull(ARecord.Values[cxGridViewIMPORTEUNIDAD.Index]) then
begin
if not VarIsNull(ARecord.Values[cxGridViewINCREMENTO.Index]) then
Incremento := ARecord.Values[cxGridViewINCREMENTO.Index];
if not VarIsNull(ARecord.Values[cxGridViewDECREMENTO.Index]) then
Decremento := ARecord.Values[cxGridViewDECREMENTO.Index];
ImporteNeto := CalcularImporteNeto(ARecord.Values[cxGridViewIMPORTEUNIDAD.Index], Incremento, Decremento);
if not VarIsNull(ARecord.Values[cxGridViewDESCUENTO.Index]) then
Descuento := ImporteNeto * (ARecord.Values[cxGridViewDESCUENTO.Index]/100);
ImporteUnidadDTO := RoundCurrency(ImporteNeto - Descuento);
end;
if (Descuento <> 0) then
begin
AText := FormatCurr(',0.00 €;-,0.00 €', FloatToCurr(ImporteUnidadDTO))
end;
end;
function TfrViewDetallesDTO.HayQueRecalcular(AItem: TcxCustomGridTableItem): Boolean;
begin
Result := inherited HayQueRecalcular(AItem);
if not Result then
Result := (AItem = cxGridViewDESCUENTO) or (AItem = cxGridViewIMPORTEPORTE);
Result := (AItem = cxGridViewINCREMENTO) or (AItem = cxGridViewDECREMENTO) or (AItem = cxGridViewDESCUENTO) or (AItem = cxGridViewIMPORTEPORTE);
end;
end.

64
Source/GUIBase/uViewFiltroBase.dfm
View File

@ -1,9 +1,9 @@
inherited frViewFiltroBase: TfrViewFiltroBase
Width = 565
Height = 102
Width = 612
Height = 123
Visible = False
ExplicitWidth = 565
ExplicitHeight = 102
ExplicitWidth = 612
ExplicitHeight = 123
object TBXDockablePanel1: TTBXDockablePanel
Left = 0
Top = 0
@ -22,7 +22,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase
object dxLayoutControl1: TdxLayoutControl
Left = 0
Top = 0
Width = 565
Width = 612
Height = 68
Align = alTop
ParentBackground = True
@ -72,11 +72,11 @@ inherited frViewFiltroBase: TfrViewFiltroBase
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 1
TabOrder = 2
Width = 121
end
object edtFechaFinFiltro: TcxDateEdit
Left = 350
Left = 379
Top = 37
Properties.OnChange = OnCamposFiltroChange
Style.BorderColor = clWindowFrame
@ -96,17 +96,53 @@ inherited frViewFiltroBase: TfrViewFiltroBase
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 2
TabOrder = 3
Width = 121
end
object txtFiltroTodo2: TcxTextEdit
Left = 267
Top = 10
Properties.OnChange = OnCamposFiltroChange
Style.BorderColor = clWindowFrame
Style.BorderStyle = ebs3D
Style.HotTrack = False
Style.LookAndFeel.Kind = lfStandard
Style.LookAndFeel.NativeStyle = True
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.Kind = lfStandard
StyleDisabled.LookAndFeel.NativeStyle = True
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.Kind = lfStandard
StyleFocused.LookAndFeel.NativeStyle = True
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True
StyleHot.LookAndFeel.SkinName = ''
TabOrder = 1
Width = 468
end
object dxLayoutControl1Group_Root: TdxLayoutGroup
ShowCaption = False
Hidden = True
ShowBorder = False
object dxLayoutControl1Item1: TdxLayoutItem
Caption = 'Que contenga:'
Control = txtFiltroTodo
ControlOptions.ShowBorder = False
object dxLayoutControl1Group2: TdxLayoutGroup
ShowCaption = False
Hidden = True
LayoutDirection = ldHorizontal
ShowBorder = False
object dxLayoutControl1Item1: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Caption = 'Que contenga:'
Control = txtFiltroTodo
ControlOptions.ShowBorder = False
end
object dxLayoutControl1Item4: TdxLayoutItem
AutoAligns = [aaVertical]
AlignHorz = ahClient
Control = txtFiltroTodo2
ControlOptions.ShowBorder = False
end
end
object dxLayoutControl1Group1: TdxLayoutGroup
ShowCaption = False
@ -133,7 +169,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase
object TBXAlignmentPanel1: TTBXAlignmentPanel
Left = 0
Top = 68
Width = 565
Width = 612
Height = 30
Margins.Left = 10
Align = alTop
@ -141,7 +177,7 @@ inherited frViewFiltroBase: TfrViewFiltroBase
object tbxBotones: TTBXToolbar
Left = 10
Top = 0
Width = 555
Width = 602
Height = 30
Align = alTop
AutoResize = False

21
Source/GUIBase/uViewFiltroBase.pas
View File

@ -24,6 +24,10 @@ type
function GetTexto: String;
procedure SetTexto(const Value: String);
property Texto: String read GetTexto write SetTexto;
function GetTexto2: String;
procedure SetTexto2(const Value: String);
property Texto2: String read GetTexto2 write SetTexto2;
end;
TfrViewFiltroBase = class(TfrViewBase, IViewFiltroBase)
@ -44,6 +48,9 @@ type
tbxBotones: TTBXToolbar;
TBXItem2: TTBXItem;
TBXAlignmentPanel1: TTBXAlignmentPanel;
dxLayoutControl1Item4: TdxLayoutItem;
txtFiltroTodo2: TcxTextEdit;
dxLayoutControl1Group2: TdxLayoutGroup;
procedure OnCamposFiltroChange(Sender: TObject);
procedure actQuitarFiltroExecute(Sender: TObject);
@ -56,6 +63,8 @@ type
procedure SetVerFiltros(const Value: Boolean);
function GetTexto: String;
procedure SetTexto(const Value: String);
function GetTexto2: String;
procedure SetTexto2(const Value: String);
protected
procedure LimpiarCampos; virtual;
@ -67,6 +76,7 @@ type
property OnFiltrosChange: TNotifyEvent read GetFiltrosChange write SetFiltrosChange;
property VerFiltros: Boolean read GetVerFiltros write SetVerFiltros;
property Texto: String read GetTexto write SetTexto;
property Texto2: String read GetTexto2 write SetTexto2;
end;
implementation
@ -106,6 +116,7 @@ end;
procedure TfrViewFiltroBase.LimpiarCampos;
begin
txtFiltroTodo.Clear;
// txtFiltroTodo2.Clear;
edtFechaIniFiltro.Clear;
edtFechaFinFiltro.Clear;
end;
@ -144,9 +155,19 @@ begin
Result := txtFiltroTodo.Text;
end;
function TfrViewFiltroBase.GetTexto2: String;
begin
// Result := txtFiltroTodo2.Text;
end;
procedure TfrViewFiltroBase.SetTexto(const Value: String);
begin
txtFiltroTodo.Text := Value;
end;
procedure TfrViewFiltroBase.SetTexto2(const Value: String);
begin
txtFiltroTodo.Text := Value;
end;
end.

68
Source/GUIBase/uViewGridBase.pas
View File

@ -87,9 +87,11 @@ type
private
FViewFiltros: IViewFiltroBase;
FFilter: string;
FFilter2: string;
FOnFilterChanged : TNotifyEvent;
FGridStatus : TcxGridStatus;
procedure BestFitAllColumns;
protected
FOnDblClick: TNotifyEvent;
FPopupMenu: TPopupMenu;
@ -105,13 +107,16 @@ type
function getNumSeleccionados: Integer;
procedure SetFilter(const Value: string); virtual;
procedure SetFilter2(const Value: string); virtual;
procedure RefrescarFiltro;
function GetFilter: string; virtual;
function GetFilter2: string; virtual;
function GetFiltered: Boolean; virtual;
procedure FiltrarGrid(TextoFiltro : String); virtual;
function GetViewFiltros: IViewFiltroBase;
procedure SetViewFiltros(const Value: IViewFiltroBase); virtual;
procedure FilterChanged(Sender : TObject); virtual;
procedure FiltrarGrid(TextoFiltro: String); virtual;
procedure FiltrarGrid2(TextoFiltro : String);
public
constructor Create(AOwner: TComponent); override;
@ -148,6 +153,7 @@ type
const APartialCompare: Boolean = False) : Boolean;}
property Filter: string read GetFilter write SetFilter;
property Filter2: string read GetFilter2 write SetFilter2;
property Filtered : Boolean read GetFiltered;
procedure AnadirOtrosFiltros; virtual;
@ -224,6 +230,7 @@ constructor TfrViewGridBase.Create(AOwner: TComponent);
begin
inherited;
FFilter := '';
FFilter2 := '';
FOnFilterChanged := FilterChanged;
FPopupMenu := nil;
FOnDblClick := nil;
@ -260,6 +267,11 @@ begin
Result := FFilter;
end;
function TfrViewGridBase.GetFilter2: string;
begin
Result := FFilter2;
end;
function TfrViewGridBase.GetFiltered: Boolean;
begin
//Los niveles de los grid no se consideran filtros
@ -332,7 +344,10 @@ procedure TfrViewGridBase.RefrescarFiltro;
begin
//De esta forma obligaremos a que se creen nuevamente todos los filtros, cuando llamemos a este metodo
if Assigned(ViewFiltros) then
begin
Filter := ViewFiltros.Texto;
// Filter2 := ViewFiltros.Texto2;
end;
end;
procedure TfrViewGridBase.RestoreFromIniFile;
@ -388,6 +403,7 @@ begin
ViewFiltros.Texto := FFilter;
FiltrarGrid(FFilter);
// FiltrarGrid('add');
//Obliga a generar todos los filtros de las vista hija
AnadirOtrosFiltros;
@ -396,6 +412,23 @@ begin
FOnFilterChanged(Self);
end;
procedure TfrViewGridBase.SetFilter2(const Value: string);
begin
FFilter2 := Value;
//Así tendremos el mismo valor en el filtro simple que en el filtro en detalle
// if Assigned(ViewFiltros) then
// ViewFiltros.Texto := FFilter;
// FiltrarGrid2(FFilter2);
//Obliga a generar todos los filtros de las vista hija
// AnadirOtrosFiltros;
// if Assigned(FOnFilterChanged) then
// FOnFilterChanged(Self);
end;
procedure TfrViewGridBase.SetMultiSelect(const Value: Boolean);
begin
_FocusedView.OptionsSelection.MultiSelect := Value;
@ -492,6 +525,39 @@ begin
end;
procedure TfrViewGridBase.FiltrarGrid2(TextoFiltro: String);
var
Columna: TcxGridDBColumn;
i: Integer;
AItemList: TcxFilterCriteriaItemList;
begin
with _FocusedView.DataController.Filter do
begin
BeginUpdate;
try
Options := [fcoCaseInsensitive, fcoSoftCompare];
// Root.Clear;
if Length(TextoFiltro) > 0 then
begin
AItemList := Root.AddItemList(fboAnd);
AItemList.BoolOperatorKind := fboOr;
for i:=0 to (_FocusedView as TcxGridDBTableView).ColumnCount - 1 do
begin
Columna := (_FocusedView as TcxGridDBTableView).Columns[i];
if (Length(Columna.Caption) > 0) and (Columna.Caption <> 'RecID') then
AItemList.AddItem(Columna, foLike, '%'+TextoFiltro+'%', IntToStr(i));
end;
Active := True;
end
else
Active := False;
finally
EndUpdate;
end;
end;
end;
procedure TfrViewGridBase.FilterChanged(Sender: TObject);
begin
//

17
Source/Informes/1/InfAlbaranCliente.fr3
View File

File diff suppressed because one or more lines are too long

13
Source/Informes/1/InfAlbaranProveedor.fr3
View File

File diff suppressed because one or more lines are too long

21
Source/Informes/1/InfContratoCliente.fr3
View File

File diff suppressed because one or more lines are too long

15
Source/Informes/1/InfFacturaCliente.fr3
View File

File diff suppressed because one or more lines are too long

38
Source/Informes/1/InfPedidoProveedor.fr3
View File

File diff suppressed because one or more lines are too long

11
Source/Informes/1/InfPresupuestoCliente.fr3
View File

File diff suppressed because one or more lines are too long

118
Source/Informes/1/InformeIVAClientes.fr3
View File

File diff suppressed because one or more lines are too long

101
Source/Informes/1/InformeIVAClientesDesglosado.fr3
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37800,8077143519" ReportOptions.Description.Text="" ReportOptions.LastChange="44243,9468371991" ScriptLanguage="PascalScript" ScriptText.Text="procedure mContinuaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FinalPass then&#13;&#10; begin&#13;&#10; if (&#60;Page#&#62; = &#60;TotalPages#&#62;) then&#13;&#10; begin &#13;&#10; mContinua.Visible := False;&#13;&#10; end &#13;&#10; else&#13;&#10; begin &#13;&#10; mContinua.Visible := True;&#13;&#10; end &#13;&#10; end; &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C5000000020446174615365743D226672784442496E666F726D654C69737461646F46616374757261732220446174615365744E616D653D226672784442496E666F726D654C69737461646F46616374757261732200010C5E00000020446174615365743D226672784442496E666F726D654C69737461646F4661637475726173526573756D656E2220446174615365744E616D653D226672784442496E666F726D654C69737461646F4661637475726173526573756D656E220000095661726961626C657301010C13000000204E616D653D2220506172616D6574726F732200010C17000000204E616D653D22546578746F506172616D6574726F73220000055374796C650100">
<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37800,8077143519" ReportOptions.Description.Text="" ReportOptions.LastChange="44594,6934118634" ScriptLanguage="PascalScript" ScriptText.Text="procedure mContinuaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FinalPass then&#13;&#10; begin&#13;&#10; if (&#60;Page#&#62; = &#60;TotalPages#&#62;) then&#13;&#10; begin &#13;&#10; mContinua.Visible := False;&#13;&#10; end &#13;&#10; else&#13;&#10; begin &#13;&#10; mContinua.Visible := True;&#13;&#10; end &#13;&#10; end; &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C5000000020446174615365743D226672784442496E666F726D654C69737461646F46616374757261732220446174615365744E616D653D226672784442496E666F726D654C69737461646F46616374757261732200010C5E00000020446174615365743D226672784442496E666F726D654C69737461646F4661637475726173526573756D656E2220446174615365744E616D653D226672784442496E666F726D654C69737461646F4661637475726173526573756D656E220000095661726961626C657301010C13000000204E616D653D2220506172616D6574726F732200010C17000000204E616D653D22546578746F506172616D6574726F73220000055374796C650100">
<TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
<TfrxReportPage Name="Page1" Orientation="poLandscape" PaperWidth="297" PaperHeight="210" PaperSize="9" LeftMargin="14,9992291666667" RightMargin="14,9992291666667" TopMargin="14,9992291666667" BottomMargin="19,9998541666667" ColumnWidth="0" ColumnPositions.Text="" LargeDesignHeight="True" HGuides.Text="" VGuides.Text="">
<TfrxPageHeader Name="Band1" Height="136,10235" Left="0" Top="16" Width="1009,14033677542" OnBeforePrint="Band1OnBeforePrint">
@ -15,37 +15,37 @@
</TfrxPageFooter>
<TfrxGroupHeader Name="" Height="40" Left="0" Restrictions="2" Top="255" Width="1009,14033677542" Condition="frxDBInformeListadoFacturas.&#34;NOMBRE&#34;" ReprintOnNewPage="True">
<TfrxMemoView Name="Memo1" Left="7,55906" Top="0,77953" Width="485,37013" Height="20,78740157" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="1" Frame.Color="8421504" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;NOMBRE&#34;]"/>
<TfrxMemoView Name="Memo27" Left="0" Top="25" Width="80" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" ParentFont="False" VAlign="vaCenter" Text="Nº factura"/>
<TfrxMemoView Name="Memo28" Align="baLeft" Left="160" Top="25" Width="290" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" ParentFont="False" VAlign="vaCenter" Text="Cliente"/>
<TfrxMemoView Name="Memo49" Align="baLeft" Left="450" Top="25" Width="85" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" ParentFont="False" VAlign="vaCenter" Text="NIF/CIF"/>
<TfrxMemoView Name="Memo50" Align="baLeft" Left="605" Top="25" Width="85" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Base imponible"/>
<TfrxMemoView Name="Memo51" Align="baLeft" Left="725" Top="25" Width="75" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe IVA"/>
<TfrxMemoView Name="Memo52" Align="baLeft" Left="835" Top="25" Width="83" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Imp. retención"/>
<TfrxMemoView Name="Memo8" Align="baLeft" Left="535" Top="25" Width="70" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" ParentFont="False" VAlign="vaCenter" Text="Fecha"/>
<TfrxMemoView Name="Memo9" Align="baLeft" Left="80" Top="25" Width="80" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" ParentFont="False" VAlign="vaCenter" Text="Referencia"/>
<TfrxMemoView Name="Memo40" Align="baLeft" Left="690" Top="25" Width="35" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="IVA"/>
<TfrxMemoView Name="Memo43" Align="baLeft" Left="918" Top="25" Width="90" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe total"/>
<TfrxMemoView Name="Memo54" Align="baLeft" Left="800" Top="25" Width="35" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="RE"/>
<TfrxMemoView Name="Memo27" Left="0" Top="25" Width="72" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" ParentFont="False" VAlign="vaCenter" Text="Nº factura"/>
<TfrxMemoView Name="Memo28" Align="baLeft" Left="148" Top="25" Width="240" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" ParentFont="False" VAlign="vaCenter" Text="Cliente"/>
<TfrxMemoView Name="Memo49" Align="baLeft" Left="388" Top="25" Width="75" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" ParentFont="False" VAlign="vaCenter" Text="NIF/CIF"/>
<TfrxMemoView Name="Memo50" Align="baLeft" Left="533" Top="25" Width="85" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Base imponible"/>
<TfrxMemoView Name="Memo51" Align="baLeft" Left="653" Top="25" Width="75" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe IVA"/>
<TfrxMemoView Name="Memo52" Align="baLeft" Left="808" Top="25" Width="83" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Imp. retención"/>
<TfrxMemoView Name="Memo8" Align="baLeft" Left="463" Top="25" Width="70" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" ParentFont="False" VAlign="vaCenter" Text="Fecha"/>
<TfrxMemoView Name="Memo9" Align="baLeft" Left="72" Top="25" Width="76" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" ParentFont="False" VAlign="vaCenter" Text="Referencia"/>
<TfrxMemoView Name="Memo40" Align="baLeft" Left="618" Top="25" Width="35" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="IVA"/>
<TfrxMemoView Name="Memo43" Align="baLeft" Left="891" Top="25" Width="90" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe total"/>
<TfrxMemoView Name="Memo54" Align="baLeft" Left="728" Top="25" Width="80" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe RE"/>
</TfrxGroupHeader>
<TfrxMasterData Name="DatosMaestros1" Height="17,00787402" Left="0" Top="315" Width="1009,14033677542" Columns="1" ColumnWidth="200" ColumnGap="20" DataSet="frxDBInformeListadoFacturas" DataSetName="frxDBInformeListadoFacturas" RowCount="0" Stretched="True">
<TfrxMemoView Name="Memo18" Left="0" Top="0" Width="80" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="14" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;REFERENCIA&#34;]"/>
<TfrxMemoView Name="Memo4" Align="baLeft" Left="160" Top="0" Width="290" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;NOMBRE&#34;]"/>
<TfrxMemoView Name="Memo20" Align="baLeft" Left="450" Top="0" Width="85" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;NIF_CIF&#34;]"/>
<TfrxMemoView Name="Memo21" Align="baLeft" Left="535" Top="0" Width="70" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;FECHA_FACTURA&#34;]"/>
<TfrxMemoView Name="Memo29" Align="baLeft" Left="605" Top="0" Width="85" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;BASE_IMPONIBLE&#34;] "/>
<TfrxMemoView Name="Memo30" Align="baLeft" Left="725" Top="0" Width="75" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;IMPORTE_IVA&#34;]"/>
<TfrxMemoView Name="Memo31" Align="baLeft" Left="918" Top="0" Width="90" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="13" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;]"/>
<TfrxMemoView Name="Memo22" Align="baLeft" Left="80" Top="0" Width="80" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;REFERENCIA_CLIENTE&#34;]"/>
<TfrxMemoView Name="Memo42" Align="baLeft" Left="690" Top="0" Width="35" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0 %" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;IVA&#34;]"/>
<TfrxMemoView Name="Memo44" Align="baLeft" Left="835" Top="0" Width="83" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" HAlign="haRight" HideZeros="True" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;IMPORTE_RETENCION&#34;]"/>
<TfrxMemoView Name="Memo55" Align="baLeft" Left="800" Top="0" Width="35" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0 %" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" HAlign="haRight" HideZeros="True" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;RETENCION&#34;]"/>
<TfrxMemoView Name="Memo18" Left="0" Top="0" Width="72" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="14" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;REFERENCIA&#34;]"/>
<TfrxMemoView Name="Memo4" Align="baLeft" Left="148" Top="0" Width="240" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;NOMBRE&#34;]"/>
<TfrxMemoView Name="Memo20" Align="baLeft" Left="388" Top="0" Width="75" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;NIF_CIF&#34;]"/>
<TfrxMemoView Name="Memo21" Align="baLeft" Left="463" Top="0" Width="70" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;FECHA_FACTURA&#34;]"/>
<TfrxMemoView Name="Memo29" Align="baLeft" Left="533" Top="0" Width="85" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;BASE_IMPONIBLE&#34;] "/>
<TfrxMemoView Name="Memo30" Align="baLeft" Left="653" Top="0" Width="75" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;IMPORTE_IVA&#34;]"/>
<TfrxMemoView Name="Memo31" Align="baLeft" Left="891" Top="0" Width="90" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="13" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;]"/>
<TfrxMemoView Name="Memo22" Align="baLeft" Left="72" Top="0" Width="76" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;REFERENCIA_CLIENTE&#34;]"/>
<TfrxMemoView Name="Memo42" Align="baLeft" Left="618" Top="0" Width="35" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0 %" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;IVA&#34;]"/>
<TfrxMemoView Name="Memo44" Align="baLeft" Left="808" Top="0" Width="83" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" HAlign="haRight" HideZeros="True" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;IMPORTE_RETENCION&#34;]"/>
<TfrxMemoView Name="Memo55" Align="baLeft" Left="728" Top="0" Width="80" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" HAlign="haRight" HideZeros="True" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;IMPORTE_RE&#34;]"/>
</TfrxMasterData>
<TfrxGroupFooter Name="" Height="20,78740402" Left="0" Top="352" Width="1009,14033677542">
<TfrxMemoView Name="Memo6" Align="baLeft" Left="800" Top="0" Width="118" Height="16" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_RETENCION&#34;&#62;,DatosMaestros1)]"/>
<TfrxMemoView Name="Memo14" Align="baLeft" Left="690" Top="0" Width="110" Height="16" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_IVA&#34;&#62;,DatosMaestros1)]"/>
<TfrxMemoView Name="Memo15" Align="baLeft" Left="605" Top="0" Width="85" Height="16" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;BASE_IMPONIBLE&#34;&#62;,DatosMaestros1)]"/>
<TfrxMemoView Name="Memo53" Left="0" Top="0" Width="605" Height="16" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="TOTALES [frxDBInformeListadoFacturas.&#34;TITULO&#34;]:"/>
<TfrxMemoView Name="Memo45" Align="baLeft" Left="918" Top="0" Width="90" Height="16" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1)]"/>
<TfrxMemoView Name="Memo6" Align="baLeft" Left="728" Top="0" Width="163" Height="16" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_RETENCION&#34;&#62;,DatosMaestros1)]"/>
<TfrxMemoView Name="Memo14" Align="baLeft" Left="618" Top="0" Width="110" Height="16" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_IVA&#34;&#62;,DatosMaestros1)]"/>
<TfrxMemoView Name="Memo15" Align="baLeft" Left="533" Top="0" Width="85" Height="16" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;BASE_IMPONIBLE&#34;&#62;,DatosMaestros1)]"/>
<TfrxMemoView Name="Memo53" Left="0" Top="0" Width="533" Height="16" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="TOTALES [frxDBInformeListadoFacturas.&#34;TITULO&#34;]:"/>
<TfrxMemoView Name="Memo45" Align="baLeft" Left="891" Top="0" Width="90" Height="16" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1)]"/>
</TfrxGroupFooter>
<TfrxGroupHeader Name="GroupHeader1" Height="22,67718" Left="0" Top="212" Width="1009,14033677542" Condition="frxDBInformeListadoFacturas.&#34;MES&#34;">
<TfrxMemoView Name="Memo7" Left="1,77953" Top="0,37795276" Width="485,37013" Height="20,40944882" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="1" Frame.Color="8421504" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;TITULO&#34;]"/>
@ -55,31 +55,34 @@
<TfrxMemoView Name="Memo23" Left="0" Top="31" Width="485,37013" Height="15,11811024" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" ParentFont="False" Text="Resumen por cliente"/>
</TfrxHeader>
<TfrxMasterData Name="DAtosMaestros2" Height="17" Left="0" Top="551" Width="1009,14033677542" ColumnWidth="0" ColumnGap="0" DataSet="frxDBInformeListadoFacturasResumen" DataSetName="frxDBInformeListadoFacturasResumen" RowCount="0" Stretched="True">
<TfrxMemoView Name="Memo24" Align="baLeft" Left="160" Top="0" Width="250" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;NOMBRE&#34;]"/>
<TfrxMemoView Name="Memo37" Left="0" Top="0" Width="80" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="14" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;REFERENCIA&#34;]"/>
<TfrxMemoView Name="Memo38" Align="baLeft" Left="80" Top="0" Width="80" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;NIF_CIF&#34;]"/>
<TfrxMemoView Name="Memo25" Align="baLeft" Left="585" Top="0" Width="95" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;BASE_IMPONIBLE&#34;]"/>
<TfrxMemoView Name="Memo26" Align="baLeft" Left="680" Top="0" Width="95" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;IMPORTE_IVA&#34;]"/>
<TfrxMemoView Name="Memo39" Align="baLeft" Left="410" Top="0" Width="175" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;POBLACION&#34;]"/>
<TfrxMemoView Name="Memo47" Align="baLeft" Left="870" Top="0" Width="95" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="13" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;IMPORTE_TOTAL&#34;]"/>
<TfrxMemoView Name="Memo32" Align="baLeft" Left="775" Top="0" Width="95" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" HAlign="haRight" HideZeros="True" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;IMPORTE_RETENCION&#34;]"/>
<TfrxMemoView Name="Memo24" Align="baLeft" Left="152" Top="0" Width="250" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;NOMBRE&#34;]"/>
<TfrxMemoView Name="Memo37" Left="0" Top="0" Width="72" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="14" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;REFERENCIA&#34;]"/>
<TfrxMemoView Name="Memo38" Align="baLeft" Left="72" Top="0" Width="80" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;NIF_CIF&#34;]"/>
<TfrxMemoView Name="Memo25" Align="baLeft" Left="567" Top="0" Width="95" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;BASE_IMPONIBLE&#34;]"/>
<TfrxMemoView Name="Memo26" Align="baLeft" Left="662" Top="0" Width="80" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;IMPORTE_IVA&#34;]"/>
<TfrxMemoView Name="Memo39" Align="baLeft" Left="402" Top="0" Width="165" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;POBLACION&#34;]"/>
<TfrxMemoView Name="Memo47" Align="baLeft" Left="912" Top="0" Width="95" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="13" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;IMPORTE_TOTAL&#34;]"/>
<TfrxMemoView Name="Memo32" Align="baLeft" Left="817" Top="0" Width="95" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" HAlign="haRight" HideZeros="True" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;IMPORTE_RETENCION&#34;]"/>
<TfrxMemoView Name="Memo56" Align="baLeft" Left="742" Top="0" Width="75" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Arial" Font.Style="0" Frame.Typ="15" HAlign="haRight" HideZeros="True" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;IMPORTE_RE&#34;]"/>
</TfrxMasterData>
<TfrxGroupHeader Name="GroupHeader2" Height="25" Left="0" Top="506" Width="1009,14033677542" Condition="frxDBInformeListadoFacturasResumen.&#34;ID_EMPRESA&#34;" ReprintOnNewPage="True">
<TfrxMemoView Name="Memo13" Align="baLeft" Left="160" Top="10" Width="250" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" ParentFont="False" VAlign="vaCenter" Text="Cliente"/>
<TfrxMemoView Name="Memo16" Align="baLeft" Left="585" Top="10" Width="95" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Base imponible"/>
<TfrxMemoView Name="Memo17" Align="baLeft" Left="680" Top="10" Width="95" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe IVA"/>
<TfrxMemoView Name="Memo19" Align="baLeft" Left="775" Top="10" Width="95" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe retención"/>
<TfrxMemoView Name="Memo34" Left="0" Top="10" Width="80" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" ParentFont="False" VAlign="vaCenter" Text="Referencia"/>
<TfrxMemoView Name="Memo35" Align="baLeft" Left="80" Top="10" Width="80" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" ParentFont="False" VAlign="vaCenter" Text="NIF/CIF"/>
<TfrxMemoView Name="Memo36" Align="baLeft" Left="410" Top="10" Width="175" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" ParentFont="False" VAlign="vaCenter" Text="Población"/>
<TfrxMemoView Name="Memo46" Align="baLeft" Left="870" Top="10" Width="95" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe total"/>
<TfrxMemoView Name="Memo13" Align="baLeft" Left="152" Top="10" Width="250" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" ParentFont="False" VAlign="vaCenter" Text="Cliente"/>
<TfrxMemoView Name="Memo16" Align="baLeft" Left="567" Top="10" Width="95" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Base imponible"/>
<TfrxMemoView Name="Memo17" Align="baLeft" Left="662" Top="10" Width="80" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe IVA"/>
<TfrxMemoView Name="Memo19" Align="baLeft" Left="742" Top="10" Width="75" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe RE"/>
<TfrxMemoView Name="Memo34" Left="0" Top="10" Width="72" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" ParentFont="False" VAlign="vaCenter" Text="Referencia"/>
<TfrxMemoView Name="Memo35" Align="baLeft" Left="72" Top="10" Width="80" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" ParentFont="False" VAlign="vaCenter" Text="NIF/CIF"/>
<TfrxMemoView Name="Memo36" Align="baLeft" Left="402" Top="10" Width="165" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" ParentFont="False" VAlign="vaCenter" Text="Población"/>
<TfrxMemoView Name="Memo46" Align="baLeft" Left="912" Top="10" Width="95" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe total"/>
<TfrxMemoView Name="Memo41" Align="baLeft" Left="817" Top="10" Width="95" Height="15" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe retención"/>
</TfrxGroupHeader>
<TfrxGroupFooter Name="GroupFooter2" Height="25" Left="0" Top="588" Width="1009,14033677542">
<TfrxMemoView Name="Memo10" Align="baLeft" Left="0" Top="0" Width="585" Height="16" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="TOTALES:"/>
<TfrxMemoView Name="Memo11" Align="baLeft" Left="775" Top="0" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturasResumen.&#34;IMPORTE_RETENCION&#34;&#62;,DatosMaestros2)]"/>
<TfrxMemoView Name="Memo12" Align="baLeft" Left="680" Top="0" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturasResumen.&#34;IMPORTE_IVA&#34;&#62;,DatosMaestros2)]"/>
<TfrxMemoView Name="Memo33" Align="baLeft" Left="585" Top="0" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturasResumen.&#34;BASE_IMPONIBLE&#34;&#62;,DatosMaestros2)]"/>
<TfrxMemoView Name="Memo48" Align="baLeft" Left="870" Top="0" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturasResumen.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros2)]"/>
<TfrxMemoView Name="Memo10" Align="baLeft" Left="0" Top="0" Width="568" Height="16" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="TOTALES:"/>
<TfrxMemoView Name="Memo11" Align="baLeft" Left="818" Top="0" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturasResumen.&#34;IMPORTE_RETENCION&#34;&#62;,DatosMaestros2)]"/>
<TfrxMemoView Name="Memo12" Align="baLeft" Left="663" Top="0" Width="80" Height="16" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturasResumen.&#34;IMPORTE_IVA&#34;&#62;,DatosMaestros2)]"/>
<TfrxMemoView Name="Memo33" Align="baLeft" Left="568" Top="0" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturasResumen.&#34;BASE_IMPONIBLE&#34;&#62;,DatosMaestros2)]"/>
<TfrxMemoView Name="Memo48" Align="baLeft" Left="913" Top="0" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturasResumen.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros2)]"/>
<TfrxMemoView Name="Memo57" Align="baLeft" Left="743" Top="0" Width="75" Height="16" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" Frame.Typ="1" HAlign="haRight" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturasResumen.&#34;IMPORTE_RE&#34;&#62;,DatosMaestros2)]"/>
</TfrxGroupFooter>
</TfrxReportPage>
</TfrxReport>

4
Source/Informes/2/InfAlbaranCliente.fr3
View File

File diff suppressed because one or more lines are too long

12
Source/Informes/2/InfContratoCliente.fr3
View File

File diff suppressed because one or more lines are too long

14
Source/Informes/2/InfFacturaCliente.fr3
View File

File diff suppressed because one or more lines are too long

12
Source/Informes/2/InfPresupuestoCliente.fr3
View File

File diff suppressed because one or more lines are too long

6
Source/Informes/2/InfReciboCliente.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/2/InformeListadoFacturasRecibosCliente.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/3/InfAlbaranCliente.fr3
View File

File diff suppressed because one or more lines are too long

12
Source/Informes/3/InfContratoCliente.fr3
View File

File diff suppressed because one or more lines are too long

14
Source/Informes/3/InfFacturaCliente.fr3
View File

File diff suppressed because one or more lines are too long

12
Source/Informes/3/InfPresupuestoCliente.fr3
View File

File diff suppressed because one or more lines are too long

6
Source/Informes/3/InfReciboCliente.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/3/InformeListadoFacturasRecibosCliente.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/4/InfAlbaranCliente.fr3
View File

File diff suppressed because one or more lines are too long

12
Source/Informes/4/InfContratoCliente.fr3
View File

File diff suppressed because one or more lines are too long

12
Source/Informes/4/InfPresupuestoCliente.fr3
View File

File diff suppressed because one or more lines are too long

6
Source/Informes/InformeIVAClientes.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/InformeIVAClientesDesglosado.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/InformeIVAProveedores.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/InformeIVAProveedoresDesglosado.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/InformeListadoFacturasCliente.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/InformeListadoFacturasClienteDesglosado.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/InformeListadoFacturasClientePendientes.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/InformeListadoFacturasClientePendientesDesglosado.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/InformeListadoFacturasProveedor.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/InformeListadoFacturasProveedorDesglosado.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/InformeListadoFacturasProveedorPendientes.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/InformeListadoFacturasProveedorPendientesDesglosado.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/InformeListadoFacturasRecibosCliente.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/InformeListadoPresupuestos.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/InformeListadoPresupuestosDesglosado.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/InformeListadoRecibosCliPendientes.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/InformeListadoRecibosCliPendientesDesglosado.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/InformeListadoRecibosCliente.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/InformeListadoRecibosClienteDesglosado.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/InformeListadoRecibosProvPendientes.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/InformeListadoRecibosProvPendientesDesglosado.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/InformeListadoRecibosProveedor.fr3
View File

File diff suppressed because one or more lines are too long

4
Source/Informes/InformeListadoRecibosProveedorDesglosado.fr3
View File

File diff suppressed because one or more lines are too long

5
Source/Modulos/Albaranes de cliente/Model/uBizAlbaranesCliente.pas
View File

@ -93,7 +93,8 @@ implementation
uses
SysUtils, Variants, uDataModuleConfiguracion, uDataModuleUsuarios, uNumUtils,
uDataTableUtils, DateUtils, uDateUtils, DB, uFactuGES_App, uBizEmpresasTiendas;
uDataTableUtils, DateUtils, uDateUtils, DB, uFactuGES_App, uBizEmpresasTiendas,
uTypesConstConfiguration;
{ TBizAlbaranCliente }
@ -197,6 +198,8 @@ begin
//TEMPORAL ALMACÉN PUESTO A CAPÓN Y PROVISIONAL
ID_ALMACEN := 0;
OBSERVACIONES.Add(AppFactuGES.Configuracion.GetSettingAsString(teBD, CTE_OBSERVACIONES_ALBARANES, AppFactuGES.EmpresaActiva.ID));
end;
procedure TBizAlbaranCliente.IVAOnChange(Sender: TDACustomField);

12
Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.dfm
View File

@ -290,20 +290,26 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
inherited Bevel4: TBevel
Left = 476
Top = 53
Width = 210
ExplicitLeft = 476
ExplicitTop = 53
ExplicitWidth = 210
end
inherited Bevel2: TBevel
Left = 11
Top = 196
Width = 333
ExplicitLeft = 11
ExplicitTop = 196
ExplicitWidth = 333
end
inherited Bevel1: TBevel
Left = 383
Top = 196
Width = 332
ExplicitLeft = 383
ExplicitTop = 196
ExplicitWidth = 332
end
inherited ImporteDto: TcxDBCurrencyEdit
Left = 191
@ -388,6 +394,8 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Style.IsFontAssigned = True
ExplicitLeft = 547
ExplicitTop = 115
ExplicitWidth = 56
Width = 56
end
inherited eImporteNeto: TcxDBCurrencyEdit
Left = 120
@ -451,6 +459,8 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
Style.IsFontAssigned = True
ExplicitLeft = 547
ExplicitTop = 211
ExplicitWidth = 342
Width = 342
end
inherited edtFechaRetencion: TcxDBDateEdit
Left = 120
@ -461,6 +471,8 @@ inherited fEditorAlbaranCliente: TfEditorAlbaranCliente
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 120
ExplicitTop = 211
ExplicitWidth = 333
Width = 333
end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
inherited dxLayoutControl1Group1: TdxLayoutGroup

4
Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranCliente.pas
View File

@ -235,7 +235,7 @@ begin
inherited;
FVerLogotipo := True;
FImprimirPrecios := False;
FImprimirTotales := True;
FImprimirTotales := False;
FImprimirRefProveedor := False;
FImprimirObservaciones := False;
FImprimirIncidencias := False;
@ -334,7 +334,7 @@ begin
inherited;
FVerLogotipo := True;
FImprimirPrecios := False;
FImprimirTotales := True;
FImprimirTotales := False;
FImprimirRefProveedor := False;
FImprimirObservaciones := False;
FImprimirIncidencias := False;

4
Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranesCliente.pas
View File

@ -398,7 +398,7 @@ begin
AllItems := False;
FVerLogotipo := True;
FImprimirPrecios := False;
FImprimirTotales := True;
FImprimirTotales := False;
FImprimirRefProveedor := False;
FImprimirObservaciones := False;
FImprimirIncidencias := False;
@ -511,7 +511,7 @@ begin
AllItems := False;
FVerLogotipo := True;
FImprimirPrecios := False;
FImprimirTotales := True;
FImprimirTotales := False;
FImprimirRefProveedor := False;
FImprimirObservaciones := False;
FImprimirIncidencias := False;

16
Source/Modulos/Albaranes de proveedor/AlbaranesProveedor_Group.groupproj
View File

@ -13,6 +13,7 @@
<Projects Include="..\Contabilidad\Views\Contabilidad_view.dproj" />
<Projects Include="..\Contactos\Controller\Contactos_controller.dproj" />
<Projects Include="..\Contactos\Views\Contactos_view.dproj" />
<Projects Include="..\Facturas de cliente\Controller\FacturasCliente_controller.dproj" />
<Projects Include="..\Facturas de proveedor\Controller\FacturasProveedor_controller.dproj" />
<Projects Include="..\Facturas de proveedor\Model\FacturasProveedor_model.dproj" />
<Projects Include="..\Facturas de proveedor\Views\FacturasProveedor_view.dproj" />
@ -241,14 +242,23 @@
<Target Name="FacturasProveedor_model:Make">
<MSBuild Projects="..\Facturas de proveedor\Model\FacturasProveedor_model.dproj" Targets="Make" />
</Target>
<Target Name="FacturasCliente_controller">
<MSBuild Projects="..\Facturas de cliente\Controller\FacturasCliente_controller.dproj" Targets="" />
</Target>
<Target Name="FacturasCliente_controller:Clean">
<MSBuild Projects="..\Facturas de cliente\Controller\FacturasCliente_controller.dproj" Targets="Clean" />
</Target>
<Target Name="FacturasCliente_controller:Make">
<MSBuild Projects="..\Facturas de cliente\Controller\FacturasCliente_controller.dproj" Targets="Make" />
</Target>
<Target Name="Build">
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_view;AlbaranesProveedor_model;AlbaranesProveedor_data;AlbaranesProveedor_controller;AlbaranesProveedor_view;AlbaranesProveedor_plugin;FactuGES;FactuGES_Server;FacturasProveedor_view;Contabilidad_view;Contactos_controller;FacturasProveedor_controller;PedidosProveedor_model;PedidosProveedor_data;PedidosProveedor_controller;PedidosProveedor_view;PedProv_AlbProv_relation;AlbProv_FacProv_relation;FacturasProveedor_model" />
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_view;AlbaranesProveedor_model;AlbaranesProveedor_data;AlbaranesProveedor_controller;AlbaranesProveedor_view;AlbaranesProveedor_plugin;FactuGES;FactuGES_Server;FacturasProveedor_view;Contabilidad_view;Contactos_controller;FacturasProveedor_controller;PedidosProveedor_model;PedidosProveedor_data;PedidosProveedor_controller;PedidosProveedor_view;PedProv_AlbProv_relation;AlbProv_FacProv_relation;FacturasProveedor_model;FacturasCliente_controller" />
</Target>
<Target Name="Clean">
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_view:Clean;AlbaranesProveedor_model:Clean;AlbaranesProveedor_data:Clean;AlbaranesProveedor_controller:Clean;AlbaranesProveedor_view:Clean;AlbaranesProveedor_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;FacturasProveedor_view:Clean;Contabilidad_view:Clean;Contactos_controller:Clean;FacturasProveedor_controller:Clean;PedidosProveedor_model:Clean;PedidosProveedor_data:Clean;PedidosProveedor_controller:Clean;PedidosProveedor_view:Clean;PedProv_AlbProv_relation:Clean;AlbProv_FacProv_relation:Clean;FacturasProveedor_model:Clean" />
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_view:Clean;AlbaranesProveedor_model:Clean;AlbaranesProveedor_data:Clean;AlbaranesProveedor_controller:Clean;AlbaranesProveedor_view:Clean;AlbaranesProveedor_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;FacturasProveedor_view:Clean;Contabilidad_view:Clean;Contactos_controller:Clean;FacturasProveedor_controller:Clean;PedidosProveedor_model:Clean;PedidosProveedor_data:Clean;PedidosProveedor_controller:Clean;PedidosProveedor_view:Clean;PedProv_AlbProv_relation:Clean;AlbProv_FacProv_relation:Clean;FacturasProveedor_model:Clean;FacturasCliente_controller:Clean" />
</Target>
<Target Name="Make">
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_view:Make;AlbaranesProveedor_model:Make;AlbaranesProveedor_data:Make;AlbaranesProveedor_controller:Make;AlbaranesProveedor_view:Make;AlbaranesProveedor_plugin:Make;FactuGES:Make;FactuGES_Server:Make;FacturasProveedor_view:Make;Contabilidad_view:Make;Contactos_controller:Make;FacturasProveedor_controller:Make;PedidosProveedor_model:Make;PedidosProveedor_data:Make;PedidosProveedor_controller:Make;PedidosProveedor_view:Make;PedProv_AlbProv_relation:Make;AlbProv_FacProv_relation:Make;FacturasProveedor_model:Make" />
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_view:Make;AlbaranesProveedor_model:Make;AlbaranesProveedor_data:Make;AlbaranesProveedor_controller:Make;AlbaranesProveedor_view:Make;AlbaranesProveedor_plugin:Make;FactuGES:Make;FactuGES_Server:Make;FacturasProveedor_view:Make;Contabilidad_view:Make;Contactos_controller:Make;FacturasProveedor_controller:Make;PedidosProveedor_model:Make;PedidosProveedor_data:Make;PedidosProveedor_controller:Make;PedidosProveedor_view:Make;PedProv_AlbProv_relation:Make;AlbProv_FacProv_relation:Make;FacturasProveedor_model:Make;FacturasCliente_controller:Make" />
</Target>
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
</Project>

16
Source/Modulos/Albaranes de proveedor/Controller/AlbaranesProveedor_controller.dproj
View File

@ -48,14 +48,14 @@
<DelphiCompile Include="AlbaranesProveedor_controller.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\..\Lib\AlbaranesProveedor_data.dcp" />
<DCCReference Include="..\..\Lib\AlbaranesProveedor_model.dcp" />
<DCCReference Include="..\..\Lib\Articulos_controller.dcp" />
<DCCReference Include="..\..\Lib\Contactos_controller.dcp" />
<DCCReference Include="..\..\Lib\GUIBase.dcp" />
<DCCReference Include="..\..\Lib\Inventario_model.dcp" />
<DCCReference Include="..\..\Lib\PedidosProveedor_controller.dcp" />
<DCCReference Include="..\..\Lib\PedidosProveedor_model.dcp" />
<DCCReference Include="..\..\Contratos de cliente\Model\AlbaranesProveedor_data.dcp" />
<DCCReference Include="..\..\Contratos de cliente\Model\AlbaranesProveedor_model.dcp" />
<DCCReference Include="..\..\Contratos de cliente\Model\Articulos_controller.dcp" />
<DCCReference Include="..\..\Contratos de cliente\Model\Contactos_controller.dcp" />
<DCCReference Include="..\..\Contratos de cliente\Model\GUIBase.dcp" />
<DCCReference Include="..\..\Contratos de cliente\Model\Inventario_model.dcp" />
<DCCReference Include="..\..\Contratos de cliente\Model\PedidosProveedor_controller.dcp" />
<DCCReference Include="..\..\Contratos de cliente\Model\PedidosProveedor_model.dcp" />
<DCCReference Include="uAlbaranesProveedorController.pas" />
<DCCReference Include="uAlbaranesProveedorReportController.pas" />
<DCCReference Include="uArticulosAlbaranProveedorController.pas" />

27
Source/Modulos/Albaranes de proveedor/Controller/uAlbaranesProveedorController.pas
View File

@ -181,6 +181,9 @@ var
i : integer;
ADetallesController : IDetallesAlbaranProveedorController;
ACantidad: Variant;
ArticulosAnadidosAux: TStringList;
ACadena: String;
begin
if not Assigned(AOrigen) then
raise Exception.Create ('Origen no asignado (CopiarArticulosPedido)');
@ -195,6 +198,7 @@ begin
ADestino.DataTable.Active := True;
ADetallesController := TDetallesAlbaranProveedorController.Create;
ArticulosAnadidosAux:= TStringList.Create;
try
//OJO IMPORTANTE
//Siempre que vayamos a trabajar con los detalles debemos hacer un beginupdate de los mismos y un endupdate para
@ -204,12 +208,28 @@ begin
AOrigen.DataTable.First;
for i := 0 to AOrigen.DataTable.RecordCount - 1 do
begin
ACadena := '';
//Comprobamos el articulo del pedido no haya sido recibido ya en otro albaran.
AArticulosPendientes.DataTable.First;
if AArticulosPendientes.DataTable.Locate(fld_PedidosProveedor_DetallesID_ARTICULO, AOrigen.ID_ARTICULO, []) then
ACantidad := AArticulosPendientes.CANTIDAD
begin
//Esto es para el caso de meter edl mismo articulo varias veces en el pedido cambiando la descripción, si esto ocurre,
//Metemos en la primera aparición la suma de las unidades a recibir y en las siguiente apariciones se pone CERO
if (ArticulosAnadidosAux.IndexOf(IntToStr(AOrigen.ID_ARTICULO)) = -1) then
begin
ACantidad := AArticulosPendientes.CANTIDAD;
ArticulosAnadidosAux.Add(IntToStr(AOrigen.ID_ARTICULO));
end
else begin
ACantidad := 0;
ACadena := #10 + #13 + ' - Artículo con ref. ' + AOrigen.REFERENCIA + ' repetido en otra linea y descripción diferente';
end;
end
else
ACantidad := AOrigen.CANTIDAD;
begin
ACantidad := 0; //AOrigen.CANTIDAD;
ACadena := ' - Recibido en un albarán anterior'
end;
ADetallesController.Add(ADestino, TIPO_DETALLE_CONCEPTO);
@ -217,7 +237,7 @@ begin
ADestino.REFERENCIA := AOrigen.REFERENCIA;
if AOrigen.ID_ARTICULO > 0 then
ADestino.ID_ARTICULO := AOrigen.ID_ARTICULO;
ADestino.CONCEPTO := AOrigen.CONCEPTO;
ADestino.CONCEPTO := AOrigen.CONCEPTO + ACadena;
ADestino.CANTIDAD := ACantidad;
ADestino.IMPORTE_UNIDAD := AOrigen.IMPORTE_UNIDAD;
ADestino.IMPORTE_TOTAL := AOrigen.IMPORTE_TOTAL;
@ -230,6 +250,7 @@ begin
AOrigen.Next;
end;
finally
ArticulosAnadidosAux.Destroy;
ADetallesController.EndUpdate(ADestino);
ADetallesController := NIL;
end;

1
Source/Modulos/Albaranes de proveedor/Model/uBizAlbaranesProveedor.pas
View File

@ -230,6 +230,7 @@ begin
DataTable.Edit;
ID_PROVEEDOR := FProveedor.ID;
NOMBRE := FProveedor.NOMBRE;
DataTable.Post; //Muy importante ya que es necesario hacer un post de la cabecera antes de añadir detalles
//si se quita el id de la cabecera y los detalles se desincroniza

4
Source/Modulos/Albaranes de proveedor/Views/uViewElegirArticulosAlbaranesProveedor.dfm
View File

@ -17,10 +17,6 @@ inherited frViewElegirArticulosAlbaranesProveedor: TfrViewElegirArticulosAlbaran
inherited cxGridLevel2: TcxGridLevel
Visible = False
end
object cxGridLevel3: TcxGridLevel
Tag = 3
Caption = 'Otros proveedores'
end
end
inherited frViewFiltroBase1: TfrViewFiltroBase
inherited TBXDockablePanel1: TTBXDockablePanel

BIN
Source/Modulos/Albaranes de proveedor/Views/uViewElegirArticulosAlbaranesProveedor.pas
View File

Binary file not shown.

27
Source/Modulos/Articulos/Controller/uArticulosController.pas
View File

@ -165,21 +165,24 @@ begin
end;
end;
//Asignamos en articulo
with AArticulos.DataTable do
if (ATarifa <> '') then
begin
First;
while not EOF do
begin
if (AArticulos.TARIFA <> ATarifa) then
//Asignamos en articulo
with AArticulos.DataTable do
begin
Edit;
AArticulos.TARIFA := ATarifa;
Post;
First;
while not EOF do
begin
if (AArticulos.TARIFA <> ATarifa) then
begin
Edit;
AArticulos.TARIFA := ATarifa;
Post;
end;
Next;
end;
ApplyUpdates;
end;
Next;
end;
ApplyUpdates;
end;
end;

16
Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas
View File

@ -9,10 +9,10 @@ const
{ Data table rules ids
Feel free to change them to something more human readable
but make sure they are unique in the context of your application }
RID_Articulos_Proveedores = '{87B29B7A-D26D-47C1-B451-2E9507E1D4E4}';
RID_Articulos = '{08E0E528-EFF1-4E46-AC45-F8FFEE66DB70}';
RID_ArticulosParaCompra = '{15CE5F47-3637-4744-9304-6622CF313564}';
RID_ArticulosParaCliente = '{C0BD03FB-8506-40EC-93DC-F0086D1E91D5}';
RID_Articulos_Proveedores = '{5D678D12-69CE-4F8D-B0A7-935BC46AB396}';
RID_Articulos = '{7C64A385-817F-4F17-8431-34FCCA700469}';
RID_ArticulosParaCompra = '{2CB03BC7-A75E-45C1-B0F4-A0041572AEFF}';
RID_ArticulosParaCliente = '{790C555B-1C87-4A88-8A26-D950849B291C}';
{ Data table names }
nme_Articulos_Proveedores = 'Articulos_Proveedores';
@ -201,7 +201,7 @@ const
type
{ IArticulos_Proveedores }
IArticulos_Proveedores = interface(IDAStronglyTypedDataTable)
['{7FB357F1-45E4-4E4B-B65A-81F004523888}']
['{6375AC3C-024A-4EE1-8F95-103234615EE6}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -356,7 +356,7 @@ type
{ IArticulos }
IArticulos = interface(IDAStronglyTypedDataTable)
['{56F08BA4-4BA6-4572-8925-96DAFF9FD5CC}']
['{D41402F4-E414-498B-9D9C-9911FDA7CB91}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -679,7 +679,7 @@ type
{ IArticulosParaCompra }
IArticulosParaCompra = interface(IDAStronglyTypedDataTable)
['{0D172C24-4F33-4CE9-93D0-EBDC340246A5}']
['{181773CE-BBDC-4BC0-B64A-D0ACA39DF9B2}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -1002,7 +1002,7 @@ type
{ IArticulosParaCliente }
IArticulosParaCliente = interface(IDAStronglyTypedDataTable)
['{714FC5E2-EF88-41C2-8187-EA797434BC6E}']
['{A6F2D4A2-8C62-4F02-8EEE-B132F5DD263E}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);

16
Source/Modulos/Articulos/Model/schArticulosServer_Intf.pas
View File

@ -9,15 +9,15 @@ const
{ Delta rules ids
Feel free to change them to something more human readable
but make sure they are unique in the context of your application }
RID_Articulos_ProveedoresDelta = '{6A153FBC-7E26-4510-9EE0-6C3141E4CC0B}';
RID_ArticulosDelta = '{8E6E3A79-C705-4C94-B2BB-3ED599BD814E}';
RID_ArticulosParaCompraDelta = '{776187FA-9868-4D23-935F-1F0AFA404EE8}';
RID_ArticulosParaClienteDelta = '{C53985C4-A448-401B-BDD5-18EBA6D738F5}';
RID_Articulos_ProveedoresDelta = '{677EF24F-54AB-443D-8530-B8B18B38C132}';
RID_ArticulosDelta = '{7D88B4CD-D716-4173-85EF-69526AA81C4D}';
RID_ArticulosParaCompraDelta = '{20C0E521-A90A-4CEB-8070-C96D1C33F103}';
RID_ArticulosParaClienteDelta = '{B8F9252C-D13A-4190-ADA5-4CE30B7E4BFB}';
type
{ IArticulos_ProveedoresDelta }
IArticulos_ProveedoresDelta = interface(IArticulos_Proveedores)
['{6A153FBC-7E26-4510-9EE0-6C3141E4CC0B}']
['{677EF24F-54AB-443D-8530-B8B18B38C132}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_ARTICULOValue : Integer;
@ -171,7 +171,7 @@ type
{ IArticulosDelta }
IArticulosDelta = interface(IArticulos)
['{8E6E3A79-C705-4C94-B2BB-3ED599BD814E}']
['{7D88B4CD-D716-4173-85EF-69526AA81C4D}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer;
@ -494,7 +494,7 @@ type
{ IArticulosParaCompraDelta }
IArticulosParaCompraDelta = interface(IArticulosParaCompra)
['{776187FA-9868-4D23-935F-1F0AFA404EE8}']
['{20C0E521-A90A-4CEB-8070-C96D1C33F103}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer;
@ -817,7 +817,7 @@ type
{ IArticulosParaClienteDelta }
IArticulosParaClienteDelta = interface(IArticulosParaCliente)
['{C53985C4-A448-401B-BDD5-18EBA6D738F5}']
['{B8F9252C-D13A-4190-ADA5-4CE30B7E4BFB}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer;

62
Source/Modulos/Articulos/Views/Articulos_view.dproj
View File

@ -55,37 +55,37 @@
<DelphiCompile Include="Articulos_view.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\..\Presupuestos de cliente\adortl.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\Articulos_controller.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\Articulos_model.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\Contactos_view.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\cxDataD11.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\cxEditorsD11.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\cxExportD11.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\cxExtEditorsD11.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\cxGridD11.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\cxLibraryD11.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\cxPageControlD11.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\dbrtl.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\dsnap.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\dxCoreD11.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\dxGDIPlusD11.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\dxThemeD11.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\Familias_controller.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\GUIBase.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\PngComponentsD10.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\PNG_D10.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\rtl.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\SubFamilias_controller.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\Tarifas_controller.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\UnidadesMedida_controller.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\vcl.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\vclactnband.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\vcldb.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\vcljpg.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\vclx.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\adortl.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\Articulos_controller.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\Articulos_model.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\Contactos_view.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\cxDataD11.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\cxEditorsD11.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\cxExportD11.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\cxExtEditorsD11.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\cxGridD11.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\cxLibraryD11.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\cxPageControlD11.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\dbrtl.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\dsnap.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\dxCoreD11.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\dxGDIPlusD11.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\dxThemeD11.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\Familias_controller.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\GUIBase.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\PngComponentsD10.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\PNG_D10.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\rtl.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\SubFamilias_controller.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\Tarifas_controller.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\UnidadesMedida_controller.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\vcl.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\vclactnband.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\vcldb.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\vcljpg.dcp" />
<DCCReference Include="..\..\Albaranes de proveedor\vclx.dcp" />
<DCCReference Include="uArticulosViewRegister.pas" />
<DCCReference Include="uEditorArticulo.pas">
<Form>fEditorArticulo</Form>

7
Source/Modulos/Articulos/Views/uEditorArticulos.dfm
View File

@ -2,7 +2,6 @@ inherited fEditorArticulos: TfEditorArticulos
Left = 489
Top = 325
Caption = 'Lista de art'#237'culos'
ExplicitHeight = 482
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
@ -30,19 +29,13 @@ inherited fEditorArticulos: TfEditorArticulos
ExplicitWidth = 543
end
inherited tbxFiltro: TTBXToolbar
ExplicitWidth = 276
inherited tbxEditFiltro: TTBXEditItem
EditOptions = [tboUseEditWhenVertical]
end
inherited TBXItem37: TTBXItem
Visible = False
end
end
inherited TBXTMain2: TTBXToolbar
Left = 276
DockPos = 275
Visible = True
ExplicitLeft = 276
ExplicitWidth = 117
object TBXItem38: TTBXItem
Action = actAsignarTarifa

4
Source/Modulos/Articulos/Views/uEditorArticulos.pas
View File

@ -92,9 +92,7 @@ end;
procedure TfEditorArticulos.ImprimirInterno;
begin
{
inherited;
}
end;
procedure TfEditorArticulos.ModificarInterno;
@ -120,9 +118,7 @@ end;
procedure TfEditorArticulos.PrevisualizarInterno;
begin
{
inherited;
}
end;
procedure TfEditorArticulos.SetArticulos(const Value: IBizArticulo);

27
Source/Modulos/Articulos/Views/uEditorElegirArticulos.dfm
View File

@ -29,18 +29,6 @@ inherited fEditorElegirArticulos: TfEditorElegirArticulos
DockPos = -6
ExplicitWidth = 142
ExplicitHeight = 27
inherited TBXItem2: TTBXItem
Visible = False
end
inherited TBXItem5: TTBXItem
Visible = False
end
inherited TBXItem4: TTBXItem
Visible = False
end
inherited TBXItem6: TTBXItem
Visible = False
end
inherited TBXItem36: TTBXItem
Action = actAnchoAuto2
end
@ -163,10 +151,25 @@ inherited fEditorElegirArticulos: TfEditorElegirArticulos
inherited EditorActionList: TActionList [5]
Left = 112
Top = 192
inherited actNuevo: TAction
Visible = False
end
inherited actModificar: TAction
Visible = False
end
inherited actEliminar: TAction
Enabled = False
Visible = False
end
inherited actPrevisualizar: TAction
Enabled = False
Visible = False
end
inherited actImprimir: TAction
Enabled = False
Visible = False
end
inherited actRefrescar: TAction
Visible = False
end
inherited actDuplicar: TAction

2
Source/Modulos/Articulos/Views/uEditorElegirArticulos.pas
View File

@ -68,7 +68,7 @@ end;
procedure TfEditorElegirArticulos.FormShow(Sender: TObject);
begin
inherited;
EditorActionList.State := asSuspended;
// EditorActionList.State := asSuspended;
if Assigned(ViewGrid) then
(ViewGrid as IViewArticulos).PrecioPunto := Controller.PrecioPunto;
end;

32
Source/Modulos/Articulos/Views/uViewArticulos.dfm
View File

@ -128,7 +128,9 @@ inherited frViewArticulos: TfrViewArticulos
DataBinding.FieldName = 'PRECIO_COSTE'
PropertiesClassName = 'TcxCurrencyEditProperties'
Properties.Alignment.Horz = taRightJustify
Properties.AssignedValues.DisplayFormat = True
Properties.DecimalPlaces = 2
Properties.DisplayFormat = ',0.00 '#8364';-,0.00 '#8364
Properties.EditFormat = ',0.00 '#8364';-,0.00 '#8364
FooterAlignmentHorz = taRightJustify
HeaderAlignmentHorz = taRightJustify
Width = 130
@ -149,6 +151,9 @@ inherited frViewArticulos: TfrViewArticulos
DataBinding.FieldName = 'PRECIO_NETO'
PropertiesClassName = 'TcxCurrencyEditProperties'
Properties.Alignment.Horz = taRightJustify
Properties.DecimalPlaces = 2
Properties.DisplayFormat = ',0.00 '#8364';-,0.00 '#8364
Properties.EditFormat = ',0.00 '#8364';-,0.00 '#8364
Visible = False
FooterAlignmentHorz = taRightJustify
HeaderAlignmentHorz = taRightJustify
@ -192,6 +197,10 @@ inherited frViewArticulos: TfrViewArticulos
end
object cxGridLevel2: TcxGridLevel
Tag = 2
Caption = 'COMPRAS'
end
object cxGridLevel3: TcxGridLevel
Tag = 3
Caption = 'OTRAS TARIFAS'
end
end
@ -210,6 +219,7 @@ inherited frViewArticulos: TfrViewArticulos
StyleHot.LookAndFeel.SkinName = ''
end
inherited edtFechaIniFiltro: TcxDateEdit
Enabled = False
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
@ -217,12 +227,32 @@ inherited frViewArticulos: TfrViewArticulos
end
inherited edtFechaFinFiltro: TcxDateEdit
Left = 549
Enabled = False
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 549
end
inherited txtFiltroTodo2: TcxTextEdit
Left = 550
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 550
end
inherited dxLayoutControl1Group_Root: TdxLayoutGroup
inherited dxLayoutControl1Group2: TdxLayoutGroup
inherited dxLayoutControl1Item4: TdxLayoutItem
Visible = False
end
end
inherited dxLayoutControl1Group1: TdxLayoutGroup
Enabled = False
Visible = False
end
end
end
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
Width = 896

6
Source/Modulos/Articulos/Views/uViewArticulos.pas
View File

@ -47,6 +47,7 @@ type
cxGridLevel1: TcxGridLevel;
cxGridLevel2: TcxGridLevel;
cxGridViewUNIDAD_MEDIDA: TcxGridDBColumn;
cxGridLevel3: TcxGridLevel;
procedure cxGridViewIDCustomDrawCell(
Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
@ -165,9 +166,12 @@ begin
case cxGrid.ActiveLevel.Index of
1 : FFiltro.AddItem(cxGridViewTARIFA, foEqual, 'TARIFA 2020', 'TARIFA 2020');
2 : begin
2 : FFiltro.AddItem(cxGridViewTARIFA, foEqual, 'COMPRAS', 'COMPRAS');
3 : begin
FFiltro.AddItem(cxGridViewTARIFA, foNotEqual, NULL, 'ARTICULOS CON TARIFA ASIGNADA');
FFiltro := AddFilterGrid(fboAnd);
FFiltro.AddItem(cxGridViewTARIFA, foNotEqual, 'COMPRAS', 'OTRAS TARIFAS');
FFiltro := AddFilterGrid(fboAnd);
FFiltro.AddItem(cxGridViewTARIFA, foNotEqual, 'TARIFA 2020', 'OTRAS TARIFAS');
end;
end;

12
Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm
View File

@ -97,12 +97,17 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
inherited cxGridViewIMPORTEUNIDAD: TcxGridDBColumn
Width = 68
end
inherited cxGridViewIMPORTENETO: TcxGridDBColumn
Width = 56
end
inherited cxGridViewDESCUENTO: TcxGridDBColumn
HeaderAlignmentHorz = taRightJustify
Width = 29
end
inherited cxGridViewIMPORTENETO: TcxGridDBColumn
Width = 56
inherited cxGridViewIMP_UNIDAD_DTO: TcxGridDBColumn
Properties.DecimalPlaces = 2
Properties.DisplayFormat = ',0.00 '#8364';-,0.00 '#8364
Properties.EditFormat = ',0.00 '#8364';-,0.00 '#8364
end
inherited cxGridViewIMPORTEPORTE: TcxGridDBColumn
Caption = 'Porte unidad'
@ -111,6 +116,9 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
Width = 78
end
inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn
Properties.DecimalPlaces = 2
Properties.DisplayFormat = ',0.00 '#8364';-,0.00 '#8364
Properties.EditFormat = ',0.00 '#8364';-,0.00 '#8364
Width = 58
end
end

10
Source/Modulos/Articulos/Views/uViewProveedoresArticulo.dfm
View File

@ -47,6 +47,8 @@ inherited frViewProveedoresArticulo: TfrViewProveedoresArticulo
DataBinding.FieldName = 'PRECIO_COSTE'
PropertiesClassName = 'TcxCurrencyEditProperties'
Properties.Alignment.Horz = taRightJustify
Properties.DecimalPlaces = 2
Properties.DisplayFormat = ',0.00 '#8364';-,0.00 '#8364
HeaderAlignmentHorz = taRightJustify
end
object cxGridViewDESCUENTO: TcxGridDBColumn
@ -67,6 +69,8 @@ inherited frViewProveedoresArticulo: TfrViewProveedoresArticulo
DataBinding.FieldName = 'PRECIO_NETO'
PropertiesClassName = 'TcxCurrencyEditProperties'
Properties.Alignment.Horz = taRightJustify
Properties.DecimalPlaces = 2
Properties.DisplayFormat = ',0.00 '#8364';-,0.00 '#8364
HeaderAlignmentHorz = taRightJustify
Options.Editing = False
end
@ -79,6 +83,9 @@ inherited frViewProveedoresArticulo: TfrViewProveedoresArticulo
object cxGridViewPRECIO_PVP_VENTA: TcxGridDBColumn
Caption = 'Precio P.V.P (Suministro)'
DataBinding.FieldName = 'PRECIO_PVP_VENTA'
PropertiesClassName = 'TcxCurrencyEditProperties'
Properties.DecimalPlaces = 2
Properties.DisplayFormat = ',0.00 '#8364';-,0.00 '#8364
Visible = False
Options.Editing = False
VisibleForCustomization = False
@ -86,6 +93,9 @@ inherited frViewProveedoresArticulo: TfrViewProveedoresArticulo
object cxGridViewPRECIO_PVP_TOTAL: TcxGridDBColumn
Caption = 'Precio P.V.P (Total)'
DataBinding.FieldName = 'PRECIO_PVP_TOTAL'
PropertiesClassName = 'TcxCurrencyEditProperties'
Properties.DecimalPlaces = 2
Properties.DisplayFormat = ',0.00 '#8364';-,0.00 '#8364
Visible = False
Options.Editing = False
VisibleForCustomization = False

7
Source/Modulos/Contactos/Data/uDataModuleClientes.dfm
View File

@ -19,6 +19,9 @@ inherited DataModuleClientes: TDataModuleClientes
inherited ds_PersonalContacto: TDADataSource
DataSet = tbl_PersonalContacto.Dataset
end
inherited ds_ContactosDirecciones: TDADataSource
DataSet = tbl_ContactosDirecciones.Dataset
end
object tbl_Clientes: TDAMemDataTable
RemoteUpdatesOptions = []
Fields = <
@ -289,6 +292,10 @@ inherited DataModuleClientes: TDataModuleClientes
item
Name = 'DESCUENTO_LINEA'
DataType = datFloat
end
item
Name = 'PRECIO_PUNTO'
DataType = datCurrency
end>
Params = <>
StreamingOptions = [soDisableEventsWhileStreaming]

99
Source/Modulos/Contactos/Model/schContactosClient_Intf.pas
View File

@ -9,22 +9,22 @@ const
{ Data table rules ids
Feel free to change them to something more human readable
but make sure they are unique in the context of your application }
RID_DarEmpresasContacto = '{1FB36DE6-DC23-42C7-B954-A3A24ECE311D}';
RID_PersonalContacto = '{70DDA4E3-5FEA-49F1-9C45-8BE8D2C082D5}';
RID_DarTiendaDeUsuario = '{2DF17380-C5A2-4406-A6A6-2F212AEBB047}';
RID_SubCuentasContacto = '{2D727D73-861E-49C8-B1B5-764B64B8A412}';
RID_Contactos = '{1568D3C5-32D9-4C7C-B8C9-1476AABB4F50}';
RID_GruposCliente = '{C6EF793B-FAF7-4E3F-8C6C-4B01F45B3522}';
RID_DatosBancarios = '{A79EE7C9-DB26-4A0B-90D3-C25CE6CFE15A}';
RID_ContactosDirecciones = '{AAD0256D-CD6A-4205-9ACB-47D091882E9E}';
RID_Clientes = '{D02B22B8-1E2E-4C0B-9705-781B2C4A41CD}';
RID_Proveedores = '{4714CC20-8D74-4550-BE55-F779D8B69651}';
RID_Vendedores = '{14779032-5C76-48F8-A515-7B4F256A581B}';
RID_DireccionesContacto = '{B72D9E4D-E41D-4CCD-97F2-9DB4EBC188F1}';
RID_ClientesDescuentos = '{BA67190A-1ACE-4404-95FA-122BB4FDFA8F}';
RID_ProcedenciasCliente = '{788EE266-FBF8-4D9A-B379-3E2F606C556C}';
RID_GruposProveedor = '{1C1C218A-93F5-47BD-BED8-59F677691E59}';
RID_Contactos_Refresh = '{D6E514CB-6FB8-4E7F-A356-E1B5CF83F38E}';
RID_DarEmpresasContacto = '{B1CD2BD5-035D-41FF-B161-A85A4E1B81FD}';
RID_PersonalContacto = '{132539DB-881F-4BFA-B2EA-79761642A83C}';
RID_DarTiendaDeUsuario = '{0826FFEA-7F45-41B4-9396-02C6392E7B29}';
RID_SubCuentasContacto = '{4A5A6049-6E38-49EB-BB52-BD46E9F71910}';
RID_Contactos = '{A4D47C89-613E-4EB7-A6D7-8ABB16A9AE11}';
RID_GruposCliente = '{1D8291C4-80C5-4359-BE2A-FB460BBF2A9C}';
RID_DatosBancarios = '{0714993C-C161-4BCA-9383-05B096C402D5}';
RID_ContactosDirecciones = '{15EFF002-99DA-4693-B657-EB53D4982587}';
RID_Clientes = '{D16B71FE-C2F8-4919-917A-B1C85B191652}';
RID_Proveedores = '{032C2AFE-73BA-48A3-AA23-0719E1425CD9}';
RID_Vendedores = '{DBF99A8A-A685-4F4D-A120-7FBB5502B343}';
RID_DireccionesContacto = '{B2CF77D6-0BA2-4329-A00D-F74DF74421AA}';
RID_ClientesDescuentos = '{C70F64A9-4FE5-4C39-986E-532E18BECABD}';
RID_ProcedenciasCliente = '{EEA58D17-0860-4F45-94CD-6E7B261B6B64}';
RID_GruposProveedor = '{7431854E-DABB-4E8E-8953-274857033D0A}';
RID_Contactos_Refresh = '{26152C3B-D52A-4C48-9E5F-0CCA91D5C991}';
{ Data table names }
nme_DarEmpresasContacto = 'DarEmpresasContacto';
@ -258,6 +258,7 @@ const
fld_ClientesVENCIMIENTO_FACTURAS_3 = 'VENCIMIENTO_FACTURAS_3';
fld_ClientesDESCUENTO = 'DESCUENTO';
fld_ClientesDESCUENTO_LINEA = 'DESCUENTO_LINEA';
fld_ClientesPRECIO_PUNTO = 'PRECIO_PUNTO';
{ Clientes field indexes }
idx_ClientesID = 0;
@ -303,6 +304,7 @@ const
idx_ClientesVENCIMIENTO_FACTURAS_3 = 40;
idx_ClientesDESCUENTO = 41;
idx_ClientesDESCUENTO_LINEA = 42;
idx_ClientesPRECIO_PUNTO = 43;
{ Proveedores fields }
fld_ProveedoresID = 'ID';
@ -567,7 +569,7 @@ const
type
{ IDarEmpresasContacto }
IDarEmpresasContacto = interface(IDAStronglyTypedDataTable)
['{0CC91EA2-C5BB-4189-926A-822047027C13}']
['{B19536E4-CCC4-4A08-86ED-BC685530D003}']
{ Property getters and setters }
function GetID_EMPRESAValue: Integer;
procedure SetID_EMPRESAValue(const aValue: Integer);
@ -602,7 +604,7 @@ type
{ IPersonalContacto }
IPersonalContacto = interface(IDAStronglyTypedDataTable)
['{404F0756-744A-4575-B2DB-1D739E395CF8}']
['{D78CFC60-E5D4-4069-A165-4D1E1AE0A598}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -745,7 +747,7 @@ type
{ IDarTiendaDeUsuario }
IDarTiendaDeUsuario = interface(IDAStronglyTypedDataTable)
['{AA525615-6715-413D-8519-32BC6F62DE6E}']
['{58A119A3-0E76-4DE5-B1CA-54D28124D967}']
{ Property getters and setters }
function GetID_TIENDAValue: Integer;
procedure SetID_TIENDAValue(const aValue: Integer);
@ -780,7 +782,7 @@ type
{ ISubCuentasContacto }
ISubCuentasContacto = interface(IDAStronglyTypedDataTable)
['{7B676FC7-57FC-4939-9D00-08D59EAABB1C}']
['{776C73E6-BEEC-4ABC-8815-0EEA55B003CB}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -875,7 +877,7 @@ type
{ IContactos }
IContactos = interface(IDAStronglyTypedDataTable)
['{A0FD48D8-831A-4051-868B-3172FFAE1B6E}']
['{481C0B46-AC52-489C-9436-71B5FACFE100}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -1198,7 +1200,7 @@ type
{ IGruposCliente }
IGruposCliente = interface(IDAStronglyTypedDataTable)
['{E661AFFB-934F-4744-ADED-A9564C54A6E4}']
['{603F9FAA-864B-4FD0-A686-3E67EAAFAD3A}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -1245,7 +1247,7 @@ type
{ IDatosBancarios }
IDatosBancarios = interface(IDAStronglyTypedDataTable)
['{25800C2B-F033-495B-B88B-8B0DDD6E590C}']
['{CEEAEFB4-2BE5-4568-B9C5-22438ED14D07}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -1400,7 +1402,7 @@ type
{ IContactosDirecciones }
IContactosDirecciones = interface(IDAStronglyTypedDataTable)
['{99CA5013-33E5-4287-93AE-D491F7626363}']
['{4A80CB98-B011-4E0A-AB17-397996E10DC4}']
{ Property getters and setters }
function GetID_CONTACTOValue: Integer;
procedure SetID_CONTACTOValue(const aValue: Integer);
@ -1579,7 +1581,7 @@ type
{ IClientes }
IClientes = interface(IDAStronglyTypedDataTable)
['{EB01EA6C-7622-47E6-914B-3C426DA210F2}']
['{A012F562-08A6-45A6-8CE0-B5DED5F93C4B}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -1752,6 +1754,10 @@ type
procedure SetDESCUENTO_LINEAValue(const aValue: Float);
function GetDESCUENTO_LINEAIsNull: Boolean;
procedure SetDESCUENTO_LINEAIsNull(const aValue: Boolean);
function GetPRECIO_PUNTOValue: Currency;
procedure SetPRECIO_PUNTOValue(const aValue: Currency);
function GetPRECIO_PUNTOIsNull: Boolean;
procedure SetPRECIO_PUNTOIsNull(const aValue: Boolean);
{ Properties }
@ -1841,6 +1847,8 @@ type
property DESCUENTOIsNull: Boolean read GetDESCUENTOIsNull write SetDESCUENTOIsNull;
property DESCUENTO_LINEA: Float read GetDESCUENTO_LINEAValue write SetDESCUENTO_LINEAValue;
property DESCUENTO_LINEAIsNull: Boolean read GetDESCUENTO_LINEAIsNull write SetDESCUENTO_LINEAIsNull;
property PRECIO_PUNTO: Currency read GetPRECIO_PUNTOValue write SetPRECIO_PUNTOValue;
property PRECIO_PUNTOIsNull: Boolean read GetPRECIO_PUNTOIsNull write SetPRECIO_PUNTOIsNull;
end;
{ TClientesDataTableRules }
@ -2021,6 +2029,10 @@ type
procedure SetDESCUENTO_LINEAValue(const aValue: Float); virtual;
function GetDESCUENTO_LINEAIsNull: Boolean; virtual;
procedure SetDESCUENTO_LINEAIsNull(const aValue: Boolean); virtual;
function GetPRECIO_PUNTOValue: Currency; virtual;
procedure SetPRECIO_PUNTOValue(const aValue: Currency); virtual;
function GetPRECIO_PUNTOIsNull: Boolean; virtual;
procedure SetPRECIO_PUNTOIsNull(const aValue: Boolean); virtual;
{ Properties }
property ID: Integer read GetIDValue write SetIDValue;
@ -2109,6 +2121,8 @@ type
property DESCUENTOIsNull: Boolean read GetDESCUENTOIsNull write SetDESCUENTOIsNull;
property DESCUENTO_LINEA: Float read GetDESCUENTO_LINEAValue write SetDESCUENTO_LINEAValue;
property DESCUENTO_LINEAIsNull: Boolean read GetDESCUENTO_LINEAIsNull write SetDESCUENTO_LINEAIsNull;
property PRECIO_PUNTO: Currency read GetPRECIO_PUNTOValue write SetPRECIO_PUNTOValue;
property PRECIO_PUNTOIsNull: Boolean read GetPRECIO_PUNTOIsNull write SetPRECIO_PUNTOIsNull;
public
constructor Create(aDataTable: TDADataTable); override;
@ -2118,7 +2132,7 @@ type
{ IProveedores }
IProveedores = interface(IDAStronglyTypedDataTable)
['{F52A07E8-726F-4A4A-BE6E-C481F115651D}']
['{008D065C-3DC8-4B0F-9815-0E4780345A55}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -2645,7 +2659,7 @@ type
{ IVendedores }
IVendedores = interface(IDAStronglyTypedDataTable)
['{74374D8C-09D5-4169-8AF6-9CDA8CEEF947}']
['{EB6BD469-1356-48BF-AAC4-546B9E30021A}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -2992,7 +3006,7 @@ type
{ IDireccionesContacto }
IDireccionesContacto = interface(IDAStronglyTypedDataTable)
['{3880AC55-1F19-4B7B-9368-5BB184A3FF5F}']
['{A17C2824-B1C2-407D-81D5-371E18069F11}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -3219,7 +3233,7 @@ type
{ IClientesDescuentos }
IClientesDescuentos = interface(IDAStronglyTypedDataTable)
['{1BDBF176-EA1D-48A0-8A72-C450D1C23AD7}']
['{FB71711B-B7D3-4352-A8C8-93B2D155BC5F}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -3302,7 +3316,7 @@ type
{ IProcedenciasCliente }
IProcedenciasCliente = interface(IDAStronglyTypedDataTable)
['{96B8D8C7-408D-4C66-A3DA-4C0A3A47C37A}']
['{3D4BFE7D-F588-4936-84D5-54CF8F49C6EB}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -3349,7 +3363,7 @@ type
{ IGruposProveedor }
IGruposProveedor = interface(IDAStronglyTypedDataTable)
['{44E24820-9866-4536-9D42-B2B56AA724B7}']
['{72F0D391-50DA-4E62-B343-2D15227798C3}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -3396,7 +3410,7 @@ type
{ IContactos_Refresh }
IContactos_Refresh = interface(IDAStronglyTypedDataTable)
['{3997B747-ADBE-4F01-80F9-C1D6771E4767}']
['{47235095-C298-4F81-BB03-93D00324A420}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
@ -6146,6 +6160,27 @@ begin
DataTable.Fields[idx_ClientesDESCUENTO_LINEA].AsVariant := Null;
end;
function TClientesDataTableRules.GetPRECIO_PUNTOValue: Currency;
begin
result := DataTable.Fields[idx_ClientesPRECIO_PUNTO].AsCurrency;
end;
procedure TClientesDataTableRules.SetPRECIO_PUNTOValue(const aValue: Currency);
begin
DataTable.Fields[idx_ClientesPRECIO_PUNTO].AsCurrency := aValue;
end;
function TClientesDataTableRules.GetPRECIO_PUNTOIsNull: boolean;
begin
result := DataTable.Fields[idx_ClientesPRECIO_PUNTO].IsNull;
end;
procedure TClientesDataTableRules.SetPRECIO_PUNTOIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_ClientesPRECIO_PUNTO].AsVariant := Null;
end;
{ TProveedoresDataTableRules }
constructor TProveedoresDataTableRules.Create(aDataTable: TDADataTable);

107
Source/Modulos/Contactos/Model/schContactosServer_Intf.pas
View File

@ -9,27 +9,27 @@ const
{ Delta rules ids
Feel free to change them to something more human readable
but make sure they are unique in the context of your application }
RID_DarEmpresasContactoDelta = '{96CB4B1C-1DEA-41CA-9599-DB7C3BA0E6FB}';
RID_PersonalContactoDelta = '{7E9E0242-BBA1-48F9-B767-9ACE52D70F22}';
RID_DarTiendaDeUsuarioDelta = '{E155048E-9222-4B72-A94B-626A860172EF}';
RID_SubCuentasContactoDelta = '{7AF8F0AA-472D-4547-B89B-05C56748A6FF}';
RID_ContactosDelta = '{323DC61F-B0F4-483D-8A02-BBE9164B3631}';
RID_GruposClienteDelta = '{2E0F6E60-334C-4D8C-94D2-DA1C062375F2}';
RID_DatosBancariosDelta = '{72CB4C8A-90CB-4820-A7F6-C7F1D904DD46}';
RID_ContactosDireccionesDelta = '{56AF34D7-1CD1-4C20-A29A-2803EE02F760}';
RID_ClientesDelta = '{B76FF388-574F-44DE-8B67-6873377B03DB}';
RID_ProveedoresDelta = '{9ECDF72A-3474-4953-BD46-0D5144A83E05}';
RID_VendedoresDelta = '{2DE78E52-4D45-4268-8819-9AD19A3F56EB}';
RID_DireccionesContactoDelta = '{E6EADB4D-1AC5-44DA-A6AC-ADA149CE45E6}';
RID_ClientesDescuentosDelta = '{D0580747-9AF6-4399-B984-B924BAAA9262}';
RID_ProcedenciasClienteDelta = '{3FA9EC4E-FA9D-41B6-AAA6-1334AA57D811}';
RID_GruposProveedorDelta = '{732E6A61-6080-47B2-A359-A7BA6C27AAB9}';
RID_Contactos_RefreshDelta = '{B90A85AF-CE77-49A0-A466-874299F1EFD8}';
RID_DarEmpresasContactoDelta = '{CF466804-9FFC-4AD2-B3C7-B13339D03040}';
RID_PersonalContactoDelta = '{647FCE7F-134B-4077-B4CA-24C3840056BE}';
RID_DarTiendaDeUsuarioDelta = '{40C0ED21-9190-4A57-839F-B77CE545E5B1}';
RID_SubCuentasContactoDelta = '{D1D5AE52-9458-44C7-AE98-CBD531EB7661}';
RID_ContactosDelta = '{26A18CDC-9D64-4B00-AA4A-03CEC10AE2E8}';
RID_GruposClienteDelta = '{0DCFFD09-B348-4E03-A7B0-91D57562F149}';
RID_DatosBancariosDelta = '{9D02BFD9-36DD-498F-B4A3-8AFC2D1F399C}';
RID_ContactosDireccionesDelta = '{29BA3019-C95E-4503-850C-F11870A2F048}';
RID_ClientesDelta = '{C2FFD6BA-D37D-45C1-8497-33B0502AC23B}';
RID_ProveedoresDelta = '{0549A35C-4FFC-43B3-9565-9EA84EDBF6F7}';
RID_VendedoresDelta = '{79411DBE-399A-44E7-9599-E0A78B242C6F}';
RID_DireccionesContactoDelta = '{406D7B1E-384D-493C-B4EE-FCCE2E32406D}';
RID_ClientesDescuentosDelta = '{DCEB6001-8BB2-418E-A795-E2611C427CE9}';
RID_ProcedenciasClienteDelta = '{91B899C7-D53B-49D0-8DB3-2BDF524FBC50}';
RID_GruposProveedorDelta = '{98457F14-838A-43BA-871B-A9A1017D60E9}';
RID_Contactos_RefreshDelta = '{FB368BB9-ECA3-4F29-9FAF-69797493E035}';
type
{ IDarEmpresasContactoDelta }
IDarEmpresasContactoDelta = interface(IDarEmpresasContacto)
['{96CB4B1C-1DEA-41CA-9599-DB7C3BA0E6FB}']
['{CF466804-9FFC-4AD2-B3C7-B13339D03040}']
{ Property getters and setters }
function GetOldID_EMPRESAValue : Integer;
@ -63,7 +63,7 @@ type
{ IPersonalContactoDelta }
IPersonalContactoDelta = interface(IPersonalContacto)
['{7E9E0242-BBA1-48F9-B767-9ACE52D70F22}']
['{647FCE7F-134B-4077-B4CA-24C3840056BE}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CONTACTOValue : Integer;
@ -205,7 +205,7 @@ type
{ IDarTiendaDeUsuarioDelta }
IDarTiendaDeUsuarioDelta = interface(IDarTiendaDeUsuario)
['{E155048E-9222-4B72-A94B-626A860172EF}']
['{40C0ED21-9190-4A57-839F-B77CE545E5B1}']
{ Property getters and setters }
function GetOldID_TIENDAValue : Integer;
@ -239,7 +239,7 @@ type
{ ISubCuentasContactoDelta }
ISubCuentasContactoDelta = interface(ISubCuentasContacto)
['{7AF8F0AA-472D-4547-B89B-05C56748A6FF}']
['{D1D5AE52-9458-44C7-AE98-CBD531EB7661}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldREF_SUBCUENTAValue : String;
@ -333,7 +333,7 @@ type
{ IContactosDelta }
IContactosDelta = interface(IContactos)
['{323DC61F-B0F4-483D-8A02-BBE9164B3631}']
['{26A18CDC-9D64-4B00-AA4A-03CEC10AE2E8}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CATEGORIAValue : Integer;
@ -656,7 +656,7 @@ type
{ IGruposClienteDelta }
IGruposClienteDelta = interface(IGruposCliente)
['{2E0F6E60-334C-4D8C-94D2-DA1C062375F2}']
['{0DCFFD09-B348-4E03-A7B0-91D57562F149}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldDESCRIPCIONValue : String;
@ -702,7 +702,7 @@ type
{ IDatosBancariosDelta }
IDatosBancariosDelta = interface(IDatosBancarios)
['{72CB4C8A-90CB-4820-A7F6-C7F1D904DD46}']
['{9D02BFD9-36DD-498F-B4A3-8AFC2D1F399C}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CONTACTOValue : Integer;
@ -856,7 +856,7 @@ type
{ IContactosDireccionesDelta }
IContactosDireccionesDelta = interface(IContactosDirecciones)
['{56AF34D7-1CD1-4C20-A29A-2803EE02F760}']
['{29BA3019-C95E-4503-850C-F11870A2F048}']
{ Property getters and setters }
function GetOldID_CONTACTOValue : Integer;
function GetOldID_DIRECCIONValue : Integer;
@ -1034,7 +1034,7 @@ type
{ IClientesDelta }
IClientesDelta = interface(IClientes)
['{B76FF388-574F-44DE-8B67-6873377B03DB}']
['{C2FFD6BA-D37D-45C1-8497-33B0502AC23B}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CATEGORIAValue : Integer;
@ -1079,6 +1079,7 @@ type
function GetOldVENCIMIENTO_FACTURAS_3Value : Integer;
function GetOldDESCUENTOValue : Float;
function GetOldDESCUENTO_LINEAValue : Float;
function GetOldPRECIO_PUNTOValue : Currency;
{ Properties }
property OldID : Integer read GetOldIDValue;
@ -1124,6 +1125,7 @@ type
property OldVENCIMIENTO_FACTURAS_3 : Integer read GetOldVENCIMIENTO_FACTURAS_3Value;
property OldDESCUENTO : Float read GetOldDESCUENTOValue;
property OldDESCUENTO_LINEA : Float read GetOldDESCUENTO_LINEAValue;
property OldPRECIO_PUNTO : Currency read GetOldPRECIO_PUNTOValue;
end;
{ TClientesBusinessProcessorRules }
@ -1390,6 +1392,12 @@ type
function GetOldDESCUENTO_LINEAIsNull: Boolean; virtual;
procedure SetDESCUENTO_LINEAValue(const aValue: Float); virtual;
procedure SetDESCUENTO_LINEAIsNull(const aValue: Boolean); virtual;
function GetPRECIO_PUNTOValue: Currency; virtual;
function GetPRECIO_PUNTOIsNull: Boolean; virtual;
function GetOldPRECIO_PUNTOValue: Currency; virtual;
function GetOldPRECIO_PUNTOIsNull: Boolean; virtual;
procedure SetPRECIO_PUNTOValue(const aValue: Currency); virtual;
procedure SetPRECIO_PUNTOIsNull(const aValue: Boolean); virtual;
{ Properties }
property ID : Integer read GetIDValue write SetIDValue;
@ -1564,6 +1572,10 @@ type
property DESCUENTO_LINEAIsNull : Boolean read GetDESCUENTO_LINEAIsNull write SetDESCUENTO_LINEAIsNull;
property OldDESCUENTO_LINEA : Float read GetOldDESCUENTO_LINEAValue;
property OldDESCUENTO_LINEAIsNull : Boolean read GetOldDESCUENTO_LINEAIsNull;
property PRECIO_PUNTO : Currency read GetPRECIO_PUNTOValue write SetPRECIO_PUNTOValue;
property PRECIO_PUNTOIsNull : Boolean read GetPRECIO_PUNTOIsNull write SetPRECIO_PUNTOIsNull;
property OldPRECIO_PUNTO : Currency read GetOldPRECIO_PUNTOValue;
property OldPRECIO_PUNTOIsNull : Boolean read GetOldPRECIO_PUNTOIsNull;
public
constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@ -1573,7 +1585,7 @@ type
{ IProveedoresDelta }
IProveedoresDelta = interface(IProveedores)
['{9ECDF72A-3474-4953-BD46-0D5144A83E05}']
['{0549A35C-4FFC-43B3-9565-9EA84EDBF6F7}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CATEGORIAValue : Integer;
@ -2100,7 +2112,7 @@ type
{ IVendedoresDelta }
IVendedoresDelta = interface(IVendedores)
['{2DE78E52-4D45-4268-8819-9AD19A3F56EB}']
['{79411DBE-399A-44E7-9599-E0A78B242C6F}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CATEGORIAValue : Integer;
@ -2447,7 +2459,7 @@ type
{ IDireccionesContactoDelta }
IDireccionesContactoDelta = interface(IDireccionesContacto)
['{E6EADB4D-1AC5-44DA-A6AC-ADA149CE45E6}']
['{406D7B1E-384D-493C-B4EE-FCCE2E32406D}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CONTACTOValue : Integer;
@ -2674,7 +2686,7 @@ type
{ IClientesDescuentosDelta }
IClientesDescuentosDelta = interface(IClientesDescuentos)
['{D0580747-9AF6-4399-B984-B924BAAA9262}']
['{DCEB6001-8BB2-418E-A795-E2611C427CE9}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldID_CLIENTEValue : Integer;
@ -2756,7 +2768,7 @@ type
{ IProcedenciasClienteDelta }
IProcedenciasClienteDelta = interface(IProcedenciasCliente)
['{3FA9EC4E-FA9D-41B6-AAA6-1334AA57D811}']
['{91B899C7-D53B-49D0-8DB3-2BDF524FBC50}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldDESCRIPCIONValue : String;
@ -2802,7 +2814,7 @@ type
{ IGruposProveedorDelta }
IGruposProveedorDelta = interface(IGruposProveedor)
['{732E6A61-6080-47B2-A359-A7BA6C27AAB9}']
['{98457F14-838A-43BA-871B-A9A1017D60E9}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldDESCRIPCIONValue : String;
@ -2848,7 +2860,7 @@ type
{ IContactos_RefreshDelta }
IContactos_RefreshDelta = interface(IContactos_Refresh)
['{B90A85AF-CE77-49A0-A466-874299F1EFD8}']
['{FB368BB9-ECA3-4F29-9FAF-69797493E035}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldNIF_CIFValue : String;
@ -6721,6 +6733,37 @@ begin
BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDESCUENTO_LINEA] := Null;
end;
function TClientesBusinessProcessorRules.GetPRECIO_PUNTOValue: Currency;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesPRECIO_PUNTO];
end;
function TClientesBusinessProcessorRules.GetPRECIO_PUNTOIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesPRECIO_PUNTO]);
end;
function TClientesBusinessProcessorRules.GetOldPRECIO_PUNTOValue: Currency;
begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesPRECIO_PUNTO];
end;
function TClientesBusinessProcessorRules.GetOldPRECIO_PUNTOIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesPRECIO_PUNTO]);
end;
procedure TClientesBusinessProcessorRules.SetPRECIO_PUNTOValue(const aValue: Currency);
begin
BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesPRECIO_PUNTO] := aValue;
end;
procedure TClientesBusinessProcessorRules.SetPRECIO_PUNTOIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesPRECIO_PUNTO] := Null;
end;
{ TProveedoresBusinessProcessorRules }
constructor TProveedoresBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);

4
Source/Modulos/Contactos/Model/uBizClientesServer.pas
View File

@ -185,7 +185,8 @@ begin
ParamByName('VENCIMIENTO_FACTURAS_3').Value := aChange.NewValueByName[fld_ProveedoresVENCIMIENTO_FACTURAS_3];
ParamByName('DESCUENTO').Value := aChange.NewValueByName[fld_ClientesDESCUENTO];
ParamByName('DESCUENTO_LINEA').Value := aChange.NewValueByName[fld_ClientesDESCUENTO_LINEA];
ParamByName('DESCUENTO_LINEA').Value := aChange.NewValueByName[fld_ClientesDESCUENTO_LINEA];
ParamByName('PRECIO_PUNTO').Value := aChange.NewValueByName[fld_ClientesPRECIO_PUNTO];
Execute;
end;
@ -243,6 +244,7 @@ begin
ParamByName('DESCUENTO').Value := aChange.NewValueByName[fld_ClientesDESCUENTO];
ParamByName('DESCUENTO_LINEA').Value := aChange.NewValueByName[fld_ClientesDESCUENTO_LINEA];
ParamByName('PRECIO_PUNTO').Value := aChange.NewValueByName[fld_ClientesPRECIO_PUNTO];
Execute;
end;

22
Source/Modulos/Contactos/Model/uBizContactos.pas
View File

@ -48,6 +48,9 @@ type
function GetDESCUENTOValue: Float;
procedure SetDESCUENTOValue(const aValue: Float);
function GetPRECIO_PUNTOValue: Currency;
procedure SetPRECIO_PUNTOValue(const aValue: Currency);
function GetDESCUENTO_LINEAValue: Float;
procedure SetDESCUENTO_LINEAValue(const aValue: Float);
@ -109,6 +112,7 @@ type
property TIENDA_WEB: Integer read GetTIENDA_WEBValue write SetTIENDA_WEBValue;
property DESCUENTO: Float read GetDESCUENTOValue write SetDESCUENTOValue;
property DESCUENTO_LINEA: Float read GetDESCUENTO_LINEAValue write SetDESCUENTO_LINEAValue;
property PRECIO_PUNTO: Currency read GetPRECIO_PUNTOValue write SetPRECIO_PUNTOValue;
function GetSubCuentas: IBizSubCuentasContacto;
procedure SetSubCuentas(const Value: IBizSubCuentasContacto);
@ -266,6 +270,9 @@ type
function GetDESCUENTOValue: Float;
procedure SetDESCUENTOValue(const aValue: Float);
function GetPRECIO_PUNTOValue: Currency;
procedure SetPRECIO_PUNTOValue(const aValue: Currency);
function GetDESCUENTO_LINEAValue: Float;
procedure SetDESCUENTO_LINEAValue(const aValue: Float);
@ -343,6 +350,7 @@ type
property TIENE_SUBCUENTA: Integer read GetTiene_SubCuenta write SetTiene_Subcuenta;
property DESCUENTO: Float read GetDESCUENTOValue write SetDESCUENTOValue;
property DESCUENTO_LINEA: Float read GetDESCUENTO_LINEAValue write SetDESCUENTO_LINEAValue;
property PRECIO_PUNTO: Currency read GetPRECIO_PUNTOValue write SetPRECIO_PUNTOValue;
end;
@ -452,7 +460,7 @@ implementation
uses
uDataTableUtils, Classes, DateUtils, SysUtils, uFactuGES_App, uConfiguracionController,
uBizEmpresasTiendas, uBizTiposIVA, uBizFormasPago;
uBizEmpresasTiendas, uBizTiposIVA, uBizFormasPago, uTypesConstConfiguration;
const
PROVEEDOR_REGIMEN_IVA = 'General';
@ -629,6 +637,11 @@ begin
result := DataTable.Fields[idx_ClientesNOMBRE_COMERCIAL].AsString;
end;
function TBizCliente.GetPRECIO_PUNTOValue: Currency;
begin
result := DataTable.Fields[idx_ClientesPRECIO_PUNTO].AsCurrency;
end;
function TBizCliente.GetPROCEDENCIA_CLIENTEValue: String;
begin
result := DataTable.Fields[idx_ClientesPROCEDENCIA_CLIENTE].AsString;
@ -685,6 +698,11 @@ begin
DataTable.Fields[idx_ClientesNOMBRE_COMERCIAL].AsString := aValue;
end;
procedure TBizCliente.SetPRECIO_PUNTOValue(const aValue: Currency);
begin
DataTable.Fields[idx_ClientesPRECIO_PUNTO].AsCurrency := aValue;
end;
procedure TBizCliente.SetPROCEDENCIA_CLIENTEValue(const aValue: String);
begin
DataTable.Fields[idx_ClientesPROCEDENCIA_CLIENTE].AsString := aValue;
@ -773,7 +791,7 @@ end;
procedure TBizCliente.IniciarValoresContactoNuevo;
begin
inherited;
inherited;
ID_CATEGORIA := CATEGORIA_CLIENTE;
BLOQUEADO := 0;
RECARGO_EQUIVALENCIA := CLIENTE_RECARGO_EQUIVALENCIA;

2
Source/Modulos/Contactos/Plugin/uPluginContactos.dfm
View File

@ -279,7 +279,7 @@ object PluginContactos: TPluginContactos
end
object actVendedores: TAction
Category = 'Empresa'
Caption = 'Vendedores'
Caption = 'Vendedores \ Instaladores'
ImageIndex = 2
OnExecute = actVendedoresExecute
OnUpdate = actVendedoresUpdate

87
Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm
View File

@ -984,6 +984,10 @@ object srvContactos: TsrvContactos
item
DatasetField = 'DESCUENTO_LINEA'
TableField = 'DESCUENTO_LINEA'
end
item
DatasetField = 'PRECIO_PUNTO'
TableField = 'PRECIO_PUNTO'
end>
end>
Name = 'Clientes'
@ -1225,6 +1229,10 @@ object srvContactos: TsrvContactos
item
Name = 'DESCUENTO_LINEA'
DataType = datFloat
end
item
Name = 'PRECIO_PUNTO'
DataType = datCurrency
end>
end
item
@ -3002,78 +3010,108 @@ object srvContactos: TsrvContactos
Params = <
item
Name = 'ID_CLIENTE'
DataType = datInteger
Value = ''
end
item
Name = 'GRUPO_CLIENTE'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'RECARGO_EQUIVALENCIA'
DataType = datSmallInt
Value = ''
end
item
Name = 'NOMBRE_COMERCIAL'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'BLOQUEADO'
DataType = datSmallInt
Value = ''
end
item
Name = 'MOTIVO_BLOQUEO'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'REGIMEN_IVA'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'ID_TIPO_IVA'
DataType = datInteger
Value = ''
end
item
Name = 'ID_FORMA_PAGO'
DataType = datInteger
Value = ''
end
item
Name = 'TIENDA_WEB'
DataType = datSmallInt
Value = ''
end
item
Name = 'CODIGO_ASIGNADO'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'IGNORAR_CONTABILIDAD'
DataType = datInteger
Value = ''
end
item
Name = 'PROCEDENCIA_CLIENTE'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'TIENE_SUBCUENTA'
DataType = datInteger
Value = ''
end
item
Name = 'VENCIMIENTO_FACTURAS_1'
DataType = datInteger
Value = ''
end
item
Name = 'VENCIMIENTO_FACTURAS_2'
DataType = datInteger
Value = ''
end
item
Name = 'VENCIMIENTO_FACTURAS_3'
DataType = datInteger
Value = ''
end
item
Name = 'DESCUENTO'
DataType = datFloat
Value = ''
end
item
Name = 'DESCUENTO_LINEA'
DataType = datFloat
Value = ''
end
item
Name = 'PRECIO_PUNTO'
DataType = datCurrency
Value = ''
end>
Statements = <
@ -3086,13 +3124,14 @@ object srvContactos: TsrvContactos
'UEO, REGIMEN_IVA, ID_TIPO_IVA, ID_FORMA_PAGO, TIENDA_WEB,'#10' C' +
'ODIGO_ASIGNADO, IGNORAR_CONTABILIDAD, PROCEDENCIA_CLIENTE, TIENE' +
'_SUBCUENTA,'#10' VENCIMIENTO_FACTURAS_1, VENCIMIENTO_FACTURAS_2,' +
' VENCIMIENTO_FACTURAS_3,'#10' DESCUENTO, DESCUENTO_LINEA)'#10' VALU' +
'ES'#10' (:ID_CLIENTE, :GRUPO_CLIENTE, :RECARGO_EQUIVALENCIA, :NOM' +
'BRE_COMERCIAL, :BLOQUEADO,'#10' :MOTIVO_BLOQUEO, :REGIMEN_IVA, :' +
'ID_TIPO_IVA, :ID_FORMA_PAGO, :TIENDA_WEB,'#10' :CODIGO_ASIGNADO,' +
' :IGNORAR_CONTABILIDAD, :PROCEDENCIA_CLIENTE, :TIENE_SUBCUENTA,'#10 +
' :VENCIMIENTO_FACTURAS_1, :VENCIMIENTO_FACTURAS_2, :VENCIMIE' +
'NTO_FACTURAS_3,'#10' :DESCUENTO, :DESCUENTO_LINEA)'#10
' VENCIMIENTO_FACTURAS_3,'#10' DESCUENTO, DESCUENTO_LINEA, PRECIO' +
'_PUNTO)'#10' VALUES'#10' (:ID_CLIENTE, :GRUPO_CLIENTE, :RECARGO_EQUI' +
'VALENCIA, :NOMBRE_COMERCIAL, :BLOQUEADO,'#10' :MOTIVO_BLOQUEO, :' +
'REGIMEN_IVA, :ID_TIPO_IVA, :ID_FORMA_PAGO, :TIENDA_WEB,'#10' :CO' +
'DIGO_ASIGNADO, :IGNORAR_CONTABILIDAD, :PROCEDENCIA_CLIENTE, :TIE' +
'NE_SUBCUENTA,'#10' :VENCIMIENTO_FACTURAS_1, :VENCIMIENTO_FACTURA' +
'S_2, :VENCIMIENTO_FACTURAS_3,'#10' :DESCUENTO, :DESCUENTO_LINEA,' +
' :PRECIO_PUNTO)'#10
StatementType = stSQL
ColumnMappings = <>
end>
@ -3122,78 +3161,108 @@ object srvContactos: TsrvContactos
Params = <
item
Name = 'ID_CLIENTE'
DataType = datInteger
Value = ''
end
item
Name = 'GRUPO_CLIENTE'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'MOTIVO_BLOQUEO'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'RECARGO_EQUIVALENCIA'
DataType = datSmallInt
Value = ''
end
item
Name = 'NOMBRE_COMERCIAL'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'BLOQUEADO'
DataType = datSmallInt
Value = ''
end
item
Name = 'REGIMEN_IVA'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'ID_TIPO_IVA'
DataType = datInteger
Value = ''
end
item
Name = 'ID_FORMA_PAGO'
DataType = datInteger
Value = ''
end
item
Name = 'TIENDA_WEB'
DataType = datSmallInt
Value = ''
end
item
Name = 'CODIGO_ASIGNADO'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'IGNORAR_CONTABILIDAD'
DataType = datInteger
Value = ''
end
item
Name = 'TIENE_SUBCUENTA'
DataType = datInteger
Value = ''
end
item
Name = 'PROCEDENCIA_CLIENTE'
DataType = datString
Size = 255
Value = ''
end
item
Name = 'VENCIMIENTO_FACTURAS_1'
DataType = datInteger
Value = ''
end
item
Name = 'VENCIMIENTO_FACTURAS_2'
DataType = datInteger
Value = ''
end
item
Name = 'VENCIMIENTO_FACTURAS_3'
DataType = datInteger
Value = ''
end
item
Name = 'DESCUENTO'
DataType = datFloat
Value = ''
end
item
Name = 'DESCUENTO_LINEA'
DataType = datFloat
Value = ''
end
item
Name = 'PRECIO_PUNTO'
DataType = datCurrency
Value = ''
end
item
@ -3217,8 +3286,8 @@ object srvContactos: TsrvContactos
'O_FACTURAS_1 = :VENCIMIENTO_FACTURAS_1,'#10' VENCIMIENTO_FACTURAS' +
'_2 = :VENCIMIENTO_FACTURAS_2,'#10' VENCIMIENTO_FACTURAS_3 = :VENC' +
'IMIENTO_FACTURAS_3,'#10' DESCUENTO = :DESCUENTO,'#10' DESCUENTO_LI' +
'NEA = :DESCUENTO_LINEA'#10' WHERE'#10' (ID_CLIENTE = :OLD_ID_CLIENTE' +
')'#10
'NEA = :DESCUENTO_LINEA,'#10' PRECIO_PUNTO = :PRECIO_PUNTO'#10' WHERE' +
#10' (ID_CLIENTE = :OLD_ID_CLIENTE)'#10
StatementType = stSQL
ColumnMappings = <>
end>

1
Source/Modulos/Contactos/Views/uEditorProveedores.dfm
View File

@ -48,7 +48,6 @@ inherited fEditorProveedores: TfEditorProveedores
inherited TBXTMain2: TTBXToolbar
Left = 282
DockPos = 282
Visible = True
ExplicitLeft = 282
ExplicitWidth = 91
object TBXItem38: TTBXItem

132
Source/Modulos/Contactos/Views/uEditorVendedor.dfm
View File

@ -3,7 +3,7 @@ inherited fEditorVendedor: TfEditorVendedor
ClientHeight = 576
ClientWidth = 676
ExplicitWidth = 684
ExplicitHeight = 610
ExplicitHeight = 614
PixelsPerInch = 96
TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader
@ -65,19 +65,19 @@ inherited fEditorVendedor: TfEditorVendedor
end
inherited pgPaginas: TPageControl
Width = 670
Height = 445
Height = 442
ActivePage = pagGeneral
ExplicitTop = 109
ExplicitTop = 112
ExplicitWidth = 670
ExplicitHeight = 445
ExplicitHeight = 442
inherited pagGeneral: TTabSheet
ExplicitWidth = 662
ExplicitHeight = 417
ExplicitHeight = 414
inline frViewVendedor1: TfrViewVendedor
Left = 0
Top = 0
Width = 662
Height = 417
Height = 414
Align = alClient
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@ -88,13 +88,13 @@ inherited fEditorVendedor: TfEditorVendedor
TabOrder = 0
ReadOnly = False
ExplicitWidth = 662
ExplicitHeight = 417
ExplicitHeight = 414
inherited dxLayoutControlContacto: TdxLayoutControl
Width = 662
Height = 417
Height = 414
LookAndFeel = dxLayoutOfficeLookAndFeel
ExplicitWidth = 662
ExplicitHeight = 417
ExplicitHeight = 414
inherited PngSpeedButton1: TPngSpeedButton
Left = 617
Top = 218
@ -115,18 +115,30 @@ inherited fEditorVendedor: TfEditorVendedor
end
inherited eCalle: TcxDBTextEdit
Top = 162
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 162
ExplicitWidth = 174
Width = 174
end
inherited cbProvincia: TcxDBComboBox
Top = 189
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 189
ExplicitWidth = 144
Width = 144
end
inherited cbPoblacion: TcxDBComboBox
Top = 216
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 216
ExplicitWidth = 236
Width = 236
@ -134,12 +146,20 @@ inherited fEditorVendedor: TfEditorVendedor
inherited eCodigoPostal: TcxDBTextEdit
Left = 251
Top = 189
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 251
ExplicitTop = 189
end
inherited eTlfParticular: TcxDBTextEdit
Left = 430
Top = 57
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 430
ExplicitTop = 57
ExplicitWidth = 172
@ -148,6 +168,10 @@ inherited fEditorVendedor: TfEditorVendedor
inherited eTlfTrabajo: TcxDBTextEdit
Left = 430
Top = 30
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 430
ExplicitTop = 30
ExplicitWidth = 172
@ -156,6 +180,10 @@ inherited fEditorVendedor: TfEditorVendedor
inherited eTlfMovil: TcxDBTextEdit
Left = 430
Top = 84
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 430
ExplicitTop = 84
ExplicitWidth = 172
@ -164,6 +192,10 @@ inherited fEditorVendedor: TfEditorVendedor
inherited eFax: TcxDBTextEdit
Left = 430
Top = 111
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 430
ExplicitTop = 111
ExplicitWidth = 172
@ -171,6 +203,10 @@ inherited fEditorVendedor: TfEditorVendedor
end
inherited eNombre: TcxDBTextEdit
Top = 57
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 57
ExplicitWidth = 263
Width = 263
@ -178,6 +214,10 @@ inherited fEditorVendedor: TfEditorVendedor
inherited eNIFCIF: TcxDBTextEdit
Left = 186
Top = 30
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 186
ExplicitTop = 30
ExplicitWidth = 194
@ -187,6 +227,10 @@ inherited fEditorVendedor: TfEditorVendedor
Left = 430
Top = 162
Properties.Prefix = 'mailto:'
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 430
ExplicitTop = 162
ExplicitWidth = 129
@ -209,6 +253,10 @@ inherited fEditorVendedor: TfEditorVendedor
Left = 430
Top = 190
Properties.Prefix = 'mailto:'
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 430
ExplicitTop = 190
ExplicitWidth = 165
@ -217,6 +265,10 @@ inherited fEditorVendedor: TfEditorVendedor
inherited ePaginaWeb: TcxDBHyperLinkEdit
Left = 430
Top = 217
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 430
ExplicitTop = 217
ExplicitWidth = 165
@ -224,12 +276,20 @@ inherited fEditorVendedor: TfEditorVendedor
end
inherited eReferencia: TcxDBTextEdit
Top = 30
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 30
ExplicitWidth = 97
Width = 97
end
inherited ePersonaContacto: TcxDBTextEdit
Top = 243
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitTop = 243
ExplicitWidth = 256
Width = 256
@ -245,6 +305,10 @@ inherited fEditorVendedor: TfEditorVendedor
Width = 451
ExplicitWidth = 451
inherited cbTienda: TcxComboBox
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 376
Width = 376
end
@ -259,8 +323,6 @@ inherited fEditorVendedor: TfEditorVendedor
ExplicitHeight = 228
inherited memObservaciones: TcxDBMemo
DataBinding.DataSource = frViewVendedor1.dsContacto
ExplicitWidth = 618
ExplicitHeight = 60
Height = 228
Width = 521
end
@ -274,33 +336,47 @@ inherited fEditorVendedor: TfEditorVendedor
end
inherited pagDatosBancarios: TTabSheet
ExplicitWidth = 662
ExplicitHeight = 417
ExplicitHeight = 414
inherited frViewClienteDatosBancarios: TfrViewClienteDatosBancarios
Width = 662
Height = 417
Height = 414
ExplicitWidth = 662
ExplicitHeight = 417
ExplicitHeight = 414
inherited dxLayoutControl1: TdxLayoutControl
Width = 662
LookAndFeel = dxLayoutOfficeLookAndFeel
ExplicitWidth = 662
inherited eEntidad: TcxDBTextEdit
ExplicitWidth = 114
Width = 114
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
inherited eSucursal: TcxDBTextEdit
Left = 426
ExplicitLeft = 426
ExplicitWidth = 112
Width = 112
Left = 428
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 428
end
inherited eCuenta: TcxDBTextEdit
ExplicitWidth = 194
Width = 194
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
inherited eDC: TcxDBTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
inherited eTitular: TcxDBTextEdit
ExplicitWidth = 194
Width = 194
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
end
end
end
@ -308,15 +384,15 @@ inherited fEditorVendedor: TfEditorVendedor
inherited pagPersonal: TTabSheet
TabVisible = False
ExplicitWidth = 662
ExplicitHeight = 417
ExplicitHeight = 414
inherited frViewPersonalContacto1: TfrViewPersonalContacto
Width = 662
Height = 417
Height = 414
ExplicitWidth = 662
ExplicitHeight = 417
ExplicitHeight = 414
inherited cxGrid: TcxGrid
Width = 662
Height = 392
Height = 389
ExplicitWidth = 662
ExplicitHeight = 422
end

6
Source/Modulos/Contactos/Views/uEditorVendedor.pas
View File

@ -42,7 +42,7 @@ end;
procedure TfEditorVendedor.EliminarInterno;
begin
if (ShowConfirmMessage('¿Desea borrar este vendedor?', '') = IDYES) then
if (ShowConfirmMessage('¿Desea borrar este vendedor / instalador?', '') = IDYES) then
inherited;
end;
@ -53,9 +53,9 @@ begin
if Assigned(Contacto) then
begin
if Contacto.EsNuevo then
FTitulo := 'Nuevo vendedor'
FTitulo := 'Nuevo vendedor / instalador'
else
FTitulo := 'Vendedor';
FTitulo := 'Vendedor / instalador';
end;
inherited PonerTitulos(FTitulo);

Some files were not shown because too many files have changed in this diff Show More