[IMP]planner: some correction according to new features added in master.

9 files changed, 140 insertions, 84 deletions

diff --git a/addons/account/views/web_planner_data.xml b/addons/account/views/web_planner_data.xml
index f92e98e35b8..b8a2d27b189 100644
--- a/addons/account/views/web_planner_data.xml
+++ b/addons/account/views/web_planner_data.xml
@@ -106,7 +106,7 @@
                             </div>
                             <div class="col-md-4 text-center">
                                 <a t-attf-href="#{prepare_backend_url('base.action_res_company_form', 'form')}&amp;id=#{company_id.id}">
-                                    <img width="150" height="90" t-attf-src="data:image/gif;base64, #{company_id.logo}"/>
+                                    <img width="150" height="90" alt="set company logo" t-attf-src="data:image/gif;base64, #{company_id.logo}"/>
                                     <p>Your Company's Logo</p>
                                 </a>
                             </div>
@@ -122,11 +122,11 @@
                     <t t-set="page_title" t-value="'Your Bank Accounts'"/>
                     <ol>
                         <p><li>Start by creating each bank account manually:</li></p>
-                        <a class="btn btn-sm odoo_purple" t-att-href="prepare_backend_url('account.action_bank_tree')">Create Bank Accounts</a>
+                        <a class="btn btn-sm odoo_purple" t-att-href="prepare_backend_url('account.action_account_bank_journal_form')">Create Bank Accounts</a>
                         <p><li>Then, register your statements:</li></p>
                         <ul>
                             <li>By <a t-att-href="prepare_backend_url('account_bank_statement_import.action_account_bank_statement_import')">importing a statement file </a>(QIF, OFX, CODA or CSV format)</li>
-                            <li>By <a>connecting to your Bank </a>(US, Canada, NZ only)</li>
+                            <li>By <a t-att-href="prepare_backend_url('account_online_sync.action_config_online_sync_journal_form')">connecting to your Bank </a>(US, Canada, NZ only)</li>
                             <li>Manually, using our <a t-att-href="prepare_backend_url('account.action_bank_statement_tree')">fast recording interface</a></li>
                         </ul>
                     </ol>
@@ -358,7 +358,7 @@
                                 <h3><strong>Assets Management</strong></h3>
                                 <p>Manage your properties like buildings, machinery, materials, cars etc. and calculate their depreciations over time.</p>
                                 <a t-att-href="prepare_backend_url('base.open_module_tree', 'form', 'account_asset')" class="btn odoo_purple">
-                                    <span class="fa fa-arrow-circle-o-down"/> Active Now
+                                    <span class="fa fa-arrow-circle-o-down"/> Install Now
                                 </a>
                             </div>
                             <div class="text-center col-md-4">
@@ -367,7 +367,7 @@
                                 <p>Use in combination with Contracts to calculate monthly revenues for multi-months Contracts.</p>
                                 <a t-att-href="prepare_backend_url('base.open_module_tree', 'form', 'account_asset')"
                                     class="btn odoo_purple">
-                                    <span class="fa fa-arrow-circle-o-down"/> Active Now
+                                    <span class="fa fa-arrow-circle-o-down"/> Install Now
                                 </a>
                             </div>
                             <div class="text-center col-md-4">
@@ -376,16 +376,18 @@
                                 <p>Simplify your cash, checks, or credit cards deposits with an integrated batch payment function.</p>
                                 <a t-att-href="prepare_backend_url('base.open_module_tree', 'form', 'account_batch_deposit')"
                                     class="btn odoo_purple">
-                                    <span class="fa fa-arrow-circle-o-down"/> Active Now
-                                </a><br/><br/><br/>
+                                    <span class="fa fa-arrow-circle-o-down"/> Install Now
+                                </a>
                             </div>
+                        </div>
+                        <div class="row o_planner_row_apps">
                             <div class="text-center col-md-4">
                                 <span class="fa fa-money fa-4x"></span>
                                 <h3><strong>Expenses</strong></h3>
                                 <p>Manage your employees expenses, from encoding to payment and reporting.</p>
                                 <a t-att-href="prepare_backend_url('base.open_module_tree', 'form', 'hr_expense')"
                                     class="btn odoo_purple">
-                                    <span class="fa fa-arrow-circle-o-down"/> Active Now
+                                    <span class="fa fa-arrow-circle-o-down"/> Install Now
                                 </a>
                             </div>
                             <div class="text-center col-md-4">
@@ -394,7 +396,7 @@
                                 <p>Validate purchase orders and control vendor bills by departments.</p>
                                 <a t-att-href="prepare_backend_url('base.open_module_tree', 'form', 'purchase')"
                                     class="btn odoo_purple">
