Archivado/LuisLeon_FactuGES2
Archived
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Albaranes de proveedores -> al generar un albarán de proveedor a partir de un pedido no se calculaba correctamente el IVA.

Browse Source 
git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES2/trunk@229 b2cfbe5a-eba1-4a0c-8b32-7feea0a119f2
This commit is contained in:
roberto 2014-07-07 11:38:24 +00:00
parent 65f49931fb
commit e4a90bf0d9
8 changed files with 99 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Cliente/FactuGES.dproj
View File

@ -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">4</VersionInfo><VersionInfo Name="MinorVer">4</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">4.4.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">4.4.0.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">4</VersionInfo><VersionInfo Name="MinorVer">4</VersionInfo><VersionInfo Name="Release">1</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">4.4.1.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">4.4.1.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>

8
Source/Cliente/FactuGES.rc
View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo\Resources\Iconos\Factuges.ico" MAINICON ICON "C:\Codigo\Resources\Iconos\Factuges.ico"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 4,4,0,0 FILEVERSION 4,4,1,0
PRODUCTVERSION 4,4,0,0 PRODUCTVERSION 4,4,1,0
FILEFLAGSMASK 0x3FL FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L FILEFLAGS 0x00L
FILEOS 0x40004L FILEOS 0x40004L
@ -13,10 +13,10 @@ BEGIN
BLOCK "0C0A04E4" BLOCK "0C0A04E4"
BEGIN BEGIN
VALUE "CompanyName", "Rodax Software S.L.\0" VALUE "CompanyName", "Rodax Software S.L.\0"
VALUE "FileVersion", "4.4.0.0\0" VALUE "FileVersion", "4.4.1.0\0"
VALUE "InternalName", "FactuGES\0" VALUE "InternalName", "FactuGES\0"
VALUE "ProductName", "FactuGES\0" VALUE "ProductName", "FactuGES\0"
VALUE "ProductVersion", "4.4.0.0\0" VALUE "ProductVersion", "4.4.1.0\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

BIN
Source/Cliente/FactuGES.res
View File

Binary file not shown.

48
Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj
View File

@ -43,6 +43,14 @@
<Borland.ProjectType>Package</Borland.ProjectType> <Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject> <BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages> <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclIntraweb_80_100.bpl">File c:\archivos de programa\borland\delphi10\Bin\dclIntraweb_80_100.bpl not found</Excluded_Packages> <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclIntraweb_80_100.bpl">File c:\archivos de programa\borland\delphi10\Bin\dclIntraweb_80_100.bpl not found</Excluded_Packages>
<Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclnet100.bpl">File c:\archivos de programa\borland\delphi10\Bin\dclnet100.bpl not found</Excluded_Packages> <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclnet100.bpl">File c:\archivos de programa\borland\delphi10\Bin\dclnet100.bpl not found</Excluded_Packages>
<Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclsoap100.bpl">File c:\archivos de programa\borland\delphi10\Bin\dclsoap100.bpl not found</Excluded_Packages> <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclsoap100.bpl">File c:\archivos de programa\borland\delphi10\Bin\dclsoap100.bpl not found</Excluded_Packages>
@ -54,26 +62,26 @@
<DelphiCompile Include="AlbaranesCliente_view.dpk"> <DelphiCompile Include="AlbaranesCliente_view.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="C:\Documents and Settings\Usuario\AlbaranesCliente_controller.dcp" /> <DCCReference Include="..\AlbaranesCliente_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\AlbaranesCliente_model.dcp" /> <DCCReference Include="..\AlbaranesCliente_model.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\AlbCli_FacCli_relation.dcp" /> <DCCReference Include="..\AlbCli_FacCli_relation.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Almacenes_controller.dcp" /> <DCCReference Include="..\Almacenes_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" /> <DCCReference Include="..\ApplicationBase.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Articulos_view.dcp" /> <DCCReference Include="..\Articulos_view.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" /> <DCCReference Include="..\Base.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" /> <DCCReference Include="..\cxLibraryD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxCoreD11.dcp" /> <DCCReference Include="..\dxCoreD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" /> <DCCReference Include="..\dxGDIPlusD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" /> <DCCReference Include="..\dxThemeD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\FacturasCliente_controller.dcp" /> <DCCReference Include="..\FacturasCliente_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\FacturasCliente_model.dcp" /> <DCCReference Include="..\FacturasCliente_model.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" /> <DCCReference Include="..\GUIBase.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Inventario_controller.dcp" /> <DCCReference Include="..\Inventario_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PedidosCliente_controller.dcp" /> <DCCReference Include="..\PedidosCliente_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PedidosCliente_model.dcp" /> <DCCReference Include="..\PedidosCliente_model.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" /> <DCCReference Include="..\rtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" /> <DCCReference Include="..\vcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" /> <DCCReference Include="..\vclx.dcp" />
<DCCReference Include="uAlbaranesClienteViewRegister.pas" /> <DCCReference Include="uAlbaranesClienteViewRegister.pas" />
<DCCReference Include="uDialogListaAlbaranesClienteEnvioEMail.pas"> <DCCReference Include="uDialogListaAlbaranesClienteEnvioEMail.pas">
<Form>frDialogListaAlbaranesClienteEnvioEMail</Form> <Form>frDialogListaAlbaranesClienteEnvioEMail</Form>

