Cullere/Cullere_FactuGES2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Se adapta a factura proforma

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.Cullere_FactuGES2/trunk@20 e61cf4a9-ab77-6246-bebb-cff159b4cb7d
This commit is contained in:
roberto 2018-02-09 11:10:33 +00:00
parent e0abbeaf63
commit 2ba69c25c5
21 changed files with 290 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Build/Build.fbl6
View File

Binary file not shown.

103
Source/Base/Base.dproj
View File

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

BIN
Source/Base/Base.res
View File

Binary file not shown.

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

@ -110,7 +110,7 @@ implementation
{ TControllerDetallesBase } { TControllerDetallesBase }
uses uses
cxControls, SysUtils, DB, uDAInterfaces, Dialogs; cxControls, SysUtils, DB, uDAInterfaces, Dialogs, uNumUtils;
procedure TControllerDetallesBase.ActualizarTotales(ADataTable: IDAStronglyTypedDataTable); procedure TControllerDetallesBase.ActualizarTotales(ADataTable: IDAStronglyTypedDataTable);
begin begin

43
Source/Informes/1/InfFacturaProforma.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

43
Source/Informes/InfFacturaCliente.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

43
Source/Informes/InfFacturaClienteProforma.fr3 Normal file
View File

File diff suppressed because one or more lines are too long

12
Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas
View File

@ -28,6 +28,7 @@ type
function Nuevo (WithInsert: Boolean = True) : IBizFacturaCliente; function Nuevo (WithInsert: Boolean = True) : IBizFacturaCliente;
function Anadir(AFactura : IBizFacturaCliente) : Boolean; overload; function Anadir(AFactura : IBizFacturaCliente) : Boolean; overload;
function AnadirAbono(AFactura : IBizFacturaCliente) : Boolean; function AnadirAbono(AFactura : IBizFacturaCliente) : Boolean;
function AnadirProforma(AFactura : IBizFacturaCliente) : Boolean;
function Anadir(AFacturas : IBizFacturaCliente; AListaAlbaranes : IBizAlbaranCliente): Boolean; overload; function Anadir(AFacturas : IBizFacturaCliente; AListaAlbaranes : IBizAlbaranCliente): Boolean; overload;
function Eliminar(const ID : Integer): Boolean; overload; function Eliminar(const ID : Integer): Boolean; overload;
@ -36,7 +37,7 @@ type
procedure DescartarCambios(AFactura : IBizFacturaCliente); procedure DescartarCambios(AFactura : IBizFacturaCliente);
function Existe(const ID: Integer) : Boolean; function Existe(const ID: Integer) : Boolean;
procedure RecuperarCliente(AFactura : IBizFacturaCliente); procedure RecuperarCliente(AFactura : IBizFacturaCliente);
procedure ActualizarFormaDePago(AFactura : IBizFacturaCliente; ID_FORMA_PAGO: Integer); procedure ActualizarFormaDePago(AFactura : IBizFacturaCliente; ID_FORMA_PAGO: Integer);
function Duplicar(AFactura: IBizFacturaCliente): IBizFacturaCliente; function Duplicar(AFactura: IBizFacturaCliente): IBizFacturaCliente;
function GenerarAbono(AFactura: IBizFacturaCliente): IBizFacturaCliente; function GenerarAbono(AFactura: IBizFacturaCliente): IBizFacturaCliente;
@ -92,6 +93,7 @@ type
function Existe(const ID: Integer) : Boolean; virtual; function Existe(const ID: Integer) : Boolean; virtual;
function Anadir(AFactura : IBizFacturaCliente): Boolean; overload; function Anadir(AFactura : IBizFacturaCliente): Boolean; overload;
function AnadirAbono(AFactura : IBizFacturaCliente) : Boolean; function AnadirAbono(AFactura : IBizFacturaCliente) : Boolean;
function AnadirProforma(AFactura : IBizFacturaCliente) : Boolean;
function Anadir(AFacturas : IBizFacturaCliente; AListaAlbaranes : IBizAlbaranCliente): Boolean; overload; function Anadir(AFacturas : IBizFacturaCliente; AListaAlbaranes : IBizAlbaranCliente): Boolean; overload;
function Buscar(const ID: Integer): IBizFacturaCliente; function Buscar(const ID: Integer): IBizFacturaCliente;
function BuscarTodos: IBizFacturaCliente; function BuscarTodos: IBizFacturaCliente;
@ -204,6 +206,14 @@ begin
Result := True; Result := True;
end; end;
function TFacturasClienteController.AnadirProforma(
AFactura: IBizFacturaCliente): Boolean;
begin
Anadir(AFactura);
AFactura.TIPO := CTE_TIPO_PROFORMA;
Result := True;
end;
procedure TFacturasClienteController.ActualizarFormaDePago( procedure TFacturasClienteController.ActualizarFormaDePago(
AFactura: IBizFacturaCliente; ID_FORMA_PAGO: Integer); AFactura: IBizFacturaCliente; ID_FORMA_PAGO: Integer);
var var