-                                    <span class="fa fa-arrow-circle-o-down"/> Active Now
+                                    <span class="fa fa-arrow-circle-o-down"/> Install Now
                                 </a>
                             </div>
                             <div class="text-center col-md-4">
@@ -403,7 +405,7 @@
                                 <p>Manage time &amp; material contracts or fixed-price recurring subscriptions.</p>
                                 <a t-att-href="prepare_backend_url('base.open_module_tree', 'form', 'account_analytic_analysis')"
                                     class="btn odoo_purple">
-                                    <span class="fa fa-arrow-circle-o-down"/> Active Now
+                                    <span class="fa fa-arrow-circle-o-down"/> Install Now
                                 </a>
                             </div>
                         </div>
@@ -468,7 +470,7 @@
                             <div class="col-md-4">
                                 <strong>Next action:</strong><br/>
                                 <a t-att-href="prepare_backend_url('base.action_res_users')" class="btn odoo_purple">
-                                    <span class="fa"/> Invite Your User
+                                    <span class="fa"/> Invite Your Users
                                 </a>
                             </div>
                             <div class="col-md-8">
@@ -537,12 +539,12 @@
                                      <div class="panel-body">
                                         <ol>
                                             <li><strong>Reconcile Bank Statements</strong></li>
-                                            <li><strong>Check unpaid invoices</strong></li><span>Run an <a t-att-href="prepare_backend_url('account_reports.action_account_report_ar')">Aged Receivable report</a> and check which customers still owe you money.</span>
+                                            <li><strong>Check unpaid invoices</strong></li><span>Run an <i>Aged Receivable report</i> and check which customers still owe you money.</span>
                                             <li><strong>Send follow-up letters</strong></li>
                                         </ol>
                                         <div class="alert alert-info info_icon" role="alert">
                                             <span class="fa fa-lightbulb-o fa-lg"/>
-                                            <p>You can setup Odoo to automatically sent by regular mail an Aged Receivable report to you customers, thanks to <a t-att-href="prepare_backend_url('print.print_provider_action','form','Docsaway')">DocsAway integration</a>.</p>
+                                            <p>You can setup Odoo to automatically sent by regular mail an Aged Receivable report to you customers, thanks to <a t-att-href="prepare_backend_url('base.open_module_tree','form','print_docsaway')">DocsAway integration</a>.</p>
                                         </div>
                                     </div>
                                 </div>
diff --git a/addons/crm/web_planner.py b/addons/crm/web_planner.py
index 727885b4828..d47dfc5fc39 100644
--- a/addons/crm/web_planner.py
+++ b/addons/crm/web_planner.py
@@ -19,5 +19,6 @@ class PlannerCrm(models.Model):
         values = {
             'alias_domain': sales_team.alias_domain,
             'alias_name': sales_team.alias_name,
+            'pipeline_menu_id': self.env.ref('crm.menu_crm_opportunities').id,
         }
         return values
diff --git a/addons/crm/web_planner_data.xml b/addons/crm/web_planner_data.xml
index b9af5898133..a543c5fc67e 100644
--- a/addons/crm/web_planner_data.xml
+++ b/addons/crm/web_planner_data.xml
@@ -246,13 +246,11 @@
                             <div class="well well-lg">
                                 <strong>Recommended actions:</strong>
                                 <li>
-                                    <a t-att-href="prepare_backend_url(
-                                        'crm.crm_lead_opportunities', 'kanban')">
+                                    <a t-attf-href="web#view_type=kanban&amp;model=crm.lead&amp;menu_id=#{pipeline_menu_id}">
                                         Configure the stages of your sales pipeline</a> with your work above
                                 </li>
                                 <li>
-                                    <a t-att-href="prepare_backend_url(
-                                        'crm.crm_lead_opportunities', 'kanban')">
+                                    <a t-attf-href="web#view_type=kanban&amp;model=crm.lead&amp;menu_id=#{pipeline_menu_id}">
                                         Create the three firsts opportunities</a> as an exercise
                                 </li>
                             </div>
@@ -377,9 +375,9 @@
                                         <h4><strong>Quote template</strong> <span class="small">(packaged services)</span></h4>
                                         <span>
                                             <li>Read the <a href="https://www.odoo.com/blog/business-hacks-1/post/how-to-build-your-quotes-for-success-173" target="_blank">blog post on the Quote Builder</a></li>
-                                            <li>Activate quotation templates in <a t-att-href="prepare_backend_url(
+                                            <li>Activate the 'Send online quotations based on templates' option in <a t-att-href="prepare_backend_url(
                                             'base_setup.action_sale_config')">Sales Settings</a></li>
