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

[jftempo]

=== modified file 'bin/addons/register_accounting/account_bank_statement.py'
--- bin/addons/register_accounting/account_bank_statement.py	2019-05-14 08:00:10 +0000
+++ bin/addons/register_accounting/account_bank_statement.py	2019-06-06 13:38:54 +0000
@@ -91,7 +91,16 @@
     def _search_filter_third(self, cr, uid, obj, name, args, context):
         if not context:
             context = {}
+        regline_obj = self.pool.get('account.bank.statement.line')
         dom = [('type', 'in', ['cash', 'bank', 'cheque'])]
+        if context.get('from', '') == 'regline_view' and context.get('active_id'):
+            # get the currency and journal values for the View "Register Lines" accessible from the reg. Actions Menu
+            reg_line = regline_obj.browse(cr, uid, context['active_id'], fields_to_fetch=['statement_id'], context=context)
+            reg = reg_line and reg_line.statement_id
+            if reg and not context.get('curr'):
+                context['curr'] = reg.currency and reg.currency.id or False
+            if reg and not context.get('journal'):
+                context['journal'] = reg.journal_id.id
         if not args or not context.get('curr') or not context.get('journal'):
             return dom
         if args[0][2]:

=== modified file 'bin/addons/register_accounting/account_view.xml'
--- bin/addons/register_accounting/account_view.xml	2019-04-25 08:45:56 +0000
+++ bin/addons/register_accounting/account_view.xml	2019-06-06 13:38:54 +0000
@@ -434,7 +434,14 @@
                     <field name="name" string="Description"/>
                     <field name="ref"/>
                     <field name="account_id" domain="[('restricted_area', '=', 'register_lines')]"/>
-                    <field name="partner_type" context="{'search_default_active': True}"/>
+                    <field name="number_imported_invoice" invisible="1"/>
+                    <field name="from_import_cheque_id" invisible="1"/>
+                    <field name="partner_type_mandatory" invisible="1"/>
+                    <field name="partner_type"
+                           attrs="{'readonly': ['|', '|', ('number_imported_invoice', '>', 0), ('from_import_cheque_id', '!=', False), ('direct_invoice', '=', True)],
+                                   'required': [('partner_type_mandatory', '=', True)]}"
+                           domain="[('filter_for_third_party', '=', account_id)]"
+                           context="{'search_default_active': True, 'from': 'regline_view',}" />
                     <field name="partner_id" invisible="1"/>
                     <field name="employee_id" invisible="1"/>
                     <field name="transfer_journal_id" invisible="1"/>