Version 1.8.5, se aregla en facturas de cliente, se pone importe neto como importe unidad, para que cuando se copien los detalles de un presupuesto se vea como importe unidad el importe neto de la linea, en el informe se cambia la sentencia para que cuando haya descuento se calcule el importe unidad
git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@1018 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
parent
7d17b66459
commit
0a0d2d1d60
@ -53,7 +53,7 @@
|
|||||||
<Borland.Personality>Delphi.Personality</Borland.Personality>
|
<Borland.Personality>Delphi.Personality</Borland.Personality>
|
||||||
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
|
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
|
||||||
<BorlandProject>
|
<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">1</VersionInfo><VersionInfo Name="MinorVer">8</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">1.8.3.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">1.8.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></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">1</VersionInfo><VersionInfo Name="MinorVer">8</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">1.8.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">1.8.5.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
|
||||||
</ProjectExtensions>
|
</ProjectExtensions>
|
||||||
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
|
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
Binary file not shown.
@ -328,11 +328,13 @@ object RptFacturasCliente: TRptFacturasCliente
|
|||||||
SQL =
|
SQL =
|
||||||
'SELECT'#10' DET.ID, DET.ID_FACTURA, DET.POSICION, DET.TIPO_DETALL' +
|
'SELECT'#10' DET.ID, DET.ID_FACTURA, DET.POSICION, DET.TIPO_DETALL' +
|
||||||
'E, ARTICULOS.REFERENCIA,'#10' DET.CONCEPTO, DET.CANTIDAD, DET.UNI' +
|
'E, ARTICULOS.REFERENCIA,'#10' DET.CONCEPTO, DET.CANTIDAD, DET.UNI' +
|
||||||
'DAD_MEDIDA, DET.IMPORTE_UNIDAD,'#10' DET.DESCUENTO, DET.IMPORTE_T' +
|
'DAD_MEDIDA,'#10#10' case'#10' when (det.descuento <> 0) then (det.im' +
|
||||||
'OTAL, DET.VISIBLE'#10'FROM FACTURAS_CLIENTE_DETALLES AS DET'#10'LEFT OUT' +
|
'porte_total / det.cantidad)'#10' else det.importe_unidad'#10' end ' +
|
||||||
'ER JOIN ARTICULOS ON (ARTICULOS.ID = DET.ID_ARTICULO)'#10'WHERE DET.' +
|
'as importe_unidad,'#10#10' DET.DESCUENTO, DET.IMPORTE_TOTAL, DET.VI' +
|
||||||
'ID_FACTURA = :ID_FACTURA AND DET.VISIBLE = 1 AND {Where}'#10'ORDER B' +
|
'SIBLE'#10'FROM FACTURAS_CLIENTE_DETALLES AS DET'#10'LEFT OUTER JOIN ARTI' +
|
||||||
'Y DET.ID_FACTURA, DET.POSICION;'#10
|
'CULOS ON (ARTICULOS.ID = DET.ID_ARTICULO)'#10'WHERE DET.ID_FACTURA =' +
|
||||||
|
' :ID_FACTURA AND DET.VISIBLE = 1 AND {Where}'#10'ORDER BY DET.ID_FAC' +
|
||||||
|
'TURA, DET.POSICION;'#10
|
||||||
StatementType = stSQL
|
StatementType = stSQL
|
||||||
ColumnMappings = <
|
ColumnMappings = <
|
||||||
item
|
item
|
||||||
|
|||||||
@ -85,11 +85,11 @@ type
|
|||||||
frxDBInformeListadoFacturasPendientes: TfrxDBDataset;
|
frxDBInformeListadoFacturasPendientes: TfrxDBDataset;
|
||||||
DADSInformeListadoFacturasPendientes: TDADataSource;
|
DADSInformeListadoFacturasPendientes: TDADataSource;
|
||||||
tbl_InformeListadoFacturasPendientes: TDAMemDataTable;
|
tbl_InformeListadoFacturasPendientes: TDAMemDataTable;
|
||||||
schReport: TDASchema;
|
|
||||||
frxDBInformeListadoFacturasResumen: TfrxDBDataset;
|
frxDBInformeListadoFacturasResumen: TfrxDBDataset;
|
||||||
DADSInformeListadoFacturasResumen: TDADataSource;
|
DADSInformeListadoFacturasResumen: TDADataSource;
|
||||||
tbl_InformeListadoFacturasResumen: TDAMemDataTable;
|
tbl_InformeListadoFacturasResumen: TDAMemDataTable;
|
||||||
Bin2DataStreamer: TDABin2DataStreamer;
|
Bin2DataStreamer: TDABin2DataStreamer;
|
||||||
|
schReport: TDASchema;
|
||||||
procedure DataModuleCreate(Sender: TObject);
|
procedure DataModuleCreate(Sender: TObject);
|
||||||
procedure DataModuleDestroy(Sender: TObject);
|
procedure DataModuleDestroy(Sender: TObject);
|
||||||
private
|
private
|
||||||
|
|||||||
@ -1,43 +1,51 @@
|
|||||||
inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente
|
inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente
|
||||||
inherited ToolBar1: TToolBar
|
inherited ToolBar1: TToolBar
|
||||||
Height = 95
|
Height = 73
|
||||||
ExplicitHeight = 95
|
ExplicitHeight = 73
|
||||||
inherited FontName: TJvFontComboBox [4]
|
inherited ToolButton3: TToolButton
|
||||||
Left = 56
|
Wrap = False
|
||||||
|
end
|
||||||
|
inherited ToolButton4: TToolButton
|
||||||
|
Left = 278
|
||||||
|
Top = 0
|
||||||
|
ExplicitLeft = 278
|
||||||
|
ExplicitTop = 0
|
||||||
|
end
|
||||||
|
inherited ToolButton14: TToolButton
|
||||||
|
Left = 334
|
||||||
|
Top = 0
|
||||||
|
ExplicitLeft = 334
|
||||||
|
ExplicitTop = 0
|
||||||
|
end
|
||||||
|
inherited FontName: TJvFontComboBox
|
||||||
Top = 22
|
Top = 22
|
||||||
ExplicitLeft = 56
|
|
||||||
ExplicitTop = 22
|
ExplicitTop = 22
|
||||||
end
|
end
|
||||||
inherited ToolButton14: TToolButton [5]
|
|
||||||
Left = 201
|
|
||||||
Wrap = False
|
|
||||||
ExplicitLeft = 201
|
|
||||||
end
|
|
||||||
inherited FontSize: TEdit
|
inherited FontSize: TEdit
|
||||||
Left = 266
|
|
||||||
Top = 22
|
Top = 22
|
||||||
ExplicitLeft = 266
|
|
||||||
ExplicitTop = 22
|
ExplicitTop = 22
|
||||||
end
|
end
|
||||||
inherited UpDown1: TUpDown
|
inherited UpDown1: TUpDown
|
||||||
Left = 308
|
|
||||||
Top = 22
|
Top = 22
|
||||||
ExplicitLeft = 308
|
|
||||||
ExplicitTop = 22
|
ExplicitTop = 22
|
||||||
end
|
end
|
||||||
inherited ToolButton13: TToolButton
|
inherited ToolButton13: TToolButton
|
||||||
Left = 325
|
|
||||||
Top = 22
|
Top = 22
|
||||||
ExplicitLeft = 325
|
|
||||||
ExplicitTop = 22
|
ExplicitTop = 22
|
||||||
end
|
end
|
||||||
inherited ToolButton11: TToolButton [9]
|
inherited ToolButton6: TToolButton
|
||||||
Left = 333
|
|
||||||
Top = 22
|
Top = 22
|
||||||
ExplicitLeft = 333
|
|
||||||
ExplicitTop = 22
|
ExplicitTop = 22
|
||||||
end
|
end
|
||||||
inherited ToolButton12: TToolButton [10]
|
inherited ToolButton7: TToolButton
|
||||||
|
Top = 22
|
||||||
|
ExplicitTop = 22
|
||||||
|
end
|
||||||
|
inherited ToolButton8: TToolButton
|
||||||
|
Top = 22
|
||||||
|
ExplicitTop = 22
|
||||||
|
end
|
||||||
|
inherited ToolButton12: TToolButton
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 22
|
Top = 22
|
||||||
Wrap = True
|
Wrap = True
|
||||||
@ -45,45 +53,43 @@ inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente
|
|||||||
ExplicitTop = 22
|
ExplicitTop = 22
|
||||||
ExplicitHeight = 27
|
ExplicitHeight = 27
|
||||||
end
|
end
|
||||||
inherited ToolButton9: TToolButton [11]
|
inherited ToolButton9: TToolButton
|
||||||
Left = 0
|
Left = 0
|
||||||
Top = 49
|
Top = 49
|
||||||
ExplicitLeft = 0
|
ExplicitLeft = 0
|
||||||
ExplicitTop = 49
|
ExplicitTop = 49
|
||||||
end
|
end
|
||||||
inherited ToolButton10: TToolButton [12]
|
inherited ToolButton10: TToolButton
|
||||||
Left = 145
|
Left = 145
|
||||||
Top = 49
|
Top = 49
|
||||||
ExplicitLeft = 145
|
ExplicitLeft = 145
|
||||||
ExplicitTop = 49
|
ExplicitTop = 49
|
||||||
end
|
end
|
||||||
inherited ToolButton6: TToolButton [13]
|
inherited ToolButton11: TToolButton
|
||||||
Left = 270
|
Left = 270
|
||||||
Top = 49
|
Top = 49
|
||||||
ExplicitLeft = 270
|
ExplicitLeft = 270
|
||||||
ExplicitTop = 49
|
ExplicitTop = 49
|
||||||
end
|
end
|
||||||
inherited ToolButton7: TToolButton [14]
|
|
||||||
Left = 336
|
|
||||||
Top = 49
|
|
||||||
Wrap = True
|
|
||||||
ExplicitLeft = 336
|
|
||||||
ExplicitTop = 49
|
|
||||||
end
|
|
||||||
inherited ToolButton8: TToolButton [15]
|
|
||||||
Left = 0
|
|
||||||
Top = 71
|
|
||||||
ExplicitLeft = 0
|
|
||||||
ExplicitTop = 71
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
inherited cxGrid: TcxGrid
|
inherited cxGrid: TcxGrid
|
||||||
Top = 121
|
Top = 99
|
||||||
Height = 183
|
Height = 205
|
||||||
ExplicitHeight = 210
|
ExplicitTop = 99
|
||||||
|
ExplicitHeight = 205
|
||||||
|
inherited cxGridView: TcxGridDBTableView
|
||||||
|
inherited cxGridViewIMPORTEUNIDAD: TcxGridDBColumn
|
||||||
|
Visible = False
|
||||||
|
VisibleForCustomization = False
|
||||||
|
end
|
||||||
|
inherited cxGridViewIMPORTENETO: TcxGridDBColumn
|
||||||
|
Caption = 'Importe Unidad'
|
||||||
|
Visible = True
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
inherited TBXDock1: TTBXDock
|
inherited TBXDock1: TTBXDock
|
||||||
Top = 95
|
Top = 73
|
||||||
ExplicitTop = 68
|
ExplicitTop = 73
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Binary file not shown.
@ -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>
|
||||||
@ -35,7 +35,9 @@
|
|||||||
<Borland.Personality>Delphi.Personality</Borland.Personality>
|
<Borland.Personality>Delphi.Personality</Borland.Personality>
|
||||||
<Borland.ProjectType />
|
<Borland.ProjectType />
|
||||||
<BorlandProject>
|
<BorlandProject>
|
||||||
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">8</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"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.8.3.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.8.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 24 de junio de 2010 13:44</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
|
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">8</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"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.8.5.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.8.5.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 20 de julio de 2010 11:19</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
|
||||||
|
|
||||||
|
|
||||||
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
|
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
|
||||||
</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
|
</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
|
||||||
</ProjectExtensions>
|
</ProjectExtensions>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user