diff --git a/addons/account/demo/account_invoice_demo.xml b/addons/account/demo/account_invoice_demo.xml
index 39bb37e6492..280eeeb9e94 100644
--- a/addons/account/demo/account_invoice_demo.xml
+++ b/addons/account/demo/account_invoice_demo.xml
@@ -1,48 +1,48 @@
-
-
-
-
-
-
-
- none
-
- draft
- in_invoice
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Toner Cartridge
-
-
-
-
-
-
-
-
-
-
-
-
- Zed+ Antivirus
-
-
+
+
+
+
+
+
+
+ none
+
+ draft
+ in_invoice
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Toner Cartridge
+
+
+
+
+
+
+
+
+
+
+
+
+ Zed+ Antivirus
+
+
diff --git a/addons/crm/crm_phonecall_demo.xml b/addons/crm/crm_phonecall_demo.xml
index 8e40f1e2e56..568a50f91f4 100644
--- a/addons/crm/crm_phonecall_demo.xml
+++ b/addons/crm/crm_phonecall_demo.xml
@@ -1,95 +1,95 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm_profiling/crm_profiling_demo.xml b/addons/crm_profiling/crm_profiling_demo.xml
index b67cd819fb1..f82acd3e230 100644
--- a/addons/crm_profiling/crm_profiling_demo.xml
+++ b/addons/crm_profiling/crm_profiling_demo.xml
@@ -3,204 +3,204 @@
-
+
-
- Activity sector?
-
-
- Number of employees?
-
-
- Partner level?
-
-
- OpenERP partner?
-
+
+ Activity sector?
+
+
+ Number of employees?
+
+
+ Partner level?
+
+
+ OpenERP partner?
+
-
+
-
- Base questionnaire
- First questionnaire.
-
-
+
+ Base questionnaire
+ First questionnaire.
+
+
-
+
-
- HR
-
-
-
- Telecom
-
-
-
- IT
-
-
-
- 1 to 50
-
-
-
- 51 to 100
-
-
-
- more than 100
-
-
-
- bronze
-
-
-
- silver
-
-
-
- gold
-
-
-
- yes
-
-
-
- no
-
-
+
+ HR
+
+
+
+ Telecom
+
+
+
+ IT
+
+
+
+ 1 to 50
+
+
+
+ 51 to 100
+
+
+
+ more than 100
+
+
+
+ bronze
+
+
+
+ silver
+
+
+
+ gold
+
+
+
+ yes
+
+
+
+ no
+
+
-
+
-
- IT sector
-
-
-
- Telecom sector
-
-
-
- HR sector
-
-
+
+ IT sector
+
+
+
+ Telecom sector
+
+
+
+ HR sector
+
+
-
+
-
- OpenERP partners
-
-
- True
-
-
- Bronze partners
-
-
-
- True
-
-
- Silver partners
-
-
-
- True
-
-
- Gold partners
-
-
-
- True
- True
-
-
- HR partners
-
-
- True
-
-
- Telecom partners
-
-
- True
-
-
- IT partners
-
-
- True
-
+
+ OpenERP partners
+
+
+ True
+
+
+ Bronze partners
+
+
+
+ True
+
+
+ Silver partners
+
+
+
+ True
+
+
+ Gold partners
+
+
+
+ True
+ True
+
+
+ HR partners
+
+
+ True
+
+
+ Telecom partners
+
+
+ True
+
+
+ IT partners
+
+
+ True
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index 1fcbe379cc1..3cdeb85df89 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -7,9 +7,9 @@
-
-
-
+
+
+
normal
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index 9cf4cf388fa..291aea24ab2 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index cb9d012386b..c8683f0d339 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -2,8 +2,8 @@
+ Resource: product.uom.categ
+ -->
All products