diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 614c24866a1..40530fb6e79 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -1,77 +1,74 @@
 <terp>
     <data>
-        
-        #---------------------------------------------------------------------------------------------------------
-        #  Analytic Account form 
-        #---------------------------------------------------------------------------------------------------------
-        
-        # Remove information on Account data => because they move on analysis sheet
-        # --------------------------------------------------------------------------
-        # create a page with invoicing informations
-        # --------------------------------------------------------------------------
+
+        <!--
+        Analytic Account form 
+
+        Remove information on Account data => because they move on analysis sheet
+        create a page with invoicing informations
+        -->
         <record model="ir.ui.view" id="hr_timesheet.account_analytic_account_form_form">
             <field name="name">account.analytic.account.invoice.form.inherit</field> 
             <field name="model">account.analytic.account</field> 
             <field name="type">form</field> 
             <field name="inherit_id" ref="account.view_account_analytic_account_form" />
-             
             <field name="priority" eval="18"/>
             <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Analysis summary">
-                        <separator string="Work done stats" colspan="4" />
-                         
-                        <field name="total_cost"/>
-                        <field name="remaining_ca"/>
-                        <field name="ca_invoiced"/>
-                        <field name="ca_theorical"/>
-                        <newline/>
-                        <!-- <field name="old"/> -->
-                        <field name="hours_quantity"/>
-                        <field name="hours_qtt_invoiced"/>
-                        <field name="remaining_hours"/>
-                        <newline/>
-                        <separator string="Analysis stats" colspan="4" />
-                         
-                        <field name="revenue_per_hour"/>
-                        <field name="real_margin"/>
-                        <field name="theorical_margin"/>
-                        <field name="real_margin_rate"/>
-                        <separator string="Key dates" colspan="4" />
-                         
-                        <field name="last_invoice_date"/>
-                         
-                        <field name="last_worked_invoiced_date" select="2"/>
-                        <field name="last_worked_date"/>
-                        <separator string="To be invoiced" colspan="4" />
-                        <field name="hours_qtt_non_invoiced"/>
-                        <field name="ca_to_invoice" select="2"/>
-                        
-                    </page>
-                    <page string="Stats by month">  
-                        <field name="month_ids" colspan="4" nolabel="1">
-                            <tree string="Month">
-                                <field name="month"/>
-                                <field name="unit_amount" widget="float_time"/>
-                            </tree>
-                        </field>
-                    </page>
-                    <page string="Stats by user"> 
-                        <field name="user_ids" colspan="4" nolabel="1">
-                            <tree string="Users">
-                                <field name="user"/>
-                                <field name="unit_amount" widget="float_time"/>
-                            </tree>
-                        </field>
-                    </page>
-                </notebook>
-                 
+                <form>
+                    <notebook position="inside">
+                        <page string="Analysis summary">
+                            <separator string="Work done stats" colspan="4" />
+
+                            <field name="total_cost"/>
+                            <field name="remaining_ca"/>
+                            <field name="ca_invoiced"/>
+                            <field name="ca_theorical"/>
+                            <newline/>
+                            <!-- <field name="old"/> -->
+                            <field name="hours_quantity"/>
+                            <field name="hours_qtt_invoiced"/>
+                            <field name="remaining_hours"/>
+                            <newline/>
+                            <separator string="Analysis stats" colspan="4" />
+
+                            <field name="revenue_per_hour"/>
+                            <field name="real_margin"/>
+                            <field name="theorical_margin"/>
+                            <field name="real_margin_rate"/>
+                            <separator string="Key dates" colspan="4" />
+
+                            <field name="last_invoice_date"/>
+
+                            <field name="last_worked_invoiced_date" select="2"/>
+                            <field name="last_worked_date"/>
+                            <separator string="To be invoiced" colspan="4" />
+                            <field name="hours_qtt_non_invoiced"/>
+                            <field name="ca_to_invoice" select="2"/>
+
+                        </page>
+                        <page string="Stats by month">  
+                            <field name="month_ids" colspan="4" nolabel="1">
+                                <tree string="Month">
+                                    <field name="month"/>
+                                    <field name="unit_amount" widget="float_time"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Stats by user"> 
+                            <field name="user_ids" colspan="4" nolabel="1">
+                                <tree string="Users">
+                                    <field name="user"/>
+                                    <field name="unit_amount" widget="float_time"/>
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
+
+                </form>
             </field>
         </record>
