Tecistel/Tecsitel_FactuGES2
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Se arreglan detalles del funcionamiento de retencion y se repasan bien los informes

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@850 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
roberto 2009-01-16 20:07:01 +00:00
parent 0d6cdadd67
commit a1de6f9c99
11 changed files with 416 additions and 399 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
Source/Base/Base.dproj
View File

@ -54,57 +54,57 @@
<DelphiCompile Include="Base.dpk"> <DelphiCompile Include="Base.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\Modulos\Facturas de proveedor\adortl.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\adortl.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxDataD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxEditorsD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxExportD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\cxExportD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxExtEditorsD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxGridD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\cxGridD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxIntl6D11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\cxIntl6D11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxIntlPrintSys3D11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\cxIntlPrintSys3D11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxLibraryD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\cxPageControlD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\cxPageControlD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\DataAbstract_Core_D11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\dbrtl.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\dclIndyCore.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\dclIndyCore.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\designide.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\designide.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\dsnap.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\dsnap.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\dxGDIPlusD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\dxPSCoreD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\dxPSCoreD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\dxThemeD11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\GUISDK_D11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\GUISDK_D11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\IndyCore.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\IndyCore.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\IndyProtocols.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\IndyProtocols.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\IndySystem.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\IndySystem.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\Jcl.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\Jcl.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JclVcl.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\JclVcl.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JSDialog100.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\JSDialog100.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvCmpD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\JvCmpD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvCoreD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\JvCoreD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvCtrlsD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvDlgsD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\JvDlgsD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvMMD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\JvMMD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvNetD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\JvNetD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvPageCompsD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvStdCtrlsD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\JvSystemD11R.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\JvSystemD11R.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\pckMD5.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\pckMD5.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\pckUCDataConnector.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\pckUCDataConnector.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\pckUserControl_RT.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\pckUserControl_RT.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\PngComponentsD10.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\PNG_D10.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\RemObjects_Core_D11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\RemObjects_Indy_D11.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\RemObjects_Indy_D11.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\rtl.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\rtl.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\TB2k_D10.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\TB2k_D10.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\tbx_d10.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\vcl.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\vcl.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\vclactnband.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\vcldb.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\vcldb.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\vcljpg.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\VclSmp.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\VclSmp.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\vclx.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\vclx.dcp" />
<DCCReference Include="..\Modulos\Facturas de proveedor\xmlrtl.dcp" /> <DCCReference Include="..\Modulos\Facturas de cliente\xmlrtl.dcp" />
<DCCReference Include="..\Servicios\FactuGES_Intf.pas" /> <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
<DCCReference Include="Conexion\uConfigurarConexion.pas"> <DCCReference Include="Conexion\uConfigurarConexion.pas">
<Form>fConfigurarConexion</Form> <Form>fConfigurarConexion</Form>

BIN
Source/Base/Base.res
View File

Binary file not shown.

32
Source/GUIBase/uViewTotales.dfm
View File

