[MERGE]

bzr revid: sbh@tinyerp.com-20110325045806-2oqta2hmpuynn9iy
2011-03-25 10:28:06 +05:30 · 2011-03-25 10:28:06 +05:30 · 479f21f4fd
parent 8757b92bab dea0358cee
commit 479f21f4fd
36 changed files with 1551 additions and 854 deletions
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@ -172,7 +172,7 @@
                            <field name="reference" nolabel="1"/>
                            <field name="date_due"/>
                            <field name="check_total" required="2"/>
-                            <field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1">
+                            <field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" context="{'type': type}" nolabel="1">
                                <tree string="Invoice lines">
                                    <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/>
                                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)"/>
@ -280,7 +280,7 @@
                            <field domain="[('company_id', '=', company_id),('type','=', 'receivable')]" name="account_id" groups="account.group_account_user"/>
                            <field name="name"/>
                            <field name="payment_term" widget="selection"/>
-                            <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list"/>
+                            <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}"/>
                            <group col="1" colspan="2">
                                <field name="tax_line" nolabel="1">
                                    <tree editable="bottom" string="Taxes">
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@ -36,7 +36,7 @@ class account_installer(osv.osv_memory):

    def _get_charts(self, cr, uid, context=None):
        modules = self.pool.get('ir.module.module')
-        ids = modules.search(cr, uid, [('category_id', '=', 'Account Charts')], context=context)
+        ids = modules.search(cr, uid, [('name', 'like', 'l10n_')], context=context)
        charts = list(
            sorted(((m.name, m.shortdesc)
                    for m in modules.browse(cr, uid, ids, context=context)),
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@ -362,13 +362,13 @@ class account_invoice(osv.osv):
    def unlink(self, cr, uid, ids, context=None):
        if context is None:
            context = {}
-        invoices = self.read(cr, uid, ids, ['state'], context=context)
+        invoices = self.read(cr, uid, ids, ['state','internal_number'], context=context)
        unlink_ids = []
        for t in invoices:
-            if t['state'] in ('draft', 'cancel'):
+            if t['state'] in ('draft', 'cancel') and t['internal_number']== False:
                unlink_ids.append(t['id'])
            else:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete invoice(s) that are already opened or paid !'))
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete invoice(s) that are already opened(or been in opened state ever) or paid!'))
        osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
        return True

@ -1290,6 +1290,20 @@ class account_invoice_line(osv.osv):
        'price_unit': _price_unit_default,
    }

+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        if context is None:
+            context = {}
+        res = super(account_invoice_line,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
+        if context.get('type', False):
+            doc = etree.XML(res['arch'])
+            for node in doc.xpath("//field[@name='product_id']"):
+                if context['type'] in ('in_invoice', 'in_refund'):
+                    node.set('domain', "[('purchase_ok', '=', True)]")
+                else:
+                    node.set('domain', "[('sale_ok', '=', True)]")
+            res['arch'] = etree.tostring(doc)
+        return res
+
    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
        if context is None:
            context = {}
--- a/addons/account/wizard/account_reconcile.py
+++ b/addons/account/wizard/account_reconcile.py
@ -153,9 +153,9 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
        if context is None:
            context = {}
        data = self.read(cr, uid, ids,context=context)[0]
-        account_id = data['writeoff_acc_id']
+        account_id = data['writeoff_acc_id'][0]
        context['date_p'] = data['date_p']
-        journal_id = data['journal_id']
+        journal_id = data['journal_id'][0]
        context['comment'] = data['comment']
        if data['analytic_id']:
            context['analytic_id'] = data['analytic_id']
--- a/addons/account_sequence/i18n/de.po
+++ b/addons/account_sequence/i18n/de.po
@ -0,0 +1,236 @@
+# German translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-03-23 12:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2011-03-24 04:50+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
+msgid "Account Sequence Application Configuration"
+msgstr "Konfiguration Konto Sequenz Anwendung"
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create entries on different periods/journals in the same move"
+msgstr ""
+"Sie können keine Buchung in verschiedenen Perioden/Journalen durch einen "
+"Buchungssatz erstellen"
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr "Interne Sequenznummer"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr "Nächste Nummer dieser Sequenz"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr "Nächste Nummer zuweisen"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr "Schrittweise Erhöhung"
+
+#. module: account_sequence
+#: model:ir.module.module,description:account_sequence.module_meta_information
+msgid ""
+"\n"
+"    This module maintains internal sequence number for accounting entries.\n"
+"    "
+msgstr ""
+"\n"
+"    Dieses Modul verwaltet interne Sequenznummern für Buchungszeilen.\n"
+"    "
+
+#. module: account_sequence
+#: model:ir.module.module,shortdesc:account_sequence.module_meta_information
+msgid "Entries Sequence Numbering"
+msgstr "Buchungszeilen Sequenznummern"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr "Die nächste Nummer dieser Sequenz wir um diese Zahl erhöht."
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr "Konfiguration der Sequenzen für Buchungungszeilen"
+
+#. module: account_sequence
+#: field:account.sequence.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Konfigurationsprozeß"
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr "Endung (Suffix) einer Sequenz"
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr "Unternehmen"
+
+#. module: account_sequence
+#: help:account.journal,internal_sequence_id:0
+msgid ""
+"This sequence will be used to maintain the internal number for the journal "
+"entries related to this journal."
+msgstr ""
+"Diese Sequenz wird für die Numerierung der Buchungszeilen dieses Journals "
+"verwendet"
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr "Vorlaufende Stellen"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr "Journaleinträge"
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr "Interne Nummer"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr "Die Firma muss für zugehörige Konten und Perioden identisch sein."
+
+#. module: account_sequence
+#: help:account.sequence.installer,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+"OpenERP wird automatisch '0' vor die \"Nächste Nummer\" stellen um die "
+"gewünschte Länge zu erzeugen"
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr "Bezeichnung"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr "Sie können keine Buchung auf einem geschlossenen Konto erzeugen."
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on centralized journal"
+msgstr ""
+"Sie können nicht mehr als eine Buchung pro Periode und Konto bei Anwendung "
+"eines zentralen Gegenkontos erstellen."
+
+#. module: account_sequence
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Falscher Debit oder Kreditwert im Buchungseintrag!"
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr "Interne Sequenz"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr "account.sequence.installer"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr "Konfigurieren"
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr "Vorlauf (Prefix) einer Sequenz"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr "Buchungssatz"
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr "Endung"
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr "Bild"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr "Titel"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "Die Journalbezeichnung sollte pro Unternehmen eindeutig sein."
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr "Prefix"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+"Die Journalkurzbezeichnung sollte innerhalb eines Unternehmens eindeutig "
+"sein !"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+"Sie können keine Buchung auf Forderungs- oder Verbindlichkeitskonten ohne "
+"einen vorher vorhandenen Partner erstellen."
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr "Journal"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr "Sie können keine Buchungen auf Konten des Typs Ansicht erstellen."
--- a/addons/account_sequence/i18n/ro.po
+++ b/addons/account_sequence/i18n/ro.po
@ -0,0 +1,223 @@
+# Romanian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-03-24 12:20+0000\n"
+"Last-Translator: Dorin <dhongu@gmail.com>\n"
+"Language-Team: Romanian <ro@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: 2011-03-25 04:40+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
+msgid "Account Sequence Application Configuration"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create entries on different periods/journals in the same move"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr "Următorul număr"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr "Increment"
+
+#. module: account_sequence
+#: model:ir.module.module,description:account_sequence.module_meta_information
+msgid ""
+"\n"
+"    This module maintains internal sequence number for accounting entries.\n"
+"    "
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.module.module,shortdesc:account_sequence.module_meta_information
+msgid "Entries Sequence Numbering"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr ""
+"Definește numărul cu care sa va incrementa pentru generarea următorul număr "
+"al secvenței"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Configurare procese"
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: account_sequence
+#: help:account.journal,internal_sequence_id:0
+msgid ""
+"This sequence will be used to maintain the internal number for the journal "
+"entries related to this journal."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr "Poziții jurnal"
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr "Nume"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on centralized journal"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr "Configurare"
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr "Înregistrare contabilă"
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr "Sufix"
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr "Imagine"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr "titlu"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr "Prefix"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr "Jurnal"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@ -22,6 +22,7 @@
 import time

 from osv import fields, osv
+from tools.translate import _
 import decimal_precision as dp

 class account_analytic_account(osv.osv):
@ -120,6 +121,31 @@ class account_analytic_account(osv.osv):

        return result

+    def _get_analytic_account(self, cr, uid, ids, context=None):
+        company_obj = self.pool.get('res.company')
+        analytic_obj = self.pool.get('account.analytic.account')
+        accounts = []
+        for company in company_obj.browse(cr, uid, ids, context=context):
+            accounts += analytic_obj.search(cr, uid, [('company_id', '=', company.id)])
+        return accounts
+
+    def _set_company_currency(self, cr, uid, ids, name, value, arg, context=None):
+        if type(ids) != type([]):
+            ids=[ids]
+        for account in self.browse(cr, uid, ids, context=context):
+            if account.company_id:
+                if account.company_id.currency_id.id != value:
+                    raise osv.except_osv(_('Error !'), _("If you set a company, the currency selected has to be the same as it's currency. \nYou can remove the company belonging, and thus change the currency, only on analytic account of type 'view'. This can be really usefull for consolidation purposes of several companies charts with different currencies, for example."))
+        return cr.execute("""update account_analytic_account set currency_id=%s where id=%s""", (value, account.id, ))
+
+    def _currency(self, cr, uid, ids, field_name, arg, context=None):
+        result = {}
+        for rec in self.browse(cr, uid, ids, context=context):
+            if rec.company_id:
+                result[rec.id] = rec.company_id.currency_id.id
+            else:
+                result[rec.id] = rec.currency_id.id
+        return result

    _columns = {
        'name': fields.char('Account Name', size=128, required=True),
@ -149,7 +175,10 @@ class account_analytic_account(osv.osv):
                                  \n* And finally when all the transactions are over, it can be in \'Close\' state. \
                                  \n* The project can be in either if the states \'Template\' and \'Running\'.\n If it is template then we can make projects based on the template projects. If its in \'Running\' state it is a normal project.\
                                 \n If it is to be reviewed then the state is \'Pending\'.\n When the project is completed the state is set to \'Done\'.'),
-       'currency_id': fields.many2one('res.currency', 'Account currency', required=True),
+        'currency_id': fields.function(_currency, fnct_inv=_set_company_currency, method=True,
+            store = {
+                'res.company': (_get_analytic_account, ['currency_id'], 10),
+            }, string='Currency', type='many2one', relation='res.currency'),
    }

    def _default_company(self, cr, uid, context=None):
@ -173,20 +202,12 @@ class account_analytic_account(osv.osv):
        'currency_id': _get_default_currency,
    }

-    def check_currency(self, cr, uid, ids, context=None):
-        obj = self.browse(cr, uid, ids[0], context=context)
-        if obj.company_id:
-            if obj.currency_id.id != self.pool.get('res.company').browse(cr, uid, obj.company_id.id, context=context).currency_id.id:
-                return False
-        return True
-
    def check_recursion(self, cr, uid, ids, parent=None):
        return super(account_analytic_account, self)._check_recursion(cr, uid, ids, parent=parent)

    _order = 'date_start desc,parent_id desc,code'
    _constraints = [
        (check_recursion, 'Error! You can not create recursive analytic accounts.', ['parent_id']),
-        (check_currency, 'Error! The currency has to be the same as the currency of the selected company', ['currency_id', 'company_id']),
    ]

    def copy(self, cr, uid, id, default=None, context=None):
--- a/addons/anonymization/i18n/de.po
+++ b/addons/anonymization/i18n/de.po
@ -0,0 +1,230 @@
+# German translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-03-23 12:46+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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: 2011-03-24 04:50+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
+msgid "ir.model.fields.anonymize.wizard"
+msgstr "ir.model.fields.anonymize.wizard"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_name:0
+msgid "Field Name"
+msgstr "Feldname"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+msgid "Field"
+msgstr "Feld"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,state:0
+#: field:ir.model.fields.anonymize.wizard,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_import:0
+msgid "Import"
+msgstr "Import"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
+msgid "ir.model.fields.anonymization"
+msgstr "ir.model.fields.anonymization"
+
+#. module: anonymization
+#: model:ir.module.module,shortdesc:anonymization.module_meta_information
+msgid "Database anonymization module"
+msgstr "Datenbank Anonymisierungsmodul"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr "Richtung"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
+#: view:ir.model.fields.anonymization:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
+msgid "Anonymized Fields"
+msgstr "Anonymisierte Felder"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
+msgid "Database anonymization"
+msgstr "Datenbank Anonymisierung"
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:55
+#: sql_constraint:ir.model.fields.anonymization:0
+#, python-format
+msgid "You cannot have two records having the same model and the same field"
+msgstr ""
+"2 Datensätze können nicht  das gleiche Model und gleiche Datenfeld haben"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Anonymized"
+msgstr "Anonymisiert"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,state:0
+msgid "unknown"
+msgstr "unbekannt"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objekt"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr "Dateipfad"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr "Export"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Reverse the Database Anonymization"
+msgstr "Mache Datenbankanonymiserung rückgängig"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Database Anonymization"
+msgstr "Datenbankanonymisierung"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
+msgid "Anonymize database"
+msgstr "Anonymisiere Datenbank"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,field_ids:0
+msgid "Fields"
+msgstr "Felder"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr "Leeren"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr "leer -> anonymisiert"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr "Zusammenfassung"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization:0
+msgid "Anonymized Field"
+msgstr "Anonymisiertes Feld"
+
+#. module: anonymization
+#: model:ir.module.module,description:anonymization.module_meta_information
+msgid ""
+"\n"
+"This module allows you to anonymize a database.\n"
+"    "
+msgstr ""
+"\n"
+"Dieses Module anonymisiert die Datenbank (für Migration durch OpenERP)\n"
+"    "
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Unstable"
+msgstr "Instabil"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Exception occured"
+msgstr "Ausnahme aufgetreten"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Not Existing"
+msgstr "Existiert nicht"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_name:0
+msgid "Object Name"
+msgstr "Objekt Bezeichnung"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
+#: view:ir.model.fields.anonymization.history:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
+msgid "Anonymization History"
+msgstr "Anonymisierungs Verlauf"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
+msgid "ir.model.fields.anonymization.history"
+msgstr "ir.model.fields.anonymization.history"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Anonymize Database"
+msgstr "Anonymisiere Datenbank"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,name:0
+msgid "File Name"
+msgstr "Dateiname"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "anonymized -> clear"
+msgstr "anonymisiert -> leer"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Started"
+msgstr "Begonnen"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Done"
+msgstr "Erledigt"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,msg:0
+#: field:ir.model.fields.anonymize.wizard,msg:0
+msgid "Message"
+msgstr "Nachricht"
--- a/addons/association/i18n/ro.po
+++ b/addons/association/i18n/ro.po
@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-11-12 11:38+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2011-03-24 12:12+0000\n"
+"Last-Translator: Dorin <dhongu@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-15 05:56+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-03-25 04:40+0000\n"
+"X-Generator: Launchpad (build 12559)\n"

 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
 msgid "Wiki"
-msgstr ""
+msgstr "Enciclopedie"

 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
@ -39,7 +39,7 @@ msgstr ""
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progres configurare"

 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
@ -51,7 +51,7 @@ msgstr ""
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "title"
-msgstr ""
+msgstr "titlu"

 #. module: association
 #: help:profile.association.config.install_modules_wizard,event_project:0
@ -61,7 +61,7 @@ msgstr ""
 #. module: association
 #: field:profile.association.config.install_modules_wizard,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Imagine"

 #. module: association
 #: help:profile.association.config.install_modules_wizard,hr_expense:0
@ -80,7 +80,7 @@ msgstr ""
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Resources Management"
-msgstr ""
+msgstr "Administrare Resurse"

 #. module: association
 #: model:ir.module.module,shortdesc:association.module_meta_information
@ -104,6 +104,8 @@ msgid ""
 "Lets you create wiki pages and page groups in order to keep track of "
 "business knowledge and share it with and  between your employees."
 msgstr ""
+"Vă permite să creați pagini wiki și grupuri de pagini, în scopul de a urmări "
+"cunoștințele de afaceri și partajați-le cu și între angajații dumneavoastră."

 #. module: association
 #: help:profile.association.config.install_modules_wizard,project:0
@ -111,6 +113,8 @@ msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
 msgstr ""
+"Ajută la gestionarea proiectelor și a sarcinilor : monitorizare, "
+"planificări, etc..."

 #. module: association
 #: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
