[tryton-debian-vcs] tryton-modules-account-payment-clearing branch upstream-3.6 updated. upstream/3.6.0-1-g97de365

[Mathias Behrle]

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.0-1-g97de365

commit 97de3656cbe081f29b6a5f5d68cb72cb75ef00a2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Apr 9 19:30:04 2016 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index cd9a9a7..03f905a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.1 - 2016-04-06
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.0 - 2015-04-20
 * Bug fixes (see mercurial logs for details)
 * Add support for PyPy
diff --git a/COPYRIGHT b/COPYRIGHT
index a085246..a29b425 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2014-2015 Cédric Krier.
-Copyright (C) 2014-2015 B2CK SPRL.
+Copyright (C) 2014-2016 Cédric Krier.
+Copyright (C) 2014-2016 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 e75c9d4..4bfa49d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_payment_clearing
-Version: 3.6.0
+Version: 3.6.1
 Summary: Tryton module for payment clearing
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/payment.py b/payment.py
index 1f0c123..77720be 100644
--- a/payment.py
+++ b/payment.py
@@ -1,7 +1,6 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
 from collections import defaultdict
-from decimal import Decimal
 
 from trytond.pool import PoolMeta, Pool
 from trytond.model import ModelView, Workflow, fields
@@ -85,8 +84,10 @@ class Payment:
         move = Move(journal=self.journal.clearing_journal, origin=self,
             date=date, period=period)
         line = Line()
-        line.debit = self.amount if self.line.credit else Decimal(0)
-        line.credit = self.amount if self.line.debit else Decimal(0)
+        if self.kind == 'payable':
+            line.debit, line.credit = self.amount, 0
+        else:
+            line.debit, line.credit = 0, self.amount
         line.account = self.line.account
         line.amount_second_currency = (-self.line.amount_second_currency
             if self.line.amount_second_currency else None)
@@ -94,8 +95,10 @@ class Payment:
         line.party = (self.line.party
             if self.line.account.party_required else None)
         counterpart = Line()
-        counterpart.debit = self.amount if self.line.debit else Decimal(0)
-        counterpart.credit = self.amount if self.line.credit else Decimal(0)
+        if self.kind == 'payable':
+            counterpart.debit, counterpart.credit = 0, self.amount
+        else:
+            counterpart.debit, counterpart.credit = self.amount, 0
         counterpart.account = self.journal.clearing_account
         counterpart.amount_second_currency = self.line.amount_second_currency
         counterpart.second_currency = self.line.second_currency
diff --git a/tryton.cfg b/tryton.cfg
index 43eac26..56b6f4f 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.0
+version=3.6.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 42f54ce..19ccce4 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.0
+Version: 3.6.1
 Summary: Tryton module for payment clearing
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_account_payment_clearing.egg-info/requires.txt b/trytond_account_payment_clearing.egg-info/requires.txt
index 306f312..af54837 100644
--- a/trytond_account_payment_clearing.egg-info/requires.txt
+++ b/trytond_account_payment_clearing.egg-info/requires.txt
@@ -1,2 +1,2 @@
 trytond_account_payment >= 3.6, < 3.7
-trytond >= 3.6, < 3.7
\ No newline at end of file
+trytond >= 3.6, < 3.7
-- 
tryton-modules-account-payment-clearing