[tryton-debian-vcs] tryton-modules-account-payment-clearing branch debian-stretch-3.8 updated. debian/3.8.2-1-4-g02dc0a4
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Jun 11 22:35:17 UTC 2017
The following commit has been merged in the debian-stretch-3.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-payment-clearing.git;a=commitdiff;h=debian/3.8.2-1-4-g02dc0a4
commit 02dc0a44f5e8920b8ef4d59c677af135528f105b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jun 11 22:47:07 2017 +0200
Releasing debian version 3.8.3-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 2d2e4c7..05c761e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-account-payment-clearing (3.8.3-1) unstable; urgency=medium
+
+ * Add the actual upstream maintainer key to signing-key.asc.
+ * Merging upstream version 3.8.3.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sun, 11 Jun 2017 22:47:07 +0200
+
tryton-modules-account-payment-clearing (3.8.2-1) unstable; urgency=medium
* Setting the branch in the watch file to the fixed version 3.8.
commit a9c573b9d8787febd41ff014c2df6addc2fc6dd9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jun 11 22:47:06 2017 +0200
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index eef3c88..c10f125 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2014-2016 Cédric Krier
- 2014-2016 B2CK SPRL
+Copyright: 2014-2017 Cédric Krier
+ 2014-2017 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 5f6a136780c395cedecf60b9c4bf66965866796c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jun 11 22:47:06 2017 +0200
Merging upstream version 3.8.3.
diff --git a/CHANGELOG b/CHANGELOG
index 9e898c8..08f828c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.8.3 - 2017-06-06
+* Bug fixes (see mercurial logs for details)
+
Version 3.8.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 193c238..99d3c90 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account_payment_clearing
-Version: 3.8.2
+Version: 3.8.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 475f81f..a1a6d1a 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.2
+version=3.8.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 8a1fe65..84d3937 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.8.2
+Version: 3.8.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