OCA · hbrunn · Apr 13, 2017 · Mar 14, 2017 · Mar 14, 2017 · Mar 15, 2017
diff --git a/.tx/config b/.tx/config
@@ -913,8 +913,12 @@ file_filter = addons/website_slides/i18n/<lang>.po
 source_file = addons/website_slides/i18n/website_slides.pot
 source_lang = en
 
+[odoo-10.website_theme_install]
+file_filter = addons/website_theme_install/i18n/<lang>.po
+source_file = addons/website_theme_install/i18n/website_theme_install.pot
+source_lang = en
+
 [odoo-10.website_twitter]
 file_filter = addons/website_twitter/i18n/<lang>.po
 source_file = addons/website_twitter/i18n/website_twitter.pot
 source_lang = en
-
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -8,7 +8,7 @@ TL;DR
 * If you [make a pull request](https://github.com/odoo/odoo/wiki/Contributing#making-pull-requests),
   do not create an issue! Use the PR description for that
 * Issues are handled with a much lower priority than pull requests
-* Use this [template](https://github.com/odoo/odoo/tree/9.0/.github/ISSUE_TEMPLATE.md)
+* Use this [template](https://github.com/odoo/odoo/tree/10.0/.github/ISSUE_TEMPLATE.md)
   when reporting issues. Please search for duplicates first!
 * Pull requests must be made against the [correct version](https://github.com/odoo/odoo/wiki/Contributing#against-which-version-should-i-submit-a-patch)
 * There are restrictions on the kind of [changes allowed in stable series](https://github.com/odoo/odoo/wiki/Contributing#what-does-stable-mean)
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -32,6 +32,7 @@ recursive-include odoo *.ttf
 recursive-include odoo *.woff
 recursive-include odoo *.woff2
 recursive-include odoo *.wsdl
+recursive-include odoo *.xls
 recursive-include odoo *.xsd
 recursive-include odoo *.xsl
 recursive-include odoo *.xml

diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
@@ -51,6 +51,7 @@
             <field name="prefix">A</field>
             <field eval="1" name="number_next"/>
             <field eval="1" name="number_increment"/>
+            <field eval="False" name="company_id"/>
         </record>
         <!--
         Invoice requests (deprecated)

diff --git a/addons/account/data/invoice_action_data.xml b/addons/account/data/invoice_action_data.xml
@@ -62,6 +62,8 @@ from ${object.company_id.name}.
             <field name="auto_delete" eval="True"/>
             <field name="body_html"><![CDATA[<html>
                 <head></head>
+                % set record = ctx.get('record')
+                % set company = record and record.company_id or user.company_id
                 <body style="margin: 0; padding: 0;">
                 <table border="0" width="100%" cellpadding="0" bgcolor="#ededed" style="padding: 20px; background-color: #ededed" summary="o_mail_notification">
                     <tbody>
@@ -77,7 +79,7 @@ from ${object.company_id.name}.
                                   </span>
                               </td>
                               <td valign="middle" align="right">
-                                  <img src="/logo.png" style="padding: 0px; margin: 0px; height: auto; width: 80px;" alt="${user.company_id.name}">
+                                  <img src="/logo.png?company=${company.id}" style="padding: 0px; margin: 0px; height: auto; width: 80px;" alt="${company.name}">
                               </td>
                             </tr>
                           </table>
@@ -103,16 +105,16 @@ from ${object.company_id.name}.
                           <table width="590" border="0" cellpadding="0" bgcolor="#875A7B" style="min-width: 590px; background-color: rgb(135,90,123); padding: 20px;">
                             <tr>
                               <td valign="middle" align="left" style="color: #fff; padding-top: 10px; padding-bottom: 10px; font-size: 12px;">
-                                ${user.company_id.name}<br/>
-                                ${user.company_id.phone or ''}
+                                ${company.name}<br/>
+                                ${company.phone or ''}
                               </td>
                               <td valign="middle" align="right" style="color: #fff; padding-top: 10px; padding-bottom: 10px; font-size: 12px;">
-                                % if user.company_id.email:
-                                <a href="mailto:${user.company_id.email}" style="text-decoration:none; color: white;">${user.company_id.email}</a><br/>
+                                % if company.email:
+                                <a href="mailto:${company.email}" style="text-decoration:none; color: white;">${company.email}</a><br/>
                                 % endif
-                                % if user.company_id.website:
-                                    <a href="${user.company_id.website}" style="text-decoration:none; color: white;">
-                                        ${user.company_id.website}
+                                % if company.website:
+                                    <a href="${company.website}" style="text-decoration:none; color: white;">
+                                        ${company.website}
                                     </a>
                                 % endif
                               </td>

diff --git a/addons/account/demo/account_bank_statement.yml b/addons/account/demo/account_bank_statement.yml
@@ -2,7 +2,8 @@
   Create demo bank statement
 -
   !python {model: ir.model.data, id: False} : |
-      journal = self.env['account.journal'].search([('type', '=', 'bank')], limit=1)
+      default_company = self.env['res.company']._company_default_get('account.journal')
+      journal = self.env['account.journal'].search([('type', '=', 'bank'), ('company_id', '=', default_company.id)], limit=1)
       import time
       if journal:
           vals = {
@@ -11,15 +12,13 @@
               'date': time.strftime('%Y')+'-01-01',
               'name': "BNK/2014/001",
               'balance_end_real': '8998.2',
-              'company_id': ref('base.main_company'),
               'balance_start': 5103.0
           }
           self._update('account.bank.statement', 'account', vals, 'demo_bank_statement_1')
           vals = {
               'ref': '',
               'statement_id': ref('account.demo_bank_statement_1'),
               'sequence': 1,
-              'company_id': ref('base.main_company'),
               'name': "SAJ/2014/002 and SAJ/2014/003",
               'journal_id': journal.id,
               'amount': 1175.0,
@@ -31,7 +30,6 @@
               'ref': '',
               'statement_id': ref('account.demo_bank_statement_1'),
               'sequence': 2,
-              'company_id': ref('base.main_company'),
               'name': "Bank fees",
               'journal_id': journal.id,
               'amount': -32.58,
@@ -42,7 +40,6 @@
               'ref': '',
               'statement_id': ref('account.demo_bank_statement_1'),
               'sequence': 3,
-              'company_id': ref('base.main_company'),
               'name': "Prepayment",
               'journal_id': journal.id,
               'amount': 650.0,
@@ -54,7 +51,6 @@
               'ref': '',
               'statement_id': ref('account.demo_bank_statement_1'),
               'sequence': 4,
-              'company_id': ref('base.main_company'),
               'name': "First 2000 € of SAJ/2014/001",
               'journal_id': journal.id,
               'amount': 2000.0,
@@ -66,7 +62,6 @@
               'ref': '',
               'statement_id': ref('account.demo_bank_statement_1'),
               'sequence': 5,
-              'company_id': ref('base.main_company'),
               'name': "Last Year Interests",
               'journal_id': journal.id,
               'amount': 102.78,

diff --git a/addons/account/demo/account_invoice_demo.yml b/addons/account/demo/account_invoice_demo.yml
@@ -2,7 +2,6 @@
    Set the context for customer invoices because the 'type' field is readonly in invoice form views, so it value won't be considered by the yaml import
 -
   !record {model: account.invoice, id: demo_invoice_1}:
-    company_id: base.main_company
     partner_id: base.res_partner_12
     user_id: base.user_demo
     reference_type: none
@@ -21,7 +20,6 @@
     self.action_invoice_open()
 -
   !record {model: account.invoice, id: demo_invoice_2}:
-    company_id: base.main_company
     partner_id: base.res_partner_2
     type: 'out_invoice'
     date_invoice: !eval time.strftime('%Y-%m')+'-08'
@@ -37,7 +35,6 @@
     self.action_invoice_open()
 -
   !record {model: account.invoice, id: demo_invoice_3}:
-    company_id: base.main_company
     partner_id: base.res_partner_2
     type: 'out_invoice'
     date_invoice: !eval time.strftime('%Y-%m')+'-08'
@@ -58,7 +55,6 @@
     type: 'in_invoice'
 -
   !record {model: account.invoice, id: demo_invoice_0}:
-    company_id: base.main_company
     partner_id: base.res_partner_12
     user_id: base.user_demo
     reference_type: none
@@ -76,7 +72,6 @@
         uom_id: product.product_uom_unit
 -
   !record {model: account.invoice, id: demo_invoice_january_wages}:
-    company_id: base.main_company
     partner_id: base.res_partner_12
     type: 'in_invoice'
     date_invoice: !eval time.strftime('%Y-%m')+'-01'
@@ -87,16 +82,16 @@
           'name': "CEO wages",
           'price_unit': 10000,
       }
-      account = self.env['account.account'].search([('tag_ids', 'in', [ref('account.demo_ceo_wages_account')])], limit=1)
+      default_company = self.env['res.company']._company_default_get('account.account')
+      account = self.env['account.account'].search([('tag_ids', 'in', [ref('account.demo_ceo_wages_account')]), ('company_id', '=', default_company.id)], limit=1)
       if not account:
-          account = self.env['account.account'].search([('user_type_id', '=', ref('account.data_account_type_expenses'))], limit=1)
+          account = self.env['account.account'].search([('user_type_id', '=', ref('account.data_account_type_expenses')), ('company_id', '=', default_company.id)], limit=1)
       if account:
           line_vals['account_id'] = account.id
           self._update('account.invoice.line', 'account', line_vals, 'ceo_wages_line')
           self.env['account.invoice'].browse(ref('demo_invoice_january_wages')).action_invoice_open()
 -
   !record {model: account.invoice, id: demo_invoice_equipment_purchase}:
-    company_id: base.main_company
     partner_id: base.res_partner_1
     type: 'in_invoice'
     date_invoice: !eval time.strftime('%Y-%m')+'-15'
@@ -107,22 +102,27 @@
           'name': "Coffee Machine with huge 'employee\'s performances boosting perk'",
           'price_unit': 4999.99,
       }
-      account_id = self.env['account.account'].search([('tag_ids', 'in', [ref('account.demo_coffee_machine_account')])], limit=1).id
+      account_default_company = self.env['res.company']._company_default_get('account.account')
+      account_id = self.env['account.account'].search([('tag_ids', 'in', [ref('account.demo_coffee_machine_account')]), ('company_id', '=', account_default_company.id)], limit=1).id
       if not account_id:
-          account_id = self.env['account.account'].search([('user_type_id', '=', ref('account.data_account_type_expenses'))], limit=1).id
+          account_id = self.env['account.account'].search([('user_type_id', '=', ref('account.data_account_type_expenses')), ('company_id', '=', account_default_company.id)], limit=1).id
       if account_id:
           line_vals['account_id'] = account_id
-          tax_id = self.env['account.tax'].search([('type_tax_use', '=', 'purchase'), ('amount', '>', 0)], limit=1).id
+          tax_default_company = self.env['res.company']._company_default_get('account.tax')
+          tax_id = self.env['account.tax'].search([('type_tax_use', '=', 'purchase'), ('amount', '>', 0), ('company_id', '=', tax_default_company.id)], limit=1).id
           if tax_id:
             line_vals['invoice_line_tax_ids'] = [(6, 0, [tax_id])]
           self._update('account.invoice.line', 'account', line_vals, 'coffee_machine_line')
           self.env['account.invoice'].browse(ref('demo_invoice_equipment_purchase'))._onchange_invoice_line_ids()
           self.env['account.invoice'].browse(ref('demo_invoice_equipment_purchase')).action_invoice_open()
+
 -
   !python {model: account.bank.statement.line, id: False} : |
+      default_company = self.env['res.company']._company_default_get('account.account')
       account = self.env['account.account'].search([
           ('user_type_id', '=', ref('account.data_account_type_revenue')),
-          ('tag_ids', 'in', [ref('account.account_tag_financing')])], limit=1)
+          ('tag_ids', 'in', [ref('account.account_tag_financing')]),
+          ('company_id', '=', default_company.id)], limit=1)
       line = self.env.ref('account.demo_bank_statement_line_5')
       if not line.journal_entry_ids and account:
           line.write({'account_id': account.id})
@@ -131,20 +131,22 @@
   !python {model: ir.model.data, id: False} : |
       from datetime import datetime
       from dateutil.relativedelta import relativedelta
+      default_company = self.env['res.company']._company_default_get('account.journal')
       vals = {
-          'company_id': ref('base.main_company'),
-          'journal_id': self.env['account.journal'].search([('type', '=', 'general')], limit=1).id,
+          'journal_id': self.env['account.journal'].search([('type', '=', 'general'), ('company_id', '=', default_company.id)], limit=1).id,
           'date': datetime.now().replace(day=1,month=1) - relativedelta(days=1),
           'ref': 'Company Creation',
       }
       self._update('account.move', 'account', vals, 'demo_opening_move')
 -
   !python {model: ir.model.data, id: False} : |
-      bank_journal = self.env['account.journal'].search([('type', '=', 'bank')], limit=1)
+      journal_default_company = self.env['res.company']._company_default_get('account.journal')
+      bank_journal = self.env['account.journal'].search([('type', '=', 'bank'), ('company_id', '=', journal_default_company.id)], limit=1)
       if bank_journal:
           bank_account_id = bank_journal.default_debit_account_id.id
-      fixed_asset_account_id = self.env['account.account'].search([('user_type_id', 'in', (ref('account.data_account_type_fixed_assets'),ref('account.data_account_type_current_assets')))], limit=1).id
-      equity_account_id = self.env['account.account'].search([('user_type_id', '=', ref('account.data_account_type_equity')), ('tag_ids', 'in', [ref('account.demo_capital_account')])], limit=1).id
+      account_default_company = self.env['res.company']._company_default_get('account.account')
+      fixed_asset_account_id = self.env['account.account'].search([('user_type_id', 'in', (ref('account.data_account_type_fixed_assets'),ref('account.data_account_type_current_assets'))), ('company_id', '=', account_default_company.id)], limit=1).id
+      equity_account_id = self.env['account.account'].search([('user_type_id', '=', ref('account.data_account_type_equity')), ('tag_ids', 'in', [ref('account.demo_capital_account')]), ('company_id', '=', account_default_company.id)], limit=1).id
       if bank_account_id and fixed_asset_account_id and equity_account_id:
           self.with_context({'check_move_validity': False})._update('account.move.line', 'account', {
               'move_id': ref('account.demo_opening_move'),