8
Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas
View File

@ -3,7 +3,7 @@ unit schFacturasClienteClient_Intf;
interface interface
uses uses
Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf; Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
const const
{ Data table rules ids { Data table rules ids
@ -185,7 +185,7 @@ type
end; end;
{ TListaAnosFacturasDataTableRules } { TListaAnosFacturasDataTableRules }
TListaAnosFacturasDataTableRules = class(TDADataTableRules, IListaAnosFacturas) TListaAnosFacturasDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosFacturas)
private private
protected protected
{ Property getters and setters } { Property getters and setters }
@ -531,7 +531,7 @@ type
end; end;
{ TFacturasClienteDataTableRules } { TFacturasClienteDataTableRules }
TFacturasClienteDataTableRules = class(TDADataTableRules, IFacturasCliente) TFacturasClienteDataTableRules = class(TIntfObjectDADataTableRules, IFacturasCliente)
private private
f_OBSERVACIONES: IROStrings; f_OBSERVACIONES: IROStrings;
procedure OBSERVACIONES_OnChange(Sender: TObject); procedure OBSERVACIONES_OnChange(Sender: TObject);
@ -963,7 +963,7 @@ type
end; end;
{ TFacturasCliente_DetallesDataTableRules } { TFacturasCliente_DetallesDataTableRules }
TFacturasCliente_DetallesDataTableRules = class(TDADataTableRules, IFacturasCliente_Detalles) TFacturasCliente_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IFacturasCliente_Detalles)
private private
protected protected
{ Property getters and setters } { Property getters and setters }

1
Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas
View File

@ -11,6 +11,7 @@ const
CTE_TIPO_ABONO = 'A'; CTE_TIPO_ABONO = 'A';
CTE_TIPO_FACTURA = 'F'; CTE_TIPO_FACTURA = 'F';
CTE_TIPO_PROFORMA = 'P';
CTE_PENDIENTE = 'PENDIENTE'; CTE_PENDIENTE = 'PENDIENTE';
CTE_PARCIAMENTE_PAGADA = 'PARCIALMENTE PAGADA'; CTE_PARCIAMENTE_PAGADA = 'PARCIALMENTE PAGADA';

14
Source/Modulos/Facturas de cliente/Model/uBizFacturasClienteServer.pas
View File

