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

[jftempo]

=== modified file 'bin/addons/msf_homere_interface/__openerp__.py'
--- bin/addons/msf_homere_interface/__openerp__.py	2018-10-31 15:29:09 +0000
+++ bin/addons/msf_homere_interface/__openerp__.py	2019-08-02 15:10:27 +0000
@@ -34,6 +34,7 @@
         'hr_view.xml',
         'hr_payroll_view.xml',
         'hr_payroll_wizard.xml',
+        'hr_employee_activation_wizard.xml',
     ],
     "demo_xml" : [],
     "test": [],

=== modified file 'bin/addons/msf_homere_interface/hr.py'
--- bin/addons/msf_homere_interface/hr.py	2019-04-08 14:33:50 +0000
+++ bin/addons/msf_homere_interface/hr.py	2019-08-02 15:10:27 +0000
@@ -256,6 +256,8 @@
         """
         if not ids:
             return True
+        elif isinstance(ids, (int, long)):
+            ids = [ids]
         # Some verifications
         if not context:
             context = {}

=== added file 'bin/addons/msf_homere_interface/hr_employee_activation_wizard.xml'
--- bin/addons/msf_homere_interface/hr_employee_activation_wizard.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_homere_interface/hr_employee_activation_wizard.xml	2019-08-02 15:10:27 +0000
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <!-- Wizard -->
+        <record id="employee_activation_view" model="ir.ui.view">
+            <field name="name">Activate/Deactivate Employees</field>
+            <field name="model">hr.employee.activation</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+            <form string="Activate/Deactivate Employees">
+                <field name="active_status"/>
+                <button icon="gtk-cancel" string="Cancel" special="cancel"/>
+                <button icon="terp-camera_test" string="Approve" name="change_employee_status" type="object" default_focus="1"/>
+            </form>
+            </field>
+        </record>
+
+        <!-- Action in Menu -->
+        <record id="employee_activation_action" model="ir.actions.act_window">
+            <field name="name">Activate/Deactivate Employees</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.employee.activation</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="employee_activation_view"/>
+            <field name="target">new</field>
+        </record>
+        <record model="ir.values" id="employee_activation_values">
+            <field name="model_id" ref="model_hr_employee" />
+            <field name="object" eval="1" />
+            <field name="name">Activate/Deactivate Employees</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('employee_activation_action'))" />
+            <field name="key">action</field>
+            <field name="model">hr.employee</field>
+            <field name="sequence" eval="105"/>
+        </record>
+
+    </data>
+</openerp>

=== modified file 'bin/addons/msf_homere_interface/wizard/__init__.py'
--- bin/addons/msf_homere_interface/wizard/__init__.py	2018-04-19 11:49:43 +0000
+++ bin/addons/msf_homere_interface/wizard/__init__.py	2019-08-02 15:10:27 +0000
@@ -29,5 +29,6 @@
 import hr_expat_import
 import hr_nat_staff_import
 import hr_payment_order
+import hr_employee_activation
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'bin/addons/msf_homere_interface/wizard/hr_employee_activation.py'
--- bin/addons/msf_homere_interface/wizard/hr_employee_activation.py	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_homere_interface/wizard/hr_employee_activation.py	2019-08-02 15:10:27 +0000
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2019 MSF, TeMPO Consulting
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+
+class hr_employee_activation(osv.osv_memory):
+    _name = 'hr.employee.activation'
+    
+    _columns = {
+        'active_status': fields.boolean('Set selected employees as active'),
+    }
+    
+    _defaults = {
+        'active_status': True,
+    }
+    
+    def change_employee_status(self, cr, uid, ids, context=None):
+        """
+        Sets the selected employees to active or inactive
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        employee_obj = self.pool.get('hr.employee')
+        data = self.read(cr, uid, ids, ['active_status'], context=context)[0]
+        for employee_id in context.get('active_ids', []):
+            employee_obj.write(cr, uid, employee_id, {'active': data['active_status']}, context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
+
+hr_employee_activation()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-07-31 14:57:17 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-08-02 15:10:27 +0000
@@ -40334,7 +40334,7 @@
 msgid "Document date"
 msgstr "Date du document"
 
-#. modules: msf_budget, res_currency_functional, account, register_accounting, finance
+#. modules: msf_budget, res_currency_functional, account, register_accounting, finance, msf_homere_interface
 #: view:account.invoice:0
 #: view:account.move:0
 #: view:validate.account.move:0
@@ -40343,6 +40343,7 @@
 #: view:msf.budget:0
 #: view:account.invoice:0
 #: view:activate.currencies:0
+#: view:hr.employee.activation:0
 msgid "Approve"
 msgstr "Approuver"
 
@@ -98178,6 +98179,7 @@
 #: view:wizard.pick.import:0
 #: code:addons/msf_doc_import/purchase_order.py:60
 #: view:wizard.import.product.line:0
+#: view:hr.employee.activation:0
 #: selection:export.report.stock.move,state:0
 #, python-format
 msgid "Cancel"
@@ -107760,3 +107762,14 @@
 #: view:account.invoice:0
 msgid "This invoice will sync to its counterpart instance."
 msgstr "Cette facture sera synchronisée à l'instance de Contrepartie."
+
+#. module: msf_homere_interface
+#: view:hr.employee.activation:0
+#: model:ir.actions.act_window,name:msf_homere_interface.employee_activation_action
+msgid "Activate/Deactivate Employees"
+msgstr "Activer / Désactiver les Employés"
+
+#. module: msf_homere_interface
+#: field:hr.employee.activation,active_status:0
+msgid "Set selected employees as active"
+msgstr "Marquer les employés sélectionnés comme actifs"

=== modified file 'bin/addons/register_accounting/account.py'
--- bin/addons/register_accounting/account.py	2016-08-18 08:32:03 +0000
+++ bin/addons/register_accounting/account.py	2019-08-02 15:10:27 +0000
@@ -67,6 +67,8 @@
     def write(self, cr, uid, ids, vals, context=None):
         if not ids:
             return True
+        elif isinstance(ids, (int, long)):
+            ids = [ids]
         if context is None:
             context = {}