@ -120,15 +124,15 @@ msgstr ""
 #. module: association
 #: field:profile.association.config.install_modules_wizard,event_project:0
 msgid "Events"
-msgstr ""
+msgstr "Evenimente"

 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "Managementul proiectelor"

 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurare"
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-22 14:25+0000\n"
-"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n"
+"PO-Revision-Date: 2011-03-23 13:45+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-23 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-03-24 04:50+0000\n"
 "X-Generator: Launchpad (build 12559)\n"

 #. module: crm
@ -78,7 +78,7 @@ msgstr "Сегодня"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Select Opportunities"
-msgstr "Выберите сделки"
+msgstr "Выберите предложения"

 #. module: crm
 #: view:crm.meeting:0
@ -127,7 +127,7 @@ msgstr "Код отдела продаж должен быть уникальн
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
-msgstr "Кандидат '%s' был преобразован в сделку."
+msgstr "Кандидат '%s' был преобразован в предложение."

 #. module: crm
 #: code:addons/crm/crm_lead.py:228
@ -177,14 +177,15 @@ msgstr "Не создавать партнера"
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Opportunities"
-msgstr "Искать сделки"
+msgstr "Искать предложения"

 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:46
 #, python-format
 msgid ""
 "Opportunity must have Partner assigned before merging with other Opportunity."
-msgstr "Сделка должна иметь партнера перед объединением с другой сделкой."
+msgstr ""
+"Предложение должно иметь партнера перед объединением с другим предложением."

 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:46
@ -198,7 +199,7 @@ msgstr "Внимание!"
 #: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
 #: model:ir.ui.menu,name:crm.menu_report_crm_opportunities_tree
 msgid "Opportunities Analysis"
-msgstr "Анализ сделок"
+msgstr "Анализ предложений"

 #. module: crm
 #: field:crm.lead,partner_id:0
@ -260,7 +261,7 @@ msgstr "Отказ"
 #: code:addons/crm/crm_opportunity.py:108
 #, python-format
 msgid "The opportunity '%s' has been marked as lost."
-msgstr "Сделка '%s' была отмечена как проигранная."
+msgstr "Предложение '%s' было отмечено как проигранное."

 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_lead
@ -310,9 +311,9 @@ msgid ""
 "communication history) will be merged with existing Opportunity of Selected "
 "partner."
 msgstr ""
-"При выборе объединения с существующей сделкой, реквизиты кандидата (вместе с "
-"историей общения) будут объединены с существующей сделкой выбранного "
-"партнера."
+"При выборе объединения с существующим предложением, реквизиты кандидата "
+"(вместе с историей общения) будут объединены с существующим предложением "
+"выбранного партнера."

 #. module: crm
 #: selection:crm.meeting,class:0
@ -394,7 +395,7 @@ msgstr "Кандидат '%s' был открыт"
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
 msgid "Opportunity Meeting"
-msgstr "Встреча по сделке"
+msgstr "Встреча по предложению"

 #. module: crm
 #: help:crm.lead.report,delay_close:0
@ -405,7 +406,7 @@ msgstr "Количество дней, чтобы закрыть вопрос"
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
 msgid "When a real project/opportunity is detected"
-msgstr "При обнаружении реального проекта/сделки"
+msgstr "При обнаружении реального проекта/предложения"

 #. module: crm
 #: field:crm.installer,crm_fundraising:0
@ -416,7 +417,7 @@ msgstr "Фандрайзинг"
 #: view:res.partner:0
 #: field:res.partner,opportunity_ids:0
 msgid "Leads and Opportunities"
-msgstr "Кандидаты и сделки"
+msgstr "Кандидаты и предложения"

 #. module: crm
 #: view:crm.send.mail:0
@ -451,7 +452,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_action
 msgid "Convert/Merge Opportunity"
-msgstr "Преобразовать/Объединить сделку"
+msgstr "Преобразовать/Объединить предложение"

 #. module: crm
 #: field:crm.lead,write_date:0
@ -480,7 +481,7 @@ msgstr "Категория"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "#Opportunities"
-msgstr "#Сделок"
+msgstr "# Предложений"

 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_oppor2
@ -500,7 +501,7 @@ msgstr "Конфиденциальность"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunity Analysis"
-msgstr "Анализ сделок"
+msgstr "Анализ предложений"

 #. module: crm
 #: help:crm.meeting,location:0
@ -530,7 +531,7 @@ msgstr "Позволяет получать эл. почту с POP/IMAP сер
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
 msgid "Normal or phone meeting for opportunity"
-msgstr "Обычная встреча или звонок по сделке"
+msgstr "Обычная встреча или звонок по предложению"

 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
@ -549,7 +550,7 @@ msgstr "Самый первый перспективный контакт"
 #: model:ir.actions.act_window,name:crm.crm_partner2opportunity
 #, python-format
 msgid "Create Opportunity"
-msgstr "Создать сделку"
+msgstr "Создать предложение"

 #. module: crm
 #: view:crm.installer:0
@ -832,7 +833,7 @@ msgstr "Панель статистики"
 #: field:crm.phonecall,opportunity_id:0
 #, python-format
 msgid "Opportunity"
-msgstr "Сделка"
+msgstr "Предложение"

 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
@ -896,7 +897,7 @@ msgstr "Эксклюзивный"
 #: code:addons/crm/crm_opportunity.py:91
 #, python-format
 msgid "The opportunity '%s' has been won."
-msgstr "Сделка  '%s' выиграна."
+msgstr "Предложение  '%s' выиграно."

 #. module: crm
 #: help:crm.meeting,alarm_id:0
@ -972,7 +973,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "Convert To Opportunity "
-msgstr "Преобразовать в сделку "
+msgstr "Преобразовать в предложение "

 #. module: crm
 #: help:crm.case.stage,sequence:0
@ -986,7 +987,7 @@ msgstr "Дает последовательность при отображен
 #: model:ir.ui.menu,name:crm.menu_crm_case_opp
 #: model:process.node,name:crm.process_node_opportunities0
 msgid "Opportunities"
-msgstr "Сделки"
+msgstr "Предложения"

 #. module: crm
 #: field:crm.segmentation,categ_id:0
@ -1035,7 +1036,7 @@ msgstr "Март"
 #: code:addons/crm/crm_lead.py:230
 #, python-format
 msgid "The opportunity '%s' has been closed."
-msgstr "Сделка '%s'  закрыта."
+msgstr "Предложение '%s'  закрыто."

 #. module: crm
 #: field:crm.lead,day_open:0
@ -1076,7 +1077,8 @@ msgstr "Способ прекращения повторения"
 msgid ""
 "There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
 msgstr ""
-"Нет других сделок в стадии \"Открыто\" или \"В ожидании\" для партнера '%s'."
+"Нет других предложений в стадии \"Открыто\" или \"В ожидании\" для партнера "
+"'%s'."

 #. module: crm
 #: view:crm.lead:0
@ -1150,7 +1152,7 @@ msgstr ""
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
 #, python-format
 msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
-msgstr "Закрытый/отмененный звонок нельзя преобразовать в сделку"
+msgstr "Закрытый/отмененный звонок нельзя преобразовать в предложение"

 #. module: crm
 #: view:crm.segmentation:0
@ -1397,7 +1399,7 @@ msgstr "Управление техподдержкой"
 #. module: crm
 #: field:crm.partner2opportunity,name:0
 msgid "Opportunity Name"
-msgstr "Название сделки"
+msgstr "Название предложения"

 #. module: crm
 #: help:crm.case.section,active:0
@ -1496,7 +1498,7 @@ msgstr "Идентификатор"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner2opportunity
 msgid "Partner To Opportunity"
-msgstr "Партнер в Сделку"
+msgstr "Партнер в Предложение"

 #. module: crm
 #: view:crm.meeting:0
@ -1520,7 +1522,7 @@ msgstr "Расширенные фильтры..."
 #. module: crm
 #: field:crm.phonecall2opportunity,name:0
 msgid "Opportunity Summary"
-msgstr "Кратко о сделке"
+msgstr "Кратко о предложении"

 #. module: crm
 #: view:crm.phonecall.report:0
@ -1530,7 +1532,7 @@ msgstr "Искать"
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Categories"
-msgstr "Сделки по категориям"
+msgstr "Предложения по категориям"

 #. module: crm
 #: view:crm.meeting:0
@ -1615,7 +1617,7 @@ msgstr "res.users"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge two Opportunities"
-msgstr "Объединить две сделки"
+msgstr "Объединить два предложения"

 #. module: crm
 #: selection:crm.meeting,end_type:0
@ -1690,6 +1692,11 @@ msgid ""
 "mainly used by the sales manager in order to do the periodic review with the "
 "teams of the sales pipeline."
 msgstr ""
+"Анализ предложений дает вам мгновенный доступ к такой информации, как "
+"ожидаемый доход, плановая себестоимость, пропущенные сроки или количество "
+"взаимодействий в предложении. Этот отчет в основном используется менеджером "
+"по продажам, с тем чтобы сделать периодический обзор по отделам продаж в "
+"процессе продаж."

 #. module: crm
 #: field:crm.case.categ,name:0
@ -1713,9 +1720,9 @@ msgid ""
 "organise their sales pipeline. Stages will allow them to easily track how a "
 "specific lead or opportunity is positioned in the sales cycle."
 msgstr ""
-"Добавление специальных этапов к кандидатам и сделкам позволяет лучше "
+"Добавление специальных этапов к кандидатам и предложениям позволяет лучше "
 "организовать процесс продаж. Этапы позволяют легче отслеживать нахождение "
-"кандидатов и сделок в процессе продаж."
+"кандидатов и предложений в процессе продаж."

 #. module: crm
 #: view:crm.lead.report:0
@ -1960,7 +1967,7 @@ msgstr "Значение"
 #: view:crm.lead:0
 #: view:crm.lead.report:0
 msgid "Opportunity by Categories"
-msgstr "Сделки по категориям"
+msgstr "Предложения по категориям"

 #. module: crm
 #: view:crm.lead:0
@ -1980,7 +1987,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
-msgstr "Звонок в Сделку"
+msgstr "Звонок в Предложение"

 #. module: crm
 #: field:crm.case.section,reply_to:0
@ -1995,7 +2002,7 @@ msgstr "Выберите этапы для этого отдела продаж"
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr "Сделки по этапам"
+msgstr "Предложения по этапам"

 #. module: crm
 #: view:crm.meeting:0
@ -2012,7 +2019,7 @@ msgstr "Перспектива преобразуется в бизнес-пар
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert To Opportunity"
-msgstr "Преобразовать в сделку"
+msgstr "Преобразовать в предложение"

 #. module: crm
 #: view:crm.phonecall:0
@ -2038,7 +2045,7 @@ msgstr "Доп. информация"
 #: model:ir.actions.act_window,name:crm.action_merge_opportunities
 #: model:ir.actions.act_window,name:crm.merge_opportunity_act
 msgid "Merge Opportunities"
-msgstr "Объединить сделки"
+msgstr "Объединить предложения"

 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
@ -2090,7 +2097,7 @@ msgstr "Использовать правила продаж покупок"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Lead To Opportunity Partner"
-msgstr "Кандидат в партнера сделки"
+msgstr "Кандидат в партнера предложения"

 #. module: crm
 #: field:crm.meeting,location:0
@ -2157,7 +2164,7 @@ msgstr "Google Adwords 2"
 #: help:crm.lead,type:0
 #: help:crm.lead.report,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr "Тип используется для разделения кандидатов и сделок"
+msgstr "Тип используется для разделения кандидатов и предложений"

 #. module: crm
 #: view:crm.phonecall2partner:0
@ -2182,8 +2189,8 @@ msgid ""
 msgstr ""
 "Определение отдела продаж для организации различных продавцов или отделов "
 "продаж в отдельные команды. Каждая команда будет работать со своим списком "
-"сделок, заказов и т.д. Каждый пользователь может установить команду по "
-"умолчанию  в своих настройках. Выводимые сделки и заказы, будут "
+"предложений, заказов и т.д. Каждый пользователь может установить команду по "
+"умолчанию  в своих настройках. Выводимые предложения и заказы, будут "
 "автоматически фильтроваться в соответствии с отделом продаж пользователя."

 #. module: crm
@ -2265,7 +2272,7 @@ msgstr ""
 "Кандидаты позволяют управлять и отслеживать все первоначальные контакты с "
 "предполагаемыми клиентами или партнерами проявившими интерес к вашей "
 "продукции или услугам. Кандидат - обычно первый шаг в процессе продажи. "
-"После оценки, кандидат может быть преобразован в сделку с созданием "
+"После оценки, кандидат может быть преобразован в предложение с созданием "
 "соответствующего партнера для будущего отслеживания связанной с ним "
 "деятельности. Вы можете импортировать базу данных предполагаемых клиентов, "
 "работать с визитными карточками или интегрировать запросы с вашего сайта с "
@ -2415,7 +2422,7 @@ msgstr "Активен"
 #: code:addons/crm/crm_lead.py:306
 #, python-format
 msgid "The stage of opportunity '%s' has been changed to '%s'."
-msgstr "Этап сделки '%s'  изменен на '%s'."
+msgstr "Этап предложения '%s'  изменен на '%s'."

 #. module: crm
 #: code:addons/crm/crm_lead.py:282
@ -2591,7 +2598,7 @@ msgstr "Вопрос '%s' отменен."
 #. module: crm
 #: field:crm.installer,sale_crm:0
 msgid "Opportunity to Quotation"
-msgstr "Сделка в Запрос цен"
+msgstr "Предложение в Заказ на продажу"

 #. module: crm
 #: model:ir.model,name:crm.model_crm_send_mail
@ -2602,7 +2609,7 @@ msgstr "Послать новое эл. письмо"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:crm.act_my_oppor
 msgid "My Open Opportunities"
-msgstr "Мои открытые сделки"
+msgstr "Мои открытые предложения"

 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
@ -2646,7 +2653,7 @@ msgstr "Тип встречи"
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
 #, python-format
 msgid "Merge with Existing Opportunity"
-msgstr "Объединить с существующей сделкой"
+msgstr "Объединить с существующим предложением"

 #. module: crm
 #: help:crm.lead,state:0
@ -2730,7 +2737,7 @@ msgstr "Указатель"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity
 msgid "Lead To Opportunity"
-msgstr "Кандидат в Сделку"
+msgstr "Кандидат в Предложение"

 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
@ -2763,7 +2770,8 @@ msgid ""
 "The name of the future partner that will be created while converting the "
 "into opportunity"
 msgstr ""
-"Название будущего партнера, который будет создан при преобразовании в сделку"
+"Название будущего партнера, который будет создан при преобразовании в "
+"предложение"

 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
@ -2864,15 +2872,16 @@ msgid ""
 "opportunities, convert them into quotations, manage related documents, track "
 "all customer related activities, and much more."
 msgstr ""
-"Со сделками вы можете управлять и отслеживать процесс продаж с помощью "
+"С предложениями вы можете управлять и отслеживать процесс продаж с помощью "
 "создания специфичных для заказчика или предполагаемого клиента документов "
 "для продаж. Может быть сохранена такая информация: ожидаемый доход, этап "
-"сделки, ожидаемая дата закрытия, история общения и многое другое. Сделки "
-"могут быть связаны с почтовым шлюзом: новые сообщения могут создавать "
-"сделки, каждая из них автоматически получает историю общения с клиентом.\n"
+"предложения, ожидаемая дата закрытия, история общения и многое другое. "
+"Предложения могут быть связаны с почтовым шлюзом: новые сообщения могут "
+"создавать предложения, каждое из них автоматически получает историю общения "
+"с клиентом.\n"
 "\n"
 "Вы и ваш отдел будете иметь возможность планировать встречи и телефонные "
-"звонки по сделкам, превращать их в запросы цен, управлять связанными "
+"звонки по предложениям, превращать их в запросы цен, управлять связанными "
 "документами, отслеживать деятельность связанную с заказчиком, и многое "
 "другое."

@ -3020,8 +3029,8 @@ msgid ""
 msgstr ""
 "Создавать специальные категории, которые подходят к деятельности вашей "
 "компании, чтобы лучше классифицировать и анализировать ваших кандидатов и "
-"сделки. Такие категории, могут, например, отражать вашу структуру продукции "
-"или различные типы продаж."
+"предложения. Такие категории, могут, например, отражать вашу структуру "
+"продукции или различные типы продаж."

 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
@ -3190,7 +3199,7 @@ msgstr "Запланировать звонок"
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
-msgstr "Закрытого/отмененного кандидата нельзя преобразовать в сделку"
+msgstr "Закрытого/отмененного кандидата нельзя преобразовать в предложение"

 #. module: crm
 #: view:crm.segmentation:0