@ -33,8 +33,10 @@ uses
const const
REF_FACTURAS_CLIENTE = 'REF_FACTURAS_CLIENTE'; REF_FACTURAS_CLIENTE = 'REF_FACTURAS_CLIENTE';
REF_ABONOS_CLIENTE = 'REF_ABONOS_CLIENTE'; REF_ABONOS_CLIENTE = 'REF_ABONOS_CLIENTE';
REF_FACTURAS_PROFORMA = 'REF_FACTURAS_PROFORMA';
CTE_TIPO_ABONO = 'A'; CTE_TIPO_ABONO = 'A';
CTE_TIPO_FACTURA = 'F'; CTE_TIPO_FACTURA = 'F';
CTE_TIPO_PROFORMA = 'P';
{ TBizFacturasClienteServer } { TBizFacturasClienteServer }
@ -128,9 +130,11 @@ var
AClientID : TGUID; AClientID : TGUID;
ATipo : String; ATipo : String;
begin begin
//No se hace distinción en la referencia entre facturas y abonos //Se hace distinción en la referencia entre proformas y (facturas/abonos)
// if TIPO = CTE_TIPO_FACTURA then if TIPO = CTE_TIPO_PROFORMA then
ATipo := REF_FACTURAS_CLIENTE; ATipo := REF_FACTURAS_PROFORMA
else
ATipo := REF_FACTURAS_CLIENTE;
// else // else
// ATipo := REF_ABONOS_CLIENTE; // ATipo := REF_ABONOS_CLIENTE;
@ -148,7 +152,9 @@ var
AClientID : TGUID; AClientID : TGUID;
ATipo : String; ATipo : String;
begin begin
// if TIPO = CTE_TIPO_FACTURA then if TIPO = CTE_TIPO_PROFORMA then
ATipo := REF_FACTURAS_PROFORMA
else
ATipo := REF_FACTURAS_CLIENTE; ATipo := REF_FACTURAS_CLIENTE;
// else // else
// ATipo := REF_ABONOS_CLIENTE; // ATipo := REF_ABONOS_CLIENTE;

63
Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm
View File

