[MERGE]: Merge with latest trunk-addons

bzr revid: rpa@tinyerp.com-20120913053058-unlfdj92o69rnjam

addons/account/account.py

@@ -2516,22 +2516,25 @@ class account_account_template(osv.osv):
         'nocreate': False,
     }
 
-    def _check_type(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        accounts = self.browse(cr, uid, ids, context=context)
-        for account in accounts:
-            if account.parent_id and account.parent_id.type != 'view':
-                return False
-        return True
-
     _check_recursion = check_cycle
     _constraints = [
         (_check_recursion, 'Error!\nYou cannot create recursive account templates.', ['parent_id']),
-        (_check_type, 'Configuration Error!\nYou cannot define children to an account that has internal type other than  "View".', ['type']),
-
     ]
 
+    def create(self, cr, uid, vals, context=None):
+        if 'parent_id' in vals:
+            parent = self.read(cr, uid, [vals['parent_id']], ['type'])
+            if parent and parent[0]['type'] != 'view':
+                raise osv.except_osv(_('Warning!'), _("You may only select a parent account of type 'View'."))
+        return super(account_account_template, self).create(cr, uid, vals, context=context)
+
+    def write(self, cr, uid, ids, vals, context=None):
+        if 'parent_id' in vals:
+            parent = self.read(cr, uid, [vals['parent_id']], ['type'])
+            if parent and parent[0]['type'] != 'view':
+                raise osv.except_osv(_('Warning!'), _("You may only select a parent account of type 'View'."))
+        return super(account_account_template, self).write(cr, uid, ids, vals, context=context)
+
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []

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"/>

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):
@@ -767,17 +772,20 @@ class account_invoice(osv.osv):
                 if not key in tax_key:
                     raise osv.except_osv(_('Warning!'), _('Taxes are missing!\nClick on compute button.'))
 
-    def compute_invoice_totals(self, cr, uid, inv, company_currency, ref, invoice_move_lines):
+    def compute_invoice_totals(self, cr, uid, inv, company_currency, ref, invoice_move_lines, context=None):
+        if context is None:
+            context={}
         total = 0
         total_currency = 0
         cur_obj = self.pool.get('res.currency')
         for i in invoice_move_lines:
             if inv.currency_id.id != company_currency:
+                context.update({'date': inv.date_invoice or time.strftime('%Y-%m-%d')})
                 i['currency_id'] = inv.currency_id.id
                 i['amount_currency'] = i['price']
                 i['price'] = cur_obj.compute(cr, uid, inv.currency_id.id,
                         company_currency, i['price'],
-                        context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')})
+                        context=context)
             else:
                 i['amount_currency'] = False
                 i['currency_id'] = False
@@ -887,7 +895,7 @@ class account_invoice(osv.osv):
             # create one move line for the total and possibly adjust the other lines amount
             total = 0
             total_currency = 0
-            total, total_currency, iml = self.compute_invoice_totals(cr, uid, inv, company_currency, ref, iml)
+            total, total_currency, iml = self.compute_invoice_totals(cr, uid, inv, company_currency, ref, iml, context=ctx)
             acc_id = inv.account_id.id
 
             name = inv['name'] or '/'

addons/account/data/configurable_account_chart.xml

@@ -45,7 +45,6 @@
         <record id="conf_chart0" model="account.account.template">
             <field name="code">0</field>
             <field name="name">Configurable Account Chart</field>
-            <field eval="0" name="parent_id"/>
             <field name="type">view</field>
             <field name="user_type" ref="data_account_type_view"/>
         </record>

addons/account/demo/account_minimal.xml

@@ -19,7 +19,6 @@
         <record id="chart0" model="account.account">
             <field name="code">X0</field>
             <field name="name">Chart For Automated Tests</field>
-            <field eval="0" name="parent_id"/>
             <field name="type">view</field>
             <field name="user_type" ref="data_account_type_view"/>
         </record>

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 "

addons/account/res_config.py

@@ -44,7 +44,7 @@ class account_config_settings(osv.osv_memory):
         'paypal_account': fields.related('company_id', 'paypal_account', type='char', size=128,
             string='Paypal account', help="Paypal account (email) for receiving online payments (credit card, etc.) If you set a paypal account, the customer  will be able to pay your invoices or quotations with a button \"Pay with  Paypal\" in automated emails or through the OpenERP portal."),
         'company_footer': fields.related('company_id', 'rml_footer', type='text', readonly=True,
-            string='Bank accounts on reports will displayed as followed', help="Bank accounts as printed in the footer of each customer's document. This is for information purpose only, you should configure these bank accounts through the above button \"Configure Bank Accounts\"."),
+            string='Bank accounts footer preview', help="Bank accounts as printed in the footer of each printed document"),
 
         'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'),
         'chart_template_id': fields.many2one('account.chart.template', 'Template', domain="[('visible','=', True)]"),
@@ -114,6 +114,9 @@ class account_config_settings(osv.osv_memory):
             help="This purchase tax will be assigned by default on new products."),
         'decimal_precision': fields.integer('Decimal precision on journal entries',
             help="""As an example, a decimal precision of 2 will allow journal entries  like: 9.99 EUR, whereas a decimal precision of 4 will allow journal  entries like: 0.0231 EUR."""),
+        'group_multi_currency': fields.boolean('allow multi currencies',
+            implied_group='base.group_multi_currency',
+            help="Allows you multi currency environment"),
     }
 
     def _default_company(self, cr, uid, context=None):

addons/account/res_config_view.xml

@@ -121,6 +121,10 @@
                         </div>
                         <label for="id" string="Features"/>
                         <div>
+                            <div>
+                                <field name="group_multi_currency" class="oe_inline"/>
+                                <label for="group_multi_currency"/>
+                            </div>
                             <div>
                                 <field name="module_account_accountant" class="oe_inline"/>
                                 <label for="module_account_accountant"/>
@@ -219,12 +223,12 @@
                         <label for="id" string="Configuration"/>
                         <div>
                             <div>
+                                <label for="company_footer"/>
                                 <button name="%(action_bank_tree)d"
                                     string="Configure your bank accounts"
                                     icon="gtk-go-forward"
                                     type="action"
                                     class="oe_inline oe_link"/>
-                                <label for="company_footer"/>
                                 <field name="company_footer"/>
                             </div>
                             <div>

addons/account_bank_statement_extensions/i18n/pt_BR.po

@@ -0,0 +1,385 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-09-11 18:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"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"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Procurar Transações Bancárias"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement:0
+#: view:account.bank.statement.line:0
+msgid "Glob. Id"
+msgstr "ID Global"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr "CODA"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr "Código da Conta-pai"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr "Débito"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
+msgid "Cancel selected statement lines"
+msgstr "Cancelar linhas de instrução selecionadas"
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr "A RIB e/ ou IBAN não é válido."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr "Agrupar Por..."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "State"
+msgstr "Situação"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr "Provisório"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr "Demonstrativo"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
+msgid "Confirm selected statement lines"
+msgstr "Confirme as linhas do demonstrativo selecionadas"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
+msgid "Bank Statement Balances Report"
+msgstr "Relatório de Balanço Bancário"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Cancel Lines"
+msgstr "Cancelar Linhas"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr "Informações de Pagamento em Lote"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr "Confirmar Linhas"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid ""
+"Delete operation not allowed !             Please go to the associated bank "
+"statement in order to delete and/or modify this bank statement line"
+msgstr ""
+"Não é permitido excluir! Vá a linha do demonstrativo bancário associada para "
+"excluir ou modificar esta linha do demonstrativo"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:bank.statement.balance.report:0
+msgid "Journal"
+msgstr "Diário"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Confirmed Statement Lines."
+msgstr "Linhas do Demonstrativo Confirmadas."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr "Transações de Crédito"
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
+msgid "cancel selected statement lines."
+msgstr "cancelar linhas do demonstrativo selecionadas."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr "Número da Contrapartida"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr "Transações"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Closing Balance"
+msgstr "Saldo final"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Date"
+msgstr "Data"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,globalisation_amount:0
+msgid "Glob. Amount"
+msgstr "Valor Global"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr "Transações de Débito."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr "Filtros Extendidos..."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirmed lines cannot be changed anymore."
+msgstr "Linhas confirmadas não podem ser alteradas."
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+"\n"
+"Por favor defina o BIC/Swift code no Banco para o tipo de conta IBAN para "
+"fazer pagamentos válidos"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Valuta Date"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
+msgid "Confirm selected statement lines."
+msgstr "Confirmar as linhas do demonstrativo."
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
+msgstr ""
+"Você tem certeza de que deseja cancelar as Linhas de Demonstrativo Bancário "
+"selecionadas?"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "ISO 20022"
+msgstr "ISO 20022"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "Manual"
+msgstr "Manual"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit"
+msgstr "Crédito"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,amount:0
+msgid "Amount"
+msgstr "Valor"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Fin.Account"
+msgstr "Fin.Account"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr "Moeda da Contrapartida"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr "BIC da Contrapartida"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+msgstr "Códigos derivados (sub-contas)"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
+msgstr ""
+"Você deseja confirmar as Linhas do Demonstrativo Bancário selecionadas?"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+"O valor do recibo deve ser o mesmo valor da linha equivalente no extrato"
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr ""
+"Código para identificar transações que pertencem ao nível de globalização "
+"dentro de um mesmo lote de pagamento"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Draft Statement Lines."
+msgstr "Linhas de Demonstrativo Provisórias."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Glob. Am."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Linha do Demonstrativo Bancário"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr "Nome da Contrapartida"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "Communication"
+msgstr "Comunicação"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Contas Bancárias"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr "O diário e o período escolhido tem que pertencer à mesma empresa."
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Extrato Bancário"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Line"
+msgstr "Linha do Demonstrativo"
+
+#. module: account_bank_statement_extensions
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr "O código precisa ser único!"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,bank_statement_line_ids:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
+#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
+msgid "Bank Statement Lines"
+msgstr "Linhas do Demonstrativo Bancário"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr "Lote de Pagamentos Filho"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: view:confirm.statement.line:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Lines"
+msgstr "Linhas do Demonstrativo"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Total Amount"
+msgstr "Valor Total"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr "ID Globalização"

addons/account_check_writing/i18n/es_EC.po

@@ -0,0 +1,207 @@
+# Spanish (Ecuador) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-09-12 01:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\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
+msgid "Check on Top"
+msgstr "Cheque on Top"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"The check payment form allows you to track the payment you do to your "
+"suppliers specially by check. When you select a supplier, the payment method "
+"and an amount for the payment, OpenERP will propose to reconcile your "
+"payment with the open supplier invoices or bills.You can print the check"
+msgstr ""
+"El pago de cheques permite rastrear el pago a sus proveedores. Cuando "
+"selecciona un proveedor, el método de pago y monto, OpenERP propondrá "
+"conciliarlo con tu factura, y podrá imprimir el cheque."
+
+#. module: account_check_writing
+#: view:account.voucher:0
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check"
+msgstr "Imprimir Cheque"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr "Cheque in middle"
+
+#. module: account_check_writing
+#: help:res.company,check_layout:0
+msgid ""
+"Check on top is compatible with Quicken, QuickBooks and Microsoft Money. "
+"Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
+"bottom is compatible with Peachtree, ACCPAC and DacEasy only"
+msgstr ""
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr "Cheque on bottom"
+
+#. module: account_check_writing
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Error! No puede crear compañías recursivas."
+
+#. module: account_check_writing
+#: help:account.journal,allow_check_writing:0
+msgid "Check this if the journal is to be used for writing checks."
+msgstr "Activar si este diario es usado para emitir cheques"
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr "Permitir emisión de cheques"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr "Diario"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_write_check
+#: model:ir.ui.menu,name:account_check_writing.menu_action_write_check
+msgid "Write Checks"
+msgstr "Escribir Cheque"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Discount"
+msgstr "Descuento"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Original Amount"
+msgstr "Monto Inicial"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "Permitir Emisión de Cheques"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr "Pagos"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr "Usar cheque preimpreso"
+
+#. module: account_check_writing
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "¡El nombre de la compañía debe ser único!"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Due Date"
+msgstr "Fecha de vencimiento"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr "Compañias"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Default Check Layout"
+msgstr ""
+
+#. module: account_check_writing
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Error de Configuración! La moneda seleccionada debe ser compartida por las "
+"cuentas por defecto tambíen"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr "Saldo Deudor"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Check Amount"
+msgstr "Monto Cheque"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "Comprobantes de Pago"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "El nombre del diaro debe ser único por compañía !"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "El código del diario debe ser único por compañía !"
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr "Monto en Letras"
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Saldo Inicial"
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Choose Check layout"
+msgstr "Elegir diseño de cheque"
+
+#~ msgid "Default Check layout"
+#~ msgstr "Diseño de cheque por defecto"

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

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)

addons/base_import/__init__.py

@@ -0,0 +1,3 @@
+import controllers
+import models
+import test_models

addons/base_import/__openerp__.py

@@ -0,0 +1,39 @@
+{
+    'name': 'Base import',
+    'description': """
+New extensible file import for OpenERP
+======================================
+
+Re-implement openerp's file import system:
+
+* Server side, the previous system forces most of the logic into the
+  client which duplicates the effort (between clients), makes the
+  import system much harder to use without a client (direct RPC or
+  other forms of automation) and makes knowledge about the
+  import/export system much harder to gather as it is spread over
+  3+ different projects.
+
+* In a more extensible manner, so users and partners can build their
+  own front-end to import from other file formats (e.g. OpenDocument
+  files) which may be simpler to handle in their work flow or from
+  their data production sources.
+
+* In a module, so that administrators and users of OpenERP who do not
+  need or want an online import can avoid it being available to users.
+""",
+    'category': 'Uncategorized',
+    'website': 'http://www.openerp.com',
+    'author': 'OpenERP SA',
+    'depends': ['base'],
+    'installable': True,
+    'auto_install': False, # set to true and allow uninstall?
+    'css': [
+        'static/lib/select2/select2.css',
+        'static/src/css/import.css',
+    ],
+    'js': [
+        'static/lib/select2/select2.js',
+        'static/src/js/import.js',
+    ],
+    'qweb': ['static/src/xml/import.xml'],
+}

addons/base_import/controllers.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+import simplejson
+
+try:
+    import openerp.addons.web.common.http as openerpweb
+except ImportError:
+    import web.common.http as openerpweb
+
+class ImportController(openerpweb.Controller):
+    _cp_path = '/base_import'
+
+    @openerpweb.httprequest
+    def set_file(self, req, file, import_id, jsonp='callback'):
+        import_id = int(import_id)
+
+        written = req.session.model('base_import.import').write(import_id, {
+            'file': file.read(),
+            'file_name': file.filename,
+            'file_type': file.content_type,
+        }, req.session.eval_context(req.context))
+
+        return 'window.top.%s(%s)' % (
+            jsonp, simplejson.dumps({'result': written}))

addons/base_import/models.py

@@ -0,0 +1,352 @@
+import csv
+import itertools
+import logging
+import operator
+
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from StringIO import StringIO
+
+import psycopg2
+
+from openerp.osv import orm, fields
+from openerp.tools.translate import _
+
+FIELDS_RECURSION_LIMIT = 2
+ERROR_PREVIEW_BYTES = 200
+_logger = logging.getLogger(__name__)
+class ir_import(orm.TransientModel):
+    _name = 'base_import.import'
+    # allow imports to survive for 12h in case user is slow
+    _transient_max_hours = 12.0
+
+    _columns = {
+        'res_model': fields.char('Model', size=64),
+        'file': fields.binary(
+            'File', help="File to check and/or import, raw binary (not base64)"),
+        'file_name': fields.char('File Name', size=None),
+        'file_type': fields.char('File Type', size=None),
+    }
+
+    def get_fields(self, cr, uid, model, context=None,
+                   depth=FIELDS_RECURSION_LIMIT):
+        """ Recursively get fields for the provided model (through
+        fields_get) and filter them according to importability
+
+        The output format is a list of ``Field``, with ``Field``
+        defined as:
+
+        .. class:: Field
+
+            .. attribute:: id (str)
+
+                A non-unique identifier for the field, used to compute
+                the span of the ``required`` attribute: if multiple
+                ``required`` fields have the same id, only one of them
+                is necessary.
+
+            .. attribute:: name (str)
+
+                The field's logical (OpenERP) name within the scope of
+                its parent.
+
+            .. attribute:: string (str)
+
+                The field's human-readable name (``@string``)
+
+            .. attribute:: required (bool)
+
+                Whether the field is marked as required in the
+                model. Clients must provide non-empty import values
+                for all required fields or the import will error out.
+
+            .. attribute:: fields (list(Field))
+
+                The current field's subfields. The database and
+                external identifiers for m2o and m2m fields; a
+                filtered and transformed fields_get for o2m fields (to
+                a variable depth defined by ``depth``).
+
+                Fields with no sub-fields will have an empty list of
+                sub-fields.
+
+        :param str model: name of the model to get fields form
+        :param int landing: depth of recursion into o2m fields
+        """
+        fields = [{
+            'id': 'id',
+            'name': 'id',
+            'string': _("External ID"),
+            'required': False,
+            'fields': [],
+        }]
+        fields_got = self.pool[model].fields_get(cr, uid, context=context)
+        for name, field in fields_got.iteritems():
+            if field.get('readonly'):
+                states = field.get('states')
+                if not states:
+                    continue
+                # states = {state: [(attr, value), (attr2, value2)], state2:...}
+                if not any(attr == 'readonly' and value is False
+                           for attr, value in itertools.chain.from_iterable(
+                                states.itervalues())):
+                    continue
+
+            f = {
+                'id': name,
+                'name': name,
+                'string': field['string'],
+                # Y U NO ALWAYS HAVE REQUIRED
+                'required': bool(field.get('required')),
+                'fields': [],
+            }
+
+            if field['type'] in ('many2many', 'many2one'):
+                f['fields'] = [
+                    dict(f, name='id', string=_("External ID")),
+                    dict(f, name='.id', string=_("Database ID")),
+                ]
+            elif field['type'] == 'one2many' and depth:
+                f['fields'] = self.get_fields(
+                    cr, uid, field['relation'], context=context, depth=depth-1)
+
+            fields.append(f)
+
+        # TODO: cache on model?
+        return fields
+
+    def _read_csv(self, record, options):
+        """ Returns a CSV-parsed iterator of all empty lines in the file
+
+        :throws csv.Error: if an error is detected during CSV parsing
+        :throws UnicodeDecodeError: if ``options.encoding`` is incorrect
+        """
+        csv_iterator = csv.reader(
+            StringIO(record.file),
+            quotechar=options['quoting'],
+            delimiter=options['separator'])
+        csv_nonempty = itertools.ifilter(None, csv_iterator)
+        # TODO: guess encoding with chardet? Or https://github.com/aadsm/jschardet
+        encoding = options.get('encoding', 'utf-8')
+        return itertools.imap(
+            lambda row: [item.decode(encoding) for item in row],
+            csv_nonempty)
+
+    def _match_header(self, header, fields, options):
+        """ Attempts to match a given header to a field of the
+        imported model.
+
+        :param str header: header name from the CSV file
+        :param fields:
+        :param dict options:
+        :returns: an empty list if the header couldn't be matched, or
+                  all the fields to traverse
+        :rtype: list(Field)
+        """
+        for field in fields:
+            # FIXME: should match all translations & original
+            # TODO: use string distance (levenshtein? hamming?)
+            if header == field['name'] \
+              or header.lower() == field['string'].lower():
+                return [field]
+
+        if '/' not in header:
+            return []
+
+        # relational field path
+        traversal = []
+        subfields = fields
+        # Iteratively dive into fields tree
+        for section in header.split('/'):
+            # Strip section in case spaces are added around '/' for
+            # readability of paths
+            match = self._match_header(section.strip(), subfields, options)
+            # Any match failure, exit
+            if not match: return []
+            # prep subfields for next iteration within match[0]
+            field = match[0]
+            subfields = field['fields']
+            traversal.append(field)
+        return traversal
+
+    def _match_headers(self, rows, fields, options):
+        """ Attempts to match the imported model's fields to the
+        titles of the parsed CSV file, if the file is supposed to have
+        headers.
+
+        Will consume the first line of the ``rows`` iterator.
+
+        Returns a pair of (None, None) if headers were not requested
+        or the list of headers and a dict mapping cell indices
+        to key paths in the ``fields`` tree
+
+        :param Iterator rows:
+        :param dict fields:
+        :param dict options:
+        :rtype: (None, None) | (list(str), dict(int: list(str)))
+        """
+        if not options.get('headers'):
+            return None, None
+
+        headers = next(rows)
+        return headers, dict(
+            (index, [field['name'] for field in self._match_header(header, fields, options)] or None)
+            for index, header in enumerate(headers)
+        )
+
+    def parse_preview(self, cr, uid, id, options, count=10, context=None):
+        """ Generates a preview of the uploaded files, and performs
+        fields-matching between the import's file data and the model's
+        columns.
+
+        If the headers are not requested (not options.headers),
+        ``matches`` and ``headers`` are both ``False``.
+
+        :param id: identifier of the import
+        :param int count: number of preview lines to generate
+        :param options: format-specific options.
+                        CSV: {encoding, quoting, separator, headers}
+        :type options: {str, str, str, bool}
+        :returns: {fields, matches, headers, preview} | {error, preview}
+        :rtype: {dict(str: dict(...)), dict(int, list(str)), list(str), list(list(str))} | {str, str}
+        """
+        (record,) = self.browse(cr, uid, [id], context=context)
+        fields = self.get_fields(cr, uid, record.res_model, context=context)
+
+        try:
+            rows = self._read_csv(record, options)
+
+            headers, matches = self._match_headers(rows, fields, options)
+            # Match should have consumed the first row (iif headers), get
+            # the ``count`` next rows for preview
+            preview = itertools.islice(rows, count)
+            return {
+                'fields': fields,
+                'matches': matches or False,
+                'headers': headers or False,
+                'preview': list(preview),
+            }
+        except Exception, e:
+            # Due to lazy generators, UnicodeDecodeError (for
+            # instance) may only be raised when serializing the
+            # preview to a list in the return.
+            _logger.debug("Error during CSV parsing preview", exc_info=True)
+            return {
+                'error': str(e),
+                # iso-8859-1 ensures decoding will always succeed,
+                # even if it yields non-printable characters. This is
+                # in case of UnicodeDecodeError (or csv.Error
+                # compounded with UnicodeDecodeError)
+                'preview': record.file[:ERROR_PREVIEW_BYTES]
+                                .decode( 'iso-8859-1'),
+            }
+
+    def _convert_import_data(self, record, fields, options, context=None):
+        """ Extracts the input browse_record and fields list (with
+        ``False``-y placeholders for fields to *not* import) into a
+        format Model.import_data can use: a fields list without holes
+        and the precisely matching data matrix
+
+        :param browse_record record:
+        :param list(str|bool): fields
+        :returns: (data, fields)
+        :rtype: (list(list(str)), list(str))
+        :raises ValueError: in case the import data could not be converted
+        """
+        # Get indices for non-empty fields
+        indices = [index for index, field in enumerate(fields) if field]
+        if not indices:
+            raise ValueError(_("You must configure at least one field to import"))
+        # If only one index, itemgetter will return an atom rather
+        # than a 1-tuple
+        if len(indices) == 1: mapper = lambda row: [row[indices[0]]]
+        else: mapper = operator.itemgetter(*indices)
+        # Get only list of actually imported fields
+        import_fields = filter(None, fields)
+
+        rows_to_import = self._read_csv(record, options)
+        if options.get('headers'):
+            rows_to_import = itertools.islice(
+                rows_to_import, 1, None)
+        data = [
+            row for row in itertools.imap(mapper, rows_to_import)
+            # don't try inserting completely empty rows (e.g. from
+            # filtering out o2m fields)
+            if any(row)
+        ]
+
+        return data, import_fields
+
+    def do(self, cr, uid, id, fields, options, dryrun=False, context=None):
+        """ Actual execution of the import
+
+        :param fields: import mapping: maps each column to a field,
+                       ``False`` for the columns to ignore
+        :type fields: list(str|bool)
+        :param dict options:
+        :param bool dryrun: performs all import operations (and
+                            validations) but rollbacks writes, allows
+                            getting as much errors as possible without
+                            the risk of clobbering the database.
+        :returns: A list of errors. If the list is empty the import
+                  executed fully and correctly. If the list is
+                  non-empty it contains dicts with 3 keys ``type`` the
+                  type of error (``error|warning``); ``message`` the
+                  error message associated with the error (a string)
+                  and ``record`` the data which failed to import (or
+                  ``false`` if that data isn't available or provided)
+        :rtype: list({type, message, record})
+        """
+        cr.execute('SAVEPOINT import')
+
+        (record,) = self.browse(cr, uid, [id], context=context)
+        try:
+            data, import_fields = self._convert_import_data(
+                record, fields, options, context=context)
+        except ValueError, e:
+            return [{
+                'type': 'error',
+                'message': str(e),
+                'record': False,
+            }]
+
+        try:
+            _logger.info('importing %d rows...', len(data))
+            (code, record, message, _wat) = self.pool[record.res_model].import_data(
+                cr, uid, import_fields, data, context=context)
+            _logger.info('done')
+
+        except Exception, e:
+            _logger.exception("Import failed")
+            # TODO: remove when exceptions stop being an "expected"
+            #       behavior of import_data on some (most) invalid
+            #       input.
+            code, record, message = -1, None, str(e)
+
+        # If transaction aborted, RELEASE SAVEPOINT is going to raise
+        # an InternalError (ROLLBACK should work, maybe). Ignore that.
+        # TODO: to handle multiple errors, create savepoint around
+        #       write and release it in case of write error (after
+        #       adding error to errors array) => can keep on trying to
+        #       import stuff, and rollback at the end if there is any
+        #       error in the results.
+        try:
+            if dryrun:
+                cr.execute('ROLLBACK TO SAVEPOINT import')
+            else:
+                cr.execute('RELEASE SAVEPOINT import')
+        except psycopg2.InternalError:
+            pass
+
+        if code != -1:
+            return []
+
+        # TODO: add key for error location?
+        # TODO: error not within normal preview, how to display? Re-preview
+        #       with higher ``count``?
+        return [{
+            'type': 'error',
+            'message': message,
+            'record': record or False
+        }]

