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

[jftempo]

=== modified file 'bin/addons/analytic_distribution/account_bank_statement.py'
--- bin/addons/analytic_distribution/account_bank_statement.py	2020-01-22 10:08:27 +0000
+++ bin/addons/analytic_distribution/account_bank_statement.py	2020-09-16 07:27:30 +0000
@@ -69,6 +69,20 @@
                                                                                                  amount=line.get('amount', 0.0))
         return res
 
+    def _display_analytic_lines_button(self, cr, uid, ids, name, args, context=None):
+        """
+        The Analytic Lines "magnifying glass" should be displayed only for expense or income lines being either temp or hard-posted.
+        """
+        res = {}
+        if context is None:
+            context = {}
+        for absl in self.browse(cr, uid, ids, fields_to_fetch=['state', 'account_id'], context=context):
+            if absl.state not in ('temp', 'hard') or not absl.account_id.is_analytic_addicted:
+                res[absl.id] = False
+            else:
+                res[absl.id] = True
+        return res
+
     _columns = {
         'analytic_distribution_id': fields.many2one('analytic.distribution', 'Analytic Distribution'),
         'display_analytic_button': fields.function(_display_analytic_button, method=True, string='Display analytic button?', type='boolean', readonly=True,
@@ -77,10 +91,13 @@
                                                        selection=[('none', 'None'), ('valid', 'Valid'),
                                                                   ('invalid', 'Invalid'), ('invalid_small_amount', 'Invalid')],
                                                        string="Distribution state", help="Informs from distribution state among 'none', 'valid', 'invalid."),
+        'display_analytic_lines_button': fields.function(_display_analytic_lines_button, method=True, store=False, type='boolean',
+                                                         string='Display analytic lines button', readonly=True),
     }
 
     _defaults = {
         'display_analytic_button': lambda *a: True,
+        'display_analytic_lines_button': lambda *a: True,
     }
 
     def button_analytic_distribution(self, cr, uid, ids, context=None):

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2020-08-26 13:50:18 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2020-09-16 07:27:30 +0000
@@ -110871,3 +110871,8 @@
 #: model:ir.ui.menu,name:vertical_integration.menu_action_hq_export_ocg_poc
 msgid "Export to HQ system (OCG-POC)"
 msgstr "Export vers le système HQ (OCG-POC)"
+
+#. module: register_accounting
+#: field:account.bank.statement.line,display_analytic_lines_button:0
+msgid "Display analytic lines button"
+msgstr "Afficher le bouton des lignes analytiques"

=== modified file 'bin/addons/register_accounting/account_view.xml'
--- bin/addons/register_accounting/account_view.xml	2020-08-06 16:10:07 +0000
+++ bin/addons/register_accounting/account_view.xml	2020-09-16 07:27:30 +0000
@@ -64,7 +64,10 @@
                                     <tree hide_delete_button="1" editable="bottom" string="Statement lines" noteditable="state=='hard' or direct_invoice is True" colors="red:(display_analytic_button and (not analytic_distribution_id or analytic_distribution_state in ('invalid', 'invalid_small_amount'))) or red_on_supplier == True" limit="20">
                                         <field name="red_on_supplier" invisible="1"/>
                                         <button name="button_duplicate" string="Duplicate" type="object" icon="gtk-copy" />
-                                        <button name="button_analytic_lines" string="Analytic lines" type="object" icon="terp-stock_zoom" />
+                                        <field name="display_analytic_lines_button" invisible="1"/>
+                                        <button name="button_analytic_lines" string="Analytic lines" type="object" icon="terp-stock_zoom"
+                                                attrs="{'invisible': [('display_analytic_lines_button', '=', False)]}"
+                                        />
                                         <field name="from_cash_return" invisible="1"/>
                                         <field name="employee_id" invisible="1"/>
                                         <button name="button_advance" states="hard" string="Advance return" type="object"
@@ -233,7 +236,10 @@
                                 <field colspan="4" name="line_ids" nolabel="1">
                                     <tree hide_delete_button="1" editable="bottom" string="Statement lines" noteditable="state=='hard' or direct_invoice is True" colors="red:(display_analytic_button and (not analytic_distribution_id or analytic_distribution_state in ('invalid', 'invalid_small_amount'))) or red_on_supplier == True" limit="20">
                                         <button name="button_duplicate" string="Duplicate" type="object" icon="gtk-copy" />
-                                        <button name="button_analytic_lines" string="Analytic lines" type="object" icon="terp-stock_zoom" />
+                                        <field name="display_analytic_lines_button" invisible="1"/>
+                                        <button name="button_analytic_lines" string="Analytic lines" type="object" icon="terp-stock_zoom"
+                                                attrs="{'invisible': [('display_analytic_lines_button', '=', False)]}"
+                                        />
                                         <field name="from_cash_return" invisible="1"/>
                                         <button name="button_advance" states="hard" string="Advance return" type="object"
                                             icon="terp-stock_effects-object-colorize" context="context"
@@ -824,7 +830,10 @@
                                 <!-- WARNING: because of UTP-331, in cheque register direct invoice lines should be editable but ONLY for cheque_number FIELD. That's why ALL field must be not editable when "direct_invoice" is True. -->
                                 <tree hide_delete_button="1" editable="bottom" string="Statement lines" noteditable="state=='hard'" colors="red:(display_analytic_button and (not analytic_distribution_id or analytic_distribution_state in ('invalid', 'invalid_small_amount'))) or red_on_supplier == True" limit="20">
                                     <button name="button_duplicate" string="Duplicate" type="object" icon="gtk-copy" />
-                                    <button name="button_analytic_lines" string="Analytic lines" type="object" icon="terp-stock_zoom" />
+                                    <field name="display_analytic_lines_button" invisible="1"/>
+                                    <button name="button_analytic_lines" string="Analytic lines" type="object" icon="terp-stock_zoom"
+                                            attrs="{'invisible': [('display_analytic_lines_button', '=', False)]}"
+                                    />
                                     <field name="document_date" attrs="{'readonly': [('direct_invoice', '=', True)]}"/>
                                     <field name="red_on_supplier" invisible="1" />
                                     <field name="date" attrs="{'readonly': [('direct_invoice', '=', True)]}"/>