9.0 merge upstream 20170607

.tx/config

@@ -57,6 +57,11 @@ file_filter = addons/account_tax_cash_basis/i18n/<lang>.po
 source_file = addons/account_tax_cash_basis/i18n/account_tax_cash_basis.pot
 source_lang = en
 
+[odoo-9.account_tax_exigible]
+file_filter = addons/account_tax_exigible/i18n/<lang>.po
+source_file = addons/account_tax_exigible/i18n/account_tax_exigible.pot
+source_lang = en
+
 [odoo-9.account_tax_python]
 file_filter = addons/account_tax_python/i18n/<lang>.po
 source_file = addons/account_tax_python/i18n/account_tax_python.pot

MANIFEST.in

@@ -32,6 +32,7 @@ recursive-include openerp *.ttf
 recursive-include openerp *.woff
 recursive-include openerp *.woff2
 recursive-include openerp *.wsdl
+recursive-include openerp *.xls
 recursive-include openerp *.xsd
 recursive-include openerp *.xsl
 recursive-include openerp *.xml

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)

addons/account/demo/account_bank_statement.yml

@@ -2,7 +2,8 @@
   Create demo bank statement
 -
   !python {model: ir.model.data} : |
-      journal_id = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'bank')])
+      default_company = self.pool.get('res.company')._company_default_get(cr, uid, 'account.journal')
+      journal_id = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'bank'), ('company_id', '=', default_company)], limit=1)
       import time
       if journal_id:
           journal_id = journal_id[0]
@@ -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(cr, uid, '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,

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
@@ -22,7 +21,6 @@
   !workflow {model: account.invoice, action: invoice_open, ref: demo_invoice_1}
 -
   !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'
@@ -39,7 +37,6 @@
   !workflow {model: account.invoice, action: invoice_open, ref: demo_invoice_2}
 -
   !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'
@@ -56,21 +53,22 @@
   !workflow {model: account.invoice, action: invoice_open, ref: demo_invoice_3}
 -
   !record {model: account.invoice, id: demo_invoice_invest_sale}:
-    company_id: base.main_company
     partner_id: base.res_partner_3
     type: 'out_invoice'
     date_invoice: !eval time.strftime('%Y-%m')+'-08'
 -
   !python {model: ir.model.data} : |
-      account_id = self.pool.get('account.account').search(cr, uid, [('tag_ids', 'in', [ref('account.demo_sale_of_land_account')])])
+      account_default_company = self.pool.get('res.company')._company_default_get(cr, uid, 'account.account')
+      account_id = self.pool.get('account.account').search(cr, uid, [('tag_ids', 'in', [ref('account.demo_sale_of_land_account')]), ('company_id', '=', account_default_company)])
       line_vals = {
           'invoice_id': ref('demo_invoice_invest_sale'),
           'name': "Land located at '50.635336,4.863298'",
           'price_unit': 210600,
       }
       if account_id:
           line_vals['account_id'] = account_id[0]
-          tax_id = self.pool.get('account.tax').search(cr, uid, [('type_tax_use', '=', 'sale'), ('amount', '>', 0)])
+          tax_default_company = self.pool.get('res.company')._company_default_get(cr, uid, 'account.account')
+          tax_id = self.pool.get('account.tax').search(cr, uid, [('type_tax_use', '=', 'sale'), ('amount', '>', 0), ('company_id', '=', tax_default_company)])
           if tax_id:
             line_vals['invoice_line_tax_ids'] = [(6, 0, [tax_id[0]])]
           self._update(cr, uid, 'account.invoice.line', 'account', line_vals, 'sale_of_land_line')
@@ -83,7 +81,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
@@ -103,7 +100,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'
@@ -114,16 +110,16 @@
           'name': "CEO wages",
           'price_unit': 10000,
       }
-      account_id = self.pool.get('account.account').search(cr, uid, [('tag_ids', 'in', [ref('account.demo_ceo_wages_account')])])
+      default_company = self.pool.get('res.company')._company_default_get(cr, uid, 'account.account')
+      account_id = self.pool.get('account.account').search(cr, uid, [('tag_ids', 'in', [ref('account.demo_ceo_wages_account')]), ('company_id', '=', default_company)])
       if not account_id:
-          account_id = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_expenses'))])
+          account_id = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_expenses')), ('company_id', '=', default_company)])
       if account_id:
           line_vals['account_id'] = account_id[0]
           self._update(cr, uid, 'account.invoice.line', 'account', line_vals, 'ceo_wages_line')
           self.pool.get('account.invoice').signal_workflow(cr, uid, [ref('demo_invoice_january_wages')], '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'
@@ -134,20 +130,23 @@
           'name': "Coffee Machine with huge 'employee\'s performances boosting perk'",
           'price_unit': 4999.99,
       }
