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

[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.1-1-ga3870fb

commit a3870fb8c78f92fdcd834f70b3c8e0d6f747d7bb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jul 11 20:07:51 2016 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 03f905a..636c880 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.2 - 2016-07-05
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.1 - 2016-04-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 4bfa49d..f9eb93f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_payment_clearing
-Version: 3.6.1
+Version: 3.6.2
 Summary: Tryton module for payment clearing
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/payment.py b/payment.py
index 77720be..dd1c04f 100644
--- a/payment.py
+++ b/payment.py
@@ -5,6 +5,7 @@ from collections import defaultdict
 from trytond.pool import PoolMeta, Pool
 from trytond.model import ModelView, Workflow, fields
 from trytond.pyson import Eval, Bool
+from trytond.transaction import Transaction
 
 __all__ = ['Journal', 'Payment']
 __metaclass__ = PoolMeta
@@ -66,6 +67,7 @@ class Payment:
         pool = Pool()
         Move = pool.get('account.move')
         Line = pool.get('account.move.line')
+        Currency = pool.get('currency.currency')
         Period = pool.get('account.period')
         Date = pool.get('ir.date')
 
@@ -81,27 +83,37 @@ class Payment:
             date = Date.today()
         period = Period.find(self.company.id, date=date)
 
+        local_currency = self.journal.currency == self.company.currency
+        if not local_currency:
+            with Transaction().set_context(date=self.date):
+                local_amount = Currency.compute(
+                    self.journal.currency, self.amount, self.company.currency)
+        else:
+            local_amount = self.amount
+
         move = Move(journal=self.journal.clearing_journal, origin=self,
             date=date, period=period)
         line = Line()
         if self.kind == 'payable':
-            line.debit, line.credit = self.amount, 0
+            line.debit, line.credit = local_amount, 0
         else:
-            line.debit, line.credit = 0, self.amount
+            line.debit, line.credit = 0, local_amount
         line.account = self.line.account
-        line.amount_second_currency = (-self.line.amount_second_currency
-            if self.line.amount_second_currency else None)
-        line.second_currency = self.line.second_currency
+        if not local_currency:
+            line.amount_second_currency = self.amount
+            line.second_currency = self.journal.currency
+
         line.party = (self.line.party
             if self.line.account.party_required else None)
         counterpart = Line()
         if self.kind == 'payable':
-            counterpart.debit, counterpart.credit = 0, self.amount
+            counterpart.debit, counterpart.credit = 0, local_amount
         else:
-            counterpart.debit, counterpart.credit = self.amount, 0
+            counterpart.debit, counterpart.credit = local_amount, 0
         counterpart.account = self.journal.clearing_account
-        counterpart.amount_second_currency = self.line.amount_second_currency
-        counterpart.second_currency = self.line.second_currency
+        if not local_currency:
+            counterpart.amount_second_currency = -self.amount
+            counterpart.second_currency = self.journal.currency
         move.lines = (line, counterpart)
         return move
 
diff --git a/tryton.cfg b/tryton.cfg
index 56b6f4f..0f3df1e 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.1
+version=3.6.2
 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 19ccce4..5fef42a 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.1
+Version: 3.6.2
 Summary: Tryton module for payment clearing
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-account-payment-clearing