@ -3233,7 +3242,7 @@ msgstr "Штат"
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr "Создание сделок из кандидатов"
+msgstr "Создание предложений из кандидатов"

 #. module: crm
 #: help:crm.send.mail,html:0
@ -3248,7 +3257,7 @@ msgstr "Нужна информация"
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
 msgid "Prospect Opportunity"
-msgstr "Перспективы сделки"
+msgstr "Перспективы предложения"

 #. module: crm
 #: view:crm.installer:0
@ -3388,7 +3397,7 @@ msgstr "Ожидаемое закрытие"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity2phonecall
 msgid "Opportunity to Phonecall"
-msgstr "Сделка в звонок"
+msgstr "Предложение в звонок"

 #. module: crm
 #: help:crm.case.section,allow_unlink:0
@ -3584,7 +3593,7 @@ msgstr "Нет ID эл. почты в адресе вашей компании!"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
-msgstr "Сделки по этапам"
+msgstr "Предложения по этапам"

 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
@ -3607,7 +3616,7 @@ msgid ""
 "cycle."
 msgstr ""
 "Добавление специальных этапов, которые будут помогать лучше организовывать "
-"процесс продаж. Этапы позволяют легче отслеживать положение сделок в "
+"процесс продаж. Этапы позволяют легче отслеживать положение предложений в "
 "процессе продаж."

 #. module: crm
@ -3671,7 +3680,7 @@ msgstr "Вы не можете иметь двух одинаковых поль
 #: code:addons/crm/wizard/crm_merge_opportunities.py:100
 #, python-format
 msgid "Merged into Opportunity: %s"
-msgstr "Объединено со сделкой: %s"
+msgstr "Объединено с предложением: %s"

 #. module: crm
 #: code:addons/crm/crm.py:347
@ -3781,7 +3790,7 @@ msgstr "Интерес к аксессуарам"
 #: code:addons/crm/crm_lead.py:211
 #, python-format
 msgid "The opportunity '%s' has been opened."
-msgstr "Сделка '%s' была открыта."
+msgstr "Предложение '%s' было открыто."

 #. module: crm
 #: field:crm.lead.report,email:0
@ -3796,7 +3805,7 @@ msgstr "Улица"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities by User and Team"
-msgstr "Сделки по пользователям и отделам"
+msgstr "Предложения по пользователям и отделам"

 #. module: crm
 #: field:crm.case.section,working_hours:0
@ -3843,7 +3852,7 @@ msgstr "Страна"
 #: view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Convert to Opportunity"
-msgstr "Преобразовать в сделку"
+msgstr "Преобразовать в предложение"

 #. module: crm
 #: selection:crm.meeting,week_list:0
@ -3870,7 +3879,7 @@ msgstr "Звонки по пользователям и секциям"
 #. module: crm
 #: selection:crm.lead2opportunity.action,name:0
 msgid "Merge with existing Opportunity"
-msgstr "Объединить с существующей сделкой"
+msgstr "Объединить с существующим предложением"

 #. module: crm
 #: field:crm.meeting,select1:0
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@ -24,6 +24,7 @@ from crm import crm
 import time
 import binascii
 import tools
+from tools.translate import _

 CRM_CLAIM_PENDING_STATES = (
    crm.AVAILABLE_STATES[2][0], # Cancelled
@ -81,6 +82,20 @@ class crm_claim(crm.crm_case, osv.osv):
        'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
    }
    
+    def stage_next(self, cr, uid, ids, context=None):
+        stage = super(crm_claim, self).stage_next(cr, uid, ids, context=context)
+        if stage:
+            stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage, context=context)
+            self.history(cr, uid, ids, _("Changed Stage to: ") + stage_obj.name)
+        return stage
+
+    def stage_previous(self, cr, uid, ids, context=None):
+        stage = super(crm_claim, self).stage_previous(cr, uid, ids, context=context)
+        if stage:
+            stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage, context=context)
+            self.history(cr, uid, ids, _("Changed Stage to: ") + stage_obj.name)
+        return stage
+    
    def _get_stage_id(self, cr, uid, context=None):
        """Finds type of stage according to object.
        @param self: The object pointer
--- a/addons/crm_partner_assign/i18n/ru.po
+++ b/addons/crm_partner_assign/i18n/ru.po
@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-14 19:21+0000\n"
+"PO-Revision-Date: 2011-03-23 13:46+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2011-03-15 04:55+0000\n"
+"X-Launchpad-Export-Date: 2011-03-24 04:50+0000\n"
 "X-Generator: Launchpad (build 12559)\n"

 #. module: crm_partner_assign
@ -281,7 +281,7 @@ msgstr "Назначение партнера"
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr "Тип используется для разделения кандидатов и сделок"
+msgstr "Тип используется для разделения кандидатов и предложений"

 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@ -308,7 +308,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Opportunities Assignment Analysis"
-msgstr "Анализ распределения сделок"
+msgstr "Анализ распределения предложений"

 #. module: crm_partner_assign
 #: view:res.partner:0
@ -397,7 +397,7 @@ msgstr "Категория"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "#Opportunities"
-msgstr "# Сделок"
+msgstr "# Предложений"

 #. module: crm_partner_assign
 #: model:ir.module.module,shortdesc:crm_partner_assign.module_meta_information
@ -431,7 +431,7 @@ msgstr "Закрыто"
 #: view:res.partner:0
 #: field:res.partner,opportunity_assigned_ids:0
 msgid "Assigned Opportunities"
-msgstr "Назначенные сделки"
+msgstr "Назначенные предложения"

 #. module: crm_partner_assign
 #: field:crm.lead,date_assign:0
@ -622,7 +622,7 @@ msgstr "Адрес"
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
-msgstr "Сделка"
+msgstr "Предложение"

 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
@ -648,7 +648,7 @@ msgstr "Страна"
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
-msgstr "Преобразовать в сделку"
+msgstr "Преобразовать в предложение"

 #. module: crm_partner_assign
 #: view:crm.lead:0
--- a/addons/hr_recruitment/i18n/pt_BR.po
+++ b/addons/hr_recruitment/i18n/pt_BR.po
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@ -177,6 +177,10 @@ class hr_timesheet_sheet(osv.osv):
        if 'employee_id' in vals:
            if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).user_id:
                raise osv.except_osv(_('Error !'), _('You cannot create a timesheet for an employee that does not have any user defined !'))
+            if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).product_id:
+                raise osv.except_osv(_('Error !'), _('You cannot create a timesheet for an employee that does not have any product defined !'))
+            if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).journal_id:
+                raise osv.except_osv(_('Error !'), _('You cannot create a timesheet for an employee that does not have any analytic journal defined !'))
        return super(hr_timesheet_sheet, self).create(cr, uid, vals, *args, **argv)

    def write(self, cr, uid, ids, vals, *args, **argv):
@ -186,6 +190,10 @@ class hr_timesheet_sheet(osv.osv):
                raise osv.except_osv(_('Error !'), _('You cannot create a timesheet for an employee that does not have any user defined !'))
            if not self._sheet_date(cr, uid, ids, forced_user_id=new_user_id):
                raise osv.except_osv(_('Error !'), _('You can not have 2 timesheets that overlaps !\nPlease use the menu \'My Current Timesheet\' to avoid this problem.'))
+            if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).product_id:
+                raise osv.except_osv(_('Error !'), _('You cannot create a timesheet for an employee that does not have any product defined !'))
+            if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).journal_id:
+                raise osv.except_osv(_('Error !'), _('You cannot create a timesheet for an employee that does not have any analytic journal defined !'))
        return super(hr_timesheet_sheet, self).write(cr, uid, ids, vals, *args, **argv)

    def button_confirm(self, cr, uid, ids, context=None):
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@ -162,38 +162,26 @@
            <field name="model">res.partner</field>
            <field name="type">search</field>
            <field name="arch" type="xml">
-                <field name="category_id" position="after">
-          <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
-                     <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
-          <separator orientation="vertical"/>
-          <filter icon="terp-personal" name="all_non_members" domain="[('membership_state', 'in', ['none','canceled','old','waiting'])]" string="All non Members" help="None/Canceled/Old/Waiting"/>
-          <filter icon="terp-personal" name="all_members" domain="[('membership_state', 'in', ['invoiced','paid','free'])]" string="All Members" help="Invoiced/Paid/Free"/>
-          <separator orientation="vertical"/>
-                   <field name="membership_stop" string="End Membership Date"/>
-                   <field name="membership_start" invisible="1"/>
-                   <newline/>
-               </field>
-            </field>
-        </record>
-
-        <record id="view_res_partner_member_filter2" model="ir.ui.view">
-            <field name="name">res.partner.select2</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="view_res_partner_member_filter"/>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <field name="membership_start" position="after">
-                <newline/>
-              <group expand="0" string="Group By..." colspan="10" col="8">
-                <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
-                  <filter string="Associate Member" name = "associate" icon="terp-partner" domain="[]" context="{'group_by':'associate_member'}"/>
-                  <separator orientation="vertical"/>
-                    <filter string=" Membership State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
-                    <separator orientation="vertical"/>
-                  <filter string="Start Date" help="Starting Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_start'}"/>
-                  <filter string="End Date" help="Ending Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_stop'}"/>
-                </group>
-                </field>
+            	<search string="Membership Partners">
+		          	<filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
+		            <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
+	          		<separator orientation="vertical"/>
+		          	<filter icon="terp-personal" name="all_non_members" domain="[('membership_state', 'in', ['none','canceled','old','waiting'])]" string="All non Members" help="None/Canceled/Old/Waiting"/>
+		          	<filter icon="terp-personal" name="all_members" domain="[('membership_state', 'in', ['invoiced','paid','free'])]" string="All Members" help="Invoiced/Paid/Free"/>
+	          		<separator orientation="vertical"/>
+	                <field name="membership_stop" string="End Membership Date"/>
+	                <field name="membership_start" invisible="1"/>
+	                <newline/>
+	                <group expand="0" string="Group By..." colspan="10" col="8">
+	                    <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by' : 'user_id'}" />
+	              	    <filter string="Associate Member" name = "associate" icon="terp-partner" domain="[]" context="{'group_by':'associate_member'}"/>
+	              		<separator orientation="vertical"/>
+	                	<filter string=" Membership State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'membership_state'}"/>
+	                	<separator orientation="vertical"/>
+	                	<filter string="Start Date" help="Starting Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_start'}"/>
+	              		<filter string="End Date" help="Ending Date Of Membership" icon="terp-go-month" domain="[]" context="{'group_by':'membership_stop'}"/>
+	            	</group>
+	           </search>
            </field>
        </record>

--- a/addons/mrp/i18n/ro.po
+++ b/addons/mrp/i18n/ro.po
@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-09 21:08+0000\n"
+"PO-Revision-Date: 2011-03-23 12:20+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-12 05:01+0000\n"
+"X-Launchpad-Export-Date: 2011-03-24 04:49+0000\n"
 "X-Generator: Launchpad (build 12559)\n"

 #. module: mrp
@ -80,7 +80,7 @@ msgstr ""
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
 msgid "Picking list"
-msgstr "Lista de preluare"
+msgstr "Listă de preluare"

 #. module: mrp
 #: code:addons/mrp/report/price.py:121
@ -365,7 +365,7 @@ msgstr "Octombrie"
 #: code:addons/mrp/report/price.py:177
 #, python-format
 msgid "Components Cost of "
-msgstr ""
+msgstr "Costul componentelor "

 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
@ -843,7 +843,7 @@ msgstr "Urgent"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
 msgid "Work Center Usage"
-msgstr ""
+msgstr "Utilizare post de lucru"

 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
@ -1722,7 +1722,7 @@ msgstr "Produse fabricate"
 #: field:mrp.production,date_finished:0
 #: field:mrp.production.order,date_finished:0
 msgid "End Date"
-msgstr "Data de sfîrșit"
+msgstr "Dată de sfârșit"

 #. module: mrp
 #: field:mrp.workcenter,resource_id:0
--- a/addons/mrp/i18n/ru.po
+++ b/addons/mrp/i18n/ru.po
@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-11-27 11:08+0000\n"
-"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
+"PO-Revision-Date: 2011-03-24 16:01+0000\n"
+"Last-Translator: Viktor Prokopiev <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-12 05:01+0000\n"
+"X-Launchpad-Export-Date: 2011-03-25 04:40+0000\n"
 "X-Generator: Launchpad (build 12559)\n"

 #. module: mrp
@ -114,7 +114,7 @@ msgstr "Техн. маршруты"
 #. module: mrp
 #: field:mrp.workcenter,product_id:0
 msgid "Work Center Product"
-msgstr ""
+msgstr "Продукция рабочего центра"

 #. module: mrp
 #: view:mrp.bom:0
@ -195,7 +195,7 @@ msgstr ""
 #: view:mrp.production.order:0
 #: field:mrp.production.order,state:0
 msgid "State"
-msgstr ""
+msgstr "Состояние"

 #. module: mrp
 #: field:mrp.workcenter,costs_hour:0
@ -282,7 +282,7 @@ msgstr "Место назначения"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "title"
-msgstr "заголовок"
+msgstr "title"

 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom
@ -346,7 +346,7 @@ msgstr "Июнь"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
-msgstr ""
+msgstr "Производимый продукт"

 #. module: mrp
 #: selection:mrp.production.order,month:0
@ -357,7 +357,7 @@ msgstr "Октябрь"
 #: code:addons/mrp/report/price.py:177
 #, python-format
 msgid "Components Cost of "
-msgstr ""
+msgstr "Стоимость компонентов "

 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
@ -459,7 +459,7 @@ msgstr ""
 #. module: mrp
 #: view:board.board:0
 msgid "Stock Value Variation"
-msgstr ""
+msgstr "Изменение стоимости запасов"

 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
@ -520,6 +520,8 @@ msgid ""
 "The Bill of Material is linked to a routing, i.e. the succession of work "
 "centers."
 msgstr ""
+"Перечень материалов соединен с маршрутизацией, то есть последовательностью "
+"рабочих центров."

 #. module: mrp
 #: constraint:product.product:0
@ -996,7 +998,7 @@ msgstr "Отмена"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Split in production lots"
-msgstr ""
+msgstr "Разлелить на лоты продукции"

 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
@ -1032,6 +1034,8 @@ msgstr "Изготовление про запас"
 msgid ""
 "Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
+"Возвращает порядок следования при отображении списка маршрутизации рабочих "
+"центров."

 #. module: mrp
 #: report:bom.structure:0
@ -1047,12 +1051,12 @@ msgstr "Начать производство"
 #: model:ir.actions.act_window,name:mrp.open_board_manufacturing
 #: model:ir.ui.menu,name:mrp.menu_board_manufacturing
 msgid "Production Dashboard"
-msgstr ""
+msgstr "Инфо-панель"

 #. module: mrp
 #: view:mrp.production:0
 msgid "Source Loc."
-msgstr ""
+msgstr "Исходное местоположение."

 #. module: mrp
 #: field:mrp.bom,position:0
@ -1065,11 +1069,13 @@ msgid ""
 "Manages product routes and paths within and between locations (e.g. "
 "warehouses)."
 msgstr ""
+"Управляет маршрутами продуктов и путями для внутренних мест хранения "
+"(например, складами)"

 #. module: mrp
 #: model:process.node,note:mrp.process_node_billofmaterial0
 msgid "Product's structure"
-msgstr ""
+msgstr "Структура продукта"

 #. module: mrp
 #: field:mrp.bom,name:0
@ -1098,12 +1104,12 @@ msgstr ""
 #. module: mrp
 #: field:mrp.product.produce,mode:0
 msgid "Mode"
-msgstr ""
+msgstr "Режим"

 #. module: mrp
 #: report:bom.structure:0
 msgid "]"
-msgstr ""
+msgstr "]"

 #. module: mrp
 #: field:mrp.workcenter.load,measure_unit:0
@ -1120,16 +1126,23 @@ msgid ""
 "materials have been defined, OpenERP is capable of automatically deciding on "
 "the manufacturing route depending on the needs of the company."
 msgstr ""
+"Производственные заказы описывают операции, которые должны быть выполнены и "
+"использование сырья в течение каждой производственной стадии. Вы используете "
+"спецификации (ведомости материалов или BoM), чтобы разработать требования "
+"сырья и производственные заказы, необходимые для готовой продукции. Как "
+"только ведомости материалов будут определены, система способна к "
+"автоматическому выбору технологического маршрута в зависимости от "
+"потребностей компании."

 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "Количество в заказе не может быть отрицательным или нулевым !"

 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
 msgid "Manufacturing Orders in Progress"
-msgstr ""
+msgstr "Текущие производственные заказы"

 #. module: mrp
 #: model:ir.module.module,description:mrp.module_meta_information
@ -1173,7 +1186,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
-msgstr ""
+msgstr "Производственные заказы в ожидании"

 #. module: mrp
 #: view:mrp.bom:0
@ -1183,7 +1196,7 @@ msgstr ""
 #: view:mrp.routing:0
 #: view:mrp.workcenter:0
 msgid "Group By..."
-msgstr ""
+msgstr "Группировать по ..."

 #. module: mrp
 #: code:addons/mrp/report/price.py:121
@ -1206,7 +1219,7 @@ msgstr "Расположение готовой продукции"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
 msgid "Resources"
-msgstr ""
+msgstr "Ресурсы"

 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
@ -1218,7 +1231,7 @@ msgstr "Книга аналитики"
 #: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
-msgstr ""
+msgstr "Участок производства"

 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@ -1233,6 +1246,10 @@ msgid ""
 "They are attached to bills of materials that will define the required raw "
 "materials."
 msgstr ""
+"Технологические маршруты позволяют создавать и управлять производственные "
+"операции, которых необходимо придерживаться в Рабочем центре с целью "
+"получения продукта. Они прикрепляются к счетам материалов, которые будут "
+"определять необходимое сырье."

 #. module: mrp
 #: field:report.workcenter.load,hour:0
@ -1242,7 +1259,7 @@ msgstr "Кол-во часов"
 #. module: mrp
 #: view:mrp.routing:0
 msgid "Work Center Operations"
-msgstr ""
+msgstr "Операции Рабочего центра"

 #. module: mrp
 #: view:mrp.routing:0
@ -1266,7 +1283,7 @@ msgstr "Выбрать ед. времени"
 #. module: mrp
 #: view:report.workcenter.load:0
 msgid "Work Center load"
-msgstr ""
+msgstr "Нагрузка производственного участка"

 #. module: mrp
 #: help:mrp.production,location_dest_id:0
@ -1279,6 +1296,8 @@ msgid ""
 "This is the internal picking list that brings the finished product to the "
 "production plan"
 msgstr ""
+"Это внутренняя комплектовочная ведомость, которая соотносит готовую "
+"продукцию к производственному плану"

 #. module: mrp
 #: field:stock.change.standard.price,change_parent_price:0
@ -1288,7 +1307,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Движение запасов"

 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_producttostockrules0
@ -1322,18 +1341,18 @@ msgstr "Приоритет"
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Комплектовочный лист"

 #. module: mrp
 #: view:mrp.production.order:0
 msgid "Month -1"
-msgstr ""
+msgstr "Месяц -1"

 #. module: mrp
 #: code:addons/mrp/mrp.py:914
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
-msgstr ""
+msgstr "Производственный заказ '%s' запланирован на %s."

 #. module: mrp
 #: report:mrp.production.order:0
@ -1344,12 +1363,12 @@ msgstr "Заказ на производство  №"
 #: code:addons/mrp/mrp.py:630
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
-msgstr ""
+msgstr "Производственный заказ '%s' готов для производства."

 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_product_line
 msgid "Production Scheduled Product"
-msgstr ""
+msgstr "Производство запланированного продукта"

 #. module: mrp
 #: help:res.company,manufacturing_lead:0
@ -1366,7 +1385,7 @@ msgstr "Изготовление про запас"
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "July"
-msgstr ""
+msgstr "Июль"

 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
@ -1384,6 +1403,8 @@ msgid ""
 "In case the Supply method of the product is Buy, the system creates a "
 "purchase order."
 msgstr ""
+"В случае если метод поставки \"Приобрести\", система создаст заказ на "
+"поставку."

 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
@ -1400,12 +1421,12 @@ msgstr "Структура себестоимости продукции"
 #: code:addons/mrp/report/price.py:130
 #, python-format
 msgid "Components suppliers"
-msgstr ""
+msgstr "Поставщики комплектующих"

 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_installer
 msgid "mrp.installer"
-msgstr ""
+msgstr "mrp.installer"

 #. module: mrp
 #: view:mrp.production:0
@ -1416,13 +1437,13 @@ msgstr ""
 #: view:mrp.production.order:0
 #: field:mrp.production.order,month:0
 msgid "Month"
-msgstr ""
+msgstr "Месяц"

 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:62
 #, python-format
 msgid "Active Id is not found"
-msgstr ""
+msgstr "Активный идентификатор не найден"

 #. module: mrp
 #: view:mrp.workcenter:0
@ -1453,12 +1474,12 @@ msgstr ""
 #. module: mrp
 #: field:mrp.production.order,product_id2:0
 msgid "Product Consumed"
-msgstr ""
+msgstr "Потребляемый продукт"

 #. module: mrp
 #: view:mrp.production:0
 msgid "Pending"
-msgstr ""
+msgstr "В ожидании"

 #. module: mrp
 #: field:mrp.bom,active:0
@ -1475,7 +1496,7 @@ msgstr "Снабжение товарами"
 #: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
 #: view:report.workcenter.load:0
 msgid "Work Center Loads"
-msgstr ""
+msgstr "Загрузка Рабочего центра"

 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
@ -1493,6 +1514,7 @@ msgstr "Свойства"
 msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
+"Ссылка на документ, который сгенерировал этот производственный заказ."

 #. module: mrp
 #: sql_constraint:mrp.bom:0
@ -1510,17 +1532,17 @@ msgstr "Доп. информация"
 #. module: mrp
 #: model:ir.model,name:mrp.model_change_production_qty
 msgid "Change Quantity of Products"
-msgstr ""
+msgstr "Изменение количества продуктов"

 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
 msgid "Drives the procurement orders for raw material."
-msgstr ""
+msgstr "Управляет заказами на приобретение сырья."

 #. module: mrp
 #: view:mrp.production.order:0
 msgid "Current"
-msgstr ""
+msgstr "Текущий"

 #. module: mrp
 #: field:mrp.workcenter,costs_general_account_id:0
@ -1542,14 +1564,14 @@ msgstr "Выполнено"
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_change_standard_price
 msgid "Change Standard Price"
-msgstr ""
+msgstr "Изменение стандартной цены"

 #. module: mrp
 #: field:mrp.production,origin:0
 #: report:mrp.production.order:0
 #: field:mrp.production.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Документ-основание"

 #. module: mrp
 #: selection:mrp.production,priority:0
@ -1574,6 +1596,8 @@ msgstr ""
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
+"Не удаётся удалить Производственный заказ(-ы), которые находятся в состоянии "
+"%s!"

 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
@ -1582,7 +1606,7 @@ msgstr ""
 #: view:mrp.workcenter:0
 #: field:report.workcenter.load,workcenter_id:0
 msgid "Work Center"
-msgstr ""
+msgstr "Рабочий центр"

 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
@ -1617,7 +1641,7 @@ msgstr "Расположение исходных материалов"
 #. module: mrp
 #: view:mrp.product_price:0
 msgid "Print Cost Structure of Product."
-msgstr ""
+msgstr "Печатать структуру себестоимости продукции."

 #. module: mrp
 #: field:mrp.bom,product_uos:0
@ -1651,19 +1675,19 @@ msgstr "Ед.изм. продукции"
 #: model:process.transition,name:mrp.process_transition_servicemto0
 #: model:process.transition,name:mrp.process_transition_stockproduct0
 msgid "Make to Order"
-msgstr ""
+msgstr "Изготовление на заказ"

 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
 msgid "Production Analysis"
-msgstr ""
+msgstr "Анализ производства"

 #. module: mrp
 #: code:addons/mrp/mrp.py:345
 #, python-format
 msgid "Copy"
-msgstr ""
+msgstr "Копировать"

 #. module: mrp
 #: view:mrp.production.lot.line:0
@ -1679,7 +1703,7 @@ msgstr "Дата окончания"
 #. module: mrp
 #: field:mrp.workcenter,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Ресурс"

 #. module: mrp
 #: help:mrp.bom,date_start:0
@ -1717,7 +1741,7 @@ msgstr ""
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Approve"
-msgstr ""
+msgstr "Утвердить"

 #. module: mrp
 #: view:mrp.property.group:0
@ -1752,7 +1776,7 @@ msgstr ""
 #: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
 #: view:mrp.production:0
 msgid "Manufacturing Orders"
-msgstr ""
+msgstr "Производственные заказы"

 #. module: mrp
 #: help:mrp.product.produce,mode:0
@ -1779,13 +1803,13 @@ msgstr "Стоимость по циклам"
 #: model:process.node,name:mrp.process_node_serviceproduct0
 #: model:process.node,name:mrp.process_node_serviceproduct1
 msgid "Service"
-msgstr ""
+msgstr "Услуга"

 #. module: mrp
 #: selection:mrp.production,state:0
 #: selection:mrp.production.order,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Отменено"

 #. module: mrp
 #: view:mrp.production.order:0
@ -1815,7 +1839,7 @@ msgstr ""
 #: field:mrp.routing.workcenter,company_id:0
 #: view:mrp.workcenter:0
 msgid "Company"
-msgstr ""
+msgstr "Организация"

 #. module: mrp
 #: field:mrp.workcenter,time_cycle:0
@ -1834,7 +1858,7 @@ msgstr "Заказ на производство"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productminimumstockrule0
 msgid "Automatic procurement rule"
-msgstr ""
+msgstr "Правило автоматической закупки"

 #. module: mrp
 #: view:mrp.production:0
@ -1851,7 +1875,7 @@ msgstr "Кол-во продукции, 2 ед. изм."
 #: view:mrp.bom:0
 #, python-format
 msgid "Components"
-msgstr ""
+msgstr "Компоненты"

 #. module: mrp
 #: report:bom.structure:0
@ -1901,12 +1925,12 @@ msgstr "Подтвердить"
 #. module: mrp
 #: field:mrp.bom,product_efficiency:0
 msgid "Manufacturing Efficiency"
-msgstr ""
+msgstr "Эффективность производства"

 #. module: mrp
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные компании."

 #. module: mrp
 #: help:mrp.bom,active:0
@ -1932,11 +1956,13 @@ msgid ""
 "This reporting allows you to analyse your manufacturing activities and "
 "performance."
 msgstr ""
+"Этот отчет позволяет анализировать производственную активность и "
+"производительность."

 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
-msgstr ""
+msgstr "Только потреблять"

 #. module: mrp
 #: view:mrp.production:0
@ -2014,7 +2040,7 @@ msgstr "Заказы на снабжение"
 #. module: mrp
 #: help:mrp.bom,product_rounding:0
 msgid "Rounding applied on the product quantity."
-msgstr ""
+msgstr "Округление, применяемое к количеству продукции."

 #. module: mrp
 #: model:process.node,note:mrp.process_node_stock0
@ -2029,7 +2055,7 @@ msgstr "Родительский маршрут"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Настроить"

 #. module: mrp
 #: help:mrp.workcenter,time_start:0
@ -2039,12 +2065,12 @@ msgstr "Время наладки в часах"
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "December"
-msgstr ""
+msgstr "Декабрь"

 #. module: mrp
 #: field:mrp.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Изображение"

 #. module: mrp
 #: field:mrp.bom.revision,bom_id:0
@ -2062,7 +2088,7 @@ msgstr "Изменения оценки запасов"
 #: model:process.node,note:mrp.process_node_mts0
 #: model:process.node,note:mrp.process_node_servicemts0
 msgid "Assignment from stock."
-msgstr ""
+msgstr "Назначение со склада."

 #. module: mrp
 #: selection:mrp.production,state:0
@ -2097,7 +2123,7 @@ msgstr "Неделя"
 #. module: mrp
 #: field:mrp.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Выполнение настройки"

 #. module: mrp
 #: selection:mrp.production,priority:0
@ -2108,14 +2134,14 @@ msgstr "Нормально"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_routing0
 msgid "Manufacturing Steps."
-msgstr ""
+msgstr "Производственные шаги."

 #. module: mrp
 #: code:addons/mrp/report/price.py:136
 #: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
-msgstr ""
+msgstr "Структура стоимости"

 #. module: mrp
 #: selection:mrp.product.produce,mode:0
@ -2125,7 +2151,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "November"
-msgstr ""
+msgstr "Ноябрь"

 #. module: mrp
 #: field:mrp.bom,bom_id:0
@ -2143,12 +2169,12 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "January"
-msgstr ""
+msgstr "Январь"

 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
 msgid "Product type is Stockable or Consumable."
-msgstr ""
+msgstr "Тип продукта — Складируемый или Потребляемый."

 #. module: mrp
 #: code:addons/mrp/mrp.py:591
@ -2161,7 +2187,7 @@ msgstr "Ошибка"
 #. module: mrp
 #: field:mrp.product.produce,product_qty:0
 msgid "Select Quantity"
-msgstr ""
+msgstr "Выберите количество"

 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
@ -2199,7 +2225,7 @@ msgstr "Продукция"
 #: code:addons/mrp/report/price.py:194
 #, python-format
 msgid "Work Cost of "
-msgstr ""
+msgstr "Стоимость работы "

 #. module: mrp
 #: help:mrp.workcenter,note:0
@ -2223,7 +2249,7 @@ msgstr "Техн. маршрут"
 #. module: mrp
 #: field:mrp.installer,mrp_operations:0
 msgid "Manufacturing Operations"
-msgstr ""
+msgstr "Производственные операции"

 #. module: mrp
 #: field:mrp.production,date_planned:0
@ -2254,17 +2280,17 @@ msgstr "Производство"
 #. module: mrp
 #: view:board.board:0
 msgid "Procurements in Exception"
-msgstr ""
+msgstr "Исключительные ситуации снабжения"

 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
-msgstr ""
+msgstr "Материал из \"Правила минимальных запасов\""

 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
-msgstr ""
+msgstr "Цена продукта"

 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_installer
@ -2274,12 +2300,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move_split
 msgid "Split in Production lots"
-msgstr ""
+msgstr "Разделить продукт на партии"

 #. module: mrp
 #: view:change.production.qty:0
 msgid "Change Quantity"
-msgstr ""
+msgstr "Изменить количество"

 #. module: mrp
 #: view:change.production.qty:0
@ -2303,17 +2329,17 @@ msgstr "Описание"
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "May"
-msgstr ""
+msgstr "Май"

 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
-msgstr ""
+msgstr "Панель производства"

 #. module: mrp
 #: field:mrp.production,date_planned_end:0
 msgid "Scheduled End Date"
-msgstr ""
+msgstr "Запланированная дата окончания"

 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
@ -2336,12 +2362,12 @@ msgstr "Производство"
 #. module: mrp
 #: view:board.board:0
 msgid "Next Production Orders"
-msgstr ""
+msgstr "Следующий производственный заказ"

 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "February"
-msgstr ""
+msgstr "Февраль"

 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_group_action
@ -2352,7 +2378,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "April"
-msgstr ""
+msgstr "Апрель"

 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_procurestockableproduct0
@ -2377,6 +2403,8 @@ msgid ""
 "If the service has a 'Produce' supply method, this creates a task in the "
 "project management module of OpenERP."
 msgstr ""
+"Если у услуги есть метод поставки 'Произвести', это создает задачу в модуле "
+"управления проектами Системы."

 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_productionprocureproducts0
@ -2422,13 +2450,13 @@ msgstr ""
 #: report:mrp.production.order:0
 #: field:mrp.production.order,products_to_consume:0
 msgid "Products to Consume"
-msgstr ""
+msgstr "Потребляемые продукты"

 #. module: mrp
 #: view:mrp.production.order:0
 #: field:mrp.production.order,year:0
 msgid "Year"
-msgstr ""
+msgstr "Год"

 #~ msgid "-"
 #~ msgstr "-"
@ -2933,5 +2961,19 @@ msgstr ""
 #~ msgid "Workcenter Usage"
 #~ msgstr "Использование Рабочего центра"

+#~ 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 ""
+#~ "Количество параллельных операций для этого рабочегоцентра. Если этот центр "
+#~ "представлен 5-ю работниками - производительность за цикл равна 5."
+
 #~ msgid "Human Resource"
 #~ msgstr "Людские ресурсы"
+
+#~ msgid ""
+#~ "Description of the work center. Explain here what's a cycle according to "
+#~ "this work center."
+#~ msgstr ""
+#~ "Описание рабочего центра. Объясните здесь, каков цикл для этого рабочего "
+#~ "центра."
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@ -95,9 +95,10 @@ class StockMove(osv.osv):
                    'location_id': move.location_dest_id.id,
                    'auto_validate': True,
                    'picking_id': False,
-                    'state': 'waiting'
+                    'state': 'confirmed'
                })
                for m in procurement_obj.search(cr, uid, [('move_id','=',move.id)], context):
+                    wf_service.trg_validate(uid, 'procurement.order', m, 'button_confirm', cr)
                    wf_service.trg_validate(uid, 'procurement.order', m, 'button_wait_done', cr)
        return True
    
--- a/addons/point_of_sale/i18n/es.po
+++ b/addons/point_of_sale/i18n/es.po
@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2011-01-13 12:13+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"PO-Revision-Date: 2011-03-24 19:00+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-14 05:04+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-03-25 04:40+0000\n"
+"X-Generator: Launchpad (build 12559)\n"

 #. module: point_of_sale
 #: field:pos.discount,discount_notes:0
@ -32,8 +32,7 @@ msgid "Point of Sale Confirm"
 msgstr "Punto de venta. Confirmar"

 #. module: point_of_sale
-#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
-#: view:pos.discount:0
+#: wizard_button:pos.discount,init,apply_discount:0
 msgid "Apply Discount"
 msgstr "Aplicar descuento"

@ -58,7 +57,7 @@ msgid "Today"
 msgstr "Hoy"

 #. module: point_of_sale
-#: view:pos.add.product:0
+#: wizard_view:pos.add_product,init:0
 msgid "Add product :"
 msgstr "Añadir producto :"

@ -80,8 +79,6 @@ msgstr "Análisis registro"

 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
-#: report:pos.details:0
-#: report:pos.details_summary:0
 msgid "Details of Sales"
 msgstr "Detalles de ventas"

@ -91,9 +88,7 @@ msgid "Are you sure you want to close the statements ?"
 msgstr "¿Está seguro de querer cerrar las declaraciones?"

 #. module: point_of_sale
-#: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product
-#: model:ir.model,name:point_of_sale.model_pos_scan_product
-#: view:pos.scan.product:0
+#: wizard_view:pos.scan_product,init:0
 msgid "Scan product"
 msgstr "Escanear producto"

@ -106,7 +101,7 @@ msgid "Day"
 msgstr "Día"

 #. module: point_of_sale
-#: view:pos.make.payment:0
+#: wizard_view:pos.payment,ask_pay:0
 msgid "Add payment :"
 msgstr "Añadir pago :"

@ -127,20 +122,18 @@ msgid "Today's Sales By Current User"
 msgstr "Ventas de hoy por usuario actual"

 #. module: point_of_sale
-#: report:account.statement:0
-#: field:pos.box.entries,amount:0
-#: field:pos.box.out,amount:0
-#: report:pos.invoice:0
-#: field:pos.make.payment,amount:0
-#: report:pos.user.product:0
+#: rml:pos.invoice:0
+#: field:pos.payment,amount:0
+#: wizard_field:pos.payment,ask_pay,amount:0
 #: field:report.transaction.pos,amount:0
 msgid "Amount"
 msgstr "Importe"

 #. module: point_of_sale
-#: report:pos.lines:0
+#: rml:pos.details:0
+#: rml:pos.lines:0
 msgid "VAT"
-msgstr "IVA"
+msgstr "CIF/NIF"

 #. module: point_of_sale
 #: report:pos.invoice:0
@ -148,7 +141,7 @@ msgid "Origin"
 msgstr "Origen"

 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "Tax"
 msgstr "Impuesto"

@ -163,14 +156,13 @@ msgid "Will put all the orders in waiting status till being accepted"
 msgstr "Pondrá todas las órdenes en espera hasta que sean aceptadas"

 #. module: point_of_sale
-#: report:account.statement:0
-#: field:report.pos.order,partner_id:0
+#: field:pos.order,partner_id:0
 msgid "Partner"
 msgstr "Empresa"

 #. module: point_of_sale
-#: report:pos.details:0
-#: report:pos.details_summary:0
+#: rml:pos.details:0
+#: rml:pos.details_summary:0
 msgid "Total of the day"
 msgstr "Total del día"

@ -181,25 +173,19 @@ msgid "Average Price"
 msgstr "Precio promedio"

 #. module: point_of_sale
-#: report:pos.lines:0
+#: rml:pos.invoice:0
+#: rml:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Desc. (%)"

 #. module: point_of_sale
-#: report:pos.details:0
-#: report:pos.details_summary:0
+#: rml:pos.details:0
+#: rml:pos.details_summary:0
 msgid "Total discount"
 msgstr "Total descuento"

 #. module: point_of_sale
-#: view:account.bank.statement:0
-#: view:pos.order:0
 #: field:pos.order,state:0
-#: report:pos.sales.user:0
-#: report:pos.sales.user.today:0
-#: report:pos.sales.user.today.current.user:0
-#: field:report.cash.register,state:0
-#: field:report.pos.order,state:0
 msgid "State"
 msgstr "Estado"

@ -282,8 +268,7 @@ msgid "Cash register management"
 msgstr "Gestión de la caja"

 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1056
-#: code:addons/point_of_sale/point_of_sale.py:1075
+#: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr "¡Se ha encontrado una línea de tarifa no válida!"
@ -378,8 +363,7 @@ msgid "Sales by User Monthly"
 msgstr "Ventas mensuales por usuario"

 #. module: point_of_sale
-#: field:pos.order,date_payment:0
-#: field:report.pos.order,date_payment:0
+#: field:pos.payment,payment_date:0
 msgid "Payment Date"
 msgstr "Fecha de pago"

@ -401,8 +385,8 @@ msgid "To count"
 msgstr "Para contar"

 #. module: point_of_sale
-#: report:pos.details:0
-#: report:pos.details_summary:0
+#: rml:pos.details:0
+#: rml:pos.details_summary:0
 msgid "Summary"
 msgstr "Resumen"

@ -417,12 +401,10 @@ msgid "Delay Payment"
 msgstr "Retrasar pago"

 #. module: point_of_sale
-#: field:pos.add.product,quantity:0
-#: report:pos.invoice:0
-#: report:pos.lines:0
+#: wizard_field:pos.add_product,init,quantity:0
+#: rml:pos.invoice:0
+#: rml:pos.lines:0
 #: field:pos.order.line,qty:0
-#: field:report.sales.by.user.pos,qty:0
-#: field:report.sales.by.user.pos.month,qty:0
 msgid "Quantity"
 msgstr "Cantidad"

@ -437,10 +419,9 @@ msgid "Period"
 msgstr "Período"

 #. module: point_of_sale
-#: report:pos.invoice:0
-#: report:pos.payment.report:0
+#: rml:pos.invoice:0
 msgid "Net Total:"
-msgstr "Total neto:"
+msgstr "Base:"

 #. module: point_of_sale
 #: field:pos.order.line,name:0
@ -470,12 +451,9 @@ msgid "Print Report"
 msgstr "Imprimir informe"

 #. module: point_of_sale
-#: report:pos.invoice:0
-#: report:pos.lines:0
+#: rml:pos.invoice:0
+#: rml:pos.lines:0
 #: field:pos.order.line,price_unit:0
-#: report:pos.payment.report:0
-#: report:pos.payment.report.date:0
-#: report:pos.payment.report.user:0
 msgid "Unit Price"
 msgstr "Precio unidad"

@ -501,28 +479,22 @@ msgid "Invoice Amount"
 msgstr "Importe factura"

 #. module: point_of_sale
-#: view:account.bank.statement:0
-#: field:account.bank.statement.line,journal_id:0
-#: report:account.statement:0
-#: report:all.closed.cashbox.of.the.day:0
-#: model:ir.model,name:point_of_sale.model_account_journal
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
-#: view:report.cash.register:0
-#: field:report.cash.register,journal_id:0
-#: field:report.pos.order,journal_id:0
+#: wizard_field:pos.payment,ask_pay,journal:0
+#: field:pos.payment,journal_id:0
+#: field:report.transaction.pos,journal_id:0
 msgid "Journal"
 msgstr "Diario"

 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "Tel. :"
 msgstr "Tel. :"

 #. module: point_of_sale
+#: model:ir.actions.wizard,name:point_of_sale.pos_payment
 #: view:pos.order:0
-#: selection:pos.order,state:0
-#: selection:report.pos.order,state:0
 msgid "Payment"
 msgstr "Pago"

@ -553,8 +525,8 @@ msgstr ""
 "registradoras confirmadas!"

 #. module: point_of_sale
-#: report:pos.details:0
-#: report:pos.details_summary:0
+#: rml:pos.details:0
+#: rml:pos.details_summary:0
 msgid "Mode of Taxes"
 msgstr "Modo de impuestos"

@ -587,8 +559,8 @@ msgid "Sales total(Revenue)"
 msgstr "Total ventas (ingresos)"

 #. module: point_of_sale
-#: report:pos.details:0
-#: report:pos.details_summary:0
+#: rml:pos.details:0
+#: rml:pos.details_summary:0
 msgid "Total paid"
 msgstr "Total pagado"

@ -598,8 +570,8 @@ msgid "Check Details"
 msgstr "Verificar detalles"

 #. module: point_of_sale
-#: report:pos.details:0
-#: report:pos.details_summary:0
+#: rml:pos.details:0
+#: rml:pos.details_summary:0
 msgid "Qty of product"
 msgstr "Ctd. producto"

@ -632,8 +604,7 @@ msgstr ""
 "Por favor seleccione una antes de seleccionar un producto."

 #. module: point_of_sale
-#: view:pos.order:0
-#: field:pos.order.line,price_subtotal_incl:0
+#: field:pos.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr "Subtotal"

@ -690,7 +661,8 @@ msgid "St.Name"
 msgstr "Nombre extracto"

 #. module: point_of_sale
-#: report:pos.details_summary:0
+#: rml:pos.details:0
+#: rml:pos.details_summary:0
 msgid "Sales total"
 msgstr "Total ventas"

@ -700,7 +672,7 @@ msgid "Sum of subtotals"
 msgstr "Suma de subtotales"

 #. module: point_of_sale
-#: field:pos.make.payment,payment_date:0
+#: wizard_field:pos.payment,ask_pay,payment_date:0
 msgid "Payment date"
 msgstr "Fecha de pago"

@ -720,10 +692,6 @@ msgid "Today's Sales"
 msgstr "Ventas de hoy"

 #. module: point_of_sale
-#: view:report.sales.by.margin.pos:0
-#: view:report.sales.by.margin.pos.month:0
-#: view:report.sales.by.user.pos:0
-#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
 msgstr "TPV "
@ -736,7 +704,7 @@ msgid "Total :"
 msgstr "Total:"

 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "Create line failed !"
 msgstr "¡Ha fallado la creación de línea!"
@ -748,20 +716,19 @@ msgid "Product Name"
 msgstr "Nombre del Producto"

 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:69
+#: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "Invalid action !"
 msgstr "¡Acción no válida!"

 #. module: point_of_sale
-#: field:pos.make.payment,pricelist_id:0
 #: field:pos.order,pricelist_id:0
 msgid "Pricelist"
 msgstr "Tarifa"

 #. module: point_of_sale
-#: report:pos.details:0
-#: report:pos.details_summary:0
+#: rml:pos.details:0
+#: rml:pos.details_summary:0
 msgid "Total invoiced"
 msgstr "Total facturado"

@ -796,7 +763,7 @@ msgid "Today's Closed Cashbox"
 msgstr "Caja registradora cerrada hoy"

 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "Draft Invoice"
 msgstr "Factura borrador"

@ -848,7 +815,7 @@ msgid "Disc."
 msgstr "Desc."

 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "VAT :"
 msgstr "CIF/NIF:"

@ -863,13 +830,13 @@ msgid "Receipt :"
 msgstr "Recibo"

 #. module: point_of_sale
-#: field:account.bank.statement.line,pos_statement_id:0
+#: field:pos.order,amount_paid:0
 #: field:pos.order,amount_return:0
 msgid "unknown"
 msgstr "desconocido"

 #. module: point_of_sale
-#: report:pos.details:0
+#: rml:pos.details:0
 #: field:report.transaction.pos,date_create:0
 msgid "Date"
 msgstr "Fecha"
@ -906,7 +873,7 @@ msgid "Pos Box Entries"
 msgstr "Entradas caja TPV"

 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
+#: code:addons/point_of_sale/wizard/wizard_get_sale.py:0
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr "No puede modificar esta venta. Ya ha sido pagada."
@ -928,14 +895,15 @@ msgid "Number of Transaction"
 msgstr "Número de transacción"

 #. module: point_of_sale
-#: view:pos.add.product:0
-#: view:pos.box.entries:0
-#: view:pos.box.out:0
-#: view:pos.get.sale:0
-#: view:pos.make.payment:0
+#: wizard_button:pos.add_product,init,end:0
+#: wizard_button:pos.config.journal,init,end:0
+#: wizard_button:pos.discount,init,end:0
+#: view:pos.order:0
 #: selection:pos.order,state:0
-#: view:pos.receipt:0
-#: selection:report.pos.order,state:0
+#: wizard_button:pos.payment,ask_pay,end:0
+#: wizard_button:pos.refund_order,init,end:0
+#: wizard_button:pos.sale.get,init,end:0
+#: wizard_button:pos.scan_product,init,end:0
 msgid "Cancel"
 msgstr "Cancelar"

@ -981,7 +949,7 @@ msgid "First Name"
 msgstr "Nombre"

 #. module: point_of_sale
-#: view:res.company:0
+#: view:pos.order:0
 msgid "Other"
 msgstr "Varios"

@ -1009,22 +977,19 @@ msgid "Users"
 msgstr "Usuarios"

 #. module: point_of_sale
-#: report:pos.details:0
-#: report:pos.invoice:0
-#: report:pos.lines:0
+#: rml:pos.details:0
+#: rml:pos.invoice:0
+#: rml:pos.lines:0
+#: rml:pos.receipt:0
 msgid "Price"
 msgstr "Precio"

 #. module: point_of_sale
-#: field:pos.scan.product,gencod:0
+#: wizard_field:pos.scan_product,init,gencod:0
 msgid "Barcode"
 msgstr "Código de barras"

 #. module: point_of_sale
-#: view:report.sales.by.margin.pos:0
-#: view:report.sales.by.margin.pos.month:0
-#: view:report.sales.by.user.pos:0
-#: view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
 msgstr "TPV"
@ -1074,7 +1039,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr "¡El nombre del diaro debe ser único por compañía!"

 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "Supplier Refund"
 msgstr "Devolución proveedor"

@ -1097,15 +1062,13 @@ msgid "All Closed CashBox"
 msgstr "Todas cajas registradoras cerradas"

 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "No Pricelist !"
 msgstr "¡No existe tarifa!"

 #. module: point_of_sale
-#: model:ir.actions.act_window,name:point_of_sale.action_pos_get_sale
-#: view:pos.get.sale:0
+#: wizard_view:pos.sale.get,init:0
 msgid "Select an Open Sale Order"
 msgstr "Seleccione una orden de venta abierta"

@ -1115,7 +1078,7 @@ msgid "Order date"
 msgstr "Fecha pedido"

 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "Base"
 msgstr "Base"

@ -1131,17 +1094,18 @@ msgstr "Responsable de ventas"

 #. module: point_of_sale
 #: view:pos.order:0
+#: field:pos.order,note:0
 msgid "Notes"
 msgstr "Notas"

 #. module: point_of_sale
-#: field:pos.get.sale,picking_id:0
-#: view:pos.order:0
+#: wizard_field:pos.sale.get,init,picking_id:0
 msgid "Sale Order"
 msgstr "Pedido de venta"

 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
+#: rml:pos.lines:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr "Impuestos"
@ -1149,13 +1113,12 @@ msgstr "Impuestos"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
-#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
 msgstr "Línea de venta"

 #. module: point_of_sale
 #: field:pos.config.journal,code:0
-#: report:pos.details:0
+#: rml:pos.details:0
 msgid "Code"
 msgstr "Código"

@ -1188,7 +1151,7 @@ msgid "Extra Info"
 msgstr "Información extra"

 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "Fax :"
 msgstr "Fax :"

@ -1240,14 +1203,8 @@ msgid "Picking List"
 msgstr "Albarán"

 #. module: point_of_sale
-#: report:pos.details:0
-#: report:pos.payment.report:0
-#: report:pos.payment.report.date:0
-#: report:pos.payment.report.user:0
-#: report:pos.sales.user.today.current.user:0
-#: report:pos.user.product:0
-#: field:report.sales.by.margin.pos,qty:0
-#: field:report.sales.by.margin.pos.month,qty:0
+#: rml:pos.details:0
+#: rml:pos.receipt:0
 msgid "Qty"
 msgstr "Ctd."

@ -1265,15 +1222,8 @@ msgid "Sale by User"
 msgstr "Ventas por usuario"

 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:555
-#: code:addons/point_of_sale/point_of_sale.py:743
-#: code:addons/point_of_sale/point_of_sale.py:851
-#: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
-#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
-#: code:addons/point_of_sale/wizard/pos_box_out.py:95
-#: code:addons/point_of_sale/wizard/pos_box_out.py:99
-#: code:addons/point_of_sale/wizard/pos_box_out.py:101
+#: code:addons/point_of_sale/pos.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:0
 #, python-format
 msgid "Error !"
 msgstr "¡Error!"
@ -1401,7 +1351,7 @@ msgid "Customer Note"
 msgstr "Nota cliente"

 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "No se han añadido líneas en esta venta."
@ -1412,10 +1362,7 @@ msgid "Opening Balance"
 msgstr "Saldo de apertura"

 #. module: point_of_sale
-#: field:pos.order,amount_paid:0
 #: selection:pos.order,state:0
-#: view:report.pos.order:0
-#: selection:report.pos.order,state:0
 msgid "Paid"
 msgstr "Pagado"

@ -1431,11 +1378,7 @@ msgid "Quotation"
 msgstr "Presupuesto"

 #. module: point_of_sale
-#: report:all.closed.cashbox.of.the.day:0
-#: report:pos.invoice:0
-#: report:pos.lines:0
-#: report:pos.payment.report.date:0
-#: report:pos.payment.report.user:0
+#: rml:pos.invoice:0
 msgid "Total:"
 msgstr "Total:"

@ -1469,7 +1412,7 @@ msgid "Nbr Invoice"
 msgstr "Nº factura"

 #. module: point_of_sale
-#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
+#: model:ir.actions.report.xml,name:point_of_sale.pos_receipt
 msgid "Receipt"
 msgstr "Tiquet"

@ -1480,15 +1423,15 @@ msgstr "Crear factura"

 #. module: point_of_sale
 #: selection:pos.order,state:0
-#: selection:report.pos.order,state:0
 msgid "Done"
 msgstr "Realizado"

 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
-#: report:pos.invoice:0
-#: field:pos.make.payment,invoice_wanted:0
+#: rml:pos.invoice:0
 #: field:pos.order,invoice_id:0
+#: wizard_field:pos.payment,ask_pay,invoice_wanted:0
+#: field:report.transaction.pos,invoice_id:0
 msgid "Invoice"
 msgstr "Factura"

@ -1505,6 +1448,7 @@ msgstr "Abierto"

 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
+#: field:pos.payment,order_id:0
 msgid "Order Ref"
 msgstr "Ref. venta"

@ -1538,7 +1482,7 @@ msgid "Sales by User Margin"
 msgstr "Ventas por margen usuario"

 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "Taxes:"
 msgstr "Impuestos:"

@ -1548,17 +1492,9 @@ msgid "Point of Sale Orders Statistics"
 msgstr "Punto de venta. Estadísticas pedidos"

 #. module: point_of_sale
-#: model:ir.model,name:point_of_sale.model_product_product
-#: field:pos.add.product,product_id:0
-#: report:pos.details:0
+#: wizard_field:pos.add_product,init,product:0
+#: rml:pos.details:0
 #: field:pos.order.line,product_id:0
-#: report:pos.payment.report:0
-#: report:pos.payment.report.date:0
-#: report:pos.payment.report.user:0
-#: report:pos.user.product:0
-#: view:product.product:0
-#: view:report.pos.order:0
-#: field:report.pos.order,product_id:0
 msgid "Product"
 msgstr "Producto"

@ -1640,13 +1576,8 @@ msgid "Date Start"
 msgstr "Fecha inicial"

 #. module: point_of_sale
+#: rml:pos.lines:0
 #: field:pos.order,amount_total:0
-#: report:pos.payment.report:0
-#: report:pos.payment.report.date:0
-#: report:pos.payment.report.user:0
-#: report:pos.sales.user.today.current.user:0
-#: field:report.sales.by.user.pos,amount:0
-#: field:report.sales.by.user.pos.month,amount:0
 msgid "Total"
 msgstr "Total"

@ -1690,26 +1621,12 @@ msgid "Return lines"
 msgstr "Líneas de devolución"

 #. module: point_of_sale
-#: report:account.statement:0
-#: report:all.closed.cashbox.of.the.day:0
-#: report:pos.details:0
-#: report:pos.details_summary:0
-#: report:pos.lines:0
-#: field:pos.order,company_id:0
-#: field:pos.order.line,company_id:0
-#: report:pos.payment.report:0
-#: report:pos.payment.report.date:0
-#: report:pos.payment.report.user:0
-#: report:pos.sales.user:0
-#: report:pos.sales.user.today:0
-#: report:pos.sales.user.today.current.user:0
-#: report:pos.user.product:0
-#: field:report.pos.order,company_id:0
+#: rml:pos.lines:0
 msgid "Company"
 msgstr "Compañía"

 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "Invoice Date"
 msgstr "Fecha factura"

@ -1761,28 +1678,29 @@ msgid "Error!"
 msgstr "¡Error!"

 #. module: point_of_sale
-#: report:pos.lines:0
+#: rml:pos.lines:0
 msgid "No. Of Articles"
 msgstr "Núm. de artículos"

 #. module: point_of_sale
 #: field:pos.order,date_validity:0
+#: wizard_field:pos.refund_order,init,date_validity:0
 msgid "Validity Date"
-msgstr "Fecha caducidad"
+msgstr "Fecha validez"

 #. module: point_of_sale
+#: view:pos.order:0
 #: field:pos.order,pickings:0
 msgid "Picking"
 msgstr "Albarán"

 #. module: point_of_sale
 #: field:pos.order,shop_id:0
-#: field:report.pos.order,shop_id:0
 msgid "Shop"
 msgstr "Tienda"

 #. module: point_of_sale
-#: field:pos.order,picking_id:0
+#: field:pos.order,last_out_picking:0
 msgid "Last Output Picking"
 msgstr "Último albarán de salida"

@ -1824,7 +1742,7 @@ msgid "Refunded Quantity"
 msgstr "Cantidad devuelta"

 #. module: point_of_sale
-#: view:pos.scan.product:0
+#: wizard_view:pos.scan_product,init:0
 msgid "Scan Barcode"
 msgstr "Escanear código de barras"

@ -1855,9 +1773,8 @@ msgid "Cancelled Invoice"
 msgstr "Factura cancelada"

 #. module: point_of_sale
-#: view:account.bank.statement:0
-#: view:pos.get.sale:0
-#: view:report.cash.register:0
+#: model:ir.actions.wizard,name:point_of_sale.pos_confirm
+#: wizard_button:pos.sale.get,init,set:0
 msgid "Confirm"
 msgstr "Confirmar"

@ -1877,18 +1794,18 @@ msgid "Discount "
 msgstr "Descuento "

 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "Supplier Invoice"
 msgstr "Factura de proveedor"

 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "Modify line failed !"
 msgstr "¡Ha fallado la modificación de la línea!"

 #. module: point_of_sale
-#: field:pos.make.payment,payment_name:0
+#: wizard_field:pos.payment,ask_pay,payment_name:0
 msgid "Payment name"
 msgstr "Descripción pago"

@ -1918,7 +1835,7 @@ msgid "The code of the journal must be unique per company !"
 msgstr "¡El código del diario debe ser único por compañía!"

 #. module: point_of_sale
-#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config
 msgid "Configuration"
 msgstr "Configuración"

@ -1981,32 +1898,23 @@ msgid "Message"
 msgstr "Mensaje"

 #. module: point_of_sale
-#: view:account.journal:0
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree2
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree3
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
-#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form_user
 #: model:ir.model,name:point_of_sale.model_pos_order
+#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "Point of Sale"
 msgstr "Terminal Punto de Venta"

 #. module: point_of_sale
-#: view:pos.order:0
-#: field:pos.payment.report.date,user_id:0
-#: field:pos.payment.report.user,user_id:0
-#: field:pos.sale.user,user_id:0
-#: field:pos.sales.user.today,user_id:0
-#: view:report.pos.order:0
-#: field:report.pos.order,user_id:0
+#: field:pos.order,user_id:0
 msgid "Salesman"
 msgstr "Vendedor"

 #. module: point_of_sale
-#: report:pos.details:0
+#: rml:pos.details:0
 #: selection:pos.order,state:0
-#: view:report.pos.order:0
-#: selection:report.pos.order,state:0
 msgid "Invoiced"
 msgstr "Facturado"

@ -2023,13 +1931,12 @@ msgid "Discount Notice"
 msgstr "Nota de descuento"

 #. module: point_of_sale
-#: view:pos.scan.product:0
+#: wizard_button:pos.scan_product,init,add:0
 msgid "Add"
 msgstr "Añadir"

 #. module: point_of_sale
-#: view:report.cash.register:0
-#: selection:report.pos.order,state:0
+#: selection:pos.order,state:0
 msgid "Draft"
 msgstr "Borrador"

@ -2049,12 +1956,12 @@ msgid "POS Payment Report according to date"
 msgstr "TPV. Informe de pago según la fecha"

 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "PRO-FORMA"
 msgstr "PRO-FORMA"

 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "Por favor indique una empresa para la venta."
@ -2073,26 +1980,14 @@ msgid "Cashier"
 msgstr "Cajero"

 #. module: point_of_sale
-#: report:account.statement:0
-#: report:all.closed.cashbox.of.the.day:0
-#: view:pos.payment.report.date:0
-#: report:pos.sales.user:0
-#: report:pos.sales.user.today:0
-#: report:pos.sales.user.today.current.user:0
-#: report:pos.user.product:0
-#: view:report.cash.register:0
-#: field:report.cash.register,user_id:0
-#: field:report.sales.by.margin.pos,user_id:0
-#: field:report.sales.by.margin.pos.month,user_id:0
-#: field:report.sales.by.user.pos,user_id:0
-#: field:report.sales.by.user.pos.month,user_id:0
 #: field:report.transaction.pos,user_id:0
 msgid "User"
 msgstr "Usuario"

 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
-#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
 msgid "Sales by user"
 msgstr "Ventas por usuario"

@ -2119,13 +2014,7 @@ msgid "POS Orders lines"
 msgstr "TPV Líneas pedido"

 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:337
-#: code:addons/point_of_sale/point_of_sale.py:504
-#: code:addons/point_of_sale/point_of_sale.py:506
-#: code:addons/point_of_sale/point_of_sale.py:544
-#: code:addons/point_of_sale/point_of_sale.py:637
-#: code:addons/point_of_sale/point_of_sale.py:1206
-#: code:addons/point_of_sale/point_of_sale.py:1214
+#: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "Error"
 msgstr "Error"
@ -2136,12 +2025,12 @@ msgid "Sales Journal"
 msgstr "Diario de ventas"

 #. module: point_of_sale
-#: report:pos.invoice:0
+#: rml:pos.invoice:0
 msgid "Refund"
 msgstr "Devolución"

 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/report/pos_invoice.py:0
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr "Por favor, cree una factura para esta venta."
@ -2166,16 +2055,7 @@ msgid "Disc(%)"
 msgstr "Desc(%)"

 #. module: point_of_sale
-#: view:all.closed.cashbox.of.the.day:0
-#: view:pos.details:0
-#: view:pos.discount:0
-#: view:pos.payment.report:0
-#: view:pos.payment.report.date:0
-#: view:pos.payment.report.user:0
-#: view:pos.sale.user:0
-#: view:pos.sales.user.today:0
-#: view:pos.sales.user.today.current_user:0
-#: view:pos.scan.product:0
+#: view:pos.order:0
 msgid "Close"
 msgstr "Cerrar"

@ -2227,11 +2107,11 @@ msgid "please check that account is set to %s"
 msgstr "Compruebe que la cuenta esté establecida a %s"

 #. module: point_of_sale
-#: field:pos.box.entries,name:0
-#: field:pos.box.out,name:0
 #: field:pos.config.journal,name:0
-#: report:pos.invoice:0
-#: report:pos.lines:0
+#: rml:pos.invoice:0
+#: rml:pos.lines:0
+#: field:pos.payment,name:0
+#: rml:pos.receipt:0
 msgid "Description"
 msgstr "Descripción"

@ -2327,21 +2207,12 @@ msgid "April"
 msgstr "Abril"

 #. module: point_of_sale
-#: field:pos.order,statement_ids:0
+#: view:pos.order:0
 msgid "Payments"
 msgstr "Pagos"

 #. module: point_of_sale
-#: report:pos.details:0
-#: report:pos.details_summary:0
-#: report:pos.lines:0
-#: report:pos.payment.report:0
-#: report:pos.payment.report.date:0
-#: report:pos.payment.report.user:0
-#: report:pos.sales.user:0
-#: report:pos.sales.user.today:0
-#: report:pos.sales.user.today.current.user:0
-#: report:pos.user.product:0
+#: rml:pos.lines:0
 msgid "Print Date"
 msgstr "Fecha impresión"

--- a/addons/process/i18n/ro.po
+++ b/addons/process/i18n/ro.po
@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-02-06 21:20+0000\n"
-"Last-Translator: Mihai Boiciuc <Unknown>\n"
+"PO-Revision-Date: 2011-03-24 12:02+0000\n"
+"Last-Translator: Dorin <dhongu@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-07 05:19+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-03-25 04:40+0000\n"
+"X-Generator: Launchpad (build 12559)\n"

 #. module: process
 #: model:ir.model,name:process.model_process_node
@ -274,7 +274,7 @@ msgstr ""
 #: view:process.node:0
 #: view:process.process:0
 msgid "Other Conditions"
-msgstr ""
+msgstr "Alte condiții"

 #. module: process
 #: model:ir.module.module,shortdesc:process.module_meta_information
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@ -261,6 +261,7 @@ class product_pricelist(osv.osv):
                                    price = res2['price']
                        else:
                            price_type = price_type_obj.browse(cr, uid, int(res['base']))
+                            uom_price_already_computed = True
                            price = currency_obj.compute(cr, uid,
                                    price_type.currency_id.id, res['currency_id'],
                                    product_obj.price_get(cr, uid, [product_id],
@ -284,6 +285,7 @@ class product_pricelist(osv.osv):
                        price = False

                if price:
+                    results['item_id'] = res['id']
                    if 'uom' in context and not uom_price_already_computed:
                        product = products_dict[product_id]
                        uom = product.uos_id or product.uom_id
@ -299,7 +301,7 @@ class product_pricelist(osv.osv):
    def price_get(self, cr, uid, ids, prod_id, qty, partner=None, context=None):
        res_multi = self.price_get_multi(cr, uid, pricelist_ids=ids, products_by_qty_by_partner=[(prod_id, qty, partner)], context=context)
        res = res_multi[prod_id]
-        res.update({'item_id': {ids[-1]: ids[-1]}})
+        res.update({'item_id': {ids[-1]: res_multi.get('item_id', ids[-1])}})
        return res

    def price_get_old(self, cr, uid, ids, prod_id, qty, partner=None, context=None):
--- a/addons/product_margin/product_margin.py
+++ b/addons/product_margin/product_margin.py
@ -52,44 +52,43 @@ class product_product(osv.osv):
            elif invoice_state == 'draft_open_paid':
                states = ('draft', 'open', 'paid')

-            if 'sale_avg_price' in field_names or 'sale_num_invoiced' in field_names or 'turnover' in field_names or 'sale_expected' in field_names:
-                invoice_types = ('out_invoice', 'in_refund')
-            if 'purchase_avg_price' in field_names or 'purchase_num_invoiced' in field_names or 'total_cost' in field_names or 'normal_cost' in field_names:
-                invoice_types = ('in_invoice', 'out_refund')
-            if len(invoice_types):
-                cr.execute("""select
-                    avg(l.price_unit) as avg_unit_price,
+            sqlstr="""select
+                    sum(l.price_unit * l.quantity)/sum(l.quantity) as avg_unit_price,
                    sum(l.quantity) as num_qty,
-                    sum(l.quantity * l.price_unit) as total,
+                    sum(l.quantity * (l.price_subtotal/l.quantity)) as total,
                    sum(l.quantity * product.list_price) as sale_expected,
                    sum(l.quantity * product.standard_price) as normal_cost
                from account_invoice_line l
                left join account_invoice i on (l.invoice_id = i.id)
                left join product_template product on (product.id=l.product_id)
-                where l.product_id = %s and i.state in %s and i.type IN %s and i.date_invoice>=%s and i.date_invoice<=%s
-                """, (val.id, states, invoice_types, date_from, date_to))
-                result = cr.fetchall()[0]
-                if 'sale_avg_price' in field_names or 'sale_num_invoiced' in field_names or 'turnover' in field_names or 'sale_expected' in field_names:
-                    res[val.id]['sale_avg_price'] = result[0] and result[0] or 0.0
-                    res[val.id]['sale_num_invoiced'] = result[1] and result[1] or 0.0
-                    res[val.id]['turnover'] = result[2] and result[2] or 0.0
-                    res[val.id]['sale_expected'] = result[3] and result[3] or 0.0
-                    res[val.id]['sales_gap'] = res[val.id]['sale_expected']-res[val.id]['turnover']
-                if 'purchase_avg_price' in field_names or 'purchase_num_invoiced' in field_names or 'total_cost' in field_names or 'normal_cost' in field_names:
-                    res[val.id]['purchase_avg_price'] = result[0] and result[0] or 0.0
-                    res[val.id]['purchase_num_invoiced'] = result[1] and result[1] or 0.0
-                    res[val.id]['total_cost'] = result[2] and result[2] or 0.0
-                    res[val.id]['normal_cost'] = result[4] and result[4] or 0.0
-                    res[val.id]['purchase_gap'] = res[val.id]['normal_cost']-res[val.id]['total_cost']
+                where l.product_id = %s and i.state in %s and i.type IN %s and (i.date_invoice IS NULL or (i.date_invoice>=%s and i.date_invoice<=%s))
+                """
+            invoice_types = ('out_invoice', 'in_refund')
+            cr.execute(sqlstr, (val.id, states, invoice_types, date_from, date_to))
+            result = cr.fetchall()[0]
+            res[val.id]['sale_avg_price'] = result[0] and result[0] or 0.0
+            res[val.id]['sale_num_invoiced'] = result[1] and result[1] or 0.0
+            res[val.id]['turnover'] = result[2] and result[2] or 0.0
+            res[val.id]['sale_expected'] = result[3] and result[3] or 0.0
+            res[val.id]['sales_gap'] = res[val.id]['sale_expected']-res[val.id]['turnover']
+
+            invoice_types = ('in_invoice', 'out_refund')
+            cr.execute(sqlstr, (val.id, states, invoice_types, date_from, date_to))
+            result = cr.fetchall()[0]
+            res[val.id]['purchase_avg_price'] = result[0] and result[0] or 0.0
+            res[val.id]['purchase_num_invoiced'] = result[1] and result[1] or 0.0
+            res[val.id]['total_cost'] = result[2] and result[2] or 0.0
+            res[val.id]['normal_cost'] = result[4] and result[4] or 0.0
+            res[val.id]['purchase_gap'] = res[val.id]['normal_cost']-res[val.id]['total_cost']

            if 'total_margin' in field_names:
-                res[val.id]['total_margin'] = res[val.id].get('turnover', val.turnover) - res[val.id].get('total_cost', val.standard_price)
+                res[val.id]['total_margin'] = res[val.id]['turnover'] - res[val.id]['total_cost']
            if 'expected_margin' in field_names:
-                res[val.id]['expected_margin'] = res[val.id].get('sale_expected',val.sale_expected) - res[val.id].get('normal_cost',val.normal_cost)
+                res[val.id]['expected_margin'] = res[val.id]['sale_expected'] - res[val.id]['normal_cost']
            if 'total_margin_rate' in field_names:
-                res[val.id]['total_margin_rate'] = res[val.id].get('turnover', val.turnover) and res[val.id]['total_margin'] * 100 / res[val.id].get('turnover', val.turnover) or 0.0
+                res[val.id]['total_margin_rate'] = res[val.id]['turnover'] and res[val.id]['total_margin'] * 100 / res[val.id]['turnover'] or 0.0
            if 'expected_margin_rate' in field_names:
-                res[val.id]['expected_margin_rate'] = res[val.id].get('sale_expected',val.sale_expected) and res[val.id]['expected_margin'] * 100 /  res[val.id].get('sale_expected',val.sale_expected) or 0.0
+                res[val.id]['expected_margin_rate'] = res[val.id]['sale_expected'] and res[val.id]['expected_margin'] * 100 / res[val.id]['sale_expected'] or 0.0
        return res

    _columns = {
--- a/addons/project_scrum/project_scrum_report.xml
+++ b/addons/project_scrum/project_scrum_report.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
    <data>
-        <report auto="False"  id="report_scrum_sprint_burndown_chart" model="project.scrum.sprint" name="scrum.sprint.burndown" string="Burndown Chart"/>
+        <report auto="False"  menu="False" id="report_scrum_sprint_burndown_chart" model="project.scrum.sprint" name="scrum.sprint.burndown" string="Burndown Chart"/>
    </data>
 </openerp>
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@ -300,8 +300,10 @@
                            <field colspan="4" name="retrospective" nolabel="1"/>
                        </page>
                    </notebook>
-                    <group col="6" colspan="4">
+                    <group col="8" colspan="4">
                        <field name="state" readonly="1"/>
+                        <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d" 
+                        			string="Burndown Chart" type="action" icon="gtk-print"/>
                        <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
                        <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
                        <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
--- a/addons/project_scrum/report/sprint_burndown.py
+++ b/addons/project_scrum/report/sprint_burndown.py
@ -62,7 +62,7 @@ class report_tasks(report_int):
                return result

            guideline__data=[(datas[0][0],max_hour), (datas[-1][0],0)]
-
+            
            ar = area.T(x_grid_style=line_style.gray50_dash1,
                x_axis=axis.X(label="Date", format=int_to_date),
                y_axis=axis.Y(label="Burndown Chart - Planned Hours"),
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/i18n/ru.po
@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-20 13:57+0000\n"
+"PO-Revision-Date: 2011-03-24 14:57+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-21 04:46+0000\n"
+"X-Launchpad-Export-Date: 2011-03-25 04:40+0000\n"
 "X-Generator: Launchpad (build 12559)\n"

 #. module: purchase
@ -113,6 +113,9 @@ msgid ""
 "products, etc. For each purchase order, you can track the products received, "
 "and control the supplier invoices."
 msgstr ""
+"Это меню используется для поиска в ваших заказах на закупки ссылок, "
+"поставщиков, ТМЦ и т.д. Для каждого заказа, вы можете отслеживать полученные "
+"ТМЦ, и контролировать счета поставщиков."

 #. module: purchase
 #: code:addons/purchase/purchase.py:722
@ -129,7 +132,7 @@ msgstr "Cчета поставщиков"
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique !"
-msgstr ""
+msgstr "Номер заказа должен быть уникальным!"

 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_packinginvoice0
--- a/addons/report_intrastat/i18n/pt_BR.po
+++ b/addons/report_intrastat/i18n/pt_BR.po
@ -7,29 +7,29 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-09-09 07:19+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-03-25 01:02+0000\n"
+"Last-Translator: Emerson <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-15 05:27+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-03-25 04:40+0000\n"
+"X-Generator: Launchpad (build 12559)\n"

 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Fatura Cancelada"

 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "June"
-msgstr ""
+msgstr "Junho"

 #. module: report_intrastat
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
-msgstr ""
+msgstr "O código do país deve ser único!"

 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@ -51,6 +51,7 @@ msgstr "Preço de unidade"
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Erro: A UdM padrão e a UdM de compra precisam estar na mesma categoria."

 #. module: report_intrastat
 #: selection:report.intrastat,type:0
@ -70,7 +71,7 @@ msgstr "Documento"
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "PRO-FORMA"

 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@ -80,7 +81,7 @@ msgstr "Taxa"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "March"
-msgstr ""
+msgstr "Março"

 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@ -91,7 +92,7 @@ msgstr "Descrição"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "May"
-msgstr ""
+msgstr "Maio"

 #. module: report_intrastat
 #: field:report.intrastat,type:0
@ -101,12 +102,12 @@ msgstr "Tipo"
 #. module: report_intrastat
 #: model:ir.actions.report.xml,name:report_intrastat.invoice_intrastat_id
 msgid "Invoice Intrastat"
-msgstr ""
+msgstr "Fatura Instrastat"

 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Data da Fatura"

 #. module: report_intrastat
 #: model:ir.module.module,shortdesc:report_intrastat.module_meta_information
@ -116,32 +117,32 @@ msgstr ""
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel. :"

 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Quantity"
-msgstr ""
+msgstr "Quantidade"

 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Base"
-msgstr ""
+msgstr "Base"

 #. module: report_intrastat
 #: view:report.intrastat:0
 msgid "This Year"
-msgstr ""
+msgstr "Este Ano"

 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "January"
-msgstr ""
+msgstr "Janeiro"

 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "July"
-msgstr ""
+msgstr "Julho"

 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat_code
@ -149,7 +150,7 @@ msgstr ""
 #: field:report.intrastat,intrastat_id:0
 #: view:report.intrastat.code:0
 msgid "Intrastat code"
-msgstr ""
+msgstr "Código Intrastat"

 #. module: report_intrastat
 #: view:report.intrastat:0
@ -159,7 +160,7 @@ msgstr "Este mês"
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Partner Ref."
-msgstr ""
+msgstr "Ref. do Parceiro"

 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@ -169,22 +170,22 @@ msgstr ""
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "February"
-msgstr ""
+msgstr "Fevereiro"

 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "October"
-msgstr ""
+msgstr "Outubro"

 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat
 msgid "Intrastat report"
-msgstr ""
+msgstr "Relatório Intrastat"

 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Invoice"
-msgstr ""
+msgstr "Fatura"

 #. module: report_intrastat
 #: model:ir.module.module,description:report_intrastat.module_meta_information
@ -194,166 +195,170 @@ msgid ""
 "    This module gives the details of the goods traded between the countries "
 "of European Union "
 msgstr ""
+"\n"
+"    Módulo que adiciona relatórios Instrastat.\n"
+"    Este módulo fornece detalhes de bens negociados entre os países da União "
+"Européia "

 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_res_country
 msgid "Country"
-msgstr ""
+msgstr "País"

 #. module: report_intrastat
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
-msgstr ""
+msgstr "O nome do país deve ser único!"

 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembro"

 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Taxes"
-msgstr ""
+msgstr "Taxas"

 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"

 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Amount"
-msgstr ""
+msgstr "Montante"

 #. module: report_intrastat
 #: view:report.intrastat:0
 msgid "Intrastat Data"
-msgstr ""
+msgstr "Dados Instrastat"

 #. module: report_intrastat
 #: field:report.intrastat,value:0
 msgid "Value"
-msgstr ""
+msgstr "Valor"

 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_tree_all
 #: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_all
 msgid "Intrastat"
-msgstr ""
+msgstr "Intrastat"

 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Fatura Provisória"

 #. module: report_intrastat
 #: field:report.intrastat,supply_units:0
 msgid "Supply Units"
-msgstr ""
+msgstr "Unidades do Fornecedor"

 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembro"

 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"

 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Refund"
-msgstr ""
+msgstr "Devolução"

 #. module: report_intrastat
 #: field:report.intrastat,ref:0
 msgid "Source document"
-msgstr ""
+msgstr "Documento origem"

 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "Ressalva de Posição Fiscal"

 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 #: field:report.intrastat,weight:0
 msgid "Weight"
-msgstr ""
+msgstr "Peso"

 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Modelo de Produto"

 #. module: report_intrastat
 #: field:res.country,intrastat:0
 msgid "Intrastat member"
-msgstr ""
+msgstr "Membro do Intrastat"

 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "December"
-msgstr ""
+msgstr "Dezembro"

 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Tax"
-msgstr ""
+msgstr "Imposto"

 #. module: report_intrastat
 #: field:report.intrastat,code:0
 msgid "Country code"
-msgstr ""
+msgstr "Código do país"

 #. module: report_intrastat
 #: field:report.intrastat,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mês"

 #. module: report_intrastat
 #: field:report.intrastat,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Moeda"

 #. module: report_intrastat
 #: selection:report.intrastat,type:0
 msgid "Export"
-msgstr ""
+msgstr "Exportar"

 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax :"

 #. module: report_intrastat
 #: field:report.intrastat,name:0
 msgid "Year"
-msgstr ""
+msgstr "Ano"

 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Reembolso de Fornecedor"

 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Total (excl. taxes):"
-msgstr ""
+msgstr "Total (sem impostos):"

 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Price"
-msgstr ""
+msgstr "Preço"

 #. module: report_intrastat
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_code_tree
 #: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_code
 #: field:report.intrastat.code,name:0
 msgid "Intrastat Code"
-msgstr ""
+msgstr "Código Intrastat"

 #~ msgid "All Months"
 #~ msgstr "Todos os meses"
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-03-20 10:02+0000\n"
+"PO-Revision-Date: 2011-03-23 14:07+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-21 04:46+0000\n"
+"X-Launchpad-Export-Date: 2011-03-24 04:50+0000\n"
 "X-Generator: Launchpad (build 12559)\n"

 #. module: sale
@ -144,6 +144,14 @@ msgid ""
 "configuration of the sales order, a draft invoice will be generated so that "
 "you just have to confirm it when you want to bill your customer."
 msgstr ""
+"Заказы на продажу помогают вам управлять запросами/предложениями цен и "
+"заказами от клиентов. OpenERP предполагает, что вы начинаете с создания "
+"запроса/предложения цен. Как только это подтверждается, запрос/предложение "
+"цен будет преобразован в заказ на продажу. OpenERP может обрабатывать "
+"множество видов ТМЦ так, что заказ может вызвать выполнение задач, доставку "
+"заказов, заказы на производство, закупки и так далее. В зависимости от вида "
+"заказа на продажу, черновик счета будет создан и вы просто должны "
+"подтвердить его в случае выставления счета заказчику."

 #. module: sale
 #: help:sale.order,invoice_quantity:0
--- a/addons/sale_crm/i18n/ru.po
+++ b/addons/sale_crm/i18n/ru.po
@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-03-20 14:00+0000\n"
+"PO-Revision-Date: 2011-03-23 13:50+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-21 04:46+0000\n"
+"X-Launchpad-Export-Date: 2011-03-24 04:50+0000\n"
 "X-Generator: Launchpad (build 12559)\n"

 #. module: sale_crm
@ -30,7 +30,7 @@ msgstr "Преобразовать в предложение"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:108
 #, python-format
 msgid "Opportunity  '%s' is converted to Quotation."
-msgstr "Сделка '%s'  преобразована в запрос цен."
+msgstr "Gредложение '%s'  преобразовано в заказ на продажу."

 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:89
@ -67,7 +67,7 @@ msgid ""
 msgstr ""
 "\n"
 "Этот модуль добавляет действие к одному или нескольким вопросам в CRM.\n"
-"Этот действие позволяет создавать заказ на продажу из выбранного вопроса.\n"
+"Это действие позволяет создавать заказ на продажу из выбранного вопроса.\n"
 "Если открыто несколько вопросов, то создается один заказ на один вопрос.\n"
 "Затем, вопрос закрывается и связывается с созданным заказом на продажу.\n"
 "Мы советуем вам установить этот модуль, если вы установили модуль CRM и "
@ -111,12 +111,12 @@ msgstr "Преобразовано в коммерческое предложе
 #: code:addons/sale_crm/wizard/crm_make_sale.py:92
 #, python-format
 msgid "Opportunity: %s"
-msgstr "Сделка: %s"
+msgstr "Предложение: %s"

 #. module: sale_crm
 #: model:ir.module.module,shortdesc:sale_crm.module_meta_information
 msgid "Creates Sales order from Opportunity"
-msgstr "Создает заказ на продажу из сделки"
+msgstr "Создает заказ на продажу из предложения"

 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm
@ -131,7 +131,7 @@ msgstr "Магазин"
 #. module: sale_crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr "Сделки по этапам"
+msgstr "Предложения по этапам"

 #. module: sale_crm
 #: view:board.board:0
@ -141,7 +141,7 @@ msgstr "Мои предложения"
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Close Opportunity"
-msgstr "Закрыть сделку"
+msgstr "Закрыть предложение"

 #. module: sale_crm
 #: view:sale.order:0
--- a/addons/sale_order_dates/i18n/ru.po
+++ b/addons/sale_order_dates/i18n/ru.po
@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-20 08:51+0000\n"
+"PO-Revision-Date: 2011-03-23 13:53+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2011-01-21 04:41+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-03-24 04:50+0000\n"
+"X-Generator: Launchpad (build 12559)\n"

 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique !"
-msgstr "Ссылка на заказ должна быть уникальной !"
+msgstr "Номер заказа должен быть уникальным!"

 #. module: sale_order_dates
 #: help:sale.order,requested_date:0
--- a/addons/stock/i18n/ro.po
+++ b/addons/stock/i18n/ro.po
@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-03-17 08:11+0000\n"
+"PO-Revision-Date: 2011-03-24 20:19+0000\n"
 "Last-Translator: Dorin <dhongu@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:40+0000\n"
+"X-Launchpad-Export-Date: 2011-03-25 04:40+0000\n"
 "X-Generator: Launchpad (build 12559)\n"

 #. module: stock
@ -532,7 +532,7 @@ msgstr "Locaţie destinaţie"
 #: code:addons/stock/stock.py:751
 #, python-format
 msgid "You can not process picking without stock moves"
-msgstr ""
+msgstr "Nu puteți procesa preluarea fără mișcări de stoc"

 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_packaging_stock_action
@ -851,7 +851,7 @@ msgstr "Dată programată"
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Search"
-msgstr ""
+msgstr "Căutare pachete"

 #. module: stock
 #: selection:stock.move,priority:0
@ -868,7 +868,7 @@ msgstr "Jurnal"
 #: code:addons/stock/stock.py:1315
 #, python-format
 msgid "is scheduled %s."
-msgstr ""
+msgstr "este programat %s."

 #. module: stock
 #: help:stock.picking,location_id:0
@ -1376,7 +1376,7 @@ msgstr "Trasabilitate în jos"
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:113
 #, python-format
 msgid "No Invoices were created"
-msgstr ""
+msgstr "Nu au fost create facturi"

 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
@ -1786,6 +1786,9 @@ msgid ""
 "moves. Use this report when you want to analyse the different routes taken "
 "by your products and inventory management performance."
 msgstr ""
+"Analiza mișcărilor vă permite să verificați şi analizați cu ușurința "
+"mișcările de stoci. Folosiţi acest raport atunci când doriţi să analizați "
+"trasabilitatea și performanța managementului."

 #. module: stock
 #: field:report.stock.move,day_diff1:0
@ -1983,6 +1986,8 @@ msgid ""
 "Move date: scheduled date until move is done, then date of actual move "
 "processing"
 msgstr ""
+"Data mișcării: data planificată dacă mișcarea nu este efectuată, după care "
+"este data procesării."

 #. module: stock
 #: field:report.stock.lines.date,date:0
@ -2134,7 +2139,7 @@ msgstr "Tip expediere"
 #: code:addons/stock/stock.py:2175
 #, python-format
 msgid "You can only delete draft moves."
-msgstr ""
+msgstr "Puteți șterge doar mișcări în starea ciornă."

 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:74
@ -2395,7 +2400,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Force Availability"
-msgstr ""
+msgstr "Forțare disponibilitate"

 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_scrap
@ -2569,7 +2574,7 @@ msgstr ""
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Contact Address :"
-msgstr ""
+msgstr "Adresă contact:"

 #. module: stock
 #: field:stock.move,backorder_id:0
@ -2586,7 +2591,7 @@ msgstr "Activ"
 #. module: stock
 #: model:ir.module.module,shortdesc:stock.module_meta_information
 msgid "Inventory Management"
-msgstr ""
+msgstr "Gestiune inventar"

 #. module: stock
 #: view:product.template:0
@ -2636,13 +2641,13 @@ msgstr "Prefix urmărire"
 #. module: stock
 #: field:stock.inventory,name:0
 msgid "Inventory Reference"
-msgstr ""
+msgstr "Referință inventar"

 #. module: stock
 #: code:addons/stock/stock.py:1307
 #, python-format
 msgid "Internal picking"
-msgstr ""
+msgstr "Preluare internă"

 #. module: stock
 #: view:stock.location.product:0
@ -2722,7 +2727,7 @@ msgstr "Va fi facturat"
 #. module: stock
 #: field:stock.inventory,date_done:0
 msgid "Date done"
-msgstr ""
+msgstr "Data execuției"

 #. module: stock
 #: code:addons/stock/stock.py:983
@ -2764,7 +2769,7 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
 #: view:report.stock.inventory:0
 msgid "Inventory Analysis"
-msgstr ""
+msgstr "Analize inventar"

 #. module: stock
 #: field:stock.invoice.onshipping,journal_id:0
@ -2927,7 +2932,7 @@ msgstr "Comandă"
 #. module: stock
 #: field:stock.tracking,name:0
 msgid "Pack Reference"
-msgstr ""
+msgstr "Referință pachet"

 #. module: stock
 #: view:report.stock.move:0
@ -2972,7 +2977,7 @@ msgstr "Loturi"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "New pack"
-msgstr ""
+msgstr "Pachet nou"

 #. module: stock
 #: view:stock.move:0
@ -2996,7 +3001,7 @@ msgstr ""
 #: code:addons/stock/product.py:383
 #, python-format
 msgid "Future Productions"
-msgstr ""
+msgstr "Producția viitoare"

 #. module: stock
 #: view:stock.picking:0
@ -3007,7 +3012,7 @@ msgstr "De facturat"
 #: code:addons/stock/wizard/stock_return_picking.py:120
 #, python-format
 msgid "Return lines"
-msgstr ""
+msgstr "Linii retur"

 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_lines_date
@ -3023,7 +3028,7 @@ msgstr ""
 #. module: stock
 #: field:report.stock.move,product_qty_out:0
 msgid "Out Qty"
-msgstr ""
+msgstr "Cant Ieșită"

 #. module: stock
 #: field:stock.production.lot,move_ids:0
@ -3045,12 +3050,12 @@ msgstr "Mesaj !"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Put in current pack"
-msgstr ""
+msgstr "Pune în pachetul curent"

 #. module: stock
 #: view:stock.inventory:0
 msgid "Lot Inventory"
-msgstr ""
+msgstr "Lot inventar"

 #. module: stock
 #: view:stock.move:0
@ -3151,7 +3156,7 @@ msgstr "Anulat"
 #. module: stock
 #: view:stock.move:0
 msgid "Picking"
-msgstr ""
+msgstr "Preluare"

 #. module: stock
 #: help:stock.picking,move_type:0
@ -3237,7 +3242,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
 #: view:stock.inventory.merge:0
 msgid "Merge inventories"
-msgstr ""
+msgstr "Unire inventare"

 #. module: stock
 #: help:stock.change.product.qty,new_quantity:0
@ -3322,7 +3327,7 @@ msgstr "Configurare"
 #: field:stock.inventory.line.split,use_exist:0
 #: field:stock.move.split,use_exist:0
 msgid "Existing Lots"
-msgstr ""
+msgstr "Loturi existente"

 #. module: stock
 #: field:product.product,location_id:0
@ -3349,7 +3354,7 @@ msgstr ""
 #: code:addons/stock/stock.py:729
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
-msgstr ""
+msgstr "Stoc insuficient, nu se poate face rezervarea produsului."

 #. module: stock
 #: model:stock.location,name:stock.stock_location_customers
@ -3371,7 +3376,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_partial_picking.py:74
 #, python-format
 msgid "Process Document"
-msgstr ""
+msgstr "Document proces"

 #. module: stock
 #: code:addons/stock/product.py:365
@ -3382,13 +3387,13 @@ msgstr "Livrări viitoare"
 #. module: stock
 #: view:stock.picking:0
 msgid "Additional info"
-msgstr ""
+msgstr "Informații adiționale"

 #. module: stock
 #: view:stock.move:0
 #: field:stock.move,tracking_id:0
 msgid "Pack"
-msgstr ""
+msgstr "Pachet"

 #. module: stock
 #: view:stock.move:0
@ -3481,7 +3486,7 @@ msgstr ""
 #. module: stock
 #: field:stock.picking,auto_picking:0
 msgid "Auto-Picking"
-msgstr ""
+msgstr "Preluare automată"

 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop1
@ -3542,7 +3547,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_return_picking.py:204
 #, python-format
 msgid "Please specify at least one non-zero quantity!"
-msgstr ""
+msgstr "Văr rog să specificați o cantitate diferită de zero!"

 #. module: stock
 #: help:product.template,property_stock_procurement:0
@ -3616,7 +3621,7 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
 msgid "Future Stock Moves"
-msgstr ""
+msgstr "Mișcări de stoc viitoare"

 #. module: stock
 #: field:stock.move,move_history_ids2:0
@ -3735,13 +3740,13 @@ msgstr ""
 #: code:addons/stock/stock.py:2386
 #, python-format
 msgid "Product  '%s' is consumed with '%s' quantity."
-msgstr ""
+msgstr "Produsul '%s' este consumat în cantitate de '%s'."

 #. module: stock
 #: code:addons/stock/stock.py:2595
 #, python-format
 msgid "Inventory '%s' is done."
-msgstr ""
+msgstr "Inventarul '%s' este efectuat."

 #. module: stock
 #: constraint:stock.move:0
@ -3763,7 +3768,7 @@ msgstr "Producţie"
 #. module: stock
 #: view:stock.split.into:0
 msgid "Split Move"
-msgstr ""
+msgstr "Împarte mișcarea"

 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:97
@ -3818,7 +3823,7 @@ msgstr "Trasabulitate în sus"
 #: model:ir.actions.report.xml,name:stock.report_location_overview_all
 #: report:lot.stock.overview_all:0
 msgid "Location Content"
-msgstr ""
+msgstr "Locația curentă"

 #. module: stock
 #: code:addons/stock/product.py:385
@ -3906,7 +3911,7 @@ msgstr ""
 #. module: stock
 #: view:product.product:0
 msgid "Cost Price:"
-msgstr ""
+msgstr "Preț"

 #. module: stock
 #: help:stock.move,move_dest_id:0
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@ -2145,7 +2145,7 @@ class stock_move(osv.osv):
        if todo:
            self.action_confirm(cr, uid, todo, context=context)

-        self.write(cr, uid, move_ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
+        self.write(cr, uid, move_ids, {'state': 'done', 'date': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
        for id in move_ids:
             wf_service.trg_trigger(uid, 'stock.move', id, cr)

@ -2589,11 +2589,6 @@ class stock_inventory(osv.osv):
                            'location_id': line.location_id.id,
                            'location_dest_id': location_id,
                        })
-                    if lot_id:
-                        value.update({
-                            'prodlot_id': lot_id,
-                            'product_qty': line.product_qty
-                        })
                    move_ids.append(self._inventory_line_hook(cr, uid, line, value))
            message = _("Inventory '%s' is done.") %(inv.name)
            self.log(cr, uid, inv.id, message)
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@ -58,61 +58,61 @@ class stock_fill_inventory(osv.osv_memory):
        @return:
        """
        if context is None:
