diff --git a/MANIFEST.in b/MANIFEST.in
index df402ab6558..43787b1f76b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include README.md
 recursive-include odoo *.css
 recursive-include odoo *.csv
 recursive-include odoo *.doc
+recursive-include odoo *.docx
 recursive-include odoo *.eml
 recursive-include odoo *.eot
 recursive-include odoo *.gif
@@ -16,6 +17,8 @@ recursive-include odoo *.less
 recursive-include odoo *.md
 recursive-include odoo *.mp3
 recursive-include odoo *.ogg
+recursive-include odoo *.ods
+recursive-include odoo *.odt
 recursive-include odoo *.otf
 recursive-include odoo *.pdf
 recursive-include odoo *.png
@@ -35,7 +38,9 @@ recursive-include odoo *.wsdl
 recursive-include odoo *.xls
 recursive-include odoo *.xsd
 recursive-include odoo *.xsl
+recursive-include odoo *.xlsx
 recursive-include odoo *.xml
 recursive-include odoo *.yml
+recursive-include odoo *.zip
 recursive-exclude * *.py[co]
 recursive-exclude * *.hg*
diff --git a/addons/purchase/views/account_invoice_views.xml b/addons/purchase/views/account_invoice_views.xml
index 3f23f6777d0..583f2f40b56 100644
--- a/addons/purchase/views/account_invoice_views.xml
+++ b/addons/purchase/views/account_invoice_views.xml
@@ -59,7 +59,7 @@
         <field name="inherit_id" ref="account.invoice_supplier_form"/>
         <field name="arch" type="xml">
             <field name="reference" position="after" >
-                 <field name="purchase_id" attrs="{'readonly': [('state','not in',['draft'])], 'invisible': [('state', '=', 'purchase')]}" class="oe_edit_only"
+                 <field name="purchase_id" attrs="{'readonly': [('state','not in',['draft'])], 'invisible': ['|', ('state', '=', 'purchase'), ('type', '=', 'in_refund')]}" class="oe_edit_only"
                     options="{'no_create': True}"/>
             </field>
             <xpath expr="//field[@name='invoice_line_ids']/tree/field[@name='company_id']" position="after">
diff --git a/addons/website_quote/models/sale_order.py b/addons/website_quote/models/sale_order.py
index 8805f2291d1..2c5bfaa5063 100644
--- a/addons/website_quote/models/sale_order.py
+++ b/addons/website_quote/models/sale_order.py
@@ -49,6 +49,15 @@ class SaleOrder(models.Model):
     def _get_default_template_id(self):
         return self.env.ref('website_quote.website_quote_template_default', raise_if_not_found=False)
 
+    def _default_require_payment(self):
+        default_template = self._get_default_template_id()
+        if self.template_id:
+            return self.template_id.require_payment
+        elif default_template:
+            return default_template.require_payment
+        else:
+            return 0
+
     access_token = fields.Char(
         'Security Token', copy=False, default=lambda self: str(uuid.uuid4()),
         required=True)
@@ -68,14 +77,7 @@ class SaleOrder(models.Model):
         (0, 'Not mandatory on website quote validation'),
         (1, 'Immediate after website order validation'),
         (2, 'Immediate after website order validation and save a token'),
-    ], 'Payment', help="Require immediate payment by the customer when validating the order from the website quote", compute='_compute_require_payment', store=True)
-
-    @api.one
-    @api.depends('template_id')
-    def _compute_require_payment(self):
-        # Do not overwrite if the field is already set
-        if self.template_id and (self.require_payment is None or self.require_payment is False):
-            self.require_payment = self.template_id.require_payment
+    ], 'Payment', help="Require immediate payment by the customer when validating the order from the website quote", default=_default_require_payment)
 
     @api.multi
     def copy(self, default=None):