[tryton-debian-vcs] tryton-modules-account-asset branch upstream-3.0 updated. upstream/3.0.3-1-g847186e

[Mathias Behrle]

The following commit has been merged in the upstream-3.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-asset.git;a=commitdiff;h=upstream/3.0.3-1-g847186e

commit 847186ef48d79b15bf2615c59b6093380fe13dfc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 3 12:49:22 2015 +0100

    Adding upstream version 3.0.4.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 22870bd..3a80a0b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.4 - 2015-03-02
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.3 - 2014-11-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index f3f7030..63ab9fa 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2012-2014 Nicolas Évrard.
-Copyright (C) 2012-2014 Cédric Krier.
+Copyright (C) 2012-2015 Nicolas Évrard.
+Copyright (C) 2012-2015 Cédric Krier.
 Copyright (C) 2012-2013 Bertrand Chenal.
-Copyright (C) 2012-2014 B2CK SPRL.
+Copyright (C) 2012-2015 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 8cccc2f..dbde635 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_asset
-Version: 3.0.3
+Version: 3.0.4
 Summary: Tryton module for assets management
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/asset.py b/asset.py
index 7114b37..735545f 100644
--- a/asset.py
+++ b/asset.py
@@ -235,8 +235,8 @@ class Asset(Workflow, ModelSQL, ModelView):
         if invoice.company.currency != invoice.currency:
             with Transaction().set_context(date=invoice.currency_date):
                 new_values['value'] = Currency.compute(
-                    invoice.company.currency, invoice_line.amount,
-                    invoice.currency)
+                    invoice.currency, invoice_line.amount,
+                    invoice.company.currency)
         else:
             new_values['value'] = invoice_line.amount
         if invoice.invoice_date:
diff --git a/tryton.cfg b/tryton.cfg
index e747a5b..648ad61 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.0.3
+version=3.0.4
 depends:
     ir
     res
diff --git a/trytond_account_asset.egg-info/PKG-INFO b/trytond_account_asset.egg-info/PKG-INFO
index b306fd3..b259cc5 100644
--- a/trytond_account_asset.egg-info/PKG-INFO
+++ b/trytond_account_asset.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-account-asset
-Version: 3.0.3
+Version: 3.0.4
 Summary: Tryton module for assets management
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-account-asset