[FIX] project: allow partner_id on new project created from template

Before this commit, when creating a new project from a template, the 'partner_id' field
was being removed from the values given to 'action_create_from_template()', even if
it was explicitly set in the 'values' parameters we want the new project to have.
For instance when specifying the 'Customer' field from the project creation from template wizard,
it was not being taken into account, and the new project was created without a partner.
Same when a product is configured to generate a project from a template, the partner was not set
on the new project.
We also rework a bit the copy method and remove unused code.
We also make projects billable by default and remove some 'default_allow_billable' contexts as it's not useful anymore.

Author: deneuvillem

addons/project/models/project_project.py

@@ -473,22 +473,16 @@ def map_tasks(self, new_project_id):
         return True
 
     def copy_data(self, default=None):
+        default = dict(default or {})
         vals_list = super().copy_data(default=default)
-        if default and 'name' in default:
-            return vals_list
         copy_from_template = self.env.context.get('copy_from_template')
         for project, vals in zip(self, vals_list):
             if project.is_template and not copy_from_template:
                 vals['is_template'] = True
             if copy_from_template:
-                # We can make last_update_status as None because it is a required field
-                vals.pop("last_update_status", None)
                 for field in set(self._get_template_field_blacklist()) & set(vals.keys()):
                     del vals[field]
-                vals["name"] = project.name
-            else:
-                if project.is_template or not vals.get("is_template"):
-                    vals["name"] = self.env._("%s (copy)", project.name)
+            vals['name'] = default.get('name', self.env._('%s (copy)', project.name))
         return vals_list
 
     def copy(self, default=None):

addons/project/wizard/project_template_create_wizard.py

@@ -25,7 +25,7 @@ def _get_template_whitelist_fields(self):
         """
         Whitelist of fields of this wizard that will be used when creating a project from a template.
         """
-        return ["name", "date_start", "date", "alias_name", "alias_domain_id", "partner_id"]
+        return ["name", "date_start", "date", "alias_name", "alias_domain_id"]
 
     def _create_project_from_template(self):
         # Dictionary with all whitelist fields and their values
@@ -35,7 +35,7 @@ def _create_project_from_template(self):
                 for fname in self._fields.keys() & self._get_template_whitelist_fields()
             }
         )
-        return self.template_id.action_create_from_template(values=field_values, role_to_users_mapping=self.role_to_users_ids)
+        return self.template_id.with_context(copy_partner=True).action_create_from_template(values=field_values, role_to_users_mapping=self.role_to_users_ids)
 
     def create_project_from_template(self):
         # Opening project task views after creation of project from template

addons/sale_project/models/project_project.py

@@ -24,7 +24,7 @@ def _domain_sale_line_id(self):
         ])
         return domain
 
-    allow_billable = fields.Boolean("Billable")
+    allow_billable = fields.Boolean("Billable", default=True)
     sale_line_id = fields.Many2one(
         'sale.order.line', 'Sales Order Item', copy=False,
         compute="_compute_sale_line_id", store=True, readonly=False, index='btree_not_null',
@@ -936,3 +936,9 @@ def _get_template_default_context_whitelist(self):
             *super()._get_template_default_context_whitelist(),
             'allow_billable',
         ]
+
+    def _get_template_field_blacklist(self):
+        res = super()._get_template_field_blacklist()
+        if self.env.context.get('copy_partner'):
+            res.remove('partner_id')
+        return res

addons/sale_project/models/sale_order.py

@@ -227,7 +227,6 @@ def action_create_project(self):
                 'default_sale_line_id': default_sale_line.id,
                 'default_partner_id': self.partner_id.id,
                 'default_user_ids': [self.env.uid],
-                'default_allow_billable': 1,
                 'hide_allow_billable': True,
                 'default_company_id': self.company_id.id,
                 'generate_milestone': default_sale_line.product_id.service_policy == 'delivered_milestones',
@@ -254,7 +253,6 @@ def action_view_project_ids(self):
                 **self._context,
                 'default_partner_id': self.partner_id.id,
                 'default_sale_line_id': default_sale_line.id,
-                'default_allow_billable': 1,
             }
         }
         if len(self.with_context(active_test=False).project_ids) == 1:

addons/sale_project/models/sale_order_line.py

@@ -193,7 +193,7 @@ def _timesheet_create_project(self):
         if project_template:
             values['name'] = "%s - %s" % (values['name'], project_template.name)
             if project_template.is_template:
