Merge lp:~julie-w/unifield-server/US-3329 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account/account_invoice_view.xml'
--- bin/addons/account/account_invoice_view.xml	2017-08-21 08:24:39 +0000
+++ bin/addons/account/account_invoice_view.xml	2018-02-02 13:26:09 +0000
@@ -149,7 +149,7 @@
             <field name="arch" type="xml">
                 <form string="Supplier Invoice">
                     <group col="8" colspan="4">
-                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/>
+                        <field name="journal_id" widget="selection"/>
                         <field name="number" readonly="1"/>
                         <field name="type" invisible="1"/>
                         <field name="currency_id" width="50"/>
@@ -267,7 +267,7 @@
             <field name="arch" type="xml">
                 <form string="Invoice">
                     <group colspan="4" col="8">
-                    <field name="journal_id" groups="base.group_user" on_change="onchange_journal_id(journal_id)" widget="selection"/>
+                    <field name="journal_id" groups="base.group_user" widget="selection"/>
                     <field name="number"/>
                     <field name="type" invisible="1"/>
                     <field name="currency_id" width="50"/>

=== modified file 'bin/addons/account/invoice.py'
--- bin/addons/account/invoice.py	2017-10-20 09:43:54 +0000
+++ bin/addons/account/invoice.py	2018-02-02 13:26:09 +0000
@@ -60,12 +60,6 @@
                                  limit=1)
         return res and res[0] or False
 
-    def _get_currency(self, cr, uid, context=None):
-        user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, [uid], context=context)[0]
-        if user.company_id:
-            return user.company_id.currency_id.id
-        return pooler.get_pool(cr.dbname).get('res.currency').search(cr, uid, [('rate','=', 1.0)])[0]
-
     def _get_journal_analytic(self, cr, uid, type_inv, context=None):
         type2journal = {'out_invoice': 'sale', 'in_invoice': 'purchase', 'out_refund': 'sale', 'in_refund': 'purchase'}
         tt = type2journal.get(type_inv, 'sale')
@@ -365,7 +359,6 @@
         'type': _get_type,
         'state': 'draft',
         'journal_id': _get_journal,
-        'currency_id': _get_currency,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.invoice', context=c),
         'reference_type': 'none',
         'check_total': 0.0,
@@ -548,17 +541,6 @@
             result['value'].update(to_update['value'])
         return result
 
