[tryton-debian-vcs] tryton-modules-account-payment branch upstream-4.2 updated. upstream/4.2.0-1-g7b6cb07

[Mathias Behrle]

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

commit 7b6cb07c78577b72aa52f3fea84ee8f66f6a290a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jun 11 22:13:12 2017 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index fecb59c..f68e5a5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.1 - 2017-06-06
+* Bug fixes (see mercurial logs for details)
+
 Version 4.2.0 - 2016-11-28
 * Bug fixes (see mercurial logs for details)
 * Allow to block payment of line
diff --git a/COPYRIGHT b/COPYRIGHT
index 20bd036..4d643a0 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2013-2016 Cédric Krier.
-Copyright (C) 2013-2016 B2CK SPRL.
+Copyright (C) 2013-2017 Cédric Krier.
+Copyright (C) 2013-2017 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 0060e83..acbe38a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_payment
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module for payment
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/account.py b/account.py
index 0ec9557..e808ab5 100644
--- a/account.py
+++ b/account.py
@@ -313,7 +313,7 @@ class Invoice:
                 for payment in line.payments:
                     if payment.state != 'failed':
                         with Transaction().set_context(date=payment.date):
-                            payment_amount = Currency.compute(
+                            payment_amount += Currency.compute(
                                 payment.currency, payment.amount,
                                 invoice.currency)
                 amounts[invoice.id] -= payment_amount
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
 [egg_info]
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 
diff --git a/tryton.cfg b/tryton.cfg
index d805c2f..d04cad0 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.2.0
+version=4.2.1
 depends:
     account
     company
diff --git a/trytond_account_payment.egg-info/PKG-INFO b/trytond_account_payment.egg-info/PKG-INFO
index f6bdae9..226eb37 100644
--- a/trytond_account_payment.egg-info/PKG-INFO
+++ b/trytond_account_payment.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-account-payment
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module for payment
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-account-payment