[tryton-debian-vcs] tryton-modules-account-asset branch upstream updated. upstream/3.4.0-1-gac2ac2e

[Mathias Behrle]

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

commit ac2ac2e754e3ba3dd81784b699548974e2a24daf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 3 12:47:31 2015 +0100

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

diff --git a/CHANGELOG b/CHANGELOG
index 7405999..f5b5046 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.1 - 2015-03-02
+* Bug fixes (see mercurial logs for details)
+
 Version 3.4.0 - 2014-10-20
 * 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/INSTALL b/INSTALL
index 318f5fd..5220d7a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,8 +7,10 @@ Prerequisites
  * Python 2.7 or later (http://www.python.org/)
  * trytond (http://www.tryton.org/)
  * trytond_account (http://www.tryton.org/)
+ * trytond_account_product (http://www.tryton.org/)
  * trytond_product (http://www.tryton.org/)
  * trytond_account_invoice (http://www.tryton.org/)
+ * Optional: trytond_purchase (http://www.tryton.org/)
 
 Installation
 ------------
diff --git a/PKG-INFO b/PKG-INFO
index c01f446..90e9f6f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_asset
-Version: 3.4.0
+Version: 3.4.1
 Summary: Tryton module for assets management
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/asset.py b/asset.py
index f9a04ee..adb9671 100644
--- a/asset.py
+++ b/asset.py
@@ -237,8 +237,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/setup.py b/setup.py
index 2f27b5a..f895a9d 100644
--- a/setup.py
+++ b/setup.py
@@ -48,6 +48,11 @@ for dep in info.get('depends', []):
 requires.append(get_require_version('trytond'))
 
 tests_require = [get_require_version('proteus')]
+dependency_links = []
+if minor_version % 2:
+    # Add development index for testing with proteus
+    dependency_links.append('https://trydevpi.tryton.org/')
+
 
 setup(name=name,
     version=version,
@@ -92,6 +97,7 @@ setup(name=name,
         ],
     license='GPL-3',
     install_requires=requires,
+    dependency_links=dependency_links,
     zip_safe=False,
     entry_points="""
     [trytond.modules]
diff --git a/tryton.cfg b/tryton.cfg
index bb92cd6..3960a4a 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.4.0
+version=3.4.1
 depends:
     ir
     res
diff --git a/trytond_account_asset.egg-info/PKG-INFO b/trytond_account_asset.egg-info/PKG-INFO
index f1d64ac..d96e686 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.4.0
+Version: 3.4.1
 Summary: Tryton module for assets management
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-account-asset