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

[jftempo]

=== modified file 'bin/addons/account/account_analytic_line.py'
--- bin/addons/account/account_analytic_line.py	2016-05-26 13:18:50 +0000
+++ bin/addons/account/account_analytic_line.py	2018-05-14 07:59:09 +0000
@@ -142,8 +142,86 @@
             return res
         return False
 
+    def get_aal_related_entries(self, cr, uid, ids, context=None):
+        """
+        Returns a view with all the Analytic Lines related to the selected one, i.e.:
+        1) those having the same Entry Sequence as the selected one (including the selected line itself)
+        2) those having the same reference as one of the lines found in 1)
+        3) those having an Entry Sequence matching exactly with the reference of one of the lines found in 1)
+        4) those whose reference contains EXACTLY the Entry Sequence of the selected line
+        5) those having the same Entry Sequence as one of the lines found in 2), 3), or 4)
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        active_ids = context.get('active_ids', [])  # to detect if the user has selected several lines
+        if len(ids) != 1 or len(active_ids) > 1:
+            raise osv.except_osv(_('Error'),
+                                 _('The related entries feature can only be used with one Analytic Line.'))
+        ir_model_obj = self.pool.get('ir.model.data')
+        analytic_acc_obj = self.pool.get('account.analytic.account')
+        related_aals = set()
+
+        selected_aal = self.browse(cr, uid, ids[0], fields_to_fetch=['entry_sequence', 'account_id'], context=context)
+        selected_entry_seq = selected_aal.entry_sequence or ''
+        selected_category = selected_aal.account_id.category or ''
+
+        # get the ids of all the related lines
+        analytic_account_ids = analytic_acc_obj.search(cr, uid, [('category', '=', selected_category)],
+                                                       order='NO_ORDER', context=context)
+        # lines having the same Entry Sequence
+        same_seq_domain = [('entry_sequence', '=', selected_entry_seq),
+                           ('account_id', 'in', analytic_account_ids)]
+        same_seq_line_ids = self.search(cr, uid, same_seq_domain, order='NO_ORDER', context=context)
+        related_aals.update(same_seq_line_ids)
+
+        # check on ref
+        set_of_refs = set()
+        for aal in self.browse(cr, uid, same_seq_line_ids, fields_to_fetch=['ref'], context=context):
+            aal.ref and set_of_refs.add(aal.ref)
+
+        domain_related_lines = ['&', '|', '|',
+                                '&', ('ref', 'in', list(set_of_refs)), ('ref', '!=', ''),
+                                ('entry_sequence', 'in', list(set_of_refs)),
+                                ('ref', '=', selected_entry_seq),
+                                ('account_id', 'in', analytic_account_ids)]
+        related_line_ids = self.search(cr, uid, domain_related_lines, order='NO_ORDER', context=context)
+        related_aals.update(related_line_ids)
+
+        # check on Entry Seq. (compared with those of the related lines found)
+        aal_seqs = set(aal.entry_sequence for aal in self.browse(cr, uid, related_line_ids,
+                                                                 fields_to_fetch=['entry_sequence'], context=context))
+        same_seq_related_line_domain = [('entry_sequence', 'in', list(aal_seqs)),
+                                        ('account_id', 'in', analytic_account_ids)]
+        same_seq_related_line_ids = self.search(cr, uid, same_seq_related_line_domain, order='NO_ORDER', context=context)
+        related_aals.update(same_seq_related_line_ids)
+
+        domain = [('id', 'in', list(related_aals))]
+        # same views whatever the category displayed (FP or Free1/2)
+        view_id = ir_model_obj.get_object_reference(cr, uid, 'account', 'view_account_analytic_line_tree')
+        view_id = view_id and view_id[1] or False
+        search_view_id = ir_model_obj.get_object_reference(cr, uid, 'account', 'view_account_analytic_line_filter')
+        search_view_id = search_view_id and search_view_id[1] or False
+        if selected_category == 'FUNDING':
+            context.update({'display_fp': True})
+        return {
+            'name': _('Related entries: Entry Sequence %s') % selected_entry_seq,
+            'type': 'ir.actions.act_window',
+            'res_model': 'account.analytic.line',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'view_id': [view_id],
+            'search_view_id': [search_view_id],
+            'context': context,
+            'domain': domain,
+            'target': 'current',
+        }
+
+
 account_analytic_line()
 
+
 class res_partner(osv.osv):
     """ Inherits partner and adds contract information in the partner form """
     _inherit = 'res.partner'

=== modified file 'bin/addons/account/account_view.xml'
--- bin/addons/account/account_view.xml	2017-09-29 09:55:29 +0000
+++ bin/addons/account/account_view.xml	2018-05-14 07:59:09 +0000
@@ -2745,6 +2745,7 @@
             <field name="act_window_id" ref="action_view_bank_statement_tree"/>
         </record>
 
+        <!-- JI RELATED ENTRIES -->
         <record id="action_aml_related_entries" model="ir.actions.server">
             <field name="name">Related Entries</field>
             <field name="model_id" ref="model_account_move_line"/>
@@ -2760,6 +2761,22 @@
             <field name="sequence" eval="105"/>
         </record>
 
+        <!-- AJI RELATED ENTRIES -->
+        <record id="action_aal_related_entries" model="ir.actions.server">
+            <field name="name">Related Entries</field>
+            <field name="model_id" ref="model_account_analytic_line"/>
+            <field name="state">code</field>
+            <field name="code">action = obj.get_aal_related_entries(context=context)</field>
+        </record>
+        <record id="ir_aal_related_entries_search" model="ir.values">
+            <field name="key2">client_action_multi</field>
+            <field name="model">account.analytic.line</field>
+            <field name="name">related_entries</field>
+            <field eval="'ir.actions.server,%d'%action_aal_related_entries" name="value"/>
+            <field eval="True" name="object"/>
+            <field name="sequence" eval="105"/>
+        </record>
+
         <menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines"
             parent="menu_finance_bank_and_cash"/>
 

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-04-27 09:58:55 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-05-14 07:59:09 +0000
@@ -18660,6 +18660,7 @@
 
 #. module: account
 #: model:ir.actions.server,name:account.action_aml_related_entries
+#: model:ir.actions.server,name:account.action_aal_related_entries
 msgid "Related Entries"
 msgstr "Ecritures associées"
 
@@ -47968,6 +47969,7 @@
 
 #. module: account
 #: code:addons/account/account_move_line.py:1366
+#: code:addons/account/account_analytic_line.py:196
 #, python-format
 msgid "Related entries: Entry Sequence %s"
 msgstr "Ecritures associées : Entrée Comptable %s"
@@ -104687,17 +104689,6 @@
 msgstr "Écritures ouvertes à"
 
 #. module: account
-#: model:ir.actions.server,name:account.action_aml_related_entries
-msgid "Related Entries"
-msgstr "Ecritures associées"
-
-#. module: account
-#: code:addons/account/account_move_line.py:1369
-#, python-format
-msgid "Related entries: Entry Sequence %s"
-msgstr "Ecritures associées : Entrée Comptable %s"
-
-#. module: account
 #: code:addons/account/account_move_line.py:1330
 #, python-format
 msgid "The related entries feature can only be used with one Journal Item."
@@ -107673,3 +107664,9 @@
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in booking currency!"
 msgstr "Valeur de crédit ou débit erronée en devise d'enregistrement !"
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:161
+#, python-format
+msgid "The related entries feature can only be used with one Analytic Line."
+msgstr "La fonctionnalité des écritures associées ne peut être utilisée qu'avec une seule Ligne Analytique."