-                                        <li>Create your templates of offers</li>
+                                            <li>Create your templates of offers</li>
                                         </span>
                                     </div>
                                 </div>
@@ -394,8 +392,11 @@
                                         </span>
                                     </div>
                                     <div class="panel-body">
-                                        <t t-if="not is_module_installed('account_analytic_analysis')"><span class="text-muted">To activate the Contracts, check 'Use contracts management' <a t-att-href="prepare_backend_url(
-                                                'base_setup.action_sale_config')">in the Sales Settings.</a> </span></t>
+                                        <t t-if="not is_module_installed('website_contract')">
+                                            <span class="text-muted">To activate the Contracts, install the
+                                                <a t-att-href="prepare_backend_url('base.open_module_tree', 'form', 'website_contract')">Subscription Management</a> app.
+                                            </span>
+                                        </t>
                                         <h4><strong>Fixed price</strong> <span class="small">(ex: monthly subscription)</span></h4>
                                         <span>
                                             <li>Create contracts template</li>
@@ -403,7 +404,7 @@
                                         <br/>
                                         <h4><strong>Time &amp; material</strong> <span class="small">(ex: consulting mission)</span></h4>
                                         <span>
-                                            <li><a t-att-href="prepare_backend_url('account_analytic_analysis.action_account_analytic_overdue_all', 'list', 'sale')">Create your contracts</a> and configure your prices</li>
+                                            <li><a t-att-href="prepare_backend_url('sale_contract.sale_subscription_action', 'list', 'sale_contract')">Create your contracts</a> and configure your prices</li>
                                         </span>
                                     </div>
                                 </div>
@@ -436,7 +437,7 @@
                 <t t-call="web_planner.page">
                     <t t-set="page_title" t-value="'Your Customers'"/>
                     <p class="text-muted">
-                        Unless you are starting a new business, you probably have a list of Customers and Suppliers you'd like to import.
+                        Unless you are starting a new business, you probably have a list of Customers and Vendors you'd like to import.
                     </p>
                     <div class="container-fluid">
                         <div class="row">
@@ -453,8 +454,10 @@
                                         <span>
                                             <a t-att-href="prepare_backend_url(
                                                 'base.action_partner_form','list')"><li>Create Customers</li></a>
-                                            <a t-att-href="prepare_backend_url(
-                                                'base.action_partner_form','list')"><li>Create Suppliers</li></a>
+                                            <li>
+                                                <a t-att-href="prepare_backend_url(
+                                                'base.action_partner_form','list')">Create Vendors</a>, if accounting or purchase is installed
+                                            </li>
                                         </span>
                                     </div>
                                 </div>
@@ -621,11 +624,17 @@
                             <div class="col-md-12">
                                 <div class="well well-lg">
                                     <span><strong>Next Action:</strong><br/>
-                                    Select the option your prefer in your <a t-att-href="prepare_backend_url('base_setup.action_sale_config')">Sales Settings</a>.
+                                    If you don't want to use unique prices, activate the 'Use pricelists to adapt your price per customers' option in your  <a t-att-href="prepare_backend_url('base_setup.action_sale_config')">Sales Settings</a>.
                                     </span>
                                 </div>
                             </div>
                         </div>
+                        <div class="alert alert-info info_icon" role="alert">
+                            <span class="fa fa-lightbulb-o fa-lg"/>
+                            <p>
+                                You can change the Price options at anytime, so we recommend you to select the easiest option that suits your needs for now.
+                            </p>
+                        </div>
                         <div class="row">
                             <div class="col-md-12">
                                 <div class="well well-lg">
@@ -635,12 +644,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="alert alert-info info_icon" role="alert">
-                        <span class="fa fa-lightbulb-o fa-lg"/>
-                        <p>
-                            You can change the Price options at anytime, so we recommend you to select the easiest option that suits your needs for now.
-                        </p>
-                    </div>
+                    
                 </t>
             </t>
             <t t-call="web_planner.category">
@@ -721,7 +725,7 @@
                                             <strong>Exercise:</strong> Try to get the number of leads per salesperson and by creation date
                                         </p>
                                         <p>
-                                            <a t-att-href="prepare_backend_url('crm.action_report_crm_lead', 'graph')">Leads analysis</a>
+                                            <a t-att-href="prepare_backend_url('crm.crm_opportunity_report_action_lead', 'graph')">Leads Analysis</a> (if leads are activated)
                                         </p>
                                     </div>
                                 </div>
@@ -736,7 +740,7 @@
                                         <p>
                                             A sales manager will mostly use these two reports:
                                             <li>