addons/base_import/static/lib/select2/LICENSE

@@ -0,0 +1,12 @@
+Copyright 2012 Igor Vaynberg
+ 
+Version: @@ver@@ Timestamp: @@timestamp@@
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in
+compliance with the License. You may obtain a copy of the License in the LICENSE file, or at:
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is
+distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and limitations under the License.

addons/base_import/static/lib/select2/README.md

@@ -0,0 +1,68 @@
+Select2
+=================
+
+Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results. Look and feel of Select2 is based on the excellent [Chosen](http://harvesthq.github.com/chosen/) library.
+
+To get started -- checkout http://ivaynberg.github.com/select2!
+
+What Does Select2 Support That Chosen Does Not?
+-------------------------------------------------
+
+* Working with large datasets: Chosen requires the entire dataset to be loaded as `option` tags in the DOM, which limits
+it to working with small-ish datasets. Select2 uses a function to find results on-the-fly, which allows it to partially
+load results.
+* Paging of results: Since Select2 works with large datasets and only loads a small amount of matching results at a time
+it has to support paging. Select2 will call the search function when the user scrolls to the bottom of currently loaded
+result set allowing for the 'infinite scrolling' of results.
+* Custom markup for results: Chosen only supports rendering text results because that is the only markup supported by
+`option` tags. Select2 provides an extension point which can be used to produce any kind of markup to represent results.
+* Ability to add results on the fly: Select2 provides the ability to add results from the search term entered by the user, which allows it to be used for
+tagging.
+
+Browser Compatibility
+--------------------
+* IE 8+ (7 mostly works except for [issue with z-index](https://github.com/ivaynberg/select2/issues/37))
+* Chrome 8+
+* Firefox 3.5+
+* Safari 3+
+* Opera 10.6+
+
+Integrations
+------------
+
+* [Wicket-Select2](https://github.com/ivaynberg/wicket-select2) (Java / Apache Wicket)
+* [select2-rails](https://github.com/argerim/select2-rails) (Ruby on Rails)
+* [AngularUI](http://angular-ui.github.com/#directives-select2) ([AngularJS](angularjs.org))
+* [Django](https://github.com/applegrew/django-select2)
+
+Bug tracker
+-----------
+
+Have a bug? Please create an issue here on GitHub!
+
+https://github.com/ivaynberg/select2/issues
+
+
+Mailing list
+------------
+
+Have a question? Ask on our mailing list!
+
+select2@googlegroups.com
+
+https://groups.google.com/d/forum/select2
+
+
+Copyright and License
+---------------------
+
+Copyright 2012 Igor Vaynberg
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in
+compliance with the License. You may obtain a copy of the License in the LICENSE file, or at:
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is
+distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and limitations under the License.

addons/base_import/static/lib/select2/release.sh

@@ -0,0 +1,77 @@
+#!/bin/bash
+set -e
+
+echo -n "Enter the version for this release: "
+
+read ver
+
+if [ ! $ver ]; then 
+	echo "Invalid version."
+	exit
+fi
+
+name="select2"
+js="$name.js"
+mini="$name.min.js"
+css="$name.css"
+release="$name-$ver"
+releasedir="/tmp/$release"
+tag="release-$ver"
+branch="build-$ver"
+curbranch=`git branch | grep "*" | sed "s/* //"`
+timestamp=$(date)
+tokens="s/@@ver@@/$ver/g;s/\@@timestamp@@/$timestamp/g"
+remote="github"
+
+git branch "$branch"
+git checkout "$branch"
+
+echo "Tokenizing..."
+
+find . -name "$js" | xargs sed -i -e "$tokens"
+find . -name "$css" | xargs sed -i -e "$tokens"
+
+git add "$js"
+git add "$css"
+
+echo "Minifying..."
+
+echo "/*" > "$mini"
+cat LICENSE | sed "$tokens" >> "$mini"
+echo "*/" >> "$mini"
+
+curl -s \
+	-d compilation_level=SIMPLE_OPTIMIZATIONS \
+	-d output_format=text \
+	-d output_info=compiled_code \
+	--data-urlencode "js_code@$js" \
+	http://closure-compiler.appspot.com/compile \
+	>> "$mini"
+
+git add "$mini"
+	
+git commit -m "release $ver"
+
+echo "Tagging..."
+
+git tag -a "$tag" -m "tagged version $ver"
+git push "$remote" --tags
+
+echo "Archiving..."
+
+rm -rf "$releasedir"
+mkdir "$releasedir"
+
+cp $name.* "$releasedir"
+cp spinner.gif "$releasedir"
+cp README.* "$releasedir"
+
+zip -r "$releasedir.zip" "$releasedir"
+rm -rf "$releasedir"
+
+echo "Cleaning Up..."
+
+git checkout "$curbranch"
+git branch -D "$branch"
+
+echo "Done. Release archive created: $releasedir.zip"

addons/base_import/static/lib/select2/select2.css

@@ -0,0 +1,524 @@
+/*
+Version: @@ver@@ Timestamp: @@timestamp@@
+*/
+.select2-container {
+    position: relative;
+    display: inline-block;
+    /* inline-block for ie7 */
+    zoom: 1;
+    *display: inline;
+    vertical-align: top;
+}
+
+.select2-container,
+.select2-drop,
+.select2-search,
+.select2-search input{
+  /*
+    Force border-box so that % widths fit the parent
+    container without overlap because of margin/padding.
+
+    More Info : http://www.quirksmode.org/css/box.html
+  */
+  -moz-box-sizing: border-box;    /* firefox */
+  -ms-box-sizing: border-box;     /* ie */
+  -webkit-box-sizing: border-box; /* webkit */
+  -khtml-box-sizing: border-box;  /* konqueror */
+  box-sizing: border-box;         /* css3 */
+}
+
+.select2-container .select2-choice {
+    background-color: #fff;
+    background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(0.5, white));
+    background-image: -webkit-linear-gradient(center bottom, #eeeeee 0%, white 50%);
+    background-image: -moz-linear-gradient(center bottom, #eeeeee 0%, white 50%);
+    background-image: -o-linear-gradient(bottom, #eeeeee 0%, #ffffff 50%);
+    background-image: -ms-linear-gradient(top, #eeeeee 0%, #ffffff 50%);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#eeeeee', endColorstr = '#ffffff', GradientType = 0);
+    background-image: linear-gradient(top, #eeeeee 0%, #ffffff 50%);
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    -moz-background-clip: padding;
+    -webkit-background-clip: padding-box;
+    background-clip: padding-box;
+    border: 1px solid #aaa;
+    display: block;
+    overflow: hidden;
+    white-space: nowrap;
+    position: relative;
+    height: 26px;
+    line-height: 26px;
+    padding: 0 0 0 8px;
+    color: #444;
+    text-decoration: none;
+}
+
+.select2-container.select2-drop-above .select2-choice
+{
+    border-bottom-color: #aaa;
+    -webkit-border-radius:0px 0px 4px 4px;
+    -moz-border-radius:0px 0px 4px 4px;
+    border-radius:0px 0px 4px 4px;
+    background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(0.9, white));
+    background-image: -webkit-linear-gradient(center bottom, #eeeeee 0%, white 90%);
+    background-image: -moz-linear-gradient(center bottom, #eeeeee 0%, white 90%);
+    background-image: -o-linear-gradient(bottom, #eeeeee 0%, white 90%);
+    background-image: -ms-linear-gradient(top, #eeeeee 0%,#ffffff 90%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#ffffff',GradientType=0 );
+    background-image: linear-gradient(top, #eeeeee 0%,#ffffff 90%);
+}
+
+.select2-container .select2-choice span {
+    margin-right: 26px;
+    display: block;
+    overflow: hidden;
+    white-space: nowrap;
+    -o-text-overflow: ellipsis;
+    -ms-text-overflow: ellipsis;
+    text-overflow: ellipsis;
+}
+
+.select2-container .select2-choice abbr {
+  display: block;
+  position: absolute;
+  right: 26px;
+  top: 8px;
+  width: 12px;
+  height: 12px;
+  font-size: 1px;
+  background: url('select2.png') right top no-repeat;
+  cursor: pointer;
+  text-decoration: none;
+  border:0;
+  outline: 0;
+}
+.select2-container .select2-choice abbr:hover {
+  background-position: right -11px;
+  cursor: pointer;
+}
+
+.select2-drop {
+    background: #fff;
+    color: #000;
+    border: 1px solid #aaa;
+    border-top: 0;
+    position: absolute;
+    top: 100%;
+    -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+    -moz-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+    -o-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+    box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+    z-index: 9999;
+    width:100%;
+    margin-top:-1px;
+
+  -webkit-border-radius: 0 0 4px 4px;
+  -moz-border-radius: 0 0 4px 4px;
+  border-radius: 0 0 4px 4px;
+}
+
+.select2-drop.select2-drop-above {
+    -webkit-border-radius: 4px 4px 0px 0px;
+    -moz-border-radius: 4px 4px 0px 0px;
+    border-radius: 4px 4px 0px 0px;
+    margin-top:1px;
+    border-top: 1px solid #aaa;
+    border-bottom: 0;
+
+    -webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+    -moz-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+    -o-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+    box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+}
+
+.select2-container .select2-choice div {
+    -webkit-border-radius: 0 4px 4px 0;
+    -moz-border-radius: 0 4px 4px 0;
+    border-radius: 0 4px 4px 0;
+    -moz-background-clip: padding;
+    -webkit-background-clip: padding-box;
+    background-clip: padding-box;
+    background: #ccc;
+    background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #ccc), color-stop(0.6, #eee));
+    background-image: -webkit-linear-gradient(center bottom, #ccc 0%, #eee 60%);
+    background-image: -moz-linear-gradient(center bottom, #ccc 0%, #eee 60%);
+    background-image: -o-linear-gradient(bottom, #ccc 0%, #eee 60%);
+    background-image: -ms-linear-gradient(top, #cccccc 0%, #eeeeee 60%);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#cccccc', endColorstr = '#eeeeee', GradientType = 0);
+    background-image: linear-gradient(top, #cccccc 0%, #eeeeee 60%);
+    border-left: 1px solid #aaa;
+    position: absolute;
+    right: 0;
+    top: 0;
+    display: block;
+    height: 100%;
+    width: 18px;
+}
+
+.select2-container .select2-choice div b {
+    background: url('select2.png') no-repeat 0 1px;
+    display: block;
+    width: 100%;
+    height: 100%;
+}
+
+.select2-search {
+  display: inline-block;
+    white-space: nowrap;
+    z-index: 10000;
+  min-height: 26px;
+  width: 100%;
+  margin: 0;
+  padding-left: 4px;
+  padding-right: 4px;
+}
+
+.select2-search-hidden {
+  display: block;
+  position: absolute;
+  left: -10000px;
+}
+
+.select2-search input {
+    background: #fff url('select2.png') no-repeat 100% -22px;
+    background: url('select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
+    background: url('select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+    background: url('select2.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+    background: url('select2.png') no-repeat 100% -22px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
+    background: url('select2.png') no-repeat 100% -22px, -ms-linear-gradient(top, #ffffff 85%, #eeeeee 99%);
+    background: url('select2.png') no-repeat 100% -22px, linear-gradient(top, #ffffff 85%, #eeeeee 99%);
+    padding: 4px 20px 4px 5px;
+    outline: 0;
+    border: 1px solid #aaa;
+    font-family: sans-serif;
+    font-size: 1em;
+    width:100%;
+    margin:0;
+    height:auto !important;
+    min-height: 26px;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+    border-radius: 0;
+    -moz-border-radius: 0;
+    -webkit-border-radius: 0;
+}
+
+.select2-drop.select2-drop-above .select2-search input
+{
+    margin-top:4px;
+}
+
+.select2-search input.select2-active {
+    background: #fff url('spinner.gif') no-repeat 100%;
+    background: url('spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
+    background: url('spinner.gif') no-repeat 100%, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+    background: url('spinner.gif') no-repeat 100%, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+    background: url('spinner.gif') no-repeat 100%, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
+    background: url('spinner.gif') no-repeat 100%, -ms-linear-gradient(top, #ffffff 85%, #eeeeee 99%);
+    background: url('spinner.gif') no-repeat 100%, linear-gradient(top, #ffffff 85%, #eeeeee 99%);
+}
+
+
+.select2-container-active .select2-choice,
+.select2-container-active .select2-choices {
+    -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3);
+    -moz-box-shadow   : 0 0 5px rgba(0,0,0,.3);
+    -o-box-shadow     : 0 0 5px rgba(0,0,0,.3);
+    box-shadow        : 0 0 5px rgba(0,0,0,.3);
+    border: 1px solid #5897fb;
+    outline: none;
+}
+
+.select2-dropdown-open .select2-choice {
+  border: 1px solid #aaa;
+  border-bottom-color: transparent;
+  -webkit-box-shadow: 0 1px 0 #fff inset;
+  -moz-box-shadow   : 0 1px 0 #fff inset;
+  -o-box-shadow     : 0 1px 0 #fff inset;
+  box-shadow        : 0 1px 0 #fff inset;
+  background-color: #eee;
+  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, white), color-stop(0.5, #eeeeee));
+  background-image: -webkit-linear-gradient(center bottom, white 0%, #eeeeee 50%);
+  background-image: -moz-linear-gradient(center bottom, white 0%, #eeeeee 50%);
+  background-image: -o-linear-gradient(bottom, white 0%, #eeeeee 50%);
+  background-image: -ms-linear-gradient(top, #ffffff 0%,#eeeeee 50%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee',GradientType=0 );
+  background-image: linear-gradient(top, #ffffff 0%,#eeeeee 50%);
+  -webkit-border-bottom-left-radius : 0;
+  -webkit-border-bottom-right-radius: 0;
+  -moz-border-radius-bottomleft : 0;
+  -moz-border-radius-bottomright: 0;
+  border-bottom-left-radius : 0;
+  border-bottom-right-radius: 0;
+}
+
+.select2-dropdown-open .select2-choice div {
+  background: transparent;
+  border-left: none;
+}
+.select2-dropdown-open .select2-choice div b {
+  background-position: -18px 1px;
+}
+
+/* results */
+.select2-results {
+  margin: 4px 4px 4px 0;
+  padding: 0 0 0 4px;
+  position: relative;
+  overflow-x: hidden;
+  overflow-y: auto;
+  max-height: 200px;
+}
+
+.select2-results ul.select2-result-sub {
+  margin: 0 0 0 0;
+}
+
+.select2-results ul.select2-result-sub > li .select2-result-label { padding-left: 20px }
+.select2-results ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 40px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 60px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 80px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 100px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 110px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 120px }
+
+.select2-results li {
+  list-style: none;
+  display: list-item;
+}
+
+.select2-results li.select2-result-with-children > .select2-result-label {
+  font-weight: bold;
+}
+
+.select2-results .select2-result-label {
+  padding: 3px 7px 4px;
+  margin: 0;
+  cursor: pointer;
+}
+
+.select2-results .select2-highlighted {
+  background: #3875d7;
+  color: #fff;
+}
+.select2-results li em {
+  background: #feffde;
+  font-style: normal;
+}
+.select2-results .select2-highlighted em {
+  background: transparent;
+}
+.select2-results .select2-no-results,
+.select2-results .select2-searching,
+.select2-results .select2-selection-limit {
+  background: #f4f4f4;
+  display: list-item;
+}
+
+/*
+disabled look for already selected choices in the results dropdown
+.select2-results .select2-disabled.select2-highlighted {
+    color: #666;
+    background: #f4f4f4;
+    display: list-item;
+    cursor: default;
+}
+.select2-results .select2-disabled {
+  background: #f4f4f4;
+  display: list-item;
+  cursor: default;
+}
+*/
+.select2-results .select2-disabled {
+    display: none;
+}
+
+.select2-more-results.select2-active {
+    background: #f4f4f4 url('spinner.gif') no-repeat 100%;
+}
+
+.select2-more-results {
+  background: #f4f4f4;
+  display: list-item;
+}
+
+/* disabled styles */
+
+.select2-container.select2-container-disabled .select2-choice {
+    background-color: #f4f4f4;
+    background-image: none;
+    border: 1px solid #ddd;
+    cursor: default;
+}
+
+.select2-container.select2-container-disabled .select2-choice div {
+    background-color: #f4f4f4;
+    background-image: none;
+    border-left: 0;
+}
+
+
+/* multiselect */
+
+.select2-container-multi .select2-choices {
+    background-color: #fff;
+      background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff));
+      background-image: -webkit-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+      background-image: -moz-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+      background-image: -o-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+      background-image: -ms-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+      background-image: linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+      border: 1px solid #aaa;
+      margin: 0;
+      padding: 0;
+      cursor: text;
+      overflow: hidden;
+      height: auto !important;
+      height: 1%;
+      position: relative;
+}
+
+.select2-container-multi .select2-choices {
+    min-height: 26px;
+}
+
+.select2-container-multi.select2-container-active .select2-choices {
+    -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3);
+    -moz-box-shadow   : 0 0 5px rgba(0,0,0,.3);
+    -o-box-shadow     : 0 0 5px rgba(0,0,0,.3);
+    box-shadow        : 0 0 5px rgba(0,0,0,.3);
+    border: 1px solid #5897fb;
+    outline: none;
+}
+.select2-container-multi .select2-choices li {
+  float: left;
+  list-style: none;
+}
+.select2-container-multi .select2-choices .select2-search-field {
+  white-space: nowrap;
+  margin: 0;
+  padding: 0;
+}
+
+.select2-container-multi .select2-choices .select2-search-field input {
+  color: #666;
+  background: transparent !important;
+  font-family: sans-serif;
+  font-size: 100%;
+  height: 15px;
+  padding: 5px;
+  margin: 1px 0;
+  outline: 0;
+  border: 0;
+  -webkit-box-shadow: none;
+  -moz-box-shadow   : none;
+  -o-box-shadow     : none;
+  box-shadow        : none;
+}
+
+.select2-container-multi .select2-choices .select2-search-field input.select2-active {
+    background: #fff url('spinner.gif') no-repeat 100% !important;
+}
+
+.select2-default {
+  color: #999 !important;
+}
+
+.select2-container-multi .select2-choices .select2-search-choice {
+  -webkit-border-radius: 3px;
+  -moz-border-radius   : 3px;
+  border-radius        : 3px;
+  -moz-background-clip   : padding;
+  -webkit-background-clip: padding-box;
+  background-clip        : padding-box;
+  background-color: #e4e4e4;
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f4f4f4', endColorstr='#eeeeee', GradientType=0 );
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
+  background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  background-image: -o-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  background-image: -ms-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  background-image: linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  -webkit-box-shadow: 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
+  -moz-box-shadow   : 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
+  box-shadow        : 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
+  color: #333;
+  border: 1px solid #aaaaaa;
+  line-height: 13px;
+  padding: 3px 5px 3px 18px;
+  margin: 3px 0 3px 5px;
+  position: relative;
+  cursor: default;
+}
+.select2-container-multi .select2-choices .select2-search-choice span {
+  cursor: default;
+}
+.select2-container-multi .select2-choices .select2-search-choice-focus {
+  background: #d4d4d4;
+}
+
+.select2-search-choice-close {
+  display: block;
+  position: absolute;
+  right: 3px;
+  top: 4px;
+  width: 12px;
+  height: 13px;
+  font-size: 1px;
+  background: url('select2.png') right top no-repeat;
+  outline: none;
+}
+
+.select2-container-multi .select2-search-choice-close {
+  left: 3px;
+}
+
+
+.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover {
+  background-position: right -11px;
+}
+.select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close {
+  background-position: right -11px;
+}
+
+/* disabled styles */
+
+.select2-container-multi.select2-container-disabled .select2-choices{
+    background-color: #f4f4f4;
+    background-image: none;
+    border: 1px solid #ddd;
+    cursor: default;
+}
+
+.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice {
+    background-image: none;
+    background-color: #f4f4f4;
+    border: 1px solid #ddd;
+    padding: 3px 5px 3px 5px;
+}
+
+.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice .select2-search-choice-close {
+    display: none;
+}
+/* end multiselect */
+
+.select2-result-selectable .select2-match,
+.select2-result-unselectable .select2-result-selectable .select2-match { text-decoration: underline; }
+.select2-result-unselectable .select2-match { text-decoration: none; }
+
+.select2-offscreen { position: absolute; left: -10000px; }
+
+/* Retina-ize icons */
+
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+	.select2-search input, .select2-search-choice-close, .select2-container .select2-choice abbr, .select2-container .select2-choice div b {
+		background-image: url(select2x2.png) !important;
+		background-repeat: no-repeat !important;
+		background-size: 60px 40px !important;
+	}
+	.select2-search input {
+		background-position: 100% -21px !important;
+	}
+}

addons/base_import/static/src/css/import.css

@@ -0,0 +1,57 @@
+.openerp .oe_list_buttons .oe_alternative {
+    visibility: visible;
+}
+.openerp .oe_list_buttons.oe_editing .oe_list_button_import {
+    display: none;
+}
+
+.oe_import dd,
+.oe_import .oe_import_toggled,
+.oe_import .oe_import_grid,
+.oe_import .oe_import_error_report,
+.oe_import .oe_import_with_file,
+.oe_import .oe_import_noheaders {
+    display: none;
+}
+
+.oe_import.oe_import_preview .oe_import_grid {
+    display: table;
+}
+.oe_import.oe_import_error .oe_import_error_report,
+.oe_import.oe_import_with_file .oe_import_with_file,
+.oe_import.oe_import_noheaders .oe_import_noheaders {
+    display: block;
+}
+
+.oe_import .oe_import_error_report ul .oe_import_report_error {
+    background-color: #FFD9DB;
+}
+.oe_import .oe_import_error_report ul .oe_import_report_warning {
+    background-color: #FEFFD9;
+}
+
+.oe_import .oe_import_noheaders {
+    color: #888;
+}
+
+.oe_import a.oe_import_toggle {
+    display: block;
+}
+.oe_import a.oe_import_toggle:before {
+    content: '> '
+}
+
+.oe_import .oe_import_options p {
+    margin: 0;
+    padding: 0;
+}
+.oe_import .oe_import_options label {
+    display: inline-block;
+    width: 10em;
+    text-align: right;
+}
+
+.oe_import_selector ul,
+.oe_import_selector li {
+    margin: 0; padding: 0;
+}

addons/base_import/static/src/js/import.js

@@ -0,0 +1,291 @@
+openerp.base_import = function (instance) {
+    var QWeb = instance.web.qweb;
+    var _t = instance.web._t;
+    var _lt = instance.web._lt;
+
+    /**
+     * Safari does not deal well at all with raw JSON data being
+     * returned. As a result, we're going to cheat by using a
+     * pseudo-jsonp: instead of getting JSON data in the iframe, we're
+     * getting a ``script`` tag which consists of a function call and
+     * the returned data (the json dump).
+     *
+     * The function is an auto-generated name bound to ``window``,
+     * which calls back into the callback provided here.
+     *
+     * @param {Object} form the form element (DOM or jQuery) to use in the call
+     * @param {Object} attributes jquery.form attributes object
+     * @param {Function} callback function to call with the returned data
+     */
+    function jsonp(form, attributes, callback) {
+        attributes = attributes || {};
+        var options = {jsonp: _.uniqueId('import_callback_')};
+        window[options.jsonp] = function () {
+            delete window[options.jsonp];
+            callback.apply(null, arguments);
+        };
+        if ('data' in attributes) {
+            _.extend(attributes.data, options);
+        } else {
+            _.extend(attributes, {data: options});
+        }
+        _.extend(attributes, {
+            dataType: 'script',
+        });
+        $(form).ajaxSubmit(attributes);
+    }
+
+    // if true, the 'Import', 'Export', etc... buttons will be shown
+    instance.web.ListView.prototype.defaults.import_enabled = true;
+    instance.web.ListView.include({
+        on_loaded: function () {
+            var self = this;
+            var add_button = false;
+            if (!this.$buttons) {
+                add_button = true;
+            }
+            this._super.apply(this, arguments);
+            if(add_button) {
+                this.$buttons.on('click', '.oe_list_button_import', function() {
+                    new instance.web.DataImport(self, self.dataset).open();
+                    return false;
+                });
+            }
+        }
+    });
+
+    instance.web.DataImport = instance.web.Dialog.extend({
+        template: 'ImportView',
+        dialog_title: _lt("Import Data"),
+        opts: [
+            {name: 'encoding', label: _lt("Encoding:"), value: 'utf-8'},
+            {name: 'separator', label: _lt("Separator:"), value: ','},
+            {name: 'quoting', label: _lt("Quoting:"), value: '"'}
+        ],
+        events: {
+            'change .oe_import_grid input': 'import_dryrun',
+            'change input.oe_import_file': 'file_update',
+            'change input.oe_import_has_header, .oe_import_options input': 'settings_updated',
+            'click a.oe_import_csv': function (e) {
+                e.preventDefault();
+            },
+            'click a.oe_import_export': function (e) {
+                e.preventDefault();
+            },
+            'click a.oe_import_toggle': function (e) {
+                e.preventDefault();
+                var $el = $(e.target);
+                ($el.next().length
+                        ? $el.next()
+                        : $el.parent().next())
+                    .toggle();
+            }
+        },
+        init: function (parent, dataset) {
+            var self = this;
+            this._super(parent, {
+                buttons: [
+                    {text: _t("Import File"), click: function () {
+                        self.do_import();
+                    }, 'class': 'oe_import_dialog_button'}
+                ]
+            });
+            this.res_model = parent.model;
+            // import object id
+            this.id = null;
+            this.Import = new instance.web.Model('base_import.import');
+        },
+        start: function () {
+            var self = this;
+            return this.Import.call('create', [{
+                'res_model': this.res_model
+            }]).then(function (id) {
+                self.id = id;
+                self.$('input[name=import_id]').val(id);
+            });
+        },
+
+        import_options: function () {
+            var self = this;
+            var options = {
+                headers: this.$('input.oe_import_has_header').prop('checked')
+            };
+            _(this.opts).each(function (opt) {
+                options[opt.name] =
+                    self.$('input.oe_import_' + opt.name).val();
+            });
+            return options;
+        },
+
+        //- File & settings change section
+        file_update: function (e) {
+            if (!this.$('input.oe_import_file').val()) { return; }
+
+            this.$el.removeClass('oe_import_preview oe_import_error');
+            jsonp(this.$el, {
+                url: '/base_import/set_file'
+            }, this.proxy('settings_updated'));
+        },
+        settings_updated: function () {
+            this.$el.addClass('oe_import_with_file');
+            // TODO: test that write // succeeded?
+            this.Import.call(
+                'parse_preview', [this.id, this.import_options()])
+                .then(this.proxy('preview'));
+        },
+        preview: function (result) {
+            this.$el.toggleClass(
+                'oe_import_noheaders',
+                !this.$('input.oe_import_has_header').prop('checked'));
+            if (result.error) {
+                this.$el.addClass('oe_import_error');
+                this.$('.oe_import_error_report').html(
+                    QWeb.render('ImportView.preview.error', result));
+                return;
+            }
+            this.$el.addClass('oe_import_preview');
+            this.$('table').html(QWeb.render('ImportView.preview', result));
+
+            var $fields = this.$('.oe_import_fields input');
+            this.render_fields_matches(result, $fields);
+            var data = this.generate_fields_completion(result);
+            var item_finder = function (id, items) {
+                items = items || data;
+                for (var i=0; i < items.length; ++i) {
+                    var item = items[i];
+                    if (item.id === id) {
+                        return item;
+                    }
+                    var val;
+                    if (item.children && (val = item_finder(id, item.children))) {
+                        return val;
+                    }
+                }
+                return '';
+            };
+            $fields.select2({
+                allowClear: true,
+                minimumInputLength: 0,
+                data: data,
+                initSelection: function (element, callback) {
+                    var default_value = element.val();
+                    if (!default_value) {
+                        callback('');
+                        return;
+                    }
+
+                    callback(item_finder(default_value));
+                },
+
+                width: 'resolve',
+                dropdownCssClass: 'oe_import_selector'
+            });
+            this.import_dryrun();
+        },
+        generate_fields_completion: function (root) {
+            var basic = [];
+            var regulars = [];
+            var o2m = [];
+            function traverse(field, ancestors, collection) {
+                var subfields = field.fields;
+                var field_path = ancestors.concat(field);
+                var label = _(field_path).pluck('string').join(' / ');
+                var id = _(field_path).pluck('name').join('/');
+
+                // If non-relational, m2o or m2m, collection is regulars
+                if (!collection) {
+                    if (field.name === 'id') {
+                        collection = basic
+                    } else if (_.isEmpty(subfields)
+                            || _.isEqual(_.pluck(subfields, 'name'), ['id', '.id'])) {
+                        collection = regulars;
+                    } else {
+                        collection = o2m;
+                    }
+                }
+
+                collection.push({
+                    id: id,
+                    text: label,
+                    required: field.required
+                });
+
+                for(var i=0, end=subfields.length; i<end; ++i) {
+                    traverse(subfields[i], field_path, collection);
+                }
+            }
+            _(root.fields).each(function (field) {
+                traverse(field, []);
+            });
+
+            var cmp = function (field1, field2) {
+                return field1.text.localeCompare(field2.text);
+
+            };
+            regulars.sort(cmp);
+            o2m.sort(cmp);
+            return basic.concat([
+                { text: _t("Normal Fields"), children: regulars },
+                { text: _t("Relation Fields"), children: o2m }
+            ]);
+        },
+        render_fields_matches: function (result, $fields) {
+            if (_(result.matches).isEmpty()) { return; }
+            $fields.each(function (index, input) {
+                var match = result.matches[index];
+                if (!match) { return; }
+
+                var current_field = result;
+                input.value = _(match).chain()
+                    .map(function (name) {
+                        // WARNING: does both mapping and folding (over the
+                        //          ``field`` iterator variable)
+                        return current_field = _(current_field.fields).find(function (subfield) {
+                            return subfield.name === name;
+                        });
+                    })
+                    .pluck('name')
+                    .value()
+                    .join('/');
+            });
+        },
+
+        //- import itself
+        call_import: function (options) {
+            var self = this;
+            var fields = this.$('.oe_import_fields input.oe_import_match_field').map(function (index, el) {
+                return $(el).select2('val') || false;
+            }).get();
+            return this.Import.call(
+                'do', [this.id, fields, this.import_options()], options);
+        },
+        import_dryrun: function () {
+//            this.call_import({ dryrun: true })
+//                .then(this.proxy('render_import_errors'));
+        },
+        do_import: function () {
+            var self = this;
+            this.call_import({ dryrun: false }).then(function (errors) {
+                if (_.isEmpty(errors)) {
+                    if (self.getParent().reload_content) {
+                        self.getParent().reload_content();
+                    }
+                    self.close();
+                    return;
+                }
+                self.render_import_errors(errors);
+            });
+        },
+        render_import_errors: function (errors) {
+            if (_.isEmpty(errors)) {
+                this.$el.removeClass('oe_import_error');
+                return;
+            }
+            // import failed (or maybe just warnings, if we ever get
+            // warnings?)
+            this.$el.addClass('oe_import_error');
+            this.$('.oe_import_error_report').html(
+                QWeb.render('ImportView.error', {errors: errors}));
+        },
+    });
+};

addons/base_import/static/src/xml/import.xml

@@ -0,0 +1,103 @@
+<templates>
+    <t t-name="ImportView">
+        <t t-set="_id" t-value="_.uniqueId('export')"/>
+        <form action="" method="post" enctype="multipart/form-data" class="oe_import">
+            <input type="hidden" name="session_id"
+                   t-att-value="widget.session.session_id"/>
+            <input type="hidden" name="import_id"/>
+            <h2>Upload your file</h2>
+            <p>Select the <a href="#" class="oe_import_csv">.CSV</a>
+            file to import. If you need a sample importable file, you
+            can use <a href="#" class="oe_import_export">the export
+            tool</a> to generate one.</p>
+            <label t-attf-for="file_#{_id}" autofocus="autofocus">CSV File:</label>
+            <input type="file" id-attf-id="file_#{_id}"
+                   name="file" class="oe_import_file"/>
+
+            <div class="oe_import_with_file">
+                <h2>Map your data to OpenERP</h2>
+                <input type="checkbox" class="oe_import_has_header"
+                       id="oe_import_has_header" checked="checked"/>
+                <label for="oe_import_has_header">The first row of the
+                file contains the label of the column</label>
+                <p class="oe_import_noheaders">If the file contains
+                the column names, OpenERP can try auto-detecting the
+                field corresponding to the column. This makes imports
+                simpler especially when the file has many columns.</p>
+
+                <div class="oe_import_error_report"></div>
+                <table class="oe_import_grid" width="100%"/>
+                <a href="#" class="oe_import_toggle">
+                    File Format Options…</a>
+                <div class="oe_import_toggled oe_import_options">
+                    <p t-foreach="widget.opts" t-as="option">
+                        <!-- no @name, avoid submission when file_update called -->
+                        <label t-attf-for="#{option.name}_#{_id}">
+                            <t t-esc="option.label"/></label>
+                        <input t-attf-id="#{option.name}_#{_id}"
+                               t-attf-class="oe_import_#{option.name}"
+                               t-att-value="option.value"/>
+                    </p>
+                </div>
+
+                <h2>Frequently Asked Questions</h2>
+                <dl>
+                    <dt><a href="#" class="oe_import_toggle">
+                        Need to import data from an other application?</a></dt>
+                    <dd>
+                        <p>In order to re-create relationships between
+                        different records, you should use the unique
+                        identifier from the original application and
+                        map it to the <abbr title="External ID">ID</abbr>
+                        column in OpenERP. When you
+                        import an other record that links to the first
+                        one, use <abbr title="XXX/External ID">XXX/ID</abbr>
+                        to the original unique identifier.</p>
+                        <p>The <abbr title="External ID">ID</abbr>
+                        will also be used to update the original
+                        import if you need to re-import modified data
+                        later, it's thus good practice to specify it
+                        whenever possible</p>
+                    </dd>
+                </dl>
+            </div>
+        </form>
+    </t>
+    <t t-name="ImportView.preview">
+        <tr t-if="headers" class="oe_import_grid-header">
+            <td t-foreach="headers" t-as="header" class="oe_import_grid-cell"
+                ><t t-esc="header"/></td>
+        </tr>
+        <tr class="oe_import_fields">
+            <!-- Iterate on first row to ensure we have all columns -->
+            <td t-foreach="preview[0]" t-as="column">
+                <input placeholder="Don't Import"
+                       class="oe_import_match_field"/>
+            </td>
+        </tr>
+        <tr t-foreach="preview" t-as="row" class="oe_import_grid-row">
+            <td t-foreach="row" t-as="cell" class="oe_import_grid-cell"
+                ><t t-esc="cell"/></td>
+        </tr>
+    </t>
+    <t t-name="ImportView.preview.error">
+        <p>Import preview failed due to: <t t-esc="error"/></p>
+        <p>Here is the start of the file we could not import:</p>
+        <pre><t t-esc="preview"/></pre>
+    </t>
+    <ul t-name="ImportView.error">
+        <li t-foreach="errors" t-as="error" t-attf-class="oe_import_report_#{error.type}">
+            <!-- can also have error.record, but may be *huge* if
+                 e.g. has image fields -->
+            <t t-esc="error.message"/>
+        </li>
+    </ul>
+    <t t-extend="ListView.buttons">
+        <t t-jquery="span.oe_alternative">
+            this.attr('t-if', 'widget.options.import_enabled');
+        </t>
+        <t t-jquery="span.oe_alternative" t-operation="append">
+            <a href="#" class="oe_bold oe_list_button_import">Import</a>
+        </t>
+    </t>
+</templates>

addons/base_import/test_models.py

@@ -0,0 +1,101 @@
+from openerp.osv import orm, fields
+
+def name(n): return 'base_import.tests.models.%s' % n
+
+class char(orm.Model):
+    _name = name('char')
+
+    _columns = {
+        'value': fields.char('unknown', size=None)
+    }
+
+class char_required(orm.Model):
+    _name = name('char.required')
+
+    _columns = {
+        'value': fields.char('unknown', size=None, required=True)
+    }
+
+class char_readonly(orm.Model):
+    _name = name('char.readonly')
+
+    _columns = {
+        'value': fields.char('unknown', size=None, readonly=True)
+    }
+
+class char_states(orm.Model):
+    _name = name('char.states')
+
+    _columns = {
+        'value': fields.char('unknown', size=None, readonly=True, states={'draft': [('readonly', False)]})
+    }
+
+class char_noreadonly(orm.Model):
+    _name = name('char.noreadonly')
+
+    _columns = {
+        'value': fields.char('unknown', size=None, readonly=True, states={'draft': [('invisible', True)]})
+    }
+
+class char_stillreadonly(orm.Model):
+    _name = name('char.stillreadonly')
+
+    _columns = {
+        'value': fields.char('unknown', size=None, readonly=True, states={'draft': [('readonly', True)]})
+    }
+
+# TODO: complex field (m2m, o2m, m2o)
+class m2o(orm.Model):
+    _name = name('m2o')
+
+    _columns = {
+        'value': fields.many2one(name('m2o.related'))
+    }
+class m2o_related(orm.Model):
+    _name = name('m2o.related')
+
+    _columns = {
+        'value': fields.integer()
+    }
+    _defaults = {
+        'value': 42
+    }
+
+class m2o_required(orm.Model):
+    _name = name('m2o.required')
+
+    _columns = {
+        'value': fields.many2one(name('m2o.required.related'), required=True)
+    }
+class m2o_required_related(orm.Model):
+    _name = name('m2o.required.related')
+
+    _columns = {
+        'value': fields.integer()
+    }
+    _defaults = {
+        'value': 42
+    }
+
+class o2m(orm.Model):
+    _name = name('o2m')
+
+    _columns = {
+        'value': fields.one2many(name('o2m.child'), 'parent_id')
+    }
+class o2m_child(orm.Model):
+    _name = name('o2m.child')
+
+    _columns = {
+        'parent_id': fields.many2one(name('o2m')),
+        'value': fields.integer()
+    }
+
+class preview_model(orm.Model):
+    _name = name('preview')
+
+    _columns = {
+        'name': fields.char('Name', size=None),
+        'somevalue': fields.integer('Some Value', required=True),
+        'othervalue': fields.integer('Other Variable'),
+    }

addons/base_import/tests/__init__.py

@@ -0,0 +1,3 @@
+from . import test_cases
+
+checks = [test_cases]

addons/base_import/tests/test_cases.py

@@ -0,0 +1,342 @@
+# -*- encoding: utf-8 -*-
+import unittest2
+from openerp.tests.common import TransactionCase
+
+from .. import models
+
+ID_FIELD = {'id': 'id', 'name': 'id', 'string': "External ID", 'required': False, 'fields': []}
+def make_field(name='value', string='unknown', required=False, fields=[]):
+    return [
+        ID_FIELD,
+        {'id': name, 'name': name, 'string': string, 'required': required, 'fields': fields},
+    ]
+
+class test_basic_fields(TransactionCase):
+    def get_fields(self, field):
+        return self.registry('base_import.import')\
+            .get_fields(self.cr, self.uid, 'base_import.tests.models.' + field)
+
+    def test_base(self):
+        """ A basic field is not required """
+        self.assertEqual(self.get_fields('char'), make_field())
+
+    def test_required(self):
+        """ Required fields should be flagged (so they can be fill-required) """
+        self.assertEqual(self.get_fields('char.required'), make_field(required=True))
+
+    def test_readonly(self):
+        """ Readonly fields should be filtered out"""
+        self.assertEqual(self.get_fields('char.readonly'), [ID_FIELD])
+
+    def test_readonly_states(self):
+        """ Readonly fields with states should not be filtered out"""
+        self.assertEqual(self.get_fields('char.states'), make_field())
+
+    def test_readonly_states_noreadonly(self):
+        """ Readonly fields with states having nothing to do with
+        readonly should still be filtered out"""
+        self.assertEqual(self.get_fields('char.noreadonly'), [ID_FIELD])
+
+    def test_readonly_states_stillreadonly(self):
+        """ Readonly fields with readonly states leaving them readonly
+        always... filtered out"""
+        self.assertEqual(self.get_fields('char.stillreadonly'), [ID_FIELD])
+
+    def test_m2o(self):
+        """ M2O fields should allow import of themselves (name_get),
+        their id and their xid"""
+        self.assertEqual(self.get_fields('m2o'), make_field(fields=[
+            {'id': 'value', 'name': 'id', 'string': 'External ID', 'required': False, 'fields': []},
+            {'id': 'value', 'name': '.id', 'string': 'Database ID', 'required': False, 'fields': []},
+        ]))
+    
+    def test_m2o_required(self):
+        """ If an m2o field is required, its three sub-fields are
+        required as well (the client has to handle that: requiredness
+        is id-based)
+        """
+        self.assertEqual(self.get_fields('m2o.required'), make_field(required=True, fields=[
+            {'id': 'value', 'name': 'id', 'string': 'External ID', 'required': True, 'fields': []},
+            {'id': 'value', 'name': '.id', 'string': 'Database ID', 'required': True, 'fields': []},
+        ]))
+
+class test_o2m(TransactionCase):
+    def get_fields(self, field):
+        return self.registry('base_import.import')\
+            .get_fields(self.cr, self.uid, 'base_import.tests.models.' + field)
+
+    def test_shallow(self):
+        self.assertEqual(self.get_fields('o2m'), make_field(fields=[
+            {'id': 'id', 'name': 'id', 'string': 'External ID', 'required': False, 'fields': []},
+            # FIXME: should reverse field be ignored?
+            {'id': 'parent_id', 'name': 'parent_id', 'string': 'unknown', 'required': False, 'fields': [
+                {'id': 'parent_id', 'name': 'id', 'string': 'External ID', 'required': False, 'fields': []},
+                {'id': 'parent_id', 'name': '.id', 'string': 'Database ID', 'required': False, 'fields': []},
+            ]},
+            {'id': 'value', 'name': 'value', 'string': 'unknown', 'required': False, 'fields': []},
+        ]))
+
+class test_match_headers_single(TransactionCase):
+    def test_match_by_name(self):
+        match = self.registry('base_import.import')._match_header(
+            'f0', [{'name': 'f0'}], {})
+
+        self.assertEqual(match, [{'name': 'f0'}])
+
+    def test_match_by_string(self):
+        match = self.registry('base_import.import')._match_header(
+            'some field', [{'name': 'bob', 'string': "Some Field"}], {})
+
+        self.assertEqual(match, [{'name': 'bob', 'string': "Some Field"}])
+
+    def test_nomatch(self):
+        match = self.registry('base_import.import')._match_header(
+            'should not be', [{'name': 'bob', 'string': "wheee"}], {})
+
+        self.assertEqual(match, [])
+
+    def test_recursive_match(self):
+        f = {
+            'name': 'f0',
+            'string': "My Field",
+            'fields': [
+                {'name': 'f0', 'string': "Sub field 0", 'fields': []},
+                {'name': 'f1', 'string': "Sub field 2", 'fields': []},
+            ]
+        }
+        match = self.registry('base_import.import')._match_header(
+            'f0/f1', [f], {})
+
+        self.assertEqual(match, [f, f['fields'][1]])
+
+    def test_recursive_nomatch(self):
+        """ Match first level, fail to match second level
+        """
+        f = {
+            'name': 'f0',
+            'string': "My Field",
+            'fields': [
+                {'name': 'f0', 'string': "Sub field 0", 'fields': []},
+                {'name': 'f1', 'string': "Sub field 2", 'fields': []},
+            ]
+        }
+        match = self.registry('base_import.import')._match_header(
+            'f0/f2', [f], {})
+
+        self.assertEqual(match, [])
+
+class test_match_headers_multiple(TransactionCase):
+    def test_noheaders(self):
+        self.assertEqual(
+            self.registry('base_import.import')._match_headers(
+                [], [], {}),
+            (None, None)
+        )
+    def test_nomatch(self):
+        self.assertEqual(
+            self.registry('base_import.import')._match_headers(
+                iter([
+                    ['foo', 'bar', 'baz', 'qux'],
+                    ['v1', 'v2', 'v3', 'v4'],
+                ]),
+                [],
+                {'headers': True}),
+            (
+                ['foo', 'bar', 'baz', 'qux'],
+                dict.fromkeys(range(4))
+            )
+        )
+
+    def test_mixed(self):
+        self.assertEqual(
+            self.registry('base_import.import')._match_headers(
+                iter(['foo bar baz qux/corge'.split()]),
+                [
+                    {'name': 'bar', 'string': 'Bar'},
+                    {'name': 'bob', 'string': 'Baz'},
+                    {'name': 'qux', 'string': 'Qux', 'fields': [
+                        {'name': 'corge', 'fields': []},
+                     ]}
+                ],
+                {'headers': True}),
+            (['foo', 'bar', 'baz', 'qux/corge'], {
+                0: None,
+                1: ['bar'],
+                2: ['bob'],
+                3: ['qux', 'corge'],
+            })
+        )
+
+class test_preview(TransactionCase):
+    def make_import(self):
+        Import = self.registry('base_import.import')
+        id = Import.create(self.cr, self.uid, {
+            'res_model': 'res.users',
+            'file': u"로그인,언어\nbob,1\n".encode('euc_kr'),
+        })
+        return Import, id
+
+    def test_encoding(self):
+        Import, id = self.make_import()
+        result = Import.parse_preview(self.cr, self.uid, id, {
+                'quoting': '"',
+                'separator': ',',
+        })
+        self.assertTrue('error' in result)
+
+    def test_csv_errors(self):
+        Import, id = self.make_import()
+
+        result = Import.parse_preview(self.cr, self.uid, id, {
+                'quoting': 'foo',
+                'separator': ',',
+                'encoding': 'euc_kr',
+        })
+        self.assertTrue('error' in result)
+
+    def test_csv_errors(self):
+        Import, id = self.make_import()
+
+        result = Import.parse_preview(self.cr, self.uid, id, {
+                'quoting': '"',
+                'separator': 'bob',
+                'encoding': 'euc_kr',
+        })
+        self.assertTrue('error' in result)
+
+    def test_success(self):
+        Import = self.registry('base_import.import')
+        id = Import.create(self.cr, self.uid, {
+            'res_model': 'base_import.tests.models.preview',
+            'file': 'name,Some Value,Counter\n'
+                    'foo,1,2\n'
+                    'bar,3,4\n'
+                    'qux,5,6\n'
+        })
+
+        result = Import.parse_preview(self.cr, self.uid, id, {
+            'quoting': '"',
+            'separator': ',',
+            'headers': True,
+        })
+
+        self.assertEqual(result['matches'], {0: ['name'], 1: ['somevalue'], 2: None})
+        self.assertEqual(result['headers'], ['name', 'Some Value', 'Counter'])
+        # Order depends on iteration order of fields_get
+        self.assertItemsEqual(result['fields'], [
+            {'id': 'id', 'name': 'id', 'string': 'External ID', 'required':False, 'fields': []},
+            {'id': 'name', 'name': 'name', 'string': 'Name', 'required':False, 'fields': []},
+            {'id': 'somevalue', 'name': 'somevalue', 'string': 'Some Value', 'required':True, 'fields': []},
+            {'id': 'othervalue', 'name': 'othervalue', 'string': 'Other Variable', 'required':False, 'fields': []},
+        ])
+        self.assertEqual(result['preview'], [
+            ['foo', '1', '2'],
+            ['bar', '3', '4'],
+            ['qux', '5', '6'],
+        ])
+        # Ensure we only have the response fields we expect
+        self.assertItemsEqual(result.keys(), ['matches', 'headers', 'fields', 'preview'])
+
+class test_convert_import_data(TransactionCase):
+    """ Tests conversion of base_import.import input into data which
+    can be fed to Model.import_data
+    """
+    def test_all(self):
+        Import = self.registry('base_import.import')
+        id = Import.create(self.cr, self.uid, {
+            'res_model': 'base_import.tests.models.preview',
+            'file': 'name,Some Value,Counter\n'
+                    'foo,1,2\n'
+                    'bar,3,4\n'
+                    'qux,5,6\n'
+        })
+        record = Import.browse(self.cr, self.uid, id)
+        data, fields = Import._convert_import_data(
+            record, ['name', 'somevalue', 'othervalue'],
+            {'quoting': '"', 'separator': ',', 'headers': True,})
+
+        self.assertItemsEqual(fields, ['name', 'somevalue', 'othervalue'])
+        self.assertItemsEqual(data, [
+            ('foo', '1', '2'),
+            ('bar', '3', '4'),
+            ('qux', '5', '6'),
+        ])
+
+    def test_filtered(self):
+        """ If ``False`` is provided as field mapping for a column,
+        that column should be removed from importable data
+        """
+        Import = self.registry('base_import.import')
+        id = Import.create(self.cr, self.uid, {
+            'res_model': 'base_import.tests.models.preview',
+            'file': 'name,Some Value,Counter\n'
+                    'foo,1,2\n'
+                    'bar,3,4\n'
+                    'qux,5,6\n'
+        })
+        record = Import.browse(self.cr, self.uid, id)
+        data, fields = Import._convert_import_data(
+            record, ['name', False, 'othervalue'],
+            {'quoting': '"', 'separator': ',', 'headers': True,})
+
+        self.assertItemsEqual(fields, ['name', 'othervalue'])
+        self.assertItemsEqual(data, [
+            ('foo', '2'),
+            ('bar', '4'),
+            ('qux', '6'),
+        ])
+
+    def test_norow(self):
+        """ If a row is composed only of empty values (due to having
+        filtered out non-empty values from it), it should be removed
+        """
+        Import = self.registry('base_import.import')
+        id = Import.create(self.cr, self.uid, {
+            'res_model': 'base_import.tests.models.preview',
+            'file': 'name,Some Value,Counter\n'
+                    'foo,1,2\n'
+                    ',3,\n'
+                    ',5,6\n'
+        })
+        record = Import.browse(self.cr, self.uid, id)
+        data, fields = Import._convert_import_data(
+            record, ['name', False, 'othervalue'],
+            {'quoting': '"', 'separator': ',', 'headers': True,})
+
+        self.assertItemsEqual(fields, ['name', 'othervalue'])
+        self.assertItemsEqual(data, [
+            ('foo', '2'),
+            ('', '6'),
+        ])
+
+    def test_nofield(self):
+        Import = self.registry('base_import.import')
+
+        id = Import.create(self.cr, self.uid, {
+            'res_model': 'base_import.tests.models.preview',
+            'file': 'name,Some Value,Counter\n'
+                    'foo,1,2\n'
+        })
+
+        record = Import.browse(self.cr, self.uid, id)
+        self.assertRaises(
+            ValueError,
+            Import._convert_import_data,
+            record, [],
+            {'quoting': '"', 'separator': ',', 'headers': True,})
+
+    def test_falsefields(self):
+        Import = self.registry('base_import.import')
+
+        id = Import.create(self.cr, self.uid, {
+            'res_model': 'base_import.tests.models.preview',
+            'file': 'name,Some Value,Counter\n'
+                    'foo,1,2\n'
+        })
+
+        record = Import.browse(self.cr, self.uid, id)
+        self.assertRaises(
+            ValueError,
+            Import._convert_import_data,
+            record, [False, False, False],
+            {'quoting': '"', 'separator': ',', 'headers': True,})

addons/base_setup/res_config.py

@@ -35,6 +35,7 @@ class base_config_settings(osv.osv_memory):
         'module_auth_anonymous': fields.boolean('activate the public portal',
             help="""Enable the public part of openerp, openerp becomes a public website."""),
         'module_auth_oauth': fields.boolean('use external authentication providers, sign in with google, facebook, ...'),
+        'module_base_import': fields.boolean("Allow users to import data from CSV files"),
     }
 
     def open_company(self, cr, uid, ids, context=None):

addons/base_setup/res_config_view.xml

@@ -14,9 +14,10 @@
                     </header>
                     <separator string="General Settings"/>
                     <div>
-                        <label string="You will also find several configuration options on your company data:
-                            address for the header and footer, overdue payments texts, etc."/>
-                        <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute" class="oe_inline oe_link"/>
+                        <p>
+                            <label string="You will find more options in your company details: address for the header and footer, overdue payments texts, etc."/>
+                            <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute" class="oe_inline oe_link"/>
+                        </p>
                     </div>
                     <group>
                         <label for="id" string="Options"/>
@@ -59,6 +60,15 @@
                             </div>
                         </div>
                     </group>
+                    <group>
+                        <label for="id" string="Import / Export"/>
+                        <div>
+                            <div>
+                                <field name="module_base_import" class="oe_inline"/>
+                                <label for="module_base_import"/>
+                            </div>
+                        </div>
+                    </group>
                 </form>
             </field>
         </record>

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',

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"/>

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')]),
     }

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>

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):
         """

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):

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>

addons/email_template/wizard/mail_compose_message.py

@@ -51,9 +51,11 @@ class mail_compose_message(osv.osv_memory):
             context = {}
         result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context)
         result['template_id'] = context.get('default_template_id', context.get('mail.compose.template_id', False))
-        # force html when using templates
+        # pre-render the template if any
         if result.get('use_template'):
-            result['content_subtype'] = 'html'
+            onchange_res = self.onchange_use_template(cr, uid, [], result.get('use_template'), result.get('template_id'),
+                result.get('composition_mode'), result.get('model'), result.get('res_id'), context=context)
+            result.update(onchange_res['value'])
         return result
 
     _columns = {

addons/email_template/wizard/mail_compose_message_view.xml

@@ -11,14 +11,14 @@
                     <xpath expr="//form/footer/button" position="before">
                         <field name="use_template" invisible="1"/>
                         <button icon="gtk-paste" type="object" name="toggle_template"
-                                string="" help="Use a message template" />
+                                string="" help="Use a message template" invisible="1"/>
                         <button icon="gtk-save" type="object" name="save_as_template"
-                                string="" help="Save as a new template"/>
+                                string="" help="Save as a new template" invisible="1"/>
                     </xpath>
                     <xpath expr="//form/notebook" position="after">
                         <group attrs="{'invisible':[('use_template','=',False)]}" colspan="4" col="4">
                             <field name="use_template" invisible="1"/>
-                            <field name="template_id" colspan="3"
+                            <field name="template_id" colspan="3" invisible="1"
                                 on_change="onchange_template_id(use_template, template_id, composition_mode, model, res_id, context)"/>
                         </group>
                     </xpath>

addons/hr/security/hr_security.xml

@@ -2,13 +2,19 @@
 <openerp>
     <data noupdate="1">
 
+    <record model="res.groups" id="base.group_user">
+        <field name="comment">the user will be able to manage his own human resources stuff (leave request, timesheets, ...), if he is linked to an employee in the system.</field>
+    </record>
+
     <record id="base.group_hr_user" model="res.groups">
         <field name="name">Officer</field>
         <field name="category_id" ref="base.module_category_human_resources"/>
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
+        <field name="comment">the user will be able to approve document created by employees.</field>
     </record>
     <record id="base.group_hr_manager" model="res.groups">
         <field name="name">Manager</field>
+        <field name="comment">the user will have an access to the human resources configuration as well as statistic reports.</field>
         <field name="category_id" ref="base.module_category_human_resources"/>
         <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>

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>

addons/l10n_ca/account_chart_en.xml

@@ -6,7 +6,6 @@
         <record id="chart0_en" model="account.account.template">
             <field name="code">0</field>
             <field name="name">Account Chart CA EN</field>
-            <field eval="0" name="parent_id"/>
             <field name="type">view</field>
             <field name="user_type" ref="account.data_account_type_view"/>
         </record>

addons/l10n_gr/account_chart.xml

@@ -7,7 +7,6 @@
         <record id="chartgr_0" model="account.account.template">
             <field name="code">0</field>
             <field name="name">Γενικό Λογιστικό Σχέδιο</field>
-            <!--<field eval="0" name="parent_id"/> -->
             <field name="type">view</field>
             <field name="user_type" ref="account_type_view"/>
         </record>

addons/l10n_gt/account_chart.xml

@@ -7,7 +7,6 @@
         <record id="plan_raiz" model="account.account.template">
             <field name="code">-</field>
             <field name="name">Plan contable de Guatemala (sencillo)</field>
-            <field eval="0" name="parent_id"/>
             <field name="type">view</field>
             <field name="user_type" ref="cuenta_vista"/>
         </record>

addons/l10n_hn/account_chart.xml

@@ -7,7 +7,6 @@
         <record id="plan_raiz" model="account.account.template">
             <field name="code">-</field>
             <field name="name">Plan contable de Honduras (sencillo)</field>
-            <field eval="0" name="parent_id"/>
             <field name="type">view</field>
             <field name="user_type" ref="cuenta_vista"/>
         </record>

addons/l10n_in/l10n_in_private_chart.xml

@@ -8,7 +8,6 @@
             <field name="name">Partnership/Private Firm Chart of Account</field>
             <field name="code">0</field>
             <field name="type">view</field>
-            <field eval="0" name="parent_id"/>
             <field name="user_type" ref="account.data_account_type_view"/>
             <field name="reconcile" eval="False"/>
         </record>
@@ -520,4 +519,4 @@
         
         
     </data>
-</openerp>
+</openerp>

addons/l10n_in/l10n_in_public_chart.xml

@@ -9,7 +9,6 @@
             <field name="name">Public Firm Chart of Account</field>
             <field name="code">0</field>
             <field name="type">view</field>
-			<field eval="0" name="parent_id"/>
             <field name="user_type" ref="account.data_account_type_view"/>
             <field name="reconcile" eval="False"/>
         </record>
@@ -673,4 +672,4 @@
         </record>
         
     </data>
-</openerp>
+</openerp>

addons/l10n_th/account_data.xml

@@ -26,7 +26,6 @@
 <record id="a_root" model="account.account.template">
     <field name="code">0</field>
     <field name="name">Simple chart of accounts</field>
-    <field name="parent_id" eval="False"/>
     <field name="type">view</field>
     <field name="user_type" ref="acc_type_view"/>
 </record>

addons/l10n_uy/account_chart_template.xml

@@ -4,7 +4,6 @@
         <record id="uy_code_0" model="account.account.template">
             <field name="code">0</field>
             <field name="type">view</field>
-            <field name="parent_id" eval="False"/>
             <field name="name">Uruguay - Plan de Cuentas</field>
             <field name="user_type" ref="type_view"/>
         </record>

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.

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;

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 */

addons/mail/static/src/js/mail.js

@@ -17,19 +17,13 @@ openerp.mail = function(session) {
      */
 
     session.web.FormView = session.web.FormView.extend({
-        // TDE FIXME TODO: CHECK WITH NEW BRANCH
         do_action: function(action, on_close) {
             if (action.res_model == 'mail.compose.message' &&
-                this.fields && this.fields.message_ids &&
-                this.fields.message_ids.view.get("actual_mode") != 'create') {
-                // debug
-                console.groupCollapsed('FormView do_action on mail.compose.message');
-                console.log('message_ids field:', this.fields.message_ids);
-                console.groupEnd();
-                var record_thread = this.fields.message_ids;
-                var thread = record_thread.thread;
-                thread.instantiate_composition_form('comment', true, false, 0, action.context);
-                return false;
+                action.context && action.context.redirect == true &&
+                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;
             }
             else {
                 return this._super(action, on_close);
@@ -37,35 +31,32 @@ openerp.mail = function(session) {
         },
     });
 
+
     /**
      * ------------------------------------------------------------
      * ChatterUtils
      * ------------------------------------------------------------
      * 
-     * This class holds a few tools method that will be used by
-     * the various Chatter widgets.
-     *
+     * This class holds a few tools method for Chatter.
      * Some regular expressions not used anymore, kept because I want to
      * - (^|\s)@((\w|@|\.)*): @login@log.log
-     *      1. '(void)'
-     *      2. login@log.log
      * - (^|\s)\[(\w+).(\w+),(\d)\|*((\w|[@ .,])*)\]: [ir.attachment,3|My Label],
      *   for internal links
-     *      1. '(void)'
-     *      2. 'ir'
-     *      3. 'attachment'
-     *      4. '3'
-     *      5. 'My Label'
      */
 
     mail.ChatterUtils = {
 
-        /** get an image in /web/binary/image?... */
-        get_image: function(session_prefix, session_id, model, field, id) {
-            return session_prefix + '/web/binary/image?session_id=' + session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
+        /** Get an image in /web/binary/image?... */
+        get_image: function(session, model, field, id) {
+            return session.prefix + '/web/binary/image?session_id=' + session.session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
         },
 
-        /** check if the current user is the message author */
+        /** Get the url of an attachment {'id': id} */
+        get_attachment_url: function (session, attachment) {
+            return session.origin + '/web/binary/saveas?session_id=' + session.session_id + '&model=ir.attachment&field=datas&filename_field=datas_fname&id=' + attachment['id'];
+        },
+
+        /** Check if the current user is the message author */
         is_author: function (widget, message_user_id) {
             return (widget.session && widget.session.uid != 0 && widget.session.uid == message_user_id);
         },
@@ -111,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
@@ -156,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, []);
         },
 
         /**
@@ -170,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',
-                    'model', 'res_id', 'parent_id', 'content_subtype'],
+                ['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();
+            });
         },
 
         /**
@@ -184,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);
         },
     }),
 
@@ -210,47 +252,48 @@ openerp.mail = function(session) {
 
         /**
          * @param {Object} parent parent
-         * @param {Object} [options]
-         * @param {Object} [options.context] context of the thread. It should
+         * @param {Array} [domain]
+         * @param {Object} [context] context of the thread. It should
             contain at least default_model, default_res_id. Please refer to
             the ComposeMessage widget for more information about it.
-         * @param {Number} [options.thread_level=0] number of thread levels
+         * @param {Object} [options]
          * @param {Number} [options.message_ids=null] ids for message_fetch
          * @param {Number} [options.message_data=null] already formatted message
             data, for subthreads getting data from their parent
-         * @param {Boolean} [options.composer] use the advanced composer, or
+         * @param {Number} [options.thread_level=0] number of thread levels
+         * @param {Boolean} [options.use_composer] use the advanced composer, or
             the default basic textarea if not set
          * @param {Number} [options.truncate_limit=250] number of character to
          *      display before having a "show more" link; note that the text
          *      will not be truncated if it does not have 110% of the parameter
          */
-        init: function(parent, options) {
+        init: function(parent, domain, context, options) {
             this._super(parent);
-            // options
-            this.options = options || {};
-            this.options.domain = options.domain || [];
-            this.options.context = _.extend({
+            this.domain = domain || [];
+            this.context = _.extend({
                 default_model: 'mail.thread',
                 default_res_id:  0,
-                default_parent_id: false }, options.context || {});
-            this.options.thread_level = options.thread_level || 0;
-            this.options.composer = options.composer || false;
-            this.options.message_ids = options.message_ids || null;
-            this.options.message_data = options.message_data || null;
+                default_parent_id: false }, context || {});
+            // options
+            this.options = {
+                message_ids: options.message_ids || null,
+                message_data: options.message_data || null,
+                thread_level: options.thread_level || 0,
+                use_composer: options.use_composer || false,
+                show_header_compose: options.show_header_compose != undefined ? options.show_header_compose: true,
+                show_record_name: options.show_record_name != undefined ? options.show_record_name: true,
+                show_reply: options.show_reply || false,
+                show_reply_by_email: options.show_reply_by_email || false,
+                show_dd_reply_by_email:options.show_dd_reply_by_email != undefined ? options.show_dd_reply_by_email: true,
+                show_dd_delete: options.show_dd_delete || false,
+                show_dd_hide: options.show_dd_hide || false,
+                show_more: options.show_more || false,
+                truncate_limit: options.truncate_limit || 250,
+            }
             // datasets and internal vars
-            this.ds_thread = new session.web.DataSetSearch(this, this.options.context.default_model);
+            this.ds_thread = new session.web.DataSetSearch(this, this.context.default_model);
             this.ds_notification = new session.web.DataSetSearch(this, 'mail.notification');
             this.ds_message = new session.web.DataSetSearch(this, 'mail.message');
-            // display customization vars
-            this.display = {
-                truncate_limit: options.truncate_limit || 250,
-                show_header_compose: options.show_header_compose || false,
-                show_reply: options.show_reply || false,
-                show_delete: options.show_delete || false,
-                show_hide: options.show_hide || false,
-                show_reply_by_email: options.show_reply_by_email || false,
-                show_more: options.show_more || false,
-            }
         },
         
         start: function() {
@@ -260,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;
@@ -270,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();
+            }
         },
 
         /**
@@ -278,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;
@@ -290,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({
@@ -334,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
@@ -357,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();
@@ -365,6 +405,11 @@ openerp.mail = function(session) {
             return compose_done;
         },
 
+        refresh_composition_form: function (context) {
+            if (! this.compose_message_widget) return;
+            return this.compose_message_widget.refresh(context);
+        },
+
         /** Clean the thread */
         message_clean: function() {
             this.$el.find('div.oe_mail_thread_display').empty();
@@ -374,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'));
         },
 
@@ -407,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) {
@@ -431,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
@@ -440,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',
@@ -473,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);
         },
         
@@ -485,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);
         },
 
@@ -533,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',
 
@@ -548,13 +588,11 @@ openerp.mail = function(session) {
             this.options.domain = this.options.domain || [];
             this.options.context = {'default_model': 'mail.thread', 'default_res_id': false};
             this.options.thread_level = this.options.thread_level || 0;
-            this.thread_list = [];
         },
 
         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() {
-            for (var i in this.thread_list) { this.thread_list[i].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();
-            for (var i in this.thread_list) { this.thread_list[i].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_list.push(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'));
         },
     });
 };

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) {

addons/mail/static/src/xml/mail.xml

@@ -39,8 +39,8 @@
         wall_thread_container template for the wall
         Each discussion thread is contained inside this template
         -->
-    <t t-name="mail.wall_thread_container">
-    </t>
+    <li t-name="mail.wall_thread_container" class="oe_mail_wall_thread">
+    </li>
 
     <!--
         record_thread main template
@@ -73,6 +73,20 @@
         </div>
     </t>
 
+    <!--
+        mail.compose_message.add_attachment template
+        Small template to be inserted in the composition form to add attachments
+        -->
+    <t t-name="mail.compose_message.add_attachment">
+        <t t-call="HiddenInputFile">
+            <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
+            <t t-set="fileupload_action">/web/binary/upload_attachment</t>
+            <input type="hidden" name="model" t-att-value="widget.form_view.model"/>
+            <input type="hidden" name="id" t-att-value="widget.form_view.datarecord.id || 0"/>
+            <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
+        </t>
+    </t>
+
     <!--
         thread template
         This template holds a thread of comments. It begins with an actions
@@ -100,16 +114,14 @@
                 <!-- dropdown menu with message options and actions -->
                 <span class="oe_dropdown_toggle oe_dropdown_arrow">
                     <ul class="oe_dropdown_menu">
-                        <t t-if="record.is_author">
-                            <li t-if="display['show_delete']"><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
-                        </t>
-                        <li t-if="display['show_hide']"><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove notification</a></li>
+                        <li t-if="record.is_author &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>

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')

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, {

addons/mail/wizard/mail_compose_message_view.xml

@@ -14,7 +14,7 @@
                     <group>
                         <field name="subject" placeholder="Subject..."/>
                         <field name="partner_ids" widget="many2many_tags" placeholder="Add contacts to notify..."
-                                context="{'force_create':True}"
+                                context="{'force_email':True}"
                                 on_change="onchange_partner_ids(partner_ids)"/>
                     </group>
                     <notebook>
@@ -65,7 +65,7 @@
                                 class="oe_mail_compose_message_body_html"
                                 attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>
                         <field name="partner_ids" colspan="2" nolabel="1" widget="many2many_tags" placeholder="Add contacts to notify..."
-                                context="{'force_create':True}"
+                                context="{'force_email':True}"
                                 on_change="onchange_partner_ids(partner_ids)"
                                 class="oe_mail_compose_message_partner_ids"/>
                         <field name="attachment_ids" colspan="2" nolabel="1" widget="many2many_tags"

addons/mrp/i18n/ar.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -48,7 +48,7 @@ msgstr "إستعمال مراكز العمل"
 #. module: mrp
 #: model:product.template,name:mrp.product_sugar_product_template
 msgid "Sugar"
-msgstr ""
+msgstr "سكر"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -63,7 +63,7 @@ msgstr "عدد الدورات"
 #. module: mrp
 #: model:product.uom.categ,name:mrp.product_uom_categ_fluid
 msgid "Fluid"
-msgstr ""
+msgstr "سائل"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_minimumstockprocure0
@@ -145,7 +145,7 @@ msgstr "منتجات منتهية"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are currently in production."
-msgstr ""
+msgstr "تصنيع الطلبيات التي هي حاليا في الإنتاج."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicerfq0
@@ -218,17 +218,14 @@ msgstr "امليء المنتج لتتعقب بسهولة تكاليف الان
 msgid "For purchased material"
 msgstr "للمواد المشتراه"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "مراجعة"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
 "the product can be purchased."
 msgstr ""
+"إنشاء نموذج المنتج على كل شيء قمت بالشراءه أو بيعه. حدد المورد إذا كان من "
+"الممكن شراء المنتج."
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.next_id_77
@@ -264,7 +261,7 @@ msgstr "معلومات عن القدرة"
 #. module: mrp
 #: field:mrp.production,move_created_ids2:0
 msgid "Produced Products"
-msgstr ""
+msgstr "إنتاج المنتجات"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -319,7 +316,7 @@ msgstr "انت تحاول تخصيص الكثير من ما هو دون المن
 #. module: mrp
 #: model:product.template,name:mrp.product_cloth_product_template
 msgid "Cloth"
-msgstr ""
+msgstr "ثوب"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
@@ -334,7 +331,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
 msgid "Work Center Usage"
-msgstr ""
+msgstr "استخدام عمل المركز"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
@@ -396,6 +393,11 @@ msgid ""
 "sales person creates a sales order, he can relate it to several properties "
 "and OpenERP will automatically select the BoM to use according the needs."
 msgstr ""
+"وتستخدم الخصائص في OpenERP لتحديد مواد المشروع المناسبة  لتصنيع منتج عندما "
+"يكون لديك طرق مختلفة لبناء نفس المنتج. يمكنك تعيين العديد من الخصائص على كل "
+"فاتورة مواد. عندما يقوم مندوب المبيعات بإنشاء طلبات مبيعات، وكما يمكنه ربطها "
+"بالعديد من الخصائص وOpenERP سوف تختار تلقائيا فاتورة المواد لاستخدامها وفقا "
+"للاحتياجات."
 
 #. module: mrp
 #: help:mrp.production,picking_id:0
@@ -473,7 +475,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
 msgid "Specify Cost of Work Center per cycle."
-msgstr ""
+msgstr "حدد تكلفة العمل المركزية دورة"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
@@ -485,11 +487,6 @@ msgstr "تعطب التصنيع"
 msgid "For Services."
 msgstr "للخدمات."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "تاريخ التعديل."
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -525,7 +522,7 @@ msgstr "خطأ: كود إين غير صالح"
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
 msgid "Products to Produce"
-msgstr ""
+msgstr "لإنتاج منتجات"
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -541,18 +538,13 @@ msgstr "كمية التغيير"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_configure_workcenter
 msgid "Configure your work centers"
-msgstr ""
+msgstr "اضبط مراكز عملك"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Force Reservation"
 msgstr "فرض الحجز"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "المؤلف"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -669,7 +661,7 @@ msgstr "جاهز"
 #. module: mrp
 #: model:product.template,name:mrp.product_buttons_product_template
 msgid "Shirt Buttons"
-msgstr ""
+msgstr "أزرار القميص"
 
 #. module: mrp
 #: help:mrp.production,routing_id:0
@@ -806,7 +798,7 @@ msgstr "عاجل"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are waiting for raw materials."
-msgstr ""
+msgstr "تصنيع الطلبيات التي تنتظر المواد الخام."
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
@@ -839,11 +831,6 @@ msgstr "الدورات الكلية"
 msgid "Ready to Produce"
 msgstr "جاهز للانتاج"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "إسم التصنيف"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -903,7 +890,7 @@ msgstr "الحد الادنى من المخزون"
 #: code:addons/mrp/mrp.py:503
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'"
-msgstr ""
+msgstr "لا يمكن حذف نظام التصنيع في ولاية %s"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menus_dash_mrp
@@ -915,7 +902,7 @@ msgstr "اللوحة الرئيسية"
 #: code:addons/mrp/report/price.py:211
 #, python-format
 msgid "Total Cost of %s %s"
-msgstr ""
+msgstr "التكلفة الكلية لـ%s %s"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
@@ -1423,11 +1410,6 @@ msgstr "شراء المنتجات"
 msgid "Work Center Loads"
 msgstr "تحميلات مركز العمل"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "فمراجعة فاتورة المواد"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1958,12 +1940,6 @@ msgstr "الوقت بالساعات للإعداد."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "فاتورة المواد"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1981,17 +1957,6 @@ msgstr "تخصيص من المخزون."
 msgid "Waiting Goods"
 msgstr "انتظار السلع"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "اخر مؤشر"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "مراجعات فاتورة المواد"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2179,19 +2144,6 @@ msgstr "غير الكمية"
 msgid "Change Product Qty"
 msgstr "غير كمية المنتج"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "الوصف"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2312,6 +2264,9 @@ msgstr "منتجات للاستهلاك"
 #~ msgid "Day"
 #~ msgstr "يوم"
 
+#~ msgid "Revision"
+#~ msgstr "مراجعة"
+
 #~ msgid "title"
 #~ msgstr "الاسم"
 
@@ -2324,6 +2279,9 @@ msgstr "منتجات للاستهلاك"
 #~ msgid "October"
 #~ msgstr "أكتوبر"
 
+#~ msgid "Author"
+#~ msgstr "المؤلف"
+
 #~ msgid "March"
 #~ msgstr "مارس"
 
@@ -2394,6 +2352,9 @@ msgstr "منتجات للاستهلاك"
 #~ "following addons."
 #~ msgstr "اضف وظائف اكثر لجوهر تطبيق الصناعة بالملحقات التالية."
 
+#~ msgid "Modification name"
+#~ msgstr "إسم التصنيف"
+
 #~ msgid ""
 #~ "Time in hours for this work center to achieve the operation of the specified "
 #~ "routing."
@@ -2497,6 +2458,15 @@ msgstr "منتجات للاستهلاك"
 #~ "performance."
 #~ msgstr "يسمح لك هذا التقرير بتحليل انشطة التصنيع الخاصة بك و الاداء."
 
+#~ msgid "BoM"
+#~ msgstr "فاتورة المواد"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "مراجعات فاتورة المواد"
+
+#~ msgid "last indice"
+#~ msgstr "اخر مؤشر"
+
 #~ msgid "Draft"
 #~ msgstr "مسوّدة"
 
@@ -2527,6 +2497,9 @@ msgstr "منتجات للاستهلاك"
 #~ msgid "Work Cost of "
 #~ msgstr "تكلفة العمل لـ "
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "فمراجعة فاتورة المواد"
+
 #~ msgid "Manufacturing Operations"
 #~ msgstr "عمليات التصنيع"
 
@@ -2535,6 +2508,9 @@ msgstr "منتجات للاستهلاك"
 #~ "this work center."
 #~ msgstr "وصف مركز العمل. يبين هنا ماهي الدورة وفقًا لمركز العمل هذا."
 
+#~ msgid "Description"
+#~ msgstr "الوصف"
+
 #~ msgid "May"
 #~ msgstr "مايو"
 
@@ -2644,3 +2620,6 @@ msgstr "منتجات للاستهلاك"
 #~ "الخصائص على كل فاتورة من المواد. عندما ينشأ البائع ترتيب مبيعات، يمكنه ربطها "
 #~ "بالعديد من الخصائص و ستحدد OpenERP تلقائيا فاتورة المواد لاستخدمها طبقًا "
 #~ "للاحتياجات."
+
+#~ msgid "Modification Date"
+#~ msgstr "تاريخ التعديل."

addons/mrp/i18n/bg.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -223,11 +223,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "За закупени суровини"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Версия"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -494,11 +489,6 @@ msgstr "Разлагане на производство"
 msgid "For Services."
 msgstr "За услуги."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Дата на промяна"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -560,11 +550,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Мощност за резервация"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Автор"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -845,11 +830,6 @@ msgstr "Общо цикли"
 msgid "Ready to Produce"
 msgstr "Готов за производство"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Име на промяна"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1410,11 +1390,6 @@ msgstr "Снабдяване с продукти"
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1918,12 +1893,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1941,17 +1910,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr "Чакащи стоки"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2137,19 +2095,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Описание"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2320,6 +2265,15 @@ msgstr ""
 #~ msgid "products"
 #~ msgstr "продукти"
 
+#~ msgid "Author"
+#~ msgstr "Автор"
+
+#~ msgid "Modification Date"
+#~ msgstr "Дата на промяна"
+
+#~ msgid "Modification name"
+#~ msgstr "Име на промяна"
+
 #~ msgid "Stockable Production Order"
 #~ msgstr "Скадируема поръчка за производство"
 
@@ -2332,6 +2286,9 @@ msgstr ""
 #~ msgid "Day"
 #~ msgstr "Ден"
 
+#~ msgid "Revision"
+#~ msgstr "Версия"
+
 #~ msgid "title"
 #~ msgstr "заглавие"
 
@@ -2435,6 +2392,9 @@ msgstr ""
 #~ msgid "January"
 #~ msgstr "Януари"
 
+#~ msgid "Description"
+#~ msgstr "Описание"
+
 #~ msgid "May"
 #~ msgstr "Май"
 

addons/mrp/i18n/bs.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -210,11 +210,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -469,11 +464,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -531,11 +521,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -816,11 +801,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1381,11 +1361,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1889,12 +1864,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1912,17 +1881,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2108,19 +2066,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"

addons/mrp/i18n/ca.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Per material comprat"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisió"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -499,11 +494,6 @@ msgstr "Descomposició fabricació"
 msgid "For Services."
 msgstr "Per serveis"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Data modificació"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -565,11 +555,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Força reserves"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -862,11 +847,6 @@ msgstr "Total cicles"
 msgid "Ready to Produce"
 msgstr "Llest per produir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nom de modificació"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1460,11 +1440,6 @@ msgstr "Proveir products"
 msgid "Work Center Loads"
 msgstr "Càrregues centre de producció"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisió de la llista de materials"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2007,12 +1982,6 @@ msgstr "Temps en hores per la configuració."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Llista de materials (LdM)"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2030,17 +1999,6 @@ msgstr "Assignació des d'estoc."
 msgid "Waiting Goods"
 msgstr "Esperant mercaderia"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Últim índex"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisions llista de materials"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2229,19 +2187,6 @@ msgstr "Canvia la quantitat"
 msgid "Change Product Qty"
 msgstr "Canvia Qtat. producte"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descripció"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2378,6 +2323,9 @@ msgstr "Productes a consumir"
 #~ "virtual menor que 0. Probablement no hauria d'utilitzar aquesta opció, "
 #~ "suggerim utilitzar una configuració de MTO en productes."
 
+#~ msgid "Revision"
+#~ msgstr "Revisió"
+
 #~ msgid "Exceptions Procurements"
 #~ msgstr "Excepcions de proveïments"
 
@@ -2544,6 +2492,9 @@ msgstr "Productes a consumir"
 #~ msgid "Make Procurement"
 #~ msgstr "Realitza proveïment"
 
+#~ msgid "Modification Date"
+#~ msgstr "Data modificació"
+
 #~ msgid "If Procure method is Make to order and supply method is produce"
 #~ msgstr ""
 #~ "Si mètode de proveïment és obtenir sota comanda i mètode de subministre és "
@@ -2552,6 +2503,9 @@ msgstr "Productes a consumir"
 #~ msgid "Purchase Lead Time"
 #~ msgstr "Termini de temps de compra"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Stockable Product Stock"
 #~ msgstr "Estoc de producte estocable"
 
@@ -2644,6 +2598,9 @@ msgstr "Productes a consumir"
 #~ msgid "Security Days"
 #~ msgstr "Dies de seguretat"
 
+#~ msgid "Modification name"
+#~ msgstr "Nom de modificació"
+
 #~ msgid "Exception"
 #~ msgstr "Excepció"
 
@@ -2995,6 +2952,9 @@ msgstr "Productes a consumir"
 #~ msgid "plus"
 #~ msgstr "més"
 
+#~ msgid "BoM"
+#~ msgstr "Llista de materials (LdM)"
+
 #~ msgid "Stockable Product Process"
 #~ msgstr "Procés producte estocable"
 
@@ -3004,6 +2964,12 @@ msgstr "Productes a consumir"
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Una sol·licitud de pressupost és creada i enviada al proveïdor."
 
+#~ msgid "last indice"
+#~ msgstr "Últim índex"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisions llista de materials"
+
 #~ msgid "Retry"
 #~ msgstr "Torna a intentar"
 
@@ -3061,6 +3027,9 @@ msgstr "Productes a consumir"
 #~ msgid "Close Move at end"
 #~ msgstr "Moviment de tancament al final"
 
+#~ msgid "Description"
+#~ msgstr "Descripció"
+
 #~ msgid "Running"
 #~ msgstr "En procés"
 
@@ -3303,6 +3272,9 @@ msgstr "Productes a consumir"
 #~ msgid "Configure"
 #~ msgstr "Configura"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisió de la llista de materials"
+
 #~ msgid ""
 #~ "Routing indicates all the workcenters used, for how long and/or cycles.If "
 #~ "Routing is indicated then,the third tab of a production order (workcenters) "

addons/mrp/i18n/cs.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: mrp
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Pro nakoupený materiál"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revize"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -477,11 +472,6 @@ msgstr "Rozložení výroby"
 msgid "For Services."
 msgstr "Pro služby."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Datum úpravy"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -539,11 +529,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Vynutit rezervaci"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -828,11 +813,6 @@ msgstr "Celkem cyklů"
 msgid "Ready to Produce"
 msgstr "Připraveno k výrobě"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Jméno úpravy"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1396,11 +1376,6 @@ msgstr "Pořídit výrobek"
 msgid "Work Center Loads"
 msgstr "Vytížení výrobních center"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revize Soupisky materiálu"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1912,12 +1887,6 @@ msgstr "Čas v hodinách na sestavení"
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "BoM"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1935,17 +1904,6 @@ msgstr "Přiřazení ze skladu."
 msgid "Waiting Goods"
 msgstr "Čekající zboží"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "poslední ukazatel"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revize BoM"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2131,19 +2089,6 @@ msgstr "Změnit množství"
 msgid "Change Product Qty"
 msgstr "Změnit množ. výrobků"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Popis"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2298,6 +2243,9 @@ msgstr "Výrobků ke spotřebě"
 #~ msgid "Raw Material Location"
 #~ msgstr "Umístění surového materiálu"
 
+#~ msgid "Revision"
+#~ msgstr "Revize"
+
 #~ msgid "title"
 #~ msgstr "nadpis"
 
@@ -2323,6 +2271,12 @@ msgstr "Výrobků ke spotřebě"
 #~ msgid "Advanced Routes"
 #~ msgstr "Pokročilé trasy"
 
+#~ msgid "Modification Date"
+#~ msgstr "Datum úpravy"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "March"
 #~ msgstr "Březen"
 
@@ -2355,6 +2309,9 @@ msgstr "Výrobků ke spotřebě"
 #~ "Čas v hodinách pro toto pracovní centrum k dosažení operace zadaného "
 #~ "směrování."
 
+#~ msgid "Modification name"
+#~ msgstr "Jméno úpravy"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Rozšířené filtry..."
 
@@ -2433,6 +2390,15 @@ msgstr "Výrobků ke spotřebě"
 #~ msgid "Image"
 #~ msgstr "Obrázek"
 
+#~ msgid "BoM"
+#~ msgstr "BoM"
+
+#~ msgid "last indice"
+#~ msgstr "poslední ukazatel"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revize BoM"
+
 #~ msgid "Draft"
 #~ msgstr "Koncept"
 
@@ -2451,6 +2417,9 @@ msgstr "Výrobků ke spotřebě"
 #~ "will be automatically pre-completed."
 #~ msgstr "poslední ukazatel"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revize Soupisky materiálu"
+
 #, python-format
 #~ msgid "Work Cost of "
 #~ msgstr "Cena práce "
@@ -2468,6 +2437,9 @@ msgstr "Výrobků ke spotřebě"
 #~ msgid "MRP Applications Configuration"
 #~ msgstr "Nastavení aplikace MRP"
 
+#~ msgid "Description"
+#~ msgstr "Popis"
+
 #~ msgid "May"
 #~ msgstr "Květen"
 

addons/mrp/i18n/da.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -470,11 +465,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -532,11 +522,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -817,11 +802,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1382,11 +1362,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1890,12 +1865,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1913,17 +1882,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2109,19 +2067,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"

addons/mrp/i18n/de.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Für eingekauftes Material"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revision"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -509,11 +504,6 @@ msgstr "Fertigungsreste"
 msgid "For Services."
 msgstr "Für Dienstleistungsprodukte."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Änderung am"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -575,11 +565,6 @@ msgstr "Konfigurieren Sie Ihre Arbeitsplätze"
 msgid "Force Reservation"
 msgstr "Erzwinge Reservierung"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Mitarbeiter"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -880,11 +865,6 @@ msgstr "Gesamt Zyklen"
 msgid "Ready to Produce"
 msgstr "Startbereit für Fertigung"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Bezeichnung geändert"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1483,11 +1463,6 @@ msgstr "Beschaffung Produkte"
 msgid "Work Center Loads"
 msgstr "Arbeitsplatz Auslastungen"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Stückliste Revision"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2032,12 +2007,6 @@ msgstr "Vorbereitungszeit"
 msgid "Orange Juice"
 msgstr "Orangensaft"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Stückliste"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2055,17 +2024,6 @@ msgstr "Zuweisung vom Lager."
 msgid "Waiting Goods"
 msgstr "Erwartet Material"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Letzter Index"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Stücklisten Revision"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2257,19 +2215,6 @@ msgstr "Ändere Anzahl"
 msgid "Change Product Qty"
 msgstr "Ändere Produkt Menge"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Beschreibung"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2409,6 +2354,9 @@ msgstr "Benötigte Produkte"
 #~ "virtuellem Lager unter \"0\". Idealerweise arbeitet man allerdings mit "
 #~ "Lagerbestandsregeln."
 
+#~ msgid "Revision"
+#~ msgstr "Revision"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Regelbasierte Beschaffungsvorschläge"
 
@@ -2582,6 +2530,9 @@ msgstr "Benötigte Produkte"
 #~ msgid "Make Procurement"
 #~ msgstr "Erzeuge Beschaffung"
 
+#~ msgid "Modification Date"
+#~ msgstr "Änderung am"
+
 #~ msgid "If Procure method is Make to order and supply method is produce"
 #~ msgstr ""
 #~ "Falls Beschaffungsmethode 'aus Auftrag' und Einkaufsmethode 'Produktion'"
@@ -2684,6 +2635,9 @@ msgstr "Benötigte Produkte"
 #~ msgid "Security Days"
 #~ msgstr "Sicherheitspuffer (Tage)"
 
+#~ msgid "Modification name"
+#~ msgstr "Bezeichnung geändert"
+
 #~ msgid "Exception"
 #~ msgstr "Fehlerliste"
 
@@ -3033,6 +2987,9 @@ msgstr "Benötigte Produkte"
 #~ msgid "plus"
 #~ msgstr "Plus"
 
+#~ msgid "BoM"
+#~ msgstr "Stückliste"
+
 #~ msgid "Stockable Product Process"
 #~ msgstr "Lagerfähiges Produkt Prozess"
 
@@ -3042,6 +2999,12 @@ msgstr "Benötigte Produkte"
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Eine Angebotsanfrage wurde erzeugt und an den Lieferanten versendet."
 
+#~ msgid "last indice"
+#~ msgstr "Letzter Index"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Stücklisten Revision"
+
 #~ msgid "Retry"
 #~ msgstr "Wiederhole"
 
@@ -3100,6 +3063,9 @@ msgstr "Benötigte Produkte"
 #~ msgid "Close Move at end"
 #~ msgstr "Beende Warenfluss (Ende)"
 
+#~ msgid "Description"
+#~ msgstr "Beschreibung"
+
 #~ msgid "Running"
 #~ msgstr "In Weiterbearbeitung"
 
@@ -3238,6 +3204,9 @@ msgstr "Benötigte Produkte"
 #~ msgid "January"
 #~ msgstr "Januar"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Stückliste Revision"
+
 #~ msgid "February"
 #~ msgstr "Februar"
 
@@ -3263,6 +3232,9 @@ msgstr "Benötigte Produkte"
 #~ msgid "Advanced Routes"
 #~ msgstr "Lieferketten"
 
+#~ msgid "Author"
+#~ msgstr "Mitarbeiter"
+
 #~ msgid "Workcenter Usage"
 #~ msgstr "Fertigungsstelle Auslastung"
 

addons/mrp/i18n/el.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -213,11 +213,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Αναθεώρηση"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -476,11 +471,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Ημερ/νία Τροποποίησης"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -540,11 +530,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Κράτηση Τώρα"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Δημιουργός"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -825,11 +810,6 @@ msgstr "Σύννολο Κύκλων"
 msgid "Ready to Produce"
 msgstr "Έτοιμο για Παραγωγή"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Όνομα τροποποίησης"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1390,11 +1370,6 @@ msgstr "Προμήθεια Προϊόντων"
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1899,12 +1874,6 @@ msgstr "Χρόνος εγκατάστασης σε ώρες"
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Κ.Υ."
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1922,17 +1891,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr "Σε αναμονή υλικών"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "last indice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Αναθεωρήσεις ΚΥ"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2118,19 +2076,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr "Αλλαγή Ποσ. Προϊόντος"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Περιγραφή"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2296,6 +2241,9 @@ msgstr ""
 #~ msgid "Security Days"
 #~ msgstr "Ημέρες Ασφαλείας"
 
+#~ msgid "Modification name"
+#~ msgstr "Όνομα τροποποίησης"
+
 #~ msgid "From minimum stock rules, it goes for procure product."
 #~ msgstr "From minimum stock rules, it goes for procure product."
 
@@ -2331,6 +2279,9 @@ msgstr ""
 #~ msgid "Manufacturing Resource Planning"
 #~ msgstr "Σχεδίαση Πηγών Βιομηχανικής Παραγωγής (MRP)"
 
+#~ msgid "Revision"
+#~ msgstr "Αναθεώρηση"
+
 #~ msgid "Routing Workcenters"
 #~ msgstr "Κέντρα Εργασίας Γραμμής Παραγωγής"
 
@@ -2468,12 +2419,18 @@ msgstr ""
 #~ msgid "Print product price"
 #~ msgstr "Εκτύπωση τιμής Προϊόντος"
 
+#~ msgid "Modification Date"
+#~ msgstr "Ημερ/νία Τροποποίησης"
+
 #~ msgid "If Procure method is Make to order and supply method is produce"
 #~ msgstr "If Procure method is Make to order and supply method is produce"
 
 #~ msgid "Purchase Lead Time"
 #~ msgstr "Χρόνος Παράδοσης Παραγγελίας"
 
+#~ msgid "Author"
+#~ msgstr "Δημιουργός"
+
 #~ msgid "Stockable Product Stock"
 #~ msgstr "Απόθεμα Αποθηκεύσιμου Προϊόντος"
 
@@ -2888,6 +2845,9 @@ msgstr ""
 #~ msgid "plus"
 #~ msgstr "plus"
 
+#~ msgid "BoM"
+#~ msgstr "Κ.Υ."
+
 #~ msgid ""
 #~ "The list of operations (list of workcenters) to produce the finished "
 #~ "product. The routing is mainly used to compute workcenter costs during "
@@ -2908,6 +2868,12 @@ msgstr ""
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Η Αίτηση για Προσφορά δημιουργήθηκε και εστάλει στον προμηθευτή."
 
+#~ msgid "last indice"
+#~ msgstr "last indice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Αναθεωρήσεις ΚΥ"
+
 #~ msgid "Retry"
 #~ msgstr "Νέα προσπάθεια"
 
@@ -2962,6 +2928,9 @@ msgstr ""
 #~ msgid "Close Move at end"
 #~ msgstr "Close Move at end"
 
+#~ msgid "Description"
+#~ msgstr "Περιγραφή"
+
 #~ msgid "Running"
 #~ msgstr "Σε εξέλιξη"
 

addons/mrp/i18n/es.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para material comprado"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisión"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -507,11 +502,6 @@ msgstr "Descomposición fabricación"
 msgid "For Services."
 msgstr "Para servicios"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Fecha de modificación"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -573,11 +563,6 @@ msgstr "Configure sus centros de producción"
 msgid "Force Reservation"
 msgstr "Forzar reservas"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -880,11 +865,6 @@ msgstr "Total ciclos"
 msgid "Ready to Produce"
 msgstr "Listo para producir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nombre de modificación"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1481,11 +1461,6 @@ msgstr "Abastecer productos"
 msgid "Work Center Loads"
 msgstr "Cargas centro de producción"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisión de lista de materiales"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2032,12 +2007,6 @@ msgstr "Tiempo en horas para la configuración."
 msgid "Orange Juice"
 msgstr "Zumo de naranja"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Lista de materiales (LdM)"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2055,17 +2024,6 @@ msgstr "Asignación desde stock."
 msgid "Waiting Goods"
 msgstr "Esperando mercancía"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último índice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisiones lista de materiales"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2256,19 +2214,6 @@ msgstr "Cambiar cantidad"
 msgid "Change Product Qty"
 msgstr "Cambiar Ctd. producto"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descripción"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2405,6 +2350,9 @@ msgstr "Productos a consumir"
 #~ "stock virtual menor que 0. Probablemente no debería utilizar esta opción, "
 #~ "sugerimos utilizar una configuración de MTO en productos."
 
+#~ msgid "Revision"
+#~ msgstr "Revisión"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Calcular sólo reglas de stock mínimo"
 
@@ -2591,6 +2539,9 @@ msgstr "Productos a consumir"
 #~ msgid "Purchase Lead Time"
 #~ msgstr "Plazo de tiempo de compra"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Stockable Product Stock"
 #~ msgstr "Stock de producto almacenable"
 
@@ -2688,6 +2639,9 @@ msgstr "Productos a consumir"
 #~ msgid "Security Days"
 #~ msgstr "Días de seguridad"
 
+#~ msgid "Modification name"
+#~ msgstr "Nombre de modificación"
+
 #~ msgid "Exception"
 #~ msgstr "Excepción"
 
@@ -3044,6 +2998,9 @@ msgstr "Productos a consumir"
 #~ msgid "plus"
 #~ msgstr "más"
 
+#~ msgid "BoM"
+#~ msgstr "Lista de materiales (LdM)"
+
 #~ msgid "Stockable Product Process"
 #~ msgstr "Proceso producto almacenable"
 
@@ -3053,6 +3010,12 @@ msgstr "Productos a consumir"
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Una solicitud de presupuesto es creada y enviada al proveedor."
 
+#~ msgid "last indice"
+#~ msgstr "Último índice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisiones lista de materiales"
+
 #~ msgid "Retry"
 #~ msgstr "Volver a intentar"
 
@@ -3111,6 +3074,9 @@ msgstr "Productos a consumir"
 #~ msgid "Close Move at end"
 #~ msgstr "Movimiento de cierre al final"
 
+#~ msgid "Description"
+#~ msgstr "Descripción"
+
 #~ msgid "Running"
 #~ msgstr "En proceso"
 
@@ -3239,6 +3205,9 @@ msgstr "Productos a consumir"
 #~ msgid "Image"
 #~ msgstr "Imagen"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisión de lista de materiales"
+
 #~ msgid "January"
 #~ msgstr "Enero"
 
@@ -3532,3 +3501,6 @@ msgstr "Productos a consumir"
 #~ "    *Gráfico de carga del centro de trabajo\n"
 #~ "    *Lista de órdenes de fabricación con excepciones\n"
 #~ "    "
+
+#~ msgid "Modification Date"
+#~ msgstr "Fecha de modificación"

addons/mrp/i18n/es_AR.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para material comprado"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisión"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -497,11 +492,6 @@ msgstr "Descomposición de la fabricación"
 msgid "For Services."
 msgstr "Para servicios"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Fecha de Modificación"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -561,11 +551,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -851,11 +836,6 @@ msgstr "Ciclos totales"
 msgid "Ready to Produce"
 msgstr "Listo para producir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nombre de la modificación"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1431,11 +1411,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisión de lista de materiales"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1955,12 +1930,6 @@ msgstr "Tiempo en horas para la configuración."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "LdM"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1978,17 +1947,6 @@ msgstr "Asignación desde stock."
 msgid "Waiting Goods"
 msgstr "Esperando mercandería"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último índice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisiones de LdM"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2177,19 +2135,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2320,6 +2265,9 @@ msgstr ""
 #~ msgid "MRP Subproducts"
 #~ msgstr "Subproductos MRP"
 
+#~ msgid "Revision"
+#~ msgstr "Revisión"
+
 #~ msgid "title"
 #~ msgstr "título"
 
@@ -2349,6 +2297,12 @@ msgstr ""
 #~ "Activa garantía y gestión de reparaciones (y su impacto sobre stocks y "
 #~ "facturación)"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Modification Date"
+#~ msgstr "Fecha de Modificación"
+
 #~ msgid "March"
 #~ msgstr "Marzo"
 
@@ -2384,6 +2338,9 @@ msgstr ""
 #~ msgid "Extended Filters..."
 #~ msgstr "Filtros extendidos..."
 
+#~ msgid "Modification name"
+#~ msgstr "Nombre de la modificación"
+
 #~ msgid "Just In Time Scheduling"
 #~ msgstr "Planificación 'Just in Time'"
 
@@ -2478,6 +2435,9 @@ msgstr ""
 #~ "Estos informes le permiten analizar sus actividades productivas y "
 #~ "rendimiento."
 
+#~ msgid "BoM"
+#~ msgstr "LdM"
+
 #~ msgid "December"
 #~ msgstr "Diciembre"
 
@@ -2490,6 +2450,12 @@ msgstr ""
 #~ msgid "Configuration Progress"
 #~ msgstr "Progreso de la configuración"
 
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisiones de LdM"
+
+#~ msgid "last indice"
+#~ msgstr "Último índice"
+
 #~ msgid "Draft"
 #~ msgstr "Borrador"
 
@@ -2512,6 +2478,9 @@ msgstr ""
 #~ msgid "Manufacturing Operations"
 #~ msgstr "Operaciones de fabricación"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisión de lista de materiales"
+
 #~ msgid ""
 #~ "Description of the work center. Explain here what's a cycle according to "
 #~ "this work center."

addons/mrp/i18n/es_CL.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para material comprado"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisión"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -508,11 +503,6 @@ msgstr "Descomposición fabricación"
 msgid "For Services."
 msgstr "Para servicios"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Fecha modificación"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -574,11 +564,6 @@ msgstr "Configure sus centros de trabajo"
 msgid "Force Reservation"
 msgstr "Forzar reservas"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -881,11 +866,6 @@ msgstr "Total ciclos"
 msgid "Ready to Produce"
 msgstr "Listo para producir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nombre de modificación"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1483,11 +1463,6 @@ msgstr "Abastecer productos"
 msgid "Work Center Loads"
 msgstr "Cargas centro de producción"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisión de lista de materiales"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2034,12 +2009,6 @@ msgstr "Tiempo en horas para la configuración."
 msgid "Orange Juice"
 msgstr "Jugo de Naranja"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Lista de materiales (LdM)"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2057,17 +2026,6 @@ msgstr "Asignación desde stock."
 msgid "Waiting Goods"
 msgstr "Esperando mercancía"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último índice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisiones lista de materiales"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2258,19 +2216,6 @@ msgstr "Cambiar cantidad"
 msgid "Change Product Qty"
 msgstr "Cambiar Ctd. producto"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descripción"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2414,6 +2359,9 @@ msgstr "Productos a consumir"
 #~ msgid "MRP Subproducts"
 #~ msgstr "Subproductos MRP"
 
+#~ msgid "Revision"
+#~ msgstr "Revisión"
+
 #~ msgid "title"
 #~ msgstr "título"
 
@@ -2442,6 +2390,12 @@ msgstr "Productos a consumir"
 #~ "Activa la garantía y la gestión de reparaciones (y su impacto sobre stocks y "
 #~ "facturación)"
 
+#~ msgid "Modification Date"
+#~ msgstr "Fecha modificación"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "March"
 #~ msgstr "Marzo"
 
@@ -2481,6 +2435,9 @@ msgstr "Productos a consumir"
 #~ "Tiempo en horas para este centro de producción para realizar la operación de "
 #~ "la ruta indicada."
 
+#~ msgid "Modification name"
+#~ msgstr "Nombre de modificación"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Filtros extendidos..."
 
@@ -2620,6 +2577,15 @@ msgstr "Productos a consumir"
 #~ msgid "Image"
 #~ msgstr "Imagen"
 
+#~ msgid "BoM"
+#~ msgstr "Lista de materiales (LdM)"
+
+#~ msgid "last indice"
+#~ msgstr "Último índice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisiones lista de materiales"
+
 #~ msgid "Draft"
 #~ msgstr "Borrador"
 
@@ -2641,6 +2607,9 @@ msgstr "Productos a consumir"
 #~ "y/o ciclos. Si se indica la ruta, entonces la tercera pestaña de una orden "
 #~ "de producción (centros de producción) será automáticamente pre-completada."
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisión de lista de materiales"
+
 #, python-format
 #~ msgid "Work Cost of "
 #~ msgstr "Coste trabajo de "
@@ -2673,6 +2642,9 @@ msgstr "Productos a consumir"
 #~ msgid "MRP Applications Configuration"
 #~ msgstr "Configuración de las aplicaciónes MRP"
 
+#~ msgid "Description"
+#~ msgstr "Descripción"
+
 #~ msgid "May"
 #~ msgstr "Mayo"
 

addons/mrp/i18n/es_CR.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 "Language: \n"
 
 #. module: mrp
@@ -226,11 +226,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para material comprado"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisión"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -508,11 +503,6 @@ msgstr "Descomposición fabricación"
 msgid "For Services."
 msgstr "Para servicios"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Fecha de modificación"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -574,11 +564,6 @@ msgstr "Configure sus centros de producción"
 msgid "Force Reservation"
 msgstr "Forzar reservas"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -880,11 +865,6 @@ msgstr "Total ciclos"
 msgid "Ready to Produce"
 msgstr "Listo para producir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nombre de modificación"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1481,11 +1461,6 @@ msgstr "Abastecer productos"
 msgid "Work Center Loads"
 msgstr "Cargas centro de producción"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisión de lista de materiales"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2032,12 +2007,6 @@ msgstr "Tiempo en horas para la configuración."
 msgid "Orange Juice"
 msgstr "Zumo de naranja"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Lista de materiales (LdM)"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2055,17 +2024,6 @@ msgstr "Asignación desde stock."
 msgid "Waiting Goods"
 msgstr "Esperando mercancía"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último índice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisiones lista de materiales"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2256,19 +2214,6 @@ msgstr "Cambiar cantidad"
 msgid "Change Product Qty"
 msgstr "Cambiar Ctd. producto"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descripción"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2390,6 +2335,33 @@ msgstr ""
 msgid "Products to Consume"
 msgstr "Productos a consumir"
 
+#~ msgid "Revision"
+#~ msgstr "Revisión"
+
+#~ msgid "Modification Date"
+#~ msgstr "Fecha de modificación"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Modification name"
+#~ msgstr "Nombre de modificación"
+
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisión de lista de materiales"
+
+#~ msgid "BoM"
+#~ msgstr "Lista de materiales (LdM)"
+
+#~ msgid "last indice"
+#~ msgstr "Último índice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisiones lista de materiales"
+
+#~ msgid "Description"
+#~ msgstr "Descripción"
+
 #~ msgid "-"
 #~ msgstr "-"
 

addons/mrp/i18n/es_EC.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para material comprado"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisión"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -497,11 +492,6 @@ msgstr "Descomposición fabricación"
 msgid "For Services."
 msgstr "Para servicios"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Fecha modificación"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -563,11 +553,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Forzar reservas"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -861,11 +846,6 @@ msgstr "Total ciclos"
 msgid "Ready to Produce"
 msgstr "Listo para producir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nombre de modificación"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1453,11 +1433,6 @@ msgstr "Abastecer productos"
 msgid "Work Center Loads"
 msgstr "Cargas centro de producción"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisión de lista de materiales"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2000,12 +1975,6 @@ msgstr "Tiempo en horas para la configuración."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Lista de materiales (LdM)"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2023,17 +1992,6 @@ msgstr "Asignación desde stock."
 msgid "Waiting Goods"
 msgstr "Esperando mercancía"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último índice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisiones lista de materiales"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2222,19 +2180,6 @@ msgstr "Cambiar cantidad"
 msgid "Change Product Qty"
 msgstr "Cambiar Ctd. producto"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descripción"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2374,6 +2319,9 @@ msgstr "Productos a consumir"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
 
+#~ msgid "Revision"
+#~ msgstr "Revisión"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Calcular sólo reglas de stock mínimo"
 
@@ -2521,6 +2469,9 @@ msgstr "Productos a consumir"
 #~ msgid "Make Procurement"
 #~ msgstr "Realizar abastecimiento"
 
+#~ msgid "Modification Date"
+#~ msgstr "Fecha modificación"
+
 #~ msgid "If Procure method is Make to order and supply method is produce"
 #~ msgstr ""
 #~ "si método de abastecimiento es obtener bajo pedido y método de suministro es "
@@ -2529,6 +2480,9 @@ msgstr "Productos a consumir"
 #~ msgid "Purchase Lead Time"
 #~ msgstr "Plazo de tiempo de compra"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Stockable Product Stock"
 #~ msgstr "Stock de producto almacenable"
 
@@ -2620,6 +2574,9 @@ msgstr "Productos a consumir"
 #~ msgid "Security Days"
 #~ msgstr "Días de seguridad"
 
+#~ msgid "Modification name"
+#~ msgstr "Nombre de modificación"
+
 #~ msgid "Exception"
 #~ msgstr "Excepción"
 
@@ -2960,6 +2917,9 @@ msgstr "Productos a consumir"
 #~ msgid "plus"
 #~ msgstr "más"
 
+#~ msgid "BoM"
+#~ msgstr "Lista de materiales (LdM)"
+
 #~ msgid ""
 #~ "The list of operations (list of workcenters) to produce the finished "
 #~ "product. The routing is mainly used to compute workcenter costs during "
@@ -2981,6 +2941,12 @@ msgstr "Productos a consumir"
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Una solicitud de presupuesto es creada y enviada al proveedor."
 
+#~ msgid "last indice"
+#~ msgstr "Último índice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisiones lista de materiales"
+
 #~ msgid "Retry"
 #~ msgstr "Volver a intentar"
 
@@ -3031,6 +2997,9 @@ msgstr "Productos a consumir"
 #~ msgid "Close Move at end"
 #~ msgstr "Movimiento de cierre al final"
 
+#~ msgid "Description"
+#~ msgstr "Descripción"
+
 #~ msgid "Running"
 #~ msgstr "En proceso"
 
@@ -3352,6 +3321,9 @@ msgstr "Productos a consumir"
 #~ msgid "Image"
 #~ msgstr "Imágen"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisión de lista de materiales"
+
 #~ msgid ""
 #~ "Routing indicates all the workcenters used, for how long and/or cycles.If "
 #~ "Routing is indicated then,the third tab of a production order (workcenters) "

addons/mrp/i18n/et.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -210,11 +210,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisjon"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -469,11 +464,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Muutmise Kuupäev"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -531,11 +521,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -816,11 +801,6 @@ msgstr "Kokku tsükkleid"
 msgid "Ready to Produce"
 msgstr "Valmis tootmiseks"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Modifikatsiooni nimi"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1381,11 +1361,6 @@ msgstr "Hangi tooted"
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1889,12 +1864,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1912,17 +1881,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2108,19 +2066,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2232,6 +2177,9 @@ msgstr ""
 #~ msgid "Moves Created"
 #~ msgstr "Liikumised loodud"
 
+#~ msgid "Revision"
+#~ msgstr "Revisjon"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Arvuta ainult lao miinimum reeglid"
 
@@ -2325,6 +2273,12 @@ msgstr ""
 #~ msgid "Print product price"
 #~ msgstr "Prindi toote hind"
 
+#~ msgid "Modification Date"
+#~ msgstr "Muutmise Kuupäev"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Latest error"
 #~ msgstr "Viimane viga"
 
@@ -2353,6 +2307,9 @@ msgstr ""
 #~ msgid "Security Days"
 #~ msgstr "Turvalised Päevad"
 
+#~ msgid "Modification name"
+#~ msgstr "Modifikatsiooni nimi"
+
 #~ msgid "Exception"
 #~ msgstr "Erand"
 

addons/mrp/i18n/fi.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -224,11 +224,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Ostettaville materiaaleille"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisio"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -496,11 +491,6 @@ msgstr "Valmistusrakenteen purkaminen"
 msgid "For Services."
 msgstr "Palveluille"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Muokkauspäivä"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -560,11 +550,6 @@ msgstr "Määrittele työpisteesi"
 msgid "Force Reservation"
 msgstr "Pakota varaus"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Tekijä"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -849,11 +834,6 @@ msgstr "Kierrot yhteensä"
 msgid "Ready to Produce"
 msgstr "Valmis tuotantoon"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Muutoksen nimi"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1428,11 +1408,6 @@ msgstr "Hanki tuotteita"
 msgid "Work Center Loads"
 msgstr "Työpisteen kuormitus"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Osaluettelon versio"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1947,12 +1922,6 @@ msgstr "Asetuksiin kuluva aika tunneissa."
 msgid "Orange Juice"
 msgstr "Appelssiinimehu"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Osaluettelo"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1970,17 +1939,6 @@ msgstr "Varastosta otto"
 msgid "Waiting Goods"
 msgstr "Odottaa tuotteita"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Viimeinen järjestys"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Osaluettelon revisiot"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2171,19 +2129,6 @@ msgstr "Muuta määrää"
 msgid "Change Product Qty"
 msgstr "Muuta tuotteen määrää"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Kuvaus"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2338,6 +2283,9 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "Make Procurement"
 #~ msgstr "Tee hankinta"
 
+#~ msgid "Author"
+#~ msgstr "Tekijä"
+
 #~ msgid "Latest error"
 #~ msgstr "Viimeisin virhe"
 
@@ -2416,6 +2364,9 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "Service Product"
 #~ msgstr "Palvelutuote"
 
+#~ msgid "Revision"
+#~ msgstr "Revisio"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Virheellinen mallin nimi toiminnon määrittelyssä."
 
@@ -2554,6 +2505,9 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "Purchase Lead Time"
 #~ msgstr "Oston läpimenoaika"
 
+#~ msgid "Modification Date"
+#~ msgstr "Muokkauspäivä"
+
 #~ msgid "Routing workcenter usage"
 #~ msgstr "Reititys työpisteiden käyttö"
 
@@ -2647,6 +2601,9 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "Serivce Stockable Order"
 #~ msgstr "Huolto varastoitava tilaus"
 
+#~ msgid "Modification name"
+#~ msgstr "Muutoksen nimi"
+
 #~ msgid "Production done"
 #~ msgstr "Tuotanto valmis"
 
@@ -2884,9 +2841,15 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "Canceled"
 #~ msgstr "Peruttu"
 
+#~ msgid "BoM"
+#~ msgstr "Osaluettelo"
+
 #~ msgid "New Production Order"
 #~ msgstr "Uusi tuotantotilaus"
 
+#~ msgid "last indice"
+#~ msgstr "Viimeinen järjestys"
+
 #~ msgid "plus"
 #~ msgstr "plus"
 
@@ -2912,6 +2875,9 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "The normal working time of the workcenter."
 #~ msgstr "Työpisteen normaali työaika."
 
+#~ msgid "BoM Revisions"
+#~ msgstr "Osaluettelon revisiot"
+
 #~ msgid "Procurement Reason"
 #~ msgstr "Hankinnan syy"
 
@@ -2944,6 +2910,9 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "TOTAL"
 #~ msgstr "Yhteensä"
 
+#~ msgid "Description"
+#~ msgstr "Kuvaus"
+
 #~ msgid "Close Move at end"
 #~ msgstr "Sulje siirto lopussa"
 
@@ -3142,6 +3111,9 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "Image"
 #~ msgstr "Kuva"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Osaluettelon versio"
+
 #~ msgid "Manufacturing Operations"
 #~ msgstr "Valmistuksen vaiheet"
 

addons/mrp/i18n/fr.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: field:mrp.bom,product_uom:0
@@ -242,11 +242,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Pour un produit acheté"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Révision"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -523,11 +518,6 @@ msgstr "Décomposition de la fabrication"
 msgid "For Services."
 msgstr "Pour les services."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Date de modification"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -589,11 +579,6 @@ msgstr "Configurer les centres de travails"
 msgid "Force Reservation"
 msgstr "Forcer la réservation"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Auteur"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -886,11 +871,6 @@ msgstr "Cycles Totaux"
 msgid "Ready to Produce"
 msgstr "Prêt à Produire"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nom de la Modification"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1486,11 +1466,6 @@ msgstr "Approvisionner les produits"
 msgid "Work Center Loads"
 msgstr "Occupation des postes de charge"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Révision des nomenclatures"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2028,12 +2003,6 @@ msgstr "Temps en Heures pour la mise en place"
 msgid "Orange Juice"
 msgstr "Jus d'orange"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Nomenclature"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2051,17 +2020,6 @@ msgstr "Affectation à partir du stock."
 msgid "Waiting Goods"
 msgstr "En attente de marchandises"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Dernier Indice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Révisions des Nomenclatures"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2250,19 +2208,6 @@ msgstr "Changer la quantité"
 msgid "Change Product Qty"
 msgstr "Changer la Qté de Produits"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Description"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2409,6 +2354,9 @@ msgstr "Produits à consommer"
 #~ msgid "Moves Created"
 #~ msgstr "Mouvements créés"
 
+#~ msgid "Revision"
+#~ msgstr "Révision"
+
 #~ msgid "Packing list"
 #~ msgstr "Liste des Colisages"
 
@@ -2457,6 +2405,12 @@ msgstr "Produits à consommer"
 #~ msgid "Print product price"
 #~ msgstr "Imprimer le prix du produit"
 
+#~ msgid "Modification Date"
+#~ msgstr "Date de modification"
+
+#~ msgid "Author"
+#~ msgstr "Auteur"
+
 #~ msgid "Latest error"
 #~ msgstr "Dernière Erreur"
 
@@ -2487,6 +2441,9 @@ msgstr "Produits à consommer"
 #~ msgid "Security Days"
 #~ msgstr "Jours de sécurité"
 
+#~ msgid "Modification name"
+#~ msgstr "Nom de la Modification"
+
 #~ msgid "Exception"
 #~ msgstr "Exception"
 
@@ -2601,9 +2558,18 @@ msgstr "Produits à consommer"
 #~ msgid "plus"
 #~ msgstr "plus"
 
+#~ msgid "BoM"
+#~ msgstr "Nomenclature"
+
 #~ msgid "New Production Order"
 #~ msgstr "Nouvel Ordre de Production"
 
+#~ msgid "last indice"
+#~ msgstr "Dernier Indice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Révisions des Nomenclatures"
+
 #~ msgid "Retry"
 #~ msgstr "Réessayez"
 
@@ -2616,6 +2582,9 @@ msgstr "Produits à consommer"
 #~ msgid "Warehouse"
 #~ msgstr "Entrepôt"
 
+#~ msgid "Description"
+#~ msgstr "Description"
+
 #~ msgid "Running"
 #~ msgstr "En cours"
 
@@ -3272,6 +3241,9 @@ msgstr "Produits à consommer"
 #~ msgid "Total Cost of "
 #~ msgstr "Coût total "
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Révision des nomenclatures"
+
 #, python-format
 #~ msgid "Work Cost of "
 #~ msgstr "Coût de fabrication de "

addons/mrp/i18n/gl.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -226,11 +226,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para material mercado"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisión"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -498,11 +493,6 @@ msgstr "Descomposición fabricación"
 msgid "For Services."
 msgstr "Para servizos"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Data de modificación"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -564,11 +554,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Forzar reservas"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -859,11 +844,6 @@ msgstr "Ciclos totais"
 msgid "Ready to Produce"
 msgstr "Listo para producir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nome da modificación"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1450,11 +1430,6 @@ msgstr "Abastecer produtos"
 msgid "Work Center Loads"
 msgstr "Cargas centro de produción"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisión da lista de materiais"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1990,12 +1965,6 @@ msgstr "Tempo en horas para a configuración."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Lista de materiais"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2013,17 +1982,6 @@ msgstr "Asignación desde stock."
 msgid "Waiting Goods"
 msgstr "Esperando mercancía"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último índice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisións lista de materiais"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2212,19 +2170,6 @@ msgstr "Cambiar cantidade"
 msgid "Change Product Qty"
 msgstr "Cambiar Ctde producto"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descrición"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2368,6 +2313,9 @@ msgstr "Produtos a consumir"
 #~ "Mellora as ordes de produción cos estados de preparación, así como a data de "
 #~ "inicio e final da execución da orde."
 
+#~ msgid "Revision"
+#~ msgstr "Revisión"
+
 #~ msgid "title"
 #~ msgstr "título"
 
@@ -2400,6 +2348,12 @@ msgstr "Produtos a consumir"
 #~ "Activa a garantía e a xestión das reparacións (e o seu impacto sobre os "
 #~ "stocks e a facturación)"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Modification Date"
+#~ msgstr "Data de modificación"
+
 #~ msgid "March"
 #~ msgstr "Marzo"
 
@@ -2442,6 +2396,9 @@ msgstr "Produtos a consumir"
 #~ msgid "Extended Filters..."
 #~ msgstr "Filtros extendidos..."
 
+#~ msgid "Modification name"
+#~ msgstr "Nome da modificación"
+
 #~ msgid "Just In Time Scheduling"
 #~ msgstr "Planificación 'Just in Time'"
 
@@ -2622,6 +2579,9 @@ msgstr "Produtos a consumir"
 #~ "Estes informes permítenlle analizar as súas actividades productivas e o seu "
 #~ "rendemento."
 
+#~ msgid "BoM"
+#~ msgstr "Lista de materiais"
+
 #~ msgid "December"
 #~ msgstr "Decembro"
 
@@ -2634,6 +2594,12 @@ msgstr "Produtos a consumir"
 #~ msgid "Configuration Progress"
 #~ msgstr "Progreso da configuración"
 
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisións lista de materiais"
+
+#~ msgid "last indice"
+#~ msgstr "Último índice"
+
 #~ msgid "Draft"
 #~ msgstr "Proxecto"
 
@@ -2652,6 +2618,9 @@ msgstr "Produtos a consumir"
 #~ msgid "January"
 #~ msgstr "Xaneiro"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisión da lista de materiais"
+
 #~ msgid "Manufacturing Operations"
 #~ msgstr "Operacións de produción"
 
@@ -2680,6 +2649,9 @@ msgstr "Produtos a consumir"
 #~ msgid "Work Cost of "
 #~ msgstr "Custo do traballo de "
 
+#~ msgid "Description"
+#~ msgstr "Descrición"
+
 #~ msgid "May"
 #~ msgstr "Maio"
 

addons/mrp/i18n/hi.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -470,11 +465,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -532,11 +522,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "लेखक"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -817,11 +802,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1382,11 +1362,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1890,12 +1865,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1913,17 +1882,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2109,19 +2067,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2284,6 +2229,9 @@ msgstr ""
 #~ msgid "Print product price"
 #~ msgstr "प्रिंट उत्पाद मूल्य"
 
+#~ msgid "Author"
+#~ msgstr "लेखक"
+
 #~ msgid "Latest error"
 #~ msgstr "नवीनतम त्रुटि"
 

addons/mrp/i18n/hr.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -223,11 +223,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Za nabavljeni materijal"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revizija"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -495,11 +490,6 @@ msgstr "Dekompozicija proizvodnje"
 msgid "For Services."
 msgstr "Za usluge."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Datum promjene"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -561,11 +551,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Force Reservation"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -856,11 +841,6 @@ msgstr "Ukupno ciklusa"
 msgid "Ready to Produce"
 msgstr "Spremno za proizvodnju"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Naziv promjene"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1446,11 +1426,6 @@ msgstr "Procure Products"
 msgid "Work Center Loads"
 msgstr "Opterećenje radnog centra"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revizija sastavnice"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1988,12 +1963,6 @@ msgstr "Vrijeme u satima za pripremu."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "BoM"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2011,17 +1980,6 @@ msgstr "Dodjela sa skladišta"
 msgid "Waiting Goods"
 msgstr "Waiting Goods"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "last indice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "BoM Revisions"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2210,19 +2168,6 @@ msgstr "Promjeni količinu"
 msgid "Change Product Qty"
 msgstr "Promjeni kol. proizvoda"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Opis"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2363,6 +2308,9 @@ msgstr "Proizvodi za utrošiti"
 #~ msgid "Raw Material Location"
 #~ msgstr "Mjesto Sirovina"
 
+#~ msgid "Revision"
+#~ msgstr "Revizija"
+
 #~ msgid "June"
 #~ msgstr "Lipanj"
 
@@ -2378,6 +2326,9 @@ msgstr "Proizvodi za utrošiti"
 #~ msgid "October"
 #~ msgstr "Listopad"
 
+#~ msgid "Modification Date"
+#~ msgstr "Datum promjene"
+
 #~ msgid "March"
 #~ msgstr "Ožujak"
 
@@ -2415,6 +2366,24 @@ msgstr "Proizvodi za utrošiti"
 #~ msgid "Manufacturing Resource Planning"
 #~ msgstr "Planiranje resursa proizvodnje"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Modification name"
+#~ msgstr "Naziv promjene"
+
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revizija sastavnice"
+
+#~ msgid "BoM"
+#~ msgstr "BoM"
+
+#~ msgid "last indice"
+#~ msgstr "last indice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "BoM Revisions"
+
 #~ msgid "Work Center Future Load"
 #~ msgstr "Buduće opterećenje radnog centra"
 
@@ -2431,6 +2400,9 @@ msgstr "Proizvodi za utrošiti"
 #~ "sales person creates a sales order, he can relate it to several properties "
 #~ "and OpenERP will automatically select the BoM to use according the the needs."
 
+#~ msgid "Description"
+#~ msgstr "Opis"
+
 #~ msgid ""
 #~ "Work Center Loads gives you a projection of work center loads over a "
 #~ "specified period. It is expressed in number of hours and machine related "

addons/mrp/i18n/hu.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -226,11 +226,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Vásárolt termékhez"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Felülvizsgálat"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -499,11 +494,6 @@ msgstr "Gyártás lebontása"
 msgid "For Services."
 msgstr "Szolgáltatásokhoz."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Módosítás dátuma"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -565,11 +555,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Foglalás erőltetése"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Szerző"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -862,11 +847,6 @@ msgstr "Összes ciklus"
 msgid "Ready to Produce"
 msgstr "Gyártásra kész"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Módosítás neve"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1453,11 +1433,6 @@ msgstr "Termékek beszerzése"
 msgid "Work Center Loads"
 msgstr "Munkaállomások terheltsége"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Anyagjegyzék felülvizsgálat"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1998,12 +1973,6 @@ msgstr "A beállításhoz szükséges idő órákban megadva."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Anyagjegyzék"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2021,17 +1990,6 @@ msgstr "Ellátás raktárból"
 msgid "Waiting Goods"
 msgstr "Várakozás az árura"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "utolsó jelzőszám"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Anyagjegyzék felülvizsgálatok"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2220,19 +2178,6 @@ msgstr "Mennyiség változtatása"
 msgid "Change Product Qty"
 msgstr "Mennyiség változtatása"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Leírás"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2366,6 +2311,12 @@ msgstr "Felhasználandó termékek"
 #~ msgid "October"
 #~ msgstr "Október"
 
+#~ msgid "Modification Date"
+#~ msgstr "Módosítás dátuma"
+
+#~ msgid "Author"
+#~ msgstr "Szerző"
+
 #~ msgid "March"
 #~ msgstr "Március"
 
@@ -2379,6 +2330,9 @@ msgstr "Felhasználandó termékek"
 #~ msgid "September"
 #~ msgstr "Szeptember"
 
+#~ msgid "Modification name"
+#~ msgstr "Módosítás neve"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Kiterjesztett szűrők…"
 
@@ -2403,6 +2357,9 @@ msgstr "Felhasználandó termékek"
 #~ msgid "January"
 #~ msgstr "Január"
 
+#~ msgid "Description"
+#~ msgstr "Leírás"
+
 #~ msgid "May"
 #~ msgstr "Május"
 
@@ -2461,6 +2418,9 @@ msgstr "Felhasználandó termékek"
 #~ msgid "MRP Subproducts"
 #~ msgstr "MRP altermékek modul"
 
+#~ msgid "Revision"
+#~ msgstr "Felülvizsgálat"
+
 #~ msgid "title"
 #~ msgstr "pozíció"
 
@@ -2682,6 +2642,15 @@ msgstr "Felhasználandó termékek"
 #~ msgid "Configure"
 #~ msgstr "Beállít"
 
+#~ msgid "BoM"
+#~ msgstr "Anyagjegyzék"
+
+#~ msgid "last indice"
+#~ msgstr "utolsó jelzőszám"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Anyagjegyzék felülvizsgálatok"
+
 #~ msgid ""
 #~ "Routing indicates all the workcenters used, for how long and/or cycles.If "
 #~ "Routing is indicated then,the third tab of a production order (workcenters) "
@@ -2691,6 +2660,9 @@ msgstr "Felhasználandó termékek"
 #~ "hány ciklusra van használatban. Ha a gyártási eljárás be van kapcsolva, a "
 #~ "gyártási rendelés 3. füle (munkaállomások) automatikusan kitöltésre kerül."
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Anyagjegyzék felülvizsgálat"
+
 #, python-format
 #~ msgid "Work Cost of "
 #~ msgstr "Munkaköltsége "

addons/mrp/i18n/id.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -210,11 +210,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -469,11 +464,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -531,11 +521,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -816,11 +801,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1381,11 +1361,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1889,12 +1864,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1912,17 +1881,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2108,19 +2066,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"

addons/mrp/i18n/it.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -226,11 +226,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Per materiali acquistati"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisione"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -501,11 +496,6 @@ msgstr "Scomposizione produzione"
 msgid "For Services."
 msgstr "Per Servizi."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Data di Ultima Modifica"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -567,11 +557,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Forza Prenotazione"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Mittente"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -866,11 +851,6 @@ msgstr "Cicli totali"
 msgid "Ready to Produce"
 msgstr "Pronto per Entrare in Produzione"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nome Modifica"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1454,11 +1434,6 @@ msgstr "Approvvigiona i prodotti"
 msgid "Work Center Loads"
 msgstr "Carico Centri di Lavoro"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisione distinta base"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2002,12 +1977,6 @@ msgstr "Tempo in ore per il setup."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Distinta base"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2025,17 +1994,6 @@ msgstr "Assegnazione da stock."
 msgid "Waiting Goods"
 msgstr "In attesa del materiale"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Ultimo Indice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisioni Distinta Base"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2224,19 +2182,6 @@ msgstr "Cambia quantità"
 msgid "Change Product Qty"
 msgstr "Cambia la quantità del prodotto"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descrizione"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2355,6 +2300,9 @@ msgstr ""
 msgid "Products to Consume"
 msgstr "Prodotti da Utilizzare"
 
+#~ msgid "Revision"
+#~ msgstr "Revisione"
+
 #~ msgid "UoS Quantity"
 #~ msgstr "Quantità Unità di Vendita"
 
@@ -2412,6 +2360,9 @@ msgstr "Prodotti da Utilizzare"
 #~ msgid "Procurement Lines"
 #~ msgstr "Righe Approvvigionamento"
 
+#~ msgid "Modification name"
+#~ msgstr "Nome Modifica"
+
 #~ msgid "Exception"
 #~ msgstr "Eccezione"
 
@@ -2517,9 +2468,18 @@ msgstr "Prodotti da Utilizzare"
 #~ msgid "plus"
 #~ msgstr "più"
 
+#~ msgid "BoM"
+#~ msgstr "Distinta base"
+
 #~ msgid "New Production Order"
 #~ msgstr "Nuovo Ordine di Produzione"
 
+#~ msgid "last indice"
+#~ msgstr "Ultimo Indice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisioni Distinta Base"
+
 #~ msgid "Retry"
 #~ msgstr "Riprova"
 
@@ -2535,6 +2495,9 @@ msgstr "Prodotti da Utilizzare"
 #~ msgid "Close Move at end"
 #~ msgstr "Chiudi spostamento alla Fine"
 
+#~ msgid "Description"
+#~ msgstr "Descrizione"
+
 #~ msgid "Running"
 #~ msgstr "In esecuzione"
 
@@ -2715,6 +2678,9 @@ msgstr "Prodotti da Utilizzare"
 #~ msgid "Procurement Process"
 #~ msgstr "Procedura di approvvigionamento"
 
+#~ msgid "Author"
+#~ msgstr "Mittente"
+
 #~ msgid "If Procure method is Make to order and supply method is produce"
 #~ msgstr ""
 #~ "Se il tipo di approvvigionamento è \"Make to Order\" e il tipo di fornitura "
@@ -2723,6 +2689,9 @@ msgstr "Prodotti da Utilizzare"
 #~ msgid "Purchase Lead Time"
 #~ msgstr "Lead Time di Acquisto"
 
+#~ msgid "Modification Date"
+#~ msgstr "Data di Ultima Modifica"
+
 #~ msgid "Manufacturity Lead Time"
 #~ msgstr "Lead Time di Produzione"
 
@@ -3124,6 +3093,9 @@ msgstr "Prodotti da Utilizzare"
 #~ msgid "January"
 #~ msgstr "Gennaio"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisione distinta base"
+
 #~ msgid "February"
 #~ msgstr "Febbraio"
 

addons/mrp/i18n/ja.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -213,11 +213,6 @@ msgstr "分析会計の中で製造コストを簡単に追跡するため、こ
 msgid "For purchased material"
 msgstr "仕入済材料"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "改訂"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -477,11 +472,6 @@ msgstr "製造分解"
 msgid "For Services."
 msgstr "サービス用"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "修正日"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -539,11 +529,6 @@ msgstr "作業センタの設定"
 msgid "Force Reservation"
 msgstr "強制予約"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "著者"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -830,11 +815,6 @@ msgstr "合計サイクル"
 msgid "Ready to Produce"
 msgstr "生産準備完了"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "変更の名前"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1402,11 +1382,6 @@ msgstr "調達製品"
 msgid "Work Center Loads"
 msgstr "作業センタの負荷"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "部品表の改訂"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1926,12 +1901,6 @@ msgstr "設定のための時間（時）"
 msgid "Orange Juice"
 msgstr "オレンジジュース"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "部品表"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1949,17 +1918,6 @@ msgstr "在庫から割当"
 msgid "Waiting Goods"
 msgstr "待機商品"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "最終インデックス"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "部品表改訂"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2148,19 +2106,6 @@ msgstr "数量変更"
 msgid "Change Product Qty"
 msgstr "製品数量変更"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "説明"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2271,6 +2216,33 @@ msgstr "部品表のリストを表示する際には並び順を与えます。
 msgid "Products to Consume"
 msgstr "消費製品"
 
+#~ msgid "Revision"
+#~ msgstr "改訂"
+
+#~ msgid "Modification Date"
+#~ msgstr "修正日"
+
+#~ msgid "Author"
+#~ msgstr "著者"
+
+#~ msgid "Modification name"
+#~ msgstr "変更の名前"
+
+#~ msgid "Bill of Material Revision"
+#~ msgstr "部品表の改訂"
+
+#~ msgid "BoM"
+#~ msgstr "部品表"
+
+#~ msgid "last indice"
+#~ msgstr "最終インデックス"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "部品表改訂"
+
+#~ msgid "Description"
+#~ msgstr "説明"
+
 #~ msgid ""
 #~ "Reference of the document that created this procurement.\n"
 #~ "This is automatically completed by Open ERP."

addons/mrp/i18n/ko.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "개정 번호"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -472,11 +467,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "수정 날짜"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -534,11 +524,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "예약하기"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "작성자"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -819,11 +804,6 @@ msgstr "총 사이클"
 msgid "Ready to Produce"
 msgstr "생산 준비"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "수정 이름"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1384,11 +1364,6 @@ msgstr "상품 조달"
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1892,12 +1867,6 @@ msgstr "셋업 시간"
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "BoM"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1915,17 +1884,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr "대기 상품"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "마지막 인덱스"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "BoM 리비전"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2111,19 +2069,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr "상품 수량 변경"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "설명"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2359,6 +2304,12 @@ msgstr ""
 #~ msgid "Purchase Lead Time"
 #~ msgstr "구매 리드 타임"
 
+#~ msgid "Author"
+#~ msgstr "작성자"
+
+#~ msgid "Modification Date"
+#~ msgstr "수정 날짜"
+
 #~ msgid "Make Procurement"
 #~ msgstr "조달하기"
 
@@ -2426,6 +2377,9 @@ msgstr ""
 #~ msgid "Security Days"
 #~ msgstr "안전 기간 (일)"
 
+#~ msgid "Modification name"
+#~ msgstr "수정 이름"
+
 #~ msgid "If Product type is service"
 #~ msgstr "상품 타입이 서비스일 경우"
 
@@ -2710,9 +2664,18 @@ msgstr ""
 #~ msgid "Canceled"
 #~ msgstr "취소됨"
 
+#~ msgid "BoM"
+#~ msgstr "BoM"
+
 #~ msgid "New Production Order"
 #~ msgstr "새 생산 주문"
 
+#~ msgid "BoM Revisions"
+#~ msgstr "BoM 리비전"
+
+#~ msgid "last indice"
+#~ msgstr "마지막 인덱스"
+
 #~ msgid "plus"
 #~ msgstr "더하기"
 
@@ -2778,6 +2741,9 @@ msgstr ""
 #~ msgid "Bill of Material Structure"
 #~ msgstr "BoM 구조"
 
+#~ msgid "Description"
+#~ msgstr "설명"
+
 #~ msgid "Workcenter load"
 #~ msgstr "워크센터 부하"
 
@@ -2790,6 +2756,9 @@ msgstr ""
 #~ msgid "Procurement Details"
 #~ msgstr "조달 상세내용"
 
+#~ msgid "Revision"
+#~ msgstr "개정 번호"
+
 #~ msgid "Not used in computations, for information purpose only."
 #~ msgstr "계산용이 아닌 정보 용도"
 

addons/mrp/i18n/lt.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 "Language: lt\n"
 
 #. module: mrp
@@ -212,11 +212,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revizija"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -474,11 +469,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Modifikavimo data"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -538,11 +528,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Priverstinai rezervuoti"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autorius"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -823,11 +808,6 @@ msgstr "Iš viso ciklų"
 msgid "Ready to Produce"
 msgstr "Paruošta gamybai"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Modifikavimo pavadinimas"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1388,11 +1368,6 @@ msgstr "Užsakyti produktus"
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1897,12 +1872,6 @@ msgstr "Laikas valandomis pradėti gamybai"
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "KS"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1920,17 +1889,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr "Laukiama žaliavų"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Pask. revizija"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "KS revizijos"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2116,19 +2074,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr "Pakeisti produkto kiekį"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Aprašymas"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2247,6 +2192,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Paleidžiamas automatiškai, kai virtualios atsargos pasidaro mažiau nulio."
 
+#~ msgid "Revision"
+#~ msgstr "Revizija"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Apskaičiuoti atsargų likučio taisykles"
 
@@ -2398,12 +2346,18 @@ msgstr ""
 #~ msgid "Make Procurement"
 #~ msgstr "Sukurti planinį užsakymą"
 
+#~ msgid "Modification Date"
+#~ msgstr "Modifikavimo data"
+
 #~ msgid "If Procure method is Make to order and supply method is produce"
 #~ msgstr "Jeigu gamybos metodas yra užsakyti ir tiekimo metodas yra gaminti"
 
 #~ msgid "Purchase Lead Time"
 #~ msgstr "Gamybos trukmė"
 
+#~ msgid "Author"
+#~ msgstr "Autorius"
+
 #~ msgid "Stockable Product Stock"
 #~ msgstr "Produktai sandėlyje."
 
@@ -2491,6 +2445,9 @@ msgstr ""
 #~ msgid "Security Days"
 #~ msgstr "Saugios dienos"
 
+#~ msgid "Modification name"
+#~ msgstr "Modifikavimo pavadinimas"
+
 #~ msgid "Exception"
 #~ msgstr "Išimtis"
 
@@ -2805,6 +2762,9 @@ msgstr ""
 #~ msgid "plus"
 #~ msgstr "plius"
 
+#~ msgid "BoM"
+#~ msgstr "KS"
+
 #~ msgid ""
 #~ "The list of operations (list of workcenters) to produce the finished "
 #~ "product. The routing is mainly used to compute workcenter costs during "
@@ -2824,6 +2784,12 @@ msgstr ""
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Užklausa yra sukurta ir išsiųsta tiekėjams."
 
+#~ msgid "last indice"
+#~ msgstr "Pask. revizija"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "KS revizijos"
+
 #~ msgid "Retry"
 #~ msgstr "Pakartoti"
 
@@ -2881,6 +2847,9 @@ msgstr ""
 #~ msgid "Close Move at end"
 #~ msgstr "Uždarymo perkėlimas pabaigoje"
 
+#~ msgid "Description"
+#~ msgstr "Aprašymas"
+
 #~ msgid "Running"
 #~ msgstr "Veikiantis"
 

addons/mrp/i18n/lv.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -470,11 +465,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -532,11 +522,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -817,11 +802,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1382,11 +1362,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1890,12 +1865,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1913,17 +1882,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2109,19 +2067,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"

addons/mrp/i18n/mn.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -227,11 +227,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Худалдан авсан материалын хувьд"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Хувилбар"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -506,11 +501,6 @@ msgstr "Үйлдвэрлэлийн задаргаа"
 msgid "For Services."
 msgstr "Үйлчилгээнүүдэд."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Зассан огноо"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -570,11 +560,6 @@ msgstr "Дамжлагыг тохируулах"
 msgid "Force Reservation"
 msgstr "Нөөцлөхийг албадах"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Зохиогч"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -870,11 +855,6 @@ msgstr "Нийт циклүүд"
 msgid "Ready to Produce"
 msgstr "Үйлдвэрлэхэд бэлэн"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Өөрчлөлтийн нэр"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1463,11 +1443,6 @@ msgstr "Бараа татах"
 msgid "Work Center Loads"
 msgstr "Дамжлагын Ачаалал"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Жорын Шинэчилсэн хувилбар"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2001,12 +1976,6 @@ msgstr "Суурилуулах хугацаа цагаар"
 msgid "Orange Juice"
 msgstr "Жүржийн Шүүс"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Жор"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2024,17 +1993,6 @@ msgstr "Бараанаас хуваарилах"
 msgid "Waiting Goods"
 msgstr "Бараанууд Хүлээж буй"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "сүүлийн индекс"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Жорын өөрчлөлтүүд"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2225,19 +2183,6 @@ msgstr "Тоо хэмжээг өөрчлөх"
 msgid "Change Product Qty"
 msgstr "Барааны Тоо Хэмжээг Өөрчлөх"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Тайлбар"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2355,3 +2300,30 @@ msgstr "Жорын жагсаалтыг харуулах дэс дарааллы
 #: report:mrp.production.order:0
 msgid "Products to Consume"
 msgstr "Хангах Бараанууд"
+
+#~ msgid "Revision"
+#~ msgstr "Хувилбар"
+
+#~ msgid "Modification Date"
+#~ msgstr "Зассан огноо"
+
+#~ msgid "Author"
+#~ msgstr "Зохиогч"
+
+#~ msgid "Modification name"
+#~ msgstr "Өөрчлөлтийн нэр"
+
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Жорын Шинэчилсэн хувилбар"
+
+#~ msgid "BoM"
+#~ msgstr "Жор"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Жорын өөрчлөлтүүд"
+
+#~ msgid "last indice"
+#~ msgstr "сүүлийн индекс"
+
+#~ msgid "Description"
+#~ msgstr "Тайлбар"

addons/mrp/i18n/mrp.pot

@@ -196,11 +196,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid "Create a product form for everything you buy or sell. Specify a supplier if the product can be purchased."
@@ -435,11 +430,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -493,11 +483,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -761,11 +746,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1294,11 +1274,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid "Reference of the document that generated this production order request."
@@ -1772,12 +1747,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1795,17 +1764,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -1987,19 +1945,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"

addons/mrp/i18n/nb.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -226,17 +226,14 @@ msgstr ""
 msgid "For purchased material"
 msgstr "For innkjøpt materiale"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisjon"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
 "the product can be purchased."
 msgstr ""
+"Lag et produktskjema for alt du kjøper eller selger. Angi en leverandør hvis "
+"produktet kan bli kjøpt."
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.next_id_77
@@ -504,11 +501,6 @@ msgstr "Produksjon nedbryting"
 msgid "For Services."
 msgstr "For Tjenester."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Dato endret"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -569,11 +561,6 @@ msgstr "Konfigurer arbeidssenter"
 msgid "Force Reservation"
 msgstr "Tving Reservasjon"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Forfatter"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -600,6 +587,7 @@ msgstr "Leverandør Pris per enhet"
 msgid ""
 "Gives the sequence order when displaying a list of routing Work Centers."
 msgstr ""
+"Gir rekkefølgen av når du viser en liste over ruter av  arbeidsstasjoner."
 
 #. module: mrp
 #: constraint:stock.move:0
@@ -714,7 +702,7 @@ msgstr "Tid i timer for å utføre en syklus."
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "BoM line product should not be same as BoM product."
-msgstr ""
+msgstr "Bom linje produktet bør ikke være det samme som BOM produkt."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -842,6 +830,10 @@ msgid ""
 "resource leave are not taken into account in the time computation of the "
 "work center."
 msgstr ""
+"Arbeidsstasjoner kan du opprette og administrere produksjonsenheter. De "
+"består av arbeidstakerne og / eller maskiner, som anses som en enhet for "
+"kapasitet og planlegging prognose. Husk at arbeidstiden og ressurs permisjon "
+"ikke er tatt hensyn til i tiden beregning av arbeidet sentrum."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
@@ -864,11 +856,6 @@ msgstr "Totalt Sykluser"
 msgid "Ready to Produce"
 msgstr "Klar for produksjon"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Endring navn"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1107,7 +1094,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.todo.category,name:mrp.category_mrp_config
 msgid "MRP Management"
-msgstr ""
+msgstr "MRP Ledelse"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
@@ -1120,6 +1107,8 @@ msgid ""
 "Number of operations this Work Center can do in parallel. If this Work "
 "Center represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
+"Antall operasjoner denne Work Center kan gjøre parallelt. Hvis dette Work "
+"Center representerer et lag av 5 arbeidere, er kapasiteten per syklus 5."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
@@ -1452,11 +1441,6 @@ msgstr "Anskaff Produkter"
 msgid "Work Center Loads"
 msgstr "Arbeidssenter Belastning"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Stykkliste revisjoner"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1976,12 +1960,6 @@ msgstr "Tid i timer for oppsett."
 msgid "Orange Juice"
 msgstr "Appelsinjuice"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Materialliste"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1999,17 +1977,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Materialliste revisjon"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2195,19 +2162,6 @@ msgstr "Endre antall"
 msgid "Change Product Qty"
 msgstr "Endre produkt mengde"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Beskrivelse"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2328,6 +2282,9 @@ msgstr "Produkter til forbruk"
 #~ msgid "Raw Material Location"
 #~ msgstr "Råmateriale Lokasjon"
 
+#~ msgid "Revision"
+#~ msgstr "Revisjon"
+
 #~ msgid "title"
 #~ msgstr "tittel"
 
@@ -2370,6 +2327,12 @@ msgstr "Produkter til forbruk"
 #~ "Muliggjør garanti og reparasjons håndtering (og deres påvirkning av lager og "
 #~ "fakturering)."
 
+#~ msgid "Author"
+#~ msgstr "Forfatter"
+
+#~ msgid "Modification Date"
+#~ msgstr "Dato endret"
+
 #~ msgid "March"
 #~ msgstr "Mars"
 
@@ -2412,6 +2375,9 @@ msgstr "Produkter til forbruk"
 #~ msgid "Extended Filters..."
 #~ msgstr "Utvidede filter..."
 
+#~ msgid "Modification name"
+#~ msgstr "Endring navn"
+
 #~ msgid "Just In Time Scheduling"
 #~ msgstr "Akkurat i Tide Planlegging"
 
@@ -2603,6 +2569,12 @@ msgstr "Produkter til forbruk"
 #~ msgid "January"
 #~ msgstr "Januar"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Stykkliste revisjoner"
+
+#~ msgid "Description"
+#~ msgstr "Beskrivelse"
+
 #~ msgid "April"
 #~ msgstr "April"
 
@@ -2614,3 +2586,9 @@ msgstr "Produkter til forbruk"
 
 #~ msgid "Year"
 #~ msgstr "År"
+
+#~ msgid "BoM"
+#~ msgstr "Materialliste"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Materialliste revisjon"

addons/mrp/i18n/nl.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Voor ingekocht materiaal"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisie"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -507,11 +502,6 @@ msgstr "Productie afbraak"
 msgid "For Services."
 msgstr "Voor services"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Wijzigingsdatum"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -573,11 +563,6 @@ msgstr "Configureer uw werkplekken"
 msgid "Force Reservation"
 msgstr "Forceer reservering"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Auteur"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -882,11 +867,6 @@ msgstr "Totaal aantal cycli"
 msgid "Ready to Produce"
 msgstr "Gereed voor productie"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Naamswijziging"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1483,11 +1463,6 @@ msgstr "Verwerf producten"
 msgid "Work Center Loads"
 msgstr "Werkplek belastingen"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Grondstoffenlijst revisie"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1555,7 +1530,7 @@ msgstr "Verantwoordelijke"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
 msgid "Manufacturing Orders To Start"
-msgstr "Porductieorers te starten"
+msgstr "Productieorders te starten"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
@@ -1737,7 +1712,7 @@ msgstr ""
 "In de 'Alleen verbruiken' modus worden alleen producten met de geselecteerde "
 "hoeveelheid verbruikt.\n"
 "In de 'Verbruik & Produceer' modus worden producten verbruikt met de "
-"geselecteerde hoeveelheid en het zal de productieporder afronden wanneer de "
+"geselecteerde hoeveelheid en het zal de productieorder afronden wanneer de "
 "totaal bestelde hoeveelheid zijn geproduceerd."
 
 #. module: mrp
@@ -2035,12 +2010,6 @@ msgstr "Opzettijd in uren"
 msgid "Orange Juice"
 msgstr "Sinasappelsap"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Materiaallijst"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2058,17 +2027,6 @@ msgstr "Toegewezen van voorraad"
 msgid "Waiting Goods"
 msgstr "Wacht op materialen"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "laatste index"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Materiaallijst versies"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2259,19 +2217,6 @@ msgstr "Wijzig hoeveelheid"
 msgid "Change Product Qty"
 msgstr "Wijzig producthoeveelheid"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Beschrijving"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2420,6 +2365,9 @@ msgstr "Producten te verbruiken"
 #~ msgid "Product Standard Price"
 #~ msgstr "Standaard productprijs"
 
+#~ msgid "Modification Date"
+#~ msgstr "Wijzigingsdatum"
+
 #~ msgid "For stockable and consumable"
 #~ msgstr "Voor voorraadartikel en verbruiksartikel"
 
@@ -2521,6 +2469,9 @@ msgstr "Producten te verbruiken"
 #~ msgid "max"
 #~ msgstr "max"
 
+#~ msgid "Author"
+#~ msgstr "Auteur"
+
 #~ msgid "Latest error"
 #~ msgstr "Laatste fout"
 
@@ -2836,6 +2787,9 @@ msgstr "Producten te verbruiken"
 #~ msgid "New Production Order"
 #~ msgstr "Nieuwe productieopdracht"
 
+#~ msgid "Description"
+#~ msgstr "Beschrijving"
+
 #~ msgid "Service Product"
 #~ msgstr "Dienstverleningsproduct"
 
@@ -3033,6 +2987,12 @@ msgstr "Producten te verbruiken"
 #~ msgid "Canceled"
 #~ msgstr "Geannuleerd"
 
+#~ msgid "BoM"
+#~ msgstr "Materiaallijst"
+
+#~ msgid "last indice"
+#~ msgstr "laatste index"
+
 #~ msgid "An entry is being made from billing material to routing."
 #~ msgstr ""
 #~ "Er wordt een boeking gemaakt van doorbelastbaar materiaal naar routering."
@@ -3111,6 +3071,9 @@ msgstr "Producten te verbruiken"
 #~ msgid "UoS Quantity"
 #~ msgstr "VE aantal"
 
+#~ msgid "Revision"
+#~ msgstr "Revisie"
+
 #~ msgid "Routing Workcenters"
 #~ msgstr "Routing werkcentra"
 
@@ -3126,6 +3089,9 @@ msgstr "Producten te verbruiken"
 #~ msgid "Workcenter Operations"
 #~ msgstr "Werkcenter operaties"
 
+#~ msgid "Modification name"
+#~ msgstr "Naamswijziging"
+
 #~ msgid "alphabetical indices"
 #~ msgstr "Alfabetische index"
 
@@ -3185,3 +3151,9 @@ msgstr "Producten te verbruiken"
 
 #~ msgid "Repairs"
 #~ msgstr "Reparaties"
+
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Grondstoffenlijst revisie"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Materiaallijst versies"

addons/mrp/i18n/nl_BE.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -210,11 +210,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -469,11 +464,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -531,11 +521,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -816,11 +801,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1381,11 +1361,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1889,12 +1864,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1912,17 +1881,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2108,19 +2066,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"

addons/mrp/i18n/pl.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -222,11 +222,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Dla kupowanych materiałów"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Wersja"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -494,11 +489,6 @@ msgstr "Dekompozycja produkcji"
 msgid "For Services."
 msgstr "Do usług."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Data modyfikacji"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -560,11 +550,6 @@ msgstr "Konfiguruj centra produkcyjne"
 msgid "Force Reservation"
 msgstr "Wymuś rezerwację"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -849,11 +834,6 @@ msgstr "Suma cykli"
 msgid "Ready to Produce"
 msgstr "Gotowe do produkcji"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nazwa modyfikacji"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1423,11 +1403,6 @@ msgstr "Zapotrzebowanie na produkty"
 msgid "Work Center Loads"
 msgstr "Obciążenie centrum roboczego"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Wersja zestawienia materiałowego"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1933,12 +1908,6 @@ msgstr "Czas dla tego kroku w godzinach"
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Zest. Mat."
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1956,17 +1925,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr "Czeka na materiały"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Wersje Zest. Mat."
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2152,19 +2110,6 @@ msgstr "Zmień ilość"
 msgid "Change Product Qty"
 msgstr "Zmień ilość produktu"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Opis"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2310,6 +2255,9 @@ msgstr "Produkty do zużycia"
 #~ msgid "Details"
 #~ msgstr "Szczegóły"
 
+#~ msgid "Modification Date"
+#~ msgstr "Data modyfikacji"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Oblicz tylko reguły minimalnych zapasów"
 
@@ -2381,6 +2329,9 @@ msgstr "Produkty do zużycia"
 #~ "Jeśli metoda nabycia jest 'Na zamówienie' i metoda zaopatrzenia jest "
 #~ "'Produkcja'"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Latest error"
 #~ msgstr "Ostatni błąd"
 
@@ -2409,6 +2360,9 @@ msgstr "Produkty do zużycia"
 #~ msgid "Security Days"
 #~ msgstr "Dni na wszelki wypadek"
 
+#~ msgid "Modification name"
+#~ msgstr "Nazwa modyfikacji"
+
 #~ msgid "If Product type is service"
 #~ msgstr "Jeśli typem produktu jest usługa"
 
@@ -2595,6 +2549,9 @@ msgstr "Produkty do zużycia"
 #~ msgid "Canceled"
 #~ msgstr "Anulowano"
 
+#~ msgid "BoM"
+#~ msgstr "Zest. Mat."
+
 #~ msgid "New Production Order"
 #~ msgstr "Nowe zamówienie produkcji"
 
@@ -2640,6 +2597,9 @@ msgstr "Produkty do zużycia"
 #~ msgid "Create minimum stock rules"
 #~ msgstr "Utwórz reguły zapasów minimalnych"
 
+#~ msgid "Description"
+#~ msgstr "Opis"
+
 #~ msgid "Bill of Material Structure"
 #~ msgstr "Struktura zestawień materiałowych"
 
@@ -2682,6 +2642,9 @@ msgstr "Produkty do zużycia"
 #~ "przechodzenia przez zamówienie produkcji. Zwykłe zestawienie materiałowe "
 #~ "będzie generowało jedno zamówienie produkcji na każdy poziom zestawienia."
 
+#~ msgid "BoM Revisions"
+#~ msgstr "Wersje Zest. Mat."
+
 #~ msgid "Draft"
 #~ msgstr "Projekt"
 
@@ -2802,6 +2765,9 @@ msgstr "Produkty do zużycia"
 #~ msgid "Service Product"
 #~ msgstr "Produkt - usługa"
 
+#~ msgid "Revision"
+#~ msgstr "Wersja"
+
 #~ msgid "Confirmed"
 #~ msgstr "Potwierdzone"
 
@@ -3200,6 +3166,9 @@ msgstr "Produkty do zużycia"
 #~ msgid "MRP Application Configuration"
 #~ msgstr "Konfiguracja aplikacji MRP"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Wersja zestawienia materiałowego"
+
 #~ msgid "MRP Applications Configuration"
 #~ msgstr "Konfiguracja aplikacji MRP"
 

addons/mrp/i18n/pt.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para materiais comprados"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisão"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -506,11 +501,6 @@ msgstr "Decomposição da produção"
 msgid "For Services."
 msgstr "Para serviços"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Data de modificação"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -572,11 +562,6 @@ msgstr "Configure os seus centros de trabalho"
 msgid "Force Reservation"
 msgstr "Forçar reserva"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -876,11 +861,6 @@ msgstr "Total de Ciclos"
 msgid "Ready to Produce"
 msgstr "Pronto para produzir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nome de modificação"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1477,11 +1457,6 @@ msgstr "Adquirir artigos"
 msgid "Work Center Loads"
 msgstr "Cargas Centro de Trabalho"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Ficha técnica da revisão de material"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2024,12 +1999,6 @@ msgstr "Tempo em horas para a configuração."
 msgid "Orange Juice"
 msgstr "Sumo Laranja"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "BoM"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2047,17 +2016,6 @@ msgstr "Atribuição de stock."
 msgid "Waiting Goods"
 msgstr "Esperar bens"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último índice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisões de BoM"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2248,19 +2206,6 @@ msgstr "Mudar a quantidade"
 msgid "Change Product Qty"
 msgstr "Alterar Quantidade do Artigo"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descrição"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2384,6 +2329,9 @@ msgstr "Artigos para consumir"
 #~ msgid "Moves Created"
 #~ msgstr "Movimentos criados"
 
+#~ msgid "Revision"
+#~ msgstr "Revisão"
+
 #~ msgid "UoS Quantity"
 #~ msgstr "Quantidade UoS"
 
@@ -2444,6 +2392,9 @@ msgstr "Artigos para consumir"
 #~ msgid "Print product price"
 #~ msgstr "Imprimir o preço do produto"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Latest error"
 #~ msgstr "Último erro"
 
@@ -2477,6 +2428,9 @@ msgstr "Artigos para consumir"
 #~ msgid "Security Days"
 #~ msgstr "Dias de segurança"
 
+#~ msgid "Modification name"
+#~ msgstr "Nome de modificação"
+
 #~ msgid "Exception"
 #~ msgstr "Excepção"
 
@@ -2617,9 +2571,18 @@ msgstr "Artigos para consumir"
 #~ msgid "plus"
 #~ msgstr "mais"
 
+#~ msgid "BoM"
+#~ msgstr "BoM"
+
 #~ msgid "New Production Order"
 #~ msgstr "Nova pedido de produção"
 
+#~ msgid "last indice"
+#~ msgstr "Último índice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisões de BoM"
+
 #~ msgid "Retry"
 #~ msgstr "Tentar novamente"
 
@@ -2644,6 +2607,9 @@ msgstr "Artigos para consumir"
 #~ msgid "Close Move at end"
 #~ msgstr "Fechar movimento no fim"
 
+#~ msgid "Description"
+#~ msgstr "Descrição"
+
 #~ msgid "Running"
 #~ msgstr "Em execução"
 
@@ -3236,6 +3202,9 @@ msgstr "Artigos para consumir"
 #~ msgid "Repairs"
 #~ msgstr "Reparações"
 
+#~ msgid "Modification Date"
+#~ msgstr "Data de modificação"
+
 #~ msgid "Raw Material Location"
 #~ msgstr "Localização do material em bruto"
 
@@ -3461,6 +3430,9 @@ msgstr "Artigos para consumir"
 #~ "aba da ordem de produção (centros de trabalho) será automaticamente pré-"
 #~ "preenchido."
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Ficha técnica da revisão de material"
+
 #, python-format
 #~ msgid "Work Cost of "
 #~ msgstr "Custo de trabalho "

addons/mrp/i18n/pt_BR.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -226,11 +226,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para Material Comprado"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisão"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -508,11 +503,6 @@ msgstr "Decomposição de Produção"
 msgid "For Services."
 msgstr "Para Serviços"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Data de Modificação"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -574,11 +564,6 @@ msgstr "Configure seus centros de trabalho"
 msgid "Force Reservation"
 msgstr "Forçar reserva"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -878,11 +863,6 @@ msgstr "Total de Ciclos"
 msgid "Ready to Produce"
 msgstr "Pronto para Produção"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Modificação de Nome"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1478,11 +1458,6 @@ msgstr "Adquirir Proodutos"
 msgid "Work Center Loads"
 msgstr "Cargas dos Centros de Trabalho"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisão da Lista de Materiais"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2026,12 +2001,6 @@ msgstr "Tempo em horas para a configuração."
 msgid "Orange Juice"
 msgstr "Suco de Laranja"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Lista de Material (BoM)"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2049,17 +2018,6 @@ msgstr "Atribuição pelo Estoque."
 msgid "Waiting Goods"
 msgstr "Aguardando mercadorias"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último Indice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "BoM Revisões"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2250,19 +2208,6 @@ msgstr "Alterar Quantidade"
 msgid "Change Product Qty"
 msgstr "Alterar Qtd. Produto"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descrição"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2425,6 +2370,9 @@ msgstr "Produtos para Consumir"
 #~ msgid "Production scheduled products"
 #~ msgstr "Produção de produtos agendados"
 
+#~ msgid "Modification Date"
+#~ msgstr "Data de Modificação"
+
 #~ msgid "Latest error"
 #~ msgstr "Último erro"
 
@@ -2455,6 +2403,9 @@ msgstr "Produtos para Consumir"
 #~ msgid "Details"
 #~ msgstr "Detalhes"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Qty Multiple"
 #~ msgstr "Múltiplo de Qtd"
 
@@ -2672,6 +2623,9 @@ msgstr "Produtos para Consumir"
 #~ msgstr ""
 #~ "Fator que multiplica todos os momentos expressa no centro de trabalho."
 
+#~ msgid "Modification name"
+#~ msgstr "Modificação de Nome"
+
 #~ msgid "Workcenter Name"
 #~ msgstr "Nome Centro de Trabalho"
 
@@ -2800,6 +2754,12 @@ msgstr "Produtos para Consumir"
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Um pedido de cotação é criado e enviado ao fornecedor."
 
+#~ msgid "BoM Revisions"
+#~ msgstr "BoM Revisões"
+
+#~ msgid "last indice"
+#~ msgstr "Último Indice"
+
 #~ msgid "Retry"
 #~ msgstr "Repetir"
 
@@ -2829,6 +2789,9 @@ msgstr "Produtos para Consumir"
 #~ msgid "Create minimum stock rules"
 #~ msgstr "Criar Regras minimas de Estoque."
 
+#~ msgid "Description"
+#~ msgstr "Descrição"
+
 #~ msgid "Service Product"
 #~ msgstr "Produto de Serviço"
 
@@ -2977,6 +2940,9 @@ msgstr "Produtos para Consumir"
 #~ msgstr ""
 #~ "Qualquer lançamento sendo feito da lista de materiais para roteamento"
 
+#~ msgid "BoM"
+#~ msgstr "Lista de Material (BoM)"
+
 #~ msgid "Procurement Reason"
 #~ msgstr "Motivo da Aquisição"
 
@@ -2992,6 +2958,9 @@ msgstr "Produtos para Consumir"
 #~ msgid "Close Move at end"
 #~ msgstr "Fechar Lançamento no final"
 
+#~ msgid "Revision"
+#~ msgstr "Revisão"
+
 #, python-format
 #~ msgid "Warning !"
 #~ msgstr "Atenção !"
@@ -3071,6 +3040,9 @@ msgstr "Produtos para Consumir"
 #~ msgid "Image"
 #~ msgstr "Imagem"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisão da Lista de Materiais"
+
 #~ msgid "November"
 #~ msgstr "Novembro"
 

addons/mrp/i18n/ro.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -223,11 +223,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Pentru materiale achizitionate"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revizie"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -504,11 +499,6 @@ msgstr "Descompunerea fabricatiei"
 msgid "For Services."
 msgstr "Pentru servicii."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Data Modificarii"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -570,11 +560,6 @@ msgstr "Configureaza centrele dumneavoastra de lucru"
 msgid "Force Reservation"
 msgstr "Impune Rezervarea"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -878,11 +863,6 @@ msgstr "Total Cicluri"
 msgid "Ready to Produce"
 msgstr "Pregatit de productie"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nume modificare"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1479,11 +1459,6 @@ msgstr "Necesar produse"
 msgid "Work Center Loads"
 msgstr "Sarcini Centru de lucru"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revizuire Lista de materiale"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2032,12 +2007,6 @@ msgstr "Timpul in ore pentru instalare."
 msgid "Orange Juice"
 msgstr "Suc de portocale"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "LdM"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2055,17 +2024,6 @@ msgstr "Repartizare din stoc."
 msgid "Waiting Goods"
 msgstr "Bunuri in asteptare"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "ultimul indice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revizuiri LdM"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2256,19 +2214,6 @@ msgstr "Schimba Cantitatea"
 msgid "Change Product Qty"
 msgstr "Schimba Cant Produsului"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descriere"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2386,12 +2331,24 @@ msgstr "Da ordinea atunci cand afiseaza o lista cu listele de materiale."
 msgid "Products to Consume"
 msgstr "Produse de consumat"
 
+#~ msgid "Revision"
+#~ msgstr "Revizie"
+
 #~ msgid "BOM"
 #~ msgstr "LDM"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Draft"
 #~ msgstr "Ciornă"
 
+#~ msgid "Description"
+#~ msgstr "Descriere"
+
+#~ msgid "Modification name"
+#~ msgstr "Nume modificare"
+
 #~ msgid "Day"
 #~ msgstr "Zi"
 
@@ -2434,6 +2391,9 @@ msgstr "Produse de consumat"
 #~ msgid "Current"
 #~ msgstr "Curent"
 
+#~ msgid "BoM"
+#~ msgstr "LdM"
+
 #~ msgid "December"
 #~ msgstr "Decembrie"
 
@@ -2510,6 +2470,9 @@ msgstr "Produse de consumat"
 #~ msgid "mrp.installer"
 #~ msgstr "mrp.installer"
 
+#~ msgid "last indice"
+#~ msgstr "ultimul indice"
+
 #~ msgid "Order quantity cannot be negative or zero !"
 #~ msgstr "Cantitatea din comandă nu poate fi negativă sau zero !"
 
@@ -2762,3 +2725,12 @@ msgstr "Produse de consumat"
 #~ "Fișa tehnologică indică toate centrele de lucru folosite, pentru cât timp și "
 #~ "/ sau cicluri. Dacă fișa tehnologică este indicată, atunci al treilea tab al "
 #~ "unei comenzi de producție (centre de lucru) va fi pre-completat automat."
+
+#~ msgid "Modification Date"
+#~ msgstr "Data Modificarii"
+
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revizuire Lista de materiale"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revizuiri LdM"

addons/mrp/i18n/ru.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -217,11 +217,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Для приобретенного материала"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Ревизия"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -489,11 +484,6 @@ msgstr "Декомпозиция производства"
 msgid "For Services."
 msgstr "Для услуг."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Дата изменения"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -553,11 +543,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Не ждать пополнения расходных"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Автор"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -846,11 +831,6 @@ msgstr "Всего циклов"
 msgid "Ready to Produce"
 msgstr "Готово к производству"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Название модификации"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1425,11 +1405,6 @@ msgstr "Снабжение товарами"
 msgid "Work Center Loads"
 msgstr "Загрузка Рабочего центра"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Пересмотр спецификации"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1936,12 +1911,6 @@ msgstr "Время наладки в часах"
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Спецификация"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1959,17 +1928,6 @@ msgstr "Назначение со склада."
 msgid "Waiting Goods"
 msgstr "Ожидание товара"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "последний индекс"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Ревизии спецификации"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2155,19 +2113,6 @@ msgstr "Изменить количество"
 msgid "Change Product Qty"
 msgstr "Изменить кол-во"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Описание"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2323,6 +2268,12 @@ msgstr "Потребляемые продукты"
 #~ msgid "Print product price"
 #~ msgstr "Распечатать цену продукции"
 
+#~ msgid "Modification Date"
+#~ msgstr "Дата изменения"
+
+#~ msgid "Author"
+#~ msgstr "Автор"
+
 #~ msgid "Latest error"
 #~ msgstr "Последняя ошибка"
 
@@ -2344,6 +2295,9 @@ msgstr "Потребляемые продукты"
 #~ msgid "Procurement Lines"
 #~ msgstr "Позиции снабжения"
 
+#~ msgid "Modification name"
+#~ msgstr "Название модификации"
+
 #~ msgid "Exception"
 #~ msgstr "Исключение"
 
@@ -2440,9 +2394,15 @@ msgstr "Потребляемые продукты"
 #~ msgid "plus"
 #~ msgstr "плюс"
 
+#~ msgid "BoM"
+#~ msgstr "Спецификация"
+
 #~ msgid "New Production Order"
 #~ msgstr "Новый заказ на производство"
 
+#~ msgid "last indice"
+#~ msgstr "последний индекс"
+
 #~ msgid "Retry"
 #~ msgstr "Повторить"
 
@@ -2458,6 +2418,9 @@ msgstr "Потребляемые продукты"
 #~ msgid "Warehouse"
 #~ msgstr "Склад"
 
+#~ msgid "Description"
+#~ msgstr "Описание"
+
 #~ msgid "Running"
 #~ msgstr "Выполняется"
 
@@ -2473,6 +2436,9 @@ msgstr "Потребляемые продукты"
 #~ msgid "Bill of Materials Components"
 #~ msgstr "Компоненты спецификации"
 
+#~ msgid "Revision"
+#~ msgstr "Ревизия"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Правила вычисления минимального запаса"
 
@@ -2574,6 +2540,9 @@ msgstr "Потребляемые продукты"
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Заявка выслана поставщику"
 
+#~ msgid "BoM Revisions"
+#~ msgstr "Ревизии спецификации"
+
 #~ msgid ""
 #~ "The list of operations (list of workcenters) to produce the finished "
 #~ "product. The routing is mainly used to compute workcenter costs during "
@@ -2965,6 +2934,9 @@ msgstr "Потребляемые продукты"
 #~ "Описание рабочего центра. Объясните здесь, каков цикл для этого рабочего "
 #~ "центра."
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Пересмотр спецификации"
+
 #~ msgid "Configure Your Manufacturing Resource Planning Application"
 #~ msgstr "Настройте модуль планирования ресурсов производства"
 

addons/mrp/i18n/sk.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revízia"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -470,11 +465,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -532,11 +522,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -817,11 +802,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1382,11 +1362,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1890,12 +1865,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1913,17 +1882,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2109,19 +2067,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2230,6 +2175,9 @@ msgstr ""
 msgid "Products to Consume"
 msgstr ""
 
+#~ msgid "Revision"
+#~ msgstr "Revízia"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neplatný názov modelu v akcii definície."
 

addons/mrp/i18n/sl.po

@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -210,11 +210,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Za nabavljeni material"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revizija"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -470,11 +465,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Datum spremembe"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -532,11 +522,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Avtor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -817,11 +802,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1382,11 +1362,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1890,12 +1865,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1913,17 +1882,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2109,19 +2067,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Opis"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2238,6 +2183,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
 
+#~ msgid "Revision"
+#~ msgstr "Revizija"
+
 #, python-format
 #~ msgid "Product name"
 #~ msgstr "Ime proizvoda"
@@ -2283,6 +2231,12 @@ msgstr ""
 #~ msgid "Reservation"
 #~ msgstr "Rezervacija"
 
+#~ msgid "Modification Date"
+#~ msgstr "Datum spremembe"
+
+#~ msgid "Author"
+#~ msgstr "Avtor"
+
 #~ msgid "Waiting"
 #~ msgstr "Čakanje"
 
@@ -2351,6 +2305,9 @@ msgstr ""
 #~ msgid "Close"
 #~ msgstr "Zapri"
 
+#~ msgid "Description"
+#~ msgstr "Opis"
+
 #~ msgid "Warehouse"
 #~ msgstr "Skladišče"
 

addons/mrp/i18n/sq.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:58+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -470,11 +465,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -532,11 +522,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -817,11 +802,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1382,11 +1362,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1890,12 +1865,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1913,17 +1882,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2109,19 +2067,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"

addons/mrp/i18n/sr@latin.po

@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 05:59+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:39+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -470,11 +465,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -532,11 +522,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -817,11 +802,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1382,11 +1362,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1890,12 +1865,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1913,17 +1882,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2109,19 +2067,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"