[tryton-debian-vcs] tryton-modules-account-deposit branch debian updated. debian/4.2.0-1-2-g9ea02c4
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Jun 7 13:31:19 UTC 2017
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-deposit.git;a=commitdiff;h=debian/4.2.0-1-2-g9ea02c4
commit 9ea02c4d29cf1b40bec26e5d4f98ac57828c1647
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jun 7 15:25:51 2017 +0200
Merging upstream version 4.4.0.
diff --git a/CHANGELOG b/CHANGELOG
index fa9890a..8443e5b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.4.0 - 2017-05-01
+* Bug fixes (see mercurial logs for details)
+
Version 4.2.0 - 2016-11-28
* Bug fixes (see mercurial logs for details)
* Support taxes defined on account deposit
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 0e2586f..81e91fe 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_deposit
-Version: 4.2.0
+Version: 4.4.0
Summary: Tryton module for accounting deposit
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_account_deposit
=======================
@@ -51,7 +51,7 @@ Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Chinese (Simplified)
diff --git a/party.py b/party.py
index 198f030..02f536f 100644
--- a/party.py
+++ b/party.py
@@ -2,7 +2,7 @@
# this repository contains the full copyright notices and license terms.
from decimal import Decimal
-from sql import Null
+from sql import Null, Literal, For
from sql.aggregate import Sum
from sql.conditionals import Coalesce
@@ -103,12 +103,19 @@ class Party:
line = MoveLine.__table__()
assert deposit_account.kind == 'deposit'
- transaction.database.lock(transaction.connection, MoveLine._table)
+ where = ((line.account == deposit_account.id)
+ & (line.party == self.id)
+ & (line.reconciliation == Null))
+ if transaction.database.has_select_for():
+ cursor.execute(*line.select(
+ Literal(1),
+ where=where,
+ for_=For('UPDATE', nowait=True)))
+ else:
+ transaction.database.lock(transaction.connection, MoveLine._table)
cursor.execute(*line.select(
Sum(Coalesce(line.debit, 0) - Coalesce(line.credit, 0)),
- where=(line.account == deposit_account.id)
- & (line.party == self.id)
- & (line.reconciliation == Null)))
+ where=where))
amount, = cursor.fetchone()
if amount and not isinstance(amount, Decimal):
currency = deposit_account.company.currency
diff --git a/setup.py b/setup.py
index 580d4be..bc8e38d 100644
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,7 @@ setup(name=name,
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
- 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
'Natural Language :: Chinese (Simplified)',
diff --git a/tryton.cfg b/tryton.cfg
index 01e9a6c..8fffea2 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.2.0
+version=4.4.0
depends:
account
account_invoice
diff --git a/trytond_account_deposit.egg-info/PKG-INFO b/trytond_account_deposit.egg-info/PKG-INFO
index 1e36e6f..451cf79 100644
--- a/trytond_account_deposit.egg-info/PKG-INFO
+++ b/trytond_account_deposit.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-account-deposit
-Version: 4.2.0
+Version: 4.4.0
Summary: Tryton module for accounting deposit
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/4.2/
+Download-URL: http://downloads.tryton.org/4.4/
Description: trytond_account_deposit
=======================
@@ -51,7 +51,7 @@ Classifier: Framework :: Tryton
Classifier: Intended Audience :: Developers
Classifier: Intended Audience :: Financial and Insurance Industry
Classifier: Intended Audience :: Legal Industry
-Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
Classifier: Natural Language :: Bulgarian
Classifier: Natural Language :: Catalan
Classifier: Natural Language :: Chinese (Simplified)
diff --git a/trytond_account_deposit.egg-info/requires.txt b/trytond_account_deposit.egg-info/requires.txt
index 8989582..faacf98 100644
--- a/trytond_account_deposit.egg-info/requires.txt
+++ b/trytond_account_deposit.egg-info/requires.txt
@@ -1,7 +1,7 @@
python-dateutil
python-sql >= 0.4
-trytond_account >= 4.2, < 4.3
-trytond_account_invoice >= 4.2, < 4.3
-trytond_company >= 4.2, < 4.3
-trytond_party >= 4.2, < 4.3
-trytond >= 4.2, < 4.3
+trytond_account >= 4.4, < 4.5
+trytond_account_invoice >= 4.4, < 4.5
+trytond_company >= 4.4, < 4.5
+trytond_party >= 4.4, < 4.5
+trytond >= 4.4, < 4.5
--
tryton-modules-account-deposit
More information about the tryton-debian-vcs
mailing list