-                                                <a t-att-href="prepare_backend_url('crm.action_report_crm_opportunity', 'graph')">Opportunities Analysis</a>
+                                                <a t-att-href="prepare_backend_url('crm.crm_opportunity_report_action', 'graph')">Opportunities Analysis</a>
                                             </li>
                                             <li>
                                                 <a t-att-href="prepare_backend_url('account.action_account_invoice_report_all', 'graph', 'account')">Invoice Analysis</a>
@@ -761,14 +765,14 @@
                                         <p>Every salesperson can analyze their own pipe by clicking on the 'switch view to graph' icon.</p>
                                         <p><strong>Exercise: </strong>Try to switch the kanban to graph view</p>
                                         <p>
-                                            <a t-att-href="prepare_backend_url('crm.crm_lead_opportunities', 'kanban')">Opportunities pipeline</a>
+                                            <a t-attf-href="web#view_type=kanban&amp;model=crm.lead&amp;menu_id=#{pipeline_menu_id}">Opportunities pipeline</a>
                                         </p>
                                     </div>
                                 </div>
                             </div>
                         </div>
                         <div class="row">
-                            <div class="col-md-8">
+                            <div class="col-md-12">
                                 <div class="alert alert-info info_icon" role="alert">
                                     <span class="fa fa-lightbulb-o fa-2x"></span>
                                     <strong>Tips:</strong>
@@ -776,7 +780,7 @@
                                     <li>Save filters or add any report to your dashboard with the Favorites menu.</li>
                                 </div>
                             </div>
-                            <div class="col-md-4">
+                            <div class="col-md-12">
                                 <div class="well well-lg">
                                     <strong>Want to know more?</strong><br/>
                                     <a href="https://www.odoo.com/slides/odoo-9-training-5/tag/crm-8-59" target="_blank"><span class="fa fa-video-camera"/> Watch our training videos</a><br/>
diff --git a/addons/project/static/src/img/web_planner_task.png b/addons/project/static/src/img/web_planner_task.png
deleted file mode 100644
index 43e4cb30762..00000000000
--- a/addons/project/static/src/img/web_planner_task.png
+++ /dev/null
diff --git a/addons/project/web_planner.py b/addons/project/web_planner.py
index 2edd0765b8b..23710215b51 100644
--- a/addons/project/web_planner.py
+++ b/addons/project/web_planner.py
@@ -1,13 +1,17 @@
 # -*- coding: utf-8 -*-
-from openerp import api, models
+from openerp import models
 
 
 class PlannerProject(models.Model):
 
     _inherit = 'web.planner'
 
-    @api.model
     def _get_planner_application(self):
         planner = super(PlannerProject, self)._get_planner_application()
         planner.append(['planner_project', 'Project Planner'])
         return planner
+
+    def _prepare_planner_project_data(self):
+        return {
+            'timesheet_menu': self.env.ref('hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current', raise_if_not_found=False),
+        }
diff --git a/addons/project/web_planner_data.xml b/addons/project/web_planner_data.xml
index bd21891213f..41af4f73d09 100644
--- a/addons/project/web_planner_data.xml
+++ b/addons/project/web_planner_data.xml
@@ -134,7 +134,7 @@
                                         <p>During a meeting, a customer asks a manager for a few modifications to a project.
                                         </p>
                                         <p>Back at the office, the manager splits the customer's demands into several tasks and delegates them to several employees.</p>
-                                        <p>Each employee will have their own simple task, while the manager will be able to follow the global advancement through the principal task.</p>
+                                        <p>Each employee will have their own simple task, while the manager will be able to follow the global advancement from the Kanban view of the project.</p>
                                         <p>Tasks are the main mechanism in Odoo and are activated by default.</p>
                                     </div>
                                 </div>
@@ -154,11 +154,7 @@
                                         <strong>A problem or request from a customer</strong> that needs to be identified, solved and followed up asap.</p>
                                         <p><strong>Example: </strong></p>
                                         <p>A customer sends a complaint to support@yourcompany.com: an Issue is automatically created into a 'Support level 1' project based on the original email from the customer.</p><br/>
-                                        <p><strong>Escalation: </strong></p>
-                                        <p>Issues have a specific mechanism called escalation. For example, if the  'Support' team can't solve an issue, they can escalate it to a 'Support level 2' project.</p>
-                                        <p>To use Issues, activate 'Track issues and bugs' in your
-                                        <a t-att-href="prepare_backend_url(
-                                                       'project.action_config_settings')">Project Settings.</a>
+                                        <p>To use Issues, install the <a t-att-href="prepare_backend_url('base.open_module_tree', 'form', 'project_issue')">Issue Tracking app.</a>
                                         </p>
                                     </div>
                                 </div>
