diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py
index 7ae28348045..148499190fd 100644
--- a/addons/hr/res_config.py
+++ b/addons/hr/res_config.py
@@ -28,7 +28,7 @@ class hr_config_settings(osv.osv_memory):
_columns = {
'module_hr_timesheet_sheet': fields.boolean('Allow timesheets validation by managers',
help ="""This installs the module hr_timesheet_sheet."""),
- 'module_hr_attendance': fields.boolean('Track attendances',
+ 'module_hr_attendance': fields.boolean('Install attendances feature',
help ="""This installs the module hr_attendance."""),
'module_hr_timesheet': fields.boolean('Manage timesheets',
help ="""This installs the module hr_timesheet."""),
@@ -42,6 +42,8 @@ class hr_config_settings(osv.osv_memory):
help ="""This installs the module hr_contract."""),
'module_hr_evaluation': fields.boolean('Organize employees periodic evaluation',
help ="""This installs the module hr_evaluation."""),
+ 'module_account_analytic_analysis': fields.boolean('Allow invoicing based on timesheets (will install the sale application)',
+ help ="""This installs the module account_analytic_analysis, which will install sales management too."""),
'module_hr_payroll': fields.boolean('Manage payroll',
help ="""This installs the module hr_payroll."""),
}
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index f370b26139d..632ceb56918 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -69,6 +69,10 @@
+
+
+
+
diff --git a/addons/hr_attendance/res_config.py b/addons/hr_attendance/res_config.py
index 0da2d183409..61e2f784a5a 100644
--- a/addons/hr_attendance/res_config.py
+++ b/addons/hr_attendance/res_config.py
@@ -25,7 +25,7 @@ class hr_attendance_config_settings(osv.osv_memory):
_inherit = 'hr.config.settings'
_columns = {
- 'group_hr_attendance': fields.boolean('Track attendances',
+ 'group_hr_attendance': fields.boolean('Track attendances for all employees',
implied_group='base.group_hr_attendance',
help="Allocates attendance group to all users."),
}
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index a28508be4db..3248f31a082 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -190,17 +190,14 @@ class hr_analytic_timesheet(osv.osv):
'journal_id': self._getAnalyticJournal(cr, uid, context),
}}
-hr_analytic_timesheet()
-
class account_analytic_account(osv.osv):
_inherit = 'account.analytic.account'
_description = 'Analytic Account'
-
_columns = {
'use_timesheets': fields.boolean('Timesheets', help="Check this field if this project manages timesheets"),
}
-
+
def on_change_template(self, cr, uid, ids, template_id, context=None):
res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context)
if template_id and 'value' in res:
@@ -208,6 +205,4 @@ class account_analytic_account(osv.osv):
res['value']['use_timesheets'] = template.use_timesheets
return res
-account_analytic_account()
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index c81cda8493b..55c4680b6a1 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -6,12 +6,12 @@
hr.analytic.timesheet.tree
hr.analytic.timesheet
-
+
-
+
-
+
@@ -24,7 +24,7 @@
hr.analytic.timesheet.form
hr.analytic.timesheet
-
+
+
+ {'search_default_sheet_id': [active_id]}
+ Timesheet Activities
+ hr.analytic.timesheet
+ hr_timesheet_sheet.sheet
+
+
+
+
+ {'search_default_sheet_id': [active_id]}
+ Attendances
+ hr.attendance
+ hr_timesheet_sheet.sheet
+
+
+
hr.timesheet.sheet.form
hr_timesheet_sheet.sheet
@@ -53,8 +70,18 @@
-
-
+
+
+
+
+
+
+
+
@@ -63,10 +90,10 @@
-
-
-
-
+
+
+
+
@@ -76,24 +103,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -106,7 +117,7 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -147,8 +175,8 @@
-
-
+
+
@@ -160,23 +188,23 @@
- Timesheets
+ Timesheets to Validate
ir.actions.act_window
hr_timesheet_sheet.sheet
form
- {'search_default_my_timesheet':1}
+ {'search_default_to_approve':1}
- Click to go to your timesheet.
+ New timesheet to approve.
You must record timesheets every day and confirm at the end
- of the week. Once the timesheet is confirmed, it his sent to
- the manager for validation.
+ of the week. Once the timesheet is confirmed, it should be
+ validated by a manager.
Timesheets can also be invoiced to customers, depending on the
- configuration of the project.
+ configuration of each project's related contract.
@@ -287,22 +315,6 @@
name="Timesheet by Day"
res_model="hr_timesheet_sheet.sheet.day"
src_model="hr_timesheet_sheet.sheet"/>
-
-
-
-
-
-
hr.timesheet.sheet.tree
hr_timesheet_sheet.sheet
@@ -312,7 +324,7 @@
-
+
diff --git a/addons/hr_timesheet_sheet/static/src/css/Makefile b/addons/hr_timesheet_sheet/static/src/css/Makefile
new file mode 100644
index 00000000000..e60087d9b33
--- /dev/null
+++ b/addons/hr_timesheet_sheet/static/src/css/Makefile
@@ -0,0 +1,3 @@
+timesheet.css: timesheet.sass
+ sass -t expanded timesheet.sass timesheet.css
+
diff --git a/addons/hr_timesheet_sheet/static/src/css/timesheet.css b/addons/hr_timesheet_sheet/static/src/css/timesheet.css
index b486f76694d..f504a0f4f10 100644
--- a/addons/hr_timesheet_sheet/static/src/css/timesheet.css
+++ b/addons/hr_timesheet_sheet/static/src/css/timesheet.css
@@ -1,79 +1,62 @@
-
+@charset "utf-8";
+.openerp .oe_form_readonly .oe_timesheet_button_add {
+ display: none;
+}
.openerp .oe_timesheet_weekly {
- overflow-x: auto;
+ overflow-x: auto;
}
-
.openerp .oe_timesheet_weekly table {
- width: 100%;
+ width: 100%;
}
-
.openerp .oe_timesheet_weekly td {
- padding-top: 15px;
+ padding: 3px;
+ text-align: right;
}
-
.openerp .oe_timesheet_weekly th {
- text-align: right;
- color: #069;
- font-family: 'Helvetica Neue', Arial, Verdana, 'Nimbus Sans L', sans-serif;
- font-size: 10px;
+ text-align: center;
+ color: #006699;
+ font-family: "Helvetica Neue", Arial, Verdana, "Nimbus Sans L", sans-serif;
+ font-size: 10px;
+ background: #eeeeee;
+ min-width: 47px;
}
-
-.openerp .oe_timesheet_weekly th.oe_timesheet_weekly_date_head {
- width: 60px;
+.openerp .oe_timesheet_weekly .oe_timesheet_total {
+ background: #eeeeee;
}
-
-.openerp .oe_timesheet_weekly td {
- text-align: right;
- vertical-align: middle;
-}
-
.openerp .oe_timesheet_weekly .oe_timesheet_weekly_account {
- text-align: left;
- padding-right: 30px;
+ text-align: left;
+}
+.openerp .oe_timesheet_weekly .oe_timesheet_first_col {
+ min-width: 130px;
}
-
.openerp .oe_timesheet_weekly td input.oe_timesheet_weekly_input {
- border: 1px solid #CCC;
- padding: 5px 2px !important;
- color: #666 !important;
- font-size: 14px;
- font-weight: bold;
- width: 38px;
- text-align: right;
- min-width: 0 !important;
+ padding: 5px 2px !important;
+ width: 40px;
+ text-align: right;
+ min-width: 0 !important;
}
-
-.openerp .oe_timesheet_weekly td .oe_timesheet_weekly_box {
- padding: 5px 2px !important;
- color: #666 !important;
- font-size: 14px;
- font-weight: bold;
- width: 38px;
- display: inline-block;
+.openerp .oe_timesheet_weekly td.oe_timesheet_total {
+ font-weight: bold;
+ padding: 5px 3px !important;
}
-
.openerp .oe_timesheet_weekly .oe_timesheet_weekly_adding_tot {
- display: table;
- width: 100%;
+ display: table;
+ width: 100%;
}
-
.openerp .oe_timesheet_weekly .oe_timesheet_weekly_adding {
- display: table-cell;
- text-align: left;
+ display: table-cell;
+ text-align: left;
}
-
.openerp .oe_timesheet_weekly .oe_timesheet_weekly_tottot {
- display: table-cell;
+ display: table-cell;
}
-
.openerp .oe_timesheet_weekly .oe_timesheet_weekly_add_row td {
- text-align: left;
+ text-align: left;
}
-
.openerp .oe_timesheet_weekly .oe_timesheet_weekly_add_row .oe_form_field_many2one {
- display: inline-block;
- width: 200px;
+ display: inline-block;
+ width: 200px;
}
-
-.openerp .oe_timesheet_weekly_today {
+.openerp .oe_timesheet_weekly .oe_timesheet_weekly_today {
+ background: #ffddee;
}
diff --git a/addons/hr_timesheet_sheet/static/src/css/timesheet.sass b/addons/hr_timesheet_sheet/static/src/css/timesheet.sass
new file mode 100644
index 00000000000..9c986517508
--- /dev/null
+++ b/addons/hr_timesheet_sheet/static/src/css/timesheet.sass
@@ -0,0 +1,49 @@
+@charset "utf-8"
+
+.openerp
+ .oe_form_readonly
+ .oe_timesheet_button_add
+ display: none
+ .oe_timesheet_weekly
+ overflow-x: auto
+ table
+ width: 100%
+ td
+ padding: 3px
+ text-align: right
+ th
+ text-align: center
+ color: #069
+ font-family: 'Helvetica Neue', Arial, Verdana, 'Nimbus Sans L', sans-serif
+ font-size: 10px
+ background: #eee
+ min-width: 47px
+ .oe_timesheet_total
+ background: #eee
+ .oe_timesheet_weekly_account
+ text-align: left
+ .oe_timesheet_first_col
+ min-width: 130px
+ td input.oe_timesheet_weekly_input
+ padding: 5px 2px !important
+ width: 40px
+ text-align: right
+ min-width: 0 !important
+ td.oe_timesheet_total
+ font-weight: bold
+ padding: 5px 3px !important
+ .oe_timesheet_weekly_adding_tot
+ display: table
+ width: 100%
+ .oe_timesheet_weekly_adding
+ display: table-cell
+ text-align: left
+ .oe_timesheet_weekly_tottot
+ display: table-cell
+ .oe_timesheet_weekly_add_row td
+ text-align: left
+ .oe_timesheet_weekly_add_row .oe_form_field_many2one
+ display: inline-block
+ width: 200px
+ .oe_timesheet_weekly_today
+ background: #fde
diff --git a/addons/hr_timesheet_sheet/static/src/js/timesheet.js b/addons/hr_timesheet_sheet/static/src/js/timesheet.js
index 1be965fd63d..7de235ec190 100644
--- a/addons/hr_timesheet_sheet/static/src/js/timesheet.js
+++ b/addons/hr_timesheet_sheet/static/src/js/timesheet.js
@@ -194,6 +194,10 @@ openerp.hr_timesheet_sheet = function(instance) {
['use_timesheets','=',1],
['id', 'not in', _.pluck(self.accounts, "account")],
],
+ context: {
+ default_use_timesheets: 1,
+ default_type: "contract",
+ },
modifiers: '{"required": true}',
},
});
diff --git a/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml b/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
index a5b2f779bd0..3bfca4c4aa2 100644
--- a/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
+++ b/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
@@ -5,7 +5,7 @@
-
+
@@ -26,29 +26,29 @@
-
+
- Add
+ Add
-
+
-
Add a Project
+
Add a Line
Total
-
+
-
+
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
index c982a9bbd39..dfe89c87f70 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
@@ -5,7 +5,7 @@
hr_timesheet_current_open.form
hr.timesheet.current.open
-
- My Current Timesheet
+ My Timesheet
hr.timesheet.current.open
form
tree,form
@@ -28,7 +28,7 @@
My Timesheet opens your timesheet so that you can book your activities into the system. From the same form, you can register your attendances (Sign In/Out) and describe the working hours made on the different projects. At the end of the period defined in the company, the timesheet is confirmed by the user and can be validated by his manager. If required, as defined on the project, you can generate the invoices based on the timesheet.
-
+