Merge PR #422 into 12.0

Signed-off-by sbidoul

contract/models/contract.py

@@ -210,7 +210,8 @@ class ContractContract(models.Model):
                     field.name in self.NO_SYNC,
                 )
             ):
-                self[field_name] = self.contract_template_id[field_name]
+                if self.contract_template_id[field_name]:
+                    self[field_name] = self.contract_template_id[field_name]
 
     @api.onchange('partner_id')
     def _onchange_partner_id(self):

product_contract/models/sale_order.py

@@ -82,6 +82,7 @@ class SaleOrder(models.Model):
                 )
                 contracts |= contract
                 contract._onchange_contract_template_id()
+                contract._onchange_contract_type()
                 order_lines.create_contract_line(contract)
                 order_lines.write({'contract_id': contract.id})
             for line in line_to_update_contract: