[tryton-debian-vcs] tryton-modules-account branch debian-squeeze-1.8 created. 9fada80ee437bb2d01a9a5442ce7e5c6fc376c9f
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-squeeze-1.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account.git;a=commitdiff;h=9fada80ee437bb2d01a9a5442ce7e5c6fc376c9f
commit 9fada80ee437bb2d01a9a5442ce7e5c6fc376c9f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 11 18:37:37 2011 +0200
Releasing debian version 1.8.3-0~60squeeze1.
diff --git a/debian/changelog b/debian/changelog
index cc8d959..6980df7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-account (1.8.3-0~60squeeze1) squeeze-backports-1.8; urgency=low
+
+ * Merging upstream version 1.8.3.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 11 Oct 2011 18:37:01 +0200
+
tryton-modules-account (1.8.2-0~60squeeze1) squeeze-backports-1.8; urgency=low
* Moving from deprecated python-support to dh_python2.
commit 3a1b2b918264a968aa1b9243dd3d73d356bfae39
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 11 18:36:21 2011 +0200
Merging upstream version 1.8.3.
diff --git a/CHANGELOG b/CHANGELOG
index 87df4ac..409e46b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.3 - 2011-09-10
+* Bug fixes (see mercurial logs for details)
+
Version 1.8.2 - 2011-05-29
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 2109605..1948efd 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_account
-Version: 1.8.2
+Version: 1.8.3
Summary: Financial and Accounting Module with:
- General accounting
- Fiscal year management
diff --git a/__tryton__.py b/__tryton__.py
index 02f6fee..f71043b 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Contabilidad',
'name_es_ES': 'Contabilidad',
'name_fr_FR': 'Comptabilité',
- 'version': '1.8.2',
+ 'version': '1.8.3',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/party.py b/party.py
index 1516600..1fbe903 100644
--- a/party.py
+++ b/party.py
@@ -71,7 +71,10 @@ class Party(ModelSQL, ModelView):
return {}
company_id = None
- user = user_obj.browse(Transaction().user)
+ user_id = Transaction().user
+ if user_id == 0 and 'user' in Transaction().context:
+ user_id = Transaction().context['user']
+ user = user_obj.browse(user_id)
if Transaction().context.get('company'):
child_company_ids = company_obj.search([
('parent', 'child_of', [user.main_company.id]),
@@ -131,7 +134,10 @@ class Party(ModelSQL, ModelView):
raise Exception('Bad argument')
company_id = None
- user = user_obj.browse(Transaction().user)
+ user_id = Transaction().user
+ if user_id == 0 and 'user' in Transaction().context:
+ user_id = Transaction().context['user']
+ user = user_obj.browse(user_id)
if Transaction().context.get('company'):
child_company_ids = company_obj.search([
('parent', 'child_of', [user.main_company.id]),
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 7072abd..41fbd47 100644
--- a/trytond_account.egg-info/PKG-INFO
+++ b/trytond_account.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-account
-Version: 1.8.2
+Version: 1.8.3
Summary: Financial and Accounting Module with:
- General accounting
- Fiscal year management
commit 87ae32465ddadfae48c7026f5f2dab9463c4712f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 20 13:08:31 2011 +0200
Releasing debian version 1.8.2-0~60squeeze1.
diff --git a/debian/changelog b/debian/changelog
index c7d4f20..cc8d959 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-account (1.8.2-0~60squeeze1) squeeze-backports-1.8; urgency=low
+
+ * Moving from deprecated python-support to dh_python2.
+ * Merging upstream version 1.8.2.
+ * Rebuilding for squeeze-backports-1.8.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 19 Sep 2011 19:30:56 +0200
+
tryton-modules-account (1.8.1-1) unstable; urgency=low
* Changing my email address.
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
new file mode 100644
index 0000000..7ce2c04
--- /dev/null
+++ b/debian/pydist-overrides
@@ -0,0 +1 @@
+python_dateutil python-dateutil
commit c680b32eb114fab18263ae287dd413c740f498b5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 20 12:59:30 2011 +0200
Moving from deprecated python-support to dh_python2.
diff --git a/debian/control b/debian/control
index 6a6dd75..1f2e526 100644
--- a/debian/control
+++ b/debian/control
@@ -6,11 +6,12 @@ Uploaders:
Daniel Baumann <daniel at debian.org>,
Mathias Behrle <mathiasb at m9s.biz>
Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8), python, python-setuptools, python-support
+Build-Depends: debhelper (>= 8), python (>= 2.6.6-3~), python-setuptools
Standards-Version: 3.9.1
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
+X-Python-Version: >= 2.5
Package: tryton-modules-account
Architecture: all
@@ -18,7 +19,6 @@ Depends:
${misc:Depends}, ${python:Depends}, tryton-server (>= 1.8),
tryton-modules-company (>= 1.8), tryton-modules-currency (>= 1.8),
tryton-modules-party (>= 1.8), python-dateutil, python-pkg-resources
-XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Financial and Accounting Module)
Tryton is a high-level general purpose application platform written in Python
and using PostgreSQL as database engine. It is the core base of a complete
diff --git a/debian/pycompat b/debian/pycompat
deleted file mode 100644
index 0cfbf08..0000000
--- a/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644
index b3dc41e..0000000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.5-
diff --git a/debian/rules b/debian/rules
index 000210b..e32b791 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,9 @@
#!/usr/bin/make -f
%:
- dh ${@}
+ dh ${@} --with python2
+
+override_dh_auto_clean:
+ dh_auto_clean
+
+ rm -rf *.egg-info
commit 67130781cb5f0d1a7737a8009740bd6a1541fb4d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Aug 9 13:57:30 2011 +0200
Merging upstream version 1.8.2.
diff --git a/CHANGELOG b/CHANGELOG
index c08a3f5..87df4ac 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.2 - 2011-05-29
+* Bug fixes (see mercurial logs for details)
+
Version 1.8.1 - 2011-02-13
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 1bc5f7f..2109605 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_account
-Version: 1.8.1
+Version: 1.8.2
Summary: Financial and Accounting Module with:
- General accounting
- Fiscal year management
diff --git a/__tryton__.py b/__tryton__.py
index 13261e4..02f6fee 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Contabilidad',
'name_es_ES': 'Contabilidad',
'name_fr_FR': 'Comptabilité',
- 'version': '1.8.1',
+ 'version': '1.8.2',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/account.py b/account.py
index f78b9b0..3edab42 100644
--- a/account.py
+++ b/account.py
@@ -5,6 +5,7 @@ from decimal import Decimal
import datetime
import time
import os
+import operator
from trytond.model import ModelView, ModelSQL, fields
from trytond.wizard import Wizard
from trytond.report import Report
@@ -1415,7 +1416,9 @@ class TrialBalance(Report):
periods = period_obj.browse(end_period_ids)
localcontext['accounts'] = accounts
+ periods.sort(key=operator.attrgetter('start_date'))
localcontext['start_period'] = periods[0]
+ periods.sort(key=operator.attrgetter('end_date'))
localcontext['end_period'] = periods[-1]
localcontext['company'] = company
localcontext['digits'] = company.currency.digits
@@ -2069,7 +2072,8 @@ class ThirdPartyBalance(Report):
localcontext['company'] = company
localcontext['digits'] = company.currency.digits
localcontext['fiscalyear'] = datas['form']['fiscalyear']
- line_query, _ = move_line_obj.query_get()
+ with Transaction().set_context(context=localcontext):
+ line_query, _ = move_line_obj.query_get()
if datas['form']['posted']:
posted_clause = "AND m.state = 'posted' "
else:
@@ -2217,7 +2221,8 @@ class AgedBalance(Report):
localcontext['digits'] = company.currency.digits
localcontext['fiscalyear'] = datas['form']['fiscalyear']
localcontext['posted'] = datas['form']['posted']
- line_query, _ = move_line_obj.query_get()
+ with Transaction().set_context(context=localcontext):
+ line_query, _ = move_line_obj.query_get()
terms = (datas['form']['term1'],
datas['form']['term2'],
diff --git a/move.py b/move.py
index 6246a39..067c9d7 100644
--- a/move.py
+++ b/move.py
@@ -927,7 +927,7 @@ class Line(ModelSQL, ModelView):
def search_move_field(self, name, clause):
if name == 'move_state':
name = 'state'
- return [('move.' + name,) + clause[1:]]
+ return [('move.' + name,) + tuple(clause[1:])]
def query_get(self, obj='l'):
'''
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 60db17a..7072abd 100644
--- a/trytond_account.egg-info/PKG-INFO
+++ b/trytond_account.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-account
-Version: 1.8.1
+Version: 1.8.2
Summary: Financial and Accounting Module with:
- General accounting
- Fiscal year management
--
tryton-modules-account
More information about the tryton-debian-vcs
mailing list