124
Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm
View File

@ -44,99 +44,93 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
inherited frViewDetallesAlbaranCliente1: TfrViewDetallesAlbaranCliente inherited frViewDetallesAlbaranCliente1: TfrViewDetallesAlbaranCliente
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Height = 73 Height = 73
ExplicitHeight = 73 inherited UpDown1: TUpDown [1]
inherited ToolButton1: TToolButton
Enabled = False
end
inherited ToolButton13: TToolButton [1]
Left = 109 Left = 109
Wrap = False
ExplicitLeft = 109 ExplicitLeft = 109
ExplicitHeight = 22
end end
inherited UpDown1: TUpDown [2] inherited ToolButton13: TToolButton [2]
Left = 117
ExplicitLeft = 117
end end
inherited ToolButton12: TToolButton [3] inherited ToolButton2: TToolButton [3]
Left = 0
Top = 0
Wrap = True
ExplicitLeft = 0
ExplicitTop = 0
ExplicitHeight = 27
end
inherited ToolButton2: TToolButton [4]
Left = 0 Left = 0
Top = 27 Top = 27
Enabled = False
ExplicitLeft = 0
ExplicitTop = 27
end end
inherited ToolButton3: TToolButton [5] inherited ToolButton3: TToolButton [4]
Left = 114 Left = 114
Top = 27 Top = 27
Enabled = False
ExplicitLeft = 114 ExplicitLeft = 114
ExplicitTop = 27 ExplicitTop = 27
end end
inherited ToolButton4: TToolButton [6] inherited ToolButton4: TToolButton [5]
Left = 169 Left = 169
Top = 27 Top = 27
ExplicitLeft = 169 ExplicitLeft = 169
ExplicitTop = 27 ExplicitTop = 27
end end
inherited ToolButton14: TToolButton [7] inherited ToolButton14: TToolButton [6]
Left = 225 Left = 225
Top = 27 Top = 27
Enabled = True
ExplicitLeft = 225 ExplicitLeft = 225
ExplicitTop = 27 ExplicitTop = 27
end end
inherited FontName: TJvFontComboBox [8] inherited FontName: TJvFontComboBox [7]
Left = 290 Left = 290
Top = 27 Top = 27
ExplicitLeft = 290 ExplicitLeft = 290
ExplicitTop = 27 ExplicitTop = 27
end end
inherited FontSize: TEdit [9] inherited FontSize: TEdit [8]
Left = 435 Left = 435
Top = 27 Top = 27
ExplicitLeft = 435 ExplicitLeft = 435
ExplicitTop = 27 ExplicitTop = 27
end end
inherited ToolButton7: TToolButton inherited ToolButton8: TToolButton [9]
Left = 621 Left = 621
Enabled = True Enabled = True
Wrap = True
ExplicitLeft = 621 ExplicitLeft = 621
end end
inherited ToolButton10: TToolButton [11] inherited ToolButton7: TToolButton
Left = 0 Left = 0
Top = 49 Top = 49
Enabled = True
Wrap = False
ExplicitLeft = 0 ExplicitLeft = 0
ExplicitTop = 49 ExplicitTop = 49
end end
inherited ToolButton9: TToolButton [11]
Left = 67
Top = 49
Enabled = True
ExplicitLeft = 67
ExplicitTop = 49
end
inherited ToolButton6: TToolButton [12] inherited ToolButton6: TToolButton [12]
Left = 125 Left = 212
Top = 49 Top = 49
ExplicitLeft = 125 Enabled = True
ExplicitLeft = 212
ExplicitTop = 49 ExplicitTop = 49
end end
inherited ToolButton8: TToolButton [13] inherited ToolButton10: TToolButton [13]
Left = 191 Left = 278
Top = 49 Top = 49
ExplicitLeft = 191 Enabled = True
ExplicitLeft = 278
ExplicitTop = 49 ExplicitTop = 49
end end
inherited ToolButton9: TToolButton [14] inherited ToolButton11: TToolButton [14]
Left = 274 Left = 403
Top = 49 Top = 49
ExplicitLeft = 274 Enabled = True
ExplicitLeft = 403
ExplicitTop = 49 ExplicitTop = 49
end end
inherited ToolButton11: TToolButton inherited ToolButton12: TToolButton [15]
Left = 419 Left = 544
Top = 49 Top = 49
ExplicitLeft = 419 ExplicitLeft = 544
ExplicitTop = 49 ExplicitTop = 49
end end
end end
@ -175,20 +169,20 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
LookAndFeel = dxLayoutOfficeLookAndFeel1 LookAndFeel = dxLayoutOfficeLookAndFeel1
inherited Bevel3: TBevel inherited Bevel3: TBevel
Left = 412 Left = 380
Height = 54 Height = 54
ExplicitLeft = 412 ExplicitLeft = 380
ExplicitHeight = 54 ExplicitHeight = 54
end end
inherited Bevel4: TBevel inherited Bevel4: TBevel
Left = 528 Left = 496
Width = 285 Width = 285
ExplicitLeft = 528 ExplicitLeft = 496
ExplicitWidth = 285 ExplicitWidth = 285
end end
inherited Bevel1: TBevel inherited Bevel1: TBevel
Left = 528 Left = 496
ExplicitLeft = 528 ExplicitLeft = 496
end end
inherited ImporteDto: TcxDBCurrencyEdit inherited ImporteDto: TcxDBCurrencyEdit
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -200,24 +194,24 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
Width = 151 Width = 151
end end
inherited ImporteIVA: TcxDBCurrencyEdit inherited ImporteIVA: TcxDBCurrencyEdit
Left = 599 Left = 567
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 599 ExplicitLeft = 567
ExplicitWidth = 219 ExplicitWidth = 219
Width = 219 Width = 219
end end
inherited ImporteTotal: TcxDBCurrencyEdit inherited ImporteTotal: TcxDBCurrencyEdit
Left = 529 Left = 497
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 529 ExplicitLeft = 497
ExplicitWidth = 289 ExplicitWidth = 289
Width = 289 Width = 289
end end
@ -229,42 +223,42 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
end end
inherited edtIVA: TcxDBSpinEdit inherited edtIVA: TcxDBSpinEdit
Left = 528 Left = 496
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 528 ExplicitLeft = 496
end end
inherited ImporteBase: TcxDBCurrencyEdit inherited ImporteBase: TcxDBCurrencyEdit
Left = 528 Left = 496
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 528 ExplicitLeft = 496
ExplicitWidth = 290 ExplicitWidth = 290
Width = 290 Width = 290
end end
inherited edtRE: TcxDBSpinEdit inherited edtRE: TcxDBSpinEdit
Left = 528 Left = 496
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 528 ExplicitLeft = 496
end end
inherited ImporteRE: TcxDBCurrencyEdit inherited ImporteRE: TcxDBCurrencyEdit
Left = 599 Left = 567
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 599 ExplicitLeft = 567
ExplicitWidth = 219 ExplicitWidth = 219
Width = 219 Width = 219
end end
@ -295,8 +289,8 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
Width = 84 Width = 84
end end
inherited bTiposIVA: TButton inherited bTiposIVA: TButton
Left = 264 Left = 232
ExplicitLeft = 264 ExplicitLeft = 232
end end
inherited cbRecargoEquivalencia: TcxDBCheckBox inherited cbRecargoEquivalencia: TcxDBCheckBox
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
@ -307,22 +301,22 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente
Width = 222 Width = 222
end end
inherited edtRetencion: TcxDBSpinEdit inherited edtRetencion: TcxDBSpinEdit
Left = 528 Left = 496
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 528 ExplicitLeft = 496
end end
inherited edtImporteRetencion: TcxDBCurrencyEdit inherited edtImporteRetencion: TcxDBCurrencyEdit
Left = 599 Left = 567
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''
Style.IsFontAssigned = True Style.IsFontAssigned = True
StyleDisabled.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 599 ExplicitLeft = 567
end end
inherited edtFechaRetencion: TcxDBDateEdit inherited edtFechaRetencion: TcxDBDateEdit
Style.LookAndFeel.SkinName = '' Style.LookAndFeel.SkinName = ''

