diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index 5e9c00ace54..95270721b8e 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -66,7 +66,6 @@
-
@@ -76,7 +75,6 @@
paid
POS/019
- tax_excluded
@@ -106,7 +104,6 @@
POS/019
-
direct
@@ -137,7 +134,6 @@
Stock move (POS 12)
-
@@ -157,7 +153,6 @@
- tax_excluded
@@ -165,7 +160,6 @@
- tax_excluded
@@ -173,11 +167,9 @@
-
[PC3] Medium PC
-
450
2
No Discount
@@ -185,11 +177,9 @@
-
[PC2] Basic+ PC (assembly on order)
-
450
2
No Discount
@@ -197,11 +187,9 @@
-
[PC1] Basic PC
-
450
5
0.10
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index db62c9c8361..92dedc2edf5 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -69,3 +69,4 @@
"access_res_partner_manager","res.partner manager","base.model_res_partner","group_pos_manager",1,0,0,0
"access_product_category_manager","product.category manager","product.model_product_category","group_pos_manager",1,0,0,0
"access_product_pricelist_manager","product.pricelist manager","product.model_product_pricelist","group_pos_manager",1,0,0,0
+"access_product_category_pos_manager","pos.category manager","model_pos_category","group_pos_manager",1,0,0,0"
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index 2b96d3c17d2..1d8eae17fb6 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -30,7 +30,6 @@
single_textbox
1
- 1
1
@@ -39,7 +38,6 @@
What is your company's size?
multiple_choice_only_one_ans
- 1
1
@@ -95,7 +93,6 @@
Where are you located?
multiple_choice_multiple_ans
- 1
@@ -139,7 +136,6 @@
When did you become an OpenERP official partner?
multiple_choice_only_one_ans
- 1
@@ -181,7 +177,6 @@
What kind of solutions do you sell to your customers?
multiple_choice_multiple_ans
- 1
@@ -215,7 +210,6 @@
What do you think about the partnership contract?
multiple_choice_only_one_ans
- 1
@@ -253,7 +247,6 @@
multiple_choice_only_one_ans
text
Why?
- 1
True
@@ -284,7 +277,7 @@
Which maintenance contract do you sell to your customers.
multiple_choice_only_one_ans
- 1
+
@@ -320,7 +313,7 @@
Give your opinion about Launchpad reporting :
matrix_of_choices_only_one_ans
- 1
+
@@ -370,7 +363,7 @@
Leads
matrix_of_choices_only_one_ans
- 1
+
1
@@ -420,7 +413,7 @@
How is OpenERP SA's communication with partners about...
matrix_of_choices_only_one_ans
- 1
+
@@ -477,8 +470,6 @@
In your opinion, how could OpenERP SA better communicate with partners and on which subjects?
comment
- 1
- 1
@@ -506,8 +497,6 @@
What is your company's name?
single_textbox
- 1
- 1
@@ -516,7 +505,7 @@
What is your company's sector?
multiple_choice_multiple_ans
- 1
+
@@ -644,7 +633,6 @@
Which activities do you plan to manage with Odoo ?
multiple_choice_multiple_ans
- 1
@@ -706,7 +694,6 @@
How did you discover Odoo ?
multiple_choice_multiple_ans
- 1
@@ -762,7 +749,6 @@
Why did you subscribe to Odoo?
multiple_choice_only_one_ans
- 1
@@ -801,7 +787,6 @@
How much time did you spend to configure the application?
matrix_of_choices_only_one_ans
- 1
@@ -872,7 +857,6 @@
multiple_choice_only_one_ans
text
No...Why?
- 1
True
@@ -902,7 +886,6 @@
Which interface would you prefer to use?
multiple_choice_only_one_ans
- 1
@@ -932,7 +915,6 @@
Give your opinion :
matrix_of_choices_only_one_ans
- 1
@@ -958,8 +940,6 @@
Is the Control Center user-friendly?
- 1
- 1
No Opinion
@@ -1002,9 +982,7 @@
What do you think about ...
matrix_of_choices_only_one_ans
- 1
1
- 1
@@ -1080,7 +1058,6 @@
single_textbox
1
- 1
@@ -1096,7 +1073,6 @@
How often would you prefer to receive your prepaid bill?
multiple_choice_only_one_ans
- 1
@@ -1128,7 +1104,6 @@
multiple_choice_only_one_ans
text
Comment
- 1
True
@@ -1153,7 +1128,6 @@
How satisfied are you with Odoo's support services :
matrix_of_choices_only_one_ans
- 1
@@ -1209,7 +1183,7 @@
Give your opinion about Odoo's
matrix_of_choices_only_one_ans
- 1
+
@@ -1271,7 +1245,7 @@
If you have any additional comments, write them here :
comment
- 1
+
@@ -1346,7 +1320,6 @@
- 1
@@ -1366,7 +1339,6 @@
- 1
@@ -1386,7 +1358,6 @@
- 1
@@ -1408,7 +1379,6 @@
1
- 1
@@ -1428,7 +1398,6 @@
- 1
@@ -1448,7 +1417,6 @@
- 1
@@ -1468,7 +1436,6 @@
- 1
@@ -1488,7 +1455,6 @@
- 1
@@ -1508,7 +1474,6 @@
- 1
@@ -1528,7 +1493,6 @@
- 1
@@ -1549,7 +1513,6 @@
1
- 1
@@ -1570,7 +1533,6 @@
1
- 1
@@ -1590,7 +1552,6 @@
- 1
@@ -1610,7 +1571,6 @@
- 1
@@ -2191,7 +2151,6 @@
The comment you entered is in an invalid format.
-
at least
@@ -2220,7 +2179,6 @@
The comment you entered is in an invalid format.
-
at least
@@ -2249,7 +2207,6 @@
The comment you entered is in an invalid format.
-
at least
@@ -2278,7 +2235,6 @@
The comment you entered is in an invalid format.
-
at least
@@ -2307,7 +2263,6 @@
The comment you entered is in an invalid format.
-
at least
@@ -2336,7 +2291,6 @@
The comment you entered is in an invalid format.
-
at least
@@ -2365,7 +2319,6 @@
The comment you entered is in an invalid format.
-
at least
@@ -2394,7 +2347,6 @@
The comment you entered is in an invalid format.
-
at least
@@ -2423,7 +2375,6 @@
The comment you entered is in an invalid format.
-
at least
@@ -2452,7 +2403,6 @@
The comment you entered is in an invalid format.
-
at least