@@ -182,9 +178,9 @@
                                         <li> <strong>Invoicing your customers</strong> on Time &amp; Material projects</li></p>
                                         <p>To use Timesheets, go to your <a t-att-href="prepare_backend_url(
                                         'project.action_config_settings')">Project Settings</a> and activate:</p>
-                                        <p><li>for Tasks: 'Record timesheet lines per tasks'</li>
-                                        <li>for Issues: 'Invoice working time on issues</li></p>
-                                        <p>You can learn more about Timesheets in the <a href="#planner_page7">Timesheets section</a> of this planner.</p>
+                                        <p><li>for Tasks: 'Log work activities on tasks'</li>
+                                        <li>for Issues: 'Activate timesheets on issues'</li></p>
+                                        <p>You can learn more about Timesheets in the Timesheets section of this planner.</p>
                                     </div>
                                 </div>
                             </div>
@@ -367,14 +363,9 @@
                     <section>
                         <div class="o_planner_paragraphs">
                             <div class="row">
-                                <div class="col-sm-offset-2 col-md-offset-2 col-sm-10 col-md-10">
-                                    <img src="/project/static/src/img/web_planner_task.png" />
-                                </div>
-                            </div>
-                            <div class="row">
                                 <div class="col-sm-1 col-md-2 icon"><span data-icon="&#xe02c;" /></div>
                                 <div class="col-sm-10 col-md-10">
-                                    <p><strong>1. Define a Naming Convention</strong><br/>
+                                    <p><strong>Define a Naming Convention</strong><br/>
                                     Add keywords in the 'Task title' field, for example [Customer name] or [Website].This will help you navigate and search through the dozens of tasks in your project.
                                     </p>
                                 </div>
@@ -382,7 +373,7 @@
                             <div class="row">
                                 <div class="col-sm-1 col-md-2 icon"><span data-icon="&#xe075;" /></div>
                                 <div class="col-sm-11 col-md-10">
-                                    <p><strong>2. Add a Deadline</strong><br/>
+                                    <p><strong>Add a Deadline</strong><br/>
                                     The deadline will help you determine if a task or issue is progressing as expected, and to anticipate its next update.
                                     </p>
                                 </div>
@@ -390,7 +381,7 @@
                             <div class="row">
                                 <div class="col-sm-1 col-md-2 icon"><span data-icon="&#xe055;" /></div>
                                 <div class="col-sm-11 col-md-10">
-                                    <p><strong>3. Use Tags</strong><br/>
+                                    <p><strong>Use Tags</strong><br/>
                                     Tags  are complementary to your project stages: they can work as a second  level categorization which is very useful if you have a lot of Tasks or Issues to manage. Also, it becomes very easy to find Tasks or Issues by typing  the Tag into the main Search bar.
                                     </p>
                                 </div>
@@ -398,7 +389,7 @@
                             <div class="row">
                                 <div class="col-sm-1 col-md-2 icon"><span data-icon="&#xe007;" /></div>
                                 <div class="col-sm-11 col-md-10">
-                                    <p><strong>4. Use Status Indicator</strong><br/>
+                                    <p><strong>Use Status Indicator</strong><br/>
                                     The Status indicator helps you manage Tasks and Issues by attributing them one of 3 different colour: Grey, Green or Red. The meaning of these Status can be freely configured, for example:
                                     <li>Grey: the Task is in progress (someone is working on it)</li>
                                     <li>Green: the Task is ready for next stage (the job for this stage is complete)</li>
@@ -409,7 +400,7 @@
                             <div class="row">
                                 <div class="col-sm-1 col-md-2 icon"><span data-icon="&#xe017;" /></div>
                                 <div class="col-sm-11 col-md-10">
-                                    <p><strong>5. Set Priorities</strong><br/>
+                                    <p><strong>Set Priorities</strong><br/>
                                     The <i class="fa fa-star"/> is used to indicate priority: in Kanban view, priority Tasks or Issues will be displayed on top. This is especially useful if you use a Scrum methodology to indicate the tasks for the week. Similarly to Status, you can change the meaning of the Star indicator from the Project Stages tab.
                                     </p>
                                 </div>
@@ -417,7 +408,7 @@
                             <div class="row">
                                 <div class="col-sm-1 col-md-2 icon"><span data-icon="&#xe001;" /></div>
                                 <div class="col-sm-11 col-md-10">
