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

[jftempo]

=== modified file 'bin/addons/account/account_report.xml'
--- bin/addons/account/account_report.xml	2018-04-05 12:43:54 +0000
+++ bin/addons/account/account_report.xml	2018-05-04 09:12:47 +0000
@@ -104,6 +104,7 @@
             file="account/report/account_liquidity_balance.mako"
             report_type="webkit"
             string="Liquidity Balance"/>
+<<<<<<< TREE
 
         <!-- Combined Journals Report -->
         <report id="combined_journals_report_xls"
@@ -123,5 +124,34 @@
                 header="True"
                 auto="False"
                 menu="False"/>
+=======
+
+        <!-- Employees Payment Order Report -->
+        <report id="hr_payment_order_report"
+                string="Payment Orders Report"
+                model="hr.payroll.msf"
+                name="hr.payment.order.report"
+                rml="msf_homere_interface/report/hr_payment_order_report.rml"
+                header="True"
+                auto="False"
+                menu="False"/>
+
+        <!-- Combined Journals Report -->
+        <report id="combined_journals_report_xls"
+                string="Combined Journals Report XLS"
+                model="account.mcdb"
+                name="combined.journals.report.xls"
+                file="account_mcdb/report/combined_journals_report.mako"
+                report_type="webkit"
+                header="False"
+                auto="False"
+                menu="False"/>
+        <report id="combined_journals_report_pdf"
+                string="Combined Journals Report PDF"
+                model="account.mcdb"
+                name="combined.journals.report.pdf"
+                rml="account_mcdb/report/combined_journals_report.rml"/>
+
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>

=== modified file 'bin/addons/hr/hr.py'
--- bin/addons/hr/hr.py	2018-03-01 16:08:21 +0000
+++ bin/addons/hr/hr.py	2018-05-04 09:12:47 +0000
@@ -161,7 +161,9 @@
         'coach_id': fields.many2one('hr.employee', 'Coach'),
         'job_id': fields.many2one('hr.job', 'Job', select=True),
         'photo': fields.binary('Photo'),
-        'passport_id':fields.char('Passport No', size=64)
+        'passport_id': fields.char('Passport No', size=64),
+        'contract_start_date': fields.date('Contract Start Date'),
+        'contract_end_date': fields.date('Contract End Date'),
     }
 
     def onchange_address_id(self, cr, uid, ids, address, context=None):

=== modified file 'bin/addons/hr/hr_department_view.xml'
--- bin/addons/hr/hr_department_view.xml	2016-11-04 12:57:37 +0000
+++ bin/addons/hr/hr_department_view.xml	2018-05-04 09:12:47 +0000
@@ -65,6 +65,36 @@
 
        <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_management" sequence="6" />
 
+        <!-- Payment method -->
+        <record id="view_payment_method_tree" model="ir.ui.view">
+            <field name="name">hr.payment.method.tree</field>
+            <field name="model">hr.payment.method</field>
+            <field name="type">tree</field>
+            <field name="priority">14</field>
+            <field name="arch" type="xml">
+                <tree hide_delete_button="1" hide_new_button="1" hide_edit_button="1">
+                    <field name="name"/>
+                </tree>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="view_payment_method_form">
+            <field name="name">hr.payment.method.form</field>
+            <field name="type">form</field>
+            <field name="priority">14</field>
+            <field name="model">hr.payment.method</field>
+            <field name="arch" type="xml">
+                <form string="Payment method" noteditable="1" hide_delete_button="1" hide_new_button="1">
+                    <field name="name"/>
+                </form>
+            </field>
+        </record>
+        <record id="open_payment_method" model="ir.actions.act_window">
+            <field name="name">Payment methods</field>
+            <field name="res_model">hr.payment.method</field>
+            <field name="view_type">form</field>
+        </record>
+        <menuitem action="open_payment_method" id="menu_hr_payment_method" parent="hr.menu_hr_management" sequence="9" />
+
        <record model="ir.ui.view" id="view_users_form_inherit">
             <field name="name">res.users.form</field>
             <field name="type">form</field>

=== modified file 'bin/addons/msf_homere_interface/__init__.py'
--- bin/addons/msf_homere_interface/__init__.py	2012-09-13 16:02:14 +0000
+++ bin/addons/msf_homere_interface/__init__.py	2018-05-04 09:12:47 +0000
@@ -27,5 +27,6 @@
 import hr_job_msf
 import hr_contract_msf
 import wizard
+import report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/msf_homere_interface/hr.py'
--- bin/addons/msf_homere_interface/hr.py	2017-10-27 12:04:12 +0000
+++ bin/addons/msf_homere_interface/hr.py	2018-05-04 09:12:47 +0000
@@ -26,6 +26,23 @@
 from lxml import etree
 from tools.translate import _
 