@ -642,32 +642,33 @@ object RptFacturasCliente: TRptFacturasCliente
TargetTable = 'FACTURAS_CLIENTE' TargetTable = 'FACTURAS_CLIENTE'
SQL = SQL =
'SELECT'#10' V_FACTURAS_CLIENTE.ID, V_FACTURAS_CLIENTE.REFERENCIA,' + 'SELECT'#10' V_FACTURAS_CLIENTE.ID, V_FACTURAS_CLIENTE.REFERENCIA,' +
' V_FACTURAS_CLIENTE.FECHA_FACTURA,'#10' V_FACTURAS_CLIENTE.TIENDA' + ' V_FACTURAS_CLIENTE.FECHA_FACTURA,'#10' V_FACTURAS_CLIENTE.TIPO,'#10 +
', V_FACTURAS_CLIENTE.ID_TIENDA,'#10' V_FACTURAS_CLIENTE.IMPORTE_N' + ' V_FACTURAS_CLIENTE.TIENDA, V_FACTURAS_CLIENTE.ID_TIENDA,'#10' ' +
'ETO,'#10' V_FACTURAS_CLIENTE.BASE_IMPONIBLE, V_FACTURAS_CLIENTE.D' + ' V_FACTURAS_CLIENTE.IMPORTE_NETO,'#10' V_FACTURAS_CLIENTE.BASE_IM' +
'ESCUENTO, V_FACTURAS_CLIENTE.IMPORTE_DESCUENTO,'#10' V_FACTURAS_C' + 'PONIBLE, V_FACTURAS_CLIENTE.DESCUENTO, V_FACTURAS_CLIENTE.IMPORT' +
'LIENTE.IVA, V_FACTURAS_CLIENTE.IMPORTE_IVA,'#10' V_FACTURAS_CLIEN' + 'E_DESCUENTO,'#10' V_FACTURAS_CLIENTE.IVA, V_FACTURAS_CLIENTE.IMPO' +
'TE.RE, V_FACTURAS_CLIENTE.IMPORTE_RE,'#10' V_FACTURAS_CLIENTE.IMP' + 'RTE_IVA,'#10' V_FACTURAS_CLIENTE.RE, V_FACTURAS_CLIENTE.IMPORTE_R' +
'ORTE_TOTAL,'#10' V_FACTURAS_CLIENTE.OBSERVACIONES, FORMAS_PAGO.DE' + 'E,'#10' V_FACTURAS_CLIENTE.IMPORTE_TOTAL,'#10' V_FACTURAS_CLIENTE.' +
'SCRIPCION AS FORMA_PAGO, V_FACTURAS_CLIENTE.ID_CLIENTE,'#10' V_FA' + 'OBSERVACIONES, FORMAS_PAGO.DESCRIPCION AS FORMA_PAGO, V_FACTURAS' +
'CTURAS_CLIENTE.REFERENCIA_CLIENTE, V_FACTURAS_CLIENTE.TELEFONO_C' + '_CLIENTE.ID_CLIENTE,'#10' V_FACTURAS_CLIENTE.REFERENCIA_CLIENTE, ' +
'LIENTE, V_FACTURAS_CLIENTE.NIF_CIF, V_FACTURAS_CLIENTE.NOMBRE, V' + 'V_FACTURAS_CLIENTE.TELEFONO_CLIENTE, V_FACTURAS_CLIENTE.NIF_CIF,' +
'_FACTURAS_CLIENTE.CALLE,'#10' V_FACTURAS_CLIENTE.PROVINCIA, V_FAC' + ' V_FACTURAS_CLIENTE.NOMBRE, V_FACTURAS_CLIENTE.CALLE,'#10' V_FACT' +
'TURAS_CLIENTE.CODIGO_POSTAL, V_FACTURAS_CLIENTE.POBLACION,'#10' C' + 'URAS_CLIENTE.PROVINCIA, V_FACTURAS_CLIENTE.CODIGO_POSTAL, V_FACT' +
'ONTACTOS_DATOS_BANCO.TITULAR,'#10' CONTACTOS_DATOS_BANCO.ENTIDAD,' + 'URAS_CLIENTE.POBLACION,'#10' CONTACTOS_DATOS_BANCO.TITULAR,'#10' C' +
#10' CONTACTOS_DATOS_BANCO.SUCURSAL,'#10' CONTACTOS_DATOS_BANCO.D' + 'ONTACTOS_DATOS_BANCO.ENTIDAD,'#10' CONTACTOS_DATOS_BANCO.SUCURSAL' +
'C,'#10' CONTACTOS_DATOS_BANCO.CUENTA,'#10' ID_EMPRESA, EMPRESAS.NI' + ','#10' CONTACTOS_DATOS_BANCO.DC,'#10' CONTACTOS_DATOS_BANCO.CUENTA' +
'F_CIF as NIF_CIF_EMPRESA, EMPRESAS.RAZON_SOCIAL,'#10' EMPRESAS.CA' + ','#10' ID_EMPRESA, EMPRESAS.NIF_CIF as NIF_CIF_EMPRESA, EMPRESAS.' +
'LLE as CALLE_EMPRESA, EMPRESAS.POBLACION as POBLACION_EMPRESA,'#10' ' + 'RAZON_SOCIAL,'#10' EMPRESAS.CALLE as CALLE_EMPRESA, EMPRESAS.POBL' +
' EMPRESAS.PROVINCIA as PROVINCIA_EMPRESA, EMPRESAS.CODIGO_POST' + 'ACION as POBLACION_EMPRESA,'#10' EMPRESAS.PROVINCIA as PROVINCIA_' +
'AL as CODIGO_POSTAL_EMPRESA,'#10' EMPRESAS.TELEFONO_1, EMPRESAS.F' + 'EMPRESA, EMPRESAS.CODIGO_POSTAL as CODIGO_POSTAL_EMPRESA,'#10' EM' +
'AX, EMPRESAS.MOVIL_1, EMPRESAS.EMAIL_1,'#10' EMPRESAS.PAGINA_WEB,' + 'PRESAS.TELEFONO_1, EMPRESAS.FAX, EMPRESAS.MOVIL_1, EMPRESAS.EMAI' +
' EMPRESAS.REGISTRO_MERCANTIL, EMPRESAS.LOGOTIPO,'#10' V_FACTURAS_' + 'L_1,'#10' EMPRESAS.PAGINA_WEB, EMPRESAS.REGISTRO_MERCANTIL, EMPRE' +
'CLIENTE.REFERENCIA_PRESUPUESTO'#10'FROM V_FACTURAS_CLIENTE'#10'LEFT JOIN' + 'SAS.LOGOTIPO,'#10' V_FACTURAS_CLIENTE.REFERENCIA_PRESUPUESTO'#10'FROM' +
' EMPRESAS ON EMPRESAS.ID = ID_EMPRESA'#10'LEFT JOIN FORMAS_PAGO ON (' + ' V_FACTURAS_CLIENTE'#10'LEFT JOIN EMPRESAS ON EMPRESAS.ID = ID_EMPRE' +
'FORMAS_PAGO.ID = V_FACTURAS_CLIENTE.ID_FORMA_PAGO)'#10'LEFT JOIN CON' + 'SA'#10'LEFT JOIN FORMAS_PAGO ON (FORMAS_PAGO.ID = V_FACTURAS_CLIENTE' +
'TACTOS_DATOS_BANCO ON (CONTACTOS_DATOS_BANCO.ID_CONTACTO = V_FAC' + '.ID_FORMA_PAGO)'#10'LEFT JOIN CONTACTOS_DATOS_BANCO ON (CONTACTOS_DA' +
'TURAS_CLIENTE.ID_CLIENTE)'#10'WHERE V_FACTURAS_CLIENTE.ID = :ID'#10 'TOS_BANCO.ID_CONTACTO = V_FACTURAS_CLIENTE.ID_CLIENTE)'#10'WHERE V_F' +
'ACTURAS_CLIENTE.ID = :ID'#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = < ColumnMappings = <
item item
@ -871,6 +872,11 @@ object RptFacturasCliente: TRptFacturasCliente
DatasetField = 'TELEFONO_CLIENTE' DatasetField = 'TELEFONO_CLIENTE'
TableField = '<unknown>' TableField = '<unknown>'
SQLOrigin = 'TELEFONO_CLIENTE' SQLOrigin = 'TELEFONO_CLIENTE'
end
item
DatasetField = 'TIPO'
TableField = '<unknown>'
SQLOrigin = 'TIPO'
end> end>
end> end>
Name = 'InformeFacturasCliente' Name = 'InformeFacturasCliente'
@ -892,6 +898,11 @@ object RptFacturasCliente: TRptFacturasCliente
DataType = datDateTime DataType = datDateTime
DictionaryEntry = 'FacturasCliente_FECHA_FACTURA' DictionaryEntry = 'FacturasCliente_FECHA_FACTURA'
end end
item
Name = 'TIPO'
DataType = datString
Size = 1
end
item item
Name = 'TIENDA' Name = 'TIENDA'
DataType = datString DataType = datString