-                                    <p><strong>6. Have Clear Responsibilities</strong><br/>
+                                    <p><strong>Have Clear Responsibilities</strong><br/>
                                     The person assigned to a task is responsible for its progress and their avatar is displayed in Kanban view for quick reference. Of course, responsibility for a task can change depending on its stage.
                                     </p>
                                 </div>
@@ -472,9 +463,12 @@
                                         </span>
                                     </div>
                                     <div class="panel-body">
-                                        <li>For employees, the <a t-att-href="prepare_backend_url('hr_timesheet_sheet.ir_actions_server_timsheet_sheet', 'form', 'hr_timesheet_sheet')">Current Timesheet </a> view of the HR module is the main tool to check, modify and confirm Timesheets.</li><br/>
+                                        <li>For employees, the
+                                            <a t-if="is_module_installed('hr_timesheet_sheet')" t-attf-href="web#view_type=form&amp;model=hr_timesheet_sheet.sheet&amp;menu_id=#{timesheet_menu and timesheet_menu.id}">Current Timesheet</a>
+                                            <a t-if="not is_module_installed('hr_timesheet_sheet')" t-att-href="prepare_backend_url('base.open_module_tree', 'form', 'hr_timesheet_sheet')">Current Timesheet</a>
+                                            view of the HR module is the main tool to check, modify and confirm Timesheets.</li><br/>
                                         <li>Alternatively, Timesheets can be added directly from Tasks by activating <strong>'Log work activities on tasks'</strong> in the <a t-att-href="prepare_backend_url('project.action_config_settings')">Project Settings</a>.</li><br/>
-                                        <li>Or, if you are using Issues, by activating 'Invoice working time on issues', also in the <a t-att-href="prepare_backend_url('project.action_config_settings')">Project Settings</a>.</li>
+                                        <li>Or, if you are using Issues, by activating 'Activate timesheets on issues', also in the <a t-att-href="prepare_backend_url('project.action_config_settings')">Project Settings</a>.</li>
                                     </div>
                                 </div>
                             </div>
@@ -494,7 +488,7 @@
                                         <li> View statistics for the week</li>
                                         <li> Get full synchronization with Odoo</li><br/>
                                         <a href="https://chrome.google.com/webstore" target="_blank">
-                                            <img src="/project/static/src/img/web_planner_chrome.png"/>
+                                            <img width="100%" src="/project/static/src/img/web_planner_chrome.png"/>
                                         </a>
                                     </div>
                                 </div>
@@ -520,15 +514,22 @@
                         <h3><strong>Approve your Timesheets</strong> (every week)</h3>
                         <div class="row">
                             <div class="col-md-12">
-                                At the end of the week, each employee should review their entries for the week and makes sure the entries are correctly encoded. This can be done from the <a t-att-href="prepare_backend_url('hr_timesheet_sheet.ir_actions_server_timsheet_sheet', 'form', 'hr_timesheet_sheet')">Current Timesheet</a> view of the Human Resources module.<br/>
-                                Once a Timesheet is confirmed by an employee, it needs to be Approved by a manager in the <a t-att-href="prepare_backend_url('hr_timesheet_sheet.act_hr_timesheet_sheet_form', 'form', 'hr_timesheet_sheet')">Timesheets to Approve</a> view.
+                                At the end of the week, each employee should review their entries for the week and makes sure the entries are correctly encoded. This can be done from the
+                                <a t-if="is_module_installed('hr_timesheet_sheet')" t-attf-href="web#view_type=form&amp;model=hr_timesheet_sheet.sheet&amp;menu_id=#{timesheet_menu and timesheet_menu.id}">Current Timesheet</a>
+                                <a t-if="not is_module_installed('hr_timesheet_sheet')" t-att-href="prepare_backend_url('base.open_module_tree', 'form', 'hr_timesheet_sheet')">Current Timesheet</a>
+                                view of the Human Resources module.<br/>
+                                Once a Timesheet is confirmed by an employee, it needs to be Approved by a manager in the
+                                <a t-if="is_module_installed('hr_timesheet_sheet')" t-att-href="prepare_backend_url('hr_timesheet_sheet.act_hr_timesheet_sheet_form')">Timesheets to Approve</a>
+                                <a t-if="not is_module_installed('hr_timesheet_sheet')" t-att-href="prepare_backend_url('base.open_module_tree', 'form', 'hr_timesheet_sheet')">Timesheets to Approve</a>
+                                view.
                             </div>
                         </div>
                         <h3><strong>Invoice your customers</strong> (every month)</h3>
                         <div class="row">
                             <div class="col-md-12">
                                 If you work on a Time &amp; Material project, you'll probably want to extract a Timesheet of the tasks and issues to invoice directly to the customer. To do that:<br/>