8
Source/Modulos/Relaciones/Pedidos de proveedor - Albaranes de proveedor/uGenerarAlbaranesProvUtils.pas
View File

@ -67,8 +67,11 @@ begin
AAlbaran.DESCUENTO := APedido.DESCUENTO; AAlbaran.DESCUENTO := APedido.DESCUENTO;
AAlbaran.IMPORTE_DESCUENTO := APedido.IMPORTE_DESCUENTO; AAlbaran.IMPORTE_DESCUENTO := APedido.IMPORTE_DESCUENTO;
AAlbaran.BASE_IMPONIBLE := APedido.BASE_IMPONIBLE; AAlbaran.BASE_IMPONIBLE := APedido.BASE_IMPONIBLE;
AAlbaran.IVA := APedido.IVA;
AAlbaran.IMPORTE_IVA := APedido.IMPORTE_IVA; // Los pedidos de proveedor no tienen IVA asinado. Me lo salto.
{AAlbaran.IVA := APedido.IVA;
AAlbaran.IMPORTE_IVA := APedido.IMPORTE_IVA;}
AAlbaran.IMPORTE_TOTAL := APedido.IMPORTE_TOTAL; AAlbaran.IMPORTE_TOTAL := APedido.IMPORTE_TOTAL;
AAlbaran.DataTable.FieldByName(fld_AlbaranesProveedorOBSERVACIONES).AsVariant := APedido.DataTable.FieldByName(fld_PedidosProveedorOBSERVACIONES).AsVariant; AAlbaran.DataTable.FieldByName(fld_AlbaranesProveedorOBSERVACIONES).AsVariant := APedido.DataTable.FieldByName(fld_PedidosProveedorOBSERVACIONES).AsVariant;
AAlbaran.ID_FORMA_PAGO := APedido.ID_FORMA_PAGO; AAlbaran.ID_FORMA_PAGO := APedido.ID_FORMA_PAGO;
@ -278,6 +281,7 @@ begin
// CopiarArticulosPendAAlbaran(APedido, AAlbaran, AArticulosPendientes); // CopiarArticulosPendAAlbaran(APedido, AAlbaran, AArticulosPendientes);
CopiarDetallesAAlbaran(APedido, AAlbaran, APedido.Detalles); CopiarDetallesAAlbaran(APedido, AAlbaran, APedido.Detalles);
//Sustituir por if de guardar //Sustituir por if de guardar
if AAlbaranesProveedorController.Guardar(AAlbaran) then if AAlbaranesProveedorController.Guardar(AAlbaran) then
begin begin

BIN
Source/Servidor/FactuGES_Server.RES
View File

Binary file not shown.

2
Source/Servidor/FactuGES_Server.rc
View File

@ -14,7 +14,7 @@ BEGIN
BEGIN BEGIN
VALUE "FileVersion", "4.4.0.0\0" VALUE "FileVersion", "4.4.0.0\0"
VALUE "ProductVersion", "4.4.0.0\0" VALUE "ProductVersion", "4.4.0.0\0"
VALUE "CompileDate", "martes, 17 de junio de 2014 19:48\0" VALUE "CompileDate", "lunes, 07 de julio de 2014 11:24\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"