[tryton-debian-vcs] tryton-modules-account-payment-clearing branch upstream updated. upstream/4.0.1-1-g3a1d032
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Jul 12 13:03:13 UTC 2016
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-payment-clearing.git;a=commitdiff;h=upstream/4.0.1-1-g3a1d032
commit 3a1d032330e606ad9e85c0b239d64683435a7432
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Jul 11 20:05:16 2016 +0200
Adding upstream version 4.0.2.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 61a74a2..6b57c70 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.2 - 2016-07-05
+* Bug fixes (see mercurial logs for details)
+
Version 4.0.1 - 2016-05-11
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 3aa9fea..2ee6823 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account_payment_clearing
-Version: 4.0.1
+Version: 4.0.2
Summary: Tryton module for payment clearing
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/payment.py b/payment.py
index 48474c8..1421092 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']
@@ -67,6 +68,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')
@@ -82,27 +84,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 34ce850..ff5b870 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.1
+version=4.0.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 8713192..411d387 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.1
+Version: 4.0.2
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