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

[jftempo]

=== modified file 'bin/addons/account/project/project_view.xml'
--- bin/addons/account/project/project_view.xml	2017-10-27 08:56:09 +0000
+++ bin/addons/account/project/project_view.xml	2018-04-24 07:17:07 +0000
@@ -249,6 +249,7 @@
                         <group>
                             <field name="amount" select="1"/>
                             <field name="amount_currency"/>
+                            <field name="currency_id" domain="[('active', '=', True)]"/>
                         </group>
                     </group>
                     <newline/>
 
=== modified file 'bin/addons/account_mcdb/account_view.xml'
--- bin/addons/account_mcdb/account_view.xml	2017-09-12 13:46:40 +0000
+++ bin/addons/account_mcdb/account_view.xml	2018-04-24 07:17:07 +0000
@@ -178,9 +178,10 @@
                             <field name="journal_type"/>
                         </group>
                         <newline/>
-                        <group col="2" colspan="4">
+                        <group col="6" colspan="4">
                             <field name="balance" string="Debit/Credit Fonctional" select='1'/>
                             <field name="balance_currency" string="Debit/Credit Booking" select='1'/>
+                            <field name="currency_id" help="" domain="[('active', '=', True)]"/>
                         </group>
                         <newline/>
                         <group expand="0" string="Group By..." colspan="4" col="20">