[tryton-debian-vcs] tryton-modules-account branch upstream-2.2 created. e7ecbcd38072439e555698f4dd22a5bfa73d537f
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 16:52:50 UTC 2013
The following commit has been merged in the upstream-2.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account.git;a=commitdiff;h=e7ecbcd38072439e555698f4dd22a5bfa73d537f
commit e7ecbcd38072439e555698f4dd22a5bfa73d537f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 17 12:42:41 2013 +0200
Adding upstream version 2.2.6.
diff --git a/CHANGELOG b/CHANGELOG
index 91512c9..f6c4dfb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.6 - 2013-10-01
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.5 - 2013-05-02
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index e619540..88a4b19 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account
-Version: 2.2.5
+Version: 2.2.6
Summary: Financial and Accounting Module with:
- General accounting
- Fiscal year management
diff --git a/__tryton__.py b/__tryton__.py
index 3532023..a6bd568 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -8,7 +8,7 @@
'name_es_ES': 'Contabilidad',
'name_fr_FR': 'Comptabilité',
'name_nl_NL': 'Boekhouden',
- 'version': '2.2.5',
+ 'version': '2.2.6',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/account.py b/account.py
index 54910e4..1511e88 100644
--- a/account.py
+++ b/account.py
@@ -374,11 +374,11 @@ class AccountTemplate(ModelSQL, ModelView):
def search_rec_name(self, name, clause):
ids = self.search([
- ('code',) + clause[1:],
+ ('code',) + tuple(clause[1:]),
], limit=1)
if ids:
- return [('code',) + clause[1:]]
- return [(self._rec_name,) + clause[1:]]
+ return [('code',) + tuple(clause[1:])]
+ return [(self._rec_name,) + tuple(clause[1:])]
def _get_account_value(self, template, account=None):
'''
@@ -843,11 +843,11 @@ class Account(ModelSQL, ModelView):
def search_rec_name(self, name, clause):
ids = self.search([
- ('code',) + clause[1:],
+ ('code',) + tuple(clause[1:]),
], limit=1)
if ids:
- return [('code',) + clause[1:]]
- return [(self._rec_name,) + clause[1:]]
+ return [('code',) + tuple(clause[1:])]
+ return [(self._rec_name,) + tuple(clause[1:])]
def copy(self, ids, default=None):
if default is None:
@@ -1034,8 +1034,8 @@ class AccountDeferral(ModelSQL, ModelView):
def search_rec_name(self, name, clause):
ids = self.search(['OR',
- ('account.rec_name',) + clause[1:],
- ('fiscalyear.rec_name',) + clause[1:],
+ ('account.rec_name',) + tuple(clause[1:]),
+ ('fiscalyear.rec_name',) + tuple(clause[1:]),
])
return [('id', 'in', ids)]
diff --git a/journal.py b/journal.py
index 39588ec..30c3350 100644
--- a/journal.py
+++ b/journal.py
@@ -155,11 +155,11 @@ class Journal(ModelSQL, ModelView):
def search_rec_name(self, name, clause):
ids = self.search([
- ('code',) + clause[1:],
+ ('code',) + tuple(clause[1:]),
], limit=1, order=[])
if ids:
- return [('code',) + clause[1:]]
- return [(self._rec_name,) + clause[1:]]
+ return [('code',) + tuple(clause[1:])]
+ return [(self._rec_name,) + tuple(clause[1:])]
Journal()
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index c8f4539..b9fd96f 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: 2.2.5
+Version: 2.2.6
Summary: Financial and Accounting Module with:
- General accounting
- Fiscal year management
commit 717cc98a724fa5df43f352bec406cdf0e5bffe85
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 16:47:32 2013 +0200
Adding upstream version 2.2.5.
diff --git a/CHANGELOG b/CHANGELOG
index 9741be6..91512c9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.5 - 2013-05-02
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.4 - 2012-12-23
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 83c0f58..244bb5d 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2013 Cédric Krier.
Copyright (C) 2008-2011 Bertrand Chenal.
-Copyright (C) 2008-2012 B2CK SPRL.
+Copyright (C) 2008-2013 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 b6cd299..e619540 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account
-Version: 2.2.4
+Version: 2.2.5
Summary: Financial and Accounting Module with:
- General accounting
- Fiscal year management
diff --git a/__tryton__.py b/__tryton__.py
index b9678c4..3532023 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -8,7 +8,7 @@
'name_es_ES': 'Contabilidad',
'name_fr_FR': 'Comptabilité',
'name_nl_NL': 'Boekhouden',
- 'version': '2.2.4',
+ 'version': '2.2.5',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/move.py b/move.py
index 55cb946..b1c93d4 100644
--- a/move.py
+++ b/move.py
@@ -1719,6 +1719,7 @@ class GeneralJournal(Report):
clause = [
('date', '>=', datas['form']['from_date']),
('date', '<=', datas['form']['to_date']),
+ ('period.fiscalyear.company', '=', datas['form']['company']),
]
if datas['form']['posted']:
clause.append(('state', '=', 'posted'))
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 35194ca..c8f4539 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: 2.2.4
+Version: 2.2.5
Summary: Financial and Accounting Module with:
- General accounting
- Fiscal year management
commit 1850fcce4d6b94e86b545666062ff6dcbbb61231
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 19:50:27 2013 +0100
Adding upstream version 2.2.4.
diff --git a/CHANGELOG b/CHANGELOG
index 5937b39..9741be6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.4 - 2012-12-23
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.3 - 2012-09-02
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 0877c28..b6cd299 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond_account
-Version: 2.2.3
+Version: 2.2.4
Summary: Financial and Accounting Module with:
- General accounting
- Fiscal year management
diff --git a/__tryton__.py b/__tryton__.py
index c7a872c..b9678c4 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -8,7 +8,7 @@
'name_es_ES': 'Contabilidad',
'name_fr_FR': 'Comptabilité',
'name_nl_NL': 'Boekhouden',
- 'version': '2.2.3',
+ 'version': '2.2.4',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/account.py b/account.py
index 0c17695..54910e4 100644
--- a/account.py
+++ b/account.py
@@ -854,6 +854,7 @@ class Account(ModelSQL, ModelView):
default = {}
default['left'] = 0
default['right'] = 0
+ default.setdefault('deferrals', [])
res = super(Account, self).copy(ids, default=default)
self._rebuild_tree('parent', False, 0)
return res
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 4eef692..35194ca 100644
--- a/trytond_account.egg-info/PKG-INFO
+++ b/trytond_account.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
Name: trytond-account
-Version: 2.2.3
+Version: 2.2.4
Summary: Financial and Accounting Module with:
- General accounting
- Fiscal year management
commit 8f29945a7392e43cef11172429900f2b48f8d3bf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 11 19:36:35 2012 +0200
Adding upstream version 2.2.3.
diff --git a/CHANGELOG b/CHANGELOG
index b9944da..5937b39 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.3 - 2012-09-02
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.2 - 2012-05-07
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 42decd4..0877c28 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
Name: trytond_account
-Version: 2.2.2
+Version: 2.2.3
Summary: Financial and Accounting Module with:
- General accounting
- Fiscal year management
diff --git a/__tryton__.py b/__tryton__.py
index 577b73b..c7a872c 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -8,7 +8,7 @@
'name_es_ES': 'Contabilidad',
'name_fr_FR': 'Comptabilité',
'name_nl_NL': 'Boekhouden',
- 'version': '2.2.2',
+ 'version': '2.2.3',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/move.py b/move.py
index 949a078..55cb946 100644
--- a/move.py
+++ b/move.py
@@ -156,8 +156,8 @@ class Move(ModelSQL, ModelView):
def search_rec_name(self, name, clause):
ids = self.search(['OR',
- ('reference',) + clause[1:],
- (self._rec_name,) + clause[1:],
+ ('reference',) + tuple(clause[1:]),
+ (self._rec_name,) + tuple(clause[1:]),
])
return [('id', 'in', ids)]
@@ -886,7 +886,7 @@ class Line(ModelSQL, ModelView):
else:
if 'account' not in res:
res['account'] = party.account_payable.id
- res['account.rec_name'] = party.account_payable.id
+ res['account.rec_name'] = party.account_payable.rec_name
if party and vals.get('credit'):
if vals['credit'] > Decimal('0.0'):
diff --git a/party.py b/party.py
index bbcb96e..91a24a1 100644
--- a/party.py
+++ b/party.py
@@ -181,7 +181,7 @@ class Party(ModelSQL, ModelView):
'GROUP BY l.party '
'HAVING (SUM((COALESCE(l.debit, 0) - COALESCE(l.credit, 0))) ' \
+ clause[1] + ' %s)',
- [code] + today_value + [company_id] + [Decimal(clause[2])])
+ [code] + today_value + [company_id] + [Decimal(clause[2] or 0)])
return [('id', 'in', [x[0] for x in cursor.fetchall()])]
Party()
diff --git a/tax.py b/tax.py
index 26fa46d..713b5c9 100644
--- a/tax.py
+++ b/tax.py
@@ -238,10 +238,10 @@ class Code(ModelSQL, ModelView):
return res
def search_rec_name(self, name, clause):
- ids = self.search([('code',) + clause[1:]], limit=1, order=[])
+ ids = self.search([('code',) + tuple(clause[1:])], limit=1, order=[])
if ids:
- return [('code',) + clause[1:]]
- return [('name',) + clause[1:]]
+ return [('code',) + tuple(clause[1:])]
+ return [('name',) + tuple(clause[1:])]
def delete(self, ids):
if isinstance(ids, (int, long)):
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 17ddc4b..4eef692 100644
--- a/trytond_account.egg-info/PKG-INFO
+++ b/trytond_account.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
Name: trytond-account
-Version: 2.2.2
+Version: 2.2.3
Summary: Financial and Accounting Module with:
- General accounting
- Fiscal year management
commit 91a118002aa55625282fd8ca174ff0a530e2a9f9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 9 11:47:27 2012 +0200
Adding upstream version 2.2.2.
diff --git a/CHANGELOG b/CHANGELOG
index f842489..b9944da 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.2 - 2012-05-07
+* Bug fixes (see mercurial logs for details)
+
Version 2.2.1 - 2011-12-26
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index a9feb41..83c0f58 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2011 Cédric Krier.
+Copyright (C) 2008-2012 Cédric Krier.
Copyright (C) 2008-2011 Bertrand Chenal.
-Copyright (C) 2008-2011 B2CK SPRL.
+Copyright (C) 2008-2012 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 ef68090..42decd4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account
-Version: 2.2.1
+Version: 2.2.2
Summary: Financial and Accounting Module with:
- General accounting
- Fiscal year management
diff --git a/__tryton__.py b/__tryton__.py
index 995c7ac..577b73b 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -8,7 +8,7 @@
'name_es_ES': 'Contabilidad',
'name_fr_FR': 'Comptabilité',
'name_nl_NL': 'Boekhouden',
- 'version': '2.2.1',
+ 'version': '2.2.2',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/account.py b/account.py
index cc15476..0c17695 100644
--- a/account.py
+++ b/account.py
@@ -154,8 +154,8 @@ class Type(ModelSQL, ModelView):
name = fields.Char('Name', size=None, required=True, translate=True)
parent = fields.Many2One('account.account.type', 'Parent',
ondelete="RESTRICT", domain=[
- ('company', '=', Eval('context', {}).get('company')),
- ])
+ ('company', '=', Eval('company')),
+ ], depends=['company'])
childs = fields.One2Many('account.account.type', 'parent', 'Children',
domain=[
('company', '=', Eval('company')),
diff --git a/move.py b/move.py
index 1108edc..949a078 100644
--- a/move.py
+++ b/move.py
@@ -769,6 +769,8 @@ class Line(ModelSQL, ModelView):
tax_code_obj = pool.get('account.tax.code')
tax_obj = pool.get('account.tax')
move_obj = pool.get('account.move')
+ tax_line_obj = pool.get('account.tax.line')
+
if vals.get('move'):
#Only for first line
return res
@@ -803,14 +805,18 @@ class Line(ModelSQL, ModelView):
for code_id, tax_id in base_amounts:
if not base_amounts[code_id, tax_id]:
continue
- res.setdefault('add', []).append({
- 'amount': base_amounts[code_id, tax_id],
- 'currency_digits': account.currency_digits,
- 'code': code_id,
- 'code.rec_name': tax_code_obj.browse(code_id).rec_name,
- 'tax': tax_id,
- 'tax.rec_name': tax_obj.browse(tax_id).rec_name,
- })
+ value = tax_line_obj.default_get(
+ tax_line_obj._columns.keys())
+ value.update({
+ 'amount': base_amounts[code_id, tax_id],
+ 'currency_digits': account.currency_digits,
+ 'code': code_id,
+ 'code.rec_name': tax_code_obj.browse(
+ code_id).rec_name,
+ 'tax': tax_id,
+ 'tax.rec_name': tax_obj.browse(tax_id).rec_name,
+ })
+ res.setdefault('add', []).append(value)
return res
def on_change_party(self, vals):
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 523d73e..17ddc4b 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: 2.2.1
+Version: 2.2.2
Summary: Financial and Accounting Module with:
- General accounting
- Fiscal year management
--
tryton-modules-account
More information about the tryton-debian-vcs
mailing list