From 8eb7e8ab6c17a20aef85594cac337329df43ae1e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 09:59:51 +0200
Subject: [PATCH 1/4] [MERGE] + improve hr_timesheet

bzr revid: fp@tinyerp.com-20121026075951-2hmaydu7skwhs5k2
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml       | 2 +-
 .../hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index f3e3af5f610..ac24cbcdc0c 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -324,7 +324,7 @@
                     <field name="employee_id"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
-                    <field name="department_id"/>
+                    <field name="department_id" invisible="1"/>
                     <field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/>
                     <field name="total_timesheet" widget="float_time"/>
                     <field name="total_difference" widget="float_time" groups="base.group_hr_attendance"/>
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 @@
         <field name="name">hr_timesheet_current_open.form</field>
         <field name="model">hr.timesheet.current.open</field>
         <field name="arch" type="xml">
-            <form string="My Current Timesheet" version="7.0">
+            <form string="My Timesheet" version="7.0">
                <group>
                     <separator string="It will open your current timesheet"/>
                </group>
@@ -19,7 +19,7 @@
     </record>
 
     <record id="action_hr_timesheet_current_open" model="ir.actions.act_window">
-        <field name="name">My Current Timesheet</field>
+        <field name="name">My Timesheet</field>
         <field name="res_model">hr.timesheet.current.open</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
@@ -28,7 +28,7 @@
         <field name="help">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.</field>
     </record>
 
-    <menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="My Current Timesheet" parent="hr_attendance.menu_hr_time_tracking" sequence="1"/>
+    <menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="My Timesheet" parent="hr_attendance.menu_hr_time_tracking" sequence="1"/>
 
     </data>
 </openerp>

From 619390d23cd337721bbe67a316052e77ee843335 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 10:01:37 +0200
Subject: [PATCH 2/4] [IMP] timesheets

bzr revid: fp@tinyerp.com-20121026080137-bluybqibtsjgb25n
---
 addons/hr/res_config.py            | 2 +-
 addons/hr_attendance/res_config.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py
index 7ae28348045..96bb42d1d8a 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."""),
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."),
     }

From f1c4b00a2926300f792a5229a591edc6dddc0d1f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 10:33:52 +0200
Subject: [PATCH 3/4] [IMP] add option in hr settings

bzr revid: fp@tinyerp.com-20121026083352-fkni5niw3a7t2m5s
---
 addons/hr/res_config.py       | 2 ++
 addons/hr/res_config_view.xml | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py
index 96bb42d1d8a..148499190fd 100644
--- a/addons/hr/res_config.py
+++ b/addons/hr/res_config.py
@@ -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 @@
                                 <field name="module_hr_timesheet_sheet" class="oe_inline"/>
                                 <label for="module_hr_timesheet_sheet"/>
                             </div>
+                            <div name="account_analytic_analysis">
+                                <field name="module_account_analytic_analysis" class="oe_inline"/>
+                                <label for="module_account_analytic_analysis"/>
+                            </div>
                             <div name="hr_attendance">
                                 <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)" class="oe_inline"/>
                                 <label for="module_hr_attendance"/>

From 052dedaf2c7c8f5ac804714ba73abc74b6934a47 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 11:37:04 +0200
Subject: [PATCH 4/4] [IMP] restyled timesheets

bzr revid: fp@tinyerp.com-20121026093704-b5q54rwtrkx73igg
---
 .../static/src/css/Makefile                   |  3 +
 .../static/src/css/timesheet.css              | 91 ++++++++-----------
 .../static/src/css/timesheet.sass             | 49 ++++++++++
 .../static/src/xml/timesheet.xml              | 12 +--
 4 files changed, 95 insertions(+), 60 deletions(-)
 create mode 100644 addons/hr_timesheet_sheet/static/src/css/Makefile
 create mode 100644 addons/hr_timesheet_sheet/static/src/css/timesheet.sass

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/xml/timesheet.xml b/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
index 43c23951514..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 @@
         <div class="oe_timesheet_weekly">
             <table>
                 <tr>
-                    <th> </th>
+                    <th class="oe_timesheet_first_col"> </th>
                     <t t-foreach="widget.dates" t-as="date">
                         <th t-att-class="'oe_timesheet_weekly_date_head' + (Date.compare(date, Date.today()) === 0 ? ' oe_timesheet_weekly_today' : '')">
                             <t t-esc="date.toString('ddd')"/><br />
@@ -26,29 +26,29 @@
                             <t t-set="day_count" t-value="day_count + 1"/>
                         </td>
                     </t>
-                    <td t-att-data-account-total="account.account"> </td>
+                    <td t-att-data-account-total="account.account" class="oe_timesheet_total"> </td>
                 </tr>
                 <tr class="oe_timesheet_weekly_add_row" style="display: none">
                     <td t-att-colspan="widget.dates.length + 2">
                         <button class="oe_highlight">Add</button>
                     </td>
                 </tr>
-                <tr>
+                <tr class="oe_timesheet_total">
                     <td>
                         <div class="oe_timesheet_weekly_adding_tot">
-                            <div class="oe_timesheet_weekly_adding"><button class="oe_link">Add a Project</button></div>
+                            <div class="oe_timesheet_weekly_adding"><button class="oe_timesheet_button_add">Add a Line</button></div>
                             <div class="oe_timesheet_weekly_tottot"><span>Total</span></div>
                         </div>
                     </td>
                     <t t-set="day_count" t-value="0"/>
                     <t t-foreach="widget.dates" t-as="date">
-                        <td t-att-class="(Date.compare(date, Date.today()) === 0 ? 'oe_timesheet_weekly_today' : '')">
+                        <td class="oe_timesheet_total">
                             <span class="oe_timesheet_weekly_box" t-att-data-day-total="day_count">
                             </span>
                             <t t-set="day_count" t-value="day_count + 1"/>
                         </td>
                     </t>
-                    <td class="oe_timesheet_weekly_supertotal"> </td>
+                    <td class="oe_timesheet_weekly_supertotal oe_timesheet_total"> </td>
                 </tr>
             </table>
         </div>