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

[jftempo]

=== modified file 'bin/addons/account_mcdb/account_mcdb.py'
--- bin/addons/account_mcdb/account_mcdb.py	2018-05-30 13:38:20 +0000
+++ bin/addons/account_mcdb/account_mcdb.py	2018-08-08 07:43:14 +0000
@@ -46,9 +46,17 @@
         'period_ids': fields.many2many(obj='account.period', rel="account_period_mcdb", id1="mcdb_id", id2="period_id", string="Accounting Period"),
         'fiscalyear_id': fields.many2one('account.fiscalyear', string='Fiscal Year'),
         'account_ids': fields.many2many(obj='account.account', rel='account_account_mcdb', id1='mcdb_id', id2='account_id', string="Account Code"),
-        'partner_id': fields.many2one('res.partner', string="Partner"),
-        'employee_id': fields.many2one('hr.employee', string="Employee"),
-        'transfer_journal_id': fields.many2one('account.journal', string="Journal", domain="[('code', '!=', 'IB')]"),  # exclude year closing initial balance journal
+        'partner_id': fields.many2one('res.partner', string="Partner"),  # not used since US-3427
+        'partner_ids': fields.many2many(obj='res.partner', rel='partner_mcdb', id1='mcdb_id', id2='partner_id',
+                                        string='Partners', order_by='name, id'),
+        'employee_id': fields.many2one('hr.employee', string="Employee"),  # not used since US-3427
+        'employee_ids': fields.many2many(obj='hr.employee', rel='employee_mcdb', id1='mcdb_id', id2='employee_id',
+                                         string='Employees', order_by='employee_type, identification_id, id'),
+        'transfer_journal_id': fields.many2one('account.journal', string="Journal",
+                                               domain="[('code', '!=', 'IB')]"),  # exclude year closing initial balance journal / not used since US-3427
+        'transfer_journal_ids': fields.many2many(obj='account.journal', rel='transfer_journal_mcdb', id1='mcdb_id', id2='journal_id',
+                                                 string='Journals', domain="[('type', 'in', ['cash', 'bank', 'cheque'])]",
+                                                 order_by='instance_id, code, id'),
         'reconciled': fields.selection([('reconciled', 'Reconciled'), ('unreconciled', 'NOT reconciled')], string='Reconciled?'),
         'functional_currency_id': fields.many2one('res.currency', string="Functional currency", readonly=True),
         'amount_func_from': fields.float('Begin amount in functional currency'),
@@ -93,6 +101,9 @@
         'rev_analytic_journal_ids': fields.boolean('Exclude analytic journal selection'),
         'rev_instance_ids': fields.boolean('Exclude instances selection'),
         'rev_top_prop_instance_ids': fields.boolean('Exclude top prop instances selection'),
