diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index 9d4f2dbe174..ff2a8e525be 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -194,7 +194,7 @@
Origin
- Your Reference
+ Customer Code
|
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index d28579a6c1a..e986ef4bf0d 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -32,11 +32,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -317,7 +317,7 @@
Review Asset Categories
account.asset.category
form
- form
+ tree,form
diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
index 1c31c4376c5..6a8a286b66c 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -231,7 +231,7 @@
Origin
- Your Reference
+ Customer Code
|
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 8ce97cb2e43..5f81769eb1a 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -6,7 +6,6 @@
id="base.menu_association"
icon="terp-calendar"
sequence="9"
- groups="base.group_extended"
web_icon="images/association.png"
web_icon_hover="images/association-hover.png"/>
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index d3536b10cf1..5a81b5bfccf 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -162,6 +162,7 @@
form
form
{'res_id': user.company_id.id}
+ Fill in your company data (address, logo, bank accounts) so that it's printed on your reports. You can click on the button 'Preview Header' in order to check the header/footer of PDF documents.
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index a98a0cbc6a4..fd6c7e6222a 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -61,7 +61,8 @@ Creates a dashboard for CRM that includes:
'mail',
'base_calendar',
'resource',
- 'board'
+ 'board',
+ 'fetchmail'
],
'init_xml': [
'crm_data.xml',
diff --git a/addons/crm_todo/__openerp__.py b/addons/crm_todo/__openerp__.py
index 3b870153347..641e37e736b 100644
--- a/addons/crm_todo/__openerp__.py
+++ b/addons/crm_todo/__openerp__.py
@@ -23,7 +23,7 @@
{
'name': 'To Do List',
'version': '1.0',
- 'category': 'Customer Relationship Management',
+ "category": 'Hidden/Link',
'complexity': "easy",
'description': """
Todo list for CRM leads and opportunities.
diff --git a/addons/fetchmail/fetchmail_installer_view.xml b/addons/fetchmail/fetchmail_installer_view.xml
index b5bd7df80ca..918b7ecd430 100644
--- a/addons/fetchmail/fetchmail_installer_view.xml
+++ b/addons/fetchmail/fetchmail_installer_view.xml
@@ -1,19 +1,5 @@
-
- Setup Incoming Mail Servers
- ir.actions.act_window
- fetchmail.server
- form
- tree,form
-
- You can connect OpenERP to your incoming mail server so that documents (leads, tasks, issues, etc) are synchronized automatically with your incoming emails.
-
-
-
-
- 4
-
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 56b7165ac56..0b9720a7503 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -32,7 +32,7 @@
-
+
diff --git a/addons/hr_evaluation/board_hr_evaluation_view.xml b/addons/hr_evaluation/board_hr_evaluation_view.xml
index 7f6d3142db5..46daeeff174 100644
--- a/addons/hr_evaluation/board_hr_evaluation_view.xml
+++ b/addons/hr_evaluation/board_hr_evaluation_view.xml
@@ -2,7 +2,7 @@
- My Evaluation Remaining
+ My Appraisal Remaining
ir.actions.act_window
hr_evaluation.evaluation
form
@@ -18,7 +18,7 @@
form
-
+
diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
index ec82292dd84..ec4b46f8a62 100644
--- a/addons/hr_evaluation/hr_evaluation_data.xml
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -2,7 +2,7 @@
- Employee Evaluation
+ Employee Appraisal
20
@@ -11,7 +11,7 @@
open
- Employee Evaluation Form
+ Employee Appraisal Form
@@ -128,7 +128,7 @@
descriptive_text
The comment you entered is in an invalid format.
- * The employee will be responsible for completing a draft of the Appraisal Form as a tool for self-evaluation and a starting point for the supervisor’s evaluation. The employee can add examples of achievements for each criterion.
+ * The employee will be responsible for completing a draft of the Appraisal Form as a tool for self-appraisal and a starting point for the supervisor’s evaluation. The employee can add examples of achievements for each criterion.
Once the form had been filled, the employee send it to his supervisor.
* It is the primary responsibility of the supervisor to gather the necessary input from the appropriate sources of feedback (internal and/or external customers, peers). In case of collaboration with OpenERP SA Belgium, the supervisor must receive completed evaluation form from the employee's Belgian project manager.
@@ -204,7 +204,7 @@ Once the form had been filled, the employee send it to his supervisor.
Subject
matrix_of_choices_only_one_ans
- Recommendations / Evaluations
+ Recommendations / Appraisals
The comment you entered is in an invalid format.
@@ -227,7 +227,7 @@ Once the form had been filled, the employee send it to his supervisor.
Supervisors only :
matrix_of_choices_only_one_ans
- Recommendations / Evaluations
+ Recommendations / Appraisals
The comment you entered is in an invalid format.
@@ -1150,7 +1150,7 @@ Once the form had been filled, the employee send it to his supervisor.
- Manager's Evaluation Plan
+ Manager's Appraisal Plan
@@ -1219,7 +1219,7 @@ Once the form had been filled, the employee send it to his supervisor.
- Run Employee Evaluation
+ Run Employee Appraisal
1
diff --git a/addons/hr_evaluation/hr_evaluation_installer.xml b/addons/hr_evaluation/hr_evaluation_installer.xml
index 842363559a9..10e7773bc62 100644
--- a/addons/hr_evaluation/hr_evaluation_installer.xml
+++ b/addons/hr_evaluation/hr_evaluation_installer.xml
@@ -2,11 +2,12 @@
- Review Evaluation Plans
+ Review Appraisal Plans
ir.actions.act_window
hr_evaluation.plan
form
tree,form
+ You can define appraisal plans (ex: first interview after 6 months, then every year). Then, each employee can be linked to an appraisal plan so that OpenERP can automatically generate interview requests to managers and/or subordinates.
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 4797ef14044..e41d24cf30b 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -37,7 +37,7 @@ system to store and search in your CV base.
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'images': ['images/hr_recruitment_analysis.jpeg','images/hr_recruitment_applicants.jpeg'],
- 'depends': ['decimal_precision', 'hr', 'survey', 'crm'],
+ 'depends': ['decimal_precision', 'hr', 'survey', 'crm', 'fetchmail'],
'update_xml': [
'wizard/hr_recruitment_phonecall_view.xml',
'wizard/hr_recruitment_employee_hired.xml',