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

[jftempo]

[Jeff Allen (jr.allen)]

Wow, beautiful code! Thanks for this.

=== modified file 'bin/addons/account/account_move_line.py'
--- bin/addons/account/account_move_line.py	2017-05-12 09:58:49 +0000
+++ bin/addons/account/account_move_line.py	2017-07-19 13:23:24 +0000
@@ -1312,6 +1312,70 @@
                 move_obj.button_validate(cr,uid, [vals['move_id']], context)
         return result
 
+    def get_related_entries(self, cr, uid, ids, context=None):
+        """
+        Returns a JI view with all the JIs related to the selected one, i.e.:
+        1) those having the same Entry Sequence as the selected JI (including the selected JI itself)
+        2) those having the same reference as one of the JIs found in 1)
+        3) those being partially or totally reconciled with one of the JIs found in 1)
+        4) those whose reference contains EXACTLY the Entry Sequence of the selected JI
+        5) those having the same Entry Sequence as one of the JIs 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 JIs
+        if len(ids) != 1 or len(active_ids) > 1:
+            raise osv.except_osv(_('Error'),
+                                 _('The related entries feature can only be used with one Journal Item.'))
+        ir_model_obj = self.pool.get('ir.model.data')
+        related_amls = set()
+        selected_aml = self.browse(cr, uid, ids[0], fields_to_fetch=['move_id'], context=context)
+        selected_entry_seq = selected_aml.move_id.name
+
+        # get the ids of all the related JIs
+        # JIs having the same Entry Seq = JIs of the same JE
+        same_seq_ji_ids = self.search(cr, uid, [('move_id', '=', selected_aml.move_id.id)], order='NO_ORDER', context=context)
+        related_amls.update(same_seq_ji_ids)
+
+        # check on ref and reconciliation
+        set_of_refs = set()
+        set_of_reconcile_ids = set()
+        for aml in self.browse(cr, uid, same_seq_ji_ids,
+                               fields_to_fetch=['ref', 'reconcile_id', 'reconcile_partial_id'], context=context):
+            aml.ref and set_of_refs.add(aml.ref)
+            aml.reconcile_id and set_of_reconcile_ids.add(aml.reconcile_id.id)
+            aml.reconcile_partial_id and set_of_reconcile_ids.add(aml.reconcile_partial_id.id)
+
+        domain_related_jis = ['|', '|', '|',
+                              '&', ('ref', 'in', list(set_of_refs)), ('ref', '!=', ''),
+                              ('ref', '=', selected_entry_seq),
+                              ('reconcile_id', 'in', list(set_of_reconcile_ids)),
+                              ('reconcile_partial_id', 'in', list(set_of_reconcile_ids))]
+        related_ji_ids = self.search(cr, uid, domain_related_jis, order='NO_ORDER', context=context)
+        related_amls.update(related_ji_ids)
+
+        # check on Entry Seq. (compared with those of the related JIs found)
+        seq_je_ids = set(am.move_id.id for am in self.browse(cr, uid, related_ji_ids, fields_to_fetch=['move_id'], context=context))
+        same_seq_related_ji_ids = self.search(cr, uid, [('move_id', 'in', list(seq_je_ids))], order='NO_ORDER', context=context)
+        related_amls.update(same_seq_related_ji_ids)
+
+        domain = [('id', 'in', list(related_amls))]
+        search_view_id = ir_model_obj.get_object_reference(cr, uid, 'account_mcdb', 'mcdb_view_account_move_line_filter')
+        search_view_id = search_view_id and search_view_id[1] or False
+        return {
+            'name': _('Related entries: Entry Sequence %s') % selected_entry_seq,
+            'type': 'ir.actions.act_window',
+            'res_model': 'account.move.line',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'search_view_id': [search_view_id],
+            'context': context,
+            'domain': domain,
+            'target': 'current',
+        }
+
 account_move_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/account/account_view.xml'
--- bin/addons/account/account_view.xml	2017-05-26 10:03:57 +0000
+++ bin/addons/account/account_view.xml	2017-07-19 13:23:24 +0000
@@ -2736,6 +2736,22 @@
             <field name="view_id" ref="account_cash_statement_graph"/>
             <field name="act_window_id" ref="action_view_bank_statement_tree"/>
         </record>
+
+        <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"/>
+            <field name="state">code</field>
+            <field name="code">action = obj.get_related_entries(context=context)</field>
+        </record>
+        <record id="ir_related_entries_search" model="ir.values">
+            <field name="key2">client_action_multi</field>
+            <field name="model">account.move.line</field>
+            <field name="name">Related Entries</field>
+            <field eval="'ir.actions.server,%d'%action_aml_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	2017-07-06 14:23:27 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2017-07-19 13:23:24 +0000
@@ -98688,3 +98688,20 @@
 #, python-format
 msgid "Warning, you have removed header value source location! The lines will be re-set to have 'Other Supplier' as the source location. Please check this is correct!"
 msgstr "Attention, vous avez supprimé la zone source d'en-tête! La zone source des lignes va être réinitialisée avec la valeur 'Autre Fournisseur'. Merci de vérifier leur cohérence!"
+
+#. 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."
+msgstr "La fonctionnalité des écritures associées ne peut être utilisée qu'avec une seule ligne d'écriture comptable."