-                project = project_template.action_create_from_template(values)
+                project = project_template.with_context(copy_partner=True).action_create_from_template(values)
             else:
                 project = project_template.copy(values)
             project.tasks.write({

addons/sale_project/views/product_views.xml

@@ -16,11 +16,11 @@
                 <div class="o_td_label d-inline-flex" invisible="service_tracking != 'task_global_project'">
                     <label for='project_id'/>
                 </div>
-                <field name="project_id" context="{'default_allow_billable': True}" invisible="service_tracking != 'task_global_project'" nolabel="1" placeholder="Defined on quotation"/>
+                <field name="project_id" invisible="service_tracking != 'task_global_project'" nolabel="1" placeholder="Defined on quotation"/>
                 <div class="o_td_label d-inline-flex" invisible="service_tracking not in ['task_in_project', 'project_only']">
                     <label for='project_template_id'/>
                 </div>
-                <field name="project_template_id" context="{'active_test': False, 'default_allow_billable': True, 'default_is_template': True}" invisible="service_tracking not in ['task_in_project', 'project_only']" nolabel="1" placeholder="Empty project"/>
+                <field name="project_template_id" context="{'active_test': False, 'default_is_template': True}" invisible="service_tracking not in ['task_in_project', 'project_only']" nolabel="1" placeholder="Empty project"/>
                 <field name="service_policy"
                     string="Invoicing Policy"
                     invisible="type != 'service' or sale_ok == False"

addons/sale_project/views/project_task_views.xml

@@ -147,7 +147,7 @@
         <field name="inherit_id" ref="project.quick_create_task_form"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='project_id']" position="attributes">
-                <attribute name="context">{'default_allow_billable': True, 'default_type_ids': [(4, context.get('default_stage_id', False))]}
+                <attribute name="context">{'default_type_ids': [(4, context.get('default_stage_id', False))]}
                 </attribute>
             </xpath>
         </field>
@@ -238,9 +238,6 @@
                 <attribute name="column_invisible">not parent.allow_billable</attribute>
                 <attribute name="invisible">not allow_billable</attribute>
             </xpath>
-            <field name="project_id" position="attributes">
-                <attribute name="context">{'default_allow_billable': True}</attribute>
-            </field>
         </field>
     </record>
 

addons/sale_project/views/project_views.xml

@@ -87,16 +87,16 @@
     </record>
 
     <record id="project.open_view_project_all_config" model="ir.actions.act_window">
-        <field name="context">{'default_allow_billable': True, 'sale_show_partner_name': True, 'display_milestone_deadline': True}</field>
+        <field name="context">{'sale_show_partner_name': True, 'display_milestone_deadline': True}</field>
     </record>
     <record id="project.open_view_project_all_config_group_stage" model="ir.actions.act_window">
-        <field name="context">{'default_allow_billable': True, 'sale_show_partner_name': True}</field>
+        <field name="context">{'sale_show_partner_name': True}</field>
     </record>
     <record id="project.open_view_project_all" model="ir.actions.act_window">
-        <field name="context">{'default_allow_billable': True, 'sale_show_partner_name': True, 'display_milestone_deadline': True}</field>
+        <field name="context">{'sale_show_partner_name': True, 'display_milestone_deadline': True}</field>
     </record>
     <record id="project.open_view_project_all_group_stage" model="ir.actions.act_window">
-        <field name="context">{'default_allow_billable': True, 'sale_show_partner_name': True}</field>
+        <field name="context">{'sale_show_partner_name': True}</field>
     </record>
 
     <record id="project_templates_view_list" model="ir.ui.view">

addons/sale_project/views/sale_order_views.xml

@@ -47,7 +47,7 @@
             </button>
             <field name="journal_id" position="before">
                 <field name="project_id" groups="project.group_project_user"
-                    context="{'default_allow_billable': True, 'default_partner_id': partner_id, 'order_id': id, 'order_state' : state}"/>
+                    context="{'default_partner_id': partner_id, 'order_id': id, 'order_state' : state}"/>
             </field>
         </field>
     </record>

addons/sale_project/wizard/project_template_create_wizard.py

@@ -5,3 +5,9 @@ class ProjectTemplateCreateWizard(models.TransientModel):
     _inherit = 'project.template.create.wizard'
 
     allow_billable = fields.Boolean(related="template_id.allow_billable")
+
+    def _get_template_whitelist_fields(self):
+        res = super()._get_template_whitelist_fields()
+        if self.allow_billable:
+            res.append("partner_id")
+        return res