-        
-        #---------------------------------------------------------------------------------------------------------
-        #  Add information on Account analytic list for the project management
-        #---------------------------------------------------------------------------------------------------------
+
+        <!-- Add information on Account analytic list for the project management -->
         <record model="ir.ui.view" id="view_account_analytic_account_tree_c2c_2">
             <field name="name">account.analytic.account.tree</field>
             <field name="model">account.analytic.account</field>
@@ -89,19 +86,19 @@
             <field name="name">account.analytic.account.tree</field> 
             <field name="model">account.analytic.account</field> 
             <field name="inherit_id" ref="account.view_account_analytic_account_list" />
-             
+
             <field name="type">tree</field> 
             <field name="arch" type="xml"> 
                 <field name="date" position="before"> 
                     <field name="last_invoice_date"/>
-                     
+
                     <field name="ca_to_invoice"/>
                 </field>
-                 
+
             </field>
-             
+
         </record>
-        
+
         <record model="ir.ui.view" id="view_account_analytic_simplified">
             <field name="name">account.analytic.account.simplified.tree</field>
             <field name="model">account.analytic.account</field>
@@ -115,10 +112,10 @@
                     <field name="remaining_hours"/>
                     <field name="ca_to_invoice"/>
                     <field name="last_invoice_date"/>
-                     
+
                 </tree>
             </field>
         </record>
-        
+
     </data>
 </terp>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index ceee39e793c..fccd416273e 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -20,10 +20,7 @@
             </field>
         </record>
         
-        # ------------------------------------------------------
-        # Case Sections
-        # ------------------------------------------------------
-        
+        <!-- Case Sections --> 
         <record id='crm_case_section_view_form' model='ir.ui.view'>
             <field name='name'>crm.case.section.form</field>
             <field name='model'>crm.case.section</field>
@@ -76,12 +73,7 @@
         </record>
         <menuitem name='CRM &amp; SRM/Cases/Cases by Section' groups='base.group_admin' action='crm_case_section_act_tree' id='menu_crm_case_section_act_tree'/>
         
-        
-        
-        # ------------------------------------------------------
-        # Case Categories
-        # ------------------------------------------------------
-        
+        <!-- Case Categories -->
         <record id='crm_case_categ-view' model='ir.ui.view'>
             <field name='name'>crm.case.categ.form</field>
             <field name='model'>crm.case.categ</field>
@@ -115,10 +107,7 @@
         </record>
         <menuitem name='CRM &amp; SRM/Configuration/Cases/Categories' groups='base.group_admin' action='crm_case_categ-act' id='menu_crm_case_categ-act'/>
         
-        # ------------------------------------------------------
-        # Case rules
-        # ------------------------------------------------------
-        
+        <!-- Case rules -->
         <record id='crm_case_rule-view' model='ir.ui.view'>
             <field name='name'>crm.case.rule.form</field>
             <field name='model'>crm.case.rule</field>
@@ -210,9 +199,7 @@
         <menuitem name='CRM &amp; SRM/Configuration/Cases/Rules' groups='base.group_admin' action='crm_case_rule-act' id='menu_crm_case_rule-act'/>
         
         
-        # ------------------------------------------------------
-        # Cases
-        # ------------------------------------------------------
+        <!-- Cases -->
         <record id='crm_case_log_tree-view' model='ir.ui.view'>
             <field name='name'>crm.case.log.tree</field>
             <field name='model'>crm.case.log</field>