-                                <li> Activate 'Allow invoicing based on timesheets' from the <a t-att-href="prepare_backend_url('hr.action_human_resources_configuration', 'form', 'hr')">Human Resources Settings</a>.</li>
+                                <li> Activate 'Allow invoicing based on timesheets' from the <i>Human Resources Settings</i>.
+                                </li>
                                 <li> This will add an Invoice Tasks menu in the Project module, that can be used to select the Timesheet to invoice.</li>
                             </div>
                         </div>
@@ -697,8 +698,14 @@
                                     <input type="text" id="input_element_stage_0_user" value="Ideas" readonly="readonly"/>
                                 </div>
                                 <div class="col-xs-12 col-md-6">
-                                    <i class="fa fa-user"/>
-                                    <input id="input_element_resp0" type="text"/>
+                                    <div class="row">
+                                        <div class="col-md-2">
+                                            <i class="fa fa-user"/>
+                                        </div>
+                                        <div class="col-md-10">
+                                            <input id="input_element_resp0" type="text"/>
+                                        </div>
+                                    </div>
                                 </div>
                                 </li>
                                 <li class="row">
@@ -707,8 +714,14 @@
                                         <input type="text" id="input_element_stage_1_user" value="To Do" readonly="readonly"/>
                                     </div>
                                     <div class="col-xs-12 col-md-6">
-                                        <i class="fa fa-user"/>
-                                        <input id="input_element_resp1" type="text"/>
+                                        <div class="row">
+                                            <div class="col-md-2">
+                                                <i class="fa fa-user"/>
+                                            </div>
+                                            <div class="col-md-10">
+                                                <input id="input_element_resp1" type="text"/>
+                                            </div>
+                                        </div>
                                     </div>
                                 </li>
                                 <li class="row">
@@ -717,8 +730,14 @@
                                         <input type="text" id="input_element_stage_2_user" value="Done" readonly="readonly"/>
                                     </div>
                                     <div class="col-xs-12 col-md-6">
-                                        <i class="fa fa-user"/>
-                                        <input id="input_element_resp2" type="text"/>
+                                        <div class="row">
+                                            <div class="col-md-2">
+                                                <i class="fa fa-user"/>
+                                            </div>
+                                            <div class="col-md-10">
+                                                <input id="input_element_resp2" type="text"/>
+                                            </div>
+                                        </div>
                                     </div>
                                 </li>
                                 <li class="row">
@@ -727,8 +746,14 @@
                                         <input type="text" id="input_element_stage_3_user" value="Cancelled" readonly="readonly"/>
                                     </div>
                                     <div class="col-xs-12 col-md-6">
-                                        <i class="fa fa-user"/>
-                                        <input id="input_element_resp3" type="text"/>
+                                        <div class="row">
+                                            <div class="col-md-2">
+                                                <i class="fa fa-user"/>
+                                            </div>
+                                            <div class="col-md-10">
+                                                <input id="input_element_resp3" type="text"/>
+                                            </div>
+                                        </div>
                                     </div>
                                 </li>
                                 <li class="row">
@@ -737,8 +762,14 @@
                                         <input type="text" id="input_element_stage_4_user" readonly="readonly"/>
                                     </div>
                                     <div class="col-xs-12 col-md-6">
-                                        <i class="fa fa-user"/>
-                                        <input id="input_element_resp4" type="text"/>
+                                        <div class="row">
+                                            <div class="col-md-2">
+                                                <i class="fa fa-user"/>
+                                            </div>
+                                            <div class="col-md-10">
+                                                <input id="input_element_resp4" type="text"/>
+                                            </div>
+                                        </div>
                                     </div>
                                 </li>
                                 <li class="row">
@@ -747,8 +778,14 @@
                                         <input type="text" id="input_element_stage_5_user" readonly="readonly"/>
                                     </div>
                                     <div class="col-xs-12 col-md-6">
-                                        <i class="fa fa-user"/>
-                                        <input id="input_element_resp5" type="text"/>
+                                        <div class="row">
+                                            <div class="col-md-2">
+                                                <i class="fa fa-user"/>
+                                            </div>
+                                            <div class="col-md-10">
+                                                <input id="input_element_resp5" type="text"/>
+                                            </div>
+                                        </div>
                                     </div>
                                 </li>
                                 <li class="row">
@@ -757,8 +794,14 @@
                                         <input type="text" id="input_element_stage_6_user" readonly="readonly"/>
                                     </div>
                                     <div class="col-xs-12 col-md-6">