-      account_id = self.pool.get('account.account').search(cr, uid, [('tag_ids', 'in', [ref('account.demo_coffee_machine_account')])])
+      account_default_company = self.pool.get('res.company')._company_default_get(cr, uid, 'account.account')
+      account_id = self.pool.get('account.account').search(cr, uid, [('tag_ids', 'in', [ref('account.demo_coffee_machine_account')]), ('company_id', '=', account_default_company)])
       if not account_id:
-          account_id = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_expenses'))])
+          account_id = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_expenses')), ('company_id', '=', account_default_company)])
       if account_id:
           line_vals['account_id'] = account_id[0]
-          tax_id = self.pool.get('account.tax').search(cr, uid, [('type_tax_use', '=', 'purchase'), ('amount', '>', 0)])
+          tax_default_company = self.pool.get('res.company')._company_default_get(cr, uid, 'account.tax')
+          tax_id = self.pool.get('account.tax').search(cr, uid, [('type_tax_use', '=', 'purchase'), ('amount', '>', 0), ('company_id', '=', tax_default_company)])
           if tax_id:
             line_vals['invoice_line_tax_ids'] = [(6, 0, [tax_id[0]])]
           self._update(cr, uid, 'account.invoice.line', 'account', line_vals, 'coffee_machine_line')
           self.pool.get('account.invoice').browse(cr, uid, ref('demo_invoice_equipment_purchase'))._onchange_invoice_line_ids()
           self.pool.get('account.invoice').signal_workflow(cr, uid, [ref('demo_invoice_equipment_purchase')], 'invoice_open')
 -
   !python {model: account.bank.statement.line} : |
-      account_ids = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_revenue')), ('tag_ids', 'in', [ref('account.account_tag_financing')])])
+      default_company = self.pool('res.company')._company_default_get(cr, uid, 'account.account')
+      account_ids = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_revenue')), ('tag_ids', 'in', [ref('account.account_tag_financing')]), ('company_id', '=', default_company)])
       line = self.browse(cr, uid, ref('account.demo_bank_statement_line_5'))
       if not line.journal_entry_ids and account_ids:
           line.write({'account_id': account_ids[0]})
@@ -156,20 +155,22 @@
   !python {model: ir.model.data} : |
       from datetime import datetime
       from dateutil.relativedelta import relativedelta
+      default_company = self.pool('res.company')._company_default_get(cr, uid, 'account.journal')
       vals = {
-          'company_id': ref('base.main_company'),
-          'journal_id': self.pool.get('account.journal').search(cr, uid, [('type', '=', 'general')])[0],
+          'journal_id': self.pool.get('account.journal').search(cr, uid, [('type', '=', 'general'), ('company_id', '=', default_company)])[0],
           'date': datetime.now().replace(day=1,month=1) - relativedelta(days=1),
           'ref': 'Company Creation',
       }
       self._update(cr, uid, 'account.move', 'account', vals, 'demo_opening_move')
 -
   !python {model: ir.model.data} : |
-      bank_journal_id = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'bank')])[0]
+      journal_default_company = self.pool('res.company')._company_default_get(cr, uid, 'account.journal')
+      bank_journal_id = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'bank'), ('company_id', '=', journal_default_company)])[0]
       if bank_journal_id:
           bank_account_id = self.pool.get('account.journal').browse(cr, uid, bank_journal_id).default_debit_account_id.id
-      fixed_asset_account_ids = self.pool.get('account.account').search(cr, uid, [('user_type_id', 'in', (ref('account.data_account_type_fixed_assets'),ref('account.data_account_type_current_assets')))])
-      equity_account_ids = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_equity')), ('tag_ids', 'in', [ref('account.demo_capital_account')])])
+      account_default_company = self.pool.get('res.company')._company_default_get(cr, uid, 'account.account')
+      fixed_asset_account_ids = self.pool.get('account.account').search(cr, uid, [('user_type_id', 'in', (ref('account.data_account_type_fixed_assets'),ref('account.data_account_type_current_assets'))), ('company_id', '=', account_default_company)])
+      equity_account_ids = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_equity')), ('tag_ids', 'in', [ref('account.demo_capital_account')]), ('company_id', '=', account_default_company)])
       if bank_account_id and fixed_asset_account_ids and equity_account_ids:
           self._update(cr, uid, 'account.move.line', 'account', {
               'move_id': ref('account.demo_opening_move'),