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

[jftempo]

=== modified file 'bin/addons/account_mcdb/account_view.xml'
--- bin/addons/account_mcdb/account_view.xml	2018-04-20 14:30:11 +0000
+++ bin/addons/account_mcdb/account_view.xml	2018-08-13 14:06:52 +0000
@@ -281,9 +281,6 @@
                     <field name="credit" sum="Total Func. Credit"/>
                     <field name="functional_currency_id"/>
                     <field name="reconcile_total_partial_id"/>
-                    <field name="reconcile_date" invisible="1"/>
-                    <field name="unreconcile_date" invisible="1"/>
-                    <field name="unreconcile_txt" invisible="1"/>
                     <field name="state"/>
                 </tree>
             </field>

=== modified file 'bin/addons/res_currency_functional/account_move_line_view.xml'
--- bin/addons/res_currency_functional/account_move_line_view.xml	2017-09-22 09:51:11 +0000
+++ bin/addons/res_currency_functional/account_move_line_view.xml	2018-08-13 14:06:52 +0000
@@ -61,6 +61,11 @@
                         <newline />
                         <field name="document_date"/>
                         <field name="date"/>
+                        <field name="reconcile_date" invisible="1"/>
+                        <field name="unreconcile_date" invisible="1"/>
+                        <field name="unreconcile_txt" invisible="1"/>
+                        <field name="invoice" invisible="1"/>
+                        <field name="cheque_number" invisible="1"/>
                     </group>
                     
                     <group col="6" colspan="4">

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2018-08-06 13:07:33 +0000
+++ bin/osv/orm.py	2018-08-13 14:06:52 +0000
@@ -668,18 +668,22 @@
                         else:
                             break
                     else:
+                        if isinstance(r, browse_record):
+                            obj = self.pool.get(r._table_name)
+                        else:
+                            obj = self
                         r = r[f[i]]
                         # To display external name of selection field when its exported
                         cols = False
-                        if f[i] in self._columns.keys():
-                            cols = self._columns[f[i]]
-                        elif f[i] in self._inherit_fields.keys():
-                            cols = selection_field(self._inherits)
+                        if f[i] in obj._columns.keys():
+                            cols = obj._columns[f[i]]
+                        elif f[i] in obj._inherit_fields.keys():
+                            cols = selection_field(obj._inherits)
                         if cols and cols._type == 'selection' and not sync_context:
                             # if requested, translate the fields.selection values
                             translated_selection = False
                             if context.get('translate_selection_field', False) and r and f:
-                                fields_get_res = self.fields_get(cr, uid, f, context=context)
+                                fields_get_res = obj.fields_get(cr, uid, f, context=context)
                                 if f[0] in fields_get_res and 'selection' in fields_get_res[f[0]]:
                                     r = dict(fields_get_res[f[0]]['selection'])[r]
                                     translated_selection = True