diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index e4c810fa6be..4af3b43d54c 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -23,7 +23,6 @@ import time
 import decimal_precision as dp
 
 import netsvc
-
 from osv import fields, osv, orm
 import pooler
 from tools import config
diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml
index 0d05d5f0d76..9a60b8a7bd0 100644
--- a/addons/account/report/account_analytic_report_view.xml
+++ b/addons/account/report/account_analytic_report_view.xml
@@ -58,7 +58,7 @@
                     <filter icon="terp-account"
                     		string="Pending"
                     		domain="[('state','=','pending')]"/>
-                     <separator orientation="vertical"/>
+                    <separator orientation="vertical"/>
 	                <field name="name"/>
 	                <field name="user_id" widget="selection">
 	                    <filter icon="terp-account"
diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index 2fc950d9e0c..df3955d8180 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -30,7 +30,7 @@
     You can define your multiple levels of recall through the menu:
         Financial Management/Configuration/Payment Terms/Follow-Ups
 
-    Once it's defined, you can automatically prints recall every days
+    Once it's defined, you can automatically print recalls every day
     through simply clicking on the menu:
         Financial_Management/Periodical_Processing/Print_Follow-Ups
 
diff --git a/addons/account_invoice_layout/__openerp__.py b/addons/account_invoice_layout/__openerp__.py
index f2df124dc75..8692385179e 100644
--- a/addons/account_invoice_layout/__openerp__.py
+++ b/addons/account_invoice_layout/__openerp__.py
@@ -32,7 +32,7 @@
         * add titles, comment lines, sub total lines
         * draw horizontal lines and put page breaks
 
-    Moreover, there is one option which allow you to print all the selected invoices with a given special message at the bottom of it. This feature can be very useful for printing your invoices with end-of-year wishes, special punctual conditions...
+    Moreover, there is one option which allows you to print all the selected invoices with a given special message at the bottom of it. This feature can be very useful for printing your invoices with end-of-year wishes, special punctual conditions...
 
     """,
     'author': 'Tiny',
diff --git a/addons/account_payment/__openerp__.py b/addons/account_payment/__openerp__.py
index 0388bc2d4e4..5cdc1254976 100644
--- a/addons/account_payment/__openerp__.py
+++ b/addons/account_payment/__openerp__.py
@@ -28,7 +28,7 @@
     "depends": ["account"],
     "init_xml": [],
     "description": """
-    This module provide :
+    This module provides :
     * a more efficient way to manage invoice payment.
     * a basic mechanism to easily plug various automated payment.
     """,
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 967a03f798b..ed250f0aaf0 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -24,8 +24,8 @@
     "version" : "1.0",
     "author" : 'Tiny & Axelor',
     "description": """
-    India Accounting module includes all the basic requirenment of
-    Basic Accounting, plus new things which available are
+    Indian Accounting module includes all the basic requirenments of
+    Basic Accounting, plus new things which are available :
     * Indian Account Chart
     * New Invoice - (Local, Retail)
     * Invoice Report
diff --git a/addons/analytic_journal_billing_rate/__openerp__.py b/addons/analytic_journal_billing_rate/__openerp__.py
index 0049d03f3c5..f77f5ad625c 100644
--- a/addons/analytic_journal_billing_rate/__openerp__.py
+++ b/addons/analytic_journal_billing_rate/__openerp__.py
@@ -25,7 +25,7 @@
     'category': 'Generic Modules/Others',
     'description': """
 
-    This module allows you to define what is the default invoicing rate for a specific journal on a given account. This is mostly used when a user encode his timesheet: the values are retrieved and the fields are auto-filled... but the possibility to change these values is still available.
+    This module allows you to define what is the default invoicing rate for a specific journal on a given account. This is mostly used when a user encodes his timesheet: the values are retrieved and the fields are auto-filled... but the possibility to change these values is still available.
 
     Obviously if no data has been recorded for the current account, the default value is given as usual by the account data so that this module is perfectly compatible with older configurations.
 
diff --git a/addons/analytic_user_function/__openerp__.py b/addons/analytic_user_function/__openerp__.py
index a6149cabb7c..072d6cfc4f9 100644
--- a/addons/analytic_user_function/__openerp__.py
+++ b/addons/analytic_user_function/__openerp__.py
@@ -26,7 +26,7 @@
     'category': 'Generic Modules/Others',
     'description': """
 
