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

[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-clearing.git;a=commitdiff;h=upstream/4.2.0-1-g8e2d929

commit 8e2d92920eee8ef5e0238624b8a139443f2a759d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jun 11 22:49:37 2017 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index c131ba0..1c38f85 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)
 * Mark Payment as succeded or failed when imported in statement
diff --git a/COPYRIGHT b/COPYRIGHT
index a29b425..b707f78 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2014-2016 Cédric Krier.
-Copyright (C) 2014-2016 B2CK SPRL.
+Copyright (C) 2014-2017 Cédric Krier.
+Copyright (C) 2014-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 362e929..3107ef0 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_payment_clearing
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module for payment clearing
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/payment.py b/payment.py
index 1421092..1f49fb9 100644
--- a/payment.py
+++ b/payment.py
@@ -101,7 +101,8 @@ class Payment:
             line.debit, line.credit = 0, local_amount
         line.account = self.line.account
         if not local_currency:
-            line.amount_second_currency = self.amount
+            line.amount_second_currency = self.amount.copy_sign(
+                line.debit - line.credit)
             line.second_currency = self.journal.currency
 
         line.party = (self.line.party
@@ -113,7 +114,8 @@ class Payment:
             counterpart.debit, counterpart.credit = local_amount, 0
         counterpart.account = self.journal.clearing_account
         if not local_currency:
-            counterpart.amount_second_currency = -self.amount
+            counterpart.amount_second_currency = self.amount.copy_sign(
+                counterpart.debit - counterpart.credit)
             counterpart.second_currency = self.journal.currency
         move.lines = (line, counterpart)
         return move
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 c5ad434..890746b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.2.0
+version=4.2.1
 depends:
     account_payment
     ir
diff --git a/trytond_account_payment_clearing.egg-info/PKG-INFO b/trytond_account_payment_clearing.egg-info/PKG-INFO
index 95473ee..8803761 100644
--- a/trytond_account_payment_clearing.egg-info/PKG-INFO
+++ b/trytond_account_payment_clearing.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-account-payment-clearing
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module for payment clearing
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-account-payment-clearing