diff --git a/addons/sale/data/sale_data.xml b/addons/sale/data/sale_data.xml
index 1d21771538d..0f3abd5937b 100644
--- a/addons/sale/data/sale_data.xml
+++ b/addons/sale/data/sale_data.xml
@@ -16,7 +16,5 @@
             <field name="key">sale.default_confirmation_template</field>
             <field name="value" ref="sale.mail_template_sale_confirmation"/>
         </record>
-
-        <function model="ir.default" name="set" eval="('product.template', 'invoice_policy', 'delivery')"/>
     </data>
 </odoo>
diff --git a/addons/sale/models/res_config_settings.py b/addons/sale/models/res_config_settings.py
index 61620dcdbac..33d7d343d85 100644
--- a/addons/sale/models/res_config_settings.py
+++ b/addons/sale/models/res_config_settings.py
@@ -21,7 +21,7 @@ class ResConfigSettings(models.TransientModel):
         ('order', 'Invoice what is ordered'),
         ('delivery', 'Invoice what is delivered')
         ], 'Invoicing Policy',
-        default='delivery',
+        default='order',
         default_model='product.template')
     deposit_default_product_id = fields.Many2one(
         'product.product',