[tryton-debian-vcs] tryton-modules-account-asset branch debian-jessie-3.0 updated. debian/3.0.3-1-4-g3bae92b

[Mathias Behrle]

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

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

    Releasing debian version 3.0.4-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 3419241..d7f22fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-account-asset (3.0.4-1) unstable; urgency=medium
+
+  * Adding actual upstream signing key.
+  * Merging upstream version 3.0.4.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 03 Mar 2015 12:49:23 +0100
+
 tryton-modules-account-asset (3.0.3-1) unstable; urgency=medium
 
   * Adding actual upstream signing key.
commit 42cbb5ed102fc40527aae2d7b1527a859f70f83a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 3 12:49:22 2015 +0100

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index 628dd6e..2b9b6fa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2012-2014 Nicolas Évrard
-           2012-2014 Cédric Krier
+Copyright: 2012-2015 Nicolas Évrard
+           2012-2015 Cédric Krier
            2012-2013 Bertrand Chenal
-           2012-2014 B2CK SPRL
+           2012-2015 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 7035a09e4f0c551ebebbe9b5de153eda1b036c4c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 3 12:49:22 2015 +0100

    Merging upstream version 3.0.4.

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