diff --git a/addons/delivery/delivery_demo.xml b/addons/delivery/delivery_demo.xml
index 8c3aea9e536..baed5f8ae06 100644
--- a/addons/delivery/delivery_demo.xml
+++ b/addons/delivery/delivery_demo.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0"?>
 <terp>
     <data noupdate="1">
-        
-        #
-        # Create a transporter
-        # 
+        <!-- Create a transporter -->
         
         <record model="res.partner" id="delivery_partner">
             <field name="name">Default Transporter</field>
@@ -16,9 +13,7 @@
             <field name="partner_id" ref="delivery_partner"/>
         </record>
         
-        #
-        # Create a partner
-        # 
+        <!-- Create a partner -->
         
         <record model="product.product" id="delivery_product">
             <field name="name">Default Delivery</field>
@@ -26,9 +21,7 @@
             <field name="categ_id" search="[]" model="product.category"/>
         </record>
         
-        #
-        # Carrier
-        #
+        <!-- Carrier -->
         
         <record id="delivery_carrier" model="delivery.carrier">
             <field name="name">Default Delivery</field>
@@ -36,9 +29,7 @@
             <field name="product_id" ref="delivery_product"/>
         </record>
         
-        #
-        # Carrier Grids
-        #
+        <!-- Carrier Grids -->
         
         <record model="delivery.grid" id="delivery_grid">
             <field name="name">Default Delivery Grid</field>
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index fa113bee301..88012d58e89 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -1,9 +1,7 @@
 <?xml version='1.0'?>
 <terp>
     <data>
-        #
-        # Delivery Carriers
-        # 
+        <!-- Delivery Carriers -->
         <menuitem name='Delivery' sequence='4' id='menu_delivery' parent='stock.menu_stock_configuration'/>
         
         <record id='view_delivery_carrier_tree' model='ir.ui.view'>
@@ -39,10 +37,7 @@
         </record>
         <menuitem action='action_delivery_carrier_form' id='menu_action_delivery_carrier_form' parent='menu_delivery'/>
         
-        #
-        # Delivery Grids
-        # 
-        
+        <!-- Delivery Grids -->
         <record id='view_delivery_grid_tree' model='ir.ui.view'>
             <field name='name'>delivery.grid.tree</field>
             <field name='model'>delivery.grid</field>
@@ -123,10 +118,6 @@
             </field>
         </record>
         
-        
-        
-        
-        
         <record id='view_order_withcarrier_form' model='ir.ui.view'>
             <field name='name'>delivery.sale.order_withcarrier.form.view</field>
             <field name='type'>form</field>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index cab9f672c9a..b8910a9b400 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -68,9 +68,7 @@
             </field>
         </record>
         
-        #
-        # Inherits for account analytic lines
-        #
+        <!-- Inherits for account analytic lines -->
         
         <record id='view_account_analytic_line_tree_inherit' model='ir.ui.view'>
             <field name='name'>account.analytic.line.tree.to_invoice</field>
@@ -96,9 +94,7 @@
             </field>
         </record>
         
-        #
-        # Menus
-        #
+        <!-- Menus -->
         <record id='action_hr_analytic_timesheet_open_tree' model='ir.actions.act_window'>
             <field name='name'>Entries to invoice</field>
             <field name='res_model'>account.analytic.line</field>
diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml
index 27b20a782f0..b627510ee58 100644
--- a/addons/l10n_be/account_pcmn_belgium.xml
+++ b/addons/l10n_be/account_pcmn_belgium.xml
@@ -6381,9 +6381,7 @@
             <field name="parent_id" eval="[(6,0,[a79])]"/>
         </record>
         
-        #
-        # Tax Code Configuration
-        #
+        <!-- Tax Code Configuration -->
         <record model="account.tax.code" id="vat_code_op_base">
             <field name="name">I. Valeur des operations</field>
         </record>