-    def onchange_journal_id(self, cr, uid, ids, journal_id=False):
-        result = {}
-        if journal_id:
-            journal = self.pool.get('account.journal').browse(cr, uid, journal_id)
-            currency_id = journal.currency and journal.currency.id or journal.company_id.currency_id.id
-            result = {'value': {
-                'currency_id': currency_id,
-            }
-            }
-        return result
-
     def get_due_date(self, cr, uid, payment_term_id, date_invoice, context=None):
         """
         If a payment_term_id is given, returns the due date based on the payment term and the invoice date,
@@ -671,12 +653,6 @@
                 val['currency_id'] = False
             else:
                 val['currency_id'] = currency.id
-        if company_id:
-            company = self.pool.get('res.company').browse(cr, uid, company_id)
-            if company.currency_id.company_id and company.currency_id.company_id.id != company_id:
-                val['currency_id'] = False
-            else:
-                val['currency_id'] = company.currency_id.id
         return {'value': val, 'domain': dom}
 
     # go from canceled state to draft state

=== modified file 'bin/addons/account_override/account_invoice_view.xml'
--- bin/addons/account_override/account_invoice_view.xml	2017-10-04 05:23:42 +0000
+++ bin/addons/account_override/account_invoice_view.xml	2018-02-02 13:26:09 +0000
@@ -236,8 +236,7 @@
             <field name="arch" type="xml">
                 <form string="Debit Note" hide_duplicate_button="1">
                     <group colspan="4" col="8">
-                        <field name="journal_id" domain="[('is_current_instance','=',True), ('type', '=', context.get('journal_type'))]"
-                               on_change="onchange_journal_id(journal_id)"/>
+                        <field name="journal_id" domain="[('is_current_instance','=',True), ('type', '=', context.get('journal_type'))]"/>
                         <field name="number"/>
                         <field name="type" invisible="1"/>
                         <field name="currency_id" width="50"/>
@@ -352,7 +351,7 @@
             <field name="arch" type="xml">
                 <form string="In-kind Donation">
                     <group colspan="4" col="8">
-                        <field name="journal_id" domain="[('is_current_instance','=',True), ('type', 'in', ('inkind', 'extra'))]" on_change="onchange_journal_id(journal_id)"/>
+                        <field name="journal_id" domain="[('is_current_instance','=',True), ('type', 'in', ('inkind', 'extra'))]"/>
                         <field name="number"/>
                         <field name="type" invisible="1"/>
                         <field name="is_inkind_donation" invisible="1"/>

=== modified file 'bin/addons/account_override/invoice.py'
--- bin/addons/account_override/invoice.py	2017-10-27 15:15:11 +0000
+++ bin/addons/account_override/invoice.py	2018-02-02 13:26:09 +0000
@@ -233,7 +233,6 @@
         'imported_invoices': fields.one2many('account.invoice.line', 'import_invoice_id', string="Imported invoices", readonly=True),
         'partner_move_line': fields.one2many('account.move.line', 'invoice_partner_link', string="Partner move line", readonly=True),
         'fake_journal_id': fields.function(_get_fake_m2o_id, method=True, type='many2one', relation="account.journal", string="Journal", hide_default_menu=True, readonly="True"),
-        'fake_currency_id': fields.function(_get_fake_m2o_id, method=True, type='many2one', relation="res.currency", string="Currency", readonly="True"),
         'have_donation_certificate': fields.function(_get_have_donation_certificate, method=True, type='boolean', string="Have a Certificate of donation?"),
         'purchase_list': fields.boolean(string='Purchase List ?', help='Check this box if the invoice comes from a purchase list', readonly=True, states={'draft':[('readonly',False)]}),
         'virtual_currency_id': fields.function(_get_virtual_fields, method=True, store=False, multi='virtual_fields', string="Currency",
@@ -457,7 +456,7 @@
 
     def default_get(self, cr, uid, fields, context=None):
         """