@ -1,8 +1,8 @@
inherited frViewTotales: TfrViewTotales inherited frViewTotales: TfrViewTotales
Width = 966 Width = 451
Height = 252 Height = 252
Align = alBottom Align = alBottom
ExplicitWidth = 966 ExplicitWidth = 451
ExplicitHeight = 252 ExplicitHeight = 252
object Bevel5: TBevel object Bevel5: TBevel
Left = 666 Left = 666
@ -15,7 +15,7 @@ inherited frViewTotales: TfrViewTotales
AlignWithMargins = True AlignWithMargins = True
Left = 0 Left = 0
Top = 0 Top = 0
Width = 966 Width = 451
Height = 252 Height = 252
Margins.Left = 0 Margins.Left = 0
Margins.Top = 0 Margins.Top = 0
@ -26,23 +26,22 @@ inherited frViewTotales: TfrViewTotales
TabOrder = 0 TabOrder = 0
TabStop = False TabStop = False
AutoContentSizes = [acsWidth, acsHeight] AutoContentSizes = [acsWidth, acsHeight]
ExplicitHeight = 265
object Bevel3: TBevel object Bevel3: TBevel
Left = 490 Left = 305
Top = 28 Top = 28
Width = 3 Width = 3
Height = 100 Height = 100
Shape = bsRightLine Shape = bsRightLine
end end
object Bevel4: TBevel object Bevel4: TBevel
Left = 602 Left = 417
Top = 70 Top = 70
Width = 342 Width = 342
Height = 9 Height = 9
Shape = bsBottomLine Shape = bsBottomLine
end end
object Bevel1: TBevel object Bevel1: TBevel
Left = 602 Left = 417
Top = 186 Top = 186
Width = 368 Width = 368
Height = 9 Height = 9
@ -91,7 +90,7 @@ inherited frViewTotales: TfrViewTotales
Width = 87 Width = 87
end end
object ImporteIVA: TcxDBCurrencyEdit object ImporteIVA: TcxDBCurrencyEdit
Left = 673 Left = 488
Top = 105 Top = 105
AutoSize = False AutoSize = False
DataBinding.DataField = 'IMPORTE_IVA' DataBinding.DataField = 'IMPORTE_IVA'
@ -126,7 +125,7 @@ inherited frViewTotales: TfrViewTotales
Width = 20 Width = 20
end end
object ImporteTotal: TcxDBCurrencyEdit object ImporteTotal: TcxDBCurrencyEdit
Left = 603 Left = 418
Top = 159 Top = 159
AutoSize = False AutoSize = False
DataBinding.DataField = 'IMPORTE_TOTAL' DataBinding.DataField = 'IMPORTE_TOTAL'
@ -196,7 +195,7 @@ inherited frViewTotales: TfrViewTotales
Width = 65 Width = 65
end end
object edtIVA: TcxDBSpinEdit object edtIVA: TcxDBSpinEdit
Left = 602 Left = 417
Top = 105 Top = 105
AutoSize = False AutoSize = False
DataBinding.DataField = 'IVA' DataBinding.DataField = 'IVA'
@ -237,7 +236,7 @@ inherited frViewTotales: TfrViewTotales
Width = 65 Width = 65
end end
object ImporteBase: TcxDBCurrencyEdit object ImporteBase: TcxDBCurrencyEdit
Left = 602 Left = 417
Top = 28 Top = 28
AutoSize = False AutoSize = False
DataBinding.DataField = 'BASE_IMPONIBLE' DataBinding.DataField = 'BASE_IMPONIBLE'
@ -272,7 +271,7 @@ inherited frViewTotales: TfrViewTotales
Width = 91 Width = 91
end end
object edtRE: TcxDBSpinEdit object edtRE: TcxDBSpinEdit
Left = 602 Left = 417
Top = 132 Top = 132
AutoSize = False AutoSize = False
DataBinding.DataField = 'RE' DataBinding.DataField = 'RE'
@ -313,7 +312,7 @@ inherited frViewTotales: TfrViewTotales
Width = 65 Width = 65
end end
object ImporteRE: TcxDBCurrencyEdit object ImporteRE: TcxDBCurrencyEdit
Left = 673 Left = 488
Top = 132 Top = 132
AutoSize = False AutoSize = False
DataBinding.DataField = 'IMPORTE_RE' DataBinding.DataField = 'IMPORTE_RE'
@ -451,7 +450,7 @@ inherited frViewTotales: TfrViewTotales
Width = 20 Width = 20
end end
object bTiposIVA: TButton object bTiposIVA: TButton
Left = 342 Left = 157
Top = 109 Top = 109
Width = 132 Width = 132
Height = 21 Height = 21
@ -489,7 +488,7 @@ inherited frViewTotales: TfrViewTotales
Width = 221 Width = 221
end end
object edtRetencion: TcxDBSpinEdit object edtRetencion: TcxDBSpinEdit
Left = 602 Left = 417
Top = 206 Top = 206
AutoSize = False AutoSize = False
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -528,13 +527,14 @@ inherited frViewTotales: TfrViewTotales
Width = 65 Width = 65
end end
object edtImporteRetencion: TcxDBCurrencyEdit object edtImporteRetencion: TcxDBCurrencyEdit
Left = 673 Left = 488
Top = 206 Top = 206
AutoSize = False AutoSize = False
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
Enabled = False Enabled = False
ParentFont = False ParentFont = False
Properties.Alignment.Horz = taRightJustify Properties.Alignment.Horz = taRightJustify
Properties.DisplayFormat = '-,0.00 '#8364';,0.00 '#8364
Properties.ReadOnly = True Properties.ReadOnly = True
Properties.UseLeftAlignmentOnEditing = False Properties.UseLeftAlignmentOnEditing = False
Properties.UseThousandSeparator = True Properties.UseThousandSeparator = True