-            context = {}        
+            context = {}
        inventory_line_obj = self.pool.get('stock.inventory.line')
        location_obj = self.pool.get('stock.location')
        product_obj = self.pool.get('product.product')
        stock_location_obj = self.pool.get('stock.location')
-        if ids and len(ids): 
+        move_obj = self.pool.get('stock.move')
+        if ids and len(ids):
            ids = ids[0]
        else:
-             return {'type': 'ir.actions.act_window_close'}    
+             return {'type': 'ir.actions.act_window_close'}
        fill_inventory = self.browse(cr, uid, ids, context=context)
        res = {}
        res_location = {}
        if fill_inventory.recursive :
            location_ids = location_obj.search(cr, uid, [('location_id',
-                             'child_of', fill_inventory.location_id.id)])
-            for location in location_ids :
-                res = location_obj._product_get(cr, uid, location)
-                res_location[location] = res
+                             'child_of', fill_inventory.location_id.id)], order="id")
        else:
-            context.update({'compute_child': False})
-            res = location_obj._product_get(cr, uid,
-                        fill_inventory.location_id.id, context=context)
-            res_location[fill_inventory.location_id.id] = res
-    
-        product_ids = []
-        for location in res_location.keys():
-            res = res_location[location]
-            for product_id in res.keys():
-                prod = product_obj.browse(cr, uid, product_id, context=context)
-                uom = prod.uom_id.id
-                context.update(uom=uom, compute_child=False)
-                amount = stock_location_obj._product_get(cr, uid,
-                         location, [product_id], context=context)[product_id]
-                if(amount):
-                    if fill_inventory.set_stock_zero:
-                        amount = 0                    
-                    line_ids=inventory_line_obj.search(cr, uid,
-                        [('inventory_id', '=', context['active_ids']),
-                         ('location_id', '=', location),
-                         ('product_id', '=', product_id),
-                         ('product_uom', '=', uom),
-                        ('product_qty', '=', amount)])
-                    if not len(line_ids):
-                        inventory_line = {
-                            'inventory_id': context['active_ids'][0],
-                            'location_id': location,
-                            'product_id': product_id,
-                            'product_uom': uom,
-                            'product_qty': amount
-                        }
-                        inventory_line_obj.create(cr, uid, inventory_line)
-                    product_ids.append(product_id)
+            location_ids = [fill_inventory.location_id.id]