@@ -6580,9 +6578,7 @@
         </record>
         
         
-        #
-        #  TVA - Taxe sur la Valeur Ajoutée
-        #
+        <!-- TVA - Taxe sur la Valeur Ajoutée -->
         <record model="account.tax" id="vat_6">
             <field name="name">VAT 6% - Ventes</field>
             <field name="amount" eval="0.06"/>
diff --git a/addons/mrp/mrp_order_point.xml b/addons/mrp/mrp_order_point.xml
index 68f48791c2f..e8deaba269c 100644
--- a/addons/mrp/mrp_order_point.xml
+++ b/addons/mrp/mrp_order_point.xml
@@ -2,9 +2,7 @@
 <terp>
     <data noupdate="1">
         
-        #
-        # Resource: stock.warehouse.orderpoint
-        #
+        <!-- Resource: stock.warehouse.orderpoint -->
         
         <record id="stock_warehouse_orderpoint_0" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">20.0</field>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 098b61b1794..69c4b0e3595 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -712,9 +712,7 @@
         </record>
         <menuitem name='Production Management/Procurement Orders/All Exceptions/Temporary Procurement Exceptions' action='mrp_procurement_action11' id='menu_mrp_procurement_action11'/>
         
-        =============================
-        Order Point
-        =============================
+        <!-- Order Point -->
         <record id='view_warehouse_orderpoint_tree' model='ir.ui.view'>
             <field name='name'>stock.warehouse.orderpoint.tree</field>
             <field name='model'>stock.warehouse.orderpoint</field>
diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml
index 89a881b5040..5b85e6e6480 100644
--- a/addons/mrp/mrp_workflow.xml
+++ b/addons/mrp/mrp_workflow.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0"?>
 <terp>
     <data>
-        # -----------------------------------------------------------
-        # Production
-        # -----------------------------------------------------------
+        <!-- Production -->
         
         <record model="workflow" id="wkf_prod">
             <field name="name">mrp.production.basic</field>
@@ -114,9 +112,7 @@
             <field name="signal">button_cancel</field>
         </record>
         
-        # -----------------------------------------------------------
-        # Procurement
-        # -----------------------------------------------------------
+        <!-- Procurement -->
         
         <record model="workflow" id="wkf">
             <field name="name">mrp.procurement.basic</field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 016f37e37b0..4ea27673c5e 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -181,9 +181,7 @@
         </record>
         
         
-        # -----------------------------------------------------------------
-        # Unit of Measure
-        # -----------------------------------------------------------------
+        <!-- Unit of Measure -->
         
         <record id='product_uom_tree_view' model='ir.ui.view'>
             <field name='name'>product.uom.tree</field>
diff --git a/addons/purchase/purchase_sequence.xml b/addons/purchase/purchase_sequence.xml
index 69dd3404545..c904664351d 100644
--- a/addons/purchase/purchase_sequence.xml
+++ b/addons/purchase/purchase_sequence.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0"?>
 <terp>
     <data noupdate="1">
-        #
-        # Sequences for purchase.order
-        #
-        
+        <!-- Sequences for purchase.order --> 
         <record model="ir.sequence.type" id="seq_type_purchase_order">
             <field name="name">Purchase Order</field>
             <field name="code">purchase.order</field>
diff --git a/addons/report_account/report_receivable_view.xml b/addons/report_account/report_receivable_view.xml
index 6f804ff6789..7fe1753f3ce 100644
--- a/addons/report_account/report_receivable_view.xml
+++ b/addons/report_account/report_receivable_view.xml
@@ -2,9 +2,7 @@
 <terp>
     <data>
         
-        #
-        # Balance by account type
-        #
+        <!-- Balance by account type -->
         
         <record id='view_crm_case_user_graph' model='ir.ui.view'>
             <field name='name'>report.account.receivable.graph</field>