8
Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas
View File

@ -82,6 +82,7 @@ uses
const const
rptFacturaCliente = 'InfFacturaCliente.fr3'; rptFacturaCliente = 'InfFacturaCliente.fr3';
rptFacturaProforma = 'InfFacturaProforma.fr3';
rptInformeIVA = 'InformeIVAClientes.fr3'; rptInformeIVA = 'InformeIVAClientes.fr3';
rptInformeIVADesglosado = 'InformeIVAClientesDesglosado.fr3'; rptInformeIVADesglosado = 'InformeIVAClientesDesglosado.fr3';
@ -685,7 +686,12 @@ begin
tbl_Detalles.Active := True; tbl_Detalles.Active := True;
tbl_Vencimientos.Active := True; tbl_Vencimientos.Active := True;
AInforme := DarRutaFichero(DarRutaInformes, rptFacturaCliente, tbl_Cabecera.FieldByName('ID_EMPRESA').AsString, tbl_Cabecera.FieldByName('ID_TIENDA').AsString); if (tbl_Cabecera.FieldByName('TIPO').AsString = 'P') then
AInforme := DarRutaFichero(DarRutaInformes, rptFacturaProforma, tbl_Cabecera.FieldByName('ID_EMPRESA').AsString, tbl_Cabecera.FieldByName('ID_TIENDA').AsString)
else
AInforme := DarRutaFichero(DarRutaInformes, rptFacturaCliente, tbl_Cabecera.FieldByName('ID_EMPRESA').AsString, tbl_Cabecera.FieldByName('ID_TIENDA').AsString);
if VarIsNull(AInforme) then if VarIsNull(AInforme) then
raise Exception.Create (('Error Servidor: _GenerarFactura, no encuentra informe ' + rptFacturaCliente)); raise Exception.Create (('Error Servidor: _GenerarFactura, no encuentra informe ' + rptFacturaCliente));

45
Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm
View File

