Merge 5bf390d into e125bce

OCA · Jul 3, 2018 · 89da526 · 89da526
2 parents e125bce + 5bf390d
commit 89da526
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 15 deletions.
diff --git a/account_cutoff_accrual_base/README.rst b/account_cutoff_accrual_base/README.rst
@@ -51,4 +51,4 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-To contribute to this module, please visit https://odoo-community.org.
+To contribute to this module, please visit https://odoo-community.org.
diff --git a/account_multicurrency_revaluation/__manifest__.py b/account_multicurrency_revaluation/__manifest__.py
@@ -12,8 +12,8 @@
         "account_reversal",
     ],
     "demo": [
-        "demo/currency_demo.xml",
         "demo/account_demo.xml",
+        "demo/currency_demo.xml",
     ],
     "data": [
         "views/res_config_view.xml",

diff --git a/account_multicurrency_revaluation/demo/account_demo.xml b/account_multicurrency_revaluation/demo/account_demo.xml
@@ -1,66 +1,105 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
+    <record id="res_partner_reval" model="res.partner">
+        <field name="name">Revaluation Company</field>
+        <field eval="1" name="customer"/>
+        <field eval="1" name="supplier"/>
+        <field name="is_company">1</field>
+        <field eval="1" name="active"/>
+        <field name="street">90 Streets Avenue</field>
+        <field model="res.country" name="country_id" search="[('code','ilike','ch')]"/>
+        <field name="zip">1000</field>
+        <field name="city">Lausanne</field>
+        <field name="email">revaluation@yourcompany.com</field>
+        <field name="phone">+41 12 345 67 89</field>
+        <field name="website">www.revaluationcompany.com</field>
+    </record>
+
+    <record id="res_company_reval" model="res.company">
+        <field name="currency_id" ref="base.EUR"/>
+        <field name="partner_id" ref="res_partner_reval"/>
+        <field name="name">Revaluation Company</field>
+    </record>
     <record id="acc_reval_loss" model="account.account">
         <field name="name">Reval Loss</field>
         <field name="code">XR001</field>
         <field name="user_type_id" ref="account.data_account_type_current_assets" />
+        <field name="company_id" ref="res_company_reval" />
     </record>
     <record id="acc_reval_gain" model="account.account">
         <field name="name">Reval Gain</field>
         <field name="code">XR002</field>
         <field name="user_type_id" ref="account.data_account_type_current_assets" />
+        <field name="company_id" ref="res_company_reval" />
     </record>
     <record id="acc_prov_bs_loss" model="account.account">
         <field name="name">Prov B.S Loss</field>
         <field name="code">XPBS001</field>
         <field name="user_type_id" ref="account.data_account_type_current_assets" />
+        <field name="company_id" ref="res_company_reval" />
     </record>
     <record id="acc_prov_bs_gain" model="account.account">
         <field name="name">Prov B.S Gain</field>
         <field name="code">XPBS002</field>
         <field name="user_type_id" ref="account.data_account_type_current_assets" />
+        <field name="company_id" ref="res_company_reval" />
     </record>
     <record id="acc_prov_pl_loss" model="account.account">
         <field name="name">Prov P L Loss</field>
         <field name="code">XPPL001</field>
         <field name="user_type_id" ref="account.data_account_type_expenses" />
+        <field name="company_id" ref="res_company_reval" />
     </record>
     <record id="acc_prov_pl_gain" model="account.account">
         <field name="name">Prov P L Gain</field>
         <field name="code">XPPL002</field>
         <field name="user_type_id" ref="account.data_account_type_revenue" />
+        <field name="company_id" ref="res_company_reval" />
     </record>
     <record id="demo_acc_receivable" model="account.account">
         <field name="name">Account Receivable</field>
         <field name="code">accrec</field>
         <field name="user_type_id" ref="account.data_account_type_receivable" />
         <field name="currency_revaluation">True</field>
         <field name="reconcile">True</field>
+        <field name="company_id" ref="res_company_reval" />
+    </record>
+    <record id="demo_acc_payable" model="account.account">
+        <field name="name">Account Payable</field>
+        <field name="code">accpay</field>
+        <field name="user_type_id" ref="account.data_account_type_payable" />
+        <field name="currency_revaluation">True</field>
+        <field name="reconcile">True</field>
+        <field name="company_id" ref="res_company_reval" />
     </record>
     <record id="demo_acc_revenue" model="account.account">
         <field name="name">Account Revenue</field>
         <field name="code">accrev</field>
         <field name="user_type_id" ref="account.data_account_type_revenue" />
         <field name="currency_revaluation">True</field>
+        <field name="company_id" ref="res_company_reval" />
     </record>
     <record id="demo_acc_liquidity_usd" model="account.account">
         <field name="name">Account Liquidity USD</field>
         <field name="code">accliq_usd</field>
         <field name="user_type_id" ref="account.data_account_type_liquidity" />
         <field name="currency_revaluation">True</field>
         <field name="currency_id" ref="base.USD" />
+        <field name="company_id" ref="res_company_reval" />
     </record>
     <record id="demo_acc_liquidity_gbp" model="account.account">
         <field name="name">Account Liquidity GBP</field>
         <field name="code">accliq_gbp</field>
         <field name="user_type_id" ref="account.data_account_type_liquidity" />
         <field name="currency_revaluation">True</field>
         <field name="currency_id" ref="base.GBP" />
+        <field name="company_id" ref="res_company_reval" />
     </record>
     <record id="reval_journal" model="account.journal">
         <field name="name">Revaluation Journal</field>
         <field name="code">RJ</field>
         <field name="type">general</field>
+        <field name="company_id" ref="res_company_reval" />
     </record>
     <record id="bank_journal_usd" model="account.journal">
         <field name="name">Bank Journal USD</field>
@@ -69,6 +108,7 @@
         <field name="currency_id" ref="base.USD"/>
         <field name="default_debit_account_id" ref="demo_acc_liquidity_usd"/>
         <field name="default_credit_account_id" ref="demo_acc_liquidity_usd"/>
+        <field name="company_id" ref="res_company_reval" />
     </record>
     <record id="bank_journal_gbp" model="account.journal">
         <field name="name">Bank Journal GBP</field>
@@ -77,10 +117,18 @@
         <field name="currency_id" ref="base.GBP"/>
         <field name="default_debit_account_id" ref="demo_acc_liquidity_gbp"/>
         <field name="default_credit_account_id" ref="demo_acc_liquidity_gbp"/>
+        <field name="company_id" ref="res_company_reval" />
     </record>
     <record id="sales_journal" model="account.journal">
         <field name="name">A Sales Journal</field>
         <field name="code">SJ</field>
         <field name="type">sale</field>
+        <field name="company_id" ref="res_company_reval" />
+    </record>
+    <record id="account_payment_method_manual_in" model="account.payment.method">
+        <field name="name">Manual</field>
+        <field name="code">manual</field>
+        <field name="payment_type">inbound</field>
+        <field name="company_id" ref="res_company_reval" />
     </record>
 </odoo>
diff --git a/account_multicurrency_revaluation/demo/currency_demo.xml b/account_multicurrency_revaluation/demo/currency_demo.xml
@@ -4,30 +4,36 @@
         <field eval="time.strftime('%Y-01-15')" name="name" />
         <field name="rate">2</field>
         <field name="currency_id" ref="base.USD"/>
+        <field name="company_id" ref="res_company_reval" />
     </record>
     <record model="res.currency.rate" id="currency_rate_usd_02">
         <field eval="time.strftime('%Y-02-15')" name="name" />
         <field name="rate">4</field>
         <field name="currency_id" ref="base.USD"/>
+        <field name="company_id" ref="res_company_reval" />
     </record>
     <record model="res.currency.rate" id="currency_rate_usd_03">
         <field eval="time.strftime('%Y-03-15')" name="name" />
         <field name="rate">2.5</field>
         <field name="currency_id" ref="base.USD"/>
+        <field name="company_id" ref="res_company_reval" />
     </record>
     <record model="res.currency.rate" id="currency_rate_gbp_01">
         <field eval="time.strftime('%Y-01-15')" name="name" />
         <field name="rate">2</field>
         <field name="currency_id" ref="base.GBP"/>
+        <field name="company_id" ref="res_company_reval" />
     </record>
     <record model="res.currency.rate" id="currency_rate_gbp_02">
         <field eval="time.strftime('%Y-02-15')" name="name" />
         <field name="rate">4</field>
         <field name="currency_id" ref="base.GBP"/>
+        <field name="company_id" ref="res_company_reval" />
     </record>
     <record model="res.currency.rate" id="currency_rate_gbp_03">
         <field eval="time.strftime('%Y-03-15')" name="name" />
         <field name="rate">2.5</field>
         <field name="currency_id" ref="base.GBP"/>
+        <field name="company_id" ref="res_company_reval" />
     </record>
 </odoo>
diff --git a/account_multicurrency_revaluation/tests/test_currency_revaluation.py b/account_multicurrency_revaluation/tests/test_currency_revaluation.py
@@ -14,11 +14,12 @@ def setUpClass(cls):
         ref = cls.env.ref
 
         # Set currency EUR on company
-        company = ref('base.main_company')
-        values = {
-            'currency_id': ref('base.EUR').id,
-        }
-        company.write(values)
+        cls.company = ref(
+            'account_multicurrency_revaluation.res_company_reval')
+        cls.env.user.write({
+            'company_ids': [(4, cls.company.id, False)]
+        })
+        cls.env.user.company_id = cls.company
 
         cls.reval_journal = ref(
             'account_multicurrency_revaluation.reval_journal')
@@ -28,6 +29,8 @@ def setUpClass(cls):
         receivable_acc = ref(
             'account_multicurrency_revaluation.demo_acc_receivable')
         receivable_acc.write({'reconcile': True})
+        payable_acc = ref(
+            'account_multicurrency_revaluation.demo_acc_payable')
 
         revenue_acc = ref('account_multicurrency_revaluation.'
                           'demo_acc_revenue')
@@ -49,22 +52,31 @@ def setUpClass(cls):
         }
 
         partner = ref('base.res_partner_3')
