diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index d9033b4..9e39f1f 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -53,7 +53,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4400FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.4.0.0FactuGESFactuGES4.4.0.0FactuGES.dprFalse +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse4410FalseFalseFalseFalseFalse30821252Rodax Software S.L.4.4.1.0FactuGESFactuGES4.4.1.0FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index 3c98570..e1e60a5 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 4,4,0,0 -PRODUCTVERSION 4,4,0,0 +FILEVERSION 4,4,1,0 +PRODUCTVERSION 4,4,1,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN 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 "ProductName", "FactuGES\0" - VALUE "ProductVersion", "4.4.0.0\0" + VALUE "ProductVersion", "4.4.1.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 8237755..6725688 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj index c80dfaf..fb69c03 100644 --- a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj +++ b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj @@ -43,6 +43,14 @@ Package FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 + + + + + + + + File c:\archivos de programa\borland\delphi10\Bin\dclIntraweb_80_100.bpl not found File c:\archivos de programa\borland\delphi10\Bin\dclnet100.bpl not found File c:\archivos de programa\borland\delphi10\Bin\dclsoap100.bpl not found @@ -54,26 +62,26 @@ MainSource - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +
frDialogListaAlbaranesClienteEnvioEMail
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm index 5846fec..aa6d636 100644 --- a/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Views/uEditorAlbaranDevCliente.dfm @@ -44,99 +44,93 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente inherited frViewDetallesAlbaranCliente1: TfrViewDetallesAlbaranCliente inherited ToolBar1: TToolBar Height = 73 - ExplicitHeight = 73 - inherited ToolButton1: TToolButton - Enabled = False - end - inherited ToolButton13: TToolButton [1] + inherited UpDown1: TUpDown [1] Left = 109 - Wrap = False ExplicitLeft = 109 - ExplicitHeight = 22 end - inherited UpDown1: TUpDown [2] - Left = 117 - ExplicitLeft = 117 + inherited ToolButton13: TToolButton [2] end - inherited ToolButton12: TToolButton [3] - Left = 0 - Top = 0 - Wrap = True - ExplicitLeft = 0 - ExplicitTop = 0 - ExplicitHeight = 27 - end - inherited ToolButton2: TToolButton [4] + inherited ToolButton2: TToolButton [3] Left = 0 Top = 27 - Enabled = False - ExplicitLeft = 0 - ExplicitTop = 27 end - inherited ToolButton3: TToolButton [5] + inherited ToolButton3: TToolButton [4] Left = 114 Top = 27 - Enabled = False ExplicitLeft = 114 ExplicitTop = 27 end - inherited ToolButton4: TToolButton [6] + inherited ToolButton4: TToolButton [5] Left = 169 Top = 27 ExplicitLeft = 169 ExplicitTop = 27 end - inherited ToolButton14: TToolButton [7] + inherited ToolButton14: TToolButton [6] Left = 225 Top = 27 + Enabled = True ExplicitLeft = 225 ExplicitTop = 27 end - inherited FontName: TJvFontComboBox [8] + inherited FontName: TJvFontComboBox [7] Left = 290 Top = 27 ExplicitLeft = 290 ExplicitTop = 27 end - inherited FontSize: TEdit [9] + inherited FontSize: TEdit [8] Left = 435 Top = 27 ExplicitLeft = 435 ExplicitTop = 27 end - inherited ToolButton7: TToolButton + inherited ToolButton8: TToolButton [9] Left = 621 Enabled = True + Wrap = True ExplicitLeft = 621 end - inherited ToolButton10: TToolButton [11] + inherited ToolButton7: TToolButton Left = 0 Top = 49 + Enabled = True + Wrap = False ExplicitLeft = 0 ExplicitTop = 49 end + inherited ToolButton9: TToolButton [11] + Left = 67 + Top = 49 + Enabled = True + ExplicitLeft = 67 + ExplicitTop = 49 + end inherited ToolButton6: TToolButton [12] - Left = 125 + Left = 212 Top = 49 - ExplicitLeft = 125 + Enabled = True + ExplicitLeft = 212 ExplicitTop = 49 end - inherited ToolButton8: TToolButton [13] - Left = 191 + inherited ToolButton10: TToolButton [13] + Left = 278 Top = 49 - ExplicitLeft = 191 + Enabled = True + ExplicitLeft = 278 ExplicitTop = 49 end - inherited ToolButton9: TToolButton [14] - Left = 274 + inherited ToolButton11: TToolButton [14] + Left = 403 Top = 49 - ExplicitLeft = 274 + Enabled = True + ExplicitLeft = 403 ExplicitTop = 49 end - inherited ToolButton11: TToolButton - Left = 419 + inherited ToolButton12: TToolButton [15] + Left = 544 Top = 49 - ExplicitLeft = 419 + ExplicitLeft = 544 ExplicitTop = 49 end end @@ -175,20 +169,20 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente inherited dxLayoutControl1: TdxLayoutControl LookAndFeel = dxLayoutOfficeLookAndFeel1 inherited Bevel3: TBevel - Left = 412 + Left = 380 Height = 54 - ExplicitLeft = 412 + ExplicitLeft = 380 ExplicitHeight = 54 end inherited Bevel4: TBevel - Left = 528 + Left = 496 Width = 285 - ExplicitLeft = 528 + ExplicitLeft = 496 ExplicitWidth = 285 end inherited Bevel1: TBevel - Left = 528 - ExplicitLeft = 528 + Left = 496 + ExplicitLeft = 496 end inherited ImporteDto: TcxDBCurrencyEdit Style.LookAndFeel.SkinName = '' @@ -200,24 +194,24 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente Width = 151 end inherited ImporteIVA: TcxDBCurrencyEdit - Left = 599 + Left = 567 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 599 + ExplicitLeft = 567 ExplicitWidth = 219 Width = 219 end inherited ImporteTotal: TcxDBCurrencyEdit - Left = 529 + Left = 497 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 529 + ExplicitLeft = 497 ExplicitWidth = 289 Width = 289 end @@ -229,42 +223,42 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente StyleHot.LookAndFeel.SkinName = '' end inherited edtIVA: TcxDBSpinEdit - Left = 528 + Left = 496 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 528 + ExplicitLeft = 496 end inherited ImporteBase: TcxDBCurrencyEdit - Left = 528 + Left = 496 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 528 + ExplicitLeft = 496 ExplicitWidth = 290 Width = 290 end inherited edtRE: TcxDBSpinEdit - Left = 528 + Left = 496 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 528 + ExplicitLeft = 496 end inherited ImporteRE: TcxDBCurrencyEdit - Left = 599 + Left = 567 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 599 + ExplicitLeft = 567 ExplicitWidth = 219 Width = 219 end @@ -295,8 +289,8 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente Width = 84 end inherited bTiposIVA: TButton - Left = 264 - ExplicitLeft = 264 + Left = 232 + ExplicitLeft = 232 end inherited cbRecargoEquivalencia: TcxDBCheckBox Style.LookAndFeel.SkinName = '' @@ -307,22 +301,22 @@ inherited fEditorAlbaranDevCliente: TfEditorAlbaranDevCliente Width = 222 end inherited edtRetencion: TcxDBSpinEdit - Left = 528 + Left = 496 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 528 + ExplicitLeft = 496 end inherited edtImporteRetencion: TcxDBCurrencyEdit - Left = 599 + Left = 567 Style.LookAndFeel.SkinName = '' Style.IsFontAssigned = True StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 599 + ExplicitLeft = 567 end inherited edtFechaRetencion: TcxDBDateEdit Style.LookAndFeel.SkinName = '' diff --git a/Source/Modulos/Relaciones/Pedidos de proveedor - Albaranes de proveedor/uGenerarAlbaranesProvUtils.pas b/Source/Modulos/Relaciones/Pedidos de proveedor - Albaranes de proveedor/uGenerarAlbaranesProvUtils.pas index 8c2236d..b4be7b4 100644 --- a/Source/Modulos/Relaciones/Pedidos de proveedor - Albaranes de proveedor/uGenerarAlbaranesProvUtils.pas +++ b/Source/Modulos/Relaciones/Pedidos de proveedor - Albaranes de proveedor/uGenerarAlbaranesProvUtils.pas @@ -67,8 +67,11 @@ begin AAlbaran.DESCUENTO := APedido.DESCUENTO; AAlbaran.IMPORTE_DESCUENTO := APedido.IMPORTE_DESCUENTO; 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.DataTable.FieldByName(fld_AlbaranesProveedorOBSERVACIONES).AsVariant := APedido.DataTable.FieldByName(fld_PedidosProveedorOBSERVACIONES).AsVariant; AAlbaran.ID_FORMA_PAGO := APedido.ID_FORMA_PAGO; @@ -278,6 +281,7 @@ begin // CopiarArticulosPendAAlbaran(APedido, AAlbaran, AArticulosPendientes); CopiarDetallesAAlbaran(APedido, AAlbaran, APedido.Detalles); + //Sustituir por if de guardar if AAlbaranesProveedorController.Guardar(AAlbaran) then begin diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index fb07ad8..1d49530 100644 Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index 9847a49..693d683 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -14,7 +14,7 @@ BEGIN BEGIN VALUE "FileVersion", "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 BLOCK "VarFileInfo"