@ -115,63 +115,43 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 159
Width = 159
end end
inherited edtFecha: TcxDBDateEdit inherited edtFecha: TcxDBDateEdit
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 159
Width = 159
end end
inherited cbFormaPago: TcxDBLookupComboBox inherited cbFormaPago: TcxDBLookupComboBox
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 78
Width = 78
end end
inherited bFormasPago: TButton inherited bFormasPago: TButton
Left = 312 Left = 312
ExplicitLeft = 312 ExplicitLeft = 312
end end
inherited frViewTienda1: TfrViewTienda inherited frViewTienda1: TfrViewTienda
Width = 351
ExplicitWidth = 351
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 351
inherited cbTienda: TcxComboBox inherited cbTienda: TcxComboBox
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 399
Width = 399
end end
end end
end end
inherited frViewClienteFactura1: TfrViewClienteFactura inherited frViewClienteFactura1: TfrViewClienteFactura
Left = 472 Left = 472
Width = 398
ExplicitLeft = 472 ExplicitLeft = 472
ExplicitWidth = 398
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 398
inherited Bevel1: TBevel
Width = 266
ExplicitWidth = 266
end
inherited edtlNombre: TcxDBTextEdit inherited edtlNombre: TcxDBTextEdit
DataBinding.DataSource = dsDataTable DataBinding.DataSource = dsDataTable
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 276
Width = 276
end end
inherited edtNIFCIF: TcxDBTextEdit inherited edtNIFCIF: TcxDBTextEdit
DataBinding.DataSource = dsDataTable DataBinding.DataSource = dsDataTable
@ -179,8 +159,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 276
Width = 276
end end
inherited edtCalle: TcxDBTextEdit inherited edtCalle: TcxDBTextEdit
DataBinding.DataSource = dsDataTable DataBinding.DataSource = dsDataTable
@ -188,8 +166,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 276
Width = 276
end end
inherited edtPoblacion: TcxDBTextEdit inherited edtPoblacion: TcxDBTextEdit
DataBinding.DataSource = dsDataTable DataBinding.DataSource = dsDataTable
@ -197,8 +173,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 158
Width = 158
end end
inherited edtProvincia: TcxDBTextEdit inherited edtProvincia: TcxDBTextEdit
DataBinding.DataSource = dsDataTable DataBinding.DataSource = dsDataTable
@ -206,8 +180,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 276
Width = 276
end end
inherited edtCodigoPostal: TcxDBTextEdit inherited edtCodigoPostal: TcxDBTextEdit
Left = 306 Left = 306
@ -227,8 +199,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 283
Width = 283
end end
end end
end end
@ -237,19 +207,14 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 310
Width = 310
end end
inherited frViewObservaciones1: TfrViewObservaciones inherited frViewObservaciones1: TfrViewObservaciones
Width = 521
Height = 228 Height = 228
ExplicitWidth = 521
ExplicitHeight = 228 ExplicitHeight = 228
inherited memObservaciones: TcxDBMemo inherited memObservaciones: TcxDBMemo
DataBinding.DataSource = frViewFacturaCliente1.DADataSource DataBinding.DataSource = frViewFacturaCliente1.DADataSource
ExplicitHeight = 228 ExplicitHeight = 228
Height = 228 Height = 228
Width = 521
end end
end end
inherited cbRecargoEquivalencia: TcxDBCheckBox inherited cbRecargoEquivalencia: TcxDBCheckBox
@ -257,12 +222,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 158
Width = 158
end
inherited edtSituacion: TcxDBComboBox
ExplicitWidth = 121
Width = 121
end end
end end
end end
@ -475,10 +434,8 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
inherited Bevel3: TBevel inherited Bevel3: TBevel
Left = 489 Left = 489
Top = 30 Top = 30
Height = 122
ExplicitLeft = 489 ExplicitLeft = 489
ExplicitTop = 30 ExplicitTop = 30
ExplicitHeight = 122
end end
inherited Bevel4: TBevel inherited Bevel4: TBevel
Left = 601 Left = 601
@ -597,8 +554,6 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 672 ExplicitLeft = 672
ExplicitTop = 104 ExplicitTop = 104
ExplicitWidth = 56
Width = 56
end end
inherited eImporteNeto: TcxDBCurrencyEdit inherited eImporteNeto: TcxDBCurrencyEdit
Top = 30 Top = 30

