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

[jftempo]

=== modified file 'bin/addons/account/account_view.xml'
--- bin/addons/account/account_view.xml	2018-10-04 13:56:00 +0000
+++ bin/addons/account/account_view.xml	2019-02-06 10:02:21 +0000
@@ -1245,6 +1245,7 @@
                     <group col="10" colspan="4">
                         <field name="journal_id" widget="selection" context="{'journal_id':self, 'visible_id':self, 'normal_view':False}"/>
                         <field name="period_id" context="{'period_id':self, 'search_default_period_id':self}"/>
+                        <field name="cheque_number"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters...">
 
=== modified file 'bin/addons/account_mcdb/account_move_line.py'
--- bin/addons/account_mcdb/account_move_line.py	2015-08-05 12:26:43 +0000
+++ bin/addons/account_mcdb/account_move_line.py	2019-02-06 10:02:21 +0000
@@ -145,6 +145,14 @@
                 cheque_number_node)
 
             view['arch'] = etree.tostring(tree)
+        if view_type == 'search':
+            # filter on Cheque Number must appear only when searching for the lines to add in the Import Cheque wizard
+            if context.get('from') != 'wizard_import_cheque':
+                tree = etree.fromstring(view['arch'])
+                element_fields = tree.xpath('.//field[@name="cheque_number"]')
+                for el in element_fields:
+                    el.getparent().remove(el)
+                view['arch'] = etree.tostring(tree)
         return view
 
 account_move_line()