From 76f9a9005b2043a5c925b05e3c1f7966cdfcae09 Mon Sep 17 00:00:00 2001 From: Sandy Carter Date: Mon, 29 Sep 2014 08:58:10 -0400 Subject: [PATCH 1/4] Fix travis to work with new quality tools --- .travis.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index a12d03c9031..47b90b76e18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,26 +3,27 @@ language: python python: - "2.7" +env: + - VERSION="7.0" ODOO_REPO="odoo/odoo" + - VERSION="7.0" ODOO_REPO="OCA/OCB" + - VERSION="7.0" UNIT_TEST="1" + virtualenv: system_site_packages: true before_install: - - git clone https://github.com/OCA/maintainer-quality-tools.git /tmp/maintainer-quality-tools - - export PATH=/tmp/maintainer-quality-tools/travis:$PATH - - travis_install_nightly 7.0 + - git clone https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools + - export PATH=${HOME}/maintainer-quality-tools/travis:$PATH + - travis_install_nightly - sudo apt-get update - sudo apt-get install openoffice.org python-genshi python-cairo python-openoffice python-lxml python-uno - sudo apt-get install zip - - bzr branch lp:aeroolib /tmp/aeroolib - - bzr branch lp:aeroo /tmp/aeroo - - pushd /tmp/aeroolib/aeroolib; sudo python setup.py install; popd + - bzr branch lp:aeroolib ${HOME}/aeroolib + - bzr branch lp:aeroo ${HOME}/aeroo + - pushd ${HOME}/aeroolib/aeroolib; sudo python setup.py install; popd -install: - - pip install coveralls flake8 - script: - - travis_run_flake8 - - travis_run_tests 7.0 /tmp/aeroo + - travis_run_tests after_success: - coveralls + - coveralls From 06d1b28394f23bb46e66699a3500d4027e0f420f Mon Sep 17 00:00:00 2001 From: Sandy Carter Date: Mon, 29 Sep 2014 09:31:28 -0400 Subject: [PATCH 2/4] Add access rules for weekday --- hr_schedule/security/ir.model.access.csv | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hr_schedule/security/ir.model.access.csv b/hr_schedule/security/ir.model.access.csv index b4cad4e1d52..04421f5dd36 100644 --- a/hr_schedule/security/ir.model.access.csv +++ b/hr_schedule/security/ir.model.access.csv @@ -17,3 +17,6 @@ access_hr_schedule_template_worktime_manager,access_hr_schedule_template_worktim access_hr_schedule_alert_hruser,access_hr_schedule_alert,model_hr_schedule_alert,base.group_hr_user,1,1,1,1 access_hr_schedule_alert_manager,access_hr_schedule_alert,model_hr_schedule_alert,base.group_hr_manager,1,1,1,1 access_hr_schedule_alert_rule_manager,access_hr_schedule_alert,model_hr_schedule_alert_rule,base.group_hr_manager,1,1,1,1 +access_hr_schedule_weekday_user,access_hr_schedule_weekday,model_hr_schedule_weekday,base.group_user,1,0,0,0 +access_hr_schedule_weekday_hruser,access_hr_schedule_weekday,model_hr_schedule_weekday,base.group_hr_user,1,1,1,1 +access_hr_schedule_weekday_manager,access_hr_schedule_weekday,model_hr_schedule_weekday,base.group_hr_manager,1,1,1,1 From 00d54f9551b633be1269e75ea1b9fec9b06c73d0 Mon Sep 17 00:00:00 2001 From: Sandy Carter Date: Mon, 29 Sep 2014 10:02:26 -0400 Subject: [PATCH 3/4] Remove access right dependent on non-declared dependency --- hr_payroll_period/security/ir.model.access.csv | 1 - 1 file changed, 1 deletion(-) diff --git a/hr_payroll_period/security/ir.model.access.csv b/hr_payroll_period/security/ir.model.access.csv index 5fa9e34baeb..b6705f82804 100644 --- a/hr_payroll_period/security/ir.model.access.csv +++ b/hr_payroll_period/security/ir.model.access.csv @@ -32,4 +32,3 @@ access_hr_payroll_register_pm,access_hr_payroll_register,hr_payroll_register.mod access_hr_attendance_pm,access_hr_attendance,hr_attendance.model_hr_attendance,hr_security.group_payroll_manager,1,0,0,0 access_hr_holidays_pm,access_hr_holidays,hr_holidays.model_hr_holidays,hr_security.group_payroll_manager,1,0,0,0 access_hr_holidays_status_pm,access_hr_holidays,hr_holidays.model_hr_holidays_status,hr_security.group_payroll_manager,1,0,0,0 -access_hr_employee_children_pm,hr.employee.children_pm,hr_family.model_hr_employee_children,hr_security.group_payroll_manager,1,0,0,0 From be12ba84d325bf2c25daa2bf38ce70772973b512 Mon Sep 17 00:00:00 2001 From: Sandy Carter Date: Mon, 29 Sep 2014 10:23:06 -0400 Subject: [PATCH 4/4] Fix missing dependencies for hr.contract --- hr_job_categories/__openerp__.py | 2 +- hr_job_hierarchy/__openerp__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hr_job_categories/__openerp__.py b/hr_job_categories/__openerp__.py index 8fb5b5de7ff..97d3730e3c7 100644 --- a/hr_job_categories/__openerp__.py +++ b/hr_job_categories/__openerp__.py @@ -36,7 +36,7 @@ 'author': 'Michael Telahun Makonnen ', 'website': 'http://miketelahun.wordpress.com', 'depends': [ - 'hr', + 'hr_contract', ], 'data': [ 'hr_view.xml', diff --git a/hr_job_hierarchy/__openerp__.py b/hr_job_hierarchy/__openerp__.py index bb9b112bcdd..73b4cf3d8ff 100644 --- a/hr_job_hierarchy/__openerp__.py +++ b/hr_job_hierarchy/__openerp__.py @@ -38,7 +38,7 @@ 'author': 'Michael Telahun Makonnen ', 'website': 'http://miketelahun.wordpress.com', 'depends': [ - 'hr', + 'hr_contract', ], 'data': [ 'hr_view.xml',