From a3f3a0db682f5e13f502ee2686846d5bd02cc50a Mon Sep 17 00:00:00 2001 From: Martin Geubelle Date: Thu, 21 May 2015 10:27:45 +0200 Subject: [PATCH] [IMP] hr, hr_*, project, sale, sales_team, stock: in dashboards, add color picker, add domains on reports and style improvements --- addons/hr/hr_dashboard.xml | 10 +- addons/hr/static/src/less/hr_dashboard.less | 8 +- addons/hr_attendance/hr_attendance.py | 1 + addons/hr_attendance/hr_attendance_view.xml | 13 ++ addons/hr_attendance/hr_dashboard.xml | 2 +- addons/hr_evaluation/hr_dashboard.xml | 2 +- .../report/hr_evaluation_report_view.xml | 16 ++ addons/hr_expense/hr_dashboard.xml | 2 +- .../report/hr_expense_report_view.xml | 15 ++ addons/hr_holidays/hr_dashboard.xml | 4 +- addons/hr_holidays/hr_holidays_view.xml | 13 ++ addons/hr_recruitment/hr_dashboard.xml | 2 +- .../hr_recruitment_dashboard.xml | 94 ++++++------ .../report/hr_recruitment_report_view.xml | 24 +++ addons/hr_timesheet/hr_dashboard.xml | 2 +- .../report/hr_timesheet_report_view.xml | 11 ++ addons/project/project_dashboard.xml | 27 ++-- addons/project/report/project_cumulative.xml | 15 ++ addons/project/static/src/js/project.js | 10 ++ .../static/src/less/project_dashboard.less | 138 +++++++++--------- addons/project_issue/project_dashboard.xml | 7 + .../project_timesheet/project_dashboard.xml | 15 +- addons/sale/sales_team_dashboard.xml | 3 +- addons/sales_team/sales_team_dashboard.xml | 7 +- .../static/src/less/sales_team_dashboard.less | 8 +- addons/stock/static/src/css/stock.css | 9 -- .../static/src/less/stock_dashboard.less | 6 +- addons/stock/stock_dashboard.xml | 37 ++--- addons/stock_account/stock_dashboard.xml | 8 - 29 files changed, 308 insertions(+), 201 deletions(-) diff --git a/addons/hr/hr_dashboard.xml b/addons/hr/hr_dashboard.xml index e7bfa41de2f..884e0cbc68c 100644 --- a/addons/hr/hr_dashboard.xml +++ b/addons/hr/hr_dashboard.xml @@ -46,8 +46,14 @@ -
- Settings + +
+
+
    • +
    • +
    + Settings +
    diff --git a/addons/hr/static/src/less/hr_dashboard.less b/addons/hr/static/src/less/hr_dashboard.less index 0e9f5ecfc70..eada8b85395 100644 --- a/addons/hr/static/src/less/hr_dashboard.less +++ b/addons/hr/static/src/less/hr_dashboard.less @@ -1,7 +1,7 @@ -.o_hr_kanban { +.oe_kanban_view.o_kanban_dashboard.o_hr_kanban { .oe_kanban_record { - max-width: 500px !important; - min-width: 400px !important; - min-height: 200px !important; + max-width: 500px; + min-width: 400px; + min-height: 200px; } } \ No newline at end of file diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py index 28031499368..8e17fc0d68f 100644 --- a/addons/hr_attendance/hr_attendance.py +++ b/addons/hr_attendance/hr_attendance.py @@ -79,6 +79,7 @@ class hr_attendance(osv.osv): 'action': fields.selection([('sign_in', 'Sign In'), ('sign_out', 'Sign Out'), ('action','Action')], 'Action', required=True), 'action_desc': fields.many2one("hr.action.reason", "Action Reason", domain="[('action_type', '=', action)]", help='Specifies the reason for Signing In/Signing Out in case of extra hours.'), 'employee_id': fields.many2one('hr.employee', "Employee", required=True, select=True), + 'department_id': fields.many2one('hr.department', "Department", related="employee_id.department_id"), 'worked_hours': fields.function(_worked_hours_compute, type='float', string='Worked Hours', store=True), } _defaults = { diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml index 6d4d06fed00..5832a35e0fc 100644 --- a/addons/hr_attendance/hr_attendance_view.xml +++ b/addons/hr_attendance/hr_attendance_view.xml @@ -51,6 +51,7 @@ + @@ -107,6 +108,18 @@ + + Attendance Analysis + hr.attendance + form + pivot,graph + { + 'search_default_department_id': [active_id], + 'default_department_id': active_id} + + + + diff --git a/addons/hr_attendance/hr_dashboard.xml b/addons/hr_attendance/hr_dashboard.xml index 6da49a4d0cc..ae1bae28c17 100644 --- a/addons/hr_attendance/hr_dashboard.xml +++ b/addons/hr_attendance/hr_dashboard.xml @@ -10,7 +10,7 @@
    - + Attendances
    diff --git a/addons/hr_evaluation/hr_dashboard.xml b/addons/hr_evaluation/hr_dashboard.xml index a9315bf8af2..528ed191810 100644 --- a/addons/hr_evaluation/hr_dashboard.xml +++ b/addons/hr_evaluation/hr_dashboard.xml @@ -55,7 +55,7 @@
    - + Appraisals
    diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml index 33c4d33f519..85943d0f16c 100644 --- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml +++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml @@ -63,6 +63,22 @@ + + Appraisal Analysis + hr.evaluation.report + form + pivot,graph + { + 'search_default_year':1, + 'search_default_month':1, + 'search_default_employee':1, + 'search_default_department_id': [active_id], + 'default_department_id': active_id + } + + + + pivot diff --git a/addons/hr_expense/hr_dashboard.xml b/addons/hr_expense/hr_dashboard.xml index f299e94f336..35e1fff64d8 100644 --- a/addons/hr_expense/hr_dashboard.xml +++ b/addons/hr_expense/hr_dashboard.xml @@ -36,7 +36,7 @@
    - + Expenses
    diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index d155ed5026d..19d93b0ff81 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -67,6 +67,21 @@ + + Expenses Analysis + hr.expense.report + form + pivot,graph + { + 'search_default_year':1, + 'search_default_month':1, + 'search_default_employee':1, + 'search_default_department_id': [active_id], + 'default_department_id': active_id} + + + + diff --git a/addons/hr_holidays/hr_dashboard.xml b/addons/hr_holidays/hr_dashboard.xml index a90e5a2b2ee..c44a02871d0 100644 --- a/addons/hr_holidays/hr_dashboard.xml +++ b/addons/hr_holidays/hr_dashboard.xml @@ -38,7 +38,7 @@
    - +
    @@ -63,7 +63,7 @@
    - + Leaves
    diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 0bd96e13047..86d34f1070c 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -702,5 +702,18 @@ + + Leaves Analysis + hr.holidays + form + pivot,graph + [('holiday_type','=','employee')] + { + 'search_default_department_id': [active_id], + 'default_department_id': active_id} + + + + diff --git a/addons/hr_recruitment/hr_dashboard.xml b/addons/hr_recruitment/hr_dashboard.xml index ccffcd9227e..55b7b80ebef 100644 --- a/addons/hr_recruitment/hr_dashboard.xml +++ b/addons/hr_recruitment/hr_dashboard.xml @@ -38,7 +38,7 @@
    - + Recruitments
    diff --git a/addons/hr_recruitment/hr_recruitment_dashboard.xml b/addons/hr_recruitment/hr_recruitment_dashboard.xml index c319f8ace53..75d4a4564a1 100644 --- a/addons/hr_recruitment/hr_recruitment_dashboard.xml +++ b/addons/hr_recruitment/hr_recruitment_dashboard.xml @@ -1,6 +1,6 @@ - + New Application hr.applicant form @@ -43,49 +43,49 @@
    - -
    -
    - -
    -
    -
    -
    - - Document(s) - -
    -
    - -
    -
    + +
    +
    + +
    +
    +
    +
    + + Document(s) + +
    +
    + +
    +
    -
    -
    - Print Interview -
    -
    +
    +
    + Print Interview +
    +
    -
    -
    - Recruitment Done -
    -
    -
    -
    -
    -
    - -
    -
    -     - -
    -
    - -
    -
    -     +
    +
    + Recruitment Done +
    +
    +
    +
    +
    +
    + +
    +
    +     + +
    +
    + +
    +
    +
    @@ -94,13 +94,13 @@
    @@ -109,7 +109,7 @@
    @@ -118,7 +118,7 @@
    diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml index 039816a1714..a252880d85f 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -85,6 +85,30 @@ {} + + + Recruitment Analysis + hr.recruitment.report + form + pivot,graph + + { + 'search_default_department_id': [active_id], + 'default_department_id': active_id} + + + + + Recruitment Analysis + hr.recruitment.report + form + pivot,graph + + { + 'search_default_job_id': [active_id], + 'default_job_id': active_id} + + diff --git a/addons/hr_timesheet/hr_dashboard.xml b/addons/hr_timesheet/hr_dashboard.xml index 3a9b191be2e..b0192973ab9 100644 --- a/addons/hr_timesheet/hr_dashboard.xml +++ b/addons/hr_timesheet/hr_dashboard.xml @@ -10,7 +10,7 @@
    - + Timesheets
    diff --git a/addons/hr_timesheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet/report/hr_timesheet_report_view.xml index 6f044d28473..069dfd92377 100644 --- a/addons/hr_timesheet/report/hr_timesheet_report_view.xml +++ b/addons/hr_timesheet/report/hr_timesheet_report_view.xml @@ -59,6 +59,17 @@ {} + + Timesheet Analysis + hr.timesheet.report + form + pivot,graph + { + 'search_default_department_id': [active_id], + 'default_department_id': active_id} + + + + @@ -18,7 +19,7 @@ -
    +
    @@ -30,20 +31,20 @@
    -
    - -
    -
    - Reports + +
    +
    +
    +
    • @@ -55,12 +56,12 @@
    - - - + + + - + Documents
    diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml index 7da815defed..5cabe21ec73 100644 --- a/addons/project/report/project_cumulative.xml +++ b/addons/project/report/project_cumulative.xml @@ -67,6 +67,21 @@ {"search_default_open":1, "search_default_this_month": 1} + + Cumulative Flow + project.task.history.cumulative + form + pivot,graph + + { + 'search_default_open':1, + 'search_default_this_month': 1, + 'search_default_project_id': [active_id], + 'default_project_id': active_id, + } + + + diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 26ae050a119..20927cebc2c 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -5,4 +5,14 @@ var KanbanView = require('web_kanban.KanbanView'); var data = require('web.data'); var session = require('web.session'); + +kanban_common.KanbanRecord.include({ + on_card_clicked: function() { + if (this.view.dataset.model === 'project.project') { + this.$('.o_project_kanban_boxes a').first().click(); + } else { + this._super.apply(this, arguments); + } + }, +}); }); diff --git a/addons/project/static/src/less/project_dashboard.less b/addons/project/static/src/less/project_dashboard.less index ade6a7995f6..11d3b468903 100644 --- a/addons/project/static/src/less/project_dashboard.less +++ b/addons/project/static/src/less/project_dashboard.less @@ -1,84 +1,80 @@ -.o_project_kanban { +.oe_kanban_view.o_kanban_dashboard.o_project_kanban { - &.o_kanban_dashboard { + @odoo-brand-optional: #21b799; - @odoo-brand-optional: #21b799; + .o_kanban_flexbox { + display: flex; + position: relative; + } - .o_kanban_flexbox { - display: flex; - position: relative; - } + .oe_kanban_record { + min-width: 300px; + max-width: 350px; + } - .oe_kanban_record { - padding: 0 !important; - min-width: 300px; - max-width: 350px; - } + /* + .oe_kanban_record:hover .o_project_kanban_manage { + visibility: visible; + } + */ - /* - .oe_kanban_record:hover .o_project_kanban_manage { - visibility: visible; - } - */ + .o_project_kanban_main { + margin-bottom: 40px; // give space for manage section at the bottom + width: 75%; - .o_project_kanban_main { - margin-bottom: 40px; // give space for manage section at the bottom - width: 75%; + .o_primary { + font-size: larger; + } - .o_primary { - font-size: larger; + .o_project_kanban_manage { + visibility: visible; + position: absolute; + bottom: 0; + margin-left: 10px; + margin-bottom: 10px; + } + .o_kanban_card_manage_pane { + border-color: lightgrey; + border-bottom-style: solid; + border-bottom-width: 1px; + + .o_kanban_card_manage_title { + margin: 0; } + } + } - .o_project_kanban_manage { - visibility: visible; - position: absolute; - bottom: 0; - margin-left: 10px; - margin-bottom: 10px; - } - .o_kanban_card_manage_pane { - border-color: #EEEEEE; - border-bottom-style: solid; - border-bottom-width: 1px; + .o_project_kanban_boxes { + display: flex; + flex-direction: column; + justify-content: flex-end; + align-content: stretch; - .o_kanban_card_manage_title { - margin: 0; - } - } - } + width: 25%; - .o_project_kanban_boxes { - display: flex; - flex-direction: column; - justify-content: flex-end; - align-content: stretch; + .o_value { + font-size: x-large; + color: white; + display: block; + } + .o_label { + color: white; + } - width: 25%; - - .o_value { - font-size: x-large; - color: white; - display: block; - } - .o_label { - color: white; - } - - .o_project_kanban_box { - text-align: center; - padding: 15px 0 15px 0; - flex: 1 1 auto; - display: flex; - align-items: center; - flex-direction: column; - justify-content: center; - } - .o_project_kanban_box:nth-child(even) { - background-color: grey; - } - .o_project_kanban_box:nth-child(odd) { - background-color: @odoo-brand-optional; - } - } - } + .o_project_kanban_box { + text-align: center; + padding: 15px 0 15px 0; + flex: 1 1 auto; + display: flex; + align-items: center; + flex-direction: column; + justify-content: center; + } + .o_project_kanban_box:nth-child(even) { + background-color: grey; + } + .o_project_kanban_box:nth-child(odd) { + background-color: @odoo-brand-optional; + } + } } \ No newline at end of file diff --git a/addons/project_issue/project_dashboard.xml b/addons/project_issue/project_dashboard.xml index 3422f6c5d20..ef496ed5c81 100644 --- a/addons/project_issue/project_dashboard.xml +++ b/addons/project_issue/project_dashboard.xml @@ -14,6 +14,13 @@ + + +
    + Issues +
    +     + \ No newline at end of file diff --git a/addons/project_timesheet/project_dashboard.xml b/addons/project_timesheet/project_dashboard.xml index d43f7dc6a82..aec13ff42c3 100644 --- a/addons/project_timesheet/project_dashboard.xml +++ b/addons/project_timesheet/project_dashboard.xml @@ -15,13 +15,14 @@ - - - + + + + + + + Hours + diff --git a/addons/sale/sales_team_dashboard.xml b/addons/sale/sales_team_dashboard.xml index cd4a2ba89ae..169e2e9ddd1 100644 --- a/addons/sale/sales_team_dashboard.xml +++ b/addons/sale/sales_team_dashboard.xml @@ -43,8 +43,7 @@
    - - +
    Define an invoicing target in the sales team settings to see the period's achievement and forecast at a glance. diff --git a/addons/sales_team/sales_team_dashboard.xml b/addons/sales_team/sales_team_dashboard.xml index 211ee24a899..fa14cd91284 100644 --- a/addons/sales_team/sales_team_dashboard.xml +++ b/addons/sales_team/sales_team_dashboard.xml @@ -48,7 +48,12 @@
    - Settings +
    +
    • +
    • +
    + Settings +
    diff --git a/addons/sales_team/static/src/less/sales_team_dashboard.less b/addons/sales_team/static/src/less/sales_team_dashboard.less index 4fedcc80691..19dbb66757a 100644 --- a/addons/sales_team/static/src/less/sales_team_dashboard.less +++ b/addons/sales_team/static/src/less/sales_team_dashboard.less @@ -1,7 +1,7 @@ -.o_salesteam_kanban { +.oe_kanban_view.o_kanban_dashboard.o_salesteam_kanban { .oe_kanban_record { - min-height: 200px !important; - min-width: 500px !important; - max-width: 600px !important; + min-height: 200px; + min-width: 500px; + max-width: 600px; } } \ No newline at end of file diff --git a/addons/stock/static/src/css/stock.css b/addons/stock/static/src/css/stock.css index 4cf5ad24c02..532eb4f18d1 100644 --- a/addons/stock/static/src/css/stock.css +++ b/addons/stock/static/src/css/stock.css @@ -10,15 +10,6 @@ .openerp .oe_stock_scan_image:hover { opacity: 1 } -.oe_gauge_labels { - width: 100%; -} -.oe_gauge_labels .oe_gauge_label_column { - width: 49%; - text-align: center; - display: inline-block; - margin: -7px; -} .oe_stock_scan_image_btn { /*height : 42px;*/ diff --git a/addons/stock/static/src/less/stock_dashboard.less b/addons/stock/static/src/less/stock_dashboard.less index 96c023e3c7b..cf272240922 100644 --- a/addons/stock/static/src/less/stock_dashboard.less +++ b/addons/stock/static/src/less/stock_dashboard.less @@ -1,6 +1,6 @@ -.o_stock_kanban { +.oe_kanban_view.o_kanban_dashboard.o_stock_kanban { .oe_kanban_record { - max-width: 500px !important; - min-width: 350px !important; + max-width: 500px; + min-width: 350px; } } \ No newline at end of file diff --git a/addons/stock/stock_dashboard.xml b/addons/stock/stock_dashboard.xml index 19f94de6314..ddf35c7beb9 100644 --- a/addons/stock/stock_dashboard.xml +++ b/addons/stock/stock_dashboard.xml @@ -6,6 +6,7 @@ + @@ -26,18 +27,14 @@
    - +
    -
    - - Ready - -
    -
    - -
    @@ -76,7 +73,7 @@
    -
    +
    View
    @@ -93,7 +90,7 @@ Back Orders
    -
    +
    New
    @@ -101,21 +98,15 @@ Transfer
    -
    -
    - Reports -
    - - -
    - Settings +
    +
    • +
    • +
    + Settings +
    diff --git a/addons/stock_account/stock_dashboard.xml b/addons/stock_account/stock_dashboard.xml index 61f50659377..a99d05973db 100644 --- a/addons/stock_account/stock_dashboard.xml +++ b/addons/stock_account/stock_dashboard.xml @@ -24,14 +24,6 @@
    - - - -