-        if(len(product_ids) == 0):
+        res = {}
+        flag = False
+        for location in location_ids:
+            datas = {}
+            res[location] = {}
+            move_ids = move_obj.search(cr, uid, [('location_dest_id','=',location),('state','=','done')], context=context)
+
+            for move in move_obj.browse(cr, uid, move_ids, context=context):
+                lot_id = move.prodlot_id.id
+                prod_id = move.product_id.id
+                qty = move.product_qty
+                location_dest_id = move.location_dest_id.id
+                if datas.get((prod_id, lot_id)):
+                    qty = datas[(prod_id, lot_id)]['product_qty'] + qty
+                datas[(prod_id, lot_id)] = {'product_id': prod_id, 'location_id': location_dest_id, 'product_qty': qty, 'product_uom': move.product_id.uom_id.id, 'prod_lot_id': lot_id}
+            if datas:
+                flag = True
+                res[location] = datas
+
+        if not flag:
            raise osv.except_osv(_('Message !'), _('No product in this location.'))
+
+        for i in res.values():
+            if i.values():
+                for mydata in i.values():
+                    mydata.update({'inventory_id': context['active_ids'][0]})
+                    domain = []
+                    if fill_inventory.set_stock_zero:
+                        mydata.update({'product_qty': 0})
+                    for k, v in mydata.items():
+                        domain.append((k, '=', v))
+                    line_ids = inventory_line_obj.search(cr, uid, domain)
+
+                    if not len(line_ids):
+                        inventory_line_obj.create(cr, uid, mydata)
+
        return {'type': 'ir.actions.act_window_close'}

 stock_fill_inventory()
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@ -163,11 +163,11 @@ class stock_return_picking(osv.osv_memory):
        
        val_id = data['product_return_moves']
        for v in val_id:
-            data_get = data_obj.read(cr, uid, v)
-            mov_id = data_get['move_id']
-            new_qty = data_get['quantity']
+            data_get = data_obj.browse(cr, uid, v, context=context)
+            mov_id = data_get.move_id.id
+            new_qty = data_get.quantity
            move = move_obj.browse(cr, uid, mov_id, context=context)
-            new_location=move.location_dest_id.id
+            new_location = move.location_dest_id.id
            returned_qty = move.product_qty
            for rec in move.move_history_ids2:
                returned_qty -= rec.product_qty
--- a/addons/stock_invoice_directly/i18n/ro.po
+++ b/addons/stock_invoice_directly/i18n/ro.po
@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2009-09-08 16:48+0000\n"
-"Last-Translator: filsys <office@filsystem.ro>\n"
+"PO-Revision-Date: 2011-03-24 12:00+0000\n"
+"Last-Translator: Dorin <dhongu@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-06 05:29+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Launchpad-Export-Date: 2011-03-25 04:40+0000\n"
+"X-Generator: Launchpad (build 12559)\n"

 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
 msgid "Partial Picking"
-msgstr ""
+msgstr "Parțial preluat"

 #. module: stock_invoice_directly
 #: model:ir.module.module,description:stock_invoice_directly.module_meta_information
