[MERGE]:trunk

bzr revid: apa@tinyerp.com-20120912124210-cn5y3gcbxhew53h1
bzr revid: apa@tinyerp.com-20120913052046-r2lxb209eau3xnvo

100 files changed, 1582 insertions, 3303 deletions

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/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_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/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_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/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/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..08a98cb0a02 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
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index e4862ca9fb9..18a88bb0b61 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -147,7 +147,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 +306,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.
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 815f0ec92c4..92ead6f2432 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -230,6 +230,10 @@
     clear: both; 
 }
 
+.openerp .oe_mail_msg_content a {
+    cursor: pointer;
+}
+
 .openerp img.oe_mail_icon {
     width: 50px;
     height: 50px;
@@ -307,6 +311,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 +349,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 +380,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 +404,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 || '');
+        },
+
+        /** 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 */
+        /** 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;
-            // datasets and internal vars
-            this.ds_thread = new session.web.DataSetSearch(this, this.options.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,
+                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_delete: options.show_delete || false,
-                show_hide: options.show_hide || 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.context.default_model);
+            this.ds_notification = new session.web.DataSetSearch(this, 'mail.notification');
+            this.ds_message = new session.web.DataSetSearch(this, 'mail.message');
         },
         
         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..34976269285 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -79,7 +79,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) {
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 66b82d5a36c..4d3b56cf62f 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
@@ -74,6 +74,20 @@
     </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
         container, holding the composition form. Then come the various
@@ -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 &amp; 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 &amp; (!record.subject) &amp; (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 &amp; record.subject &amp; 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/tests/test_mail.py b/addons/mail/tests/test_mail.py
index f45745f31dc..069e1b0d35a 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -29,7 +29,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 +52,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>
@@ -153,7 +153,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')
 
@@ -409,12 +409,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 +460,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/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 3153ccc2069..03c5a7cfe8b 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,11 +187,10 @@ 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):
@@ -211,9 +212,9 @@ class mail_compose_message(osv.TransientModel):
                 }
 
     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:
@@ -221,12 +222,6 @@ class mail_compose_message(osv.TransientModel):
         res.update(self._verify_partner_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 +250,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 +264,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 +294,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/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
@@ -219,16 +219,13 @@ 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
@@ -486,11 +488,6 @@ 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
 msgid ""
@@ -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,7 +538,7 @@ 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
@@ -549,11 +546,6 @@ 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"
 msgstr "قيمة المخزون"
@@ -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
@@ -840,11 +832,6 @@ 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
 msgid "Date"
@@ -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
@@ -1424,11 +1411,6 @@ 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."
@@ -1959,12 +1941,6 @@ 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
 msgid "Stock value variation"
@@ -1982,17 +1958,6 @@ 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
 msgid "Week"
@@ -2180,19 +2145,6 @@ 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"
 msgstr "التصنيع"
@@ -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
@@ -224,11 +224,6 @@ 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 "
@@ -495,11 +490,6 @@ 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
 msgid ""
@@ -561,11 +551,6 @@ 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"
 msgstr "Складова наличност"
@@ -846,11 +831,6 @@ 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
 msgid "Date"
@@ -1411,11 +1391,6 @@ 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."
@@ -1919,12 +1894,6 @@ 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
 msgid "Stock value variation"
@@ -1942,17 +1911,6 @@ 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
 msgid "Week"
@@ -2138,19 +2096,6 @@ 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"
 msgstr ""
@@ -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
@@ -211,11 +211,6 @@ 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 "
@@ -470,11 +465,6 @@ 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
 msgid ""
@@ -532,11 +522,6 @@ 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"
 msgstr ""
@@ -817,11 +802,6 @@ 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
 msgid "Date"
@@ -1382,11 +1362,6 @@ 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."
@@ -1890,12 +1865,6 @@ 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
 msgid "Stock value variation"
@@ -1913,17 +1882,6 @@ 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
 msgid "Week"
@@ -2109,19 +2067,6 @@ 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"
 msgstr ""
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
@@ -226,11 +226,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -500,11 +495,6 @@ 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
 msgid ""
@@ -566,11 +556,6 @@ 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"
 msgstr "Valor de l'estoc"
@@ -863,11 +848,6 @@ 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
 msgid "Date"
@@ -1461,11 +1441,6 @@ 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 ""
 "Reference of the document that generated this production order request."
@@ -2008,12 +1983,6 @@ 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
 msgid "Stock value variation"
@@ -2031,17 +2000,6 @@ 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
 msgid "Week"
@@ -2230,19 +2188,6 @@ 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"
 msgstr "Taulell de fabricació"
@@ -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
@@ -212,11 +212,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -478,11 +473,6 @@ 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
 msgid ""
@@ -540,11 +530,6 @@ 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"
 msgstr "Hodnota zásob"
@@ -829,11 +814,6 @@ 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
 msgid "Date"
@@ -1397,11 +1377,6 @@ 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 ""
 "Reference of the document that generated this production order request."
@@ -1913,12 +1888,6 @@ 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
 msgid "Stock value variation"
@@ -1936,17 +1905,6 @@ 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
 msgid "Week"
@@ -2132,19 +2090,6 @@ 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"
 msgstr "Výrobní tabule"
@@ -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
@@ -212,11 +212,6 @@ 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 "
@@ -471,11 +466,6 @@ 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
 msgid ""
@@ -533,11 +523,6 @@ 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"
 msgstr "Lager værdi"
@@ -818,11 +803,6 @@ 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
 msgid "Date"
@@ -1383,11 +1363,6 @@ 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."
@@ -1891,12 +1866,6 @@ 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
 msgid "Stock value variation"
@@ -1914,17 +1883,6 @@ 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
 msgid "Week"
@@ -2110,19 +2068,6 @@ 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"
 msgstr ""
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
@@ -226,11 +226,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -510,11 +505,6 @@ 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
 msgid ""
@@ -576,11 +566,6 @@ 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"
 msgstr "Bestandswert"
@@ -881,11 +866,6 @@ 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
 msgid "Date"
@@ -1484,11 +1464,6 @@ 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 ""
 "Reference of the document that generated this production order request."
@@ -2033,12 +2008,6 @@ 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
 msgid "Stock value variation"
@@ -2056,17 +2025,6 @@ 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
 msgid "Week"
@@ -2258,19 +2216,6 @@ 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"
 msgstr "Pinnwand Fertigung"
@@ -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"
@@ -214,11 +214,6 @@ 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 "
@@ -477,11 +472,6 @@ 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
 msgid ""
@@ -541,11 +531,6 @@ 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"
 msgstr "Αξία αποθέματος"
@@ -826,11 +811,6 @@ 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
 msgid "Date"
@@ -1391,11 +1371,6 @@ 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."
@@ -1900,12 +1875,6 @@ 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
 msgid "Stock value variation"
@@ -1923,17 +1892,6 @@ 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
 msgid "Week"
@@ -2119,19 +2077,6 @@ 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"
 msgstr ""
@@ -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
@@ -226,11 +226,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -508,11 +503,6 @@ 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
 msgid ""
@@ -574,11 +564,6 @@ 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"
 msgstr "Valor del stock"
@@ -881,11 +866,6 @@ 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
 msgid "Date"
@@ -1482,11 +1462,6 @@ 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 ""
 "Reference of the document that generated this production order request."
@@ -2033,12 +2008,6 @@ 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
 msgid "Stock value variation"
@@ -2056,17 +2025,6 @@ 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
 msgid "Week"
@@ -2257,19 +2215,6 @@ 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"
 msgstr "Tablero fabricación"
@@ -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
@@ -226,11 +226,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -498,11 +493,6 @@ 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
 msgid ""
@@ -562,11 +552,6 @@ 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"
 msgstr "Valor del stock"
@@ -852,11 +837,6 @@ 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
 msgid "Date"
@@ -1432,11 +1412,6 @@ 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 ""
 "Reference of the document that generated this production order request."
@@ -1956,12 +1931,6 @@ 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
 msgid "Stock value variation"
@@ -1979,17 +1948,6 @@ 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
 msgid "Week"
@@ -2178,19 +2136,6 @@ 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"
 msgstr ""
@@ -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
@@ -226,11 +226,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -509,11 +504,6 @@ 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
 msgid ""
@@ -575,11 +565,6 @@ 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"
 msgstr "Valor del stock"
@@ -882,11 +867,6 @@ 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
 msgid "Date"
@@ -1484,11 +1464,6 @@ 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 ""
 "Reference of the document that generated this production order request."
@@ -2035,12 +2010,6 @@ 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
 msgid "Stock value variation"
@@ -2058,17 +2027,6 @@ 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
 msgid "Week"
@@ -2259,19 +2217,6 @@ 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"
 msgstr "Tablero fabricación"
@@ -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
@@ -227,11 +227,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -509,11 +504,6 @@ 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
 msgid ""
@@ -575,11 +565,6 @@ 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"
 msgstr "Valor del stock"
@@ -881,11 +866,6 @@ 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
 msgid "Date"
@@ -1482,11 +1462,6 @@ 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 ""
 "Reference of the document that generated this production order request."
@@ -2033,12 +2008,6 @@ 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
 msgid "Stock value variation"
@@ -2056,17 +2025,6 @@ 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
 msgid "Week"
@@ -2257,19 +2215,6 @@ 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"
 msgstr "Tablero fabricación"
@@ -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
@@ -226,11 +226,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -498,11 +493,6 @@ 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
 msgid ""
@@ -564,11 +554,6 @@ 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"
 msgstr "Valor del stock"
@@ -862,11 +847,6 @@ 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
 msgid "Date"
@@ -1454,11 +1434,6 @@ 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 ""
 "Reference of the document that generated this production order request."
@@ -2001,12 +1976,6 @@ 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
 msgid "Stock value variation"
@@ -2024,17 +1993,6 @@ 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
 msgid "Week"
@@ -2223,19 +2181,6 @@ 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"
 msgstr "Tablero fabricación"
@@ -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
@@ -211,11 +211,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -470,11 +465,6 @@ 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
 msgid ""
@@ -532,11 +522,6 @@ 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"
 msgstr "Lao suurus"
@@ -817,11 +802,6 @@ 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
 msgid "Date"
@@ -1382,11 +1362,6 @@ 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."
@@ -1890,12 +1865,6 @@ 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
 msgid "Stock value variation"
@@ -1913,17 +1882,6 @@ 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
 msgid "Week"
@@ -2109,19 +2067,6 @@ 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"
 msgstr ""
@@ -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
@@ -225,11 +225,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -497,11 +492,6 @@ 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
 msgid ""
@@ -561,11 +551,6 @@ 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"
 msgstr "Varastoarvo"
@@ -850,11 +835,6 @@ 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
 msgid "Date"
@@ -1429,11 +1409,6 @@ 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 ""
 "Reference of the document that generated this production order request."
@@ -1948,12 +1923,6 @@ 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
 msgid "Stock value variation"
@@ -1971,17 +1940,6 @@ 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
 msgid "Week"
@@ -2172,19 +2130,6 @@ 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"
 msgstr "Valmistuksen työpöytä"
@@ -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
@@ -243,11 +243,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -524,11 +519,6 @@ 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
 msgid ""
@@ -590,11 +580,6 @@ 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"
 msgstr "Valeur du stock"
@@ -887,11 +872,6 @@ 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
 msgid "Date"
@@ -1487,11 +1467,6 @@ 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 ""
 "Reference of the document that generated this production order request."
@@ -2029,12 +2004,6 @@ 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
 msgid "Stock value variation"
@@ -2052,17 +2021,6 @@ 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
 msgid "Week"
@@ -2251,19 +2209,6 @@ 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"
 msgstr "Tableau de bord de production"
@@ -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
@@ -227,11 +227,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -499,11 +494,6 @@ 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
 msgid ""
@@ -565,11 +555,6 @@ 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"
 msgstr "Valor do stock"
@@ -860,11 +845,6 @@ 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
 msgid "Date"
@@ -1451,11 +1431,6 @@ 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 ""
 "Reference of the document that generated this production order request."
@@ -1991,12 +1966,6 @@ 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
 msgid "Stock value variation"
@@ -2014,17 +1983,6 @@ 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
 msgid "Week"
@@ -2213,19 +2171,6 @@ 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"
 msgstr "Taboleiro de fabricación"
@@ -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
@@ -212,11 +212,6 @@ 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 "
@@ -471,11 +466,6 @@ 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
 msgid ""
@@ -533,11 +523,6 @@ 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"
 msgstr ""
@@ -818,11 +803,6 @@ 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
 msgid "Date"
@@ -1383,11 +1363,6 @@ 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."
@@ -1891,12 +1866,6 @@ 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
 msgid "Stock value variation"
@@ -1914,17 +1883,6 @@ 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
 msgid "Week"
@@ -2110,19 +2068,6 @@ 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"
 msgstr ""
@@ -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
@@ -224,11 +224,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -496,11 +491,6 @@ 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
 msgid ""
@@ -562,11 +552,6 @@ 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"
 msgstr "Vrijednost Zalihe"
@@ -857,11 +842,6 @@ 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
 msgid "Date"
@@ -1447,11 +1427,6 @@ 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 ""
 "Reference of the document that generated this production order request."
@@ -1989,12 +1964,6 @@ 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
 msgid "Stock value variation"
@@ -2012,17 +1981,6 @@ 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
 msgid "Week"
@@ -2211,19 +2169,6 @@ 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"
 msgstr "Kokpit proizvodnje"
@@ -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
@@ -227,11 +227,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -500,11 +495,6 @@ 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
 msgid ""
@@ -566,11 +556,6 @@ 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"
 msgstr "Készletérték"
@@ -863,11 +848,6 @@ 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
 msgid "Date"
@@ -1454,11 +1434,6 @@ 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 ""
 "Reference of the document that generated this production order request."
@@ -1999,12 +1974,6 @@ 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
 msgid "Stock value variation"
@@ -2022,17 +1991,6 @@ 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
 msgid "Week"
@@ -2221,19 +2179,6 @@ 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"
 msgstr "Gyártás áttekintő"
@@ -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
@@ -211,11 +211,6 @@ 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 "
@@ -470,11 +465,6 @@ 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
 msgid ""
@@ -532,11 +522,6 @@ 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"
 msgstr ""
@@ -817,11 +802,6 @@ 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
 msgid "Date"
@@ -1382,11 +1362,6 @@ 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."
@@ -1890,12 +1865,6 @@ 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
 msgid "Stock value variation"
@@ -1913,17 +1882,6 @@ 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
 msgid "Week"
@@ -2109,19 +2067,6 @@ 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"
 msgstr ""
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
@@ -227,11 +227,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -502,11 +497,6 @@ 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
 msgid ""
@@ -568,11 +558,6 @@ 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"
 msgstr "Valore Stock"
@@ -867,11 +852,6 @@ 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
 msgid "Date"
@@ -1455,11 +1435,6 @@ 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 ""
 "Reference of the document that generated this production order request."
@@ -2003,12 +1978,6 @@ 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
 msgid "Stock value variation"
@@ -2026,17 +1995,6 @@ 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
 msgid "Week"
@@ -2225,19 +2183,6 @@ 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"
 msgstr "Dashboard Produzione"
@@ -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
@@ -214,11 +214,6 @@ 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 "
@@ -478,11 +473,6 @@ 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
 msgid ""
@@ -540,11 +530,6 @@ 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"
 msgstr "在庫価値"
@@ -831,11 +816,6 @@ 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
 msgid "Date"
@@ -1403,11 +1383,6 @@ 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."
@@ -1927,12 +1902,6 @@ 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
 msgid "Stock value variation"
@@ -1950,17 +1919,6 @@ 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
 msgid "Week"
@@ -2149,19 +2107,6 @@ 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"
 msgstr "製造ボード"
@@ -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
@@ -212,11 +212,6 @@ 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 "
@@ -473,11 +468,6 @@ 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
 msgid ""
@@ -535,11 +525,6 @@ 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"
 msgstr ""
@@ -820,11 +805,6 @@ 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
 msgid "Date"
@@ -1385,11 +1365,6 @@ 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."
@@ -1893,12 +1868,6 @@ 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
 msgid "Stock value variation"
@@ -1916,17 +1885,6 @@ 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
 msgid "Week"
@@ -2112,19 +2070,6 @@ 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"
 msgstr ""
@@ -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
@@ -213,11 +213,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -475,11 +470,6 @@ 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
 msgid ""
@@ -539,11 +529,6 @@ 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"
 msgstr ""
@@ -824,11 +809,6 @@ 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
 msgid "Date"
@@ -1389,11 +1369,6 @@ 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."
@@ -1898,12 +1873,6 @@ 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
 msgid "Stock value variation"
@@ -1921,17 +1890,6 @@ 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
 msgid "Week"
@@ -2117,19 +2075,6 @@ 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"
 msgstr ""
@@ -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
@@ -212,11 +212,6 @@ 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 "
@@ -471,11 +466,6 @@ 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
 msgid ""
@@ -533,11 +523,6 @@ 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"
 msgstr ""
@@ -818,11 +803,6 @@ 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
 msgid "Date"
@@ -1383,11 +1363,6 @@ 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."
@@ -1891,12 +1866,6 @@ 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
 msgid "Stock value variation"
@@ -1914,17 +1883,6 @@ 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
 msgid "Week"
@@ -2110,19 +2068,6 @@ 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"
 msgstr ""
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
@@ -228,11 +228,6 @@ 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 "
@@ -507,11 +502,6 @@ 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
 msgid ""
@@ -571,11 +561,6 @@ 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"
 msgstr "Нөөцийн үнэ"
@@ -871,11 +856,6 @@ 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
 msgid "Date"
@@ -1464,11 +1444,6 @@ 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."
@@ -2002,12 +1977,6 @@ 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
 msgid "Stock value variation"
@@ -2025,17 +1994,6 @@ 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
 msgid "Week"
@@ -2226,19 +2184,6 @@ 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"
 msgstr "Үйлдвэрлэлийн самбар"
@@ -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
@@ -197,11 +197,6 @@ 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 ""
@@ -436,11 +431,6 @@ 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
 msgid "Complete this only if you want automatic analytic accounting entries on production orders."
@@ -494,11 +484,6 @@ 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"
 msgstr ""
@@ -762,11 +747,6 @@ 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
 msgid "Date"
@@ -1295,11 +1275,6 @@ 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."
 msgstr ""
@@ -1773,12 +1748,6 @@ 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
 msgid "Stock value variation"
@@ -1796,17 +1765,6 @@ 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
 msgid "Week"
@@ -1988,19 +1946,6 @@ 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"
 msgstr ""
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
@@ -227,16 +227,13 @@ 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
@@ -505,11 +502,6 @@ 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
 msgid ""
@@ -570,11 +562,6 @@ 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"
 msgstr "Lagerverdi"
@@ -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
@@ -865,11 +857,6 @@ 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
 msgid "Date"
@@ -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
@@ -1453,11 +1442,6 @@ 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 ""
 "Reference of the document that generated this production order request."
@@ -1977,12 +1961,6 @@ 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
 msgid "Stock value variation"
@@ -2000,17 +1978,6 @@ 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
 msgid "Week"
@@ -2196,19 +2163,6 @@ 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"
 msgstr ""
@@ -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
@@ -226,11 +226,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -508,11 +503,6 @@ 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
 msgid ""
@@ -574,11 +564,6 @@ 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"
 msgstr "Voorraadwaarde"
@@ -883,11 +868,6 @@ 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
 msgid "Date"
@@ -1484,11 +1464,6 @@ 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 ""
 "Reference of the document that generated this production order request."
@@ -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
@@ -2036,12 +2011,6 @@ 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
 msgid "Stock value variation"
@@ -2059,17 +2028,6 @@ 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
 msgid "Week"
@@ -2260,19 +2218,6 @@ 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"
 msgstr "Productie dashboard"
@@ -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
@@ -211,11 +211,6 @@ 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 "
@@ -470,11 +465,6 @@ 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
 msgid ""
@@ -532,11 +522,6 @@ 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"
 msgstr ""
@@ -817,11 +802,6 @@ 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
 msgid "Date"
@@ -1382,11 +1362,6 @@ 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."
@@ -1890,12 +1865,6 @@ 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
 msgid "Stock value variation"
@@ -1913,17 +1882,6 @@ 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
 msgid "Week"
@@ -2109,19 +2067,6 @@ 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"
 msgstr ""
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
@@ -223,11 +223,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -495,11 +490,6 @@ 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
 msgid ""
@@ -561,11 +551,6 @@ 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"
 msgstr "Wycena zapasów"
@@ -850,11 +835,6 @@ 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
 msgid "Date"
@@ -1424,11 +1404,6 @@ 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 ""
 "Reference of the document that generated this production order request."
@@ -1934,12 +1909,6 @@ 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
 msgid "Stock value variation"
@@ -1957,17 +1926,6 @@ 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
 msgid "Week"
@@ -2153,19 +2111,6 @@ 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"
 msgstr "Konsola produkcji"
@@ -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
@@ -226,11 +226,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -507,11 +502,6 @@ 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
 msgid ""
@@ -573,11 +563,6 @@ 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"
 msgstr "Valor do stock"
@@ -877,11 +862,6 @@ 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
 msgid "Date"
@@ -1478,11 +1458,6 @@ 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 ""
 "Reference of the document that generated this production order request."
@@ -2025,12 +2000,6 @@ 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
 msgid "Stock value variation"
@@ -2048,17 +2017,6 @@ 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
 msgid "Week"
@@ -2249,19 +2207,6 @@ 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"
 msgstr "Painel de fabrico"
@@ -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
@@ -227,11 +227,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -509,11 +504,6 @@ 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
 msgid ""
@@ -575,11 +565,6 @@ 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"
 msgstr "Valor do Estoque"
@@ -879,11 +864,6 @@ 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
 msgid "Date"
@@ -1479,11 +1459,6 @@ 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 ""
 "Reference of the document that generated this production order request."
@@ -2027,12 +2002,6 @@ 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
 msgid "Stock value variation"
@@ -2050,17 +2019,6 @@ 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
 msgid "Week"
@@ -2251,19 +2209,6 @@ 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"
 msgstr "Quadro de produção"
@@ -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
@@ -224,11 +224,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -505,11 +500,6 @@ 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
 msgid ""
@@ -571,11 +561,6 @@ 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"
 msgstr "Valoare stoc"
@@ -879,11 +864,6 @@ 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
 msgid "Date"
@@ -1480,11 +1460,6 @@ 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 ""
 "Reference of the document that generated this production order request."
@@ -2033,12 +2008,6 @@ 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
 msgid "Stock value variation"
@@ -2056,17 +2025,6 @@ 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
 msgid "Week"
@@ -2257,19 +2215,6 @@ 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"
 msgstr "Panou fabricatie"
@@ -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
@@ -218,11 +218,6 @@ 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 "
@@ -490,11 +485,6 @@ 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
 msgid ""
@@ -554,11 +544,6 @@ 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"
 msgstr "Оценка запасов"
@@ -847,11 +832,6 @@ 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
 msgid "Date"
@@ -1426,11 +1406,6 @@ 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."
@@ -1937,12 +1912,6 @@ 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
 msgid "Stock value variation"
@@ -1960,17 +1929,6 @@ 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
 msgid "Week"
@@ -2156,19 +2114,6 @@ 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"
 msgstr "Панель производства"
@@ -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
@@ -212,11 +212,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -471,11 +466,6 @@ 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
 msgid ""
@@ -533,11 +523,6 @@ 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"
 msgstr ""
@@ -818,11 +803,6 @@ 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
 msgid "Date"
@@ -1383,11 +1363,6 @@ 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."
@@ -1891,12 +1866,6 @@ 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
 msgid "Stock value variation"
@@ -1914,17 +1883,6 @@ 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
 msgid "Week"
@@ -2110,19 +2068,6 @@ 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"
 msgstr ""
@@ -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
@@ -211,11 +211,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -471,11 +466,6 @@ 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
 msgid ""
@@ -533,11 +523,6 @@ 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"
 msgstr "Vrednost zaloge"
@@ -818,11 +803,6 @@ 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
 msgid "Date"
@@ -1383,11 +1363,6 @@ 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."
@@ -1891,12 +1866,6 @@ 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
 msgid "Stock value variation"
@@ -1914,17 +1883,6 @@ 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
 msgid "Week"
@@ -2110,19 +2068,6 @@ 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"
 msgstr ""
@@ -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
@@ -212,11 +212,6 @@ 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 "
@@ -471,11 +466,6 @@ 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
 msgid ""
@@ -533,11 +523,6 @@ 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"
 msgstr ""
@@ -818,11 +803,6 @@ 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
 msgid "Date"
@@ -1383,11 +1363,6 @@ 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."
@@ -1891,12 +1866,6 @@ 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
 msgid "Stock value variation"
@@ -1914,17 +1883,6 @@ 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
 msgid "Week"
@@ -2110,19 +2068,6 @@ 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"
 msgstr ""
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
@@ -212,11 +212,6 @@ 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 "
@@ -471,11 +466,6 @@ 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
 msgid ""
@@ -533,11 +523,6 @@ 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"
 msgstr ""
@@ -818,11 +803,6 @@ 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
 msgid "Date"
@@ -1383,11 +1363,6 @@ 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."
@@ -1891,12 +1866,6 @@ 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
 msgid "Stock value variation"
@@ -1914,17 +1883,6 @@ 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
 msgid "Week"
@@ -2110,19 +2068,6 @@ 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"
 msgstr ""
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
@@ -211,11 +211,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -477,11 +472,6 @@ 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
 msgid ""
@@ -541,11 +531,6 @@ 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"
 msgstr ""
@@ -826,11 +811,6 @@ 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
 msgid "Date"
@@ -1394,11 +1374,6 @@ 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."
@@ -1907,12 +1882,6 @@ 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
 msgid "Stock value variation"
@@ -1930,17 +1899,6 @@ 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
 msgid "Week"
@@ -2126,19 +2084,6 @@ 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"
 msgstr ""
@@ -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
@@ -211,11 +211,6 @@ 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 "
@@ -470,11 +465,6 @@ 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
 msgid ""
@@ -532,11 +522,6 @@ 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"
 msgstr ""
@@ -817,11 +802,6 @@ 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
 msgid "Date"
@@ -1382,11 +1362,6 @@ 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."
@@ -1890,12 +1865,6 @@ 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
 msgid "Stock value variation"
@@ -1913,17 +1882,6 @@ 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
 msgid "Week"
@@ -2109,19 +2067,6 @@ 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"
 msgstr ""
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
@@ -225,11 +225,6 @@ 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 ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
@@ -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
@@ -497,11 +497,6 @@ 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
 msgid ""
@@ -561,11 +556,6 @@ 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"
 msgstr "Stok Değeri"
@@ -860,11 +850,6 @@ 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
 msgid "Date"
@@ -1452,11 +1437,6 @@ 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 ""
 "Reference of the document that generated this production order request."
@@ -1992,12 +1972,6 @@ 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
 msgid "Stock value variation"
@@ -2015,17 +1989,6 @@ 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
 msgid "Week"
@@ -2216,19 +2179,6 @@ 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"
 msgstr "Üretim panosu"
@@ -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
@@ -211,11 +211,6 @@ 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 "
@@ -470,11 +465,6 @@ 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
 msgid ""
@@ -532,11 +522,6 @@ 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"
 msgstr "Складська ціна"
@@ -817,11 +802,6 @@ 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
 msgid "Date"
@@ -1382,11 +1362,6 @@ 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."
@@ -1890,12 +1865,6 @@ 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
 msgid "Stock value variation"
@@ -1913,17 +1882,6 @@ 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
 msgid "Week"
@@ -2109,19 +2067,6 @@ 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"
 msgstr ""
@@ -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
@@ -217,11 +217,6 @@ 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 "
@@ -476,11 +471,6 @@ 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
 msgid ""
@@ -538,11 +528,6 @@ 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"
 msgstr ""
@@ -823,11 +808,6 @@ 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
 msgid "Date"
@@ -1388,11 +1368,6 @@ 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."
@@ -1896,12 +1871,6 @@ 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
 msgid "Stock value variation"
@@ -1919,17 +1888,6 @@ 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
 msgid "Week"
@@ -2115,19 +2073,6 @@ 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"
 msgstr ""
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
@@ -212,11 +212,6 @@ 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 "
@@ -473,11 +468,6 @@ 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
 msgid ""
@@ -535,11 +525,6 @@ 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"
 msgstr "库存值"
@@ -821,11 +806,6 @@ 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
 msgid "Date"
@@ -1390,11 +1370,6 @@ 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."
@@ -1912,12 +1887,6 @@ 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
 msgid "Stock value variation"
@@ -1935,17 +1904,6 @@ 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
 msgid "Week"
@@ -2133,19 +2091,6 @@ 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"
 msgstr "生产控制台"
@@ -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
@@ -212,11 +212,6 @@ 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 "
@@ -471,11 +466,6 @@ 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
 msgid ""
@@ -533,11 +523,6 @@ 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"
 msgstr ""
@@ -818,11 +803,6 @@ 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
 msgid "Date"
@@ -1383,11 +1363,6 @@ 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."
@@ -1891,12 +1866,6 @@ 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
 msgid "Stock value variation"
@@ -1914,17 +1883,6 @@ 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
 msgid "Week"
@@ -2110,19 +2068,6 @@ 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"
 msgstr ""
@@ -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
@@ -211,11 +211,6 @@ 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 "
@@ -470,11 +465,6 @@ 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
 msgid ""
@@ -532,11 +522,6 @@ 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"
 msgstr ""
@@ -817,11 +802,6 @@ 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
 msgid "Date"
@@ -1382,11 +1362,6 @@ 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."
@@ -1890,12 +1865,6 @@ 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
 msgid "Stock value variation"
@@ -1913,17 +1882,6 @@ 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
 msgid "Week"
@@ -2109,19 +2067,6 @@ 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"
 msgstr ""
@@ -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),
-
-        '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),
+        '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, 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,35 +345,35 @@
             <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"/>
+                            <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"
+                                    class="oe_inline"/>
+                                <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"/>
-                            <label for="product_uos_qty" groups="product.group_uos"/>
-                            <div groups="product.group_uos" >
-                                <field name="product_uos_qty"
-                                    class="oe_inline"/>
-                                <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/>
-                                <field name="product_uos" class="oe_inline"/>
-                            </div>
                         </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..34717d985c0 100644
--- a/addons/mrp/res_config.py
+++ b/addons/mrp/res_config.py
@@ -65,7 +65,7 @@ class mrp_config_settings(osv.osv_memory):
             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 ",
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/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/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/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/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/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/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..a2c45bead62 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')],
+            'Invoice Method', 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/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>