18
Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas
View File

@ -293,13 +293,13 @@ begin
begin begin
if FFactura.TIPO = CTE_TIPO_FACTURA then if FFactura.TIPO = CTE_TIPO_FACTURA then
ShowInfoMessage('La factura se ha dado de alta con el código ' + FFactura.REFERENCIA) ShowInfoMessage('La factura se ha dado de alta con el código ' + FFactura.REFERENCIA)
else if FFactura.TIPO = CTE_TIPO_ABONO then
ShowInfoMessage('El abono se ha dado de alta con el código ' + FFactura.REFERENCIA)
else else
begin ShowInfoMessage('La factura proforma se ha dado de alta con el código ' + FFactura.REFERENCIA)
ShowInfoMessage('El abono se ha dado de alta con el código ' + FFactura.REFERENCIA);
//Preguntamos is desea hacer una orden de devolución asociada //Preguntamos is desea hacer una orden de devolución asociada
// if (Application.MessageBox('¿Desea crear una orden de devolución para el abono?', 'Atención', MB_YESNO) = IDYES) then // if (Application.MessageBox('¿Desea crear una orden de devolución para el abono?', 'Atención', MB_YESNO) = IDYES) then
// GenerarAlbaranCli(FFactura); // GenerarAlbaranCli(FFactura);
end;
end; end;
Modified := False; Modified := False;
@ -393,8 +393,10 @@ begin
begin begin
if FFactura.TIPO = CTE_TIPO_FACTURA then if FFactura.TIPO = CTE_TIPO_FACTURA then
ACadena := 'Antes debe elegir un cliente para esta factura' ACadena := 'Antes debe elegir un cliente para esta factura'
else if FFactura.TIPO = CTE_TIPO_ABONO then
ACadena := 'Antes debe elegir un cliente para este abono'
else else
ACadena := 'Antes debe elegir un cliente para este abono'; ACadena := 'Antes debe elegir un cliente para esta factura proforma';
ShowWarningMessage(ACadena); ShowWarningMessage(ACadena);
AllowChange := False; AllowChange := False;
end; end;
@ -410,13 +412,17 @@ begin
if Factura.EsNuevo then if Factura.EsNuevo then
if Factura.TIPO = CTE_TIPO_FACTURA then if Factura.TIPO = CTE_TIPO_FACTURA then
FTitulo := 'Nueva factura de cliente' FTitulo := 'Nueva factura de cliente'
else else if Factura.TIPO = CTE_TIPO_ABONO then
FTitulo := 'Nuevo abono a cliente' FTitulo := 'Nuevo abono a cliente'
else
FTitulo := 'Nueva factura proforma de cliente'
else else
if Factura.TIPO = CTE_TIPO_FACTURA then if Factura.TIPO = CTE_TIPO_FACTURA then
FTitulo := 'Factura de cliente' + ' - ' + FFactura.Cliente.Nombre FTitulo := 'Factura de cliente' + ' - ' + FFactura.Cliente.Nombre
else if Factura.TIPO = CTE_TIPO_ABONO then
FTitulo := 'Abono a cliente' + ' - ' + FFactura.Cliente.Nombre
else else
FTitulo := 'Abono a cliente' + ' - ' + FFactura.Cliente.Nombre FTitulo := 'Factura proforma de cliente' + ' - ' + FFactura.Cliente.Nombre
end; end;
inherited PonerTitulos(FTitulo); inherited PonerTitulos(FTitulo);

9
Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.dfm
View File

@ -52,6 +52,9 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
Action = actNuevoAbono Action = actNuevoAbono
Caption = 'Nuevo abono...' Caption = 'Nuevo abono...'
end end
object TBXItem41: TTBXItem
Action = actNuevaProforma
end
end end
inherited TBXItem2: TTBXItem inherited TBXItem2: TTBXItem
Visible = False Visible = False
@ -285,6 +288,12 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
ImageIndex = 25 ImageIndex = 25
OnExecute = actInformesExecute OnExecute = actInformesExecute
end end
object actNuevaProforma: TAction
Category = 'Archivo'
Caption = 'Proforma'
ImageIndex = 6
OnExecute = actNuevaProformaExecute
end
end end
inherited SmallImages: TPngImageList [5] inherited SmallImages: TPngImageList [5]
PngImages = < PngImages = <