diff --git a/addons/report_analytic/report_analytic_view.xml b/addons/report_analytic/report_analytic_view.xml
index fde14a466e0..13a8fea47ff 100644
--- a/addons/report_analytic/report_analytic_view.xml
+++ b/addons/report_analytic/report_analytic_view.xml
@@ -1,11 +1,7 @@
 <?xml version='1.0'?>
 <terp>
     <data>
-        
-        #
-        # Analytic accounts to close
-        #
-        
+        <!-- Analytic accounts to close -->
         <record id='view_analytic_account_close_form' model='ir.ui.view'>
             <field name='name'>report.analytic.account.close.form</field>
             <field name='model'>report.analytic.account.close</field>
diff --git a/addons/report_crm/report_crm_view.xml b/addons/report_crm/report_crm_view.xml
index 152d290301f..f6fb594a4b1 100644
--- a/addons/report_crm/report_crm_view.xml
+++ b/addons/report_crm/report_crm_view.xml
@@ -90,9 +90,7 @@
         </record>
         <menuitem name='CRM &amp; SRM/Reporting/All Months/My Cases by Section' action='action_report_crm_case_user_tree_my' id='menu_crm_case_user_tree_my'/>
         
-        #
-        # Cases by section and categoryof case
-        #
+        <!-- # Cases by section and categoryof case -->
         
         <record id='view_crm_case_categ_tree' model='ir.ui.view'>
             <field name='name'>report.crm.case.categ.tree</field>
diff --git a/addons/report_mrp/report_mrp_view.xml b/addons/report_mrp/report_mrp_view.xml
index f6fab235c55..18450747d6e 100644
--- a/addons/report_mrp/report_mrp_view.xml
+++ b/addons/report_mrp/report_mrp_view.xml
@@ -52,9 +52,7 @@
         </record>
         <menuitem name='Production Management/Reporting/Workcenter Loads' action='action_report_workcenter_load_tree' id='menu_report_workcenter_load'/>
         
-        =============================
-        stock.move compared to internal location src/dest
-        ==============================
+        <!-- stock.move compared to internal location src/dest -->
         
         <record id='view_report_in_out_picking_tree' model='ir.ui.view'>
             <field name='name'>report.mrp.inout.tree</field>
diff --git a/addons/report_project/report_project_view.xml b/addons/report_project/report_project_view.xml
index e8080e9e0f6..f7058c2cc12 100644
--- a/addons/report_project/report_project_view.xml
+++ b/addons/report_project/report_project_view.xml
@@ -2,10 +2,7 @@
 <terp>
     <data>
         
-        #
-        # Tasks by projects and users
-        #
-        
+        <!-- Tasks by projects and users -->
         <record id='view_task_project_user_form' model='ir.ui.view'>
             <field name='name'>report.project.task.user.form</field>
             <field name='model'>report.project.task.user</field>
@@ -59,9 +56,7 @@
         </record>
         <menuitem name='Project Management/Reporting/All Months/Tasks Closed by Project and User' action='action_project_task_user_tree' id='menu_project_task_user_tree'/>
         
-        #
-        # Tasks by projects
-        #
+        <!-- Tasks by projects -->
         
         <record id='view_task_project_form' model='ir.ui.view'>
             <field name='name'>report.project.task.form</field>
diff --git a/addons/report_purchase/report_purchase_view.xml b/addons/report_purchase/report_purchase_view.xml
index eceda5c0e24..40629b11617 100644
--- a/addons/report_purchase/report_purchase_view.xml
+++ b/addons/report_purchase/report_purchase_view.xml
@@ -2,10 +2,7 @@
 <terp>
     <data>
         
-        #
-        # Purchases by products by month
-        #
-        
+        <!-- Purchases by products by month -->       
         <record id='view_order_product_form' model='ir.ui.view'>
             <field name='name'>report.purchase.order.product.form</field>
             <field name='model'>report.purchase.order.product</field>
