[tryton-debian-vcs] tryton-modules-account-payment-clearing branch debian-stretch-4.0 updated. debian/4.0.2-1-5-g130f5e5

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 debian-stretch-4.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-payment-clearing.git;a=commitdiff;h=debian/4.0.2-1-5-g130f5e5

commit 130f5e57cdb8e1339ed54e729e51fef52a99df1c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jun 11 22:48:23 2017 +0200

    Releasing debian version 4.0.3-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index c181c50..f6538fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-account-payment-clearing (4.0.3-1) unstable; urgency=medium
+
+  * Setting the branch in the watch file to the fixed version 4.0.
+  * Add the actual upstream maintainer key to signing-key.asc.
+  * Merging upstream version 4.0.3.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Sun, 11 Jun 2017 22:48:22 +0200
+
 tryton-modules-account-payment-clearing (4.0.2-1) unstable; urgency=medium
 
   * Updating to Standards-Version: 3.9.8, no changes needed.
commit 0e5f096d9f46c44cae083f8628f64d2baedbe868
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jun 11 22:48:22 2017 +0200

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index f760dca..b6cfdbe 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 e2412cb63d98185cb5e1829f18d864977ec33f2a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jun 11 22:48:22 2017 +0200

    Merging upstream version 4.0.3.

diff --git a/CHANGELOG b/CHANGELOG
index 6b57c70..8a516e1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.3 - 2017-06-06
+* Bug fixes (see mercurial logs for details)
+
 Version 4.0.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 2ee6823..9a395c4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_payment_clearing
-Version: 4.0.2
+Version: 4.0.3
 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 ff5b870..e302da2 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.0.2
+version=4.0.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 411d387..c0005fd 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.0.2
+Version: 4.0.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