BIN
Source/Informes/1/FacturaCliente.rdx
View File

Binary file not shown.

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

File diff suppressed because one or more lines are too long

BIN
Source/Informes/2/FacturaCliente.rdx
View File

Binary file not shown.

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

File diff suppressed because one or more lines are too long

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

@ -579,6 +579,11 @@ begin
if (EsFechaVacia(AFactura.FECHA_FACTURA)) then if (EsFechaVacia(AFactura.FECHA_FACTURA)) then
raise Exception.Create('Debe indicar la fecha de esta factura'); raise Exception.Create('Debe indicar la fecha de esta factura');
//En el caso de asignar una retención a la factura será obligatorio meter la fecha de retención.
if (AFactura.IMPORTE_RETENCION > 0) then
if (EsFechaVacia(AFactura.FECHA_RETENCION)) then
raise Exception.Create('Debe indicar la fecha de vencimiento de la retención, para poder asociarla al recibo que contendrá el importe de la retención.');
if (AFactura.Detalles.DataTable.RecordCount = 0) then if (AFactura.Detalles.DataTable.RecordCount = 0) then
raise Exception.Create('La factura debe tener al menos un concepto en su contenido'); raise Exception.Create('La factura debe tener al menos un concepto en su contenido');

1
Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas
View File

@ -264,6 +264,7 @@ begin
FWordApp.Application.Selection.Cells.Delete(_ShiftCells); FWordApp.Application.Selection.Cells.Delete(_ShiftCells);
end end
else begin else begin
ReplaceBookmark('TituloImporteTotal', 'Total certificacion');
ReplaceBookmark('Retencion', FieldByName('RETENCION').AsString); ReplaceBookmark('Retencion', FieldByName('RETENCION').AsString);
ReplaceBookmark('ImporteRetencion', FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_RETENCION').AsFloat)); ReplaceBookmark('ImporteRetencion', FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_RETENCION').AsFloat));
ReplaceBookmark('ImporteTotalRet', FormatFloat(DISPLAY_EUROS2, (FieldByName('IMPORTE_TOTAL').AsFloat - FieldByName('IMPORTE_RETENCION').AsFloat))); ReplaceBookmark('ImporteTotalRet', FormatFloat(DISPLAY_EUROS2, (FieldByName('IMPORTE_TOTAL').AsFloat - FieldByName('IMPORTE_RETENCION').AsFloat)));

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

@ -130,6 +130,7 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
Caption = 'Importe retenido' Caption = 'Importe retenido'
DataBinding.FieldName = 'IMPORTE_RETENCION' DataBinding.FieldName = 'IMPORTE_RETENCION'
PropertiesClassName = 'TcxCurrencyEditProperties' PropertiesClassName = 'TcxCurrencyEditProperties'
Properties.Alignment.Horz = taRightJustify
FooterAlignmentHorz = taRightJustify FooterAlignmentHorz = taRightJustify
HeaderAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify
end end

2
Source/Servidor/FactuGES_Server.dproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid> <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>