@@ -56,9 +53,7 @@
         </record>
         <menuitem name='Purchase Management/Reporting/All Months/Purchases by Products' action='action_order_product_tree_all' id='menu_report_order_product_all'/>
         
-        #
-        # Purchases by category by month
-        #
+        <!-- Purchases by category by month -->
         
         <record id='view_order_category_form' model='ir.ui.view'>
             <field name='name'>report.purchase.order.category.form</field>
diff --git a/addons/report_sale/report_sale_view.xml b/addons/report_sale/report_sale_view.xml
index 381d9591446..997b36df30b 100644
--- a/addons/report_sale/report_sale_view.xml
+++ b/addons/report_sale/report_sale_view.xml
@@ -2,12 +2,7 @@
 <terp>
     <data>
         
-        #
-        # Sales by products by month
-        #
-        
-        
-        
+        <!--  Sales by products by month -->
         <record id='view_order_product_form' model='ir.ui.view'>
             <field name='name'>report.sale.order.product.form</field>
             <field name='model'>report.sale.order.product</field>
@@ -59,9 +54,7 @@
         </record>
         <menuitem name='Sales Management/Reporting/All Months/Sales by Product' action='action_order_product_tree_all' id='menu_report_order_product_all'/>
         
-        #
-        # Sales by category by month
-        #
+        <!-- Sales by category by month -->
         
         <record id='view_order_category_form' model='ir.ui.view'>
             <field name='name'>report.sale.order.category.form</field>
@@ -124,9 +117,7 @@
         </record>
         <menuitem name='Sales Management/Reporting/All Months/Sales by Category of Products' action='action_order_category_tree_all' id='menu_report_order_category_all'/>
         
-        #
-        # Sales of the month
-        #
+        <!-- Sales of the month -->
         <record id='action_order_sale_list' model='ir.actions.act_window'>
             <field name='name'>Sales of the Month</field>
             <field name='res_model'>sale.order</field>
diff --git a/addons/report_task/report_task_view.xml b/addons/report_task/report_task_view.xml
index 7b493432e2e..27994c07baf 100644
--- a/addons/report_task/report_task_view.xml
+++ b/addons/report_task/report_task_view.xml
@@ -2,9 +2,7 @@
 <terp>
     <data>
         
-        #
-        # Tasks by projects and users
-        #
+        <!-- Tasks by projects and users -->
         
         <record id='view_task_project_form' model='ir.ui.view'>
             <field name='name'>report.project.task.form</field>
diff --git a/addons/report_timesheet/report_timesheet_view.xml b/addons/report_timesheet/report_timesheet_view.xml
index 4ea5511fa5b..f37e1b31fa5 100644
--- a/addons/report_timesheet/report_timesheet_view.xml
+++ b/addons/report_timesheet/report_timesheet_view.xml
@@ -2,9 +2,7 @@
 <terp>
     <data>
         
-        #
-        # Statistics report on timesheet by user
-        #
+        <!-- Statistics report on timesheet by user -->
         
         <record id='view_timesheet_user_graph' model='ir.ui.view'>
             <field name='name'>report_timesheet.user.graph</field>
@@ -90,9 +88,7 @@
         </record>
         <menuitem name='Human Resources/Reporting/All Months/Timesheet by User' action='action_timesheet_user_stat_all' id='menu_report_timesheet_user_all'/>
         
-        #
-        # Statistics report on timesheets to invoice
-        #
+        <!-- Statistics report on timesheets to invoice -->
         
         <record id='view_timesheet_invoice_graph' model='ir.ui.view'>
             <field name='name'>report_timesheet.invoice.graph</field>
@@ -153,9 +149,7 @@
         </record>
         <menuitem name='Human Resources/Reporting/This Month/My Timesheets to Invoice' action='action_timesheet_invoice_stat_my' id='menu_report_timesheet_invoice_my'/>
         
-        #
-        # Statistics report on daily timesheets per account
-        #
+        <!-- Statistics report on daily timesheets per account -->
         
         <record id='view_timesheet_account_date_tree' model='ir.ui.view'>
             <field name='name'>report_timesheet.account.date.tree</field>
