From 12430b59f3269e27d4cfb511967bf45e20a5ef68 Mon Sep 17 00:00:00 2001
From: jem-odoo <jem@openerp.com>
Date: Thu, 26 Jul 2018 10:01:35 +0200
Subject: [PATCH] [FIX] project,sale_timesheet: default partner on billed task

---
 addons/project/models/project.py        | 3 ++-
 addons/sale_timesheet/models/project.py | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/project/models/project.py b/addons/project/models/project.py
index bddeff7d218..7b947a62344 100644
--- a/addons/project/models/project.py
+++ b/addons/project/models/project.py
@@ -410,6 +410,7 @@ class Task(models.Model):
             result.update(self._subtask_values_from_parent(result['parent_id']))
         return result
 
+    @api.model
     def _get_default_partner(self):
         if 'default_project_id' in self.env.context:
             default_project_id = self.env['project.project'].browse(self.env.context['default_project_id'])
@@ -478,7 +479,7 @@ class Task(models.Model):
         index=True, track_visibility='always')
     partner_id = fields.Many2one('res.partner',
         string='Customer',
-        default=_get_default_partner)
+        default=lambda self: self._get_default_partner())
     manager_id = fields.Many2one('res.users', string='Project Manager', related='project_id.user_id', readonly=True, related_sudo=False)
     company_id = fields.Many2one('res.company',
         string='Company',
diff --git a/addons/sale_timesheet/models/project.py b/addons/sale_timesheet/models/project.py
index 3f80dddbe45..fdff5f5dd08 100644
--- a/addons/sale_timesheet/models/project.py
+++ b/addons/sale_timesheet/models/project.py
@@ -56,11 +56,14 @@ class Project(models.Model):
 class ProjectTask(models.Model):
     _inherit = "project.task"
 
+    @api.model
     def _get_default_partner(self):
-        partner = super(ProjectTask, self)._get_default_partner()
+        partner = False
         if 'default_project_id' in self.env.context:  # partner from SO line is prior on one from project
             project = self.env['project.project'].browse(self.env.context['default_project_id'])
             partner = project.sale_line_id.order_partner_id
+        if not partner:
+            partner = super(ProjectTask, self)._get_default_partner()
         return partner
 
     @api.model