+
+class hr_payment_method(osv.osv):
+    _name = 'hr.payment.method'
+    _description = 'Payment Method'
+    _columns = {
+        'name': fields.char(size=128, string='Name', required=True, select=1),
+    }
+
+    _order = 'name'
+
+    _sql_constraints = [
+        ('name_uniq', 'UNIQUE(name)', 'The payment method name must be unique.')
+    ]
+
+hr_payment_method()
+
+
 class hr_employee(osv.osv):
     _name = 'hr.employee'
     _inherit = 'hr.employee'
@@ -105,6 +122,9 @@
         'allow_edition': fields.function(_get_allow_edition, method=True, type='boolean', store=False, string="Allow local employee edition?", readonly=True),
         'photo': fields.binary('Photo', readonly=True),
         'ex_allow_edition': fields.function(_get_ex_allow_edition, method=True, type='boolean', store=False, string="Allow expat employee edition?", readonly=True),
+        'payment_method_id': fields.many2one('hr.payment.method', string='Payment Method', required=False),
+        'bank_name': fields.char('Bank Name', size=256, required=False),
+        'bank_account_number': fields.char('Bank Account Number', size=128, required=False),
     }
 
     _defaults = {

=== modified file 'bin/addons/msf_homere_interface/hr_payroll.py'
--- bin/addons/msf_homere_interface/hr_payroll.py	2017-08-09 09:50:40 +0000
+++ bin/addons/msf_homere_interface/hr_payroll.py	2018-05-04 09:12:47 +0000
@@ -395,7 +395,7 @@
         if key == 'action' and key2 == 'client_action_multi' and 'hr.payroll.msf' in [x[0] for x in models]:
             new_act = []
             for v in values:
-                if v[1] == 'action_payroll_deletion':
+                if v[1] in ['action_payroll_deletion', 'action_payment_orders']:
                     # for all Payroll views
                     new_act.append(v)
                 elif context.get('payroll_bs_lines'):

=== modified file 'bin/addons/msf_homere_interface/hr_payroll_wizard.xml'
--- bin/addons/msf_homere_interface/hr_payroll_wizard.xml	2017-10-04 05:23:42 +0000
+++ bin/addons/msf_homere_interface/hr_payroll_wizard.xml	2018-05-04 09:12:47 +0000
@@ -62,6 +62,24 @@
             </field>
         </record>
 
+        <!-- Payment orders Wizard -->
+        <record id="payment_order_wizard" model="ir.ui.view">
+            <field name="name">payment.order.wizard</field>
+            <field name="model">hr.payment.order</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Payment Orders">
+                    <group colspan="4" col="4">
+                        <field name="payment_method_id"/>
+                        <field name="period_id"/>
+                        <button string="Cancel" special="cancel" icon="gtk-cancel" colspan="2"/>
+                        <button name="print_payment_order_report" type="object" string="Print report" icon="gtk-print"
+                                colspan="2"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
         <record id="payroll_employee_import" model="ir.ui.view">
             <field name="name">payroll.employee.import</field>
             <field name="model">hr.payroll.employee.import</field>
@@ -250,6 +268,18 @@
             target="new"
             view_id="payroll_deletion_wizard"/>
 
+        <!-- Payment Orders -->
+        <act_window id="action_payment_orders"
+            name="Payment Orders"
+            res_model="hr.payment.order"
+            src_model="hr.payroll.msf"
+            key2="client_print_multi"
+            view_mode="form"
+            view_type="form"
+            target="new"
+            empty_ids="1"
+            view_id="payment_order_wizard"/>
+
         <!-- Expat Employee Import -->
         <record id="action_expat_employee_import_wizard" model="ir.actions.act_window">
             <field name="name">Import Expats</field>

=== modified file 'bin/addons/msf_homere_interface/hr_view.xml'
--- bin/addons/msf_homere_interface/hr_view.xml	2018-04-10 09:53:54 +0000
+++ bin/addons/msf_homere_interface/hr_view.xml	2018-05-04 09:12:47 +0000
@@ -63,6 +63,14 @@
                             <separator string="Position" colspan="2"/>
                             <field name="job_id" domain="[('state','!=','old')]" attrs="{'readonly': [('employee_type', '=', 'local'), ('allow_edition', '=', False)]}"/>
                             <field name="coach_id" attrs="{'readonly': [('employee_type', '=', 'local'), ('allow_edition', '=', False)]}"/>
+                            <field name="contract_start_date" attrs="{'readonly': ['|', ('employee_type', '=', 'ex'), ('allow_edition', '=', False)]}"/>
+                            <field name="contract_end_date" attrs="{'readonly': ['|', ('employee_type', '=', 'ex'), ('allow_edition', '=', False)]}"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator string="Payment Information" colspan="2"/>
+                            <field name="payment_method_id" attrs="{'readonly': ['|', ('employee_type', '=', 'ex'), ('allow_edition', '=', False)]}"/>
+                            <field name="bank_name" attrs="{'readonly': ['|', ('employee_type', '=', 'ex'), ('allow_edition', '=', False)]}"/>
+                            <field name="bank_account_number" attrs="{'readonly': ['|', ('employee_type', '=', 'ex'), ('allow_edition', '=', False)]}"/>
                         </group>
                     </page>
                     <page string="Categories">

=== added directory 'bin/addons/msf_homere_interface/report'
=== added file 'bin/addons/msf_homere_interface/report/__init__.py'
--- bin/addons/msf_homere_interface/report/__init__.py	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_homere_interface/report/__init__.py	2018-05-04 09:12:47 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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/>.
+#
+##############################################################################
+
+import hr_payment_order_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'bin/addons/msf_homere_interface/report/hr_payment_order_report.py'
--- bin/addons/msf_homere_interface/report/hr_payment_order_report.py	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_homere_interface/report/hr_payment_order_report.py	2018-05-04 09:12:47 +0000
@@ -0,0 +1,123 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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 report import report_sxw
+
+
+class hr_payment_order_report(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context=None):
+        super(hr_payment_order_report, self).__init__(cr, uid, name, context=context)
+        self.context = {}
+        self.payment_method_id = False
+        self.period_id = False
+        self.localcontext.update({
+            'lines': self._get_lines,
+            'period_selected': self._get_period_selected,
+            'payment_method_selected': self._get_payment_method_selected,
+        })
+
+    def _get_period_selected(self):
+        """
+        Returns the name of the period selected or "-"
+        """
+        if not self.period_id:
+            return '-'
+        period_obj = self.pool.get('account.period')
+        period = period_obj.browse(self.cr, self.uid, self.period_id, fields_to_fetch=['name'], context=self.context)
+        return period.name
+
+    def _get_payment_method_selected(self):
+        """
+        Returns the name of the payment method selected or "-"
+        """
+        if not self.payment_method_id:
+            return '-'
+        payment_method_obj = self.pool.get('hr.payment.method')
+        payment_method = payment_method_obj.browse(self.cr, self.uid, self.payment_method_id, fields_to_fetch=['name'],
+                                                   context=self.context)
+        return payment_method.name
+
+    def _get_lines(self):
+        """
+        Returns a list of lines to display in the report, grouped and ordered by employee and currency.
+        Each line contains the employee name, identification number, bank data, and total of the JIs matching the criteria.
+        Employees = LOCAL Staff using the Payment Method selected.
+        JIs = per employee, posted, unreconciled, with a posting date in the period selected if any, booked on an account
+        having the account type "Payables" or "Receivables" (=> internal types are ignored), no matter the journal used.
+        """
+        res = []
+        employee_obj = self.pool.get('hr.employee')
+        account_obj = self.pool.get('account.account')
+        aml_obj = self.pool.get('account.move.line')
+        bg_obj = self.pool.get('memory.background.report')
+        employee_ids = employee_obj.search(self.cr, self.uid, [('employee_type', '=', 'local'),
+                                                               ('payment_method_id', '=', self.payment_method_id)],
+                                           order='name', context=self.context)
+        account_ids = account_obj.search(self.cr, self.uid,
+                                         [('user_type_code', 'in', ['receivables', 'payables'])],
+                                         order='NO_ORDER', context=self.context)
+        dom = [('move_state', '=', 'posted'),
+               ('reconcile_id', '=', False),
+               ('account_id', 'in', account_ids)]
+        if self.period_id:
+            dom.append(('period_id', '=', self.period_id))
+        aml_ids = aml_obj.search(self.cr, self.uid, dom, order='NO_ORDER', context=self.context)
+        current_line_position = 0
+        for employee in employee_obj.read(self.cr, self.uid, employee_ids,
+                                          ['name', 'identification_id', 'bank_name', 'bank_account_number'], context=self.context):
+            current_line_position += 1
+            employee_aml_ids = aml_obj.search(self.cr, self.uid,
+                                              [('id', 'in', aml_ids), ('employee_id', '=', employee['id'])],
+                                              order='currency_id', context=self.context)
+            curr = {}
+            for aml in aml_obj.read(self.cr, self.uid, employee_aml_ids, ['amount_currency', 'currency_id'], context=self.context):
+                if aml['currency_id'] and len(aml['currency_id']) == 2:
+                    if aml['currency_id'][1] not in curr:
+                        curr[aml['currency_id'][1]] = 0.0
+                    curr[aml['currency_id'][1]] += aml['amount_currency'] or 0.0
+            for c in curr:
+                employee_dict = {
+                    'employee_name': employee['name'],
+                    'employee_id': employee['identification_id'] or '',
+                    'bank_name': employee['bank_name'] or '',
+                    'bank_account_number': employee['bank_account_number'] or '',
+                    'net_to_pay': curr[c],
+                    'currency': c,
+                }
+                res.append(employee_dict)
+            bg_obj.compute_percent(self.cr, self.uid, current_line_position, len(employee_ids), context=self.context)
+        return res
+
+    def set_context(self, objects, data, ids, report_type=None):
+        """
+        Retrieves the Payment method & period selected
+        """
+        self.context = data.get('context', {})
+        self.payment_method_id = data.get('payment_method_id')
+        self.period_id = data.get('period_id', False)
+        return super(hr_payment_order_report, self).set_context(objects, data, ids, report_type)
+
+
+report_sxw.report_sxw('report.hr.payment.order.report', 'hr.payroll.msf',
+                      'addons/msf_homere_interface/report/payment_order_report.rml', parser=hr_payment_order_report,
+                      header='internal')
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'bin/addons/msf_homere_interface/report/hr_payment_order_report.rml'
--- bin/addons/msf_homere_interface/report/hr_payment_order_report.rml	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_homere_interface/report/hr_payment_order_report.rml	2018-05-04 09:12:47 +0000
@@ -0,0 +1,116 @@
+<?xml version="1.0"?>
+<document filename="payment_orders_report.pdf">
+
+  <template pageSize="(595.0,842.0)" title="Payment Orders Report" author="Medecins Sans Frontieres" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+    </pageTemplate>
+  </template>
+
+  <stylesheet>
+    <blockTableStyle id="Table_Company_Name">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="7.0" leading="10" alignment="CENTER"/>
+    <blockTableStyle id="TableHeader">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="#000000" start="0,0" stop="-1,0"/>
+      <lineStyle kind="OUTLINE" colorName="black" start="0,0" stop="1,1"/>
+      <lineStyle kind="INNERGRID" colorName="gray" start="0,1" stop="1,-1" thickness="0.5"/>
+      <blockBackground colorName="#e6e6e6" start="0,0" stop="-1,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="TableData">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="GRID" colorName="#000000" start="0,0" stop="-1,0"/>
+      <lineStyle kind="OUTLINE" colorName="black" start="0,0" stop="5,-1"/>
+      <lineStyle kind="INNERGRID" colorName="gray" start="0,1" stop="5,-1" thickness="0.5"/>
+      <blockBackground colorName="#e6e6e6" start="0,0" stop="-1,0"/>
+    </blockTableStyle>
+  </stylesheet>
+
+  <story>
+
+    <blockTable colWidths="540.0" style="Table_Company_Name">
+      <tr>
+        <td>
+          <para style="terp_header_Centre">Payment Orders</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+
+    <blockTable colWidths="270.0,270.0" style="TableHeader">
+        <tr>
+          <td><parawrap style="terp_tblheader_General_Centre">Payment Method</parawrap></td>
+          <td><parawrap style="terp_tblheader_General_Centre">Period</parawrap></td>
+        </tr>
+        <tr>
+          <td><parawrap style="terp_default_Centre_8">[[ payment_method_selected() ]]</parawrap></td>
+          <td><parawrap style="terp_default_Centre_8">[[ period_selected() ]]</parawrap></td>
+        </tr>
+    </blockTable>
+
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+
+    <blockTable style="TableData" colWidths="90.0,90.0,90.0,90.0,90.0,90.0">
+      <tr>
+        <td>
+          <parawrap style="P3">Employee Name</parawrap>
+        </td>
+        <td>
+          <parawrap style="P3">Employee ID</parawrap>
+        </td>
+        <td>
+          <parawrap style="P3">Bank Name</parawrap>
+        </td>
+        <td>
+          <parawrap style="P3">Bank Account Number</parawrap>
+        </td>
+        <td>
+          <parawrap style="P3">Net to Pay</parawrap>
+        </td>
+        <td>
+          <parawrap style="P3">Currency</parawrap>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P3">[[ repeatIn(lines(), 'line') ]]</para>
+          <parawrap style="P3">[[ line['employee_name'] ]]</parawrap>
+        </td>
+        <td>
+          <parawrap style="P3">[[ line['employee_id'] ]]</parawrap>
+        </td>
+        <td>
+          <parawrap style="P3">[[ line['bank_name'] ]]</parawrap>
+        </td>
+        <td>
+          <parawrap style="P3">[[ line['bank_account_number'] ]]</parawrap>
+        </td>
+        <td>
+          <parawrap style="P3">[[ formatLang(line['net_to_pay'] or 0.0) ]]</parawrap>
+        </td>
+        <td>
+          <parawrap style="P3">[[ line['currency'] ]]</parawrap>
+        </td>
+      </tr>
+    </blockTable>
+
+  </story>
+</document>

=== modified file 'bin/addons/msf_homere_interface/wizard/__init__.py'
--- bin/addons/msf_homere_interface/wizard/__init__.py	2012-12-04 16:12:51 +0000
+++ bin/addons/msf_homere_interface/wizard/__init__.py	2018-05-04 09:12:47 +0000
@@ -28,5 +28,6 @@
 import hr_payroll_deletion
 import hr_expat_import
 import hr_nat_staff_import
+import hr_payment_order
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'bin/addons/msf_homere_interface/wizard/hr_payment_order.py'
--- bin/addons/msf_homere_interface/wizard/hr_payment_order.py	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_homere_interface/wizard/hr_payment_order.py	2018-05-04 09:12:47 +0000
@@ -0,0 +1,66 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2018 TeMPO Consulting, MSF. All Rights Reserved
+#
+#    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 osv
+from osv import fields
+
+
+class hr_payment_order(osv.osv_memory):
+    _name = 'hr.payment.order'
+    _description = 'Payment Orders'
+
+    _columns = {
+        'payment_method_id': fields.many2one('hr.payment.method', string='Payment Method', required=True),
+        'period_id': fields.many2one('account.period', string='Period', required=False, domain="[('number', '!=', 0)]"),
+    }
+
+    def print_payment_order_report(self, cr, uid, ids, context=None):
+        """
+        Generates the Payment Orders report
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        bg_obj = self.pool.get('memory.background.report')
+        wiz = self.browse(cr, uid, ids[0], context=context)
+        data = {
+            'payment_method_id': wiz.payment_method_id.id,
+            'period_id': wiz.period_id and wiz.period_id.id or False,
+        }
+        # make the report run in background
+        report_name = 'hr.payment.order.report'
+        background_id = bg_obj.create(cr, uid, {'file_name': 'Payment Orders Report',
+                                                'report_name': report_name}, context=context)
+        context['background_id'] = background_id
+        context['background_time'] = 2
+        data['context'] = context
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': report_name,
+            'datas': data,
+            'context': context,
+        }
+
+
+hr_payment_order()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/msf_homere_interface/wizard/hr_payroll_employee_import.py'
--- bin/addons/msf_homere_interface/wizard/hr_payroll_employee_import.py	2018-03-01 16:08:21 +0000
+++ bin/addons/msf_homere_interface/wizard/hr_payroll_employee_import.py	2018-05-04 09:12:47 +0000
@@ -285,6 +285,7 @@
         updated = 0
         if context is None:
             context = {}
+        payment_method_obj = self.pool.get('hr.payment.method')
         if not employee_data or not wizard_id:
             message = _('No data found for this line: %s.') % line_number
             self.pool.get('hr.payroll.employee.import.errors').create(cr, uid, {'wizard_id': wizard_id, 'msg': message})
@@ -310,6 +311,9 @@
             statutfamilial = employee_data.get('statutfamilial', False)
             tel_bureau = employee_data.get('tel_bureau', False)
             tel_prive = employee_data.get('tel_prive', False)
+            bqmodereglement = employee_data.get('bqmodereglement', False)
+            bqnom = employee_data.get('bqnom', False)
+            bqnumerocompte = employee_data.get('bqnumerocompte', False)
         except ValueError, e:
             raise osv.except_osv(_('Error'), _('The given file is probably corrupted!\n%s') % (e))
         # Process data
@@ -356,10 +360,23 @@
                 'mobile_phone': portable or False,
                 'work_phone': tel_bureau or False,
                 'private_phone': tel_prive or False,
+                'bank_name': bqnom,
+                'bank_account_number': bqnumerocompte,
             }
             # Update Birthday if equal to 0000-00-00
             if datenaissance and datenaissance == '0000-00-00':
                 vals.update({'birthday': False,})
+
+            # Update the payment method
+            payment_method_id = False
+            if bqmodereglement:
+                payment_method_ids = payment_method_obj.search(cr, uid, [('name', '=', bqmodereglement)], limit=1, context=context)
+                if payment_method_ids:
+                    payment_method_id = payment_method_ids[0]
+                else:
+                    payment_method_id = payment_method_obj.create(cr, uid, {'name': bqmodereglement}, context=context)
+            vals.update({'payment_method_id': payment_method_id})
+
             # Update Nationality
             if nation:
                 n_ids = self.pool.get('res.country').search(cr, uid, [('code', '=', ustr(nation))])
@@ -414,6 +431,9 @@
                 # Check job
                 if contract.job_id:
                     vals.update({'job_id': contract.job_id.id})
+                # Check the contract dates
+                vals.update({'contract_start_date': contract.date_start or False})
+                vals.update({'contract_end_date': contract.date_end or False})
             # Desactivate employee if no current contract
             if not current_contract:
                 vals.update({'active': False})

=== modified file 'bin/addons/msf_profile/data/patches.xml'
=== 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-04 09:12:47 +0000
@@ -22069,6 +22069,7 @@
 #: report:addons/account/report/account_liquidity_balance.mako:162
 #: field:cash.request,name:0
 #: field:msf.instance.cloud,name:0
+#: field:hr.payment.method,name:0
 #: report:addons/account_override/report/account_chart_export.mako:136
 #: report:addons/analytic_distribution/report/report_account_analytic_chart_export.mako:146
 #: report:addons/mission_stock/report/stock_mission_report_xls.mako:50
@@ -25959,6 +25960,8 @@
 #: field:wizard.register.creation,period_id:0
 #: field:wizard.register.creation.lines,period_id:0
 #: field:wizard.register.import.lines,period_id:0
+#: field:hr.payment.order,period_id:0
+#: report:hr.payment.order.report:0
 #, python-format
 msgid "Period"
 msgstr "Période"
@@ -56840,10 +56843,12 @@
 msgid "ESC Message 1"
 msgstr "ESC Message 1"
 
-#. modules: hr, account, register_accounting
+#. modules: hr, account, register_accounting, msf_homere_interface
 #: field:account.journal,bank_account_number:0
 #: field:hr.employee,bank_account_id:0
 #: field:account.bank.statement,bank_account_number:0
+#: field:hr.employee,bank_account_number:0
+#: report:hr.payment.order.report:0
 msgid "Bank Account Number"
 msgstr "Numéro de Compte Bancaire"
 
@@ -58877,9 +58882,13 @@
 msgid "Inventory counter Name"
 msgstr "Responsable Inventaire"
 
-#. module: account_payment
+#. modules: account_payment, msf_homere_interface
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
 #: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form
+#: view:hr.payment.order:0
+#: model:ir.actions.act_window,name:msf_homere_interface.action_payment_orders
+#: model:ir.model,name:msf_homere_interface.model_hr_payment_order
+#: report:hr.payment.order.report:0
 msgid "Payment Orders"
 msgstr "Ordres de Paiement"
 
@@ -58948,11 +58957,12 @@
 msgid "Logistic"
 msgstr "Logistique"
 
-#. modules: msf_doc_import, account, consumption_calculation
+#. modules: msf_doc_import, account, consumption_calculation, msf_homere_interface
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:weekly.forecast.report:0
 #: view:wizard.import.in.simulation.screen:0
 #: view:wizard.import.po.simulation.screen:0
+#: view:hr.payment.order:0
 msgid "Print report"
 msgstr "Imprimer Rapport"
 
@@ -100318,6 +100328,7 @@
 #: view:ocp.matching.export.wizard:0
 #: view:wizard.hq.report.oca:0
 #: view:wizard.import.mapping:0
+#: view:hr.payment.order:0
 #, python-format
 msgid "Cancel"
 msgstr "Annuler"
@@ -106115,7 +106126,7 @@
 msgid "Price in functional currency"
 msgstr "Prix dans la devise fonctionnelle"
 
-#. modules: purchase_followup, finance
+#. modules: purchase_followup, finance, msf_homere_interface
 #: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:242
 #: field:cash.request.expense,currency_id:0
 #: view:cash.request.liquidity.bank:0
@@ -106123,6 +106134,7 @@
 #: view:cash.request.liquidity.cheque:0
 #: field:cash.request.total.transfer.line,currency_id:0
 #: field:cash.request.transfer.currency,currency_id:0
+#: report:hr.payment.order.report:0
 msgid "Currency"
 msgstr "Devise"
 
@@ -107561,6 +107573,7 @@
 #, python-format
 msgid "You have to load the template first."
 msgstr "Vous devez d'abord charger le modèle."
+<<<<<<< TREE
 
 #. module: account_corrections
 #: code:addons/account_corrections/account_move_line.py:929
@@ -107673,3 +107686,125 @@
 #: 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: hr
+#: field:hr.employee,contract_start_date:0
+msgid "Contract Start Date"
+msgstr "Date de Début de Contrat"
+
+#. module: hr
+#: field:hr.employee,contract_end_date:0
+msgid "Contract End Date"
+msgstr "Date de Fin de Contrat"
+
+#. module: msf_homere_interface
+#: field:hr.employee,payment_method_id:0
+#: field:hr.payment.order,payment_method_id:0
+#: model:ir.model,name:msf_homere_interface.model_hr_payment_method
+#: report:hr.payment.order.report:0
+msgid "Payment Method"
+msgstr "Mode de Paiement"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_payment_method
+#: model:ir.ui.menu,name:hr.menu_hr_payment_method
+msgid "Payment methods"
+msgstr "Modes de paiement"
+
+#. module: hr
+#: view:hr.payment.method:0
+msgid "Payment method"
+msgstr "Mode de paiement"
+
+#. module: msf_homere_interface
+#: sql_constraint:hr.payment.method:0
+msgid "The payment method name must be unique."
+msgstr "Le nom du mode de paiement doit être unique."
+
+#. module: msf_homere_interface
+#: report:hr.payment.order.report:0
+msgid "Employee Name"
+msgstr "Nom de l'Employé"
+
+#. module: msf_homere_interface
+#: report:hr.payment.order.report:0
+msgid "Employee ID"
+msgstr "ID de l'Employé"
+
+#. module: msf_homere_interface
+#: report:hr.payment.order.report:0
+msgid "Net to Pay"
+msgstr "Net à Payer"
+
+#. module: msf_homere_interface
+#: field:hr.employee,bank_name:0
+#: report:hr.payment.order.report:0
+msgid "Bank Name"
+msgstr "Nom de la Banque"
+
+#. module: account_mcdb
+#: report:addons/account_mcdb/report/combined_journals_report.mako:8
+#: report:addons/account_mcdb/report/combined_journals_report.mako:126
+#: report:combined.journals.report.pdf:0
+#: model:ir.actions.act_window,name:account_mcdb.action_account_mcdb_combined_form
+#: model:ir.ui.menu,name:account_mcdb.menu_finance_mcdb_combined_line
+msgid "Combined Journals Report"
+msgstr "Rapport des Journaux Agrégés"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.combined_journals_report_pdf
+msgid "Combined Journals Report PDF"
+msgstr "Rapport des Journaux Agrégés PDF"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.combined_journals_report_xls
+msgid "Combined Journals Report XLS"
+msgstr "Rapport des Journaux Agrégés XLS"
+
+#. module: account_mcdb
+#: selection:account.mcdb,model:0
+msgid "Both Journal Items and Analytic Journal Items"
+msgstr "À la fois les Lignes d'Ecritures Comptables et les Lignes d'Ecritures Analytiques"
+
+#. module: account_mcdb
+#: report:addons/account_mcdb/report/combined_journals_report.mako:230
+#: report:combined.journals.report.pdf:0
+msgid "Cost Centre"
+msgstr "Centre de Coût"
+
+#. module: account_mcdb
+#: report:combined.journals.report.pdf:0
+msgid "Total Booking"
+msgstr "Total Devise d'Enreg."
+
+#. module: account_mcdb
+#: report:combined.journals.report.pdf:0
+msgid "Total Func."
+msgstr "Total Devise Fonc."
+
+#. module: account_mcdb
+#: view:account.mcdb:0
+#: code:addons/account_mcdb/account_mcdb.py:609
+#: code:addons/account_mcdb/account_mcdb.py:665
+#, python-format
+msgid "Selector - Combined Journals Report"
+msgstr "Sélecteur - Rapport des Journaux Agrégés"
+
+#. module: account_mcdb
+#: report:addons/account_mcdb/report/combined_journals_report.mako:173
+#: report:combined.journals.report.pdf:0
+msgid "COMBINED JOURNALS REPORT"
+msgstr "RAPPORT DES JOURNAUX AGRÉGÉS"
+
+#. module: account_mcdb
+#: code:addons/account_mcdb/report/combined_journals_report.py:273
+#, python-format
+msgid "Selector not found."
+msgstr "Sélecteur non trouvé."
+
+#. module: account_mcdb
+#: report:addons/account_mcdb/report/combined_journals_report.mako:181
+msgid "SELECTION"
+msgstr "SÉLECTION"
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/msf_profile/msf_profile.py'
=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2018-04-27 09:58:55 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2018-05-04 09:12:47 +0000
@@ -62,12 +62,18 @@
 msf_sync_data_server.intermission_partner,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"['|', ('active', '=', ''), ('active', '!=', ''),('partner_type' , '=' , 'intermission')]","['customer', 'manufacturer', 'name', 'partner_type', 'property_account_payable/id', 'property_account_receivable/id', 'ref', 'supplier', 'transporter']",OC,res.partner,,Intermission Partner,Valid,"{'customer': True, 'supplier': True, 'active': False}",320
 msf_sync_data_server.intermission_partner_tree,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"['|', ('active', '=', ''), ('active', '!=', ''),('partner_type' , '=' , 'intermission'), ('parent_id', '!=', '')]",['parent_id/id'],OC,res.partner,,Intermission Partner Tree,Valid,,321
 msf_sync_data_server.intermission_partner_address,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"['|', ('active', '=', ''), ('active', '!=', ''),('partner_id' , 'in' , ('res.partner' , 'id' , [('partner_type' , '=' , 'intermission')]))]","['active', 'city', 'country_id/id', 'email', 'fax', 'function', 'mobile', 'name', 'partner_id/id', 'phone', 'state_id/id', 'street', 'street2', 'title/id', 'type', 'zip']",OC,res.partner.address,,Intermission Partner Address,Valid,,322
+msf_sync_data_server.payment_method,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,"[]","['name']",HQ + MISSION,hr.payment.method,,Payment Method,Valid,,328
 msf_sync_data_server.job_description,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,[],"['code', 'description', 'expected_employees', 'name', 'requirements', 'state']",HQ + MISSION,hr.job,,Job Description,Valid,,330
 msf_sync_data_server.expatriate_employees,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('employee_type','=','ex'),('name','!=','Administrator')]","['active', 'birthday', 'code', 'cost_center_id/id', 'country_id/id', 'destination_id/id','employee_type', 'filter_for_third_party', 'free1_id/id', 'free2_id/id', 'funding_pool_id/id', 'gender', 'homere_codeterrain', 'homere_id_staff', 'homere_id_unique', 'identification_id', 'job_id/id', 'marital/id', 'mobile_phone', 'name', 'name_resource', 'notes', 'passport_id', 'private_phone', 'resource_type', 'sinid', 'ssnid', 'work_email', 'work_location', 'work_phone']",HQ + MISSION,hr.employee,,Expatriate Employees,Valid,,331
 msf_sync_data_server.expatriate_employees_tree,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,"[('parent_id', '!=', '')]",['parent_id/id'],HQ + MISSION,hr.employee,,Expatriate Employees Tree,Valid,,332
 msf_sync_data_server.expatriate_employees_coach,FALSE,TRUE,FALSE,FALSE,bidirectional,Bidirectional,"[('coach_id', '!=', '')]",['coach_id/id'],HQ + MISSION,hr.employee,,Expatriate Employees Coach,Valid,,334
+<<<<<<< TREE
 msf_sync_data_server.local_employees,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,"[('employee_type','=','local'),('name','!=','Administrator')]","['birthday', 'code', 'cost_center_id/id', 'destination_id/id', 'employee_type', 'filter_for_third_party', 'free1_id/id', 'free2_id/id', 'funding_pool_id/id', 'gender', 'homere_codeterrain', 'homere_id_staff', 'homere_id_unique', 'identification_id', 'job_id/id', 'marital/id', 'mobile_phone', 'name', 'name_resource', 'notes', 'passport_id', 'private_phone', 'resource_type', 'sinid', 'ssnid', 'work_email', 'work_location', 'work_phone']",HQ + MISSION,hr.employee,,Local Employees,Valid,"{'active': False}",335
 msf_sync_data_server.register,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,"[('state','!=','draft'),('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')]))]","['balance_end_real', 'balance_start', 'closing_date', 'comments', 'date', 'instance_id/id', 'journal_id/id', 'name', 'notes', 'open_advance_amount', 'period_id/id','closing_balance_frozen','closing_balance_frozen_date','unrecorded_expenses_amount', 'register_closed_by']",MISSION,account.bank.statement,instance_id,Register,Valid,,400
+=======
+msf_sync_data_server.local_employees,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,"[('employee_type','=','local'),('name','!=','Administrator')]","['birthday', 'code', 'cost_center_id/id', 'destination_id/id', 'employee_type', 'filter_for_third_party', 'free1_id/id', 'free2_id/id', 'funding_pool_id/id', 'gender', 'homere_codeterrain', 'homere_id_staff', 'homere_id_unique', 'identification_id', 'job_id/id', 'marital/id', 'mobile_phone', 'name', 'name_resource', 'notes', 'passport_id', 'private_phone', 'resource_type', 'sinid', 'ssnid', 'work_email', 'work_location', 'work_phone', 'contract_start_date', 'contract_end_date', 'payment_method_id/id', 'bank_name', 'bank_account_number']",HQ + MISSION,hr.employee,,Local Employees,Valid,"{'active': False}",335
+msf_sync_data_server.register,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,"[('state','!=','draft'),('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')]))]","['balance_end_real', 'balance_start', 'closing_date', 'comments', 'date', 'instance_id/id', 'journal_id/id', 'name', 'notes', 'open_advance_amount', 'period_id/id','closing_balance_frozen','closing_balance_frozen_date','unrecorded_expenses_amount']",MISSION,account.bank.statement,instance_id,Register,Valid,,400
+>>>>>>> MERGE-SOURCE
 msf_sync_data_server.register_line,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')])),('statement_id','in',('account.bank.statement','id',[('state','!=','draft')])),'!',('state','=','draft')]","['account_id/id', 'amount_in', 'amount_out', 'analytic_distribution_id/id', 'cheque_number', 'date', 'direct_invoice', 'direct_state', 'document_date', 'employee_id/id', 'instance_id/id', 'name', 'note', 'partner_id/id', 'reconciled', 'ref', 'sequence', 'statement_id/id', 'transfer_amount','transfer_journal_id/id', 'type', 'from_cash_return']",MISSION,account.bank.statement.line,instance_id,Register Line,Valid,,401
 msf_sync_data_server.register_cashbox_line_starting,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')])),('starting_id','in',('account.bank.statement','id',[('state','!=','draft')])),('starting_id', '!=', ''),('ending_id', '=', '')]","['instance_id/id', 'number', 'pieces', 'starting_id/id']",MISSION,account.cashbox.line,instance_id,Register Cashbox Line (starting),Valid,,402
 msf_sync_data_server.register_status,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,"[('state','!=','draft'),('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')]))]","['instance_id/id', 'state']",MISSION,account.bank.statement,instance_id,Register Status,Valid,,403

=== modified file 'bin/addons/sync_common/common.py'
--- bin/addons/sync_common/common.py	2018-03-22 16:09:20 +0000
+++ bin/addons/sync_common/common.py	2018-05-04 09:12:47 +0000
@@ -160,6 +160,7 @@
     'cash.request.liquidity.bank',
     'cash.request.liquidity.cheque',
     'cash.request.liquidity.total',
+    'hr.payment.method',
 ]
 
 OC_LIST = ['OCA', 'OCB', 'OCBA', 'OCG', 'OCP']