Merge 8582221 into 6be3a73

hr_attendance_computation/__openerp__.py

@@ -23,7 +23,6 @@
         "views/res_company_views.xml",
         "views/hr_attendance_views.xml",
         "views/resource_calendar_views.xml",
-        "views/resource_calendar_attendance_views.xml",
     ],
     "demo": [
         "demo/hr_attendance_demo.xml",

hr_attendance_import_from_machine/__openerp__.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Copyright 2018 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# pylint: disable=locally-disabled, manifest-required-author
 {
     "name": "Import Attendance Data From Machine",
     "version": "8.0.1.0.0",

hr_attendance_import_from_machine/wizards/hr_attendance_import.py

@@ -62,7 +62,7 @@ def get_csv_detail(self):
                     }
             return dict_field
         else:
-            raise UserError("No CSV Details")
+            raise UserError(_("No CSV Details"))
 
     @api.multi
     def check_employee_code(self, row, column):
@@ -140,9 +140,8 @@ def check_sign_in_out(
         try:
             sign_in_out = row[column]
         except:
-            return True,
-            "Invalid Sign In/Out Column "
-            "on line %s" % (str(line_num))
+            err_msg = "Invalid Sign In/Out Column on line %s" % (str(line_num))
+            return True, err_msg
 
         if sign_in_out == sign_in_code:
             return False, 1

hr_holiday_code/__openerp__.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Copyright 2018 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# pylint: disable=locally-disabled, manifest-required-author
 {
     "name": "HR Holiday Code",
     "version": "8.0.1.0.0",

hr_holiday_code/hooks.py

@@ -35,6 +35,7 @@ def assign_old_sequences(cr, registry):
             cr, SUPERUSER_ID, criteria_lvr, order="id")
 
     for lvr in lvr_ids:
+        # pylint: disable=locally-disabled, sql-injection
         cr.execute("UPDATE hr_holidays "
                    "SET holiday_code = '%s' "
                    "WHERE id = %d;" %
@@ -50,6 +51,7 @@ def assign_old_sequences(cr, registry):
             cr, SUPERUSER_ID, criteria_alr, order="id")
 
     for alr in alr_ids:
+        # pylint: disable=locally-disabled, sql-injection
         cr.execute("UPDATE hr_holidays "
                    "SET holiday_code = '%s' "
                    "WHERE id = %d;" %

hr_job_family_modelling/__openerp__.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
-# © 2016 OpenSynergy Indonesia
+# Copyright 2016 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+# pylint: disable=locally-disabled, manifest-required-author
 {
     "name": "Job Family Modelling",
     "summary": "Grading system that divides jobs into coherent groups "

hr_payslip_import_input/__init__.py

@@ -3,4 +3,4 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import models
-from . import wizards
+from . import wizards

hr_payslip_import_input/__openerp__.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Copyright 2017 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# pylint: disable=locally-disabled, manifest-required-author
 {
     "name": "Import Other Inputs From Payslip Batches",
     "version": "8.0.1.0.0",

hr_payslip_import_input/models/__init__.py

@@ -4,4 +4,4 @@
 
 from . import hr_payslip_process_line
 from . import hr_payslip_imported_line
-from . import hr_payroll_run
+from . import hr_payroll_run

hr_payslip_import_input/tests/test_import.py

@@ -105,8 +105,8 @@ def _create_structure(self):
     def _create_contract_1(self):
         vals = {
             'name': 'Contract 1',
-            'date_start': time.strftime('%Y-%m')+'-1',
-            'date_end': time.strftime('%Y')+'-12-31',
+            'date_start': time.strftime('%Y-%m') + '-1',
+            'date_end': time.strftime('%Y') + '-12-31',
             'wage': 7500000.0,
             'type_id': self.type.id,
             'employee_id': self.employee_1.id,
@@ -120,8 +120,8 @@ def _create_contract_1(self):
     def _create_contract_2(self):
         vals = {
             'name': 'Contract 2',
-            'date_start': time.strftime('%Y-%m')+'-1',
-            'date_end': time.strftime('%Y')+'-12-31',
+            'date_start': time.strftime('%Y-%m') + '-1',
+            'date_end': time.strftime('%Y') + '-12-31',
             'wage': 7500000.0,
             'type_id': self.type.id,
             'employee_id': self.employee_2.id,
@@ -185,7 +185,7 @@ def test_import_data(self):
              }
         )
 
-        msg_error_2 = ("Not 'employee' or 'code' or 'amount' keys found")
+        msg_error_2 = ("Not employee or code or amount keys found")
         with self.assertRaises(UserError) as error:
             wiz.import_data()
 

hr_payslip_import_input/wizards/__init__.py

@@ -2,4 +2,4 @@
 # Copyright 2017 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from . import hr_payslip_import_input
+from . import hr_payslip_import_input