-    This module allows you to define what is the default function of a specific user on a given account. This is mostly used when a user encode his timesheet: the values are retrieved and the fields are auto-filled... but the possibility to change these values is still available.
+    This module allows you to define what is the default function of a specific user on a given account. This is mostly used when a user encodes his timesheet: the values are retrieved and the fields are auto-filled... but the possibility to change these values is still available.
 
     Obviously if no data has been recorded for the current account, the default value is given as usual by the employee data so that this module is perfectly compatible with older configurations.
 
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index de44f6e0333..2c6c8bf3f9b 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -20,10 +20,11 @@
 ##############################################################################
 
 {
-    "name" : "Basic Calendar Functionality",
-    "version" : "1.0",
-    "depends" : ["base"],
-    'description': """Full featured calendar system that support:
+    "name" : "Basic Calendar Functionality", 
+    "version" : "1.0", 
+    "depends" : ["base"], 
+    'description': """Full featured calendar system that supports:
+
     - Alerts (create requests)
     - Recurring events (*)
     - Invitations to others people""",
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 4c3940301b3..bf93c9c775d 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1660,9 +1660,10 @@ class ir_model(osv.osv):
         @param ids: List of IR Model’s IDs.
         @param context: A standard dictionary for contextual values
         """
+        new_ids = isinstance(ids, (str, int, long)) and [ids] or ids
         if not context:
             context = {}
-        data = super(ir_model, self).read(cr, uid, ids, fields=fields, \
+        data = super(ir_model, self).read(cr, uid, new_ids, fields=fields, \
                         context=context, load=load)
         if data:
             for val in data:
diff --git a/addons/base_contact/__openerp__.py b/addons/base_contact/__openerp__.py
index df9992b2ab8..a0fc97aa5a1 100644
--- a/addons/base_contact/__openerp__.py
+++ b/addons/base_contact/__openerp__.py
@@ -25,14 +25,14 @@
     'version': '1.0',
     'category': 'Generic Modules/Base',
     'description': """
-        This module allows you to manage entirely your contacts.
+        This module allows you to manage your contacts entirely.
 
     It lets you define
         *contacts unrelated to a partner,
         *contacts working at several addresses (possibly for different partners),
         *contacts with possibly different functions for each of its job's addresses
 
-    It also add new menu items located in
+    It also adds new menu items located in
         Partners \ Contacts
         Partners \ Functions
 
diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py
index 5521263a270..568d8a612a2 100644
--- a/addons/base_iban/__openerp__.py
+++ b/addons/base_iban/__openerp__.py
@@ -23,7 +23,7 @@
     'version': '1.0',
     'category': 'Generic Modules/Base',
     'description': """
-This module install the base for IBAN (International Bank Account Number) bank accounts and checks for its validity
+This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity
 
     """,
     'author': 'Tiny',
diff --git a/addons/base_module_quality/__openerp__.py b/addons/base_module_quality/__openerp__.py
index eaf73199e43..e6952263268 100644
--- a/addons/base_module_quality/__openerp__.py
+++ b/addons/base_module_quality/__openerp__.py
@@ -27,7 +27,7 @@
     'description': """
 This module's aim is to check the quality of other modules.
 
-It defines a wizard on the list of modules in OpenERP, which allow you to
+It defines a wizard on the list of modules in OpenERP, which allows you to
 evaluate them on different criteria such as: the respect of OpenERP coding
 standards, the speed efficiency...
 
diff --git a/addons/base_module_record/__openerp__.py b/addons/base_module_record/__openerp__.py
index 51dceec5b70..9e91153be2b 100644
--- a/addons/base_module_record/__openerp__.py
+++ b/addons/base_module_record/__openerp__.py
@@ -39,7 +39,7 @@ for custom configurations and demo/testing data.
 
 How to use it:
 Run Administration/Customization/Module Creation/Export Customizations As a Module wizard.
-Select datetime critearea of recording and objects to be recorded and Record module.
+Select datetime critearia of recording and objects to be recorded and Record module.
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
diff --git a/addons/base_report_creator/__openerp__.py b/addons/base_report_creator/__openerp__.py
index a706f0c9317..22d7adffe8b 100644
--- a/addons/base_report_creator/__openerp__.py
+++ b/addons/base_report_creator/__openerp__.py
@@ -24,8 +24,8 @@
     'name': 'Report Creator',
     'version': '1.0',
     'category': 'Generic Modules/Base',
-    'description': """This modules allows you to create any statistic
-report on several object. It's a SQL query builder and browser
+    'description': """This module allows you to create any statistic
+report on several objects. It's a SQL query builder and browser
 for and users.
 
 After installing the module, it adds a menu to define custom report in
diff --git a/addons/board_manufacturing/__openerp__.py b/addons/board_manufacturing/__openerp__.py
index 50afa0d6cbc..e61a1c08fcf 100644
--- a/addons/board_manufacturing/__openerp__.py
+++ b/addons/board_manufacturing/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Board/Manufacturing',
     'description': """
-    This module creates a dashboards for Manufaturing that includes:
+    This module creates a dashboard for Manufaturing that includes:
     * List of next production orders
     * List of deliveries (out picking)
     * Graph of work center load
diff --git a/addons/board_project/__openerp__.py b/addons/board_project/__openerp__.py
index f934c7d3bc5..6d5518b17f2 100644
--- a/addons/board_project/__openerp__.py
+++ b/addons/board_project/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Board/Projects & Services',
     'description': """
-This module implements a dashboard for project member that includes:
+This module implements a dashboard for project members that includes:
     * List of my open tasks
     * List of messages
     * Members list of project
diff --git a/addons/board_purchase/__terp__.py b/addons/board_purchase/__terp__.py
index f5ada7cfe46..bd31ee75d56 100644
--- a/addons/board_purchase/__terp__.py
+++ b/addons/board_purchase/__terp__.py
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Board/Purchase',
     'description': """
-This module implements a dashboard for purcgase management that includes:
+This module implements a dashboard for purchase management that includes:
     * Current Purchase Orders
     * Draft Purchase Orders
     * Graph for quantity and amount per month
diff --git a/addons/board_sale/__openerp__.py b/addons/board_sale/__openerp__.py
index 1c9d01d376a..4c2ae1e88c3 100644
--- a/addons/board_sale/__openerp__.py
+++ b/addons/board_sale/__openerp__.py
@@ -26,7 +26,7 @@
     'category': 'Board/Sales & Purchase',
     'description': """
 This module implements a dashboard for salesman that includes:
-    * You open quotations
+    * Your open quotations
     * Top 10 sales of the month
     * Cases statistics
     * Graph of sales by product
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 0c98fd51c9c..386387b1157 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -32,12 +32,12 @@ assignment, resolution and notification.
 
 Open ERP ensures that all cases are successfully tracked by users, customers and
 suppliers. It can automatically send reminders, escalate the request, trigger
-specific methods and lots of others actions based on your enterprise own rules.
+specific methods and lots of other actions based on your own enterprise rules.
 
 The greatest thing about this system is that users don't need to do anything
 special. They can just send email to the request tracker. Open ERP will take
 care of thanking them for their message, automatically routing it to the
-appropriate staff, and making sure all future correspondence gets to the right
+appropriate staff, and make sure all future correspondence gets to the right
 place.
 
 The CRM module has a email gateway for the synchronisation interface
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 0eddb4aa628..9c24e306154 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 
-<!--Lead Stage Form view -->
+	<!--Lead Stage Form view -->
 
     <record id="crm_lead_stage_act" model="ir.actions.act_window">
         <field name="name">Lead Stages</field>
@@ -16,7 +16,7 @@
         groups="base.group_extended"
         parent="crm.menu_crm_case_stage" />
 
-    <!--  Resource Type Form View -->
+    	<!--  Resource Type Form View -->
 
         <record id="crm_lead_resource_act" model="ir.actions.act_window">
             <field name="name">Lead Resource Type</field>
@@ -31,7 +31,7 @@
             groups="base.group_extended"
             parent="crm.menu_crm_case_resource_type" />
 
-<!-- CRM Lead Form View  -->
+		<!-- CRM Lead Form View  -->
 
         <record model="ir.ui.view" id="crm_case_form_view_leads">
         <field name="name">CRM - Leads Form</field>
@@ -190,7 +190,7 @@
         </field>
     </record>
 
-<!-- CRM Lead Tree View -->
+	<!-- CRM Lead Tree View -->
 
     <record model="ir.ui.view" id="crm_case_tree_view_leads">
         <field name="name">CRM - Leads Tree</field>
@@ -239,7 +239,7 @@
         </field>
     </record>
 
-<!-- CRM Lead Calendar View -->
+	<!-- CRM Lead Calendar View -->
 
     <record model="ir.ui.view" id="crm_case_calendar_view_leads">
         <field name="name">CRM - Leads Calendar</field>
@@ -257,7 +257,7 @@
         </field>
     </record>
 
-<!-- CRM Lead Search View -->
+	<!-- CRM Lead Search View -->
 
     <record id="view_crm_case_leads_filter" model="ir.ui.view">
         <field name="name">CRM - Leads Search</field>
@@ -322,6 +322,5 @@
         </field>
     </record>
 
-
 </data>
 </openerp>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 9136a15d9c0..e84bbb673ee 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-<!-- CRM Meetings Categories Form View -->
+	<!-- CRM Meetings Categories Form View -->
 
     <record id="crm_meeting_categ_action" model="ir.actions.act_window">
         <field name="name">Meeting Categories</field>
@@ -16,7 +16,7 @@
     <menuitem action="crm_meeting_categ_action"
         id="menu_crm_case_meeting-act" parent="crm.menu_crm_case_categ" />
 
-<!-- CRM Meetings Form View -->
+	<!-- CRM Meetings Form View -->
 
     <record model="ir.ui.view" id="crm_case_form_view_meet">
         <field name="name">CRM - Meetings Form</field>
@@ -204,7 +204,7 @@
         </field>
     </record>
 
-<!-- CRM Meeting Tree View  -->
+	<!-- CRM Meeting Tree View  -->
 
     <record model="ir.ui.view" id="crm_case_tree_view_meet">
         <field name="name">CRM - Meetings Tree</field>
@@ -222,7 +222,7 @@
         </field>
     </record>
 
-<!-- CRM Meeting Calendar -->
+	<!-- CRM Meeting Calendar -->
 
     <record model="ir.ui.view" id="crm_case_calendar_view_meet">
         <field name="name">CRM - Meetings Calendar</field>
@@ -238,7 +238,7 @@
         </field>
     </record>
 
-<!-- CRM Meeting Gantt  -->
+	<!-- CRM Meeting Gantt  -->
 
     <record id="crm_case_gantt_view_meet" model="ir.ui.view">
         <field name="name">CRM - Meetings Gantt</field>
@@ -254,7 +254,7 @@
         </field>
     </record>
 
-<!-- CRM Meeting Search View  -->
+	<!-- CRM Meeting Search View  -->
 
     <record id="view_crm_case_meetings_filter" model="ir.ui.view">
         <field name="name">CRM - Meetings Search</field>
@@ -296,7 +296,7 @@
             </field>
         </record>
 
-<!-- Calendar Attendee Form View -->
+		<!-- Calendar Attendee Form View -->
 
         <record id="attendee_form_view_inherit" model="ir.ui.view">
                 <field name="name">calendar.attendee.form.inherit</field>
@@ -310,7 +310,7 @@
                 </field>
         </record>
 
-<!-- Calendar Attendee Tree View -->
+		<!-- Calendar Attendee Tree View -->
 
         <record id="attendee_tree_view_inherit" model="ir.ui.view">
                 <field name="name">calendar.attendee.tree.inherit</field>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 3dbba04567e..6f34e42324d 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 
-<!-- Opportunity Categories Form View -->
+	<!-- Opportunity Categories Form View -->
 
     <record id="crm_opportunity_categ_action" model="ir.actions.act_window">
         <field name="name">Opportunity Categories</field>
@@ -17,7 +17,7 @@
         id="menu_crm_case_opportunity-act"
         parent="crm.menu_crm_case_categ" />
 
-<!-- Opportunity Stages Form View-->
+		<!-- Opportunity Stages Form View-->
 
         <record id="crm_opportunity_stage_act" model="ir.actions.act_window">
             <field name="name">Opportunity Stages</field>
@@ -32,7 +32,7 @@
             id="menu_crm_opportunity_stage_act"
             parent="crm.menu_crm_case_stage" />
 
-<!-- Opportunity Resource Type Form View -->
+		<!-- Opportunity Resource Type Form View -->
 
         <record id="crm_opportunity_resource_act" model="ir.actions.act_window">
             <field name="name">Opportunity Resource Type</field>
@@ -47,7 +47,7 @@
             id="menu_crm_opportunity_resource_act"
             parent="crm.menu_crm_case_resource_type" />
 
-<!-- Opportunities Form View -->
+	<!-- Opportunities Form View -->
 
     <record model="ir.ui.view" id="crm_case_form_view_oppor">
         <field name="name">Opportunities</field>
@@ -204,7 +204,7 @@
         </field>
     </record>
 
-<!-- Opportunities Tree View -->
+	<!-- Opportunities Tree View -->
 
     <record model="ir.ui.view" id="crm_case_tree_view_oppor">
         <field name="name">Opportunities Tree</field>
@@ -246,7 +246,7 @@
         </field>
     </record>
 
-<!-- Opportunities Graph View -->
+	<!-- Opportunities Graph View -->
 
     <record model="ir.ui.view" id="crm_case_graph_view_opportunity">
         <field name="name">CRM - Opportunity Graph</field>
@@ -261,7 +261,7 @@
         </field>
     </record>
 
-<!-- Opportunities Search View -->
+	<!-- Opportunities Search View -->
 
     <record id="view_crm_case_opportunities_filter" model="ir.ui.view">
         <field name="name">CRM - Opportunities Search</field>
@@ -293,11 +293,10 @@
                 <field name="user_id" widget="selection">
                     <filter icon="terp-partner"
                         domain="[('user_id','=',uid)]"
-                        help="My Opportunities" default="1"
-                    />
+                        help="My Opportunities" default="1"/>
                     <filter icon="terp-partner"
                         domain="[('user_id','=', uid)]"
-                        help="Unassigned Opportunities" />
+                        help="Unassigned Opportunities"/>
                 </field>
                 <field name="section_id"
                     default="context.get('section_id', False)" select="1"
@@ -309,23 +308,24 @@
                 <newline/>
                 <group expand="1" string="Group By...">
                     <filter string="Stage" icon="terp-crm" domain="[]"
-                        context="{'group_by':'stage_id'}" />
+                        context="{'group_by':'stage_id'}"/>
                     <filter string="Priority" icon="terp-crm" domain="[]"
-                        context="{'group_by':'priority'}" />
+                        context="{'group_by':'priority'}"/>
                     <filter string="Category" icon="terp-crm"
-                        domain="[]" context="{'group_by':'categ_id'}" />
+                        domain="[]" context="{'group_by':'categ_id'}"/>
 
-                    <separator orientation="vertical" />
+                    <separator orientation="vertical"/>
                     <filter string="Salesman" icon="terp-crm"
-                        domain="[('user_id','=',uid)]" context="{'group_by':'user_id'}" />
-                    <separator orientation="vertical" />
+                        domain="[('user_id','=',uid)]" context="{'group_by':'user_id'}"/>
+                    <separator orientation="vertical"/>
                     <filter string="Creation" icon="terp-project"
-                        domain="[]" context="{'group_by':'create_date'}" />
+                        domain="[]" context="{'group_by':'create_date'}"/>
                     <filter string="Exp.Closing" icon="terp-project"
-                        domain="[]" context="{'group_by':'date_deadline'}" />
+                        domain="[]" context="{'group_by':'date_deadline'}"/>
                 </group>
            </search>
         </field>
     </record>
+
 </data>
 </openerp>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 79e1fc3496b..52450419fd2 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -45,7 +45,7 @@
             </field>
         </record>
 
-<!-- Case Sections Tree View -->
+		<!-- Case Sections Tree View -->
 
         <record id="crm_case_section_view_tree" model="ir.ui.view">
             <field name="name">crm.case.section.tree</field>
@@ -61,7 +61,7 @@
             </field>
         </record>
 
-<!-- Case Sections Action -->
+		<!-- Case Sections Action -->
 
         <record id="crm_case_section_act" model="ir.actions.act_window">
             <field name="name">Sales Team</field>
@@ -70,7 +70,7 @@
             <field name="view_id" ref="crm_case_section_view_tree"/>
         </record>
 
-<!-- CRM Stage Tree View -->
+		<!-- CRM Stage Tree View -->
 
         <record model="ir.ui.view" id="crm_case_stage_tree">
             <field name="name">crm.case.stage.tree</field>
@@ -87,7 +87,7 @@
             </field>
         </record>
 
-<!-- CRM Stage Form View -->
+		<!-- CRM Stage Form View -->
 
         <record model="ir.ui.view" id="crm_case_stage_form">
             <field name="name">crm.case.stage.form</field>
@@ -108,7 +108,7 @@
             </field>
         </record>
 
-<!-- CRM Stage Action -->
+		<!-- CRM Stage Action -->
 
         <record id="crm_case_stage_act" model="ir.actions.act_window">
             <field name="name">Stages</field>
@@ -119,7 +119,7 @@
 
         <menuitem  id="menu_crm_case_stage" name="Stages" parent="base.menu_crm_configuration" groups="base.group_extended"/>
 
-<!-- Case Categories Form View -->
+		<!-- Case Categories Form View -->
 
         <record id="crm_case_categ-view" model="ir.ui.view">
             <field name="name">crm.case.categ.form</field>
@@ -134,7 +134,7 @@
             </field>
         </record>
 
-<!-- Case Categories Tree View -->
+		<!-- Case Categories Tree View -->
 
         <record id="crm_case_categ_tree-view" model="ir.ui.view">
             <field name="name">crm.case.categ.tree</field>
@@ -148,7 +148,7 @@
             </field>
         </record>
 
-<!-- Case Categories Action -->
+		<!-- Case Categories Action -->
 
         <record id="crm_case_categ-act" model="ir.actions.act_window">
             <field name="name">Categories</field>
@@ -163,7 +163,7 @@
             parent="base.menu_crm_configuration" />
 
 
-<!-- Resource Type of case Tree View -->
+		<!-- Resource Type of case Tree View -->
 
         <record model="ir.ui.view" id="crm_case_resource_type_tree">
             <field name="name">crm.case.resource.type.tree</field>
@@ -178,7 +178,7 @@
             </field>
         </record>
 
-<!-- Resource Type of case Form View -->
+		<!-- Resource Type of case Form View -->
 
         <record model="ir.ui.view" id="crm_case_resource_type_form">
             <field name="name">crm.case.resource.type.form</field>
@@ -193,7 +193,7 @@
             </field>
         </record>
 
-<!-- Resource Type of case Action -->
+		<!-- Resource Type of case Action -->
 
         <record id="crm_case_resource_type_act" model="ir.actions.act_window">
             <field name="name">Resource Type</field>
@@ -212,7 +212,7 @@
             <field name="view_id" ref="crm_case_section_view_tree"/>
         </record>
 
-<!-- Cases Tree View  -->
+		<!-- Cases Tree View  -->
 
         <record id="crm_case_log_tree-view" model="ir.ui.view">
             <field name="name">crm.case.log.tree</field>
@@ -232,8 +232,7 @@
             </field>
         </record>
 
-
-<!-- Segmentation line Tree View  -->
+		<!-- Segmentation line Tree View  -->
 
         <record id="crm_segmentation_line_tree-view" model="ir.ui.view">
             <field name="name">crm.segmentation.line.tree</field>
@@ -250,7 +249,7 @@
             </field>
         </record>
 
-<!-- Segmentation line Form View  -->
+		<!-- Segmentation line Form View  -->
 
         <record id="crm_segmentation_line-view" model="ir.ui.view">
             <field name="name">crm.segmentation.line.form</field>
@@ -270,7 +269,7 @@
             </field>
         </record>
 
-<!-- CRM Segmentation  Form View  -->
+		<!-- CRM Segmentation  Form View  -->
 
         <record id="crm_segmentation-view" model="ir.ui.view">
             <field name="name">crm.segmentation.form</field>
@@ -315,7 +314,7 @@
             </field>
         </record>
 
-<!-- CRM Segmentation  Tree View  -->
+		<!-- CRM Segmentation  Tree View  -->
 
         <record id="crm_segmentation_tree-view" model="ir.ui.view">
             <field name="name">crm.segmentation.tree</field>
@@ -375,7 +374,7 @@
                 </field>
         </record>
 
-<!-- Inherit View From Partner  -->
+		<!-- Inherit View From Partner  -->
 
         <record id="view_partners_form_crm1" model="ir.ui.view">
                 <field name="name">view.res.partner.form.crm.inherited1</field>
diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index 684547e0a89..9cdc402ae56 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -24,7 +24,7 @@
     'name': 'Carriers and deliveries',
     'version': '1.0',
     'category': 'Generic Modules/Sales & Purchases',
-    'description': """Allows you to add delivery methods in sales orders and picking.
+    'description': """Allows you to add delivery methods in sale orders and picking.
      You can define your own carrier and delivery grids for prices.
      When creating invoices from picking, Open ERP is able to add and compute the shipping line.
 
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index 7626bd3c51b..8a78ae46fdd 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -31,7 +31,7 @@
     ATTENTION:
     - When you install this module in a running company that have already PDF files stored into the database,
       you will lose them all.
-    - After installing this module PDF's are not longer stored into the database,
+    - After installing this module PDF's are no longer stored into the database,
       but in the servers rootpad like /server/bin/filestore.
 """,
     'author': 'Tiny',
diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py
index 7fcdfd8d0d5..18042dabf93 100644
--- a/addons/document_ftp/__openerp__.py
+++ b/addons/document_ftp/__openerp__.py
@@ -26,7 +26,7 @@
     'category': 'Generic Modules/Others',
     'description': """This is a support FTP Interface with document management system.
     With this module you would not only be able to access documents through open erp
-    also you would be able to connect with them through the file system using the FTP protocol.
+    but you would also be able to connect with them through the file system using the FTP protocol.
 """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index 7fd52a7fc8b..a1276c11643 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -26,7 +26,7 @@
     "version" : "1.0",
     "depends" : ["base"],
     "author" : "Tiny",
-    "description": """Fetchail: 
+    "description": """Fetchmail: 
     * Fetch email from Pop / IMAP server
     * Support SSL
     * Integrated with all Modules
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index be1ce233718..36b54b63d0b 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -28,7 +28,7 @@
     "depends" : ["hr",'hr_recruitment','survey'],
     "description": """
                       Ability to create employees evaluation.
-                      An evaluation can be created by employee for subordinates
+                      An evaluation can be created by employee for subordinates,
                       juniors as well as his manager.The evaluation is done under a plan
                       in which various surveys can be created and it can be defined which
                       level of employee hierarchy fills what and final review and evaluation
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index d8d6e23ac51..ae13b0ce67b 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -34,7 +34,7 @@
     * Validation by the accountant and invoice creation
     * Payment of the invoice to the employee
 
-    This module also use the analytic accounting and is compatible with
+    This module also uses the analytic accounting and is compatible with
     the invoice on timesheet module so that you will be able to automatically
     re-invoice your customer's expenses if your work by project.
     """,
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index bd9df6fcc96..34f14271758 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -105,7 +105,6 @@
             <field name="view_mode">tree,graph</field>
             <field name="context">{'search_default_month':1,'search_default_User':1,'group_by':[], "search_default_user_id": uid}</field>
             <field name="view_id" ref="view_hr_available_holidays_report_search"/>
-
         </record>
 
         <record model="ir.actions.act_window.view" id="action_hr_available_holidays_report_tree">
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index ad8f8335640..b6afe32fb25 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data>
+	<data>
+
     <record id="view_hr_holidays_report_tree" model="ir.ui.view">
         <field name="name">hr.holidays.report.tree</field>
         <field name="model">hr.holidays.report</field>
@@ -152,5 +153,6 @@
             </graph>
         </field>
     </record>
-            </data>
-</openerp>
\ No newline at end of file
+
+    </data>
+</openerp>
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 1e0af949825..758ad78eb8d 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -25,7 +25,7 @@
     'category': 'Generic Modules/Human Resources',
     'description': """
 Manages job positions and the recruitement process. It's integrated with the
-survey module to allows you to define interview for different jobs.
+survey module to allow you to define interview for different jobs.
 
 This module is integrated with the mail gateway to automatically tracks email
 sent to jobs@YOURCOMPANY.com. It's also integrated with the document management
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index 4bd6d3525fc..312f17b44b3 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -25,9 +25,9 @@
     'version': '1.0',
     'category': 'Generic Modules/Human Resources',
     'description': """
-This module implement a timesheet system. Each employee can encode and
+This module implements a timesheet system. Each employee can encode and
 track their time spent on the different projects. A project is an
-analytic account and the time spent on a project generate costs on
+analytic account and the time spent on a project generates costs on
 the analytic account.
 
 Lots of reporting on time and employee tracking are provided.
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index 44058d048cb..997b9f74898 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -25,21 +25,21 @@
     'version': '1.0',
     'category': 'Generic Modules/Human Resources',
     'description': """
-This module help you easily encode and validate timesheet and attendances
+This module helps you to easily encode and validate timesheet and attendances
 within the same view. The upper part of the view is for attendances and
 track (sign in/sign out) events. The lower part is for timesheet.
 
-Others tabs contains statistics views to help you analyse your
+Other tabs contains statistics views to help you analyse your
 time or the time of your team:
 * Time spent by day (with attendances)
 * Time spent by project
 
-This module also implement a complete timesheet validation process:
+This module also implements a complete timesheet validation process:
 * Draft sheet
 * Confirmation at the end of the period by the employee
 * Validation by the project manager
 
-The validation can be configured in te company:
+The validation can be configured in the company:
 * Period size (day, week, month, year)
 * Maximal difference between timesheet and attendances
     """,
diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py
index 0db86965870..f10a00c75e2 100644
--- a/addons/idea/__openerp__.py
+++ b/addons/idea/__openerp__.py
@@ -27,8 +27,8 @@
     'description': """
     This module allows your user to easily and efficiently participate in the innovation of the enterprise.
     It allows everybody to express ideas about different subjects.
-    Then, others users can comment these ideas and vote for particular ideas.
-    Each idea as a score based on the different votes.
+    Then, other users can comment on these ideas and vote for particular ideas.
+    Each idea has a score based on the different votes.
     The managers can obtain an easy view on best ideas from all the users.
     Once installed, check the menu 'Ideas' in the 'Tools' main menu.""",
     'author': 'Tiny',
diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py
index c8fdb530a45..e5d8e1255a6 100644
--- a/addons/l10n_be/__openerp__.py
+++ b/addons/l10n_be/__openerp__.py
@@ -26,7 +26,7 @@
 
     After Installing this module,The Configuration wizard for accounting is launched.
     * We have the account templates which can be helpful to generate Charts of Accounts.
-    * On that particular wizard,You will be asked to pass the name of the company,the chart template to follow,the no. of digits to generate the code for your account and Bank account,currency  to create Journals.
+    * On that particular wizard,You will be asked to pass the name of the company,the chart template to follow,the no. of digits to generate the code for your account and Bank account,currency to create Journals.
         Thus,the pure copy of Chart Template is generated.
     * This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.
 
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index ba10ab52212..9d0b2852abd 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -34,7 +34,7 @@
     "name" : "Switzerland localisation corrected by Camptocamp",
     "description" : """
 Swiss localisation :
- - DTA generation for a lot of paiment types
+ - DTA generation for a lot of payment types
  - BVR management (number generation, report, etc..)
  - Import account move from the bank file (like v11 etc..)
  - Simplify the way you handle the bank statement for reconciliation
diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index efde2f16e61..831bc45d122 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -23,7 +23,7 @@
     "name": "Lunch Module",
     "author": "Tiny",
     "Description": """
-    The lunch module is for keeping record of the order placing and payment of the orders.
+    The lunch module is for keeping record of the order placed and payment of the orders.
     The products are defined under categories and the payment records are maintained user wise
     Every user has a cashbox which keeps track of the amount paid for a particular order.
 
diff --git a/addons/process/__openerp__.py b/addons/process/__openerp__.py
index d8c039ef276..57b28e76311 100644
--- a/addons/process/__openerp__.py
+++ b/addons/process/__openerp__.py
@@ -26,7 +26,7 @@
     'category': 'Generic Modules/Base',
     'description': """
      This module shows the basic processes involved
-     in the selected modules and in the sequence these
+     in the selected modules and in the sequence they
      occur
 
      Note: This applies to the modules containing modulename_process_xml
diff --git a/addons/product_margin/__openerp__.py b/addons/product_margin/__openerp__.py
index 9272287371a..7607c499add 100644
--- a/addons/product_margin/__openerp__.py
+++ b/addons/product_margin/__openerp__.py
@@ -26,7 +26,7 @@
     'category': 'Custom',
     'description': """
 Adds a reporting menu in products that computes sales, purchases, margins
-and others interesting indicators based on invoices. The wizard to launch
+and other interesting indicators based on invoices. The wizard to launch
 the report has several options to help you get the data you need.
 """,
     'author': 'Tiny',
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 3c7e80d4c11..a98b5cb28fd 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -28,7 +28,7 @@
     "category" : "Generic Modules/Projects & Services",
     "depends" : ["product", "analytic", "process", "mail_gateway"],
     "description": """Project management module that track multi-level projects, tasks,
-works done on tasks, eso. It is able to render planning, order tasks, eso.
+work done on tasks, eso. It is able to render planning, order tasks, eso.
     """,
     "init_xml" : [],
     "update_xml": [
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index f0d843dd059..a56ae9435c3 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -215,7 +215,7 @@
     </record>
 
     <!-- Views and action for project  dashboard -->
-       <record id="view_task_by_days_vs_planned_hours_tree" model="ir.ui.view">
+    <record id="view_task_by_days_vs_planned_hours_tree" model="ir.ui.view">
         <field name="name">task.by.days.vs.planned.hours.tree</field>
         <field name="model">task.by.days.vs.planned.hours</field>
         <field name="type">tree</field>
@@ -247,5 +247,6 @@
         <field name="view_mode">graph,tree</field>
         <field name="view_id" ref="view_task_by_days_vs_planned_hours_graph"/>
     </record>
+    
     </data>
 </openerp>
diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index 99bce80caca..70ce9020cf5 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -29,7 +29,7 @@
 
         Long Term Project management module that track planning, scheduling, resources allocation.
         Mainly used with Big project management.
-            - Project Phases will be maintain by Manager of the project
+            - Project Phases will be maintained by Manager of the project
             - Compute Phase Scheduling: Compute start date and end date of the phases which are in draft,open and pending state of the project given.
                                         If no project given then all the draft,open and pending states phases will be taken
             - Compute Task Scheduling: This works same as the scheduler button on project.phase. It takes the project as arguement and computes all the open,draft and pending tasks
diff --git a/addons/project_planning/__openerp__.py b/addons/project_planning/__openerp__.py
index cbc30a912e7..87a68a2e410 100644
--- a/addons/project_planning/__openerp__.py
+++ b/addons/project_planning/__openerp__.py
@@ -32,7 +32,7 @@ This module is based on the analytic accounting and is totally integrated with
 * the holidays management
 * the project management
 
-So that, each department manager can know if someone in his team has still unaloccated time for a given planning (taking in consideration the validated leaves) or if he still needs to encode tasks.
+So that, each department manager can know if someone in his team has still unallocated time for a given planning (taking in consideration the validated leaves) or if he still needs to encode tasks.
 
 At the end of the month, the planning manager can also check if the encoded timesheets are respecting the planned time on each analytic account.
 """,
diff --git a/addons/project_retro_planning/__openerp__.py b/addons/project_retro_planning/__openerp__.py
index 4d89af6bb28..80601db9e81 100644
--- a/addons/project_retro_planning/__openerp__.py
+++ b/addons/project_retro_planning/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '0.1',
     'category': 'Generic Modules/Projects & Services',
     'description': """
-        - If deadline date of project is changed will
+        - If deadline date of project is changed 
           then the deadline date for all the tasks will change to the same  """,
     'author': 'Tiny',
     'depends': ['base', 'project'],
diff --git a/addons/report_intrastat/__openerp__.py b/addons/report_intrastat/__openerp__.py
index 5fb8f7e564c..de9d3af1e44 100644
--- a/addons/report_intrastat/__openerp__.py
+++ b/addons/report_intrastat/__openerp__.py
@@ -26,7 +26,7 @@
     'category': 'Generic Modules/Inventory Control',
     'description': """
     A module that adds intrastat reports.
-    This module gives the details of the goods traded between the countries of Europan Union """,
+    This module gives the details of the goods traded between the countries of European Union """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'product', 'stock', 'sale', 'purchase'],
diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py
index b7c5f4fd512..d204d4a3ee5 100644
--- a/addons/sale_journal/__openerp__.py
+++ b/addons/sale_journal/__openerp__.py
@@ -28,7 +28,7 @@
     The sale journal modules allows you to categorise your
     sales and deliveries (picking lists) between different journals.
     This module is very helpful for bigger companies that
-    works by departments.
+    work by departments.
 
     You can use journal for different purposes, some examples:
     * isolate sales of different departments
diff --git a/addons/scrum/__openerp__.py b/addons/scrum/__openerp__.py
index 3170baca2a1..2f4007793ac 100644
--- a/addons/scrum/__openerp__.py
+++ b/addons/scrum/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Enterprise Specific Modules/Information Technology',
     'description': """
-    This modules implements all concepts defined by the scrum project
+    This module implements all concepts defined by the scrum project
     management methodology for IT companies:
     * Project with sprints, product owner, scrum master
     * Sprints with reviews, daily meetings, feedbacks
@@ -36,10 +36,10 @@
     * Mid-term, long-term road-map
     * Customers/functional requests VS technical ones
 
-    It also create a new reporting:
+    It also creates a new reporting:
     * Burn-down chart
 
-    The scrum projects and tasks inherits from the real projects and
+    The scrum projects and tasks inherit from the real projects and
     tasks, so you can continue working on normal tasks that will also
     include tasks from scrum projects.
 
diff --git a/addons/stock/report/report_stock.py b/addons/stock/report/report_stock.py
index 3e7fe147c73..81e2bb125fd 100644
--- a/addons/stock/report/report_stock.py
+++ b/addons/stock/report/report_stock.py
@@ -95,7 +95,7 @@ class stock_report_tracklots(osv.osv):
     }
     
     def init(self, cr):
-        drop_view_if_exists(cr, 'stock_report_prodlots')
+        drop_view_if_exists(cr, 'stock_report_tracklots')
         cr.execute("""
            create or replace view stock_report_tracklots as (
                 
@@ -150,7 +150,7 @@ class report_stock_lines_date(osv.osv):
         'date': fields.datetime('Latest Inventory Date'),
     }
     def init(self, cr):
-        drop_view_if_exists(cr, 'stock_report_prodlots')
+        drop_view_if_exists(cr, 'report_stock_lines_date')
         cr.execute("""
             create or replace view report_stock_lines_date as (
                 select
diff --git a/addons/stock_planning/__openerp__.py b/addons/stock_planning/__openerp__.py
index 1ff4e8d0b10..100e793805b 100644
--- a/addons/stock_planning/__openerp__.py
+++ b/addons/stock_planning/__openerp__.py
@@ -38,7 +38,7 @@ Because we have another module sale_forecast which uses terms "Sales Forecast" a
 
 Activity with this module is divided to three steps:
 - Creating Periods. Mandatory step.
-- Creating Sale Forecasts and entering quantities to them. Optional step but useful for farther planning.
+- Creating Sale Forecasts and entering quantities to them. Optional step but useful for further planning.
 - Creating Planning lines, entering quantities to them and making Procurement. Making procurement is the final step for the Period.
 
 Periods
@@ -52,7 +52,7 @@ Creating periods is the first step you have to do to use modules features. You c
 Remarks:
 - These periods (officially Stock and Sales Periods) are separated of Financial or other periods in the system.
 - Periods are not assigned to companies (when you use multicompany feature at all). Module suppose that you use the same periods across companies. If you wish to use different periods for different companies define them as you wish (they can overlap). Later on in this text will be indications how to use such periods.
-- When periods are created automatically their start and finish dates are with with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily periods they will have start date 31.01.2010 00:00:00 and end date 31.01.2010 23:59:00. It works only in automatic creation of periods. When you create periods manually you have to take care about hours because you can have incorrect values form sales or stock. 
+- When periods are created automatically their start and finish dates are with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily periods they will have start date 31.01.2010 00:00:00 and end date 31.01.2010 23:59:00. It works only in automatic creation of periods. When you create periods manually you have to take care about hours because you can have incorrect values form sales or stock. 
 - If you use overlapping periods for the same product, warehouse and company results can be unpredictable.
 - If current date doesn't belong to any period or you have holes between periods results can be unpredictable.
 
@@ -65,13 +65,13 @@ You have few menus for Sales forecast in "Sales Management - Sales Forecasts".
 Menu "Create Sales Forecasts for Sales Periods" creates Forecasts for products from selected Category, for selected Period and for selected Warehouse. It is an option "Copy Last Forecast" to copy forecast and other settings of period before this one to created one.
 
 Remarks:
-- This tool doesn't create lines if relevant lines (for the same Product, Period, Warehouse and validated or created by you) already exists. If you wish to create another forecast if relevant lines exists you have to do it manually using menus described bellow.
+- This tool doesn't create lines, if relevant lines (for the same Product, Period, Warehouse and validated or created by you) already exists. If you wish to create another forecast, if relevant lines exists you have to do it manually using menus described bellow.
 - When created lines are validated by someone else you can use this tool to create another lines for the same Period, Product and Warehouse. 
 - When you choose "Copy Last Forecast" created line takes quantity and some settings from your (validated by you or created by you if not validated yet) forecast which is for last period before period of created forecast. If there are few your forecasts for period before this one (it is possible) system takes one of them (no rule which of them).
 
 
 Menus "Sales Forecasts"
-On "Sales Forecast" form mainly you have to enter a forecast quantity in "Product Quantity". Farther calculation can work for draft forecasts. But validation can save your data against any accidental changes. You can click "Validate" button but it is not mandatory.
+On "Sales Forecast" form mainly you have to enter a forecast quantity in "Product Quantity". Further calculation can work for draft forecasts. But validation can save your data against any accidental changes. You can click "Validate" button but it is not mandatory.
 
 Instead of forecast quantity you can enter amount of forecast sales in field "Product Amount". System will count quantity from amount according to Sale price of the Product.
 
@@ -94,7 +94,7 @@ Menu "Create Stock Planning Lines" allows you to create quickly Planning lines f
 
 Under menu "Master Procurement Scheduler" you can generally change the values "Planned Out" and "Planned In" to observe the field "Stock Simulation" and decide if this value would be accurate for end of the Period. 
 "Planned Out" can be based on "Warehouse Forecast" which is the sum of all forecasts for Period and Warehouse. But your planning can be based on any other information you have. It is not necessary to have any forecast. 
-"Planned In" quantity is used to calculate field "Incoming Left" which is the quantity to be procured to make stock as indicated in "Stock Simulation" at the and of Period. You can compare "Stock Simulation" quantity to minimum stock rules visible on the form. But you can plan different quantity than in Minimum Stock Rules. Calculation is made for whole Warehouse by default. But if you want to see values for Stock location of calculated warehouse you can use check box "Stock Location Only".
+"Planned In" quantity is used to calculate field "Incoming Left" which is the quantity to be procured to make stock as indicated in "Stock Simulation" at the end of Period. You can compare "Stock Simulation" quantity to minimum stock rules visible on the form. But you can plan different quantity than in Minimum Stock Rules. Calculation is made for whole Warehouse by default. But if you want to see values for Stock location of calculated warehouse you can use check box "Stock Location Only".
 
 If after few tries you decide that you found correct quantities for "Planned Out" and "Planned In" and you are satisfied with end of period stock calculated in "Stock Simulation" you can click "Procure Incoming Left" button to procure quantity of field "Incoming Left" into the Warehouse. System creates appropriate Procurement Order. You can decide if procurement will be made to Stock or Input location of calculated Warehouse. 
 
diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index ee4099828f2..47840d7082f 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Tools',
     'description': """
-    This module is used for surveing. It depends on the answers or reviews of some questions by different users.
+    This module is used for surveying. It depends on the answers or reviews of some questions by different users.
     A survey may have multiple pages. Each page may contain multiple questions and each question may have multiple answers.
     Different users may give different answers of question and according to that survey is done. 
     Partners are also sent mails with user name and password for the invitation of the survey