@@ -215,9 +209,7 @@
         </record>
         <menuitem name='Human Resources/Reporting/This Month/My Daily Timesheets by Account' action='action_timesheet_account_date_stat_my' id='menu_report_timesheet_account_date_my'/>
         
-        #
-        # Statistics report on timesheets per account
-        #
+        <!-- Statistics report on timesheets per account -->
         
         <record id='view_timesheet_account_tree' model='ir.ui.view'>
             <field name='name'>report_timesheet.account.tree</field>
diff --git a/addons/sale/sale_sequence.xml b/addons/sale/sale_sequence.xml
index 02754831df7..e14c6c2d7d1 100644
--- a/addons/sale/sale_sequence.xml
+++ b/addons/sale/sale_sequence.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0"?>
 <terp>
     <data noupdate="1">
-        
-        #
-        # Sequences for sale.order
-        #
-        
+        <!-- Sequences for sale.order -->
         <record model="ir.sequence.type" id="seq_type_sale_order">
             <field name="name">Sale Order</field>
             <field name="code">sale.order</field>
@@ -16,6 +12,5 @@
             <field name="prefix">SO</field>
             <field name="padding">3</field>
         </record>
-        
     </data>
 </terp>
diff --git a/addons/sale/sale_workflow.xml b/addons/sale/sale_workflow.xml
index 3daa1da78c8..ed4a4983f6a 100644
--- a/addons/sale/sale_workflow.xml
+++ b/addons/sale/sale_workflow.xml
@@ -7,9 +7,7 @@
             <field name="on_create">True</field>
         </record>
         
-        #----------------------------------------------
-        # Activity
-        #----------------------------------------------
+        <!-- Activity -->
         <record model="workflow.activity" id="act_draft">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="flow_start">True</field>
@@ -117,9 +115,7 @@
             <field name="action">action_cancel()</field>
         </record>
         
-        #----------------------------------------------
-        # Transistion
-        #----------------------------------------------
+        <!-- Transistion -->
         
         <record model="workflow.transition" id="trans_invoice_end_done">
             <field name="act_from" ref="act_invoice_end"/>
diff --git a/addons/scrum/scrum_demo.xml b/addons/scrum/scrum_demo.xml
index 4462373f911..d4f0348d1ba 100644
--- a/addons/scrum/scrum_demo.xml
+++ b/addons/scrum/scrum_demo.xml
@@ -2,9 +2,7 @@
 <terp>
     <data noupdate="1">
         
-        #
-        # Resource: scrum.project
-        #
+        <!-- Resource: scrum.project -->
         
         <record id="scrum_project_1" model="scrum.project">
             <!-- FIXME !!! -->
@@ -15,9 +13,7 @@
             <field name="product_owner_id" model="res.users" search="[('login','=','demo')]"/>
         </record>
         
-        #
-        # Resource: scrum.sprint
-        #
+        <!-- Resource: scrum.sprint -->
         
         <record id="scrum_sprint_0" model="scrum.sprint">
             <field name="date_stop">2005-12-20</field>
@@ -28,14 +24,10 @@
             <field name="state">open</field>
         </record>
         
-        #
-        # Resource: scrum.team
-        #
+        <!-- Resource: scrum.team -->
         
         
-        #
-        # Resource: scrum.product.backlog
-        #
+        <!-- Resource: scrum.product.backlog -->
         
         <record id="scrum_product_backlog_0" model="scrum.product.backlog">
             <field name="priority">3</field>
@@ -87,9 +79,7 @@
             <field name="project_id" ref="scrum_project_1"/>
         </record>
         
-        #
-        # Resource: scrum.task
-        #
+        <!-- Resource: scrum.task -->
         
         <record id="scrum_task_3" model="scrum.task">
             <field name="planned_hours">4.0</field>