[tryton-debian-vcs] tryton-modules-account-payment-clearing branch upstream-3.6 updated. upstream/3.6.2-1-g6d1d6ad
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Jun 11 22:35:18 UTC 2017
The following commit has been merged in the upstream-3.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-payment-clearing.git;a=commitdiff;h=upstream/3.6.2-1-g6d1d6ad
commit 6d1d6adc5640b5a05e53ed329fca49a4b686eb22
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jun 11 22:45:49 2017 +0200
Adding upstream version 3.6.3.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 636c880..71a38c8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.3 - 2017-06-06
+* Bug fixes (see mercurial logs for details)
+
Version 3.6.2 - 2016-07-05
* Bug fixes (see mercurial logs for details)
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 f9eb93f..87331fd 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account_payment_clearing
-Version: 3.6.2
+Version: 3.6.3
Summary: Tryton module for payment clearing
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/payment.py b/payment.py
index dd1c04f..9e0bfc6 100644
--- a/payment.py
+++ b/payment.py
@@ -100,7 +100,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
@@ -112,7 +113,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 0f3df1e..b984581 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.6.2
+version=3.6.3
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 5fef42a..ede3eb6 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: 3.6.2
+Version: 3.6.3
Summary: Tryton module for payment clearing
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-account-payment-clearing
More information about the tryton-debian-vcs
mailing list