-        Fill in fake currency for intermission invoice (in context).
+        Fill in account and journal for intermission invoice
         """
         defaults = super(account_invoice, self).default_get(cr, uid, fields, context=context)
         if context and context.get('is_intermission', False):
@@ -468,10 +467,6 @@
                     defaults = {}
                 user = self.pool.get('res.users').browse(cr, uid, [uid], context=context)
                 if user and user[0] and user[0].company_id:
-                    # get company default currency
-                    if user[0].company_id.currency_id:
-                        defaults['fake_currency_id'] = user[0].company_id.currency_id.id
-                        defaults['currency_id'] = defaults['fake_currency_id']
                     # get 'intermission counter part' account
                     if user[0].company_id.intermission_default_counterpart:
                         defaults['account_id'] = user[0].company_id.intermission_default_counterpart.id

=== modified file 'bin/addons/msf_profile/i18n/es_MF.po'
--- bin/addons/msf_profile/i18n/es_MF.po	2017-09-28 14:05:02 +0000
+++ bin/addons/msf_profile/i18n/es_MF.po	2018-02-02 13:26:09 +0000
@@ -63069,7 +63069,6 @@
 #: report:account.bank.statement.line_csv:0
 #: field:account.mcdb,currency_id:0
 #: code:addons/account_mcdb/report/account_mcdb_export.py:252
-#: field:account.invoice,fake_currency_id:0
 #: model:ir.model,name:account_override.model_res_currency
 #: report:payment.order:0
 #: field:account.model,currency_id:0

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2017-12-12 10:23:48 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-02-02 13:26:09 +0000
@@ -91168,7 +91168,6 @@
 #: field:account.mcdb,currency_id:0
 #: code:addons/account_mcdb/report/account_mcdb_export.py:287
 #: report:addons/account_mcdb/report/report_account_bank_statement_line_xls.mako:57
-#: field:account.invoice,fake_currency_id:0
 #: field:account.invoice,virtual_currency_id:0
 #: model:ir.model,name:account_override.model_res_currency
 #: report:payment.order:0
@@ -91309,7 +91308,6 @@
 #: field:validate.move.processor,currency:0
 #: field:wizard.compare.rfq,currency_id:0
 #: field:account.direct.invoice.wizard,currency_id:0
-#: field:wizard.account.invoice,fake_currency_id:0
 #: field:wizard.account.invoice,virtual_currency_id:0
 #: field:claim.product.line,price_currency_claim_product_line:0
 #: field:claim.product.line,price_unit_claim_product_line:0

=== modified file 'bin/addons/register_accounting/account_invoice_view.xml'
--- bin/addons/register_accounting/account_invoice_view.xml	2017-10-04 05:23:42 +0000
+++ bin/addons/register_accounting/account_invoice_view.xml	2018-02-02 13:26:09 +0000
@@ -11,7 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Supplier Invoice">
                     <group colspan="4" col="6">
-                        <field name="journal_id" domain="[('is_current_instance','=',True),('type','=','purchase')]" on_change="onchange_journal_id(journal_id)"/>
+                        <field name="journal_id" domain="[('is_current_instance','=',True), ('type','=','purchase')]" />
                         <field name="number" readonly="1" />
                         <field name="type" invisible="1"/>
                         <field name="currency_id" readonly="1" />
@@ -144,11 +144,10 @@
                 <form string="Supplier Invoice" hide_save_button="1" hide_duplicate_button="1" hide_new_button="1" hide_edit_button="1" hide_delete_button="1">
                     <group colspan="4" col="8">
                         <field name="is_direct_invoice" invisible="1" readonly="1"/>
-                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection" attrs="{'readonly': [('is_direct_invoice', '=', True)]}" />
+                        <field name="journal_id" widget="selection" attrs="{'readonly': [('is_direct_invoice', '=', True)]}" />
                         <field name="number" readonly="1"/>
                         <field name="type" invisible="1"/>
-                        <field name="currency_id" invisible="1" />
-                        <field name="fake_currency_id" attrs="{'readonly': [('is_direct_invoice', '=', True)]}"/>
+                        <field name="currency_id" attrs="{'readonly': [('is_direct_invoice', '=', True)]}"/>
                         <newline/>
                         <field name="partner_id" domain="[('supplier', '=', True)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id,is_inkind_donation,is_intermission,is_debit_note,is_direct_invoice)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" required="1" attrs="{'readonly': [('is_direct_invoice', '=', True),('state', '=', 'paid')]}"/>
 
@@ -289,8 +288,7 @@
             <field name="arch" type="xml">
                 <data>
                     <field name="journal_id" position="replace">
-                        <field name="journal_id" domain="[('is_current_instance','=',True), ('type', '=', context.get('journal_type'))]"
-                               on_change="onchange_journal_id(journal_id)"/>
+                        <field name="journal_id" domain="[('is_current_instance','=',True), ('type', '=', context.get('journal_type'))]"/>
                     </field>
                     <button name="action_cancel_draft" position="replace"/>
                     <button name='invoice_open' position="replace">
@@ -322,8 +320,7 @@
                         </group>
                     </xpath>
                     <field name="journal_id" position="replace">
-                        <field name="journal_id" domain="[('is_current_instance','=',True), ('type', '=', context.get('journal_type'))]"
-                               on_change="onchange_journal_id(journal_id)"/>
+                        <field name="journal_id" domain="[('is_current_instance','=',True), ('type', '=', context.get('journal_type'))]"/>
                         <field name="vat_ok" invisible="1" />
                     </field>
                     <button name="action_cancel_draft" position="replace"/>

=== modified file 'bin/addons/register_accounting/wizard/account_direct_invoice_wizard_view.xml'
--- bin/addons/register_accounting/wizard/account_direct_invoice_wizard_view.xml	2016-01-07 10:40:49 +0000
+++ bin/addons/register_accounting/wizard/account_direct_invoice_wizard_view.xml	2018-02-02 13:26:09 +0000
@@ -27,7 +27,7 @@
                 <form string="Supplier Invoice" noteditable="state=='paid'">
                     <group colspan="4" col="6">
                         <field name="is_direct_invoice" invisible="1" readonly="1"/>
-                        <field name="journal_id" domain="[('is_current_instance','=',True),('type','=','purchase')]" on_change="onchange_journal_id(journal_id)"/>
+                        <field name="journal_id" domain="[('is_current_instance','=',True), ('type','=','purchase')]"/>
                         <field name="number" readonly="1"/>
                         <field name="type" invisible="1"/>
                         <field name="currency_id" readonly="1" />