[tryton-debian-vcs] tryton-modules-project branch debian-squeeze-1.8 created. c1d90041182a59a10a0193a240f8ac0dab80b714
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 17:06:38 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-project.git;a=commitdiff;h=c1d90041182a59a10a0193a240f8ac0dab80b714
commit c1d90041182a59a10a0193a240f8ac0dab80b714
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Oct 31 13:59:14 2011 +0100
Releasing debian version 1.8.2-0~60squeeze1.
diff --git a/debian/changelog b/debian/changelog
index 2908218..3f60150 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-project (1.8.2-0~60squeeze1) squeeze-backports-1.8; urgency=low
+
+ * Merging upstream version 1.8.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 11 Oct 2011 19:32:04 +0200
+
tryton-modules-project (1.8.1-0~60squeeze1) squeeze-backports-1.8; urgency=low
* Moving from deprecated python-support to dh_python2.
commit 168006c603047d67164f90b7c1e6f4a31875bf31
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Oct 11 19:31:35 2011 +0200
Merging upstream version 1.8.2.
diff --git a/CHANGELOG b/CHANGELOG
index 7a14dea..6e24b18 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.2 - 2011-09-10
+* Bug fixes (see mercurial logs for details)
+
Version 1.8.1 - 2011-05-29
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index d1ddcca..28e67b5 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_project
-Version: 1.8.1
+Version: 1.8.2
Summary: Project Module with:
- Project management
diff --git a/__tryton__.py b/__tryton__.py
index 6624ccc..dca295f 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Proyectos',
'name_es_ES': 'Proyecto',
'name_fr_FR': 'Projet',
- 'version': '1.8.1',
+ 'version': '1.8.2',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/trytond_project.egg-info/PKG-INFO b/trytond_project.egg-info/PKG-INFO
index ad32765..205b649 100644
--- a/trytond_project.egg-info/PKG-INFO
+++ b/trytond_project.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-project
-Version: 1.8.1
+Version: 1.8.2
Summary: Project Module with:
- Project management
diff --git a/work.py b/work.py
index 0d6ba59..f900ffc 100644
--- a/work.py
+++ b/work.py
@@ -29,6 +29,14 @@ class TimesheetWork(ModelSQL, ModelView):
self.parent.context['type'] = Eval('type')
self._reset_columns()
+ def copy(self, ids, default=None):
+ if default is None:
+ default = {}
+ default = default.copy()
+ if 'timesheet_lines' not in default:
+ default['timesheet_lines'] = False
+ return super(TimesheetWork, self).copy(ids, default=default)
+
TimesheetWork()
commit e7fbe9eef9261c0c270457b85e14c9366ebfabd8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 20 13:08:35 2011 +0200
Releasing debian version 1.8.1-0~60squeeze1.
diff --git a/debian/changelog b/debian/changelog
index ca81585..2908218 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-project (1.8.1-0~60squeeze1) squeeze-backports-1.8; urgency=low
+
+ * Moving from deprecated python-support to dh_python2.
+ * Merging upstream version 1.8.1.
+ * Rebuilding for squeeze-backports-1.8.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 19 Sep 2011 19:32:57 +0200
+
tryton-modules-project (1.8.0-2) unstable; urgency=low
* Changing my email address.
commit 61d4f526e455dc8a72abb61f5ce9cbc2a97a9250
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 20 12:59:32 2011 +0200
Moving from deprecated python-support to dh_python2.
diff --git a/debian/control b/debian/control
index ccd1b45..98144fb 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-project.git
Vcs-Git: git://git.debian-maintainers.org/git/tryton/tryton-modules-project.git
+X-Python-Version: >= 2.5
Package: tryton-modules-project
Architecture: all
@@ -18,7 +19,6 @@ Depends:
${misc:Depends}, ${python:Depends}, tryton-server (>= 1.8),
tryton-modules-party (>= 1.8), tryton-modules-timesheet (>= 1.8),
python-pkg-resources
-XB-Python-Version: ${python:Versions}
Description: Tryton Application Platform (Project 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 cb4f135259d23fa372a212aff1365592491d6fdf
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Aug 9 14:44:53 2011 +0200
Merging upstream version 1.8.1.
diff --git a/CHANGELOG b/CHANGELOG
index 505414f..7a14dea 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.1 - 2011-05-29
+* Bug fixes (see mercurial logs for details)
+
Version 1.8.0 - 2010-11-01
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index ab06914..2ff157b 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2010 Cédric Krier.
-Copyright (C) 2008-2010 B2CK SPRL.
-Copyright (C) 2009-2010 Bertrand Chenal.
+Copyright (C) 2008-2011 Cédric Krier.
+Copyright (C) 2008-2011 B2CK SPRL.
+Copyright (C) 2009-2011 Bertrand Chenal.
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 d5e1603..d1ddcca 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond_project
-Version: 1.8.0
+Version: 1.8.1
Summary: Project Module with:
- Project management
diff --git a/__tryton__.py b/__tryton__.py
index d3a9cae..6624ccc 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
'name_es_CO': 'Proyectos',
'name_es_ES': 'Proyecto',
'name_fr_FR': 'Projet',
- 'version': '1.8.0',
+ 'version': '1.8.1',
'author': 'B2CK',
'email': 'info at b2ck.com',
'website': 'http://www.tryton.org/',
diff --git a/trytond_project.egg-info/PKG-INFO b/trytond_project.egg-info/PKG-INFO
index ec09678..ad32765 100644
--- a/trytond_project.egg-info/PKG-INFO
+++ b/trytond_project.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: trytond-project
-Version: 1.8.0
+Version: 1.8.1
Summary: Project Module with:
- Project management
diff --git a/trytond_project.egg-info/SOURCES.txt b/trytond_project.egg-info/SOURCES.txt
index fe00c05..e4bbfab 100644
--- a/trytond_project.egg-info/SOURCES.txt
+++ b/trytond_project.egg-info/SOURCES.txt
@@ -17,8 +17,6 @@ work.xml
./tests/__init__.py
./tests/test_project.py
doc/index.rst
-tests/__init__.py
-tests/test_project.py
trytond_project.egg-info/PKG-INFO
trytond_project.egg-info/SOURCES.txt
trytond_project.egg-info/dependency_links.txt
diff --git a/work.py b/work.py
index 24f0b34..0d6ba59 100644
--- a/work.py
+++ b/work.py
@@ -16,7 +16,7 @@ class TimesheetWork(ModelSQL, ModelView):
depends=['timesheet_available', 'active'],
states={
'invisible': Not(Bool(Eval('timesheet_available'))),
- 'readonly': Not(Bool(Eval('not active'))),
+ 'readonly': Not(Bool(Eval('active'))),
})
sequence = fields.Integer('Sequence')
--
tryton-modules-project
More information about the tryton-debian-vcs
mailing list