diff --git a/addons/account/account.py b/addons/account/account.py
index e5e29f178a3..d4e31167c43 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2338,6 +2338,16 @@ class account_model(osv.osv):
 
         return move_ids
 
+    def onchange_journal_id(self, cr, uid, ids, journal_id, context=None):
+        company_id = False
+
+        if journal_id:
+            journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
+            if journal.company_id.id:
+                company_id = journal.company_id.id
+
+        return {'value': {'company_id': company_id}}
+
 account_model()
 
 class account_model_line(osv.osv):
@@ -3013,9 +3023,9 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         'purchase_tax_rate': fields.float('Purchase Tax(%)'),
         'complete_tax_set': fields.boolean('Complete Set of Taxes', help='This boolean helps you to choose if you want to propose to the user to encode the sales and purchase rates or use the usual m2o fields. This last choice assumes that the set of tax defined for the chosen template is complete'),
     }
-    
+
     def onchange_company_id(self, cr, uid, ids, company_id, context=None):
-        currency_id = False        
+        currency_id = False
         if company_id:
             currency_id = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id.id
         return {'value': {'currency_id': currency_id}}
diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py
index ef146128a67..e44d2acd163 100644
--- a/addons/account/account_bank.py
+++ b/addons/account/account_bank.py
@@ -43,11 +43,15 @@ class bank(osv.osv):
         "Return the name to use when creating a bank journal"
         return (bank.bank_name or '') + ' ' + bank.acc_number
 
-    def _prepare_name_get(self, cr, uid, bank_type_obj, bank_obj, context=None):
-        """Add ability to have %(currency_name)s in the format_layout of
-        res.partner.bank.type"""
-        bank_obj._data[bank_obj.id]['currency_name'] = bank_obj.currency_id and bank_obj.currency_id.name or ''
-        return super(bank, self)._prepare_name_get(cr, uid, bank_type_obj, bank_obj, context=context)
+    def _prepare_name_get(self, cr, uid, bank_dicts, context=None):
+        """Add ability to have %(currency_name)s in the format_layout of res.partner.bank.type"""
+        currency_ids = list(set(data['currency_id'][0] for data in bank_dicts if data['currency_id']))
+        currencies = self.pool.get('res.currency').browse(cr, uid, currency_ids, context=context)
+        currency_name = dict((currency.id, currency.name) for currency in currencies)
+
+        for data in bank_dicts:
+            data['currency_name'] = data['currency_id'] and currency_name[data['currency_id'][0]] or ''
+        return super(bank, self)._prepare_name_get(cr, uid, bank_dicts, context=context)
 
     def post_write(self, cr, uid, ids, context={}):
         if isinstance(ids, (int, long)):
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index c92d4eda602..58e824a6250 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -14,8 +14,12 @@
                     </footer>
                 </footer>
                 <separator string="title" position="replace">
+                    <p class="oe_grey">
+                        Select a configuration package to setup automatically your
+                        taxes and chart of accounts.
+                    </p>
                     <group>
-                        <field name="charts"/>
+                        <field name="charts" class="oe_inline"/>
                     </group>
                     <group string="Configure your Fiscal Year" groups="account.group_account_user">
                         <field name="has_default_company" invisible="1" />
@@ -32,7 +36,7 @@
         </record>
 
         <record id="action_account_configuration_installer" model="ir.actions.act_window">
-            <field name="name">Configure your Chart of Accounts</field>
+            <field name="name">Configure Accounting Data</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.installer</field>
             <field name="view_id" ref="view_account_configuration_installer"/>
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 19af105c950..bbcb25fefa9 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -395,18 +395,23 @@ class account_invoice(osv.osv):
         template_id = template and template[1] or False
         res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
         res_id = res and res[1] or False
-        ctx = dict(context, active_model='account.invoice', active_id=ids[0])
-        ctx.update({'mail.compose.template_id': template_id})
+        ctx = dict(context)
+        ctx.update({
+            'default_model': 'account.invoice',
+            'default_res_id': ids[0],
+            'default_use_template': True,
+            'default_template_id': template_id,
+            })
         return {
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'mail.compose.message',
-                'views': [(res_id, 'form')],
-                'view_id': res_id,
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'context': ctx,
-                'nodestroy': True,
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'mail.compose.message',
+            'views': [(res_id, 'form')],
+            'view_id': res_id,
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'context': ctx,
+            'nodestroy': True,
         }
 
     def confirm_paid(self, cr, uid, ids, context=None):
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 8c0de73ef8c..d1b19910365 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -112,7 +112,7 @@
 		                        <field name="fiscalyear_id" widget="selection"/>
 		                        <label for="date_start" string="Duration"/>
 		                        <div>
-		                            <field name="date_start" class="oe_inline" nolabel="1"/> - 
+		                            <field name="date_start" class="oe_inline" nolabel="1"/> -
 		                            <field name="date_stop" nolabel="1" class="oe_inline"/>
 		                        </div>
 		                    </group>
@@ -181,7 +181,7 @@
                 <form string="Account" version="7.0">
                     <label for="code" class="oe_edit_only" string="Account Code and Name"/>
                     <h1>
-                        <field name="code" class="oe_inline" placeholder="Account code" style="width: 6em"/> - 
+                        <field name="code" class="oe_inline" placeholder="Account code" style="width: 6em"/> -
                         <field name="name" class="oe_inline" placeholder="Account name"/>
                     </h1>
                     <group>
@@ -1082,7 +1082,7 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Journal Item" version="7.0">
-                    <sheet> 
+                    <sheet>
 	                    <group>
 	                        <group>
 		                        <field name="name"/>
@@ -1349,7 +1349,7 @@
                             <field name="date"/>
                             <field name="to_check"/>
                             <field name="amount" invisible="1"/>
-                        </group>	
+                        </group>
                     </group>
                     <notebook>
                         <page string="Journal Items">
@@ -1651,8 +1651,8 @@
                 <form string="Journal Entry Model" version="7.0">
                     <group col="4">
                         <field name="name"/>
-                        <field name="journal_id"/>
-                        <field name="company_id" widget='selection' groups="base.group_multi_company"/>
+                        <field name="journal_id" on_change="onchange_journal_id(journal_id)"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
 
                     <field name="lines_id" widget="one2many_list"/>
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 60a34628b1b..6173ea9213e 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -45,12 +45,12 @@ class account_installer(osv.osv_memory):
             sorted(((m.name, m.shortdesc)
                     for m in modules.browse(cr, uid, ids, context=context)),
                    key=itemgetter(1)))
-        charts.insert(0, ('configurable', 'Generic Chart Of Accounts'))
+        charts.insert(0, ('configurable', _('Custom')))
         return charts
 
     _columns = {
         # Accounting
-        'charts': fields.selection(_get_charts, 'Chart of Accounts',
+        'charts': fields.selection(_get_charts, 'Accounting Package',
             required=True,
             help="Installs localized accounting charts to match as closely as "
                  "possible the accounting needs of your company based on your "
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 91f1068d166..ea903654a4e 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -51,10 +51,10 @@ class account_config_settings(osv.osv_memory):
         'code_digits': fields.integer('# of Digits', help="No. of digits to use for account code"),
         'tax_calculation_rounding_method': fields.related('company_id',
             'tax_calculation_rounding_method', type='selection', selection=[
-            ('round_per_line', 'Round per Line'),
-            ('round_globally', 'Round Globally'),
+            ('round_per_line', 'Round per line'),
+            ('round_globally', 'Round globally'),
             ], string='Tax calculation rounding method',
-            help="If you select 'Round per Line' : for each tax, the tax amount will first be computed and rounded for each PO/SO/invoice line and then these rounded amounts will be summed, leading to the total amount for that tax. If you select 'Round Globally': for each tax, the tax amount will be computed for each PO/SO/invoice line, then these amounts will be summed and eventually this total tax amount will be rounded. If you sell with tax included, you should choose 'Round per line' because you certainly want the sum of your tax-included line subtotals to be equal to the total amount with taxes."),
+            help="If you select 'Round per line' : for each tax, the tax amount will first be computed and rounded for each PO/SO/invoice line and then these rounded amounts will be summed, leading to the total amount for that tax. If you select 'Round globally': for each tax, the tax amount will be computed for each PO/SO/invoice line, then these amounts will be summed and eventually this total tax amount will be rounded. If you sell with tax included, you should choose 'Round per line' because you certainly want the sum of your tax-included line subtotals to be equal to the total amount with taxes."),
         'sale_tax': fields.many2one("account.tax.template", "Default sale tax"),
         'purchase_tax': fields.many2one("account.tax.template", "Default purchase tax"),
         'sale_tax_rate': fields.float('Sales tax (%)'),
@@ -72,40 +72,40 @@ class account_config_settings(osv.osv_memory):
         'sale_refund_journal_id': fields.many2one('account.journal', 'Sale refund journal'),
         'sale_refund_sequence_prefix': fields.related('sale_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Credit note sequence'),
         'sale_refund_sequence_next': fields.related('sale_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next credit note number'),
-        'purchase_journal_id': fields.many2one('account.journal', 'Purchase Journal'),
+        'purchase_journal_id': fields.many2one('account.journal', 'Purchase journal'),
         'purchase_sequence_prefix': fields.related('purchase_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier invoice sequence'),
         'purchase_sequence_next': fields.related('purchase_journal_id', 'sequence_id', 'number_next', type='integer', string='Next supplier invoice number'),
         'purchase_refund_journal_id': fields.many2one('account.journal', 'Purchase refund journal'),
         'purchase_refund_sequence_prefix': fields.related('purchase_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier credit note sequence'),
         'purchase_refund_sequence_next': fields.related('purchase_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next supplier credit note number'),
 
-        'module_account_check_writing': fields.boolean('pay your suppliers by check',
+        'module_account_check_writing': fields.boolean('Pay your suppliers by check',
             help="""This allows you to check writing and printing.
                 This installs the module account_check_writing."""),
-        'module_account_accountant': fields.boolean('full accounting features: journals, legal statements, chart of accounts, etc.',
+        'module_account_accountant': fields.boolean('Full accounting features: journals, legal statements, chart of accounts, etc.',
             help="""If you do not check this box, you will be able to do invoicing & payments, but not accounting (Journal Items, Chart of  Accounts, ...)"""),
-        'module_account_asset': fields.boolean('assets management',
+        'module_account_asset': fields.boolean('Assets management',
             help="""This allows you to manage the assets owned by a company or a person.
                 It keeps track of the depreciation occurred on those assets, and creates account move for those depreciation lines.
                 This installs the module account_asset. If you do not check this box, you will be able to do invoicing & payments,
                 but not accounting (Journal Items, Chart of Accounts, ...)"""),
-        'module_account_budget': fields.boolean('budget management',
+        'module_account_budget': fields.boolean('Budget management',
             help="""This allows accountants to manage analytic and crossovered budgets.
                 Once the master budgets and the budgets are defined,
                 the project managers can set the planned amount on each analytic account.
                 This installs the module account_budget."""),
-        'module_account_payment': fields.boolean('manage payment orders',
+        'module_account_payment': fields.boolean('Manage payment orders',
             help="""This allows you to create and manage your payment orders, with purposes to
                     * serve as base for an easy plug-in of various automated payment mechanisms, and
                     * provide a more efficient way to manage invoice payments.
                 This installs the module account_payment."""),
-        'module_account_voucher': fields.boolean('manage customer payments',
+        'module_account_voucher': fields.boolean('Manage customer payments',
             help="""This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc.
                 This installs the module account_voucher."""),
-        'module_account_followup': fields.boolean('manage customer payment follow-ups',
+        'module_account_followup': fields.boolean('Manage customer payment follow-ups',
             help="""This allows to automate letters for unpaid invoices, with multi-level recalls.
                 This installs the module account_followup."""),
-        'group_proforma_invoices': fields.boolean('allow pro-forma invoices',
+        'group_proforma_invoices': fields.boolean('Allow pro-forma invoices',
             implied_group='account.group_proforma_invoices',
             help="Allows you to put invoices in pro-forma state."),
         'default_sale_tax': fields.many2one('account.tax', 'Default sale tax',
@@ -114,7 +114,7 @@ class account_config_settings(osv.osv_memory):
             help="This purchase tax will be assigned by default on new products."),
         'decimal_precision': fields.integer('Decimal precision on journal entries',
             help="""As an example, a decimal precision of 2 will allow journal entries  like: 9.99 EUR, whereas a decimal precision of 4 will allow journal  entries like: 0.0231 EUR."""),
-        'group_multi_currency': fields.boolean('allow multi currencies',
+        'group_multi_currency': fields.boolean('Allow multi currencies',
             implied_group='base.group_multi_currency',
             help="Allows you multi currency environment"),
     }
@@ -223,6 +223,16 @@ class account_config_settings(osv.osv_memory):
             return {'value': {'date_stop': end_date.strftime('%Y-%m-%d')}}
         return {}
 
+    def open_company_form(self, cr, uid, ids, context=None):
+        config = self.browse(cr, uid, ids[0], context)
+        return {
+            'type': 'ir.actions.act_window',
+            'name': 'Configure your Company',
+            'res_model': 'res.company',
+            'res_id': config.company_id.id,
+            'view_mode': 'form',
+        }
+
     def set_default_taxes(self, cr, uid, ids, context=None):
         """ set default sale and purchase taxes for products """
         ir_values = self.pool.get('ir.values')
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index bc8ace5c262..d7618fbff5a 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -224,10 +224,8 @@
                         <div>
                             <div>
                                 <label for="company_footer"/>
-                                <button name="%(action_bank_tree)d"
-                                    string="Configure your bank accounts"
-                                    icon="gtk-go-forward"
-                                    type="action"
+                                <button name="open_company_form" type="object"
+                                    string="Configure your company bank accounts" icon="gtk-go-forward"
                                     class="oe_inline oe_link"/>
                                 <field name="company_footer"/>
                             </div>
diff --git a/addons/account_check_writing/i18n/es_EC.po b/addons/account_check_writing/i18n/es_EC.po
index 7543458097f..4a0783d4648 100644
--- a/addons/account_check_writing/i18n/es_EC.po
+++ b/addons/account_check_writing/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-12 04:36+0000\n"
-"X-Generator: Launchpad (build 15930)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index f75cda8cdde..c74ca5f833a 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -1045,6 +1045,8 @@ class account_voucher(osv.osv):
             # if the amount encoded in voucher is equal to the amount unreconciled, we need to compute the
             # currency rate difference
             if line.amount == line.amount_unreconciled:
+                if not line.move_line_id.amount_residual:
+                    raise osv.except_osv(_('Wrong bank statement line'),_("You have to delete the bank statement line which the payment was reconciled to manually. Please check the payment of the partner %s by the amount of %s.")%(line.voucher_id.partner_id.name, line.voucher_id.amount))
                 currency_rate_difference = line.move_line_id.amount_residual - amount
             else:
                 currency_rate_difference = 0.0
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index d90e2006a71..66a67ad4219 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -96,22 +96,6 @@ class account_analytic_account(osv.osv):
                 res[row['id']][field] = row[field]
         return self._compute_level_tree(cr, uid, ids, child_ids, res, fields, context)
 
-    def name_get(self, cr, uid, ids, context=None):
-        if isinstance(ids, (int, long)):
-            ids=[ids]
-        if not ids:
-            return []
-        res = []
-        for account in self.browse(cr, uid, ids, context=context):
-            data = []
-            acc = account
-            while acc:
-                data.insert(0, acc.name)
-                acc = acc.parent_id
-            data = ' / '.join(data)
-            res.append((account.id, data))
-        return res
-
     def _complete_name_calc(self, cr, uid, ids, prop, unknow_none, unknow_dict):
         res = self.name_get(cr, uid, ids)
         return dict(res)
diff --git a/addons/auth_signup/res_config.py b/addons/auth_signup/res_config.py
index 813a903870c..8bfe1fc3ddb 100644
--- a/addons/auth_signup/res_config.py
+++ b/addons/auth_signup/res_config.py
@@ -25,7 +25,7 @@ class base_config_settings(osv.TransientModel):
     _inherit = 'base.config.settings'
 
     _columns = {
-        'auth_signup_uninvited': fields.boolean('allow public users to sign up', help="If unchecked only invited users may sign up"),
+        'auth_signup_uninvited': fields.boolean('Allow public users to sign up', help="If unchecked only invited users may sign up"),
         'auth_signup_template_user_id': fields.many2one('res.users', 'Template user for new users created through signup'),
     }
 
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index e1920fc05d9..0dc4a0f0794 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -25,16 +25,16 @@ class base_config_settings(osv.osv_memory):
     _name = 'base.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
-        'module_multi_company': fields.boolean('manage multiple companies',
+        'module_multi_company': fields.boolean('Manage multiple companies',
             help="""Work in multi-company environments, with appropriate security access between companies.
                 This installs the module multi_company."""),
-        'module_share': fields.boolean('allow documents sharing',
+        'module_share': fields.boolean('Allow documents sharing',
             help="""Share or embbed any screen of openerp."""),
-        'module_portal': fields.boolean('activate the customer/supplier portal',
+        'module_portal': fields.boolean('Activate the customer/supplier portal',
             help="""Give access your customers and suppliers to their documents."""),
-        'module_auth_anonymous': fields.boolean('activate the public portal',
+        'module_auth_anonymous': fields.boolean('Activate the public portal',
             help="""Enable the public part of openerp, openerp becomes a public website."""),
-        'module_auth_oauth': fields.boolean('use external authentication providers, sign in with google, facebook, ...'),
+        'module_auth_oauth': fields.boolean('Use external authentication providers, sign in with google, facebook, ...'),
         'module_base_import': fields.boolean("Allow users to import data from CSV files"),
     }
 
@@ -57,17 +57,17 @@ class sale_config_settings(osv.osv_memory):
     _name = 'sale.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
-        'module_web_linkedin': fields.boolean('get contacts automatically from LinkedIn',
+        'module_web_linkedin': fields.boolean('Get contacts automatically from linkedIn',
             help="""When you create a new contact (person or company), you will be able to load all the data from LinkedIn (photos, address, etc)."""),
         'module_crm': fields.boolean('CRM'),
-        'module_plugin_thunderbird': fields.boolean('enable Thunderbird plugin',
+        'module_plugin_thunderbird': fields.boolean('Enable Thunderbird plugin',
             help="""The plugin allows you archive email and its attachments to the selected
                 OpenERP objects. You can select a partner, or a lead and
                 attach the selected mail as a .eml file in
                 the attachment of a selected record. You can create documents for CRM Lead,
                 Partner from the selected emails.
                 This installs the module plugin_thunderbird."""),
-        'module_plugin_outlook': fields.boolean('enable Outlook plugin',
+        'module_plugin_outlook': fields.boolean('Enable Outlook plugin',
             help="""The Outlook plugin allows you to select an object that you would like to add
                 to your email and its attachments from MS Outlook. You can select a partner,
                 or a lead object and archive a selected
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 2b717b6e0b1..c06ff6534d7 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -16,7 +16,7 @@
                     <div>
                         <p>
                             <label string="You will find more options in your company details: address for the header and footer, overdue payments texts, etc."/>
-                            <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute" class="oe_inline oe_link"/>
+                            <button type="object" name="open_company" string="Configure your company data" icon="gtk-execute" class="oe_inline oe_link"/>
                         </p>
                     </div>
                     <group>
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index b45b8ea8712..aff2bcb610b 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -75,7 +75,9 @@ class crm_case_stage(osv.osv):
         'requirements': fields.text('Requirements'),
         'section_ids':fields.many2many('crm.case.section', 'section_stage_rel', 'stage_id', 'section_id', string='Sections',
                         help="Link between stages and sales teams. When set, this limitate the current stage to the selected sales teams."),
-        'state': fields.selection(AVAILABLE_STATES, 'State', required=True, help="The related state for the stage. The state of your document will automatically change regarding the selected stage. For example, if a stage is related to the state 'Close', when your document reaches this stage, it will be automatically have the 'closed' state."),
+        'state': fields.selection(AVAILABLE_STATES, 'Related Status', required=True,
+            help="The status of your document will automatically change regarding the selected stage. " \
+                "For example, if a stage is related to the state 'Close', when your document reaches this stage, it is automatically closed."),
         'case_default': fields.boolean('Common to All Teams',
                         help="If you check this field, this stage will be proposed by default on each sales team. It will not assign this stage to existing teams."),
         'fold': fields.boolean('Hide in Views when Empty',
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index ddfdb05ca66..fff47205582 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -27,13 +27,15 @@ import time
 import tools
 from tools.translate import _
 
+from base.res.res_partner import format_address
+
 CRM_LEAD_PENDING_STATES = (
     crm.AVAILABLE_STATES[2][0], # Cancelled
     crm.AVAILABLE_STATES[3][0], # Done
     crm.AVAILABLE_STATES[4][0], # Pending
 )
 
-class crm_lead(base_stage, osv.osv):
+class crm_lead(base_stage, format_address, osv.osv):
     """ CRM Lead Case """
     _name = "crm.lead"
     _description = "Lead/Opportunity"
@@ -105,6 +107,12 @@ class crm_lead(base_stage, osv.osv):
 
         return result, fold
 
+    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        res = super(crm_lead,self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
+        if view_type == 'form':
+            res['arch'] = self.fields_view_get_address(cr, user, res['arch'], context=context)
+        return res
+
     _group_by_full = {
         'stage_id': _read_group_stage_ids
     }
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index b51f1288b95..4f4d73d5f43 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -183,7 +183,7 @@
                 <form string="Stage" version="7.0">
                     <group col="4">
                         <field name="name"/>
-                        <field name="state" string="Related State" />
+                        <field name="state" />
                         <field name="probability"/>
                         <field name="type"/>
                         <field name="on_change"/>
diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index 1d30abdc33c..b1414244403 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -26,19 +26,19 @@ class crm_configuration(osv.osv_memory):
     _inherit = ['sale.config.settings', 'fetchmail.config.settings']
 
     _columns = {
-        'fetchmail_lead': fields.boolean("create leads from incoming mails",
+        'fetchmail_lead': fields.boolean("Create leads from incoming mails",
             fetchmail_model='crm.lead', fetchmail_name='Incoming Leads',
             help="""Allows you to configure your incoming mail server, and create leads from incoming emails."""),
-        'module_crm_caldav': fields.boolean("applications with Caldav protocol",
+        'module_crm_caldav': fields.boolean("Applications with Caldav protocol",
             help="""Use protocol caldav to synchronize meetings with other calendar applications (like Sunbird).
                 This installs the module crm_caldav."""),
         'module_import_sugarcrm': fields.boolean("SugarCRM",
             help="""Import SugarCRM leads, opportunities, users, accounts, contacts, employees, meetings, phonecalls, emails, project and project tasks data.
                 This installs the module import_sugarcrm."""),
-        'module_import_google': fields.boolean("Google (Contacts and Calendar)",
+        'module_import_google': fields.boolean("Google (contacts and calendar)",
             help="""Import google contact in partner address and add google calendar events details in Meeting.
                 This installs the module import_google."""),
-        'module_google_map': fields.boolean("add google maps on customers",
+        'module_google_map': fields.boolean("Add google maps on customers",
             help="""Locate customers on Google Map.
                 This installs the module google_map."""),
         'group_fund_raising': fields.boolean("Manage Fund Raising",
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index e90303dda66..44ce73c23fe 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -30,10 +30,10 @@ class crm_lead2opportunity_partner(osv.osv_memory):
     _inherit = 'crm.lead2partner'
 
     _columns = {
-        'action': fields.selection([('exist', 'Link to an existing partner'), \
-                                    ('create', 'Create a new partner'), \
-                                    ('nothing', 'Do not link to a partner')], \
-                                    'Related Partner', required=True),
+        'action': fields.selection([('exist', 'Link to an existing customer'), \
+                                    ('create', 'Create a new customer'), \
+                                    ('nothing', 'Do not link to a customer')], \
+                                    'Related Customer', required=True),
         'name': fields.selection([('convert', 'Convert to Opportunities'), ('merge', 'Merge with existing Opportunities')], 'Conversion Action', required=True),
         'opportunity_ids': fields.many2many('crm.lead', string='Opportunities', domain=[('type', '=', 'opportunity')]),
     }
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index 6a826f7bc0e..ef8acf95b58 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -7,22 +7,23 @@
             <field name="model">crm.lead2opportunity.partner</field>
             <field name="arch" type="xml">
                 <form string="Convert to Opportunity" version="7.0">
-                    <field name="action"/>
-                    <group attrs="{'invisible':[('action','!=','exist')]}">
-                        <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
+                    <group>
+                        <field name="action" class="oe_inline"/>
+                        <field name="partner_id" 
+                            attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"
+                            class="oe_inline"/>
                     </group>
-                    <group string="Convert to Opportunity">
-                        <field name="name" colspan="4"/>
+                    <group>
+                        <field name="name" class="oe_inline"/>
+                        <field name="opportunity_ids" attrs="{'invisible': [('name', '=', 'convert')]}">
+                            <tree>
+                                <field name="name"/>
+                                <field name="partner_id"/>
+                                <field name="user_id"/>
+                                <field name="section_id"/>
+                            </tree>
+                        </field>
                     </group>
-                    <separator string="Select Opportunities" attrs="{'invisible': [('name', '=', 'convert')]}"/>
-                    <field name="opportunity_ids" attrs="{'invisible': [('name', '=', 'convert')]}">
-                        <tree>
-                            <field name="name"/>
-                            <field name="partner_id"/>
-                            <field name="user_id"/>
-                            <field name="section_id"/>
-                        </tree>
-                    </field>
                     <footer>
                         <button name="action_apply" string="Create Opportunity" type="object" class="oe_highlight"/>
                         or
@@ -72,7 +73,7 @@
         </record>
 
         <record id="action_crm_lead2opportunity_partner" model="ir.actions.act_window">
-            <field name="name">Create a Partner</field>
+            <field name="name">Convert to opportunity</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">crm.lead2opportunity.partner</field>
             <field name="view_type">form</field>
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 9b239bab7b9..a9e74f306e5 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -28,10 +28,10 @@ class crm_lead2partner(osv.osv_memory):
     _description = 'Lead to Partner'
 
     _columns = {
-        'action': fields.selection([('exist', 'Link to an existing partner'), \
-                                    ('create', 'Create a new partner')], \
+        'action': fields.selection([('exist', 'Link to an existing customer'), \
+                                    ('create', 'Create a new customer')], \
                                     'Action', required=True),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
+        'partner_id': fields.many2one('res.partner', 'Customer'),
     }
     def view_init(self, cr, uid, fields, context=None):
         """
diff --git a/addons/crm/wizard/crm_partner_to_opportunity.py b/addons/crm/wizard/crm_partner_to_opportunity.py
index a1e1f0f2914..aa8f4a2a036 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity.py
+++ b/addons/crm/wizard/crm_partner_to_opportunity.py
@@ -32,7 +32,7 @@ class crm_partner2opportunity(osv.osv_memory):
         'name' : fields.char('Opportunity Name', size=64, required=True),
         'planned_revenue': fields.float('Expected Revenue', digits=(16,2)),
         'probability': fields.float('Success Probability', digits=(16,2)),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
+        'partner_id': fields.many2one('res.partner', 'Customer'),
     }
 
     def action_cancel(self, cr, uid, ids, context=None):
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
index 8ec4846733c..4b2ec725759 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
@@ -9,11 +9,14 @@
             <field name="model">crm.phonecall2opportunity</field>
             <field name="arch" type="xml">
                 <form string="Convert To Opportunity " version="7.0">
-                    <group col="4">
+                    <group>
                         <field name="name"/>
                         <field name="partner_id" />
-                        <field name="planned_revenue"/>
-                        <field name="probability"/>
+                        <label for="planned_revenue"/>
+                        <div>
+                            <field name="planned_revenue" class="oe_inline"/> at 
+                            <field name="probability" class="oe_inline"/> %%
+                        </div>
                     </group>
                     <footer>
                         <button name="make_opportunity" type="object" string="_Convert" class="oe_highlight"/>
@@ -27,7 +30,7 @@
 <!-- Phonecall to Opportunity action -->
 
         <record model="ir.actions.act_window" id="phonecall2opportunity_act">
-            <field name="name">Convert To Opportunity</field>
+            <field name="name">Convert to opportunity</field>
             <field name="res_model">crm.phonecall2opportunity</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
diff --git a/addons/crm_claim/res_config.py b/addons/crm_claim/res_config.py
index cf260fcd163..92e474d6a46 100644
--- a/addons/crm_claim/res_config.py
+++ b/addons/crm_claim/res_config.py
@@ -26,7 +26,7 @@ class crm_claim_settings(osv.osv_memory):
     _inherit = ['sale.config.settings', 'fetchmail.config.settings']
 
     _columns = {
-        'fetchmail_claim': fields.boolean("create claims from incoming mails",
+        'fetchmail_claim': fields.boolean("Create claims from incoming mails",
             fetchmail_model='crm.claim', fetchmail_name='Incoming Claims',
             help="""Allows you to configure your incoming mail server, and create claims from incoming emails."""),
     }
diff --git a/addons/email_template/tests/test_mail.py b/addons/email_template/tests/test_mail.py
index 85ab3afc902..1091c34ad5c 100644
--- a/addons/email_template/tests/test_mail.py
+++ b/addons/email_template/tests/test_mail.py
@@ -20,17 +20,10 @@
 ##############################################################################
 
 import base64
-from openerp.tests import common
+from openerp.addons.mail.tests import test_mail
 
-class test_message_compose(common.TransactionCase):
 
-    def _mock_smtp_gateway(self, *args, **kwargs):
-        return True
-
-    def _mock_build_email(self, *args, **kwargs):
-        self._build_email_args = args
-        self._build_email_kwargs = kwargs
-        return self.build_email_real(*args, **kwargs)
+class test_message_compose(test_mail.TestMailMockups):
 
     def setUp(self):
         super(test_message_compose, self).setUp()
@@ -40,11 +33,6 @@ class test_message_compose(common.TransactionCase):
         self.res_users = self.registry('res.users')
         self.res_partner = self.registry('res.partner')
 
-        # Install mock SMTP gateway
-        self.build_email_real = self.registry('ir.mail_server').build_email
-        self.registry('ir.mail_server').build_email = self._mock_build_email
-        self.registry('ir.mail_server').send_email = self._mock_smtp_gateway
-
         # create a 'pigs' and 'bird' groups that will be used through the various tests
         self.group_pigs_id = self.mail_group.create(self.cr, self.uid,
             {'name': 'Pigs', 'description': 'Fans of Pigs, unite !'})
diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py
index 411040f45b8..7ae28348045 100644
--- a/addons/hr/res_config.py
+++ b/addons/hr/res_config.py
@@ -26,23 +26,23 @@ class hr_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'module_hr_timesheet_sheet': fields.boolean('allow timesheets validation by managers',
+        'module_hr_timesheet_sheet': fields.boolean('Allow timesheets validation by managers',
             help ="""This installs the module hr_timesheet_sheet."""),
-        'module_hr_attendance': fields.boolean('track attendances',
+        'module_hr_attendance': fields.boolean('Track attendances',
             help ="""This installs the module hr_attendance."""),
-        'module_hr_timesheet': fields.boolean('manage timesheets',
+        'module_hr_timesheet': fields.boolean('Manage timesheets',
             help ="""This installs the module hr_timesheet."""),
-        'module_hr_holidays': fields.boolean('manage holidays, leaves and allocation requests',
+        'module_hr_holidays': fields.boolean('Manage holidays, leaves and allocation requests',
             help ="""This installs the module hr_holidays."""),
-        'module_hr_expense': fields.boolean('manage employees expenses',
+        'module_hr_expense': fields.boolean('Manage employees expenses',
             help ="""This installs the module hr_expense."""),
-        'module_hr_recruitment': fields.boolean('manage the recruitment process',
+        'module_hr_recruitment': fields.boolean('Manage the recruitment process',
             help ="""This installs the module hr_recruitment."""),
-        'module_hr_contract': fields.boolean('record contracts per employee',
+        'module_hr_contract': fields.boolean('Record contracts per employee',
             help ="""This installs the module hr_contract."""),
-        'module_hr_evaluation': fields.boolean('organize employees periodic evaluation',
+        'module_hr_evaluation': fields.boolean('Organize employees periodic evaluation',
             help ="""This installs the module hr_evaluation."""),
-        'module_hr_payroll': fields.boolean('manage payroll',
+        'module_hr_payroll': fields.boolean('Manage payroll',
             help ="""This installs the module hr_payroll."""),
     }
 
diff --git a/addons/hr_payroll/res_config.py b/addons/hr_payroll/res_config.py
index c39295dd925..72f8b56d5da 100644
--- a/addons/hr_payroll/res_config.py
+++ b/addons/hr_payroll/res_config.py
@@ -24,6 +24,6 @@ from osv import osv, fields
 class human_resources_configuration(osv.osv_memory):
     _inherit = 'hr.config.settings'
     _columns = {
-        'module_hr_payroll_account': fields.boolean('link your payroll to accounting system',
-            help ="""Create Journal Entries from Payslips"""),
+        'module_hr_payroll_account': fields.boolean('Link your payroll to accounting system',
+            help ="""Create journal entries from payslips"""),
     }
diff --git a/addons/hr_recruitment/res_config.py b/addons/hr_recruitment/res_config.py
index bf247f303f1..d80b0b71727 100644
--- a/addons/hr_recruitment/res_config.py
+++ b/addons/hr_recruitment/res_config.py
@@ -26,10 +26,10 @@ class hr_applicant_settings(osv.osv_memory):
     _inherit = ['hr.config.settings', 'fetchmail.config.settings']
 
     _columns = {
-        'module_document_ftp': fields.boolean('allow the automatic indexation of resumes',
+        'module_document_ftp': fields.boolean('Allow the automatic indexation of resumes',
             help="""Manage your CV's and motivation letter related to all applicants.
                 This installs the module document_ftp. This will install the knowledge management  module in order to allow you to search using specific keywords through  the content of all documents (PDF, .DOCx...)"""),
-        'fetchmail_applicants': fields.boolean('create applicants from an incoming email account',
+        'fetchmail_applicants': fields.boolean('Create applicants from an incoming email account',
             fetchmail_model='hr.applicant', fetchmail_name='Incoming HR Applications',   
             help ="""Allow applicants to send their job application to an email address (jobs@mycompany.com),
                 and create automatically application documents in the system."""),
diff --git a/addons/knowledge/res_config.py b/addons/knowledge/res_config.py
index 7d9f161701b..012bd670ee3 100644
--- a/addons/knowledge/res_config.py
+++ b/addons/knowledge/res_config.py
@@ -25,16 +25,16 @@ class knowledge_config_settings(osv.osv_memory):
     _name = 'knowledge.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
-        'module_document_page': fields.boolean('create static web pages',
+        'module_document_page': fields.boolean('Create static web pages',
             help="""This installs the module document_page."""),
-        'module_document': fields.boolean('manage documents',
+        'module_document': fields.boolean('Manage documents',
             help="""This is a complete document management system, with: user authentication,
                 full document search (but pptx and docx are not supported), and a document dashboard.
                 This installs the module document."""),
-        'module_document_ftp': fields.boolean('share repositories (FTP)',
+        'module_document_ftp': fields.boolean('Share repositories (FTP)',
             help="""Access your documents in OpenERP through an FTP interface.
                 This installs the module document_ftp."""),
-        'module_document_webdav': fields.boolean('share repositories (WebDAV)',
+        'module_document_webdav': fields.boolean('Share repositories (WebDAV)',
             help="""Access your documents in OpenERP through WebDAV.
                 This installs the module document_webdav."""),
     }
diff --git a/addons/l10n_be_invoice_bba/account_invoice_view.xml b/addons/l10n_be_invoice_bba/account_invoice_view.xml
index c344f1e9b6f..c4c53261f57 100644
--- a/addons/l10n_be_invoice_bba/account_invoice_view.xml
+++ b/addons/l10n_be_invoice_bba/account_invoice_view.xml
@@ -8,15 +8,13 @@
       <field name="model">account.invoice</field>
       <field name="inherit_id" ref="account.invoice_form"/>
       <field name="arch" type="xml">
-        <field name="payment_term" position="after">
-          <group col="4" colspan="2">
-              <field name="reference_type" nolabel="1"  size="0" attrs="{'readonly':[('state','!=','draft')]}"
-                 on_change="generate_bbacomm(type,reference_type, partner_id,reference, context)" colspan="1"/>
-              <field name="reference" nolabel="1"  colspan="3" attrs="{'readonly':[('state','!=','draft')]}"/>
-          </group>
+        <field name="date_due" position="after">
+              <field name="reference_type" nolabel="1"  attrs="{'readonly':[('state','!=','draft')]}"
+                 on_change="generate_bbacomm(type,reference_type, partner_id,reference, context)"/>
+              <field name="reference" nolabel="1"  attrs="{'readonly':[('state','!=','draft')]}"/>
         </field>
       </field>
     </record>
-    
+
   </data>
 </openerp>
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 99dd6bda6ac..f0ab2c67bcf 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -30,27 +30,27 @@ A business oriented Social Networking with a fully-integrated email and message
 ===========================================================================================
 
 The Social Networking module provides an unified social network
-abstraction layer allowing applications to display a complete 
+abstraction layer allowing applications to display a complete
 communication history on documents. It gives the users the possibility
 to read and send messages and emails in an unified way.
 
-It also provides a feeds page combined to a subscription mechanism, that 
+It also provides a feeds page combined to a subscription mechanism, that
 allows to follow documents, and to be constantly updated about recent
 news.
-        
+
 The main features of the module are:
 ------------------------------------
     * a clean and renewed communication history for any OpenERP
       document that can act as a discussion topic,
     * a discussion mean on documents,
-    * a subscription mechanism to be updated about new messages on 
+    * a subscription mechanism to be updated about new messages on
       interesting documents,
-    * an unified feeds page to see recent messages and activity 
+    * an unified feeds page to see recent messages and activity
       on followed documents,
     * user communication through the feeds page,
     * a threaded discussion design,
     * relies on the global outgoing mail server, an integrated email
-      management system allowing to send emails with a configurable 
+      management system allowing to send emails with a configurable
       scheduler-based processing engine
     * includes an extensible generic email composition assistant, that can turn
       into a mass-mailing assistant, and is capable of interpreting
@@ -61,6 +61,7 @@ The main features of the module are:
     'website': 'http://www.openerp.com',
     'depends': ['base', 'base_tools', 'base_setup'],
     'data': [
+        'wizard/invite_view.xml',
         'wizard/mail_compose_message_view.xml',
         'res_config_view.xml',
         'mail_message_view.xml',
diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py
index 27eb29051b9..96f9b2e4a94 100644
--- a/addons/mail/mail_alias.py
+++ b/addons/mail/mail_alias.py
@@ -86,7 +86,7 @@ class mail_alias(osv.Model):
                                       help="Optional ID of a thread (record) to which all incoming "
                                            "messages will be attached, even if they did not reply to it. "
                                            "If set, this will disable the creation of new records completely."),
-        'alias_domain': fields.function(_get_alias_domain, string="Alias Domain", type='char', size=None),
+        'alias_domain': fields.function(_get_alias_domain, string="Alias domain", type='char', size=None),
     }
 
     _defaults = {
diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 2aba685c4fa..b8f6c21ecf5 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -23,6 +23,7 @@ from osv import osv
 from osv import fields
 import tools
 
+
 class mail_followers(osv.Model):
     """ mail_followers holds the data related to the follow mechanism inside
         OpenERP. Partners can choose to follow documents (records) of any kind
@@ -84,16 +85,44 @@ class mail_notification(osv.Model):
         notif_ids = self.search(cr, uid, [('partner_id', '=', partner_id), ('message_id', '=', msg_id)], context=context)
         return self.write(cr, uid, notif_ids, {'read': True}, context=context)
 
+    def get_partners_to_notify(self, cr, uid, partner_ids, message, context=None):
+        """ Return the list of partners to notify, based on their preferences.
+
+            :param browse_record message: mail.message to notify
+        """
+        notify_pids = []
+        for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context):
+            # Do not send an email to the writer
+            if partner.user_ids and partner.user_ids[0].id == uid:
+                continue
+            # Do not send to partners without email address defined
+            if not partner.email:
+                continue
+            # Partner does not want to receive any emails
+            if partner.notification_email_send == 'none':
+                continue
+            # Partner wants to receive only emails and comments
+            if partner.notification_email_send == 'comment' and message.type not in ('email', 'comment'):
+                continue
+            # Partner wants to receive only emails
+            if partner.notification_email_send == 'email' and message.type != 'email':
+                continue
+            notify_pids.append(partner.id)
+        return notify_pids
+
     def notify(self, cr, uid, partner_ids, msg_id, context=None):
         """ Send by email the notification depending on the user preferences """
         context = context or {}
         # mail_noemail (do not send email) or no partner_ids: do not send, return
         if context.get('mail_noemail') or not partner_ids:
             return True
-
-        mail_mail = self.pool.get('mail.mail')
         msg = self.pool.get('mail.message').browse(cr, uid, msg_id, context=context)
 
+        notify_partner_ids = self.get_partners_to_notify(cr, uid, partner_ids, msg, context=context)
+        if not notify_partner_ids:
+            return True
+
+        mail_mail = self.pool.get('mail.mail')
         # add signature
         body_html = msg.body
         signature = msg.author_id and msg.author_id.user_ids[0].signature or ''
@@ -107,27 +136,6 @@ class mail_notification(osv.Model):
             'body_html': body_html,
             'state': 'outgoing',
         }
-
-        for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context):
-            # Do not send an email to the writer
-            if partner.user_ids and partner.user_ids[0].id == uid:
-                continue
-            # Do not send to partners without email address defined
-            if not partner.email:
-                continue
-            # Partner does not want to receive any emails
-            if partner.notification_email_send == 'none':
-                continue
-            # Partner wants to receive only emails and comments
-            if partner.notification_email_send == 'comment' and msg.type not in ('email', 'comment'):
-                continue
-            # Partner wants to receive only emails
-            if partner.notification_email_send == 'email' and msg.type != 'email':
-                continue
-            if partner.email not in mail_values['email_to']:
-                mail_values['email_to'].append(partner.email)
-        if mail_values['email_to']:
-            mail_values['email_to'] = ', '.join(mail_values['email_to'])
-            email_notif_id = mail_mail.create(cr, uid, mail_values, context=context)
-            mail_mail.send(cr, uid, [email_notif_id], context=context)
-        return True
+        mail_values['email_to'] = ', '.join(mail_values['email_to'])
+        email_notif_id = mail_mail.create(cr, uid, mail_values, context=context)
+        return mail_mail.send(cr, uid, [email_notif_id], recipient_ids=notify_partner_ids, context=context)
diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 175ce650f06..fe0cc3950ae 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -19,13 +19,11 @@
 #
 ##############################################################################
 
-import datetime as DT
 import openerp
 import openerp.tools as tools
-from operator import itemgetter
 from osv import osv
 from osv import fields
-from tools.translate import _
+
 
 class mail_group(osv.Model):
     """ A mail_group is a collection of users sharing messages in a discussion
@@ -47,7 +45,7 @@ class mail_group(osv.Model):
     _columns = {
         'description': fields.text('Description'),
         'menu_id': fields.many2one('ir.ui.menu', string='Related Menu', required=True, ondelete="cascade"),
-        'public': fields.selection([('public','Public'),('private','Private'),('groups','Selected Group Only')], 'Privacy', required=True,
+        'public': fields.selection([('public', 'Public'), ('private', 'Private'), ('groups', 'Selected Group Only')], 'Privacy', required=True,
             help='This group is visible by non members. \
             Invisible groups can add members through the invite button.'),
         'group_public_id': fields.many2one('res.groups', string='Authorized Group'),
@@ -126,14 +124,14 @@ class mail_group(osv.Model):
             search_ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'view_message_search')
             params = {
                 'search_view_id': search_ref and search_ref[1] or False,
-                'domain': [('model','=','mail.group'), ('res_id','=',mail_group_id)],
+                'domain': [('model', '=', 'mail.group'), ('res_id', '=', mail_group_id)],
                 'context': {'default_model': 'mail.group', 'default_res_id': mail_group_id},
                 'res_model': 'mail.message',
                 'thread_level': 1,
             }
             cobj = self.pool.get('ir.actions.client')
             newref = cobj.copy(cr, uid, ref[1], default={'params': str(params), 'name': vals['name']}, context=context)
-            self.write(cr, uid, [mail_group_id], {'action': 'ir.actions.client,'+str(newref), 'mail_group_id': mail_group_id}, context=context)
+            self.write(cr, uid, [mail_group_id], {'action': 'ir.actions.client,' + str(newref), 'mail_group_id': mail_group_id}, context=context)
 
         mail_alias.write(cr, uid, [vals['alias_id']], {"alias_force_thread_id": mail_group_id}, context)
 
@@ -142,9 +140,13 @@ class mail_group(osv.Model):
         return mail_group_id
 
     def unlink(self, cr, uid, ids, context=None):
+        groups = self.browse(cr, uid, ids, context=context)
         # Cascade-delete mail aliases as well, as they should not exist without the mail group.
         mail_alias = self.pool.get('mail.alias')
-        alias_ids = [group.alias_id.id for group in self.browse(cr, uid, ids, context=context) if group.alias_id]
+        alias_ids = [group.alias_id.id for group in groups if group.alias_id]
+        # Cascade-delete menu entries as well
+        self.pool.get('ir.ui.menu').unlink(cr, uid, [group.menu_id.id for group in groups if group.menu_id], context=context)
+        # Delete mail_group
         res = super(mail_group, self).unlink(cr, uid, ids, context=context)
         mail_alias.unlink(cr, uid, alias_ids, context=context)
         return res
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 7b593c5b998..6bbfa9bc30e 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -30,6 +30,7 @@ from tools.translate import _
 
 _logger = logging.getLogger(__name__)
 
+
 class mail_mail(osv.Model):
     """ Model holding RFC2822 email messages to send. This model also provides
         facilities to queue and send new email messages.  """
@@ -58,8 +59,8 @@ class mail_mail(osv.Model):
         'body_html': fields.text('Rich-text Contents', help="Rich-text/HTML message"),
 
         # Auto-detected based on create() - if 'mail_message_id' was passed then this mail is a notification
-        # and during unlink() we will cascade delete the parent and its attachments 
-        'notification': fields.boolean('Is Notification') 
+        # and during unlink() we will not cascade delete the parent and its attachments
+        'notification': fields.boolean('Is Notification')
     }
 
     def _get_default_from(self, cr, uid, context=None):
@@ -76,21 +77,21 @@ class mail_mail(osv.Model):
     def create(self, cr, uid, values, context=None):
         if 'notification' not in values and values.get('mail_message_id'):
             values['notification'] = True
-        return super(mail_mail,self).create(cr, uid, values, context=context)
+        return super(mail_mail, self).create(cr, uid, values, context=context)
 
     def unlink(self, cr, uid, ids, context=None):
         # cascade-delete the parent message for all mails that are not created for a notification
-        ids_to_cascade = self.search(cr, uid, [('notification','=',False),('id','in',ids)])
+        ids_to_cascade = self.search(cr, uid, [('notification', '=', False), ('id', 'in', ids)])
         parent_msg_ids = [m.mail_message_id.id for m in self.browse(cr, uid, ids_to_cascade, context=context)]
-        res = super(mail_mail,self).unlink(cr, uid, ids, context=context)
+        res = super(mail_mail, self).unlink(cr, uid, ids, context=context)
         self.pool.get('mail.message').unlink(cr, uid, parent_msg_ids, context=context)
         return res
 
     def mark_outgoing(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'outgoing'}, context=context)
+        return self.write(cr, uid, ids, {'state': 'outgoing'}, context=context)
 
     def cancel(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'cancel'}, context=context)
+        return self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
 
     def process_email_queue(self, cr, uid, ids=None, context=None):
         """Send immediately queued messages, committing after each
@@ -127,7 +128,7 @@ class mail_mail(osv.Model):
         """Perform any post-processing necessary after sending ``mail``
         successfully, including deleting it completely along with its
         attachment if the ``auto_delete`` flag of the mail was set.
-        Overridden by subclasses for extra post-processing behaviors. 
+        Overridden by subclasses for extra post-processing behaviors.
 
         :param browse_record mail: the mail that was just sent
         :return: True
@@ -136,14 +137,46 @@ class mail_mail(osv.Model):
             mail.unlink()
         return True
 
-    def _send_get_mail_subject(self, cr, uid, mail, force=False, context=None):
-        """ if void and related document: '<Author> posted on <Resource>'
-            :param mail: mail.mail browse_record """
+    def send_get_mail_subject(self, cr, uid, mail, force=False, partner=None, context=None):
+        """ If subject is void and record_name defined: '<Author> posted on <Resource>'
+
+            :param boolean force: force the subject replacement
+            :param browse_record mail: mail.mail browse_record
+            :param browse_record partner: specific recipient partner
+        """
         if force or (not mail.subject and mail.model and mail.res_id):
             return '%s posted on %s' % (mail.author_id.name, mail.record_name)
         return mail.subject
 
-    def send(self, cr, uid, ids, auto_commit=False, context=None):
+    def send_get_mail_body(self, cr, uid, mail, partner=None, context=None):
+        """ Return a specific ir_email body. The main purpose of this method
+            is to be inherited by Portal, to add a link for signing in, in
+            each notification email a partner receives.
+
+            :param browse_record mail: mail.mail browse_record
+            :param browse_record partner: specific recipient partner
+        """
+        return mail.body_html
+
+    def send_get_email_dict(self, cr, uid, mail, partner=None, context=None):
+        """ Return a dictionary for specific email values, depending on a
+            partner, or generic to the whole recipients given by mail.email_to.
+
+            :param browse_record mail: mail.mail browse_record
+            :param browse_record partner: specific recipient partner
+        """
+        body = self.send_get_mail_body(cr, uid, mail, partner=partner, context=context)
+        subject = self.send_get_mail_subject(cr, uid, mail, partner=partner, context=context)
+        body_alternative = tools.html2plaintext(body)
+        email_to = [partner.email] if partner else tools.email_split(mail.email_to)
+        return {
+            'body': body,
+            'body_alternative': body_alternative,
+            'subject': subject,
+            'email_to': email_to,
+        }
+
+    def send(self, cr, uid, ids, auto_commit=False, recipient_ids=None, context=None):
         """ Sends the selected emails immediately, ignoring their current
             state (mails that have already been sent should not be passed
             unless they should actually be re-sent).
@@ -154,50 +187,55 @@ class mail_mail(osv.Model):
             :param bool auto_commit: whether to force a commit of the mail status
                 after sending each mail (meant only for scheduler processing);
                 should never be True during normal transactions (default: False)
+            :param list recipient_ids: specific list of res.partner recipients.
+                If set, one email is sent to each partner. Its is possible to
+                tune the sent email through ``send_get_mail_body`` and ``send_get_mail_subject``.
+                If not specified, one email is sent to mail_mail.email_to.
             :return: True
         """
         ir_mail_server = self.pool.get('ir.mail_server')
         for mail in self.browse(cr, uid, ids, context=context):
             try:
-                body = mail.body_html
-                subject = self._send_get_mail_subject(cr, uid, mail, context=context)
-
                 # handle attachments
                 attachments = []
                 for attach in mail.attachment_ids:
                     attachments.append((attach.datas_fname, base64.b64decode(attach.datas)))
-
-                # use only sanitized html and set its plaintexted version as alternative
-                body_alternative = tools.html2plaintext(body)
-                content_subtype_alternative = 'plain'
+                # specific behavior to customize the send email for notified partners
+                email_list = []
+                if recipient_ids:
+                    for partner in self.pool.get('res.partner').browse(cr, uid, recipient_ids, context=context):
+                        email_list.append(self.send_get_email_dict(cr, uid, mail, partner=partner, context=context))
+                else:
+                    email_list.append(self.send_get_email_dict(cr, uid, mail, context=context))
 
                 # build an RFC2822 email.message.Message object and send it without queuing
-                msg = ir_mail_server.build_email(
-                    email_from = mail.email_from,
-                    email_to = tools.email_split(mail.email_to),
-                    subject = subject,
-                    body = body,
-                    body_alternative = body_alternative,
-                    email_cc = tools.email_split(mail.email_cc),
-                    reply_to = mail.reply_to,
-                    attachments = attachments,
-                    message_id = mail.message_id,
-                    references = mail.references,
-                    object_id = mail.res_id and ('%s-%s' % (mail.res_id, mail.model)),
-                    subtype = 'html',
-                    subtype_alternative = content_subtype_alternative)
-                res = ir_mail_server.send_email(cr, uid, msg,
-                    mail_server_id=mail.mail_server_id.id, context=context)
+                for email in email_list:
+                    msg = ir_mail_server.build_email(
+                        email_from = mail.email_from,
+                        email_to = email.get('email_to'),
+                        subject = email.get('subject'),
+                        body = email.get('body'),
+                        body_alternative = email.get('body_alternative'),
+                        email_cc = tools.email_split(mail.email_cc),
+                        reply_to = mail.reply_to,
+                        attachments = attachments,
+                        message_id = mail.message_id,
+                        references = mail.references,
+                        object_id = mail.res_id and ('%s-%s' % (mail.res_id, mail.model)),
+                        subtype = 'html',
+                        subtype_alternative = 'plain')
+                    res = ir_mail_server.send_email(cr, uid, msg,
+                        mail_server_id=mail.mail_server_id.id, context=context)
                 if res:
-                    mail.write({'state':'sent', 'message_id': res})
+                    mail.write({'state': 'sent', 'message_id': res})
                 else:
-                    mail.write({'state':'exception'})
+                    mail.write({'state': 'exception'})
                 mail.refresh()
                 if mail.state == 'sent':
                     self._postprocess_sent_message(cr, uid, mail, context=context)
             except Exception:
                 _logger.exception('failed sending mail.mail %s', mail.id)
-                mail.write({'state':'exception'})
+                mail.write({'state': 'exception'})
 
             if auto_commit == True:
                 cr.commit()
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index e4862ca9fb9..44ce76b94b0 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -20,11 +20,13 @@
 ##############################################################################
 
 import logging
+import openerp
 import tools
 
 from email.header import decode_header
 from operator import itemgetter
 from osv import osv, fields
+from tools.translate import _
 
 _logger = logging.getLogger(__name__)
 
@@ -35,6 +37,7 @@ def decode(text):
         text = decode_header(text.replace('\r', ''))
         return ''.join([tools.ustr(x[0], x[1]) for x in text])
 
+
 class mail_message(osv.Model):
     """ Messages model: system notification (replacing res.log notifications),
         comments (OpenChatter discussion) and incoming emails. """
@@ -57,7 +60,10 @@ class mail_message(osv.Model):
         for message in self.browse(cr, uid, ids, context=context):
             if not message.model or not message.res_id:
                 continue
-            result[message.id] = self._shorten_name(self.pool.get(message.model).name_get(cr, uid, [message.res_id], context=context)[0][1])
+            try:
+                result[message.id] = self._shorten_name(self.pool.get(message.model).name_get(cr, uid, [message.res_id], context=context)[0][1])
+            except openerp.exceptions.AccessDenied, e:
+                pass
         return result
 
     def _get_unread(self, cr, uid, ids, name, arg, context=None):
@@ -147,7 +153,7 @@ class mail_message(osv.Model):
 
     def _message_dict_get(self, cr, uid, msg, context=None):
         """ Return a dict representation of the message browse record. """
-        attachment_ids = self.pool.get('ir.attachment').name_get(cr, uid, [x.id for x in msg.attachment_ids], context=context)
+        attachment_ids = [{'id': attach[0], 'name': attach[1]} for attach in self.pool.get('ir.attachment').name_get(cr, uid, [x.id for x in msg.attachment_ids], context=context)]
         author_id = self.pool.get('res.partner').name_get(cr, uid, [msg.author_id.id], context=context)[0]
         author_user_id = self.pool.get('res.users').name_get(cr, uid, [msg.author_id.user_ids[0].id], context=context)[0]
         partner_ids = self.pool.get('res.partner').name_get(cr, uid, [x.id for x in msg.partner_ids], context=context)
@@ -306,15 +312,15 @@ class mail_message(osv.Model):
 
     def unlink(self, cr, uid, ids, context=None):
         # cascade-delete attachments that are directly attached to the message (should only happen
-        # for mail.messages that act as parent for a standalone mail.mail record.
+        # for mail.messages that act as parent for a standalone mail.mail record).
         attachments_to_delete = []
-        for mail in self.browse(cr, uid, ids, context=context):
-            for attach in mail.attachment_ids:
-                if attach.res_model == 'mail.message' and attach.res_id == mail.id:
+        for message in self.browse(cr, uid, ids, context=context):
+            for attach in message.attachment_ids:
+                if attach.res_model == self._name and attach.res_id == message.id:
                     attachments_to_delete.append(attach.id)
         if attachments_to_delete:
             self.pool.get('ir.attachment').unlink(cr, uid, attachments_to_delete, context=context)
-        return super(mail_message,self).unlink(cr, uid, ids, context=context)
+        return super(mail_message, self).unlink(cr, uid, ids, context=context)
 
     def notify(self, cr, uid, newid, context=None):
         """ Add the related record followers to the destination partner_ids.
@@ -341,3 +347,25 @@ class mail_message(osv.Model):
             default = {}
         default.update(message_id=False, headers=False)
         return super(mail_message, self).copy(cr, uid, id, default=default, context=context)
+
+    #------------------------------------------------------
+    # Tools
+    #------------------------------------------------------
+
+    def check_partners_email(self, cr, uid, partner_ids, context=None):
+        """ Verify that selected partner_ids have an email_address defined.
+            Otherwise throw a warning. """
+        partner_wo_email_lst = []
+        for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context):
+            if not partner.email:
+                partner_wo_email_lst.append(partner)
+        if not partner_wo_email_lst:
+            return {}
+        warning_msg = _('The following partners chosen as recipients for the email have no email address linked :')
+        for partner in partner_wo_email_lst:
+            warning_msg += '\n- %s' % (partner.name)
+        return {'warning': {
+                    'title': _('Partners email addresses not found'),
+                    'message': warning_msg,
+                    }
+                }
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index c0d6ac90fe6..d798007275f 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -623,14 +623,8 @@ class mail_thread(osv.AbstractModel):
         return self.message_subscribe(cr, uid, ids, partner_ids, context=context)
 
     def message_subscribe(self, cr, uid, ids, partner_ids, context=None):
-        """ Add partners to the records followers.
-            :param partner_ids: a list of partner_ids to subscribe
-            :param return: new value of followers if read_back key in context
-        """
-        self.write(cr, uid, ids, {'message_follower_ids': [(4, pid) for pid in partner_ids]}, context=context)
-        if context and context.get('read_back'):
-            return [follower.id for thread in self.browse(cr, uid, ids, context=context) for follower in thread.message_follower_ids]
-        return []
+        """ Add partners to the records followers. """
+        return self.write(cr, uid, ids, {'message_follower_ids': [(4, pid) for pid in partner_ids]}, context=context)
 
     def message_unsubscribe_users(self, cr, uid, ids, user_ids=None, context=None):
         """ Wrapper on message_subscribe, using users. If user_ids is not
@@ -640,14 +634,8 @@ class mail_thread(osv.AbstractModel):
         return self.message_unsubscribe(cr, uid, ids, partner_ids, context=context)
 
     def message_unsubscribe(self, cr, uid, ids, partner_ids, context=None):
-        """ Remove partners from the records followers.
-            :param partner_ids: a list of partner_ids to unsubscribe
-            :param return: new value of followers if read_back key in context
-        """
-        self.write(cr, uid, ids, {'message_follower_ids': [(3, pid) for pid in partner_ids]}, context=context)
-        if context and context.get('read_back'):
-            return [follower.id for thread in self.browse(cr, uid, ids, context=context) for follower in thread.message_follower_ids]
-        return []
+        """ Remove partners from the records followers. """
+        return self.write(cr, uid, ids, {'message_follower_ids': [(3, pid) for pid in partner_ids]}, context=context)
 
     #------------------------------------------------------
     # Thread state
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index f9ca54c478d..8bbe075f159 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -72,6 +72,9 @@ class res_users(osv.Model):
 
     def create(self, cr, uid, data, context=None):
         # create default alias same as the login
+        if not data.get('login', False):
+            raise osv.except_osv(_('Invalid Action!'), _('You may not create a user.'))
+
         mail_alias = self.pool.get('mail.alias')
         alias_id = mail_alias.create_unique_alias(cr, uid, {'alias_name': data['login']}, model_name=self._name, context=context)
         data['alias_id'] = alias_id
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 815f0ec92c4..48a178732b0 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -96,10 +96,6 @@
     width: 120px;
 }
 
-.openerp button.oe_mail_button_followers {
-    display: inline;
-}
-
 .openerp button.oe_mail_button_mouseout {
   color: white;
   background-color: #8a89ba;
@@ -230,6 +226,10 @@
     clear: both; 
 }
 
+.openerp .oe_mail_msg_content a {
+    cursor: pointer;
+}
+
 .openerp img.oe_mail_icon {
     width: 50px;
     height: 50px;
@@ -307,6 +307,29 @@
     padding: 1px;
 }
 
+/* attachment button: override of openerp values */
+.openerp .oe_mail_msg_content .oe_mail_compose_message_icons div.oe_hidden_input_file {
+    display: inline-block;
+    width: 24px;
+    height: 24px;
+    margin: 2px;
+}
+.openerp .oe_mail_msg_content .oe_mail_compose_message_icons div.oe_hidden_input_file button {
+    margin: 0px;
+}
+.openerp .oe_mail_msg_content .oe_mail_compose_message_icons input.oe_form_binary_file {
+    bottom: 0px;
+    top: auto;
+    left: auto;
+    right: 28px;
+    height: 26px;
+    width: 26px;
+    min-width: 22px;
+    font-size: 0px;
+    margin: 0px;
+    padding: 0px;
+}
+
 /* ------------------------------------------------------------ */
 /* Messages layout
 /* ------------------------------------------------------------ */
@@ -322,31 +345,20 @@
     text-decoration: none;
 }
 
-.openerp .oe_mail_msg_footer {
-    color: #888;
-}
-
-.openerp .oe_mail_msg_footer li {
-  float: left;
-  margin-right: 3px;
-}
-
-.openerp .oe_mail_msg_body {
+.openerp .oe_mail_msg .oe_mail_msg_body {
     margin-bottom: .5em;
     text-align: justify;
 }
 
-.openerp .oe_mail_msg_record_body pre {
+.openerp .oe_mail_msg .oe_mail_msg_body pre {
     font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
     margin: 0px;
-}
-
-.openerp .oe_mail_msg_body span.oe_mail_msg_tail {
+    white-space: pre-wrap;
     display: inline;
 }
 
 /* Read more/less link */
-.openerp .oe_mail_msg_content .oe_mail_reduce {
+.openerp .oe_mail_msg span.oe_mail_reduce {
     position: absolute;
     right: 0;
 }
@@ -364,16 +376,23 @@
     border-top: 4px solid #404040;
 }
 
-.openerp .oe_mail_msg_footer li:after {
+/* Message footer */
+.openerp .oe_mail_msg .oe_mail_msg_footer {
+    color: #888;
+}
+.openerp .oe_mail_msg .oe_mail_msg_footer li {
+    float: left;
+    margin-right: 3px;
+}
+.openerp .oe_mail_msg .oe_mail_msg_footer li:after {
     content: " · ";
 }
-
-.openerp .oe_mail_msg_footer li:last-child:after {
+.openerp .oe_mail_msg .oe_mail_msg_footer li:last-child:after {
     content: "";
 }
 
 /* Attachments list */
-.openerp ul.oe_mail_msg_attachments {
+.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments {
     display: none;
     width: 100%;
     border-top: 1px solid #CCC;
@@ -381,7 +400,7 @@
     padding: .5em 0;
     list-style-position: inside;
 }
-.openerp ul.oe_mail_msg_attachments li {
+.openerp .oe_mail_msg_content ul.oe_mail_msg_attachments li {
     float: none;
     margin: 0;
     padding: 0;
diff --git a/addons/mail/static/src/css/mail_group.css b/addons/mail/static/src/css/mail_group.css
index 8f4ca61d531..b700cb8c80f 100644
--- a/addons/mail/static/src/css/mail_group.css
+++ b/addons/mail/static/src/css/mail_group.css
@@ -12,7 +12,6 @@
   min-height: 0px;
   max-height: none;
   padding: 0px 18px;
-  max-width: 80%;
 }
 
 /* Resize footer width */
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 3f23e65f00d..71665bc69fb 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -20,10 +20,8 @@ openerp.mail = function(session) {
         do_action: function(action, on_close) {
             if (action.res_model == 'mail.compose.message' &&
                 action.context && action.context.redirect == true &&
-                this.fields && this.fields.message_ids &&
-                this.fields.message_ids.view.get("actual_mode") != 'create') {
-                var record_thread = this.fields.message_ids;
-                var thread = record_thread.thread;
+                this.fields && this.fields.message_ids && this.fields.message_ids.view.get("actual_mode") != 'create') {
+                var thread = this.fields.message_ids.thread;
                 thread.refresh_composition_form(action.context);
                 return true;
             }
@@ -33,35 +31,32 @@ openerp.mail = function(session) {
         },
     });
 
+
     /**
      * ------------------------------------------------------------
      * ChatterUtils
      * ------------------------------------------------------------
      * 
-     * This class holds a few tools method that will be used by
-     * the various Chatter widgets.
-     *
+     * This class holds a few tools method for Chatter.
      * Some regular expressions not used anymore, kept because I want to
      * - (^|\s)@((\w|@|\.)*): @login@log.log
-     *      1. '(void)'
-     *      2. login@log.log
      * - (^|\s)\[(\w+).(\w+),(\d)\|*((\w|[@ .,])*)\]: [ir.attachment,3|My Label],
      *   for internal links
-     *      1. '(void)'
-     *      2. 'ir'
-     *      3. 'attachment'
-     *      4. '3'
-     *      5. 'My Label'
      */
 
     mail.ChatterUtils = {
 
-        /** get an image in /web/binary/image?... */
-        get_image: function(session_prefix, session_id, model, field, id) {
-            return session_prefix + '/web/binary/image?session_id=' + session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
+        /** Get an image in /web/binary/image?... */
+        get_image: function(session, model, field, id) {
+            return session.prefix + '/web/binary/image?session_id=' + session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
         },
 
-        /** check if the current user is the message author */
+        /** Get the url of an attachment {'id': id} */
+        get_attachment_url: function (session, attachment) {
+            return session.origin + '/web/binary/saveas?session_id=' + session.session_id + '&model=ir.attachment&field=datas&filename_field=datas_fname&id=' + attachment['id'];
+        },
+
+        /** Check if the current user is the message author */
         is_author: function (widget, message_user_id) {
             return (widget.session && widget.session.uid != 0 && widget.session.uid == message_user_id);
         },
@@ -107,21 +102,19 @@ openerp.mail = function(session) {
         init: function (parent, options) {
             var self = this;
             this._super(parent);
+            this.attachment_ids = [];
             // options
             this.options = options || {};
             this.options.context = options.context || {};
             this.options.form_xml_id = options.form_xml_id || 'email_compose_message_wizard_form_chatter';
             this.options.form_view_id = options.form_view_id || false;
-            // debug
-            // console.groupCollapsed('New ComposeMessage: model', this.options.context.default_res_model, ', id', this.options.context.default_res_id);
-            // console.log('context:', this.options.context);
-            // console.groupEnd();
+            this.show_attachment_delete = true;
         },
 
         start: function () {
             this._super.apply(this, arguments);
             // customize display: add avatar, clean previous content
-            var user_avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', this.session.uid);
+            var user_avatar = mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid);
             this.$el.find('img.oe_mail_icon').attr('src', user_avatar);
             this.$el.find('div.oe_mail_msg_content').empty();
             // create a context for the dataset and default_get of the wizard
@@ -152,10 +145,52 @@ openerp.mail = function(session) {
             });
             // add the form, bind events, activate the form
             var msg_node = this.$el.find('div.oe_mail_msg_content');
-            return $.when(this.form_view.appendTo(msg_node)).pipe(function() {
-                self.bind_events();
-                self.form_view.do_show();
-            });
+            return $.when(this.form_view.appendTo(msg_node)).pipe(this.proxy('postprocess_create_form_view'));
+        },
+
+        postprocess_create_form_view: function () {
+            // handle attachment button
+            this.fileupload_id = _.uniqueId('oe_fileupload');
+            var button_attach = this.$el.find('button.oe_mail_compose_message_attachment');
+            var rendered = session.web.qweb.render('mail.compose_message.add_attachment', {'widget': this});
+            $(rendered).insertBefore(button_attach);
+            // move the button inside div.oe_hidden_input_file
+            var input_node = this.$el.find('input[name=ufile]');
+            button_attach.detach().insertAfter(input_node);
+            // set the function called when attachments are added
+            this.$el.find('input.oe_form_binary_file').change(this.on_attachment_change);
+            this.bind_events();
+            this.form_view.do_show();
+        },
+
+        on_attachment_change: function (event) {
+            var $target = $(event.target);
+            if ($target.val() !== '') {
+                this.$el.find('form.oe_form_binary_form').submit();
+                session.web.blockUI();
+            }
+        },
+
+        on_attachment_delete: function (event) {
+            if (event.target.dataset && event.target.dataset.id) {
+                var attachment_id = parseInt(event.target.dataset.id);
+                var idx = _.pluck(this.attachment_ids, 'id').indexOf(attachment_id);
+                if (idx == -1) return false;
+                new session.web.DataSetSearch(this, 'ir.attachment').unlink(attachment_id);
+                this.attachment_ids.splice(idx, 1);
+                this.display_attachments();
+            }
+        },
+
+        display_attachments: function () {
+            var attach_node = this.$el.find('div.oe_mail_compose_message_attachments');
+            var rendered = session.web.qweb.render('mail.thread.message.attachments', {'record': this});
+            attach_node.empty();
+            $(rendered).appendTo(attach_node);
+            this.$el.find('.oe_mail_msg_attachments').show();
+            var composer_attachment_ids = _.pluck(this.attachment_ids, 'id');
+            var onchange_like = {'value': {'attachment_ids': composer_attachment_ids}}
+            this.form_view.on_processed_onchange(onchange_like, []);
         },
 
         /**
@@ -166,13 +201,18 @@ openerp.mail = function(session) {
         refresh: function (new_context) {
             if (! this.form_view) return;
             var self = this;
+            this.attachments = [];
             this.options.context = _.extend(this.options.context, new_context || {});
             this.ds_compose.context = _.extend(this.ds_compose.context, this.options.context);
             return this.ds_compose.call('default_get', [
-                ['subject', 'body_text', 'body', 'attachment_ids', 'partner_ids', 'composition_mode',
+                ['subject', 'body_text', 'body', 'partner_ids', 'composition_mode',
                     'use_template', 'template_id', 'model', 'res_id', 'parent_id', 'content_subtype'],
                 this.ds_compose.get_context(),
-            ]).then( function (result) { self.form_view.on_processed_onchange({'value': result}, []); });
+            ]).then( function (result) {
+                self.form_view.on_processed_onchange({'value': result}, []);
+                self.attachment_ids = [];
+                self.display_attachments();
+            });
         },
 
         /**
@@ -180,11 +220,17 @@ openerp.mail = function(session) {
          * in the function. */
         bind_events: function() {
             var self = this;
-            // event: click on 'Attachment' icon-link that opens the dialog to
-            // add an attachment.
-            this.$el.on('click', 'button.oe_mail_compose_message_attachment', function (event) {
-                event.stopImmediatePropagation();
+            // event: add a new attachment
+            $(window).on(this.fileupload_id, function() {
+                var args = [].slice.call(arguments).slice(1);
+                var attachment = args[0];
+                attachment['url'] = mail.ChatterUtils.get_attachment_url(self.session, attachment);
+                self.attachment_ids.push(attachment);
+                self.display_attachments();
+                session.web.unblockUI();
             });
+            // event: delete an attachment
+            this.$el.on('click', '.oe_mail_attachment_delete', self.on_attachment_delete);
         },
     }),
 
@@ -206,47 +252,48 @@ openerp.mail = function(session) {
 
         /**
          * @param {Object} parent parent
-         * @param {Object} [options]
-         * @param {Object} [options.context] context of the thread. It should
+         * @param {Array} [domain]
+         * @param {Object} [context] context of the thread. It should
             contain at least default_model, default_res_id. Please refer to
             the ComposeMessage widget for more information about it.
-         * @param {Number} [options.thread_level=0] number of thread levels
+         * @param {Object} [options]
          * @param {Number} [options.message_ids=null] ids for message_fetch
          * @param {Number} [options.message_data=null] already formatted message
             data, for subthreads getting data from their parent
-         * @param {Boolean} [options.composer] use the advanced composer, or
+         * @param {Number} [options.thread_level=0] number of thread levels
+         * @param {Boolean} [options.use_composer] use the advanced composer, or
             the default basic textarea if not set
          * @param {Number} [options.truncate_limit=250] number of character to
          *      display before having a "show more" link; note that the text
          *      will not be truncated if it does not have 110% of the parameter
          */
-        init: function(parent, options) {
+        init: function(parent, domain, context, options) {
             this._super(parent);
-            // options
-            this.options = options || {};
-            this.options.domain = options.domain || [];
-            this.options.context = _.extend({
+            this.domain = domain || [];
+            this.context = _.extend({
                 default_model: 'mail.thread',
                 default_res_id:  0,
-                default_parent_id: false }, options.context || {});
-            this.options.thread_level = options.thread_level || 0;
-            this.options.composer = options.composer || false;
-            this.options.message_ids = options.message_ids || null;
-            this.options.message_data = options.message_data || null;
+                default_parent_id: false }, context || {});
+            // options
+            this.options = {
+                message_ids: options.message_ids || null,
+                message_data: options.message_data || null,
+                thread_level: options.thread_level || 0,
+                use_composer: options.use_composer || false,
+                show_header_compose: options.show_header_compose != undefined ? options.show_header_compose: true,
+                show_record_name: options.show_record_name != undefined ? options.show_record_name: true,
+                show_reply: options.show_reply || false,
+                show_reply_by_email: options.show_reply_by_email || false,
+                show_dd_reply_by_email:options.show_dd_reply_by_email != undefined ? options.show_dd_reply_by_email: true,
+                show_dd_delete: options.show_dd_delete || false,
+                show_dd_hide: options.show_dd_hide || false,
+                show_more: options.show_more || false,
+                truncate_limit: options.truncate_limit || 250,
+            }
             // datasets and internal vars
-            this.ds_thread = new session.web.DataSetSearch(this, this.options.context.default_model);
+            this.ds_thread = new session.web.DataSetSearch(this, this.context.default_model);
             this.ds_notification = new session.web.DataSetSearch(this, 'mail.notification');
             this.ds_message = new session.web.DataSetSearch(this, 'mail.message');
-            // display customization vars
-            this.display = {
-                truncate_limit: options.truncate_limit || 250,
-                show_header_compose: options.show_header_compose || false,
-                show_reply: options.show_reply || false,
-                show_delete: options.show_delete || false,
-                show_hide: options.show_hide || false,
-                show_reply_by_email: options.show_reply_by_email || false,
-                show_more: options.show_more || false,
-            }
         },
         
         start: function() {
@@ -256,7 +303,7 @@ openerp.mail = function(session) {
             // fetch and display message, using message_ids if set
             var display_done = $.when(this.message_fetch(true, [], {})).then(this.proxy('do_customize_display'));
             // add message composition form view
-            if (this.display.show_header_compose && this.options.composer) {
+            if (this.options.show_header_compose && this.options.use_composer) {
                 var compose_done = this.instantiate_composition_form();
             }
             return display_done && compose_done;
@@ -266,7 +313,9 @@ openerp.mail = function(session) {
          * - show_header_compose: show the composition form in the header */
         do_customize_display: function() {
             this.display_user_avatar();
-            if (this.display.show_header_compose) { this.$el.find('div.oe_mail_thread_action').eq(0).show(); }
+            if (this.options.show_header_compose) {
+                this.$el.find('div.oe_mail_thread_action').eq(0).show();
+            }
         },
 
         /**
@@ -274,10 +323,8 @@ openerp.mail = function(session) {
          * in the function. */
         bind_events: function() {
             var self = this;
-            // event: click on 'more' at bottom of thread
-            this.$el.find('button.oe_mail_button_more').click(function () {
-                self.do_message_fetch();
-            });
+            // event: click on 'More' at bottom of thread
+            this.$el.on('click', 'button.oe_mail_button_more', this.do_message_fetch_more);
             // event: writing in basic textarea of composition form (quick reply)
             this.$el.find('textarea.oe_mail_compose_textarea').keyup(function (event) {
                 var charCode = (event.which) ? event.which : window.event.keyCode;
@@ -286,41 +333,21 @@ openerp.mail = function(session) {
             });
             // event: click on 'Reply' in msg
             this.$el.on('click', 'a.oe_mail_msg_reply', function (event) {
-                event.preventDefault();
-                event.stopPropagation();
                 var act_dom = $(this).parents('li.oe_mail_thread_msg').eq(0).find('div.oe_mail_thread_action:first');
                 act_dom.toggle();
             });
-            // event: click on 'attachment(s)' in msg
+            // event: click on 'Attachment(s)' in msg
             this.$el.on('click', 'a.oe_mail_msg_view_attachments', function (event) {
-                event.preventDefault();
-                event.stopPropagation();
                 var act_dom = $(this).parent().parent().parent().find('.oe_mail_msg_attachments');
                 act_dom.toggle();
             });
             // event: click on 'Delete' in msg side menu
-            this.$el.on('click', 'a.oe_mail_msg_delete', function (event) {
-                event.preventDefault();
-                event.stopPropagation();
-                if (! confirm(_t("Do you really want to delete this message?"))) { return false; }
-                var msg_id = event.srcElement.dataset.id;
-                if (! msg_id) return false;
-                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).remove();
-                return self.ds_msg.unlink([parseInt(msg_id)]);
-            });
+            this.$el.on('click', 'a.oe_mail_msg_delete', this.on_message_delete);
             // event: click on 'Hide' in msg side menu
-            this.$el.on('click', 'a.oe_mail_msg_hide', function (event) {
-                event.preventDefault();
-                event.stopPropagation();
-                var msg_id = event.srcElement.dataset.id;
-                if (! msg_id) return false;
-                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).remove();
-                return self.ds_notif.call('set_message_read', [parseInt(msg_id)]);
-            });
-            // event: click on "Reply by email" in msg side menu (email style)
+            this.$el.on('click', 'a.oe_mail_msg_hide', this.on_message_read);
+            // event: click on 'Reply by email' in msg side menu
             this.$el.on('click', 'a.oe_mail_msg_reply_by_email', function (event) {
-                event.preventDefault();
-                event.stopPropagation();
+                if (! self.compose_message_widget) return true;
                 var msg_id = event.srcElement.dataset.msg_id;
                 if (! msg_id) return false;
                 self.compose_message_widget.refresh({
@@ -330,20 +357,37 @@ openerp.mail = function(session) {
             });
         },
 
+        on_message_delete: function (event) {
+            if (! confirm(_t("Do you really want to delete this message?"))) { return false; }
+            var msg_id = event.srcElement.dataset.id;
+            if (! msg_id) return false;
+            $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).remove();
+            return this.ds_message.unlink([parseInt(msg_id)]);
+        },
+
+        on_message_read: function (event) {
+            //TDE: TODO
+            var msg_id = event.srcElement.dataset.id;
+            if (! msg_id) return false;
+            $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).remove();
+            return this.ds_notification.call('set_message_read', [parseInt(msg_id)]);
+        },
+
         /**
          * Override-hack of do_action: automatically reload the chatter.
          * Normally it should be called only when clicking on 'Post/Send'
          * in the composition form. */
         do_action: function(action, on_close) {
+            //TDE: TODO: instead of reloading, push the message ?
             this.message_clean();
             this.message_fetch();
             if (this.compose_message_widget) {
                 this.compose_message_widget.refresh({
                     'default_composition_mode': 'comment',
-                    'default_parent_id': this.options.default_parent_id,
+                    'default_parent_id': this.context.default_parent_id,
                     'default_content_subtype': 'plain'} );
             }
-            return this._super(action, on_close);
+            // return this._super(action, on_close);
         },
 
         /** Instantiate the composition form, with every parameters in context
@@ -353,7 +397,7 @@ openerp.mail = function(session) {
                 this.compose_message_widget.destroy();
             }
             this.compose_message_widget = new mail.ComposeMessage(this, {
-                'context': _.extend(context || {}, this.options.context),
+                'context': _.extend(context || {}, this.context),
             });
             var composition_node = this.$el.find('div.oe_mail_thread_action');
             composition_node.empty();
@@ -375,20 +419,20 @@ openerp.mail = function(session) {
          * @param {Bool} initial_mode: initial mode: try to use message_data or
          *  message_ids, if nothing available perform a message_read; otherwise
          *  directly perform a message_read
-         * @param {Array} additional_domain: added to options.domain
-         * @param {Object} additional_context: added to options.context
+         * @param {Array} additional_domain: added to this.domain
+         * @param {Object} additional_context: added to this.context
          */
         message_fetch: function (initial_mode, additional_domain, additional_context) {
             var self = this;
             // domain and context: options + additional
-            fetch_domain = _.flatten([this.options.domain, additional_domain || []], true)
-            fetch_context = _.extend(this.options.context, additional_context || {})
-            // if message_ids is set: try to use it
+            fetch_domain = _.flatten([this.domain, additional_domain || []], true)
+            fetch_context = _.extend(this.context, additional_context || {})
+            // initial mode: try to use message_data or message_ids
             if (initial_mode && this.options.message_data) {
                 return this.message_display(this.options.message_data);
             }
-            return this.ds_message.call('message_read',
-                [(initial_mode && this.options.message_ids) || false, fetch_domain, this.options.thread_level, undefined, fetch_context]
+            message_ids = initial_mode && this.options.message_ids != null && this.options.message_ids || false;
+            return this.ds_message.call('message_read', [message_ids, fetch_domain, this.options.thread_level, undefined, fetch_context]
                 ).then(this.proxy('message_display'));
         },
 
@@ -408,19 +452,19 @@ openerp.mail = function(session) {
                 }
                 else {
                     self.display_record(record);
-                    // if (self.options.thread_level >= 0) {
-                    self.thread = new mail.Thread(self, {
-                        'context': {
-                            'default_model': record.model,
+                    self.thread = new mail.Thread(self, self.domain,
+                        {   'default_model': record.model,
                             'default_res_id': record.res_id,
                             'default_parent_id': record.id },
-                        'message_data': record.child_ids, 'thread_level': self.options.thread_level-1,
-                        'show_header_compose': false, 'show_reply': self.options.thread_level > 1,
-                        'show_hide': self.display.show_hide, 'show_delete': self.display.show_delete,
-                    });
+                        {   'message_data': record.child_ids,
+                            'thread_level': self.options.thread_level - 1,
+                            'show_header_compose': false,
+                            'show_reply': self.options.show_reply && self.options.thread_level > 1,
+                            'show_reply_by_email': self.options.show_reply_by_email,
+                            'show_dd_hide': self.options.show_dd_hide,
+                            'show_dd_delete': self.options.show_dd_delete });
                     self.$el.find('li.oe_mail_thread_msg:last').append('<div class="oe_mail_thread_subthread"/>');
                     self.thread.appendTo(self.$el.find('div.oe_mail_thread_subthread:last'));
-                    // }
                 }
             });
             if (! _expendable) {
@@ -432,7 +476,7 @@ openerp.mail = function(session) {
          * - record.date: formatting according to the user timezone
          * - record.timerelative: relative time givein by timeago lib
          * - record.avatar: image url
-         * - record.attachments[].url: url of each attachment
+         * - record.attachment_ids[].url: url of each attachment
          * - record.is_author: is the current user the author of the record */
         display_record: function (record) {
             // formatting and additional fields
@@ -441,21 +485,18 @@ openerp.mail = function(session) {
             if (record.type == 'email') {
                 record.avatar = ('/mail/static/src/img/email_icon.png');
             } else {
-                record.avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.partner', 'image_small', record.author_id[0]);
+                record.avatar = mail.ChatterUtils.get_image(this.session, 'res.partner', 'image_small', record.author_id[0]);
             }
-            //TDE: FIX
-            if (record.attachments) {
-                for (var l in record.attachments) {
-                    var url = self.session.origin + '/web/binary/saveas?session_id=' + self.session.session_id + '&model=ir.attachment&field=datas&filename_field=datas_fname&id='+records[k].attachments[l].id;
-                    record.attachments[l].url = url;
-                }
+            for (var l in record.attachment_ids) {
+                var attach = record.attachment_ids[l];
+                attach['url'] = mail.ChatterUtils.get_attachment_url(this.session, attach);
             }
             record.is_author = mail.ChatterUtils.is_author(this, record.author_user_id[0]);
             // render, add the expand feature
-            var rendered = session.web.qweb.render('mail.thread.message', {'record': record, 'thread': this, 'params': this.options, 'display': this.display});
+            var rendered = session.web.qweb.render('mail.thread.message', {'record': record, 'thread': this, 'options': this.options});
             $(rendered).appendTo(this.$el.children('div.oe_mail_thread_display:first'));
-            this.$el.find('div.oe_mail_msg_record_body').expander({
-                slicePoint: this.options.msg_more_limit,
+            this.$el.find('div.oe_mail_msg_body').expander({
+                slicePoint: this.options.truncate_limit,
                 expandText: 'read more',
                 userCollapseText: '[^]',
                 detailClass: 'oe_mail_msg_tail',
@@ -474,7 +515,7 @@ openerp.mail = function(session) {
         },
 
         display_user_avatar: function () {
-            var avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', this.session.uid);
+            var avatar = mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid);
             return this.$el.find('img.oe_mail_icon').attr('src', avatar);
         },
         
@@ -486,12 +527,12 @@ openerp.mail = function(session) {
                 comment_node.val('');
             }
             return this.ds_thread.call('message_post', [
-                [this.options.context.default_res_id], body, false, 'comment', this.options.context.default_parent_id, undefined]
+                [this.context.default_res_id], body, false, 'comment', this.context.default_parent_id, undefined]
                 ).then(self.message_fetch());
         },
 
         /** Action: 'shows more' to fetch new messages */
-        do_message_fetch: function () {
+        do_message_fetch_more: function () {
             return this.message_fetch(false, this.fetch_more_domain, this.fetch_more_context);
         },
 
@@ -534,13 +575,11 @@ openerp.mail = function(session) {
      * mail_thread Widget
      * ------------------------------------------------------------
      *
-     * This widget handles the display of the Chatter on documents.
+     * This widget handles the display of messages on a document. Its main
+     * use is to receive a context and a domain, and to delegate the message
+     * fetching and displaying to the Thread widget.
      */
-
-    /* Add mail_thread widget to registry */
     session.web.form.widgets.add('mail_thread', 'openerp.mail.RecordThread');
-
-    /** mail_thread widget: thread of comments */
     mail.RecordThread = session.web.form.AbstractField.extend({
         template: 'mail.record_thread',
 
@@ -553,8 +592,7 @@ openerp.mail = function(session) {
 
         start: function() {
             this._super.apply(this, arguments);
-            // NB: all the widget should be modified to check the actual_mode property on view, not use
-            // any other method to know if the view is in create mode anymore
+            // NB: check the actual_mode property on view to know if the view is in create mode anymore
             this.view.on("change:actual_mode", this, this._check_visibility);
             this._check_visibility();
         },
@@ -563,11 +601,6 @@ openerp.mail = function(session) {
             this.$el.toggle(this.view.get("actual_mode") !== "create");
         },
 
-        destroy: function() {
-            if (this.thread) { this.thread.destroy(); }
-            this._super.apply(this, arguments);
-        },
-
         set_value: function() {
             var self = this;
             this._super.apply(this, arguments);
@@ -579,15 +612,15 @@ openerp.mail = function(session) {
             _.extend(this.options.context, {
                 default_res_id: this.view.datarecord.id,
                 default_model: this.view.model });
+            // update domain
+            var domain = this.options.domain.concat([['model', '=', this.view.model], ['res_id', '=', this.view.datarecord.id]]);
             // create and render Thread widget
             this.$el.find('div.oe_mail_recthread_main').empty();
-            if (this.thread) { this.thread.destroy(); }
-            var thread = new mail.Thread(self, {
-                'context': this.options.context,
-                'thread_level': this.options.thread_level, 'show_header_compose': true,
-                'message_ids': this.get_value(),
-                'show_delete': true, 'composer': true });
-            this.thread = thread;
+            var thread = new mail.Thread(self, domain, this.options.context,
+                {   'thread_level': this.options.thread_level,
+                    'use_composer': true,
+                    'show_dd_delete': true,
+                    'show_reply_by_email': true });
             return thread.appendTo(this.$el.find('div.oe_mail_recthread_main'));
         },
     });
@@ -598,22 +631,22 @@ openerp.mail = function(session) {
      * Wall Widget
      * ------------------------------------------------------------
      *
-     * This widget handles the display of the Chatter on the Wall.
+     * This widget handles the display of messages on a Wall. Its main
+     * use is to receive a context and a domain, and to delegate the message
+     * fetching and displaying to the Thread widget.
      */
-
-    /* Add WallView widget to registry */
     session.web.client_actions.add('mail.wall', 'session.mail.Wall');
-
-    /* WallView widget: a wall of messages */
     mail.Wall = session.web.Widget.extend({
         template: 'mail.wall',
 
         /**
          * @param {Object} parent parent
          * @param {Object} [options]
-         * @param {Number} [options.domain] domain on the Wall, is an array.
-         * @param {Number} [options.domain] context, is an object. It should
+         * @param {Array} [options.domain] domain on the Wall
+         * @param {Object} [options.context] context, is an object. It should
          *      contain default_model, default_res_id, to give it to the threads.
+         * @param {Number} [options.thread_level] number of thread levels to display
+         *      0 being flat.
          */
         init: function (parent, options) {
             this._super(parent);
@@ -621,23 +654,15 @@ openerp.mail = function(session) {
             this.options.domain = options.domain || [];
             this.options.context = options.context || {};
             this.options.thread_level = options.thread_level || 1;
-            this.thread_list = [];
-            this.ds_msg = new session.web.DataSetSearch(this, 'mail.message');
-            // for search view
-            this.search = {'domain': [], 'context': {}, 'groupby': {}}
             this.search_results = {'domain': [], 'context': {}, 'groupby': {}}
+            this.ds_msg = new session.web.DataSetSearch(this, 'mail.message');
         },
 
         start: function () {
             this._super.apply(this, arguments);
-            var search_view_ready = this.load_search_view({}, false);
-            var thread_displayed = this.message_display();
-            return (search_view_ready && thread_displayed);
-        },
-
-        destroy: function () {
-            for (var i in this.thread_list) { this.thread_list[i].destroy(); }
-            this._super.apply(this, arguments);
+            var searchview_ready = this.load_searchview({}, false);
+            var thread_displayed = this.message_render();
+            return (searchview_ready && thread_displayed);
         },
 
         /**
@@ -645,7 +670,7 @@ openerp.mail = function(session) {
          * @param {Object} defaults ??
          * @param {Boolean} hidden some kind of trick we do not care here
          */
-        load_search_view: function (defaults, hidden) {
+        load_searchview: function (defaults, hidden) {
             var self = this;
             this.searchview = new session.web.SearchView(this, this.ds_msg, false, defaults || {}, hidden || false);
             return this.searchview.appendTo(this.$el.find('.oe_view_manager_view_search')).then(function () {
@@ -654,9 +679,8 @@ openerp.mail = function(session) {
         },
 
         /**
-         * Aggregate the domains, contexts and groupbys in parameter
-         * with those from search form, and then calls fetch_comments
-         * to actually fetch comments
+         * Get the domains, contexts and groupbys in parameter from search
+         * view, then render the filtered threads.
          * @param {Array} domains
          * @param {Array} contexts
          * @param {Array} groupbys
@@ -671,30 +695,24 @@ openerp.mail = function(session) {
                 self.search_results['context'] = results.context;
                 self.search_results['domain'] = results.domain;
                 self.search_results['groupby'] = results.group_by;
-                self.message_clean();
-                return self.message_display();
+                return self.message_render();
             });
         },
 
-        /** Clean the wall */
-        message_clean: function() {
+        /** Clean and display the threads */
+        message_render: function () {
             this.$el.find('ul.oe_mail_wall_threads').empty();
-        },
-
-        /** Display the Wall threads */
-        message_display: function () {
+            var domain = this.options.domain.concat(this.search_results['domain']);
             var render_res = session.web.qweb.render('mail.wall_thread_container', {});
-            $('<li class="oe_mail_wall_thread">').html(render_res).appendTo(this.$el.find('ul.oe_mail_wall_threads'));
-            var thread = new mail.Thread(this, {
-                'domain': this.options.domain, 'context': this.options.context,
-                'thread_level': this.options.thread_level, 'composer': true,
-                // display options
-                'show_header_compose': true,  'show_reply': this.options.thread_level > 0,
-                'show_hide': true, 'show_reply_by_email': true,
+            $(render_res).appendTo(this.$el.find('ul.oe_mail_wall_threads'));
+            var thread = new mail.Thread(this, domain, this.options.context,
+                {   'thread_level': this.options.thread_level,
+                    'use_composer': true,
+                    'show_reply': this.options.thread_level > 0,
+                    'show_dd_hide': true,
                 }
             );
-            thread.appendTo(this.$el.find('li.oe_mail_wall_thread:last'));
-            this.thread_list.push(thread);
+            return thread.appendTo(this.$el.find('li.oe_mail_wall_thread:last'));
         },
     });
 };
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index e5d216ed3d2..cf33bd64640 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -31,33 +31,52 @@ openerp_mail_followers = function(session, mail) {
         },
 
         start: function() {
-            var self = this;
-            // NB: all the widget should be modified to check the actual_mode property on view, not use
-            // any other method to know if the view is in create mode anymore
+            // use actual_mode property on view to know if the view is in create mode anymore
             this.view.on("change:actual_mode", this, this._check_visibility);
             this._check_visibility();
-            this.$el.find('button.oe_mail_button_follow').click(function () { self.do_follow(); })
-                .mouseover(function () { $(this).html('Follow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
-                .mouseleave(function () { $(this).html('Not following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
-            this.$el.find('button.oe_mail_button_unfollow').click(function () { self.do_unfollow(); })
-                .mouseover(function () { $(this).html('Unfollow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
-                .mouseleave(function () { $(this).html('Following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
             this.reinit();
+            this.bind_events();
         },
 
         _check_visibility: function() {
             this.$el.toggle(this.view.get("actual_mode") !== "create");
         },
 
-        destroy: function () {
-            this._super.apply(this, arguments);
-        },
-
         reinit: function() {
             this.$el.find('button.oe_mail_button_follow').hide();
             this.$el.find('button.oe_mail_button_unfollow').hide();
         },
 
+        bind_events: function() {
+            var self = this;
+            this.$('button.oe_mail_button_unfollow').on('click', function () { self.do_unfollow(); })
+                .mouseover(function () { $(this).html('Unfollow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
+                .mouseleave(function () { $(this).html('Following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
+            this.$el.on('click', 'button.oe_mail_button_follow', function () { self.do_follow(); });
+            this.$el.on('click', 'button.oe_mail_button_invite', function(event) {
+                action = {
+                    type: 'ir.actions.act_window',
+                    res_model: 'mail.wizard.invite',
+                    view_mode: 'form',
+                    view_type: 'form',
+                    views: [[false, 'form']],
+                    target: 'new',
+                    context: {
+                        'default_res_model': self.view.dataset.model,
+                        'default_res_id': self.view.datarecord.id
+                    },
+                }
+                self.do_action(action, function() { self.read_value(); });
+            });
+        },
+
+        read_value: function() {
+            var self = this;
+            return this.ds_model.read_ids([this.view.datarecord.id], ['message_follower_ids']).pipe(function (results) {
+                return results[0].message_follower_ids;
+            }).pipe(this.proxy('set_value'));
+        },
+
         set_value: function(value_) {
             this.reinit();
             if (! this.view.datarecord.id ||
@@ -65,11 +84,11 @@ openerp_mail_followers = function(session, mail) {
                 this.$el.find('div.oe_mail_recthread_aside').hide();
                 return;
             }
-            return this.fetch_followers(value_);
+            return this.fetch_followers(value_  || this.get_value());
         },
 
         fetch_followers: function (value_) {
-            return this.ds_follow.call('read', [value_ || this.get_value(), ['name', 'user_ids']]).then(this.proxy('display_followers'));
+            return this.ds_follow.call('read', [value_, ['name', 'user_ids']]).pipe(this.proxy('display_followers'));
         },
 
         /** Display the followers, evaluate is_follower directly */
@@ -79,7 +98,7 @@ openerp_mail_followers = function(session, mail) {
             var node_user_list = this.$el.find('ul.oe_mail_followers_display').empty();
             this.$el.find('div.oe_mail_recthread_followers h4').html(this.options.title + ' (' + records.length + ')');
             _(records).each(function (record) {
-                record.avatar_url = mail.ChatterUtils.get_image(self.session.prefix, self.session.session_id, 'res.partner', 'image_small', record.id);
+                record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
                 $(session.web.qweb.render('mail.followers.partner', {'record': record})).appendTo(node_user_list);
             });
             if (this.message_is_follower) {
@@ -91,13 +110,13 @@ openerp_mail_followers = function(session, mail) {
         },
 
         do_follow: function () {
-            var context = new session.web.CompoundContext(this.build_context(), {'read_back': true});
-            return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], undefined, context]).pipe(this.proxy('set_value'));
+            var context = new session.web.CompoundContext(this.build_context(), {});
+            return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], undefined, context]).pipe(this.proxy('read_value'));
         },
 
         do_unfollow: function () {
-            var context = new session.web.CompoundContext(this.build_context(), {'read_back': true});
-            return this.ds_model.call('message_unsubscribe_users', [[this.view.datarecord.id], undefined, context]).pipe(this.proxy('set_value'));
+            var context = new session.web.CompoundContext(this.build_context(), {});
+            return this.ds_model.call('message_unsubscribe_users', [[this.view.datarecord.id], undefined, context]).pipe(this.proxy('read_value'));
         },
     });
 };
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 66b82d5a36c..bf339f21f1c 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -39,8 +39,8 @@
         wall_thread_container template for the wall
         Each discussion thread is contained inside this template
         -->
-    <t t-name="mail.wall_thread_container">
-    </t>
+    <li t-name="mail.wall_thread_container" class="oe_mail_wall_thread">
+    </li>
 
     <!--
         record_thread main template
@@ -73,6 +73,20 @@
         </div>
     </t>
 
+    <!--
+        mail.compose_message.add_attachment template
+        Small template to be inserted in the composition form to add attachments
+        -->
+    <t t-name="mail.compose_message.add_attachment">
+        <t t-call="HiddenInputFile">
+            <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
+            <t t-set="fileupload_action">/web/binary/upload_attachment</t>
+            <input type="hidden" name="model" t-att-value="widget.form_view.model"/>
+            <input type="hidden" name="id" t-att-value="widget.form_view.datarecord.id || 0"/>
+            <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
+        </t>
+    </t>
+
     <!--
         thread template
         This template holds a thread of comments. It begins with an actions
@@ -100,16 +114,14 @@
                 <!-- dropdown menu with message options and actions -->
                 <span class="oe_dropdown_toggle oe_dropdown_arrow">
                     <ul class="oe_dropdown_menu">
-                        <t t-if="record.is_author">
-                            <li t-if="display['show_delete']"><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
-                        </t>
-                        <li t-if="display['show_hide']"><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove notification</a></li>
+                        <li t-if="record.is_author and options.show_dd_delete"><a class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
+                        <li t-if="options.show_dd_hide"><a class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove notification</a></li>
 <!--                    Uncomment when adding subtype hiding
                         <li t-if="display['show_hide']">
                             <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a>
                         </li> -->
-                        <li><a href="#" t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Quote and reply</a></li>
-                        <li t-if="record.type == 'email'"><a t-attf-href="#model=mail.message&amp;id=#{record.id}" class="oe_mail_msg_details">Details</a></li>
+                        <li t-if="options.show_dd_reply_by_email"><a class="oe_mail_msg_reply_by_email" t-attf-data-msg_id="{record.id}">Quote and reply</a></li>
+                        <li t-if="record.type == 'email'"><a class="oe_mail_msg_details" t-attf-href="#model=mail.message&amp;id=#{record.id}" >Details</a></li>
                     </ul>
                 </span>
                 <!-- message itself -->
@@ -118,38 +130,54 @@
                         <t t-raw="record.subject"/>
                     </h1>
                     <div class="oe_mail_msg_body">
-                        <div class="oe_mail_msg_record_body">
-                            <a t-attf-href="#model=#{record.model}&amp;id=#{record.res_id}" t-if="(params.thread_level > 0) &amp; (!record.subject)"><t t-raw="record.record_name"/></a>
-                            <t t-raw="record.body"/>
-                        </div>
+                        <t t-if="options.show_record_name and record.record_name and (!record.subject) and (options.thread_level > 0)">
+                            <a t-attf-href="#model=#{record.model}&amp;id=#{record.res_id}"><t t-raw="record.record_name"/></a>
+                        </t>
+                        <t t-raw="record.body"/>
                     </div>
                     <div class="oe_clear"/>
                     <ul class="oe_mail_msg_footer">
-                      <li t-if="record.subject &amp; params.thread_level > 0"><a t-attf-href="#model=#{record.model}&amp;id=#{record.res_id}"><t t-raw="record.record_name"/></a></li>
-                      <li><a t-attf-href="#model=res.partner&amp;id=#{record.author_id[0]}"><t t-raw="record.author_id[1]"/></a></li>
-                      <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
-                      <li t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply">Reply</a></li>
-                      <!-- uncomment when merging vote
-                      <li><a href="#">Like</a></li>
-                      -->
-                      <li t-if="record.attachment_ids.length > 0">
-                          <a href="#" class="oe_mail_msg_view_attachments">
-                              <t t-if="record.attachment_ids.length == 1">1 Attachment</t>
-                              <t t-if="record.attachment_ids.length > 1"><t t-raw="record.attachment_ids.length"/> Attachments</t>
-                          </a>
-                      </li>
+                        <li t-if="options.show_record_name and record.record_name and record.subject and options.thread_level > 0">
+                            <a t-attf-href="#model=#{record.model}&amp;id=#{record.res_id}"><t t-raw="record.record_name"/></a>
+                        </li>
+                        <li><a t-attf-href="#model=res.partner&amp;id=#{record.author_id[0]}"><t t-raw="record.author_id[1]"/></a></li>
+                        <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
+                        <li t-if="options.show_reply"><a class="oe_mail_msg_reply">Reply</a></li>
+                        <li t-if="options.show_reply_by_email"><a class="oe_mail_msg_reply_by_email" t-attf-data-msg_id="{record.id}">Reply</a></li>
+                        <!-- uncomment when merging vote
+                        <li><a href="#">Like</a></li>
+                        -->
+                        <li t-if="record.attachment_ids.length > 0">
+                            <a class="oe_mail_msg_view_attachments">
+                                <t t-if="record.attachment_ids.length == 1">1 Attachment</t>
+                                <t t-if="record.attachment_ids.length > 1"><t t-raw="record.attachment_ids.length"/> Attachments</t>
+                            </a>
+                        </li>
                     </ul>
                     <t t-if="record.attachment_ids.length > 0">
                         <div class="oe_clear"></div>
-                        <ul class="oe_mail_msg_attachments">
-                            <t t-foreach="record.attachments" t-as="attachment">
-                                <li> <a t-att-href="attachment.url"><t t-raw="attachment.name"/></a> </li>
-                            </t>
-                        </ul>
+                        <t t-call="mail.thread.message.attachments"/>
                     </t>
                 </div>
             </div>
         </div>
     </li>
 
+    <!--
+        mail.thread.message.attachments template
+        Template used to display attachments in a mail.message
+        -->
+    <t t-name="mail.thread.message.attachments">
+        <ul class="oe_mail_msg_attachments">
+            <t t-foreach="record.attachment_ids" t-as="attachment">
+                <li>
+                    <a t-att-href="attachment.url"><t t-raw="attachment.name || attachment.filename"/></a>
+                    <t t-if="record.show_attachment_delete">
+                        <a class="oe_right oe_mail_attachment_delete" title="Delete this attachmentt" t-attf-data-id="{attachment.id}">x</a>
+                    </t>
+                </li>
+            </t>
+        </ul>
+    </t>
+
 </template>
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 39622f42abf..32ce34d48d1 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -7,7 +7,8 @@
         -->
     <div t-name="mail.followers" class="oe_mail_recthread_aside oe_semantic_html_override">
         <div class="oe_mail_recthread_actions">
-            <button type="button" class="oe_mail_button_follow oe_mail_button_mouseout">Not following</button>
+            <button type="button" class="oe_mail_button_invite">Invite</button>
+            <button type="button" class="oe_mail_button_follow">Follow</button>
             <button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button>
         </div>
         <div class="oe_mail_recthread_followers">
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index f45745f31dc..1fab5dd1732 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -19,6 +19,8 @@
 #
 ##############################################################################
 
+import tools
+
 from openerp.tests import common
 from openerp.tools.html_sanitize import html_sanitize
 
@@ -29,7 +31,7 @@ Received: by mail1.openerp.com (Postfix, from userid 10002)
 From: Sylvie Lelitre <sylvie.lelitre@agrolait.com>
 Subject: {subject}
 MIME-Version: 1.0
-Content-Type: multipart/alternative; 
+Content-Type: multipart/alternative;
     boundary="----=_Part_4200734_24778174.1344608186754"
 Date: Fri, 10 Aug 2012 14:16:26 +0000
 Message-ID: <1198923581.41972151344608186760.JavaMail@agrolait.com>
@@ -52,9 +54,9 @@ Content-Transfer-Encoding: quoted-printable
   <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dutf-8" />
  </head>=20
  <body style=3D"margin: 0; padding: 0; background: #ffffff;-webkit-text-size-adjust: 100%;">=20
-  
+
   <p>Please call me as soon as possible this afternoon!</p>
-  
+
   <p>--<br/>
      Sylvie
   <p>
@@ -82,15 +84,42 @@ Sylvie
 """
 
 
-class test_mail(common.TransactionCase):
+class TestMailMockups(common.TransactionCase):
 
     def _mock_smtp_gateway(self, *args, **kwargs):
         return True
 
+    def _init_mock_build_email(self):
+        self._build_email_args_list = []
+        self._build_email_kwargs_list = []
+
     def _mock_build_email(self, *args, **kwargs):
-        self._build_email_args = args
-        self._build_email_kwargs = kwargs
-        return self.build_email_real(*args, **kwargs)
+        self._build_email_args_list.append(args)
+        self._build_email_kwargs_list.append(kwargs)
+        return self._build_email(*args, **kwargs)
+
+    def setUp(self):
+        super(TestMailMockups, self).setUp()
+        # Install mock SMTP gateway
+        self._init_mock_build_email()
+        self._build_email = self.registry('ir.mail_server').build_email
+        self.registry('ir.mail_server').build_email = self._mock_build_email
+        self._send_email = self.registry('ir.mail_server').send_email
+        self.registry('ir.mail_server').send_email = self._mock_smtp_gateway
+
+    def tearDown(self):
+        # Remove mocks
+        self.registry('ir.mail_server').build_email = self._build_email
+        self.registry('ir.mail_server').send_email = self._send_email
+        super(TestMailMockups, self).tearDown()
+
+
+class test_mail(TestMailMockups):
+
+    def _mock_send_get_mail_body(self, *args, **kwargs):
+        # def _send_get_mail_body(self, cr, uid, mail, partner=None, context=None)
+        body = tools.append_content_to_html(args[2].body_html, kwargs.get('partner').name if kwargs.get('partner') else 'No specific partner')
+        return body
 
     def setUp(self):
         super(test_mail, self).setUp()
@@ -105,10 +134,9 @@ class test_mail(common.TransactionCase):
         self.res_users = self.registry('res.users')
         self.res_partner = self.registry('res.partner')
 
-        # Install mock SMTP gateway
-        self.build_email_real = self.registry('ir.mail_server').build_email
-        self.registry('ir.mail_server').build_email = self._mock_build_email
-        self.registry('ir.mail_server').send_email = self._mock_smtp_gateway
+        # Mock send_get_mail_body to test its functionality without other addons override
+        self._send_get_mail_body = self.registry('mail.mail').send_get_mail_body
+        self.registry('mail.mail').send_get_mail_body = self._mock_send_get_mail_body
 
         # groups@.. will cause the creation of new mail groups
         self.mail_group_model_id = self.ir_model.search(self.cr, self.uid, [('model', '=', 'mail.group')])[0]
@@ -118,6 +146,11 @@ class test_mail(common.TransactionCase):
         self.group_pigs_id = self.mail_group.create(self.cr, self.uid,
             {'name': 'Pigs', 'description': 'Fans of Pigs, unite !'})
 
+    def tearDown(self):
+        # Remove mocks
+        self.registry('mail.mail').send_get_mail_body = self._send_get_mail_body
+        super(test_mail, self).tearDown()
+
     def test_00_message_process(self):
         cr, uid = self.cr, self.uid
         # Incoming mail creates a new mail_group "frogs"
@@ -153,7 +186,7 @@ class test_mail(common.TransactionCase):
         test_msg_id = '<deadcafe.1337@smtp.agrolait.com>'
         mail_text = MAIL_TEMPLATE_PLAINTEXT.format(to='groups@example.com', subject='frogs', extra='', msg_id=test_msg_id)
         self.mail_thread.message_process(cr, uid, None, mail_text)
-        new_mail = self.mail_message.browse(cr, uid, self.mail_message.search(cr, uid, [('message_id','=',test_msg_id)])[0])
+        new_mail = self.mail_message.browse(cr, uid, self.mail_message.search(cr, uid, [('message_id', '=', test_msg_id)])[0])
         self.assertEqual(new_mail.body, '\n<pre>\nPlease call me as soon as possible this afternoon!\n\n--\nSylvie\n</pre>\n',
                          'plaintext mail incorrectly parsed')
 
@@ -274,18 +307,20 @@ class test_mail(common.TransactionCase):
         _attachments = [('First', 'My first attachment'), ('Second', 'My second attachment')]
 
         # CASE1: post comment, body and subject specified
+        self._init_mock_build_email()
         msg_id = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body1, subject=_subject, type='comment')
         message = self.mail_message.browse(cr, uid, msg_id)
-        sent_email = self._build_email_kwargs
+        sent_emails = self._build_email_kwargs_list
         # Test: notifications have been deleted
         self.assertFalse(self.mail_mail.search(cr, uid, [('mail_message_id', '=', msg_id)]), 'mail.mail notifications should have been auto-deleted!')
         # Test: mail_message: subject is _subject, body is _body1 (no formatting done)
         self.assertEqual(message.subject, _subject, 'mail.message subject incorrect')
         self.assertEqual(message.body, _body1, 'mail.message body incorrect')
-        # Test: sent_email: email send by server: correct subject, body; body_alternative
-        self.assertEqual(sent_email['subject'], _subject, 'sent_email subject incorrect')
-        self.assertEqual(sent_email['body'], _mail_body1, 'sent_email body incorrect')
-        self.assertEqual(sent_email['body_alternative'], _mail_bodyalt1, 'sent_email body_alternative is incorrect')
+        # Test: sent_email: email send by server: correct subject, body, body_alternative
+        for sent_email in sent_emails:
+            self.assertEqual(sent_email['subject'], _subject, 'sent_email subject incorrect')
+            self.assertEqual(sent_email['body'], _mail_body1 + '\n<pre>Bert Tartopoils</pre>\n', 'sent_email body incorrect')
+            self.assertEqual(sent_email['body_alternative'], _mail_bodyalt1 + '\nBert Tartopoils', 'sent_email body_alternative is incorrect')
         # Test: mail_message: partner_ids = group followers
         message_pids = set([partner.id for partner in message.partner_ids])
         test_pids = set([p_a_id, p_b_id, p_c_id])
@@ -295,14 +330,16 @@ class test_mail(common.TransactionCase):
         notif_pids = set([notif.partner_id.id for notif in self.mail_notification.browse(cr, uid, notif_ids)])
         self.assertEqual(notif_pids, test_pids, 'mail.message notification partners incorrect')
         # Test: sent_email: email_to should contain b@b, not c@c (pref email), not a@a (writer)
-        self.assertEqual(sent_email['email_to'], ['b@b'], 'sent_email email_to is incorrect')
+        for sent_email in sent_emails:
+            self.assertEqual(sent_email['email_to'], ['b@b'], 'sent_email email_to is incorrect')
 
         # CASE2: post an email with attachments, parent_id, partner_ids
         # TESTS: automatic subject, signature in body_html, attachments propagation
+        self._init_mock_build_email()
         msg_id2 = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body2, type='email',
             partner_ids=[(6, 0, [p_d_id])], parent_id=msg_id, attachments=_attachments)
         message = self.mail_message.browse(cr, uid, msg_id2)
-        sent_email = self._build_email_kwargs
+        sent_emails = self._build_email_kwargs_list
         self.assertFalse(self.mail_mail.search(cr, uid, [('mail_message_id', '=', msg_id2)]), 'mail.mail notifications should have been auto-deleted!')
 
         # Test: mail_message: subject is False, body is _body2 (no formatting done), parent_id is msg_id
@@ -310,9 +347,11 @@ class test_mail(common.TransactionCase):
         self.assertEqual(message.body, html_sanitize(_body2), 'mail.message body incorrect')
         self.assertEqual(message.parent_id.id, msg_id, 'mail.message parent_id incorrect')
         # Test: sent_email: email send by server: correct subject, body, body_alternative
-        self.assertEqual(sent_email['subject'], _mail_subject, 'sent_email subject incorrect')
-        self.assertEqual(sent_email['body'], _mail_body2, 'sent_email body incorrect')
-        self.assertEqual(sent_email['body_alternative'], _mail_bodyalt2, 'sent_email body_alternative incorrect')
+        self.assertEqual(len(sent_emails), 2, 'sent_email number of sent emails incorrect')
+        for sent_email in sent_emails:
+            self.assertEqual(sent_email['subject'], _mail_subject, 'sent_email subject incorrect')
+            self.assertIn(_mail_body2, sent_email['body'], 'sent_email body incorrect')
+            self.assertIn(_mail_bodyalt2, sent_email['body_alternative'], 'sent_email body_alternative incorrect')
         # Test: mail_message: partner_ids = group followers
         message_pids = set([partner.id for partner in message.partner_ids])
         test_pids = set([p_a_id, p_b_id, p_c_id, p_d_id])
@@ -322,7 +361,8 @@ class test_mail(common.TransactionCase):
         notif_pids = set([notif.partner_id.id for notif in self.mail_notification.browse(cr, uid, notif_ids)])
         self.assertEqual(notif_pids, test_pids, 'mail.message notification partners incorrect')
         # Test: sent_email: email_to should contain b@b, c@c, not a@a (writer)
-        self.assertEqual(set(sent_email['email_to']), set(['b@b', 'c@c']), 'sent_email email_to incorrect')
+        for sent_email in sent_emails:
+            self.assertTrue(set(sent_email['email_to']).issubset(set(['b@b', 'c@c'])), 'sent_email email_to incorrect')
         # Test: attachments
         for attach in message.attachment_ids:
             self.assertEqual(attach.res_model, 'mail.group', 'mail.message attachment res_model incorrect')
@@ -409,12 +449,14 @@ class test_mail(common.TransactionCase):
         self.assertEqual(compose.content_subtype, 'html', 'mail.compose.message incorrect content_subtype')
 
         # 2. Post the comment, get created message
+        parent_id = message.id
         mail_compose.send_mail(cr, uid, [compose_id])
         group_pigs.refresh()
         message = group_pigs.message_ids[0]
-        # Test: mail.message: subject as Re:.., body in html
+        # Test: mail.message: subject as Re:.., body in html, parent_id
         self.assertEqual(message.subject, _msg_reply, 'mail.message incorrect subject')
         self.assertIn('Administrator wrote:<blockquote><pre>Pigs rules</pre></blockquote></div>', message.body, 'mail.message body is incorrect')
+        self.assertEqual(message.parent_id and message.parent_id.id, parent_id, 'mail.message parent_id incorrect')
         # Test: mail.message: attachments
         for attach in message.attachment_ids:
             self.assertEqual(attach.res_model, 'mail.group', 'mail.message attachment res_model incorrect')
@@ -458,6 +500,7 @@ class test_mail(common.TransactionCase):
         # It will be updated as soon as we have fixed specs !
         cr, uid = self.cr, self.uid
         group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+
         def _compare_structures(struct1, struct2, n=0):
             # print '%scompare structure' % ('\t' * n)
             self.assertEqual(len(struct1), len(struct2), 'message_read structure number of childs incorrect')
diff --git a/addons/mail/wizard/__init__.py b/addons/mail/wizard/__init__.py
index 88b9581f68e..39a2d843354 100644
--- a/addons/mail/wizard/__init__.py
+++ b/addons/mail/wizard/__init__.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+import invite
 import mail_compose_message
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/wizard/invite.py b/addons/mail/wizard/invite.py
new file mode 100644
index 00000000000..50ecf9450da
--- /dev/null
+++ b/addons/mail/wizard/invite.py
@@ -0,0 +1,82 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+from tools.translate import _
+
+
+class invite_wizard(osv.osv_memory):
+    """ Wizard to invite partners and make them followers. """
+    _name = 'mail.wizard.invite'
+    _description = 'Invite wizard'
+
+    def default_get(self, cr, uid, fields, context=None):
+        result = super(invite_wizard, self).default_get(cr, uid, fields, context=context)
+        if 'message' in fields and result.get('res_model') and result.get('res_id'):
+            document_name = self.pool.get(result.get('res_model')).name_get(cr, uid, [result.get('res_id')], context=context)[0][1]
+            message = _('<div>You have been invited to follow %s.</div>' % document_name)
+            result['message'] = message
+        elif 'message' in fields:
+            result['message'] = _('<div>You have been invited to follow a new document.</div>')
+        return result
+
+    _columns = {
+        'res_model': fields.char('Related Document Model', size=128,
+                        required=True, select=1,
+                        help='Model of the followed resource'),
+        'res_id': fields.integer('Related Document ID', select=1,
+                        help='Id of the followed resource'),
+        'partner_ids': fields.many2many('res.partner', string='Partners'),
+        'message': fields.html('Message'),
+    }
+
+    def onchange_partner_ids(self, cr, uid, ids, value, context=None):
+        """ onchange_partner_ids (value format: [[6, 0, [3, 4]]]). The
+            basic purpose of this method is to check that destination partners
+            effectively have email addresses. Otherwise a warning is thrown.
+        """
+        res = {'value': {}}
+        if not value or not value[0] or not value[0][0] == 6:
+            return
+        res.update(self.pool.get('mail.message').check_partners_email(cr, uid, value[0][2], context=context))
+        return res
+
+    def add_followers(self, cr, uid, ids, context=None):
+        for wizard in self.browse(cr, uid, ids, context=context):
+            model_obj = self.pool.get(wizard.res_model)
+            document = model_obj.browse(cr, uid, wizard.res_id, context=context)
+
+            # filter partner_ids to get the new followers, to avoid sending email to already following partners
+            new_follower_ids = [p.id for p in wizard.partner_ids if p.id not in document.message_follower_ids]
+            model_obj.message_subscribe(cr, uid, [wizard.res_id], new_follower_ids, context=context)
+
+            # send an email
+            if wizard.message:
+                for follower_id in new_follower_ids:
+                    mail_mail = self.pool.get('mail.mail')
+                    mail_id = mail_mail.create(cr, uid, {
+                        'subject': 'Invitation to follow %s' % document.name_get()[0][1],
+                        'body_html': '%s' % wizard.message,
+                        'auto_delete': True,
+                        }, context=context)
+                    mail_mail.send(cr, uid, [mail_id], recipient_ids=[follower_id], context=context)
+        return {'type': 'ir.actions.act_window_close'}
diff --git a/addons/mail/wizard/invite_view.xml b/addons/mail/wizard/invite_view.xml
new file mode 100644
index 00000000000..b932f96dfe7
--- /dev/null
+++ b/addons/mail/wizard/invite_view.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- wizard view -->
+        <record model="ir.ui.view" id="mail_wizard_invite_form">
+            <field name="name">Add Followers</field>
+            <field name="model">mail.wizard.invite</field>
+            <field name="arch" type="xml">
+                <form string="Add Followers" version="7.0">
+                    <group>
+                        <field name="res_model" invisible="1"/>
+                        <field name="res_id" invisible="1"/>
+                        <field name="partner_ids" widget="many2many_tags"
+                            on_change="onchange_partner_ids(partner_ids)" />
+                        <field name="message"/>
+                    </group>
+                    <footer>
+                        <button string="Add Followers"
+                            name="add_followers" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />    
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 3153ccc2069..760d16dbef2 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -31,6 +31,7 @@ from tools.translate import _
 # main mako-like expression pattern
 EXPRESSION_PATTERN = re.compile('(\$\{.+?\})')
 
+
 class mail_compose_message(osv.TransientModel):
     """ Generic message composition wizard. You may inherit from this wizard
         at model and view levels to provide specific features.
@@ -117,6 +118,7 @@ class mail_compose_message(osv.TransientModel):
         'body_text': lambda self, cr, uid, ctx={}: False,
         'body': lambda self, cr, uid, ctx={}: '',
         'subject': lambda self, cr, uid, ctx={}: False,
+        'partner_ids': lambda self, cr, uid, ctx={}: [],
     }
 
     def notify(self, cr, uid, newid, context=None):
@@ -152,7 +154,7 @@ class mail_compose_message(osv.TransientModel):
         # create subject
         re_prefix = _('Re:')
         reply_subject = tools.ustr(message_data.subject or '')
-        if not (reply_subject.startswith('Re:') or reply_subject.startswith(re_prefix)):
+        if not (reply_subject.startswith('Re:') or reply_subject.startswith(re_prefix)) and message_data.subject:
             reply_subject = "%s %s" % (re_prefix, reply_subject)
         # create the reply in the body
         reply_body = _('<div>On %(date)s, %(sender_name)s wrote:<blockquote>%(body)s</blockquote></div>') % {
@@ -176,8 +178,8 @@ class mail_compose_message(osv.TransientModel):
         return result
 
     def toggle_content_subtype(self, cr, uid, ids, context=None):
-        """ hit toggle formatting mode button: calls onchange_formatting to
-            emulate an on_change, then writes the value to update the form. """
+        """ toggle content_subtype: calls onchange_formatting to emulate an
+            on_change, then writes the value to update the form. """
         for record in self.browse(cr, uid, ids, context=context):
             content_st_new_value = 'plain' if record.content_subtype == 'html' else 'html'
             onchange_res = self.onchange_content_subtype(cr, uid, ids, content_st_new_value, record.model, record.res_id, context=context)
@@ -185,48 +187,23 @@ class mail_compose_message(osv.TransientModel):
         return True
 
     def onchange_content_subtype(self, cr, uid, ids, value, model, res_id, context=None):
-        """ onchange_content_subtype (values: 'plain' or 'html'). This onchange
-            on the subtype allows to have some specific behavior when switching
-            between text or html mode.
-            This method can be overridden for models that want to have their
-            specific behavior. """
+        """ This onchange allows to have some specific behavior when switching
+            between text or html mode. This method can be overridden.
+            :param values: 'plain' or 'html'
+        """
         return {'value': {'content_subtype': value}}
 
-    def _verify_partner_email(self, cr, uid, partner_ids, context=None):
-        """ Verify that selected partner_ids have an email_address defined.
-            Otherwise throw a warning. """
-        partner_wo_email_lst = []
-        for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context):
-            if not partner.email:
-                partner_wo_email_lst.append(partner)
-        if not partner_wo_email_lst:
-            return {}
-        warning_msg = _('The following partners chosen as recipients for the email have no email address linked :')
-        for partner in partner_wo_email_lst:
-            warning_msg += '\n- %s' % (partner.name)
-        return {'warning': {
-                    'title': _('Partners email addresses not found'),
-                    'message': warning_msg,
-                    }
-                }
-
     def onchange_partner_ids(self, cr, uid, ids, value, context=None):
-        """ onchange_partner_ids (value format: [[6, 0, [3, 4]]]). The
-            basic purpose of this method is to check that destination partners
+        """ The basic purpose of this method is to check that destination partners
             effectively have email addresses. Otherwise a warning is thrown.
+            :param value: value format: [[6, 0, [3, 4]]]
         """
         res = {'value': {}}
         if not value or not value[0] or not value[0][0] == 6:
             return
-        res.update(self._verify_partner_email(cr, uid, value[0][2], context=context))
+        res.update(self.check_partners_email(cr, uid, value[0][2], context=context))
         return res
 
-    def unlink(self, cr, uid, ids, context=None):
-        # Cascade delete all attachments, as they are owned by the composition wizard
-        for wizard in self.read(cr, uid, ids, ['attachment_ids'], context=context):
-            self.pool.get('ir.attachment').unlink(cr, uid, wizard['attachment_ids'], context=context)
-        return super(mail_compose_message, self).unlink(cr, uid, ids, context=context)
-
     def dummy(self, cr, uid, ids, context=None):
         """ TDE: defined to have buttons that do basically nothing. It is
             currently impossible to have buttons that do nothing special
@@ -255,6 +232,7 @@ class mail_compose_message(osv.TransientModel):
                 post_values = {
                     'subject': wizard.subject if wizard.content_subtype == 'html' else False,
                     'body': wizard.body if wizard.content_subtype == 'html' else '<pre>%s</pre>' % tools.ustr(wizard.body_text),
+                    'parent_id': wizard.parent_id and wizard.parent_id.id,
                     'partner_ids': [(4, partner.id) for partner in wizard.partner_ids],
                     'attachments': [(attach.datas_fname or attach.name, base64.b64decode(attach.datas)) for attach in wizard.attachment_ids],
                 }
@@ -268,6 +246,8 @@ class mail_compose_message(osv.TransientModel):
                     post_values.update(email_dict)
                 # post the message
                 active_model_pool.message_post(cr, uid, [res_id], type='comment', context=context, **post_values)
+            # post process: update attachments, because id is not necessarily known when adding attachments in Chatter
+            self.pool.get('ir.attachment').write(cr, uid, [attach.id for attach in wizard.attachment_ids], {'res_id': wizard.id}, context=context)
 
         return {'type': 'ir.actions.act_window_close'}
 
@@ -296,6 +276,7 @@ class mail_compose_message(osv.TransientModel):
         """
         if context is None:
             context = {}
+
         def merge(match):
             exp = str(match.group()[2:-1]).strip()
             result = eval(exp, {
diff --git a/addons/marketing/res_config.py b/addons/marketing/res_config.py
index 7584f00e6b0..7cedb65a373 100644
--- a/addons/marketing/res_config.py
+++ b/addons/marketing/res_config.py
@@ -25,14 +25,14 @@ class marketing_config_settings(osv.osv_memory):
     _name = 'marketing.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
-        'module_marketing_campaign': fields.boolean('Marketing Campaigns',
+        'module_marketing_campaign': fields.boolean('Marketing campaigns',
             help="""Provides leads automation through marketing campaigns.
                 Campaigns can in fact be defined on any resource, not just CRM leads.
                 This installs the module marketing_campaign."""),
-        'module_marketing_campaign_crm_demo': fields.boolean('Demo Data for Marketing Campaigns',
+        'module_marketing_campaign_crm_demo': fields.boolean('Demo data for marketing campaigns',
             help="""Installs demo data like leads, campaigns and segments for Marketing Campaigns.
                 This installs the module marketing_campaign_crm_demo."""),
-        'module_crm_profiling': fields.boolean('Track Customer Profile to Focus your Campaigns',
+        'module_crm_profiling': fields.boolean('Track customer profile to focus your campaigns',
             help="""Allows users to perform segmentation within partners.
                 This installs the module crm_profiling."""),
     }
diff --git a/addons/mrp/i18n/ar.po b/addons/mrp/i18n/ar.po
index 4dd8634257b..a4f19287cd4 100644
--- a/addons/mrp/i18n/ar.po
+++ b/addons/mrp/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -48,7 +48,7 @@ msgstr "إستعمال مراكز العمل"
 #. module: mrp
 #: model:product.template,name:mrp.product_sugar_product_template
 msgid "Sugar"
-msgstr ""
+msgstr "سكر"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -63,7 +63,7 @@ msgstr "عدد الدورات"
 #. module: mrp
 #: model:product.uom.categ,name:mrp.product_uom_categ_fluid
 msgid "Fluid"
-msgstr ""
+msgstr "سائل"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_minimumstockprocure0
@@ -145,7 +145,7 @@ msgstr "منتجات منتهية"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are currently in production."
-msgstr ""
+msgstr "تصنيع الطلبيات التي هي حاليا في الإنتاج."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicerfq0
@@ -218,17 +218,14 @@ msgstr "امليء المنتج لتتعقب بسهولة تكاليف الان
 msgid "For purchased material"
 msgstr "للمواد المشتراه"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "مراجعة"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
 "the product can be purchased."
 msgstr ""
+"إنشاء نموذج المنتج على كل شيء قمت بالشراءه أو بيعه. حدد المورد إذا كان من "
+"الممكن شراء المنتج."
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.next_id_77
@@ -264,7 +261,7 @@ msgstr "معلومات عن القدرة"
 #. module: mrp
 #: field:mrp.production,move_created_ids2:0
 msgid "Produced Products"
-msgstr ""
+msgstr "إنتاج المنتجات"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -319,7 +316,7 @@ msgstr "انت تحاول تخصيص الكثير من ما هو دون المن
 #. module: mrp
 #: model:product.template,name:mrp.product_cloth_product_template
 msgid "Cloth"
-msgstr ""
+msgstr "ثوب"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
@@ -334,7 +331,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
 msgid "Work Center Usage"
-msgstr ""
+msgstr "استخدام عمل المركز"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
@@ -396,6 +393,11 @@ msgid ""
 "sales person creates a sales order, he can relate it to several properties "
 "and OpenERP will automatically select the BoM to use according the needs."
 msgstr ""
+"وتستخدم الخصائص في OpenERP لتحديد مواد المشروع المناسبة  لتصنيع منتج عندما "
+"يكون لديك طرق مختلفة لبناء نفس المنتج. يمكنك تعيين العديد من الخصائص على كل "
+"فاتورة مواد. عندما يقوم مندوب المبيعات بإنشاء طلبات مبيعات، وكما يمكنه ربطها "
+"بالعديد من الخصائص وOpenERP سوف تختار تلقائيا فاتورة المواد لاستخدامها وفقا "
+"للاحتياجات."
 
 #. module: mrp
 #: help:mrp.production,picking_id:0
@@ -473,7 +475,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
 msgid "Specify Cost of Work Center per cycle."
-msgstr ""
+msgstr "حدد تكلفة العمل المركزية دورة"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
@@ -485,11 +487,6 @@ msgstr "تعطب التصنيع"
 msgid "For Services."
 msgstr "للخدمات."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "تاريخ التعديل."
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -525,7 +522,7 @@ msgstr "خطأ: كود إين غير صالح"
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
 msgid "Products to Produce"
-msgstr ""
+msgstr "لإنتاج منتجات"
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -541,18 +538,13 @@ msgstr "كمية التغيير"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_configure_workcenter
 msgid "Configure your work centers"
-msgstr ""
+msgstr "اضبط مراكز عملك"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Force Reservation"
 msgstr "فرض الحجز"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "المؤلف"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -669,7 +661,7 @@ msgstr "جاهز"
 #. module: mrp
 #: model:product.template,name:mrp.product_buttons_product_template
 msgid "Shirt Buttons"
-msgstr ""
+msgstr "أزرار القميص"
 
 #. module: mrp
 #: help:mrp.production,routing_id:0
@@ -806,7 +798,7 @@ msgstr "عاجل"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are waiting for raw materials."
-msgstr ""
+msgstr "تصنيع الطلبيات التي تنتظر المواد الخام."
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
@@ -839,11 +831,6 @@ msgstr "الدورات الكلية"
 msgid "Ready to Produce"
 msgstr "جاهز للانتاج"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "إسم التصنيف"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -903,7 +890,7 @@ msgstr "الحد الادنى من المخزون"
 #: code:addons/mrp/mrp.py:503
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'"
-msgstr ""
+msgstr "لا يمكن حذف نظام التصنيع في ولاية %s"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menus_dash_mrp
@@ -915,7 +902,7 @@ msgstr "اللوحة الرئيسية"
 #: code:addons/mrp/report/price.py:211
 #, python-format
 msgid "Total Cost of %s %s"
-msgstr ""
+msgstr "التكلفة الكلية لـ%s %s"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
@@ -1423,11 +1410,6 @@ msgstr "شراء المنتجات"
 msgid "Work Center Loads"
 msgstr "تحميلات مركز العمل"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "فمراجعة فاتورة المواد"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1958,12 +1940,6 @@ msgstr "الوقت بالساعات للإعداد."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "فاتورة المواد"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1981,17 +1957,6 @@ msgstr "تخصيص من المخزون."
 msgid "Waiting Goods"
 msgstr "انتظار السلع"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "اخر مؤشر"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "مراجعات فاتورة المواد"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2179,19 +2144,6 @@ msgstr "غير الكمية"
 msgid "Change Product Qty"
 msgstr "غير كمية المنتج"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "الوصف"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2312,6 +2264,9 @@ msgstr "منتجات للاستهلاك"
 #~ msgid "Day"
 #~ msgstr "يوم"
 
+#~ msgid "Revision"
+#~ msgstr "مراجعة"
+
 #~ msgid "title"
 #~ msgstr "الاسم"
 
@@ -2324,6 +2279,9 @@ msgstr "منتجات للاستهلاك"
 #~ msgid "October"
 #~ msgstr "أكتوبر"
 
+#~ msgid "Author"
+#~ msgstr "المؤلف"
+
 #~ msgid "March"
 #~ msgstr "مارس"
 
@@ -2394,6 +2352,9 @@ msgstr "منتجات للاستهلاك"
 #~ "following addons."
 #~ msgstr "اضف وظائف اكثر لجوهر تطبيق الصناعة بالملحقات التالية."
 
+#~ msgid "Modification name"
+#~ msgstr "إسم التصنيف"
+
 #~ msgid ""
 #~ "Time in hours for this work center to achieve the operation of the specified "
 #~ "routing."
@@ -2497,6 +2458,15 @@ msgstr "منتجات للاستهلاك"
 #~ "performance."
 #~ msgstr "يسمح لك هذا التقرير بتحليل انشطة التصنيع الخاصة بك و الاداء."
 
+#~ msgid "BoM"
+#~ msgstr "فاتورة المواد"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "مراجعات فاتورة المواد"
+
+#~ msgid "last indice"
+#~ msgstr "اخر مؤشر"
+
 #~ msgid "Draft"
 #~ msgstr "مسوّدة"
 
@@ -2527,6 +2497,9 @@ msgstr "منتجات للاستهلاك"
 #~ msgid "Work Cost of "
 #~ msgstr "تكلفة العمل لـ "
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "فمراجعة فاتورة المواد"
+
 #~ msgid "Manufacturing Operations"
 #~ msgstr "عمليات التصنيع"
 
@@ -2535,6 +2508,9 @@ msgstr "منتجات للاستهلاك"
 #~ "this work center."
 #~ msgstr "وصف مركز العمل. يبين هنا ماهي الدورة وفقًا لمركز العمل هذا."
 
+#~ msgid "Description"
+#~ msgstr "الوصف"
+
 #~ msgid "May"
 #~ msgstr "مايو"
 
@@ -2644,3 +2620,6 @@ msgstr "منتجات للاستهلاك"
 #~ "الخصائص على كل فاتورة من المواد. عندما ينشأ البائع ترتيب مبيعات، يمكنه ربطها "
 #~ "بالعديد من الخصائص و ستحدد OpenERP تلقائيا فاتورة المواد لاستخدمها طبقًا "
 #~ "للاحتياجات."
+
+#~ msgid "Modification Date"
+#~ msgstr "تاريخ التعديل."
diff --git a/addons/mrp/i18n/bg.po b/addons/mrp/i18n/bg.po
index c433a374169..ddd3947e772 100644
--- a/addons/mrp/i18n/bg.po
+++ b/addons/mrp/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -223,11 +223,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "За закупени суровини"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Версия"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -494,11 +489,6 @@ msgstr "Разлагане на производство"
 msgid "For Services."
 msgstr "За услуги."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Дата на промяна"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -560,11 +550,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Мощност за резервация"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Автор"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -845,11 +830,6 @@ msgstr "Общо цикли"
 msgid "Ready to Produce"
 msgstr "Готов за производство"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Име на промяна"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1410,11 +1390,6 @@ msgstr "Снабдяване с продукти"
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1918,12 +1893,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1941,17 +1910,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr "Чакащи стоки"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2137,19 +2095,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Описание"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2320,6 +2265,15 @@ msgstr ""
 #~ msgid "products"
 #~ msgstr "продукти"
 
+#~ msgid "Author"
+#~ msgstr "Автор"
+
+#~ msgid "Modification Date"
+#~ msgstr "Дата на промяна"
+
+#~ msgid "Modification name"
+#~ msgstr "Име на промяна"
+
 #~ msgid "Stockable Production Order"
 #~ msgstr "Скадируема поръчка за производство"
 
@@ -2332,6 +2286,9 @@ msgstr ""
 #~ msgid "Day"
 #~ msgstr "Ден"
 
+#~ msgid "Revision"
+#~ msgstr "Версия"
+
 #~ msgid "title"
 #~ msgstr "заглавие"
 
@@ -2435,6 +2392,9 @@ msgstr ""
 #~ msgid "January"
 #~ msgstr "Януари"
 
+#~ msgid "Description"
+#~ msgstr "Описание"
+
 #~ msgid "May"
 #~ msgstr "Май"
 
diff --git a/addons/mrp/i18n/bs.po b/addons/mrp/i18n/bs.po
index 221b8dfd6af..96ed648dced 100644
--- a/addons/mrp/i18n/bs.po
+++ b/addons/mrp/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -210,11 +210,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -469,11 +464,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -531,11 +521,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -816,11 +801,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1381,11 +1361,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1889,12 +1864,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1912,17 +1881,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2108,19 +2066,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
diff --git a/addons/mrp/i18n/ca.po b/addons/mrp/i18n/ca.po
index 48007166a19..b43d7b7fc5c 100644
--- a/addons/mrp/i18n/ca.po
+++ b/addons/mrp/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Per material comprat"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisió"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -499,11 +494,6 @@ msgstr "Descomposició fabricació"
 msgid "For Services."
 msgstr "Per serveis"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Data modificació"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -565,11 +555,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Força reserves"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -862,11 +847,6 @@ msgstr "Total cicles"
 msgid "Ready to Produce"
 msgstr "Llest per produir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nom de modificació"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1460,11 +1440,6 @@ msgstr "Proveir products"
 msgid "Work Center Loads"
 msgstr "Càrregues centre de producció"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisió de la llista de materials"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2007,12 +1982,6 @@ msgstr "Temps en hores per la configuració."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Llista de materials (LdM)"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2030,17 +1999,6 @@ msgstr "Assignació des d'estoc."
 msgid "Waiting Goods"
 msgstr "Esperant mercaderia"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Últim índex"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisions llista de materials"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2229,19 +2187,6 @@ msgstr "Canvia la quantitat"
 msgid "Change Product Qty"
 msgstr "Canvia Qtat. producte"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descripció"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2378,6 +2323,9 @@ msgstr "Productes a consumir"
 #~ "virtual menor que 0. Probablement no hauria d'utilitzar aquesta opció, "
 #~ "suggerim utilitzar una configuració de MTO en productes."
 
+#~ msgid "Revision"
+#~ msgstr "Revisió"
+
 #~ msgid "Exceptions Procurements"
 #~ msgstr "Excepcions de proveïments"
 
@@ -2544,6 +2492,9 @@ msgstr "Productes a consumir"
 #~ msgid "Make Procurement"
 #~ msgstr "Realitza proveïment"
 
+#~ msgid "Modification Date"
+#~ msgstr "Data modificació"
+
 #~ msgid "If Procure method is Make to order and supply method is produce"
 #~ msgstr ""
 #~ "Si mètode de proveïment és obtenir sota comanda i mètode de subministre és "
@@ -2552,6 +2503,9 @@ msgstr "Productes a consumir"
 #~ msgid "Purchase Lead Time"
 #~ msgstr "Termini de temps de compra"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Stockable Product Stock"
 #~ msgstr "Estoc de producte estocable"
 
@@ -2644,6 +2598,9 @@ msgstr "Productes a consumir"
 #~ msgid "Security Days"
 #~ msgstr "Dies de seguretat"
 
+#~ msgid "Modification name"
+#~ msgstr "Nom de modificació"
+
 #~ msgid "Exception"
 #~ msgstr "Excepció"
 
@@ -2995,6 +2952,9 @@ msgstr "Productes a consumir"
 #~ msgid "plus"
 #~ msgstr "més"
 
+#~ msgid "BoM"
+#~ msgstr "Llista de materials (LdM)"
+
 #~ msgid "Stockable Product Process"
 #~ msgstr "Procés producte estocable"
 
@@ -3004,6 +2964,12 @@ msgstr "Productes a consumir"
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Una sol·licitud de pressupost és creada i enviada al proveïdor."
 
+#~ msgid "last indice"
+#~ msgstr "Últim índex"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisions llista de materials"
+
 #~ msgid "Retry"
 #~ msgstr "Torna a intentar"
 
@@ -3061,6 +3027,9 @@ msgstr "Productes a consumir"
 #~ msgid "Close Move at end"
 #~ msgstr "Moviment de tancament al final"
 
+#~ msgid "Description"
+#~ msgstr "Descripció"
+
 #~ msgid "Running"
 #~ msgstr "En procés"
 
@@ -3303,6 +3272,9 @@ msgstr "Productes a consumir"
 #~ msgid "Configure"
 #~ msgstr "Configura"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisió de la llista de materials"
+
 #~ msgid ""
 #~ "Routing indicates all the workcenters used, for how long and/or cycles.If "
 #~ "Routing is indicated then,the third tab of a production order (workcenters) "
diff --git a/addons/mrp/i18n/cs.po b/addons/mrp/i18n/cs.po
index a6f97ebee88..bd2be7678e4 100644
--- a/addons/mrp/i18n/cs.po
+++ b/addons/mrp/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: mrp
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Pro nakoupený materiál"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revize"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -477,11 +472,6 @@ msgstr "Rozložení výroby"
 msgid "For Services."
 msgstr "Pro služby."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Datum úpravy"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -539,11 +529,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Vynutit rezervaci"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -828,11 +813,6 @@ msgstr "Celkem cyklů"
 msgid "Ready to Produce"
 msgstr "Připraveno k výrobě"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Jméno úpravy"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1396,11 +1376,6 @@ msgstr "Pořídit výrobek"
 msgid "Work Center Loads"
 msgstr "Vytížení výrobních center"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revize Soupisky materiálu"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1912,12 +1887,6 @@ msgstr "Čas v hodinách na sestavení"
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "BoM"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1935,17 +1904,6 @@ msgstr "Přiřazení ze skladu."
 msgid "Waiting Goods"
 msgstr "Čekající zboží"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "poslední ukazatel"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revize BoM"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2131,19 +2089,6 @@ msgstr "Změnit množství"
 msgid "Change Product Qty"
 msgstr "Změnit množ. výrobků"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Popis"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2298,6 +2243,9 @@ msgstr "Výrobků ke spotřebě"
 #~ msgid "Raw Material Location"
 #~ msgstr "Umístění surového materiálu"
 
+#~ msgid "Revision"
+#~ msgstr "Revize"
+
 #~ msgid "title"
 #~ msgstr "nadpis"
 
@@ -2323,6 +2271,12 @@ msgstr "Výrobků ke spotřebě"
 #~ msgid "Advanced Routes"
 #~ msgstr "Pokročilé trasy"
 
+#~ msgid "Modification Date"
+#~ msgstr "Datum úpravy"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "March"
 #~ msgstr "Březen"
 
@@ -2355,6 +2309,9 @@ msgstr "Výrobků ke spotřebě"
 #~ "Čas v hodinách pro toto pracovní centrum k dosažení operace zadaného "
 #~ "směrování."
 
+#~ msgid "Modification name"
+#~ msgstr "Jméno úpravy"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Rozšířené filtry..."
 
@@ -2433,6 +2390,15 @@ msgstr "Výrobků ke spotřebě"
 #~ msgid "Image"
 #~ msgstr "Obrázek"
 
+#~ msgid "BoM"
+#~ msgstr "BoM"
+
+#~ msgid "last indice"
+#~ msgstr "poslední ukazatel"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revize BoM"
+
 #~ msgid "Draft"
 #~ msgstr "Koncept"
 
@@ -2451,6 +2417,9 @@ msgstr "Výrobků ke spotřebě"
 #~ "will be automatically pre-completed."
 #~ msgstr "poslední ukazatel"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revize Soupisky materiálu"
+
 #, python-format
 #~ msgid "Work Cost of "
 #~ msgstr "Cena práce "
@@ -2468,6 +2437,9 @@ msgstr "Výrobků ke spotřebě"
 #~ msgid "MRP Applications Configuration"
 #~ msgstr "Nastavení aplikace MRP"
 
+#~ msgid "Description"
+#~ msgstr "Popis"
+
 #~ msgid "May"
 #~ msgstr "Květen"
 
diff --git a/addons/mrp/i18n/da.po b/addons/mrp/i18n/da.po
index becdcd330fc..6eea2b3c7e8 100644
--- a/addons/mrp/i18n/da.po
+++ b/addons/mrp/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -470,11 +465,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -532,11 +522,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -817,11 +802,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1382,11 +1362,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1890,12 +1865,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1913,17 +1882,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2109,19 +2067,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po
index b3c8716c9f4..8c4a422fd10 100644
--- a/addons/mrp/i18n/de.po
+++ b/addons/mrp/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Für eingekauftes Material"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revision"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -509,11 +504,6 @@ msgstr "Fertigungsreste"
 msgid "For Services."
 msgstr "Für Dienstleistungsprodukte."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Änderung am"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -575,11 +565,6 @@ msgstr "Konfigurieren Sie Ihre Arbeitsplätze"
 msgid "Force Reservation"
 msgstr "Erzwinge Reservierung"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Mitarbeiter"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -880,11 +865,6 @@ msgstr "Gesamt Zyklen"
 msgid "Ready to Produce"
 msgstr "Startbereit für Fertigung"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Bezeichnung geändert"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1483,11 +1463,6 @@ msgstr "Beschaffung Produkte"
 msgid "Work Center Loads"
 msgstr "Arbeitsplatz Auslastungen"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Stückliste Revision"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2032,12 +2007,6 @@ msgstr "Vorbereitungszeit"
 msgid "Orange Juice"
 msgstr "Orangensaft"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Stückliste"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2055,17 +2024,6 @@ msgstr "Zuweisung vom Lager."
 msgid "Waiting Goods"
 msgstr "Erwartet Material"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Letzter Index"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Stücklisten Revision"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2257,19 +2215,6 @@ msgstr "Ändere Anzahl"
 msgid "Change Product Qty"
 msgstr "Ändere Produkt Menge"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Beschreibung"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2409,6 +2354,9 @@ msgstr "Benötigte Produkte"
 #~ "virtuellem Lager unter \"0\". Idealerweise arbeitet man allerdings mit "
 #~ "Lagerbestandsregeln."
 
+#~ msgid "Revision"
+#~ msgstr "Revision"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Regelbasierte Beschaffungsvorschläge"
 
@@ -2582,6 +2530,9 @@ msgstr "Benötigte Produkte"
 #~ msgid "Make Procurement"
 #~ msgstr "Erzeuge Beschaffung"
 
+#~ msgid "Modification Date"
+#~ msgstr "Änderung am"
+
 #~ msgid "If Procure method is Make to order and supply method is produce"
 #~ msgstr ""
 #~ "Falls Beschaffungsmethode 'aus Auftrag' und Einkaufsmethode 'Produktion'"
@@ -2684,6 +2635,9 @@ msgstr "Benötigte Produkte"
 #~ msgid "Security Days"
 #~ msgstr "Sicherheitspuffer (Tage)"
 
+#~ msgid "Modification name"
+#~ msgstr "Bezeichnung geändert"
+
 #~ msgid "Exception"
 #~ msgstr "Fehlerliste"
 
@@ -3033,6 +2987,9 @@ msgstr "Benötigte Produkte"
 #~ msgid "plus"
 #~ msgstr "Plus"
 
+#~ msgid "BoM"
+#~ msgstr "Stückliste"
+
 #~ msgid "Stockable Product Process"
 #~ msgstr "Lagerfähiges Produkt Prozess"
 
@@ -3042,6 +2999,12 @@ msgstr "Benötigte Produkte"
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Eine Angebotsanfrage wurde erzeugt und an den Lieferanten versendet."
 
+#~ msgid "last indice"
+#~ msgstr "Letzter Index"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Stücklisten Revision"
+
 #~ msgid "Retry"
 #~ msgstr "Wiederhole"
 
@@ -3100,6 +3063,9 @@ msgstr "Benötigte Produkte"
 #~ msgid "Close Move at end"
 #~ msgstr "Beende Warenfluss (Ende)"
 
+#~ msgid "Description"
+#~ msgstr "Beschreibung"
+
 #~ msgid "Running"
 #~ msgstr "In Weiterbearbeitung"
 
@@ -3238,6 +3204,9 @@ msgstr "Benötigte Produkte"
 #~ msgid "January"
 #~ msgstr "Januar"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Stückliste Revision"
+
 #~ msgid "February"
 #~ msgstr "Februar"
 
@@ -3263,6 +3232,9 @@ msgstr "Benötigte Produkte"
 #~ msgid "Advanced Routes"
 #~ msgstr "Lieferketten"
 
+#~ msgid "Author"
+#~ msgstr "Mitarbeiter"
+
 #~ msgid "Workcenter Usage"
 #~ msgstr "Fertigungsstelle Auslastung"
 
diff --git a/addons/mrp/i18n/el.po b/addons/mrp/i18n/el.po
index 32dfa7a3025..3eb611eb8e6 100644
--- a/addons/mrp/i18n/el.po
+++ b/addons/mrp/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -213,11 +213,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Αναθεώρηση"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -476,11 +471,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Ημερ/νία Τροποποίησης"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -540,11 +530,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Κράτηση Τώρα"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Δημιουργός"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -825,11 +810,6 @@ msgstr "Σύννολο Κύκλων"
 msgid "Ready to Produce"
 msgstr "Έτοιμο για Παραγωγή"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Όνομα τροποποίησης"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1390,11 +1370,6 @@ msgstr "Προμήθεια Προϊόντων"
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1899,12 +1874,6 @@ msgstr "Χρόνος εγκατάστασης σε ώρες"
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Κ.Υ."
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1922,17 +1891,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr "Σε αναμονή υλικών"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "last indice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Αναθεωρήσεις ΚΥ"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2118,19 +2076,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr "Αλλαγή Ποσ. Προϊόντος"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Περιγραφή"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2296,6 +2241,9 @@ msgstr ""
 #~ msgid "Security Days"
 #~ msgstr "Ημέρες Ασφαλείας"
 
+#~ msgid "Modification name"
+#~ msgstr "Όνομα τροποποίησης"
+
 #~ msgid "From minimum stock rules, it goes for procure product."
 #~ msgstr "From minimum stock rules, it goes for procure product."
 
@@ -2331,6 +2279,9 @@ msgstr ""
 #~ msgid "Manufacturing Resource Planning"
 #~ msgstr "Σχεδίαση Πηγών Βιομηχανικής Παραγωγής (MRP)"
 
+#~ msgid "Revision"
+#~ msgstr "Αναθεώρηση"
+
 #~ msgid "Routing Workcenters"
 #~ msgstr "Κέντρα Εργασίας Γραμμής Παραγωγής"
 
@@ -2468,12 +2419,18 @@ msgstr ""
 #~ msgid "Print product price"
 #~ msgstr "Εκτύπωση τιμής Προϊόντος"
 
+#~ msgid "Modification Date"
+#~ msgstr "Ημερ/νία Τροποποίησης"
+
 #~ msgid "If Procure method is Make to order and supply method is produce"
 #~ msgstr "If Procure method is Make to order and supply method is produce"
 
 #~ msgid "Purchase Lead Time"
 #~ msgstr "Χρόνος Παράδοσης Παραγγελίας"
 
+#~ msgid "Author"
+#~ msgstr "Δημιουργός"
+
 #~ msgid "Stockable Product Stock"
 #~ msgstr "Απόθεμα Αποθηκεύσιμου Προϊόντος"
 
@@ -2888,6 +2845,9 @@ msgstr ""
 #~ msgid "plus"
 #~ msgstr "plus"
 
+#~ msgid "BoM"
+#~ msgstr "Κ.Υ."
+
 #~ msgid ""
 #~ "The list of operations (list of workcenters) to produce the finished "
 #~ "product. The routing is mainly used to compute workcenter costs during "
@@ -2908,6 +2868,12 @@ msgstr ""
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Η Αίτηση για Προσφορά δημιουργήθηκε και εστάλει στον προμηθευτή."
 
+#~ msgid "last indice"
+#~ msgstr "last indice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Αναθεωρήσεις ΚΥ"
+
 #~ msgid "Retry"
 #~ msgstr "Νέα προσπάθεια"
 
@@ -2962,6 +2928,9 @@ msgstr ""
 #~ msgid "Close Move at end"
 #~ msgstr "Close Move at end"
 
+#~ msgid "Description"
+#~ msgstr "Περιγραφή"
+
 #~ msgid "Running"
 #~ msgstr "Σε εξέλιξη"
 
diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po
index b044729d30a..fc51d8dc3c7 100644
--- a/addons/mrp/i18n/es.po
+++ b/addons/mrp/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para material comprado"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisión"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -507,11 +502,6 @@ msgstr "Descomposición fabricación"
 msgid "For Services."
 msgstr "Para servicios"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Fecha de modificación"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -573,11 +563,6 @@ msgstr "Configure sus centros de producción"
 msgid "Force Reservation"
 msgstr "Forzar reservas"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -880,11 +865,6 @@ msgstr "Total ciclos"
 msgid "Ready to Produce"
 msgstr "Listo para producir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nombre de modificación"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1481,11 +1461,6 @@ msgstr "Abastecer productos"
 msgid "Work Center Loads"
 msgstr "Cargas centro de producción"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisión de lista de materiales"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2032,12 +2007,6 @@ msgstr "Tiempo en horas para la configuración."
 msgid "Orange Juice"
 msgstr "Zumo de naranja"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Lista de materiales (LdM)"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2055,17 +2024,6 @@ msgstr "Asignación desde stock."
 msgid "Waiting Goods"
 msgstr "Esperando mercancía"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último índice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisiones lista de materiales"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2256,19 +2214,6 @@ msgstr "Cambiar cantidad"
 msgid "Change Product Qty"
 msgstr "Cambiar Ctd. producto"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descripción"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2405,6 +2350,9 @@ msgstr "Productos a consumir"
 #~ "stock virtual menor que 0. Probablemente no debería utilizar esta opción, "
 #~ "sugerimos utilizar una configuración de MTO en productos."
 
+#~ msgid "Revision"
+#~ msgstr "Revisión"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Calcular sólo reglas de stock mínimo"
 
@@ -2591,6 +2539,9 @@ msgstr "Productos a consumir"
 #~ msgid "Purchase Lead Time"
 #~ msgstr "Plazo de tiempo de compra"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Stockable Product Stock"
 #~ msgstr "Stock de producto almacenable"
 
@@ -2688,6 +2639,9 @@ msgstr "Productos a consumir"
 #~ msgid "Security Days"
 #~ msgstr "Días de seguridad"
 
+#~ msgid "Modification name"
+#~ msgstr "Nombre de modificación"
+
 #~ msgid "Exception"
 #~ msgstr "Excepción"
 
@@ -3044,6 +2998,9 @@ msgstr "Productos a consumir"
 #~ msgid "plus"
 #~ msgstr "más"
 
+#~ msgid "BoM"
+#~ msgstr "Lista de materiales (LdM)"
+
 #~ msgid "Stockable Product Process"
 #~ msgstr "Proceso producto almacenable"
 
@@ -3053,6 +3010,12 @@ msgstr "Productos a consumir"
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Una solicitud de presupuesto es creada y enviada al proveedor."
 
+#~ msgid "last indice"
+#~ msgstr "Último índice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisiones lista de materiales"
+
 #~ msgid "Retry"
 #~ msgstr "Volver a intentar"
 
@@ -3111,6 +3074,9 @@ msgstr "Productos a consumir"
 #~ msgid "Close Move at end"
 #~ msgstr "Movimiento de cierre al final"
 
+#~ msgid "Description"
+#~ msgstr "Descripción"
+
 #~ msgid "Running"
 #~ msgstr "En proceso"
 
@@ -3239,6 +3205,9 @@ msgstr "Productos a consumir"
 #~ msgid "Image"
 #~ msgstr "Imagen"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisión de lista de materiales"
+
 #~ msgid "January"
 #~ msgstr "Enero"
 
@@ -3532,3 +3501,6 @@ msgstr "Productos a consumir"
 #~ "    *Gráfico de carga del centro de trabajo\n"
 #~ "    *Lista de órdenes de fabricación con excepciones\n"
 #~ "    "
+
+#~ msgid "Modification Date"
+#~ msgstr "Fecha de modificación"
diff --git a/addons/mrp/i18n/es_AR.po b/addons/mrp/i18n/es_AR.po
index 995d32da5d5..040da63a7ed 100644
--- a/addons/mrp/i18n/es_AR.po
+++ b/addons/mrp/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para material comprado"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisión"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -497,11 +492,6 @@ msgstr "Descomposición de la fabricación"
 msgid "For Services."
 msgstr "Para servicios"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Fecha de Modificación"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -561,11 +551,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -851,11 +836,6 @@ msgstr "Ciclos totales"
 msgid "Ready to Produce"
 msgstr "Listo para producir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nombre de la modificación"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1431,11 +1411,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisión de lista de materiales"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1955,12 +1930,6 @@ msgstr "Tiempo en horas para la configuración."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "LdM"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1978,17 +1947,6 @@ msgstr "Asignación desde stock."
 msgid "Waiting Goods"
 msgstr "Esperando mercandería"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último índice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisiones de LdM"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2177,19 +2135,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2320,6 +2265,9 @@ msgstr ""
 #~ msgid "MRP Subproducts"
 #~ msgstr "Subproductos MRP"
 
+#~ msgid "Revision"
+#~ msgstr "Revisión"
+
 #~ msgid "title"
 #~ msgstr "título"
 
@@ -2349,6 +2297,12 @@ msgstr ""
 #~ "Activa garantía y gestión de reparaciones (y su impacto sobre stocks y "
 #~ "facturación)"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Modification Date"
+#~ msgstr "Fecha de Modificación"
+
 #~ msgid "March"
 #~ msgstr "Marzo"
 
@@ -2384,6 +2338,9 @@ msgstr ""
 #~ msgid "Extended Filters..."
 #~ msgstr "Filtros extendidos..."
 
+#~ msgid "Modification name"
+#~ msgstr "Nombre de la modificación"
+
 #~ msgid "Just In Time Scheduling"
 #~ msgstr "Planificación 'Just in Time'"
 
@@ -2478,6 +2435,9 @@ msgstr ""
 #~ "Estos informes le permiten analizar sus actividades productivas y "
 #~ "rendimiento."
 
+#~ msgid "BoM"
+#~ msgstr "LdM"
+
 #~ msgid "December"
 #~ msgstr "Diciembre"
 
@@ -2490,6 +2450,12 @@ msgstr ""
 #~ msgid "Configuration Progress"
 #~ msgstr "Progreso de la configuración"
 
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisiones de LdM"
+
+#~ msgid "last indice"
+#~ msgstr "Último índice"
+
 #~ msgid "Draft"
 #~ msgstr "Borrador"
 
@@ -2512,6 +2478,9 @@ msgstr ""
 #~ msgid "Manufacturing Operations"
 #~ msgstr "Operaciones de fabricación"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisión de lista de materiales"
+
 #~ msgid ""
 #~ "Description of the work center. Explain here what's a cycle according to "
 #~ "this work center."
diff --git a/addons/mrp/i18n/es_CL.po b/addons/mrp/i18n/es_CL.po
index 2c24b479f82..3fa0bdb155a 100644
--- a/addons/mrp/i18n/es_CL.po
+++ b/addons/mrp/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para material comprado"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisión"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -508,11 +503,6 @@ msgstr "Descomposición fabricación"
 msgid "For Services."
 msgstr "Para servicios"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Fecha modificación"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -574,11 +564,6 @@ msgstr "Configure sus centros de trabajo"
 msgid "Force Reservation"
 msgstr "Forzar reservas"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -881,11 +866,6 @@ msgstr "Total ciclos"
 msgid "Ready to Produce"
 msgstr "Listo para producir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nombre de modificación"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1483,11 +1463,6 @@ msgstr "Abastecer productos"
 msgid "Work Center Loads"
 msgstr "Cargas centro de producción"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisión de lista de materiales"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2034,12 +2009,6 @@ msgstr "Tiempo en horas para la configuración."
 msgid "Orange Juice"
 msgstr "Jugo de Naranja"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Lista de materiales (LdM)"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2057,17 +2026,6 @@ msgstr "Asignación desde stock."
 msgid "Waiting Goods"
 msgstr "Esperando mercancía"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último índice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisiones lista de materiales"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2258,19 +2216,6 @@ msgstr "Cambiar cantidad"
 msgid "Change Product Qty"
 msgstr "Cambiar Ctd. producto"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descripción"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2414,6 +2359,9 @@ msgstr "Productos a consumir"
 #~ msgid "MRP Subproducts"
 #~ msgstr "Subproductos MRP"
 
+#~ msgid "Revision"
+#~ msgstr "Revisión"
+
 #~ msgid "title"
 #~ msgstr "título"
 
@@ -2442,6 +2390,12 @@ msgstr "Productos a consumir"
 #~ "Activa la garantía y la gestión de reparaciones (y su impacto sobre stocks y "
 #~ "facturación)"
 
+#~ msgid "Modification Date"
+#~ msgstr "Fecha modificación"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "March"
 #~ msgstr "Marzo"
 
@@ -2481,6 +2435,9 @@ msgstr "Productos a consumir"
 #~ "Tiempo en horas para este centro de producción para realizar la operación de "
 #~ "la ruta indicada."
 
+#~ msgid "Modification name"
+#~ msgstr "Nombre de modificación"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Filtros extendidos..."
 
@@ -2620,6 +2577,15 @@ msgstr "Productos a consumir"
 #~ msgid "Image"
 #~ msgstr "Imagen"
 
+#~ msgid "BoM"
+#~ msgstr "Lista de materiales (LdM)"
+
+#~ msgid "last indice"
+#~ msgstr "Último índice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisiones lista de materiales"
+
 #~ msgid "Draft"
 #~ msgstr "Borrador"
 
@@ -2641,6 +2607,9 @@ msgstr "Productos a consumir"
 #~ "y/o ciclos. Si se indica la ruta, entonces la tercera pestaña de una orden "
 #~ "de producción (centros de producción) será automáticamente pre-completada."
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisión de lista de materiales"
+
 #, python-format
 #~ msgid "Work Cost of "
 #~ msgstr "Coste trabajo de "
@@ -2673,6 +2642,9 @@ msgstr "Productos a consumir"
 #~ msgid "MRP Applications Configuration"
 #~ msgstr "Configuración de las aplicaciónes MRP"
 
+#~ msgid "Description"
+#~ msgstr "Descripción"
+
 #~ msgid "May"
 #~ msgstr "Mayo"
 
diff --git a/addons/mrp/i18n/es_CR.po b/addons/mrp/i18n/es_CR.po
index 77292b8bc9c..bf699a68e31 100644
--- a/addons/mrp/i18n/es_CR.po
+++ b/addons/mrp/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 "Language: \n"
 
 #. module: mrp
@@ -226,11 +226,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para material comprado"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisión"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -508,11 +503,6 @@ msgstr "Descomposición fabricación"
 msgid "For Services."
 msgstr "Para servicios"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Fecha de modificación"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -574,11 +564,6 @@ msgstr "Configure sus centros de producción"
 msgid "Force Reservation"
 msgstr "Forzar reservas"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -880,11 +865,6 @@ msgstr "Total ciclos"
 msgid "Ready to Produce"
 msgstr "Listo para producir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nombre de modificación"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1481,11 +1461,6 @@ msgstr "Abastecer productos"
 msgid "Work Center Loads"
 msgstr "Cargas centro de producción"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisión de lista de materiales"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2032,12 +2007,6 @@ msgstr "Tiempo en horas para la configuración."
 msgid "Orange Juice"
 msgstr "Zumo de naranja"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Lista de materiales (LdM)"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2055,17 +2024,6 @@ msgstr "Asignación desde stock."
 msgid "Waiting Goods"
 msgstr "Esperando mercancía"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último índice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisiones lista de materiales"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2256,19 +2214,6 @@ msgstr "Cambiar cantidad"
 msgid "Change Product Qty"
 msgstr "Cambiar Ctd. producto"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descripción"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2390,6 +2335,33 @@ msgstr ""
 msgid "Products to Consume"
 msgstr "Productos a consumir"
 
+#~ msgid "Revision"
+#~ msgstr "Revisión"
+
+#~ msgid "Modification Date"
+#~ msgstr "Fecha de modificación"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Modification name"
+#~ msgstr "Nombre de modificación"
+
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisión de lista de materiales"
+
+#~ msgid "BoM"
+#~ msgstr "Lista de materiales (LdM)"
+
+#~ msgid "last indice"
+#~ msgstr "Último índice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisiones lista de materiales"
+
+#~ msgid "Description"
+#~ msgstr "Descripción"
+
 #~ msgid "-"
 #~ msgstr "-"
 
diff --git a/addons/mrp/i18n/es_EC.po b/addons/mrp/i18n/es_EC.po
index a654c6db97f..021462a540b 100644
--- a/addons/mrp/i18n/es_EC.po
+++ b/addons/mrp/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para material comprado"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisión"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -497,11 +492,6 @@ msgstr "Descomposición fabricación"
 msgid "For Services."
 msgstr "Para servicios"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Fecha modificación"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -563,11 +553,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Forzar reservas"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -861,11 +846,6 @@ msgstr "Total ciclos"
 msgid "Ready to Produce"
 msgstr "Listo para producir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nombre de modificación"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1453,11 +1433,6 @@ msgstr "Abastecer productos"
 msgid "Work Center Loads"
 msgstr "Cargas centro de producción"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisión de lista de materiales"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2000,12 +1975,6 @@ msgstr "Tiempo en horas para la configuración."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Lista de materiales (LdM)"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2023,17 +1992,6 @@ msgstr "Asignación desde stock."
 msgid "Waiting Goods"
 msgstr "Esperando mercancía"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último índice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisiones lista de materiales"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2222,19 +2180,6 @@ msgstr "Cambiar cantidad"
 msgid "Change Product Qty"
 msgstr "Cambiar Ctd. producto"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descripción"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2374,6 +2319,9 @@ msgstr "Productos a consumir"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
 
+#~ msgid "Revision"
+#~ msgstr "Revisión"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Calcular sólo reglas de stock mínimo"
 
@@ -2521,6 +2469,9 @@ msgstr "Productos a consumir"
 #~ msgid "Make Procurement"
 #~ msgstr "Realizar abastecimiento"
 
+#~ msgid "Modification Date"
+#~ msgstr "Fecha modificación"
+
 #~ msgid "If Procure method is Make to order and supply method is produce"
 #~ msgstr ""
 #~ "si método de abastecimiento es obtener bajo pedido y método de suministro es "
@@ -2529,6 +2480,9 @@ msgstr "Productos a consumir"
 #~ msgid "Purchase Lead Time"
 #~ msgstr "Plazo de tiempo de compra"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Stockable Product Stock"
 #~ msgstr "Stock de producto almacenable"
 
@@ -2620,6 +2574,9 @@ msgstr "Productos a consumir"
 #~ msgid "Security Days"
 #~ msgstr "Días de seguridad"
 
+#~ msgid "Modification name"
+#~ msgstr "Nombre de modificación"
+
 #~ msgid "Exception"
 #~ msgstr "Excepción"
 
@@ -2960,6 +2917,9 @@ msgstr "Productos a consumir"
 #~ msgid "plus"
 #~ msgstr "más"
 
+#~ msgid "BoM"
+#~ msgstr "Lista de materiales (LdM)"
+
 #~ msgid ""
 #~ "The list of operations (list of workcenters) to produce the finished "
 #~ "product. The routing is mainly used to compute workcenter costs during "
@@ -2981,6 +2941,12 @@ msgstr "Productos a consumir"
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Una solicitud de presupuesto es creada y enviada al proveedor."
 
+#~ msgid "last indice"
+#~ msgstr "Último índice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisiones lista de materiales"
+
 #~ msgid "Retry"
 #~ msgstr "Volver a intentar"
 
@@ -3031,6 +2997,9 @@ msgstr "Productos a consumir"
 #~ msgid "Close Move at end"
 #~ msgstr "Movimiento de cierre al final"
 
+#~ msgid "Description"
+#~ msgstr "Descripción"
+
 #~ msgid "Running"
 #~ msgstr "En proceso"
 
@@ -3352,6 +3321,9 @@ msgstr "Productos a consumir"
 #~ msgid "Image"
 #~ msgstr "Imágen"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisión de lista de materiales"
+
 #~ msgid ""
 #~ "Routing indicates all the workcenters used, for how long and/or cycles.If "
 #~ "Routing is indicated then,the third tab of a production order (workcenters) "
diff --git a/addons/mrp/i18n/et.po b/addons/mrp/i18n/et.po
index 9745405756c..52b21406bfa 100644
--- a/addons/mrp/i18n/et.po
+++ b/addons/mrp/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -210,11 +210,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisjon"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -469,11 +464,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Muutmise Kuupäev"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -531,11 +521,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -816,11 +801,6 @@ msgstr "Kokku tsükkleid"
 msgid "Ready to Produce"
 msgstr "Valmis tootmiseks"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Modifikatsiooni nimi"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1381,11 +1361,6 @@ msgstr "Hangi tooted"
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1889,12 +1864,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1912,17 +1881,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2108,19 +2066,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2232,6 +2177,9 @@ msgstr ""
 #~ msgid "Moves Created"
 #~ msgstr "Liikumised loodud"
 
+#~ msgid "Revision"
+#~ msgstr "Revisjon"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Arvuta ainult lao miinimum reeglid"
 
@@ -2325,6 +2273,12 @@ msgstr ""
 #~ msgid "Print product price"
 #~ msgstr "Prindi toote hind"
 
+#~ msgid "Modification Date"
+#~ msgstr "Muutmise Kuupäev"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Latest error"
 #~ msgstr "Viimane viga"
 
@@ -2353,6 +2307,9 @@ msgstr ""
 #~ msgid "Security Days"
 #~ msgstr "Turvalised Päevad"
 
+#~ msgid "Modification name"
+#~ msgstr "Modifikatsiooni nimi"
+
 #~ msgid "Exception"
 #~ msgstr "Erand"
 
diff --git a/addons/mrp/i18n/fi.po b/addons/mrp/i18n/fi.po
index ad1704e1441..58081cbe657 100644
--- a/addons/mrp/i18n/fi.po
+++ b/addons/mrp/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -224,11 +224,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Ostettaville materiaaleille"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisio"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -496,11 +491,6 @@ msgstr "Valmistusrakenteen purkaminen"
 msgid "For Services."
 msgstr "Palveluille"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Muokkauspäivä"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -560,11 +550,6 @@ msgstr "Määrittele työpisteesi"
 msgid "Force Reservation"
 msgstr "Pakota varaus"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Tekijä"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -849,11 +834,6 @@ msgstr "Kierrot yhteensä"
 msgid "Ready to Produce"
 msgstr "Valmis tuotantoon"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Muutoksen nimi"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1428,11 +1408,6 @@ msgstr "Hanki tuotteita"
 msgid "Work Center Loads"
 msgstr "Työpisteen kuormitus"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Osaluettelon versio"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1947,12 +1922,6 @@ msgstr "Asetuksiin kuluva aika tunneissa."
 msgid "Orange Juice"
 msgstr "Appelssiinimehu"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Osaluettelo"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1970,17 +1939,6 @@ msgstr "Varastosta otto"
 msgid "Waiting Goods"
 msgstr "Odottaa tuotteita"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Viimeinen järjestys"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Osaluettelon revisiot"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2171,19 +2129,6 @@ msgstr "Muuta määrää"
 msgid "Change Product Qty"
 msgstr "Muuta tuotteen määrää"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Kuvaus"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2338,6 +2283,9 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "Make Procurement"
 #~ msgstr "Tee hankinta"
 
+#~ msgid "Author"
+#~ msgstr "Tekijä"
+
 #~ msgid "Latest error"
 #~ msgstr "Viimeisin virhe"
 
@@ -2416,6 +2364,9 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "Service Product"
 #~ msgstr "Palvelutuote"
 
+#~ msgid "Revision"
+#~ msgstr "Revisio"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Virheellinen mallin nimi toiminnon määrittelyssä."
 
@@ -2554,6 +2505,9 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "Purchase Lead Time"
 #~ msgstr "Oston läpimenoaika"
 
+#~ msgid "Modification Date"
+#~ msgstr "Muokkauspäivä"
+
 #~ msgid "Routing workcenter usage"
 #~ msgstr "Reititys työpisteiden käyttö"
 
@@ -2647,6 +2601,9 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "Serivce Stockable Order"
 #~ msgstr "Huolto varastoitava tilaus"
 
+#~ msgid "Modification name"
+#~ msgstr "Muutoksen nimi"
+
 #~ msgid "Production done"
 #~ msgstr "Tuotanto valmis"
 
@@ -2884,9 +2841,15 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "Canceled"
 #~ msgstr "Peruttu"
 
+#~ msgid "BoM"
+#~ msgstr "Osaluettelo"
+
 #~ msgid "New Production Order"
 #~ msgstr "Uusi tuotantotilaus"
 
+#~ msgid "last indice"
+#~ msgstr "Viimeinen järjestys"
+
 #~ msgid "plus"
 #~ msgstr "plus"
 
@@ -2912,6 +2875,9 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "The normal working time of the workcenter."
 #~ msgstr "Työpisteen normaali työaika."
 
+#~ msgid "BoM Revisions"
+#~ msgstr "Osaluettelon revisiot"
+
 #~ msgid "Procurement Reason"
 #~ msgstr "Hankinnan syy"
 
@@ -2944,6 +2910,9 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "TOTAL"
 #~ msgstr "Yhteensä"
 
+#~ msgid "Description"
+#~ msgstr "Kuvaus"
+
 #~ msgid "Close Move at end"
 #~ msgstr "Sulje siirto lopussa"
 
@@ -3142,6 +3111,9 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "Image"
 #~ msgstr "Kuva"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Osaluettelon versio"
+
 #~ msgid "Manufacturing Operations"
 #~ msgstr "Valmistuksen vaiheet"
 
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index f2f572d6c27..e55bc565550 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: field:mrp.bom,product_uom:0
@@ -242,11 +242,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Pour un produit acheté"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Révision"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -523,11 +518,6 @@ msgstr "Décomposition de la fabrication"
 msgid "For Services."
 msgstr "Pour les services."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Date de modification"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -589,11 +579,6 @@ msgstr "Configurer les centres de travails"
 msgid "Force Reservation"
 msgstr "Forcer la réservation"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Auteur"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -886,11 +871,6 @@ msgstr "Cycles Totaux"
 msgid "Ready to Produce"
 msgstr "Prêt à Produire"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nom de la Modification"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1486,11 +1466,6 @@ msgstr "Approvisionner les produits"
 msgid "Work Center Loads"
 msgstr "Occupation des postes de charge"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Révision des nomenclatures"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2028,12 +2003,6 @@ msgstr "Temps en Heures pour la mise en place"
 msgid "Orange Juice"
 msgstr "Jus d'orange"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Nomenclature"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2051,17 +2020,6 @@ msgstr "Affectation à partir du stock."
 msgid "Waiting Goods"
 msgstr "En attente de marchandises"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Dernier Indice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Révisions des Nomenclatures"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2250,19 +2208,6 @@ msgstr "Changer la quantité"
 msgid "Change Product Qty"
 msgstr "Changer la Qté de Produits"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Description"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2409,6 +2354,9 @@ msgstr "Produits à consommer"
 #~ msgid "Moves Created"
 #~ msgstr "Mouvements créés"
 
+#~ msgid "Revision"
+#~ msgstr "Révision"
+
 #~ msgid "Packing list"
 #~ msgstr "Liste des Colisages"
 
@@ -2457,6 +2405,12 @@ msgstr "Produits à consommer"
 #~ msgid "Print product price"
 #~ msgstr "Imprimer le prix du produit"
 
+#~ msgid "Modification Date"
+#~ msgstr "Date de modification"
+
+#~ msgid "Author"
+#~ msgstr "Auteur"
+
 #~ msgid "Latest error"
 #~ msgstr "Dernière Erreur"
 
@@ -2487,6 +2441,9 @@ msgstr "Produits à consommer"
 #~ msgid "Security Days"
 #~ msgstr "Jours de sécurité"
 
+#~ msgid "Modification name"
+#~ msgstr "Nom de la Modification"
+
 #~ msgid "Exception"
 #~ msgstr "Exception"
 
@@ -2601,9 +2558,18 @@ msgstr "Produits à consommer"
 #~ msgid "plus"
 #~ msgstr "plus"
 
+#~ msgid "BoM"
+#~ msgstr "Nomenclature"
+
 #~ msgid "New Production Order"
 #~ msgstr "Nouvel Ordre de Production"
 
+#~ msgid "last indice"
+#~ msgstr "Dernier Indice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Révisions des Nomenclatures"
+
 #~ msgid "Retry"
 #~ msgstr "Réessayez"
 
@@ -2616,6 +2582,9 @@ msgstr "Produits à consommer"
 #~ msgid "Warehouse"
 #~ msgstr "Entrepôt"
 
+#~ msgid "Description"
+#~ msgstr "Description"
+
 #~ msgid "Running"
 #~ msgstr "En cours"
 
@@ -3272,6 +3241,9 @@ msgstr "Produits à consommer"
 #~ msgid "Total Cost of "
 #~ msgstr "Coût total "
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Révision des nomenclatures"
+
 #, python-format
 #~ msgid "Work Cost of "
 #~ msgstr "Coût de fabrication de "
diff --git a/addons/mrp/i18n/gl.po b/addons/mrp/i18n/gl.po
index 22cabf88895..05b80d99743 100644
--- a/addons/mrp/i18n/gl.po
+++ b/addons/mrp/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -226,11 +226,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para material mercado"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisión"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -498,11 +493,6 @@ msgstr "Descomposición fabricación"
 msgid "For Services."
 msgstr "Para servizos"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Data de modificación"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -564,11 +554,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Forzar reservas"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -859,11 +844,6 @@ msgstr "Ciclos totais"
 msgid "Ready to Produce"
 msgstr "Listo para producir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nome da modificación"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1450,11 +1430,6 @@ msgstr "Abastecer produtos"
 msgid "Work Center Loads"
 msgstr "Cargas centro de produción"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisión da lista de materiais"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1990,12 +1965,6 @@ msgstr "Tempo en horas para a configuración."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Lista de materiais"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2013,17 +1982,6 @@ msgstr "Asignación desde stock."
 msgid "Waiting Goods"
 msgstr "Esperando mercancía"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último índice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisións lista de materiais"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2212,19 +2170,6 @@ msgstr "Cambiar cantidade"
 msgid "Change Product Qty"
 msgstr "Cambiar Ctde producto"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descrición"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2368,6 +2313,9 @@ msgstr "Produtos a consumir"
 #~ "Mellora as ordes de produción cos estados de preparación, así como a data de "
 #~ "inicio e final da execución da orde."
 
+#~ msgid "Revision"
+#~ msgstr "Revisión"
+
 #~ msgid "title"
 #~ msgstr "título"
 
@@ -2400,6 +2348,12 @@ msgstr "Produtos a consumir"
 #~ "Activa a garantía e a xestión das reparacións (e o seu impacto sobre os "
 #~ "stocks e a facturación)"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Modification Date"
+#~ msgstr "Data de modificación"
+
 #~ msgid "March"
 #~ msgstr "Marzo"
 
@@ -2442,6 +2396,9 @@ msgstr "Produtos a consumir"
 #~ msgid "Extended Filters..."
 #~ msgstr "Filtros extendidos..."
 
+#~ msgid "Modification name"
+#~ msgstr "Nome da modificación"
+
 #~ msgid "Just In Time Scheduling"
 #~ msgstr "Planificación 'Just in Time'"
 
@@ -2622,6 +2579,9 @@ msgstr "Produtos a consumir"
 #~ "Estes informes permítenlle analizar as súas actividades productivas e o seu "
 #~ "rendemento."
 
+#~ msgid "BoM"
+#~ msgstr "Lista de materiais"
+
 #~ msgid "December"
 #~ msgstr "Decembro"
 
@@ -2634,6 +2594,12 @@ msgstr "Produtos a consumir"
 #~ msgid "Configuration Progress"
 #~ msgstr "Progreso da configuración"
 
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisións lista de materiais"
+
+#~ msgid "last indice"
+#~ msgstr "Último índice"
+
 #~ msgid "Draft"
 #~ msgstr "Proxecto"
 
@@ -2652,6 +2618,9 @@ msgstr "Produtos a consumir"
 #~ msgid "January"
 #~ msgstr "Xaneiro"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisión da lista de materiais"
+
 #~ msgid "Manufacturing Operations"
 #~ msgstr "Operacións de produción"
 
@@ -2680,6 +2649,9 @@ msgstr "Produtos a consumir"
 #~ msgid "Work Cost of "
 #~ msgstr "Custo do traballo de "
 
+#~ msgid "Description"
+#~ msgstr "Descrición"
+
 #~ msgid "May"
 #~ msgstr "Maio"
 
diff --git a/addons/mrp/i18n/hi.po b/addons/mrp/i18n/hi.po
index 427d50288fe..953960bc26b 100644
--- a/addons/mrp/i18n/hi.po
+++ b/addons/mrp/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -470,11 +465,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -532,11 +522,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "लेखक"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -817,11 +802,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1382,11 +1362,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1890,12 +1865,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1913,17 +1882,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2109,19 +2067,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2284,6 +2229,9 @@ msgstr ""
 #~ msgid "Print product price"
 #~ msgstr "प्रिंट उत्पाद मूल्य"
 
+#~ msgid "Author"
+#~ msgstr "लेखक"
+
 #~ msgid "Latest error"
 #~ msgstr "नवीनतम त्रुटि"
 
diff --git a/addons/mrp/i18n/hr.po b/addons/mrp/i18n/hr.po
index 7f545f986d5..08931365976 100644
--- a/addons/mrp/i18n/hr.po
+++ b/addons/mrp/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -223,11 +223,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Za nabavljeni materijal"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revizija"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -495,11 +490,6 @@ msgstr "Dekompozicija proizvodnje"
 msgid "For Services."
 msgstr "Za usluge."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Datum promjene"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -561,11 +551,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Force Reservation"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -856,11 +841,6 @@ msgstr "Ukupno ciklusa"
 msgid "Ready to Produce"
 msgstr "Spremno za proizvodnju"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Naziv promjene"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1446,11 +1426,6 @@ msgstr "Procure Products"
 msgid "Work Center Loads"
 msgstr "Opterećenje radnog centra"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revizija sastavnice"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1988,12 +1963,6 @@ msgstr "Vrijeme u satima za pripremu."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "BoM"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2011,17 +1980,6 @@ msgstr "Dodjela sa skladišta"
 msgid "Waiting Goods"
 msgstr "Waiting Goods"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "last indice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "BoM Revisions"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2210,19 +2168,6 @@ msgstr "Promjeni količinu"
 msgid "Change Product Qty"
 msgstr "Promjeni kol. proizvoda"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Opis"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2363,6 +2308,9 @@ msgstr "Proizvodi za utrošiti"
 #~ msgid "Raw Material Location"
 #~ msgstr "Mjesto Sirovina"
 
+#~ msgid "Revision"
+#~ msgstr "Revizija"
+
 #~ msgid "June"
 #~ msgstr "Lipanj"
 
@@ -2378,6 +2326,9 @@ msgstr "Proizvodi za utrošiti"
 #~ msgid "October"
 #~ msgstr "Listopad"
 
+#~ msgid "Modification Date"
+#~ msgstr "Datum promjene"
+
 #~ msgid "March"
 #~ msgstr "Ožujak"
 
@@ -2415,6 +2366,24 @@ msgstr "Proizvodi za utrošiti"
 #~ msgid "Manufacturing Resource Planning"
 #~ msgstr "Planiranje resursa proizvodnje"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Modification name"
+#~ msgstr "Naziv promjene"
+
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revizija sastavnice"
+
+#~ msgid "BoM"
+#~ msgstr "BoM"
+
+#~ msgid "last indice"
+#~ msgstr "last indice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "BoM Revisions"
+
 #~ msgid "Work Center Future Load"
 #~ msgstr "Buduće opterećenje radnog centra"
 
@@ -2431,6 +2400,9 @@ msgstr "Proizvodi za utrošiti"
 #~ "sales person creates a sales order, he can relate it to several properties "
 #~ "and OpenERP will automatically select the BoM to use according the the needs."
 
+#~ msgid "Description"
+#~ msgstr "Opis"
+
 #~ msgid ""
 #~ "Work Center Loads gives you a projection of work center loads over a "
 #~ "specified period. It is expressed in number of hours and machine related "
diff --git a/addons/mrp/i18n/hu.po b/addons/mrp/i18n/hu.po
index a54f4137326..16409c5afc9 100644
--- a/addons/mrp/i18n/hu.po
+++ b/addons/mrp/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -226,11 +226,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Vásárolt termékhez"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Felülvizsgálat"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -499,11 +494,6 @@ msgstr "Gyártás lebontása"
 msgid "For Services."
 msgstr "Szolgáltatásokhoz."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Módosítás dátuma"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -565,11 +555,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Foglalás erőltetése"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Szerző"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -862,11 +847,6 @@ msgstr "Összes ciklus"
 msgid "Ready to Produce"
 msgstr "Gyártásra kész"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Módosítás neve"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1453,11 +1433,6 @@ msgstr "Termékek beszerzése"
 msgid "Work Center Loads"
 msgstr "Munkaállomások terheltsége"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Anyagjegyzék felülvizsgálat"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1998,12 +1973,6 @@ msgstr "A beállításhoz szükséges idő órákban megadva."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Anyagjegyzék"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2021,17 +1990,6 @@ msgstr "Ellátás raktárból"
 msgid "Waiting Goods"
 msgstr "Várakozás az árura"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "utolsó jelzőszám"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Anyagjegyzék felülvizsgálatok"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2220,19 +2178,6 @@ msgstr "Mennyiség változtatása"
 msgid "Change Product Qty"
 msgstr "Mennyiség változtatása"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Leírás"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2366,6 +2311,12 @@ msgstr "Felhasználandó termékek"
 #~ msgid "October"
 #~ msgstr "Október"
 
+#~ msgid "Modification Date"
+#~ msgstr "Módosítás dátuma"
+
+#~ msgid "Author"
+#~ msgstr "Szerző"
+
 #~ msgid "March"
 #~ msgstr "Március"
 
@@ -2379,6 +2330,9 @@ msgstr "Felhasználandó termékek"
 #~ msgid "September"
 #~ msgstr "Szeptember"
 
+#~ msgid "Modification name"
+#~ msgstr "Módosítás neve"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Kiterjesztett szűrők…"
 
@@ -2403,6 +2357,9 @@ msgstr "Felhasználandó termékek"
 #~ msgid "January"
 #~ msgstr "Január"
 
+#~ msgid "Description"
+#~ msgstr "Leírás"
+
 #~ msgid "May"
 #~ msgstr "Május"
 
@@ -2461,6 +2418,9 @@ msgstr "Felhasználandó termékek"
 #~ msgid "MRP Subproducts"
 #~ msgstr "MRP altermékek modul"
 
+#~ msgid "Revision"
+#~ msgstr "Felülvizsgálat"
+
 #~ msgid "title"
 #~ msgstr "pozíció"
 
@@ -2682,6 +2642,15 @@ msgstr "Felhasználandó termékek"
 #~ msgid "Configure"
 #~ msgstr "Beállít"
 
+#~ msgid "BoM"
+#~ msgstr "Anyagjegyzék"
+
+#~ msgid "last indice"
+#~ msgstr "utolsó jelzőszám"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Anyagjegyzék felülvizsgálatok"
+
 #~ msgid ""
 #~ "Routing indicates all the workcenters used, for how long and/or cycles.If "
 #~ "Routing is indicated then,the third tab of a production order (workcenters) "
@@ -2691,6 +2660,9 @@ msgstr "Felhasználandó termékek"
 #~ "hány ciklusra van használatban. Ha a gyártási eljárás be van kapcsolva, a "
 #~ "gyártási rendelés 3. füle (munkaállomások) automatikusan kitöltésre kerül."
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Anyagjegyzék felülvizsgálat"
+
 #, python-format
 #~ msgid "Work Cost of "
 #~ msgstr "Munkaköltsége "
diff --git a/addons/mrp/i18n/id.po b/addons/mrp/i18n/id.po
index 86b71f3e881..98dd494ca17 100644
--- a/addons/mrp/i18n/id.po
+++ b/addons/mrp/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -210,11 +210,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -469,11 +464,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -531,11 +521,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -816,11 +801,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1381,11 +1361,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1889,12 +1864,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1912,17 +1881,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2108,19 +2066,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
diff --git a/addons/mrp/i18n/it.po b/addons/mrp/i18n/it.po
index 5efbb7870e7..c37ee163724 100644
--- a/addons/mrp/i18n/it.po
+++ b/addons/mrp/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -226,11 +226,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Per materiali acquistati"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisione"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -501,11 +496,6 @@ msgstr "Scomposizione produzione"
 msgid "For Services."
 msgstr "Per Servizi."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Data di Ultima Modifica"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -567,11 +557,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Forza Prenotazione"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Mittente"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -866,11 +851,6 @@ msgstr "Cicli totali"
 msgid "Ready to Produce"
 msgstr "Pronto per Entrare in Produzione"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nome Modifica"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1454,11 +1434,6 @@ msgstr "Approvvigiona i prodotti"
 msgid "Work Center Loads"
 msgstr "Carico Centri di Lavoro"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisione distinta base"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2002,12 +1977,6 @@ msgstr "Tempo in ore per il setup."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Distinta base"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2025,17 +1994,6 @@ msgstr "Assegnazione da stock."
 msgid "Waiting Goods"
 msgstr "In attesa del materiale"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Ultimo Indice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisioni Distinta Base"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2224,19 +2182,6 @@ msgstr "Cambia quantità"
 msgid "Change Product Qty"
 msgstr "Cambia la quantità del prodotto"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descrizione"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2355,6 +2300,9 @@ msgstr ""
 msgid "Products to Consume"
 msgstr "Prodotti da Utilizzare"
 
+#~ msgid "Revision"
+#~ msgstr "Revisione"
+
 #~ msgid "UoS Quantity"
 #~ msgstr "Quantità Unità di Vendita"
 
@@ -2412,6 +2360,9 @@ msgstr "Prodotti da Utilizzare"
 #~ msgid "Procurement Lines"
 #~ msgstr "Righe Approvvigionamento"
 
+#~ msgid "Modification name"
+#~ msgstr "Nome Modifica"
+
 #~ msgid "Exception"
 #~ msgstr "Eccezione"
 
@@ -2517,9 +2468,18 @@ msgstr "Prodotti da Utilizzare"
 #~ msgid "plus"
 #~ msgstr "più"
 
+#~ msgid "BoM"
+#~ msgstr "Distinta base"
+
 #~ msgid "New Production Order"
 #~ msgstr "Nuovo Ordine di Produzione"
 
+#~ msgid "last indice"
+#~ msgstr "Ultimo Indice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisioni Distinta Base"
+
 #~ msgid "Retry"
 #~ msgstr "Riprova"
 
@@ -2535,6 +2495,9 @@ msgstr "Prodotti da Utilizzare"
 #~ msgid "Close Move at end"
 #~ msgstr "Chiudi spostamento alla Fine"
 
+#~ msgid "Description"
+#~ msgstr "Descrizione"
+
 #~ msgid "Running"
 #~ msgstr "In esecuzione"
 
@@ -2715,6 +2678,9 @@ msgstr "Prodotti da Utilizzare"
 #~ msgid "Procurement Process"
 #~ msgstr "Procedura di approvvigionamento"
 
+#~ msgid "Author"
+#~ msgstr "Mittente"
+
 #~ msgid "If Procure method is Make to order and supply method is produce"
 #~ msgstr ""
 #~ "Se il tipo di approvvigionamento è \"Make to Order\" e il tipo di fornitura "
@@ -2723,6 +2689,9 @@ msgstr "Prodotti da Utilizzare"
 #~ msgid "Purchase Lead Time"
 #~ msgstr "Lead Time di Acquisto"
 
+#~ msgid "Modification Date"
+#~ msgstr "Data di Ultima Modifica"
+
 #~ msgid "Manufacturity Lead Time"
 #~ msgstr "Lead Time di Produzione"
 
@@ -3124,6 +3093,9 @@ msgstr "Prodotti da Utilizzare"
 #~ msgid "January"
 #~ msgstr "Gennaio"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisione distinta base"
+
 #~ msgid "February"
 #~ msgstr "Febbraio"
 
diff --git a/addons/mrp/i18n/ja.po b/addons/mrp/i18n/ja.po
index e3837617d63..b5827bb09c5 100644
--- a/addons/mrp/i18n/ja.po
+++ b/addons/mrp/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -213,11 +213,6 @@ msgstr "分析会計の中で製造コストを簡単に追跡するため、こ
 msgid "For purchased material"
 msgstr "仕入済材料"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "改訂"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -477,11 +472,6 @@ msgstr "製造分解"
 msgid "For Services."
 msgstr "サービス用"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "修正日"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -539,11 +529,6 @@ msgstr "作業センタの設定"
 msgid "Force Reservation"
 msgstr "強制予約"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "著者"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -830,11 +815,6 @@ msgstr "合計サイクル"
 msgid "Ready to Produce"
 msgstr "生産準備完了"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "変更の名前"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1402,11 +1382,6 @@ msgstr "調達製品"
 msgid "Work Center Loads"
 msgstr "作業センタの負荷"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "部品表の改訂"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1926,12 +1901,6 @@ msgstr "設定のための時間（時）"
 msgid "Orange Juice"
 msgstr "オレンジジュース"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "部品表"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1949,17 +1918,6 @@ msgstr "在庫から割当"
 msgid "Waiting Goods"
 msgstr "待機商品"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "最終インデックス"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "部品表改訂"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2148,19 +2106,6 @@ msgstr "数量変更"
 msgid "Change Product Qty"
 msgstr "製品数量変更"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "説明"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2271,6 +2216,33 @@ msgstr "部品表のリストを表示する際には並び順を与えます。
 msgid "Products to Consume"
 msgstr "消費製品"
 
+#~ msgid "Revision"
+#~ msgstr "改訂"
+
+#~ msgid "Modification Date"
+#~ msgstr "修正日"
+
+#~ msgid "Author"
+#~ msgstr "著者"
+
+#~ msgid "Modification name"
+#~ msgstr "変更の名前"
+
+#~ msgid "Bill of Material Revision"
+#~ msgstr "部品表の改訂"
+
+#~ msgid "BoM"
+#~ msgstr "部品表"
+
+#~ msgid "last indice"
+#~ msgstr "最終インデックス"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "部品表改訂"
+
+#~ msgid "Description"
+#~ msgstr "説明"
+
 #~ msgid ""
 #~ "Reference of the document that created this procurement.\n"
 #~ "This is automatically completed by Open ERP."
diff --git a/addons/mrp/i18n/ko.po b/addons/mrp/i18n/ko.po
index 1f34ff36b9f..6577f11cc68 100644
--- a/addons/mrp/i18n/ko.po
+++ b/addons/mrp/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "개정 번호"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -472,11 +467,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "수정 날짜"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -534,11 +524,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "예약하기"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "작성자"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -819,11 +804,6 @@ msgstr "총 사이클"
 msgid "Ready to Produce"
 msgstr "생산 준비"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "수정 이름"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1384,11 +1364,6 @@ msgstr "상품 조달"
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1892,12 +1867,6 @@ msgstr "셋업 시간"
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "BoM"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1915,17 +1884,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr "대기 상품"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "마지막 인덱스"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "BoM 리비전"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2111,19 +2069,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr "상품 수량 변경"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "설명"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2359,6 +2304,12 @@ msgstr ""
 #~ msgid "Purchase Lead Time"
 #~ msgstr "구매 리드 타임"
 
+#~ msgid "Author"
+#~ msgstr "작성자"
+
+#~ msgid "Modification Date"
+#~ msgstr "수정 날짜"
+
 #~ msgid "Make Procurement"
 #~ msgstr "조달하기"
 
@@ -2426,6 +2377,9 @@ msgstr ""
 #~ msgid "Security Days"
 #~ msgstr "안전 기간 (일)"
 
+#~ msgid "Modification name"
+#~ msgstr "수정 이름"
+
 #~ msgid "If Product type is service"
 #~ msgstr "상품 타입이 서비스일 경우"
 
@@ -2710,9 +2664,18 @@ msgstr ""
 #~ msgid "Canceled"
 #~ msgstr "취소됨"
 
+#~ msgid "BoM"
+#~ msgstr "BoM"
+
 #~ msgid "New Production Order"
 #~ msgstr "새 생산 주문"
 
+#~ msgid "BoM Revisions"
+#~ msgstr "BoM 리비전"
+
+#~ msgid "last indice"
+#~ msgstr "마지막 인덱스"
+
 #~ msgid "plus"
 #~ msgstr "더하기"
 
@@ -2778,6 +2741,9 @@ msgstr ""
 #~ msgid "Bill of Material Structure"
 #~ msgstr "BoM 구조"
 
+#~ msgid "Description"
+#~ msgstr "설명"
+
 #~ msgid "Workcenter load"
 #~ msgstr "워크센터 부하"
 
@@ -2790,6 +2756,9 @@ msgstr ""
 #~ msgid "Procurement Details"
 #~ msgstr "조달 상세내용"
 
+#~ msgid "Revision"
+#~ msgstr "개정 번호"
+
 #~ msgid "Not used in computations, for information purpose only."
 #~ msgstr "계산용이 아닌 정보 용도"
 
diff --git a/addons/mrp/i18n/lt.po b/addons/mrp/i18n/lt.po
index 83ff2a3e314..e68f7cd1137 100644
--- a/addons/mrp/i18n/lt.po
+++ b/addons/mrp/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 "Language: lt\n"
 
 #. module: mrp
@@ -212,11 +212,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revizija"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -474,11 +469,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Modifikavimo data"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -538,11 +528,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Priverstinai rezervuoti"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autorius"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -823,11 +808,6 @@ msgstr "Iš viso ciklų"
 msgid "Ready to Produce"
 msgstr "Paruošta gamybai"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Modifikavimo pavadinimas"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1388,11 +1368,6 @@ msgstr "Užsakyti produktus"
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1897,12 +1872,6 @@ msgstr "Laikas valandomis pradėti gamybai"
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "KS"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1920,17 +1889,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr "Laukiama žaliavų"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Pask. revizija"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "KS revizijos"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2116,19 +2074,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr "Pakeisti produkto kiekį"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Aprašymas"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2247,6 +2192,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Paleidžiamas automatiškai, kai virtualios atsargos pasidaro mažiau nulio."
 
+#~ msgid "Revision"
+#~ msgstr "Revizija"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Apskaičiuoti atsargų likučio taisykles"
 
@@ -2398,12 +2346,18 @@ msgstr ""
 #~ msgid "Make Procurement"
 #~ msgstr "Sukurti planinį užsakymą"
 
+#~ msgid "Modification Date"
+#~ msgstr "Modifikavimo data"
+
 #~ msgid "If Procure method is Make to order and supply method is produce"
 #~ msgstr "Jeigu gamybos metodas yra užsakyti ir tiekimo metodas yra gaminti"
 
 #~ msgid "Purchase Lead Time"
 #~ msgstr "Gamybos trukmė"
 
+#~ msgid "Author"
+#~ msgstr "Autorius"
+
 #~ msgid "Stockable Product Stock"
 #~ msgstr "Produktai sandėlyje."
 
@@ -2491,6 +2445,9 @@ msgstr ""
 #~ msgid "Security Days"
 #~ msgstr "Saugios dienos"
 
+#~ msgid "Modification name"
+#~ msgstr "Modifikavimo pavadinimas"
+
 #~ msgid "Exception"
 #~ msgstr "Išimtis"
 
@@ -2805,6 +2762,9 @@ msgstr ""
 #~ msgid "plus"
 #~ msgstr "plius"
 
+#~ msgid "BoM"
+#~ msgstr "KS"
+
 #~ msgid ""
 #~ "The list of operations (list of workcenters) to produce the finished "
 #~ "product. The routing is mainly used to compute workcenter costs during "
@@ -2824,6 +2784,12 @@ msgstr ""
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Užklausa yra sukurta ir išsiųsta tiekėjams."
 
+#~ msgid "last indice"
+#~ msgstr "Pask. revizija"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "KS revizijos"
+
 #~ msgid "Retry"
 #~ msgstr "Pakartoti"
 
@@ -2881,6 +2847,9 @@ msgstr ""
 #~ msgid "Close Move at end"
 #~ msgstr "Uždarymo perkėlimas pabaigoje"
 
+#~ msgid "Description"
+#~ msgstr "Aprašymas"
+
 #~ msgid "Running"
 #~ msgstr "Veikiantis"
 
diff --git a/addons/mrp/i18n/lv.po b/addons/mrp/i18n/lv.po
index 437122ce2cd..109f6fb2c97 100644
--- a/addons/mrp/i18n/lv.po
+++ b/addons/mrp/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -470,11 +465,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -532,11 +522,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -817,11 +802,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1382,11 +1362,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1890,12 +1865,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1913,17 +1882,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2109,19 +2067,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
diff --git a/addons/mrp/i18n/mn.po b/addons/mrp/i18n/mn.po
index a66cb6ffe1e..2eb6ebf3942 100644
--- a/addons/mrp/i18n/mn.po
+++ b/addons/mrp/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -227,11 +227,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Худалдан авсан материалын хувьд"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Хувилбар"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -506,11 +501,6 @@ msgstr "Үйлдвэрлэлийн задаргаа"
 msgid "For Services."
 msgstr "Үйлчилгээнүүдэд."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Зассан огноо"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -570,11 +560,6 @@ msgstr "Дамжлагыг тохируулах"
 msgid "Force Reservation"
 msgstr "Нөөцлөхийг албадах"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Зохиогч"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -870,11 +855,6 @@ msgstr "Нийт циклүүд"
 msgid "Ready to Produce"
 msgstr "Үйлдвэрлэхэд бэлэн"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Өөрчлөлтийн нэр"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1463,11 +1443,6 @@ msgstr "Бараа татах"
 msgid "Work Center Loads"
 msgstr "Дамжлагын Ачаалал"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Жорын Шинэчилсэн хувилбар"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2001,12 +1976,6 @@ msgstr "Суурилуулах хугацаа цагаар"
 msgid "Orange Juice"
 msgstr "Жүржийн Шүүс"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Жор"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2024,17 +1993,6 @@ msgstr "Бараанаас хуваарилах"
 msgid "Waiting Goods"
 msgstr "Бараанууд Хүлээж буй"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "сүүлийн индекс"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Жорын өөрчлөлтүүд"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2225,19 +2183,6 @@ msgstr "Тоо хэмжээг өөрчлөх"
 msgid "Change Product Qty"
 msgstr "Барааны Тоо Хэмжээг Өөрчлөх"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Тайлбар"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2355,3 +2300,30 @@ msgstr "Жорын жагсаалтыг харуулах дэс дарааллы
 #: report:mrp.production.order:0
 msgid "Products to Consume"
 msgstr "Хангах Бараанууд"
+
+#~ msgid "Revision"
+#~ msgstr "Хувилбар"
+
+#~ msgid "Modification Date"
+#~ msgstr "Зассан огноо"
+
+#~ msgid "Author"
+#~ msgstr "Зохиогч"
+
+#~ msgid "Modification name"
+#~ msgstr "Өөрчлөлтийн нэр"
+
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Жорын Шинэчилсэн хувилбар"
+
+#~ msgid "BoM"
+#~ msgstr "Жор"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Жорын өөрчлөлтүүд"
+
+#~ msgid "last indice"
+#~ msgstr "сүүлийн индекс"
+
+#~ msgid "Description"
+#~ msgstr "Тайлбар"
diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index 1223b21f55d..21c397bd1b0 100644
--- a/addons/mrp/i18n/mrp.pot
+++ b/addons/mrp/i18n/mrp.pot
@@ -196,11 +196,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid "Create a product form for everything you buy or sell. Specify a supplier if the product can be purchased."
@@ -435,11 +430,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -493,11 +483,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -761,11 +746,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1294,11 +1274,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid "Reference of the document that generated this production order request."
@@ -1772,12 +1747,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1795,17 +1764,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -1987,19 +1945,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
diff --git a/addons/mrp/i18n/nb.po b/addons/mrp/i18n/nb.po
index e94a0636397..6dc969fbea2 100644
--- a/addons/mrp/i18n/nb.po
+++ b/addons/mrp/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -226,17 +226,14 @@ msgstr ""
 msgid "For purchased material"
 msgstr "For innkjøpt materiale"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisjon"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
 "the product can be purchased."
 msgstr ""
+"Lag et produktskjema for alt du kjøper eller selger. Angi en leverandør hvis "
+"produktet kan bli kjøpt."
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.next_id_77
@@ -504,11 +501,6 @@ msgstr "Produksjon nedbryting"
 msgid "For Services."
 msgstr "For Tjenester."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Dato endret"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -569,11 +561,6 @@ msgstr "Konfigurer arbeidssenter"
 msgid "Force Reservation"
 msgstr "Tving Reservasjon"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Forfatter"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -600,6 +587,7 @@ msgstr "Leverandør Pris per enhet"
 msgid ""
 "Gives the sequence order when displaying a list of routing Work Centers."
 msgstr ""
+"Gir rekkefølgen av når du viser en liste over ruter av  arbeidsstasjoner."
 
 #. module: mrp
 #: constraint:stock.move:0
@@ -714,7 +702,7 @@ msgstr "Tid i timer for å utføre en syklus."
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "BoM line product should not be same as BoM product."
-msgstr ""
+msgstr "Bom linje produktet bør ikke være det samme som BOM produkt."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -842,6 +830,10 @@ msgid ""
 "resource leave are not taken into account in the time computation of the "
 "work center."
 msgstr ""
+"Arbeidsstasjoner kan du opprette og administrere produksjonsenheter. De "
+"består av arbeidstakerne og / eller maskiner, som anses som en enhet for "
+"kapasitet og planlegging prognose. Husk at arbeidstiden og ressurs permisjon "
+"ikke er tatt hensyn til i tiden beregning av arbeidet sentrum."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
@@ -864,11 +856,6 @@ msgstr "Totalt Sykluser"
 msgid "Ready to Produce"
 msgstr "Klar for produksjon"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Endring navn"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1107,7 +1094,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.todo.category,name:mrp.category_mrp_config
 msgid "MRP Management"
-msgstr ""
+msgstr "MRP Ledelse"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
@@ -1120,6 +1107,8 @@ msgid ""
 "Number of operations this Work Center can do in parallel. If this Work "
 "Center represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
+"Antall operasjoner denne Work Center kan gjøre parallelt. Hvis dette Work "
+"Center representerer et lag av 5 arbeidere, er kapasiteten per syklus 5."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
@@ -1452,11 +1441,6 @@ msgstr "Anskaff Produkter"
 msgid "Work Center Loads"
 msgstr "Arbeidssenter Belastning"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Stykkliste revisjoner"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1976,12 +1960,6 @@ msgstr "Tid i timer for oppsett."
 msgid "Orange Juice"
 msgstr "Appelsinjuice"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Materialliste"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1999,17 +1977,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Materialliste revisjon"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2195,19 +2162,6 @@ msgstr "Endre antall"
 msgid "Change Product Qty"
 msgstr "Endre produkt mengde"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Beskrivelse"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2328,6 +2282,9 @@ msgstr "Produkter til forbruk"
 #~ msgid "Raw Material Location"
 #~ msgstr "Råmateriale Lokasjon"
 
+#~ msgid "Revision"
+#~ msgstr "Revisjon"
+
 #~ msgid "title"
 #~ msgstr "tittel"
 
@@ -2370,6 +2327,12 @@ msgstr "Produkter til forbruk"
 #~ "Muliggjør garanti og reparasjons håndtering (og deres påvirkning av lager og "
 #~ "fakturering)."
 
+#~ msgid "Author"
+#~ msgstr "Forfatter"
+
+#~ msgid "Modification Date"
+#~ msgstr "Dato endret"
+
 #~ msgid "March"
 #~ msgstr "Mars"
 
@@ -2412,6 +2375,9 @@ msgstr "Produkter til forbruk"
 #~ msgid "Extended Filters..."
 #~ msgstr "Utvidede filter..."
 
+#~ msgid "Modification name"
+#~ msgstr "Endring navn"
+
 #~ msgid "Just In Time Scheduling"
 #~ msgstr "Akkurat i Tide Planlegging"
 
@@ -2603,6 +2569,12 @@ msgstr "Produkter til forbruk"
 #~ msgid "January"
 #~ msgstr "Januar"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Stykkliste revisjoner"
+
+#~ msgid "Description"
+#~ msgstr "Beskrivelse"
+
 #~ msgid "April"
 #~ msgstr "April"
 
@@ -2614,3 +2586,9 @@ msgstr "Produkter til forbruk"
 
 #~ msgid "Year"
 #~ msgstr "År"
+
+#~ msgid "BoM"
+#~ msgstr "Materialliste"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Materialliste revisjon"
diff --git a/addons/mrp/i18n/nl.po b/addons/mrp/i18n/nl.po
index f890f30bf59..f2646fb5b78 100644
--- a/addons/mrp/i18n/nl.po
+++ b/addons/mrp/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Voor ingekocht materiaal"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisie"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -507,11 +502,6 @@ msgstr "Productie afbraak"
 msgid "For Services."
 msgstr "Voor services"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Wijzigingsdatum"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -573,11 +563,6 @@ msgstr "Configureer uw werkplekken"
 msgid "Force Reservation"
 msgstr "Forceer reservering"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Auteur"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -882,11 +867,6 @@ msgstr "Totaal aantal cycli"
 msgid "Ready to Produce"
 msgstr "Gereed voor productie"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Naamswijziging"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1483,11 +1463,6 @@ msgstr "Verwerf producten"
 msgid "Work Center Loads"
 msgstr "Werkplek belastingen"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Grondstoffenlijst revisie"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1555,7 +1530,7 @@ msgstr "Verantwoordelijke"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
 msgid "Manufacturing Orders To Start"
-msgstr "Porductieorers te starten"
+msgstr "Productieorders te starten"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
@@ -1737,7 +1712,7 @@ msgstr ""
 "In de 'Alleen verbruiken' modus worden alleen producten met de geselecteerde "
 "hoeveelheid verbruikt.\n"
 "In de 'Verbruik & Produceer' modus worden producten verbruikt met de "
-"geselecteerde hoeveelheid en het zal de productieporder afronden wanneer de "
+"geselecteerde hoeveelheid en het zal de productieorder afronden wanneer de "
 "totaal bestelde hoeveelheid zijn geproduceerd."
 
 #. module: mrp
@@ -2035,12 +2010,6 @@ msgstr "Opzettijd in uren"
 msgid "Orange Juice"
 msgstr "Sinasappelsap"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Materiaallijst"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2058,17 +2027,6 @@ msgstr "Toegewezen van voorraad"
 msgid "Waiting Goods"
 msgstr "Wacht op materialen"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "laatste index"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Materiaallijst versies"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2259,19 +2217,6 @@ msgstr "Wijzig hoeveelheid"
 msgid "Change Product Qty"
 msgstr "Wijzig producthoeveelheid"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Beschrijving"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2420,6 +2365,9 @@ msgstr "Producten te verbruiken"
 #~ msgid "Product Standard Price"
 #~ msgstr "Standaard productprijs"
 
+#~ msgid "Modification Date"
+#~ msgstr "Wijzigingsdatum"
+
 #~ msgid "For stockable and consumable"
 #~ msgstr "Voor voorraadartikel en verbruiksartikel"
 
@@ -2521,6 +2469,9 @@ msgstr "Producten te verbruiken"
 #~ msgid "max"
 #~ msgstr "max"
 
+#~ msgid "Author"
+#~ msgstr "Auteur"
+
 #~ msgid "Latest error"
 #~ msgstr "Laatste fout"
 
@@ -2836,6 +2787,9 @@ msgstr "Producten te verbruiken"
 #~ msgid "New Production Order"
 #~ msgstr "Nieuwe productieopdracht"
 
+#~ msgid "Description"
+#~ msgstr "Beschrijving"
+
 #~ msgid "Service Product"
 #~ msgstr "Dienstverleningsproduct"
 
@@ -3033,6 +2987,12 @@ msgstr "Producten te verbruiken"
 #~ msgid "Canceled"
 #~ msgstr "Geannuleerd"
 
+#~ msgid "BoM"
+#~ msgstr "Materiaallijst"
+
+#~ msgid "last indice"
+#~ msgstr "laatste index"
+
 #~ msgid "An entry is being made from billing material to routing."
 #~ msgstr ""
 #~ "Er wordt een boeking gemaakt van doorbelastbaar materiaal naar routering."
@@ -3111,6 +3071,9 @@ msgstr "Producten te verbruiken"
 #~ msgid "UoS Quantity"
 #~ msgstr "VE aantal"
 
+#~ msgid "Revision"
+#~ msgstr "Revisie"
+
 #~ msgid "Routing Workcenters"
 #~ msgstr "Routing werkcentra"
 
@@ -3126,6 +3089,9 @@ msgstr "Producten te verbruiken"
 #~ msgid "Workcenter Operations"
 #~ msgstr "Werkcenter operaties"
 
+#~ msgid "Modification name"
+#~ msgstr "Naamswijziging"
+
 #~ msgid "alphabetical indices"
 #~ msgstr "Alfabetische index"
 
@@ -3185,3 +3151,9 @@ msgstr "Producten te verbruiken"
 
 #~ msgid "Repairs"
 #~ msgstr "Reparaties"
+
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Grondstoffenlijst revisie"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Materiaallijst versies"
diff --git a/addons/mrp/i18n/nl_BE.po b/addons/mrp/i18n/nl_BE.po
index 720234c8f5a..a7251604a56 100644
--- a/addons/mrp/i18n/nl_BE.po
+++ b/addons/mrp/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -210,11 +210,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -469,11 +464,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -531,11 +521,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -816,11 +801,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1381,11 +1361,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1889,12 +1864,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1912,17 +1881,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2108,19 +2066,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index 2d4647be9e1..491b12bf492 100644
--- a/addons/mrp/i18n/pl.po
+++ b/addons/mrp/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -222,11 +222,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Dla kupowanych materiałów"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Wersja"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -494,11 +489,6 @@ msgstr "Dekompozycja produkcji"
 msgid "For Services."
 msgstr "Do usług."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Data modyfikacji"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -560,11 +550,6 @@ msgstr "Konfiguruj centra produkcyjne"
 msgid "Force Reservation"
 msgstr "Wymuś rezerwację"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -849,11 +834,6 @@ msgstr "Suma cykli"
 msgid "Ready to Produce"
 msgstr "Gotowe do produkcji"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nazwa modyfikacji"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1423,11 +1403,6 @@ msgstr "Zapotrzebowanie na produkty"
 msgid "Work Center Loads"
 msgstr "Obciążenie centrum roboczego"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Wersja zestawienia materiałowego"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1933,12 +1908,6 @@ msgstr "Czas dla tego kroku w godzinach"
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Zest. Mat."
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1956,17 +1925,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr "Czeka na materiały"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Wersje Zest. Mat."
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2152,19 +2110,6 @@ msgstr "Zmień ilość"
 msgid "Change Product Qty"
 msgstr "Zmień ilość produktu"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Opis"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2310,6 +2255,9 @@ msgstr "Produkty do zużycia"
 #~ msgid "Details"
 #~ msgstr "Szczegóły"
 
+#~ msgid "Modification Date"
+#~ msgstr "Data modyfikacji"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Oblicz tylko reguły minimalnych zapasów"
 
@@ -2381,6 +2329,9 @@ msgstr "Produkty do zużycia"
 #~ "Jeśli metoda nabycia jest 'Na zamówienie' i metoda zaopatrzenia jest "
 #~ "'Produkcja'"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Latest error"
 #~ msgstr "Ostatni błąd"
 
@@ -2409,6 +2360,9 @@ msgstr "Produkty do zużycia"
 #~ msgid "Security Days"
 #~ msgstr "Dni na wszelki wypadek"
 
+#~ msgid "Modification name"
+#~ msgstr "Nazwa modyfikacji"
+
 #~ msgid "If Product type is service"
 #~ msgstr "Jeśli typem produktu jest usługa"
 
@@ -2595,6 +2549,9 @@ msgstr "Produkty do zużycia"
 #~ msgid "Canceled"
 #~ msgstr "Anulowano"
 
+#~ msgid "BoM"
+#~ msgstr "Zest. Mat."
+
 #~ msgid "New Production Order"
 #~ msgstr "Nowe zamówienie produkcji"
 
@@ -2640,6 +2597,9 @@ msgstr "Produkty do zużycia"
 #~ msgid "Create minimum stock rules"
 #~ msgstr "Utwórz reguły zapasów minimalnych"
 
+#~ msgid "Description"
+#~ msgstr "Opis"
+
 #~ msgid "Bill of Material Structure"
 #~ msgstr "Struktura zestawień materiałowych"
 
@@ -2682,6 +2642,9 @@ msgstr "Produkty do zużycia"
 #~ "przechodzenia przez zamówienie produkcji. Zwykłe zestawienie materiałowe "
 #~ "będzie generowało jedno zamówienie produkcji na każdy poziom zestawienia."
 
+#~ msgid "BoM Revisions"
+#~ msgstr "Wersje Zest. Mat."
+
 #~ msgid "Draft"
 #~ msgstr "Projekt"
 
@@ -2802,6 +2765,9 @@ msgstr "Produkty do zużycia"
 #~ msgid "Service Product"
 #~ msgstr "Produkt - usługa"
 
+#~ msgid "Revision"
+#~ msgstr "Wersja"
+
 #~ msgid "Confirmed"
 #~ msgstr "Potwierdzone"
 
@@ -3200,6 +3166,9 @@ msgstr "Produkty do zużycia"
 #~ msgid "MRP Application Configuration"
 #~ msgstr "Konfiguracja aplikacji MRP"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Wersja zestawienia materiałowego"
+
 #~ msgid "MRP Applications Configuration"
 #~ msgstr "Konfiguracja aplikacji MRP"
 
diff --git a/addons/mrp/i18n/pt.po b/addons/mrp/i18n/pt.po
index f4f70b7fa58..fd06a72ddfa 100644
--- a/addons/mrp/i18n/pt.po
+++ b/addons/mrp/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para materiais comprados"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisão"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -506,11 +501,6 @@ msgstr "Decomposição da produção"
 msgid "For Services."
 msgstr "Para serviços"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Data de modificação"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -572,11 +562,6 @@ msgstr "Configure os seus centros de trabalho"
 msgid "Force Reservation"
 msgstr "Forçar reserva"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -876,11 +861,6 @@ msgstr "Total de Ciclos"
 msgid "Ready to Produce"
 msgstr "Pronto para produzir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nome de modificação"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1477,11 +1457,6 @@ msgstr "Adquirir artigos"
 msgid "Work Center Loads"
 msgstr "Cargas Centro de Trabalho"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Ficha técnica da revisão de material"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2024,12 +1999,6 @@ msgstr "Tempo em horas para a configuração."
 msgid "Orange Juice"
 msgstr "Sumo Laranja"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "BoM"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2047,17 +2016,6 @@ msgstr "Atribuição de stock."
 msgid "Waiting Goods"
 msgstr "Esperar bens"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último índice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisões de BoM"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2248,19 +2206,6 @@ msgstr "Mudar a quantidade"
 msgid "Change Product Qty"
 msgstr "Alterar Quantidade do Artigo"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descrição"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2384,6 +2329,9 @@ msgstr "Artigos para consumir"
 #~ msgid "Moves Created"
 #~ msgstr "Movimentos criados"
 
+#~ msgid "Revision"
+#~ msgstr "Revisão"
+
 #~ msgid "UoS Quantity"
 #~ msgstr "Quantidade UoS"
 
@@ -2444,6 +2392,9 @@ msgstr "Artigos para consumir"
 #~ msgid "Print product price"
 #~ msgstr "Imprimir o preço do produto"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Latest error"
 #~ msgstr "Último erro"
 
@@ -2477,6 +2428,9 @@ msgstr "Artigos para consumir"
 #~ msgid "Security Days"
 #~ msgstr "Dias de segurança"
 
+#~ msgid "Modification name"
+#~ msgstr "Nome de modificação"
+
 #~ msgid "Exception"
 #~ msgstr "Excepção"
 
@@ -2617,9 +2571,18 @@ msgstr "Artigos para consumir"
 #~ msgid "plus"
 #~ msgstr "mais"
 
+#~ msgid "BoM"
+#~ msgstr "BoM"
+
 #~ msgid "New Production Order"
 #~ msgstr "Nova pedido de produção"
 
+#~ msgid "last indice"
+#~ msgstr "Último índice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisões de BoM"
+
 #~ msgid "Retry"
 #~ msgstr "Tentar novamente"
 
@@ -2644,6 +2607,9 @@ msgstr "Artigos para consumir"
 #~ msgid "Close Move at end"
 #~ msgstr "Fechar movimento no fim"
 
+#~ msgid "Description"
+#~ msgstr "Descrição"
+
 #~ msgid "Running"
 #~ msgstr "Em execução"
 
@@ -3236,6 +3202,9 @@ msgstr "Artigos para consumir"
 #~ msgid "Repairs"
 #~ msgstr "Reparações"
 
+#~ msgid "Modification Date"
+#~ msgstr "Data de modificação"
+
 #~ msgid "Raw Material Location"
 #~ msgstr "Localização do material em bruto"
 
@@ -3461,6 +3430,9 @@ msgstr "Artigos para consumir"
 #~ "aba da ordem de produção (centros de trabalho) será automaticamente pré-"
 #~ "preenchido."
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Ficha técnica da revisão de material"
+
 #, python-format
 #~ msgid "Work Cost of "
 #~ msgstr "Custo de trabalho "
diff --git a/addons/mrp/i18n/pt_BR.po b/addons/mrp/i18n/pt_BR.po
index aa7250aa3a7..48bfb807036 100644
--- a/addons/mrp/i18n/pt_BR.po
+++ b/addons/mrp/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -226,11 +226,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para Material Comprado"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisão"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -508,11 +503,6 @@ msgstr "Decomposição de Produção"
 msgid "For Services."
 msgstr "Para Serviços"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Data de Modificação"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -574,11 +564,6 @@ msgstr "Configure seus centros de trabalho"
 msgid "Force Reservation"
 msgstr "Forçar reserva"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -878,11 +863,6 @@ msgstr "Total de Ciclos"
 msgid "Ready to Produce"
 msgstr "Pronto para Produção"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Modificação de Nome"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1478,11 +1458,6 @@ msgstr "Adquirir Proodutos"
 msgid "Work Center Loads"
 msgstr "Cargas dos Centros de Trabalho"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisão da Lista de Materiais"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2026,12 +2001,6 @@ msgstr "Tempo em horas para a configuração."
 msgid "Orange Juice"
 msgstr "Suco de Laranja"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Lista de Material (BoM)"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2049,17 +2018,6 @@ msgstr "Atribuição pelo Estoque."
 msgid "Waiting Goods"
 msgstr "Aguardando mercadorias"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último Indice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "BoM Revisões"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2250,19 +2208,6 @@ msgstr "Alterar Quantidade"
 msgid "Change Product Qty"
 msgstr "Alterar Qtd. Produto"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descrição"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2425,6 +2370,9 @@ msgstr "Produtos para Consumir"
 #~ msgid "Production scheduled products"
 #~ msgstr "Produção de produtos agendados"
 
+#~ msgid "Modification Date"
+#~ msgstr "Data de Modificação"
+
 #~ msgid "Latest error"
 #~ msgstr "Último erro"
 
@@ -2455,6 +2403,9 @@ msgstr "Produtos para Consumir"
 #~ msgid "Details"
 #~ msgstr "Detalhes"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Qty Multiple"
 #~ msgstr "Múltiplo de Qtd"
 
@@ -2672,6 +2623,9 @@ msgstr "Produtos para Consumir"
 #~ msgstr ""
 #~ "Fator que multiplica todos os momentos expressa no centro de trabalho."
 
+#~ msgid "Modification name"
+#~ msgstr "Modificação de Nome"
+
 #~ msgid "Workcenter Name"
 #~ msgstr "Nome Centro de Trabalho"
 
@@ -2800,6 +2754,12 @@ msgstr "Produtos para Consumir"
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Um pedido de cotação é criado e enviado ao fornecedor."
 
+#~ msgid "BoM Revisions"
+#~ msgstr "BoM Revisões"
+
+#~ msgid "last indice"
+#~ msgstr "Último Indice"
+
 #~ msgid "Retry"
 #~ msgstr "Repetir"
 
@@ -2829,6 +2789,9 @@ msgstr "Produtos para Consumir"
 #~ msgid "Create minimum stock rules"
 #~ msgstr "Criar Regras minimas de Estoque."
 
+#~ msgid "Description"
+#~ msgstr "Descrição"
+
 #~ msgid "Service Product"
 #~ msgstr "Produto de Serviço"
 
@@ -2977,6 +2940,9 @@ msgstr "Produtos para Consumir"
 #~ msgstr ""
 #~ "Qualquer lançamento sendo feito da lista de materiais para roteamento"
 
+#~ msgid "BoM"
+#~ msgstr "Lista de Material (BoM)"
+
 #~ msgid "Procurement Reason"
 #~ msgstr "Motivo da Aquisição"
 
@@ -2992,6 +2958,9 @@ msgstr "Produtos para Consumir"
 #~ msgid "Close Move at end"
 #~ msgstr "Fechar Lançamento no final"
 
+#~ msgid "Revision"
+#~ msgstr "Revisão"
+
 #, python-format
 #~ msgid "Warning !"
 #~ msgstr "Atenção !"
@@ -3071,6 +3040,9 @@ msgstr "Produtos para Consumir"
 #~ msgid "Image"
 #~ msgstr "Imagem"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisão da Lista de Materiais"
+
 #~ msgid "November"
 #~ msgstr "Novembro"
 
diff --git a/addons/mrp/i18n/ro.po b/addons/mrp/i18n/ro.po
index 4c4687d1f25..06586d71c3c 100644
--- a/addons/mrp/i18n/ro.po
+++ b/addons/mrp/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -223,11 +223,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Pentru materiale achizitionate"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revizie"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -504,11 +499,6 @@ msgstr "Descompunerea fabricatiei"
 msgid "For Services."
 msgstr "Pentru servicii."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Data Modificarii"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -570,11 +560,6 @@ msgstr "Configureaza centrele dumneavoastra de lucru"
 msgid "Force Reservation"
 msgstr "Impune Rezervarea"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -878,11 +863,6 @@ msgstr "Total Cicluri"
 msgid "Ready to Produce"
 msgstr "Pregatit de productie"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nume modificare"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1479,11 +1459,6 @@ msgstr "Necesar produse"
 msgid "Work Center Loads"
 msgstr "Sarcini Centru de lucru"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revizuire Lista de materiale"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2032,12 +2007,6 @@ msgstr "Timpul in ore pentru instalare."
 msgid "Orange Juice"
 msgstr "Suc de portocale"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "LdM"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2055,17 +2024,6 @@ msgstr "Repartizare din stoc."
 msgid "Waiting Goods"
 msgstr "Bunuri in asteptare"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "ultimul indice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revizuiri LdM"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2256,19 +2214,6 @@ msgstr "Schimba Cantitatea"
 msgid "Change Product Qty"
 msgstr "Schimba Cant Produsului"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descriere"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2386,12 +2331,24 @@ msgstr "Da ordinea atunci cand afiseaza o lista cu listele de materiale."
 msgid "Products to Consume"
 msgstr "Produse de consumat"
 
+#~ msgid "Revision"
+#~ msgstr "Revizie"
+
 #~ msgid "BOM"
 #~ msgstr "LDM"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Draft"
 #~ msgstr "Ciornă"
 
+#~ msgid "Description"
+#~ msgstr "Descriere"
+
+#~ msgid "Modification name"
+#~ msgstr "Nume modificare"
+
 #~ msgid "Day"
 #~ msgstr "Zi"
 
@@ -2434,6 +2391,9 @@ msgstr "Produse de consumat"
 #~ msgid "Current"
 #~ msgstr "Curent"
 
+#~ msgid "BoM"
+#~ msgstr "LdM"
+
 #~ msgid "December"
 #~ msgstr "Decembrie"
 
@@ -2510,6 +2470,9 @@ msgstr "Produse de consumat"
 #~ msgid "mrp.installer"
 #~ msgstr "mrp.installer"
 
+#~ msgid "last indice"
+#~ msgstr "ultimul indice"
+
 #~ msgid "Order quantity cannot be negative or zero !"
 #~ msgstr "Cantitatea din comandă nu poate fi negativă sau zero !"
 
@@ -2762,3 +2725,12 @@ msgstr "Produse de consumat"
 #~ "Fișa tehnologică indică toate centrele de lucru folosite, pentru cât timp și "
 #~ "/ sau cicluri. Dacă fișa tehnologică este indicată, atunci al treilea tab al "
 #~ "unei comenzi de producție (centre de lucru) va fi pre-completat automat."
+
+#~ msgid "Modification Date"
+#~ msgstr "Data Modificarii"
+
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revizuire Lista de materiale"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revizuiri LdM"
diff --git a/addons/mrp/i18n/ru.po b/addons/mrp/i18n/ru.po
index 4a0d3eaf5c4..e54e3617354 100644
--- a/addons/mrp/i18n/ru.po
+++ b/addons/mrp/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -217,11 +217,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Для приобретенного материала"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Ревизия"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -489,11 +484,6 @@ msgstr "Декомпозиция производства"
 msgid "For Services."
 msgstr "Для услуг."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Дата изменения"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -553,11 +543,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Не ждать пополнения расходных"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Автор"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -846,11 +831,6 @@ msgstr "Всего циклов"
 msgid "Ready to Produce"
 msgstr "Готово к производству"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Название модификации"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1425,11 +1405,6 @@ msgstr "Снабжение товарами"
 msgid "Work Center Loads"
 msgstr "Загрузка Рабочего центра"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Пересмотр спецификации"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1936,12 +1911,6 @@ msgstr "Время наладки в часах"
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Спецификация"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1959,17 +1928,6 @@ msgstr "Назначение со склада."
 msgid "Waiting Goods"
 msgstr "Ожидание товара"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "последний индекс"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Ревизии спецификации"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2155,19 +2113,6 @@ msgstr "Изменить количество"
 msgid "Change Product Qty"
 msgstr "Изменить кол-во"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Описание"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2323,6 +2268,12 @@ msgstr "Потребляемые продукты"
 #~ msgid "Print product price"
 #~ msgstr "Распечатать цену продукции"
 
+#~ msgid "Modification Date"
+#~ msgstr "Дата изменения"
+
+#~ msgid "Author"
+#~ msgstr "Автор"
+
 #~ msgid "Latest error"
 #~ msgstr "Последняя ошибка"
 
@@ -2344,6 +2295,9 @@ msgstr "Потребляемые продукты"
 #~ msgid "Procurement Lines"
 #~ msgstr "Позиции снабжения"
 
+#~ msgid "Modification name"
+#~ msgstr "Название модификации"
+
 #~ msgid "Exception"
 #~ msgstr "Исключение"
 
@@ -2440,9 +2394,15 @@ msgstr "Потребляемые продукты"
 #~ msgid "plus"
 #~ msgstr "плюс"
 
+#~ msgid "BoM"
+#~ msgstr "Спецификация"
+
 #~ msgid "New Production Order"
 #~ msgstr "Новый заказ на производство"
 
+#~ msgid "last indice"
+#~ msgstr "последний индекс"
+
 #~ msgid "Retry"
 #~ msgstr "Повторить"
 
@@ -2458,6 +2418,9 @@ msgstr "Потребляемые продукты"
 #~ msgid "Warehouse"
 #~ msgstr "Склад"
 
+#~ msgid "Description"
+#~ msgstr "Описание"
+
 #~ msgid "Running"
 #~ msgstr "Выполняется"
 
@@ -2473,6 +2436,9 @@ msgstr "Потребляемые продукты"
 #~ msgid "Bill of Materials Components"
 #~ msgstr "Компоненты спецификации"
 
+#~ msgid "Revision"
+#~ msgstr "Ревизия"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Правила вычисления минимального запаса"
 
@@ -2574,6 +2540,9 @@ msgstr "Потребляемые продукты"
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Заявка выслана поставщику"
 
+#~ msgid "BoM Revisions"
+#~ msgstr "Ревизии спецификации"
+
 #~ msgid ""
 #~ "The list of operations (list of workcenters) to produce the finished "
 #~ "product. The routing is mainly used to compute workcenter costs during "
@@ -2965,6 +2934,9 @@ msgstr "Потребляемые продукты"
 #~ "Описание рабочего центра. Объясните здесь, каков цикл для этого рабочего "
 #~ "центра."
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Пересмотр спецификации"
+
 #~ msgid "Configure Your Manufacturing Resource Planning Application"
 #~ msgstr "Настройте модуль планирования ресурсов производства"
 
diff --git a/addons/mrp/i18n/sk.po b/addons/mrp/i18n/sk.po
index 7f62c1836c9..225730b4937 100644
--- a/addons/mrp/i18n/sk.po
+++ b/addons/mrp/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revízia"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -470,11 +465,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -532,11 +522,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -817,11 +802,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1382,11 +1362,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1890,12 +1865,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1913,17 +1882,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2109,19 +2067,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2230,6 +2175,9 @@ msgstr ""
 msgid "Products to Consume"
 msgstr ""
 
+#~ msgid "Revision"
+#~ msgstr "Revízia"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neplatný názov modelu v akcii definície."
 
diff --git a/addons/mrp/i18n/sl.po b/addons/mrp/i18n/sl.po
index 80603cd1591..060dd81a3a2 100644
--- a/addons/mrp/i18n/sl.po
+++ b/addons/mrp/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -210,11 +210,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Za nabavljeni material"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revizija"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -470,11 +465,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Datum spremembe"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -532,11 +522,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Avtor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -817,11 +802,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1382,11 +1362,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1890,12 +1865,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1913,17 +1882,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2109,19 +2067,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Opis"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2238,6 +2183,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
 
+#~ msgid "Revision"
+#~ msgstr "Revizija"
+
 #, python-format
 #~ msgid "Product name"
 #~ msgstr "Ime proizvoda"
@@ -2283,6 +2231,12 @@ msgstr ""
 #~ msgid "Reservation"
 #~ msgstr "Rezervacija"
 
+#~ msgid "Modification Date"
+#~ msgstr "Datum spremembe"
+
+#~ msgid "Author"
+#~ msgstr "Avtor"
+
 #~ msgid "Waiting"
 #~ msgstr "Čakanje"
 
@@ -2351,6 +2305,9 @@ msgstr ""
 #~ msgid "Close"
 #~ msgstr "Zapri"
 
+#~ msgid "Description"
+#~ msgstr "Opis"
+
 #~ msgid "Warehouse"
 #~ msgstr "Skladišče"
 
diff --git a/addons/mrp/i18n/sq.po b/addons/mrp/i18n/sq.po
index 131a02ab8a8..8602a0c6985 100644
--- a/addons/mrp/i18n/sq.po
+++ b/addons/mrp/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -470,11 +465,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -532,11 +522,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -817,11 +802,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1382,11 +1362,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1890,12 +1865,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1913,17 +1882,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2109,19 +2067,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
diff --git a/addons/mrp/i18n/sr@latin.po b/addons/mrp/i18n/sr@latin.po
index 06c5da4ea56..dc566ed2f53 100644
--- a/addons/mrp/i18n/sr@latin.po
+++ b/addons/mrp/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -470,11 +465,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -532,11 +522,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -817,11 +802,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1382,11 +1362,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1890,12 +1865,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1913,17 +1882,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2109,19 +2067,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
diff --git a/addons/mrp/i18n/sv.po b/addons/mrp/i18n/sv.po
index 98c0b5615c3..2ad9e9e4c6e 100644
--- a/addons/mrp/i18n/sv.po
+++ b/addons/mrp/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -210,11 +210,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revision"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -476,11 +471,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Ändringsdatum"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -540,11 +530,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Force Reservation"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Upphovsman"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -825,11 +810,6 @@ msgstr "Totalt antal cykler"
 msgid "Ready to Produce"
 msgstr "Klar att producera"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Ändring"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1393,11 +1373,6 @@ msgstr "Procure Products"
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1906,12 +1881,6 @@ msgstr "Time in hours for the setup."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "BoM"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1929,17 +1898,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr "Väntande varor"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "last indice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "BoM Revisions"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2125,19 +2083,6 @@ msgstr "Ändra kvantitet"
 msgid "Change Product Qty"
 msgstr "Ändra produktkvantitet"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Beskrivning"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2254,6 +2199,12 @@ msgstr ""
 #~ msgid "Reservation"
 #~ msgstr "Reservation"
 
+#~ msgid "Author"
+#~ msgstr "Upphovsman"
+
+#~ msgid "Modification name"
+#~ msgstr "Ändring"
+
 #~ msgid "Exception"
 #~ msgstr "Undantag"
 
@@ -2295,6 +2246,9 @@ msgstr ""
 #~ msgid "max"
 #~ msgstr "max"
 
+#~ msgid "Modification Date"
+#~ msgstr "Ändringsdatum"
+
 #~ msgid "Waiting"
 #~ msgstr "Väntar"
 
@@ -2322,6 +2276,9 @@ msgstr ""
 #~ msgid "Close"
 #~ msgstr "Stäng"
 
+#~ msgid "Description"
+#~ msgstr "Beskrivning"
+
 #~ msgid "Ask New Products"
 #~ msgstr "Be om nya produkter"
 
@@ -2340,6 +2297,9 @@ msgstr ""
 #~ msgid "Paid ?"
 #~ msgstr "Betald?"
 
+#~ msgid "Revision"
+#~ msgstr "Revision"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Beräkna minsta lagersaldo regler"
 
@@ -2911,6 +2871,9 @@ msgstr ""
 #~ msgid "Product quantity"
 #~ msgstr "Product quantity"
 
+#~ msgid "BoM"
+#~ msgstr "BoM"
+
 #~ msgid ""
 #~ "The list of operations (list of workcenters) to produce the finished "
 #~ "product. The routing is mainly used to compute workcenter costs during "
@@ -2934,6 +2897,12 @@ msgstr ""
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "A Request for Quotation is created and sent to the supplier."
 
+#~ msgid "last indice"
+#~ msgstr "last indice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "BoM Revisions"
+
 #~ msgid "When any procuere products, it comes into the prpcurement orders"
 #~ msgstr "When any procuere products, it comes into the prpcurement orders"
 
diff --git a/addons/mrp/i18n/tlh.po b/addons/mrp/i18n/tlh.po
index a1ec5465328..0ed57249ba6 100644
--- a/addons/mrp/i18n/tlh.po
+++ b/addons/mrp/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -210,11 +210,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -469,11 +464,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -531,11 +521,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -816,11 +801,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1381,11 +1361,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1889,12 +1864,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1912,17 +1881,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2108,19 +2066,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index 2e4f1a91a8c..c5d211a1b78 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -224,11 +224,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Satın alınan malzemeler için"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Düzeltme"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -406,6 +401,11 @@ msgid ""
 "sales person creates a sales order, he can relate it to several properties "
 "and OpenERP will automatically select the BoM to use according the needs."
 msgstr ""
+"Aynı ürünü farklı yöntemlerle yapma durumunuz varsa, OpenERP özellikleri bir "
+"ürünün üretimi için doğru ürün ağacını seçmek için kullanılır. Her Ürün "
+"Ağacına çeşitli özellikler atayabilirsiniz. Bir satış elemanı bir satış "
+"siparişi oluşturduğunda onu çeşitli özelliklerle ilişkilendirebilir ve "
+"OpenERP gereksinimlere göre kullanmak üzere otomatikman Ürün Ağacını seçer."
 
 #. module: mrp
 #: help:mrp.production,picking_id:0
@@ -496,11 +496,6 @@ msgstr "Üretim ayrıştırma"
 msgid "For Services."
 msgstr "Hizmetler için."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Değiştirme Tarihi"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -560,11 +555,6 @@ msgstr "İş merkezlerinizi ayarlayın"
 msgid "Force Reservation"
 msgstr "Rezerve Et"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Yazar"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -859,11 +849,6 @@ msgstr "Toplam Çevrim"
 msgid "Ready to Produce"
 msgstr "Üretim için Hazır"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Değiştirme Adı"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1451,11 +1436,6 @@ msgstr "Ürün Satınal"
 msgid "Work Center Loads"
 msgstr "İş Merkezi Yükleri"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Ürün Ağacı Revizyonu"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1991,12 +1971,6 @@ msgstr "Ayar için saat cinsinden süre."
 msgid "Orange Juice"
 msgstr "Portakal Suyu"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "BoM"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2014,17 +1988,6 @@ msgstr "Stoktan atama."
 msgid "Waiting Goods"
 msgstr "Malzeme Bekleniyor"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "son indis"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "BoM Revizyonları"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2215,19 +2178,6 @@ msgstr "Miktar Değiştir"
 msgid "Change Product Qty"
 msgstr "Ürün Miktarını Değiştir"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Açıklama"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2441,9 +2391,15 @@ msgstr "Sarf Edilecek Ürünler"
 #~ msgid "Make Procurement"
 #~ msgstr "Satınalma Yap"
 
+#~ msgid "Modification Date"
+#~ msgstr "Değiştirme Tarihi"
+
 #~ msgid "Purchase Lead Time"
 #~ msgstr "Alış Tedarik Süresi"
 
+#~ msgid "Author"
+#~ msgstr "Yazar"
+
 #~ msgid "Stockable Product Stock"
 #~ msgstr "Stoklanabilir Ürün Stoğ"
 
@@ -2489,6 +2445,9 @@ msgstr "Sarf Edilecek Ürünler"
 #~ msgid "Security Days"
 #~ msgstr "Emniyet Günü"
 
+#~ msgid "Modification name"
+#~ msgstr "Değiştirme Adı"
+
 #~ msgid "Exception"
 #~ msgstr "İstisnai"
 
@@ -2682,6 +2641,9 @@ msgstr "Sarf Edilecek Ürünler"
 #~ msgid "New Production Order"
 #~ msgstr "Yeni Üretim Emri Oluştur"
 
+#~ msgid "BoM Revisions"
+#~ msgstr "BoM Revizyonları"
+
 #~ msgid "Retry"
 #~ msgstr "Tekrar Dene"
 
@@ -2715,6 +2677,9 @@ msgstr "Sarf Edilecek Ürünler"
 #~ msgid "Close Move at end"
 #~ msgstr "Son Hareketi Kapat"
 
+#~ msgid "Description"
+#~ msgstr "Açıklama"
+
 #~ msgid "Running"
 #~ msgstr "Çalışıyor"
 
@@ -3022,6 +2987,12 @@ msgstr "Sarf Edilecek Ürünler"
 #~ msgid "Image"
 #~ msgstr "Resim"
 
+#~ msgid "BoM"
+#~ msgstr "BoM"
+
+#~ msgid "last indice"
+#~ msgstr "son indis"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Kurulum Safhası"
 
@@ -3040,6 +3011,9 @@ msgstr "Sarf Edilecek Ürünler"
 #~ "ve/veya çevrimleri gösterir. Rota gösterilirse, ürün emrinin üçüncü sekmesi "
 #~ "(iş merkezleri) otomatik olarak önceden doldurulacaktır."
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Ürün Ağacı Revizyonu"
+
 #, python-format
 #~ msgid "Work Cost of "
 #~ msgstr "İş Maliyeti "
@@ -3095,3 +3069,6 @@ msgstr "Sarf Edilecek Ürünler"
 
 #~ msgid "Moves Created"
 #~ msgstr "Oluşturulan Hareketler"
+
+#~ msgid "Revision"
+#~ msgstr "Düzeltme"
diff --git a/addons/mrp/i18n/uk.po b/addons/mrp/i18n/uk.po
index 163fab92b6a..6f09893d897 100644
--- a/addons/mrp/i18n/uk.po
+++ b/addons/mrp/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -210,11 +210,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Ревізії"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -469,11 +464,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Дата модифікації"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -531,11 +521,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Виконати резервування"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Автор"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -816,11 +801,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr "Готовий до виробництва"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Назва модифікації"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1381,11 +1361,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1889,12 +1864,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "СВ"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1912,17 +1881,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr "Очікування вантажу"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "останній індекс"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Ревізії СВ"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2108,19 +2066,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Опис"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2232,6 +2177,9 @@ msgstr ""
 #~ msgid "Moves Created"
 #~ msgstr "Створені переміщення"
 
+#~ msgid "Revision"
+#~ msgstr "Ревізії"
+
 #~ msgid "Routing Workcenters"
 #~ msgstr "Робочі центри технологічних маршрутів"
 
@@ -2280,6 +2228,12 @@ msgstr ""
 #~ msgid "Print product price"
 #~ msgstr "Друк ціни продукту"
 
+#~ msgid "Modification Date"
+#~ msgstr "Дата модифікації"
+
+#~ msgid "Author"
+#~ msgstr "Автор"
+
 #~ msgid "Latest error"
 #~ msgstr "Остання помилка"
 
@@ -2304,6 +2258,9 @@ msgstr ""
 #~ msgid "Procurement Lines"
 #~ msgstr "Радки постачання"
 
+#~ msgid "Modification name"
+#~ msgstr "Назва модифікації"
+
 #~ msgid "Exception"
 #~ msgstr "Вилучений"
 
@@ -2423,6 +2380,15 @@ msgstr ""
 #~ msgid "plus"
 #~ msgstr "plus"
 
+#~ msgid "BoM"
+#~ msgstr "СВ"
+
+#~ msgid "last indice"
+#~ msgstr "останній індекс"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Ревізії СВ"
+
 #~ msgid "Retry"
 #~ msgstr "Повторити"
 
@@ -2441,6 +2407,9 @@ msgstr ""
 #~ msgid "Close Move at end"
 #~ msgstr "Дія закриття в кінці"
 
+#~ msgid "Description"
+#~ msgstr "Опис"
+
 #~ msgid "Running"
 #~ msgstr "Діючий"
 
diff --git a/addons/mrp/i18n/vi.po b/addons/mrp/i18n/vi.po
index 61357a82208..b11ade19365 100644
--- a/addons/mrp/i18n/vi.po
+++ b/addons/mrp/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -216,11 +216,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -475,11 +470,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -537,11 +527,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -822,11 +807,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1387,11 +1367,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1895,12 +1870,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1918,17 +1887,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2114,19 +2072,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index 0f584b45e31..bfeab10df7e 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/mrp/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr "输入一个费用产品用于跟踪辅助核算会计中的成本"
 msgid "For purchased material"
 msgstr "用于采购原料"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "版本"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -472,11 +467,6 @@ msgstr "产品数量结构分解"
 msgid "For Services."
 msgstr "用于服务。"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "修改日期"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -534,11 +524,6 @@ msgstr "配置你的工作中心"
 msgid "Force Reservation"
 msgstr "强制预留"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "作者"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -820,11 +805,6 @@ msgstr "总周期"
 msgid "Ready to Produce"
 msgstr "准备生产"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "修改名称"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1389,11 +1369,6 @@ msgstr "生产产品"
 msgid "Work Center Loads"
 msgstr "工作中心负载"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "物料清单版本"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1911,12 +1886,6 @@ msgstr "准备小时数"
 msgid "Orange Juice"
 msgstr "橙汁"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "物料清单"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1934,17 +1903,6 @@ msgstr "按库存预留"
 msgid "Waiting Goods"
 msgstr "等待原料"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "最近指标"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "物料清单版本"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2132,19 +2090,6 @@ msgstr "修改数量"
 msgid "Change Product Qty"
 msgstr "改变产品数量"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "说明"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2304,6 +2249,9 @@ msgstr "未投料数量"
 #~ msgid "max"
 #~ msgstr "最大"
 
+#~ msgid "Author"
+#~ msgstr "作者"
+
 #~ msgid "Production orders"
 #~ msgstr "生产单"
 
@@ -2358,6 +2306,12 @@ msgstr "未投料数量"
 #~ msgid "Canceled"
 #~ msgstr "已取消"
 
+#~ msgid "BoM"
+#~ msgstr "物料清单"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "物料清单版本"
+
 #~ msgid "Retry"
 #~ msgstr "重试"
 
@@ -2370,6 +2324,9 @@ msgstr "未投料数量"
 #~ msgid "Warehouse"
 #~ msgstr "仓库"
 
+#~ msgid "Description"
+#~ msgstr "说明"
+
 #~ msgid "Running"
 #~ msgstr "运行中"
 
@@ -2430,6 +2387,9 @@ msgstr "未投料数量"
 #~ msgid "Hours Cost"
 #~ msgstr "按小时计算的成本"
 
+#~ msgid "Modification name"
+#~ msgstr "修改名称"
+
 #, python-format
 #~ msgid "SUBTOTAL"
 #~ msgstr "小计"
@@ -2576,6 +2536,9 @@ msgstr "未投料数量"
 #~ msgid "You can see its bill of material which are used to make product"
 #~ msgstr "你可以看到生产产品使用的物料清单"
 
+#~ msgid "Revision"
+#~ msgstr "版本"
+
 #~ msgid "Routing Workcenters"
 #~ msgstr "工艺路线的工作中心"
 
@@ -2650,6 +2613,9 @@ msgstr "未投料数量"
 #~ msgid "Print product price"
 #~ msgstr "产品报价"
 
+#~ msgid "Modification Date"
+#~ msgstr "修改日期"
+
 #~ msgid "If Procure method is Make to order and supply method is produce"
 #~ msgstr "如果获得方式是来自订单并且供应方式是生产"
 
@@ -2893,6 +2859,9 @@ msgstr "未投料数量"
 #~ msgid "New Production Order"
 #~ msgstr "新的生产单"
 
+#~ msgid "last indice"
+#~ msgstr "最近指标"
+
 #~ msgid "When any procuere products, it comes into the prpcurement orders"
 #~ msgstr "当生产任何产品时它生成产品需求单"
 
@@ -3215,6 +3184,9 @@ msgstr "未投料数量"
 #~ msgid "January"
 #~ msgstr "一月"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "物料清单版本"
+
 #~ msgid ""
 #~ "Routing indicates all the workcenters used, for how long and/or cycles.If "
 #~ "Routing is indicated then,the third tab of a production order (workcenters) "
diff --git a/addons/mrp/i18n/zh_HK.po b/addons/mrp/i18n/zh_HK.po
index 34419ffcba6..387b470e108 100644
--- a/addons/mrp/i18n/zh_HK.po
+++ b/addons/mrp/i18n/zh_HK.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -470,11 +465,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "修改日期"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -532,11 +522,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "強制預留"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -817,11 +802,6 @@ msgstr "週期總數"
 msgid "Ready to Produce"
 msgstr "就緒生產"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "修改名稱"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1382,11 +1362,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1890,12 +1865,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1913,17 +1882,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2109,19 +2067,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2374,6 +2319,9 @@ msgstr ""
 #~ msgid "Print product price"
 #~ msgstr "打印貨品價格"
 
+#~ msgid "Modification Date"
+#~ msgstr "修改日期"
+
 #~ msgid "Make Procurement"
 #~ msgstr "生成採購計劃"
 
@@ -2454,6 +2402,9 @@ msgstr ""
 #~ msgid "Security Days"
 #~ msgstr "保障天數"
 
+#~ msgid "Modification name"
+#~ msgstr "修改名稱"
+
 #~ msgid "Exception"
 #~ msgstr "例外"
 
diff --git a/addons/mrp/i18n/zh_TW.po b/addons/mrp/i18n/zh_TW.po
index cba37db93e5..c5774616d94 100644
--- a/addons/mrp/i18n/zh_TW.po
+++ b/addons/mrp/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -210,11 +210,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -469,11 +464,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "修改日期"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -531,11 +521,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "強制預留"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -816,11 +801,6 @@ msgstr "週期總數"
 msgid "Ready to Produce"
 msgstr "就緒生產"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "修改名稱"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1381,11 +1361,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1889,12 +1864,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1912,17 +1881,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2108,19 +2066,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2376,6 +2321,9 @@ msgstr ""
 #~ msgid "Print product price"
 #~ msgstr "打印貨品價格"
 
+#~ msgid "Modification Date"
+#~ msgstr "修改日期"
+
 #~ msgid "Production Procure Products"
 #~ msgstr "以生產獲得貨品"
 
@@ -2453,6 +2401,9 @@ msgstr ""
 #~ msgid "Security Days"
 #~ msgstr "保障天數"
 
+#~ msgid "Modification name"
+#~ msgstr "修改名稱"
+
 #~ msgid "If Product type is service"
 #~ msgstr "如果產品類型是服務型"
 
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index c667daadbec..ae29ad324db 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -47,13 +47,13 @@ class mrp_workcenter(osv.osv):
         'time_start': fields.float('Time before prod.', help="Time in hours for the setup."),
         'time_stop': fields.float('Time after prod.', help="Time in hours for the cleaning."),
         'costs_hour': fields.float('Cost per hour', help="Specify Cost of Work Center per hour."),
-        'costs_hour_account_id': fields.many2one('account.analytic.account', 'Hour Account', domain=[('type','<>','view')],
+        'costs_hour_account_id': fields.many2one('account.analytic.account', 'Hour Account', domain=[('type','!=','view')],
             help="Fill this only if you want automatic analytic accounting entries on production orders."),
         'costs_cycle': fields.float('Cost per cycle', help="Specify Cost of Work Center per cycle."),
-        'costs_cycle_account_id': fields.many2one('account.analytic.account', 'Cycle Account', domain=[('type','<>','view')],
+        'costs_cycle_account_id': fields.many2one('account.analytic.account', 'Cycle Account', domain=[('type','!=','view')],
             help="Fill this only if you want automatic analytic accounting entries on production orders."),
         'costs_journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal'),
-        'costs_general_account_id': fields.many2one('account.account', 'General Account', domain=[('type','<>','view')]),
+        'costs_general_account_id': fields.many2one('account.account', 'General Account', domain=[('type','!=','view')]),
         'resource_id': fields.many2one('resource.resource','Resource', ondelete='cascade', required=True),
         'product_id': fields.many2one('product.product','Work Center Product', help="Fill this product to easily track your production costs in the analytic accounting."),
     }
@@ -214,7 +214,6 @@ class mrp_bom(osv.osv):
         'bom_id': fields.many2one('mrp.bom', 'Parent BoM', ondelete='cascade', select=True),
         'routing_id': fields.many2one('mrp.routing', 'Routing', help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production planning."),
         'property_ids': fields.many2many('mrp.property', 'mrp_bom_property_rel', 'bom_id','property_id', 'Properties'),
-        'revision_ids': fields.one2many('mrp.bom.revision', 'bom_id', 'BoM Revisions'),
         'child_complete_ids': fields.function(_child_compute, relation='mrp.bom', string="BoM Hierarchy", type='many2many'),
         'company_id': fields.many2one('res.company','Company',required=True),
     }
@@ -374,26 +373,6 @@ class mrp_bom(osv.osv):
 
 mrp_bom()
 
-class mrp_bom_revision(osv.osv):
-    _name = 'mrp.bom.revision'
-    _description = 'Bill of Material Revision'
-    _columns = {
-        'name': fields.char('Modification name', size=64, required=True),
-        'description': fields.text('Description'),
-        'date': fields.date('Modification Date'),
-        'indice': fields.char('Revision', size=16),
-        'last_indice': fields.char('last indice', size=64),
-        'author_id': fields.many2one('res.users', 'Author'),
-        'bom_id': fields.many2one('mrp.bom', 'BoM', select=True),
-    }
-
-    _defaults = {
-        'author_id': lambda x, y, z, c: z,
-        'date': fields.date.context_today,
-    }
-
-mrp_bom_revision()
-
 def rounding(f, r):
     import math
     if not r:
@@ -457,41 +436,59 @@ class mrp_production(osv.osv):
         return dest_location_id.id
 
     _columns = {
-        'name': fields.char('Reference', size=64, required=True),
-        'origin': fields.char('Source Document', size=64, help="Reference of the document that generated this production order request."),
-        'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', select=True),
+        'name': fields.char('Reference', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'origin': fields.char('Source Document', size=64, readonly=True, states={'draft': [('readonly', False)]},
+            help="Reference of the document that generated this production order request."),
+        'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority',
+            select=True, readonly=True, states=dict.fromkeys(['draft', 'confirmed'], [('readonly', False)])),
 
-        'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'product_qty': fields.float('Product Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, states={'draft':[('readonly',False)]}, readonly=True),
-        'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, states={'draft':[('readonly',False)]}, readonly=True),
-        'product_uos_qty': fields.float('Product UoS Quantity', states={'draft':[('readonly',False)]}, readonly=True),
-        'product_uos': fields.many2one('product.uom', 'Product UoS', states={'draft':[('readonly',False)]}, readonly=True),
+        'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'product_qty': fields.float('Product Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'product_uos_qty': fields.float('Product UoS Quantity', readonly=True, states={'draft': [('readonly', False)]}),
+        'product_uos': fields.many2one('product.uom', 'Product UoS', readonly=True, states={'draft': [('readonly', False)]}),
 
         'location_src_id': fields.many2one('stock.location', 'Raw Materials Location', required=True,
-            readonly=True, states={'draft':[('readonly',False)]}, help="Location where the system will look for components."),
+            readonly=True, states={'draft':[('readonly',False)]},
+            help="Location where the system will look for components."),
         'location_dest_id': fields.many2one('stock.location', 'Finished Products Location', required=True,
-            readonly=True, states={'draft':[('readonly',False)]}, help="Location where the system will stock the finished products."),
+            readonly=True, states={'draft':[('readonly',False)]},
+            help="Location where the system will stock the finished products."),
 
         'date_planned_end': fields.function(_production_date_end, type='date', string='Scheduled End Date'),
         'date_planned_date': fields.function(_production_date, type='date', string='Scheduled Date'),
-        'date_planned': fields.datetime('Scheduled Date', required=True, select=1),
-        'date_start': fields.datetime('Start Date', select=True),
-        'date_finished': fields.datetime('End Date', select=True),
+        'date_planned': fields.datetime('Scheduled Date', required=True, select=1, readonly=True, states={'draft':[('readonly',False)]}),
+        'date_start': fields.datetime('Start Date', select=True, readonly=True),
+        'date_finished': fields.datetime('End Date', select=True, readonly=True),
 
         'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)], readonly=True, states={'draft':[('readonly',False)]}),
-        'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', readonly=True, states={'draft':[('readonly',False)]}, help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."),
+        'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', readonly=True, states={'draft':[('readonly',False)]},
+            help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."),
         'picking_id': fields.many2one('stock.picking', 'Picking List', readonly=True, ondelete="restrict",
             help="This is the Internal Picking List that brings the finished product to the production plan"),
         'move_prod_id': fields.many2one('stock.move', 'Product Move', readonly=True),
-        'move_lines': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products to Consume', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}),
-        'move_lines2': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Consumed Products', domain=[('state','in', ('done', 'cancel'))]),
-        'move_created_ids': fields.one2many('stock.move', 'production_id', 'Products to Produce', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}),
-        'move_created_ids2': fields.one2many('stock.move', 'production_id', 'Produced Products', domain=[('state','in', ('done', 'cancel'))]),
-        'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'),
-        'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Work Centers Utilisation'),
-        'state': fields.selection([('draft','New'),('cancel','Cancelled'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','Production Started'),('done','Done')],'Status', readonly=True,
-                                    help='When the production order is created the state is set to \'Draft\'.\n If the order is confirmed the state is set to \'Waiting Goods\'.\n If any exceptions are there, the state is set to \'Picking Exception\'.\
-                                    \nIf the stock is available then the state is set to \'Ready to Produce\'.\n When the production gets started then the state is set to \'In Production\'.\n When the production is over, the state is set to \'Done\'.'),
+        'move_lines': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products to Consume',
+            domain=[('state','not in', ('done', 'cancel'))], readonly=True, states={'draft':[('readonly',False)]}),
+        'move_lines2': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Consumed Products',
+            domain=[('state','in', ('done', 'cancel'))], readonly=True, states={'draft':[('readonly',False)]}),
+        'move_created_ids': fields.one2many('stock.move', 'production_id', 'Products to Produce',
+            domain=[('state','not in', ('done', 'cancel'))], readonly=True, states={'draft':[('readonly',False)]}),
+        'move_created_ids2': fields.one2many('stock.move', 'production_id', 'Produced Products',
+            domain=[('state','in', ('done', 'cancel'))], readonly=True, states={'draft':[('readonly',False)]}),
+        'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods',
+            readonly=True, states={'draft':[('readonly',False)]}),
+        'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Work Centers Utilisation',
+            readonly=True, states={'draft':[('readonly',False)]}),
+        'state': fields.selection(
+            [('draft', 'New'), ('cancel', 'Cancelled'), ('picking_except', 'Picking Exception'), ('confirmed', 'Waiting Goods'),
+                ('ready', 'Ready to Produce'), ('in_production', 'Production Started'), ('done', 'Done')],
+            string='Status', readonly=True,
+            help="When the production order is created the state is set to 'Draft'.\n\
+                If the order is confirmed the state is set to 'Waiting Goods'.\n\
+                If any exceptions are there, the state is set to 'Picking Exception'.\n\
+                If the stock is available then the state is set to 'Ready to Produce'.\n\
+                When the production gets started then the state is set to 'In Production'.\n\
+                When the production is over, the state is set to 'Done'."),
         'hour_total': fields.function(_production_calc, type='float', string='Total Hours', multi='workorder', store=True),
         'cycle_total': fields.function(_production_calc, type='float', string='Total Cycles', multi='workorder', store=True),
         'user_id':fields.many2one('res.users', 'Responsible'),
@@ -728,7 +725,7 @@ class mrp_production(osv.osv):
 
         produced_qty = 0
         for produced_product in production.move_created_ids2:
-            if (produced_product.scrapped) or (produced_product.product_id.id <> production.product_id.id):
+            if (produced_product.scrapped) or (produced_product.product_id.id != production.product_id.id):
                 continue
             produced_qty += produced_product.product_qty
         if production_mode in ['consume','consume_produce']:
@@ -935,7 +932,7 @@ class mrp_production(osv.osv):
         # If usage of routing location is a internal, make outgoing shipment otherwise internal shipment
         if production.bom_id.routing_id and production.bom_id.routing_id.location_id:
             routing_loc = production.bom_id.routing_id.location_id
-            if routing_loc.usage <> 'internal':
+            if routing_loc.usage != 'internal':
                 pick_type = 'out'
             partner_id = routing_loc.partner_id and routing_loc.partner_id.id or False
 
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 8121f6e84d1..8e0550a0c52 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -345,28 +345,14 @@
             <field name="model">mrp.bom</field>
             <field name="arch" type="xml">
                 <form string="Bill of Material" version="7.0">
-                    <label for="product_id" string="Product and Quantity" class="oe_edit_only"/>
-                    <h1>
-                        <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>:
-                        <field name="product_qty" class="oe_inline"/>
-                        <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
-                    </h1>
-                    <div groups="mrp.group_mrp_routings">
-                        <label for="routing_id" class="oe_edit_only"/>
-                        <h2><field name="routing_id" class="oe_inline"/></h2>
-                    </div>
                     <group>
                         <group>
-                            <field name="name"/>
-                            <field name="code" string="Reference"/>
-                        </group>
-                        <group>
-                            <field name="type"/>
-                            <p colspan="2" class="oe_grey" attrs="{'invisible': [('type','=','normal')]}">
-                                When processing a sale order for this product, the delivery order
-                                will contain the raw materials, instead of the finished product.
-                            </p>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>
+                            <label for="product_qty" string="Quantity"/>
+                            <div>
+                                <field name="product_qty" class="oe_inline"/>
+                                <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
+                            </div>
                             <label for="product_uos_qty" groups="product.group_uos"/>
                             <div groups="product.group_uos" >
                                 <field name="product_uos_qty"
@@ -374,6 +360,20 @@
                                 <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/>
                                 <field name="product_uos" class="oe_inline"/>
                             </div>
+                            <div groups="mrp.group_mrp_routings">
+                                <label for="routing_id" class="oe_edit_only"/>
+                                <h2><field name="routing_id" class="oe_inline"/></h2>
+                            </div>
+                        </group>
+                        <group>
+                            <field name="name" class="oe_inline"/>
+                            <field name="code" string="Reference"/>
+                            <field name="type"/>
+                            <p colspan="2" class="oe_grey" attrs="{'invisible': [('type','=','normal')]}">
+                                When processing a sale order for this product, the delivery order
+                                will contain the raw materials, instead of the finished product.
+                            </p>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
                     </group>
                     <notebook>
@@ -389,9 +389,6 @@
                                 </tree>
                             </field>
                         </page>
-                        <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
-                            <field name="revision_ids"/>
-                        </page>
                         <page string="Properties" groups="product.group_mrp_properties">
                             <group>
                                 <group>
@@ -411,6 +408,10 @@
                             <field name="property_ids" widget="many2many_tags"/>
                         </page>
                     </notebook>
+                    <div class="oe_chatter">
+                         <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                         <field name="message_follower_ids" widget="mail_followers"/>
+                    </div>
                 </form>
             </field>
         </record>
@@ -543,35 +544,6 @@
             <field eval="'ir.actions.act_window,'+str(action2)" name="value"/>
         </record>
 
-        <record id="mrp_bom_revision_tree" model="ir.ui.view">
-            <field name="name">mrp.bom.revision</field>
-            <field name="model">mrp.bom.revision</field>
-            <field name="arch" type="xml">
-                <tree string="BoM Revisions">
-                    <field name="indice"/>
-                    <field name="author_id"/>
-                    <field name="date"/>
-                    <field colspan="4" name="name"/>
-                </tree>
-            </field>
-        </record>
-        <record id="mrp_bom_revision_form" model="ir.ui.view">
-            <field name="name">mrp.bom.revision</field>
-            <field name="model">mrp.bom.revision</field>
-            <field name="arch" type="xml">
-                <form string="BoM Revisions" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="indice"/>
-                        <field name="date"/>
-                        <field name="author_id" readonly="1"/>
-                    </group>
-                    <separator string="Description"/>
-                    <field name="description"/>
-                </form>
-            </field>
-        </record>
-
         <!--
         Production Management
         -->
@@ -653,7 +625,7 @@
                     </div>
                     <group>
                         <group>
-                            <field name="product_id" on_change="product_id_change(product_id)" domain="[('bom_ids','&lt;&gt;',False),('bom_ids.bom_id','=',False)]" class="oe_inline"/>
+                            <field name="product_id" on_change="product_id_change(product_id)" domain="[('bom_ids','!=',False),('bom_ids.bom_id','=',False)]" class="oe_inline" context='{"default_supply_method":"produce", "default_type": "product"}'/>
                             <label for="product_qty"/>
                             <div>
                                 <field name="product_qty" class="oe_inline"/>
@@ -661,7 +633,7 @@
                                 <button type="action"
                                     icon="terp-accessories-archiver+"
                                     name="%(mrp.action_change_production_qty)d"
-                                    string="(Update)" states="ready,confirmed" class="oe_edit_only oe_link"/>
+                                    string="(Update)" states="confirmed" class="oe_edit_only oe_link"/>
                             </div>
                             <label for="product_uos_qty" groups="product.group_uos"/>
                             <div groups="product.group_uos">
@@ -686,12 +658,12 @@
                         <page string="Consumed Products">
                             <group>
                                 <group string="Products to Consume">
-                                    <field name="move_lines" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
+                                    <field name="move_lines" nolabel="1">
                                         <tree colors="blue:state == 'draft';black:state in ('picking_except','confirmed','ready','in_production');gray:state in ('cancel','done') " string="Products to Consume">
                                             <field name="product_id"/>
                                             <field name="product_qty"  string="Quantity"/>
                                             <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
-                                            <field name="location_id"  string="Source Loc." groups="stock.group_locations"/>
+                                            <field name="prodlot_id" groups="stock.group_production_lot"/>
                                             <field name="state" invisible="1"/>
                                             <button name="%(stock.move_consume)d"
                                                 string="Consume Products" type="action"
@@ -701,7 +673,8 @@
                                                    name="%(stock.track_line)d"
                                                    string="Split in Serial Numbers"
                                                    type="action" icon="gtk-justify-fill"
-                                                   states="draft,waiting,confirmed,assigned"/>
+                                                   states="draft,waiting,confirmed,assigned" 
+                                                   groups="stock.group_production_lot"/>
                                             <button name="%(stock.move_scrap)d"
                                                 string="Scrap Products" type="action"
                                                 icon="gtk-convert" context="{'scrap': True}"
@@ -710,12 +683,12 @@
                                     </field>
                                 </group>
                                 <group string="Consumed Product">
-                                    <field name="move_lines2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
+                                    <field name="move_lines2" nolabel="1">
                                        <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
                                            <field name="product_id" readonly="1"/>
                                            <field name="product_qty" readonly="1"/>
                                            <field name="product_uom" readonly="1" string="Unit of Measure" groups="product.group_uom"/>
-                                           <field name="prodlot_id" context="{'product_id': product_id}"/>
+                                           <field name="prodlot_id" context="{'product_id': product_id}" groups="stock.group_production_lot"/>
                                            <field name="state" invisible="1"/>
                                            <field name="scrapped" invisible="1"/>
                                            <button
@@ -731,7 +704,7 @@
                         <page string="Finished Products">
                             <group>
                                 <group string="Products to Produce">
-                                    <field name="move_created_ids" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
+                                    <field name="move_created_ids" nolabel="1">
                                         <tree string="Products to Finish">
                                             <field name="product_id"/>
                                             <field name="product_qty"/>
@@ -749,13 +722,13 @@
                                     </field>
                                 </group>
                                 <group string="Produced Products">
-                                    <field name="move_created_ids2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
+                                    <field name="move_created_ids2" nolabel="1">
                                         <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
                                             <field name="product_id" readonly="1"/>
                                             <field name="product_qty" readonly="1"/>
                                             <field name="product_uom" readonly="1" string="Unit of Measure" groups="product.group_uom"/>
                                             <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection" groups="stock.group_locations"/>
-                                            <field name="prodlot_id" context="{'product_id': product_id}"/>
+                                            <field name="prodlot_id" context="{'product_id': product_id}" groups="stock.group_production_lot"/>
                                             <field name="scrapped" invisible="1"/>
                                             <field name="state" invisible="1"/>
                                             <button name="%(stock.track_line)d"
diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py
index 555010c2be1..2cb9fd77f80 100644
--- a/addons/mrp/res_config.py
+++ b/addons/mrp/res_config.py
@@ -28,11 +28,11 @@ class mrp_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'module_stock_planning': fields.boolean('manage master production shedule',
+        'module_stock_planning': fields.boolean('Manage master production shedule',
             help ="""This allows to create a manual procurement plan apart of the normal MRP scheduling,
                 which works automatically based on minimum stock rules.
                 This installs the module stock_planning."""),
-        'module_mrp_repair': fields.boolean("manage repairs of products ",
+        'module_mrp_repair': fields.boolean("Manage repairs of products ",
             help="""Allows to manage all product repairs.
                     * Add/remove products in the reparation
                     * Impact for stocks
@@ -41,34 +41,34 @@ class mrp_config_settings(osv.osv_memory):
                     * Repair quotation report
                     * Notes for the technician and for the final customer.
                 This installs the module mrp_repair."""),
-        'module_mrp_operations': fields.boolean("allow detailed planning of work order",
+        'module_mrp_operations': fields.boolean("Allow detailed planning of work order",
             help="""This allows to add state, date_start,date_stop in production order operation lines (in the "Work Centers" tab).
                 This installs the module mrp_operations."""),
-        'module_mrp_subproduct': fields.boolean("produce several products from one manufacturing order",
+        'module_mrp_subproduct': fields.boolean("Produce several products from one manufacturing order",
             help="""You can configure sub-products in the bill of material.
                 Without this module: A + B + C -> D.
                 With this module: A + B + C -> D + E.
                 This installs the module mrp_subproduct."""),
-        'module_mrp_jit': fields.boolean("generate procurement in real time",
+        'module_mrp_jit': fields.boolean("Generate procurement in real time",
             help="""This allows Just In Time computation of procurement orders.
                 All procurement orders will be processed immediately, which could in some
                 cases entail a small performance impact.
                 This installs the module mrp_jit."""),
-        'module_stock_no_autopicking': fields.boolean("manage manual picking to fulfill manufacturing orders ",
+        'module_stock_no_autopicking': fields.boolean("Manage manual picking to fulfill manufacturing orders ",
             help="""This module allows an intermediate picking process to provide raw materials to production orders.
                 For example to manage production made by your suppliers (sub-contracting).
                 To achieve this, set the assembled product which is sub-contracted to "No Auto-Picking"
                 and put the location of the supplier in the routing of the assembly operation.
                 This installs the module stock_no_autopicking."""),
-        'group_mrp_routings': fields.boolean("manage routings and work orders ",
+        'group_mrp_routings': fields.boolean("Manage routings and work orders ",
             implied_group='mrp.group_mrp_routings',
             help="""Routings allow you to create and manage the manufacturing operations that should be followed
                 within your work centers in order to produce a product. They are attached to bills of materials
                 that will define the required raw materials."""),
-        'group_mrp_properties': fields.boolean("allow several bill of materials per products",
+        'group_mrp_properties': fields.boolean("Allow several bill of materials per products using properties",
             implied_group='product.group_mrp_properties',
             help="""The selection of the right Bill of Material to use will depend on the  properties specified on the sale order and the Bill of Material."""),
-        'module_product_manufacturer': fields.boolean("define manufacturers on products ",
+        'module_product_manufacturer': fields.boolean("Define manufacturers on products ",
             help="""This allows you to define the following for a product:
                     * Manufacturer
                     * Manufacturer Product Name
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 4d94e611fdf..16ebbdcb05b 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -12,6 +12,9 @@
             <field name="type">automatic</field>
             <field name="sequence">100</field>
         </record>
+         <record id="purchase.todo_open_purchase_menu" model="ir.actions.todo">
+                <field name="state">done</field>
+        </record>
     </data>
     <data>
         <record id="view_mrp_config" model="ir.ui.view">
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 5d254f86b4e..d7213a1c689 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -3,7 +3,6 @@ access_mrp_workcenter,mrp.workcenter,model_mrp_workcenter,mrp.group_mrp_user,1,0
 access_mrp_routing,mrp.routing,model_mrp_routing,mrp.group_mrp_user,1,0,0,0
 access_mrp_routing_workcenter,mrp.routing.workcenter,model_mrp_routing_workcenter,mrp.group_mrp_user,1,0,0,0
 access_mrp_bom,mrp.bom,model_mrp_bom,group_mrp_user,1,0,0,0
-access_mrp_bom_revision,mrp.bom.revision,model_mrp_bom_revision,group_mrp_user,1,0,0,0
 access_mrp_production,mrp.production user,model_mrp_production,mrp.group_mrp_user,1,1,1,1
 access_mrp_production_salesman,mrp.production salesman,model_mrp_production,base.group_sale_salesman,1,1,1,0
 access_mrp_production_product_line_salesman,mrp.production.product.line salesman,model_mrp_production_product_line,base.group_sale_salesman,1,0,1,0
@@ -16,7 +15,6 @@ access_mrp_workcenter_manager,mrp.workcenter.manager,model_mrp_workcenter,mrp.gr
 access_mrp_routing_manager,mrp.routing.manager,model_mrp_routing,mrp.group_mrp_manager,1,1,1,1
 access_mrp_routing_workcenter_manager,mrp.routing.workcenter.manager,model_mrp_routing_workcenter,mrp.group_mrp_manager,1,1,1,1
 access_mrp_bom_manager,mrp.bom.manager,model_mrp_bom,mrp.group_mrp_manager,1,1,1,1
-access_mrp_bom_revision_manager,mrp.bom.revision.manager,model_mrp_bom_revision,mrp.group_mrp_manager,1,1,1,1
 access_stock_location_mrp_worker,stock.location mrp_worker,stock.model_stock_location,mrp.group_mrp_user,1,0,0,0
 access_stock_move_mrp_worker,stock.move mrp_worker,stock.model_stock_move,mrp.group_mrp_user,1,1,1,0
 access_stock_picking_mrp_worker,stock.picking mrp_worker,stock.model_stock_picking,mrp.group_mrp_user,1,1,1,1
diff --git a/addons/mrp/test/order_process.yml b/addons/mrp/test/order_process.yml
index f8a2ebfbf99..a714035a9cd 100644
--- a/addons/mrp/test/order_process.yml
+++ b/addons/mrp/test/order_process.yml
@@ -71,7 +71,7 @@
     partner_id = False
     if order.bom_id.routing_id and order.bom_id.routing_id.location_id:
         routing_loc = order.bom_id.routing_id.location_id
-        if routing_loc.usage <> 'internal':
+        if routing_loc.usage != 'internal':
             pick_type = 'out'
         partner_id = routing_loc.partner_id and routing_loc.partner_id.id or False
         routing_loc = routing_loc.id
diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py
index 6c021c069ab..9be34b6bd1e 100644
--- a/addons/mrp/wizard/change_production_qty.py
+++ b/addons/mrp/wizard/change_production_qty.py
@@ -68,12 +68,12 @@ class change_production_qty(osv.osv_memory):
         assert record_id, _('Active Id not found')
         prod_obj = self.pool.get('mrp.production')
         bom_obj = self.pool.get('mrp.bom')
+        move_obj = self.pool.get('stock.move')
         for wiz_qty in self.browse(cr, uid, ids, context=context):
             prod = prod_obj.browse(cr, uid, record_id, context=context)
             prod_obj.write(cr, uid, [prod.id], {'product_qty': wiz_qty.product_qty})
             prod_obj.action_compute(cr, uid, [prod.id])
 
-            move_lines_obj = self.pool.get('stock.move')
             for move in prod.move_lines:
                 bom_point = prod.bom_id
                 bom_id = prod.bom_id.id
@@ -88,12 +88,17 @@ class change_production_qty(osv.osv_memory):
                     raise osv.except_osv(_('Error!'), _("Cannot find bill of material for this product."))
 
                 factor = prod.product_qty * prod.product_uom.factor / bom_point.product_uom.factor
-                res = bom_obj._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, [])
-                for r in res[0]:
+                product_details, workcenter_details = \
+                    bom_obj._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, [])
+                product_move = dict((mv.product_id.id, mv.id) for mv in prod.picking_id.move_lines)
+                for r in product_details:
                     if r['product_id'] == move.product_id.id:
-                        move_lines_obj.write(cr, uid, [move.id], {'product_qty' :  r['product_qty']})
+                        move_obj.write(cr, uid, [move.id], {'product_qty': r['product_qty']})
+                    if r['product_id'] in product_move:
+                        move_obj.write(cr, uid, [product_move[r['product_id']]], {'product_qty': r['product_qty']})
+            if prod.move_prod_id:
+                move_obj.write(cr, uid, [prod.move_prod_id.id], {'product_qty' :  wiz_qty.product_qty})
             self._update_product_to_produce(cr, uid, prod, wiz_qty.product_qty, context=context)
-
         return {}
 
 change_production_qty()
diff --git a/addons/point_of_sale/controllers/main.py b/addons/point_of_sale/controllers/main.py
index 425a7e3d7f8..e6976dd319c 100644
--- a/addons/point_of_sale/controllers/main.py
+++ b/addons/point_of_sale/controllers/main.py
@@ -72,19 +72,19 @@ class PointOfSaleController(openerpweb.Controller):
         return getattr(self, method)(request, **kwargs)
 
     @openerpweb.jsonrequest
-    def scan_item_success(self, request):
+    def scan_item_success(self, request, ean):
         """
         A product has been scanned with success
         """
-        print 'scan_item_success'
+        print 'scan_item_success: ' + str(ean)
         return 
 
     @openerpweb.jsonrequest
-    def scan_item_error_unrecognized(self, request):
+    def scan_item_error_unrecognized(self, request, ean):
         """
         A product has been scanned without success
         """
-        print 'scan_item_error_unrecognized'
+        print 'scan_item_error_unrecognized: ' + str(ean)
         return 
 
     @openerpweb.jsonrequest
@@ -166,4 +166,9 @@ class PointOfSaleController(openerpweb.Controller):
         print 'print_receipt' + str(receipt)
         return
 
+    @openerpweb.jsonrequest
+    def print_pdf_invoice(self, request, pdfinvoice):
+        print 'print_pdf_invoice' + str(pdfinvoice)
+        return
+
 
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index 7d80dd493ad..faa3927a9c4 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -6,17 +6,17 @@
         </record>
         <record id="base.user_demo" model="res.users">
             <field name="groups_id" eval="[(4,ref('group_pos_user'))]"/>
-            <field name="ean13">0410200000005</field>
+            <field name="ean13">0420100000005</field>
         </record>
         <record id="account.cash_journal" model="account.journal">
             <field eval="True" name="journal_user"/>
         </record>
         <record id="base.user_root" model="res.users">
-            <field name="ean13">0410300000004</field>
+            <field name="ean13">0410100000006</field>
             <field name="groups_id" eval="[(4,ref('group_pos_manager'))]"/>
         </record>
         <record id="base.user_demo" model="res.users">
-            <field name="ean13">0410400000003</field>
+            <field name="ean13">0420100000005</field>
             <field name="groups_id" eval="[(4,ref('group_pos_manager'))]"/>
         </record>
 
@@ -189,6 +189,7 @@
         <record id="citron" model="product.product">
           <field name="list_price">1.98</field>
           <field name="name">Lemon</field>
+          <field name="ean13">2301000000006</field>
           <field name="to_weight">True</field>
           <field name="pos_categ_id" ref="autres_agrumes"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
diff --git a/addons/point_of_sale/static/src/css/keyboard.css b/addons/point_of_sale/static/src/css/keyboard.css
index 3a06970929f..d5ce468d7be 100644
--- a/addons/point_of_sale/static/src/css/keyboard.css
+++ b/addons/point_of_sale/static/src/css/keyboard.css
@@ -71,7 +71,7 @@
 	clear: left;
 }
 .point-of-sale .keyboard .lastitem {
-	margin-right: 0;
+	margin-right: 0 !important;
 }
 
 /* ---- full sized keyboard ---- */
@@ -79,13 +79,13 @@
 .point-of-sale .full_keyboard {
     list-style: none;
     font-size: 14px;
-    width: 680px;
+    width: 685px;
     height: 100%;
-    margin-left: auto;
-    margin-right: auto;
+    margin-left: auto !important;
+    margin-right: auto !important;
 }
 .point-of-sale .full_keyboard li{
-	margin: 0 5px 5px 0;
+	margin: 0 5px 5px 0 !important;
 	width: 40px;
 	height: 40px;
 	line-height: 40px;
@@ -115,22 +115,22 @@
 .point-of-sale .simple_keyboard {
     list-style: none;
     font-size: 16px;
-    width: 545px;
+    width: 555px;
     height: 220px;
-    margin-left: auto;
-    margin-right: auto;
+    margin-left: auto !important;
+    margin-right: auto !important;
 }
 .point-of-sale .simple_keyboard li{
-    margin: 0 5px 5px 0;
+    margin: 0 5px 5px 0 !important;
     width: 49px;
     height: 49px;
     line-height: 49px;
 }
 .point-of-sale .simple_keyboard .firstitem.row_asdf{
-    margin-left:25px;
+    margin-left:25px !important;
 }
 .point-of-sale .simple_keyboard .firstitem.row_zxcv{
-    margin-left:55px;
+    margin-left:55px !important;
 }
 .point-of-sale .simple_keyboard .delete{
     width: 103px;
@@ -139,7 +139,7 @@
     width: 103px;
 }
 .point-of-sale .simple_keyboard .space{
-    width:268px;
+    width:273px;
 }
 .point-of-sale .simple_keyboard .numlock{
     width:103px;
diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index 9ac7d4405d0..8213df7fc44 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -373,7 +373,7 @@
 /*  ********* The product list  ********* */
 
 .point-of-sale .product-list {
-    padding:10px;
+    padding:10px !important;
 }
 
 .point-of-sale .product-list-scroller{
@@ -470,7 +470,7 @@
 }
 
 .point-of-sale .category-list{
-    padding:10px;
+    padding:10px !important;
 }
 /*  d) the category button */
 
@@ -479,7 +479,7 @@
     vertical-align: top;
     display: inline-block;
     font-size: 11px;
-    margin: 5px;
+    margin: 5px !important;
     width: 120px;
     height:120px;
     background:#fff;
@@ -566,7 +566,7 @@
     display: inline-block;
     line-height: 100px;
     font-size: 11px;
-    margin: 5px;
+    margin: 5px !important;
     width: 120px;
     height:120px;
     background:#fff;
@@ -809,6 +809,8 @@
 }
 
 .point-of-sale .scale-screen .product-picture img{
+    max-width: 178px;
+    max-height:178px;
     vertical-align: middle;
     cursor:pointer;
 }
@@ -860,7 +862,7 @@
 .point-of-sale .goodbye-message{
     position: absolute;
     left:50%;
-    top:30%;
+    top:40%;
     width:500px;
     height:400px;
     margin-left: -250px;
@@ -1100,6 +1102,79 @@
 .point-of-sale .pos-actionbar .button.rightalign{
     float:right;
 }
+/*  ********* The Debug Widget  ********* */
+
+.point-of-sale .debug-widget{
+    z-index:100000;
+    position: absolute;
+    right: 10px;
+    top: 10px;
+    width: 200px;
+    font-size: 10px;
+    
+    background: rgba(0,0,0,0.82);
+    color: white;
+    text-shadow: none;
+    padding-bottom: 10px;
+    box-shadow: 0px 3px 20px rgba(0,0,0,0.3);
+    cursor:move;
+}
+.point-of-sale .debug-widget .toggle{
+    position: absolute;
+    font-size: 16px;
+    cursor:pointer;
+    top:0px;
+    right:0px;
+    padding:10px;
+    padding-right:15px;
+}
+.point-of-sale .debug-widget .content{
+    overflow: hidden;
+}
+.point-of-sale .debug-widget h1{
+    background:black;
+    padding-top: 10px;
+    padding-left: 10px;
+    margin-top:0;
+    margin-bottom:0;
+}
+.point-of-sale .debug-widget .category{
+    background: black;
+    padding-left: 10px;
+    margin: 0px;
+    font-weight: bold;
+    padding-top:3px;
+    padding-bottom:3px;
+}
+.point-of-sale .debug-widget .button{
+    padding: 5px;
+    padding-left: 15px;
+    display: block;
+    cursor:pointer;
+}
+.point-of-sale .debug-widget .button:hover{
+    background: rgba(96,21,177,0.45);
+}
+.point-of-sale .debug-widget input{
+    margin-left:10px;
+    margin-top:7px;
+}
+.point-of-sale .debug-widget .status{
+    padding: 5px;
+    padding-left: 15px;
+    display: block;
+    cursor:default;
+}
+.point-of-sale .debug-widget .status.on{
+    background-color: #6cd11d;
+}
+.point-of-sale .debug-widget .event{
+    padding: 5px;
+    padding-left: 15px;
+    display: block;
+    cursor:default;
+    background-color: #1E1E1E;
+}
 
 /*  ********* The PopupWidgets  ********* */
 
diff --git a/addons/point_of_sale/static/src/js/db.js b/addons/point_of_sale/static/src/js/db.js
index 77f7307b48f..c80c1958aae 100644
--- a/addons/point_of_sale/static/src/js/db.js
+++ b/addons/point_of_sale/static/src/js/db.js
@@ -21,6 +21,8 @@ function openerp_pos_db(instance, module){
             this.category_childs = {};
             this.category_parent    = {};
             this.category_search_string = {};
+            this.packagings_by_id = {};
+            this.packagings_by_product_id = {};
         },
         /* returns the category object from its id. If you pass a list of id as parameters, you get
          * a list of category objects. 
@@ -116,6 +118,10 @@ function openerp_pos_db(instance, module){
             if(product.ean13){
                 str += '|' + product.ean13;
             }
+            var packagings = this.packagings_by_product_id[product.id] || [];
+            for(var i = 0; i < packagings.length; i++){
+                str += '|' + packagings[i].ean;
+            }
             return str + '\n';
         },
         add_products: function(products){
@@ -158,6 +164,16 @@ function openerp_pos_db(instance, module){
             this.save('products',stored_products);
             this.save('categories',stored_categories);
         },
+        add_packagings: function(packagings){
+            for(var i = 0, len = packagings.length; i < len; i++){
+                var pack = packagings[i];
+                this.packagings_by_id[pack.id] = pack;
+                if(!this.packagings_by_product_id[pack.product_id[0]]){
+                    this.packagings_by_product_id[pack.product_id[0]] = [];
+                }
+                this.packagings_by_product_id[pack.product_id[0]].push(pack);
+            }
+        },
         /* removes all the data from the database. TODO : being able to selectively remove data */
         clear: function(stores){
             for(var i = 0, len = arguments.length; i < len; i++){
@@ -184,6 +200,12 @@ function openerp_pos_db(instance, module){
                     return products[i];
                 }
             }
+            for(var p in this.packagings_by_id){
+                var pack = this.packagings_by_id[p];
+                if( pack.ean === ean13){
+                    return products[pack.product_id[0]];
+                }
+            }
             return undefined;
         },
         get_product_by_category: function(category_id){
@@ -223,9 +245,12 @@ function openerp_pos_db(instance, module){
         },
         remove_order: function(order_id){
             var orders = this.load('orders',[]);
+            console.log('Remove order:',order_id);
+            console.log('Order count:',orders.length);
             orders = _.filter(orders, function(order){
                 return order.id !== order_id;
             });
+            console.log('Order count:',orders.length);
             this.save('orders',orders);
         },
         get_orders: function(){
diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js
index e36070414b6..a26d8ca7154 100644
--- a/addons/point_of_sale/static/src/js/devices.js
+++ b/addons/point_of_sale/static/src/js/devices.js
@@ -1,26 +1,6 @@
 
 function openerp_pos_devices(instance,module){ //module is instance.point_of_sale
 
-     var debug_devices = new (instance.web.Class.extend({
-        active: false,
-        payment_status: 'waiting_for_payment',
-        weight: 0,
-        activate: function(){
-            this.active = true;
-        },
-        deactivate: function(){
-            this.active = false;
-        },
-        set_weight: function(weight){ this.activate(); this.weight = weight; },
-        accept_payment: function(){ this.activate(); this.payment_status = 'payment_accepted'; },
-        reject_payment: function(){ this.activate(); this.payment_status = 'payment_rejected'; },
-        delay_payment:  function(){ this.activate(); this.payment_status = 'waiting_for_payment'; },
-    }))();
-
-    if(jQuery.deparam(jQuery.param.querystring()).debug !== undefined){
-        window.debug_devices = debug_devices;
-    }
-
     // this object interfaces with the local proxy to communicate to the various hardware devices
     // connected to the Point of Sale. As the communication only goes from the POS to the proxy,
     // methods are used both to signal an event, and to fetch information. 
@@ -38,32 +18,42 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
 
             this.connection = new instance.web.JsonRPC();
             this.connection.setup(url);
+
+            this.bypass_proxy = false;
+            this.notifications = {};
             
         },
         message : function(name,params,success_callback, error_callback){
             success_callback = success_callback || function(){}; 
             error_callback   =  error_callback  || function(){};    
 
-            
-            if(jQuery.deparam(jQuery.param.querystring()).debug !== undefined){
-                console.log('PROXY:',name,params);
+            var callbacks = this.notifications[name] || [];
+            for(var i = 0; i < callbacks.length; i++){
+                callbacks[i](params);
             }
 
-            if(!(debug_devices && debug_devices.active)){
-                this.connection.rpc('/pos/'+name, params || {}, success_callback, error_callback);
+            this.connection.rpc('/pos/'+name, params || {}, success_callback, error_callback);
+        },
+
+        // this allows the client to be notified when a proxy call is made. The notification 
+        // callback will be executed with the same arguments as the proxy call
+        add_notification: function(name, callback){
+            if(!this.notifications[name]){
+                this.notifications[name] = [];
             }
+            this.notifications[name].push(callback);
         },
         
         //a product has been scanned and recognized with success
         // ean is a parsed ean object
         scan_item_success: function(ean){
-            this.message('scan_item_success',ean);
+            this.message('scan_item_success',{ean: ean});
         },
 
         // a product has been scanned but not recognized
         // ean is a parsed ean object
         scan_item_error_unrecognized: function(ean){
-            this.message('scan_item_error_unrecognized',ean);
+            this.message('scan_item_error_unrecognized',{ean: ean});
         },
 
         //the client is asking for help
@@ -78,12 +68,12 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
 
         //the client is starting to weight
         weighting_start: function(){
-            this.weight = 0;
-            if(debug_devices){
-                debug_devices.weigth = 0;
+            if(!this.weighting){
+                this.weight = 0;
+                this.weighting = true;
+                this.bypass_proxy = false;
+                this.message('weighting_start');
             }
-            this.weighting = true;
-            this.message('weighting_start');
         },
 
         //returns the weight on the scale. 
@@ -91,22 +81,29 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
         // and a weighting_end()
         weighting_read_kg: function(){
             var self = this;
-            if(debug_devices && debug_devices.active){
-                return debug_devices.weight;
+            if(this.bypass_proxy){
+                return this.weight;
             }else{
                 this.message('weighting_read_kg',{},function(weight){
-                    if(self.weighting){
+                    if(self.weighting && !self.bypass_proxy){
                         self.weight = weight;
                     }
                 });
-                return self.weight;
+                return this.weight;
             }
         },
 
+        // sets a custom weight, ignoring the proxy returned value until the next weighting_end 
+        debug_set_weight: function(kg){
+            this.bypass_proxy = true;
+            this.weight = kg;
+        },
+
         // the client has finished weighting products
         weighting_end: function(){
             this.weight = 0;
             this.weighting = false;
+            this.bypass_proxy = false;
             this.message('weighting_end');
         },
 
@@ -116,9 +113,6 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
         payment_request: function(price, method, info){
             this.paying = true;
             this.payment_status = 'waiting_for_payment';
-            if(debug_devices){
-                debug_devices.payment_status = 'waiting_for_payment';
-            }
             this.message('payment_request',{'price':price,'method':method,'info':info});
         },
 
@@ -127,18 +121,30 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
         // returns 'waiting_for_payment' | 'payment_accepted' | 'payment_rejected'
         is_payment_accepted: function(){
             var self = this;
-            if(debug_devices.active){
-                return debug_devices.payment_status;
+            if(this.bypass_proxy){
+                this.bypass_proxy = false;
+                return this.payment_status;
             }else{
                 this.message('is_payment_accepted', {}, function(payment_status){
                     if(self.paying){
                         self.payment_status = payment_status;
                     }
                 });
-                return self.payment_status;
+                return this.payment_status;
             }
         },
+        
+        // override what the proxy says and accept the payment
+        debug_accept_payment: function(){
+            this.bypass_proxy = true;
+            this.payment_status = 'payment_accepted';
+        },
 
+        // override what the proxy says and reject the payment
+        debug_reject_payment: function(){
+            this.bypass_proxy = true;
+            this.payment_status = 'payment_rejected';
+        },
         // the client cancels his payment
         payment_canceled: function(){
             this.paying = false;
@@ -212,6 +218,11 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
         print_receipt: function(receipt){
             this.message('print_receipt',{receipt: receipt});
         },
+
+        // asks the proxy to print an invoice in pdf form ( used to print invoices generated by the server ) 
+        print_pdf_invoice: function(pdfinvoice){
+            this.message('print_pdf_invoice',{pdfinvoice: pdfinvoice});
+        },
     });
 
     // this module interfaces with the barcode reader. It assumes the barcode reader
@@ -237,6 +248,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
             this.cashier_prefix_set  = attributes.cashier_prefix_set  ||  {'041':''};
             this.client_prefix_set   = attributes.client_prefix_set   ||  {'042':''};
         },
+
         save_callbacks: function(){
             var callbacks = {};
             for(name in this.action_callback){
@@ -244,6 +256,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
             }
             this.action_callback_stack.push(callbacks);
         },
+
         restore_callbacks: function(){
             if(this.action_callback_stack.length){
                 var callbacks = this.action_callback_stack.pop();
@@ -337,7 +350,6 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
                 value: 0,
                 unit: 'none',
             };
-            console.log('ean',ean);
 
             function match_prefix(prefix_set, type){
                 for(prefix in prefix_set){
@@ -380,6 +392,23 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
             return parse_result;
         },
 
+        on_ean: function(ean){
+            var parse_result = this.parse_ean(ean);
+
+            if (parse_result.type === 'error') {    //most likely a checksum error, raise warning
+                console.warn('WARNING: barcode checksum error:',parse_result);
+            }else if(parse_result.type in {'unit':'', 'weight':'', 'price':''}){    //ean is associated to a product
+                if(this.action_callback['product']){
+                    this.action_callback['product'](parse_result);
+                }
+                //this.trigger("codebar",parse_result );
+            }else{
+                if(this.action_callback[parse_result.type]){
+                    this.action_callback[parse_result.type](parse_result);
+                }
+            }
+        },
+
         // starts catching keyboard events and tries to interpret codebar 
         // calling the callbacks when needed.
         connect: function(){
@@ -410,21 +439,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
                     lastTimeStamp = new Date().getTime();
                     if (codeNumbers.length == 13) {
                         //We have found what seems to be a valid codebar
-                        var parse_result = self.parse_ean(codeNumbers.join(''));
-
-                        if (parse_result.type === 'error') {    //most likely a checksum error, raise warning
-                            console.warn('WARNING: barcode checksum error:',parse_result);
-                        }else if(parse_result.type in {'unit':'', 'weight':'', 'price':''}){    //ean is associated to a product
-                            if(self.action_callback['product']){
-                                self.action_callback['product'](parse_result);
-                            }
-                            //this.trigger("codebar",parse_result );
-                        }else{
-                            if(self.action_callback[parse_result.type]){
-                                self.action_callback[parse_result.type](parse_result);
-                            }
-                        }
-
+                        self.on_ean(codeNumbers.join(''));
                         codeNumbers = [];
                     }
                 } else {
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 93860697492..2c6f4e8b6e0 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -1,9 +1,6 @@
 function openerp_pos_models(instance, module){ //module is instance.point_of_sale
     var QWeb = instance.web.qweb;
 
-    var fetch = function(model, fields, domain, ctx){
-        return new instance.web.Model(model).query(fields).filter(domain).context(ctx).all()
-    };
     
     // The PosModel contains the Point Of Sale's representation of the backend.
     // Since the PoS must work in standalone ( Without connection to the server ) 
@@ -27,6 +24,8 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
             this.proxy = new module.ProxyDevice();              // used to communicate to the hardware devices via a local proxy
             this.db = new module.PosLS();                       // a database used to store the products and categories
             this.db.clear('products','categories');
+            this.debug = jQuery.deparam(jQuery.param.querystring()).debug !== undefined;    //debug mode
+
 
             // default attributes values. If null, it will be loaded below.
             this.set({
@@ -51,7 +50,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 'units':            null,
                 'units_by_id':      null,
 
-                'selectedOrder':    undefined,
+                'selectedOrder':    null,
             });
 
             this.get('orders').bind('remove', function(){ self.on_removed_order(); });
@@ -70,15 +69,19 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 });
         },
 
+        // helper function to load data from the server
+        fetch: function(model, fields, domain, ctx){
+            return new instance.web.Model(model).query(fields).filter(domain).context(ctx).all()
+        },
         // loads all the needed data on the sever. returns a deferred indicating when all the data has loaded. 
         load_server_data: function(){
             var self = this;
 
-            var loaded = fetch('res.users',['name','company_id'],[['id','=',this.session.uid]]) 
+            var loaded = self.fetch('res.users',['name','company_id'],[['id','=',this.session.uid]]) 
                 .pipe(function(users){
                     self.set('user',users[0]);
 
-                    return fetch('res.company',
+                    return self.fetch('res.company',
                     [
                         'currency_id',
                         'email',
@@ -93,15 +96,15 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 }).pipe(function(companies){
                     self.set('company',companies[0]);
 
-                    return fetch('res.partner',['contact_address'],[['id','=',companies[0].partner_id[0]]]);
+                    return self.fetch('res.partner',['contact_address'],[['id','=',companies[0].partner_id[0]]]);
                 }).pipe(function(company_partners){
                     self.get('company').contact_address = company_partners[0].contact_address;
 
-                    return fetch('res.currency',['symbol','position'],[['id','=',self.get('company').currency_id[0]]]);
+                    return self.fetch('res.currency',['symbol','position'],[['id','=',self.get('company').currency_id[0]]]);
                 }).pipe(function(currencies){
                     self.set('currency',currencies[0]);
 
-                    return fetch('product.uom', null, null);
+                    return self.fetch('product.uom', null, null);
                 }).pipe(function(units){
                     self.set('units',units);
                     var units_by_id = {};
@@ -110,19 +113,19 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                     }
                     self.set('units_by_id',units_by_id);
                     
-                    return fetch('product.packaging', null, null);
+                    return self.fetch('product.packaging', null, null);
                 }).pipe(function(packagings){
                     self.set('product.packaging',packagings);
 
-                    return fetch('res.users', ['name','ean13'], [['ean13', '!=', false]]);
+                    return self.fetch('res.users', ['name','ean13'], [['ean13', '!=', false]]);
                 }).pipe(function(users){
                     self.set('user_list',users);
 
-                    return fetch('account.tax', ['amount', 'price_include', 'type']);
+                    return self.fetch('account.tax', ['amount', 'price_include', 'type']);
                 }).pipe(function(taxes){
                     self.set('taxes', taxes);
 
-                    return fetch(
+                    return self.fetch(
                         'pos.session', 
                         ['id', 'journal_ids','name','user_id','config_id','start_at','stop_at'],
                         [['state', '=', 'opened'], ['user_id', '=', self.session.uid]]
@@ -130,7 +133,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 }).pipe(function(sessions){
                     self.set('pos_session', sessions[0]);
 
-                    return fetch(
+                    return self.fetch(
                         'pos.config',
                         ['name','journal_ids','shop_id','journal_id',
                          'iface_self_checkout', 'iface_led', 'iface_cashdrawer',
@@ -147,15 +150,19 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                     self.iface_self_checkout       =  !!pos_config.iface_self_checkout;
                     self.iface_cashdrawer          =  !!pos_config.iface_cashdrawer;
 
-                    return fetch('sale.shop',[],[['id','=',pos_config.shop_id[0]]]);
+                    return self.fetch('sale.shop',[],[['id','=',pos_config.shop_id[0]]]);
                 }).pipe(function(shops){
                     self.set('shop',shops[0]);
 
-                    return fetch('pos.category', ['id','name','parent_id','child_id','image'])
+                    return self.fetch('product.packaging',['ean','product_id']);
+                }).pipe(function(packagings){
+                    self.db.add_packagings(packagings);
+
+                    return self.fetch('pos.category', ['id','name','parent_id','child_id','image'])
                 }).pipe(function(categories){
                     self.db.add_categories(categories);
 
-                    return fetch(
+                    return self.fetch(
                         'product.product', 
                         ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 
                          'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type', 'description_sale', 'description'],
@@ -165,7 +172,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 }).pipe(function(products){
                     self.db.add_products(products);
 
-                    return fetch(
+                    return self.fetch(
                         'account.bank.statement',
                         ['account_id','currency','journal_id','state','name','user_id','pos_session_id'],
                         [['state','=','open'],['pos_session_id', '=', self.get('pos_session').id]]
@@ -173,7 +180,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 }).pipe(function(bank_statements){
                     self.set('bank_statements', bank_statements);
 
-                    return fetch('account.journal', undefined, [['user_id','=', self.get('pos_session').user_id[0]]]);
+                    return self.fetch('account.journal', undefined, [['user_id','=', self.get('pos_session').user_id[0]]]);
                 }).pipe(function(journals){
                     self.set('journals',journals);
 
@@ -226,6 +233,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
 
         // saves the order locally and try to send it to the backend. 'record' is a bizzarely defined JSON version of the Order
         push_order: function(record) {
+            console.log('PUSHING NEW ORDER:',record);
             this.db.add_order(record);
             this.flush();
         },
@@ -241,10 +249,15 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
         // and remove the successfully sent ones from the db once
         // it has been confirmed that they have been sent correctly.
         flush: function() {
+            //TODO make the mutex work 
+            console.log('FLUSH');
             //this makes sure only one _int_flush is called at the same time
+            /*
             return this.flush_mutex.exec(_.bind(function() {
                 return this._flush(0);
             }, this));
+            */
+            this._flush(0);
         },
         // attempts to send an order of index 'index' in the list of order to send. The index
         // is used to skip orders that failed. do not call this method outside the mutex provided
@@ -253,6 +266,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
             var self = this;
             var orders = this.db.get_orders();
             self.set('nbr_pending_operations',orders.length);
+            console.log('TRYING TO FLUSH ORDER:',index,'Of',orders.length);
 
             var order  = orders[index];
             if(!order){
@@ -268,6 +282,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 })
                 .done(function(){
                     //remove from db if success
+                    console.log('Order successfully sent');
                     self.db.remove_order(order.id);
                     self._flush(index);
                 });
@@ -301,6 +316,9 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
     });
 
     module.Product = Backbone.Model.extend({
+        get_image_url: function(){
+            return '/web/binary/image?session_id='+instance.session.session_id+'&model=product.product&field=image&id='+this.get('id');
+        },
     });
 
     module.ProductCollection = Backbone.Collection.extend({
@@ -330,7 +348,6 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
         get_discount: function(){
             return this.discount;
         },
-        // FIXME
         get_product_type: function(){
             return this.type;
         },
@@ -546,6 +563,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
             this.pos =     attributes.pos; 
             this.selected_orderline = undefined;
             this.screen_data = {};  // see ScreenSelector
+            this.receipt_type = 'receipt';  // 'receipt' || 'invoice'
             return this;
         },
         generateUniqueId: function() {
@@ -617,6 +635,13 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
         getDueLeft: function() {
             return this.getTotal() - this.getPaidTotal();
         },
+        // sets the type of receipt 'receipt'(default) or 'invoice'
+        set_receipt_type: function(type){
+            this.receipt_type = type;
+        },
+        get_receipt_type: function(){
+            return this.receipt_type;
+        },
         // the client related to the current order.
         set_client: function(client){
             this.set('client',client);
diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index 9a2071c6335..d2c79f19928 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -65,6 +65,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         },
         close_popup: function(){
             if(this.current_popup){
+                this.current_popup.close();
                 this.current_popup.hide();
                 this.current_popup = null;
             }
@@ -188,7 +189,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                     return true;
                 }
             }
-            this.pos.proxy.scan_item_unrecognized(ean);
+            this.pos.proxy.scan_item_error_unrecognized(ean);
             return false;
         },
         
@@ -206,7 +207,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                     return true;
                 }
             }
-            this.pos.proxy.scan_item_unrecognized(ean);
+            this.pos.proxy.scan_item_error_unrecognized(ean);
             return false;
             //TODO start the transaction
         },
@@ -336,6 +337,11 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                 this.$el.show();
             }
         },
+        /* called before hide, when a popup is closed */
+        close: function(){
+        },
+        /* hides the popup. keep in mind that this is called in the initialization pass of the 
+         * pos instantiation, so you don't want to do anything fancy in here */
         hide: function(){
             if(this.$el){
                 this.$el.hide();
@@ -352,9 +358,40 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             
             this.$el.find('.button').off('click').click(function(){
                 self.pos_widget.screen_selector.close_popup();
-                self.pos.proxy.help_canceled();
             });
         },
+        close:function(){
+            this.pos.proxy.help_canceled();
+        },
+    });
+
+    module.ChooseReceiptPopupWidget = module.PopUpWidget.extend({
+        template:'ChooseReceiptPopupWidget',
+        show: function(){
+            console.log('show');
+            this._super();
+            this.renderElement();
+            var self = this;
+            var currentOrder = self.pos.get('selectedOrder');
+            
+            this.$('.button.receipt').off('click').click(function(){
+                currentOrder.set_receipt_type('receipt');
+                self.pos_widget.screen_selector.set_current_screen('products');
+            });
+
+            this.$('.button.invoice').off('click').click(function(){
+                currentOrder.set_receipt_type('invoice');
+                self.pos_widget.screen_selector.set_current_screen('products');
+            });
+        },
+        get_client_name: function(){
+            var client = this.pos.get('selectedOrder').get_client();
+            if( client ){
+                return client.name;
+            }else{
+                return '';
+            }
+        },
     });
 
     module.ErrorPopupWidget = module.PopUpWidget.extend({
@@ -492,10 +529,6 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             var product = this.get_product();
             return (product ? product.get('list_price') : 0) || 0;
         },
-        get_product_image: function(){
-            var product = this.get_product();
-            return product ? product.get('image') : undefined;
-        },
         get_product_weight: function(){
             return this.weight || 0;
         },
@@ -527,23 +560,21 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                     
                     //we get the first cashregister marked as self-checkout
                     var selfCheckoutRegisters = [];
-                    for(var i = 0; i < this.pos.get('cashRegisters').models.length; i++){
-                        var cashregister = this.pos.get('cashRegisters').models[i];
+                    for(var i = 0; i < self.pos.get('cashRegisters').models.length; i++){
+                        var cashregister = self.pos.get('cashRegisters').models[i];
                         if(cashregister.self_checkout_payment_method){
                             selfCheckoutRegisters.push(cashregister);
                         }
                     }
 
-                    var cashregister = selfCheckoutRegisters[0] || this.pos.get('cashRegisters').models[0];
+                    var cashregister = selfCheckoutRegisters[0] || self.pos.get('cashRegisters').models[0];
                     currentOrder.addPaymentLine(cashregister);
-
-                    self.pos.push_order(currentOrder.exportAsJSON()).then(function() {
-                        currentOrder.destroy();
-                        self.pos.proxy.transaction_end();
-                        self.pos_widget.screen_selector.set_current_screen(self.next_screen);
-                    });
+                    self.pos.push_order(currentOrder.exportAsJSON())
+                    currentOrder.destroy();
+                    self.pos.proxy.transaction_end();
+                    self.pos_widget.screen_selector.set_current_screen(self.next_screen);
                 }else if(payment === 'payment_rejected'){
-                    clearInterval(this.intervalID);
+                    clearInterval(self.intervalID);
                     //TODO show a tryagain thingie ? 
                 }
             },500);
@@ -571,19 +602,35 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
 
         show_numpad:     false,
         show_leftpane:   false,
+        barcode_product_action: function(ean){
+            this.pos.proxy.transaction_start();
+            this._super(ean);
+        },
 
         barcode_client_action: function(ean){
+            this.pos.proxy.transaction_start();
             this._super(ean);
-            this.pos_widget.screen_selector.set_current_screen(this.next_screen);
+            $('.goodbye-message').hide();
+            this.pos_widget.screen_selector.show_popup('choose-receipt');
         },
         
         show: function(){
             this._super();
             var self = this;
+
+            this.add_action_button({
+                    label: 'help',
+                    icon: '/point_of_sale/static/src/img/icons/png48/help.png',
+                    click: function(){ 
+                        $('.goodbye-message').css({opacity:1}).hide();
+                        self.help_button_action();
+                    },
+                });
+
             $('.goodbye-message').css({opacity:1}).show();
             setTimeout(function(){
                 $('.goodbye-message').animate({opacity:0},500,'swing',function(){$('.goodbye-message').hide();});
-            },3000);
+            },5000);
         },
     });
     
@@ -743,6 +790,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                 });
 
             this.updatePaymentSummary();
+            this.$('.paymentline-amout input').last().focus();
         },
         close: function(){
             this._super();
@@ -830,7 +878,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
     		this.numpadState.set({mode: 'payment'});
     	},
         set_value: function(val) {
-        	this.currentPaymentLines.last().set({amount: val});
+        	this.currentPaymentLines.last().set_amount(val);
         },
     });
 
diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index 6de31c88dfd..f4d16b527c8 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -284,12 +284,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             this.click_product_action = options.click_product_action; 
         },
         // returns the url of the product thumbnail
-        get_image_url: function() {
-            return '/web/binary/image?session_id='+instance.session.session_id+'&model=product.product&field=image&id='+this.model.get('id');
-        },
         renderElement: function() {
             this._super();
-            this.$('img').replaceWith(this.pos_widget.image_cache.get_image(this.get_image_url()));
+            this.$('img').replaceWith(this.pos_widget.image_cache.get_image(this.model.get_image_url()));
             var self = this;
             $("a", this.$el).click(function(e){
                 if(self.click_product_action){
@@ -667,9 +664,95 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         },
         show: function(){ this.$el.show(); },
         hide: function(){ this.$el.hide(); },
-
     });
 
+    // The debug widget lets the user control and monitor the hardware and software status
+    // without the use of the proxy
+    module.DebugWidget = module.PosBaseWidget.extend({
+        template: "DebugWidget",
+        eans:{
+            admin_badge:  '0410100000006',
+            client_badge: '0420100000005',
+            invalid_ean:  '1232456',
+            soda_33cl:    '5449000000996',
+            oranges_kg:   '2100002031410',
+            lemon_price:  '2301000001560',
+            unknown_product: '9900000000004',
+        },
+        events:[
+            'scan_item_success',
+            'scan_item_error_unrecognized',
+            'payment_request',
+            'open_cashbox',
+            'print_receipt',
+            'print_pdf_invoice',
+            'weighting_read_kg',
+            'is_payment_accepted',
+        ],
+        minimized: false,
+        start: function(){
+            var self = this;
+
+            this.$el.draggable();
+            this.$('.toggle').click(function(){
+                var content = self.$('.content');
+                var bg      = self.$el;
+                if(!self.minimized){
+                    content.animate({'height':'0'},200);
+                }else{
+                    content.css({'height':'auto'});
+                }
+                self.minimized = !self.minimized;
+            });
+            this.$('.button.accept_payment').click(function(){
+                self.pos.proxy.debug_accept_payment();
+            });
+            this.$('.button.reject_payment').click(function(){
+                self.pos.proxy.debug_reject_payment();
+            });
+            this.$('.button.set_weight').click(function(){
+                var kg = Number(self.$('input.weight').val());
+                if(!Number.isNaN(kg)){
+                    self.pos.proxy.debug_set_weight(kg);
+                }
+            });
+            this.$('.button.custom_ean').click(function(){
+                var ean = self.pos.barcode_reader.sanitize_ean(self.$('input.ean').val() || '0');
+                self.$('input.ean').val(ean);
+                self.pos.barcode_reader.on_ean(ean);
+            });
+            _.each(this.eans, function(ean, name){
+                self.$('.button.'+name).click(function(){
+                    self.$('input.ean').val(ean);
+                    self.pos.barcode_reader.on_ean(ean);
+                });
+            });
+            _.each(this.events, function(name){
+                self.pos.proxy.add_notification(name,function(){
+                    self.$('.event.'+name).stop().clearQueue().css({'background-color':'#6CD11D'}); 
+                    self.$('.event.'+name).animate({'background-color':'#1E1E1E'},2000);
+                });
+            });
+            self.pos.proxy.add_notification('help_needed',function(){
+                self.$('.status.help_needed').addClass('on');
+            });
+            self.pos.proxy.add_notification('help_canceled',function(){
+                self.$('.status.help_needed').removeClass('on');
+            });
+            self.pos.proxy.add_notification('transaction_start',function(){
+                self.$('.status.transaction').addClass('on');
+            });
+            self.pos.proxy.add_notification('transaction_end',function(){
+                self.$('.status.transaction').removeClass('on');
+            });
+            self.pos.proxy.add_notification('weighting_start',function(){
+                self.$('.status.weighting').addClass('on');
+            });
+            self.pos.proxy.add_notification('weighting_end',function(){
+                self.$('.status.weighting').removeClass('on');
+            });
+        },
+    });
 
 // ---------- Main Point of Sale Widget ----------
 
@@ -698,6 +781,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         },
     });
 
+
     // The PosWidget is the main widget that contains all other widgets in the PointOfSale.
     // It is mainly composed of :
     // - a header, containing the list of orders
@@ -722,14 +806,6 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             this.leftpane_width   = '440px';
             this.cashier_controls_visible = true;
             this.image_cache = new module.ImageCache(); // for faster products image display
-
-            /*
-             //Epileptic mode
-            setInterval(function(){ 
-                $('body').css({'-webkit-filter':'hue-rotate('+Math.random()*360+'deg)' });
-            },100);
-            */
-            
         },
       
         start: function() {
@@ -758,6 +834,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
 
                 self.screen_selector.set_default_screen();
 
+                window.screen_selector = self.screen_selector;
+
                 self.pos.barcode_reader.connect();
 
                 instance.webclient.set_content_full_screen(true);
@@ -771,11 +849,6 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                 self.$('.loader').animate({opacity:0},1500,'swing',function(){self.$('.loader').hide();});
                 self.$('.loader img').hide();
 
-                if(jQuery.deparam(jQuery.param.querystring()).debug !== undefined){
-                    window.pos = self.pos;
-                    window.pos_widget = self.pos_widget;
-                }
-
             },function(){   // error when loading models data from the backend
                 self.$('.loader img').hide();
                 return new instance.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_pos_session_opening']], ['res_id'])
@@ -831,6 +904,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             this.error_session_popup = new module.ErrorNoSessionPopupWidget(this, {});
             this.error_session_popup.appendTo($('.point-of-sale'));
 
+            this.choose_receipt_popup = new module.ChooseReceiptPopupWidget(this, {});
+            this.choose_receipt_popup.appendTo($('.point-of-sale'));
+
             // --------  Misc ---------
 
             this.notification = new module.SynchNotificationWidget(this,{});
@@ -890,12 +966,17 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                     'error': this.error_popup,
                     'error-product': this.error_product_popup,
                     'error-session': this.error_session_popup,
+                    'choose-receipt': this.choose_receipt_popup,
                 },
                 default_client_screen: 'welcome',
                 default_cashier_screen: 'products',
                 default_mode: this.pos.iface_self_checkout ?  'client' : 'cashier',
             });
 
+            if(this.pos.debug){
+                this.debug_widget = new module.DebugWidget(this);
+                this.debug_widget.appendTo(this.$('#content'));
+            }
         },
 
         changed_pending_operations: function () {
@@ -965,9 +1046,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         },
         try_close: function() {
             var self = this;
-            self.pos.flush().then(function() {
-                self.close();
-            });
+            //TODO : do the close after the flush...
+            self.pos.flush()
+            self.close();
         },
         close: function() {
             var self = this;
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index bbe278758d5..7af3c2c2255 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -185,8 +185,8 @@
                     <span class="product-price">
                         <t t-esc="widget.format_currency(widget.get_product_price()) + '/Kg'" />
                     </span> 
-                    <t t-if="widget.get_product_image()">
-                        <img t-att-src="'data:image/png;base64,'+ widget.get_product_image()" />
+                    <t t-if="widget.get_product()">
+                        <img t-att-src="widget.get_product().get_image_url()" />
                     </t>
                 </div>
             </div>
@@ -313,18 +313,16 @@
         </div>
     </t>
 
-    <t t-name="ReceiptPopupWidget">
+    <t t-name="ChooseReceiptPopupWidget">
         <div class="modal-dialog">
             <div class="popup popup-help">
-                <p class="message">Welcome Mr. John Smith <br /> Choose your type of receipt:</p>
+                <p class="message">Welcome <t t-esc="widget.get_client_name()" /><br /> Choose your type of receipt:</p>
                 <div class = "button big-left receipt">
                     Ticket
                 </div>
                 <div class = "button big-right invoice">
                     Invoice
                 </div>
-                <div class="footer">
-                </div>
             </div>
         </div>
     </t>
@@ -348,7 +346,8 @@
     <t t-name="ErrorPopupWidget">
         <div class="modal-dialog">
             <div class="popup popup-help">
-                <p class="message"><t t-esc=" widget.message || 'Error.' " /></p>
+                <p class="message"><t t-esc=" widget.message || 'Error' " /></p>
+                <p class="comment"><t t-esc=" widget.comment || '' "/></p>
             </div>
         </div>
     </t>
@@ -415,6 +414,57 @@
         </div>
     </t>
 
+    <t t-name="DebugWidget">
+        <div class="debug-widget">
+            <h1>Debug Window</h1>
+            <div class="toggle">▾</div>
+            <div class="content">
+                <p class="category">Payment Terminal</p>
+
+                <ul>
+                    <li class="button accept_payment">Accept Payment</li>
+                    <li class="button reject_payment">Reject Payment</li>
+                </ul>
+                <p class="category">Electronic Scale</p>
+                <ul>
+                    <li><input type="text" class="weight"></input></li>
+                    <li class="button set_weight">Set Weight</li>
+                </ul>
+
+                <p class="category">Barcode Scanner</p>
+                <ul>
+                    <li><input type="text" class="ean"></input></li>
+                    <li class="button custom_ean">Custom Ean13</li>
+                    <li class="button admin_badge">Admin Badge</li>
+                    <li class="button client_badge">Client Badge</li>
+                    <li class="button soda_33cl">Soda 33cl</li>
+                    <li class="button oranges_kg">3.141Kg Oranges</li>
+                    <li class="button lemon_price">1.54€ Lemon</li>
+                    <li class="button unknown_product">Unknown Product</li>
+                    <li class="button invalid_ean">Invalid Ean</li>
+                </ul>
+
+                <p class="category">Hardware Status</p>
+                <ul>
+                    <li class="status help_needed">Help needed</li>
+                    <li class="status weighting">Weighting</li>
+                    <li class="status transaction">In Transaction</li>
+                </ul>
+                <p class="category">Hardware Events</p>
+                <ul>
+                    <li class="event scan_item_success">Scan Item Success</li>
+                    <li class="event scan_item_error_unrecognized">Scan Item Unrecognized</li>
+                    <li class="event payment_request">Payment Request</li>
+                    <li class="event open_cashbox">Open Cashbox</li>
+                    <li class="event print_receipt">Print Receipt</li>
+                    <li class="event print_pdf_invoice">Print Invoice</li>
+                    <li class="event weighting_read_kg">Read Weighting Scale</li>
+                    <li class="event is_payment_accepted">Check Payment</li>
+                </ul>
+            </div>
+        </div>
+    </t>
+
     <t t-name="OrderlineWidget">
         <li class="orderline">
             <span class="product-name">
diff --git a/addons/point_of_sale/wizard/pos_session_opening.py b/addons/point_of_sale/wizard/pos_session_opening.py
index d6f95cbb7fc..4e7965f8e97 100644
--- a/addons/point_of_sale/wizard/pos_session_opening.py
+++ b/addons/point_of_sale/wizard/pos_session_opening.py
@@ -52,6 +52,9 @@ class pos_session_opening(osv.osv_memory):
                 'config_id' : wizard.pos_config_id.id,
             }
             session_id = proxy.create(cr, uid, values, context=context)
+            s = proxy.browse(cr, uid, session_id, context=context)
+            if s.state=='opened':
+                return self.open_ui(cr, uid, ids, context=context)
             return self._open_session(session_id)
         return self._open_session(wizard.pos_session_id.id)
 
diff --git a/addons/point_of_sale/wizard/pos_session_opening.xml b/addons/point_of_sale/wizard/pos_session_opening.xml
index 6e44030e582..a7dbe43c962 100644
--- a/addons/point_of_sale/wizard/pos_session_opening.xml
+++ b/addons/point_of_sale/wizard/pos_session_opening.xml
@@ -39,9 +39,8 @@
                         <p class="oe_view_nocontent_create">
                           Click to start a session.
                         </p><p>
-                          You will first have to control your cash amount in your cash register.
-                          Then you will be able to open the session and start selling with the touchscreen
-                          interface.
+                          You may have to control your cash amount in your cash register, before
+                          being able to start selling through the touchscreen interface.
                         </p>
                     </div>
                     <div attrs="{'invisible' : [('pos_state', '!=', 'opened')]}" class="oe_view_nocontent">
@@ -49,8 +48,8 @@
                             Click to continue the session.
                         </p>
                         <p>
-                            The session <field name="pos_session_name" class="oe_inline" /> (<field name="pos_session_username" class="oe_inline" />) is "<b><field name="pos_state_str" class="oe_inline" /></b>"<br/>
-                            You can continue sales from the touchscreen interface by clicking on "<b>Sellings</b>" or close the cash register session ?
+                            The session <field name="pos_session_name" class="oe_inline" /> (<field name="pos_session_username" class="oe_inline" />) is "<b><field name="pos_state_str" class="oe_inline" /></b>".<br/>
+                            You can continue sales from the touchscreen interface by clicking on "Start Selling" or close the cash register session.
                         </p>
                     </div>
 
diff --git a/addons/portal/__init__.py b/addons/portal/__init__.py
index 9c6cc59be7d..2bfc6df0d96 100644
--- a/addons/portal/__init__.py
+++ b/addons/portal/__init__.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import portal
+import mail_mail
 import wizard
 
 
diff --git a/addons/portal/mail_mail.py b/addons/portal/mail_mail.py
new file mode 100644
index 00000000000..72c8469c042
--- /dev/null
+++ b/addons/portal/mail_mail.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    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/>.
+#
+##############################################################################
+
+import tools
+from osv import osv
+
+
+class mail_mail_portal(osv.Model):
+    """ Update of mail_mail class, to add the signin URL to notifications.
+    """
+    _name = 'mail.mail'
+    _inherit = ['mail.mail']
+
+    def _generate_signin_url(self, cr, uid, partner_id, portal_group_id, key, context=None):
+        """ Generate the signin url """
+        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='', context=context)
+        return base_url + '/login?action=signin&partner_id=%s&group=%s&key=%s' % (partner_id, portal_group_id, key)
+
+    def send_get_mail_body(self, cr, uid, mail, partner=None, context=None):
+        """ Return a specific ir_email body. The main purpose of this method
+            is to be inherited by Portal, to add a link for signing in, in
+            each notification email a partner receives.
+
+            :param mail: mail.mail browse_record
+            :param partner: browse_record of the specific recipient partner
+        """
+        if partner:
+            portal_ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'portal', 'portal')
+            portal_id = portal_ref and portal_ref[1] or False
+            url = self._generate_signin_url(cr, uid, partner.id, portal_id, 1234, context=context)
+            body = tools.append_content_to_html(mail.body_html, url)
+            return body
+        else:
+            return super(mail_mail_portal, self).send_get_mail_body(cr, uid, mail, partner=partner, context=context)
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index dd720d448ef..fd15a842405 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -50,8 +50,6 @@
                                 <field name="parent_menu_id"
                                     context="{'ir.ui.menu.full_list': True}"/>
                                 <label for="partent_menu_id" colspan="1"/>
-                                <button name="do_create_menu" type="object"
-                                    string="Create Parent Menu"/>
                             </group>
                             <separator string="Widgets Assigned to Users" colspan="2"/>
                             <field name="widget_ids" nolabel="1" colspan="2">
diff --git a/addons/portal/tests/__init__.py b/addons/portal/tests/__init__.py
new file mode 100644
index 00000000000..c4717f80ebf
--- /dev/null
+++ b/addons/portal/tests/__init__.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    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/>.
+#
+##############################################################################
+from . import test_portal
+
+checks = [
+    test_portal,
+]
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/portal/tests/test_portal.py b/addons/portal/tests/test_portal.py
new file mode 100644
index 00000000000..2c301228859
--- /dev/null
+++ b/addons/portal/tests/test_portal.py
@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    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/>.
+#
+##############################################################################
+
+from openerp.addons.mail.tests import test_mail
+from openerp.tools import append_content_to_html
+
+
+class test_portal(test_mail.TestMailMockups):
+
+    def setUp(self):
+        super(test_portal, self).setUp()
+        self.ir_model = self.registry('ir.model')
+        self.mail_group = self.registry('mail.group')
+        self.mail_mail = self.registry('mail.mail')
+        self.res_users = self.registry('res.users')
+        self.res_partner = self.registry('res.partner')
+
+        # create a 'pigs' group that will be used through the various tests
+        self.group_pigs_id = self.mail_group.create(self.cr, self.uid,
+            {'name': 'Pigs', 'description': 'Fans of Pigs, unite !'})
+
+    def test_00_mail_invite(self):
+        cr, uid = self.cr, self.uid
+        user_admin = self.res_users.browse(cr, uid, uid)
+        self.mail_invite = self.registry('mail.wizard.invite')
+        base_url = self.registry('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='')
+        portal_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'portal', 'portal')
+        portal_id = portal_ref and portal_ref[1] or False
+
+        # 0 - Admin
+        p_a_id = user_admin.partner_id.id
+        # 1 - Bert Tartopoils, with email, should receive emails for comments and emails
+        p_b_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'})
+
+        # ----------------------------------------
+        # CASE1: generated URL
+        # ----------------------------------------
+
+        url = self.mail_mail._generate_signin_url(cr, uid, p_b_id, portal_id, 1234)
+        self.assertEqual(url,  base_url + '/login?action=signin&partner_id=%s&group=%s&key=%s' % (p_b_id, portal_id, 1234),
+            'generated signin URL incorrect')
+
+        # ----------------------------------------
+        # CASE2: invite Bert
+        # ----------------------------------------
+
+        _sent_email_subject = 'Invitation to follow Pigs'
+        _sent_email_body = append_content_to_html('<div>You have been invited to follow Pigs.</div>', url)
+
+        # Do: create a mail_wizard_invite, validate it
+        self._init_mock_build_email()
+        mail_invite_id = self.mail_invite.create(cr, uid, {'partner_ids': [(4, p_b_id)]}, {'default_res_model': 'mail.group', 'default_res_id': self.group_pigs_id})
+        self.mail_invite.add_followers(cr, uid, [mail_invite_id])
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+
+        # Test: Pigs followers should contain Admin and Bert
+        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+        self.assertEqual(set(follower_ids), set([p_a_id, p_b_id]), 'Pigs followers after invite is incorrect')
+        # Test: sent email subject, body
+        self.assertEqual(len(self._build_email_kwargs_list), 1, 'sent email number incorrect, should be only for Bert')
+        for sent_email in self._build_email_kwargs_list:
+            self.assertEqual(sent_email.get('subject'), _sent_email_subject, 'sent email subject incorrect')
+            self.assertEqual(sent_email.get('body'), _sent_email_body, 'sent email body incorrect')
diff --git a/addons/product/product.py b/addons/product/product.py
index c9345a22103..58106bf5bf5 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -609,7 +609,7 @@ class product_product(osv.osv):
         return res
 
 
-    _constraints = [(_check_ean_key, 'Error: Invalid ean code', ['ean13'])]
+    _constraints = [(_check_ean_key, 'You provided an invalid "EAN13 Barcode" reference. You may use the internal reference field instead.', ['ean13'])]
 
     def on_order(self, cr, uid, ids, orderline, quantity):
         pass
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 80dbfac564d..5ae76a87695 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -190,7 +190,7 @@ parameter) will see those record just disappear.
             <field name="standard_price">30.0</field>
             <field name="uom_id" ref="product.product_uom_hour"/>
             <field name="uom_po_id" ref="product.product_uom_hour"/>
-            <field name="name">Service on Demand</field>
+            <field name="name">Service</field>
             <field name="categ_id" ref="product.product_category_all"/>
             <field name="type">service</field>
             <field eval="False" name="purchase_ok"/>
diff --git a/addons/project/project.py b/addons/project/project.py
index 9bd939dd4fe..35be1d82c6e 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -41,8 +41,9 @@ class project_task_type(osv.osv):
         'case_default': fields.boolean('Common to All Projects',
                         help="If you check this field, this stage will be proposed by default on each new project. It will not assign this stage to existing projects."),
         'project_ids': fields.many2many('project.project', 'project_task_type_rel', 'type_id', 'project_id', 'Projects'),
-        'state': fields.selection(_TASK_STATE, 'State', required=True,
-                        help="The related state for the stage. The state of your document will automatically change regarding the selected stage. Example, a stage is related to the state 'Close', when your document reach this stage, it will be automatically closed."),
+        'state': fields.selection(_TASK_STATE, 'Related Status', required=True,
+                        help="The status of your document is automatically changed regarding the selected stage. " \
+                            "For example, if a stage is related to the status 'Close', when your document reaches this stage, it is automatically closed."),
         'fold': fields.boolean('Hide in views if empty',
                         help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."),
     }
@@ -727,7 +728,7 @@ class task(base_stage, osv.osv):
                       When the case is over, the state is set to \'Done\'.\
                       If the case needs to be reviewed then the state is \
                       set to \'Pending\'.'),
-        'categ_ids': fields.many2many('project.category', string='Categories'),
+        'categ_ids': fields.many2many('project.category', string='Tags'),
         'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready To Pull')], 'Kanban State',
                                          help="A task's kanban state indicates special situations affecting it:\n"
                                               " * Normal is the default situation\n"
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 4f2fe7d54f1..ff8ac943a67 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -136,6 +136,7 @@
                                     <field name="resource_calendar_id"/>
                                 </group>
                                 <group string="Miscellaneous" name="misc">
+                                    <field name="date"/>
                                     <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
                                     <field name="priority"/>
                                     <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
@@ -249,47 +250,21 @@
                                     <div class="oe_kanban_project_list">
                                         <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action"> <field name="task_count"/> Tasks</a>
                                     </div>
-                                    <table>
-                                      <tr class="oe_kanban_project_fields oe_kanban_project_deadline" t-if="record.date.raw_value">
-                                        <th>Deadline</th>
-                                        <td><field name="date"/></td>
-                                      </tr>
-                                      <tr class="oe_kanban_project_fields oe_kanban_project_progress">
-                                        <th>Progress</th>
-                                        <td><t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/></td>
-                                      </tr>
-                                    </table>
+                                    <div class="oe_kanban_footer_left">
+                                        <span>
+                                            <span class="oe_e">R</span>
+                                            <t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/>
+                                        </span>
+                                        <span t-if="record.date.raw_value">
+                                            <span class="oe_e">N</span>
+                                            <field name="date"/>
+                                        </span>
+                                    </div>
                                     <div class="oe_kanban_project_avatars">
                                         <t t-foreach="record.members.raw_value" t-as="member">
                                             <img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>
                                         </t>
                                     </div>
-
-                                    <!--<h3 class="oe_kanban_ellipsis"><field name="name"/></h3>-->
-
-                                    <!--<div class="oe_kanban_project_list">-->
-                                        <!--<a t-if="record.use_tasks.raw_value"-->
-                                            <!--name="%(act_project_project_2_project_task_all)d" type="action">-->
-                                            <!--Tasks(<field name="task_count"/>)</a>-->
-                                    <!--</div>-->
-
-                                    <!--<div class="oe_kanban_project_fields oe_kanban_project_deadline" t-if="record.date.raw_value">-->
-                                        <!--<div>Deadline</div>-->
-                                        <!--<div><field name="date"/></div>-->
-                                    <!--</div>-->
-                                    <!--<div class="oe_kanban_project_fields oe_kanban_project_progress">-->
-                                        <!--<div>Progress</div>-->
-                                        <!--<div><t t-esc="Math.round(record.effective_hours.raw_value)"/> / <t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/></div>-->
-                                    <!--</div>-->
-                                    <!--<div name="alias_box" t-if="record.alias_domain.raw_value" class="oe_kanban_ellipsis">-->
-                                        <!--<a t-attf-href="mailto:#{record.alias_id.value}"><field name="alias_id"/></a>-->
-                                    <!--</div>-->
-                                    <!--<div class="oe_kanban_project_avatars">-->
-                                        <!--<t t-foreach="record.members.raw_value" t-as="member">-->
-                                            <!--<img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>-->
-                                        <!--</t>-->
-                                    <!--</div>-->
-
                                 </div>
                             </div>
                         </t>
@@ -779,7 +754,7 @@
                             <field name="case_default"/>
                         </group>
                         <group>
-                            <field name="state" string="Related State"/>
+                            <field name="state"/>
                             <field name="sequence"/>
                             <field name="fold"/>
                         </group>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 6c1f5443835..f3055727d5e 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -52,7 +52,7 @@ class report_project_task_user(osv.osv):
 ('0','Very urgent')], 'Priority', readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
         'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'Status', readonly=True),
-        'company_id': fields.many2one('res.company', 'Company', readonly=True, groups="base.group_multi_company"),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Contact', readonly=True),
     }
     _order = 'name desc, project_id'
diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index fcb3ecc9e21..6642dbf485d 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -27,38 +27,38 @@ class project_configuration(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'module_project_mrp': fields.boolean('generate tasks from sale orders',
+        'module_project_mrp': fields.boolean('Generate tasks from sale orders',
             help ="""This feature automatically creates project tasks from service products in sale orders.
                 More precisely, tasks are created for procurement lines with product of type 'Service',
                 procurement method 'Make to Order', and supply method 'Produce'.
                 This installs the module project_mrp."""),
-        'module_pad': fields.boolean("use integrated collaborative note pads on task",
+        'module_pad': fields.boolean("Use integrated collaborative note pads on task",
             help="""Lets the company customize which Pad installation should be used to link to new pads
                 (by default, http://ietherpad.com/).
                 This installs the module pad."""),
-        'module_project_timesheet': fields.boolean("record timesheet lines per tasks",
+        'module_project_timesheet': fields.boolean("Record timesheet lines per tasks",
             help="""This allows you to transfer the entries under tasks defined for Project Management to
                 the timesheet line entries for particular date and user, with the effect of creating,
                 editing and deleting either ways.
                 This installs the module project_timesheet."""),
-        'module_project_long_term': fields.boolean("manage resources planning on gantt view",
+        'module_project_long_term': fields.boolean("Manage resources planning on gantt view",
             help="""A long term project management module that tracks planning, scheduling, and resource allocation.
                 This installs the module project_long_term."""),
-        'module_project_issue': fields.boolean("track issues and bugs",
+        'module_project_issue': fields.boolean("Track issues and bugs",
             help="""Provides management of issues/bugs in projects.
                 This installs the module project_issue."""),
         'time_unit': fields.many2one('product.uom', 'Working time unit', required=True,
             help="""This will set the unit of measure used in projects and tasks."""),
-        'module_project_issue_sheet': fields.boolean("invoice working time on issues",
+        'module_project_issue_sheet': fields.boolean("Invoice working time on issues",
             help="""Provides timesheet support for the issues/bugs management in project.
                 This installs the module project_issue_sheet."""),
-        'group_tasks_work_on_tasks': fields.boolean("compute work activities on tasks",
+        'group_tasks_work_on_tasks': fields.boolean("Compute work activities on tasks",
             implied_group='project.group_tasks_work_on_tasks',
             help="Allows you to compute work on tasks."),
-        'group_time_work_estimation_tasks': fields.boolean("manage time estimation on tasks",
+        'group_time_work_estimation_tasks': fields.boolean("Manage time estimation on tasks",
             implied_group='project.group_time_work_estimation_tasks',
             help="Allows you to compute Time Estimation on tasks."),
-        'group_manage_delegation_task': fields.boolean("allow task delegation",
+        'group_manage_delegation_task': fields.boolean("Allow task delegation",
             implied_group='project.group_delegate_task',
             help="Allows you to delegate tasks to other users."),
     }
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index f90162fcc76..8381e6d68d3 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -3,7 +3,7 @@
 }
 
 .oe_kanban_project {
-    width: 250px;
+    width: 220px;
     min-height: 160px;
 }
 
diff --git a/addons/project_issue/res_config.py b/addons/project_issue/res_config.py
index 9fdbf502a62..f286f9cac25 100644
--- a/addons/project_issue/res_config.py
+++ b/addons/project_issue/res_config.py
@@ -26,7 +26,7 @@ class project_issue_settings(osv.osv_memory):
     _inherit = ['project.config.settings', 'fetchmail.config.settings']
 
     _columns = {
-        'fetchmail_issue': fields.boolean("create issues from an incoming email account ", 
+        'fetchmail_issue': fields.boolean("Create issues from an incoming email account ", 
             fetchmail_model='project.issue', fetchmail_name='Incoming Issues',
             help="""Allows you to configure your incoming mail server, and create issues from incoming emails."""),
     }
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 894271e46ce..d491985cf52 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -85,7 +85,8 @@
                   icon="terp-graph"
                   id="menu_board_purchase"
                   parent="base.menu_reporting_dashboard"
-                  sequence="20"/>
+                  sequence="20"
+                  groups="purchase.group_purchase_user"/>
 
     </data>
 </openerp>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 592bf783a64..1f6279af3ad 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -347,13 +347,18 @@ class purchase_order(osv.osv):
         template_id = template and template[1] or False
         res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
         res_id = res and res[1] or False
-        ctx = dict(context, active_model='purchase.order', active_id=ids[0])
-        ctx.update({'mail.compose.template_id': template_id})
+        ctx = dict(context)
+        ctx.update({
+            'default_model': 'purchase.order',
+            'default_res_id': ids[0],
+            'default_use_template': True,
+            'default_template_id': template_id,
+            })
         return {
             'view_type': 'form',
             'view_mode': 'form',
             'res_model': 'mail.compose.message',
-            'views': [(res_id,'form')],
+            'views': [(res_id, 'form')],
             'view_id': res_id,
             'type': 'ir.actions.act_window',
             'target': 'new',
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 3d9c858cec5..bf7512a8666 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -29,36 +29,36 @@ class purchase_config_settings(osv.osv_memory):
 
     _columns = {
         'default_invoice_method': fields.selection(
-            [('manual', 'Based on Purchase Order Lines'),
-             ('picking', 'Based on Receptions'),
-             ('order', 'Pre-Generate Draft Invoices based on Purchase Orders'),
-            ], 'default invoicing control method', required=True, default_model='purchase.order'),
-        'group_purchase_pricelist':fields.boolean("manage pricelist per supplier",
+            [('manual', 'Based on purchase order lines'),
+             ('picking', 'Based on receptions'),
+             ('order', 'Pre-generate draft invoices based on purchase orders'),
+            ], 'Default invoicing control method', required=True, default_model='purchase.order'),
+        'group_purchase_pricelist':fields.boolean("Manage pricelist per supplier",
             implied_group='product.group_purchase_pricelist',
             help="""Allows to manage different prices based on rules per category of Supplier.
                 Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
-        'group_uom':fields.boolean("manage different units of measure for products",
+        'group_uom':fields.boolean("Manage different units of measure for products",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
-        'group_costing_method':fields.boolean("compute product cost price based on average cost",
+        'group_costing_method':fields.boolean("Compute product cost price based on average cost",
             implied_group='product.group_costing_method',
             help="""Allows you to compute product cost price based on average cost."""),
-        'group_purchase_delivery_address': fields.boolean("allow a different address for incoming products and invoicings",
+        'group_purchase_delivery_address': fields.boolean("Allow a different address for incoming products and invoicings",
             implied_group='purchase.group_delivery_invoice_address',
             help="Allows you to specify different delivery and invoice addresses on a purchase order."),
-        'module_purchase_analytic_plans': fields.boolean('allow using multiple analytic accounts on the same order',
+        'module_purchase_analytic_plans': fields.boolean('Allow using multiple analytic accounts on the same order',
             help ="""Allows the user to maintain several analysis plans. These let you split
                 lines on a purchase order between several accounts and analytic plans.
                 This installs the module purchase_analytic_plans."""),
-        'module_warning': fields.boolean("alerts by products or supllier",
+        'module_warning': fields.boolean("Alerts by products or supplier",
             help="""Allow to configure warnings on products and trigger them when a user wants to purchase a given product or a given supplier.
             Example: Product: this product is deprecated, do not purchase more than 5.
                     Supplier: don't forget to ask for an express delivery."""),
 
-        'module_purchase_double_validation': fields.boolean("force two levels of approvals",
+        'module_purchase_double_validation': fields.boolean("Force two levels of approvals",
             help="""Provide a double validation mechanism for purchases exceeding minimum amount.
                 This installs the module purchase_double_validation."""),
-        'module_purchase_requisition': fields.boolean("manage purchase requisitions",
+        'module_purchase_requisition': fields.boolean("Manage purchase requisitions",
             help="""Purchase Requisitions are used when you want to request quotations from several suppliers for a given set of products.
             You can configure per product if you directly do a Request for Quotation
             to one supplier or if you want a purchase requisition to negotiate with several suppliers."""),
@@ -74,9 +74,9 @@ class purchase_config_settings(osv.osv_memory):
 class account_config_settings(osv.osv_memory):
     _inherit = 'account.config.settings'
     _columns = {
-        'module_purchase_analytic_plans': fields.boolean('use multiple analytic accounts on orders',
+        'module_purchase_analytic_plans': fields.boolean('Use multiple analytic accounts on orders',
             help="""This allows install module purchase_analytic_plans."""),
-        'group_analytic_account_for_purchases': fields.boolean('analytic accounting for purchases',
+        'group_analytic_account_for_purchases': fields.boolean('Analytic accounting for purchases',
             implied_group='purchase.group_analytic_accounting',
             help="Allows you to specify an analytic account on purchase orders."),
     }
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index 1e7b5b67c53..d84bc3595f5 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -27,70 +27,70 @@ class sale_configuration(osv.osv_memory):
     _inherit = 'sale.config.settings'
 
     _columns = {
-        'group_invoice_so_lines': fields.boolean('generate invoices based on the sale order',
+        'group_invoice_so_lines': fields.boolean('Generate invoices based on the sale order',
             implied_group='sale.group_invoice_so_lines',
             help="To allow your salesman to make invoices for sale order lines using the menu 'Lines to Invoice'."),
-        'group_invoice_deli_orders': fields.boolean('generate invoices after and based on delivery orders',
+        'group_invoice_deli_orders': fields.boolean('Generate invoices after and based on delivery orders',
             implied_group='sale.group_invoice_deli_orders',
             help="To allow your salesman to make invoices for Delivery Orders using the menu 'Deliveries to Invoice'."),
-        'task_work': fields.boolean("prepare invoices based on task's activities",
+        'task_work': fields.boolean("Prepare invoices based on task's activities",
             help="""Lets you transfer the entries under tasks defined for Project Management to
                 the Timesheet line entries for particular date and particular user  with the effect of creating, editing and deleting either ways
                 and to automatically creates project tasks from procurement lines.
                 This installs the modules project_timesheet and project_mrp."""),
-        'timesheet': fields.boolean('prepare invoices based on timesheets',
+        'timesheet': fields.boolean('Prepare invoices based on timesheets',
             help = """For modifying account analytic view to show important data to project manager of services companies.
                 You can also view the report of account analytic summary user-wise as well as month wise.
                 This installs the module account_analytic_analysis."""),
-        'module_account_analytic_analysis': fields.boolean('use contracts management',
+        'module_account_analytic_analysis': fields.boolean('Use contracts management',
             help = """Allows to define your customer contracts conditions: invoicing
             method (fixed price, on timesheet, advance invoice), the exact pricing
             (650€/day for a developer), the duration (one year support contract).
             You will be able to follow the progress of the contract and invoice automatically.
             It installs the account_analytic_analysis module."""),
         'default_order_policy': fields.selection(
-            [('manual', 'Invoice Based on Sales Orders'), ('picking', 'Invoice Based on Deliveries')],
+            [('manual', 'Invoice based on sales orders'), ('picking', 'Invoice based on deliveries')],
             'The default invoicing method is', default_model='sale.order',
             help="You can generate invoices based on sales orders or based on shippings."),
-        'module_delivery': fields.boolean('allow adding shipping costs',
+        'module_delivery': fields.boolean('Allow adding shipping costs',
             help ="""Allows you to add delivery methods in sale orders and delivery orders.
                 You can define your own carrier and delivery grids for prices.
                 This installs the module delivery."""),
-        'time_unit': fields.many2one('product.uom', 'the default working time unit for services is'),
-        'default_picking_policy' : fields.boolean("deliver all at once when all products are available.",
+        'time_unit': fields.many2one('product.uom', 'The default working time unit for services is'),
+        'default_picking_policy' : fields.boolean("Deliver all at once when all products are available.",
             help = "Sales order by default will be configured to deliver all products at once instead of delivering each product when it is available. This may have an impact on the shipping price."),
-        'group_sale_pricelist':fields.boolean("use pricelists to adapt your price per customers",
+        'group_sale_pricelist':fields.boolean("Use pricelists to adapt your price per customers",
             implied_group='product.group_sale_pricelist',
             help="""Allows to manage different prices based on rules per category of customers.
                 Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
-        'group_uom':fields.boolean("allow using different units of measures",
+        'group_uom':fields.boolean("Allow using different units of measures",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
-        'group_sale_delivery_address': fields.boolean("allow a different address for delivery and invoicing ",
+        'group_sale_delivery_address': fields.boolean("Allow a different address for delivery and invoicing ",
             implied_group='sale.group_delivery_invoice_address',
             help="Allows you to specify different delivery and invoice addresses on a sale order."),
-        'group_mrp_properties': fields.boolean('product properties on order lines',
+        'group_mrp_properties': fields.boolean('Product properties on order lines',
             implied_group='sale.group_mrp_properties',
             help="Allows you to tag sale order lines with properties."),
-        'group_discount_per_so_line': fields.boolean("allow setting a discount on the sale order lines",
+        'group_discount_per_so_line': fields.boolean("Allow setting a discount on the sale order lines",
             implied_group='sale.group_discount_per_so_line',
             help="Allows you to apply some discount per sale order line."),
-        'group_multiple_shops': fields.boolean("manage multiple shops",
+        'group_multiple_shops': fields.boolean("Manage multiple shops",
             implied_group='stock.group_locations',
             help="This allows to configure and use multiple shops."),
-        'module_warning': fields.boolean("allow configuring alerts by customer or products",
+        'module_warning': fields.boolean("Allow configuring alerts by customer or products",
             help="""Allow to configure warnings on products and trigger them when a user wants to sale a given product or a given customer.
             Example: Product: this product is deprecated, do not purchase more than 5.
             Supplier: don't forget to ask for an express delivery."""),
-        'module_sale_margin': fields.boolean("display margins on sales orders",
+        'module_sale_margin': fields.boolean("Display margins on sales orders",
             help="""This adds the 'Margin' on sales order.
                 This gives the profitability by calculating the difference between the Unit Price and Cost Price.
                 This installs the module sale_margin."""),
-        'module_sale_journal': fields.boolean("allow batch invoicing of delivery orders through journals",
+        'module_sale_journal': fields.boolean("Allow batch invoicing of delivery orders through journals",
             help="""Allows you to categorize your sales and deliveries (picking lists) between different journals,
                 and perform batch operations on journals.
                 This installs the module sale_journal."""),
-        'module_analytic_user_function': fields.boolean("one employee can have different roles per contract",
+        'module_analytic_user_function': fields.boolean("One employee can have different roles per contract",
             help="""Allows you to define what is the default function of a specific user on a given account.
                 This is mostly used when a user encodes his timesheet. The values are retrieved and the fields are auto-filled.
                 But the possibility to change these values is still available.
@@ -172,9 +172,9 @@ class sale_configuration(osv.osv_memory):
 class account_config_settings(osv.osv_memory):
     _inherit = 'account.config.settings'
     _columns = {
-        'module_sale_analytic_plans': fields.boolean('several analytic accounts on sales',
+        'module_sale_analytic_plans': fields.boolean('Several analytic accounts on sales',
             help="""This allows install module sale_analytic_plans."""),
-        'group_analytic_account_for_sales': fields.boolean('analytic accounting for sales',
+        'group_analytic_account_for_sales': fields.boolean('Analytic accounting for sales',
             implied_group='sale.group_analytic_accounting',
             help="Allows you to specify an analytic account on sale orders."),
     }
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 1f077f6601d..af86cf9b218 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -158,8 +158,8 @@
                             <button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
                             <button name="action_quotation_send" string="Send by Mail" type="object" states="draft" class="oe_highlight"/>
                             <button name="action_quotation_send" string="Send by Mail" type="object" states="sent"/>
-                            <button name="print_quotation" string="Send by Post" type="object" states="draft" class="oe_highlight"/>
-                            <button name="print_quotation" string="Send by Post" type="object" states="sent"/>
+                            <button name="print_quotation" string="Print" type="object" states="draft" class="oe_highlight"/>
+                            <button name="print_quotation" string="Print" type="object" states="sent"/>
                             <button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
                             <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
                             <button name="action_view_invoice" string="View Invoice" type="object" class="oe_highlight"
@@ -183,7 +183,7 @@
                     </h1>
                     <group>
                         <group>
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true, "highlight_first_line": true}'/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true}'/>
                             <field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address"/>
                             <field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address"/>
                             <field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index a672c6b680a..ee3aa942b7b 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -28,9 +28,9 @@ class sale_advance_payment_inv(osv.osv_memory):
 
     _columns = {
         'advance_payment_method':fields.selection(
-            [('all', 'Invoice all the Sale Order'), ('percentage','Percentage'), ('fixed','Fixed Price'),
-                ('lines', 'Some Order Lines')],
-            'Type', required=True,
+            [('all', 'Invoice the whole sale order'), ('percentage','Percentage'), ('fixed','Fixed price (deposit)'),
+                ('lines', 'Some order lines')],
+            'What do you want to invoice?', required=True,
             help="""Use All to create the final invoice.
                 Use Percentage to invoice a percentage of the total amount.
                 Use Fixed Price to invoice a specific amound in advance.
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index 97e9c843683..17821f519a6 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -2,12 +2,17 @@
 <openerp>
     <data>
         <record id="view_sale_advance_payment_inv" model="ir.ui.view">
-            <field name="name">Advance Invoice</field>
+            <field name="name">Invoice Order</field>
             <field name="model">sale.advance.payment.inv</field>
             <field name="arch" type="xml">
-                <form string="Advance Invoice" version="7.0">
+                <form string="Invoice Sale Order" version="7.0">
+                    <p class="oe_grey">
+                        Select how you want to invoice this order. This
+                        will create a draft invoice that can be modified
+                        before validation.
+                    </p>
                     <group>
-                        <field name="advance_payment_method"
+                        <field name="advance_payment_method" class="oe_inline"
                             on_change="onchange_method(advance_payment_method, product_id)"/>
                         <field name="qtty" invisible="1"/>
                         <field name="product_id"
@@ -23,15 +28,15 @@
                         </div>
                     </group>
                     <div>
-                        <b><label string="After clicking 'Show Lines to Invoice' button, select lines to invoice and make invoice from the 'More' button." attrs="{'invisible': [('advance_payment_method', '!=', 'lines')]}"/></b>
+                        <b><label string="After clicking 'Show Lines to Invoice', select lines to invoice and create the invoice from the 'More' dropdown menu." attrs="{'invisible': [('advance_payment_method', '!=', 'lines')]}"/></b>
                     </div>
                     <footer>
+                        <button name="create_invoices" string="Create and View Invoice" type="object"
+                            context="{'open_invoices': True}" class="oe_highlight"
+                            attrs="{'invisible': [('advance_payment_method', '=', 'lines')]}"/>
                         <button name="create_invoices" string="Create Invoice" type="object"
                             class="oe_highlight"
                             attrs="{'invisible': [('advance_payment_method', '=', 'lines')]}"/>
-                        <button name="create_invoices" string="Create and view Invoice" type="object"
-                            context="{'open_invoices': True}" class="oe_highlight"
-                            attrs="{'invisible': [('advance_payment_method', '=', 'lines')]}"/>
                         <button name="create_invoices" string="Show Lines to Invoice" type="object"
                             class="oe_highlight"
                             attrs="{'invisible': [('advance_payment_method', '!=', 'lines')]}"/>
@@ -43,7 +48,7 @@
         </record>
 
         <record id="action_view_sale_advance_payment_inv" model="ir.actions.act_window">
-            <field name="name">Advance Invoice</field>
+            <field name="name">Invoice Order</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.advance.payment.inv</field>
             <field name="view_type">form</field>
diff --git a/addons/sale_mrp/security/ir.model.access.csv b/addons/sale_mrp/security/ir.model.access.csv
index 4f0f0f8072c..a0f117b61e5 100644
--- a/addons/sale_mrp/security/ir.model.access.csv
+++ b/addons/sale_mrp/security/ir.model.access.csv
@@ -2,4 +2,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_mrp_bom_user,mrp.bom,mrp.model_mrp_bom,base.group_sale_salesman,1,0,0,0
 access_sale_order_manufacturing_user,sale.order manufacturing.user,sale.model_sale_order,mrp.group_mrp_user,1,1,0,0
 access_sale_order_line_manufacturing_user,sale.order.line manufacturing.user,sale.model_sale_order_line,mrp.group_mrp_user,1,1,0,0
-access_mrp_bom_revision_salesman,mrp.bom.revision,mrp.model_mrp_bom_revision,base.group_sale_salesman,1,0,0,0
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index 2e7018f4409..53cd657dbfa 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -26,14 +26,14 @@ class stock_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'module_claim_from_delivery': fields.boolean("allow claim on deliveries",
+        'module_claim_from_delivery': fields.boolean("Allow claim on deliveries",
             help="""Adds a Claim link to the delivery order.
                 This installs the module claim_from_delivery."""),
-        'module_stock_invoice_directly': fields.boolean("create and open the invoice when the user finish a delivery order",
+        'module_stock_invoice_directly': fields.boolean("Create and open the invoice when the user finish a delivery order",
             help="""This allows to automatically launch the invoicing wizard if the delivery is
                 to be invoiced when you send or deliver goods.
                 This installs the module stock_invoice_directly."""),
-        'module_product_expiry': fields.boolean("expiry date on lots",
+        'module_product_expiry': fields.boolean("Expiry date on lots",
             help="""Track different dates on products and serial numbers.
                 The following dates can be tracked:
                     - end of life
@@ -41,36 +41,36 @@ class stock_config_settings(osv.osv_memory):
                     - removal date
                     - alert date.
                 This installs the module product_expiry."""),
-        'module_stock_location': fields.boolean("create push/pull logistic rules",
+        'module_stock_location': fields.boolean("Create push/pull logistic rules",
             help="""Provide push and pull inventory flows.  Typical uses of this feature are:
                 manage product manufacturing chains, manage default locations per product,
                 define routes within your warehouse according to business needs, etc.
                 This installs the module stock_location."""),
-        'group_uom': fields.boolean("manage units of measure on products",
+        'group_uom': fields.boolean("Manage units of measure on products",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
-        'group_uos': fields.boolean("invoice products in a different unit of measure than the sale order",
+        'group_uos': fields.boolean("Invoice products in a different unit of measure than the sale order",
             implied_group='product.group_uos',
             help="""Allows you to sell units of a product, but invoice based on a different unit of measure.
                 For instance, you can sell pieces of meat that you invoice based on their weight."""),
-        'group_stock_packaging': fields.boolean("allow to define several packaging methods on products",
+        'group_stock_packaging': fields.boolean("Allow to define several packaging methods on products",
             implied_group='product.group_stock_packaging',
             help="""Allows you to create and manage your packaging dimensions and types you want to be maintained in your system."""),
-        'group_stock_production_lot': fields.boolean("track serial number on products",
+        'group_stock_production_lot': fields.boolean("Track serial number on products",
             implied_group='stock.group_production_lot',
             help="""This allows you to manage products by using serial numbers.
                 When you select a lot, you can get the upstream or downstream traceability of the products contained in lot."""),
-        'group_stock_tracking_lot': fields.boolean("track serial number on logistic units (pallets)",
+        'group_stock_tracking_lot': fields.boolean("Track serial number on logistic units (pallets)",
             implied_group='stock.group_tracking_lot',
             help="""Allows you to get the upstream or downstream traceability of the products contained in lot."""),
-        'group_stock_inventory_valuation': fields.boolean("generate accounting entries per stock movement",
+        'group_stock_inventory_valuation': fields.boolean("Generate accounting entries per stock movement",
             implied_group='stock.group_inventory_valuation',
             help="""Allows to configure inventory valuations on products and product categories."""),
-        'group_stock_multiple_locations': fields.boolean("manage multiple locations and warehouses",
+        'group_stock_multiple_locations': fields.boolean("Manage multiple locations and warehouses",
             implied_group='stock.group_locations',
             help="""This allows to configure and use multiple stock locations and warehouses,
                 instead of having a single default one."""),
-        'group_product_variant': fields.boolean("support multiple variants per products  ",
+        'group_product_variant': fields.boolean("Support multiple variants per products  ",
             implied_group='product.group_product_variant',
             help="""Allow to manage several variants per product. As an example, if you  sell T-Shirts, for the same "Linux T-Shirt", you may have variants on  sizes or colors; S, M, L, XL, XXL."""),
         'decimal_precision': fields.integer('Decimal precision on weight', help="As an example, a decimal precision of 2 will allow weights like: 9.99 kg, whereas a decimal precision of 4 will allow weights like:  0.0231 kg."),
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index e93f9bb34ea..31d5a68c9fe 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2545,11 +2545,6 @@ class stock_move(osv.osv):
                 }
                 self.write(cr, uid, [move.id], update_val)
 
-        product_obj = self.pool.get('product.product')
-        for new_move in self.browse(cr, uid, res, context=context):
-            message = _("Product has been consumed with '%s' quantity.") % (new_move.product_qty)
-            product_obj.message_post(cr, uid, [new_move.product_id.id], body=message, context=context)
-
         self.action_done(cr, uid, res, context=context)
 
         return res
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3560b255ab5..154927a2f19 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -164,14 +164,14 @@
                                 <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                 <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
                                 <field name="prodlot_id" groups="stock.group_production_lot"/>
-                                 <button name="%(track_line)d" string="Split in serial numbers" type="action"
+                                <button name="%(track_line)d" string="Split in serial numbers" type="action"
                                     icon="terp-stock_effects-object-colorize"
                                     attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
                                     states="draft,done,cancel"
                                     context="{'inventory_id':parent.id}"
                                     groups="stock.group_production_lot"/>
-                                 <field groups="stock.group_tracking_lot" name="tracking_id"/>
-                                 <button name="%(split_into)d" string="Put in a new pack" type="action"
+                                <field groups="stock.group_tracking_lot" name="tracking_id"/>
+                                <button name="%(split_into)d" string="Put in a new pack" type="action"
                                     groups="stock.group_tracking_lot"
                                     icon="terp-stock_effects-object-colorize"
                                     context="{'inventory_id':parent.id}"
diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py
index 5aa4649af02..3c1ba2c17a0 100644
--- a/addons/stock/wizard/stock_change_product_qty.py
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@ -30,7 +30,7 @@ class stock_change_product_qty(osv.osv_memory):
     _description = "Change Product Quantity"
     _columns = {
         'product_id' : fields.many2one('product.product', 'Product'),
-        'new_quantity': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, help='This quantity is expressed in the Default Unit of Measure of the product.'),
+        'new_quantity': fields.float('New Quantity on Hand', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, help='This quantity is expressed in the Default Unit of Measure of the product.'),
         'prodlot_id': fields.many2one('stock.production.lot', 'Serial Number', domain="[('product_id','=',product_id)]"),
         'location_id': fields.many2one('stock.location', 'Location', required=True, domain="[('usage', '=', 'internal')]"),
     }
diff --git a/addons/stock/wizard/stock_change_product_qty_view.xml b/addons/stock/wizard/stock_change_product_qty_view.xml
index a533d9f837b..b6304426b0e 100644
--- a/addons/stock/wizard/stock_change_product_qty_view.xml
+++ b/addons/stock/wizard/stock_change_product_qty_view.xml
@@ -6,7 +6,7 @@
             <field name="model">stock.change.product.qty</field>
             <field name="arch" type="xml">
                 <form string="Change Product Quantity" version="7.0">
-                    <group string="Select Quantity">
+                    <group>
                         <field name="new_quantity" />
                         <field name="product_id" invisible="1"/>
                         <field name="location_id" groups="stock.group_locations"/>
diff --git a/addons/stock/wizard/stock_inventory_line_split_view.xml b/addons/stock/wizard/stock_inventory_line_split_view.xml
index fdc3aa03a60..92c91317e35 100644
--- a/addons/stock/wizard/stock_inventory_line_split_view.xml
+++ b/addons/stock/wizard/stock_inventory_line_split_view.xml
@@ -5,7 +5,7 @@
             <field name="name">Split Inventory Line</field>
             <field name="model">stock.inventory.line.split</field>
             <field name="arch" type="xml">
-                <form string="Split in Lots" version="7.0">
+                <form string="Split in Serial Numbers" version="7.0">
                     <group>
                         <field name="product_id" colspan="4" readonly="1"/>
                         <label for="qty"/>
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 1f3dcc3372d..538fa1c9441 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -170,7 +170,8 @@ class split_in_production_lot(osv.osv_memory):
         'product_uom': fields.many2one('product.uom', 'Unit of Measure'),
         'line_ids': fields.one2many('stock.move.split.lines', 'wizard_id', 'Serial Numbers'),
         'line_exist_ids': fields.one2many('stock.move.split.lines', 'wizard_exist_id', 'Serial Numbers'),
-        'use_exist' : fields.boolean('Existing Lots', help="Check this option to select existing lots in the list below, otherwise you should enter new ones line by line."),
+        'use_exist' : fields.boolean('Existing Serial Numbers',
+            help="Check this option to select existing serial numbers in the list below, otherwise you should enter new ones line by line."),
         'location_id': fields.many2one('stock.location', 'Source Location')
      }
 
@@ -271,8 +272,8 @@ class stock_move_split_lines_exist(osv.osv_memory):
     }
 
     def onchange_lot_id(self, cr, uid, ids, prodlot_id=False, product_qty=False,
-                        loc_id=False, product_id=False, uom_id=False):
+                        loc_id=False, product_id=False, uom_id=False,context=None):
         return self.pool.get('stock.move').onchange_lot_id(cr, uid, [], prodlot_id, product_qty,
-                        loc_id, product_id, uom_id)
+                        loc_id, product_id, uom_id, context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index b3a7fbee885..3df336b5e30 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -12,10 +12,10 @@
                         <field name="product_id" readonly="1"/>
                         <label for="product_qty"/>
                         <div>
-                            <field name="product_qty"/>
-                            <field name="product_uom" nolabel="1" readonly="1"/>
+                            <field name="product_qty" class="oe_inline"/>
+                            <field name="product_uom" class="oe_inline" readonly="1" groups="product.group_uom"/>
                         </div>
-                        <field name="location_id"/>
+                        <field name="location_id" groups="stock.group_locations"/>
                     </group>
                     <footer>
                         <button name="do_move_consume" string="Ok" type="object" class="oe_highlight"/>
@@ -46,9 +46,10 @@
                         <label for="product_qty"/>
                         <div>
                             <field name="product_qty" class="oe_inline"/>
-                            <field name="product_uom" class="oe_inline" readonly="1"/>
+                            <field name="product_uom" class="oe_inline" readonly="1" groups="product.group_uom"/>
                         </div>
-                        <field name="location_id" string="Scrap Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]" widget="selection"/>
+                        <field name="location_id" string="Scrap Location" widget="selection"
+                            domain="[('usage','!=','view'),('scrap_location','=',True)]" groups="stock.group_locations"/>
                     </group>
                     <footer>
                         <button name="move_scrap" string="Ok" type="object" class="oe_highlight"  />
@@ -69,10 +70,10 @@
         </record>
 
         <record id="view_split_in_lots" model="ir.ui.view">
-                <field name="name">Split in lots</field>
+                <field name="name">Split in Serial Numbers</field>
                 <field name="model">stock.move.split</field>
                 <field name="arch" type="xml">
-                <form string="Split in Lots" version="7.0">
+                <form string="Split in Serial Numbers" version="7.0">
                     <group>
                         <field name="product_id" readonly="1"/>
                         <label for="qty"/>
@@ -85,25 +86,25 @@
                     </group>
                     <field name="line_ids" attrs="{'invisible':[('use_exist','=',True)]}">
                         <tree string="Serial Numbers" editable="bottom">
-                            <field name="name" string="Lots"/>
+                            <field name="name"/>
                             <field name="quantity" />
                         </tree>
                         <form string="Serial Number" version="7.0">
                             <group>
-                                <field name="name" string="Lot number"/>
+                                <field name="name"/>
                                 <field name="quantity" />
                             </group>
                         </form>
                     </field>
                     <field name="line_exist_ids" attrs="{'invisible':[('use_exist','!=',True)]}">
                         <tree string="Serial Numbers" editable="bottom">
-                            <field name="prodlot_id" string="Lot number" domain="[('product_id','=',parent.product_id)]" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)"/>
-                            <field name="quantity" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)" />
+                            <field name="prodlot_id" string="Serial Number" quick_create="false" domain="[('product_id','=',parent.product_id)]" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom, context)" context="{'product_id': parent.product_id}"/>
+                            <field name="quantity" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom,context)" />
                         </tree>
                         <form string="Serial Number" version="7.0">
                             <group>
-                                <field name="prodlot_id" string="Lot number" domain="[('product_id','=',parent.product_id)]" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)"/>
-                                <field name="quantity" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)" />
+                                <field name="prodlot_id" domain="[('product_id','=',parent.product_id)]" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom, context)"/>
+                                <field name="quantity" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom, context)" />
                             </group>
                         </form>
                     </field>
@@ -115,7 +116,7 @@
             </record>
 
             <record id="track_line" model="ir.actions.act_window">
-                <field name="name">Split in lots</field>
+                <field name="name">Split in Serial Numbers</field>
                 <field name="type">ir.actions.act_window</field>
                 <field name="res_model">stock.move.split</field>
                 <field name="view_type">form</field>
diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index 8f6a2b096a5..3cdfbfff410 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -117,6 +117,8 @@ openerp.web_linkedin = function(instance) {
                         "count": 25,
                     }).result(function(result) {
                         children_def.resolve(result);
+                    }).error(function() {
+                        children_def.reject();
                     });
                 defs.push(children_def.pipe(function(result) {
                     result = _.reject(result.people.values || [], function(el) {
@@ -130,6 +132,8 @@ openerp.web_linkedin = function(instance) {
                         var p_to_change = _.toArray(arguments);
                         to_change.child_ids = p_to_change;
                     });
+                }, function() {
+                    return $.when();
                 }));
                 /* TODO
                 to_change.linkedinUrl = _.str.sprintf("http://www.linkedin.com/company/%d", entity.id);