diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 4c274f3f0bb..f46a862a165 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -21,8 +21,7 @@
 {
     "name" : "Accounting and Financial Management",
     "version" : "1.1",
-    "depends" : ["product", "analytic", "process","board"],
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category": 'Generic Modules/Accounting',
     "description": """Financial and accounting module that covers:
     General accountings
diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml
index da1cb8f8fa7..3727f7741bf 100644
--- a/addons/account/project/analytic_account_demo.xml
+++ b/addons/account/project/analytic_account_demo.xml
@@ -163,7 +163,7 @@
             <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
         </record>
         <record id="analytic_tiny_at_work" model="account.analytic.account">
-            <field name="name">Tiny AT Work</field>
+            <field name="name">OpenERP SA AT Work</field>
             <field name="code">15</field>
             <field name="parent_id" ref="analytic_partners"/>
             <field name="partner_id" ref="base.res_partner_tinyatwork"/>
diff --git a/addons/account_analytic_default/__openerp__.py b/addons/account_analytic_default/__openerp__.py
index 3f735ebaa6c..b529a92e6f1 100644
--- a/addons/account_analytic_default/__openerp__.py
+++ b/addons/account_analytic_default/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -31,7 +31,7 @@ Allows to automatically select analytic accounts based on criterions:
 * Company
 * Date
     """,
-    'author'    : 'Tiny',
+    'author'    : 'OpenERP SA',
     'website'   : 'http://www.openerp.com',
     'depends'   : ['sale'],
     'init_xml'  : [],
diff --git a/addons/account_analytic_plans/__openerp__.py b/addons/account_analytic_plans/__openerp__.py
index 28fd154b039..0c3d1d07370 100644
--- a/addons/account_analytic_plans/__openerp__.py
+++ b/addons/account_analytic_plans/__openerp__.py
@@ -54,7 +54,7 @@ for one account entry.
 The analytic plan validates the minimum and maximum percentage at the time of creation
 of distribution models.
         """,
-    'author'    : 'Tiny',
+    'author'    : 'OpenERP SA',
     'website'   : 'http://www.openerp.com',
     'depends'   : ['account', 'account_analytic_default'],
     'init_xml'  : [],
diff --git a/addons/account_anglo_saxon/__openerp__.py b/addons/account_anglo_saxon/__openerp__.py
index 735bc9e0007..035fb47f949 100644
--- a/addons/account_anglo_saxon/__openerp__.py
+++ b/addons/account_anglo_saxon/__openerp__.py
@@ -21,7 +21,7 @@
 {
     "name"      : "Stock Accounting for Anglo Saxon countries",
     "version"   : "1.2",
-    "author"    : "Tiny, Veritos",
+    "author"    : "OpenERP SA, Veritos",
     "website"   : "http://tinyerp.com - http://veritos.nl",
     "description" : """This module will support the Anglo-Saxons accounting methodology by
     changing the accounting logic with stock transactions. The difference between the Anglo-Saxon accounting countries
diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py
index 253127fa6c7..5b32009efff 100644
--- a/addons/account_budget/__openerp__.py
+++ b/addons/account_budget/__openerp__.py
@@ -43,7 +43,7 @@ Three reports are available:
     3. The last one is available from the Analytic Chart of Accounts. It gives the spreading, for the selected Analytic Accounts, of the Master Budgets per Budgets.
 
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account'],
     'init_xml': [],
diff --git a/addons/account_cancel/__openerp__.py b/addons/account_cancel/__openerp__.py
index fda719a8178..6bbf304d440 100644
--- a/addons/account_cancel/__openerp__.py
+++ b/addons/account_cancel/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name" : "Account Cancel",
     "version" : "1.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category": 'Generic Modules/Accounting',
     "description": """
     Module adds 'Allow cancelling entries' field on form view of account journal. If set to true it allows user to cancel entries & invoices.
diff --git a/addons/account_chart/__openerp__.py b/addons/account_chart/__openerp__.py
index ca1c4a71351..f96f89fa791 100644
--- a/addons/account_chart/__openerp__.py
+++ b/addons/account_chart/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,7 +25,7 @@
     'version': '1.1',
     'category': 'Generic Modules/Accounting',
     'description': """Remove minimal account chart""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account'],
     'init_xml': [],
diff --git a/addons/account_coda/__openerp__.py b/addons/account_coda/__openerp__.py
index 2a7f30248bb..f758e04aa5b 100644
--- a/addons/account_coda/__openerp__.py
+++ b/addons/account_coda/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name"      : "Account CODA - import bank statements from coda file",
     "version"   : "1.0",
-    "author"    : "Tiny",
+    "author"    : "OpenERP SA",
     "category"  : "Account CODA",
     "description": """
     Module provides functionality to import
diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index 7d47d46f926..f8772f2e50b 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -41,7 +41,7 @@
         Accounting/Reporting/Follow-Ups/All receivable entries
 
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account'],
     'init_xml': [],
diff --git a/addons/account_invoice_layout/__openerp__.py b/addons/account_invoice_layout/__openerp__.py
index 8692385179e..c0503539956 100644
--- a/addons/account_invoice_layout/__openerp__.py
+++ b/addons/account_invoice_layout/__openerp__.py
@@ -35,7 +35,7 @@
     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',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'account'],
     'init_xml': [],
diff --git a/addons/account_payment/__openerp__.py b/addons/account_payment/__openerp__.py
index cd0e162df17..f3e437face2 100644
--- a/addons/account_payment/__openerp__.py
+++ b/addons/account_payment/__openerp__.py
@@ -23,7 +23,7 @@
 {
     "name": "Payment Management",
     "version": "1.1",
-    "author": "Tiny",
+    "author": "OpenERP SA",
     "category": "Generic Modules/Payment",
     "depends": ["account"],
     "init_xml": [],
@@ -32,7 +32,7 @@
     * a more efficient way to manage invoice payment.
     * a basic mechanism to easily plug various automated payment.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['account'],
     'init_xml': [],
     'update_xml': [
diff --git a/addons/account_report/__openerp__.py b/addons/account_report/__openerp__.py
index 5cdacedce34..07afc6ed58f 100644
--- a/addons/account_report/__openerp__.py
+++ b/addons/account_report/__openerp__.py
@@ -29,7 +29,7 @@
     Indicators
     Add a dashboards for accountant that include  Indicators reporting.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account'],
     'init_xml': [],
diff --git a/addons/account_reporting/__openerp__.py b/addons/account_reporting/__openerp__.py
index b31c7fb516b..5ac93d17984 100644
--- a/addons/account_reporting/__openerp__.py
+++ b/addons/account_reporting/__openerp__.py
@@ -26,7 +26,7 @@
     'category': 'Generic Modules/Accounting',
     'description': """Financial and accounting reporting
     Balance Sheet Report""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['account'],
     'init_xml': [],
     'update_xml': [
diff --git a/addons/account_tax_include/__openerp__.py b/addons/account_tax_include/__openerp__.py
index 0981da4888e..f1e6c3dfb74 100644
--- a/addons/account_tax_include/__openerp__.py
+++ b/addons/account_tax_include/__openerp__.py
@@ -29,7 +29,7 @@ Especially useful for b2c businesses.
 
 This module implement the modification on the invoice form.
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account'],
     'init_xml': [],
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index aa2dd4cecd4..6fef206aa8d 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name" : "Accounting Voucher Entries",
     "version" : "1.0",
-    "author" : 'Tiny & Axelor',
+    "author" : 'OpenERP SA & Axelor',
     "description": """Account Voucher module includes all the basic requirements of
     Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc...
     * Voucher Entry
diff --git a/addons/account_voucher_payment/__openerp__.py b/addons/account_voucher_payment/__openerp__.py
index fc4ce593eac..a48d95bda16 100755
--- a/addons/account_voucher_payment/__openerp__.py
+++ b/addons/account_voucher_payment/__openerp__.py
@@ -21,7 +21,7 @@
 {
     "name" : "Invoice Payment/Receipt by Vouchers.",
     "version" : "1.0",
-    "author" : 'Tiny & Axelor',
+    "author" : 'OpenERP SA & Axelor',
     "description": """Extension Account Voucher module includes allows to link payment / receipt 
     entries with voucher, also automatically reconcile during the payment and receipt entries
     """,
diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py
index 143168ab8fe..e0411506dd8 100644
--- a/addons/analytic/__openerp__.py
+++ b/addons/analytic/__openerp__.py
@@ -23,7 +23,7 @@
 {
     "name" : "Analytic Account",
     "version": "1.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
     "category" : "Generic Modules/Projects & Services",
     "depends" : ["base", "decimal_precision"],
diff --git a/addons/analytic_journal_billing_rate/__openerp__.py b/addons/analytic_journal_billing_rate/__openerp__.py
index f77f5ad625c..b422240751c 100644
--- a/addons/analytic_journal_billing_rate/__openerp__.py
+++ b/addons/analytic_journal_billing_rate/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -30,7 +30,7 @@
     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.
 
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['analytic_user_function', 'account', 'hr_timesheet_invoice'],
     'init_xml': [],
diff --git a/addons/analytic_user_function/__openerp__.py b/addons/analytic_user_function/__openerp__.py
index 072d6cfc4f9..8f6af6f84b7 100644
--- a/addons/analytic_user_function/__openerp__.py
+++ b/addons/analytic_user_function/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -31,7 +31,7 @@
     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.
 
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['hr_timesheet_sheet'],
     'init_xml': [],
diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py
index 38d3f2e787e..ff7eef35255 100644
--- a/addons/association/__openerp__.py
+++ b/addons/association/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '0.1',
     'category': 'Profile',
     'description': """This module is to create Profile for Associates""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['membership', 'event'],
     'update_xml': ['security/ir.model.access.csv', 'profile_association.xml'],
     'demo_xml': [],
diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py
index f9940571143..7d96fe90aa1 100644
--- a/addons/auction/__openerp__.py
+++ b/addons/auction/__openerp__.py
@@ -38,7 +38,7 @@
        * Objects Statistics (list)
        * My Objects By Day (list)
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['base', 'account', 'hr_attendance'],
     'init_xml': ['auction_sequence.xml'],
     'update_xml': [
diff --git a/addons/audittrail/__openerp__.py b/addons/audittrail/__openerp__.py
index 7ec81b4eb7e..e660b418aa3 100644
--- a/addons/audittrail/__openerp__.py
+++ b/addons/audittrail/__openerp__.py
@@ -32,7 +32,7 @@
     Administrator can subscribe rules for read,write and
     delete on objects and can check logs.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [],
diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py
index cdb62316d15..7891f6e3ae2 100644
--- a/addons/base_action_rule/__openerp__.py
+++ b/addons/base_action_rule/__openerp__.py
@@ -24,7 +24,7 @@
     'version': '1.0',
     'category': 'Generic Modules/Others',
     'description': "This module allows to implement action rules for any object.",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 2d18f675c6f..65afc868604 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -28,7 +28,7 @@
     - Alerts (create requests)
     - Recurring events
     - Invitations to people""",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     'category': 'Generic Modules/Others',
     'website': 'http://www.openerp.com',
     "init_xml" : [
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index cb2ca806afa..cb754080c02 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -77,11 +77,11 @@
             <field name="arch" type="xml">
                 <tree string="Invitation details">
                     <field name="sent_by_uid" string="Invitation From" />
-                    <field name="role" string="My Role"/>                    
+                    <field name="role" string="My Role"/>
                     <field name="cutype" string="Invitation type"/>
                     <field name="state" />
                     <field name="rsvp" string="Required to Join"/>
-                    <button name="do_tentative" states="needs-action,declined,accepted"                                
+                    <button name="do_tentative" states="needs-action,declined,accepted"
                                 string="Uncertain" type="object"
                                 icon="terp-crm" />
                     <button name="do_accept" string="Accept"
@@ -108,12 +108,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Invitations">
+                   <filter icon="terp-camera_test" name="toreview" string="To Review"
+                       domain="[('state','=', 'needs-action')]"
+                       separator="1" help="Invitations To Review" />
                    <filter icon="terp-check" string="Accepted"
                        domain="[('state','=', 'accepted')]"
                        separator="1" help="Accepted Invitations" />
                    <filter icon="terp-dialog-close" string="Declined"
                        domain="[('state','=', 'declined')]"
                        separator="1" help="Declined Invitations" />
+                   <filter icon="gtk-sort-descending" string="Delegated"
+                       domain="[('state','=', 'delegated')]"
+                       separator="1" help="Delegated Invitations" />
                    <separator orientation="vertical"/>
                    <field name="email" select='1'/>
                    <field name="user_id" select="1"/>
diff --git a/addons/base_contact/__openerp__.py b/addons/base_contact/__openerp__.py
index 8c58d44ff4c..7aa210fd0bf 100644
--- a/addons/base_contact/__openerp__.py
+++ b/addons/base_contact/__openerp__.py
@@ -38,7 +38,7 @@
 
     Pay attention that this module converts the existing addresses into "addresses + contacts". It means that some fields of the addresses will be missing (like the contact name), since these are supposed to be defined in an other object.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base','process'],
     'init_xml': [],
diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py
index 568d8a612a2..c82109d9b54 100644
--- a/addons/base_iban/__openerp__.py
+++ b/addons/base_iban/__openerp__.py
@@ -26,7 +26,7 @@
 This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity
 
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account'],
     'init_xml': ['base_iban_data.xml'],
diff --git a/addons/base_module_doc_rst/__terp__.py b/addons/base_module_doc_rst/__terp__.py
index 4af4b2d3467..8a7fe96b6bd 100644
--- a/addons/base_module_doc_rst/__terp__.py
+++ b/addons/base_module_doc_rst/__terp__.py
@@ -29,7 +29,7 @@
     * It creates a tarball (.tgz file suffix) containing an index file and one file per module
     * Generate Relationship Graph
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [],
diff --git a/addons/base_module_quality/__openerp__.py b/addons/base_module_quality/__openerp__.py
index e6952263268..53e2d0ebb24 100644
--- a/addons/base_module_quality/__openerp__.py
+++ b/addons/base_module_quality/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Base module quality - To check the quality of other modules' ,
     'version': '1.0',
-    'category': 'Tiny Specific Modules/Base module quality',
+    'category': 'OpenERP SA Specific Modules/Base module quality',
     'description': """
 This module's aim is to check the quality of other modules.
 
@@ -37,7 +37,7 @@ For further info, coders may take a look into base_module_quality\README.txt
 WARNING: This module can not work as a ZIP file, you must unzip it before
 using it, otherwise it may crash.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [],
diff --git a/addons/base_module_record/__openerp__.py b/addons/base_module_record/__openerp__.py
index 9e91153be2b..22f413924fb 100644
--- a/addons/base_module_record/__openerp__.py
+++ b/addons/base_module_record/__openerp__.py
@@ -41,7 +41,7 @@ How to use it:
 Run Administration/Customization/Module Creation/Export Customizations As a Module wizard.
 Select datetime critearia of recording and objects to be recorded and Record module.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [],
diff --git a/addons/base_module_record/wizard/base_module_save.py b/addons/base_module_record/wizard/base_module_save.py
index 7f912c74499..ea3fdb22979 100644
--- a/addons/base_module_record/wizard/base_module_save.py
+++ b/addons/base_module_record/wizard/base_module_save.py
@@ -63,7 +63,7 @@ intro_start_fields = {
     'name': {'string':'Module Name', 'type':'char', 'size':64, 'required':True},
     'directory_name': {'string':'Directory Name', 'type':'char', 'size':32, 'required':True},
     'version': {'string':'Version', 'type':'char', 'size':16, 'required':True},
-    'author': {'string':'Author', 'type':'char', 'size':64, 'default': lambda *args: 'Tiny', 'required':True},
+    'author': {'string':'Author', 'type':'char', 'size':64, 'default': lambda *args: 'OpenERP SA', 'required':True},
     'category': {'string':'Category', 'type':'char', 'size':64, 'default': lambda *args: 'Vertical Modules/Parametrization', 'required':True},
     'website': {'string':'Documentation URL', 'type':'char', 'size':64, 'default': lambda *args: 'http://www.openerp.com', 'required':True},
     'description': {'string':'Full Description', 'type':'text', 'required':True},
diff --git a/addons/base_report_creator/__openerp__.py b/addons/base_report_creator/__openerp__.py
index 8e1ba708850..43ced889725 100644
--- a/addons/base_report_creator/__openerp__.py
+++ b/addons/base_report_creator/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -31,7 +31,7 @@ for and users.
 After installing the module, it adds a menu to define custom report in
 the "Dashboard" menu.
 """,
-    'author': 'Tiny & Axelor',
+    'author': 'OpenERP SA & Axelor',
     'website': '',
     'depends': ['base', 'board'],
     'init_xml': [],
diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py
index efdf6cd5a00..50fe73f753f 100644
--- a/addons/base_report_designer/__openerp__.py
+++ b/addons/base_report_designer/__openerp__.py
@@ -33,7 +33,7 @@ This module adds wizards to Import/Export .sxw report that
 you can modify in OpenOffice.Once you have modified it you can
 upload the report using the same wizard.
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': ['base_report_data.xml'],
diff --git a/addons/base_report_designer/wizard/base_report_designer_modify.py b/addons/base_report_designer/wizard/base_report_designer_modify.py
index 273608c03d9..98d0bf07ed9 100644
--- a/addons/base_report_designer/wizard/base_report_designer_modify.py
+++ b/addons/base_report_designer/wizard/base_report_designer_modify.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -39,7 +39,7 @@ intro_fields = {
         'string': 'Introduction',
         'type': 'text',
         'readonly': True,
-        'default': lambda *args: """This system must be used with the Tiny OpenOffice plugin. If you
+        'default': lambda *args: """This system must be used with the OpenERP SA OpenOffice plugin. If you
 did not installed yet, you can find this package on:
     http://www.openerp.com
 
@@ -83,7 +83,7 @@ get_form_result = '''<?xml version="1.0"?>
     <newline/>
     <field name="file_sxw"/>
     <newline/>
-    <label colspan="4" string="This is the template of your requested report.\nSave it as a .SXW file and open it with OpenOffice.\nDon't forget to install the Tiny OpenOffice package to modify it.\nOnce it is modified, re-upload it in Open ERP using this wizard." align="0.0"/>
+    <label colspan="4" string="This is the template of your requested report.\nSave it as a .SXW file and open it with OpenOffice.\nDon't forget to install the OpenERP SA OpenOffice package to modify it.\nOnce it is modified, re-upload it in Open ERP using this wizard." align="0.0"/>
 </form>'''
 
 get_form_fields = {
@@ -144,7 +144,7 @@ rml_form_fields = {
        'file_rml': {
         'string': 'Save As',
         'type': 'binary',
-    } 
+    }
 }
 
 save_rml_arch = '''<?xml version="1.0"?>
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index 6b4df476b4b..fbee18b9476 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -37,7 +37,7 @@
     It also asks screens to help easily configure your company, the header and
     footer, the account chart to install and the language.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': ['base_setup_data.xml'],
diff --git a/addons/base_vat/__openerp__.py b/addons/base_vat/__openerp__.py
index ff34cd3e09c..ab148f97494 100644
--- a/addons/base_vat/__openerp__.py
+++ b/addons/base_vat/__openerp__.py
@@ -28,7 +28,7 @@
     This module follows the methods stated at http://sima-pc.com/nif.php for
     checking the validity of VAT Number assinged to partners in European countries.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['account'],
     'website': 'http://www.openerp.com',
     'update_xml': ['base_vat_view.xml'],
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index bafb4be1602..72f054e0161 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -24,7 +24,7 @@
     'version': '1.0',
     'category': 'Board/Base',
     'description': """Base module for all dashboards.""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['base'],
     'update_xml': ['security/ir.model.access.csv', 'wizard/board_menu_create_view.xml', 'board_view.xml'],
     'demo_xml': [],
diff --git a/addons/caldav/__openerp__.py b/addons/caldav/__openerp__.py
index 3717ad32d83..cdb06a17a1f 100644
--- a/addons/caldav/__openerp__.py
+++ b/addons/caldav/__openerp__.py
@@ -43,7 +43,7 @@
         DATABASE_NAME: Name of database on which OpenERP Calendar is created
         CALENDAR_NAME: Name of calendar to access
 """, 
-    "author" : "Tiny", 
+    "author" : "OpenERP SA", 
     'category': 'Generic Modules/Others', 
     'website': 'http://www.openerp.com', 
     "init_xml" : ["caldav_data.xml"], 
diff --git a/addons/claim_from_delivery/__openerp__.py b/addons/claim_from_delivery/__openerp__.py
index c530a5605fb..c2572e1604e 100644
--- a/addons/claim_from_delivery/__openerp__.py
+++ b/addons/claim_from_delivery/__openerp__.py
@@ -1,5 +1,5 @@
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -14,13 +14,13 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 {
     "name" : "Claim from delivery",
     "version" : "1.0",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category" : "Generic Modules/Inventory Control",
     "depends" : ["base", "crm_claim", "stock"],
     "init_xml" : [],
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 00b964a2039..35870801ae6 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -50,7 +50,7 @@ Create dashboard for CRM that includes:
     * My Cases (list)
     * Jobs Tracking (graph)
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': [
         'base',
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index e69a58206ae..dd18d055f64 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -166,11 +166,9 @@ class crm_lead(osv.osv, crm_case):
     }
 
     def create(self, cr, uid, vals, context=None):
-        lead_id = vals and vals.get('stage_id',False)
-        if not lead_id:
+        if not vals.get('stage_id',False):
             raise osv.except_osv('Error', _('There is no stage defined for this Sales Team'))
-        res_id = super(crm_lead, self).create(cr, uid, vals, context=context)
-        return res_id
+        return super(crm_lead, self).create(cr, uid, vals, context=context)
     
     def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
         """This function returns value of partner email based on Partner Address
diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 3d8c92b44f1..311f8e2424f 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -106,7 +106,7 @@
          <field name="view_mode">tree,form</field>
          <field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view" />
         <field name="domain">[('ref','like','crm.meeting,')]</field>
-         <field name="context">{"search_default_user_id":uid}</field>
+         <field name="context">{"search_default_toreview":1, "search_default_user_id":uid}</field>
      </record>
 
     <menuitem id="menu_attendee_invitations"
diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py
index 0bfb48e328a..ce8f72a3e17 100644
--- a/addons/crm_caldav/__openerp__.py
+++ b/addons/crm_caldav/__openerp__.py
@@ -28,7 +28,7 @@
     New Futures in Meeting:        
         *  Share meeting with other calendar clients like sunbird         
 """, 
-    'author': 'Tiny', 
+    'author': 'OpenERP SA', 
     'website': 'http://www.openerp.com', 
     'depends': ['caldav', 'crm'
                     ], 
diff --git a/addons/crm_fundraising/__openerp__.py b/addons/crm_fundraising/__openerp__.py
index 5c0c7907c3d..0d7e8d656bb 100644
--- a/addons/crm_fundraising/__openerp__.py
+++ b/addons/crm_fundraising/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0', 
     'category': 'Generic Modules/CRM & SRM', 
     'description': """Fundraising""", 
-    'author': 'Tiny', 
+    'author': 'OpenERP SA', 
     'website': 'http://www.openerp.com', 
     'depends': ['crm'], 
     'init_xml': [
diff --git a/addons/crm_helpdesk/__openerp__.py b/addons/crm_helpdesk/__openerp__.py
index b8d2409fcb2..0f663377476 100644
--- a/addons/crm_helpdesk/__openerp__.py
+++ b/addons/crm_helpdesk/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0', 
     'category': 'Generic Modules/CRM & SRM', 
     'description': """Helpdesk Management""", 
-    'author': 'Tiny', 
+    'author': 'OpenERP SA', 
     'website': 'http://www.openerp.com', 
     'depends': ['crm'], 
     'init_xml': [
diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py
index b155e806e0f..191bb32cfd7 100644
--- a/addons/crm_profiling/__openerp__.py
+++ b/addons/crm_profiling/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -35,7 +35,7 @@
 
     * Note: this module is not compatible with the module segmentation, since it's the same which has been renamed.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'crm'],
     'init_xml': [],
diff --git a/addons/decimal_precision/__openerp__.py b/addons/decimal_precision/__openerp__.py
index 113f2be8883..11c6d3b5d8f 100644
--- a/addons/decimal_precision/__openerp__.py
+++ b/addons/decimal_precision/__openerp__.py
@@ -27,7 +27,7 @@ of usage: accounting, sales, purchases, ...
 
 The decimal precision is configured per company.
 """,
-    "author": "Tiny",
+    "author": "OpenERP SA",
     "version": "0.1",
     "depends": ["base"],
     "category" : "Generic Modules/Others",
diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index b5def0592c6..191677292f0 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -29,14 +29,14 @@
      When creating invoices from picking, Open ERP is able to add and compute the shipping line.
 
      """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['sale', 'purchase', 'stock'],
     'init_xml': ['delivery_data.xml'],
     'update_xml': [
         'security/ir.model.access.csv',
         'wizard/delivery_sale_order_view.xml',
         'delivery_report.xml',
-        'delivery_view.xml',        
+        'delivery_view.xml',
         'partner_view.xml'
     ],
     'demo_xml': ['delivery_demo.xml'],
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index f97cf7ec275..3a18406f607 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -38,7 +38,7 @@
     - After installing this module PDF's are no longer stored into the database,
       but in the servers rootpad like /server/bin/filestore.
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['process','board', 'knowledge'],
     'init_xml': [],
diff --git a/addons/document_email/__openerp__.py b/addons/document_email/__openerp__.py
index 5f628b2a02c..e341678e009 100644
--- a/addons/document_email/__openerp__.py
+++ b/addons/document_email/__openerp__.py
@@ -30,7 +30,7 @@
     * Email based Document submission
     * user based document subission
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'init_xml': [],
     'update_xml': [
diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py
index 89281c9072f..fbae2266215 100644
--- a/addons/document_ftp/__openerp__.py
+++ b/addons/document_ftp/__openerp__.py
@@ -29,7 +29,7 @@
     but you would also be able to connect with them through the file system using the 
     a FTP client.
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'document'],
     'init_xml': [],
diff --git a/addons/document_ics/__openerp__.py b/addons/document_ics/__openerp__.py
index 4ad979fec5c..1ef049f9833 100644
--- a/addons/document_ics/__openerp__.py
+++ b/addons/document_ics/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Generic Modules/Others',
     'description': """Allows to synchronise calendars with others applications.""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['document', 'crm'],
     'init_xml': ['document_data.xml'],
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index 24893c275e1..39330f68dea 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -31,7 +31,7 @@
 {
 	"name" : "WebDAV server for Document Management",
 	"version" : "2.0",
-	"author" : "Tiny",
+	"author" : "OpenERP SA",
 	"category" : "Generic Modules/Others",
 	"website": "http://www.openerp.com",
 	"description": """ With this module, the WebDAV server for the documents is activated.
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index e55d282ed9d..0d8bd245db1 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -38,7 +38,7 @@
     - You can access predefined reports about number of registration per event or per event category in:
                 Events / Reporting
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['crm', 'base_contact', 'account'],
     'init_xml': [],
     'update_xml': [
diff --git a/addons/event_project/__openerp__.py b/addons/event_project/__openerp__.py
index 20edb735496..db5540a7508 100644
--- a/addons/event_project/__openerp__.py
+++ b/addons/event_project/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -28,7 +28,7 @@
 
     This module allows you to create retro planning for managing your events.
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['project_retro_planning', 'event'],
     'init_xml': [],
     'update_xml': ['wizard/event_project_view.xml', 'event_view.xml'],
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index 31037cca63f..94dbdf4ef5c 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -25,7 +25,7 @@
     "name" : "Fetchmail Server",
     "version" : "1.0",
     "depends" : ["base", 'mail_gateway'],
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "description": """Fetchmail: 
     * Fetch email from Pop / IMAP server
     * Support SSL
diff --git a/addons/google_map/__openerp__.py b/addons/google_map/__openerp__.py
index 53a90e65fb5..5283ba92711 100644
--- a/addons/google_map/__openerp__.py
+++ b/addons/google_map/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -27,7 +27,7 @@
     'description': """The module adds google map field in partner address
 so that we can directly open google map from the
 url widget.""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [],
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index 443848fbff4..ef54e39bc14 100755
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -23,7 +23,7 @@
 {
     "name": "Human Resources",
     "version": "1.1",
-    "author": "Tiny",
+    "author": "OpenERP SA",
     "category": "Generic Modules/Human Resources",
     "website": "http://www.openerp.com",
     "description": """
@@ -32,7 +32,7 @@
     * HR Departments
     * HR Jobs
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'process', 'resource','board'],
     'init_xml': [],
diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index e31773fb314..383f1dfa8b1 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -29,7 +29,7 @@
     Keeps account of the attendances of the employees on the basis of the
     actions(Sign in/Sign out) performed by them.
        """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['base', 'hr'],
     'update_xml': [
         'security/hr_security.xml',
diff --git a/addons/hr_contract/__openerp__.py b/addons/hr_contract/__openerp__.py
index a649a53478a..949485fa03b 100755
--- a/addons/hr_contract/__openerp__.py
+++ b/addons/hr_contract/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -31,7 +31,7 @@
     * Place of birth, birth date, ...
     You can assign several contracts per employee.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['hr'],
     'init_xml': ['hr_contract_data.xml'],
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 9292b10fd4c..9710a84b4d7 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name" : "Human Resources Evaluation",
     "version": "0.1",
-    "author": "Tiny",
+    "author": "OpenERP SA",
     "category": "Generic Modules/Human Resources",
     "website": "http://www.openerp.com",
     "depends": ["hr",'hr_recruitment','survey'],
diff --git a/addons/hr_evaluation/hr_evaluation_demo.xml b/addons/hr_evaluation/hr_evaluation_demo.xml
index 1147483f8fd..2c5b290b20a 100644
--- a/addons/hr_evaluation/hr_evaluation_demo.xml
+++ b/addons/hr_evaluation/hr_evaluation_demo.xml
@@ -536,7 +536,7 @@
             <field name="descriptive_text">* The employee will be responsible for completing a draft of the Appraisal Form as a tool for self-evaluation and a starting point for the supervisor’s evaluation. The employee can add examples of achievements for each criterion.
 Once the form had been filled, the employee send it to his supervisor.
 
-* It is the primary responsibility of the supervisor to gather the necessary input from     the appropriate sources of feedback (internal and/or external customers, peers). In case of collaboration with Tiny Belgium, the supervisor must receive completed evaluation form from the employee's Belgian project manager.
+* It is the primary responsibility of the supervisor to gather the necessary input from     the appropriate sources of feedback (internal and/or external customers, peers). In case of collaboration with OpenERP SA Belgium, the supervisor must receive completed evaluation form from the employee's Belgian project manager.
 
 * The supervisor synthesizes and integrates all input into the completed appraisal. He motivates his evaluation in the ad hoc fields.
 
@@ -614,7 +614,7 @@ Once the form had been filled, the employee send it to his supervisor.
      * The employee will be responsible for completing a draft of the Appraisal Form as a tool for self-evaluation and a starting point for the supervisor’s evaluation. The employee can add examples of achievements for each criterion.
 Once the form had been filled, the employee send it to his supervisor.
 
-     * It is the primary responsibility of the supervisor to gather the necessary input from the appropriate sources of feedback (internal and/or external customers, peers). In case of collaboration with Tiny Belgium, the supervisor must receive completed evaluation form from the employee's Belgian project manager.
+     * It is the primary responsibility of the supervisor to gather the necessary input from the appropriate sources of feedback (internal and/or external customers, peers). In case of collaboration with OpenERP SA Belgium, the supervisor must receive completed evaluation form from the employee's Belgian project manager.
 
      * The supervisor synthesizes and integrates all input into the completed appraisal. He motivates his evaluation in the ad hoc fields.
 
@@ -1672,7 +1672,7 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="1" name="wait"/>
         </record>
     </data>
-    
+
 <!--    <data noupdate="1">-->
 <!--        <record id="hr_evaluation_interview_1" model="survey.request">-->
 <!--            <field name="state">waiting_answer</field>-->
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 3be26d8ff72..109e658d433 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -38,7 +38,7 @@
     the invoice on timesheet module so that you will be able to automatically
     re-invoice your customer's expenses if your work by project.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['hr', 'account'],
     'init_xml': [],
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index e322a2d8786..e093526ad34 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -23,7 +23,7 @@
 {
     "name": "Human Resources: Holidays management",
     "version": "1.5",
-    "author": "Tiny & Axelor",
+    "author": "OpenERP SA & Axelor",
     "category": "Generic Modules/Human Resources",
     "website": "http://www.openerp.com",
     "description": """Human Ressources: Holidays tracking and workflow
@@ -48,7 +48,7 @@
             for example, you maybe will do it for the user 'admin'
             .
 """,
-    'author': 'Tiny & Axelor',
+    'author': 'OpenERP SA & Axelor',
     'website': 'http://www.openerp.com',
     'depends': ['hr', 'crm', 'process', 'resource'],
     'init_xml': [],
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 59264aec693..48ab3432b52 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -98,7 +98,7 @@ class hr_holidays_status(osv.osv):
         'name': fields.char('Name', size=64, required=True, translate=True),
         'categ_id': fields.many2one('crm.case.categ', 'Meeting Category', domain="[('object_id.model', '=', 'crm.meeting')]", help='If you link this type of leave with a category in the CRM, it will synchronize each leave asked with a case in this category, to display it in the company shared calendar for example.'),
         'color_name': fields.selection([('red', 'Red'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'),
-        'limit': fields.boolean('Allow to Override Limit', help='If you thick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones.'),
+        'limit': fields.boolean('Allow to Override Limit', help='If you tick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones.'),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."),
         'max_leaves': fields.function(_user_left_days, method=True, string='Maximum Leaves Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'),
         'leaves_taken': fields.function(_user_left_days, method=True, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'),
diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 7575dcf9ad6..188a5e84197 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -33,7 +33,7 @@
     * Monthly Payroll Register
     * Integrated with Holiday Management
     """,
-    'author':'Tiny/Axelor',
+    'author':'OpenERP SA/Axelor',
     'website':'http://www.openerp.com',
     'depends': [
         'hr',
diff --git a/addons/hr_payroll_account/__openerp__.py b/addons/hr_payroll_account/__openerp__.py
index 33c17518ab9..7bb1c3027e1 100644
--- a/addons/hr_payroll_account/__openerp__.py
+++ b/addons/hr_payroll_account/__openerp__.py
@@ -1,7 +1,7 @@
 #-*- coding:utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    d$
 #
@@ -28,7 +28,7 @@
     * Payment Encoding
     * Comany Contribution Managemet
     """,
-    'author':'Tiny/Axelor',
+    'author':'OpenERP SA/Axelor',
     'website':'http://www.openerp.com',
     'depends': [
         'hr_payroll',
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 7779a1db90d..084e81147a3 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -31,7 +31,7 @@ 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
 system to store and search in your CV base.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['hr','survey','crm'],
     'update_xml': [
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index 66bcfe46a43..c7207b6761c 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -35,7 +35,7 @@ Lots of reporting on time and employee tracking are provided.
 It is completely integrated with the cost accounting module. It allows you
 to set up a management by affair.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account', 'hr', 'base', 'hr_attendance', 'process'],
     'init_xml': ['hr_timesheet_data.xml'],
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
index 1f3bd0ddf74..27533710f35 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
@@ -51,7 +51,6 @@ class analytical_timesheet_employees(osv.osv_memory):
             'type': 'ir.actions.report.xml',
             'report_name': 'hr.analytical.timesheet_users',
             'datas': datas,
-            'nodestroy':True
             }
 
 analytical_timesheet_employees()
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index 0b96cc94974..f9be64cc454 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -28,7 +28,7 @@
 Module to generate invoices based on costs (human resources, expenses, ...).
 You can define price lists in analytic account, make some theoretical revenue
 reports, eso.""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account', 'hr_timesheet'],
     'init_xml': [],
diff --git a/addons/hr_timesheet_invoice/report/account_analytic_profit.py b/addons/hr_timesheet_invoice/report/account_analytic_profit.py
index c9873f07f18..8b6cd7f9fbd 100644
--- a/addons/hr_timesheet_invoice/report/account_analytic_profit.py
+++ b/addons/hr_timesheet_invoice/report/account_analytic_profit.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -34,8 +34,7 @@ class account_analytic_profit(report_sxw.rml_parse):
     def _user_ids(self, lines):
         user_obj=pooler.get_pool(self.cr.dbname).get('res.users')
         ids=list(set([b.user_id.id for b in lines]))
-        res=user_obj.browse(self.cr, self.uid, ids)
-        return res
+        return user_obj.browse(self.cr, self.uid, ids)
 
     def _journal_ids(self, form, user_id):
         line_obj=pooler.get_pool(self.cr.dbname).get('account.analytic.line')
@@ -47,8 +46,7 @@ class account_analytic_profit(report_sxw.rml_parse):
             ('user_id', '=', user_id),
             ])
         ids=list(set([b.journal_id.id for b in line_obj.browse(self.cr, self.uid, line_ids)]))
-        res=journal_obj.browse(self.cr, self.uid, ids)
-        return res
+        return journal_obj.browse(self.cr, self.uid, ids)
 
     def _line(self, form, journal_ids, user_ids):
         pool=pooler.get_pool(self.cr.dbname)
@@ -103,12 +101,11 @@ class account_analytic_profit(report_sxw.rml_parse):
                     res[id]['amount'] += xxx
             else:
                 res[id]['amount'] += xxx
-
             res[id]['cost']+=line.amount
             res[id]['unit_amount']+=line.unit_amount
         for id in res:
             res[id]['profit']=res[id]['amount']+res[id]['cost']
-            res[id]['eff']='%d' % (-res[id]['amount'] / res[id]['cost'] * 100,)
+            res[id]['eff']=res[id]['cost'] and '%d' % (-res[id]['amount'] / res[id]['cost'] * 100,) or 0.0
         return res.values()
 
     def _lines(self, form):
@@ -119,10 +116,8 @@ class account_analytic_profit(report_sxw.rml_parse):
             ('journal_id', 'in', form['journal_ids'][0][2]),
             ('user_id', 'in', form['employee_ids'][0][2]),
             ])
-        res=line_obj.browse(self.cr, self.uid, ids)
-        return res
+        return line_obj.browse(self.cr, self.uid, ids)
 
 report_sxw.report_sxw('report.account.analytic.profit', 'account.analytic.line', 'addons/hr_timesheet_invoice/report/account_analytic_profit.rml', parser=account_analytic_profit)
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
index 1ead36be0a7..4630ea1e833 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
@@ -46,8 +46,6 @@ class account_analytic_profit(osv.osv_memory):
 
     def print_report(self, cr, uid, ids, context=None):
         line_obj = self.pool.get('account.analytic.line')
-        product_obj = self.pool.get('product.product')
-        price_obj = self.pool.get('product.pricelist')
         if context is None:
             context = {}
         data = {}
@@ -67,14 +65,12 @@ class account_analytic_profit(osv.osv_memory):
              'ids': [],
              'model': 'account.analytic.line',
              'form': data['form']
-                 }
+             }
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'account.analytic.profit',
             'datas': datas,
-            'nodestroy': True
-
-            }
+             }
 
 account_analytic_profit()
 
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index 7930df1f243..73bb496967f 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -43,7 +43,7 @@ The validation can be configured in the company:
 * Period size (day, week, month, year)
 * Maximal difference between timesheet and attendances
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['hr_timesheet', 'hr_timesheet_invoice', 'process'],
     'init_xml': [],
diff --git a/addons/html_view/__openerp__.py b/addons/html_view/__openerp__.py
index 8f32ef9eaaf..8ffd2f6abd4 100644
--- a/addons/html_view/__openerp__.py
+++ b/addons/html_view/__openerp__.py
@@ -1,7 +1,7 @@
 {
     "name" : "Html View",
     "version" : "1.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category" : "Generic Modules/Inventory Control",
     "depends" : ['base'],
     "init_xml" : ['html_view.xml'],
diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py
index d2b854ba0b5..28ab76e8d5e 100644
--- a/addons/idea/__openerp__.py
+++ b/addons/idea/__openerp__.py
@@ -31,7 +31,7 @@
     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',
+    'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'depends': ['base'],
     'init_xml': [],
diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py
index 05b1119c4a4..a20d0378f82 100644
--- a/addons/knowledge/__openerp__.py
+++ b/addons/knowledge/__openerp__.py
@@ -24,7 +24,7 @@
     "name" : "Knowledge Management System",
     "version" : "1.0",
     "depends" : ["base"],
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "description": """Installer for knowledge-based tools
     """,
     'website': 'http://www.openerp.com',
diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py
index e5d8e1255a6..354ae84f9cd 100644
--- a/addons/l10n_be/__openerp__.py
+++ b/addons/l10n_be/__openerp__.py
@@ -39,7 +39,7 @@
                            Path to access : Financial Management/Reporting/Legal Statements/Belgium Statements/Annual Listing Of VAT-Subjected Customers
 
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': [
                 'account',
                 'account_report',
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index 55b5eb1ce1f..708f72d2147 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -28,7 +28,7 @@
 {
     "name" : "France - Plan Comptable Général",
     "version" : "1.0",
-    "author" : "OpenERP",
+    "author" : "OpenERP SA",
     "website": "http://www.openerp.com",
     "category" : "Localisation/Account Charts",
     "description": """This is the module to manage the accounting chart for France in Open ERP.
diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py
index 334b94dad59..18791f9e0f4 100644
--- a/addons/l10n_in/__openerp__.py
+++ b/addons/l10n_in/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,7 +25,7 @@
     "description":"""
     Indian Accounting : chart of Account
     """,
-    "author" : 'Tiny & Axelor',
+    "author" : 'OpenERP SA & Axelor',
     "category": "Localisation/Account Charts",
     "depends" : [
         "account",
diff --git a/addons/l10n_lu/__openerp__.py b/addons/l10n_lu/__openerp__.py
index 391c75f01b4..d17d6b99828 100644
--- a/addons/l10n_lu/__openerp__.py
+++ b/addons/l10n_lu/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -30,7 +30,7 @@ This module installs:
     *the KLUWER Chart of Accounts,
     *the Tax Code Chart for Luxembourg
     *the main taxes used in Luxembourg""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'depends': ['account', 'account_report', 'base_vat', 'base_iban'],
     'init_xml': [],
diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index 46346889834..7ffbe191ba0 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -21,7 +21,7 @@
 
 {
     "name": "Lunch Module",
-    "author": "Tiny",
+    "author": "OpenERP SA",
     "Description": """
     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
diff --git a/addons/mail_gateway/__openerp__.py b/addons/mail_gateway/__openerp__.py
index aa08c7f190d..961f16f541f 100644
--- a/addons/mail_gateway/__openerp__.py
+++ b/addons/mail_gateway/__openerp__.py
@@ -26,7 +26,7 @@
     'description': """The generic email gateway system allows to send and receive emails
     * History for Emails
     * Easy Integration with any Module""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [],
diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py
index e3890ffe8f6..16127d2d343 100644
--- a/addons/marketing/__openerp__.py
+++ b/addons/marketing/__openerp__.py
@@ -24,7 +24,7 @@
     "name" : "Marketing",
     "version" : "1.1",
     "depends" : ["base"],
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category": 'Generic Modules/Marketing',
     "description": "Menu for Marketing",
     'website': 'http://www.openerp.com',
diff --git a/addons/marketing_campaign_mailchimp/__openerp__.py b/addons/marketing_campaign_mailchimp/__openerp__.py
index 2a913eaa8da..ef3a0a82e65 100644
--- a/addons/marketing_campaign_mailchimp/__openerp__.py
+++ b/addons/marketing_campaign_mailchimp/__openerp__.py
@@ -24,7 +24,7 @@
     "name" : "",
     "version" : "1.1",
     "depends" : ['marketing_campaign'],
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category": 'Generic Modules/Marketing',
     "description": """
     """,
diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py
index 1de648ff8e8..fa9052f884c 100644
--- a/addons/membership/__openerp__.py
+++ b/addons/membership/__openerp__.py
@@ -36,7 +36,7 @@ It supports different kind of members:
 It is integrated with sales and accounting to allow you to automatically
 invoice and send propositions for membership renewal.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['base', 'product', 'account', 'process'],
     'init_xml': ['membership_data.xml'],
     'update_xml': [
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index 2a282882099..b5c72d41f68 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -23,7 +23,7 @@
 {
     "name" : "Manufacturing Resource Planning",
     "version" : "1.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
     "category" : "Generic Modules/Production",
     "depends" : ["procurement", "stock", "resource", "purchase", "product","process"],
diff --git a/addons/mrp_jit/__openerp__.py b/addons/mrp_jit/__openerp__.py
index 497a81352f3..aa06715d986 100644
--- a/addons/mrp_jit/__openerp__.py
+++ b/addons/mrp_jit/__openerp__.py
@@ -39,7 +39,7 @@
     
     
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['procurement'],
     'update_xml': ['mrp_jit.xml'],
     'demo_xml': [],
diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py
index 0ce116535c1..6cc27a4e2b2 100644
--- a/addons/mrp_operations/__openerp__.py
+++ b/addons/mrp_operations/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -49,7 +49,7 @@
     So that we can compare the theoretic delay and real delay.
 
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['stock', 'hr', 'purchase', 'product', 'mrp'],
     'init_xml': [],
diff --git a/addons/mrp_repair/__openerp__.py b/addons/mrp_repair/__openerp__.py
index 58efc27f824..c9a4068f925 100644
--- a/addons/mrp_repair/__openerp__.py
+++ b/addons/mrp_repair/__openerp__.py
@@ -33,7 +33,7 @@
            * Repair quotation report
            * Notes for the technician and for the final customer           
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['mrp', 'sale', 'account'],
     'update_xml': [
         'security/ir.model.access.csv',
diff --git a/addons/mrp_subproduct/__openerp__.py b/addons/mrp_subproduct/__openerp__.py
index 02dd29bd73d..f208e0b1a76 100644
--- a/addons/mrp_subproduct/__openerp__.py
+++ b/addons/mrp_subproduct/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -32,7 +32,7 @@ Without this module:
 With this module:
     A + B + C -> D + E
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'mrp'],
     'init_xml': [],
diff --git a/addons/multi_company/__openerp__.py b/addons/multi_company/__openerp__.py
index 8e9105a4c40..fdae2efa3cd 100644
--- a/addons/multi_company/__openerp__.py
+++ b/addons/multi_company/__openerp__.py
@@ -28,7 +28,7 @@
     Multicompany module is for managing a multicompany environment.
     This module is the base module for other multicompany modules.
     """,
-    'author': 'Tiny,SYLEAM',
+    'author': 'OpenERP SA,SYLEAM',
     'website': 'http://www.openerp.com/',
     'depends': [
         'base',
diff --git a/addons/olap/__openerp__.py b/addons/olap/__openerp__.py
index eb0c89db3f8..1171cdd23f9 100644
--- a/addons/olap/__openerp__.py
+++ b/addons/olap/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name" : "Olap Schemes Management",
     "version" : "0.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
     "depends" : ["base"],
     "category" : "Generic Modules/Olap",
diff --git a/addons/olap/olap.py b/addons/olap/olap.py
index 765711793f3..7e5198abb6d 100644
--- a/addons/olap/olap.py
+++ b/addons/olap/olap.py
@@ -1081,7 +1081,7 @@ class olap_query_logs(osv.osv):
     _description = "Olap query logs"
 
     _columns = {
-        'user_id': fields.many2one('res.users', 'Tiny ERP User'),
+        'user_id': fields.many2one('res.users', 'OpenERP SA User'),
         'query': fields.text('Query', required = True),
         'time': fields.datetime('Time', required = True),
         'result_size': fields.integer('Result Size', readonly = True),
diff --git a/addons/olap_crm/__openerp__.py b/addons/olap_crm/__openerp__.py
index 940355ab49c..8bef559c12e 100644
--- a/addons/olap_crm/__openerp__.py
+++ b/addons/olap_crm/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,14 +15,14 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 {
     "name" : "olap_crm",
     "version" : "0.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
     "depends" : ["olap"],
     "category" : "Generic Modules/Olap",
diff --git a/addons/olap_extract/__openerp__.py b/addons/olap_extract/__openerp__.py
index 6e44d5e7e43..b1cd0f6d43f 100644
--- a/addons/olap_extract/__openerp__.py
+++ b/addons/olap_extract/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,14 +15,14 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 {
     "name" : "Module to extracts the schema structure",
     "version" : "0.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
     "depends" : ["olap"],
     "category" : "Generic Modules/Olap",
diff --git a/addons/olap_extract/wizard_olap_extract.py b/addons/olap_extract/wizard_olap_extract.py
index e71d2cb7fe6..75e546bd7b6 100644
--- a/addons/olap_extract/wizard_olap_extract.py
+++ b/addons/olap_extract/wizard_olap_extract.py
@@ -128,7 +128,7 @@ class wizard_olap_extract(wizard.interface):
         _terp= """{
                 "name" : "%(modulename)s",
                 "version" : "0.1",
-                "author" : "Tiny",
+                "author" : "OpenERP SA",
                 "website" : "http://tinyerp.com/",
                 "depends" : ["olap"],
                 "category" : "Generic Modules/Others",
diff --git a/addons/olap_sale/__openerp__.py b/addons/olap_sale/__openerp__.py
index d94e6ee956d..11c2bd5ecbe 100644
--- a/addons/olap_sale/__openerp__.py
+++ b/addons/olap_sale/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name" : "Load Sale Module data in Olap Tables",
     "version" : "0.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
     "depends" : ["olap"],
     "category" : "Generic Modules/Olap",
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index bbfa1677ea2..feaa797aeb5 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -35,7 +35,7 @@ Main features :
  - Allow to refund former sales.
 
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['sale', 'delivery'],
     'init_xml': [],
 
diff --git a/addons/process/__openerp__.py b/addons/process/__openerp__.py
index 57b28e76311..829bd13c1a1 100644
--- a/addons/process/__openerp__.py
+++ b/addons/process/__openerp__.py
@@ -33,7 +33,7 @@
      for e.g product/process/product_process_xml
 
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [],
diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py
index 210dbdc7098..1f11ebcd22e 100644
--- a/addons/procurement/__openerp__.py
+++ b/addons/procurement/__openerp__.py
@@ -23,7 +23,7 @@
 {
     "name" : "Procurements",
     "version" : "1.0",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "website" : "http://www.openerp.com",
     "category" : "Generic Modules/Production",
     "depends" : ["base","process", "product", "stock"],
diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index b3e18ced10a..15dec4892d1 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -23,7 +23,7 @@
 {
     "name" : "Products & Pricelists",
     "version" : "1.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category" : "Generic Modules/Inventory Control",
     "depends" : ["base", "process", "decimal_precision"],
     "init_xml" : [],
diff --git a/addons/product_margin/__openerp__.py b/addons/product_margin/__openerp__.py
index e80f14ae490..495c3a76b53 100644
--- a/addons/product_margin/__openerp__.py
+++ b/addons/product_margin/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -29,7 +29,7 @@ Adds a reporting menu in products that computes sales, purchases, margins
 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',
+    'author': 'OpenERP SA',
     'depends': ['base', 'product', 'account'],
     'update_xml': [
                    'security/ir.model.access.csv',
diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py
index ae977e633ff..f767ea3526e 100644
--- a/addons/product_visible_discount/__openerp__.py
+++ b/addons/product_visible_discount/__openerp__.py
@@ -20,7 +20,7 @@
 {
     "name": "Visible Discount",
     "version": "1.0",
-    "author": "Tiny",
+    "author": "OpenERP SA",
     "category": "Generic Modules/Sales & Purchases",
     "description": """
     This module lets you calculate discounts on Sale Order lines and Invoice lines base on the partner's pricelist.
diff --git a/addons/profile_accounting/__openerp__.py b/addons/profile_accounting/__openerp__.py
index 9e02bd3e275..b438db8e7b2 100644
--- a/addons/profile_accounting/__openerp__.py
+++ b/addons/profile_accounting/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Profile',
     'description': """Profile for Accounting""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['account', 'board_account', 'account_followup'],
     'update_xml': ['security/ir.model.access.csv', 'profile_accounting.xml'],
     'demo_xml': [],
diff --git a/addons/profile_manufacturing/__openerp__.py b/addons/profile_manufacturing/__openerp__.py
index f9c45b7260e..8d079681916 100644
--- a/addons/profile_manufacturing/__openerp__.py
+++ b/addons/profile_manufacturing/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Profile',
     'description': """Profile for manufacturing industries""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['mrp', 'sale', 'delivery', 'board_manufacturing', 'product_margin', 'sale_delivery_report'],
     'update_xml': ['security/ir.model.access.csv', 'profile_manufacturing.xml'],
     'demo_xml': [],
diff --git a/addons/profile_tools/__openerp__.py b/addons/profile_tools/__openerp__.py
index 508a68e819f..45206fd081f 100644
--- a/addons/profile_tools/__openerp__.py
+++ b/addons/profile_tools/__openerp__.py
@@ -24,7 +24,7 @@
     "name" : "Miscellaneous Tools",
     "version" : "1.0",
     "depends" : ["base"],
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category" : "Tools",
     "description": """Installs tools for lunch,survey,subscription and audittrail
     module
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index b5ff85fcc3c..3a6134b76ae 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -23,7 +23,7 @@
 {
     "name": "Project Management",
     "version": "1.1",
-    "author": "Tiny",
+    "author": "OpenERP SA",
     "website": "http://www.openerp.com",
     "category": "Generic Modules/Projects & Services",
     "depends": ["product", "analytic", "mail_gateway", "board"],
diff --git a/addons/project_caldav/__openerp__.py b/addons/project_caldav/__openerp__.py
index c8f379b18e5..1e78db79bf0 100644
--- a/addons/project_caldav/__openerp__.py
+++ b/addons/project_caldav/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name": "Caldav task management",
     "version": "1.0",
-    "author": "Tiny",
+    "author": "OpenERP SA",
     "category": "Generic Modules/Others",
     "description": """ Synchronize between Project task and Caldav Vtodo.""",
     "depends": ["project", "caldav", "base_calendar"],
diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py
index 971b2e8e324..1707c1f76d8 100644
--- a/addons/project_gtd/__openerp__.py
+++ b/addons/project_gtd/__openerp__.py
@@ -37,7 +37,7 @@ recording them externally. That way, the mind is freed from the job of
 remembering everything that needs to be done, and can concentrate on actually
 performing those tasks.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['project'],
     'init_xml': [],
     'update_xml': [
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 84414cf8a1b..5f04ad40640 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -28,7 +28,7 @@
     'description': """
         This module provide Issues/Bugs Management in Project
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': [
         'crm',
diff --git a/addons/project_issue_sheet/__openerp__.py b/addons/project_issue_sheet/__openerp__.py
index 7f2d124f8b8..db08233cc98 100644
--- a/addons/project_issue_sheet/__openerp__.py
+++ b/addons/project_issue_sheet/__openerp__.py
@@ -28,7 +28,7 @@
     'description': """ 
                     This module adds the Timesheet support for the Issues/Bugs Management in Project
                 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': [
         'project_issue',
diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index ae391ebbb03..0fb16cdc23d 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name": "Long Term Project Management",
     "version": "1.1",
-    "author": "Tiny",
+    "author": "OpenERP SA",
     "website": "http://www.openerp.com",
     "category": "Generic Modules/Projects & Services",
     "depends": ["resource", "project"],
diff --git a/addons/project_messages/__openerp__.py b/addons/project_messages/__openerp__.py
index 6127533e9c5..473bb6325e8 100644
--- a/addons/project_messages/__openerp__.py
+++ b/addons/project_messages/__openerp__.py
@@ -24,7 +24,7 @@
     "name": "In-Project Messaging System",
     "version": "1.0",
     "depends": ["project"],
-    "author": "Tiny",
+    "author": "OpenERP SA",
     "description": """
     This module provides the functionality to send messages within a project.
     A user can send messages individually to other user. He can even broadcast
diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py
index 2ac983e67e4..7ca37e87d13 100644
--- a/addons/project_mrp/__openerp__.py
+++ b/addons/project_mrp/__openerp__.py
@@ -45,7 +45,7 @@ This module is useful to be able to invoice services based on tasks
 automatically created via sale orders.
 
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['project', 'procurement', 'sale', 'mrp_jit'],
     'init_xml': [],
diff --git a/addons/project_planning/__openerp__.py b/addons/project_planning/__openerp__.py
index 74c1a3fcabe..330a2e2b0c7 100644
--- a/addons/project_planning/__openerp__.py
+++ b/addons/project_planning/__openerp__.py
@@ -36,7 +36,7 @@ So that, each department manager can know if someone in his team has still unall
 
 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.
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': [
         'project',
diff --git a/addons/project_retro_planning/__openerp__.py b/addons/project_retro_planning/__openerp__.py
index aa0b106bbad..a9ba0a1111a 100644
--- a/addons/project_retro_planning/__openerp__.py
+++ b/addons/project_retro_planning/__openerp__.py
@@ -26,7 +26,7 @@
     'description': """
         - If deadline date of project is changed
           then the deadline date for all the tasks will change to the same  """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['base', 'project'],
     'init_xml': [],
     'update_xml': [],
diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py
index 9fa418d6ca3..847263ba7d3 100644
--- a/addons/project_scrum/__openerp__.py
+++ b/addons/project_scrum/__openerp__.py
@@ -46,7 +46,7 @@
     More information on the methodology:
     * http://controlchaos.com
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['project', 'process'],
     'init_xml': [],
     'update_xml': [
diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index 009d83a03fd..3dd6600efc9 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -28,7 +28,7 @@
         the Timesheet line entries for particular date and particular user  with the effect of creating, editing and deleting either ways.
 
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'project', 'hr_timesheet_sheet'],
     'init_xml': [],
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 479155f0932..423bd090d24 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -33,7 +33,7 @@
     * Graph for quantity and amount per month    
 
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'account', 'stock', 'process', 'procurement'],
     'data': [
diff --git a/addons/purchase_analytic_plans/__openerp__.py b/addons/purchase_analytic_plans/__openerp__.py
index 88dff2cdc57..743dce1006a 100644
--- a/addons/purchase_analytic_plans/__openerp__.py
+++ b/addons/purchase_analytic_plans/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -27,7 +27,7 @@
     'description': """
     The base module to manage analytic distribution and purchase orders.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['purchase', 'account_analytic_plans'],
     'init_xml': [],
diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index d707af0e50d..f4c8942bf47 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -20,7 +20,7 @@
 {
     "name" : "Purchase - Purchase Requisition",
     "version" : "0.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category" : "Generic Modules/Sales & Purchases",
     "website" : "http://www.openerp.com",
     "description": """
diff --git a/addons/report_designer/__openerp__.py b/addons/report_designer/__openerp__.py
index f36973f740b..7e002bf03bf 100644
--- a/addons/report_designer/__openerp__.py
+++ b/addons/report_designer/__openerp__.py
@@ -24,7 +24,7 @@
     "name" : "Reporting Tools",
     "version" : "1.0",
     "depends" : ["base"],
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category": "Tools",
     "description": """Installer for reporting tools selection
     """,
diff --git a/addons/report_intrastat/__openerp__.py b/addons/report_intrastat/__openerp__.py
index de9d3af1e44..16860ef9b70 100644
--- a/addons/report_intrastat/__openerp__.py
+++ b/addons/report_intrastat/__openerp__.py
@@ -27,7 +27,7 @@
     'description': """
     A module that adds intrastat reports.
     This module gives the details of the goods traded between the countries of European Union """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'product', 'stock', 'sale', 'purchase'],
     'init_xml': ['report_intrastat_data.xml'],
diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py
index 41872ca22a7..01780626db7 100644
--- a/addons/resource/__openerp__.py
+++ b/addons/resource/__openerp__.py
@@ -23,7 +23,7 @@
 {
     "name" : "Resource",
     "version" : "1.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category" : "Generic Modules/Projects & Services",
     "website" : "http://www.openerp.com",
     "description": """
@@ -34,7 +34,7 @@
      It also manages the leaves of every resource.
 
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'process'],
     'init_xml': [],
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index d60b132a827..d6943e617d0 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -46,7 +46,7 @@
     * Graph of sales by product
     * Graph of cases of the month
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['product', 'stock', 'procurement', 'process','board'],
     'init_xml': [],
diff --git a/addons/sale_analytic_plans/__openerp__.py b/addons/sale_analytic_plans/__openerp__.py
index c3e803fd4f6..0394816f4eb 100644
--- a/addons/sale_analytic_plans/__openerp__.py
+++ b/addons/sale_analytic_plans/__openerp__.py
@@ -27,7 +27,7 @@
     'description': """
     The base module to manage analytic distribution and sales orders.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['sale', 'account_analytic_plans'],
     'init_xml': [],
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 007711da5d0..4b8baa1654e 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -34,7 +34,7 @@ The case is then closed and linked to the generated sale order.
 We suggest you to install this module if you installed both the sale and the
 crm modules.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['sale', 'crm'],
     'init_xml': [],
diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py
index 80643eb5d4d..8453b24b05a 100644
--- a/addons/sale_journal/__openerp__.py
+++ b/addons/sale_journal/__openerp__.py
@@ -46,7 +46,7 @@
 
     Some statistics by journals are provided.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['sale'],
     'init_xml': ['sale_journal_data.xml'],
diff --git a/addons/sale_layout/__openerp__.py b/addons/sale_layout/__openerp__.py
index c8868de9c2b..b4c647627ba 100755
--- a/addons/sale_layout/__openerp__.py
+++ b/addons/sale_layout/__openerp__.py
@@ -22,7 +22,7 @@
     "name" : "Sale Order Layout Improvement",
     "version" : "1.0",
     "depends" : ["base", "sale"],
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "description": """
     This module provides some features to improve the layout of the Sale Order.
 
diff --git a/addons/sale_margin/__openerp__.py b/addons/sale_margin/__openerp__.py
index 0a0d523a7ae..3a59a69f105 100644
--- a/addons/sale_margin/__openerp__.py
+++ b/addons/sale_margin/__openerp__.py
@@ -26,7 +26,7 @@
     This module adds the 'Margin' on sales order,
     which gives the profitability by calculating the difference between the Unit Price and Cost Price
     """,
-    "author":"Tiny",
+    "author":"OpenERP SA",
     "depends":["sale"],
     "demo_xml":[],
     "update_xml":["security/ir.model.access.csv","sale_margin_view.xml","report/report_margin_view.xml"],
diff --git a/addons/sale_mrp/__openerp__.py b/addons/sale_mrp/__openerp__.py
index 1496e46c87e..79a08afd57a 100644
--- a/addons/sale_mrp/__openerp__.py
+++ b/addons/sale_mrp/__openerp__.py
@@ -30,7 +30,7 @@
     orders generated from sale orders.
     It adds sale name and sale Reference on production order
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['mrp', 'sale'],
     'init_xml': [],
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index e6762e91ef2..9dc2a6658d8 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -24,7 +24,7 @@
     "name" : "Share Management",
     "version" : "1.1",
     "depends" : ["base"],
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category": 'Generic Modules',
     "description": """The goal is to implement a generic sharing mechanism, where user of OpenERP
 can share data from OpenERP to their colleagues, customers, or friends.
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index d25698194e6..e4fa7c18080 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name" : "Inventory Management",
     "version" : "1.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "description" : """OpenERP Inventory Management module can manage multi-warehouses, multi and structured stock locations.
 Thanks to the double entry management, the inventory controlling is powerful and flexible:
 * Moves history and planning,
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 83f828203f6..c46a9210aad 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1583,16 +1583,19 @@ class stock_move(osv.osv):
 
         def create_chained_picking(self, cr, uid, moves, context=None):
             new_moves = []
-            res_obj =  self.pool.get('res.company')
+            res_obj = self.pool.get('res.company')
+            picking_obj = self.pool.get('stock.picking')
+            move_obj = self.pool.get('stock.move')
             if context is None:
                 context = {}
             for picking, todo in self._chain_compute(cr, uid, moves, context=context).items():
                 ptype = todo[0][1][5] and todo[0][1][5] or self.pool.get('stock.location').picking_type_get(cr, uid, todo[0][0].location_dest_id, todo[0][1][0])
-                pick_name = ''
+                pick_name = picking.name
                 if ptype == 'delivery':
                     pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.delivery')
-                pickid = self.pool.get('stock.picking').create(cr, uid, {
-                    'name': pick_name or picking.name,
+
+                pickid = picking_obj.create(cr, uid, {
+                    'name': pick_name,
                     'origin': str(picking.origin or ''),
                     'type': ptype,
                     'note': picking.note,
@@ -1604,9 +1607,9 @@ class stock_move(osv.osv):
                     'invoice_state': 'none',
                     'date': picking.date,
                     'sale_id': picking.sale_id.id
-                })
+                    })
                 for move, (loc, auto, delay, journal, company_id, ptype) in todo:
-                    new_id = self.pool.get('stock.move').copy(cr, uid, move.id, {
+                    new_id = move_obj.copy(cr, uid, move.id, {
                         'location_id': move.location_dest_id.id,
                         'location_dest_id': loc.id,
                         'date_moved': time.strftime('%Y-%m-%d'),
@@ -1617,7 +1620,7 @@ class stock_move(osv.osv):
                         'date_planned': (datetime.strptime(move.date_planned, '%Y-%m-%d %H:%M:%S') + relativedelta(days=delay or 0)).strftime('%Y-%m-%d'),
                         'move_history_ids2': []}
                     )
-                    self.pool.get('stock.move').write(cr, uid, [move.id], {
+                    move_obj.write(cr, uid, [move.id], {
                         'move_dest_id': new_id,
                         'move_history_ids': [(4, new_id)]
                     })
diff --git a/addons/stock_invoice_directly/__openerp__.py b/addons/stock_invoice_directly/__openerp__.py
index f24603672c9..b59ba72c41a 100644
--- a/addons/stock_invoice_directly/__openerp__.py
+++ b/addons/stock_invoice_directly/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -28,7 +28,7 @@
         When you send or deliver goods, this module automatically launch
         the invoicing wizard if the delivery is to be invoiced.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['delivery', 'stock'],
     'init_xml': [],
diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index e80b00fc7ad..18d8457a4a3 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -36,7 +36,7 @@ This module may be useful for different purposes:
    - Supplier Return
 * Manage products to be rent.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['procurement','stock'],
     'init_xml': [],
     'update_xml': ['stock_location_view.xml', 'security/ir.model.access.csv', 'mrp_pull_workflow.xml'],
diff --git a/addons/stock_no_autopicking/__openerp__.py b/addons/stock_no_autopicking/__openerp__.py
index 202b05cac86..88a09cb6380 100644
--- a/addons/stock_no_autopicking/__openerp__.py
+++ b/addons/stock_no_autopicking/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -33,7 +33,7 @@
     which is sub-contracted to "No Auto-Picking" and put the location of the
     supplier in the routing of the assembly operation.
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['mrp'],
     'update_xml': ['stock_no_autopicking_view.xml'],
     'demo_xml': [],
diff --git a/addons/stock_planning/__openerp__.py b/addons/stock_planning/__openerp__.py
index 100e793805b..c03945785a1 100644
--- a/addons/stock_planning/__openerp__.py
+++ b/addons/stock_planning/__openerp__.py
@@ -21,11 +21,11 @@
 {
     "name":"Master Procurement Schedule",
     "version":"1.1",
-    "author":"Tiny and Grzegorz Grzelak (Cirrus)",
+    "author":"OpenERP SA and Grzegorz Grzelak (Cirrus)",
     "category":"Custom",
     "depends":["hr","stock","sale"],
     "description": """
-This module is based on original Tiny module stock_planning version 1.0 of the same name Master Procurement Schedule.
+This module is based on original OpenERP SA module stock_planning version 1.0 of the same name Master Procurement Schedule.
 
 Purpose of MPS is to allow create a manual procurement (requisition) apart of MRP scheduler (which works automatically on minimum stock rules).
 
diff --git a/addons/subscription/__openerp__.py b/addons/subscription/__openerp__.py
index c67ba98d454..d85a943f9bf 100644
--- a/addons/subscription/__openerp__.py
+++ b/addons/subscription/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Generic Modules/Others',
     'description': """Module allows to create new documents and add subscription on that document.""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['base'],
     'init_xml': [],
     'update_xml': ['security/ir.model.access.csv', 'subscription_view.xml'],
diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index 47840d7082f..3d1cb78230f 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -30,7 +30,7 @@
     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
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['base'],
     'update_xml': ['survey_report.xml',
                    'survey_data.xml',
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index 68e6c1e9883..43db63e982b 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -388,7 +388,7 @@
         </record>
         <record id="survey_answer_converted_in_customers" model="survey.answer">
             <field name="in_visible_answer_type">1</field>
-            <field name="answer">How are the leads that you find thanks to Tiny be converted in customers?</field>
+            <field name="answer">How are the leads that you find thanks to OpenERP SA be converted in customers?</field>
             <field name="question_id" ref="survey_question_Leads" />
             <field name="sequence" eval="2"/>
         </record>
@@ -425,7 +425,7 @@
 
         <record id="survey_question_partners_about" model="survey.question">
             <field name="in_visible_answer_type">1</field>
-            <field name="question">How is Tiny's communication with partners about...</field>
+            <field name="question">How is OpenERP SA's communication with partners about...</field>
             <field name="page_id" ref="survey_page_communication" />
             <field name="type">matrix_of_choices_only_one_ans</field>
             <field name="in_visible_single_text">1</field>
@@ -482,7 +482,7 @@
 
         <record id="survey_question_partners_on_which_subjects" model="survey.question">
             <field name="in_visible_answer_type">1</field>
-            <field name="question">In your opinion, how could Tiny better communicate with partners and on which subjects?</field>
+            <field name="question">In your opinion, how could OpenERP SA better communicate with partners and on which subjects?</field>
             <field name="page_id" ref="survey_page_communication" />
             <field name="type">comment</field>
             <field name="in_visible_rating_weight">1</field>
@@ -2830,9 +2830,9 @@
             <field eval="8" name="sequence"/>
         </record>
     </data>
-    
+
     <!--  Survey Response -->
-    
+
     <data noupdate="1">
         <record id="survey_history_0" model="survey.history">
             <field name="date">2010-03-03 14:25:03</field>
@@ -2902,7 +2902,7 @@
             <field name="date_create">2010-03-03 14:25:03.706175</field>
             <field name="state">done</field>
             <field name="response_id" ref="survey_response_0"/>
-            <field name="single_text">Tiny ERP</field>
+            <field name="single_text">OpenERP SA</field>
             <field name="question_id" ref="survey.survey_question_company_name"/>
         </record>
     </data>
@@ -2983,7 +2983,7 @@
             <field name="date_create">2010-03-03 14:29:36.33203</field>
             <field name="state">done</field>
             <field name="response_id" ref="survey_response_1"/>
-            <field name="single_text">Tiny ERP</field>
+            <field name="single_text">OpenERP SA</field>
             <field name="question_id" ref="survey.survey_question_odoo_company_name"/>
         </record>
     </data>
diff --git a/addons/users_ldap/__openerp__.py b/addons/users_ldap/__openerp__.py
index b4dbfb19a57..f03d5e37c27 100644
--- a/addons/users_ldap/__openerp__.py
+++ b/addons/users_ldap/__openerp__.py
@@ -22,7 +22,7 @@
     "name" : "Authenticate users with ldap server",
     "version" : "0.1",
     "depends" : ["base"],
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "description": """Adds support for authentication by ldap server""",
     "website" : "http://www.openerp.com",
     "category" : "Generic Modules/Others",
diff --git a/addons/warning/__openerp__.py b/addons/warning/__openerp__.py
index ccbd2db9772..af10eb968a5 100644
--- a/addons/warning/__openerp__.py
+++ b/addons/warning/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Tools',
     'description': """Module for Warnings form onchange Event.""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'depends': ['base', 'sale', 'purchase'],
     'update_xml': ['warning_view.xml'],
     'demo_xml': [],
diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py
index d5c5cc16b30..bccd2fc5c3f 100644
--- a/addons/wiki/__openerp__.py
+++ b/addons/wiki/__openerp__.py
@@ -28,7 +28,7 @@ The base module to manage documents(wiki)
 
 keep track for the wiki groups, pages, and history
     """,
-    'author': 'Tiny & Axelor',
+    'author': 'OpenERP SA & Axelor',
     'website': 'http://openerp.com',
     'depends': ['knowledge'],
     'web_depends': ['widget_wiki'],
diff --git a/addons/wiki_faq/__openerp__.py b/addons/wiki_faq/__openerp__.py
index 7716ba015fe..9f7f4e139b4 100644
--- a/addons/wiki_faq/__openerp__.py
+++ b/addons/wiki_faq/__openerp__.py
@@ -25,7 +25,7 @@
     'category': 'Generic Modules/Others',
     'description': """This module provides a wiki FAQ Template
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'depends': ['wiki'],
     'init_xml': [],
diff --git a/addons/wiki_quality_manual/__openerp__.py b/addons/wiki_quality_manual/__openerp__.py
index 9729c4c4910..5e1e0200fbe 100644
--- a/addons/wiki_quality_manual/__openerp__.py
+++ b/addons/wiki_quality_manual/__openerp__.py
@@ -25,7 +25,7 @@
     'category': 'Generic Modules/Others',
     'description': """Quality Manual Template
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'depends': ['wiki'],
     'init_xml': [],
diff --git a/addons/wiki_sale_faq/__openerp__.py b/addons/wiki_sale_faq/__openerp__.py
index 9619ec98f15..3270275bff8 100644
--- a/addons/wiki_sale_faq/__openerp__.py
+++ b/addons/wiki_sale_faq/__openerp__.py
@@ -25,7 +25,7 @@
     'category': 'Generic Modules/Others',
     'description': """This module provides a wiki FAQ Template
     """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'depends': ['wiki_faq','document','crm'],
     'init_xml': [