[tryton-debian-vcs] tryton-modules-timesheet branch upstream-3.6 updated. upstream/3.6.0-1-g655189c

[Mathias Behrle]

The following commit has been merged in the upstream-3.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-timesheet.git;a=commitdiff;h=upstream/3.6.0-1-g655189c

commit 655189ce8a512e31fd6ec7538dc25cc651624a76
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 23 15:45:26 2015 +0100

    Adding upstream version 3.6.1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index bca10c5..6716bed 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.1 - 2015-12-22
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.0 - 2015-04-20
 * Bug fixes (see mercurial logs for details)
 * Add support for PyPy
diff --git a/PKG-INFO b/PKG-INFO
index e2ee87c..3798124 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_timesheet
-Version: 3.6.0
+Version: 3.6.1
 Summary: Tryton module with timesheets
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/line.py b/line.py
index f9a0e15..8196e96 100644
--- a/line.py
+++ b/line.py
@@ -171,10 +171,12 @@ class EnterLines(Wizard):
         date = Date(date.year, date.month, date.day)
         action['pyson_domain'] = PYSONEncoder().encode([
                 ('employee', '=', self.start.employee.id),
+                ('company', '=', self.start.employee.company.id),
                 ('date', '=', date),
                 ])
         action['pyson_context'] = PYSONEncoder().encode({
                 'employee': self.start.employee.id,
+                'company': self.start.employee.company.id,
                 'date': date,
                 })
         action['name'] += " - " + self.start.employee.rec_name
diff --git a/tryton.cfg b/tryton.cfg
index 13c3bbc..8163cb3 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.0
+version=3.6.1
 depends:
     company
     company_work_time
diff --git a/trytond_timesheet.egg-info/PKG-INFO b/trytond_timesheet.egg-info/PKG-INFO
index 0815907..b63ec6d 100644
--- a/trytond_timesheet.egg-info/PKG-INFO
+++ b/trytond_timesheet.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-timesheet
-Version: 3.6.0
+Version: 3.6.1
 Summary: Tryton module with timesheets
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-timesheet