[tryton-debian-vcs] tryton-modules-account branch debian-jessie-3.2 updated. debian/3.2.3-1-4-g5c91d88
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Mar 4 00:28:48 UTC 2015
The following commit has been merged in the debian-jessie-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account.git;a=commitdiff;h=debian/3.2.3-1-4-g5c91d88
commit 5c91d88012b5dc37fe8b79daeff23cbf034bbbdc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 3 12:33:26 2015 +0100
Releasing debian version 3.2.4-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index dc6b6b4..d90fc7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-account (3.2.4-1) unstable; urgency=medium
+
+ * Adding actual upstream signing key.
+ * Merging upstream version 3.2.4.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 03 Mar 2015 12:33:26 +0100
+
tryton-modules-account (3.2.3-1) unstable; urgency=medium
* Merging upstream version 3.2.3.
commit ab82c052d30a87511923c9f01a02a5a684ba2061
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 3 12:33:25 2015 +0100
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index 76bf8cb..b9a3ed9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2008-2014 Cédric Krier
+Copyright: 2008-2015 Cédric Krier
2008-2013 Bertrand Chenal
- 2008-2014 B2CK SPRL
+ 2008-2015 B2CK SPRL
2004-2008 Tiny SPRL
License: GPL-3+
commit 5877346da4939ae54210cb02a3b9f4f42f6a1b8e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 3 12:33:25 2015 +0100
Merging upstream version 3.2.4.
diff --git a/CHANGELOG b/CHANGELOG
index 750ddab..d02ee45 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.4 - 2015-03-02
+* Bug fixes (see mercurial logs for details)
+
Version 3.2.3 - 2014-12-03
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 77715d8..3a28212 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2014 Cédric Krier.
+Copyright (C) 2008-2015 Cédric Krier.
Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2014 B2CK SPRL.
+Copyright (C) 2008-2015 B2CK SPRL.
Copyright (C) 2004-2008 Tiny SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index daf2465..c46b500 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account
-Version: 3.2.3
+Version: 3.2.4
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/journal.py b/journal.py
index 9b398ce..63e15a2 100644
--- a/journal.py
+++ b/journal.py
@@ -140,8 +140,8 @@ class Journal(ModelSQL, ModelView):
# Migration from 1.0 sequence Many2One change into Property
if table.column_exist('sequence'):
Property = Pool().get('ir.property')
- table = cls.__table__()
- cursor.execute(*table.select(table.id, table.sequence))
+ sql_table = cls.__table__()
+ cursor.execute(*sql_table.select(sql_table.id, sql_table.sequence))
with Transaction().set_user(0):
for journal_id, sequence_id in cursor.fetchall():
Property.set('sequence', cls._name,
diff --git a/move.py b/move.py
index cc904be..8376296 100644
--- a/move.py
+++ b/move.py
@@ -143,6 +143,11 @@ class Move(ModelSQL, ModelView):
def on_change_with_date(self):
Line = Pool().get('account.move.line')
date = self.date
+ if date:
+ if self.period and not (
+ self.period.start_date <= date <= self.period.end_date):
+ date = self.period.start_date
+ return date
lines = Line.search([
('journal', '=', self.journal),
('period', '=', self.period),
@@ -302,7 +307,7 @@ class Move(ModelSQL, ModelView):
cursor.execute(*line.select(line.move, line.id,
where=red_sql & (line.state == 'draft'),
order_by=line.move))
- move2draft_lines.update(dict((k, (j[1] for j in g))
+ move2draft_lines.update(dict((k, [j[1] for j in g])
for k, g in groupby(cursor.fetchall(), itemgetter(0))))
valid_moves = []
@@ -314,8 +319,7 @@ class Move(ModelSQL, ModelView):
# SQLite uses float for SUM
if not isinstance(amount, Decimal):
amount = Decimal(amount)
- draft_lines = MoveLine.browse(
- list(move2draft_lines.get(move.id, [])))
+ draft_lines = MoveLine.browse(move2draft_lines.get(move.id, []))
if not company.currency.is_zero(amount):
draft_moves.append(move.id)
continue
diff --git a/party.py b/party.py
index de9579f..c7f2d7b 100644
--- a/party.py
+++ b/party.py
@@ -173,7 +173,7 @@ class Party:
& (line.party != None)
& (line.reconciliation == None)
& (account.company == company_id)
- & today_query,
+ & line_query & today_query,
group_by=line.party,
having=Operator(Sum(Coalesce(line.debit, 0)
- Coalesce(line.credit, 0)),
diff --git a/setup.py b/setup.py
index 9c76991..663f810 100644
--- a/setup.py
+++ b/setup.py
@@ -47,6 +47,12 @@ for dep in info.get('depends', []):
requires.append(get_require_version('trytond_%s' % dep))
requires.append(get_require_version('trytond'))
+tests_require = [get_require_version('proteus')]
+dependency_links = []
+if minor_version % 2:
+ # Add development index for testing with proteus
+ dependency_links.append('https://trydevpi.tryton.org/')
+
setup(name=name,
version=version,
description='Tryton module for accounting',
@@ -91,6 +97,7 @@ setup(name=name,
],
license='GPL-3',
install_requires=requires,
+ dependency_links=dependency_links,
zip_safe=False,
entry_points="""
[trytond.modules]
@@ -98,4 +105,5 @@ setup(name=name,
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
+ tests_require=tests_require,
)
diff --git a/tryton.cfg b/tryton.cfg
index 726cc6e..e8db517 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.3
+version=3.2.4
depends:
company
currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 91eb356..83c797f 100644
--- a/trytond_account.egg-info/PKG-INFO
+++ b/trytond_account.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-account
-Version: 3.2.3
+Version: 3.2.4
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-account
More information about the tryton-debian-vcs
mailing list