9
Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas
View File

@ -35,12 +35,15 @@ type
actInformes: TAction; actInformes: TAction;
JSInformesDialog: TJSDialog; JSInformesDialog: TJSDialog;
TBXItem40: TTBXItem; TBXItem40: TTBXItem;
actNuevaProforma: TAction;
TBXItem41: TTBXItem;
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
procedure actEliminarUpdate(Sender: TObject); procedure actEliminarUpdate(Sender: TObject);
procedure actNuevaFacturaExecute(Sender: TObject); procedure actNuevaFacturaExecute(Sender: TObject);
procedure actNuevoAbonoExecute(Sender: TObject); procedure actNuevoAbonoExecute(Sender: TObject);
procedure actInformesExecute(Sender: TObject); procedure actInformesExecute(Sender: TObject);
procedure OnListaAnosChange(Sender: TObject; const Text: string); procedure OnListaAnosChange(Sender: TObject; const Text: string);
procedure actNuevaProformaExecute(Sender: TObject);
private private
FFacturas: IBizFacturaCliente; FFacturas: IBizFacturaCliente;
@ -128,6 +131,12 @@ begin
actNuevo.Execute; actNuevo.Execute;
end; end;
procedure TfEditorFacturasCliente.actNuevaProformaExecute(Sender: TObject);
begin
if FController.AnadirProforma(Facturas) then
FController.Ver(Facturas);
end;
procedure TfEditorFacturasCliente.actNuevoAbonoExecute(Sender: TObject); procedure TfEditorFacturasCliente.actNuevoAbonoExecute(Sender: TObject);
var var
Respuesta : Integer; Respuesta : Integer;

8
Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm
View File

@ -32,6 +32,10 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
item item
Description = 'Abono' Description = 'Abono'
Value = 'A' Value = 'A'
end
item
Description = 'Proforma'
Value = 'P'
end> end>
end end
object cxGridViewTIENDA: TcxGridDBColumn object cxGridViewTIENDA: TcxGridDBColumn
@ -408,6 +412,10 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
AssignedValues = [svTextColor] AssignedValues = [svTextColor]
TextColor = clBlue TextColor = clBlue
end end
object cxStyleProforma: TcxStyle
AssignedValues = [svTextColor]
TextColor = clGreen
end
end end
object PngImageList: TPngImageList object PngImageList: TPngImageList
PngImages = < PngImages = <

1
Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas
View File

@ -64,6 +64,7 @@ type
cxGridViewREFERENCIA_PRESUPUESTO: TcxGridDBColumn; cxGridViewREFERENCIA_PRESUPUESTO: TcxGridDBColumn;
cxGridViewREF_CLI_CONTRATO: TcxGridDBColumn; cxGridViewREF_CLI_CONTRATO: TcxGridDBColumn;
cxGridViewFECHA_COBRO: TcxGridDBColumn; cxGridViewFECHA_COBRO: TcxGridDBColumn;
cxStyleProforma: TcxStyle;
procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
out AStyle: TcxStyle); out AStyle: TcxStyle);

3
Source/Servidor/FactuGES_Server.dproj
View File

@ -30,6 +30,9 @@
<BorlandProject> <BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">3</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">2.6.3.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.6.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 08 de octubre de 2013 18:53</VersionInfoKeys></VersionInfoKeys><Excluded_Packages> <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">3</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">2.6.3.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.6.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 08 de octubre de 2013 18:53</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 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_Server.dpr</Source></Source></Delphi.Personality><ModelSupport>True</ModelSupport></BorlandProject></BorlandProject> </Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality><ModelSupport>True</ModelSupport></BorlandProject></BorlandProject>
</ProjectExtensions> </ProjectExtensions>

BIN
Source/Servidor/FactuGES_Server.res
View File

Binary file not shown.