@ -33,4 +33,4 @@ msgstr ""
 #. module: stock_invoice_directly
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
-msgstr ""
+msgstr "Factura direct la preluare"
--- a/addons/wiki/wizard/wiki_make_index.py
+++ b/addons/wiki/wizard/wiki_make_index.py
@ -20,6 +20,7 @@
 ##############################################################################

 from osv import fields, osv
+from tools.translate import _

 class wiki_make_index(osv.osv_memory):
    """ Create Index For Selected Page """
@ -38,12 +39,18 @@ class wiki_make_index(osv.osv_memory):
        if context is None:
            context = {}
        data = context and context.get('active_ids', []) or []
-
+        
+        if not data:
+            return {'type':  'ir.actions.act_window_close'}
+        
        for index_obj in self.browse(cr, uid, ids, context=context):
            wiki_pool = self.pool.get('wiki.wiki')
            cr.execute("Select id, section from wiki_wiki where id IN %s \
                            order by section ", (tuple(data),))
            lst0 = cr.fetchall()
+            if not lst0[0][1]:
+                raise osv.except_osv(_('Warning !'), _('There is no section in this Page'))
+
            lst = []
            s_ids = {}

@ -75,7 +82,6 @@ class wiki_make_index(osv.osv_memory):
                        current = current[:pos + 1]
                        if pos == len(l) - 1:
                            break
-
                key = ('.'.join([str(x) for x in l]))
                id = s_ids[key]
                val = ('.'.join([str(x) for x in current[:]]), id)