+        'rev_partner_ids': fields.boolean('Exclude partner selection'),
+        'rev_employee_ids': fields.boolean('Exclude employee selection'),
+        'rev_transfer_journal_ids': fields.boolean('Exclude journal selection'),  # Third Party Journal
         'analytic_axis': fields.selection([('fp', 'Funding Pool'), ('f1', 'Free 1'), ('f2', 'Free 2')], string='Display'),
         'rev_analytic_account_dest_ids': fields.boolean('Exclude Destination selection'),
         'analytic_account_dest_ids': fields.many2many(obj='account.analytic.account', rel="account_analytic_dest_mcdb", id1="mcdb_id", id2="analytic_account_id",
@@ -111,6 +122,9 @@
         'display_destination': fields.boolean('Display destinations?'),
         'display_free1': fields.boolean('Display Free 1?'),
         'display_free2': fields.boolean('Display Free 2?'),
+        'display_partner': fields.boolean('Display Partners?'),
+        'display_employee': fields.boolean('Display Employees?'),
+        'display_transfer_journal': fields.boolean('Display Transfer Journals?'),
         'user': fields.many2one('res.users', "User"),
         'cheque_number': fields.char('Cheque Number', size=120),  # BKLG-7
         'partner_txt': fields.char('Third Party', size=120),  # BKLG-7
@@ -281,6 +295,7 @@
         domain = []
         wiz = self.browse(cr, uid, [ids[0]], context=context)[0]
         res_model = context.get('selector_model', False) or (wiz and wiz.model) or False
+        journal_obj = self.pool.get('account.journal')
         if res_model:
             # Prepare domain values
             # First MANY2MANY fields
@@ -312,8 +327,12 @@
             else:
                 m2m_fields.append(('account_ids', 'account_id'))
                 m2m_fields.append(('account_type_ids', 'account_id.user_type'))
+                m2m_fields.append(('partner_ids', 'partner_id'))
+                m2m_fields.append(('employee_ids', 'employee_id'))
+                m2m_fields.append(('transfer_journal_ids', 'transfer_journal_id'))
             for m2m in m2m_fields:
                 if getattr(wiz, m2m[0]):
+                    value = False
 
                     # do not add domain if the block have not been selected
                     # (because they are using same field relation m2m)
@@ -359,6 +378,18 @@
                         operator = 'not in'
                     elif m2m[0] == 'top_prop_instance_ids' and wiz.rev_top_prop_instance_ids:
                         operator = 'not in'
+                    # partner_ids with reversal
+                    elif m2m[0] == 'partner_ids' and wiz.rev_partner_ids:
+                        operator = 'not in'
+                    # employee_ids with reversal
+                    elif m2m[0] == 'employee_ids' and wiz.rev_employee_ids:
+                        operator = 'not in'
+                    # transfer_journal_ids with reversal
+                    elif m2m[0] == 'transfer_journal_ids' and wiz.rev_transfer_journal_ids:
+                        operator = 'not in'
+                        # also exclude all non liquidity journals (so the right journals will be displayed in the PDF report header)
+                        other_journal_ids = journal_obj.search(cr, uid, [('type', 'not in', ['cash', 'bank', 'cheque'])], order='NO_ORDER', context=context)
+                        value = [x.id for x in getattr(wiz, m2m[0])] + other_journal_ids
                     # Search if a view account is given
                     if m2m[0] in ['account_ids', 'analytic_account_fp_ids', 'analytic_account_cc_ids', 'analytic_account_f1_ids', 'analytic_account_f2_ids']:
                         account_ids = []
@@ -383,10 +414,10 @@
                         id_list = child_list + [x.id for x in getattr(wiz, m2m[0])]
                         domain.append((m2m[1], operator, tuple(id_list)))
                     else:
-                        domain.append((m2m[1], operator, tuple([x.id for x in getattr(wiz, m2m[0])])))
+                        value = value or tuple([x.id for x in getattr(wiz, m2m[0])])
+                        domain.append((m2m[1], operator, value))
             # Then MANY2ONE fields
-            for m2o in [('abs_id', 'statement_id'), ('partner_id', 'partner_id'), ('employee_id', 'employee_id'),
-                        ('transfer_journal_id', 'transfer_journal_id'), ('booking_currency_id', 'currency_id'),
+            for m2o in [('abs_id', 'statement_id'), ('booking_currency_id', 'currency_id'),
                         ('fiscalyear_id', 'fiscalyear_id')]:
                 if getattr(wiz, m2o[0]):
                     domain.append((m2o[1], '=', getattr(wiz, m2o[0]).id))
@@ -1013,6 +1044,75 @@
         field = 'instance_ids'
         return self._button_add(cr, uid, ids, obj, field, args, context=context)
 
+    def button_partner_add(self, cr, uid, ids, context=None):
+        """
+        Adds all Partners in partner_ids field content
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        obj = 'res.partner'
+        args = [('active', '=', 't')]
+        field = 'partner_ids'
+        return self._button_add(cr, uid, ids, obj, field, args, context=context)
+
+    def button_employee_add(self, cr, uid, ids, context=None):
+        """
+        Adds all Employees in employee_ids field content
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        obj = 'hr.employee'
+        args = [('active', '=', 't')]
+        field = 'employee_ids'
+        return self._button_add(cr, uid, ids, obj, field, args, context=context)
+
+    def button_transfer_journal_add(self, cr, uid, ids, context=None):
+        """
+        Adds all Transfer Journals in transfer_journal_ids field content
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        obj = 'account.journal'
+        args = [('type', 'in', ['cash', 'bank', 'cheque'])]
+        field = 'transfer_journal_ids'
+        return self._button_add(cr, uid, ids, obj, field, args, context=context)
+
+    def button_partner_clear(self, cr, uid, ids, context=None):
+        """
+        Deletes partner_ids field content
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        return self.button_clear(cr, uid, ids, field='partner_ids', context=context)
+
+    def button_employee_clear(self, cr, uid, ids, context=None):
+        """
+        Deletes employee_ids field content
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        return self.button_clear(cr, uid, ids, field='employee_ids', context=context)
+
+    def button_transfer_journal_clear(self, cr, uid, ids, context=None):
+        """
+        Deletes transfer_journal_ids field content
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        return self.button_clear(cr, uid, ids, field='transfer_journal_ids', context=context)
+
     def clean_up_search(self, cr, uid, ids, context=None):
         """
         Clean up objects that have no description.

=== modified file 'bin/addons/account_mcdb/account_mcdb_view.xml'
--- bin/addons/account_mcdb/account_mcdb_view.xml	2018-04-05 12:43:54 +0000
+++ bin/addons/account_mcdb/account_mcdb_view.xml	2018-08-08 07:43:14 +0000
@@ -32,9 +32,70 @@
                     &currency;
                     <group colspan="4" col="6">
                         <separator string="Third Party" colspan="6"/>
-                        <field name="partner_id" colspan="2" context="{'show_button_show_inactive':1}" />
-                        <field name="employee_id" colspan="2" context="{'disrupt_inactive': False}"/>
-                        <field name="transfer_journal_id" colspan="2"/>
+                        <!-- PARTNERS -->
+                        <group col="2" colspan="2">
+                            <group col="4" colspan="2">
+                                <separator string="Partners" colspan="3"/>
+                                <field name="display_partner" colspan="1" nolabel="1"/>
+                            </group>
+                            <group col="2" colspan="2" attrs="{'invisible': [('display_partner', '=', False)]}">
+                                <group col="2" colspan="2">
+                                    <button name="button_partner_clear" type="object" string="Remove all Partners" icon="gtk-clear" colspan="1"/>
+                                    <button name="button_partner_add" type="object" string="Add all Partners" icon="gtk-add" colspan="1"/>
+                                </group>
+                                <field name="rev_partner_ids" colspan="2"/>
+                                <field name="partner_ids" colspan="2" nolabel="1" context="{'show_button_show_inactive':1}">
+                                    <tree string="Partners" editable="top" noteditable="1">
+                                        <field name="name"/>
+                                        <field name="ref"/>
+                                        <field name="partner_type"/>
+                                    </tree>
+                                </field>
+                            </group>
+                        </group>
+                        <!-- EMPLOYEES -->
+                        <group col="2" colspan="2">
+                            <group col="4" colspan="2">
+                                <separator string="Employees" colspan="3"/>
+                                <field name="display_employee" colspan="1" nolabel="1"/>
+                            </group>
+                            <group col="2" colspan="2" attrs="{'invisible': [('display_employee', '=', False)]}">
+                                <group col="2" colspan="2">
+                                    <button name="button_employee_clear" type="object" string="Remove all Employees" icon="gtk-clear" colspan="1"/>
+                                    <button name="button_employee_add" type="object" string="Add all Employees" icon="gtk-add" colspan="1"/>
+                                </group>
+                                <field name="rev_employee_ids" colspan="2"/>
+                                <field name="employee_ids" colspan="2" nolabel="1" context="{'disrupt_inactive': False}">
+                                    <tree string="Employees" editable="top" noteditable="1">
+                                        <field name="name"/>
+                                        <field name="identification_id"/>
+                                        <field name="employee_type"/>
+                                    </tree>
+                                </field>
+                            </group>
+                        </group>
+                        <!-- JOURNAL THIRD PARTIES -->
+                        <group col="2" colspan="2">
+                            <group col="4" colspan="2">
+                                <separator string="Journals" colspan="3"/>
+                                <field name="display_transfer_journal" colspan="1" nolabel="1"/>
+                            </group>
+                            <group col="2" colspan="2" attrs="{'invisible': [('display_transfer_journal', '=', False)]}">
+                                <group col="2" colspan="2">
+                                    <button name="button_transfer_journal_clear" type="object" string="Remove all Journals" icon="gtk-clear" colspan="1"/>
+                                    <button name="button_transfer_journal_add" type="object" string="Add all Journals" icon="gtk-add" colspan="1"/>
+                                </group>
+                                <field name="rev_transfer_journal_ids" colspan="2"/>
+                                <field name="transfer_journal_ids" colspan="2" nolabel="1">
+                                    <tree string="Journals" editable="top" noteditable="1">
+                                        <field name="instance_id"/>
+                                        <field name="code"/>
+                                        <field name="name"/>
+                                        <field name="type"/>
+                                    </tree>
+                                </field>
+                            </group>
+                        </group>
                     </group>
                     &end;
                 </form>

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2018-07-20 10:23:42 +0000
+++ bin/addons/msf_profile/data/patches.xml	2018-08-08 07:43:14 +0000
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <openerp>
     <data>
+        <!-- UF10.0 -->
+        <record id="us_3427_update_third_parties_in_gl_selector" model="patch.scripts">
+            <field name="method">us_3427_update_third_parties_in_gl_selector</field>
+        </record>
+
         <!-- UF 9.1 -->
         <record id="change_xml_payment_method" model="patch.scripts">
             <field name="method">change_xml_payment_method</field>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-07-25 16:06:03 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-08-08 07:43:14 +0000
@@ -14426,6 +14426,21 @@
 msgid "Display journals?"
 msgstr "Afficher les journaux ?"
 
+#. module: account_mcdb
+#: field:account.mcdb,display_partner:0
+msgid "Display Partners?"
+msgstr "Afficher les Partenaires ?"
+
+#. module: account_mcdb
+#: field:account.mcdb,display_transfer_journal:0
+msgid "Display Transfer Journals?"
+msgstr "Afficher les Journaux de Transfert ?"
+
+#. module: account_mcdb
+#: field:account.mcdb,display_employee:0
+msgid "Display Employees?"
+msgstr "Afficher les Employés ?"
+
 #. module: consumption_calculation
 #: field:real.average.consumption.line,asset_check:0
 msgid "Asset Check"
@@ -37392,11 +37407,13 @@
 msgid "Partially available"
 msgstr "Partiellement disponible"
 
-#. modules: product, account, base, finance, useability_dashboard_and_menu
+#. modules: product, account, base, finance, useability_dashboard_and_menu, account_mcdb
 #: field:account.partner.ledger,partner_ids:0
 #: model:ir.ui.menu,name:account.next_id_22
 #: view:res.partner:0
 #: view:res.partner.category:0
+#: view:account.mcdb:0
+#: field:account.mcdb,partner_ids:0
 #: field:res.partner.category,partner_ids:0
 #: field:wizard.account.partner.balance.tree,partner_ids:0
 #: field:product.template,seller_ids:0
@@ -46373,6 +46390,21 @@
 msgid "Exclude instances selection"
 msgstr "Exclure la sélection d'instance"
 
+#. module: account_mcdb
+#: field:account.mcdb,rev_partner_ids:0
+msgid "Exclude partner selection"
+msgstr "Exclure la sélection de partenaires"
+
+#. module: account_mcdb
+#: field:account.mcdb,rev_employee_ids:0
+msgid "Exclude employee selection"
+msgstr "Exclure la sélection d'employés"
+
+#. module: account_mcdb
+#: field:account.mcdb,rev_transfer_journal_ids:0
+msgid "Exclude journal selection"
+msgstr "Exclure la sélection de journaux"
+
 #. modules: msf_outgoing, stock_move_tracking, stock_override, consumption_calculation, specific_rules, msf_supply_doc_export, msf_doc_import, procurement_report, stock
 #: view:expiry.quantity.report:0
 #: field:expiry.quantity.report.line,batch_number:0
@@ -47146,6 +47178,16 @@
 msgid "Remove all Journals"
 msgstr "Supprimer tous les Journaux"
 
+#. module: account_mcdb
+#: view:account.mcdb:0
+msgid "Remove all Partners"
+msgstr "Supprimer tous les Partenaires"
+
+#. module: account_mcdb
+#: view:account.mcdb:0
+msgid "Remove all Employees"
+msgstr "Supprimer tous les Employés"
+
 #. module: base
 #: code:addons/base/res/res_user.py:293
 #, python-format
@@ -56995,6 +57037,16 @@
 msgid "Add all Journals"
 msgstr "Ajouter tous les Journaux"
 
+#. module: account_mcdb
+#: view:account.mcdb:0
+msgid "Add all Partners"
+msgstr "Ajouter tous les Partenaires"
+
+#. module: account_mcdb
+#: view:account.mcdb:0
+msgid "Add all Employees"
+msgstr "Ajouter tous les Employés"
+
 #. modules: msf_order_date, purchase, purchase_override, sale
 #: field:update.lines,stock_take_date:0
 #: field:purchase.order,stock_take_date:0
@@ -69838,6 +69890,7 @@
 #: model:ir.ui.menu,name:account.menu_journals
 #: model:ir.ui.menu,name:account.menu_journals_report
 #: view:account.mcdb:0
+#: field:account.mcdb,transfer_journal_ids:0
 #: report:addons/finance/report/account_partner_balance_tree_xls.mako:314
 #: report:account.general.ledger_landscape_tb:0
 #: field:wizard.account.partner.balance.tree,journal_ids:0
@@ -95997,7 +96050,7 @@
 msgid "SQL Constraint"
 msgstr "Contrainte SQL"
 
-#. modules: hr, base, msf_homere_interface
+#. modules: hr, base, msf_homere_interface, account_mcdb
 #: model:ir.actions.act_window,name:base.action_partner_employee_form
 #: view:hr.employee:0
 #: field:hr.job,employee_ids:0
@@ -96007,6 +96060,8 @@
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_configuration_form
 #: view:hr.employee:0
+#: view:account.mcdb:0
+#: field:account.mcdb,employee_ids:0
 msgid "Employees"
 msgstr "Employé(e)s"
 

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2018-07-20 10:23:42 +0000
+++ bin/addons/msf_profile/msf_profile.py	2018-08-08 07:43:14 +0000
@@ -51,6 +51,44 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+    # UF10.0
+    def us_3427_update_third_parties_in_gl_selector(self, cr, uid, *a, **b):
+        """
+        Third Parties in G/L selector (partners / employees / journals) become many2many fields
+        Updates the existing selectors accordingly
+        (note: selectors aren't synched for now)
+        """
+        selector_obj = self.pool.get('account.mcdb')
+        selector_ids = selector_obj.search(cr, uid, [('model', '=', 'account.move.line')])
+        for selector in selector_obj.browse(cr, uid, selector_ids,
+                                            fields_to_fetch=['partner_id', 'employee_id', 'transfer_journal_id']):
+            partner_ids = employee_ids = transfer_journal_ids = []
+            display_partner = display_employee = display_transfer_journal = False
+            if selector.partner_id:
+                partner_ids = [selector.partner_id.id]
+                display_partner = True
+            if selector.employee_id:
+                employee_ids = [selector.employee_id.id]
+                display_employee = True
+            if selector.transfer_journal_id:
+                transfer_journal_ids = [selector.transfer_journal_id.id]
+                display_transfer_journal = True
+            vals = {
+                # old fields not used anymore: to set to False in any cases
+                'partner_id': False,
+                'employee_id': False,
+                'transfer_journal_id': False,
+                # new fields: to fill in if need be
+                'partner_ids': [(6, 0, partner_ids)],
+                'employee_ids': [(6, 0, employee_ids)],
+                'transfer_journal_ids': [(6, 0, transfer_journal_ids)],
+                # 'display' boolean: to set to True to display the relative section by default in the selector
+                'display_partner': display_partner,
+                'display_employee': display_employee,
+                'display_transfer_journal': display_transfer_journal,
+            }
+            selector_obj.write(cr, uid, selector.id, vals)
+
     # UF9.1
     def change_xml_payment_method(self, cr, uid, *a, **b):
         user_obj = self.pool.get('res.users')