+        partner.company_id = cls.company.id
+        partner.property_account_payable_id = receivable_acc.id
+        partner.property_account_receivable_id = payable_acc.id
+
+        payment_term = ref(
+            'account.account_payment_term')
 
         year = fields.Date.from_string(fields.Date.today()).strftime('%Y')
 
         invoice = cls.env['account.invoice'].create({
             'name': "Customer Invoice",
             'date_invoice': '%s-01-16' % year,
             'currency_id': usd_currency.id,
+            'company_id': cls.company.id,
             'journal_id': sales_journal.id,
             'partner_id': partner.id,
             'account_id': receivable_acc.id,
-            'invoice_line_ids': [(0, 0, invoice_line_data)]
+            'invoice_line_ids': [(0, 0, invoice_line_data)],
+            'payment_term_id': payment_term.id,
         })
         # Validate invoice
         invoice.action_invoice_open()
 
-        payment_method = ref('account.account_payment_method_manual_in')
+        payment_method = ref('account_multicurrency_revaluation.'
+                             'account_payment_method_manual_in')
 
         # Register partial payment
         payment = cls.env['account.payment'].create({
@@ -105,15 +117,15 @@ def setUpClass(cls):
             'date_invoice': '%s-01-16' % year,
             'currency_id': gbp_currency.id,
             'journal_id': sales_journal.id,
+            'company_id': cls.company.id,
             'partner_id': ref('base.res_partner_3').id,
             'account_id': receivable_acc.id,
-            'invoice_line_ids': [(0, 0, invoice_line_data)]
+            'invoice_line_ids': [(0, 0, invoice_line_data)],
+            'payment_term_id': payment_term.id,
         })
         # Validate invoice
         invoice.action_invoice_open()
 
-        payment_method = ref('account.account_payment_method_manual_in')
-
         # Register partial payment
         payment = cls.env['account.payment'].create({
             'invoice_ids': [(4, invoice.id, 0)],
@@ -133,8 +145,6 @@ def setUpClass(cls):
 
     def test_uk_revaluation(self):
         # Set accounts on company
-        company = self.env['res.company'].search([])
-
         values = {
             'revaluation_loss_account_id':
                 self.env.ref('account_multicurrency_revaluation.'
@@ -144,7 +154,8 @@ def test_uk_revaluation(self):
                              'acc_reval_gain').id,
             'default_currency_reval_journal_id': self.reval_journal.id,
         }
-        company.write(values)
+        self.company.write(values)
+        self.assertEqual(self.company.currency_id, self.env.ref('base.EUR'))
 
         wizard = self.env['wizard.currency.revaluation']
         data = {