[tryton-debian-vcs] tryton-modules-account branch debian-wheezy-2.2 created. 159829efb9d640992cfa997829af5ced1c9441f4
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 16:52:48 UTC 2013
The following commit has been merged in the debian-wheezy-2.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account.git;a=commitdiff;h=159829efb9d640992cfa997829af5ced1c9441f4
commit 159829efb9d640992cfa997829af5ced1c9441f4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Nov 21 12:00:55 2013 +0100
Removing inadvertently commited .pc directory.
diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
deleted file mode 100644
index 6857a8d..0000000
--- a/.pc/.quilt_patches
+++ /dev/null
@@ -1 +0,0 @@
-debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
deleted file mode 100644
index c206706..0000000
--- a/.pc/.quilt_series
+++ /dev/null
@@ -1 +0,0 @@
-series
diff --git a/.pc/.version b/.pc/.version
deleted file mode 100644
index 0cfbf08..0000000
--- a/.pc/.version
+++ /dev/null
@@ -1 +0,0 @@
-2
commit 44dd5f3a8cbc64ab0a562faf7aac1267dc028a87
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 17 12:56:32 2013 +0200
Releasing debian version 2.2.6-1.
diff --git a/debian/changelog b/debian/changelog
index f64e285..ceb12ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-account (2.2.6-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.6.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 17 Oct 2013 12:42:48 +0200
+
tryton-modules-account (2.2.5-1) unstable; urgency=low
* Merging upstream version 2.2.5.
commit 9a7346f26289ace4b001c35905ebe6988945de68
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 17 12:42:42 2013 +0200
Merging 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 2af9e2c7b13c1d73545ede0c84dea37485781856
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 17:05:14 2013 +0200
Releasing debian version 2.2.5-1.
diff --git a/debian/changelog b/debian/changelog
index 3d3f459..f64e285 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-account (2.2.5-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.5.
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 04 May 2013 16:56:21 +0200
+
tryton-modules-account (2.2.4-1) unstable; urgency=low
* Adding xz compression in source/options.
commit cbb9e447a5e00703a3868b7afad6ceb78cac9761
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 16:50:58 2013 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index bc21ded..81bd6a2 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-2012 Cédric Krier
+Copyright: 2008-2013 Cédric Krier
2008-2011 Bertrand Chenal
- 2008-2012 B2CK SPRL
+ 2008-2013 B2CK SPRL
2004-2008 Tiny SPRL
License: GPL-3+
commit e89320d822d137059f780242facd34529172a578
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 16:47:36 2013 +0200
Merging 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 93bc3e839c4e1ce28c1d1e7595c5fc5abfecfc40
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 19 19:25:25 2013 +0100
Releasing debian version 2.2.4-1.
diff --git a/debian/changelog b/debian/changelog
index 2bdf6ac..3d3f459 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-account (2.2.4-1) unstable; urgency=low
+
+ * Adding xz compression in source/options.
+ * Merging upstream version 2.2.4.
+ * Updating to Standards-Version: 3.9.4, no changes needed.
+ * Removing obsolete Dm-Upload-Allowed
+ * Updating copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sun, 24 Feb 2013 22:10:15 +0100
+
tryton-modules-account (2.2.3-1) unstable; urgency=low
* Merging upstream version 2.2.3.
commit 4d8241987caaefd0578491c48cac47b4e240f919
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 22:09:31 2013 +0100
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index 824edfb..bc21ded 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2004-2008 Tiny SPRL
- 2008-2012 Cedric Krier
+Copyright: 2008-2012 Cédric Krier
2008-2011 Bertrand Chenal
2008-2012 B2CK SPRL
+ 2004-2008 Tiny SPRL
License: GPL-3+
Files: icons/*
commit b9a1e9fbcec148339d5e02497b76bbdc5cc40b08
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 22:01:47 2013 +0100
Removing obsolete Dm-Upload-Allowed
diff --git a/debian/control b/debian/control
index edd37e5..474735b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
-Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
commit 51af7e6b6730ca9ce0efb8ba9127034c910014bb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 22:01:09 2013 +0100
Updating to Standards-Version: 3.9.4, no changes needed.
diff --git a/debian/control b/debian/control
index 3b791ea..edd37e5 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-account.git
Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-account.git
commit 637a44d378a22a9f2de42662a07f349485eea9ac
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Feb 24 19:50:31 2013 +0100
Merging 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 7087b653594a34a914e45c6177d1961583807eb9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Oct 24 13:58:56 2012 +0200
Adding xz compression in source/options.
diff --git a/debian/source/options b/debian/source/options
index d053b65..22a4de9 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,2 @@
-compression = gzip
+compression = xz
compression-level = 9
commit 48977d688a9f2e8315fd2b6913f0b8adf64d49db
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Oct 3 23:00:00 2012 +0200
Releasing debian version 2.2.3-1.
diff --git a/debian/changelog b/debian/changelog
index b84795c..2bdf6ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-account (2.2.3-1) unstable; urgency=low
+
+ * Merging upstream version 2.2.3.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 03 Oct 2012 21:52:12 +0200
+
tryton-modules-account (2.2.2-2) unstable; urgency=low
* Updating maintainers field.
commit 2147f4b6b95df691caa49607c1dd8dba3e084bfc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 11 19:36:38 2012 +0200
Merging 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 5af03e382f933b47d6880ebcad0d6cd45a5c3a71
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:03:47 2012 +0200
Releasing debian version 2.2.2-2.
diff --git a/debian/changelog b/debian/changelog
index 63c9637..b84795c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-account (2.2.2-2) unstable; urgency=low
+
+ * Updating maintainers field.
+ * Updating vcs fields.
+ * Correcting copyright file to match format version 1.0.
+ * Switching to xz compression.
+ * Updating to debhelper version 9.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 30 Jun 2012 18:03:32 +0200
+
tryton-modules-account (2.2.2-1) unstable; urgency=low
* Updating to Standards-Version: 3.9.3, no changes needed.
commit 2935ec36be87b1e242e28642404c9dbf234f89a9
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 18:02:28 2012 +0200
Updating to debhelper version 9.
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 8914fab..3b791ea 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
+Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-account.git
commit 1ab6477b022e4825f1636a96b8ad86d134053b85
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:53:50 2012 +0200
Switching to xz compression.
diff --git a/debian/rules b/debian/rules
index e32b791..1ae0776 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,3 +7,6 @@ override_dh_auto_clean:
dh_auto_clean
rm -rf *.egg-info
+
+override_dh_builddeb:
+ dh_builddeb -- -Zxz -z9
commit a7bdd569ac861d03f789562b68e3b62fe061a5ee
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jun 30 17:50:23 2012 +0200
Correcting copyright file to match format version 1.0.
diff --git a/debian/copyright b/debian/copyright
index 2a7ea13..824edfb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,10 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright:
- (C) 2004-2008 Tiny SPRL
- (C) 2008-2012 Cedric Krier
- (C) 2008-2011 Bertrand Chenal
- (C) 2008-2012 B2CK SPRL
+Copyright: 2004-2008 Tiny SPRL
+ 2008-2012 Cedric Krier
+ 2008-2011 Bertrand Chenal
+ 2008-2012 B2CK SPRL
License: GPL-3+
Files: icons/*
@@ -13,9 +12,8 @@ Copyright: not applicable
License: public-domain
Files: debian/*
-Copyright:
- (C) 2009-2012 Daniel Baumann <daniel at debian.org>
- (C) 2011-2012 Mathias Behrle <mathiasb at m9s.biz>
+Copyright: 2009-2012 Daniel Baumann <daniel at debian.org>
+ 2011-2012 Mathias Behrle <mathiasb at m9s.biz>
License: GPL-3+
License: GPL-3+
commit 0b04dbeae7f2982d2ba450f7e97d228b75631b86
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:55:03 2012 +0200
Updating vcs fields.
diff --git a/debian/control b/debian/control
index 02bf14d..8914fab 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.3
Homepage: http://www.tryton.org/
-Vcs-Browser: http://git.debian-maintainers.org/?p=tryton/tryton-modules-account.git
-Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-account.git
+Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-account.git
+Vcs-Git: git://debian.tryton.org/git/packages/tryton-modules-account.git
X-Python-Version: >= 2.6
Package: tryton-modules-account
commit df107b9ca3d060b442d9d5c3769a550259265e9c
Author: Daniel Baumann <daniel at 127011.net>
Date: Sat Jun 30 16:52:29 2012 +0200
Updating maintainers field.
diff --git a/debian/control b/debian/control
index ffa6760..02bf14d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tryton-modules-account
Section: python
Priority: optional
-Maintainer: Debian Tryton Maintainers <tryton at lists.debian-maintainers.org>
+Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Daniel Baumann <daniel at debian.org>, Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
commit 077c1729c51ba14f1108bbb6c6eb968006043a81
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 9 13:13:20 2012 +0200
Releasing debian version 2.2.2-1.
diff --git a/debian/changelog b/debian/changelog
index 6a8b9f3..63c9637 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-account (2.2.2-1) unstable; urgency=low
+
+ * Updating to Standards-Version: 3.9.3, no changes needed.
+ * Updating year in copyright.
+ * Adding Format header for DEP5.
+ * Merging upstream version 2.2.2.
+ * Updating years in copyright.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 09 May 2012 11:58:27 +0200
+
tryton-modules-account (2.2.1-1) unstable; urgency=low
* Merging upstream version 2.2.1.
commit 93c7c648ed37904e7dfed293b50e97888a803eee
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 9 11:58:22 2012 +0200
Updating years in copyright.
diff --git a/debian/copyright b/debian/copyright
index 165d163..2a7ea13 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,9 +3,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright:
(C) 2004-2008 Tiny SPRL
- (C) 2008-2011 Cedric Krier
+ (C) 2008-2012 Cedric Krier
(C) 2008-2011 Bertrand Chenal
- (C) 2008-2011 B2CK SPRL
+ (C) 2008-2012 B2CK SPRL
License: GPL-3+
Files: icons/*
commit 5d766ad01ebfd83c1931b204a1bba64a968a30e6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed May 9 11:47:27 2012 +0200
Merging 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