-                                        <i class="fa fa-user"/>
-                                        <input id="input_element_resp6" type="text"/>
+                                        <div class="row">
+                                            <div class="col-md-2">
+                                                <i class="fa fa-user"/>
+                                            </div>
+                                            <div class="col-md-10">
+                                                <input id="input_element_resp6" type="text"/>
+                                            </div>
+                                        </div>
                                     </div>
                                 </li>
                                 <div class="o_planner_notebook_line_separator"></div>
diff --git a/addons/stock/data/web_planner_data.xml b/addons/stock/data/web_planner_data.xml
index c881e5145fc..909b63e12d5 100644
--- a/addons/stock/data/web_planner_data.xml
+++ b/addons/stock/data/web_planner_data.xml
@@ -204,6 +204,7 @@
                 <t t-set="menu_categoryclasses" t-value="'fa-recycle'"/>
                 <t t-call="web_planner.page">
                     <t t-set="page_title" t-value="'Adapt Reordering Rules'"/>
+                    <t t-set="page_menutitle" t-value="'Reordering Rules'"/>
                     <p>
                         A good inventory management aims to optimize stock levels: not too low (or
                         you may find yourself out of stock) and not too high (your products occupy
@@ -219,6 +220,7 @@
 
                 <t t-call="web_planner.page">
                     <t t-set="page_title" t-value="'Resolve Procurement Exceptions'"/>
+                    <t t-set="page_menutitle" t-value="'Procurement Exceptions'"/>
                     <p>
                         If you configured automatic procurement, Odoo will automatically generate
                         Procurements Orders. You usually don't need to worry about them, but
@@ -292,6 +294,7 @@
 
                 <t t-call="web_planner.page">
                     <t t-set="page_title" t-value="'Real-Time Inventory Valuation'"/>
+                    <t t-set="page_menutitle" t-value="'Inventory Valuation'"/>
                     <p>
                         Imagine the following situation: you ask your accountant for an inventory
                         valuation or the value added by production, he will give you a figure. If
diff --git a/addons/web_planner/static/src/less/web_planner_common.less b/addons/web_planner/static/src/less/web_planner_common.less
index 106a126c135..265df1907ca 100644
--- a/addons/web_planner/static/src/less/web_planner_common.less
+++ b/addons/web_planner/static/src/less/web_planner_common.less
@@ -498,7 +498,7 @@
                                 position: relative;
                                 background-color: #fcf8e3;
 
-                                textarea, input {
+                                textarea, input[type="text"] {
                                     background: #fcf8e3;
                                     border: none;
                                     width: 100%;
diff --git a/addons/website/data/web_planner_data.xml b/addons/website/data/web_planner_data.xml
index 11f33d1628d..b49bd624e51 100644
--- a/addons/website/data/web_planner_data.xml
+++ b/addons/website/data/web_planner_data.xml
@@ -175,12 +175,11 @@
                                 </div>
                                 <div class="panel-body">
                                     <p>
-                                        You can change the look of your theme in a few clicks:
+                                        Use the <i>Customize</i> menu to change the look of your theme:
                                         <li>Background image</li>
                                         <li>Special effects and animations</li>
                                         <li>Colors palette</li>
                                         <li>Fonts</li>
-                                        <span id="theme_customize"><a class="hide_planner" href="#">Customize your theme</a></span>
                                     </p>
                                 </div>
                             </div>
@@ -188,7 +187,7 @@
                     </div>
                     <div>
                         <div class="alert alert-info info_icon" role="alert">
-                            <span class="fa fa-lightbulb-o fa-2x"></span><p>You can also use the <span id="html_editor"><u><a href="#advanced-view-editor" class="hide_planner" data-action='ace'>integrated HTML Editor</a></u></span> to modify the code directly.</p>
+                            <span class="fa fa-lightbulb-o fa-2x"></span><p>You can also use the <i>integrated HTML Editor(from the Customize menu)</i> to modify the code directly.</p>
                         </div>
                         <div class="row">
                             <div class="col-md-7 col-xs-12">
@@ -880,7 +879,7 @@
                             <div class="col-sm-11 col-md-10">
                                 <p> 2. <strong>Setup Gengo</strong><br/>
                                 <li>Install the <a t-att-href="prepare_backend_url('base.open_module_tree', 'form', 'website_gengo')">Gengo module</a> in Odoo</li>
-                                <li>Follow <a t-att-href="prepare_backend_url('base.action_res_company_form', 'form')">these instructions</a> to configure your Gengo API key</li>
+                                <li>Configure your Gengo API key in <a t-att-href="prepare_backend_url('base.action_res_company_form', 'form')">your Company details form</a></li>
                                 </p>
                             </div>
                         </div>