diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index f892d7354d9..bd1002b476e 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-18 22:37+0000\n"
+"PO-Revision-Date: 2010-10-19 20:43+0000\n"
 "Last-Translator: Cristian Salamea (GnuThink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2110,7 +2110,7 @@ msgstr "Proceso de factura de cliente"
 #. module: account
 #: rml:account.invoice:0
 msgid "Fiscal Mapping Remark :"
-msgstr ""
+msgstr "Posiciones Fiscales"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3713,7 +3713,7 @@ msgstr "Secuencia"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
 msgid "Template for Fiscal Mapping"
-msgstr ""
+msgstr "Plantilla para posiciones fiscales"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3820,7 +3820,7 @@ msgstr "Facturas borrador"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Mapping"
-msgstr ""
+msgstr "Plantilla para cambio de impuestos"
 
 #. module: account
 #: rml:account.invoice:0
@@ -4220,7 +4220,7 @@ msgstr "Realizado"
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
 msgid "Periods"
-msgstr ""
+msgstr "Periodos"
 
 #. module: account
 #: rml:account.invoice:0
@@ -4229,7 +4229,7 @@ msgstr ""
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Factura"
 
 #. module: account
 #: selection:account.analytic.account,state:0
@@ -4237,30 +4237,32 @@ msgstr ""
 #: wizard_button:account.open_closed_fiscalyear,init,open:0
 #: wizard_button:account_use_models,create,open_move:0
 msgid "Open"
-msgstr ""
+msgstr "Abrir"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_29
 msgid "Search Entries"
-msgstr ""
+msgstr "Buscar asientos"
 
 #. module: account
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to reinvoice purchases, timesheets, ..."
-msgstr ""
+msgstr "Costes analíticos para refacturar compras, hojas de servicios, ..."
 
 #. module: account
 #: field:account.account,tax_ids:0
 #: field:account.account.template,tax_ids:0
 msgid "Default Taxes"
-msgstr ""
+msgstr "Impuestos por defecto"
 
 #. module: account
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
 
 #. module: account
 #: help:account.account.type,sign:0
@@ -4269,11 +4271,13 @@ msgid ""
 "reports, so that you can see positive figures instead of negative ones in "
 "expenses accounts."
 msgstr ""
+"Permite cambiar el signo del saldo que se muestra en los informes, para que "
+"pueda ver cifras positivas en vez de negativas en cuentas de gastos."
 
 #. module: account
 #: help:account.config.wizard,code:0
 msgid "Name of the fiscal year as displayed in reports."
-msgstr ""
+msgstr "Nombre del ejercicio fiscal que se muestra en informes."
 
 #. module: account
 #: help:account.move.line,date_maturity:0
@@ -4281,26 +4285,28 @@ msgid ""
 "This field is used for payable and receivable entries. You can put the limit "
 "date for the payment of this entry line."
 msgstr ""
+"Este campo es usado en asientos a pagar y a cobrar. Puede definir la fecha "
+"límite de pago para este apunte."
 
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Third party (Country)"
-msgstr ""
+msgstr "Terceros (país)"
 
 #. module: account
 #: field:account.account,parent_left:0
 msgid "Parent Left"
-msgstr ""
+msgstr "Padre izquierdo"
 
 #. module: account
 #: help:account.journal,sequence_id:0
 msgid "The sequence gives the display order for a list of journals"
-msgstr ""
+msgstr "La secuencia indica el orden a mostrar en una lista de diarios"
 
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
-msgstr ""
+msgstr "Controles de tipo"
 
 #. module: account
 #: field:account.analytic.account,name:0
@@ -4308,17 +4314,17 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.central.journal:0
 msgid "Account Name"
-msgstr ""
+msgstr "Nombre de Cuenta"
 
 #. module: account
 #: wizard_field:account.invoice.pay,init,date:0
 msgid "Payment date"
-msgstr ""
+msgstr "Fecha de pago"
 
 #. module: account
 #: wizard_button:account_use_models,create,end:0
 msgid "Ok"
-msgstr ""
+msgstr "Aceptar"
 
 #. module: account
 #: rml:account.invoice:0
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 361cf8e91ae..0ef2a560878 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 11:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-19 14:39+0000\n"
+"Last-Translator: Lorenzo Battistini <lorenzo.battistini@domsense.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: 2010-09-30 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -353,7 +353,7 @@ msgstr "Delta di Debito"
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr "Imposte"
+msgstr "Tassa"
 
 #. module: account
 #: rml:account.general.journal:0
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index ea1d2cfeba4..71316b3567a 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-17 07:44+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-18 06:38+0000\n"
+"Last-Translator: sugi <Unknown>\n"
 "Language-Team: Mongolian <mn@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: 2010-10-18 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -51,7 +51,7 @@ msgstr "Ноорогноос тайлан батлах."
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
 msgid "Asset"
-msgstr "Үндсэн хөрөнгө"
+msgstr "Хөрөнгө"
 
 #. module: account
 #: constraint:ir.actions.act_window:0
@@ -152,7 +152,7 @@ msgstr "Алдаа! Мөчлөгийн үргэжлэх хугацаа буру
 #: model:ir.actions.act_window,name:account.action_move_line_form
 #: model:ir.ui.menu,name:account.menu_action_move_line_form
 msgid "Entries"
-msgstr "Ажил гүйлгээнүүд"
+msgstr "Ажил гүйлгээ"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -329,7 +329,7 @@ msgstr "Гүйлгээний нэр"
 #. module: account
 #: xsl:account.transfer:0
 msgid "Reference"
-msgstr "Ишлэл"
+msgstr "Дугаар"
 
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
@@ -528,7 +528,7 @@ msgstr "Нийлүүлэгчийн нэхэмжлэл"
 #: model:process.transition,name:account.process_transition_reconcilepaid0
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "Reconcile Paid"
-msgstr "Төлсөн гүйцэлтгэл"
+msgstr "Төлсөн тулгалт"
 
 #. module: account
 #: wizard_field:account.chart,init,target_move:0
@@ -647,7 +647,7 @@ msgstr "Харилцагчийн төлбөрийн нөхцөл"
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Account Entry Reconcile"
-msgstr "Дансны бичилт бууралт"
+msgstr "Дансны бичилт гүйцээлт"
 
 #. module: account
 #: wizard_button:account.move.bank.reconcile,init,open:0
@@ -706,7 +706,7 @@ msgstr "Нэмэлт мэдээлэл"
 #. module: account
 #: selection:account.invoice,type:0
 msgid "Customer Refund"
-msgstr "Үйлчлүүлэгчийн буцаалт"
+msgstr "Худалдан авагчийн буцаалт"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
@@ -894,7 +894,7 @@ msgstr "Заавал бөглөх"
 #: field:product.category,property_account_expense_categ:0
 #: field:product.template,property_account_expense:0
 msgid "Expense Account"
-msgstr "Зарлагын данс"
+msgstr "Зардлын данс"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,journal_id:0
@@ -1067,7 +1067,7 @@ msgstr "Төлсөн дүн"
 #: model:process.transition,name:account.process_transition_customerinvoice0
 #: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
 msgid "Customer Invoice"
-msgstr "Үйлчлүүлэгчийн нэхэмжлэл"
+msgstr "Худалдан авагчийн нэхэмжлэл"
 
 #. module: account
 #: wizard_view:account.open_closed_fiscalyear,init:0
@@ -1159,7 +1159,7 @@ msgstr "wizard.multi.charts.accounts"
 #. module: account
 #: model:account.journal,name:account.sales_journal
 msgid "Journal de vente"
-msgstr "борлуулалтын журнал"
+msgstr "Борлуулалтын журнал"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
@@ -1356,7 +1356,7 @@ msgstr "Төлөх нэхэмжлэл сонгох"
 #: selection:account.analytic.account,type:0
 #: field:account.journal,view_id:0
 msgid "View"
-msgstr "Дэлгэц"
+msgstr "Харах"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,display_account:0
@@ -1707,7 +1707,7 @@ msgstr "Өртөг ба Орлого"
 #. module: account
 #: constraint:account.account:0
 msgid "Error ! You can not create recursive accounts."
-msgstr "Алдаа! Та цикл хэлбэрийн данс үүсгэх боломжгүй."
+msgstr "Алдаа ! Та цикл хэлбэрийн данс үүсгэх боломжтой."
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -2502,7 +2502,7 @@ msgstr "Эхлэн"
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr "Банкны хуулга"
+msgstr "Харилцахын орлого, зарлагын ордер"
 
 #. module: account
 #: wizard_view:account.invoice.pay,addendum:0
@@ -2859,7 +2859,7 @@ msgstr "Зарлага төвлөрөл"
 #. module: account
 #: rml:account.overdue:0
 msgid "Customer Ref:"
-msgstr "Үйлчлүүлэгчийн дугаар"
+msgstr "Худалдан авагчийн дугаар"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -2965,7 +2965,7 @@ msgstr "Дансны хуулга"
 #. module: account
 #: rml:account.overdue:0
 msgid "Document: Customer account statement"
-msgstr "Баримт: Үйлчлүүлэгчийн дансны хуулга"
+msgstr "Баримт: Худалдан авагчийн дансны хуулга"
 
 #. module: account
 #: view:product.product:0
@@ -3119,7 +3119,7 @@ msgstr "Аналитик Журнал"
 #. module: account
 #: rml:account.general.ledger:0
 msgid "Entry Label"
-msgstr "Гүйлгээний нэр"
+msgstr "Бичлэгийн нэр"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -3136,7 +3136,7 @@ msgstr "("
 #: view:account.period:0
 #: view:account.subscription:0
 msgid "Set to Draft"
-msgstr "Ноорог болгох"
+msgstr "Ноороглох"
 
 #. module: account
 #: help:account.invoice,origin:0
@@ -3300,7 +3300,7 @@ msgstr "Санхүүгийн менежмент"
 #: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
-msgstr "Аль нь ч биш"
+msgstr "Байхгүй"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close
@@ -3601,7 +3601,7 @@ msgstr "Шинэ нийлүүлэгчийн буцаалт"
 #. module: account
 #: view:account.model:0
 msgid "Entry Model"
-msgstr "Гүйлгээний загвар"
+msgstr "Гүйлгээний модель"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,amount_currency:0
@@ -3693,7 +3693,7 @@ msgstr ""
 #: field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
-msgstr "Дугаарлалт"
+msgstr "Дараалал"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
@@ -3766,7 +3766,7 @@ msgstr "Биелэх огноо"
 #. module: account
 #: view:account.subscription:0
 msgid "Entry Subscription"
-msgstr "Гүйлгээний тэмдэглэл"
+msgstr "захиалгын бичилт"
 
 #. module: account
 #: selection:account.print.journal.report,init,sort_selection:0
@@ -3988,7 +3988,7 @@ msgstr "Код/Огноо"
 #: field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
-msgstr "Идэвхитэй"
+msgstr "Актив"
 
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
@@ -4086,7 +4086,7 @@ msgstr "Ажил гүйлгээ"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr "Тайлангийн цуваа"
+msgstr "Орлого, зарлагын гүйлгээ"
 
 #. module: account
 #: field:account.move.line,amount_taxed:0
@@ -4411,7 +4411,7 @@ msgstr "банкны төлбөр"
 #. module: account
 #: selection:account.move,state:0
 msgid "Posted"
-msgstr "Батлагдсан"
+msgstr "Илгээсэн"
 
 #. module: account
 #: view:account.tax:0
@@ -4482,7 +4482,7 @@ msgstr "Санхүүгийн жилийн дарааллууд"
 #. module: account
 #: view:account.model.line:0
 msgid "Entry Model Line"
-msgstr "Гүйлгээний загварын мөр"
+msgstr "Бүртгэл загвар шугам"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4819,7 +4819,7 @@ msgstr ""
 #. module: account
 #: selection:account.invoice,state:0
 msgid "Cancelled"
-msgstr "Цуцалсан"
+msgstr "Цуцлагдсан"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@@ -4931,7 +4931,7 @@ msgstr "Дансны тулгалт"
 #: view:account.bank.statement:0
 #: selection:account.bank.statement,state:0
 msgid "Confirm"
-msgstr "Батлагдсан"
+msgstr "Батлах"
 
 #. module: account
 #: wizard_view:account.account.balance.report,account_selection:0
@@ -5280,7 +5280,9 @@ msgstr "Томьёолол"
 #. module: account
 #: help:account.move.line,currency_id:0
 msgid "The optional other currency if it is a multi-currency entry."
-msgstr "Гадаад валютын гүйлгээ бол валютыг сонгоно."
+msgstr ""
+"Тухайн дансны валютаас өөр валютаар бичилт хийх үед хэрэглэгдэх валютын "
+"төрөл."
 
 #. module: account
 #: view:account.invoice:0
@@ -5359,7 +5361,7 @@ msgstr ""
 #. module: account
 #: wizard_view:account.period.close,init:0
 msgid "Are you sure ?"
-msgstr "Та итгэлтэй байна уу?"
+msgstr "Итгэлтэй байна уу ?"
 
 #. module: account
 #: rml:account.invoice:0
@@ -5602,7 +5604,7 @@ msgstr "Хаах"
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
 msgid "Moves"
-msgstr "Шилжүүлэх"
+msgstr "Ажил гүйлгээ"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -5720,7 +5722,7 @@ msgstr ""
 #: field:account.tax.code,info:0
 #: field:account.tax.code.template,info:0
 msgid "Description"
-msgstr "Тодорхойлолт"
+msgstr "Тайлбар"
 
 #. module: account
 #: help:product.template,property_account_income:0
@@ -5804,7 +5806,7 @@ msgstr "Нэхэмжлэлийн мөр"
 #. module: account
 #: selection:account.bank.statement.line,type:0
 msgid "Customer"
-msgstr "Үйлчлүүлэгчийн"
+msgstr "Худалдан авагч"
 
 #. module: account
 #: field:account.subscription,period_type:0
@@ -6198,7 +6200,7 @@ msgstr ""
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,landscape:0
 msgid "Show Report in Landscape Form"
-msgstr ""
+msgstr "Тайланг хөндлөнгөөр харуулах"
 
 #. module: account
 #: rml:account.account.balance.landscape:0
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 2a253811120..e0cb5d6076e 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-04 06:51+0000\n"
+"PO-Revision-Date: 2010-10-18 09:52+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: 2010-10-05 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1348,7 +1348,7 @@ msgstr "Сообщение"
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Select invoices you want to pay and manages advances"
-msgstr ""
+msgstr "Выберите счета для оплаты и авансирования"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1513,7 +1513,7 @@ msgstr ""
 #. module: account
 #: field:account.journal,refund_journal:0
 msgid "Refund Journal"
-msgstr ""
+msgstr "Журнал возвратов"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_income
@@ -4294,7 +4294,7 @@ msgstr "Период счета"
 #. module: account
 #: wizard_field:account.invoice.pay,init,journal_id:0
 msgid "Journal/Payment Mode"
-msgstr ""
+msgstr "Журнал/Форма оплаты"
 
 #. module: account
 #: rml:account.invoice:0
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index d94fc6cb72d..e49ea2c9c9e 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-14 07:29+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-18 12:12+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Serbian <sr@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: 2010-10-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index ab9b90d7361..dbac0fdd745 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -830,7 +830,7 @@ class account_invoice(osv.osv):
                         total_fixed += line.value_amount
                     if line.value == 'procent':
                         total_percent += line.value_amount
-                total_fixed = (total_fixed * 100) / inv.amount_total
+                total_fixed = (total_fixed * 100) / (inv.amount_total or 1.0)
                 if (total_fixed + total_percent) > 100:
                     raise osv.except_osv(_('Error !'), _("Cannot create the invoice !\nThe payment term defined gives a computed amount greater than the total invoiced amount."))
 
diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py
index 2f793b77d67..4ab6201b507 100644
--- a/addons/account/wizard/account_fiscalyear_close.py
+++ b/addons/account/wizard/account_fiscalyear_close.py
@@ -79,9 +79,9 @@ class account_fiscalyear_close(osv.osv_memory):
         if not new_journal.default_credit_account_id or not new_journal.default_debit_account_id:
             raise osv.except_osv(_('UserError'),
                     _('The journal must have default credit and debit account'))
-        if not new_journal.centralisation:
+        if (not new_journal.centralisation) or new_journal.entry_posted:
             raise osv.except_osv(_('UserError'),
-                    _('The journal must have centralised counterpart'))
+                    _('The journal must have centralised counterpart without the Skipping draft state option checked!'))
 
         move_ids = obj_acc_move_line.search(cr, uid, [
             ('journal_id', '=', new_journal.id), ('period_id.fiscalyear_id', '=', new_fyear.id)])
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 352d23d6b53..d4184dd9c8b 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
             <form string="Validate Account Entries">
                 <separator string="Validate Journal Entries of a Journal" colspan="4"/>
-                <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accouting fields." colspan="4"/>
+                <label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields." colspan="4"/>
                 <field name="journal_id"/>
                 <newline/>
                 <field name="period_id"/>
@@ -49,7 +49,7 @@
             <form string="Validate Journal Entries">
                 <separator string="Post Journal Entries" colspan="4"/>
                 <image name="terp-referer"/>
-                <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accouting fields." colspan="2"/>
+                <label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields." colspan="2"/>
                 <separator colspan="4"/>
                 <group colspan="4" col="6">
                     <button icon="gtk-cancel" special="cancel" string="Cancel"/>
diff --git a/addons/account_anglo_saxon/i18n/nl.po b/addons/account_anglo_saxon/i18n/nl.po
index c955e868340..b9d63e6cba8 100644
--- a/addons/account_anglo_saxon/i18n/nl.po
+++ b/addons/account_anglo_saxon/i18n/nl.po
@@ -7,60 +7,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-11-24 12:50+0000\n"
-"PO-Revision-Date: 2010-10-01 11:59+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-18 21:04+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-10-02 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: account_anglo_saxon
-#: view:product.category:0
-msgid " Accounting Property"
-msgstr " Administratieve instelling"
-
-#. module: account_anglo_saxon
-#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
-msgid ""
-"This module will support the Anglo-Saxons accounting methodology by \n"
-"    changing the accounting logic with stock transactions. The difference "
-"between the Anglo-Saxon accounting countries \n"
-"    and the Rhine or also called Continental accounting countries is the "
-"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
-"    Anglo-Saxons accounting does take the cost when sales invoice is "
-"created, Continental accounting will take the cost at he moment the goods "
-"are shipped.\n"
-"    This module will add this functionality by using a interim account, to "
-"store the value of shipped goods and will contra book this interim account \n"
-"    when the invoice is created to transfer this amount to the debtor or "
-"creditor account."
-msgstr ""
-"Deze module geeft ondersteuning voor de Angelsaksische boekhoud methoden "
-"door \n"
-"    de boekingslogica bij voorraad transacties te veranderen. Het verschil "
-"tussen de Angelsaksische boekhoud landen en de\n"
-"    Rijn- of ook wel continentale boekhoud landen is het moment van het "
-"nemen van de kosten van verkochte goederen versus kostprijs verkopen. \n"
-"    Angelsaksische boekhoudingen nemen de kosten op het wanneer de "
-"verkoopfactuur wordt gemaakt, Continentale boekhoudingen wanneer wordt "
-"geleverd.\n"
-"    Deze module voegt deze functionaliteit toe door een tussenrekening te "
-"gebruiken voor het boeken van de geleverde goederen en \n"
-"    voor het tegenboeken wanneer de factuur wordt gemaakt om het over te "
-"boeken naar de klant of leverancier."
-
-#. module: account_anglo_saxon
-#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
-msgid "Stock Account"
-msgstr "Voorraadrekening"
-
 #. module: account_anglo_saxon
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML, kan overzicht niet weergeven!"
+msgstr "Ongeldige XML voor weergave opbouw!"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr "Productcategorie"
+
+#. module: account_anglo_saxon
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Factuurregel"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_purchase_order
+msgid "Purchase Order"
+msgstr "Inkooporder"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_template
+msgid "Product Template"
+msgstr "Productsjabloon"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Accounting for Anglo Saxon countries"
+msgstr "Voorraadboekhouding voor Angelsaksische landen"
 
 #. module: account_anglo_saxon
 #: field:product.category,property_account_creditor_price_difference_categ:0
@@ -68,6 +60,48 @@ msgstr "Ongeldige XML, kan overzicht niet weergeven!"
 msgid "Price Difference Account"
 msgstr "Prijsverschillen rekening"
 
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice
+msgid "Invoice"
+msgstr "Factuur"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_stock_picking
+msgid "Picking List"
+msgstr "Piklijst"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by\n"
+"    changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries\n"
+"    and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales.\n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at the moment the goods "
+"are shipped.\n"
+"    This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account\n"
+"    when the invoice is created to transfer this amount to the debtor or "
+"creditor account.\n"
+"    Secondly, price differences between actual purchase price and fixed "
+"product standard price are booked on a separate account"
+msgstr ""
+"Deze module ondersteunt de Angelsaksische boekhoudmethode door\n"
+"    het wijzigen van de voorraadtransacties. Het verschil tussen de "
+"Angelsaksische boekhouding landen\n"
+"    en de Rijn of ook continentale boekhouding landen is het moment van het "
+"nemen van de kosten van verkochte goederen versus kostprijs verkopen.\n"
+"    Angelsaksische boekhouding neemt de kosten wanneer de factuur gemaakt "
+"wordt, continentale boekhouding neemt de kosten wanneer er geleverd wordt.\n"
+"    Deze module voegt deze functionaliteit toe door gebruikmaking van een "
+"tussenrekening om de waarde van de geleverde goederen op te boeken en \n"
+"    tegen te boeken als de factuur wordt gemaakt naar de klant of "
+"leverancier rekening.\n"
+"    Ten tweede worden prijsverschillen tussen werkelijke inkoopprijs en "
+"vaste product verrekenprijs geboekt op een aparte rekening."
+
 #. module: account_anglo_saxon
 #: help:product.category,property_account_creditor_price_difference_categ:0
 #: help:product.template,property_account_creditor_price_difference:0
@@ -77,3 +111,37 @@ msgid ""
 msgstr ""
 "Deze rekening wordt gebruikt om de prijsverschillen tussen inkoop- en "
 "kostprijs te boeken."
+
+#~ msgid "Stock Account"
+#~ msgstr "Voorraadrekening"
+
+#~ msgid " Accounting Property"
+#~ msgstr " Administratieve instelling"
+
+#~ msgid ""
+#~ "This module will support the Anglo-Saxons accounting methodology by \n"
+#~ "    changing the accounting logic with stock transactions. The difference "
+#~ "between the Anglo-Saxon accounting countries \n"
+#~ "    and the Rhine or also called Continental accounting countries is the "
+#~ "moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
+#~ "    Anglo-Saxons accounting does take the cost when sales invoice is "
+#~ "created, Continental accounting will take the cost at he moment the goods "
+#~ "are shipped.\n"
+#~ "    This module will add this functionality by using a interim account, to "
+#~ "store the value of shipped goods and will contra book this interim account \n"
+#~ "    when the invoice is created to transfer this amount to the debtor or "
+#~ "creditor account."
+#~ msgstr ""
+#~ "Deze module geeft ondersteuning voor de Angelsaksische boekhoud methoden "
+#~ "door \n"
+#~ "    de boekingslogica bij voorraad transacties te veranderen. Het verschil "
+#~ "tussen de Angelsaksische boekhoud landen en de\n"
+#~ "    Rijn- of ook wel continentale boekhoud landen is het moment van het "
+#~ "nemen van de kosten van verkochte goederen versus kostprijs verkopen. \n"
+#~ "    Angelsaksische boekhoudingen nemen de kosten op het wanneer de "
+#~ "verkoopfactuur wordt gemaakt, Continentale boekhoudingen wanneer wordt "
+#~ "geleverd.\n"
+#~ "    Deze module voegt deze functionaliteit toe door een tussenrekening te "
+#~ "gebruiken voor het boeken van de geleverde goederen en \n"
+#~ "    voor het tegenboeken wanneer de factuur wordt gemaakt om het over te "
+#~ "boeken naar de klant of leverancier."
diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py
index b85e089016e..87b7573a68a 100644
--- a/addons/account_budget/account_budget.py
+++ b/addons/account_budget/account_budget.py
@@ -110,6 +110,7 @@ class crossovered_budget_lines(osv.osv):
 
     def _prac_amt(self, cr, uid, ids, context={}):
         res = {}
+        result = 0.0
         for line in self.browse(cr, uid, ids):
             acc_ids = [x.id for x in line.general_budget_id.account_ids]
             if not acc_ids:
@@ -120,10 +121,11 @@ class crossovered_budget_lines(osv.osv):
                 date_from = context['wizard_date_from']
             if context.has_key('wizard_date_to'):
                 date_to = context['wizard_date_to']
-            cr.execute("SELECT SUM(amount) FROM account_analytic_line WHERE account_id=%s AND (date "
+            if line.analytic_account_id.id:
+                cr.execute("SELECT SUM(amount) FROM account_analytic_line WHERE account_id=%s AND (date "
                        "between to_date(%s,'yyyy-mm-dd') AND to_date(%s,'yyyy-mm-dd')) AND "
                        "general_account_id=ANY(%s)", (line.analytic_account_id.id, date_from, date_to,acc_ids,))
-            result = cr.fetchone()[0]
+                result = cr.fetchone()[0]
             if result is None:
                 result = 0.00
             res[line.id] = result
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 3faf30299c4..866021f5f24 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -131,6 +131,7 @@
                                     <field name="date_to"/>
                                     <field name="paid_date" select="1"/>
                                     <field name="planned_amount" select="1"/>
+                                    <field name="analytic_account_id"/>
                                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                                 </form>
                             </field>
diff --git a/addons/account_budget/i18n/sv.po b/addons/account_budget/i18n/sv.po
index 69bc52d6152..3a16cb730dd 100644
--- a/addons/account_budget/i18n/sv.po
+++ b/addons/account_budget/i18n/sv.po
@@ -6,25 +6,25 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-12 14:38+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-19 13:03+0000\n"
+"Last-Translator: Magnus Brandt, Aspirix AB <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: 2010-09-29 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Ansvarig användare"
 
 #. module: account_budget
-#: rml:account.budget:0
-msgid "% performance"
-msgstr ""
+#: selection:crossovered.budget,state:0
+msgid "Confirmed"
+msgstr "Bekräftad"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.open_budget_post_form
@@ -38,19 +38,60 @@ msgid "Invalid model name in the action definition."
 msgstr ""
 
 #. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
 msgid "Printed at:"
-msgstr ""
+msgstr "Utskriven vid"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Confirm"
-msgstr ""
+msgstr "Bekräfta"
 
 #. module: account_budget
 #: field:crossovered.budget,validating_user_id:0
 msgid "Validate User"
+msgstr "Validera användare"
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
+msgid "Print Summary"
+msgstr "Summering"
+
+#. module: account_budget
+#: field:crossovered.budget.lines,paid_date:0
+msgid "Paid Date"
+msgstr "Betaldatum"
+
+#. module: account_budget
+#: field:account.budget.analytic,date_to:0
+#: field:account.budget.crossvered.report,date_to:0
+#: field:account.budget.crossvered.summary.report,date_to:0
+#: field:account.budget.report,date_to:0
+msgid "End of period"
+msgstr "Periodens slut"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "at"
+msgstr ""
+
+#. module: account_budget
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Currency:"
 msgstr ""
 
 #. module: account_budget
@@ -61,55 +102,13 @@ msgstr ""
 "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
 
 #. module: account_budget
-#: selection:crossovered.budget,state:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: account_budget
-#: wizard_field:account.budget.report,init,date2:0
-#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
-#: wizard_field:wizard.crossovered.budget,init,date_to:0
-#: wizard_field:wizard.crossovered.budget.summary,init,date_to:0
-msgid "End of period"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Printing date:"
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_report
+msgid "Account Budget crossvered report"
 msgstr ""
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "at"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post:0
-msgid "Dotations"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Performance"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Currency:"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "From"
+msgid "Validated"
 msgstr ""
 
 #. module: account_budget
@@ -118,13 +117,224 @@ msgid "Percentage"
 msgstr ""
 
 #. module: account_budget
-#: rml:account.budget:0
-msgid "Results"
+#: field:crossovered.budget,state:0
+msgid "Status"
 msgstr ""
 
 #. module: account_budget
-#: field:crossovered.budget,state:0
-msgid "Status"
+#: view:account.budget.crossvered.summary.report:0
+msgid "This wizard is used to print summary of budgets"
+msgstr ""
+
+#. module: account_budget
+#: report:crossovered.budget.report:0
+msgid "%"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Description"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post,company_id:0
+#: field:crossovered.budget,company_id:0
+#: field:crossovered.budget.lines,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,planned_amount:0
+msgid "Planned Amount"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Perc(%)"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+#: selection:crossovered.budget,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Practical Amt"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,practical_amount:0
+msgid "Practical Amount"
+msgstr ""
+
+#. module: account_budget
+#: field:crossovered.budget,date_to:0
+#: field:crossovered.budget.lines,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: account_budget
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_analytic
+#: model:ir.model,name:account_budget.model_account_budget_report
+msgid "Account Budget report for analytic account"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,theoritical_amount:0
+msgid "Theoritical Amount"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post,name:0
+#: field:crossovered.budget,name:0
+msgid "Name"
+msgstr "Namn"
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget_lines
+msgid "Budget Line"
+msgstr ""
+
+#. module: account_budget
+#: view:account.analytic.account:0
+#: view:account.budget.post:0
+msgid "Lines"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,crossovered_budget_id:0
+#: report:crossovered.budget.report:0
+#: model:ir.actions.report.xml,name:account_budget.account_budget
+#: model:ir.model,name:account_budget.model_crossovered_budget
+msgid "Budget"
+msgstr ""
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.post,code:0
+#: field:crossovered.budget,code:0
+msgid "Code"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+msgid "This wizard is used to print budget"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_report
+#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
+#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
+#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
+#: model:ir.ui.menu,name:account_budget.next_id_31
+#: model:ir.ui.menu,name:account_budget.next_id_pos
+msgid "Budgets"
+msgstr "Budgetar"
+
+#. module: account_budget
+#: code:addons/account_budget/account_budget.py:0
+#, python-format
+msgid "The General Budget '%s' has no Accounts!"
+msgstr ""
+
+#. module: account_budget
+#: selection:crossovered.budget,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Approve"
+msgstr ""
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "To Approve"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.post:0
+#: field:crossovered.budget.lines,general_budget_id:0
+#: model:ir.model,name:account_budget.model_account_budget_post
+msgid "Budgetary Position"
+msgstr ""
+
+#. module: account_budget
+#: field:account.budget.analytic,date_from:0
+#: field:account.budget.crossvered.report,date_from:0
+#: field:account.budget.crossvered.summary.report,date_from:0
+#: field:account.budget.report,date_from:0
+msgid "Start of period"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.report:0
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_analytic
+#: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_report
+msgid "Print Budgets"
+msgstr ""
+
+#. module: account_budget
+#: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
+msgid "Account Budget  crossvered summary report"
+msgstr ""
+
+#. module: account_budget
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Theoretical Amt"
+msgstr ""
+
+#. module: account_budget
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Select Dates Period"
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Print"
 msgstr ""
 
 #. module: account_budget
@@ -132,10 +342,9 @@ msgstr ""
 msgid ""
 "This module allows accountants to manage analytic and crossovered budgets.\n"
 "\n"
-"Once the Master Budgets and the Budgets defined (in Financial\n"
-"Management/Budgets/), the Project Managers can set the planned amount on "
-"each\n"
-"Analytic Account.\n"
+"Once the Master Budgets and the Budgets are defined (in "
+"Accounting/Budgets/),\n"
+"the Project Managers can set the planned amount on each Analytic Account.\n"
 "\n"
 "The accountant has the possibility to see the total of amount planned for "
 "each\n"
@@ -157,234 +366,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#. module: account_budget
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "%"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Description"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-msgid "Analytic Account :"
-msgstr ""
-
-#. module: account_budget
-#: wizard_button:account.budget.report,init,report:0
-#: wizard_button:wizard.analytic.account.budget.report,init,report:0
-#: wizard_button:wizard.crossovered.budget,init,report:0
-#: wizard_button:wizard.crossovered.budget.summary,init,report:0
-msgid "Print"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "A/c No."
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "to"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Total :"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: field:crossovered.budget.lines,planned_amount:0
-#: rml:crossovered.budget.report:0
-msgid "Planned Amount"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Perc(%)"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Period Budget"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Budget Analysis"
-msgstr ""
-
-#. module: account_budget
-#: view:crossovered.budget:0
-#: selection:crossovered.budget,state:0
-msgid "Done"
-msgstr ""
-
-#. module: account_budget
-#: view:crossovered.budget:0
-msgid "Validate"
-msgstr ""
-
-#. module: account_budget
-#: wizard_view:wizard.crossovered.budget,init:0
-#: wizard_view:wizard.crossovered.budget.summary,init:0
-msgid "Select Options"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: field:crossovered.budget.lines,practical_amount:0
-#: rml:crossovered.budget.report:0
-msgid "Practical Amount"
-msgstr ""
-
-#. module: account_budget
-#: field:crossovered.budget,date_to:0
-#: field:crossovered.budget.lines,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: account_budget
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_budget
-#: field:crossovered.budget.lines,theoritical_amount:0
-msgid "Theoritical Amount"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post,name:0
-#: field:crossovered.budget,name:0
-msgid "Name"
-msgstr "Namn"
-
-#. module: account_budget
-#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu_1
-msgid "Print Summary of Budgets"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.actions.wizard,name:account_budget.wizard_budget_spread
-msgid "Spread amount"
-msgstr ""
-
-#. module: account_budget
-#: view:account.analytic.account:0
-#: view:account.budget.post:0
-msgid "Lines"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.budget:0
-#: view:crossovered.budget:0
-#: field:crossovered.budget.lines,crossovered_budget_id:0
-#: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
-#: model:ir.actions.wizard,name:account_budget.wizard_budget_report
-#: model:ir.model,name:account_budget.model_crossovered_budget
-#: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
-msgid "Budget"
-msgstr ""
-
-#. module: account_budget
-#: field:crossovered.budget.lines,paid_date:0
-msgid "Paid Date"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
-#: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
-#: model:ir.ui.menu,name:account_budget.next_id_31
-msgid "Budgets"
-msgstr "Budgetar"
-
-#. module: account_budget
-#: selection:crossovered.budget,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.budget:0
-msgid "Budget Item Detail"
-msgstr ""
-
-#. module: account_budget
-#: view:account.budget.post:0
-#: field:crossovered.budget.lines,general_budget_id:0
-#: model:ir.model,name:account_budget.model_account_budget_post
-msgid "Budgetary Position"
-msgstr ""
-
-#. module: account_budget
-#: wizard_field:account.budget.report,init,date1:0
-#: wizard_field:wizard.analytic.account.budget.report,init,date_from:0
-#: wizard_field:wizard.crossovered.budget,init,date_from:0
-#: wizard_field:wizard.crossovered.budget.summary,init,date_from:0
-msgid "Start of period"
-msgstr ""
-
-#. module: account_budget
-#: model:ir.actions.report.xml,name:account_budget.account_analytic_account_budget
-#: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
-#: model:ir.actions.wizard,name:account_budget.account_analytic_account_budget_report
-#: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu
-msgid "Print Budgets"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post,code:0
-#: field:crossovered.budget,code:0
-msgid "Code"
-msgstr ""
-
-#. module: account_budget
-#: wizard_view:wizard.analytic.account.budget.report,init:0
-msgid "Select Dates Period"
-msgstr ""
-
-#. module: account_budget
-#: field:account.budget.post,dotation_ids:0
-msgid "Spreading"
-msgstr ""
-
-#. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Theoretical Amount"
-msgstr ""
-
-#. module: account_budget
-#: wizard_field:account.budget.spread,init,fiscalyear:0
-msgid "Fiscal Year"
-msgstr ""
-
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
+#: model:ir.model,name:account_budget.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
 
 #. module: account_budget
-#: rml:crossovered.budget.report:0
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
 msgid "Budget :"
 msgstr ""
 
 #. module: account_budget
-#: rml:account.budget:0
-#: view:account.budget.post:0
-#: wizard_view:account.budget.spread,init:0
-#: wizard_button:account.budget.spread,init,spread:0
-msgid "Spread"
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
+msgid "Planned Amt"
 msgstr ""
 
 #. module: account_budget
@@ -393,11 +390,6 @@ msgstr ""
 msgid "Accounts"
 msgstr "Konton"
 
-#. module: account_budget
-#: model:ir.actions.report.xml,name:account_budget.account_budget
-msgid "Print Budget"
-msgstr ""
-
 #. module: account_budget
 #: view:account.analytic.account:0
 #: field:account.analytic.account,crossovered_budget_line:0
@@ -408,18 +400,16 @@ msgstr ""
 #: view:crossovered.budget.lines:0
 #: model:ir.actions.act_window,name:account_budget.act_account_analytic_account_cb_lines
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
-#: model:ir.model,name:account_budget.model_crossovered_budget_lines
 #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
 msgid "Budget Lines"
 msgstr ""
 
 #. module: account_budget
-#: wizard_button:account.budget.report,init,end:0
-#: wizard_button:account.budget.spread,init,end:0
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
 #: view:crossovered.budget:0
-#: wizard_button:wizard.analytic.account.budget.report,init,end:0
-#: wizard_button:wizard.crossovered.budget,init,end:0
-#: wizard_button:wizard.crossovered.budget.summary,init,end:0
 msgid "Cancel"
 msgstr ""
 
@@ -435,17 +425,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: account_budget
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
+#: report:account.budget:0
+#: report:crossovered.budget.report:0
 msgid "Analysis from"
 msgstr ""
-
-#. module: account_budget
-#: selection:crossovered.budget,state:0
-msgid "Validated"
-msgstr ""
-
-#. module: account_budget
-#: wizard_view:account.budget.report,init:0
-msgid "Select period"
-msgstr ""
diff --git a/addons/account_cancel/i18n/sv.po b/addons/account_cancel/i18n/sv.po
new file mode 100644
index 00000000000..30a9bef7341
--- /dev/null
+++ b/addons/account_cancel/i18n/sv.po
@@ -0,0 +1,28 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-19 12:04+0000\n"
+"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
+"Language-Team: Swedish <sv@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: 2010-10-20 04:55+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_cancel
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Ogiltig XML för Vy-arkitektur!"
+
+#. module: account_cancel
+#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
+msgid "Account Cancel"
+msgstr ""
diff --git a/addons/account_chart/i18n/sv.po b/addons/account_chart/i18n/sv.po
index 83868b82810..88333495ee9 100644
--- a/addons/account_chart/i18n/sv.po
+++ b/addons/account_chart/i18n/sv.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-21 07:34+0000\n"
-"Last-Translator: Kristian <kimocoder> Bremvaag <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-19 12:03+0000\n"
+"Last-Translator: Magnus Brandt, Aspirix AB <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: 2010-09-29 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
 msgid "Remove minimal account chart"
-msgstr "Ta bort minimal konto diagram"
+msgstr "Ta bort minimal kontoplan"
diff --git a/addons/account_invoice_layout/i18n/sv.po b/addons/account_invoice_layout/i18n/sv.po
index 7368c305868..584c30a3147 100644
--- a/addons/account_invoice_layout/i18n/sv.po
+++ b/addons/account_invoice_layout/i18n/sv.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 22:03+0000\n"
-"Last-Translator: Anders Eriksson (Mobila System) <ae@mobilasystem.se>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-19 15:21+0000\n"
+"Last-Translator: Magnus Brandt, Aspirix AB <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: 2010-09-29 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
@@ -22,9 +22,10 @@ msgid "Sub Total"
 msgstr "Delsumma"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Invoice Date:"
-msgstr "Fakturadatum:"
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Note:"
+msgstr ""
 
 #. module: account_invoice_layout
 #: constraint:ir.model:0
@@ -34,7 +35,8 @@ msgstr ""
 "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Cancelled Invoice"
 msgstr "Avbrutna fakturor"
 
@@ -45,55 +47,65 @@ msgid "Title"
 msgstr "Titel"
 
 #. module: account_invoice_layout
-#: model:ir.actions.wizard,name:account_invoice_layout.wizard_notify_message
+#: model:ir.actions.act_window,name:account_invoice_layout.action_account_invoice_special_msg
+#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_layout_message
 msgid "Invoices with Layout and Message"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Disc. (%)"
 msgstr "Rabatt (%)"
 
-#. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "(Incl. taxes):"
-msgstr "(Inkl moms):"
-
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 msgid "Note"
 msgstr "Notering"
 
 #. module: account_invoice_layout
-#: wizard_button:wizard.notify_message,init,print:0
-msgid "Print"
-msgstr "Skriv ut"
+#: model:ir.model,name:account_invoice_layout.model_notify_message
+msgid "Notify By Messages"
+msgstr ""
 
 #. module: account_invoice_layout
 #: help:notify.message,msg:0
 msgid ""
 "This notification will appear at the bottom of the Invoices when printed."
-msgstr ""
+msgstr "Meddelandet kommer att visas i nederkant av fakturan vid utskrift"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Unit Price"
 msgstr "Pris"
 
+#. module: account_invoice_layout
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Fel! Ni kan inte skapa recursiva menyer"
+
+#. module: account_invoice_layout
+#: model:notify.message,msg:account_invoice_layout.demo_message1
+msgid "Be Expert with the Experts..."
+msgstr ""
+
 #. module: account_invoice_layout
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
 #. module: account_invoice_layout
-#: model:ir.model,name:account_invoice_layout.model_notify_message
-msgid "Notify By Messages"
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Document"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "PRO-FORMA"
 
 #. module: account_invoice_layout
 #: field:account.invoice,abstract_line_ids:0
@@ -111,32 +123,30 @@ msgid "Notification Message"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Customer Ref:"
-msgstr "Kundreferens:"
+#: selection:account.invoice.line,state:0
+msgid "Product"
+msgstr "Produkt"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid ")"
+#: help:account.invoice.line,sequence:0
+msgid "Gives the sequence order when displaying a list of invoice lines."
 msgstr ""
 
 #. module: account_invoice_layout
-#: field:account.invoice.line,state:0
-msgid "Type"
-msgstr "Typ"
-
-#. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Price"
 msgstr "Pris"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "/ ("
-msgstr ""
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Invoice Date"
+msgstr "Fakturadatum"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Taxes:"
 msgstr "Moms:"
 
@@ -148,50 +158,62 @@ msgstr ""
 #. module: account_invoice_layout
 #: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
 msgid "Write Messages"
-msgstr ""
+msgstr "Skriv meddelanden"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Base"
 msgstr "Bas"
 
-#. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Fax :"
-msgstr ""
-
-#. module: account_invoice_layout
-#: field:notify.message,msg:0
-msgid "Special Message"
-msgstr ""
-
-#. module: account_invoice_layout
-#: view:notify.message:0
-msgid "Write a notification or a wishful message."
-msgstr ""
-
-#. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Tel. :"
-msgstr ""
-
-#. module: account_invoice_layout
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 msgid "Page Break"
 msgstr "Sidbrytning"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Document:"
-msgstr "Dokument:"
+#: view:notify.message:0
+#: field:notify.message,msg:0
+msgid "Special Message"
+msgstr "Särskilt meddelande"
 
 #. module: account_invoice_layout
-#: wizard_view:wizard.notify_message,init:0
+#: help:account.invoice.special.msg,message:0
+msgid "Message to Print at the bottom of report"
+msgstr "Meddelande att skrivas ut i nederkant av rapporten"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Quantity"
+msgstr "Antal"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Partner Ref."
+msgstr "Företagsreferense"
+
+#. module: account_invoice_layout
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: model:ir.model,name:account_invoice_layout.model_account_invoice
+#: report:notify_account.invoice:0
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Total:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
 msgid "Select Message"
 msgstr "Välj meddelande"
 
@@ -200,33 +222,32 @@ msgstr "Välj meddelande"
 msgid "Messages"
 msgstr "Meddelanden"
 
-#. module: account_invoice_layout
-#: selection:account.invoice.line,state:0
-msgid "Product"
-msgstr "Produkt"
-
 #. module: account_invoice_layout
 #: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1
 msgid "Invoices with Layout"
 msgstr "Fakturor med layout"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Description / Taxes"
 msgstr "Beskrivning/moms"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Amount"
 msgstr "Belopp"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Description/Taxes"
-msgstr "Beskrivning/moms"
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Tel. :"
+msgstr "Tel. :"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Draft Invoice"
 msgstr "Preliminär faktura"
 
@@ -236,19 +257,20 @@ msgid "Sequence Number"
 msgstr "Pos"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Quantity"
-msgstr "Antal"
+#: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg
+msgid "Account Invoice Special Message"
+msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Refund"
 msgstr "Återbetalning"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "VAT :"
-msgstr "Moms :"
+#: field:account.invoice.line,state:0
+msgid "Type"
+msgstr "Typ"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -256,56 +278,99 @@ msgid "Separator Line"
 msgstr "Skiljelinje"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
+msgid "Invoices Layout Improvement"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Supplier Invoice"
 msgstr "Leverantörsfaktura"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Note :"
-msgstr "Notering :"
+#: view:account.invoice.special.msg:0
+msgid "Print"
+msgstr "Skriv ut"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "VAT :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Tax"
 msgstr "Moms"
 
 #. module: account_invoice_layout
-#: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
-msgid "account_invoice_layout"
+#: model:ir.model,name:account_invoice_layout.model_account_invoice_line
+msgid "Invoice Line"
 msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Total (Excl. taxes):"
-msgstr "Total (ex moms)"
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Net Total:"
+msgstr ""
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Invoice"
-msgstr "Faktura"
+#: view:notify.message:0
+msgid "Write a notification or a wishful message."
+msgstr ""
 
 #. module: account_invoice_layout
-#: wizard_button:wizard.notify_message,init,end:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. module: account_invoice_layout
-#: rml:account.invoice.layout:0
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
 msgid "Supplier Refund"
 msgstr ""
 
 #. module: account_invoice_layout
-#: wizard_field:wizard.notify_message,init,message:0
+#: field:account.invoice.special.msg,message:0
 msgid "Message"
 msgstr "Meddelande"
 
-#. module: account_invoice_layout
-#: rml:account.invoice.layout:0
-msgid "Total"
-msgstr "Total"
-
 #. module: account_invoice_layout
 #: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
 msgid "All Notification Messages"
 msgstr ""
+
+#~ msgid "Invoice Date:"
+#~ msgstr "Fakturadatum:"
+
+#~ msgid "(Incl. taxes):"
+#~ msgstr "(Inkl moms):"
+
+#~ msgid "Customer Ref:"
+#~ msgstr "Kundreferens:"
+
+#~ msgid "Document:"
+#~ msgstr "Dokument:"
+
+#~ msgid "VAT :"
+#~ msgstr "Moms :"
+
+#~ msgid "Note :"
+#~ msgstr "Notering :"
+
+#~ msgid "Description/Taxes"
+#~ msgstr "Beskrivning/moms"
+
+#~ msgid "Total"
+#~ msgstr "Total"
+
+#~ msgid "Total (Excl. taxes):"
+#~ msgstr "Total (ex moms)"
diff --git a/addons/account_payment/i18n/sv.po b/addons/account_payment/i18n/sv.po
index 7c68ab21694..9af1e2ed03c 100644
--- a/addons/account_payment/i18n/sv.po
+++ b/addons/account_payment/i18n/sv.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-10 09:49+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-19 13:15+0000\n"
+"Last-Translator: Magnus Brandt, Aspirix AB <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: 2010-09-29 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
@@ -24,18 +24,24 @@ msgstr ""
 #. module: account_payment
 #: field:payment.line,currency:0
 msgid "Partner Currency"
-msgstr ""
+msgstr "Valuta för partner"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Set to draft"
-msgstr ""
+msgstr "Sätt till utkast"
 
 #. module: account_payment
 #: help:payment.order,mode:0
 msgid "Select the Payment Mode to be applied."
 msgstr ""
 
+#. module: account_payment
+#: view:payment.mode:0
+#: view:payment.order:0
+msgid "Group By..."
+msgstr "Gruppera"
+
 #. module: account_payment
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
@@ -48,6 +54,14 @@ msgstr ""
 msgid "Owner Account"
 msgstr ""
 
+#. module: account_payment
+#: help:payment.order,state:0
+msgid ""
+"When an order is placed the state is 'Draft'.\n"
+" Once the bank is confirmed the state is set to 'Confirmed'.\n"
+" Then the order is paid the state is 'Done'."
+msgstr ""
+
 #. module: account_payment
 #: help:account.invoice,amount_to_pay:0
 msgid ""
@@ -60,7 +74,7 @@ msgstr ""
 msgid ""
 "If no payment date is specified, the bank will treat this payment line "
 "directly"
-msgstr ""
+msgstr "Om inget betaldatum anges kommer betalningen gå iväg omgående"
 
 #. module: account_payment
 #: field:payment.order,date_prefered:0
@@ -70,15 +84,21 @@ msgstr ""
 #. module: account_payment
 #: selection:payment.line,state:0
 msgid "Free"
-msgstr ""
+msgstr "Ledigt"
 
 #. module: account_payment
-#: wizard_field:populate_payment,search,entries:0
+#: field:payment.order.create,entries:0
 msgid "Entries"
 msgstr ""
 
 #. module: account_payment
-#: wizard_field:populate_payment,init,duedate:0
+#: report:payment.order:0
+msgid "Used Account"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_maturity_date:0
+#: field:payment.order.create,duedate:0
 msgid "Due Date"
 msgstr ""
 
@@ -88,90 +108,84 @@ msgid "Account Entry Line"
 msgstr ""
 
 #. module: account_payment
-#: wizard_button:populate_payment,search,create:0
+#: view:payment.order.create:0
 msgid "_Add to payment order"
 msgstr ""
 
 #. module: account_payment
-#: rml:payment.order:0
-#: view:payment.order:0
-msgid "Amount"
+#: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
+#: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm
+msgid "Payment Populate statement"
 msgstr ""
 
 #. module: account_payment
-#: rml:payment.order:0
-msgid "Execution date:"
-msgstr ""
+#: report:payment.order:0
+#: view:payment.order:0
+msgid "Amount"
+msgstr "Belopp"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Total in Company Currency"
-msgstr ""
+msgstr "Totalt i bolagets valuta"
 
 #. module: account_payment
 #: selection:payment.order,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Avbruten"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
-#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form_new
 msgid "New Payment Order"
-msgstr ""
+msgstr "Ny betalorder"
 
 #. module: account_payment
-#: rml:payment.order:0
+#: report:payment.order:0
 #: field:payment.order,reference:0
 msgid "Reference"
-msgstr ""
+msgstr "Referens"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
 #: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form
 msgid "Payment Orders"
-msgstr ""
+msgstr "Betalorder"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Directly"
-msgstr ""
+msgstr "Direkt"
 
 #. module: account_payment
-#: model:ir.actions.act_window,name:account_payment.action_payment_line_form
-#: model:ir.model,name:account_payment.model_payment_line
-#: view:payment.line:0
 #: view:payment.order:0
-msgid "Payment Line"
-msgstr ""
-
-#. module: account_payment
-#: field:payment.type,suitable_bank_types:0
-msgid "Suitable bank types"
-msgstr ""
+#: selection:payment.order,state:0
+msgid "Draft"
+msgstr "Utkast"
 
 #. module: account_payment
 #: view:payment.line:0
 msgid "Amount Total"
-msgstr ""
+msgstr "Belopp totalt"
 
 #. module: account_payment
+#: view:payment.order:0
 #: selection:payment.order,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Bekräftad"
 
 #. module: account_payment
 #: help:payment.line,ml_date_created:0
 msgid "Invoice Effective Date"
-msgstr ""
+msgstr "Fakturadatum"
 
 #. module: account_payment
 #: field:payment.order,line_ids:0
 msgid "Payment lines"
-msgstr ""
+msgstr "betallinjer"
 
 #. module: account_payment
-#: help:payment.order,date_scheduled:0
-msgid "Select a date if you have chosen Preferred Date to be fixed."
+#: report:payment.order:0
+msgid "Execution Type"
 msgstr ""
 
 #. module: account_payment
@@ -180,6 +194,7 @@ msgid "Structured"
 msgstr ""
 
 #. module: account_payment
+#: view:payment.order:0
 #: field:payment.order,state:0
 msgid "State"
 msgstr ""
@@ -192,8 +207,10 @@ msgstr ""
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
+#: model:ir.model,name:account_payment.model_payment_mode
 #: model:ir.ui.menu,name:account_payment.menu_action_payment_mode_form
 #: view:payment.mode:0
+#: view:payment.order:0
 msgid "Payment Mode"
 msgstr ""
 
@@ -215,6 +232,12 @@ msgid ""
 "scheduled date of execution."
 msgstr ""
 
+#. module: account_payment
+#: code:addons/account_payment/account_move_line.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
 #. module: account_payment
 #: view:account.move.line:0
 msgid "Total debit"
@@ -232,30 +255,33 @@ msgstr ""
 
 #. module: account_payment
 #: field:payment.line,info_partner:0
+#: view:payment.order:0
 msgid "Destination Account"
 msgstr ""
 
 #. module: account_payment
 #: view:payment.line:0
-#: view:payment.order:0
 msgid "Desitination Account"
 msgstr ""
 
+#. module: account_payment
+#: view:payment.order:0
+msgid "Search Payment Orders"
+msgstr ""
+
 #. module: account_payment
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
 #. module: account_payment
-#: wizard_button:populate_payment,init,end:0
-#: wizard_button:populate_payment,search,end:0
-#: wizard_button:populate_statement,init,end:0
-msgid "_Cancel"
+#: field:payment.line,create_date:0
+msgid "Created"
 msgstr ""
 
 #. module: account_payment
-#: field:payment.line,create_date:0
-msgid "Created"
+#: view:payment.order:0
+msgid "Select Invoices to Pay"
 msgstr ""
 
 #. module: account_payment
@@ -279,8 +305,8 @@ msgid "Payment Management"
 msgstr ""
 
 #. module: account_payment
-#: field:payment.line,communication:0
-msgid "Communication"
+#: field:payment.line,bank_statement_line_id:0
+msgid "Bank statement line"
 msgstr ""
 
 #. module: account_payment
@@ -293,19 +319,43 @@ msgstr ""
 msgid "Amount to be paid"
 msgstr ""
 
+#. module: account_payment
+#: report:payment.order:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Yes"
+msgstr ""
+
 #. module: account_payment
 #: help:payment.line,info_owner:0
 msgid "Address of the Main Partner"
 msgstr ""
 
+#. module: account_payment
+#: field:payment.mode,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_payment_populate_statement
+msgid "Account Payment Populate Statement"
+msgstr ""
+
 #. module: account_payment
 #: help:payment.mode,name:0
 msgid "Mode of Payment"
 msgstr ""
 
 #. module: account_payment
-#: view:payment.type:0
-#: help:payment.type,name:0
+#: report:payment.order:0
+msgid "Value Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
 msgid "Payment Type"
 msgstr ""
 
@@ -315,14 +365,16 @@ msgid "Payment amount in the partner currency"
 msgstr ""
 
 #. module: account_payment
-#: selection:payment.order,state:0
-msgid "Draft"
+#: model:ir.actions.act_window,name:account_payment.action_payment_line_form
+#: model:ir.model,name:account_payment.model_payment_line
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment Line"
 msgstr ""
 
 #. module: account_payment
-#: field:payment.line,partner_id:0
-#: rml:payment.order:0
-msgid "Partner"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
 msgstr ""
 
 #. module: account_payment
@@ -330,19 +382,30 @@ msgstr ""
 msgid "The successor message of Communication."
 msgstr ""
 
+#. module: account_payment
+#: code:addons/account_payment/account_move_line.py:0
+#, python-format
+msgid "No partner defined on entry line"
+msgstr ""
+
 #. module: account_payment
 #: help:payment.line,info_partner:0
 msgid "Address of the Ordering Customer."
 msgstr ""
 
+#. module: account_payment
+#: view:account.payment.populate.statement:0
+msgid "Populate Statement:"
+msgstr ""
+
 #. module: account_payment
 #: view:account.move.line:0
 msgid "Total credit"
 msgstr ""
 
 #. module: account_payment
-#: model:ir.actions.wizard,name:account_payment.wizard_populate_payment
-msgid "Populate payment"
+#: help:payment.order,date_scheduled:0
+msgid "Select a date if you have chosen Preferred Date to be fixed."
 msgstr ""
 
 #. module: account_payment
@@ -351,19 +414,14 @@ msgid "User"
 msgstr ""
 
 #. module: account_payment
+#: field:account.payment.populate.statement,lines:0
 #: model:ir.actions.act_window,name:account_payment.act_account_invoice_2_payment_line
-#: wizard_field:populate_statement,init,lines:0
 msgid "Payment Lines"
 msgstr ""
 
 #. module: account_payment
-#: rml:payment.order:0
-msgid "Date"
-msgstr ""
-
-#. module: account_payment
-#: rml:payment.order:0
-msgid "Reference:"
+#: model:ir.model,name:account_payment.model_account_move_line
+msgid "Journal Items"
 msgstr ""
 
 #. module: account_payment
@@ -373,19 +431,29 @@ msgid ""
 "customer."
 msgstr ""
 
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "Search"
+msgstr ""
+
 #. module: account_payment
 #: field:payment.line,date:0
 msgid "Payment Date"
 msgstr ""
 
+#. module: account_payment
+#: report:payment.order:0
+msgid "Total:"
+msgstr ""
+
 #. module: account_payment
 #: field:payment.order,date_created:0
 msgid "Creation date"
 msgstr ""
 
 #. module: account_payment
-#: field:payment.line,ml_maturity_date:0
-msgid "Maturity Date"
+#: view:account.payment.populate.statement:0
+msgid "ADD"
 msgstr ""
 
 #. module: account_payment
@@ -393,11 +461,6 @@ msgstr ""
 msgid "Import payment lines"
 msgstr ""
 
-#. module: account_payment
-#: help:payment.type,code:0
-msgid "Specify the Code for Payment Type"
-msgstr ""
-
 #. module: account_payment
 #: field:account.move.line,amount_to_pay:0
 msgid "Amount to pay"
@@ -414,8 +477,13 @@ msgid "The Ordering Customer"
 msgstr ""
 
 #. module: account_payment
-#: field:payment.type,code:0
-msgid "Code"
+#: model:ir.model,name:account_payment.model_account_payment_make_payment
+msgid "Account make payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Invoice Ref"
 msgstr ""
 
 #. module: account_payment
@@ -423,6 +491,11 @@ msgstr ""
 msgid "Your Reference"
 msgstr ""
 
+#. module: account_payment
+#: field:payment.order,mode:0
+msgid "Payment mode"
+msgstr ""
+
 #. module: account_payment
 #: view:payment.order:0
 msgid "Payment order"
@@ -435,17 +508,26 @@ msgid "General Information"
 msgstr ""
 
 #. module: account_payment
+#: view:payment.order:0
 #: selection:payment.order,state:0
 msgid "Done"
 msgstr ""
 
 #. module: account_payment
-#: view:payment.order:0
-msgid "Select Invoices to Pay"
+#: model:ir.model,name:account_payment.model_account_invoice
+msgid "Invoice"
 msgstr ""
 
 #. module: account_payment
+#: field:payment.line,communication:0
+msgid "Communication"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+#: view:account.payment.populate.statement:0
 #: view:payment.order:0
+#: view:payment.order.create:0
 msgid "Cancel"
 msgstr ""
 
@@ -462,30 +544,19 @@ msgid ""
 msgstr ""
 "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
 
-#. module: account_payment
-#: model:ir.actions.wizard,name:account_payment.wizard_pay_payment
-msgid "Pay"
-msgstr ""
-
 #. module: account_payment
 #: model:ir.actions.report.xml,name:account_payment.payment_order1
 #: model:ir.model,name:account_payment.model_payment_order
 msgid "Payment Order"
 msgstr ""
 
-#. module: account_payment
-#: model:ir.actions.act_window,name:account_payment.action_payment_order_draft
-#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_draft
-msgid "Draft Payment Order"
-msgstr ""
-
 #. module: account_payment
 #: help:payment.line,amount:0
 msgid "Payment amount in the company currency"
 msgstr ""
 
 #. module: account_payment
-#: wizard_view:populate_payment,init:0
+#: view:payment.order.create:0
 msgid "Search Payment lines"
 msgstr ""
 
@@ -504,6 +575,11 @@ msgstr ""
 msgid "Destination Bank account"
 msgstr ""
 
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Are you sure you want to make payment?"
+msgstr ""
+
 #. module: account_payment
 #: help:payment.mode,journal:0
 msgid "Cash Journal for the Payment Mode"
@@ -511,7 +587,6 @@ msgstr ""
 
 #. module: account_payment
 #: field:payment.mode,bank_id:0
-#: rml:payment.order:0
 msgid "Bank account"
 msgstr ""
 
@@ -522,17 +597,22 @@ msgstr ""
 
 #. module: account_payment
 #: field:payment.line,company_currency:0
+#: report:payment.order:0
 msgid "Company Currency"
 msgstr ""
 
 #. module: account_payment
-#: model:ir.ui.menu,name:account_payment.menu_main
-#: model:ir.ui.menu,name:account_payment.next_id_44
+#: model:ir.ui.menu,name:account_payment.menu_main_payment
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Payment"
 msgstr ""
 
+#. module: account_payment
+#: report:payment.order:0
+msgid "Payment Order / Payment"
+msgstr ""
+
 #. module: account_payment
 #: field:payment.line,move_line_id:0
 msgid "Entry line"
@@ -547,13 +627,12 @@ msgstr ""
 
 #. module: account_payment
 #: field:payment.mode,name:0
-#: field:payment.type,name:0
 msgid "Name"
 msgstr ""
 
 #. module: account_payment
-#: wizard_button:populate_payment,init,search:0
-msgid "_Search"
+#: report:payment.order:0
+msgid "Bank Account"
 msgstr ""
 
 #. module: account_payment
@@ -563,8 +642,8 @@ msgid "Entry Information"
 msgstr ""
 
 #. module: account_payment
-#: model:ir.actions.wizard,name:account_payment.wizard_populate_statement
-msgid "Populate Statement with Payment lines"
+#: model:ir.model,name:account_payment.model_payment_order_create
+msgid "payment.order.create"
 msgstr ""
 
 #. module: account_payment
@@ -572,37 +651,31 @@ msgstr ""
 msgid "Order"
 msgstr ""
 
-#. module: account_payment
-#: model:ir.actions.act_window,name:account_payment.action_payment_order_open
-#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_open
-msgid "Payment Orders to Validate"
-msgstr ""
-
-#. module: account_payment
-#: model:ir.model,name:account_payment.model_payment_type
-#: field:payment.mode,type:0
-msgid "Payment type"
-msgstr ""
-
 #. module: account_payment
 #: field:payment.order,total:0
 msgid "Total"
 msgstr ""
 
 #. module: account_payment
-#: wizard_button:populate_statement,init,add:0
-msgid "_Add"
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
 msgstr ""
 
 #. module: account_payment
-#: help:payment.mode,type:0
-msgid "Select the Payment Type for the Payment Mode."
+#: view:account.payment.make.payment:0
+#: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
+msgid "Make Payment"
 msgstr ""
 
 #. module: account_payment
-#: model:ir.model,name:account_payment.model_payment_mode
-#: field:payment.order,mode:0
-msgid "Payment mode"
+#: field:payment.line,partner_id:0
+#: report:payment.order:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_create_payment_order
+msgid "Populate Payment"
 msgstr ""
 
 #. module: account_payment
@@ -611,6 +684,7 @@ msgid "Bank Account for the Payment Mode"
 msgstr ""
 
 #. module: account_payment
+#: view:payment.mode:0
 #: field:payment.mode,journal:0
 msgid "Journal"
 msgstr ""
diff --git a/addons/analytic_user_function/i18n/nl.po b/addons/analytic_user_function/i18n/nl.po
index 0ee7a4503dc..11aa70c296d 100644
--- a/addons/analytic_user_function/i18n/nl.po
+++ b/addons/analytic_user_function/i18n/nl.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-02 07:26+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-18 12:20+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <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: 2010-09-29 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
@@ -22,9 +22,22 @@ msgid "Invalid XML for View Architecture!"
 msgstr "Ongeldige XML, kan overzicht niet weergeven!"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Koppeltabel tussen gebruikers en producten op een kostenplaats"
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
@@ -33,7 +46,16 @@ msgstr "Product"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
+#: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
+msgstr "Kostenplaats"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid ""
+"There is no expense account define ' \\n                                    "
+"'for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
@@ -48,17 +70,23 @@ msgid "User"
 msgstr "Gebruiker"
 
 #. module: analytic_user_function
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Koppeltabel tussen gebruikers en producten op een kostenplaats"
 
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
 msgstr ""
 
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:0
+#, python-format
+msgid ""
+"There is no expense account define ' \\n                                'for "
+"this product: \"%s\" (id:%d)"
+msgstr ""
+
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
diff --git a/addons/base_action_rule/i18n/mn.po b/addons/base_action_rule/i18n/mn.po
index 86fbab1e414..9025cadb8e5 100644
--- a/addons/base_action_rule/i18n/mn.po
+++ b/addons/base_action_rule/i18n/mn.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-08-19 12:20+0000\n"
-"PO-Revision-Date: 2010-09-29 11:46+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-18 07:23+0000\n"
+"Last-Translator: sugi <Unknown>\n"
 "Language-Team: Mongolian <mn@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: 2010-09-30 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
@@ -36,7 +36,7 @@ msgstr "Харилцагчийн ангилал"
 #. module: base_action_rule
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
 
 #. module: base_action_rule
 #: help:base.action.rule,act_remind_user:0
@@ -64,6 +64,11 @@ msgstr ""
 msgid "Set State to"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,act_email_from:0
+msgid "Email From"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Body"
@@ -108,11 +113,6 @@ msgid ""
 "Check this if you want the rule to send a reminder by email to the partner."
 msgstr ""
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Email Reminders"
-msgstr "Имэйл сануулагууд"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions on Model Partner"
@@ -134,9 +134,9 @@ msgid "%(object_subject)s = Object subject"
 msgstr ""
 
 #. module: base_action_rule
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: view:base.action.rule:0
+msgid "Email Reminders"
+msgstr "Имэйл сануулагууд"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -209,6 +209,13 @@ msgstr ""
 msgid "None"
 msgstr "Хоосон"
 
+#. module: base_action_rule
+#: help:base.action.rule,act_email_to:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'To' field of the header"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_user_phone)s = Responsible phone"
@@ -226,6 +233,11 @@ msgstr ""
 msgid "Delay type"
 msgstr "Саатлын төрөл"
 
+#. module: base_action_rule
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
 #. module: base_action_rule
 #: help:base.action.rule,regex_name:0
 msgid ""
@@ -240,6 +252,11 @@ msgstr ""
 msgid "Call Object Method"
 msgstr "Объектын метод дуудах"
 
+#. module: base_action_rule
+#: field:base.action.rule,act_email_to:0
+msgid "Email To"
+msgstr ""
+
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_watchers:0
 msgid ""
@@ -257,6 +274,13 @@ msgstr "%(partner)s = Түншийн нэр"
 msgid "Note"
 msgstr "Тэмдэглэл"
 
+#. module: base_action_rule
+#: help:base.action.rule,act_email_from:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'From' field of the header"
+msgstr ""
+
 #. module: base_action_rule
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
@@ -374,11 +398,6 @@ msgstr "Хариуцлагатай"
 msgid "%(partner_email)s = Partner Email"
 msgstr "%(partner_email)s = Түншийн имэйл"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "%(object_date)s = Creation date"
-msgstr "%(object_date)s = Үүсгэх огноо"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_user_email)s = Responsible Email"
@@ -479,3 +498,6 @@ msgstr "Нөхцөл байдал"
 #: field:base.action.rule,trg_date_type:0
 msgid "Trigger Date"
 msgstr "Гарааны огноо"
+
+#~ msgid "%(object_date)s = Creation date"
+#~ msgstr "%(object_date)s = Үүсгэх огноо"
diff --git a/addons/base_action_rule/i18n/sr.po b/addons/base_action_rule/i18n/sr.po
index 3370aac8617..86f4f52b407 100644
--- a/addons/base_action_rule/i18n/sr.po
+++ b/addons/base_action_rule/i18n/sr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-08-19 12:20+0000\n"
-"PO-Revision-Date: 2010-10-17 14:30+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-18 07:54+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@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: 2010-10-18 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
@@ -64,6 +64,11 @@ msgstr "Email za Ostale Emailove"
 msgid "Set State to"
 msgstr "Postavi stanje na"
 
+#. module: base_action_rule
+#: field:base.action.rule,act_email_from:0
+msgid "Email From"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Body"
@@ -110,11 +115,6 @@ msgid ""
 "Check this if you want the rule to send a reminder by email to the partner."
 msgstr "oznaci ovde ako zelis da pravilo posalje Email podsetnik partnerima"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Email Reminders"
-msgstr "Email podsetnici"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions on Model Partner"
@@ -136,9 +136,9 @@ msgid "%(object_subject)s = Object subject"
 msgstr "%(object_subject)s = Objekt subject"
 
 #. module: base_action_rule
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za pregled arhitekture"
+#: view:base.action.rule:0
+msgid "Email Reminders"
+msgstr "Email podsetnici"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -211,6 +211,13 @@ msgstr ""
 msgid "None"
 msgstr ""
 
+#. module: base_action_rule
+#: help:base.action.rule,act_email_to:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'To' field of the header"
+msgstr ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_user_phone)s = Responsible phone"
@@ -228,6 +235,11 @@ msgstr ""
 msgid "Delay type"
 msgstr ""
 
+#. module: base_action_rule
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
 #. module: base_action_rule
 #: help:base.action.rule,regex_name:0
 msgid ""
@@ -242,6 +254,11 @@ msgstr ""
 msgid "Call Object Method"
 msgstr ""
 
+#. module: base_action_rule
+#: field:base.action.rule,act_email_to:0
+msgid "Email To"
+msgstr ""
+
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_watchers:0
 msgid ""
@@ -259,6 +276,13 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
+#. module: base_action_rule
+#: help:base.action.rule,act_email_from:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'From' field of the header"
+msgstr ""
+
 #. module: base_action_rule
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
@@ -376,11 +400,6 @@ msgstr ""
 msgid "%(partner_email)s = Partner Email"
 msgstr ""
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "%(object_date)s = Creation date"
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_user_email)s = Responsible Email"
diff --git a/addons/base_calendar/i18n/nl.po b/addons/base_calendar/i18n/nl.po
index c431225ff57..31384f76e43 100644
--- a/addons/base_calendar/i18n/nl.po
+++ b/addons/base_calendar/i18n/nl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-08-19 12:50+0000\n"
-"PO-Revision-Date: 2010-10-09 14:13+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-18 21:11+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-10-10 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
@@ -25,8 +25,6 @@ msgstr "De gebeurtenis begint"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
 msgid "Hourly"
 msgstr "Ieder uur"
 
@@ -45,6 +43,12 @@ msgstr ""
 "Hiermee bepaalt u de datum/tijd-uitzonderingslijst voor een terugkerend "
 "kalender-item"
 
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr "Tijdzone"
+
 #. module: base_calendar
 #: field:calendar.event.edit.all,name:0
 msgid "Title"
@@ -52,9 +56,7 @@ msgstr "Titel"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
 #: selection:calendar.event,rrule_type:0
-#: selection:calendar.todo,freq:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Monthly"
 msgstr "Maandelijks"
@@ -64,6 +66,11 @@ msgstr "Maandelijks"
 msgid "Invited User"
 msgstr "Uitgenodigde gebruikers"
 
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "Select range to Exclude"
+msgstr "Selecteer uit te sluiten bereik"
+
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -96,6 +103,12 @@ msgstr "Details uitnodiging"
 msgid "Fourth"
 msgstr "vierde"
 
+#. module: base_calendar
+#: help:calendar.event,count:0
+#: help:calendar.todo,count:0
+msgid "Repeat max that times"
+msgstr "Herhaal max aantal keren"
+
 #. module: base_calendar
 #: field:calendar.event,show_as:0
 #: field:calendar.todo,show_as:0
@@ -120,6 +133,8 @@ msgstr "Openbaar"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Hours"
 msgstr "Uren"
@@ -207,9 +222,7 @@ msgstr "din"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
 #: selection:calendar.event,rrule_type:0
-#: selection:calendar.todo,freq:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Yearly"
 msgstr "Jaarlijks"
@@ -239,6 +252,8 @@ msgstr "Zaal"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Days"
 msgstr "dagen"
@@ -264,9 +279,9 @@ msgid "Chair Person"
 msgstr "Voorzitter"
 
 #. module: base_calendar
-#: selection:calendar.alarm,action:0
-msgid "Procedure"
-msgstr "Werkwijze"
+#: view:calendar.event:0
+msgid "Exclude range"
+msgstr "Uitsluit bereik"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -281,6 +296,8 @@ msgstr "Geannuleerd"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Minutes"
 msgstr "Minuten"
@@ -302,8 +319,6 @@ msgstr "Soort uitnodiging"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
 msgid "Secondly"
 msgstr "Per seconde"
 
@@ -320,6 +335,11 @@ msgstr "Datum gebeurtenis"
 msgid "Group By..."
 msgstr "Groepeer op.."
 
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,email:0
+msgid "Provide external email address who will receive this invitation."
+msgstr "Vul externe email adres in die de uitnodiging zal ontvangen"
+
 #. module: base_calendar
 #: help:calendar.attendee,partner_id:0
 msgid "Partner related to contact"
@@ -331,13 +351,10 @@ msgid "Specify the type of Invitation"
 msgstr "Geef de soort uitnodiging op"
 
 #. module: base_calendar
-#: help:calendar.event,exrule:0
-#: help:calendar.todo,exrule:0
-msgid ""
-"defines a rule or repeating pattern for an exception to a recurrence set"
-msgstr ""
-"definieert een regel of herhalingspatroon voor een uitzondering op een "
-"herhaling"
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Years"
+msgstr "Jaren"
 
 #. module: base_calendar
 #: field:calendar.alarm,event_end_date:0
@@ -350,6 +367,12 @@ msgstr "Einddatum gebeurtenis"
 msgid "Optional Participation"
 msgstr "Deelname optioneel"
 
+#. module: base_calendar
+#: help:calendar.event,interval:0
+#: help:calendar.todo,interval:0
+msgid "Repeat every x"
+msgstr "Herhaal elke x"
+
 #. module: base_calendar
 #: field:calendar.event,date_deadline:0
 #: field:calendar.todo,date_deadline:0
@@ -505,6 +528,12 @@ msgstr "Vertrouwelijk"
 msgid "Repeat Until"
 msgstr "Herhaal tot"
 
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Seconds"
+msgstr "Seconden"
+
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Visibility"
@@ -578,6 +607,11 @@ msgstr "Deelname vereist"
 msgid "Created"
 msgstr "Aangemaakt"
 
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
+msgid "Set Exclude range"
+msgstr "Stel uitsluit bereik in"
+
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
@@ -586,9 +620,7 @@ msgstr "Privé"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
 #: selection:calendar.event,rrule_type:0
-#: selection:calendar.todo,freq:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Daily"
 msgstr "Dagelijks"
@@ -611,6 +643,12 @@ msgstr "Markeren als"
 msgid "Contact"
 msgstr "Contactpersoon"
 
+#. module: base_calendar
+#: help:calendar.event,rrule_type:0
+#: help:calendar.todo,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr "Laat de gebeurtenis automatisch herhalen met dit interval"
+
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
@@ -624,11 +662,6 @@ msgstr "Toewijzen"
 msgid "Partner"
 msgstr "Partner"
 
-#. module: base_calendar
-#: view:base.calendar.set.exrule:0
-msgid "Select data for ExRule"
-msgstr "Selecteer gegevens voor uitzondering regel"
-
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: selection:base_calendar.invite.attendee,type:0
@@ -734,6 +767,12 @@ msgstr "Mijn gebeurtenissen"
 msgid "Decline"
 msgstr "Weigeren"
 
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Weeks"
+msgstr "Weken"
+
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Group"
@@ -819,7 +858,6 @@ msgstr "Herinnering"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr "Stel uitzondering regel in"
@@ -903,21 +941,17 @@ msgid "Delegated From"
 msgstr "Overgenomen van"
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: field:calendar.attendee,user_id:0
 msgid "User"
 msgstr "Gebruiker"
 
 #. module: base_calendar
-#: view:calendar.event:0
-msgid "ExRule"
-msgstr "UitzRegel"
-
-#. module: base_calendar
-#: view:calendar.event:0
-#: field:calendar.event,date:0
-msgid "Date"
-msgstr "Datum"
+#: field:calendar.alarm,active:0
+#: field:calendar.event,active:0
+#: field:calendar.todo,active:0
+#: field:res.alarm,active:0
+msgid "Active"
+msgstr "Actief"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
@@ -931,6 +965,11 @@ msgstr "November"
 msgid "Indicate the groups that the attendee belongs to"
 msgstr "Geeft de groepen aan waar de deelnemer bij behoort"
 
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Data"
+msgstr "Data"
+
 #. module: base_calendar
 #: field:base.calendar.set.exrule,mo:0
 #: field:calendar.event,mo:0
@@ -1005,12 +1044,10 @@ msgid "Summary"
 msgstr "Samenvatting"
 
 #. module: base_calendar
-#: field:calendar.alarm,active:0
-#: field:calendar.event,active:0
-#: field:calendar.todo,active:0
-#: field:res.alarm,active:0
-msgid "Active"
-msgstr "Actief"
+#: view:calendar.event:0
+#: field:calendar.event,date:0
+msgid "Date"
+msgstr "Datum"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -1022,6 +1059,11 @@ msgstr "Uitnodiging"
 msgid "Action"
 msgstr "Actie"
 
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,type:0
+msgid "Select whom you want to Invite"
+msgstr "Selecteer wie u wilt uitnodigen"
+
 #. module: base_calendar
 #: help:calendar.alarm,duration:0
 #: help:res.alarm,duration:0
@@ -1059,9 +1101,7 @@ msgstr "Zoek gebeurtenissen"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
 #: selection:calendar.event,rrule_type:0
-#: selection:calendar.todo,freq:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Weekly"
 msgstr "Wekelijks"
@@ -1147,6 +1187,11 @@ msgstr "res.users"
 msgid "Tuesday"
 msgstr "Dinsdag"
 
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Procedure"
+msgstr "Werkwijze"
+
 #. module: base_calendar
 #: help:calendar.alarm,description:0
 msgid ""
@@ -1183,6 +1228,7 @@ msgid "Tentative"
 msgstr "Voorlopig"
 
 #. module: base_calendar
+#: view:calendar.attendee:0
 #: view:calendar.event:0
 #: field:calendar.event,user_id:0
 #: field:calendar.todo,user_id:0
@@ -1234,6 +1280,16 @@ msgstr ""
 msgid "Details"
 msgstr "Details"
 
+#. module: base_calendar
+#: help:calendar.event,exrule:0
+#: help:calendar.todo,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+"Definieer een regel of herhaalpatroon of tijd om uit te sluiten van de "
+"herhaalregel."
+
 #. module: base_calendar
 #: field:base.calendar.set.exrule,month_list:0
 #: field:calendar.event,month_list:0
@@ -1343,8 +1399,6 @@ msgstr ""
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
 msgid "Minutely"
 msgstr "Elke minuut"
 
@@ -1366,6 +1420,12 @@ msgstr "Einddatum"
 msgid "February"
 msgstr "Februari"
 
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Months"
+msgstr "Maanden"
+
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Resource"
@@ -1484,10 +1544,10 @@ msgid "Sequence"
 msgstr "Volgnummer"
 
 #. module: base_calendar
-#: field:calendar.event,vtimezone:0
-#: field:calendar.todo,vtimezone:0
-msgid "Timezone"
-msgstr "Tijdzone"
+#: help:calendar.event,alarm_id:0
+#: help:calendar.todo,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr "Stel het alarm in op een tijd voorafgaand aan de gebeurtenis"
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
@@ -1500,13 +1560,6 @@ msgstr "Interne gebruiker"
 msgid "Accept"
 msgstr "Accepteren"
 
-#. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
-#: selection:calendar.event,week_list:0
-#: selection:calendar.todo,week_list:0
-msgid "Saturday"
-msgstr "Zaterdag"
-
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation To"
@@ -1547,21 +1600,11 @@ msgid "Trigger Date"
 msgstr "Activeerdatum"
 
 #. module: base_calendar
-#: help:calendar.alarm,attach:0
-msgid ""
-"* Points to a sound resource,                     which is rendered when the "
-"alarm is triggered for audio,\n"
-"                    * File which is intended to be sent as message "
-"attachments for email,\n"
-"                    * Points to a procedure resource, which is invoked when  "
-"                    the alarm is triggered for procedure."
-msgstr ""
-"* Verwijst naar een geluidsfragment, dat wordt afgespeeld nadat het alarm "
-"voor audio is afgegaan,\n"
-"                    * Bestand dat bedoeld is om mee te worden gestuurd als "
-"bijlage bij een e-mail bericht,\n"
-"                    * Verwijst naar een procedure bron, die wordt "
-"aangeroepen nadat het alarm is afgegaan voor procedure."
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Saturday"
+msgstr "Zaterdag"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
@@ -1569,3 +1612,30 @@ msgstr ""
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
 msgstr "Vijfde"
+
+#~ msgid ""
+#~ "defines a rule or repeating pattern for an exception to a recurrence set"
+#~ msgstr ""
+#~ "definieert een regel of herhalingspatroon voor een uitzondering op een "
+#~ "herhaling"
+
+#~ msgid "Select data for ExRule"
+#~ msgstr "Selecteer gegevens voor uitzondering regel"
+
+#~ msgid "ExRule"
+#~ msgstr "UitzRegel"
+
+#~ msgid ""
+#~ "* Points to a sound resource,                     which is rendered when the "
+#~ "alarm is triggered for audio,\n"
+#~ "                    * File which is intended to be sent as message "
+#~ "attachments for email,\n"
+#~ "                    * Points to a procedure resource, which is invoked when  "
+#~ "                    the alarm is triggered for procedure."
+#~ msgstr ""
+#~ "* Verwijst naar een geluidsfragment, dat wordt afgespeeld nadat het alarm "
+#~ "voor audio is afgegaan,\n"
+#~ "                    * Bestand dat bedoeld is om mee te worden gestuurd als "
+#~ "bijlage bij een e-mail bericht,\n"
+#~ "                    * Verwijst naar een procedure bron, die wordt "
+#~ "aangeroepen nadat het alarm is afgegaan voor procedure."
diff --git a/addons/base_calendar/i18n/sr.po b/addons/base_calendar/i18n/sr.po
index 084471fb3cd..d23e4e3d5e4 100644
--- a/addons/base_calendar/i18n/sr.po
+++ b/addons/base_calendar/i18n/sr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-08-19 12:50+0000\n"
-"PO-Revision-Date: 2010-10-17 14:09+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-18 07:53+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@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: 2010-10-18 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
@@ -25,8 +25,6 @@ msgstr "Događaj počinje"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
 msgid "Hourly"
 msgstr "Po satu"
 
@@ -45,6 +43,12 @@ msgstr ""
 "Ovo svojstvo određuje listu ekssepcija datuma/vremena za ponavljajuću "
 "komponentu kalendara"
 
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr "Vremenska zona"
+
 #. module: base_calendar
 #: field:calendar.event.edit.all,name:0
 msgid "Title"
@@ -52,9 +56,7 @@ msgstr "Naslov"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
 #: selection:calendar.event,rrule_type:0
-#: selection:calendar.todo,freq:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Monthly"
 msgstr "Mesečno"
@@ -64,6 +66,11 @@ msgstr "Mesečno"
 msgid "Invited User"
 msgstr "Pozvani korisnik"
 
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "Select range to Exclude"
+msgstr ""
+
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -96,6 +103,12 @@ msgstr "Detalji poziva"
 msgid "Fourth"
 msgstr "Četvrti"
 
+#. module: base_calendar
+#: help:calendar.event,count:0
+#: help:calendar.todo,count:0
+msgid "Repeat max that times"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,show_as:0
 #: field:calendar.todo,show_as:0
@@ -120,6 +133,8 @@ msgstr "Javno"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Hours"
 msgstr "Sati"
@@ -207,9 +222,7 @@ msgstr "Utorak"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
 #: selection:calendar.event,rrule_type:0
-#: selection:calendar.todo,freq:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Yearly"
 msgstr "Godišnje"
@@ -239,6 +252,8 @@ msgstr "Soba"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Days"
 msgstr "Dana"
@@ -264,9 +279,9 @@ msgid "Chair Person"
 msgstr "Glavna Osoba"
 
 #. module: base_calendar
-#: selection:calendar.alarm,action:0
-msgid "Procedure"
-msgstr "Procedura"
+#: view:calendar.event:0
+msgid "Exclude range"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -281,6 +296,8 @@ msgstr "Otkazano"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Minutes"
 msgstr "Minuti"
@@ -302,8 +319,6 @@ msgstr "Tip poziva"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
 msgid "Secondly"
 msgstr "Drugo"
 
@@ -320,6 +335,11 @@ msgstr "Datum događaja"
 msgid "Group By..."
 msgstr "Grupirano po"
 
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,email:0
+msgid "Provide external email address who will receive this invitation."
+msgstr ""
+
 #. module: base_calendar
 #: help:calendar.attendee,partner_id:0
 msgid "Partner related to contact"
@@ -331,12 +351,10 @@ msgid "Specify the type of Invitation"
 msgstr "Odredite tip poziva"
 
 #. module: base_calendar
-#: help:calendar.event,exrule:0
-#: help:calendar.todo,exrule:0
-msgid ""
-"defines a rule or repeating pattern for an exception to a recurrence set"
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Years"
 msgstr ""
-"Definise pravilo ili ponavljajući uzorak za eksepciju u skupu ponavljanja"
 
 #. module: base_calendar
 #: field:calendar.alarm,event_end_date:0
@@ -349,6 +367,12 @@ msgstr "Datum završetka događaja"
 msgid "Optional Participation"
 msgstr "Neobvezno sudelovanje"
 
+#. module: base_calendar
+#: help:calendar.event,interval:0
+#: help:calendar.todo,interval:0
+msgid "Repeat every x"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,date_deadline:0
 #: field:calendar.todo,date_deadline:0
@@ -504,6 +528,12 @@ msgstr "Poverljivo"
 msgid "Repeat Until"
 msgstr "Ponavljaj dok"
 
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Seconds"
+msgstr ""
+
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Visibility"
@@ -577,6 +607,11 @@ msgstr "Obvezno sudelovanje"
 msgid "Created"
 msgstr "Kreirano"
 
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
+msgid "Set Exclude range"
+msgstr ""
+
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
@@ -585,9 +620,7 @@ msgstr "Privatno"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
 #: selection:calendar.event,rrule_type:0
-#: selection:calendar.todo,freq:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Daily"
 msgstr "Dnevno"
@@ -610,6 +643,12 @@ msgstr "Označi kao"
 msgid "Contact"
 msgstr "Kontakt"
 
+#. module: base_calendar
+#: help:calendar.event,rrule_type:0
+#: help:calendar.todo,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr ""
+
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
@@ -623,11 +662,6 @@ msgstr "Delegiraj"
 msgid "Partner"
 msgstr "Partner"
 
-#. module: base_calendar
-#: view:base.calendar.set.exrule:0
-msgid "Select data for ExRule"
-msgstr "Odaberi podatke za pravilo iznimke"
-
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: selection:base_calendar.invite.attendee,type:0
@@ -733,6 +767,12 @@ msgstr "Moji Dogadjaji"
 msgid "Decline"
 msgstr "Odbij"
 
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Weeks"
+msgstr ""
+
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Group"
@@ -818,7 +858,6 @@ msgstr "Podsetnik"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
 msgstr "Postavi pravilo izuzetka"
@@ -900,21 +939,17 @@ msgid "Delegated From"
 msgstr "Delegirano Od"
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: field:calendar.attendee,user_id:0
 msgid "User"
 msgstr "Korisnik"
 
 #. module: base_calendar
-#: view:calendar.event:0
-msgid "ExRule"
-msgstr "Pravilo Izuzetka"
-
-#. module: base_calendar
-#: view:calendar.event:0
-#: field:calendar.event,date:0
-msgid "Date"
-msgstr "Datum"
+#: field:calendar.alarm,active:0
+#: field:calendar.event,active:0
+#: field:calendar.todo,active:0
+#: field:res.alarm,active:0
+msgid "Active"
+msgstr "Aktivan"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
@@ -928,6 +963,11 @@ msgstr "Novembar"
 msgid "Indicate the groups that the attendee belongs to"
 msgstr "Označite grupe kojima ucesnik pripada"
 
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Data"
+msgstr ""
+
 #. module: base_calendar
 #: field:base.calendar.set.exrule,mo:0
 #: field:calendar.event,mo:0
@@ -1002,12 +1042,10 @@ msgid "Summary"
 msgstr "Sumarno"
 
 #. module: base_calendar
-#: field:calendar.alarm,active:0
-#: field:calendar.event,active:0
-#: field:calendar.todo,active:0
-#: field:res.alarm,active:0
-msgid "Active"
-msgstr "Aktivan"
+#: view:calendar.event:0
+#: field:calendar.event,date:0
+msgid "Date"
+msgstr "Datum"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -1019,6 +1057,11 @@ msgstr "Pozivnica"
 msgid "Action"
 msgstr "Radnja"
 
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,type:0
+msgid "Select whom you want to Invite"
+msgstr ""
+
 #. module: base_calendar
 #: help:calendar.alarm,duration:0
 #: help:res.alarm,duration:0
@@ -1056,9 +1099,7 @@ msgstr "Pretraži događaje"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
 #: selection:calendar.event,rrule_type:0
-#: selection:calendar.todo,freq:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Weekly"
 msgstr "Sedmično"
@@ -1144,6 +1185,11 @@ msgstr "res.users"
 msgid "Tuesday"
 msgstr "Utorak"
 
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Procedure"
+msgstr "Procedura"
+
 #. module: base_calendar
 #: help:calendar.alarm,description:0
 msgid ""
@@ -1180,6 +1226,7 @@ msgid "Tentative"
 msgstr "Uslovno"
 
 #. module: base_calendar
+#: view:calendar.attendee:0
 #: view:calendar.event:0
 #: field:calendar.event,user_id:0
 #: field:calendar.todo,user_id:0
@@ -1231,6 +1278,14 @@ msgstr ""
 msgid "Details"
 msgstr "Detalji"
 
+#. module: base_calendar
+#: help:calendar.event,exrule:0
+#: help:calendar.todo,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+
 #. module: base_calendar
 #: field:base.calendar.set.exrule,month_list:0
 #: field:calendar.event,month_list:0
@@ -1340,8 +1395,6 @@ msgstr ""
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
 msgid "Minutely"
 msgstr "U minutama"
 
@@ -1363,6 +1416,12 @@ msgstr "Završni Datum"
 msgid "February"
 msgstr "Februar"
 
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Months"
+msgstr ""
+
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Resource"
@@ -1481,10 +1540,10 @@ msgid "Sequence"
 msgstr "Sekvenca"
 
 #. module: base_calendar
-#: field:calendar.event,vtimezone:0
-#: field:calendar.todo,vtimezone:0
-msgid "Timezone"
-msgstr "Vremenska zona"
+#: help:calendar.event,alarm_id:0
+#: help:calendar.todo,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr ""
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
@@ -1497,13 +1556,6 @@ msgstr "Interni Korisnik"
 msgid "Accept"
 msgstr "Prihvati"
 
-#. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
-#: selection:calendar.event,week_list:0
-#: selection:calendar.todo,week_list:0
-msgid "Saturday"
-msgstr "Subota"
-
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation To"
@@ -1544,18 +1596,11 @@ msgid "Trigger Date"
 msgstr "Datum okidanja"
 
 #. module: base_calendar
-#: help:calendar.alarm,attach:0
-msgid ""
-"* Points to a sound resource,                     which is rendered when the "
-"alarm is triggered for audio,\n"
-"                    * File which is intended to be sent as message "
-"attachments for email,\n"
-"                    * Points to a procedure resource, which is invoked when  "
-"                    the alarm is triggered for procedure."
-msgstr ""
-"* Pokazuje na datoteku sa zvukom, koji se pojavljuje kada se pokrene alarm,\n"
-"* Na datoteku koja se treba poslati kao dodatak e-pošte,\n"
-"* Na proceduru koja se pokreće kada se pokrene alarm za proceduru."
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Saturday"
+msgstr "Subota"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
@@ -1563,3 +1608,26 @@ msgstr ""
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
 msgstr "Peti"
+
+#~ msgid ""
+#~ "defines a rule or repeating pattern for an exception to a recurrence set"
+#~ msgstr ""
+#~ "Definise pravilo ili ponavljajući uzorak za eksepciju u skupu ponavljanja"
+
+#~ msgid "Select data for ExRule"
+#~ msgstr "Odaberi podatke za pravilo iznimke"
+
+#~ msgid "ExRule"
+#~ msgstr "Pravilo Izuzetka"
+
+#~ msgid ""
+#~ "* Points to a sound resource,                     which is rendered when the "
+#~ "alarm is triggered for audio,\n"
+#~ "                    * File which is intended to be sent as message "
+#~ "attachments for email,\n"
+#~ "                    * Points to a procedure resource, which is invoked when  "
+#~ "                    the alarm is triggered for procedure."
+#~ msgstr ""
+#~ "* Pokazuje na datoteku sa zvukom, koji se pojavljuje kada se pokrene alarm,\n"
+#~ "* Na datoteku koja se treba poslati kao dodatak e-pošte,\n"
+#~ "* Na proceduru koja se pokreće kada se pokrene alarm za proceduru."
diff --git a/addons/base_contact/i18n/mn.po b/addons/base_contact/i18n/mn.po
index 1d6c7e0c9f7..da0768540e7 100644
--- a/addons/base_contact/i18n/mn.po
+++ b/addons/base_contact/i18n/mn.po
@@ -7,25 +7,269 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 09:24+0000\n"
-"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-18 07:18+0000\n"
+"Last-Translator: sugi <Unknown>\n"
 "Language-Team: Mongolian <mn@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: 2010-09-30 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: base_contact
+#: field:res.partner.contact,title:0
+msgid "Title"
+msgstr "Гарчиг"
+
+#. module: base_contact
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
+
+#. module: base_contact
+#: view:res.partner.address:0
+msgid "# of Contacts"
+msgstr "Харьцах хүмүүсийн тоо"
+
+#. module: base_contact
+#: field:res.partner.job,fax:0
+msgid "Fax"
+msgstr "Факс"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "title"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,date_start:0
+msgid "Start date of job(Joining Date)"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,function:0
+msgid "Function of this contact with this partner"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,state:0
+msgid "Status of Address"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,name:0
+msgid ""
+"You may                     enter Address first,Partner will be linked "
+"automatically if any."
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,fax:0
+msgid "Job FAX no."
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,mobile:0
+msgid "Mobile"
+msgstr "Гар утас"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.contact,comment:0
+msgid "Notes"
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_contacts0
+msgid "People you work with."
+msgstr "Таны харьцдаг хүмүүс."
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
+msgid "Define functions and address."
+msgstr "Үүрэг болон хаяг тодорхойлох."
+
+#. module: base_contact
+#: help:res.partner.job,date_stop:0
+msgid "Last date of job"
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+#: field:base.contact.installer,migrate:0
+msgid "Migrate"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.job,name:0
+msgid "Partner"
+msgstr "Харилцагч"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_function0
+msgid "Jobs at a same partner address."
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_partners0
+msgid "Partners"
+msgstr "Харилцагч"
+
+#. module: base_contact
+#: field:res.partner.job,function:0
+msgid "Partner Function"
+msgstr "Харилцагчийн үүрэг"
+
+#. module: base_contact
+#: field:res.partner.job,state:0
+msgid "State"
+msgstr "Төлөв"
+
+#. module: base_contact
+#: model:ir.module.module,shortdesc:base_contact.module_meta_information
+#: model:process.process,name:base_contact.process_process_basecontactprocess0
+msgid "Base Contact"
+msgstr "Суурь харьцах хүн"
+
+#. module: base_contact
+#: field:res.partner.job,date_stop:0
+msgid "Date Stop"
+msgstr "Дуусах огноо"
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
+msgid "Contact's Jobs"
+msgstr "Харьцах хүний ажил"
+
+#. module: base_contact
+#: view:res.partner:0
+msgid "Categories"
+msgstr "Ангилалууд"
+
+#. module: base_contact
+#: help:res.partner.job,sequence_partner:0
+msgid ""
+"Order of importance                 of this job title in the list of job "
+"title of the linked partner"
+msgstr ""
+
+#. module: base_contact
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Дэлгэцийн XML алдаатай!"
+
+#. module: base_contact
+#: field:res.partner.job,extension:0
+msgid "Extension"
+msgstr "Өргөтгөл"
+
+#. module: base_contact
+#: help:res.partner.job,extension:0
+msgid "Internal/External extension phone number"
+msgstr "Дотоод/Гадаад өргөтгөл дугаар"
+
+#. module: base_contact
+#: help:res.partner.job,phone:0
+msgid "Job Phone no."
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.contact,job_ids:0
+msgid "Functions and Addresses"
+msgstr "Үүрэг ба Хаягууд"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_contact
+#: field:res.partner.job,contact_id:0
+msgid "Contact"
+msgstr "Харьцах хүн"
+
+#. module: base_contact
+#: help:res.partner.job,email:0
+msgid "Job E-Mail"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,sequence_partner:0
+msgid "Partner Seq."
+msgstr "Харицагчийн Д/д."
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_functiontoaddress0
+msgid "Function to address"
+msgstr "Хаяглах албан тушаал"
+
+#. module: base_contact
+#: field:res.partner.contact,name:0
+msgid "Last Name"
+msgstr "Эцгийн нэр"
+
+#. module: base_contact
+#: view:res.partner:0
+#: view:res.partner.contact:0
+msgid "Communication"
+msgstr ""
+
+#. module: base_contact
+#: field:base.contact.installer,config_logo:0
+#: field:res.partner.contact,photo:0
+msgid "Image"
+msgstr ""
+
+#. module: base_contact
+#: selection:res.partner.job,state:0
+msgid "Past"
+msgstr "Өмнөх"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_address
+msgid "Partner Addresses"
+msgstr ""
+
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
 msgid "Contact Seq."
+msgstr "Гэрээний дараалал"
+
+#. module: base_contact
+#: view:res.partner.address:0
+msgid "Search Contact"
 msgstr ""
 
 #. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-msgid "res.partner.contact"
-msgstr "res.partner.contact"
+#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
+#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
+#: model:ir.ui.menu,name:base_contact.menu_purchases_partner_contact_form
+#: model:process.node,name:base_contact.process_node_contacts0
+#: view:res.partner:0
+#: field:res.partner.address,job_ids:0
+msgid "Contacts"
+msgstr "Харьцах хүмүүс"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid ""
+"Due to changes in Address and Partner's relation, some of the details from "
+"address are needed to be migrated into contact information."
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_addresses0
+msgid "Working and private addresses."
+msgstr "Ажлын болон хувийн хаягууд."
+
+#. module: base_contact
+#: help:res.partner.job,address_id:0
+msgid "Address which is linked to the Partner"
+msgstr ""
+
+#. module: base_contact
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
 
 #. module: base_contact
 #: constraint:ir.model:0
@@ -36,29 +280,122 @@ msgstr ""
 "болохгүй!"
 
 #. module: base_contact
-#: field:res.partner.job,function_id:0
-msgid "Partner Function"
-msgstr "Харилцагчийн үүрэг"
+#: help:res.partner.job,other:0
+msgid "Additional phone field"
+msgstr "Нэмэлт утас"
 
 #. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
-#: model:ir.ui.menu,name:base_contact.menu_partner_contact_form
-#: model:process.node,name:base_contact.process_node_contacts0
-#: view:res.partner:0
-#: view:res.partner.address:0
-#: field:res.partner.address,job_ids:0
-msgid "Contacts"
-msgstr "Харьцах хүмүүс"
+#: field:res.partner.contact,website:0
+msgid "Website"
+msgstr "Вэбсайт"
 
 #. module: base_contact
-#: field:res.partner.job,sequence_partner:0
-msgid "Partner Seq."
-msgstr "Харицагчийн Д/д."
+#: view:base.contact.installer:0
+msgid "Otherwise these details will not be visible from address/contact."
+msgstr ""
+
+#. module: base_contact
+#: field:base.contact.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,email:0
+#: field:res.partner.job,email:0
+msgid "E-Mail"
+msgstr "И-Мэйл"
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_base_contact_installer
+msgid "base.contact.installer"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.contact,active:0
+msgid ""
+"If the active field is set to true,                 it will allow you to "
+"hide the partner contact without removing it."
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.job:0
+msgid "Contact Functions"
+msgstr "Харьцах хүний үүрэг"
+
+#. module: base_contact
+#: field:res.partner.job,phone:0
+msgid "Phone"
+msgstr "Утас"
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Do you want to migrate your Address data in Contact Data?"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,active:0
+msgid "Active"
+msgstr "Идэвхитэй"
+
+#. module: base_contact
+#: field:res.partner.contact,function:0
+msgid "Main Function"
+msgstr "Үндсэн үүрэг"
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
+msgid "Define partners and their addresses."
+msgstr "Харилцагч, тэдний хаягыг тодорхойлох."
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Seq."
+msgstr "Д/д."
+
+#. module: base_contact
+#: field:res.partner.contact,lang_id:0
+msgid "Language"
+msgstr "Хэл"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Extra Information"
+msgstr "Нэмэлт мэдээлэл"
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_partners0
+msgid "Companies you work with."
+msgstr "Таны харьцаг компаниуд"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Partner Contact"
+msgstr "Харьцах хүн"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "General"
+msgstr "Ерөнхий"
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Photo"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,birthdate:0
+msgid "Birth Date"
+msgstr "Төрсөн огноо"
+
+#. module: base_contact
+#: help:base.contact.installer,migrate:0
+msgid "If you select this, all addresses will be migrated."
+msgstr ""
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Current"
-msgstr ""
+msgstr "Одоо"
 
 #. module: base_contact
 #: field:res.partner.contact,first_name:0
@@ -75,194 +412,47 @@ msgstr ""
 msgid "Other"
 msgstr "Бусад"
 
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_contacttofunction0
-msgid "Contact to function"
-msgstr "Хариуцах хүн"
-
-#. module: base_contact
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr "Хаяглах харилцагч"
-
-#. module: base_contact
-#: view:res.partner.address:0
-msgid "# of Contacts"
-msgstr "Харьцах хүмүүсийн тоо"
-
-#. module: base_contact
-#: help:res.partner.job,other:0
-msgid "Additional phone field"
-msgstr "Нэмэлт утас"
-
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_function0
 msgid "Function"
 msgstr "Үүрэг"
 
-#. module: base_contact
-#: field:res.partner.job,fax:0
-msgid "Fax"
-msgstr "Факс"
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr "Хэл"
-
-#. module: base_contact
-#: field:res.partner.job,phone:0
-msgid "Phone"
-msgstr "Утас"
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_contacttofunction0
-msgid "Defines contacts and functions."
-msgstr "Харьцах хүмүүс, үүргийг тодорхойлно."
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr "Гарчиг"
-
-#. module: base_contact
-#: view:res.partner.job:0
-msgid "Contact Functions"
-msgstr "Харьцах хүний үүрэг"
-
-#. module: base_contact
-#: model:ir.module.module,shortdesc:base_contact.module_meta_information
-msgid "Base Contact"
-msgstr "Суурь харьцах хүн"
-
-#. module: base_contact
-#: help:res.partner.job,sequence_partner:0
-msgid ""
-"Order of importance of this job title in the list of job title of the linked "
-"partner"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-#: field:res.partner.job,email:0
-msgid "E-Mail"
-msgstr "И-Мэйл"
-
-#. module: base_contact
-#: field:res.partner.job,date_stop:0
-msgid "Date Stop"
-msgstr "Дуусах огноо"
-
-#. module: base_contact
-#: view:res.partner:0
-#: field:res.partner.job,address_id:0
-msgid "Address"
-msgstr "Хаяг"
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
-#: model:ir.ui.menu,name:base_contact.menu_action_res_partner_job
-msgid "Contact's Jobs"
-msgstr "Харьцах хүний ажил"
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr "Үндэстэн"
-
-#. module: base_contact
-#: help:res.partner.job,sequence_contact:0
-msgid ""
-"Order of importance of this address in the list of addresses of the linked "
-"contact"
-msgstr "Хаягын жагсаалтад эрэмбэлэгдэх байрлал"
-
 #. module: base_contact
 #: field:res.partner.address,job_id:0
 #: field:res.partner.contact,job_id:0
 msgid "Main Job"
 msgstr "Үндсэн ажил"
 
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_contacttofunction0
+msgid "Defines contacts and functions."
+msgstr "Харьцах хүмүүс, үүргийг тодорхойлно."
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_contacttofunction0
+msgid "Contact to function"
+msgstr "Хариуцах хүн"
+
 #. module: base_contact
 #: view:res.partner:0
-msgid "Categories"
-msgstr "Ангилалууд"
+#: field:res.partner.job,address_id:0
+msgid "Address"
+msgstr "Хаяг"
 
 #. module: base_contact
-#: field:res.partner.contact,function_id:0
-msgid "Main Function"
-msgstr "Үндсэн үүрэг"
+#: field:res.partner.contact,country_id:0
+msgid "Nationality"
+msgstr "Үндэстэн"
 
 #. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr "Харилцагч, тэдний хаягыг тодорхойлох."
-
-#. module: base_contact
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Дэлгэцийн XML алдаатай!"
-
-#. module: base_contact
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact Process"
+#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
+msgid "Open Jobs"
 msgstr ""
 
 #. module: base_contact
-#: view:res.partner.contact:0
-msgid "Seq."
-msgstr "Д/д."
-
-#. module: base_contact
-#: field:res.partner.job,extension:0
-msgid "Extension"
-msgstr "Өргөтгөл"
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr "Гар утас"
-
-#. module: base_contact
-#: help:res.partner.job,extension:0
-msgid "Internal/External extension phone number"
-msgstr "Дотоод/Гадаад өргөтгөл дугаар"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr "Таны харьцдаг хүмүүс."
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr "Нэмэлт мэдээлэл"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr "Үүрэг ба Хаягууд"
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr "Идэвхитэй"
-
-#. module: base_contact
-#: field:res.partner.job,contact_id:0
-msgid "Contact"
-msgstr "Харьцах хүн"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr "Таны харьцаг компаниуд"
+#: field:base.contact.installer,name:0
+msgid "Name"
+msgstr ""
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
@@ -270,24 +460,14 @@ msgid "Main Employer"
 msgstr "Үндсэн ажил олгогч"
 
 #. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_functiontoaddress0
-msgid "Function to address"
-msgstr "Хаяглах албан тушаал"
+#: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
+msgid "Address Migration"
+msgstr ""
 
 #. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
-msgid "Partner Contacts"
-msgstr "Харилцагчийн холбоосууд"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
-msgstr "Харьцах хүн"
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr "Харилцагч"
+#: view:res.partner:0
+msgid "Postal Address"
+msgstr ""
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_addresses0
@@ -296,45 +476,9 @@ msgid "Addresses"
 msgstr "Хаягууд"
 
 #. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr "Ажлын болон хувийн хаягууд."
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Last Name"
-msgstr "Эцгийн нэр"
-
-#. module: base_contact
-#: field:res.partner.job,state:0
-msgid "State"
-msgstr "Төлөв"
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: view:res.partner.job:0
-msgid "General"
-msgstr "Ерөнхий"
-
-#. module: base_contact
-#: selection:res.partner.job,state:0
-msgid "Past"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General Information"
-msgstr "Ерөнхий мэдээлэл"
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_function0
-msgid "Jobs at a same partner address."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.job,name:0
-msgid "Partner"
-msgstr "Харилцагч"
+#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
+msgid "Partner to address"
+msgstr "Хаяглах харилцагч"
 
 #. module: base_contact
 #: field:res.partner.job,date_start:0
@@ -342,16 +486,22 @@ msgid "Date Start"
 msgstr "Эхлэх огноо"
 
 #. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
-msgid "Define functions and address."
-msgstr "Үүрэг болон хаяг тодорхойлох."
+#: help:res.partner.job,sequence_contact:0
+msgid ""
+"Order of                     importance of this address in the list of "
+"addresses of the linked contact"
+msgstr ""
 
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr "Вэбсайт"
+#~ msgid "Partner Contacts"
+#~ msgstr "Харилцагчийн холбоосууд"
 
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr "Төрсөн огноо"
+#~ msgid "General Information"
+#~ msgstr "Ерөнхий мэдээлэл"
+
+#~ msgid "res.partner.contact"
+#~ msgstr "res.partner.contact"
+
+#~ msgid ""
+#~ "Order of importance of this address in the list of addresses of the linked "
+#~ "contact"
+#~ msgstr "Хаягын жагсаалтад эрэмбэлэгдэх байрлал"
diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po
index 4c40197553e..6700b1be115 100644
--- a/addons/base_setup/i18n/nl.po
+++ b/addons/base_setup/i18n/nl.po
@@ -6,159 +6,253 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-22 08:50+0000\n"
-"Last-Translator: Jan Verlaan (Veritos) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-18 21:45+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <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: 2010-09-29 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
-#: wizard_field:base_setup.base_setup,company,city:0
-#: wizard_field:base_setup.base_setup,init,city:0
-#: wizard_field:base_setup.base_setup,update,city:0
+#: field:base.setup.company,city:0
 msgid "City"
 msgstr "Plaats"
 
 #. module: base_setup
-#: wizard_view:base_setup.base_setup,finish:0
+#: constraint:ir.model:0
 msgid ""
-"You can start configuring the system or connect directly to the database "
-"using the default setup."
+"The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"U kunt meteen beginnen met het configureren van het systeem of direct "
-"verbinden met de database met de standaard setup."
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
 
 #. module: base_setup
-#: wizard_field:base_setup.base_setup,company,zip:0
-#: wizard_field:base_setup.base_setup,init,zip:0
-#: wizard_field:base_setup.base_setup,update,zip:0
-msgid "Zip code"
-msgstr "Postcode"
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Ongeldige modelnaam in de definitie van de actie."
 
 #. module: base_setup
-#: wizard_view:base_setup.base_setup,init:0
-msgid "Select a Profile"
-msgstr "Kies een profiel"
+#: field:base.setup.installer,account_voucher:0
+msgid "Invoicing"
+msgstr "Facturatie"
 
 #. module: base_setup
-#: wizard_view:base_setup.base_setup,company:0
-msgid "Report header"
-msgstr "Koptekst rapport"
-
-#. module: base_setup
-#: wizard_button:base_setup.base_setup,finish,config:0
-msgid "Start Configuration"
-msgstr "Configuratie beginnen"
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,init:0
-msgid ""
-"You'll be able to install more modules later through the Administration menu."
-msgstr ""
-"Later kunnen er meer modules worden geïnstalleerd via het Administratie menu."
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,init:0
-msgid ""
-"A profile sets a pre-selection of modules for specific needs. These profiles "
-"have been setup to help you discover the different aspects of OpenERP. This "
-"is just an overview, we have 300+ available modules."
-msgstr ""
-"Een profiel bevat een voorselectie van modules voor specifieke behoeften. "
-"Deze profielen zijn een opzet om u te helpen de verschillende aspecten van "
-"OpenERP te ontdekken. Dit is slechts een overzicht, we hebben meer dan 300 "
-"modules beschikbaar"
-
-#. module: base_setup
-#: wizard_button:base_setup.base_setup,company,update:0
-#: wizard_button:base_setup.base_setup,init,company:0
-msgid "Next"
-msgstr "Volgende"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,email:0
-#: wizard_field:base_setup.base_setup,init,email:0
-#: wizard_field:base_setup.base_setup,update,email:0
-msgid "E-mail"
-msgstr "E-mail"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,state_id:0
-#: wizard_field:base_setup.base_setup,init,state_id:0
-#: wizard_field:base_setup.base_setup,update,state_id:0
-msgid "State"
-msgstr "Staat/Provincie"
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,finish:0
-msgid "Your new database is now fully installed."
-msgstr "De database is geïnstalleerd."
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,profile:0
-#: wizard_field:base_setup.base_setup,init,profile:0
-#: wizard_field:base_setup.base_setup,update,profile:0
-msgid "Profile"
-msgstr "Profiel"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,rml_footer1:0
-#: wizard_field:base_setup.base_setup,init,rml_footer1:0
-#: wizard_field:base_setup.base_setup,update,rml_footer1:0
-msgid "Report Footer 1"
-msgstr "Rapport Voettekst 1"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,rml_footer2:0
-#: wizard_field:base_setup.base_setup,init,rml_footer2:0
-#: wizard_field:base_setup.base_setup,update,rml_footer2:0
-msgid "Report Footer 2"
-msgstr "Rapport Voettekst 2"
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,company:0
-msgid "General Information"
-msgstr "Algemene Informatie"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,street2:0
-#: wizard_field:base_setup.base_setup,init,street2:0
-#: wizard_field:base_setup.base_setup,update,street2:0
-msgid "Street2"
-msgstr "Adres 2"
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,company:0
-msgid "Report Information"
-msgstr "Rapportinformatie"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,phone:0
-#: wizard_field:base_setup.base_setup,init,phone:0
-#: wizard_field:base_setup.base_setup,update,phone:0
-msgid "Phone"
-msgstr "Telefoon"
-
-#. module: base_setup
-#: wizard_view:base_setup.base_setup,company:0
-msgid "Define Main Company"
-msgstr "Defineer moederorganisatie"
-
-#. module: base_setup
-#: wizard_field:base_setup.base_setup,company,name:0
-#: wizard_field:base_setup.base_setup,init,name:0
-#: wizard_field:base_setup.base_setup,update,name:0
+#: field:base.setup.company,name:0
 msgid "Company Name"
 msgstr "Bedrijfsnaam"
 
 #. module: base_setup
-#: help:base_setup.base_setup,company,rml_footer2:0
-#: help:base_setup.base_setup,init,rml_footer2:0
-#: help:base_setup.base_setup,update,rml_footer2:0
+#: field:base.setup.company,email:0
+msgid "E-mail"
+msgstr "E-mail"
+
+#. module: base_setup
+#: field:base.setup.company,account_no:0
+msgid "Bank Account No"
+msgstr "Bank Rekening Nr"
+
+#. module: base_setup
+#: field:base.setup.installer,profile_tools:0
+msgid "Extra Tools"
+msgstr "Extra hulpmiddelen"
+
+#. module: base_setup
+#: field:base.setup.company,rml_footer1:0
+msgid "Report Footer 1"
+msgstr "Rapport Voettekst 1"
+
+#. module: base_setup
+#: help:base.setup.installer,mrp:0
+msgid ""
+"Helps you manage your manufacturing processes and generate reports on those "
+"processes."
+msgstr ""
+"Helpt uw productieprocessen te beheren en genereert overzichten van die "
+"processen."
+
+#. module: base_setup
+#: help:base.setup.installer,marketing:0
+msgid "Helps you manage your marketing campaigns step by step."
+msgstr "Helpt uw marketing campagnes stap voor stap te beheren."
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "Your database is now created."
+msgstr "Uw database is nu gemaakt."
+
+#. module: base_setup
+#: field:base.setup.installer,point_of_sale:0
+msgid "Point of Sales"
+msgstr "Kassa's"
+
+#. module: base_setup
+#: field:base.setup.installer,association:0
+msgid "Associations"
+msgstr "Verenigingen"
+
+#. module: base_setup
+#: help:base.setup.installer,account_accountant:0
+msgid ""
+"Helps you handle your accounting needs, if you are not an accountant, we "
+"suggest you to install only the Invoicing "
+msgstr ""
+"Helpt uw boekhouding te regelen; al u geen boekhouder bent, stellen we voor "
+"om alleen de facturatie te installeren "
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid ""
+"You can start configuring the system or connect directly to the database as "
+"an administrator."
+msgstr ""
+"U kunt beginnen met de configuratie van het systeem of direct verbinden met "
+"de database als beheerder."
+
+#. module: base_setup
+#: field:base.setup.company,progress:0
+#: field:base.setup.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Voortgang configuratie"
+
+#. module: base_setup
+#: field:base.setup.company,rml_footer2:0
+msgid "Report Footer 2"
+msgstr "Rapport Voettekst 2"
+
+#. module: base_setup
+#: field:base.setup.company,currency:0
+#: model:ir.model,name:base_setup.model_res_currency
+msgid "Currency"
+msgstr "Valuta"
+
+#. module: base_setup
+#: field:base.setup.company,state_id:0
+msgid "Fed. State"
+msgstr "Staat/Provincie"
+
+#. module: base_setup
+#: field:base.setup.installer,marketing:0
+msgid "Marketing"
+msgstr "Marketing"
+
+#. module: base_setup
+#: field:base.setup.company,company_id:0
+msgid "Company"
+msgstr "Bedrijf"
+
+#. module: base_setup
+#: field:base.setup.installer,sale:0
+msgid "Sales Management"
+msgstr "Verkoopbeheer"
+
+#. module: base_setup
+#: help:base.setup.installer,profile_tools:0
+msgid ""
+"Lets you install various interesting but non-essential tools like Survey, "
+"Lunch and Ideas box."
+msgstr ""
+"Laat u verschillende interessante maar niet-noodzakelijke hulpmiddelen zoals "
+"enquête, lunch en ideeënbus installeren."
+
+#. module: base_setup
+#: field:base.setup.installer,report_designer:0
+msgid "Advanced Reporting"
+msgstr "Geavanceerde overzichten"
+
+#. module: base_setup
+#: field:base.setup.company,phone:0
+msgid "Phone"
+msgstr "Telefoon"
+
+#. module: base_setup
+#: view:base.setup.company:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
+#. module: base_setup
+#: view:base.setup.installer:0
+msgid "title"
+msgstr "titel"
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "Use Directly"
+msgstr "Direct Gebruiken"
+
+#. module: base_setup
+#: field:base.setup.installer,knowledge:0
+msgid "Knowledge Management"
+msgstr "Kennisbeheer"
+
+#. module: base_setup
+#: help:base.setup.installer,product_expiry:0
+msgid ""
+"Installs a preselected set of OpenERP applications which will help you "
+"manage your industry."
+msgstr ""
+"Installeert een voorgeselecteerde groep OpenERP applicaties die u helpen bij "
+"het beheren van uw bedrijfstak."
+
+#. module: base_setup
+#: help:base.setup.installer,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+"Helpt uw projecten en taken te beheren door ze te volgen, planningen te "
+"genereren, etc..."
+
+#. module: base_setup
+#: help:base.setup.installer,point_of_sale:0
+msgid ""
+"Helps you get the most out of your points of sales with fast sale encoding, "
+"simplified payment mode encoding, automatic picking lists generation and "
+"more."
+msgstr ""
+"Helpt u het meeste te halen uit uw kassa's met snelle codering, eenvoudige "
+"betaalmethode codering, automatische piklijst generatie en meer."
+
+#. module: base_setup
+#: help:base.setup.installer,hr:0
+msgid ""
+"Helps you manage your human resources by encoding your employees structure, "
+"generating work sheets, tracking attendance and more."
+msgstr ""
+"Helpt uw personeel te beheren door uw personeel structuur te coderen, "
+"werkbladen te genereren, aanwezigheid te volgen en meer."
+
+#. module: base_setup
+#: help:base.setup.installer,account_voucher:0
+msgid ""
+"Allows you to create your invoices and track the payments. It is an easier "
+"version of the accounting module for managers who are not accountants."
+msgstr ""
+"Laat u facturen maken en de betalingen volgen. Het is een simpeler versie "
+"van de boekhoud module voor managers die geen boekhouders zijn."
+
+#. module: base_setup
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Ongeldige XML voor weergave opbouw!"
+
+#. module: base_setup
+#: field:base.setup.installer,hr:0
+msgid "Human Resources"
+msgstr "Personeelszaken"
+
+#. module: base_setup
+#: help:base.setup.installer,purchase:0
+msgid ""
+"Helps you manage your purchase-related processes such as requests for "
+"quotations, supplier invoices, etc..."
+msgstr ""
+"Helpt de inkoop-gerelateerde processen te beheren zoals inkoop "
+"prijsaanvragen, inkoopfacturen, etc..."
+
+#. module: base_setup
+#: help:base.setup.company,rml_footer2:0
 msgid ""
 "This sentence will appear at the bottom of your reports.\n"
 "We suggest you to put bank information here:\n"
@@ -169,54 +263,110 @@ msgstr ""
 "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
 
 #. module: base_setup
-#: wizard_field:base_setup.base_setup,company,country_id:0
-#: wizard_field:base_setup.base_setup,init,country_id:0
-#: wizard_field:base_setup.base_setup,update,country_id:0
+#: field:base.setup.company,street2:0
+msgid "Street 2"
+msgstr "Straat 2"
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_base_setup_installer
+msgid "base.setup.installer"
+msgstr "base.setup.installer"
+
+#. module: base_setup
+#: field:base.setup.company,country_id:0
 msgid "Country"
 msgstr "Land"
 
 #. module: base_setup
-#: wizard_view:base_setup.base_setup,company:0
-#: wizard_view:base_setup.base_setup,finish:0
-#: wizard_view:base_setup.base_setup,init:0
-#: wizard_view:base_setup.base_setup,update:0
-#: model:ir.actions.wizard,name:base_setup.action_wizard_setup
-#: model:ir.actions.wizard,name:base_setup.wizard_base_setup
+#: model:ir.actions.act_window,name:base_setup.action_base_setup
 msgid "Setup"
 msgstr "Instellingen"
 
 #. module: base_setup
-#: help:base_setup.base_setup,company,rml_footer1:0
-#: help:base_setup.base_setup,init,rml_footer1:0
-#: help:base_setup.base_setup,update,rml_footer1:0
+#: field:base.setup.installer,account_accountant:0
+msgid "Accounting & Finance"
+msgstr "Boekhouding & Financiën"
+
+#. module: base_setup
+#: field:base.setup.installer,auction:0
+msgid "Auction Houses"
+msgstr "Veilinghuizen"
+
+#. module: base_setup
+#: field:base.setup.company,zip:0
+msgid "Zip Code"
+msgstr "Postcode"
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "Start Configuration"
+msgstr "Configuratie beginnen"
+
+#. module: base_setup
+#: help:base.setup.installer,knowledge:0
 msgid ""
-"This sentence will appear at the bottom of your reports.\n"
-"We suggest you to write legal sentences here:\n"
-"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
+"Lets you install addons geared towards sharing knowledge with and between "
+"your employees."
 msgstr ""
-"Deze regel verschijnt op de voet van uw rapporten.\n"
-"We raden u aan hier een bedrijfsstatement neer te zetten, bijv:\n"
-"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
+"Laat u aanvullingen installeren die gericht zijn op het delen van kennis met "
+"en tussen uw medewerkers."
 
 #. module: base_setup
-#: wizard_view:base_setup.base_setup,update:0
-msgid "Summary"
-msgstr "Samenvatting"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Company Configuration"
+msgstr "Bedrijf configuratie"
 
 #. module: base_setup
-#: wizard_button:base_setup.base_setup,update,finish:0
-msgid "Install"
-msgstr "Installeren"
+#: field:base.setup.company,logo:0
+msgid "Logo"
+msgstr "Logo"
 
 #. module: base_setup
-#: wizard_view:base_setup.base_setup,finish:0
-msgid "Installation Done"
-msgstr "Installatie Gereed"
+#: field:base.setup.installer,purchase:0
+msgid "Purchase Management"
+msgstr "Inkoopbeheer"
 
 #. module: base_setup
-#: help:base_setup.base_setup,company,rml_header1:0
-#: help:base_setup.base_setup,init,rml_header1:0
-#: help:base_setup.base_setup,update,rml_header1:0
+#: help:base.setup.installer,sale:0
+msgid "Helps you handle your quotations, sale orders and invoicing."
+msgstr "Helpt u offertes, verkooporders en facturen te beheren."
+
+#. module: base_setup
+#: field:base.setup.installer,stock:0
+msgid "Warehouse Management"
+msgstr "Manazijnbeheer"
+
+#. module: base_setup
+#: field:base.setup.installer,project:0
+msgid "Project Management"
+msgstr "Projectbeheer"
+
+#. module: base_setup
+#: field:base.setup.config,installed_users:0
+msgid "Installed Users"
+msgstr "Geïnstalleerde gebruikers"
+
+#. module: base_setup
+#: view:base.setup.config:0
+msgid "New Database"
+msgstr "Nieuwe database"
+
+#. module: base_setup
+#: field:base.setup.installer,crm:0
+msgid "Customer Relationship Management"
+msgstr "Klantrelatiebeheer"
+
+#. module: base_setup
+#: help:base.setup.installer,auction:0
+msgid ""
+"Installs a preselected set of OpenERP applications selected to help you "
+"manage your auctions as well as the business processes around them."
+msgstr ""
+"Installeert een voorgeselecteerde groep OpenERP applicaties die u helpt bij "
+"het beheren van veilingen evenals de processen eromheen."
+
+#. module: base_setup
+#: help:base.setup.company,rml_header1:0
 msgid ""
 "This sentence will appear at the top right corner of your reports.\n"
 "We suggest you to put a slogan here:\n"
@@ -227,47 +377,107 @@ msgstr ""
 "\"Open Source Business Solutions\"."
 
 #. module: base_setup
-#: wizard_field:base_setup.base_setup,company,rml_header1:0
-#: wizard_field:base_setup.base_setup,init,rml_header1:0
-#: wizard_field:base_setup.base_setup,update,rml_header1:0
+#: help:base.setup.installer,report_designer:0
+msgid ""
+"Lets you install various tools to simplify and enhance OpenERP's report "
+"creation."
+msgstr ""
+"Laat u verschillende hulpmiddelen installeren die OpenERP's overzichten "
+"aanmaak verbeteren en vereenvoudigen."
+
+#. module: base_setup
+#: field:base.setup.company,rml_header1:0
 msgid "Report Header"
 msgstr "Rapport koptekst"
 
 #. module: base_setup
-#: wizard_view:base_setup.base_setup,company:0
+#: view:base.setup.config:0
+msgid "Information about your new database"
+msgstr "Informatie over uw nieuwe database"
+
+#. module: base_setup
+#: field:base.setup.company,config_logo:0
+#: field:base.setup.config,config_logo:0
+#: field:base.setup.installer,config_logo:0
+msgid "Image"
+msgstr "Afbeelding"
+
+#. module: base_setup
+#: field:base.setup.installer,product_expiry:0
+msgid "Food Industry"
+msgstr "Voedingsindustrie"
+
+#. module: base_setup
+#: field:base.setup.installer,mrp:0
+msgid "Manufacturing"
+msgstr "Productie"
+
+#. module: base_setup
+#: view:base.setup.company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
 msgstr "Uw Logo - Gebruik een afmeting van ongeveer 450x150 pixels."
 
 #. module: base_setup
-#: wizard_field:base_setup.base_setup,company,currency:0
-#: wizard_field:base_setup.base_setup,init,currency:0
-#: wizard_field:base_setup.base_setup,update,currency:0
-msgid "Currency"
-msgstr "Valuta"
+#: help:base.setup.company,rml_footer1:0
+msgid ""
+"This sentence will appear at the bottom of your reports.\n"
+"We suggest you to write legal sentences here:\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
+msgstr ""
+"Deze regel verschijnt op de voet van uw rapporten.\n"
+"We raden u aan hier een bedrijfsstatement neer te zetten, bijv:\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 
 #. module: base_setup
-#: wizard_field:base_setup.base_setup,company,street:0
-#: wizard_field:base_setup.base_setup,init,street:0
-#: wizard_field:base_setup.base_setup,update,street:0
+#: field:base.setup.company,website:0
+msgid "Company Website"
+msgstr "Website bedrijf"
+
+#. module: base_setup
+#: view:base.setup.installer:0
+msgid "Install Specific Industry Applications"
+msgstr "Installeer specifieke bedrijfstak appliacties"
+
+#. module: base_setup
+#: field:base.setup.company,street:0
 msgid "Street"
 msgstr "Adres"
 
 #. module: base_setup
-#: wizard_button:base_setup.base_setup,finish,menu:0
-msgid "Use Directly"
-msgstr "Direct Gebruiken"
+#: model:ir.model,name:base_setup.model_base_setup_company
+msgid "base.setup.company"
+msgstr "base.setup.company"
 
 #. module: base_setup
-#: wizard_button:base_setup.base_setup,init,menu:0
-msgid "Cancel"
-msgstr "Annuleren"
+#: help:base.setup.company,website:0
+msgid "Example: http://openerp.com"
+msgstr "Voorbeeld: http://openerp.com"
 
 #. module: base_setup
-#: wizard_field:base_setup.base_setup,company,logo:0
-#: wizard_field:base_setup.base_setup,init,logo:0
-#: wizard_field:base_setup.base_setup,update,logo:0
-msgid "Logo"
-msgstr "Logo"
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
+msgid "Install Applications"
+msgstr "Installeer applicaties"
+
+#. module: base_setup
+#: help:base.setup.installer,crm:0
+msgid ""
+"Helps you track and manage relations with customers such as leads, requests "
+"or issues. Can automatically send reminders, escalate requests or trigger "
+"business-specific actions based on standard events."
+msgstr ""
+"Helpt u bij het volgen en beheren van relaties met klanten zoals leads, "
+"aanvragen en incidenten. Kan automatisch herinneringen sturen, aanvragen "
+"escaleren en bedrijfs-specifieke acties oproepen op basis van standaard "
+"gebeurtenissen."
+
+#. module: base_setup
+#: help:base.setup.installer,stock:0
+msgid ""
+"Helps you manage your inventory and main stock operations: delivery orders, "
+"receptions, etc."
+msgstr ""
+"Helpt uw voorraad te beheren en bij belangrijke voorraad bewerkingen: "
+"leveringen, ontvangsten, etc."
 
 #. module: base_setup
 #: model:ir.module.module,shortdesc:base_setup.module_meta_information
@@ -275,7 +485,91 @@ msgid "Base Setup"
 msgstr "Basis setup"
 
 #. module: base_setup
-#: wizard_button:base_setup.base_setup,company,init:0
-#: wizard_button:base_setup.base_setup,update,company:0
-msgid "Previous"
-msgstr "Vorige"
+#: help:base.setup.installer,association:0
+msgid ""
+"Installs a preselected set of OpenERP applications which will help you "
+"manage your association more efficiently."
+msgstr ""
+"Installeert een voorgeselecteerde groep applicaties die u helpen om uw "
+"vereniging efficiënter te beheren."
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_base_setup_config
+msgid "base.setup.config"
+msgstr "base.setup.config"
+
+#. module: base_setup
+#: code:addons/base_setup/__init__.py:0
+#, python-format
+msgid "The following users have been installed : \n"
+msgstr "De volgende gebruikers zijn geïnstalleerd: \n"
+
+#~ msgid ""
+#~ "You can start configuring the system or connect directly to the database "
+#~ "using the default setup."
+#~ msgstr ""
+#~ "U kunt meteen beginnen met het configureren van het systeem of direct "
+#~ "verbinden met de database met de standaard setup."
+
+#~ msgid "Zip code"
+#~ msgstr "Postcode"
+
+#~ msgid "Select a Profile"
+#~ msgstr "Kies een profiel"
+
+#~ msgid "Report header"
+#~ msgstr "Koptekst rapport"
+
+#~ msgid ""
+#~ "You'll be able to install more modules later through the Administration menu."
+#~ msgstr ""
+#~ "Later kunnen er meer modules worden geïnstalleerd via het Administratie menu."
+
+#~ msgid ""
+#~ "A profile sets a pre-selection of modules for specific needs. These profiles "
+#~ "have been setup to help you discover the different aspects of OpenERP. This "
+#~ "is just an overview, we have 300+ available modules."
+#~ msgstr ""
+#~ "Een profiel bevat een voorselectie van modules voor specifieke behoeften. "
+#~ "Deze profielen zijn een opzet om u te helpen de verschillende aspecten van "
+#~ "OpenERP te ontdekken. Dit is slechts een overzicht, we hebben meer dan 300 "
+#~ "modules beschikbaar"
+
+#~ msgid "Next"
+#~ msgstr "Volgende"
+
+#~ msgid "State"
+#~ msgstr "Staat/Provincie"
+
+#~ msgid "Your new database is now fully installed."
+#~ msgstr "De database is geïnstalleerd."
+
+#~ msgid "Profile"
+#~ msgstr "Profiel"
+
+#~ msgid "General Information"
+#~ msgstr "Algemene Informatie"
+
+#~ msgid "Street2"
+#~ msgstr "Adres 2"
+
+#~ msgid "Report Information"
+#~ msgstr "Rapportinformatie"
+
+#~ msgid "Define Main Company"
+#~ msgstr "Defineer moederorganisatie"
+
+#~ msgid "Summary"
+#~ msgstr "Samenvatting"
+
+#~ msgid "Install"
+#~ msgstr "Installeren"
+
+#~ msgid "Installation Done"
+#~ msgstr "Installatie Gereed"
+
+#~ msgid "Cancel"
+#~ msgstr "Annuleren"
+
+#~ msgid "Previous"
+#~ msgstr "Vorige"
diff --git a/addons/base_vat/i18n/mn.po b/addons/base_vat/i18n/mn.po
index b3780f0cf5e..e82d9a09695 100644
--- a/addons/base_vat/i18n/mn.po
+++ b/addons/base_vat/i18n/mn.po
@@ -7,21 +7,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:36+0000\n"
-"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-18 07:12+0000\n"
+"Last-Translator: sugi <Unknown>\n"
 "Language-Team: Mongolian <mn@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: 2010-09-29 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
-#: model:ir.module.module,description:base_vat.module_meta_information
+#: code:addons/base_vat/base_vat.py:0
+#, python-format
 msgid ""
-"Enable the VAT Number for the partner. Check the validity of that VAT Number."
-msgstr "Харилцагчид НӨАТ дугаар нэмэх, түүнийг шалгах."
+"The Vat does not seems to be correct. You should have entered something like "
+"this %s"
+msgstr ""
 
 #. module: base_vat
 #: constraint:ir.ui.view:0
@@ -29,11 +31,42 @@ msgid "Invalid XML for View Architecture!"
 msgstr "Дэлгэцийн XML алдаатай!"
 
 #. module: base_vat
-#: field:res.partner,vat_subjected:0
-msgid "VAT Legal Statement"
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
 #. module: base_vat
 #: model:ir.module.module,shortdesc:base_vat.module_meta_information
-msgid "VAT"
-msgstr "НӨАТ"
+msgid "Base VAT - To check VAT number validity"
+msgstr ""
+
+#. module: base_vat
+#: code:addons/base_vat/base_vat.py:0
+#, python-format
+msgid "The VAT is invalid, It should begin with the country code"
+msgstr ""
+
+#. module: base_vat
+#: help:res.partner,vat_subjected:0
+msgid ""
+"Check this box if the partner is subjected to the VAT. It will be used for "
+"the VAT legal statement."
+msgstr ""
+
+#. module: base_vat
+#: model:ir.model,name:base_vat.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: base_vat
+#: field:res.partner,vat_subjected:0
+msgid "VAT Legal Statement"
+msgstr "НӨАТ-н тайлан"
+
+#~ msgid ""
+#~ "Enable the VAT Number for the partner. Check the validity of that VAT Number."
+#~ msgstr "Харилцагчид НӨАТ дугаар нэмэх, түүнийг шалгах."
+
+#~ msgid "VAT"
+#~ msgstr "НӨАТ"
diff --git a/addons/base_vat/i18n/sv.po b/addons/base_vat/i18n/sv.po
index 020caa584af..4ced5921c21 100644
--- a/addons/base_vat/i18n/sv.po
+++ b/addons/base_vat/i18n/sv.po
@@ -6,33 +6,62 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-19 12:13+0000\n"
+"Last-Translator: Magnus Brandt, Aspirix AB <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: 2010-09-29 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
-#: model:ir.module.module,description:base_vat.module_meta_information
+#: code:addons/base_vat/base_vat.py:0
+#, python-format
 msgid ""
-"Enable the VAT Number for the partner. Check the validity of that VAT Number."
+"The Vat does not seems to be correct. You should have entered something like "
+"this %s"
 msgstr ""
 
 #. module: base_vat
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
+msgstr "Ogiltig XML för Vy-arkitektur!"
+
+#. module: base_vat
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+
+#. module: base_vat
+#: model:ir.module.module,shortdesc:base_vat.module_meta_information
+msgid "Base VAT - To check VAT number validity"
+msgstr ""
+
+#. module: base_vat
+#: code:addons/base_vat/base_vat.py:0
+#, python-format
+msgid "The VAT is invalid, It should begin with the country code"
+msgstr "Momsen är felaktig, den ska börja med landskoden"
+
+#. module: base_vat
+#: help:res.partner,vat_subjected:0
+msgid ""
+"Check this box if the partner is subjected to the VAT. It will be used for "
+"the VAT legal statement."
+msgstr ""
+"Klicka i denna box om företaget skall använda moms. Den kommer att användas "
+"till momsrapporten."
+
+#. module: base_vat
+#: model:ir.model,name:base_vat.model_res_partner
+msgid "Partner"
+msgstr "Företag"
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
 msgid "VAT Legal Statement"
-msgstr ""
-
-#. module: base_vat
-#: model:ir.module.module,shortdesc:base_vat.module_meta_information
-msgid "VAT"
-msgstr ""
+msgstr "Momsrapporten"
diff --git a/addons/decimal_precision/i18n/nl.po b/addons/decimal_precision/i18n/nl.po
index 861ad9983d0..680afd21b67 100644
--- a/addons/decimal_precision/i18n/nl.po
+++ b/addons/decimal_precision/i18n/nl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-08-20 05:24+0000\n"
-"PO-Revision-Date: 2010-10-04 06:52+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-18 12:22+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-10-05 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: decimal_precision
@@ -40,25 +40,14 @@ msgid "Invalid model name in the action definition."
 msgstr "Ongeldige modelnaam in de actie-definiëring."
 
 #. module: decimal_precision
-#: view:decimal.precision:0
-msgid "Decimal Precision"
-msgstr "Decimale precisie"
+#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
+msgid "Decimal Precision Configuration"
+msgstr "Decimale precisie configuratie"
 
 #. module: decimal_precision
 #: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
 #: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
-msgid "Decimal Accuracy Definitions"
-msgstr "Decimale nauwkeurigheid definities"
-
-#. module: decimal_precision
-#: model:ir.module.module,description:decimal_precision.module_meta_information
-msgid ""
-"\n"
-"This module allows to configure the price accuracy you need for different "
-"kind\n"
-"of usage: accounting, sales, purchases, ...\n"
-"\n"
-"The decimal precision is configured per company.\n"
+msgid "Decimal Accuracy"
 msgstr ""
 
 #. module: decimal_precision
@@ -72,11 +61,14 @@ msgid "Usage"
 msgstr "Gebruik"
 
 #. module: decimal_precision
-#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
-msgid "Decimal Precision Configuration"
-msgstr "Decimale precisie configuratie"
+#: view:decimal.precision:0
+msgid "Decimal Precision"
+msgstr "Decimale precisie"
 
 #. module: decimal_precision
 #: model:ir.model,name:decimal_precision.model_decimal_precision
 msgid "decimal.precision"
 msgstr "decimal.precision"
+
+#~ msgid "Decimal Accuracy Definitions"
+#~ msgstr "Decimale nauwkeurigheid definities"
diff --git a/addons/document/i18n/nl.po b/addons/document/i18n/nl.po
index dd1bf05c686..5ca0c72dfa7 100644
--- a/addons/document/i18n/nl.po
+++ b/addons/document/i18n/nl.po
@@ -6,37 +6,244 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 03:29+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-18 12:23+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <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: 2010-09-29 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
-#: field:document.directory,create_date:0
-msgid "Date Created"
-msgstr "Aanmaakdatum"
-
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "Bron ID"
-
-#. module: document
-#: field:document.directory.content,include_name:0
-msgid "Include Record Name"
-msgstr "Inclusief naam record"
-
-#. module: document
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: field:document.directory,parent_id:0
+msgid "Parent Directory"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_document_configuration
+msgid "Auto Directory Configuration"
+msgstr ""
+
+#. module: document
+#: field:document.directory,resource_field:0
+msgid "Name field"
+msgstr ""
+
+#. module: document
+#: view:board.board:0
+msgid "Document board"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_process_node
+msgid "Process Node"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Search Document Directory"
+msgstr ""
+
+#. module: document
+#: help:document.directory,resource_field:0
+msgid ""
+"Field to be used as name on resource directories. If empty, the \"name\" "
+"will be used."
+msgstr ""
+
+#. module: document
+#: code:addons/document/document_directory.py:0
+#, python-format
+msgid "Directory name contains special characters!"
+msgstr "Foldernaam bevat speciale tekens!"
+
+#. module: document
+#: view:document.directory:0
+#: view:document.storage:0
+msgid "Group By..."
+msgstr ""
+
+#. module: document
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Ongeldige modelnaam in de actie-definitie."
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Soort inhoud map"
+
+#. module: document
+#: view:document.directory:0
+msgid "Resources"
+msgstr ""
+
+#. module: document
+#: field:document.directory,file_ids:0
+#: view:report.document.user:0
+msgid "Files"
+msgstr "Bestanden"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr "Bestanden per maand"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "March"
+msgstr ""
+
+#. module: document
+#: field:document.directory,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_content
+msgid "Directory Content"
+msgstr "Inhoud map"
+
+#. module: document
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr ""
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_document_management_configuration
+msgid "Document Management"
+msgstr "Documentbeheer"
+
+#. module: document
+#: help:document.directory.dctx,expr:0
+msgid ""
+"A python expression used to evaluate the field.\n"
+"You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference "
+"to the current record, in dynamic folders"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "This Year"
+msgstr ""
+
+#. module: document
+#: field:document.storage,path:0
+msgid "Path"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document_directory.py:0
+#, python-format
+msgid "Directory name must be unique!"
+msgstr "Mapnaam moet uniek zijn"
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,index_content:0
+msgid "Indexed Content"
+msgstr "Geïndexeerde inhoud"
+
+#. module: document
+#: help:document.directory,resource_find_all:0
+msgid ""
+"If true, all attachments that match this resource will  be located. If "
+"false, only ones that have this as parent."
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+#: field:document.storage,dir_ids:0
+#: model:ir.actions.act_window,name:document.action_document_directory_form
+#: model:ir.ui.menu,name:document.menu_document_directories
+msgid "Directories"
+msgstr "Mappen"
+
+#. module: document
+#: field:document.configuration,sale_order:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr "Bestandsdetails per gebruiker"
+
+#. module: document
+#: field:document.configuration,project:0
+msgid "Project"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document_storage.py:0
+#, python-format
+msgid "Error!"
+msgstr "Fout!"
+
+#. module: document
+#: help:document.configuration,product:0
+msgid "Auto directory configuration for Products."
+msgstr ""
+
+#. module: document
+#: field:document.directory,resource_find_all:0
+msgid "Find all resources"
+msgstr ""
+
+#. module: document
+#: selection:document.directory,type:0
+msgid "Folders per resource"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,suffix:0
+msgid "Suffix"
+msgstr "Achtervoegsel"
+
+#. module: document
+#: field:report.document.user,change_date:0
+msgid "Modified Date"
+msgstr "Wijzigingsdatum"
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,partner_id:0
+#: field:report.files.partner,partner:0
+msgid "Partner"
+msgstr "Relatie"
+
+#. module: document
+#: view:board.board:0
+msgid "Files by Users"
+msgstr ""
+
+#. module: document
+#: field:process.node,directory_id:0
+msgid "Document directory"
+msgstr "Documentenmap"
+
+#. module: document
+#: code:addons/document/document.py:0
+#: code:addons/document/document_directory.py:0
+#, python-format
+msgid "ValidateError"
+msgstr "Validatiefout"
+
+#. module: document
+#: model:ir.model,name:document.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_document_file_form
+#: view:ir.attachment:0
+#: model:ir.ui.menu,name:document.menu_document_doc
+#: model:ir.ui.menu,name:document.menu_document_files
+msgid "Documents"
 msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
 
 #. module: document
 #: field:ir.actions.report.xml,model_id:0
@@ -49,72 +256,44 @@ msgid "Error! You can not create recursive Directories."
 msgstr "Fout! U kunt geen recursieve mappen maken"
 
 #. module: document
-#: model:ir.ui.menu,name:document.menu_document_configuration
-msgid "Document Configuration"
-msgstr "Document instellingen"
+#: view:document.directory:0
+#: field:document.directory,storage_id:0
+msgid "Storage"
+msgstr ""
 
 #. module: document
-#: view:ir.attachment:0
-msgid "Preview"
-msgstr "Voorbeeld"
-
-#. module: document
-#: field:ir.attachment,store_method:0
-msgid "Storing Method"
-msgstr "Opslagmethode"
-
-#. module: document
-#: model:ir.actions.act_window,name:document.action_config_auto_directory
-msgid "Auto Configure Directory"
-msgstr "Automatische instellingen-map"
+#: field:document.directory,ressource_type_id:0
+msgid "Resource model"
+msgstr ""
 
 #. module: document
 #: field:ir.attachment,file_size:0
+#: field:report.document.file,file_size:0
+#: field:report.document.user,file_size:0
+#: field:report.files.partner,file_size:0
 msgid "File Size"
 msgstr "Bestandsgrootte"
 
 #. module: document
-#: help:document.directory.content,include_name:0
+#: field:document.directory.content.type,name:0
+#: field:ir.attachment,file_type:0
+msgid "Content Type"
+msgstr "Soort inhoud"
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,type:0
+#: view:document.storage:0
+#: field:document.storage,type:0
+msgid "Type"
+msgstr "Soort"
+
+#. module: document
+#: help:document.directory,ressource_type_id:0
 msgid ""
-"Check this field if you want that the name of the file start by the record "
-"name."
+"Select an object here and there will be one folder per record of that "
+"resource."
 msgstr ""
-"Vink dit veld indien u wilt dat de bestandsnaam begint met de recordnaam."
-
-#. module: document
-#: selection:document.directory,type:0
-msgid "Other Resources"
-msgstr "Andere bronnen"
-
-#. module: document
-#: field:document.directory,ressource_parent_type_id:0
-msgid "Parent Model"
-msgstr "Hoofdmodel"
-
-#. module: document
-#: view:document.configuration.wizard:0
-msgid "Document Management System."
-msgstr "Documentenbeheersysteem."
-
-#. module: document
-#: view:ir.attachment:0
-msgid "Attachment"
-msgstr "Bijlage"
-
-#. module: document
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de actie-definitie."
-
-#. module: document
-#: selection:document.directory,type:0
-msgid "Static Directory"
-msgstr "Statische map"
-
-#. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Soort inhoud map"
 
 #. module: document
 #: help:document.directory,domain:0
@@ -124,6 +303,252 @@ msgstr ""
 "Gebruik een domein bij het plaatsen van een automatisch filter op zichtbare "
 "bronnen."
 
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Partner"
+msgstr ""
+
+#. module: document
+#: field:document.directory,dctx_ids:0
+msgid "Context fields"
+msgstr ""
+
+#. module: document
+#: field:ir.attachment,store_fname:0
+msgid "Stored Filename"
+msgstr "Opgeslagen bestandsnaam"
+
+#. module: document
+#: view:document.directory:0
+#: field:report.document.user,type:0
+msgid "Directory Type"
+msgstr "Soort map"
+
+#. module: document
+#: field:document.directory.content,report_id:0
+msgid "Report"
+msgstr "Overzicht"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "July"
+msgstr ""
+
+#. module: document
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Ongeldige XML voor weergave!"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.open_board_document_manager
+#: model:ir.ui.menu,name:document.menu_reports_document_manager
+msgid "Document Dashboard"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content.type,code:0
+msgid "Extension"
+msgstr "Uitbreiding"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Created"
+msgstr ""
+
+#. module: document
+#: field:document.directory,content_ids:0
+msgid "Virtual Files"
+msgstr "Virtuele bestanden"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Modified"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document_storage.py:0
+#, python-format
+msgid "Error at doc write!"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Generated Files"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,directory_id:0
+#: field:document.directory.dctx,dir_id:0
+#: model:ir.actions.act_window,name:document.action_document_file_directory_form
+#: view:ir.attachment:0
+#: field:ir.attachment,parent_id:0
+#: model:ir.model,name:document.model_document_directory
+#: field:report.document.user,directory:0
+msgid "Directory"
+msgstr "Map"
+
+#. module: document
+#: view:board.board:0
+msgid "Files by Partner"
+msgstr ""
+
+#. module: document
+#: field:document.directory,write_uid:0
+#: field:document.storage,write_uid:0
+#: field:ir.attachment,write_uid:0
+msgid "Last Modification User"
+msgstr "Laatste wijziging door gebruiker"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.act_res_partner_document
+#: model:ir.actions.act_window,name:document.zoom_directory
+msgid "Related Documents"
+msgstr ""
+
+#. module: document
+#: field:document.configuration,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: document
+#: field:document.directory,domain:0
+msgid "Domain"
+msgstr "Domein"
+
+#. module: document
+#: field:document.directory,write_date:0
+#: field:document.storage,write_date:0
+#: field:ir.attachment,write_date:0
+msgid "Date Modified"
+msgstr "Wijzigingsdatum"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr "Bestandsdetails per map"
+
+#. module: document
+#: view:report.document.user:0
+msgid "All users files"
+msgstr ""
+
+#. module: document
+#: view:board.board:0
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr "Bestandsgrootte per maand"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "December"
+msgstr ""
+
+#. module: document
+#: field:document.configuration,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: document
+#: selection:document.directory,type:0
+msgid "Static Directory"
+msgstr "Statische map"
+
+#. module: document
+#: field:document.directory,child_ids:0
+msgid "Children"
+msgstr "Dochters"
+
+#. module: document
+#: view:document.directory:0
+msgid "Define words in the context, for all child directories and files"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,description:document.module_meta_information
+msgid ""
+"This is a complete document management system:\n"
+"    * User Authentication\n"
+"    * Document Indexation :- .pptx and .docx files are not support in "
+"windows platform.\n"
+"    * Dashboard for Document that includes:\n"
+"        * New Files (list)\n"
+"        * Files by Resource Type (graph)\n"
+"        * Files by Partner (graph)\n"
+"        * Files by Month (graph)\n"
+"    ATTENTION:\n"
+"    - When you install this module in a running company that have already "
+"PDF files stored into the database,\n"
+"      you will lose them all.\n"
+"    - After installing this module PDF's are no longer stored into the "
+"database,\n"
+"      but in the servers rootpad like /server/bin/filestore.\n"
+msgstr ""
+
+#. module: document
+#: help:document.storage,online:0
+msgid ""
+"If not checked, media is currently offline and its contents not available"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+#: field:document.directory,user_id:0
+#: field:document.storage,user_id:0
+#: view:ir.attachment:0
+#: field:ir.attachment,user_id:0
+#: field:report.document.user,user_id:0
+#: field:report.document.wall,user_id:0
+msgid "Owner"
+msgstr "Eigenaar"
+
+#. module: document
+#: view:document.directory:0
+msgid "PDF Report"
+msgstr "PDF-overzicht"
+
+#. module: document
+#: view:document.directory:0
+msgid "Contents"
+msgstr "Inhoud"
+
+#. module: document
+#: field:document.directory,create_date:0
+#: field:document.storage,create_date:0
+#: field:report.document.user,create_date:0
+msgid "Date Created"
+msgstr "Aanmaakdatum"
+
+#. module: document
+#: help:document.directory.content,include_name:0
+msgid ""
+"Check this field if you want that the name of the file to contain the record "
+"name.\n"
+"If set, the directory will have to be a resource one."
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,include_name:0
+msgid "Include Record Name"
+msgstr "Inclusief naam record"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Attachment"
+msgstr "Bijlage"
+
+#. module: document
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: document
+#: field:document.storage,online:0
+msgid "Online"
+msgstr ""
+
 #. module: document
 #: help:document.directory,ressource_tree:0
 msgid ""
@@ -134,71 +559,117 @@ msgstr ""
 "object in het systeem."
 
 #. module: document
-#: field:document.directory,type:0
-msgid "Type"
-msgstr "Soort"
+#: view:document.directory:0
+msgid "Security"
+msgstr "Beveiliging"
 
 #. module: document
-#: model:ir.actions.act_window,name:document.action_document_directory_tree
-#: model:ir.ui.menu,name:document.menu_document_directories_tree
-msgid "Directorie's Structure"
-msgstr "Mappenstructuur"
-
-#. module: document
-#: field:document.directory,parent_id:0
-msgid "Parent Item"
-msgstr "Hoofditem"
-
-#. module: document
-#: view:ir.attachment:0
-msgid "File Information"
-msgstr "Bestandsinformatie"
-
-#. module: document
-#: field:document.directory,file_ids:0
-#: view:ir.attachment:0
-msgid "Files"
-msgstr "Bestanden"
-
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Opgeslagen bestandsnaam"
-
-#. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
-msgid "Last Modification User"
-msgstr "Laatste wijziging door gebruiker"
-
-#. module: document
-#: view:document.configuration.wizard:0
-msgid "Configure"
-msgstr "Instellen"
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Boomstructuur"
-
-#. module: document
-#: field:ir.attachment,title:0
-msgid "Resource Title"
-msgstr "Titel van bron"
-
-#. module: document
-#: model:ir.actions.todo,note:document.config_auto_directory
-msgid ""
-"This wizard will configure the URL of the server of the document management "
-"system."
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "August"
 msgstr ""
-"Deze assistent zal de URL van de server voor het documentbeheersysteem "
-"instellen."
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content
-msgid "Directory Content"
-msgstr "Inhoud map"
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "June"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,user:0
+#: field:report.document.wall,user:0
+msgid "User"
+msgstr "Gebruiker"
+
+#. module: document
+#: field:document.directory,group_ids:0
+#: field:document.storage,group_ids:0
+msgid "Groups"
+msgstr "Groepen"
+
+#. module: document
+#: field:document.directory.content.type,active:0
+msgid "Active"
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "November"
+msgstr ""
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,db_datas:0
+msgid "Data"
+msgstr "Gegevens"
+
+#. module: document
+#: view:document.directory:0
+msgid "Definition"
+msgstr "Definitie"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "October"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Seq."
+msgstr "Reeks"
+
+#. module: document
+#: selection:document.storage,type:0
+msgid "Database"
+msgstr "Database"
+
+#. module: document
+#: help:document.configuration,project:0
+msgid "Auto directory configuration for Projects."
+msgstr ""
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Related to"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,shortdesc:document.module_meta_information
+msgid "Integrated Document Management System"
+msgstr "Geïntegreerd documentbeheersysteem"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Attached To"
+msgstr "Gekoppeld aan"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_reports_document
+msgid "Dashboard"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr "Bestanden per gebruikers"
+
+#. module: document
+#: field:document.storage,readonly:0
+msgid "Read Only"
+msgstr ""
+
+#. module: document
+#: field:document.directory.dctx,expr:0
+msgid "Expression"
+msgstr ""
+
+#. module: document
+#: field:document.directory,create_uid:0
+#: field:document.storage,create_uid:0
+msgid "Creator"
+msgstr "Gemaakt door"
 
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
@@ -211,312 +682,81 @@ msgstr ""
 "kiest."
 
 #. module: document
-#: model:ir.ui.menu,name:document.menu_document
-msgid "Document Management"
-msgstr "Documentbeheer"
-
-#. module: document
-#: selection:ir.attachment,store_method:0
-msgid "Link"
-msgstr "Verwijzing"
-
-#. module: document
-#: view:document.directory:0
-msgid "Directory Type"
-msgstr "Soort map"
-
-#. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
-msgid "Groups"
-msgstr "Groepen"
-
-#. module: document
-#: field:document.directory.content,report_id:0
-msgid "Report"
-msgstr "Overzicht"
-
-#. module: document
-#: help:document.configuration.wizard,host:0
-msgid ""
-"Put here the server address or IP. Keep localhost if you don't know what to "
-"write."
-msgstr ""
-"Plaats hier de URL of het IP-adres van de server. Laat het staan op "
-"'localhost' staan wanneer u niet weet wat hier bedoeld wordt."
-
-#. module: document
-#: view:document.configuration.wizard:0
-msgid ""
-"This wizard will automatically configure the document management system "
-"according to modules installed on your system."
-msgstr ""
-"Deze assistent zal het documentbeheersysteem automatisch instellen aan de "
-"hand van de geïnstalleerde modules op uw systeem."
-
-#. module: document
-#: view:ir.attachment:0
-msgid "Data"
-msgstr "Gegevens"
-
-#. module: document
-#: view:ir.attachment:0
-msgid "Notes"
-msgstr "Notities"
-
-#. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
-msgid "Indexed Content"
-msgstr "Geïndexeerde inhoud"
-
-#. module: document
-#: view:document.directory:0
-msgid "Definition"
-msgstr "Definitie"
-
-#. module: document
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave!"
-
-#. module: document
-#: model:ir.module.module,description:document.module_meta_information
-msgid ""
-"This is a complete document management system:\n"
-"    * FTP Interface\n"
-"    * User Authentication\n"
-"    * Document Indexation\n"
-msgstr ""
-"Dit is een compleet documentbeheersysteem:\n"
-"    * FTP interface\n"
-"    * Gebruikersauthenticatie\n"
-"    * Document-indexering\n"
-
-#. module: document
-#: field:document.directory,name:0
-msgid "Name"
-msgstr "Naam"
-
-#. module: document
-#: field:document.directory.content.type,code:0
-msgid "Extension"
-msgstr "Uitbreiding"
-
-#. module: document
-#: selection:ir.attachment,store_method:0
-msgid "Database"
-msgstr "Database"
-
-#. module: document
-#: field:document.directory,content_ids:0
-msgid "Virtual Files"
-msgstr "Virtuele bestanden"
-
-#. module: document
-#: view:document.directory:0
-#: model:ir.ui.menu,name:document.menu_document_directories
-msgid "Directories"
-msgstr "Mappen"
-
-#. module: document
-#: view:document.directory:0
-msgid "Seq."
-msgstr "Reeks"
-
-#. module: document
-#: model:ir.module.module,shortdesc:document.module_meta_information
-msgid "Integrated Document Management System"
-msgstr "Geïntegreerd documentbeheersysteem"
-
-#. module: document
-#: field:document.directory.content,directory_id:0
-#: field:ir.attachment,parent_id:0
-msgid "Directory"
-msgstr "Map"
-
-#. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
-msgid "Owner"
-msgstr "Eigenaar"
-
-#. module: document
-#: model:ir.model,name:document.model_document_configuration_wizard
-msgid "document.configuration.wizard"
-msgstr "document.configuration.wizard"
-
-#. module: document
-#: view:ir.attachment:0
-msgid "Attached To"
-msgstr "Gekoppeld aan"
-
-#. module: document
-#: selection:ir.attachment,store_method:0
-msgid "Filesystem"
-msgstr "Bestandssysteem"
-
-#. module: document
-#: field:document.directory,file_type:0
-#: field:document.directory.content.type,name:0
-#: field:ir.attachment,file_type:0
-msgid "Content Type"
-msgstr "Soort inhoud"
-
-#. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
-msgid "Security"
-msgstr "Beveiliging"
-
-#. module: document
-#: model:ir.ui.menu,name:document.menu_document_browse
-msgid "Browse Files Using FTP"
-msgstr "Blader door bestanden met FTP"
-
-#. module: document
-#: field:document.directory,ressource_type_id:0
-msgid "Directories Mapped to Objects"
-msgstr "Mappen vertaald naar objecten"
-
-#. module: document
-#: view:ir.attachment:0
-msgid "History"
-msgstr "Historie"
-
-#. module: document
-#: help:document.directory,ressource_type_id:0
-msgid ""
-"Select an object here and Open ERP will create a mapping for each of these "
-"objects, using the given domain, when browsing through FTP."
-msgstr ""
-"Kies hier een object en OpenERP zal een snelkoppeling voor elk van deze "
-"objecten met het gegeven domein maken, bij bladeren door FTP."
-
-#. module: document
-#: view:ir.attachment:0
-msgid "Others Info"
-msgstr "Overige info"
-
-#. module: document
-#: field:document.directory,domain:0
-msgid "Domain"
-msgstr "Domein"
-
-#. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
-msgid "Date Modified"
-msgstr "Wijzigingsdatum"
-
-#. module: document
-#: field:document.directory.content,suffix:0
-msgid "Suffix"
-msgstr "Achtervoegsel"
-
-#. module: document
-#: field:document.configuration.wizard,host:0
-msgid "Server Address"
-msgstr "Adres server"
-
-#. module: document
-#: model:ir.actions.url,name:document.action_document_browse
-msgid "Browse Files"
-msgstr "Bladeren"
-
-#. module: document
-#: field:document.directory.content,name:0
-msgid "Content Name"
-msgstr "Naam inhoud"
-
-#. module: document
-#: model:ir.model,name:document.model_document_directory
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Documentenmap"
-
-#. module: document
-#: field:document.directory,create_uid:0
-msgid "Creator"
-msgstr "Gemaakt door"
-
-#. module: document
-#: view:document.directory:0
-msgid "Auto-Generated Files"
-msgstr "Automatisch gegenereerde bestanden"
-
-#. module: document
-#: field:document.directory.content,sequence:0
-msgid "Sequence"
-msgstr "Reeks"
-
-#. module: document
-#: model:ir.ui.menu,name:document.menu_document_files
-msgid "Search a File"
-msgstr "Zoek een bestand"
-
-#. module: document
-#: view:document.configuration.wizard:0
-msgid "Auto Configure"
-msgstr "Automatisch instellen"
-
-#. module: document
-#: view:document.configuration.wizard:0
-msgid "Cancel"
-msgstr "Annuleren"
-
-#. module: document
-#: field:ir.attachment,partner_id:0
-msgid "Partner"
-msgstr "Relatie"
-
-#. module: document
-#: view:document.directory:0
-msgid "PDF Report"
-msgstr "PDF-overzicht"
-
-#. module: document
-#: field:document.directory.content,extension:0
-msgid "Document Type"
-msgstr "Soort document"
-
-#. module: document
-#: field:document.directory,child_ids:0
-msgid "Children"
-msgstr "Dochters"
-
-#. module: document
-#: view:document.directory:0
-msgid "Contents"
-msgstr "Inhoud"
-
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_files_by_partner
-msgid "Files Per Month"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
+#: view:report.document.user:0
+msgid "Files by Month"
 msgstr "Bestanden per maand"
 
 #. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "September"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: document
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr "Laatste plaatsing"
+
+#. module: document
+#: field:report.document.user,datas_fname:0
+msgid "File Name"
+msgstr "Bestandsnaam"
+
+#. module: document
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "Bron ID"
+
+#. module: document
+#: selection:document.storage,type:0
+msgid "External file storage"
+msgstr ""
+
+#. module: document
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
+
+#. module: document
+#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_wall
-#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
 #: view:report.document.wall:0
 msgid "Wall of Shame"
 msgstr "Wall of Shame"
 
 #. module: document
-#: model:ir.model,name:document.model_report_files_partner
-msgid "Files details by Partners"
+#: help:document.storage,path:0
+msgid "For file storage, the root path of the storage"
 msgstr ""
 
 #. module: document
-#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
-msgid "All Months"
-msgstr "Alle maanden"
+#: model:ir.model,name:document.model_report_files_partner
+msgid "Files details by Partners"
+msgstr "Details bestanden per relatie"
 
 #. module: document
-#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
-#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
-msgid "My files"
-msgstr "Mijn bestanden"
+#: field:document.directory.dctx,field:0
+msgid "Field"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_dctx
+msgid "Directory Dynamic Context"
+msgstr ""
+
+#. module: document
+#: field:document.directory,ressource_parent_type_id:0
+msgid "Parent Model"
+msgstr "Hoofdmodel"
 
 #. module: document
 #: view:report.document.user:0
@@ -524,130 +764,365 @@ msgid "Files by users"
 msgstr "Bestanden per gebruiker"
 
 #. module: document
-#: view:report.files.partner:0
-msgid "Files per Month"
-msgstr "Bestanden per maand"
+#: field:report.document.file,month:0
+#: field:report.document.user,month:0
+#: field:report.document.wall,month:0
+#: field:report.document.wall,name:0
+#: field:report.files.partner,month:0
+msgid "Month"
+msgstr "Maand"
 
 #. module: document
-#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
-msgid "My files (All months)"
-msgstr "Mijn bestanden (alle maanden)"
-
-#. module: document
-#: field:report.document.wall,file_name:0
-msgid "Last Posted File Name"
-msgstr "Laatst geposte bestandnaam"
-
-#. module: document
-#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+#: model:ir.ui.menu,name:document.menu_reporting
 msgid "Reporting"
 msgstr "Overzichten"
 
+#. module: document
+#: field:document.configuration,product:0
+msgid "Product"
+msgstr ""
+
+#. module: document
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Boomstructuur"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "May"
+msgstr ""
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
+msgstr "Alls gebruikersbestanden"
+
 #. module: document
 #: model:ir.model,name:document.model_report_document_wall
 msgid "Users that did not inserted documents since one month"
 msgstr "Gebruikers die de laatste maand geen documenten hebben toegevoegd"
 
+#. module: document
+#: view:document.directory:0
+msgid "For each entry here, virtual files will appear in this folder."
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: document
+#: view:board.board:0
+msgid "New Files"
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "January"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Static"
+msgstr ""
+
 #. module: document
 #: view:report.files.partner:0
 msgid "Files By Partner"
 msgstr "Bestanden per relatie"
 
 #. module: document
-#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+#: help:document.directory.dctx,field:0
+msgid ""
+"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+"what is typed here."
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
 msgid "This Month"
 msgstr "Deze maand"
 
 #. module: document
-#: field:report.document.user,user:0 field:report.document.wall,user:0
-msgid "User"
-msgstr "Gebruiker"
+#: view:ir.attachment:0
+msgid "Notes"
+msgstr "Notities"
 
 #. module: document
-#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
-#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
-msgid "All Users files"
-msgstr "Alls gebruikersbestanden"
+#: help:document.configuration,sale_order:0
+msgid ""
+"Auto directory configuration for Sale Orders and Quotation with report."
+msgstr ""
 
 #. module: document
-#: model:ir.actions.act_window,name:document.action_view_my_document_tree
-msgid "My files (This months)"
-msgstr "Mijn bestanden (deze maanden)"
+#: help:document.directory,type:0
+msgid ""
+"Each directory can either have the type Static or be linked to another "
+"resource. A static directory, as with Operating Systems, is the classic "
+"directory that can contain a set of files. The directories linked to systems "
+"resources automatically possess sub-directories for each of resource types "
+"defined in the parent directory."
+msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_report_document_user
-msgid "Files details by Users"
-msgstr "Bestandsdetails per gebruiker"
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "February"
+msgstr ""
 
 #. module: document
-#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: model:ir.actions.act_window,name:document.open_board_document_manager1
+#: model:ir.ui.menu,name:document.menu_reports_document_manager1
+msgid "Statistics by User"
+msgstr ""
+
+#. module: document
+#: field:document.directory,name:0
+#: field:document.storage,name:0
+msgid "Name"
+msgstr "Naam"
+
+#. module: document
+#: view:document.directory:0
+msgid "Fields"
+msgstr ""
+
+#. module: document
+#: help:document.storage,readonly:0
+msgid "If set, media is for reading only"
+msgstr ""
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "April"
+msgstr ""
+
+#. module: document
+#: field:report.document.user,nbr:0
 #: field:report.files.partner,nbr:0
 msgid "# of Files"
 msgstr "# bestanden"
 
 #. module: document
-#: model:ir.actions.act_window,name:document.action_view_user_graph
-msgid "Files By Users"
-msgstr "Bestanden per gebruikers"
+#: view:document.directory:0
+msgid ""
+"Only members of these groups will have access to this directory and its "
+"files."
+msgstr ""
 
 #. module: document
-#: model:ir.module.module,shortdesc:report_document.module_meta_information
-msgid "Document Management - Reporting"
-msgstr "Documentbeheer - Overzichten"
+#: view:document.directory:0
+msgid ""
+"These groups, however, do NOT apply to children directories, which must "
+"define their own groups."
+msgstr ""
 
 #. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files (All months)"
-msgstr "Alle gebruikersbestanden (alle maanden)"
+#: field:document.directory.content.type,mimetype:0
+msgid "Mime Type"
+msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_report_document_file
-msgid "Files details by Directory"
-msgstr "Bestandsdetails per map"
+#: field:document.directory.content,sequence:0
+msgid "Sequence"
+msgstr "Reeks"
 
 #. module: document
-#: field:report.document.user,change_date:0
-#: field:report.files.partner,change_date:0
-msgid "Modified Date"
-msgstr "Wijzigingsdatum"
+#: field:document.directory.content,name:0
+msgid "Content Name"
+msgstr "Naam inhoud"
 
 #. module: document
-#: model:ir.actions.act_window,name:document.action_view_size_month
-#: view:report.document.file:0
-msgid "File Size by Month"
-msgstr "Bestandsgrootte per maand"
+#: code:addons/document/document.py:0
+#, python-format
+msgid "File name must be unique!"
+msgstr "Bestandsnaam moet uniek zijn!"
 
 #. module: document
-#: field:report.document.user,file_title:0
-#: field:report.files.partner,file_title:0
-msgid "File Name"
-msgstr "Bestandsnaam"
+#: selection:document.storage,type:0
+msgid "Internal File storage"
+msgstr ""
 
 #. module: document
-#: field:report.document.file,month:0 field:report.document.user,month:0
-#: field:report.document.user,name:0 field:report.document.wall,month:0
-#: field:report.document.wall,name:0 field:report.files.partner,name:0
-msgid "Month"
-msgstr "Maand"
-
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
-#: view:report.document.user:0
-msgid "Files by Month"
-msgstr "Bestanden per maand"
+#: model:ir.actions.act_window,name:document.action_document_directory_tree
+#: model:ir.ui.menu,name:document.menu_document_directories_tree
+msgid "Directories' Structure"
+msgstr ""
 
 #. module: document
+#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
 #: view:report.document.user:0
 msgid "Files by Resource Type"
 msgstr "Bestanden per soort bron"
 
 #. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree
-msgid "All Users files (This month)"
-msgstr "Alle gebruikersbestanden (deze maand)"
+#: field:report.document.user,name:0
+#: field:report.files.partner,name:0
+msgid "Year"
+msgstr ""
 
 #. module: document
-#: field:report.document.wall,last:0
-msgid "Last Posted Time"
-msgstr "Laatste plaatsing"
+#: view:document.storage:0
+#: model:ir.model,name:document.model_document_storage
+#: model:ir.ui.menu,name:document.menu_document_storage_media
+msgid "Storage Media"
+msgstr ""
+
+#. module: document
+#: view:document.storage:0
+msgid "Search Document storage"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,extension:0
+msgid "Document Type"
+msgstr "Soort document"
+
+#~ msgid "Other Resources"
+#~ msgstr "Andere bronnen"
+
+#~ msgid "File Information"
+#~ msgstr "Bestandsinformatie"
+
+#~ msgid "Filesystem"
+#~ msgstr "Bestandssysteem"
+
+#~ msgid "Cancel"
+#~ msgstr "Annuleren"
+
+#~ msgid "Search a File"
+#~ msgstr "Zoek een bestand"
+
+#~ msgid "Auto-Generated Files"
+#~ msgstr "Automatisch gegenereerde bestanden"
+
+#~ msgid "Resource Title"
+#~ msgstr "Titel van bron"
+
+#~ msgid "Browse Files"
+#~ msgstr "Bladeren"
+
+#~ msgid "Others Info"
+#~ msgstr "Overige info"
+
+#~ msgid "Storing Method"
+#~ msgstr "Opslagmethode"
+
+#~ msgid "Preview"
+#~ msgstr "Voorbeeld"
+
+#~ msgid "Link"
+#~ msgstr "Verwijzing"
+
+#~ msgid ""
+#~ "This wizard will configure the URL of the server of the document management "
+#~ "system."
+#~ msgstr ""
+#~ "Deze assistent zal de URL van de server voor het documentbeheersysteem "
+#~ "instellen."
+
+#~ msgid ""
+#~ "This wizard will automatically configure the document management system "
+#~ "according to modules installed on your system."
+#~ msgstr ""
+#~ "Deze assistent zal het documentbeheersysteem automatisch instellen aan de "
+#~ "hand van de geïnstalleerde modules op uw systeem."
+
+#~ msgid ""
+#~ "This is a complete document management system:\n"
+#~ "    * FTP Interface\n"
+#~ "    * User Authentication\n"
+#~ "    * Document Indexation\n"
+#~ msgstr ""
+#~ "Dit is een compleet documentbeheersysteem:\n"
+#~ "    * FTP interface\n"
+#~ "    * Gebruikersauthenticatie\n"
+#~ "    * Document-indexering\n"
+
+#~ msgid "History"
+#~ msgstr "Historie"
+
+#~ msgid "Server Address"
+#~ msgstr "Adres server"
+
+#~ msgid "Directories Mapped to Objects"
+#~ msgstr "Mappen vertaald naar objecten"
+
+#~ msgid "Directorie's Structure"
+#~ msgstr "Mappenstructuur"
+
+#~ msgid "Document Configuration"
+#~ msgstr "Document instellingen"
+
+#~ msgid "Auto Configure Directory"
+#~ msgstr "Automatische instellingen-map"
+
+#~ msgid ""
+#~ "Check this field if you want that the name of the file start by the record "
+#~ "name."
+#~ msgstr ""
+#~ "Vink dit veld indien u wilt dat de bestandsnaam begint met de recordnaam."
+
+#~ msgid "Document Management System."
+#~ msgstr "Documentenbeheersysteem."
+
+#~ msgid "Configure"
+#~ msgstr "Instellen"
+
+#~ msgid "Parent Item"
+#~ msgstr "Hoofditem"
+
+#~ msgid ""
+#~ "Put here the server address or IP. Keep localhost if you don't know what to "
+#~ "write."
+#~ msgstr ""
+#~ "Plaats hier de URL of het IP-adres van de server. Laat het staan op "
+#~ "'localhost' staan wanneer u niet weet wat hier bedoeld wordt."
+
+#~ msgid "document.configuration.wizard"
+#~ msgstr "document.configuration.wizard"
+
+#~ msgid ""
+#~ "Select an object here and Open ERP will create a mapping for each of these "
+#~ "objects, using the given domain, when browsing through FTP."
+#~ msgstr ""
+#~ "Kies hier een object en OpenERP zal een snelkoppeling voor elk van deze "
+#~ "objecten met het gegeven domein maken, bij bladeren door FTP."
+
+#~ msgid "Browse Files Using FTP"
+#~ msgstr "Blader door bestanden met FTP"
+
+#~ msgid "Auto Configure"
+#~ msgstr "Automatisch instellen"
+
+#~ msgid "Files Per Month"
+#~ msgstr "Bestanden per maand"
+
+#~ msgid "All Months"
+#~ msgstr "Alle maanden"
+
+#~ msgid "My files"
+#~ msgstr "Mijn bestanden"
+
+#~ msgid "My files (All months)"
+#~ msgstr "Mijn bestanden (alle maanden)"
+
+#~ msgid "Last Posted File Name"
+#~ msgstr "Laatst geposte bestandnaam"
+
+#~ msgid "My files (This months)"
+#~ msgstr "Mijn bestanden (deze maanden)"
+
+#~ msgid "Document Management - Reporting"
+#~ msgstr "Documentbeheer - Overzichten"
+
+#~ msgid "All Users files (All months)"
+#~ msgstr "Alle gebruikersbestanden (alle maanden)"
+
+#~ msgid "All Users files (This month)"
+#~ msgstr "Alle gebruikersbestanden (deze maand)"
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index 1c2e232e914..e6b8cfd3f94 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -38,6 +38,17 @@
         You can then use any compatible browser to remotely see the attachments of OpenObject.
 
         After installation, the webDAV server can be controlled by a [webdav] section in the server's config.
+        Server Configuration Parameter:
+        [webdav]
+        ; enable = True ; Serve webdav over the http(s) servers
+        ; vdir = webdav ; the directory that webdav will be served at
+          ; this default val means that webdav will be
+          ; on "http://localhost:8069/webdav/
+        ; verbose = True ; Turn on the verbose messages of webdav
+        ; debug = True ; Turn on the debugging messages of webdav
+          ; since the messages are routed to the python logging, with
+          ; levels "debug" and "debug_rpc" respectively, you can leave
+          ; these options on
 """,
         "depends" : ["base", "document"],
         "init_xml" : [],
diff --git a/addons/email_template/i18n/nl.po b/addons/email_template/i18n/nl.po
index c7f60fb26a3..6f08e8a8162 100644
--- a/addons/email_template/i18n/nl.po
+++ b/addons/email_template/i18n/nl.po
@@ -7,57 +7,56 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-08-20 05:34+0000\n"
-"PO-Revision-Date: 2010-09-10 17:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-18 19:26+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
-#: view:email_template.send.wizard:0
-msgid "Send mail Wizard"
-msgstr ""
+#: help:email_template.account,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr "Verwijder e-mails definitief na verzending"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Email Account Configuration"
-msgstr ""
+msgstr "Email Account Configuratie"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #, python-format
 msgid "Emails for multiple items saved in outbox."
-msgstr ""
+msgstr "Emails voor meer items bewaard in Postvak UIT"
 
 #. module: email_template
-#: view:email.template:0
-msgid "Email Data"
-msgstr ""
-
-#. module: email_template
-#: field:email.template,def_to:0
-#: field:email_template.mailbox,email_to:0
-msgid "Recipient (To)"
-msgstr ""
+#: view:email_template.mailbox:0
+msgid "Personal Emails"
+msgstr "Persoonlijke e-mails"
 
 #. module: email_template
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ongeldige modelnaam in de definitie van de actie."
 
 #. module: email_template
-#: selection:email_template.send.wizard,state:0
-msgid "Wizard Complete"
-msgstr ""
+#: view:email.template:0
+msgid "Email Content  "
+msgstr "Email inhoud  "
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send mail Wizard"
+msgstr "Verstuur email assistent"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "Plain Text & HTML with no attachments"
-msgstr ""
+msgstr "Platte tekst & HTML zonder bijlagen"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
@@ -67,6 +66,9 @@ msgid ""
 "server\n"
 "Error: %s"
 msgstr ""
+"Mail van account %s mislukt bij aanmelding. Waarschijnlijke reden: Kon niet "
+"aanmelden op server\n"
+"Error: %s"
 
 #. module: email_template
 #: field:email_template.preview,body_html:0
@@ -74,13 +76,13 @@ msgstr ""
 #: field:email_template.send.wizard,body_html:0
 #: field:email_template.send.wizard,body_text:0
 msgid "Body"
-msgstr ""
+msgstr "Berichttekst"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:0
 #, python-format
 msgid "Deletion of Record failed"
-msgstr ""
+msgstr "Record verwijderen is mislukt"
 
 #. module: email_template
 #: help:email_template.account,company:0
@@ -88,69 +90,97 @@ msgid ""
 "Select if this mail account does not belong to specific user but to the "
 "organization as a whole. eg: info@companydomain.com"
 msgstr ""
+"Selecteer als deze mail account niet aan een specifieke gebruiker maar aan "
+"de hele organisatie toebehoort. bijv: info@companydomain.com"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Send now"
-msgstr ""
+msgstr "Nu versturen"
 
 #. module: email_template
-#: view:email_template.mailbox:0
 #: selection:email_template.mailbox,state:0
 msgid "Not Applicable"
-msgstr ""
+msgstr "Niet van toepassing"
 
 #. module: email_template
+#: view:email_template.account:0
+#: model:ir.ui.menu,name:email_template.menu_email_account_all_tools
 #: model:ir.ui.menu,name:email_template.menu_email_template_account_all
 msgid "Email Accounts"
-msgstr ""
+msgstr "E-mail accounts"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Send all mails"
-msgstr ""
+msgstr "Verstuur alle emails"
 
 #. module: email_template
 #: field:email_template.mailbox,server_ref:0
 msgid "Server Reference of mail"
-msgstr ""
+msgstr "Server referentie van email"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Reason: %s"
+msgstr "Reden: %s"
 
 #. module: email_template
 #: view:email_template.account:0
-msgid "My Accounts"
-msgstr ""
-
-#. module: email_template
-#: view:email_template.mailbox:0
-msgid "Send Mail"
-msgstr ""
-
-#. module: email_template
 #: selection:email_template.account,state:0
 msgid "Approved"
+msgstr "Goedgekeurd"
+
+#. module: email_template
+#: help:email.template,def_cc:0
+msgid ""
+"Carbon Copy address(es), comma-separated. Placeholders can be used here. "
+"e.g. ${object.email_cc}"
 msgstr ""
+"Carbon Copy adress(en), comma-gescheiden. Hier kunnen plaatsvervangers "
+"worden gebruikt. bijv. ${object.email_cc}"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Account"
+msgstr "Account"
 
 #. module: email_template
 #: field:email.template,table_html:0
 msgid "HTML code"
-msgstr ""
+msgstr "HTML-code"
 
 #. module: email_template
-#: help:email.template,file_name:0
+#: help:email_template.account,name:0
 msgid ""
-"File name pattern can be specified with placeholders.eg. 2009_SO003.pdf"
+"The description is used as the Sender name along with the provided From "
+"Email, unless it is already specified in the From Email, e.g: John Doe "
+"<john@doe.com>"
 msgstr ""
+"De omschrijving wordt gebruikt als zendernaam samen met het opgegeven Van "
+"emailadres, behalve als het al is opgegeven bij het Van emailadres, bijv.: "
+"John Doe <john@doe.com>"
 
 #. module: email_template
 #: field:email.template,from_account:0
 msgid "Email Account"
-msgstr ""
+msgstr "Email account"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #, python-format
 msgid "Email sending failed for one or more objects."
+msgstr "Email verzending mislukt voor één of meer objecten"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Add here all attachments of the current document you want to include in the "
+"Email."
 msgstr ""
+"Voeg hier alle bijlagen aan het huidige document toe die u bij de email wilt "
+"bijvoegen."
 
 #. module: email_template
 #: help:email.template,lang:0
@@ -158,11 +188,22 @@ msgid ""
 "The default language for the email. Placeholders can be used here. eg. "
 "${object.partner_id.lang}"
 msgstr ""
+"De standaard-taal voor het e-mailbericht. Hierin kunnen plaatsvervangers "
+"worden gebruikt, bijv. ${object.partner_id.lang}"
 
 #. module: email_template
-#: help:email_template.account,smtpport:0
-msgid "Enter port number,eg:SMTP-587 "
+#: help:email.template,sub_model_object_field:0
+msgid ""
+"When you choose relationship fields this field will specify the sub value "
+"you can use."
 msgstr ""
+"Wanneer u relatievelden kiest, dan geeft dit veld de sub-waarde aan die u "
+"gebruiken kunt."
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Wizard Complete"
+msgstr "Assistent voltooid"
 
 #. module: email_template
 #: field:email.template,reply_to:0
@@ -170,111 +211,102 @@ msgstr ""
 #: field:email_template.preview,reply_to:0
 #: field:email_template.send.wizard,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Antwoord aan"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Delete Action"
-msgstr ""
+msgstr "Actie verwijderen"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Approve Account"
-msgstr ""
-
-#. module: email_template
-#: model:ir.ui.menu,name:email_template.menu_email_template_all
-msgid "E-MAIL Templates"
-msgstr ""
+msgstr "Account goedkeuren"
 
 #. module: email_template
 #: field:email_template.preview,rel_model_ref:0
 #: field:email_template.send.wizard,rel_model_ref:0
 msgid "Referred Document"
-msgstr ""
+msgstr "Gerefereerd document"
 
 #. module: email_template
 #: field:email_template.send.wizard,full_success:0
 msgid "Complete Success"
-msgstr ""
+msgstr "Volledig succes"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "Both HTML & Text (Mixed)"
-msgstr ""
+msgstr "Zowel HTML & Tekst (door elkaar)"
 
 #. module: email_template
 #: view:email_template.preview:0
 msgid "OK"
-msgstr ""
+msgstr "OK"
+
+#. module: email_template
+#: field:email_template.account,auto_delete:0
+msgid "Auto Delete"
+msgstr "Auto-verwijder"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "Both HTML & Text (Alternative)"
-msgstr ""
+msgstr "Zowel HTML & Tekst (Alternatief)"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:0
 #, python-format
 msgid "Mako templates not installed"
-msgstr ""
+msgstr "Mako sjablonen niet geïnstalleerd"
 
 #. module: email_template
 #: field:email_template.send.wizard,requested:0
 msgid "No of requested Mails"
-msgstr ""
+msgstr "Aantal gevraagde mails"
 
 #. module: email_template
+#: field:email.template,def_body_text:0
 #: view:email_template.mailbox:0
-msgid "Download Full Mail"
-msgstr ""
-
-#. module: email_template
-#: help:email.template,def_to:0
-msgid "The default recipient of email.Placeholders can be used here."
-msgstr ""
-
-#. module: email_template
-#: view:email_template.mailbox:0
-msgid "Mailboxes"
-msgstr ""
+#: field:email_template.mailbox,body_text:0
+msgid "Standard Body (Text)"
+msgstr "Standaard bericht (tekst)"
 
 #. module: email_template
 #: field:email.template,attachment_ids:0
 msgid "Attached Files"
-msgstr ""
+msgstr "Bijgevoegde bestanden"
 
 #. module: email_template
-#: field:email_template.account,smtpssl:0
-msgid "SSL/TLS (only in python 2.6)"
-msgstr ""
+#: view:email_template.mailbox:0
+msgid "Standard Body"
+msgstr "Standaard berichttekst"
 
 #. module: email_template
 #: field:email_template.account,email_id:0
 msgid "From Email"
-msgstr ""
+msgstr "Van e-mail"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:0
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Waarschuwing"
 
 #. module: email_template
-#: view:email_template.account:0
 #: model:ir.actions.act_window,name:email_template.action_email_template_account_tree_all
 msgid "Accounts"
-msgstr ""
-
-#. module: email_template
-#: field:email.template,track_campaign_item:0
-msgid "Track campaign items"
-msgstr ""
+msgstr "Accounts"
 
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Body(Text)"
-msgstr ""
+msgstr "Bericht(Tekst)"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Company Emails"
+msgstr "Bedrijfs-emails"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
@@ -282,127 +314,125 @@ msgid ""
 "Tip: Multiple emails are sent in the same language (the first one is "
 "proposed). We suggest you send emails in groups according to language."
 msgstr ""
+"Tip: Meer e-mails worden in dezelfde taal verstuurd (de eerste wordt "
+"voorgesteld). We adviseren om e-mails in groepen per taal te versturen."
 
 #. module: email_template
-#: help:email.template,reply_to:0
 #: help:email_template.preview,reply_to:0
 #: help:email_template.send.wizard,reply_to:0
 msgid ""
 "The address recipients should reply to, if different from the From address. "
 "Placeholders can be used here."
 msgstr ""
+"Het adres waar ontvangers naar moeten antwoorden, indien afwijkend van het "
+"Van adres. Hierin kunnen plaatsvervangers worden gebruikt."
 
 #. module: email_template
+#: field:email.template,def_subject:0
 #: field:email_template.mailbox,subject:0
 #: field:email_template.preview,subject:0
 #: field:email_template.send.wizard,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "Onderwerp"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
-msgid "Reason: %s"
-msgstr ""
-
-#. module: email_template
-#: help:email_template.account,email_id:0
-msgid "eg: yourname@yourdomain.com "
-msgstr ""
+#: view:email_template.mailbox:0
+msgid "My Emails"
+msgstr "Mijn emails"
 
 #. module: email_template
 #: field:email_template.mailbox,email_from:0
 msgid "From"
-msgstr ""
+msgstr "Van"
 
 #. module: email_template
-#: field:email_template.preview,ref_template:0
-#: field:email_template.send.wizard,ref_template:0
-msgid "Template"
-msgstr ""
+#: field:email.template,file_name:0
+msgid "Report Filename"
+msgstr "Bestandsnaam overzicht"
 
 #. module: email_template
-#: field:email.template,def_body_text:0
-#: view:email_template.mailbox:0
-#: field:email_template.mailbox,body_text:0
-msgid "Standard Body (Text)"
-msgstr ""
-
-#. module: email_template
-#: view:email_template.mailbox:0
 #: selection:email_template.mailbox,state:0
 msgid "Sending"
-msgstr ""
+msgstr "Bezig met zenden"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Insert Simple Field"
-msgstr ""
+msgstr "Voeg eenvoudig veld in"
 
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Body(Html)"
-msgstr ""
+msgstr "Bericht(Html)"
 
 #. module: email_template
-#: view:email_template.account:0
-msgid "Send/Receive"
+#: help:email.template,def_bcc:0
+msgid ""
+"Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
+"here. e.g. ${object.email_bcc}"
 msgstr ""
+"Blind Carbon Copy adres(sen), comma-gescheiden. Hier kunnen plaatsvervangers "
+"worden gebruikt. bijv. ${object.email_bcc}"
 
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
 msgid "Template Preview"
-msgstr ""
+msgstr "Sjabloon voorbeeld"
 
 #. module: email_template
 #: field:email.template,def_body_html:0
 msgid "Body (Text-Web Client Only)"
-msgstr ""
+msgstr "Berichttekst (tekst - alleen web-client)"
+
+#. module: email_template
+#: field:email_template.account,state:0
+#: view:email_template.mailbox:0
+msgid "State"
+msgstr "Status"
 
 #. module: email_template
 #: field:email.template,ref_ir_value:0
 msgid "Wizard Button"
-msgstr ""
+msgstr "Assistent-knop"
+
+#. module: email_template
+#: help:email_template.account,email_id:0
+msgid "eg: 'john@doe.com' or 'John Doe <john@doe.com>'"
+msgstr "bijv: 'john@doe.com' of 'John Doe <john@doe.com>'"
+
+#. module: email_template
+#: view:email.template:0
+#: field:email.template,object_name:0
+msgid "Resource"
+msgstr "Resource"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
 #, python-format
 msgid "Out going connection test failed"
-msgstr ""
+msgstr "Uitgaande verbindingtest mislukt"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
 #, python-format
 msgid "Mail from Account %s successfully Sent."
-msgstr ""
-
-#. module: email_template
-#: view:email.template:0
-#: view:email_template.mailbox:0
-msgid "Standard Body"
-msgstr ""
+msgstr "Mail van account %s met succes verstuurd."
 
 #. module: email_template
 #: selection:email.template,template_language:0
 msgid "Mako Templates"
-msgstr ""
-
-#. module: email_template
-#: help:email.template,def_body_html:0
-#: help:email.template,def_body_text:0
-msgid "The text version of the mail"
-msgstr ""
+msgstr "Mako Sjablonen"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:0
 #, python-format
 msgid " (Email Attachment)"
-msgstr ""
+msgstr " (Email Bijlage)"
 
 #. module: email_template
 #: selection:email_template.mailbox,folder:0
 msgid "Sent Items"
-msgstr ""
+msgstr "Verstuurde berichten"
 
 #. module: email_template
 #: code:addons/email_template/email_template_mailbox.py:0
@@ -411,40 +441,62 @@ msgid ""
 "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
 "Error: %s"
 msgstr ""
+"Mail %s versturen is mislukt. Waarschijnlijke reden: Kon niet aanmelden bij "
+"server\n"
+"Fout: %s"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Test Outgoing Connection"
-msgstr ""
+msgstr "Test uitgaande verbinding"
 
 #. module: email_template
-#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
-msgid "Mailbox"
-msgstr ""
+#: help:email.template,def_body_html:0
+#: help:email.template,def_body_text:0
+msgid "The text version of the mail"
+msgstr "De tekst-versie van het bericht"
 
 #. module: email_template
-#: help:email.template,attachment_ids:0
+#: help:email.template,reply_to:0
 msgid ""
-"You may attach existing files to this template, so they will be added in all "
-"emails created from this template"
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here. e.g. ${object.email_reply_to}"
 msgstr ""
+"Het adres waar ontvangers aan moeten antworden, als dit afwijkt van het Van "
+"adres. Hier kunnen plaatsvervangers worden gebruikt. bijv. "
+"${object.email_reply_to}"
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+msgid ""
+"Button in the side bar of the form view of this Resource that will invoke "
+"the Window Action"
+msgstr ""
+"Knop in de zijbalk van de formulierweergave van deze resource die de "
+"vensteractie zal aanroepen"
 
 #. module: email_template
 #: field:email_template.mailbox,account_id:0
 msgid "User account"
-msgstr ""
+msgstr "Gebruikersaccount"
 
 #. module: email_template
 #: field:email_template.send.wizard,signature:0
 msgid "Attach my signature to mail"
-msgstr ""
+msgstr "Voeg mijn ondertekening toe aan email"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #: view:email.template:0
 #, python-format
 msgid "Report"
-msgstr ""
+msgstr "Overzicht"
+
+#. module: email_template
+#: field:email_template.preview,ref_template:0
+#: field:email_template.send.wizard,ref_template:0
+msgid "Template"
+msgstr "Sjabloon"
 
 #. module: email_template
 #: help:email.template,model_object_field:0
@@ -454,163 +506,172 @@ msgid ""
 "in the box below\n"
 "(Note:If there are no values make sure you have selected the correct model)"
 msgstr ""
+"Kies het veld van het model dat u gebruiken wilt.\n"
+"Als het een relatieveld betreft, dan kunt u de geneste waarden hieronder "
+"kiezen.\n"
+"(NB: als er geen waarden zijn, controleer dan of u het juiste model heeft "
+"gekozen)"
 
 #. module: email_template
 #: view:email.template:0
 #: view:email_template.mailbox:0
 msgid "Advanced"
-msgstr ""
+msgstr "Geavanceerd"
 
 #. module: email_template
 #: constraint:ir.cron:0
 msgid "Invalid arguments"
-msgstr ""
+msgstr "Ongeldige argumenten"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Expression Builder"
-msgstr ""
+msgstr "Expressie-bouwer"
 
 #. module: email_template
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Ongeldige XML voor weergave opbouw!"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "HTML Body"
-msgstr ""
+msgstr "HTML-bericht"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Suspend Account"
-msgstr ""
+msgstr "Blokkeer Account"
 
 #. module: email_template
 #: help:email.template,null_value:0
 msgid "This Value is used if the field is empty"
-msgstr ""
+msgstr "Deze waarde wordt gebruikt als het veld leeg is"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Preview Template"
-msgstr ""
+msgstr "Sjabloon voorbeeld"
 
 #. module: email_template
 #: field:email_template.account,smtpserver:0
 msgid "Server"
-msgstr ""
+msgstr "Server"
 
 #. module: email_template
 #: help:email.template,copyvalue:0
 msgid ""
 "Copy and paste the value in the location you want to use a system value."
 msgstr ""
+"Kopieer en plak de waarde op de plek waar u een systeem-waarde wilt "
+"gebruiken."
 
 #. module: email_template
-#: help:email.template,sub_model_object_field:0
+#: help:email.template,track_campaign_item:0
 msgid ""
-"When you choose relationship fields this field will specify the sub value "
-"you can use."
-msgstr ""
-
-#. module: email_template
-#: help:email.template,sub_object:0
-msgid ""
-"When a relation field is used this field will show you the type of field you "
-"have selected"
-msgstr ""
-
-#. module: email_template
-#: field:email.template,lang:0
-msgid "Language"
+"Enable this is you wish to include a special tracking marker in outgoing "
+"emails so you can identify replies and link them back to the corresponding "
+"resource record. This is useful for CRM leads for example"
 msgstr ""
+"Zet aan als u een speciale volgmarkering wilt toevoegen aan uitgaande e-"
+"mails zodat u antwoorden kunt herkennen en terug kunt koppelen naar het "
+"corresponderende resource record. Dit is nuttig bij bijvoorbeeld CRM leads"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Body (Raw HTML)"
-msgstr ""
+msgstr "Berichttekst (Raw HTML)"
 
 #. module: email_template
 #: field:email.template,use_sign:0
 msgid "Signature"
-msgstr ""
+msgstr "Handtekening"
 
 #. module: email_template
 #: field:email.template,sub_object:0
 msgid "Sub-model"
-msgstr ""
+msgstr "Sub-model"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Options"
+msgstr "Opties"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Body (Plain Text)"
-msgstr ""
+msgstr "Berichttekst (platte tekst)"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Body (Text)"
-msgstr ""
+msgstr "Berichttekst (tekst)"
 
 #. module: email_template
 #: field:email_template.mailbox,date_mail:0
 msgid "Rec/Sent Date"
-msgstr ""
+msgstr "Datum ontv/verz"
 
 #. module: email_template
 #: field:email.template,report_template:0
 msgid "Report to send"
-msgstr ""
+msgstr "Te versturen overzicht"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Server Information"
-msgstr ""
+msgstr "Serverinformatie"
 
 #. module: email_template
 #: field:email_template.send.wizard,generated:0
 msgid "No of generated Mails"
-msgstr ""
+msgstr "Aant. gegegereerde emails"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Mail Details"
-msgstr ""
+msgstr "Berichtdetails"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
 #, python-format
 msgid "SMTP SERVER or PORT not specified"
-msgstr ""
+msgstr "SMTP SERVER of POORT niet ingevuld"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Note: This is Raw HTML."
-msgstr ""
+msgstr "Opmerking: Dit is Raw HTML."
+
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr "Groepeer op..."
 
 #. module: email_template
 #: selection:email_template.send.wizard,state:0
 msgid "Multiple Mail Wizard Step 1"
-msgstr ""
+msgstr "Meervoudige mail assistent stap 1"
 
 #. module: email_template
 #: field:email_template.account,user:0
 msgid "Related User"
-msgstr ""
+msgstr "Gekoppelde gebruiker"
 
 #. module: email_template
 #: field:email_template.mailbox,body_html:0
 msgid "Body (Rich Text Clients Only)"
-msgstr ""
+msgstr "Berichttekst (Alleen Rich Text Clients)"
 
 #. module: email_template
 #: selection:email_template.account,company:0
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
 #. module: email_template
 #: field:email.template,ref_ir_act_window:0
 msgid "Window Action"
-msgstr ""
+msgstr "Vensteractie"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
@@ -618,38 +679,39 @@ msgstr ""
 msgid ""
 "Datetime Extraction failed.Date:%s \\n                      \tError:%s"
 msgstr ""
-
-#. module: email_template
-#: view:email_template.account:0
-msgid "SMTP Server"
-msgstr ""
+"Datumtijd extractie mislukt.Datum:%s \\n                      \tFout:%s"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "HTML, otherwise Text"
-msgstr ""
+msgstr "HTML, anders Tekst"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: selection:email_template.mailbox,folder:0
 msgid "Drafts"
-msgstr ""
+msgstr "Concepten"
 
 #. module: email_template
 #: selection:email_template.account,company:0
 msgid "No"
-msgstr ""
+msgstr "Nee"
+
+#. module: email_template
+#: field:email_template.account,smtpport:0
+msgid "SMTP Port"
+msgstr "SMTP poort"
 
 #. module: email_template
 #: field:email_template.mailbox,mail_type:0
 msgid "Mail Contents"
-msgstr ""
+msgstr "Inhoud mailbericht"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:0
 #, python-format
 msgid "The template name must be unique !"
-msgstr ""
+msgstr "De sjabloon naam moet uniek zijn!"
 
 #. module: email_template
 #: field:email.template,def_bcc:0
@@ -657,35 +719,27 @@ msgstr ""
 #: field:email_template.preview,bcc:0
 #: field:email_template.send.wizard,bcc:0
 msgid "BCC"
-msgstr ""
-
-#. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
-msgid ""
-"Mail from Account %s failed. Probable Reason:Server Send Error\n"
-"Description: %s"
-msgstr ""
+msgstr "BCC"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "Plain Text"
-msgstr ""
+msgstr "Gewone tekst"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Draft"
-msgstr ""
+msgstr "Concept"
 
 #. module: email_template
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Fout ! U kunt geen recursief menu maken."
 
 #. module: email_template
 #: field:email.template,model_int_name:0
 msgid "Model Internal Name"
-msgstr ""
+msgstr "Interne naam model"
 
 #. module: email_template
 #: field:email.template,message_id:0
@@ -693,12 +747,12 @@ msgstr ""
 #: field:email_template.preview,message_id:0
 #: field:email_template.send.wizard,message_id:0
 msgid "Message-ID"
-msgstr ""
+msgstr "Bericht-ID"
 
 #. module: email_template
 #: help:email_template.mailbox,server_ref:0
 msgid "Applicable for inward items only"
-msgstr ""
+msgstr "Alleen toepasbaar voor inkomende berichten"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
@@ -706,103 +760,103 @@ msgid ""
 "After clicking send all mails, mails will be sent to outbox and cleared in "
 "next Send/Recieve"
 msgstr ""
+"Na het klikken op 'Verstuur alle email' worden deze naar Postvak Uit "
+"verplaatst en opgeschoond in de volgende Versturen/Ontvangen."
 
 #. module: email_template
-#: field:email_template.account,state:0
 #: field:email_template.mailbox,state:0
 #: field:email_template.send.wizard,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Uitgaand"
 
 #. module: email_template
 #: selection:email_template.account,state:0
 msgid "Initiated"
-msgstr ""
+msgstr "Begonnen"
 
 #. module: email_template
 #: help:email.template,use_sign:0
 msgid "the signature from the User details will be appended to the mail"
 msgstr ""
+"de handtekening uit de gebruiker details wordt toegevoegd aan de mail"
 
 #. module: email_template
 #: field:email_template.send.wizard,from:0
 msgid "From Account"
-msgstr ""
+msgstr "Van account"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "Intermixed content"
-msgstr ""
+msgstr "Gemengde inhoud"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Request Re-activation"
-msgstr ""
+msgstr "Verzoek her-activeren"
 
 #. module: email_template
 #: view:email.template:0
 #: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+#: model:ir.ui.menu,name:email_template.menu_email_template_all
+#: model:ir.ui.menu,name:email_template.menu_email_template_all_tools
 msgid "Email Templates"
-msgstr ""
+msgstr "Email-sjablonen"
 
 #. module: email_template
 #: field:email_template.account,smtpuname:0
 msgid "User Name"
-msgstr ""
+msgstr "Gebruikersnaam"
 
 #. module: email_template
 #: field:email.template,sub_model_object_field:0
 msgid "Sub Field"
+msgstr "Sub-veld"
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+msgid ""
+"You may attach existing files to this template, so they will be added in all "
+"emails created from this template"
 msgstr ""
+"U mag bestaande bestanden bijvoegen bij dit sjabloon, zodat ze in alle e-"
+"mails worden toegevoegd die met dit sjabloon worden gemaakt"
 
 #. module: email_template
 #: field:email_template.mailbox,user:0
 msgid "User"
-msgstr ""
+msgstr "Gebruiker"
 
 #. module: email_template
-#: help:email.template,allowed_groups:0
-msgid ""
-"Only users from these groups will be allowed to send mails from this Template"
-msgstr ""
+#: view:email.template:0
+msgid "Advanced Options"
+msgstr "Geavanceerde opties"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: selection:email_template.mailbox,folder:0
 msgid "Outbox"
-msgstr ""
+msgstr "Postvak UIT"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Save in Drafts"
-msgstr ""
-
-#. module: email_template
-#: help:email.template,def_subject:0
-msgid "The default subject of email. Placeholders can be used here."
-msgstr ""
+msgstr "Bewaar in Concepten"
 
 #. module: email_template
 #: field:email_template.account,smtptls:0
 msgid "TLS"
-msgstr ""
+msgstr "TLS"
 
 #. module: email_template
-#: view:email_template.send.wizard:0
-msgid ""
-"Add here all attachments of the current document you want to include in the "
-"e-mail."
-msgstr ""
-
-#. module: email_template
-#: model:ir.model,name:email_template.model_email_template_send_wizard
-msgid "This is the wizard for sending mail"
-msgstr ""
+#: field:email.template,lang:0
+msgid "Language"
+msgstr "Taal"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:0
@@ -810,14 +864,22 @@ msgstr ""
 #: code:addons/email_template/email_template_mailbox.py:0
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #: model:ir.ui.menu,name:email_template.menu_email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
+#: model:ir.ui.menu,name:email_template.menu_email_template_tools
 #, python-format
 msgid "Email Template"
-msgstr ""
+msgstr "Email sjabloon"
 
 #. module: email_template
-#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
-msgid "Personal Mails"
-msgstr ""
+#: view:email_template.account:0
+msgid "Send/Receive"
+msgstr "Versturen/ontvangen"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Send Mail"
+msgstr "Verstuur bericht"
 
 #. module: email_template
 #: code:addons/email_template/email_template_mailbox.py:0
@@ -832,39 +894,55 @@ msgid ""
 "            context = {}\n"
 "        filters = [('folder', '=', 'outbox"
 msgstr ""
+"Fout bij versturen mail: %s\" % str(e)))\n"
+"        \n"
+"    def send_all_mail(self, cr, uid, ids=None, context=None):\n"
+"        if ids is None:\n"
+"            ids = []\n"
+"        if context is None:\n"
+"            context = {}\n"
+"        filters = [('folder', '=', 'outbox"
 
 #. module: email_template
-#: field:email.template,file_name:0
-msgid "File Name Pattern"
+#: help:email.template,allowed_groups:0
+msgid ""
+"Only users from these groups will be allowed to send mails from this Template"
 msgstr ""
+"Alleen gebruikers van deze groepen mogen mails versturen via dit sjabloon."
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:0
 #, python-format
 msgid "Send Mail (%s)"
+msgstr "Verstuur mail (%s)"
+
+#. module: email_template
+#: help:email.template,def_subject:0
+msgid "The subject of email. Placeholders can be used here."
 msgstr ""
+"Het onderwerp van de email. Plaatsvervangers kunnen hier worden gebruikt."
 
 #. module: email_template
 #: field:email_template.send.wizard,report:0
 msgid "Report File Name"
-msgstr ""
+msgstr "Bestandsnaam overzicht"
 
 #. module: email_template
 #: field:email.template,copyvalue:0
 msgid "Expression"
-msgstr ""
+msgstr "Uitdrukking"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: field:email_template.mailbox,history:0
 msgid "History"
-msgstr ""
+msgstr "Historie"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:0
 #, python-format
 msgid "Django templates not installed"
-msgstr ""
+msgstr "Django sjablonen niet geïnstalleerd"
 
 #. module: email_template
 #: view:email.template:0
@@ -873,61 +951,57 @@ msgstr ""
 #: view:email_template.send.wizard:0
 #: field:email_template.send.wizard,attachment_ids:0
 msgid "Attachments"
-msgstr ""
+msgstr "Bijlagen"
 
 #. module: email_template
 #: field:email_template.preview,to:0
 #: field:email_template.send.wizard,to:0
 msgid "To"
-msgstr ""
-
-#. module: email_template
-#: field:email_template.account,smtpport:0
-msgid "SMTP Port "
-msgstr ""
+msgstr "Aan"
 
 #. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "Text, otherwise HTML"
-msgstr ""
+msgstr "Tekst, anders HTML"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:0
 #, python-format
 msgid "Copy of template "
-msgstr ""
+msgstr "Sjabloon kopie "
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Discard Mail"
-msgstr ""
+msgstr "Verwerp email"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template
 msgid "Email Templates for Models"
-msgstr ""
+msgstr "Email sjablonen voor modellen"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Close"
-msgstr ""
+msgstr "Sluiten"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Body (HTML-Web Client Only)"
-msgstr ""
+msgstr "Berichttekst (HTML-Alleen web-client)"
 
 #. module: email_template
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #, python-format
 msgid "%s (Email Attachment)"
-msgstr ""
+msgstr "%s (Email bijlage)"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
@@ -937,43 +1011,55 @@ msgid ""
 "Either ask admin to enforce an account for this template or get yourself a "
 "personal email account."
 msgstr ""
+"Geen persoonlijke email accounts voor u geconfigureerd. \n"
+"Vraag de beheerder om voor een account voor dit sjabloon te zorgen of zorg "
+"zelf voor een persoonlijke email account."
 
 #. module: email_template
 #: field:email.template,allowed_groups:0
 msgid "Allowed User Groups"
-msgstr ""
+msgstr "Toegestane gebruikersgroepen"
 
 #. module: email_template
 #: field:email.template,model_object_field:0
 msgid "Field"
-msgstr ""
+msgstr "Veld"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "User Information"
-msgstr ""
+msgstr "Gebruikersinformatie"
 
 #. module: email_template
 #: view:email_template.account:0
 #: selection:email_template.account,state:0
 msgid "Suspended"
+msgstr "Geblokkeerd"
+
+#. module: email_template
+#: help:email.template,file_name:0
+msgid ""
+"Name of the generated report file. Placeholders can be used in the filename. "
+"eg: 2009_SO003.pdf"
 msgstr ""
+"Naam ver het gegenereerde overzichtbestand. Plaatsvervangers kunnen worden "
+"gebruikt in de bestandsnaam. bijv: 2009_SO003.pdf"
 
 #. module: email_template
 #: field:email_template.mailbox,folder:0
 msgid "Folder"
-msgstr ""
+msgstr "Map"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 #: selection:email_template.mailbox,folder:0
 msgid "Trash"
-msgstr ""
+msgstr "Prullenbak"
 
 #. module: email_template
-#: model:ir.model,name:email_template.model_email_template_mailbox
-msgid "Email Mailbox"
-msgstr ""
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
+msgstr "Datum waarop de email is verstuurd of ontvangen"
 
 #. module: email_template
 #: help:email_template.account,smtpuname:0
@@ -981,49 +1067,81 @@ msgid ""
 "Specify the username if your SMTP server requires authentication, otherwise "
 "leave it empty."
 msgstr ""
+"Vul de gebruikersnaam in als uw SMTP server authenticatie vereist, laat het "
+"anders leeg."
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #, python-format
 msgid "Missing mail account"
-msgstr ""
+msgstr "Ontbrekende mail account"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
 #, python-format
 msgid "SMTP Test Connection Was Successful"
-msgstr ""
+msgstr "SMTP Test verbinding was succesvol"
 
 #. module: email_template
 #: model:ir.module.module,shortdesc:email_template.module_meta_information
 msgid "Email Template for OpenERP"
-msgstr ""
+msgstr "Email sjabloon voor OpenERP"
 
 #. module: email_template
 #: field:email_template.account,name:0
 msgid "Description"
-msgstr ""
+msgstr "Omschrijving"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Create Action"
-msgstr ""
+msgstr "Nieuwe actie"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
-msgid "Mail from Account %s failed. Probable Reason:Account not approved"
+#: help:email_template.account,smtpserver:0
+msgid "Enter name of outgoing server, eg: smtp.yourdomain.com"
+msgstr "Vul naam in van uitgaande server, bijv. smtp.uwdomein.nl"
+
+#. module: email_template
+#: help:email.template,sub_object:0
+msgid ""
+"When a relation field is used this field will show you the type of field you "
+"have selected"
 msgstr ""
+"Wanneer een relatieveld wordt gebruikt, toont dit veld u het veldtype dat u "
+"gekozen heeft."
+
+#. module: email_template
+#: help:email.template,message_id:0
+msgid ""
+"Specify the Message-ID SMTP header to use in outgoing emails. Please note "
+"that this overrides the Resource tracking option! Placeholders can be used "
+"here."
+msgstr ""
+"Vul de Message-ID SMTP header in voor gebruik bij uitgaande emails. Merk op "
+"dat dit voorrang heeft op de resource volgoptie! Er kunnen plaatsvervangers "
+"worden gebruikt."
+
+#. module: email_template
+#: field:email.template,def_to:0
+#: field:email_template.mailbox,email_to:0
+msgid "Recipient (To)"
+msgstr "Ontvanger (Aan)"
 
 #. module: email_template
 #: field:email.template,null_value:0
 msgid "Null Value"
-msgstr ""
+msgstr "Nulwaarde"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr "Email postvak"
 
 #. module: email_template
 #: field:email.template,template_language:0
 msgid "Templating Language"
-msgstr ""
+msgstr "Taal voor sjabloon"
 
 #. module: email_template
 #: field:email.template,def_cc:0
@@ -1031,80 +1149,95 @@ msgstr ""
 #: field:email_template.preview,cc:0
 #: field:email_template.send.wizard,cc:0
 msgid "CC"
-msgstr ""
+msgstr "CC"
 
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Sent"
-msgstr ""
+msgstr "Verstuurd"
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+msgid "Action that will open this email template on Resource records"
+msgstr "Actie die dit email sjabloon opent bij resource records"
 
 #. module: email_template
 #: field:email_template.account,smtppass:0
 msgid "Password"
-msgstr ""
+msgstr "Wachtwoord"
 
 #. module: email_template
-#: help:email.template,message_id:0
 #: help:email_template.preview,message_id:0
 #: help:email_template.send.wizard,message_id:0
 msgid ""
 "The Message-ID header value, if you need tospecify it, for example to "
 "automatically recognize the replies later. Placeholders can be used here."
 msgstr ""
+"De Bericht-ID kop waarde, als u die wilt opgeven, bijvoorbeeld om later "
+"automatisch antwoorden te herkennen. Plaatsvervangers mogen hierin worden "
+"gebruikt."
 
 #. module: email_template
-#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
+#: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+#: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Emails"
-msgstr ""
+msgstr "Emails"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Templates"
-msgstr ""
+msgstr "Sjablonen"
 
 #. module: email_template
 #: field:email_template.preview,report:0
 msgid "Report Name"
-msgstr ""
+msgstr "Naam overzicht"
 
 #. module: email_template
 #: field:email.template,name:0
 msgid "Name"
-msgstr ""
+msgstr "Naam"
+
+#. module: email_template
+#: field:email.template,track_campaign_item:0
+msgid "Resource Tracking"
+msgstr "Resources volgen"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_preview
 msgid "Email Template Preview"
-msgstr ""
+msgstr "Email sjabloon voorbeeld"
 
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Email Preview"
+msgstr "Email voorbeeld"
+
+#. module: email_template
+#: help:email.template,def_to:0
+msgid ""
+"The Recipient of email. Placeholders can be used here. e.g. "
+"${object.email_to}"
 msgstr ""
+"De email ontvanger. Hier kunnen plaatvervangers worden gebruikt. bijv. "
+"${object.email_to}"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Existing files"
-msgstr ""
+msgstr "Bestaande bestanden"
 
 #. module: email_template
-#: view:email_template.account:0
-msgid "Personal Accounts"
-msgstr ""
-
-#. module: email_template
-#: model:ir.module.module,description:email_template.module_meta_information
-msgid ""
-"\n"
-"    Email Template is extraction of Power Email basically just to send the "
-"emails.\n"
-"    "
-msgstr ""
+#: field:email_template.account,smtpssl:0
+msgid "SSL/TLS (only in python 2.6)"
+msgstr "SSL/TLS (alleen in python 2.6)"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Body (HTML)"
-msgstr ""
+msgstr "Berichttekst (HTML)"
 
 #. module: email_template
 #: help:email.template,table_html:0
@@ -1112,61 +1245,45 @@ msgid ""
 "Copy this html code to your HTML message body for displaying the info in "
 "your mail."
 msgstr ""
+"Kopieer deze HTML-code in uw HTML-berichttekst om deze info in uw mail op te "
+"nemen."
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_account
 msgid "email_template.account"
-msgstr ""
+msgstr "email_template.account"
 
 #. module: email_template
-#: field:email.template,object_name:0
 #: field:email_template.preview,rel_model:0
 #: field:email_template.send.wizard,rel_model:0
 msgid "Model"
-msgstr ""
+msgstr "Model"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
 #, python-format
 msgid "Core connection for the given ID does not exist"
-msgstr ""
+msgstr "Kernverbinding voor opgegeven ID bestaat niet"
 
 #. module: email_template
 #: field:email_template.account,company:0
 msgid "Corporate"
-msgstr ""
+msgstr "Bedrijf"
 
 #. module: email_template
-#: help:email_template.account,smtpserver:0
-msgid "Enter name of outgoing server, eg:smtp.gmail.com "
-msgstr ""
-
-#. module: email_template
-#: model:ir.ui.menu,name:email_template.menu_email_template_company_mails
-msgid "Company Mails"
-msgstr ""
+#: model:ir.model,name:email_template.model_email_template_send_wizard
+msgid "This is the wizard for sending mail"
+msgstr "Dit is de assistent voor het versturen van email."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Addresses"
-msgstr ""
+msgstr "Adressen"
 
 #. module: email_template
 #: help:email.template,from_account:0
 msgid "Emails will be sent from this approved account."
-msgstr ""
-
-#. module: email_template
-#: field:email.template,def_subject:0
-msgid "Default Subject"
-msgstr ""
-
-#. module: email_template
-#: help:email.template,def_bcc:0
-msgid ""
-"Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
-"here."
-msgstr ""
+msgstr "Emails worden verstuurd vanaf deze bevestigde account."
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
@@ -1175,55 +1292,55 @@ msgid ""
 "Mail from Account %s failed. Probable Reason:MIME Error\n"
 "Description: %s"
 msgstr ""
+"Mail vanaf account %s mislukt. Waarschijnlijke reden: MIME Fout\n"
+"Omschrijving: %s"
 
 #. module: email_template
 #: field:email_template.account,send_pref:0
 msgid "Mail Format"
-msgstr ""
+msgstr "Mail-indeling"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Actions"
-msgstr ""
+msgstr "Acties"
 
 #. module: email_template
 #: view:email_template.account:0
 msgid "Company Accounts"
-msgstr ""
+msgstr "Bedrijfs-accounts"
+
+#. module: email_template
+#: help:email_template.account,smtpport:0
+msgid "Enter port number, eg: 25 or 587"
+msgstr "Vul poortnummer in, bijv. 25 of 587"
 
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #, python-format
 msgid "email-template"
-msgstr ""
+msgstr "email-sjabloon"
 
 #. module: email_template
-#: help:email.template,def_cc:0
-msgid ""
-"Carbon Copy address(es), comma-separated. Placeholders can be used here."
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Mail from Account %s failed. Probable Reason:Account not approved"
 msgstr ""
+"Mail van account %s mislukt. Waarschijnlijke reden: Account niet bevestigd"
 
 #. module: email_template
 #: selection:email_template.send.wizard,state:0
 msgid "Simple Mail Wizard Step 1"
-msgstr ""
+msgstr "Eenvoudige mail assistent stap 1"
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "Has Attachments"
-msgstr ""
-
-#. module: email_template
-#: help:email.template,track_campaign_item:0
-msgid ""
-"Enable this if you want the outgoing e-mails to include a tracking marker "
-"that makes it possible to identify the replies an link them back to the "
-"campaign item"
-msgstr ""
+msgstr "Heeft bijlagen"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:0
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #, python-format
 msgid "No Description"
-msgstr ""
+msgstr "Geen beschrijving"
diff --git a/addons/email_template/i18n/ru.po b/addons/email_template/i18n/ru.po
index 689ca686703..ad8cf97a81d 100644
--- a/addons/email_template/i18n/ru.po
+++ b/addons/email_template/i18n/ru.po
@@ -7,19 +7,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-08-20 05:34+0000\n"
-"PO-Revision-Date: 2010-10-17 18:13+0000\n"
-"Last-Translator: Wladimir Rossinski <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-18 07:52+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\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: 2010-10-18 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
-#: view:email_template.send.wizard:0
-msgid "Send mail Wizard"
+#: help:email_template.account,auto_delete:0
+msgid "Permanently delete emails after sending"
 msgstr ""
 
 #. module: email_template
@@ -34,15 +34,9 @@ msgid "Emails for multiple items saved in outbox."
 msgstr "Почта для многократной отправки сохранена в исходящих."
 
 #. module: email_template
-#: view:email.template:0
-msgid "Email Data"
-msgstr "Данные электронной почты"
-
-#. module: email_template
-#: field:email.template,def_to:0
-#: field:email_template.mailbox,email_to:0
-msgid "Recipient (To)"
-msgstr "Получатель (Кому)"
+#: view:email_template.mailbox:0
+msgid "Personal Emails"
+msgstr ""
 
 #. module: email_template
 #: constraint:ir.actions.act_window:0
@@ -50,9 +44,14 @@ msgid "Invalid model name in the action definition."
 msgstr "Недопустимое имя модели в определении действия."
 
 #. module: email_template
-#: selection:email_template.send.wizard,state:0
-msgid "Wizard Complete"
-msgstr "Мастер завершён."
+#: view:email.template:0
+msgid "Email Content  "
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send mail Wizard"
+msgstr ""
 
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
@@ -99,12 +98,13 @@ msgid "Send now"
 msgstr "Отправить сейчас"
 
 #. module: email_template
-#: view:email_template.mailbox:0
 #: selection:email_template.mailbox,state:0
 msgid "Not Applicable"
 msgstr "Неприменимо"
 
 #. module: email_template
+#: view:email_template.account:0
+#: model:ir.ui.menu,name:email_template.menu_email_account_all_tools
 #: model:ir.ui.menu,name:email_template.menu_email_template_account_all
 msgid "Email Accounts"
 msgstr "Учетные записи"
@@ -119,32 +119,42 @@ msgstr "Отправить всю почту"
 msgid "Server Reference of mail"
 msgstr "Ссылка сервера почты"
 
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Reason: %s"
+msgstr "Причина: %s"
+
 #. module: email_template
 #: view:email_template.account:0
-msgid "My Accounts"
-msgstr "Мои аккаунты"
-
-#. module: email_template
-#: view:email_template.mailbox:0
-msgid "Send Mail"
-msgstr "Отправить письмо"
-
-#. module: email_template
 #: selection:email_template.account,state:0
 msgid "Approved"
 msgstr "Подтверждено"
 
+#. module: email_template
+#: help:email.template,def_cc:0
+msgid ""
+"Carbon Copy address(es), comma-separated. Placeholders can be used here. "
+"e.g. ${object.email_cc}"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Account"
+msgstr ""
+
 #. module: email_template
 #: field:email.template,table_html:0
 msgid "HTML code"
 msgstr "HTML код"
 
 #. module: email_template
-#: help:email.template,file_name:0
+#: help:email_template.account,name:0
 msgid ""
-"File name pattern can be specified with placeholders.eg. 2009_SO003.pdf"
+"The description is used as the Sender name along with the provided From "
+"Email, unless it is already specified in the From Email, e.g: John Doe "
+"<john@doe.com>"
 msgstr ""
-"Образец названия файла может быть определен например как: 2009_SO003.pdf"
 
 #. module: email_template
 #: field:email.template,from_account:0
@@ -157,6 +167,13 @@ msgstr "Аккаунт почты"
 msgid "Email sending failed for one or more objects."
 msgstr "Отправка почты не удалась для одного или более объектов."
 
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Add here all attachments of the current document you want to include in the "
+"Email."
+msgstr ""
+
 #. module: email_template
 #: help:email.template,lang:0
 msgid ""
@@ -167,9 +184,16 @@ msgstr ""
 "${object.partner_id.lang}"
 
 #. module: email_template
-#: help:email_template.account,smtpport:0
-msgid "Enter port number,eg:SMTP-587 "
-msgstr "Введите номер порта, например: SMTP-587 "
+#: help:email.template,sub_model_object_field:0
+msgid ""
+"When you choose relationship fields this field will specify the sub value "
+"you can use."
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Wizard Complete"
+msgstr "Мастер завершён."
 
 #. module: email_template
 #: field:email.template,reply_to:0
@@ -189,11 +213,6 @@ msgstr "Удалить действие"
 msgid "Approve Account"
 msgstr "Одобрите учетную запись"
 
-#. module: email_template
-#: model:ir.ui.menu,name:email_template.menu_email_template_all
-msgid "E-MAIL Templates"
-msgstr "Шаблон письма"
-
 #. module: email_template
 #: field:email_template.preview,rel_model_ref:0
 #: field:email_template.send.wizard,rel_model_ref:0
@@ -215,6 +234,11 @@ msgstr ""
 msgid "OK"
 msgstr "ОК"
 
+#. module: email_template
+#: field:email_template.account,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
 #. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "Both HTML & Text (Alternative)"
@@ -232,19 +256,11 @@ msgid "No of requested Mails"
 msgstr "Запрашиваемые письма не найдены"
 
 #. module: email_template
+#: field:email.template,def_body_text:0
 #: view:email_template.mailbox:0
-msgid "Download Full Mail"
-msgstr "Скачать письмо целиком"
-
-#. module: email_template
-#: help:email.template,def_to:0
-msgid "The default recipient of email.Placeholders can be used here."
-msgstr "Не указан получатель письма. Укажите его здесь."
-
-#. module: email_template
-#: view:email_template.mailbox:0
-msgid "Mailboxes"
-msgstr "Почтовые ящики"
+#: field:email_template.mailbox,body_text:0
+msgid "Standard Body (Text)"
+msgstr "Шаблон (текст)"
 
 #. module: email_template
 #: field:email.template,attachment_ids:0
@@ -252,9 +268,9 @@ msgid "Attached Files"
 msgstr "Прикрепленные файлы"
 
 #. module: email_template
-#: field:email_template.account,smtpssl:0
-msgid "SSL/TLS (only in python 2.6)"
-msgstr "SSL/TLS (только для python 2.6)"
+#: view:email_template.mailbox:0
+msgid "Standard Body"
+msgstr ""
 
 #. module: email_template
 #: field:email_template.account,email_id:0
@@ -268,21 +284,20 @@ msgid "Warning"
 msgstr "Предупреждение"
 
 #. module: email_template
-#: view:email_template.account:0
 #: model:ir.actions.act_window,name:email_template.action_email_template_account_tree_all
 msgid "Accounts"
 msgstr "Аккаунты"
 
-#. module: email_template
-#: field:email.template,track_campaign_item:0
-msgid "Track campaign items"
-msgstr ""
-
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Body(Text)"
 msgstr "Тело (Текст)"
 
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Company Emails"
+msgstr ""
+
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid ""
@@ -291,7 +306,6 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: help:email.template,reply_to:0
 #: help:email_template.preview,reply_to:0
 #: help:email_template.send.wizard,reply_to:0
 msgid ""
@@ -300,6 +314,7 @@ msgid ""
 msgstr ""
 
 #. module: email_template
+#: field:email.template,def_subject:0
 #: field:email_template.mailbox,subject:0
 #: field:email_template.preview,subject:0
 #: field:email_template.send.wizard,subject:0
@@ -307,15 +322,9 @@ msgid "Subject"
 msgstr "Предмет"
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
-msgid "Reason: %s"
-msgstr "Причина: %s"
-
-#. module: email_template
-#: help:email_template.account,email_id:0
-msgid "eg: yourname@yourdomain.com "
-msgstr "например: yourname@yourdomain.com "
+#: view:email_template.mailbox:0
+msgid "My Emails"
+msgstr ""
 
 #. module: email_template
 #: field:email_template.mailbox,email_from:0
@@ -323,20 +332,11 @@ msgid "From"
 msgstr "От"
 
 #. module: email_template
-#: field:email_template.preview,ref_template:0
-#: field:email_template.send.wizard,ref_template:0
-msgid "Template"
-msgstr "Шаблон"
+#: field:email.template,file_name:0
+msgid "Report Filename"
+msgstr ""
 
 #. module: email_template
-#: field:email.template,def_body_text:0
-#: view:email_template.mailbox:0
-#: field:email_template.mailbox,body_text:0
-msgid "Standard Body (Text)"
-msgstr "Шаблон (текст)"
-
-#. module: email_template
-#: view:email_template.mailbox:0
 #: selection:email_template.mailbox,state:0
 msgid "Sending"
 msgstr "Отправка"
@@ -352,9 +352,11 @@ msgid "Body(Html)"
 msgstr "Тело (HTML)"
 
 #. module: email_template
-#: view:email_template.account:0
-msgid "Send/Receive"
-msgstr "Отправить/Получить"
+#: help:email.template,def_bcc:0
+msgid ""
+"Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
+"here. e.g. ${object.email_bcc}"
+msgstr ""
 
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
@@ -366,11 +368,28 @@ msgstr "Просмотр шаблона"
 msgid "Body (Text-Web Client Only)"
 msgstr "Тело (текст - только веб-клиент)"
 
+#. module: email_template
+#: field:email_template.account,state:0
+#: view:email_template.mailbox:0
+msgid "State"
+msgstr ""
+
 #. module: email_template
 #: field:email.template,ref_ir_value:0
 msgid "Wizard Button"
 msgstr "Кнопка мастера"
 
+#. module: email_template
+#: help:email_template.account,email_id:0
+msgid "eg: 'john@doe.com' or 'John Doe <john@doe.com>'"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: field:email.template,object_name:0
+msgid "Resource"
+msgstr ""
+
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
 #, python-format
@@ -383,23 +402,11 @@ msgstr "Тест связи потерпел неудачу"
 msgid "Mail from Account %s successfully Sent."
 msgstr ""
 
-#. module: email_template
-#: view:email.template:0
-#: view:email_template.mailbox:0
-msgid "Standard Body"
-msgstr ""
-
 #. module: email_template
 #: selection:email.template,template_language:0
 msgid "Mako Templates"
 msgstr "Шаблоны Mako"
 
-#. module: email_template
-#: help:email.template,def_body_html:0
-#: help:email.template,def_body_text:0
-msgid "The text version of the mail"
-msgstr ""
-
 #. module: email_template
 #: code:addons/email_template/email_template.py:0
 #, python-format
@@ -425,18 +432,24 @@ msgid "Test Outgoing Connection"
 msgstr "Проверьте исходящую связь"
 
 #. module: email_template
-#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
-msgid "Mailbox"
-msgstr "Почтовый ящик"
+#: help:email.template,def_body_html:0
+#: help:email.template,def_body_text:0
+msgid "The text version of the mail"
+msgstr ""
 
 #. module: email_template
-#: help:email.template,attachment_ids:0
+#: help:email.template,reply_to:0
 msgid ""
-"You may attach existing files to this template, so they will be added in all "
-"emails created from this template"
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here. e.g. ${object.email_reply_to}"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+msgid ""
+"Button in the side bar of the form view of this Resource that will invoke "
+"the Window Action"
 msgstr ""
-"Вы можете приложить существующие файлы к этому шаблону, таким образом они "
-"будут добавлены во всех электронных письмах, созданных из этого шаблона"
 
 #. module: email_template
 #: field:email_template.mailbox,account_id:0
@@ -455,6 +468,12 @@ msgstr "Прикрепить подпись к письму"
 msgid "Report"
 msgstr "Отчет"
 
+#. module: email_template
+#: field:email_template.preview,ref_template:0
+#: field:email_template.send.wizard,ref_template:0
+msgid "Template"
+msgstr "Шаблон"
+
 #. module: email_template
 #: help:email.template,model_object_field:0
 msgid ""
@@ -517,24 +536,13 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: help:email.template,sub_model_object_field:0
+#: help:email.template,track_campaign_item:0
 msgid ""
-"When you choose relationship fields this field will specify the sub value "
-"you can use."
+"Enable this is you wish to include a special tracking marker in outgoing "
+"emails so you can identify replies and link them back to the corresponding "
+"resource record. This is useful for CRM leads for example"
 msgstr ""
 
-#. module: email_template
-#: help:email.template,sub_object:0
-msgid ""
-"When a relation field is used this field will show you the type of field you "
-"have selected"
-msgstr ""
-
-#. module: email_template
-#: field:email.template,lang:0
-msgid "Language"
-msgstr "Язык"
-
 #. module: email_template
 #: view:email.template:0
 msgid "Body (Raw HTML)"
@@ -550,6 +558,11 @@ msgstr "Подпись"
 msgid "Sub-model"
 msgstr "Подмодель"
 
+#. module: email_template
+#: view:email.template:0
+msgid "Options"
+msgstr ""
+
 #. module: email_template
 #: view:email_template.send.wizard:0
 msgid "Body (Plain Text)"
@@ -596,6 +609,11 @@ msgstr "Не определен SMTP сервер или порт"
 msgid "Note: This is Raw HTML."
 msgstr "Примечание: Этот HTML сырой"
 
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr ""
+
 #. module: email_template
 #: selection:email_template.send.wizard,state:0
 msgid "Multiple Mail Wizard Step 1"
@@ -628,11 +646,6 @@ msgid ""
 "Datetime Extraction failed.Date:%s \\n                      \tError:%s"
 msgstr ""
 
-#. module: email_template
-#: view:email_template.account:0
-msgid "SMTP Server"
-msgstr ""
-
 #. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "HTML, otherwise Text"
@@ -649,6 +662,11 @@ msgstr ""
 msgid "No"
 msgstr ""
 
+#. module: email_template
+#: field:email_template.account,smtpport:0
+msgid "SMTP Port"
+msgstr ""
+
 #. module: email_template
 #: field:email_template.mailbox,mail_type:0
 msgid "Mail Contents"
@@ -668,14 +686,6 @@ msgstr ""
 msgid "BCC"
 msgstr ""
 
-#. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
-msgid ""
-"Mail from Account %s failed. Probable Reason:Server Send Error\n"
-"Description: %s"
-msgstr ""
-
 #. module: email_template
 #: selection:email_template.mailbox,mail_type:0
 msgid "Plain Text"
@@ -717,7 +727,6 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: field:email_template.account,state:0
 #: field:email_template.mailbox,state:0
 #: field:email_template.send.wizard,state:0
 msgid "Status"
@@ -756,6 +765,8 @@ msgstr ""
 #. module: email_template
 #: view:email.template:0
 #: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+#: model:ir.ui.menu,name:email_template.menu_email_template_all
+#: model:ir.ui.menu,name:email_template.menu_email_template_all_tools
 msgid "Email Templates"
 msgstr ""
 
@@ -769,15 +780,23 @@ msgstr ""
 msgid "Sub Field"
 msgstr ""
 
+#. module: email_template
+#: help:email.template,attachment_ids:0
+msgid ""
+"You may attach existing files to this template, so they will be added in all "
+"emails created from this template"
+msgstr ""
+"Вы можете приложить существующие файлы к этому шаблону, таким образом они "
+"будут добавлены во всех электронных письмах, созданных из этого шаблона"
+
 #. module: email_template
 #: field:email_template.mailbox,user:0
 msgid "User"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,allowed_groups:0
-msgid ""
-"Only users from these groups will be allowed to send mails from this Template"
+#: view:email.template:0
+msgid "Advanced Options"
 msgstr ""
 
 #. module: email_template
@@ -791,27 +810,15 @@ msgstr ""
 msgid "Save in Drafts"
 msgstr ""
 
-#. module: email_template
-#: help:email.template,def_subject:0
-msgid "The default subject of email. Placeholders can be used here."
-msgstr ""
-
 #. module: email_template
 #: field:email_template.account,smtptls:0
 msgid "TLS"
 msgstr ""
 
 #. module: email_template
-#: view:email_template.send.wizard:0
-msgid ""
-"Add here all attachments of the current document you want to include in the "
-"e-mail."
-msgstr ""
-
-#. module: email_template
-#: model:ir.model,name:email_template.model_email_template_send_wizard
-msgid "This is the wizard for sending mail"
-msgstr ""
+#: field:email.template,lang:0
+msgid "Language"
+msgstr "Язык"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:0
@@ -819,14 +826,22 @@ msgstr ""
 #: code:addons/email_template/email_template_mailbox.py:0
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #: model:ir.ui.menu,name:email_template.menu_email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
+#: model:ir.ui.menu,name:email_template.menu_email_template_tools
 #, python-format
 msgid "Email Template"
 msgstr ""
 
 #. module: email_template
-#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
-msgid "Personal Mails"
-msgstr ""
+#: view:email_template.account:0
+msgid "Send/Receive"
+msgstr "Отправить/Получить"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Send Mail"
+msgstr "Отправить письмо"
 
 #. module: email_template
 #: code:addons/email_template/email_template_mailbox.py:0
@@ -843,8 +858,9 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: field:email.template,file_name:0
-msgid "File Name Pattern"
+#: help:email.template,allowed_groups:0
+msgid ""
+"Only users from these groups will be allowed to send mails from this Template"
 msgstr ""
 
 #. module: email_template
@@ -853,6 +869,11 @@ msgstr ""
 msgid "Send Mail (%s)"
 msgstr ""
 
+#. module: email_template
+#: help:email.template,def_subject:0
+msgid "The subject of email. Placeholders can be used here."
+msgstr ""
+
 #. module: email_template
 #: field:email_template.send.wizard,report:0
 msgid "Report File Name"
@@ -890,11 +911,6 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#. module: email_template
-#: field:email_template.account,smtpport:0
-msgid "SMTP Port "
-msgstr ""
-
 #. module: email_template
 #: selection:email_template.account,send_pref:0
 msgid "Text, otherwise HTML"
@@ -968,6 +984,13 @@ msgstr ""
 msgid "Suspended"
 msgstr ""
 
+#. module: email_template
+#: help:email.template,file_name:0
+msgid ""
+"Name of the generated report file. Placeholders can be used in the filename. "
+"eg: 2009_SO003.pdf"
+msgstr ""
+
 #. module: email_template
 #: field:email_template.mailbox,folder:0
 msgid "Folder"
@@ -980,8 +1003,8 @@ msgid "Trash"
 msgstr ""
 
 #. module: email_template
-#: model:ir.model,name:email_template.model_email_template_mailbox
-msgid "Email Mailbox"
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
 msgstr ""
 
 #. module: email_template
@@ -1019,16 +1042,41 @@ msgid "Create Action"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#, python-format
-msgid "Mail from Account %s failed. Probable Reason:Account not approved"
+#: help:email_template.account,smtpserver:0
+msgid "Enter name of outgoing server, eg: smtp.yourdomain.com"
 msgstr ""
 
+#. module: email_template
+#: help:email.template,sub_object:0
+msgid ""
+"When a relation field is used this field will show you the type of field you "
+"have selected"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,message_id:0
+msgid ""
+"Specify the Message-ID SMTP header to use in outgoing emails. Please note "
+"that this overrides the Resource tracking option! Placeholders can be used "
+"here."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_to:0
+#: field:email_template.mailbox,email_to:0
+msgid "Recipient (To)"
+msgstr "Получатель (Кому)"
+
 #. module: email_template
 #: field:email.template,null_value:0
 msgid "Null Value"
 msgstr ""
 
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr ""
+
 #. module: email_template
 #: field:email.template,template_language:0
 msgid "Templating Language"
@@ -1047,13 +1095,17 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+msgid "Action that will open this email template on Resource records"
+msgstr ""
+
 #. module: email_template
 #: field:email_template.account,smtppass:0
 msgid "Password"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,message_id:0
 #: help:email_template.preview,message_id:0
 #: help:email_template.send.wizard,message_id:0
 msgid ""
@@ -1062,7 +1114,10 @@ msgid ""
 msgstr ""
 
 #. module: email_template
-#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
+#: view:email_template.mailbox:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+#: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Emails"
 msgstr ""
 
@@ -1081,6 +1136,11 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
+#. module: email_template
+#: field:email.template,track_campaign_item:0
+msgid "Resource Tracking"
+msgstr ""
+
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_preview
 msgid "Email Template Preview"
@@ -1091,24 +1151,22 @@ msgstr ""
 msgid "Email Preview"
 msgstr ""
 
+#. module: email_template
+#: help:email.template,def_to:0
+msgid ""
+"The Recipient of email. Placeholders can be used here. e.g. "
+"${object.email_to}"
+msgstr ""
+
 #. module: email_template
 #: view:email.template:0
 msgid "Existing files"
 msgstr ""
 
 #. module: email_template
-#: view:email_template.account:0
-msgid "Personal Accounts"
-msgstr ""
-
-#. module: email_template
-#: model:ir.module.module,description:email_template.module_meta_information
-msgid ""
-"\n"
-"    Email Template is extraction of Power Email basically just to send the "
-"emails.\n"
-"    "
-msgstr ""
+#: field:email_template.account,smtpssl:0
+msgid "SSL/TLS (only in python 2.6)"
+msgstr "SSL/TLS (только для python 2.6)"
 
 #. module: email_template
 #: view:email_template.send.wizard:0
@@ -1128,7 +1186,6 @@ msgid "email_template.account"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,object_name:0
 #: field:email_template.preview,rel_model:0
 #: field:email_template.send.wizard,rel_model:0
 msgid "Model"
@@ -1146,13 +1203,8 @@ msgid "Corporate"
 msgstr ""
 
 #. module: email_template
-#: help:email_template.account,smtpserver:0
-msgid "Enter name of outgoing server, eg:smtp.gmail.com "
-msgstr ""
-
-#. module: email_template
-#: model:ir.ui.menu,name:email_template.menu_email_template_company_mails
-msgid "Company Mails"
+#: model:ir.model,name:email_template.model_email_template_send_wizard
+msgid "This is the wizard for sending mail"
 msgstr ""
 
 #. module: email_template
@@ -1165,18 +1217,6 @@ msgstr ""
 msgid "Emails will be sent from this approved account."
 msgstr ""
 
-#. module: email_template
-#: field:email.template,def_subject:0
-msgid "Default Subject"
-msgstr ""
-
-#. module: email_template
-#: help:email.template,def_bcc:0
-msgid ""
-"Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
-"here."
-msgstr ""
-
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
 #, python-format
@@ -1200,6 +1240,11 @@ msgstr ""
 msgid "Company Accounts"
 msgstr ""
 
+#. module: email_template
+#: help:email_template.account,smtpport:0
+msgid "Enter port number, eg: 25 or 587"
+msgstr ""
+
 #. module: email_template
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #, python-format
@@ -1207,9 +1252,9 @@ msgid "email-template"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,def_cc:0
-msgid ""
-"Carbon Copy address(es), comma-separated. Placeholders can be used here."
+#: code:addons/email_template/email_template_account.py:0
+#, python-format
+msgid "Mail from Account %s failed. Probable Reason:Account not approved"
 msgstr ""
 
 #. module: email_template
@@ -1222,17 +1267,41 @@ msgstr ""
 msgid "Has Attachments"
 msgstr ""
 
-#. module: email_template
-#: help:email.template,track_campaign_item:0
-msgid ""
-"Enable this if you want the outgoing e-mails to include a tracking marker "
-"that makes it possible to identify the replies an link them back to the "
-"campaign item"
-msgstr ""
-
 #. module: email_template
 #: code:addons/email_template/email_template.py:0
 #: code:addons/email_template/wizard/email_template_send_wizard.py:0
 #, python-format
 msgid "No Description"
 msgstr ""
+
+#~ msgid "Email Data"
+#~ msgstr "Данные электронной почты"
+
+#~ msgid "My Accounts"
+#~ msgstr "Мои аккаунты"
+
+#~ msgid ""
+#~ "File name pattern can be specified with placeholders.eg. 2009_SO003.pdf"
+#~ msgstr ""
+#~ "Образец названия файла может быть определен например как: 2009_SO003.pdf"
+
+#~ msgid "Enter port number,eg:SMTP-587 "
+#~ msgstr "Введите номер порта, например: SMTP-587 "
+
+#~ msgid "E-MAIL Templates"
+#~ msgstr "Шаблон письма"
+
+#~ msgid "Download Full Mail"
+#~ msgstr "Скачать письмо целиком"
+
+#~ msgid "The default recipient of email.Placeholders can be used here."
+#~ msgstr "Не указан получатель письма. Укажите его здесь."
+
+#~ msgid "Mailboxes"
+#~ msgstr "Почтовые ящики"
+
+#~ msgid "eg: yourname@yourdomain.com "
+#~ msgstr "например: yourname@yourdomain.com "
+
+#~ msgid "Mailbox"
+#~ msgstr "Почтовый ящик"
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 918147b79cb..6fc620abdf8 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -171,7 +171,6 @@
             <field name="arch" type="xml">
                 <tree string="Events" colors="red:register_min>register_current;black:register_min&lt;=register_current">
                     <field name="name" string="Name"/>
-                    <field name="user_id"/>
                     <field name="main_speaker_id"/>
                     <field name="language"/>
                     <field name="type"/>
diff --git a/addons/google_map/i18n/ru.po b/addons/google_map/i18n/ru.po
index 69ab81641ce..a6c1dfa3a09 100644
--- a/addons/google_map/i18n/ru.po
+++ b/addons/google_map/i18n/ru.po
@@ -6,32 +6,45 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 04:12+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-19 11:39+0000\n"
+"Last-Translator: Alex L. <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: 2010-09-29 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
-#: model:ir.actions.wizard,name:google_map.wizard_google_map
-msgid "Launch Google Map"
-msgstr "Запустить Google Map"
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Map"
+msgstr "Карта"
 
 #. module: google_map
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Неправильный XML для просмотра архитектуры!"
 
+#. module: google_map
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Имя Объекта должно начаться с x_ и не содержать специальных символов!"
+
 #. module: google_map
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Street2 : "
 msgstr "Улица2 : "
 
+#. module: google_map
+#: model:ir.actions.wizard,name:google_map.wizard_google_map
+msgid "Launch Google Map"
+msgstr "Запустить Google Map"
+
 #. module: google_map
 #: model:ir.module.module,description:google_map.module_meta_information
 msgid ""
@@ -44,7 +57,6 @@ msgstr ""
 "адреса виджета."
 
 #. module: google_map
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Map"
-msgstr "Карта"
+#: model:ir.model,name:google_map.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "Адреса партнера"
diff --git a/addons/google_map/i18n/vi.po b/addons/google_map/i18n/vi.po
index 6e695668772..87ad731a101 100644
--- a/addons/google_map/i18n/vi.po
+++ b/addons/google_map/i18n/vi.po
@@ -7,32 +7,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-17 08:01+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-18 07:54+0000\n"
 "Last-Translator: nlhnam <nlhnam@gmail.com>\n"
 "Language-Team: Vietnamese <vi@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: 2010-10-18 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
-#: model:ir.actions.wizard,name:google_map.wizard_google_map
-msgid "Launch Google Map"
-msgstr "Khởi động Google Map"
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Map"
+msgstr "Bản đồ"
 
 #. module: google_map
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "XML không hợp lệ để xem Kiến trúc"
 
+#. module: google_map
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
 #. module: google_map
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Street2 : "
 msgstr ""
 
+#. module: google_map
+#: model:ir.actions.wizard,name:google_map.wizard_google_map
+msgid "Launch Google Map"
+msgstr "Khởi động Google Map"
+
 #. module: google_map
 #: model:ir.module.module,description:google_map.module_meta_information
 msgid ""
@@ -42,7 +54,6 @@ msgid ""
 msgstr ""
 
 #. module: google_map
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Map"
-msgstr "Bản đồ"
+#: model:ir.model,name:google_map.model_res_partner_address
+msgid "Partner Addresses"
+msgstr ""
diff --git a/addons/hr/i18n/mn.po b/addons/hr/i18n/mn.po
index 9a362d9ed55..52658376f2c 100644
--- a/addons/hr/i18n/mn.po
+++ b/addons/hr/i18n/mn.po
@@ -7,121 +7,200 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 08:59+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-18 09:13+0000\n"
+"Last-Translator: sugi <Unknown>\n"
 "Language-Team: Mongolian <mn@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: 2010-09-30 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
-#: model:process.transition,name:hr.process_transition_employeeuser0
 msgid "Openerp user"
 msgstr "Openerp хэрэглэгч"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.edit_workgroup
-#: model:ir.ui.menu,name:hr.menu_edit_workgroup
-msgid "Working Time Categories"
+#: view:hr.job:0
+#: field:hr.job,requirements:0
+msgid "Requirements"
 msgstr ""
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You can not create recursive departments."
+msgstr "Алдаа!"
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_contactofemployee0
+msgid "Link the employee to information"
 msgstr ""
 
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr ""
+msgstr "Даатгалын дугаар"
 
 #. module: hr
 #: model:ir.module.module,shortdesc:hr.module_meta_information
+#: model:ir.ui.menu,name:hr.menu_hr_deshboard
+#: model:ir.ui.menu,name:hr.menu_hr_main
+#: model:ir.ui.menu,name:hr.menu_hr_management
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
 msgstr "Хүний нөөц"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Sunday"
-msgstr "Ням"
+#: view:hr.department:0
+#: view:hr.employee:0
+#: view:hr.job:0
+msgid "Group By..."
+msgstr ""
 
 #. module: hr
-#: view:res.users:0
-msgid "Parents"
-msgstr "Эцэг эх"
+#: field:hr.employee,work_email:0
+msgid "Work E-mail"
+msgstr ""
 
 #. module: hr
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Моделийн нэр алдаатай тодорхойлсон байна."
 
 #. module: hr
-#: view:hr.department:0
+#: view:hr.employee:0
+#: field:hr.employee,department_id:0
+#: view:hr.job:0
+#: field:hr.job,department_id:0
+#: view:res.users:0
 msgid "Department"
 msgstr "Хэлтэс"
 
 #. module: hr
-#: model:process.transition,name:hr.process_transition_contactofemployee0
-msgid "Contact  of employee"
-msgstr "Ажилтны гэрээ"
+#: help:hr.installer,hr_attendance:0
+msgid "Simplifies the management of employee's attendances."
+msgstr ""
 
 #. module: hr
-#: field:hr.employee,work_email:0
-msgid "Work Email"
-msgstr "Ажлын и-мэйл"
+#: view:hr.job:0
+msgid "Mark as Old"
+msgstr ""
 
 #. module: hr
-#: field:hr.timesheet.group,name:0
-msgid "Group name"
-msgstr "Группын нэр"
+#: view:hr.job:0
+msgid "Jobs"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "In Recruitment"
+msgstr ""
+
+#. module: hr
+#: view:hr.installer:0
+msgid "title"
+msgstr ""
 
 #. module: hr
 #: field:hr.department,company_id:0
-#: field:hr.employee,company_id:0
+#: view:hr.employee:0
+#: view:hr.job:0
+#: field:hr.job,company_id:0
 msgid "Company"
 msgstr "Компани"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Friday"
-msgstr "Баасан"
+#: field:hr.job,no_of_recruitment:0
+msgid "Expected in Recruitment"
+msgstr ""
 
 #. module: hr
-#: field:hr.department,parent_id:0
-msgid "Parent Department"
-msgstr "Эцэг хэлтэс"
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
+msgid "Holidays"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_holidays:0
+msgid "Tracks employee leaves, allocation requests and planning."
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_employee_marital_status
+msgid "Employee Marital Status"
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,partner_id:0
+msgid ""
+"Partner that is related to the current employee. Accounting transaction will "
+"be written on this partner belongs to employee."
+msgstr ""
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_employeeuser0
+msgid "Link a user to an employee"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_contract:0
+msgid "Employee's Contracts"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_payroll:0
+msgid "Generic Payroll system."
+msgstr ""
 
 #. module: hr
-#: view:hr.department:0
 #: view:hr.employee:0
-#: field:hr.employee,notes:0
-msgid "Notes"
-msgstr "Тэмдэглэл"
+msgid "My Departments Employee"
+msgstr ""
 
 #. module: hr
-#: field:hr.timesheet,hour_from:0
-msgid "Work from"
-msgstr "Ажлаасаа"
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,passport_id:0
+msgid "Employee Passport Information"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Position"
+msgstr ""
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Employee Hierarchy"
+msgstr "Ажилтныг шатлан захирах"
+
+#. module: hr
+#: model:process.transition,note:hr.process_transition_employeeuser0
+msgid ""
+"The Related user field on the Employee form allows to link the OpenERP user "
+"(and her rights) to the employee."
 msgstr ""
 
 #. module: hr
-#: model:ir.ui.menu,name:hr.menu_hr_configuration
-msgid "Configuration"
-msgstr "Тохиргоо"
+#: view:hr.job:0
+#: selection:hr.job,state:0
+msgid "In Recruitement"
+msgstr ""
 
 #. module: hr
-#: selection:hr.employee,marital:0
-msgid "Unmaried"
-msgstr "Гэрлээгүй"
+#: field:hr.employee,identification_id:0
+msgid "Identification No"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_employee:0
+msgid "No of Employee"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -129,13 +208,23 @@ msgid "Female"
 msgstr "эм"
 
 #. module: hr
-#: view:hr.timesheet.group:0
-msgid "Working Time Category"
+#: help:hr.installer,hr_timesheet_sheet:0
+msgid ""
+"Tracks and helps employees encode and validate timesheets and attendances."
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_evaluation:0
+msgid "Periodic Evaluations"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_timesheet_sheet:0
+msgid "Timesheets"
 msgstr ""
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
-#: model:ir.ui.menu,name:hr.menu_open_view_employee_tree
 msgid "Employees Structure"
 msgstr "Ажилчдын бүтэц"
 
@@ -144,6 +233,11 @@ msgstr "Ажилчдын бүтэц"
 msgid "Social IDs"
 msgstr "Нийтийн Дугаар"
 
+#. module: hr
+#: help:hr.job,no_of_employee:0
+msgid "Number of employee with that job."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,work_phone:0
 msgid "Work Phone"
@@ -152,6 +246,13 @@ msgstr "Ажлын утас"
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
+msgstr "Жижиг зэрэглэл"
+
+#. module: hr
+#: view:hr.job:0
+#: field:hr.job,description:0
+#: model:ir.model,name:hr.model_hr_job
+msgid "Job Description"
 msgstr ""
 
 #. module: hr
@@ -159,23 +260,38 @@ msgstr ""
 msgid "Office Location"
 msgstr "Ажлын байршил"
 
+#. module: hr
+#: field:hr.employee,passport_id:0
+msgid "Passport"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
-#: field:hr.employee,name:0
+#: view:hr.job:0
 #: model:ir.model,name:hr.model_hr_employee
 #: model:process.node,name:hr.process_node_employee0
 msgid "Employee"
 msgstr "Ажилтан"
 
 #. module: hr
-#: field:hr.timesheet.group,manager:0
-msgid "Workgroup manager"
+#: model:process.node,note:hr.process_node_employeecontact0
+msgid "Other information"
 msgstr ""
 
 #. module: hr
-#: field:hr.employee,child_ids:0
-msgid "Subordinates"
-msgstr "Харьяалагдсан"
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Ажлын хаяг"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action_hr_installer
+msgid "Human Resources Application Configuration"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,birthday:0
+msgid "Date of Birth"
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
@@ -183,40 +299,69 @@ msgid "Reporting"
 msgstr "Тайлан"
 
 #. module: hr
+#: model:ir.model,name:hr.model_ir_actions_act_window
+msgid "ir.actions.act_window"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr
+msgid "Human Resources Dashboard"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,job_id:0
+#: view:hr.job:0
+msgid "Job"
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
 #: field:hr.department,member_ids:0
 msgid "Members"
 msgstr "Гишүүд"
 
 #. module: hr
-#: field:hr.employee,ssnid:0
-msgid "SSN No"
+#: model:ir.ui.menu,name:hr.menu_hr_configuration
+msgid "Configuration"
+msgstr "Тохиргоо"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Categories"
 msgstr ""
 
 #. module: hr
-#: model:process.transition,note:hr.process_transition_contactofemployee0
-msgid "Fill up contact information"
+#: field:hr.job,expected_employees:0
+msgid "Expected Employees"
 msgstr ""
 
 #. module: hr
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Архитектур алдаатай!"
 
 #. module: hr
-#: selection:hr.employee,marital:0
-msgid "Divorced"
-msgstr "Салсан"
+#: help:hr.employee,sinid:0
+msgid "Social Insurance Number"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
 msgid "Parent Category"
+msgstr "Харилцагчийн зэрэглэл"
+
+#. module: hr
+#: constraint:hr.employee.category:0
+msgid "Error ! You cannot create recursive Categories."
 msgstr ""
 
 #. module: hr
+#: view:hr.department:0
 #: model:ir.actions.act_window,name:hr.open_module_tree_department
-#: model:ir.actions.act_window,name:hr.open_module_tree_department_tree
-#: model:ir.ui.menu,name:hr.menu_department_def
-#: model:ir.ui.menu,name:hr.menu_department_tree
+#: model:ir.ui.menu,name:hr.menu_hr_department_tree
+#: view:res.users:0
+#: field:res.users,context_department_id:0
 msgid "Departments"
 msgstr "Хэлтсүүд"
 
@@ -226,13 +371,8 @@ msgid "Employee Contact"
 msgstr "Ажилтны гэрээ"
 
 #. module: hr
-#: selection:hr.employee,marital:0
-msgid "Maried"
-msgstr "Гэрлэсэн"
-
-#. module: hr
-#: field:hr.timesheet,tgroup_id:0
-msgid "Employee's timesheet group"
+#: view:board.board:0
+msgid "My Board"
 msgstr ""
 
 #. module: hr
@@ -241,9 +381,10 @@ msgid "Male"
 msgstr "эр"
 
 #. module: hr
-#: model:process.transition,note:hr.process_transition_employeeuser0
-msgid "Create openerp user"
-msgstr "Openerp хэрэглэгч үүсгэх"
+#: model:ir.actions.act_window,name:hr.open_view_categ_form
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
+msgid "Categories of Employee"
+msgstr "Ажилчдын зэрэглэл"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -252,26 +393,48 @@ msgid "Employee Category"
 msgstr "Ажилтны зэрэглэл"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Tuesday"
-msgstr "Мягмар"
+#: field:hr.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: hr
+#: model:process.process,name:hr.process_process_employeecontractprocess0
+msgid "Employee Contract"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_evaluation:0
+msgid ""
+"Lets you create and manage the periodic evaluation and performance review of "
+"employees."
+msgstr ""
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
 msgid "hr.department"
+msgstr "Хүний нөөцийн хэлтэс"
+
+#. module: hr
+#: help:hr.employee,parent_id:0
+msgid "It is linked with manager of Department"
 msgstr ""
 
 #. module: hr
-#: field:hr.employee,user_id:0
-msgid "Related User"
-msgstr "Холбоотой хэрэглэгч"
+#: field:hr.installer,hr_recruitment:0
+msgid "Recruitment Process"
+msgstr ""
 
 #. module: hr
-#: field:hr.employee,category_id:0
+#: field:hr.employee,category_ids:0
 #: field:hr.employee.category,name:0
 msgid "Category"
 msgstr "Ангилал"
 
+#. module: hr
+#: help:hr.employee,bank_account_id:0
+msgid "Employee bank salary account"
+msgstr ""
+
 #. module: hr
 #: field:hr.department,note:0
 msgid "Note"
@@ -283,14 +446,24 @@ msgid "Contact Information"
 msgstr "Гэрээний мэдээлэл"
 
 #. module: hr
-#: view:hr.employee:0
-msgid "Status"
-msgstr "Төлөв"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Monday"
-msgstr "Даваа"
+#: model:ir.actions.act_window,name:hr.open_board_hr_manager
+msgid "HR Manager Dashboard"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Status"
+msgstr "Байдал"
+
+#. module: hr
+#: field:hr.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -299,39 +472,29 @@ msgid "Categories structure"
 msgstr "Зэрэглэлийн бүтэц"
 
 #. module: hr
-#: field:hr.timesheet,dayofweek:0
-msgid "Day of week"
-msgstr "7 хоногийн өдөр"
+#: field:hr.employee,partner_id:0
+msgid "unknown"
+msgstr ""
 
 #. module: hr
-#: field:hr.employee,birthday:0
-msgid "Birthday"
-msgstr "Төрсөн өдөр"
+#: field:hr.installer,hr_holidays:0
+msgid "Holidays / Leaves Management"
+msgstr ""
 
 #. module: hr
-#: field:hr.employee,active:0
+#: field:hr.employee,ssnid:0
+msgid "SSN No"
+msgstr "Регистр"
+
+#. module: hr
+#: view:hr.employee:0
 msgid "Active"
-msgstr "Идэвхжсэн"
+msgstr "Идэвхитэй"
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
-
-#. module: hr
-#: model:process.process,name:hr.process_process_employeecontractprocess0
-msgid "Employee Contract Process"
-msgstr "Ажилтны гэрээний үйл явц"
-
-#. module: hr
-#: model:process.node,note:hr.process_node_openerpuser0
-msgid "Create OpenERP User"
-msgstr "OpenERP хэрэглэгч үүсгэх"
-
-#. module: hr
-#: model:process.node,note:hr.process_node_employee0
-msgid "Employee Complete Form"
-msgstr ""
+msgstr "Алдаа!"
 
 #. module: hr
 #: view:hr.department:0
@@ -339,40 +502,66 @@ msgid "Companies"
 msgstr "Компаниуд"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Wednesday"
-msgstr "Лхагва"
+#: model:process.transition,note:hr.process_transition_contactofemployee0
+msgid ""
+"In the Employee form, there are different kind of information like Contact "
+"information."
+msgstr ""
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_view_categ_form
-#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
-msgid "Categories of Employee"
-msgstr "Ажилчдын зэрэглэл"
+#: help:hr.job,expected_employees:0
+msgid "Required number of Employees in total for that job."
+msgstr ""
 
 #. module: hr
-#: field:hr.timesheet,date_from:0
-msgid "Starting date"
-msgstr "Эхлэл огноо"
+#: selection:hr.job,state:0
+msgid "Old"
+msgstr ""
 
 #. module: hr
-#: field:res.users,parent_id:0
-msgid "Parent Users"
-msgstr "Эцэг хэрэглэгчид"
+#: field:hr.employee.marital.status,description:0
+msgid "Status Description"
+msgstr ""
 
 #. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Ажлын хаяг"
+#: view:hr.job:0
+#: field:hr.job,state:0
+msgid "State"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,marital:0
+#: view:hr.employee.marital.status:0
+#: field:hr.employee.marital.status,name:0
+#: model:ir.actions.act_window,name:hr.action_hr_marital_status
+#: model:ir.ui.menu,name:hr.hr_menu_marital_status
 msgid "Marital Status"
 msgstr "Гэрлэлтийн байдал"
 
 #. module: hr
-#: model:ir.model,name:hr.model_hr_timesheet
-msgid "Timesheet Line"
-msgstr "Цагийн хуваарийн шугам"
+#: help:hr.installer,hr_recruitment:0
+msgid "Helps you manage and streamline your recruitment process."
+msgstr ""
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employee0
+msgid "Employee form and structure"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,photo:0
+msgid "Photo"
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_payroll_account:0
+msgid "Payroll Accounting"
+msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
@@ -388,26 +577,26 @@ msgstr ""
 "болохгүй!"
 
 #. module: hr
-#: view:hr.timesheet:0
-#: field:hr.timesheet.group,timesheet_id:0
-#: model:ir.model,name:hr.model_hr_timesheet_group
-msgid "Working Time"
-msgstr "Ажлын цаг"
-
-#. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Thursday"
-msgstr "Пүрэв"
-
-#. module: hr
-#: field:hr.timesheet,hour_to:0
-msgid "Work to"
+#: view:res.users:0
+msgid "Current Activity"
 msgstr ""
 
 #. module: hr
-#: selection:hr.employee,marital:0
-msgid "Other"
-msgstr "Бусад"
+#: help:hr.installer,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "Current"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,parent_id:0
+msgid "Parent Department"
+msgstr "Толгой хэлтэс"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -419,6 +608,39 @@ msgstr "Ажилчдын зэрэглэл"
 msgid "Home Address"
 msgstr "Гэрийн хаяг"
 
+#. module: hr
+#: field:hr.installer,hr_attendance:0
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
+msgid "Attendances"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee.marital.status:0
+#: view:hr.job:0
+msgid "Description"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_contract:0
+msgid "Extends employee profiles to help manage their contracts."
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_payroll:0
+msgid "Payroll"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,name:0
+msgid "Job Name"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+#: selection:hr.job,state:0
+msgid "In Position"
+msgstr ""
+
 #. module: hr
 #: view:hr.department:0
 msgid "department"
@@ -430,12 +652,30 @@ msgid "Nationality"
 msgstr "Яс үндэс"
 
 #. module: hr
-#: field:hr.employee,otherid:0
-msgid "Other ID"
-msgstr "Бусад дугаар"
+#: view:hr.department:0
+#: view:hr.employee:0
+#: field:hr.employee,notes:0
+msgid "Notes"
+msgstr "Тэмдэглэл"
 
 #. module: hr
-#: field:hr.timesheet,name:0
+#: model:ir.model,name:hr.model_hr_installer
+msgid "hr.installer"
+msgstr ""
+
+#. module: hr
+#: view:board.board:0
+msgid "HR Manager Board"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,resource_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,complete_name:0
+#: field:hr.employee.category,complete_name:0
 msgid "Name"
 msgstr "Нэр"
 
@@ -446,50 +686,161 @@ msgstr "Хүйс"
 
 #. module: hr
 #: view:hr.employee:0
+#: field:hr.job,employee_ids:0
+#: model:ir.actions.act_window,name:hr.hr_employee_normal_action_tree
 #: model:ir.actions.act_window,name:hr.open_view_employee_list
-#: model:ir.ui.menu,name:hr.menu_open_view_employee_list
+#: model:ir.actions.act_window,name:hr.open_view_employee_list_my
+#: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_configuration_form
 msgid "Employees"
 msgstr "Ажилчид"
 
+#. module: hr
+#: field:hr.employee,bank_account_id:0
+msgid "Bank Account"
+msgstr ""
+
 #. module: hr
 #: field:hr.department,name:0
 msgid "Department Name"
 msgstr "Хэлтэсийн нэр"
 
+#. module: hr
+#: help:hr.employee,ssnid:0
+msgid "Social Security Number"
+msgstr ""
+
+#. module: hr
+#: model:process.node,note:hr.process_node_openerpuser0
+msgid "Creation of a OpenERP user"
+msgstr ""
+
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
+msgstr "Жижиг хэлтэс"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action_hr_job
+#: model:ir.ui.menu,name:hr.menu_hr_job
+msgid "Job Positions"
 msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
-msgid "Job Information"
-msgstr "Ажлын мэдээлэл"
-
-#. module: hr
-#: model:process.node,note:hr.process_node_employeecontact0
-msgid "Fill up employee's contact information"
+#: field:hr.employee,coach_id:0
+msgid "Coach"
 msgstr ""
 
 #. module: hr
+#: field:hr.installer,hr_expense:0
+msgid "Expenses"
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
 #: field:hr.department,manager_id:0
+#: view:hr.employee:0
 #: field:hr.employee,parent_id:0
 msgid "Manager"
 msgstr "Менежер"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.open_view_employee_list_my
-#: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
-msgid "All Employees"
-msgstr "Бүх ажилчид"
+#: help:hr.installer,hr_payroll_account:0
+msgid "Generic Payroll system Integrated with Accountings."
+msgstr ""
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Saturday"
-msgstr "Бямба"
+#: field:hr.employee,child_ids:0
+msgid "Subordinates"
+msgstr "Харьяалагдсан"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_view_employee_new
-#: model:ir.ui.menu,name:hr.menu_open_view_employee_new
-msgid "New Employee"
-msgstr "Шинэ ажилтан"
+#~ msgid "Sunday"
+#~ msgstr "Ням"
+
+#~ msgid "Work Email"
+#~ msgstr "Ажлын и-мэйл"
+
+#~ msgid "Friday"
+#~ msgstr "Баасан"
+
+#~ msgid "Tuesday"
+#~ msgstr "Мягмар"
+
+#~ msgid "Create OpenERP User"
+#~ msgstr "OpenERP хэрэглэгч үүсгэх"
+
+#~ msgid "Birthday"
+#~ msgstr "Төрсөн өдөр"
+
+#~ msgid "Monday"
+#~ msgstr "Даваа"
+
+#~ msgid "Wednesday"
+#~ msgstr "Лхагва"
+
+#~ msgid "Starting date"
+#~ msgstr "Эхлэл огноо"
+
+#~ msgid "Thursday"
+#~ msgstr "Пүрэв"
+
+#~ msgid "Other"
+#~ msgstr "Бусад"
+
+#~ msgid "New Employee"
+#~ msgstr "Шинэ ажилтан"
+
+#~ msgid "Saturday"
+#~ msgstr "Бямба"
+
+#~ msgid "Maried"
+#~ msgstr "Гэрлэсэн"
+
+#~ msgid "Parents"
+#~ msgstr "Эцэг эх"
+
+#~ msgid "Contact  of employee"
+#~ msgstr "Ажилтны гэрээ"
+
+#~ msgid "Group name"
+#~ msgstr "Группын нэр"
+
+#~ msgid "Work from"
+#~ msgstr "Ажлаасаа"
+
+#~ msgid "Unmaried"
+#~ msgstr "Гэрлээгүй"
+
+#~ msgid "Divorced"
+#~ msgstr "Салсан"
+
+#~ msgid "Create openerp user"
+#~ msgstr "Openerp хэрэглэгч үүсгэх"
+
+#~ msgid "Related User"
+#~ msgstr "Холбоотой хэрэглэгч"
+
+#~ msgid "Day of week"
+#~ msgstr "7 хоногийн өдөр"
+
+#~ msgid "Employee Contract Process"
+#~ msgstr "Ажилтны гэрээний үйл явц"
+
+#~ msgid "Parent Users"
+#~ msgstr "Эцэг хэрэглэгчид"
+
+#~ msgid "Timesheet Line"
+#~ msgstr "Цагийн хуваарийн шугам"
+
+#~ msgid "Working Time"
+#~ msgstr "Ажлын цаг"
+
+#~ msgid "Other ID"
+#~ msgstr "Бусад дугаар"
+
+#~ msgid "Job Information"
+#~ msgstr "Ажлын мэдээлэл"
+
+#~ msgid "All Employees"
+#~ msgstr "Бүх ажилчид"
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 3c5a150691e..4d8ef9d440f 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -124,7 +124,7 @@ class hr_employee(osv.osv):
             flag = False
             evaluation_plan =  evaluation_plan_obj.browse(cr, uid, [evaluation_plan_id], context=context)[0]
             if not evaluation_date:
-               evaluation_date=(parser.parse(datetime.date.today().strftime('%Y-%m-%d'))+ relativedelta(months=+evaluation_plan.month_first)).strftime('%Y-%m-%d')
+               evaluation_date=(parser.parse(datetime.now().strftime('%Y-%m-%d'))+ relativedelta(months=+evaluation_plan.month_first)).strftime('%Y-%m-%d')
                flag = True
             else:
                 if (parser.parse(evaluation_date) + relativedelta(months = int(evaluation_plan.month_next))).strftime('%Y-%m-%d') <= time.strftime("%Y-%m-%d"):
diff --git a/addons/hr_payroll/i18n/mn.po b/addons/hr_payroll/i18n/mn.po
index 5994f778d3f..c4d8899081f 100644
--- a/addons/hr_payroll/i18n/mn.po
+++ b/addons/hr_payroll/i18n/mn.po
@@ -7,60 +7,56 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-11-25 13:16+0000\n"
-"PO-Revision-Date: 2010-09-29 10:42+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-18 09:13+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@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: 2010-09-30 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "E-mail Address"
 msgstr "Имэйл хаяг"
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "(Based on type Payroll will calculate basic salary)"
+#: view:hr.allounce.deduction.categoty:0
+msgid "Based"
 msgstr ""
 
 #. module: hr_payroll
+#: field:hr.contract,net:0
+#: field:hr.employee,net:0
 #: field:hr.payroll.register,net:0
 #: field:hr.payslip,net:0
+#: report:salary.structure:0
 msgid "Net Salary"
 msgstr "Цэвэр цалин"
 
 #. module: hr_payroll
-#: field:hr.payslip,working_days:0
-msgid "Working Days"
-msgstr "Ажлын хоног"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
+#: view:hr.payslip:0
+msgid "Recompute Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
-msgid "Axis Bank"
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid ""
+"Variable Error : %s ' % (e)))\n"
+"\n"
+"                if sal_type in ('gross', 'net"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,esp_account:0
-msgid "EPS Account"
-msgstr ""
+#: report:employees.salary:0
+msgid "Employees Salary Details"
+msgstr "Ажилтны цалингийн дэлгэрэнгүй"
 
 #. module: hr_payroll
-#: help:hr.employee,analytic_account:0
-msgid "Analytic Account for Salary Analysis"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Allowances with Basic:"
 msgstr ""
 
@@ -70,35 +66,46 @@ msgid "Invalid model name in the action definition."
 msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:salary.structure:0
+#: report:employees.salary:0
+#: report:salary.structure:0
 msgid "Department"
 msgstr "Хэлтэс"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Deductions:"
 msgstr "Суутгалууд:"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,gratuity:0
+#: field:company.contribution,gratuity:0
 msgid "Use for Gratuity ?"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
-msgid "Employee No"
-msgstr "Ажилтны дугаар"
+#: field:hr.contract,working_days_per_week:0
+#: field:hr.payslip,working_days:0
+#: report:payslip.pdf:0
+msgid "Working Days"
+msgstr "Ажлын хоног"
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: selection:hr.allounce.deduction.categoty,type:0
+#: selection:hr.payslip.line,type:0
+msgid "Loan"
+msgstr "Зээл"
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
 msgid "Salary Payment Register"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr "Төлсөн ? "
+#: field:hr.employee,slip_ids:0
+#: view:hr.payroll.register:0
+#: field:hr.payroll.register,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
+msgid "Payslips"
+msgstr ""
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
@@ -112,21 +119,26 @@ msgid "Paid Salary"
 msgstr "Төлсөн цалин"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
+#: report:payslip.pdf:0
+msgid "("
 msgstr ""
 
 #. module: hr_payroll
+#: field:company.contribution,company_id:0
+#: field:hr.allounce.deduction.categoty,company_id:0
+#: field:hr.contibution.register,company_id:0
+#: field:hr.holidays.status,company_id:0
+#: field:hr.payroll.advice,company_id:0
 #: field:hr.payroll.register,company_id:0
+#: field:hr.payroll.structure,company_id:0
 #: field:hr.payslip,company_id:0
-#: wizard_field:payroll.analysis,init,company_id:0
 msgid "Company"
 msgstr "Компани"
 
 #. module: hr_payroll
-#: help:hr.employee,employee_account:0
-msgid "Employee Payable Account"
-msgstr "Ажилтны өглөгийн данс"
+#: report:payroll.advice:0
+msgid "The Manager"
+msgstr "Менежер"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
@@ -134,7 +146,8 @@ msgid "Letter Details"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
+#: report:payslip.pdf:0
 msgid ","
 msgstr ","
 
@@ -146,9 +159,9 @@ msgid "Set to Draft"
 msgstr "Ноороглох"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
-msgid "The Manager"
-msgstr "Менежер"
+#: view:hr.passport:0
+msgid "Expire"
+msgstr ""
 
 #. module: hr_payroll
 #: selection:hr.holidays.status,type:0
@@ -156,8 +169,84 @@ msgid "Half-Pay Holiday"
 msgstr "Хагас цалинтай амралт"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: rml:hr.payroll.register.sheet:0
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid ""
+"Please check configuration of %s, payroll head is missing' % "
+"(hday.holiday_status_id.name)))\n"
+"                    \n"
+"                res = {\n"
+"                    'slip_id':slip.id,\n"
+"                    'name':hday.holiday_status_id.name + '-%s' % "
+"(hday.number_of_days),\n"
+"                    'code':hday.holiday_status_id.code,\n"
+"                    'amount_type':'fix',\n"
+"                    'category_id':hday.holiday_status_id.head_id.id,\n"
+"                    'sequence':hday.holiday_status_id.head_id.sequence\n"
+"                }\n"
+"                days = hday.number_of_days\n"
+"                if hday.number_of_days < 0:\n"
+"                    days = hday.number_of_days * -1\n"
+"                total_leave += days\n"
+"                if hday.holiday_status_id.type == 'paid':\n"
+"                    paid_leave += days\n"
+"                    continue\n"
+"#                    res['name'] = hday.holiday_status_id.name + '-%s' % "
+"(days)\n"
+"#                    res['amount'] = perday * days\n"
+"#                    res['type'] = 'allowance'\n"
+"#                    leave += days\n"
+"#                    total += perday * days\n"
+"                \n"
+"                elif hday.holiday_status_id.type == 'halfpaid':\n"
+"                    paid_leave += (days / 2)\n"
+"                    res['name'] = hday.holiday_status_id.name + '-%s/2' % "
+"(days)\n"
+"                    res['amount'] = perday * (days/2)\n"
+"                    total += perday * (days/2)\n"
+"                    leave += days / 2\n"
+"                    res['type'] = 'deduction'\n"
+"                else:\n"
+"                    res['name'] = hday.holiday_status_id.name + '-%s' % "
+"(days)\n"
+"                    res['amount'] = perday * days\n"
+"                    res['type'] = 'deduction'\n"
+"                    leave += days\n"
+"                    total += perday * days\n"
+"\n"
+"                slip_line_pool.create(cr, uid, res, context=context)\n"
+"            basic = basic - total\n"
+"            leaves = total\n"
+"            update.update({\n"
+"                'basic':basic,\n"
+"                'basic_before_leaves': round(basic_before_leaves),\n"
+"                'leaves':total,\n"
+"                'holiday_days':leave,\n"
+"                'worked_days':working_day - leave,\n"
+"                'working_days':working_day,\n"
+"            })\n"
+"            self.write(cr, uid, [slip.id], update, context=context)\n"
+"        return True\n"
+"hr_payslip()\n"
+"\n"
+"class hr_payslip_line(osv.osv):\n"
+"    '''\n"
+"    Payslip Line\n"
+"    '''\n"
+"    \n"
+"    _name = 'hr.payslip.line'\n"
+"    _description = 'Payslip Line'\n"
+"\n"
+"    def onchange_category(self, cr, uid, ids, category_id):\n"
+"        seq = 0\n"
+"        res = {\n"
+"        }\n"
+"        if category_id:\n"
+"            category = self.pool.get('hr.allounce.deduction.categoty"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
 #: field:hr.payslip,other_pay:0
 msgid "Others"
 msgstr "Бусад"
@@ -165,105 +254,102 @@ msgstr "Бусад"
 #. module: hr_payroll
 #: field:hr.payslip.line,slip_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Pay Slip"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Calculations Rules"
-msgstr "Тооцоолох дүрмүүд"
+#: report:salary.structure:0
+msgid "Contract Detail:"
+msgstr "Гэрээний мэдээлэл:"
 
 #. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
-msgid ""
-"\n"
-"    The Payroll system - India, Manages and depends on,\n"
-"    * HR Details\n"
-"    * HR Contracts\n"
-"    * HR Payslip\n"
-"    * HR Paysheet\n"
-"    * HR Attendance\n"
-"    * HR Holidays\n"
-"    "
-msgstr ""
-"\n"
-"    Цалингийн систем,\n"
-"    * Хүний нөөцийн бүртгэл\n"
-"    * Хөдөлмөрийн гэрээ\n"
-"    * Цалингийн хуудас\n"
-"    * Ирц бүртгэл\n"
-"    * Амралт, чөлөө\n"
-"    "
-
-#. module: hr_payroll
-#: view:hr.employee:0
-#: rml:salary.structure:0
-msgid "Salary"
-msgstr "Цалин"
-
-#. module: hr_payroll
-#: field:hr.holidays.status,account_id:0
-msgid "Account"
-msgstr "Данс"
-
-#. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-msgid "Payment From"
+#: field:hr.payslip,igross:0
+#: field:hr.payslip,inet:0
+msgid "Calculaton Field"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.employee:0
-msgid "Miscelleanous / Statutory"
+#: help:hr.payroll.advice,bank_id:0
+#: help:hr.payroll.register,bank_id:0
+msgid "Select the Bank Address from whcih the salary is going to be paid"
 msgstr ""
 
 #. module: hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+msgid "Bank Advice"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Reject"
+msgstr "Татгалзах"
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Leaves"
 msgstr "Чөлөө"
 
 #. module: hr_payroll
+#: field:hr.contibution.register.line,register_id:0
+#: view:hr.payslip:0
 #: field:hr.payslip,register_id:0
+#: report:payslip.pdf:0
 msgid "Register"
 msgstr "Бүртгүүлэх"
 
 #. module: hr_payroll
-#: selection:wizard.year.salary,init,salary_on:0
-msgid "Next Month Date"
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.payroll.register,period_id:0
-#: help:hr.payslip,period_id:0
-msgid "Keep empty to use the period of the validation(Payslip) date."
-msgstr ""
+#: report:payslip.pdf:0
+msgid "Total Deductions"
+msgstr "Нийт суутгал"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,value:0
+#: field:company.contribution.line,value:0
+#: field:hr.payslip.line.line,value:0
 msgid "Value"
 msgstr "Утга"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "Name of the Employee"
 msgstr "Ажилтны нэр"
 
 #. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
+#: view:hr.contibution.register:0
+msgid "Register Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Salary Computation"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,amount:0
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
+#: report:salary.structure:0
 msgid "Amount"
 msgstr "Дүн"
 
 #. module: hr_payroll
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
+#: selection:company.contribution,amount_type:0
+msgid "Percentage"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+msgid "Other Information"
 msgstr ""
 
 #. module: hr_payroll
@@ -272,18 +358,12 @@ msgid "Country of Issue"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid "Warning !"
-msgstr "Анхаар !"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid "Please Confirm all Expanse Invoice appear for Reimbursement"
+#: field:hr.contibution.register.line,emp_deduction:0
+msgid "Employee Deduction"
 msgstr ""
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Other Deduction"
 msgstr "Бусад суутгал"
@@ -294,69 +374,69 @@ msgid "Paid Holiday"
 msgstr "Цалинтай амралт"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-msgid "Employees Salary Details"
-msgstr "Ажилтны цалингийн дэлгэрэнгүй"
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+#: view:hr.passport:0
+#: view:hr.payslip:0
+msgid "Group By..."
+msgstr ""
 
 #. module: hr_payroll
 #: field:hr.passport,date_expire:0
 msgid "Passport Expire Date"
 msgstr "Пасспортын дуусах хугацаа"
 
-#. module: hr_payroll
-#: view:hr.employee:0
-msgid "Special Allowance and Deductions for Employee"
-msgstr ""
-
 #. module: hr_payroll
 #: selection:hr.holidays.status,type:0
 msgid "Un-Paid Holiday"
 msgstr "Цалингүй амралт"
 
 #. module: hr_payroll
-#: field:hr.payroll.register,period_id:0
-#: field:hr.payslip,period_id:0
-msgid "Force Period"
+#: view:hr.passport:0
+msgid "Valid From"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
-msgid "Amount (in words) :"
+#: help:hr.payslip,igross:0
+#: help:hr.payslip,inet:0
+msgid ""
+"Calculation field used for internal calculation, do not place this on form"
 msgstr ""
 
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Amount (in words) :"
+msgstr "Дүн (үгээр) :"
+
 #. module: hr_payroll
 #: field:hr.holidays.status,type:0
 msgid "Payment"
 msgstr "Төлбөр"
 
 #. module: hr_payroll
-#: field:hr.employee,analytic_account:0
-#: field:hr.employee.grade,account_id:0
-#: field:hr.holidays.status,analytic_account_id:0
-#: field:hr.payslip.line,analytic_account_id:0
-#: rml:salary.structure:0
-msgid "Analytic Account"
-msgstr "Аналитик Данс"
-
-#. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-msgid "Expanse To"
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: field:hr.payslip,line_ids:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
 msgstr ""
 
 #. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Identification No"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
 #: field:hr.allounce.deduction.categoty,base:0
 msgid "Based on"
 msgstr "Суурь"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:salary.structure:0
-msgid "Bank"
-msgstr "Банк"
-
-#. module: hr_payroll
-#: field:hr.payslip,move_id:0
-msgid "Expanse Entries"
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for Verification"
 msgstr ""
 
 #. module: hr_payroll
@@ -365,24 +445,38 @@ msgid "Human Resource Payroll"
 msgstr "Хүний нөөцийн цалин"
 
 #. module: hr_payroll
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "Алдаа! Та цикл хэлбэрийн аналитик данс үүсгэх боломжгүй."
-
-#. module: hr_payroll
-#: field:hr.employee,esi_account:0
-msgid "ESI Account"
+#: report:payroll.advice:0
+msgid "Total:"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr "Пасспортын мэдээлэл"
+#: view:hr.payslip:0
+msgid "Posted"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid "Please defined the Employee Home Address Along with Partners !!"
+#: model:ir.module.module,description:hr_payroll.module_meta_information
+msgid ""
+"Generic Payroll system\n"
+"    * Employee Details\n"
+"    * Employee Contracts\n"
+"    * Passport based Contract\n"
+"    * Allowances / Deductions\n"
+"    * Allow to configure Basic / Grows / Net Salary\n"
+"    * Employee Payslip\n"
+"    * Monthly Payroll Register\n"
+"    * Integrated with Holiday Management\n"
+"    "
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_holidays_status
+msgid "Leave Type"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Date :"
 msgstr ""
 
 #. module: hr_payroll
@@ -390,25 +484,36 @@ msgstr ""
 msgid "Sub Total"
 msgstr "Дэд дүн"
 
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Payments -"
+msgstr ""
+
 #. module: hr_payroll
 #: field:hr.contract,visa_no:0
 msgid "Visa No"
 msgstr "Визний дугаар"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,from:0
+#: field:company.contribution.line,from_val:0
+#: report:employees.salary:0
+#: field:hr.payslip.line.line,from_val:0
+#: report:year.salary:0
 msgid "From"
 msgstr "Хаанаас"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice.line,bysal:0
+#: report:payroll.advice:0
 msgid "By Salary"
 msgstr "Цалингаар"
 
 #. module: hr_payroll
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Employee Year Salary"
-msgstr "Ажилтны жилийн цалин"
+#: field:hr.payroll.employees.detail,date_to:0
+#: field:hr.payroll.year.salary,date_to:0
+#: report:salary.structure:0
+msgid "End Date"
+msgstr "Дуусах огноо"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
@@ -416,60 +521,111 @@ msgid "Employee PaySlip"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-#: rml:payroll.advice:0
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid ""
+"Variable Error : %s ' % (e)))\n"
+"                amount = 0.0\n"
+"                if line.amount_type == 'per':\n"
+"                    amount = amt * line.amount\n"
+"                elif line.amount_type == 'func':\n"
+"                    amount = slip_line_pool.execute_function(cr, uid, "
+"line.id, amt, context)\n"
+"                elif line.amount_type == 'fix':\n"
+"                    amount = line.amount\n"
+"                \n"
+"                if line.type == 'allowance':\n"
+"                    allowance += amount\n"
+"                elif line.type == 'deduction':\n"
+"                    deduction += amount\n"
+"            \n"
+"            vals[employee.id] = {\n"
+"                'basic':basic, \n"
+"                'advantages_gross':allowance, \n"
+"                'gross':basic + allowance, \n"
+"                'advantages_net':deduction,\n"
+"                'net':basic + allowance - deduction\n"
+"            }\n"
+"        return vals\n"
+"    \n"
+"    _columns = {\n"
+"        'passport_id':fields.many2one('hr.passport', 'Passport', "
+"required=False, domain=\"[('employee_id','=',active_id), "
+"('address_id','=',address_home_id)]\", help=\"Employee Passport Information"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,leaves:0
+msgid "Leave Deductions"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+#: report:payroll.advice:0
 msgid "Authorised Signature"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,umo_id:0
-msgid "Unite"
+#: selection:hr.payslip.line,amount_type:0
+msgid "Function Value"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Salary Detail"
-msgstr "Цалингийн мэдээлэл"
+#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
+msgid "Contribution Register Line"
+msgstr ""
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Notes:"
 msgstr "Тэмдэглэл:"
 
 #. module: hr_payroll
-#: rml:salary.structure:0
-msgid "End Date"
-msgstr "Дуусах огноо"
+#: field:hr.payroll.advice,state:0
+#: field:hr.payroll.register,state:0
+#: field:hr.payslip,state:0
+msgid "State"
+msgstr "Төлөв"
 
 #. module: hr_payroll
-#: view:hr.employee:0
-msgid "Accounting Information"
+#: view:hr.payroll.advice:0
+msgid "Paymeny Lines"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.employee.grade:0
-msgid "Amount Information"
-msgstr "Дүнгийн мэдээлэл"
+#: report:payslip.pdf:0
+msgid "Other Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.employee,passport_id:0
-#: view:hr.passport:0
-msgid "Passport"
-msgstr "Пасспорт"
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+msgid "Function Arguments"
+msgstr ""
 
 #. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
+msgid "Company Contributions"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register.line,employee_id:0
 #: field:hr.passport,employee_id:0
 #: field:hr.payroll.advice.line,employee_id:0
 #: field:hr.payslip,employee_id:0
 #: field:hr.payslip.line,employee_id:0
+#: model:ir.model,name:hr_payroll.model_hr_employee
 msgid "Employee"
 msgstr "Ажилтан"
 
 #. module: hr_payroll
-#: rml:salary.structure:0
-msgid "Start Date"
-msgstr "Эхлэх огноо"
+#: field:hr.payslip.line,base:0
+msgid "Formula"
+msgstr ""
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
@@ -477,28 +633,24 @@ msgid "Bank Advice Lines"
 msgstr ""
 
 #. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
 #: field:hr.allounce.deduction.categoty,type:0
 #: field:hr.payslip.line,type:0
-#: wizard_field:payroll.analysis,init,type:0
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Type"
 msgstr "Төрөл"
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-msgid "#"
-msgstr "#"
-
-#. module: hr_payroll
-#: view:hr.employee:0
-msgid "Miscelleanous"
-msgstr "Бусад"
+#: report:payslip.pdf:0
+msgid "Email"
+msgstr ""
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
-msgid "Integrity Error !"
-msgstr "Нэгтгэлийн алдаа !"
+msgid "Error !"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
@@ -507,56 +659,71 @@ msgid "Verify Sheet"
 msgstr "Хуудсыг шалгах"
 
 #. module: hr_payroll
-#: field:hr.employee,pan_no:0
-msgid "PAN No"
+#: help:hr.contract,working_days_per_week:0
+msgid "No of Working days / week for an employee"
 msgstr ""
 
 #. module: hr_payroll
-#: wizard_button:wizard.employees.detail,init,report:0
-#: wizard_button:wizard.year.salary,init,report:0
-msgid "Print"
-msgstr "Хэвлэх"
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+"болохгүй!"
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Accounting Informations"
-msgstr "Санхүүгийн мэдээлэл"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Contributions Configuration"
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "New Slip"
 msgstr ""
 
 #. module: hr_payroll
+#: field:hr.payslip,basic:0
+msgid "Net Basic"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,gross:0
+#: field:hr.employee,gross:0
 #: field:hr.payroll.register,grows:0
 #: field:hr.payslip,grows:0
+#: report:salary.structure:0
 msgid "Gross Salary"
 msgstr "Бүтэн цалин"
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Total Earnings"
 msgstr "Нийт орлого"
 
 #. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
+msgid "Employee Salary Statement"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Other Payment"
 msgstr "Бусад төлбөр"
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Basic Salary - Leaves"
-msgstr "Үндсэн цалин - Чөлөө"
+#: field:hr.employee,advantages_net:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
+msgid "Deductions"
+msgstr "Суутгалууд"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "C/D"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:payroll.analysis,init,type:0
-msgid "By Employee Function"
-msgstr ""
+#: field:hr.contract,permit_no:0
+msgid "Work Permit No"
+msgstr "Ажлын зөвшөөрлийн дугаар"
 
 #. module: hr_payroll
 #: field:hr.payroll.advice,line_ids:0
@@ -569,25 +736,33 @@ msgid "Chaque Nos"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.wizard,name:hr_payroll.wizard_print_year_salary
-msgid "Year Salary Detail"
-msgstr "Жилийн цалингийн мэдээлэл"
+#: field:hr.contibution.register,monthly_total_by_emp:0
+msgid "Total By Employee"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty.line,amount_type:0
+#: view:company.contribution:0
+#: selection:company.contribution,amount_type:0
+#: selection:company.contribution.line,amount_type:0
 #: selection:hr.payslip.line,amount_type:0
+#: selection:hr.payslip.line.line,amount_type:0
 msgid "Fixed Amount"
 msgstr "Тогтмол дүн"
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid ""
+"Variable Error : %s ' % (e)))\n"
+"                elif line.amount_type in ('fix', 'func"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Account Lines"
+#: field:company.contribution.line,to_val:0
+#: report:employees.salary:0
+#: field:hr.payslip.line.line,to_val:0
+#: report:year.salary:0
+msgid "To"
 msgstr ""
 
 #. module: hr_payroll
@@ -595,39 +770,65 @@ msgstr ""
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid "Variable Error !"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
+msgid "hr.payroll.employees.detail"
+msgstr ""
+
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Pay Salary"
 msgstr ""
 
-#. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-msgid "Gross SAL"
-msgstr ""
-
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
-msgid "Please defined the Partner in Home Address !!"
+msgid ""
+"Please define bank account for the %s employee' % (slip.employee_id.name)))\n"
+"                pline = {\n"
+"                    'advice_id':pid,\n"
+"                    'name':slip.employee_id.bank_account_id.acc_number,\n"
+"                    'employee_id':slip.employee_id.id,\n"
+"                    'amount':slip.other_pay + slip.net,\n"
+"                    'bysal':slip.net\n"
+"                }\n"
+"                id = advice_line_pool.create(cr, uid, pline, "
+"context=context)\n"
+"\n"
+"        self.write(cr, uid, ids, {'state':'confirm'}, context=context)\n"
+"        return True\n"
+"\n"
+"    def process_sheet(self, cr, uid, ids, context=None):\n"
+"        slip_pool = self.pool.get('hr.payslip"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-#: rml:payslip.pdf:0
+#: field:hr.payroll.advice.line,name:0
+msgid "Bank Account A/C"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Contribution Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
 msgid "For the month of"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Payslip"
-msgstr ""
-
-#. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
 #: selection:hr.allounce.deduction.categoty,type:0
 #: field:hr.payroll.register,deduction:0
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 #: field:hr.payslip,deduction:0
 #: selection:hr.payslip.line,type:0
 msgid "Deduction"
@@ -639,85 +840,57 @@ msgid "Bank Advice Note"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport List"
+#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
+msgid "Contibution Register"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,payment_id:0
-msgid "Payment Entries"
-msgstr "Төлбөрийн бичилт"
-
-#. module: hr_payroll
-#: rml:payslip.pdf:0
-msgid "YTD"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip.line,expanse_id:0
-msgid "Expense"
-msgstr "Зардал"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,based_on:0
-msgid "Fided Value"
+#: view:hr.payroll.register:0
+#: view:hr.payslip:0
+msgid "Payslip"
 msgstr ""
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Loan Installment"
 msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
-#: view:hr.payslip:0
 msgid "Complete HR Checking"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "Yours Sincerely"
 msgstr "Таныг хүндэтгэсэн"
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-msgid "Allowances"
-msgstr "Олголтууд"
-
-#. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "SI. No."
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Net Amount"
 msgstr "Цэвэр дүн"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,based_on:0
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
-#: field:hr.payslip,state:0
-msgid "State"
-msgstr "Төлөв"
-
-#. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Salary Structure:"
 msgstr "Цалингийн задаргаа:"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-#: model:ir.actions.wizard,name:hr_payroll.wizard_print_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_employees_detail
 msgid "Employees Salary Detail"
 msgstr "Ажилтны цалингийн мэдээлэл"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_employee_grade
-msgid "Function of the Employee"
-msgstr "Ажилтны үүрэг"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
+msgid "Function Line"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
@@ -728,114 +901,124 @@ msgid "Confirm Sheet"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 msgid "Others:"
 msgstr "Бусад:"
 
 #. module: hr_payroll
-#: view:hr.employee:0
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
-msgstr "Гэрээнүүд"
+#: view:company.contribution:0
+#: selection:company.contribution,amount_type:0
+msgid "Function Calculation"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.employee:0
-msgid "Passport and Visa"
-msgstr "Пасспорт ба Виз"
+#: field:hr.payslip,worked_days:0
+#: report:payslip.pdf:0
+msgid "Worked Day"
+msgstr "Ажилласан хоног"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: field:hr.contibution.register,monthly_total_by_comp:0
+msgid "Total By Company"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.advice.line,flag:0
+msgid "D/C"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Country & Address"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
 msgid "Employee Code"
 msgstr "Ажилтны код"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,amount_type:0
+#: report:payslip.pdf:0
+msgid "Basic Salary – Leaves"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution,amount_type:0
+#: field:company.contribution.line,amount_type:0
 #: field:hr.payslip.line,amount_type:0
-#: rml:salary.structure:0
+#: field:hr.payslip.line.line,amount_type:0
+#: report:salary.structure:0
 msgid "Amount Type"
 msgstr "Дүнгийн төрөл"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,category_id:0
+#: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
-#: rml:salary.structure:0
 msgid "Category"
 msgstr "Ангилал"
 
 #. module: hr_payroll
-#: field:hr.payslip,move_line_ids:0
-msgid "Accounting Lines"
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+#: field:hr.payslip.line,company_contrib:0
+#: model:ir.model,name:hr_payroll.model_company_contribution
+msgid "Company Contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.register,bank_journal_id:0
-#: field:hr.payslip,bank_journal_id:0
-msgid "Bank Journal"
-msgstr "Банкны журнал"
-
-#. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-msgid "Total SAL"
-msgstr "Нийт цалин"
-
-#. module: hr_payroll
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-"болохгүй!"
-
-#. module: hr_payroll
-#: field:hr.employee,hospital_id:0
-msgid "ESI Hospital"
+#: field:company.contribution,category_id:0
+msgid "Heads"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
-msgid "Payslips"
+#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
+msgid "Print Statement"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: view:hr.payslip:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
 msgid "Earnings"
 msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "Татгалзах"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+#: report:salary.structure:0
+msgid "Basic"
+msgstr ""
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_passport_tree
 msgid "All Passports"
 msgstr "Бүх пасспортууд"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:hr.payroll.register.sheet:0
-#: rml:payslip.pdf:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
+#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
+msgid "Salary Register"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: report:hr.payroll.register.sheet:0
 msgid "Employee Name"
 msgstr "Ажилтны нэр"
 
 #. module: hr_payroll
-#: field:hr.employee,salary_account:0
-msgid "Salary Account"
-msgstr "Цалингийн данс"
+#: model:ir.model,name:hr_payroll.model_hr_passport
+msgid "Passport Detail"
+msgstr "Пасспортын мэдээлэл"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty.line,amount_type:0
 #: selection:hr.payslip.line,amount_type:0
 msgid "Percentage (%)"
 msgstr "Хувь (%)"
@@ -850,67 +1033,61 @@ msgid "Payroll Register"
 msgstr "Цалингийн бүртгэл"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:hr.payroll.register.sheet:0
-#: rml:payroll.advice:0
-#: rml:salary.structure:0
-#: rml:year.salary:0
+#: report:hr.payroll.register.sheet:0
+#: report:payroll.advice:0
 msgid "For"
 msgstr "Юунд"
 
 #. module: hr_payroll
-#: field:hr.payroll.register,journal_id:0
-#: field:hr.payslip,journal_id:0
-msgid "Expanse Journal"
-msgstr "Зардлын журнал"
+#: view:hr.passport:0
+#: field:hr.passport,contracts_ids:0
+msgid "Contracts"
+msgstr "Гэрээнүүд"
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_contract
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_contract
-msgid "Employee Contract"
-msgstr "Ажилтны гэрээ"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,contribute:0
-msgid "Contribe by Company ?"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.employee.grade:0
+#: view:hr.payroll.structure:0
 msgid "Employee Function"
 msgstr "Ажилтны үүрэг"
 
 #. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-msgid "Working Days / Week"
-msgstr "Ажлын хоног / Долоо хоног"
-
-#. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-msgid "Worked Day"
-msgstr "Ажилласан хоног"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Complete Accountant Checking"
+msgid "Paid"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
+#: view:hr.payslip:0
+msgid "Approve Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,paid:0
+msgid "Paid ? "
+msgstr "Төлсөн ? "
+
+#. module: hr_payroll
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
 msgid "Title"
 msgstr "Гарчиг"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,based_on:0
-msgid "On Attendance"
+#: view:company.contribution:0
+msgid "Search Company Contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Allowance/Deduction Heads"
-msgstr "Олголт/Суутгалын толгой"
+#: field:hr.allounce.deduction.categoty,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr "Төлбөрийн мөрүүд"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -918,20 +1095,26 @@ msgid "Compute Sheet"
 msgstr ""
 
 #. module: hr_payroll
+#: field:company.contribution,active:0
 #: field:hr.payroll.register,active:0
 msgid "Active"
 msgstr "Идэвхитэй"
 
 #. module: hr_payroll
-#: field:hr.employee,employee_account:0
-msgid "Employee Account"
-msgstr "Ажилтны данс"
+#: help:hr.allounce.deduction.categoty,condition:0
+msgid "Applied this head for calculation if condition is true"
+msgstr ""
 
 #. module: hr_payroll
-#: rml:year.salary:0
+#: report:year.salary:0
 msgid "Yearly Salary Details"
 msgstr "Жилийн цалингийн мэдээлэл"
 
+#. module: hr_payroll
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,condition:0
 msgid "Condition"
@@ -944,8 +1127,8 @@ msgid "Wating for HR Verification"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,pf_account:0
-msgid "PF Account"
+#: report:payroll.advice:0
+msgid "Payment Advice:"
 msgstr ""
 
 #. module: hr_payroll
@@ -954,29 +1137,23 @@ msgid "Compute"
 msgstr "Тооцоолох"
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payslip:0
-#: field:hr.payslip,move_payment_ids:0
-msgid "Payment Lines"
-msgstr "Төлбөрийн мөрүүд"
-
-#. module: hr_payroll
-#: rml:employees.salary:0
+#: report:employees.salary:0
 #: field:hr.payslip,deg_id:0
-#: rml:payslip.pdf:0
-#: rml:salary.structure:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
 msgid "Designation"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
+#: report:hr.payroll.register.sheet:0
 msgid "HR Manager"
 msgstr "Хүний нөөцийн менежер"
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,based_on:0
+#: field:hr.contract,basic:0
+#: field:hr.employee,basic:0
 #: field:hr.payslip,basic_before_leaves:0
-#: rml:payslip.pdf:0
+#: report:payslip.pdf:0
 msgid "Basic Salary"
 msgstr "Суурь цалин"
 
@@ -991,20 +1168,25 @@ msgid "Salary Information"
 msgstr "Цалингийн мэдээлэл"
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
+#: model:ir.model,name:hr_payroll.model_company_contribution_line
 msgid "Allowance Deduction Categoty"
 msgstr "Олголт суутгалын ангилал"
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: view:hr.payslip:0
+msgid "Companies"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
 msgid "Authorized Signature"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Allowance / Deduction Category"
-msgstr ""
+#: field:hr.payslip,contract_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr "Гэрээ"
 
 #. module: hr_payroll
 #: selection:hr.payroll.advice,state:0
@@ -1012,157 +1194,182 @@ msgid "Draft Sheet"
 msgstr ""
 
 #. module: hr_payroll
+#: selection:hr.payroll.year.salary,salary_on:0
+msgid "Next Month Date"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register.line,date:0
 #: field:hr.payroll.advice,date:0
 #: field:hr.payroll.register,date:0
-#: rml:hr.payroll.register.sheet:0
 #: field:hr.payslip,date:0
 msgid "Date"
 msgstr "Огноо"
 
-#. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-msgid "Basic SAL"
-msgstr ""
-
 #. module: hr_payroll
 #: field:hr.contract,visa_expire:0
 msgid "Visa Expire Date"
 msgstr "Виз дуусах хугацаа"
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:salary.structure:0
+#: view:hr.passport:0
+msgid "Search Passport"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: report:salary.structure:0
 msgid "Phone No."
 msgstr "Утасны дугаар"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,include_in_salary:0
-msgid "Included in Salary ?"
-msgstr "Цалинд багтсан ?"
-
-#. module: hr_payroll
-#: field:hr.expense.expense,category_id:0
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
-msgstr "Цалингийн толгой"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
+#: field:company.contribution,contribute_per:0
+#: field:company.contribution.line,contribution_id:0
+#: view:hr.allounce.deduction.categoty:0
+#: view:hr.contibution.register:0
+#: view:hr.contibution.register.line:0
+msgid "Contribution"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,account_id:0
-#: rml:salary.structure:0
-msgid "General Account"
-msgstr "Ерөнхий данс"
+#: field:hr.allounce.deduction.categoty,state:0
+msgid "Label"
+msgstr ""
 
 #. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:0
+#, python-format
+msgid ""
+"Variable Error : %s ' % (e)))\n"
+"\n"
+"                if not calculate:\n"
+"                    continue\n"
+"\n"
+"                percent = 0.0\n"
+"                value = 0.0\n"
+"                base = False\n"
+"                company_contrib = 0.0\n"
+"                base = line.category_id.base\n"
+"\n"
+"                try:\n"
+"                    #Please have a look at the configuration guide.\n"
+"                    amt = eval(base, obj)\n"
+"                except Exception, e:\n"
+"                    raise osv.except_osv(_('Variable Error !"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+msgid "Company contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: report:employees.salary:0
+#: report:salary.structure:0
+msgid "Other No."
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution,code:0
+#: field:hr.contibution.register.line,code:0
 #: field:hr.holidays.status,code:0
+#: field:hr.payroll.structure,code:0
 #: field:hr.payslip.line,code:0
-#: rml:salary.structure:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
 msgid "Code"
 msgstr "Код"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
 #: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-#: rml:payroll.advice:0
 msgid "Payment Advice"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,to:0
-msgid "To"
+#: report:hr.payroll.register.sheet:0
+msgid "Number :"
 msgstr ""
 
 #. module: hr_payroll
-#: wizard_button:payroll.analysis,init,process:0
-msgid "Process"
-msgstr "Процесс"
+#: help:hr.allounce.deduction.categoty,base:0
+msgid ""
+"This will use to computer the % fields values, in general its on basic, but "
+"You can use all heads code field in small letter as a variable name i.e. "
+"hra, ma, lta, etc...., also you can use, static varible basic"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "Зээл"
+#: view:hr.payslip:0
+msgid "Computation Overview"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,sequence:0
-msgid "Sequence"
-msgstr "Дараалал"
-
-#. module: hr_payroll
-#: wizard_field:wizard.year.salary,init,salary_on:0
+#: field:hr.payroll.year.salary,salary_on:0
 msgid "Salary On"
 msgstr ""
 
 #. module: hr_payroll
 #: field:hr.payroll.advice,number:0
 #: field:hr.payroll.register,number:0
-#: rml:hr.payroll.register.sheet:0
 #: field:hr.payslip,number:0
 msgid "Number"
 msgstr "Дугаар"
 
 #. module: hr_payroll
-#: rml:salary.structure:0
-msgid "Contract Detail:"
-msgstr "Гэрээний мэдээлэл:"
-
-#. module: hr_payroll
-#: view:hr.employee.grade:0
-msgid "General Information"
-msgstr "Ерөнхий мэдээлэл"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.employee:0
+#: field:hr.contract,struct_id:0
 #: field:hr.employee,line_ids:0
-#: view:hr.employee.grade:0
-#: field:hr.employee.grade,line_ids:0
-#: rml:salary.structure:0
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,line_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
+#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
+#: model:ir.model,name:hr_payroll.model_hr_payroll_structure
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
 msgstr "Цалингийн задаргаа"
 
+#. module: hr_payroll
+#: field:hr.contibution.register,register_line_ids:0
+msgid "Register Line"
+msgstr ""
+
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
-#: wizard_button:payroll.analysis,init,end:0
-#: wizard_button:wizard.employees.detail,init,end:0
-#: wizard_button:wizard.year.salary,init,end:0
 msgid "Cancel"
 msgstr "Цуцлах"
 
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Close"
+msgstr ""
+
 #. module: hr_payroll
 #: field:hr.payslip.line,amount:0
-#: rml:salary.structure:0
 msgid "Amount / Percentage"
 msgstr "Дүн / Хувь"
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Accounting Details"
-msgstr ""
+#: field:hr.employee,advantages_gross:0
+#: report:hr.payroll.register.sheet:0
+#: report:salary.structure:0
+msgid "Allowances"
+msgstr "Олголтууд"
 
 #. module: hr_payroll
-#: selection:wizard.year.salary,init,salary_on:0
+#: selection:hr.payroll.year.salary,salary_on:0
 msgid "Current Month Date"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.employee:0
-msgid "Contract Duration"
-msgstr "Гэрээний үргэлжлэх хугацаа"
-
-#. module: hr_payroll
-#: wizard_view:payroll.analysis,init:0
-msgid "Process Form"
-msgstr ""
+#: report:salary.structure:0
+msgid "Salary"
+msgstr "Цалин"
 
 #. module: hr_payroll
 #: field:hr.passport,name:0
@@ -1170,44 +1377,65 @@ msgid "Passport No"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.employee.grade:0
-msgid "Account Information"
-msgstr "Дансны мэдээлэл"
+#: field:hr.contract,passport_id:0
+#: view:hr.passport:0
+msgid "Passport"
+msgstr "Пасспорт"
 
 #. module: hr_payroll
-#: view:hr.employee:0
-msgid "Generalities"
-msgstr "Ерөнхий"
+#: report:hr.payroll.register.sheet:0
+msgid "Total Salary"
+msgstr ""
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "for period"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr "Олголт / Суутгал"
+#: field:hr.holidays.status,head_id:0
+msgid "Payroll Head"
+msgstr "Цалингийн толгой"
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: field:company.contribution,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contibution_register
+msgid "Contribution Register"
+msgstr ""
+
+#. module: hr_payroll
+#: report:salary.structure:0
 msgid "E-mail"
 msgstr "И-мэйл"
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
+#: view:hr.allounce.deduction.categoty:0
+#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
+msgid "Salary Heads"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,line_ids:0
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
+msgid "Print Report"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution,line_ids:0
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
 msgstr "Тооцоолол"
 
 #. module: hr_payroll
-#: wizard_view:wizard.year.salary,init:0
-msgid "Salary Deposit Date Option?"
+#: help:company.contribution,contribute_per:0
+msgid ""
+"Define Company contribution ratio 1.00=100% contribution, If Employee "
+"Contribute 5% then company will and here 0.50 defined then company will "
+"contribute 50% on employee 5% contribution"
 msgstr ""
 
 #. module: hr_payroll
@@ -1215,47 +1443,118 @@ msgstr ""
 msgid "Other Informations"
 msgstr ""
 
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.passport:0
+msgid "Issue"
+msgstr ""
+
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
 msgid "Dynamic Computation"
 msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee.grade,function_id:0
+#: report:payslip.pdf:0
+msgid "Basic Salary without Leave:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
 #: field:hr.payslip.line,function_id:0
 msgid "Function"
 msgstr "Үүрэг"
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
+#: view:hr.payslip:0
+msgid "States"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payroll.advice:0
 msgid "Dear Sir/Madam,"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:salary.structure:0
-msgid "PAN No."
+#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
+msgid "Allowance Deduction Heads"
 msgstr ""
 
 #. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Gross Sal."
+msgstr ""
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: field:company.contribution,note:0
+#: view:hr.allounce.deduction.categoty:0
+#: field:hr.allounce.deduction.categoty,note:0
+#: view:hr.contibution.register:0
+#: field:hr.contibution.register,note:0
+#: view:hr.passport:0
+#: field:hr.passport,note:0
 #: field:hr.payroll.advice,note:0
+#: field:hr.payroll.register,note:0
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,note:0
+#: view:hr.payslip:0
+#: field:hr.payslip,note:0
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,note:0
 msgid "Description"
 msgstr "Тодорхойлолт"
 
 #. module: hr_payroll
-#: field:hr.employee,pg_joining:0
-msgid "PF Join Date"
+#: field:hr.payroll.employees.detail,date_from:0
+#: field:hr.payroll.year.salary,date_from:0
+#: report:salary.structure:0
+msgid "Start Date"
+msgstr "Эхлэх огноо"
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid "Deduction -"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
+msgid ")"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contibution.register:0
+msgid "Contribution Registers"
 msgstr ""
 
 #. module: hr_payroll
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_root_payroll
+#: model:ir.ui.menu,name:hr_payroll.payroll_configure
 msgid "Payroll"
 msgstr ""
 
 #. module: hr_payroll
-#: wizard_view:wizard.employees.detail,init:0
-#: wizard_view:wizard.year.salary,init:0
+#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
+msgid "Wage Type"
+msgstr ""
+
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "Net Sal."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.employees.detail:0
+#: view:hr.payroll.year.salary:0
 msgid "Year Salary"
 msgstr "Жилийн цалин"
 
@@ -1265,37 +1564,35 @@ msgid "Categoty Name"
 msgstr "Ангиллын нэр"
 
 #. module: hr_payroll
-#: model:ir.actions.wizard,name:hr_payroll.wizard_payroll_analysis
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_payroll_analysis
-msgid "Create Analytic Structure"
+#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
+msgid "hr.payroll.year.salary"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:payslip.pdf:0
-#: rml:salary.structure:0
+#: report:employees.salary:0
+#: field:hr.passport,address_id:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
 msgid "Address"
 msgstr "Хаяг"
 
 #. module: hr_payroll
-#: help:hr.employee,property_bank_account:0
-msgid "Select Bank Account from where Salary Expanse will be Paid"
+#: field:hr.payslip.line.line,slipline_id:0
+msgid "Slip Line"
 msgstr ""
 
 #. module: hr_payroll
-#: help:hr.employee,salary_account:0
-msgid "Expanse account when Salary Expanse will be recorded"
+#: report:payslip.pdf:0
+msgid "Number of Leaves"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.employee:0
-msgid "Notes"
-msgstr "Тэмдэглэгээ"
-
-#. module: hr_payroll
-#: model:ir.ui.menu,name:hr_payroll.payroll_configure
-msgid "Configure Payroll"
-msgstr ""
+#: report:employees.salary:0
+#: field:hr.payroll.advice,bank_id:0
+#: field:hr.payroll.register,bank_id:0
+#: report:salary.structure:0
+msgid "Bank"
+msgstr "Банк"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
@@ -1303,72 +1600,87 @@ msgid "Cancel Sheet"
 msgstr ""
 
 #. module: hr_payroll
+#: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Advance"
 msgstr "Урьдчилгаа"
 
 #. module: hr_payroll
-#: rml:salary.structure:0
+#: report:salary.structure:0
 msgid "Special Allowances and Deductions For Employee:"
 msgstr "Тусгай олголт, суутгал:"
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,name:0
+#: field:company.contribution,name:0
+#: field:company.contribution.line,name:0
+#: field:hr.contibution.register,name:0
+#: field:hr.contibution.register.line,name:0
 #: field:hr.payroll.advice,name:0
 #: field:hr.payroll.register,name:0
+#: field:hr.payroll.structure,name:0
 #: field:hr.payslip,name:0
 #: field:hr.payslip.line,name:0
-#: rml:salary.structure:0
-#: rml:year.salary:0
+#: field:hr.payslip.line.line,name:0
+#: report:payslip.pdf:0
+#: report:salary.structure:0
+#: report:year.salary:0
 msgid "Name"
 msgstr "Нэр"
 
 #. module: hr_payroll
-#: field:hr.payslip,leaves:0
+#: report:payslip.pdf:0
 msgid "Leaved Deduction"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.employee:0
-msgid "Statutory Information"
+#: view:hr.passport:0
+msgid "Country"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
-msgid "Employee Functions"
-msgstr "Ажилтны үүрэг"
-
-#. module: hr_payroll
-#: wizard_field:wizard.employees.detail,init,employee_ids:0
-#: wizard_field:wizard.year.salary,init,employee_ids:0
+#: view:hr.passport:0
+#: view:hr.payroll.employees.detail:0
+#: field:hr.payroll.employees.detail,employee_ids:0
+#: view:hr.payroll.year.salary:0
+#: field:hr.payroll.year.salary,employee_ids:0
+#: view:hr.payslip:0
 msgid "Employees"
 msgstr "Ажилчид"
 
 #. module: hr_payroll
-#: field:hr.employee,property_bank_account:0
-#: rml:payroll.advice:0
+#: report:payroll.advice:0
 msgid "Bank Account"
 msgstr "Банкны данс"
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
+#: help:company.contribution,register_id:0
+msgid "Contribution register based on company"
 msgstr ""
 
 #. module: hr_payroll
-#: wizard_field:wizard.employees.detail,init,fiscalyear_id:0
-#: wizard_field:wizard.year.salary,init,fiscalyear_id:0
-msgid "Fiscal Year"
-msgstr "Санхүүгийн жил"
+#: help:hr.allounce.deduction.categoty,sequence:0
+msgid "Use to arrange calculation sequence"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.employee:0
-msgid "Contract"
-msgstr "Гэрээ"
+#: field:hr.payslip,total_pay:0
+msgid "Total Payment"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:payroll.analysis,init,type:0
-msgid "By Allownce / Deduction"
+#: report:payslip.pdf:0
+msgid "Leave Deductions Line:"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payroll.register,state:0
+#: selection:hr.payslip,state:0
+msgid "Wating for Account Verification"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contibution.register.line,comp_deduction:0
+msgid "Company Deduction"
 msgstr ""
 
 #. module: hr_payroll
@@ -1382,6 +1694,7 @@ msgid "Passport Issue Date"
 msgstr ""
 
 #. module: hr_payroll
+#: view:hr.allounce.deduction.categoty:0
 #: selection:hr.allounce.deduction.categoty,type:0
 #: field:hr.payroll.register,allounce:0
 #: field:hr.payslip,allounce:0
@@ -1395,14 +1708,27 @@ msgid "No of Leaves"
 msgstr "Чөлөөний тоо"
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
+#: field:hr.employee,otherid:0
+msgid "Other Id"
+msgstr ""
+
+#. module: hr_payroll
+#: report:payslip.pdf:0
 msgid "Bank Details"
 msgstr "Банкны мэдээлэл"
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
-msgid "Deductions"
-msgstr "Суутгалууд"
+#: report:payslip.pdf:0
+msgid "Slip ID"
+msgstr ""
+
+#. module: hr_payroll
+#: field:company.contribution.line,sequence:0
+#: field:hr.allounce.deduction.categoty,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.line.line,sequence:0
+msgid "Sequence"
+msgstr "Дараалал"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
@@ -1416,14 +1742,9 @@ msgid "Letter Content"
 msgstr ""
 
 #. module: hr_payroll
-#: rml:payroll.advice:0
-msgid "By Sal"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-msgid "Net SAL"
-msgstr ""
+#: view:hr.payroll.register:0
+msgid "Allowance / Deduction"
+msgstr "Олголт / Суутгал"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
@@ -1431,18 +1752,159 @@ msgid "Bank Payment Advice"
 msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
-msgid "Print Salary Structure"
-msgstr "Цалингийн задаргааг хэвлэх"
+#: view:hr.payslip:0
+msgid "Search Payslips"
+msgstr ""
 
 #. module: hr_payroll
-#: rml:payslip.pdf:0
-msgid "Total Deductions"
-msgstr "Нийт суутгал"
-
-#. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:payroll.advice:0
-#: rml:year.salary:0
+#: report:employees.salary:0
+#: field:hr.contibution.register.line,total:0
+#: report:year.salary:0
 msgid "Total"
 msgstr "Нийт"
+
+#. module: hr_payroll
+#: view:company.contribution:0
+#: view:hr.allounce.deduction.categoty:0
+#: field:hr.allounce.deduction.categoty,contribute_ids:0
+msgid "Contributions"
+msgstr ""
+
+#~ msgid "Calculations Rules"
+#~ msgstr "Тооцоолох дүрмүүд"
+
+#~ msgid "Account"
+#~ msgstr "Данс"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Анхаар !"
+
+#~ msgid "Employee Year Salary"
+#~ msgstr "Ажилтны жилийн цалин"
+
+#~ msgid "Error! You can not create recursive analytic accounts."
+#~ msgstr "Алдаа! Та цикл хэлбэрийн аналитик данс үүсгэх боломжгүй."
+
+#~ msgid "Amount Information"
+#~ msgstr "Дүнгийн мэдээлэл"
+
+#~ msgid "Salary Detail"
+#~ msgstr "Цалингийн мэдээлэл"
+
+#, python-format
+#~ msgid "Integrity Error !"
+#~ msgstr "Нэгтгэлийн алдаа !"
+
+#~ msgid "Accounting Informations"
+#~ msgstr "Санхүүгийн мэдээлэл"
+
+#~ msgid "Print"
+#~ msgstr "Хэвлэх"
+
+#~ msgid "Miscelleanous"
+#~ msgstr "Бусад"
+
+#~ msgid "#"
+#~ msgstr "#"
+
+#~ msgid "Basic Salary - Leaves"
+#~ msgstr "Үндсэн цалин - Чөлөө"
+
+#~ msgid "Year Salary Detail"
+#~ msgstr "Жилийн цалингийн мэдээлэл"
+
+#~ msgid "Expense"
+#~ msgstr "Зардал"
+
+#~ msgid "Payment Entries"
+#~ msgstr "Төлбөрийн бичилт"
+
+#~ msgid "Function of the Employee"
+#~ msgstr "Ажилтны үүрэг"
+
+#~ msgid "Passport and Visa"
+#~ msgstr "Пасспорт ба Виз"
+
+#~ msgid "Total SAL"
+#~ msgstr "Нийт цалин"
+
+#~ msgid "Bank Journal"
+#~ msgstr "Банкны журнал"
+
+#~ msgid "Salary Account"
+#~ msgstr "Цалингийн данс"
+
+#~ msgid "Employee Contract"
+#~ msgstr "Ажилтны гэрээ"
+
+#~ msgid "Expanse Journal"
+#~ msgstr "Зардлын журнал"
+
+#~ msgid "Allowance/Deduction Heads"
+#~ msgstr "Олголт/Суутгалын толгой"
+
+#~ msgid "Working Days / Week"
+#~ msgstr "Ажлын хоног / Долоо хоног"
+
+#~ msgid "Employee Account"
+#~ msgstr "Ажилтны данс"
+
+#~ msgid "General Account"
+#~ msgstr "Ерөнхий данс"
+
+#~ msgid "Process"
+#~ msgstr "Процесс"
+
+#~ msgid "Included in Salary ?"
+#~ msgstr "Цалинд багтсан ?"
+
+#~ msgid "General Information"
+#~ msgstr "Ерөнхий мэдээлэл"
+
+#~ msgid "Account Information"
+#~ msgstr "Дансны мэдээлэл"
+
+#~ msgid "Generalities"
+#~ msgstr "Ерөнхий"
+
+#~ msgid "Contract Duration"
+#~ msgstr "Гэрээний үргэлжлэх хугацаа"
+
+#~ msgid "Notes"
+#~ msgstr "Тэмдэглэгээ"
+
+#~ msgid "Fiscal Year"
+#~ msgstr "Санхүүгийн жил"
+
+#~ msgid "Employee Functions"
+#~ msgstr "Ажилтны үүрэг"
+
+#~ msgid "Print Salary Structure"
+#~ msgstr "Цалингийн задаргааг хэвлэх"
+
+#~ msgid "Employee No"
+#~ msgstr "Ажилтны дугаар"
+
+#~ msgid ""
+#~ "\n"
+#~ "    The Payroll system - India, Manages and depends on,\n"
+#~ "    * HR Details\n"
+#~ "    * HR Contracts\n"
+#~ "    * HR Payslip\n"
+#~ "    * HR Paysheet\n"
+#~ "    * HR Attendance\n"
+#~ "    * HR Holidays\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    Цалингийн систем,\n"
+#~ "    * Хүний нөөцийн бүртгэл\n"
+#~ "    * Хөдөлмөрийн гэрээ\n"
+#~ "    * Цалингийн хуудас\n"
+#~ "    * Ирц бүртгэл\n"
+#~ "    * Амралт, чөлөө\n"
+#~ "    "
+
+#~ msgid "Employee Payable Account"
+#~ msgstr "Ажилтны өглөгийн данс"
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index b152e0112eb..6411bae7bc0 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -319,7 +319,7 @@ class hr_timesheet_sheet(osv.osv):
         if r=='month':
             return time.strftime('%Y-%m-01')
         elif r=='week':
-            return (datetime.today() + relativedelta(weekday=0)).strftime('%Y-%m-%d')
+            return (datetime.today() + relativedelta(weekday=0, weeks=-1)).strftime('%Y-%m-%d')
         elif r=='year':
             return time.strftime('%Y-01-01')
         return time.strftime('%Y-%m-%d')
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
index dedac8377a7..a4b4b434da6 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
@@ -10,11 +10,12 @@
             <field eval="time.strftime('%Y-%m-%d', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))" name="date_to"/>
         </record>
 
-        <!-- record id="sheet1" model="hr_timesheet_sheet.sheet">
+        <record id="sheet1" model="hr_timesheet_sheet.sheet">
             <field name="name">Sheet 1</field>
             <field name="user_id" ref="base.user_root"/>
+            <field name="employee_id" ref="hr.employee1" />
             <field eval="time.strftime('%Y-%m-%d')" name="date_current"/>
-        </record-->
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/knowledge/i18n/mn.po b/addons/knowledge/i18n/mn.po
index 623e7b83cb0..e5e773f512e 100644
--- a/addons/knowledge/i18n/mn.po
+++ b/addons/knowledge/i18n/mn.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-08-20 06:56+0000\n"
-"PO-Revision-Date: 2010-09-10 09:07+0000\n"
-"Last-Translator: munkhbold <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-18 10:43+0000\n"
+"Last-Translator: sugi <Unknown>\n"
 "Language-Team: Mongolian <mn@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: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: knowledge
@@ -22,11 +22,13 @@ msgstr ""
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+"болохгүй!"
 
 #. module: knowledge
 #: field:knowledge.installer,wiki:0
 msgid "Collaborative Content (Wiki)"
-msgstr ""
+msgstr "Хамтарсан агуулга (Вики)"
 
 #. module: knowledge
 #: help:knowledge.installer,wiki_quality_manual:0
@@ -36,26 +38,33 @@ msgstr ""
 #. module: knowledge
 #: field:knowledge.installer,document_ftp:0
 msgid "Shared Repositories (FTP)"
-msgstr ""
+msgstr "Дундын хадгалах газар (FTP)"
 
 #. module: knowledge
 #: model:ir.module.module,shortdesc:knowledge.module_meta_information
 msgid "Knowledge Management System"
-msgstr ""
+msgstr "Баримтын удирдлагын систем"
 
 #. module: knowledge
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Алдаа! Та рекурсив цэс үүсгэж чадахгүй."
 
 #. module: knowledge
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Үйлдэлийн тодорхойлолтод буруу моделийн нэр заасан байна."
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
 msgid "Knowledge"
+msgstr "Баримт"
+
+#. module: knowledge
+#: help:knowledge.installer,document_ftp:0
+msgid ""
+"Provides an FTP access to your OpenERP's Document Management System. It lets "
+"you access attachments and virtual documents through a standard FTP client."
 msgstr ""
 
 #. module: knowledge
@@ -74,14 +83,7 @@ msgstr "Тохиргооны явц"
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "title"
-msgstr ""
-
-#. module: knowledge
-#: help:knowledge.installer,document_ftp:0
-msgid ""
-"Provides an FTP access to your OpenERP's Document Management System. Lets "
-"you access attachments and virtual documents through a standard FTP client."
-msgstr ""
+msgstr "гарчиг"
 
 #. module: knowledge
 #: model:ir.module.module,description:knowledge.module_meta_information
@@ -93,37 +95,22 @@ msgstr ""
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Тохиргоо"
 
 #. module: knowledge
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
-msgid "Knowledge Modules Installation"
-msgstr ""
-
-#. module: knowledge
-#: view:ir.actions.todo:0
-msgid "Launch"
-msgstr ""
+msgstr "Дэлгэцийн XML алдаатай!"
 
 #. module: knowledge
 #: field:knowledge.installer,wiki_quality_manual:0
 msgid "Quality Manual"
-msgstr ""
-
-#. module: knowledge
-#: view:knowledge.installer:0
-msgid "Templates of Content"
-msgstr ""
+msgstr "Чанартай удирдлага"
 
 #. module: knowledge
 #: field:knowledge.installer,document_webdav:0
 msgid "Shared Repositories (WebDAV)"
-msgstr ""
+msgstr "Дундын хадгалах газар (WebDAV)"
 
 #. module: knowledge
 #: help:knowledge.installer,wiki_faq:0
@@ -135,22 +122,22 @@ msgstr ""
 #. module: knowledge
 #: field:knowledge.installer,wiki_faq:0
 msgid "Internal FAQ"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document2
-msgid "Collaborative Content"
-msgstr ""
+msgstr "Дотоод түгээмэл тавигддаг асуултууд(ТТА)"
 
 #. module: knowledge
 #: field:knowledge.installer,config_logo:0
 msgid "Image"
 msgstr "Зураг"
 
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
+msgid "Knowledge Application Configuration"
+msgstr ""
+
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_knowledge_installer
 msgid "knowledge.installer"
-msgstr ""
+msgstr "Баримт суулгагч"
 
 #. module: knowledge
 #: help:knowledge.installer,wiki:0
@@ -158,3 +145,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 ""
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Content templates"
+msgstr ""
diff --git a/addons/marketing/i18n/nl.po b/addons/marketing/i18n/nl.po
index d194189a5ee..707b061830b 100644
--- a/addons/marketing/i18n/nl.po
+++ b/addons/marketing/i18n/nl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-08-20 07:04+0000\n"
-"PO-Revision-Date: 2010-10-08 07:32+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-18 21:48+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-10-09 12:13+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
@@ -40,9 +40,9 @@ msgid "title"
 msgstr "titel"
 
 #. module: marketing
-#: field:marketing.installer,email_template:0
-msgid "Automated E-Mails"
-msgstr "Automatische e-mails"
+#: model:ir.module.module,shortdesc:marketing.module_meta_information
+msgid "Marketing"
+msgstr "Marketing"
 
 #. module: marketing
 #: field:marketing.installer,config_logo:0
@@ -58,15 +58,6 @@ msgstr ""
 "Helpt u marketing campagnes te beheren en acties en communicatie stappen te "
 "automatiseren."
 
-#. module: marketing
-#: help:marketing.installer,marketing_campaign_mailchimp:0
-msgid ""
-"This modules integrate mailchimp.com's service with OpenERP to automate mass "
-"mailings."
-msgstr ""
-"Deze module integreert mailchimp.com's service met OpenERP om bulk mailings "
-"te automatiseren."
-
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
 msgid "Menu for Marketing"
@@ -82,11 +73,9 @@ msgstr ""
 "processen."
 
 #. module: marketing
-#: help:marketing.installer,crm_profiling:0
-msgid ""
-"Helps you to perform segmentation within partners and design questionaires."
-msgstr ""
-"Helpt u om binnen relaties te segmenteren en vragenlijsten te ontwerpen."
+#: model:ir.model,name:marketing.model_marketing_installer
+msgid "marketing.installer"
+msgstr "marketing.installer"
 
 #. module: marketing
 #: constraint:ir.actions.act_window:0
@@ -94,9 +83,9 @@ msgid "Invalid model name in the action definition."
 msgstr "Ongeldige modelnaam in de definitie van de actie."
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
-msgid "Marketing"
-msgstr "Marketing"
+#: model:ir.actions.act_window,name:marketing.action_marketing_installer
+msgid "Marketing Applications Configuration"
+msgstr "Marketing applicatie configuratie"
 
 #. module: marketing
 #: field:marketing.installer,crm_profiling:0
@@ -109,16 +98,31 @@ msgid "Marketing Campaigns"
 msgstr "Marketing Campagnes"
 
 #. module: marketing
-#: model:ir.model,name:marketing.model_marketing_installer
-msgid "marketing.installer"
-msgstr "marketing.installer"
+#: help:marketing.installer,crm_profiling:0
+msgid ""
+"Helps you to perform segmentation of partners and design segmentation "
+"questionnaires"
+msgstr ""
+"Helpt bij het segmenteren van relaties en het ontwerpen van segmentatie "
+"vragenlijsten"
 
-#. module: marketing
-#: field:marketing.installer,marketing_campaign_mailchimp:0
-msgid "Mailchimp Integration"
-msgstr "Mailchimp Integratie"
+#~ msgid "Automated E-Mails"
+#~ msgstr "Automatische e-mails"
 
-#. module: marketing
-#: model:ir.actions.act_window,name:marketing.action_marketing_installer
-msgid "Marketing Modules Installation"
-msgstr "Marketing modules installatie"
+#~ msgid ""
+#~ "This modules integrate mailchimp.com's service with OpenERP to automate mass "
+#~ "mailings."
+#~ msgstr ""
+#~ "Deze module integreert mailchimp.com's service met OpenERP om bulk mailings "
+#~ "te automatiseren."
+
+#~ msgid ""
+#~ "Helps you to perform segmentation within partners and design questionaires."
+#~ msgstr ""
+#~ "Helpt u om binnen relaties te segmenteren en vragenlijsten te ontwerpen."
+
+#~ msgid "Mailchimp Integration"
+#~ msgstr "Mailchimp Integratie"
+
+#~ msgid "Marketing Modules Installation"
+#~ msgstr "Marketing modules installatie"
diff --git a/addons/marketing_campaign_crm_demo/i18n/nl.po b/addons/marketing_campaign_crm_demo/i18n/nl.po
index 22534597f07..5f444bcf0ee 100644
--- a/addons/marketing_campaign_crm_demo/i18n/nl.po
+++ b/addons/marketing_campaign_crm_demo/i18n/nl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-08-20 08:14+0000\n"
-"PO-Revision-Date: 2010-10-17 14:29+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-18 07:49+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2010-10-18 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign_crm_demo
@@ -75,6 +75,11 @@ msgstr "Bedankt voor getoonde interesse in OpenERP"
 msgid "Thanks for buying the OpenERP book"
 msgstr "Bedankt voor het aanschaffen van het OpenERP boek"
 
+#. module: marketing_campaign_crm_demo
+#: constraint:marketing.campaign.transition:0
+msgid "The To/From Activity of transition must be of the same Campaign "
+msgstr ""
+
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5
 msgid "Propose a free technical training to Gold partners"
@@ -96,7 +101,7 @@ msgstr ""
 "            Groeten,OpenERP Team,"
 
 #. module: marketing_campaign_crm_demo
-#: rml:crm.lead.demo:0
+#: report:crm.lead.demo:0
 msgid "Partner :"
 msgstr "Relatie :"
 
@@ -113,11 +118,6 @@ msgstr ""
 "waardeer uw medewerking hierin.\n"
 "            Groeten,OpenERP Team,"
 
-#. module: marketing_campaign_crm_demo
-#: rml:crm.lead.demo:0
-msgid "Company :"
-msgstr "Bedrijf :"
-
 #. module: marketing_campaign_crm_demo
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
 msgid "Thanks for subscribing to technical training"
@@ -208,3 +208,11 @@ msgstr "marketing_campaign_crm_demo"
 #: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
 msgid "Propose gold partnership to silver partners"
 msgstr "Stel goud partnerschap voor aan zilver partners"
+
+#. module: marketing_campaign_crm_demo
+#: constraint:marketing.campaign.segment:0
+msgid "Model of filter must be same as resource model of Campaign "
+msgstr ""
+
+#~ msgid "Company :"
+#~ msgstr "Bedrijf :"
diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po
index 094b42b8735..96ece2bed84 100644
--- a/addons/mrp/i18n/de.po
+++ b/addons/mrp/i18n/de.po
@@ -6,36 +6,51 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-29 10:22+0000\n"
-"Last-Translator: Ferdinand-chricar <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-18 15:15+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.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: 2010-09-29 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
-#: field:mrp.production,move_created_ids:0
-msgid "Moves Created"
-msgstr "Buchung erzeugt"
+#: view:mrp.routing.workcenter:0
+msgid "Routing Work Centers"
+msgstr ""
 
 #. module: mrp
-#: rml:mrp.production.order:0
+#: report:mrp.production.order:0
 msgid "No. Of Cycles"
 msgstr "Anzahl Zyklen"
 
 #. module: mrp
-#: help:mrp.procurement.compute.all,init,automatic:0
-msgid ""
-"Triggers an automatic procurement for all products that have a virtual stock "
-"under 0. You should probably not use this option, we suggest using a MTO "
-"configuration on products."
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of operations this workcenter can do."
 msgstr ""
-"Triggert einen automatischen Beschaffungsvorschlag für alle Produkte mit "
-"virtuellem Lager unter \"0\". Idealerweise arbeitet man allerdings mit "
-"Lagerbestandsregeln."
+
+#. module: mrp
+#: help:mrp.production,location_src_id:0
+msgid "Location where the system will look for components."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,workcenter_lines:0
+msgid "Work Centers Utilisation"
+msgstr ""
+
+#. module: mrp
+#: view:report.workcenter.load:0
+msgid "Work Centers load"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,move_created_ids:0
+#: field:mrp.production,move_created_ids2:0
+msgid "Moves Created"
+msgstr "Buchung erzeugt"
 
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
@@ -48,31 +63,52 @@ msgid "Invalid model name in the action definition."
 msgstr "Ungültiger Modellname in der Aktionsdefinition."
 
 #. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revision"
+#: field:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of Cycles"
+msgstr ""
 
 #. module: mrp
-#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc2
-#: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc2
-msgid "Compute Stock Minimum Rules Only"
-msgstr "Regelbasierte Beschaffungsvorschläge"
+#: model:process.transition,note:mrp.process_transition_minimumstockprocure0
+msgid ""
+"The 'Minimum stock rule' allows the system to create procurement orders "
+"automatically as soon as the minimum stock is reached."
+msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_procurement_action5
-#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action5
-msgid "Exceptions Procurements"
-msgstr "Fehlerliste Beschaffung"
+#: help:mrp.bom,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the bills of "
+"material without removing it."
+msgstr ""
 
 #. module: mrp
-#: view:mrp.routing.workcenter:0
-msgid "Routing Workcenters"
-msgstr "Definition Arbeitsgänge"
+#: field:mrp.production,picking_id:0
+#: field:mrp.production.order,picking_id:0
+msgid "Picking list"
+msgstr ""
 
 #. module: mrp
-#: help:mrp.property,composition:0
-msgid "Not used in computations, for information purpose only."
-msgstr "Keine Verwendung in Berechnungen, nur zur Info"
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Hourly Cost"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Cost Price per Uom"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Scrap Products"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: field:mrp.production.order,day:0
+msgid "Day"
+msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
@@ -81,28 +117,24 @@ msgid "Routings"
 msgstr "Arbeitsgänge"
 
 #. module: mrp
-#: field:mrp.production,picking_id:0
-msgid "Packing list"
-msgstr "Packliste"
+#: view:mrp.bom:0
+msgid "Search Bill Of Material"
+msgstr ""
 
 #. module: mrp
-#: model:process.node,name:mrp.process_node_stock0
-msgid "Stockable Stock"
-msgstr "Bestand Lagerprodukte"
+#: model:process.node,note:mrp.process_node_stockproduct1
+msgid "For stockable products and consumables"
+msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,origin:0
-#: field:mrp.production,origin:0
-msgid "Origin"
-msgstr "Bezug"
-
-#. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Konfiguration"
+#: model:process.transition,name:mrp.process_transition_stockproduction0
+msgid "To Produce"
+msgstr ""
 
 #. module: mrp
+#: view:mrp.bom:0
+#: field:mrp.bom,code:0
+#: view:mrp.production:0
 #: field:mrp.production,name:0
 msgid "Reference"
 msgstr "Referenz"
@@ -113,10 +145,37 @@ msgid "Finished Products"
 msgstr "Fertigprodukte"
 
 #. module: mrp
-#: wizard_field:mrp.procurement.compute.all,init,automatic:0
-#: wizard_field:mrp.procurement.orderpoint.compute,init,automatic:0
-msgid "Automatic orderpoint"
-msgstr "Automatischer Bestellvorschlag"
+#: selection:mrp.production.order,month:0
+msgid "May"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_servicerfq0
+#: model:process.transition,name:mrp.process_transition_stockrfq0
+msgid "To Buy"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.order:0
+msgid "Raw Material Location"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.installer,mrp_operations:0
+msgid ""
+"Enhances production orders with readiness states as well as the start date "
+"and end date of execution of the order."
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_purchaseprocure0
+msgid "The system launches automatically a RFQ to the preferred supplier."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Products to Finish"
+msgstr ""
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -129,12 +188,17 @@ msgid "Invalid XML for View Architecture!"
 msgstr "Fehlerhafter xml Code für diese Ansicht!"
 
 #. module: mrp
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
+#: field:mrp.installer,mrp_subproduct:0
+msgid "MRP Subproducts"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+#: field:mrp.production,state:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,state:0
+msgid "State"
 msgstr ""
-"Diese Tage werden aus Sicherheitsgründen addiert zur versprochenen "
-"Auslieferungszeit (an den Kunden)."
 
 #. module: mrp
 #: field:mrp.workcenter,costs_hour:0
@@ -142,101 +206,90 @@ msgid "Cost per hour"
 msgstr "Kosten per Stunde"
 
 #. module: mrp
-#: selection:stock.warehouse.orderpoint,logic:0
-msgid "Best price (not yet active!)"
-msgstr "Günstigster Preis (noch nicht aktiv!)"
-
-#. module: mrp
-#: view:mrp.procurement:0
-msgid "Product & Location"
-msgstr "Produkt & Lagerort"
-
-#. module: mrp
-#: view:res.company:0
-msgid "MRP & Logistic Scheduler"
-msgstr "Fertigungs- und Beschaffungsplanung"
-
-#. module: mrp
-#: help:mrp.workcenter,capacity_per_cycle:0
+#: model:process.transition,note:mrp.process_transition_stockproduction0
 msgid ""
-"Number of operation this workcenter can do in parallel. If this workcenter "
-"represent a team of 5 workers, the capacity per cycle is 5."
+"In case the Supply method of the product is Produce, the system creates a "
+"production order."
 msgstr ""
-"Anzahl paralleler Durchführungen dieses Arbeitsplatzes. Falls Arbeitsplatz "
-"ein Team von 5 Mitarbeitern repräsentiert ist die Kapazität per Zyklus 5."
 
 #. module: mrp
-#: wizard_button:product.product.procurement,init,create:0
-msgid "Ask New Products"
-msgstr "Anfrage neue Produkte"
+#: view:mrp.production:0
+msgid "UOM"
+msgstr "ME"
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_reordering
-msgid "Automatic Procurements"
-msgstr "Beschaffungsvorschlag"
-
-#. module: mrp
-#: wizard_field:change_production_qty,confirm,product_qty:0
+#: field:change.production.qty,product_qty:0
 #: field:mrp.bom,product_qty:0
 #: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Qty"
 msgstr "Produktmenge"
 
 #. module: mrp
-#: field:mrp.production,move_lines:0
-msgid "Products Consummed"
-msgstr "Produkte Verbrauchswaren"
+#: model:process.node,note:mrp.process_node_purchaseprocure0
+msgid "For purchased material"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom.revision,indice:0
+msgid "Revision"
+msgstr "Revision"
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.next_id_77
+msgid "Reporting"
+msgstr "Berichtswesen"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle_account_id:0
 msgid "Cycle Account"
 msgstr "Analysekonto Zyklen"
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Cost"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "["
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procureserviceproduct0
+msgid "Procurement of services"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Capacity Information"
 msgstr "Information Kapazität"
 
 #. module: mrp
-#: selection:mrp.production,state:0
-msgid "Packing Exception"
-msgstr "Packvorgang Fehlerliste"
-
-#. module: mrp
-#: model:process.node,note:mrp.process_node_orderrfq0
-msgid "A purchase order is created for a sub-contracting demand."
-msgstr "Ein Beschaffungsauftrag wird angelegt für einen Sub-Auftragnehmer"
-
-#. module: mrp
-#: rml:mrp.production.order:0
+#: report:mrp.production.order:0
 msgid "Destination Location"
 msgstr "Lieferanschrift"
 
 #. module: mrp
-#: view:mrp.workcenter:0
-msgid "Analytic Accounting"
-msgstr "Auswertungen Analysekonten"
+#: view:mrp.installer:0
+msgid "title"
+msgstr ""
 
 #. module: mrp
-#: model:process.node,note:mrp.process_node_servicemts0
-msgid "Do nothing"
-msgstr "Keine Aktion"
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom
+msgid "Master Data"
+msgstr ""
 
 #. module: mrp
-#: rml:mrp.production.order:0
+#: report:mrp.production.order:0
 msgid "Partner Ref"
 msgstr "Partner Referenz"
 
 #. module: mrp
-#: help:mrp.procurement.orderpoint.compute,init,automatic:0
-msgid "If the stock of a product is under 0, it will act like an orderpoint"
-msgstr ""
-"Falls der Lagerbestand eines Produktes unter 0 geht, wird agiert wie bei "
-"einer Bestandsregel"
-
-#. module: mrp
-#: selection:mrp.workcenter.load,init,measure_unit:0
+#: selection:mrp.workcenter.load,measure_unit:0
 msgid "Amount in hours"
 msgstr "Wert in Stunden"
 
@@ -246,9 +299,18 @@ msgid "Scheduled goods"
 msgstr "Verplantes Material"
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_producttostockrules0
-msgid "you can see the minimum stock rules from product"
-msgstr "Einblick in die Regel für den Minimalbestand über die Produktseite"
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid ""
+"Cannot delete Production Order(s) which are in %s State!' % s['state']))\n"
+"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
+"\n"
+"    def copy(self, cr, uid, id, default=None, context=None):\n"
+"        if default is None:\n"
+"            default = {}\n"
+"        default.update({\n"
+"            'name': self.pool.get('ir.sequence"
+msgstr ""
 
 #. module: mrp
 #: selection:mrp.bom,type:0
@@ -256,26 +318,10 @@ msgid "Sets / Phantom"
 msgstr "Baukasten / Phantom"
 
 #. module: mrp
-#: wizard_view:mrp.procurement.compute,init:0
-msgid "This wizard will schedule procurements."
-msgstr "Dieser Assistent berechnet die Beschaffungsvorschläge."
-
-#. module: mrp
-#: field:mrp.bom,position:0
-msgid "Internal Ref."
-msgstr "Interne Referenz"
-
-#. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,state:0
-#: field:mrp.production,state:0
-msgid "Status"
-msgstr "Status"
-
-#. module: mrp
-#: model:process.transition,name:mrp.process_transition_stockproduction0
-msgid "Stockable Production Order"
-msgstr "Fertigungsauftrag Lagerprodukt"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Not urgent"
+msgstr "Nicht dringend"
 
 #. module: mrp
 #: help:mrp.bom,position:0
@@ -283,56 +329,54 @@ msgid "Reference to a position in an external plan."
 msgstr "Referenz auf eine externe Planungsposition."
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_stockrfq0
-msgid "Stockable Request"
-msgstr "Lagerbestandsprüfung"
-
-#. module: mrp
-#: model:process.node,name:mrp.process_node_serviceonorder0
-msgid "Service on Order"
-msgstr "Leistung auf Bestellung"
-
-#. module: mrp
-#: help:stock.warehouse.orderpoint,product_max_qty:0
-#: help:stock.warehouse.orderpoint,product_min_qty:0
-msgid ""
-"When the virtual stock goes belong the Min Quantity, Open ERP generates a "
-"procurement to bring the virtual stock to the Max Quantity."
+#: selection:mrp.production.order,month:0
+msgid "August"
 msgstr ""
-"Wenn der virtuelle Bestand unter den Min. Bestand geht, wird ein "
-"Beschaffungsauftrag erzeugt, der den virtuellen Lagerbestand auf die Max. "
-"Anzahl bringt."
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_stockmts0
-msgid "Stockable Make to Stock"
-msgstr "Lagerproduktion \"vom Lager\""
+#: model:ir.model,name:mrp.model_mrp_production_order
+msgid "Production Order Report"
+msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: view:mrp.production:0
-msgid "Production Orders"
-msgstr "Fertigungsaufträge"
+#: selection:mrp.production.order,month:0
+msgid "June"
+msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.procurement,product_qty:0
-#: rml:mrp.production.order:0
-#: wizard_field:product.product.procurement,init,qty:0
+#: model:ir.model,name:mrp.model_mrp_product_produce
+msgid "Product Produce"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "October"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,name:mrp.process_transition_procurestockableproduct0
+msgid "Procurement of stockable Product"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "Default UOM"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#: report:bom.structure:0
+#: field:mrp.product.produce,product_qty:0
+#: field:mrp.product_price,number:0
+#: report:mrp.production.order:0
+#, python-format
 msgid "Quantity"
 msgstr "Menge"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
-msgid "Not urgent"
-msgstr "Nicht dringend"
-
-#. module: mrp
-#: model:process.transition,name:mrp.process_transition_procureserviceproduct0
-msgid "Procure Service Product"
-msgstr "Beschaffung Dienstleistungsprodukt"
+#: field:mrp.production.workcenter.line,hour:0
+msgid "Nbr of hours"
+msgstr ""
 
 #. module: mrp
 #: view:mrp.production:0
@@ -340,51 +384,50 @@ msgid "Confirm Production"
 msgstr "Start Fertigungsauftrag"
 
 #. module: mrp
-#: model:process.node,name:mrp.process_node_purchaseprocure0
-#: field:stock.move,procurements:0
-msgid "Procurements"
-msgstr "Beschaffungsvorgänge"
+#: model:process.transition,note:mrp.process_transition_stockproduct0
+msgid ""
+"The system creates an order (production or purchased) depending on the sold "
+"quantity and the products parameters."
+msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_production_product_line
-msgid "Production scheduled products"
-msgstr "Fertigungsaufträge nach Produkten"
+#: model:process.transition,note:mrp.process_transition_servicemts0
+msgid ""
+"This is used in case of a service without any impact in the system, a "
+"training session for instance."
+msgstr ""
 
 #. module: mrp
-#: field:mrp.workcenter,timesheet_id:0
-msgid "Working Time"
-msgstr "Arbeitszeit"
+#: field:mrp.installer,mrp_repair:0
+msgid "Repairs"
+msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-msgid "Details"
-msgstr "Details"
+#: field:mrp.installer,stock_location:0
+msgid "Advanced Routes"
+msgstr ""
 
 #. module: mrp
-#: model:process.process,name:mrp.process_process_procurementprocess0
-msgid "Procurement Process"
-msgstr "Einkaufs Prozess"
+#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
+msgid "Weekly Stock Value Variation"
+msgstr "Wöchentliche Lagerbewertung (Veränderung)"
+
+#. module: mrp
+#: help:mrp.installer,mrp_repair:0
+msgid ""
+"Enables warranty and repair management (and their impact on stocks and "
+"invoicing)."
+msgstr ""
 
 #. module: mrp
 #: field:mrp.production,date_planned_date:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,date_planned:0
 msgid "Scheduled Date"
 msgstr "Geplantes Datum"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
-#: selection:mrp.production,priority:0
-msgid "Urgent"
-msgstr "Dringend"
-
-#. module: mrp
-#: help:mrp.bom,product_rounding:0
-msgid ""
-"Rounding applied on the product quantity. For integer only values, put 1.0"
-msgstr ""
-"Rundung bezieht sich auf Produktmenge. Für Zahlentyp integer trage 1.0 ein."
-
-#. module: mrp
-#: rml:mrp.production.order:0
+#: report:mrp.production.order:0
 msgid "Bill Of Material"
 msgstr "Stückliste"
 
@@ -401,9 +444,9 @@ msgstr ""
 "Das kann auch ein Partner-Ort sein, wenn Sie Subkontrakte haben."
 
 #. module: mrp
-#: field:mrp.procurement,move_id:0
-msgid "Reservation"
-msgstr "Reservierung"
+#: view:board.board:0
+msgid "Stock Value Variation"
+msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
@@ -411,29 +454,25 @@ msgid "Bill of Materials Structure"
 msgstr "Stückliste Struktur"
 
 #. module: mrp
-#: wizard_field:product.product.procurement,init,product_id:0
-msgid "product"
-msgstr "Produkt"
+#: model:process.node,note:mrp.process_node_serviceproduct0
+msgid "Product type is service"
+msgstr ""
 
 #. module: mrp
-#: selection:mrp.property,composition:0
-msgid "max"
-msgstr "max"
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "of "
+msgstr ""
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_producttostockrules0
-msgid "Product to stock rules"
-msgstr "Regelung Einlagerung Produkte"
+#: model:process.transition,name:mrp.process_transition_bom0
+msgid "Manufacturing decomposition"
+msgstr ""
 
 #. module: mrp
-#: wizard_button:product_price,init,price:0
-msgid "Print product price"
-msgstr "Druck Preisliste"
-
-#. module: mrp
-#: wizard_view:product.product.procurement,done:0
-msgid "Make Procurement"
-msgstr "Erzeuge Beschaffung"
+#: model:process.node,note:mrp.process_node_serviceproduct1
+msgid "For Services."
+msgstr ""
 
 #. module: mrp
 #: field:mrp.bom.revision,date:0
@@ -451,17 +490,36 @@ msgstr ""
 "werden soll (bei Produktionsaufträgen)."
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_stockproduction0
-msgid "If Procure method is Make to order and supply method is produce"
+#: field:mrp.production.workcenter.line,cycle:0
+msgid "Nbr of cycles"
 msgstr ""
-"Falls Beschaffungsmethode 'aus Auftrag' und Einkaufsmethode 'Produktion'"
 
 #. module: mrp
-#: field:res.company,po_lead:0
-msgid "Purchase Lead Time"
-msgstr "Beschaffungszeit (Lieferant)"
+#: model:process.node,note:mrp.process_node_orderrfq0
+#: model:process.node,note:mrp.process_node_rfq0
+msgid "Request for Quotation."
+msgstr ""
 
 #. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Component suppliers"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
+msgid ""
+"The Bill of Material is linked to a routing, i.e. the succession of work "
+"centers."
+msgstr ""
+
+#. module: mrp
+#: help:mrp.workcenter,costs_hour:0
+msgid "Specify Cost of Workcenter per hour."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
 #: field:mrp.routing,location_id:0
 msgid "Production Location"
 msgstr "Fertigungort (virtuelles Lager)"
@@ -482,36 +540,73 @@ msgid "Author"
 msgstr "Autor"
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_stockproduct0
-msgid "Stockable Product Stock"
-msgstr "Bestand Lagerprodukt"
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr "Lagerwert Veränderungen"
 
 #. module: mrp
-#: field:mrp.bom,product_uos:0
-#: field:mrp.production.product.line,product_uos:0
-msgid "Product UOS"
-msgstr "Produkt UoS"
+#: model:ir.actions.act_window,name:mrp.action_product_bom_structure
+msgid "Product BoM Structure"
+msgstr "Produktstruktur"
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_productionprocureproducts0
-msgid "Production Procure Products"
-msgstr "Fertigung Beschaffung Produkte"
-
-#. module: mrp
-#: model:process.process,name:mrp.process_process_serviceproductprocess0
-msgid "Service Product Process"
-msgstr "Dienstleistung Prozess"
-
-#. module: mrp
-#: model:process.transition,note:mrp.process_transition_purchaseprocure0
-msgid "Procurement convert into the draft purchase order."
+#: view:mrp.production:0
+msgid "Search Production"
 msgstr ""
-"Beschaffungsvorschlag erzeugt einen Beschaffungsauftrag im Stadium Entwurf."
 
 #. module: mrp
-#: field:mrp.procurement,message:0
-msgid "Latest error"
-msgstr "Letzte Fehlermeldung"
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Supplier Price per Uom"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "March"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_workcenter_load
+msgid "Workcenter Load"
+msgstr "Arbeitsplatz Auslastung"
+
+#. module: mrp
+#: help:mrp.workcenter,costs_cycle:0
+msgid "Specify Cost of Workcenter per cycle."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,child_complete_ids:0
+msgid "BoM Hierarchy"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
+#: view:mrp.product.produce:0
+#: view:mrp.production:0
+msgid "Produce"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.production,picking_id:0
+msgid ""
+"This is the internal picking list that brings the finished product to the "
+"production plan"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.product_price,number:0
+msgid ""
+"Specify quantity of products to produce or buy. Report of Cost structure "
+"will be displayed base on this qunatity."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
+msgid "Picking Exception"
+msgstr ""
 
 #. module: mrp
 #: field:mrp.bom,bom_lines:0
@@ -524,12 +619,15 @@ msgid "Time before prod."
 msgstr "Vorlauf Produktion"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing_workcenter
-msgid "Routing workcenter usage"
-msgstr "Reihenfolge Arbeitsplatzbelegung"
+#: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
+msgid "Material Routing"
+msgstr ""
 
 #. module: mrp
 #: view:mrp.production:0
+#: field:mrp.production,move_lines2:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,consumed_products:0
 msgid "Consumed Products"
 msgstr "Verbrauchsprodukte"
 
@@ -539,122 +637,115 @@ msgid "Error ! You can not create recursive BoM."
 msgstr "Fehler! Sie können keine rekursiven Stücklisten definieren."
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_stockmts0
-#: model:process.transition,note:mrp.process_transition_stockrfq0
-msgid "If Product type is Stockable and procure method is make to stock"
+#: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
+#: model:ir.model,name:mrp.model_report_workcenter_load
+msgid "Work Center Load"
 msgstr ""
-"Falls Produkttyp = Lagerprodukt und Beschaffungsmethode 'vom Lager' (Make to "
-"Stock - MtS)"
 
 #. module: mrp
-#: field:res.company,manufacturing_lead:0
-msgid "Manufacturity Lead Time"
-msgstr "Aufrüstzeiten"
+#: code:addons/mrp/procurement.py:0
+#, python-format
+msgid "No BoM defined for this product !"
+msgstr "Keine BoM für dieses Produkt."
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_procurement_action4
-#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action4
-msgid "Exceptions Procurements to Fix"
-msgstr "Fehler Beschaffung"
-
-#. module: mrp
-#: selection:mrp.procurement,state:0
-msgid "Ready"
-msgstr "Fertig"
-
-#. module: mrp
-#: view:mrp.routing:0
-msgid "Workcenter Operations"
-msgstr "Arbeitsplatz Vorgangsliste"
-
-#. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_production_action2_gantt
-#: model:ir.ui.menu,name:mrp.menu_production_orders_start_gantt
-msgid "Production Orders Planning"
-msgstr "Fertigungsauftragsplanung"
-
-#. module: mrp
-#: help:mrp.workcenter,time_efficiency:0
-msgid "Factor that multiplies all times expressed in the workcenter."
+#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
+#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
+msgid "Bill of Material Components"
 msgstr ""
-"Faktor der alle angefallenen Zeiten dieses Arbeitsplatzes multipliziert."
 
 #. module: mrp
+#: field:mrp.production.order,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_planning
+msgid "Planning"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Costing Information"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing.workcenter,hour_nbr:0
 #: help:mrp.workcenter,time_cycle:0
 msgid "Time in hours for doing one cycle."
 msgstr "Zeit in Stunden für einen (Auftrags-) Zyklus"
 
 #. module: mrp
-#: field:mrp.production,date_finished:0
-msgid "End Date"
-msgstr "Endedatum"
-
-#. module: mrp
-#: help:mrp.production,picking_id:0
-msgid ""
-"This is the internal picking list take bring the raw materials to the "
-"production plan."
+#: report:bom.structure:0
+msgid "BOM Ref"
 msgstr ""
-"Diese interne Packliste liefert die Rohmaterialien zum Fertigungsort "
-"(Bereitstellung)"
 
 #. module: mrp
 #: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
 msgid "In Production"
 msgstr "In Produktion"
 
 #. module: mrp
-#: field:stock.warehouse.orderpoint,qty_multiple:0
-msgid "Qty Multiple"
-msgstr "Menge Multiple"
+#: model:ir.ui.menu,name:mrp.menu_mrp_property
+msgid "Master Bill of Materials"
+msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-msgid "Waiting"
-msgstr "Warteliste"
+#: help:mrp.bom,product_uos:0
+msgid ""
+"Product UOS (Unit of Sale) is the unit of measurement for the invoicing and "
+"promotion of stock."
+msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_routing
-#: field:mrp.bom,routing_id:0
-#: field:mrp.production,routing_id:0
-#: view:mrp.routing:0
-#: model:process.node,name:mrp.process_node_routing0
-msgid "Routing"
-msgstr "Reihenfolge Arbeitsvorgänge"
-
-#. module: mrp
-#: wizard_button:mrp.workcenter.load,init,report:0
+#: view:mrp.product_price:0
+#: view:mrp.workcenter.load:0
 msgid "Print"
 msgstr "Druck"
 
 #. module: mrp
-#: field:mrp.workcenter,type:0
+#: view:mrp.bom:0
+#: view:mrp.workcenter:0
 msgid "Type"
 msgstr "Typ"
 
 #. module: mrp
-#: model:process.node,note:mrp.process_node_stockproduct0
-#: model:process.node,note:mrp.process_node_stockproduct1
-msgid "For stockable and consumable"
-msgstr "Für Lager- und Verbrauchswaren"
+#: model:process.node,note:mrp.process_node_minimumstockrule0
+msgid "Linked to the 'Minimum stock rule' supplying method."
+msgstr ""
 
 #. module: mrp
-#: selection:mrp.workcenter.load,init,time_unit:0
+#: selection:mrp.workcenter.load,time_unit:0
 msgid "Per month"
 msgstr "Pro Monat"
 
 #. module: mrp
-#: field:mrp.procurement,product_uos_qty:0
-msgid "UoS Quantity"
-msgstr "Menge (UOS)"
+#: code:addons/mrp/mrp.py:0
+#: code:addons/mrp/wizard/change_production_qty.py:0
+#, python-format
+msgid "Couldn't find bill of material for product"
+msgstr "Kann keine Stückliste für diese Produkt finden"
 
 #. module: mrp
-#: rml:bom.structure:0
+#: report:bom.structure:0
 msgid "Product Name"
 msgstr "Produkt Bezeichnung"
 
 #. module: mrp
-#: rml:mrp.production.order:0
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "Fehlerhafte Aktion"
+
+#. module: mrp
+#: help:mrp.bom,product_efficiency:0
+msgid "A factor of 0.9 means a loss of 10% within the production process."
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
 msgid "Printing date"
 msgstr "Datum Druck"
 
@@ -665,56 +756,53 @@ msgid "RFQ"
 msgstr "Angebotsanfrage"
 
 #. module: mrp
-#: field:mrp.bom,revision_type:0
-msgid "indice type"
-msgstr "Index Typ"
+#: model:process.transition,name:mrp.process_transition_producttostockrules0
+msgid "Procurement rule"
+msgstr ""
 
 #. module: mrp
-#: model:process.node,note:mrp.process_node_production0
-msgid "Production orders are created for the product manufacturing."
-msgstr "Fertigungsaufträge werden angelegt bei der Produktherstellung."
+#: view:mrp.production:0
+msgid "Partial"
+msgstr ""
 
 #. module: mrp
-#: rml:mrp.production.order:0
+#: selection:mrp.production.order,month:0
+msgid "September"
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
 msgid "WorkCenter"
 msgstr "Arbeitsplatz"
 
 #. module: mrp
-#: field:stock.warehouse.orderpoint,product_min_qty:0
-msgid "Min Quantity"
-msgstr "Min. Menge"
+#: model:process.transition,note:mrp.process_transition_procureserviceproduct0
+msgid ""
+"Depending on the chosen method to 'supply' the service, the procurement "
+"order creates a RFQ for a subcontracting purchase order or waits until the "
+"service is done (= the delivery of the products)."
+msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-msgid "Production orders"
-msgstr "Fertigungsaufträge"
+#: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
+msgid "Urgent"
+msgstr "Dringend"
 
 #. module: mrp
-#: field:mrp.bom,child_complete_ids:0
-#: field:mrp.bom,child_ids:0
-msgid "BoM Hyerarchy"
-msgstr "Hierachie Stückliste"
+#: model:ir.model,name:mrp.model_mrp_routing_workcenter
+msgid "Workcenter Usage"
+msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-msgid "Procurement Lines"
-msgstr "Beschaffungsvorschlag Positionen"
+#: model:ir.model,name:mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_servicemts0
-msgid "If Product type is service and procure method is Make to stock"
-msgstr "Falls Produkttyp Service und Beschaffungsmethode 'vom Lager' (MtS)"
-
-#. module: mrp
-#: model:process.node,note:mrp.process_node_serviceproduct0
-#: model:process.node,note:mrp.process_node_serviceproduct1
-msgid "If Product type is service"
-msgstr "Falls Produkttyp Dienstleistungen (Service)"
-
-#. module: mrp
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Sicherheitspuffer (Tage)"
+#: model:process.transition,name:mrp.process_transition_productionprocureproducts0
+msgid "Procurement of raw material"
+msgstr ""
 
 #. module: mrp
 #: view:mrp.production:0
@@ -724,6 +812,8 @@ msgstr "Gesamt Zyklen"
 
 #. module: mrp
 #: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
 msgid "Ready to Produce"
 msgstr "Startbereit für Fertigung"
 
@@ -732,107 +822,144 @@ msgstr "Startbereit für Fertigung"
 msgid "Modification name"
 msgstr "Bezeichnung geändert"
 
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.production:0
+#: field:mrp.production.order,date:0
+msgid "Date"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,type:0
 msgid "BoM Type"
 msgstr "Stückliste Typ"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-msgid "Exception"
-msgstr "Fehlerliste"
+#: view:mrp.production.order:0
+msgid "Extended Filters..."
+msgstr ""
 
 #. module: mrp
-#: wizard_view:product.product.procurement,init:0
+#: code:addons/mrp/procurement.py:0
+#, python-format
 msgid ""
-"This wizard will planify the procurement for this product. This procurement "
-"may generate task, production orders or purchase orders."
+"Procurement '%s' has an exception: 'No BoM defined for this product !'"
 msgstr ""
-"Dieser Assistent wird die Beschaffungsplanung für dieses Produkt vornehmen. "
-"Diese Beschaffung kann eine Aufgabe, einen Produktionsauftrag oder einen "
-"Beschaffungsauftrag generieren,"
 
 #. module: mrp
-#: model:process.node,note:mrp.process_node_mts0
-msgid "The system waits for requested products in stock."
-msgstr "Das System warted auf Produktverfügbarkeit."
-
-#. module: mrp
-#: model:process.transition,name:mrp.process_transition_servicemto0
-msgid "Serivce Stockable Order"
-msgstr "Beschaffungsauftrag Dienstleistungen"
-
-#. module: mrp
-#: model:process.transition,note:mrp.process_transition_minimumstockprocure0
-msgid "From minimum stock rules, it goes for procure product."
+#: view:mrp.production.order:0
+#: view:mrp.property:0
+msgid "Search"
+msgstr ""
+
+#. module: mrp
+#: field:report.workcenter.load,cycle:0
+msgid "Nbr of cycle"
+msgstr "Anzahl Zyklen"
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,name:mrp.process_node_minimumstockrule0
+#: model:process.node,name:mrp.process_node_productminimumstockrule0
+msgid "Minimum Stock"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menus_dash_mrp
+msgid "Dashboard"
 msgstr ""
-"Aus der Meldebestandregel leitet sich die Berechnung des "
-"Beschaffungsauftrags ab."
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
 #: model:process.node,name:mrp.process_node_stockproduct1
+#: model:process.process,name:mrp.process_process_stockableproductprocess0
 msgid "Stockable Product"
 msgstr "Lagerprodukt"
 
 #. module: mrp
-#: view:mrp.production:0
-msgid "Production done"
-msgstr "Beende Fertigung"
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Center name"
+msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: field:mrp.bom,code:0
 #: field:mrp.routing,code:0
-#: field:mrp.workcenter,code:0
 msgid "Code"
 msgstr "Kurzbezeichnung"
 
 #. module: mrp
-#: rml:mrp.production.order:0
+#: report:mrp.production.order:0
 msgid "No. Of Hours"
 msgstr "Anz. Stunden"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_property_group
-#: field:mrp.property,group_id:0
-#: field:mrp.property.group,name:0
+#: field:mrp.installer,mrp_jit:0
+msgid "Just In Time Scheduling"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.property:0
+#: view:mrp.property.group:0
 msgid "Property Group"
 msgstr "Eigenschaften Gruppe"
 
 #. module: mrp
-#: field:mrp.bom,bom_id:0
-msgid "Parent BoM"
-msgstr "(Ober-) Stückliste"
-
-#. module: mrp
-#: view:mrp.procurement:0
-msgid "References"
-msgstr "Referenzen"
-
-#. module: mrp
-#: wizard_button:change_production_qty,confirm,end:0
-#: view:mrp.procurement:0
-#: selection:mrp.procurement,state:0
-#: wizard_button:mrp.procurement.compute,init,end:0
-#: wizard_button:mrp.procurement.compute.all,init,end:0
-#: wizard_button:mrp.procurement.orderpoint.compute,init,end:0
 #: view:mrp.production:0
-#: wizard_button:mrp.workcenter.load,init,end:0
-#: wizard_button:product.product.procurement,init,end:0
-#: wizard_button:product_price,init,end:0
+msgid "Qty"
+msgstr "Anz."
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_production0
+msgid "Manufacturing Plan."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
+#: view:mrp.workcenter:0
+msgid "Inactive"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.installer,mrp_subproduct:0
+msgid ""
+"Enables multiple product output from a single production order: without "
+"this, a production order can have only one output product."
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+#: view:mrp.product.produce:0
+#: view:mrp.product_price:0
+#: view:mrp.production:0
+#: view:mrp.workcenter.load:0
 msgid "Cancel"
 msgstr "Abbrechen"
 
+#. module: mrp
+#: view:mrp.production:0
+msgid "Split in production lots"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_servicerfq0
+msgid ""
+"If the service has a 'Buy' supply method, this creates a RFQ, a "
+"subcontracting demand for instance."
+msgstr ""
+
 #. module: mrp
 #: field:mrp.production,move_prod_id:0
 msgid "Move product"
 msgstr "Bewege Ware"
 
 #. module: mrp
-#: selection:mrp.workcenter,type:0
-msgid "Machine"
-msgstr "Maschine"
+#: view:mrp.production:0
+msgid "Late"
+msgstr ""
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_servicemts0
@@ -840,9 +967,14 @@ msgid "Make to stock"
 msgstr "vom Lager (MtS)"
 
 #. module: mrp
-#: field:mrp.workcenter,name:0
-msgid "Workcenter Name"
-msgstr "Arbeitsplatz Name"
+#: view:board.board:0
+msgid "Work Center Future load"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
+msgid "BOM Name"
+msgstr ""
 
 #. module: mrp
 #: view:mrp.production:0
@@ -850,137 +982,127 @@ msgid "Start Production"
 msgstr "Starte Fertigungsauftrag"
 
 #. module: mrp
-#: selection:mrp.property,composition:0
-msgid "min"
-msgstr "min"
-
-#. module: mrp
-#: help:mrp.workcenter,note:0
-msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+#: model:ir.actions.act_window,name:mrp.open_board_manufacturing
+#: model:ir.ui.menu,name:mrp.menu_board_manufacturing
+msgid "Production Dashboard"
 msgstr ""
-"Beschreibung des Arbeitsplatzes. Beschreibe hier den Vorgang dieses "
-"Arbeitsplatzes für den gesamten Auftragszyklus."
 
 #. module: mrp
-#: rml:bom.structure:0
-msgid "-"
-msgstr "-"
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Component"
+msgstr ""
 
 #. module: mrp
-#: selection:mrp.workcenter,type:0
-msgid "Human Resource"
-msgstr "Personal"
+#: view:mrp.production:0
+msgid "Source Loc."
+msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
-#: field:mrp.routing,workcenter_lines:0
-msgid "Workcenters"
-msgstr "Arbeitsplätze"
+#: field:mrp.bom,position:0
+msgid "Internal Reference"
+msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-msgid "UOM"
-msgstr "ME"
+#: help:mrp.installer,stock_location:0
+msgid ""
+"Manages product routes and paths within and between locations (e.g. "
+"warehouses)."
+msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,procure_method:0
-msgid "on order"
-msgstr "von Auftrag"
-
-#. module: mrp
-#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc0
-#: model:ir.ui.menu,name:mrp.mrp_Sched_all
-msgid "Compute All Schedulers"
-msgstr "Beschaffungsvorschläge"
-
-#. module: mrp
-#: field:mrp.production.workcenter.line,cycle:0
-msgid "Nbr of cycle"
-msgstr "Anzahl Zyklen"
+#: model:process.node,note:mrp.process_node_billofmaterial0
+msgid "Product's structure"
+msgstr ""
 
 #. module: mrp
 #: field:mrp.bom,name:0
-#: field:mrp.procurement,name:0
-#: rml:mrp.production.order:0
+#: report:mrp.production.order:0
 #: field:mrp.production.product.line,name:0
-#: field:mrp.property,name:0
 #: field:mrp.routing,name:0
 #: field:mrp.routing.workcenter,name:0
-#: field:stock.warehouse.orderpoint,name:0
 msgid "Name"
 msgstr "Bezeichnung"
 
 #. module: mrp
-#: field:mrp.routing.workcenter,cycle_nbr:0
-msgid "Number of Cycle"
-msgstr "Anzahl Zyklen"
-
-#. module: mrp
-#: wizard_field:mrp.workcenter.load,init,measure_unit:0
-msgid "Amount measuring unit"
-msgstr "Menge (ME)"
-
-#. module: mrp
-#: view:mrp.procurement:0
-msgid "Run procurement"
-msgstr "Starte Beschaffungsvorschlag"
-
-#. module: mrp
-#: help:res.company,schedule_range:0
+#: help:mrp.installer,mrp_jit:0
 msgid ""
-"This is the time frame analysed by the scheduler when computing "
-"procurements. All procurement that are not between today and today+range are "
-"skipped for futur computation."
+"Enables Just In Time computation of procurement orders.\n"
+"\n"
+"While it's more resource intensive than the default setup, the JIT computer "
+"avoids having to wait for the procurement scheduler to run or having to run "
+"the procurement scheduler manually."
 msgstr ""
-"Das ermittelte Zeitfenster für die automatische Beschaffung nach "
-"Durchführung der Fertigungsplanung. Alle Beschaffungsaktionen zwischen heute "
-"und heute + Zeitfenster werden abgebrochen für zukünftige neue "
-"Berechnungen(Beschaffungsdisposition)."
 
 #. module: mrp
-#: field:mrp.workcenter,time_efficiency:0
-msgid "Time Efficiency"
-msgstr "Zeiteffizienz"
-
-#. module: mrp
-#: help:res.company,manufacturing_lead:0
-msgid "Security days for each manufacturing operation."
-msgstr "Sicherheitspuffer (Tage) für Fertigungsauftrag"
-
-#. module: mrp
-#: wizard_view:mrp.procurement.compute.all,init:0
-msgid "Scheduler Parameters"
-msgstr "Zeitplanung Parameter"
-
-#. module: mrp
-#: help:mrp.routing.workcenter,cycle_nbr:0
-msgid "A cycle is defined in the workcenter definition."
+#: field:mrp.product.produce,mode:0
+msgid "Mode"
 msgstr ""
-"Ein Auftragsdurchlauf (Zyklus) wird definiert bei der Definition "
-"desArbeitsplatzes."
 
 #. module: mrp
-#: selection:mrp.workcenter.load,init,measure_unit:0
+#: report:bom.structure:0
+msgid "]"
+msgstr ""
+
+#. module: mrp
+#: help:mrp.routing.workcenter,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of routing workcenters."
+msgstr ""
+
+#. module: mrp
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr ""
+
+#. module: mrp
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero !"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action3
+msgid "Manufacturing Orders in Progress"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action4
+msgid "Manufacturing Orders Waiting Products"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+#: view:mrp.production:0
+#: view:mrp.production.order:0
+#: view:mrp.property:0
+#: view:mrp.routing:0
+#: view:mrp.workcenter:0
+msgid "Group By..."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Cycles Cost"
+msgstr "Auftragszykluskosten"
+
+#. module: mrp
+#: selection:mrp.workcenter.load,measure_unit:0
 msgid "Amount in cycles"
 msgstr "Summe in Auftragsdurchläufen"
 
 #. module: mrp
 #: field:mrp.production,location_dest_id:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,location_dest_id:0
 msgid "Finished Products Location"
 msgstr "Fertigprodukte Lagerort"
 
 #. module: mrp
-#: wizard_field:product.product.procurement,init,uom_id:0
-msgid "Unit of Measure"
-msgstr "Mengeneinheit"
-
-#. module: mrp
-#: field:mrp.procurement,procure_method:0
-msgid "Procurement Method"
-msgstr "Beschaffungsmethode"
+#: model:ir.ui.menu,name:mrp.menu_pm_resources_config
+#: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
+msgid "Resources"
+msgstr ""
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
@@ -988,39 +1110,36 @@ msgid "Analytic Journal"
 msgstr "Analytisches Journal"
 
 #. module: mrp
-#: selection:mrp.workcenter.load,init,time_unit:0
+#: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_workcenter_action
+#: field:mrp.routing,workcenter_lines:0
+msgid "Work Centers"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
 msgid "Per week"
 msgstr "Pro Woche"
 
 #. module: mrp
-#: wizard_button:mrp.procurement.compute,init,compute:0
-#: wizard_button:mrp.procurement.compute.all,init,compute:0
-#: wizard_button:mrp.procurement.orderpoint.compute,init,compute:0
-msgid "Compute Procurements"
-msgstr "Berechne Beschaffungsvorschlag"
+#: model:process.transition,note:mrp.process_transition_stockmts0
+msgid ""
+"The system waits for the products to be available in the stock. These "
+"products are typically procured manually or through a minimum stock rule."
+msgstr ""
 
 #. module: mrp
-#: model:process.node,note:mrp.process_node_stock0
-msgid "Wait for available products for reservation"
-msgstr "Warte auf Reservierung verfügbarer Produkte"
-
-#. module: mrp
-#: wizard_button:change_production_qty,confirm,validate:0
-msgid "Validate"
-msgstr "Validieren"
-
-#. module: mrp
-#: model:process.transition,name:mrp.process_transition_purchaseprocure0
-msgid "Procurement Purchase"
-msgstr "Einkaufsauftrag"
-
-#. module: mrp
-#: field:mrp.production.workcenter.line,hour:0
+#: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
 msgstr "Anz. Stunden"
 
 #. module: mrp
-#: view:mrp.procurement:0
+#: view:mrp.routing:0
+msgid "Work Center Operations"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.routing:0
 msgid "Notes"
 msgstr "Notizen"
 
@@ -1028,18 +1147,20 @@ msgstr "Notizen"
 #: model:ir.model,name:mrp.model_mrp_bom
 #: view:mrp.bom:0
 #: field:mrp.production,bom_id:0
+#: field:mrp.production.order,bom_id:0
+#: model:process.node,name:mrp.process_node_billofmaterial0
 msgid "Bill of Material"
 msgstr "Stückliste"
 
 #. module: mrp
-#: wizard_view:mrp.workcenter.load,init:0
+#: view:mrp.workcenter.load:0
 msgid "Select time unit"
 msgstr "Wähle Zeiteinheit"
 
 #. module: mrp
-#: wizard_field:product_price,init,number:0
-msgid "Number of products to produce"
-msgstr "Produktionsmenge"
+#: view:report.workcenter.load:0
+msgid "Work Center load"
+msgstr ""
 
 #. module: mrp
 #: help:mrp.production,location_dest_id:0
@@ -1047,139 +1168,139 @@ msgid "Location where the system will stock the finished products."
 msgstr "Ort, wo das System die Fertigprodukte lagert."
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
-msgid "Material routing"
-msgstr "Weiterverarbeitung Material"
+#: help:mrp.routing,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the routing "
+"without removing it."
+msgstr ""
 
 #. module: mrp
-#: selection:mrp.workcenter.load,init,time_unit:0
+#: field:stock.change.standard.price,change_parent_price:0
+msgid "Change Parent Price"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_producttostockrules0
+msgid ""
+"The Minimum Stock Rule is an automatic procurement rule based on a mini and "
+"maxi quantity. It's available in the Inventory management menu and "
+"configured by product."
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.workcenter.load,time_unit:0
 msgid "Day by day"
 msgstr "Tag für Tag"
 
-#. module: mrp
-#: model:process.node,name:mrp.process_node_productminimumstockrule0
-msgid "Minimum stock rule"
-msgstr "Minimalbestand Regel"
-
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Revisions"
 msgstr "Revisionen"
 
 #. module: mrp
-#: field:mrp.bom,product_efficiency:0
-msgid "Product Efficiency"
-msgstr "Produkteffizienz"
-
-#. module: mrp
-#: model:ir.model,name:mrp.model_stock_warehouse_orderpoint
-msgid "Orderpoint minimum rule"
-msgstr "Regel Meldebestand"
-
-#. module: mrp
-#: model:process.transition,name:mrp.process_transition_servicemts0
-msgid "Service Make to Stock"
-msgstr "Dienstleistung \"vom Lager\""
-
-#. module: mrp
-#: field:mrp.production,sale_ref:0
-msgid "Sale Ref"
-msgstr "Verkaufsauftrag Ref."
-
-#. module: mrp
-#: field:mrp.procurement,priority:0
 #: field:mrp.production,priority:0
-#: rml:mrp.production.order:0
+#: field:mrp.production.order,priority:0
 msgid "Priority"
 msgstr "Priorität"
 
 #. module: mrp
-#: field:mrp.procurement,location_id:0
-#: field:stock.warehouse.orderpoint,location_id:0
-msgid "Location"
-msgstr "Ort"
+#: model:ir.model,name:mrp.model_stock_picking
+msgid "Picking List"
+msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_procurement_new
-#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_new
-msgid "New Procurement"
-msgstr "Neuer Beschaffungsauftrag"
+#: view:mrp.production.order:0
+msgid "Month -1"
+msgstr ""
 
 #. module: mrp
-#: rml:mrp.production.order:0
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Manufacturing order '%s' is scheduled for the %s."
+msgstr ""
+
+#. module: mrp
+#: report:mrp.production.order:0
 msgid "Production Order N° :"
 msgstr "Fertigungsauftrag Nr.:"
 
 #. module: mrp
-#: selection:mrp.workcenter,type:0
-msgid "Tool"
-msgstr "Werkzeug"
-
-#. module: mrp
-#: help:mrp.production,location_src_id:0
-msgid ""
-"Location where the system will look for products used in raw materials."
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
-"Lagerort in dem nach weiteren Produkten gesucht wird, die in Rohmaterialien "
-"eingesetzt werden."
 
 #. module: mrp
-#: rml:mrp.production.order:0
-#: wizard_field:product.product.procurement,init,date_planned:0
-msgid "Planned Date"
-msgstr "Datum Planung"
+#: model:ir.model,name:mrp.model_mrp_production_product_line
+msgid "Production Scheduled Product"
+msgstr ""
 
 #. module: mrp
-#: model:process.node,note:mrp.process_node_purchaseprocure0
-msgid "Procurement orders"
-msgstr "Beschaffungsauftrag"
+#: help:res.company,manufacturing_lead:0
+msgid "Security days for each manufacturing operation."
+msgstr "Sicherheitspuffer (Tage) für Fertigungsauftrag"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_mts0
+#: model:process.transition,name:mrp.process_transition_servicemts0
+#: model:process.transition,name:mrp.process_transition_stockmts0
 msgid "Make to Stock"
 msgstr "Produziere vom Lager (MtS)"
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_servicemto0
-msgid "If product type is service and procure method is Make to order"
-msgstr "Produkttyp 'Service' und Beschaffungsmethode 'von Auftrag' (MtO)"
+#: selection:mrp.production.order,month:0
+msgid "July"
+msgstr ""
 
 #. module: mrp
-#: field:res.company,schedule_range:0
-msgid "Scheduler Range"
-msgstr "Planungsreichweite"
+#: model:process.transition,note:mrp.process_transition_stockrfq0
+msgid ""
+"In case the Supply method of the product is Buy, the system creates a "
+"purchase order."
+msgstr ""
 
 #. module: mrp
-#: field:stock.warehouse.orderpoint,product_max_qty:0
-msgid "Max Quantity"
-msgstr "Max. Menge"
-
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_procurement
-#: view:mrp.procurement:0
+#: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
 msgstr "Beschaffung"
 
 #. module: mrp
-#: model:ir.actions.wizard,name:mrp.product_procurement_wizard
-msgid "Procurement Request"
-msgstr "Einkaufs Anforderung"
-
-#. module: mrp
-#: model:ir.actions.wizard,name:mrp.wizard_price
+#: model:ir.actions.act_window,name:mrp.action_view_mrp_product_price_wizard
+#: view:mrp.product_price:0
 msgid "Product Cost Structure"
 msgstr "Herstellungskosten"
 
 #. module: mrp
-#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
-msgid "Minimum Stock Procure"
-msgstr "Meldebestandregel"
+#: model:ir.model,name:mrp.model_mrp_installer
+msgid "mrp.installer"
+msgstr ""
 
 #. module: mrp
-#: help:res.company,po_lead:0
-msgid "This is the leads/security time for each purchase order."
+#: view:mrp.production:0
+msgid "Production Work Centers"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production.order:0
+#: field:mrp.production.order,month:0
+msgid "Month"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/wizard/change_production_qty.py:0
+#, python-format
+msgid "Active Id is not found"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Search for mrp workcenter"
 msgstr ""
-"Diese ist die Abwicklungs-/Sicherheitszeit für alle Bestellungen im Einkauf."
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1188,58 +1309,45 @@ msgstr "Stückliste Struktur"
 
 #. module: mrp
 #: field:mrp.production,date_start:0
+#: field:mrp.production.order,date_start:0
 msgid "Start Date"
 msgstr "Startdatum"
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Cost "
+msgstr ""
+
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
 msgid "Hour Account"
 msgstr "Stundenkonto"
 
 #. module: mrp
-#: selection:mrp.bom,revision_type:0
-msgid "alphabetical indices"
-msgstr "Alphabetischer Index"
-
-#. module: mrp
-#: model:process.node,note:mrp.process_node_productionorder0
-msgid "Procurement for raw materials."
-msgstr "Beschaffung von Bauteilen / Rohstoffe"
-
-#. module: mrp
-#: view:mrp.procurement:0
-#: field:mrp.procurement,note:0
-#: rml:mrp.production.order:0
-msgid "Note"
-msgstr "Bemerkung"
-
-#. module: mrp
-#: model:process.transition,name:mrp.process_transition_procurestockableproduct0
-msgid "Procure Stockable Product"
-msgstr "Beschaffe Lagerprodukt"
-
-#. module: mrp
-#: field:mrp.bom,method:0
-msgid "Method"
-msgstr "Methode"
-
-#. module: mrp
-#: wizard_view:product_price,init:0
-msgid "Paid ?"
-msgstr "Bezahlt?"
-
-#. module: mrp
-#: model:process.node,note:mrp.process_node_routing0
-msgid "Define a routing to describe the manufacturing steps."
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Destination Loc."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production.order,product_id2:0
+msgid "Product Consumed"
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Work Cost "
 msgstr ""
-"Definiere einen Arbeitsvorgang um die Schritte der Fertigung zu "
-"dokumentieren."
 
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
-#: field:mrp.workcenter,active:0
-#: field:stock.warehouse.orderpoint,active:0
 msgid "Active"
 msgstr "Aktiv"
 
@@ -1248,49 +1356,52 @@ msgstr "Aktiv"
 msgid "Procure Products"
 msgstr "Beschaffung Produkte"
 
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+msgid "Work Center Loads"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_property_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action_prop
 #: view:mrp.bom:0
 #: field:mrp.bom,property_ids:0
-#: view:mrp.procurement:0
-#: field:mrp.procurement,property_ids:0
 #: view:mrp.property:0
+#: view:procurement.order:0
+#: field:procurement.order,property_ids:0
 msgid "Properties"
 msgstr "Eigenschaften"
 
 #. module: mrp
-#: field:mrp.procurement,date_planned:0
 #: field:mrp.production,date_planned:0
 msgid "Scheduled date"
 msgstr "Geplantes Fertigungsdatum"
 
 #. module: mrp
-#: view:mrp.procurement:0
+#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
+msgid "'Minimum stock rule' material"
+msgstr ""
+
+#. module: mrp
 #: view:mrp.production:0
 msgid "Extra Information"
 msgstr "Extra Information"
 
 #. module: mrp
-#: model:process.node,note:mrp.process_node_billofmaterial0
-msgid "Define the product structure, with sub-products and/or components."
+#: model:ir.model,name:mrp.model_change_production_qty
+msgid "Change Quantity of Products"
 msgstr ""
-"Definiere die Produktstruktur, mit Subprodukten und / oder Komponenten."
 
 #. module: mrp
-#: model:process.node,note:mrp.process_node_minimumstockrule0
-msgid ""
-"Procurement is created if the product quantity is lower than the minimum "
-"limit."
+#: model:process.node,note:mrp.process_node_productionorder0
+msgid "Drives the procurement orders for raw material."
 msgstr ""
-"Beschaffungsauftrag wird erzeugt wenn der Bestand geringer ist als der "
-"Meldebestand."
 
 #. module: mrp
-#: field:mrp.procurement,date_close:0
-msgid "Date Closed"
-msgstr "Datum Ende"
+#: view:mrp.production:0
+#: view:mrp.production.order:0
+msgid "Current"
+msgstr ""
 
 #. module: mrp
 #: field:mrp.workcenter,costs_general_account_id:0
@@ -1298,41 +1409,28 @@ msgid "General Account"
 msgstr "Sachkonto"
 
 #. module: mrp
-#: field:mrp.property,composition:0
-msgid "Properties composition"
-msgstr "Zusammenstellung Eigenschaften"
-
-#. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_production_action4
-#: model:ir.ui.menu,name:mrp.menu_production_orders_waiting4
-msgid "Production Orders Waiting Products"
-msgstr "Fertigungsaufträge (Warteliste)"
-
-#. module: mrp
-#: rml:mrp.production.order:0
+#: report:mrp.production.order:0
 msgid "SO Number"
 msgstr "SO Nummer"
 
 #. module: mrp
-#: model:ir.actions.wizard,name:mrp.wizard_change_production_qty
-msgid "Change Product Qty."
-msgstr "Ändere Menge"
-
-#. module: mrp
-#: selection:mrp.procurement,state:0
 #: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
 msgid "Done"
 msgstr "Erledigt"
 
 #. module: mrp
-#: help:stock.warehouse.orderpoint,qty_multiple:0
-msgid "The procurement quantity will by rounded up to this multiple."
-msgstr "Die Beschaffungsmethode wird aufgerundet auf dieses Vielfache."
+#: model:ir.model,name:mrp.model_stock_change_standard_price
+msgid "Change Standard Price"
+msgstr ""
 
 #. module: mrp
-#: field:stock.warehouse.orderpoint,logic:0
-msgid "Reordering Mode"
-msgstr "Wiederbeschaffungsmodus"
+#: field:mrp.production,origin:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,origin:0
+msgid "Source Document"
+msgstr ""
 
 #. module: mrp
 #: constraint:ir.model:0
@@ -1343,24 +1441,25 @@ msgstr ""
 "beinhalten"
 
 #. module: mrp
-#: model:process.node,note:mrp.process_node_procureproducts0
-msgid "Central document to procure products"
-msgstr "Zentrales Dokument für die Beschaffung"
+#: help:stock.change.standard.price,change_parent_price:0
+msgid ""
+"This will change the price of parent products also according to the BoM "
+"structure specified for the product."
+msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_production_action3
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action3
-msgid "Production Orders in Progress"
-msgstr "Fertigungsaufträge (in Bearbeitung)"
+#: model:ir.actions.act_window,name:mrp.mrp_production_action2
+msgid "Manufacturing Orders To Start"
+msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.act_product_product_2_stock_warehouse_orderpoint
-#: model:ir.actions.act_window,name:mrp.act_stock_warehouse_2_stock_warehouse_orderpoint
-#: model:ir.actions.act_window,name:mrp.action_orderpoint_form
-#: model:ir.ui.menu,name:mrp.menu_action_orderpoint_form
-#: view:stock.warehouse.orderpoint:0
-msgid "Minimum Stock Rules"
-msgstr "Regel Meldebestand"
+#: model:ir.model,name:mrp.model_mrp_workcenter
+#: field:mrp.production.workcenter.line,workcenter_id:0
+#: field:mrp.routing.workcenter,workcenter_id:0
+#: view:mrp.workcenter:0
+#: field:report.workcenter.load,workcenter_id:0
+msgid "Work Center"
+msgstr ""
 
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
@@ -1368,12 +1467,15 @@ msgid "Capacity per Cycle"
 msgstr "Kapazität pro Zyklus"
 
 #. module: mrp
+#: model:ir.model,name:mrp.model_product_product
+#: view:mrp.bom:0
 #: field:mrp.bom,product_id:0
-#: field:mrp.procurement,product_id:0
+#: view:mrp.production:0
 #: field:mrp.production,product_id:0
-#: rml:mrp.production.order:0
+#: report:mrp.production.order:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_id:0
 #: field:mrp.production.product.line,product_id:0
-#: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
 msgstr "Produkt"
 
@@ -1385,30 +1487,54 @@ msgstr "Gesamte Stunden"
 
 #. module: mrp
 #: field:mrp.production,location_src_id:0
+#: field:mrp.production.order,location_src_id:0
 msgid "Raw Materials Location"
 msgstr "Vorräte Lager"
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_product_bom_structure
-msgid "Product BoM Structure"
-msgstr "Produktstruktur"
+#: view:mrp.product_price:0
+msgid "Print Cost Structure of Product."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,product_uos:0
+#: field:mrp.production.product.line,product_uos:0
+msgid "Product UOS"
+msgstr "Produkt UoS"
+
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action
+#: model:ir.actions.act_window,name:mrp.mrp_production_action_planning
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+#: view:mrp.production:0
+msgid "Manufacturing Orders"
+msgstr ""
+
+#. module: mrp
+#: view:mrp.production:0
+msgid "Consume Products"
+msgstr ""
 
 #. module: mrp
 #: field:mrp.bom,product_uom:0
 #: field:mrp.production,product_uom:0
+#: field:mrp.production.order,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
-#: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product UOM"
 msgstr "Produkt ME"
 
 #. module: mrp
-#: help:mrp.procurement,origin:0
-msgid ""
-"Reference of the document that created this procurement.\n"
-"This is automatically completed by Open ERP."
+#: model:process.node,name:mrp.process_node_stock0
+#: model:process.transition,name:mrp.process_transition_servicemto0
+#: model:process.transition,name:mrp.process_transition_stockproduct0
+msgid "Make to Order"
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
+msgid "Production Analysis"
 msgstr ""
-"Referenz des Dokumentes welches diesen Beschaffungsvorgang erzeugt hat.\n"
-"Diese Referenz wird automatisch generiert."
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
@@ -1416,10 +1542,15 @@ msgid "Production Products"
 msgstr "Produktion Fertigwaren"
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_stockproduct0
-msgid "Product type is Stockable and procure method is make to stock"
+#: field:mrp.production,date_finished:0
+#: field:mrp.production.order,date_finished:0
+msgid "End Date"
+msgstr "Endedatum"
+
+#. module: mrp
+#: field:mrp.workcenter,resource_id:0
+msgid "Resource"
 msgstr ""
-"Produkttyp ist 'Lagerprodukt' und Beschaffungsmethode ist 'vom Lager'"
 
 #. module: mrp
 #: help:mrp.bom,date_start:0
@@ -1429,40 +1560,25 @@ msgstr ""
 "Validierung der Stückliste oder Komponente. Lasse leer falls immer valide."
 
 #. module: mrp
-#: field:mrp.procurement,product_uos:0
 #: field:mrp.production,product_uos:0
 msgid "Product UoS"
 msgstr "Produkt UoS"
 
 #. module: mrp
-#: field:mrp.procurement,product_uom:0
-msgid "Product UoM"
-msgstr "Produkt ME"
+#: view:mrp.production.order:0
+msgid "#Line Orders"
+msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_workcenter
-#: field:mrp.production.workcenter.line,workcenter_id:0
-#: field:mrp.routing.workcenter,workcenter_id:0
-#: view:mrp.workcenter:0
-msgid "Workcenter"
-msgstr "Arbeitsplatz"
-
-#. module: mrp
-#: selection:mrp.procurement,priority:0
 #: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
 msgid "Very Urgent"
 msgstr "Sehr dringend"
 
 #. module: mrp
-#: field:mrp.procurement,purchase_id:0
-#: field:stock.warehouse.orderpoint,procurement_id:0
-msgid "Purchase Order"
-msgstr "Beschaffungsauftrag"
-
-#. module: mrp
-#: view:mrp.production:0
-msgid "Production Workcenters"
-msgstr "Fertigung Arbeitsplätze"
+#: view:change.production.qty:0
+msgid "Approve"
+msgstr ""
 
 #. module: mrp
 #: view:mrp.property.group:0
@@ -1470,25 +1586,15 @@ msgid "Properties categories"
 msgstr "Kategorien"
 
 #. module: mrp
-#: help:mrp.procurement,procure_method:0
-msgid ""
-"If you encode manually a procurement, you probably want to use a make to "
-"order method."
+#: help:mrp.production.workcenter.line,sequence:0
+msgid "Gives the sequence order when displaying a list of work orders."
 msgstr ""
-"Falls Sie einen Beschaffungsauftrag manuell erfassen möchten Sie eventuell "
-"Gebrauch machen von einer bestimmten Beschaffungsmethode (z.B. aus "
-"Bestellung - MtO)."
 
 #. module: mrp
-#: rml:mrp.production.order:0
+#: report:mrp.production.order:0
 msgid "Source Location"
 msgstr "Quelle"
 
-#. module: mrp
-#: model:process.transition,name:mrp.process_transition_servicerfq0
-msgid "Stockable Order Request"
-msgstr "Lagerprodukt Beschaffungsanfrage"
-
 #. module: mrp
 #: view:mrp.production:0
 #: view:mrp.production.product.line:0
@@ -1501,24 +1607,33 @@ msgid "Production Products Consommation"
 msgstr "Fertigwaren Verbrauch"
 
 #. module: mrp
-#: selection:mrp.bom,revision_type:0
-msgid "numeric indices"
-msgstr "Numerischer Index"
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Total Cost "
+msgstr ""
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_servicerfq0
-msgid "If Procure method is Make to order and supply method is buy"
-msgstr "Falls Beschaffungsmethode 'vom Lager' und Einkaufsmethode 'Kauf'"
+#: help:mrp.workcenter,note:0
+msgid ""
+"Description of the workcenter. Explain here what's a cycle according to this "
+"workcenter."
+msgstr ""
+"Beschreibung des Arbeitsplatzes. Beschreibe hier den Vorgang dieses "
+"Arbeitsplatzes für den gesamten Auftragszyklus."
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_procurestockableproduct0
-msgid "if Product type is Stockable in procurement order"
-msgstr "Falls Typ Lagerprodukt in Beschaffungsauftrag"
+#: help:mrp.product.produce,mode:0
+msgid ""
+"'Consume only' mode will only consume the products with the quantity "
+"selected.\n"
+"'Consume & Produce' mode will consume as well as produce the products with "
+"the quantity selected and it will finish the production order when total "
+"ordered quantities are produced."
+msgstr ""
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_production_workcenter_line
 #: view:mrp.production:0
-#: rml:mrp.production.order:0
+#: report:mrp.production.order:0
 msgid "Work Orders"
 msgstr "Arbeitsaufträge"
 
@@ -1528,38 +1643,46 @@ msgid "Cost per cycle"
 msgstr "Kosten pro Zyklus"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of material revisions"
-msgstr "Stückliste Revisionen"
+#: model:process.node,name:mrp.process_node_serviceproduct0
+#: model:process.node,name:mrp.process_node_serviceproduct1
+msgid "Service"
+msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-msgid "Planification"
-msgstr "Planung"
+#: selection:mrp.production,state:0
+#: selection:mrp.production.order,state:0
+msgid "Cancelled"
+msgstr ""
 
 #. module: mrp
-#: rml:bom.structure:0
-#: model:process.transition,name:mrp.process_transition_bom0
+#: view:mrp.production.order:0
 msgid "BOM"
 msgstr "Stückliste"
 
 #. module: mrp
-#: help:mrp.bom,type:0
+#: help:mrp.bom,product_uom:0
 msgid ""
-"Use a phantom bill of material in raw materials lines that have to be "
-"automatically computed in on eproduction order and not one per level.If you "
-"put \"Phantom/Set\" at the root level of a bill of material it is considered "
-"as a set or pack: the products are replaced by the components between the "
-"sale order to the picking without going through the production order.The "
-"normal BoM will generate one production order per BoM level."
+"UoM (Unit of Measure) is the unit of measurement for the inventory control"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_bom0
+msgid ""
+"The Bill of Material is the product's decomposition. The components (that "
+"are products themselves) can also have their own Bill of Material (multi-"
+"level)."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,company_id:0
+#: field:mrp.production,company_id:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,company_id:0
+#: field:mrp.routing,company_id:0
+#: field:mrp.routing.workcenter,company_id:0
+#: view:mrp.workcenter:0
+msgid "Company"
 msgstr ""
-"Benutze Phantom Stückliste für Zukaufpositionen die automatisch über einen "
-"einzigen Fertigungsauftrag berechnet werden müssen und nicht einzeln per "
-"Fertigungsstufe. Falls Sie Phantom als Grundebene einer BoM setzen wird ein "
-"Set oder Paket angenommen: Die Produkte werden ersetzt durch Ihre "
-"Komponenten zwischen Verkaufsauftrag und Versandverpackung ohne einen "
-"Produktionsauftrag zu durchlaufen. Die normale BoM würde einen "
-"Produktionsauftrag pro Fertigungsstufe erzeugen."
 
 #. module: mrp
 #: field:mrp.workcenter,time_cycle:0
@@ -1567,16 +1690,7 @@ msgid "Time for 1 cycle (hour)"
 msgstr "Zeit für 1 Zyklus (in Stunden)"
 
 #. module: mrp
-#: wizard_view:product.product.procurement,done:0
-msgid "Your procurement request has been sent !"
-msgstr "Ihre Beschaffungsanfrage wurde versendet !"
-
-#. module: mrp
-#: wizard_view:product.product.procurement,init:0
-msgid "Internal Procurement Request"
-msgstr "Interne Beschaffungsanfrage"
-
-#. module: mrp
+#: model:ir.actions.act_window,name:mrp.action_report_mrp_production_order
 #: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
 #: field:mrp.production.product.line,production_id:0
 #: field:mrp.production.workcenter.line,production_id:0
@@ -1585,44 +1699,47 @@ msgstr "Interne Beschaffungsanfrage"
 msgid "Production Order"
 msgstr "Fertigungsauftrag"
 
+#. module: mrp
+#: help:mrp.production,routing_id:0
+msgid ""
+"The list of operations (list of workcenters) to produce the finished "
+"product. The routing is mainly used to compute workcenter costs during "
+"operations and to plan future loads on workcenters based on production "
+"plannification."
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_productminimumstockrule0
+msgid "Automatic procurement rule"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Compute Data"
 msgstr "Berechne Daten"
 
-#. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_property_group_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
-msgid "Property Categories"
-msgstr "Kategorien"
-
-#. module: mrp
-#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc1
-#: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc1
-msgid "Compute Procurements Only"
-msgstr "Auftragsbezogene Beschaffungsvorschläge"
-
 #. module: mrp
 #: field:mrp.production,product_uos_qty:0
 msgid "Product UoS Qty"
 msgstr "Proukt Verkaufseinheit"
 
 #. module: mrp
-#: rml:bom.structure:0
+#: view:mrp.bom:0
+msgid "Components"
+msgstr ""
+
+#. module: mrp
+#: report:bom.structure:0
 #: model:ir.actions.report.xml,name:mrp.report_bom_structure
 msgid "BOM Structure"
 msgstr "Stückliste Struktur"
 
 #. module: mrp
-#: field:mrp.bom,date_stop:0
-msgid "Valid Until"
-msgstr "Gültig bis"
-
-#. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_procurement_action11
-#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action11
-msgid "Temporary Procurement Exceptions"
-msgstr "Temporäre Fehlerliste"
+#: help:mrp.workcenter,capacity_per_cycle:0
+msgid ""
+"Number of operations this workcenter can do in parallel. If this workcenter "
+"represents a team of 5 workers, the capacity per cycle is 5."
+msgstr ""
 
 #. module: mrp
 #: field:mrp.bom,date_start:0
@@ -1634,6 +1751,11 @@ msgstr "Gültig ab"
 msgid "Normal BoM"
 msgstr "Normale Stückliste"
 
+#. module: mrp
+#: field:res.company,manufacturing_lead:0
+msgid "Manufacturing Lead Time"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,product_uos_qty:0
 #: field:mrp.production.product.line,product_uos_qty:0
@@ -1641,34 +1763,19 @@ msgid "Product UOS Qty"
 msgstr "Produkt Menge (UoS)"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-msgid "Confirmed"
-msgstr "Bestätigt"
+#: field:mrp.bom,date_stop:0
+msgid "Valid Until"
+msgstr "Gültig bis"
 
 #. module: mrp
-#: wizard_view:mrp.procurement.compute,init:0
-#: wizard_view:mrp.procurement.orderpoint.compute,init:0
-msgid "Parameters"
-msgstr "Parameter"
-
-#. module: mrp
-#: view:mrp.procurement:0
+#: view:mrp.product.produce:0
 msgid "Confirm"
 msgstr "Gebucht"
 
 #. module: mrp
-#: field:mrp.production,workcenter_lines:0
-msgid "Workcenters Utilisation"
-msgstr "Arbeitsplatz Auslastung"
-
-#. module: mrp
-#: help:mrp.bom,product_efficiency:0
-msgid ""
-"Efficiency on the production. A factor of 0.9 means a loss of 10% in the "
-"production."
+#: field:mrp.bom,product_efficiency:0
+msgid "Manufacturing Efficiency"
 msgstr ""
-"Effektivität der Produktion. Ein Faktor von 0.9 bedeutet 10% weniger "
-"Leistung gegenüber der 100% Vorgabe."
 
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
@@ -1676,19 +1783,47 @@ msgid "Product Rounding"
 msgstr "Produkt Rundung"
 
 #. module: mrp
+#: model:ir.model,name:mrp.model_mrp_production_workcenter_line
 #: field:mrp.production.workcenter.line,name:0
 msgid "Work Order"
 msgstr "Arbeits Auftrag"
 
+#. module: mrp
+#: selection:mrp.product.produce,mode:0
+msgid "Consume Only"
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Recreate Picking"
 msgstr "Wiederherstellung Packliste"
 
 #. module: mrp
-#: model:process.node,note:mrp.process_node_serviceonorder0
-msgid "If procurement is make to order"
-msgstr "Falls Beschaffung 'von Auftrag'"
+#: help:mrp.bom,type:0
+msgid ""
+"If a sub-product is used in several products, it can be useful to create its "
+"own BoM. Though if you don't want separated production orders for this sub-"
+"product, select Set/Phantom as BoM type. If a Phantom BoM is used for a root "
+"product, it will be sold and shipped as a set of components, instead of "
+"being produced."
+msgstr ""
+
+#. module: mrp
+#: field:mrp.bom,method:0
+msgid "Method"
+msgstr "Methode"
+
+#. module: mrp
+#: help:mrp.production,state:0
+msgid ""
+"When the production order is created the state is set to 'Draft'.\n"
+" If the order is confirmed the state is set to 'Waiting Goods'.\n"
+" If any exceptions are there, the state is set to 'Picking Exception'.       "
+"                             \n"
+"If the stock is available then the state is set to 'Ready to Produce'.\n"
+" When the production gets started then the state is set to 'In Production'.\n"
+" When the production is over, the state is set to 'Done'."
+msgstr ""
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -1696,15 +1831,10 @@ msgid "On Order"
 msgstr "von Auftrag"
 
 #. module: mrp
-#: model:process.node,name:mrp.process_node_minimumstockrule0
-msgid "Minimum Stock Rule"
-msgstr "Meldebestandsregelung"
-
-#. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action_new
-#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action_new
-msgid "New Bill of Materials"
-msgstr "Neue Stückliste"
+#: model:ir.ui.menu,name:mrp.menu_mrp_configuration
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Konfiguration"
 
 #. module: mrp
 #: field:mrp.workcenter,time_stop:0
@@ -1712,7 +1842,7 @@ msgid "Time after prod."
 msgstr "Abrüstzeit"
 
 #. module: mrp
-#: wizard_field:mrp.workcenter.load,init,time_unit:0
+#: field:mrp.workcenter.load,time_unit:0
 msgid "Type of period"
 msgstr "Typ Zeitraum"
 
@@ -1727,15 +1857,24 @@ msgid "Number of Hours"
 msgstr "Gesamtstunden"
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_procurement_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action
+#: model:process.node,name:mrp.process_node_purchaseprocure0
 msgid "Procurement Orders"
 msgstr "Beschaffungsaufträge"
 
 #. module: mrp
-#: model:ir.model,name:mrp.model_mrp_property
-msgid "Property"
-msgstr "Eigenschaft"
+#: help:mrp.bom,product_rounding:0
+msgid "Rounding applied on the product quantity."
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
+msgid "Working Period"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stock0
+msgid "Assignment from Production or Purchase Order."
+msgstr ""
 
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
@@ -1748,54 +1887,40 @@ msgid "Time in hours for the setup."
 msgstr "Zeit in Stunden für Setup"
 
 #. module: mrp
-#: selection:mrp.production,state:0
-msgid "Canceled"
-msgstr "Abgebrochen"
+#: selection:mrp.production.order,month:0
+msgid "December"
+msgstr ""
 
 #. module: mrp
-#: selection:mrp.property,composition:0
-msgid "plus"
-msgstr "Plus"
+#: field:mrp.installer,config_logo:0
+msgid "Image"
+msgstr ""
 
 #. module: mrp
 #: field:mrp.bom.revision,bom_id:0
-#: field:mrp.procurement,bom_id:0
+#: field:procurement.order,bom_id:0
 msgid "BoM"
 msgstr "Stückliste"
 
 #. module: mrp
-#: help:mrp.bom,routing_id:0
-msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan futur loads on workcenters based on production "
-"plannification."
+#: model:ir.model,name:mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr "Lagerwert Veränderungen"
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_mts0
+#: model:process.node,note:mrp.process_node_servicemts0
+msgid "Assignment from stock."
 msgstr ""
-"Arbeitsplätze, an denen Fertigprodukte produziert werden. Das \"Routing\" "
-"wird für die Berechnung der Kosten der Arbeitsplätze und für die Auslastung "
-"aufgrund der Produktionsplanung verwendet."
 
 #. module: mrp
 #: selection:mrp.production,state:0
+#: view:mrp.production.order:0
+#: selection:mrp.production.order,state:0
 msgid "Waiting Goods"
 msgstr "Warenzugang"
 
-#. module: mrp
-#: model:process.process,name:mrp.process_process_stockableproductprocess0
-msgid "Stockable Product Process"
-msgstr "Lagerfähiges Produkt Prozess"
-
-#. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_production_new
-#: model:ir.ui.menu,name:mrp.menu_production_orders_new
-msgid "New Production Order"
-msgstr "Neuer Fertigungsauftrag"
-
-#. module: mrp
-#: model:process.node,note:mrp.process_node_rfq0
-msgid "A Request for Quotation is created and sent to the supplier."
-msgstr "Eine Angebotsanfrage wurde erzeugt und an den Lieferanten versendet."
-
 #. module: mrp
 #: field:mrp.bom.revision,last_indice:0
 msgid "last indice"
@@ -1808,79 +1933,101 @@ msgid "BoM Revisions"
 msgstr "Stücklisten Revision"
 
 #. module: mrp
-#: view:mrp.procurement:0
-msgid "Retry"
-msgstr "Wiederhole"
-
-#. module: mrp
-#: selection:mrp.procurement,state:0
+#: view:mrp.production:0
 #: selection:mrp.production,state:0
+#: selection:mrp.production.order,state:0
 msgid "Draft"
 msgstr "Entwurf"
 
 #. module: mrp
-#: selection:mrp.procurement,priority:0
+#: field:report.mrp.inout,date:0
+#: field:report.workcenter.load,name:0
+msgid "Week"
+msgstr "Woche"
+
+#. module: mrp
+#: field:mrp.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: mrp
 #: selection:mrp.production,priority:0
+#: selection:mrp.production.order,priority:0
 msgid "Normal"
 msgstr "Normal"
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_productionprocureproducts0
-msgid "When any procuere products, it comes into the prpcurement orders"
+#: model:process.node,note:mrp.process_node_routing0
+msgid "Manufacturing Steps."
 msgstr ""
-"Wenn Beschaffungsvorschlag erstellt wird landet dieser in einem "
-"Beschaffungsauftrag."
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_production_action2
-#: model:ir.ui.menu,name:mrp.menu_production_orders_start
-msgid "Production Orders To Start"
-msgstr "Fertigungsaufträge (Startbereit)"
+#: code:addons/mrp/report/price.py:0
+#, python-format
+msgid "Cost Structure"
+msgstr ""
 
 #. module: mrp
-#: view:mrp.procurement:0
-msgid "Procurement Reason"
-msgstr "Begründung Beschaffung"
+#: selection:mrp.product.produce,mode:0
+msgid "Consume & Produce"
+msgstr ""
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
-msgid "An entry is being made from billing material to routing."
-msgstr "Ein Eintrag wird erzeugt durch Berechnung des eingesetzten Materials"
+#: selection:mrp.production.order,month:0
+msgid "November"
+msgstr ""
 
 #. module: mrp
-#: help:mrp.workcenter,timesheet_id:0
-msgid "The normal working time of the workcenter."
-msgstr "Normale Arbeitszeit des Arbeitsplatzes."
+#: field:mrp.bom,bom_id:0
+msgid "Parent BoM"
+msgstr "(Ober-) Stückliste"
 
 #. module: mrp
-#: selection:stock.warehouse.orderpoint,logic:0
-msgid "Order to Max"
-msgstr "Beschaffung bis Max. Menge"
+#: field:mrp.workcenter.load,measure_unit:0
+msgid "Amount measuring unit"
+msgstr "Menge (ME)"
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "January"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_stockproduct0
+msgid "Product type is Stockable or Consumable."
+msgstr ""
+
+#. module: mrp
+#: code:addons/mrp/mrp.py:0
+#: code:addons/mrp/wizard/change_production_qty.py:0
+#, python-format
+msgid "Error"
+msgstr "Fehler"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
-#: model:process.node,name:mrp.process_node_billofmaterial0
+#: field:product.product,bom_ids:0
 msgid "Bill of Materials"
 msgstr "Produktstückliste"
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_procureserviceproduct0
-msgid "In procurement order, if product type is service"
-msgstr "In Beschaffungsvorschlag, wenn Produkttyp \"Service\""
+#: help:mrp.routing.workcenter,routing_id:0
+msgid ""
+"Routing indicates all the workcenters used, for how long and/or cycles.If "
+"Routing is indicated then,the third tab of a production order (workcenters) "
+"will be automatically pre-completed."
+msgstr ""
 
 #. module: mrp
-#: selection:mrp.procurement,procure_method:0
-msgid "from stock"
-msgstr "vom Lager"
+#: model:ir.model,name:mrp.model_mrp_bom_revision
+msgid "Bill of Material Revision"
+msgstr ""
 
 #. module: mrp
-#: view:mrp.bom:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: view:mrp.routing:0
 #: view:mrp.routing.workcenter:0
+#: view:mrp.workcenter:0
 msgid "General Information"
 msgstr "Grundinformation"
 
@@ -1890,55 +2037,72 @@ msgid "Productions"
 msgstr "Produktion"
 
 #. module: mrp
-#: wizard_button:product.product.procurement,done,end:0
-msgid "Close"
-msgstr "Fertig"
+#: model:ir.model,name:mrp.model_mrp_routing
+#: view:mrp.bom:0
+#: field:mrp.bom,routing_id:0
+#: view:mrp.production:0
+#: field:mrp.production,routing_id:0
+#: field:mrp.production.order,routing_id:0
+#: view:mrp.routing:0
+#: model:process.node,name:mrp.process_node_routing0
+msgid "Routing"
+msgstr "Reihenfolge Arbeitsvorgänge"
 
 #. module: mrp
-#: field:mrp.production,sale_name:0
-msgid "Sale Name"
-msgstr "Verkauf Bezeichnung"
+#: field:mrp.installer,mrp_operations:0
+msgid "Manufacturing Operations"
+msgstr ""
 
 #. module: mrp
-#: model:process.node,note:mrp.process_node_productminimumstockrule0
-msgid "Create minimum stock rules"
-msgstr "Erzeuge Minimalbestandsregel"
+#: help:mrp.production,origin:0
+msgid ""
+"Reference of the document that generated this production order request."
+msgstr ""
 
 #. module: mrp
-#: wizard_field:product.product.procurement,init,warehouse_id:0
-#: field:stock.warehouse.orderpoint,warehouse_id:0
-msgid "Warehouse"
-msgstr "Zentrallager"
-
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_production
+#: view:mrp.production.order:0
 #: field:stock.move,production_id:0
 msgid "Production"
 msgstr "Produktionsstätte"
 
 #. module: mrp
-#: model:process.node,name:mrp.process_node_serviceproduct0
-#: model:process.node,name:mrp.process_node_serviceproduct1
-msgid "Service Product"
-msgstr "Dienstleistungen Produkt"
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr ""
 
 #. module: mrp
-#: field:mrp.procurement,close_move:0
-msgid "Close Move at end"
-msgstr "Beende Warenfluss (Ende)"
+#: model:ir.model,name:mrp.model_mrp_product_price
+msgid "Product Price"
+msgstr ""
 
 #. module: mrp
-#: wizard_view:change_production_qty,confirm:0
+#: model:ir.actions.act_window,name:mrp.action_mrp_installer
+msgid "MRP Applications Configuration"
+msgstr ""
+
+#. module: mrp
+#: model:ir.model,name:mrp.model_stock_move_split
+msgid "Split in Production lots"
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+msgid "Change Quantity"
+msgstr ""
+
+#. module: mrp
+#: view:change.production.qty:0
+#: model:ir.actions.act_window,name:mrp.action_change_production_qty
 msgid "Change Product Qty"
 msgstr "Ändere Menge"
 
 #. module: mrp
+#: view:mrp.bom.revision:0
 #: field:mrp.bom.revision,description:0
 #: view:mrp.property:0
-#: field:mrp.property,description:0
-#: field:mrp.property.group,description:0
-#: view:mrp.routing:0
+#: view:mrp.property.group:0
 #: field:mrp.routing,note:0
+#: view:mrp.routing.workcenter:0
 #: field:mrp.routing.workcenter,note:0
 #: view:mrp.workcenter:0
 #: field:mrp.workcenter,note:0
@@ -1946,31 +2110,61 @@ msgid "Description"
 msgstr "Beschreibung"
 
 #. module: mrp
-#: selection:mrp.procurement,state:0
-msgid "Running"
-msgstr "In Weiterbearbeitung"
+#: help:mrp.bom,routing_id:0
+msgid ""
+"The list of operations (list of workcenters) to produce the finished "
+"product. The routing is mainly used to compute workcenter costs during "
+"operations and to plan future loads on workcenters based on production "
+"planning."
+msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_root
+#: view:board.board:0
+msgid "Manufacturing board"
+msgstr ""
+
+#. module: mrp
+#: field:mrp.production,date_planned_end:0
+msgid "Scheduled End Date"
+msgstr ""
+
+#. module: mrp
+#: model:process.node,note:mrp.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr ""
+
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
 msgid "Manufacturing"
 msgstr "Fertigung"
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_procurement_action3
-#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action3
-msgid "Unscheduled procurements"
-msgstr "Beschaffungsauftragsliste"
+#: view:board.board:0
+msgid "Next Production Orders"
+msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_bom_tree_action
-#: model:ir.ui.menu,name:mrp.menu_bom_tree
-msgid "Bill of Material Structure"
-msgstr "Stückliste Struktur"
+#: selection:mrp.production.order,month:0
+msgid "February"
+msgstr ""
 
 #. module: mrp
-#: model:ir.actions.wizard,name:mrp.wizard_workcenter_load
-msgid "Workcenter load"
-msgstr "Arbeitsplatz Auslastung"
+#: model:ir.actions.act_window,name:mrp.mrp_property_group_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_property_group_action
+msgid "Property Groups"
+msgstr ""
+
+#. module: mrp
+#: selection:mrp.production.order,month:0
+msgid "April"
+msgstr ""
+
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_procurestockableproduct0
+msgid ""
+"Depending on the chosen method to supply the stockable products, the "
+"procurement order creates a RFQ, a production order, ... "
+msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,time_stop:0
@@ -1978,20 +2172,24 @@ msgid "Time in hours for the cleaning."
 msgstr "Zeitaufwand in Stunden für die Reinigung."
 
 #. module: mrp
-#: view:mrp.procurement:0
-msgid "Procurement Details"
-msgstr "Beschaffungsvorschläge Details"
-
-#. module: mrp
-#: model:process.transition,note:mrp.process_transition_bom0
-msgid "You can see its bill of material which are used to make product"
+#: model:process.transition,name:mrp.process_transition_purchaseprocure0
+msgid "Automatic RFQ"
 msgstr ""
-"Sie können die Stückliste für die Fertigung dieses Produktes einsehen."
 
 #. module: mrp
-#: field:mrp.production,date_planned_end:0
-msgid "Scheduled End"
-msgstr "Geplantes Ende"
+#: model:process.transition,note:mrp.process_transition_servicemto0
+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
+msgid ""
+"In order to supply raw material (to be purchased or produced), the "
+"production order creates as much procurement orders as components listed in "
+"the BOM, through a run of the schedulers (MRP)."
+msgstr ""
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -2000,67 +2198,718 @@ msgstr "auf Lager"
 
 #. module: mrp
 #: field:mrp.bom,sequence:0
-#: rml:mrp.production.order:0
+#: report:mrp.production.order:0
 #: field:mrp.production.workcenter.line,sequence:0
 #: field:mrp.routing.workcenter,sequence:0
 msgid "Sequence"
 msgstr "Sequenz"
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
-#: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
-msgid "Bill of Materials Components"
-msgstr "Komponenten"
+#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
+msgid "Resource Leaves"
+msgstr ""
 
 #. module: mrp
-#: field:report.mrp.inout,date:0 field:report.workcenter.load,name:0
-msgid "Week"
-msgstr "Woche"
+#: help:mrp.bom,sequence:0
+msgid "Gives the sequence order when displaying a list of bills of material."
+msgstr ""
 
 #. module: mrp
-#: model:ir.ui.menu,name:mrp.next_id_77
-msgid "Reporting"
-msgstr "Berichtswesen"
+#: view:mrp.production:0
+#: field:mrp.production,move_lines:0
+#: report:mrp.production.order:0
+#: field:mrp.production.order,products_to_consume:0
+msgid "Products to Consume"
+msgstr ""
 
 #. module: mrp
-#: view:report.workcenter.load:0
-msgid "Workcenters load"
-msgstr "Arbeitsplatz Auslastung"
+#: view:mrp.production.order:0
+#: field:mrp.production.order,year:0
+msgid "Year"
+msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_report_workcenter_load
-msgid "Workcenter Load"
-msgstr "Arbeitsplatz Auslastung"
+#~ msgid "-"
+#~ msgstr "-"
 
-#. module: mrp
-#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
-msgid "MRP Management - Reporting"
-msgstr "Reporting Materialbeschaffungsplanung (MRP)"
+#~ msgid "Production Workcenters"
+#~ msgstr "Fertigung Arbeitsplätze"
 
-#. module: mrp
-#: field:report.mrp.inout,value:0
-msgid "Stock value"
-msgstr "Lagerwert Veränderungen"
+#~ msgid "Service on Order"
+#~ msgstr "Leistung auf Bestellung"
 
-#. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
-#: model:ir.ui.menu,name:mrp.menu_report_workcenter_load
-msgid "Workcenter Loads"
-msgstr "Arbeitsplatz Auslastung"
+#~ msgid "Do nothing"
+#~ msgstr "Keine Aktion"
 
-#. module: mrp
-#: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
-#: model:ir.ui.menu,name:mrp.menu_report_in_out_picking
-msgid "Weekly Stock Value Variation"
-msgstr "Wöchentliche Lagerbewertung (Veränderung)"
+#~ msgid ""
+#~ "Triggers an automatic procurement for all products that have a virtual stock "
+#~ "under 0. You should probably not use this option, we suggest using a MTO "
+#~ "configuration on products."
+#~ msgstr ""
+#~ "Triggert einen automatischen Beschaffungsvorschlag für alle Produkte mit "
+#~ "virtuellem Lager unter \"0\". Idealerweise arbeitet man allerdings mit "
+#~ "Lagerbestandsregeln."
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_report_mrp_inout
-#: view:report.mrp.inout:0
-msgid "Stock value variation"
-msgstr "Lagerwert Veränderungen"
+#~ msgid "Compute Stock Minimum Rules Only"
+#~ msgstr "Regelbasierte Beschaffungsvorschläge"
 
-#. module: mrp
-#: view:board.board:0
-msgid "Next production orders"
-msgstr "Nächste Produktionsaufträge"
+#~ msgid "Exceptions Procurements"
+#~ msgstr "Fehlerliste Beschaffung"
+
+#~ msgid "UoS Quantity"
+#~ msgstr "Menge (UOS)"
+
+#~ msgid "Routing Workcenters"
+#~ msgstr "Definition Arbeitsgänge"
+
+#~ msgid "Not used in computations, for information purpose only."
+#~ msgstr "Keine Verwendung in Berechnungen, nur zur Info"
+
+#~ msgid "Packing list"
+#~ msgstr "Packliste"
+
+#~ msgid "Stockable Stock"
+#~ msgstr "Bestand Lagerprodukte"
+
+#~ msgid "Origin"
+#~ msgstr "Bezug"
+
+#~ msgid "Automatic orderpoint"
+#~ msgstr "Automatischer Bestellvorschlag"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "Diese Tage werden aus Sicherheitsgründen addiert zur versprochenen "
+#~ "Auslieferungszeit (an den Kunden)."
+
+#~ msgid "Best price (not yet active!)"
+#~ msgstr "Günstigster Preis (noch nicht aktiv!)"
+
+#~ msgid "Product & Location"
+#~ msgstr "Produkt & Lagerort"
+
+#~ msgid "MRP & Logistic Scheduler"
+#~ msgstr "Fertigungs- und Beschaffungsplanung"
+
+#~ msgid ""
+#~ "Number of operation this workcenter can do in parallel. If this workcenter "
+#~ "represent a team of 5 workers, the capacity per cycle is 5."
+#~ msgstr ""
+#~ "Anzahl paralleler Durchführungen dieses Arbeitsplatzes. Falls Arbeitsplatz "
+#~ "ein Team von 5 Mitarbeitern repräsentiert ist die Kapazität per Zyklus 5."
+
+#~ msgid "Ask New Products"
+#~ msgstr "Anfrage neue Produkte"
+
+#~ msgid "Automatic Procurements"
+#~ msgstr "Beschaffungsvorschlag"
+
+#~ msgid "Products Consummed"
+#~ msgstr "Produkte Verbrauchswaren"
+
+#~ msgid "Packing Exception"
+#~ msgstr "Packvorgang Fehlerliste"
+
+#~ msgid "A purchase order is created for a sub-contracting demand."
+#~ msgstr "Ein Beschaffungsauftrag wird angelegt für einen Sub-Auftragnehmer"
+
+#~ msgid "Analytic Accounting"
+#~ msgstr "Auswertungen Analysekonten"
+
+#~ msgid "If the stock of a product is under 0, it will act like an orderpoint"
+#~ msgstr ""
+#~ "Falls der Lagerbestand eines Produktes unter 0 geht, wird agiert wie bei "
+#~ "einer Bestandsregel"
+
+#~ msgid "you can see the minimum stock rules from product"
+#~ msgstr "Einblick in die Regel für den Minimalbestand über die Produktseite"
+
+#~ msgid "This wizard will schedule procurements."
+#~ msgstr "Dieser Assistent berechnet die Beschaffungsvorschläge."
+
+#~ msgid "Internal Ref."
+#~ msgstr "Interne Referenz"
+
+#~ msgid "Status"
+#~ msgstr "Status"
+
+#~ msgid "Stockable Production Order"
+#~ msgstr "Fertigungsauftrag Lagerprodukt"
+
+#~ msgid "Stockable Request"
+#~ msgstr "Lagerbestandsprüfung"
+
+#~ msgid ""
+#~ "When the virtual stock goes belong the Min Quantity, Open ERP generates a "
+#~ "procurement to bring the virtual stock to the Max Quantity."
+#~ msgstr ""
+#~ "Wenn der virtuelle Bestand unter den Min. Bestand geht, wird ein "
+#~ "Beschaffungsauftrag erzeugt, der den virtuellen Lagerbestand auf die Max. "
+#~ "Anzahl bringt."
+
+#~ msgid "Stockable Make to Stock"
+#~ msgstr "Lagerproduktion \"vom Lager\""
+
+#~ msgid "Production Orders"
+#~ msgstr "Fertigungsaufträge"
+
+#~ msgid "Procure Service Product"
+#~ msgstr "Beschaffung Dienstleistungsprodukt"
+
+#~ msgid "Procurements"
+#~ msgstr "Beschaffungsvorgänge"
+
+#~ msgid "Production scheduled products"
+#~ msgstr "Fertigungsaufträge nach Produkten"
+
+#~ msgid "Working Time"
+#~ msgstr "Arbeitszeit"
+
+#~ msgid "Details"
+#~ msgstr "Details"
+
+#~ msgid "Procurement Process"
+#~ msgstr "Einkaufs Prozess"
+
+#~ msgid ""
+#~ "Rounding applied on the product quantity. For integer only values, put 1.0"
+#~ msgstr ""
+#~ "Rundung bezieht sich auf Produktmenge. Für Zahlentyp integer trage 1.0 ein."
+
+#~ msgid "Reservation"
+#~ msgstr "Reservierung"
+
+#~ msgid "product"
+#~ msgstr "Produkt"
+
+#~ msgid "max"
+#~ msgstr "max"
+
+#~ msgid "Product to stock rules"
+#~ msgstr "Regelung Einlagerung Produkte"
+
+#~ msgid "Print product price"
+#~ msgstr "Druck Preisliste"
+
+#~ msgid "Make Procurement"
+#~ msgstr "Erzeuge Beschaffung"
+
+#~ msgid "If Procure method is Make to order and supply method is produce"
+#~ msgstr ""
+#~ "Falls Beschaffungsmethode 'aus Auftrag' und Einkaufsmethode 'Produktion'"
+
+#~ msgid "Purchase Lead Time"
+#~ msgstr "Beschaffungszeit (Lieferant)"
+
+#~ msgid "Stockable Product Stock"
+#~ msgstr "Bestand Lagerprodukt"
+
+#~ msgid "Production Procure Products"
+#~ msgstr "Fertigung Beschaffung Produkte"
+
+#~ msgid "Service Product Process"
+#~ msgstr "Dienstleistung Prozess"
+
+#~ msgid "Procurement convert into the draft purchase order."
+#~ msgstr ""
+#~ "Beschaffungsvorschlag erzeugt einen Beschaffungsauftrag im Stadium Entwurf."
+
+#~ msgid "Latest error"
+#~ msgstr "Letzte Fehlermeldung"
+
+#~ msgid "Routing workcenter usage"
+#~ msgstr "Reihenfolge Arbeitsplatzbelegung"
+
+#~ msgid "If Product type is Stockable and procure method is make to stock"
+#~ msgstr ""
+#~ "Falls Produkttyp = Lagerprodukt und Beschaffungsmethode 'vom Lager' (Make to "
+#~ "Stock - MtS)"
+
+#~ msgid "Manufacturity Lead Time"
+#~ msgstr "Aufrüstzeiten"
+
+#~ msgid "Exceptions Procurements to Fix"
+#~ msgstr "Fehler Beschaffung"
+
+#~ msgid "Ready"
+#~ msgstr "Fertig"
+
+#~ msgid "Workcenter Operations"
+#~ msgstr "Arbeitsplatz Vorgangsliste"
+
+#~ msgid "Production Orders Planning"
+#~ msgstr "Fertigungsauftragsplanung"
+
+#~ msgid "Factor that multiplies all times expressed in the workcenter."
+#~ msgstr ""
+#~ "Faktor der alle angefallenen Zeiten dieses Arbeitsplatzes multipliziert."
+
+#~ msgid ""
+#~ "This is the internal picking list take bring the raw materials to the "
+#~ "production plan."
+#~ msgstr ""
+#~ "Diese interne Packliste liefert die Rohmaterialien zum Fertigungsort "
+#~ "(Bereitstellung)"
+
+#~ msgid "Qty Multiple"
+#~ msgstr "Menge Multiple"
+
+#~ msgid "Waiting"
+#~ msgstr "Warteliste"
+
+#~ msgid "For stockable and consumable"
+#~ msgstr "Für Lager- und Verbrauchswaren"
+
+#~ msgid "indice type"
+#~ msgstr "Index Typ"
+
+#~ msgid "Production orders are created for the product manufacturing."
+#~ msgstr "Fertigungsaufträge werden angelegt bei der Produktherstellung."
+
+#~ msgid "Min Quantity"
+#~ msgstr "Min. Menge"
+
+#~ msgid "Production orders"
+#~ msgstr "Fertigungsaufträge"
+
+#~ msgid "BoM Hyerarchy"
+#~ msgstr "Hierachie Stückliste"
+
+#~ msgid "Procurement Lines"
+#~ msgstr "Beschaffungsvorschlag Positionen"
+
+#~ msgid "If Product type is service and procure method is Make to stock"
+#~ msgstr "Falls Produkttyp Service und Beschaffungsmethode 'vom Lager' (MtS)"
+
+#~ msgid "If Product type is service"
+#~ msgstr "Falls Produkttyp Dienstleistungen (Service)"
+
+#~ msgid "Security Days"
+#~ msgstr "Sicherheitspuffer (Tage)"
+
+#~ msgid "Exception"
+#~ msgstr "Fehlerliste"
+
+#~ msgid ""
+#~ "This wizard will planify the procurement for this product. This procurement "
+#~ "may generate task, production orders or purchase orders."
+#~ msgstr ""
+#~ "Dieser Assistent wird die Beschaffungsplanung für dieses Produkt vornehmen. "
+#~ "Diese Beschaffung kann eine Aufgabe, einen Produktionsauftrag oder einen "
+#~ "Beschaffungsauftrag generieren,"
+
+#~ msgid "The system waits for requested products in stock."
+#~ msgstr "Das System warted auf Produktverfügbarkeit."
+
+#~ msgid "Serivce Stockable Order"
+#~ msgstr "Beschaffungsauftrag Dienstleistungen"
+
+#~ msgid "From minimum stock rules, it goes for procure product."
+#~ msgstr ""
+#~ "Aus der Meldebestandregel leitet sich die Berechnung des "
+#~ "Beschaffungsauftrags ab."
+
+#~ msgid "Production done"
+#~ msgstr "Beende Fertigung"
+
+#~ msgid "References"
+#~ msgstr "Referenzen"
+
+#~ msgid "Machine"
+#~ msgstr "Maschine"
+
+#~ msgid "Workcenter Name"
+#~ msgstr "Arbeitsplatz Name"
+
+#~ msgid "min"
+#~ msgstr "min"
+
+#~ msgid "Human Resource"
+#~ msgstr "Personal"
+
+#~ msgid "Workcenters"
+#~ msgstr "Arbeitsplätze"
+
+#~ msgid "on order"
+#~ msgstr "von Auftrag"
+
+#~ msgid "Compute All Schedulers"
+#~ msgstr "Beschaffungsvorschläge"
+
+#~ msgid "Number of Cycle"
+#~ msgstr "Anzahl Zyklen"
+
+#~ msgid "Run procurement"
+#~ msgstr "Starte Beschaffungsvorschlag"
+
+#~ msgid ""
+#~ "This is the time frame analysed by the scheduler when computing "
+#~ "procurements. All procurement that are not between today and today+range are "
+#~ "skipped for futur computation."
+#~ msgstr ""
+#~ "Das ermittelte Zeitfenster für die automatische Beschaffung nach "
+#~ "Durchführung der Fertigungsplanung. Alle Beschaffungsaktionen zwischen heute "
+#~ "und heute + Zeitfenster werden abgebrochen für zukünftige neue "
+#~ "Berechnungen(Beschaffungsdisposition)."
+
+#~ msgid "Time Efficiency"
+#~ msgstr "Zeiteffizienz"
+
+#~ msgid "Scheduler Parameters"
+#~ msgstr "Zeitplanung Parameter"
+
+#~ msgid "A cycle is defined in the workcenter definition."
+#~ msgstr ""
+#~ "Ein Auftragsdurchlauf (Zyklus) wird definiert bei der Definition "
+#~ "desArbeitsplatzes."
+
+#~ msgid "Unit of Measure"
+#~ msgstr "Mengeneinheit"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Beschaffungsmethode"
+
+#~ msgid "Compute Procurements"
+#~ msgstr "Berechne Beschaffungsvorschlag"
+
+#~ msgid "Wait for available products for reservation"
+#~ msgstr "Warte auf Reservierung verfügbarer Produkte"
+
+#~ msgid "Validate"
+#~ msgstr "Validieren"
+
+#~ msgid "Procurement Purchase"
+#~ msgstr "Einkaufsauftrag"
+
+#~ msgid "Number of products to produce"
+#~ msgstr "Produktionsmenge"
+
+#~ msgid "Material routing"
+#~ msgstr "Weiterverarbeitung Material"
+
+#~ msgid "Minimum stock rule"
+#~ msgstr "Minimalbestand Regel"
+
+#~ msgid "Product Efficiency"
+#~ msgstr "Produkteffizienz"
+
+#~ msgid "Orderpoint minimum rule"
+#~ msgstr "Regel Meldebestand"
+
+#~ msgid "Service Make to Stock"
+#~ msgstr "Dienstleistung \"vom Lager\""
+
+#~ msgid "Sale Ref"
+#~ msgstr "Verkaufsauftrag Ref."
+
+#~ msgid "Location"
+#~ msgstr "Ort"
+
+#~ msgid "New Procurement"
+#~ msgstr "Neuer Beschaffungsauftrag"
+
+#~ msgid "Tool"
+#~ msgstr "Werkzeug"
+
+#~ msgid ""
+#~ "Location where the system will look for products used in raw materials."
+#~ msgstr ""
+#~ "Lagerort in dem nach weiteren Produkten gesucht wird, die in Rohmaterialien "
+#~ "eingesetzt werden."
+
+#~ msgid "Planned Date"
+#~ msgstr "Datum Planung"
+
+#~ msgid "Procurement orders"
+#~ msgstr "Beschaffungsauftrag"
+
+#~ msgid "If product type is service and procure method is Make to order"
+#~ msgstr "Produkttyp 'Service' und Beschaffungsmethode 'von Auftrag' (MtO)"
+
+#~ msgid "Scheduler Range"
+#~ msgstr "Planungsreichweite"
+
+#~ msgid "Max Quantity"
+#~ msgstr "Max. Menge"
+
+#~ msgid "Minimum Stock Procure"
+#~ msgstr "Meldebestandregel"
+
+#~ msgid "This is the leads/security time for each purchase order."
+#~ msgstr ""
+#~ "Diese ist die Abwicklungs-/Sicherheitszeit für alle Bestellungen im Einkauf."
+
+#~ msgid "alphabetical indices"
+#~ msgstr "Alphabetischer Index"
+
+#~ msgid "Procurement for raw materials."
+#~ msgstr "Beschaffung von Bauteilen / Rohstoffe"
+
+#~ msgid "Note"
+#~ msgstr "Bemerkung"
+
+#~ msgid "Procure Stockable Product"
+#~ msgstr "Beschaffe Lagerprodukt"
+
+#~ msgid "Paid ?"
+#~ msgstr "Bezahlt?"
+
+#~ msgid "Define a routing to describe the manufacturing steps."
+#~ msgstr ""
+#~ "Definiere einen Arbeitsvorgang um die Schritte der Fertigung zu "
+#~ "dokumentieren."
+
+#~ msgid "Define the product structure, with sub-products and/or components."
+#~ msgstr ""
+#~ "Definiere die Produktstruktur, mit Subprodukten und / oder Komponenten."
+
+#~ msgid ""
+#~ "Procurement is created if the product quantity is lower than the minimum "
+#~ "limit."
+#~ msgstr ""
+#~ "Beschaffungsauftrag wird erzeugt wenn der Bestand geringer ist als der "
+#~ "Meldebestand."
+
+#~ msgid "Date Closed"
+#~ msgstr "Datum Ende"
+
+#~ msgid "Properties composition"
+#~ msgstr "Zusammenstellung Eigenschaften"
+
+#~ msgid "Production Orders Waiting Products"
+#~ msgstr "Fertigungsaufträge (Warteliste)"
+
+#~ msgid "Change Product Qty."
+#~ msgstr "Ändere Menge"
+
+#~ msgid "The procurement quantity will by rounded up to this multiple."
+#~ msgstr "Die Beschaffungsmethode wird aufgerundet auf dieses Vielfache."
+
+#~ msgid "Reordering Mode"
+#~ msgstr "Wiederbeschaffungsmodus"
+
+#~ msgid "Central document to procure products"
+#~ msgstr "Zentrales Dokument für die Beschaffung"
+
+#~ msgid "Production Orders in Progress"
+#~ msgstr "Fertigungsaufträge (in Bearbeitung)"
+
+#~ msgid "Minimum Stock Rules"
+#~ msgstr "Regel Meldebestand"
+
+#~ msgid ""
+#~ "Reference of the document that created this procurement.\n"
+#~ "This is automatically completed by Open ERP."
+#~ msgstr ""
+#~ "Referenz des Dokumentes welches diesen Beschaffungsvorgang erzeugt hat.\n"
+#~ "Diese Referenz wird automatisch generiert."
+
+#~ msgid "Product type is Stockable and procure method is make to stock"
+#~ msgstr ""
+#~ "Produkttyp ist 'Lagerprodukt' und Beschaffungsmethode ist 'vom Lager'"
+
+#~ msgid "Workcenter"
+#~ msgstr "Arbeitsplatz"
+
+#~ msgid "Purchase Order"
+#~ msgstr "Beschaffungsauftrag"
+
+#~ msgid ""
+#~ "If you encode manually a procurement, you probably want to use a make to "
+#~ "order method."
+#~ msgstr ""
+#~ "Falls Sie einen Beschaffungsauftrag manuell erfassen möchten Sie eventuell "
+#~ "Gebrauch machen von einer bestimmten Beschaffungsmethode (z.B. aus "
+#~ "Bestellung - MtO)."
+
+#~ msgid "Stockable Order Request"
+#~ msgstr "Lagerprodukt Beschaffungsanfrage"
+
+#~ msgid "numeric indices"
+#~ msgstr "Numerischer Index"
+
+#~ msgid "If Procure method is Make to order and supply method is buy"
+#~ msgstr "Falls Beschaffungsmethode 'vom Lager' und Einkaufsmethode 'Kauf'"
+
+#~ msgid "if Product type is Stockable in procurement order"
+#~ msgstr "Falls Typ Lagerprodukt in Beschaffungsauftrag"
+
+#~ msgid "Bill of material revisions"
+#~ msgstr "Stückliste Revisionen"
+
+#~ msgid "Planification"
+#~ msgstr "Planung"
+
+#~ msgid ""
+#~ "Use a phantom bill of material in raw materials lines that have to be "
+#~ "automatically computed in on eproduction order and not one per level.If you "
+#~ "put \"Phantom/Set\" at the root level of a bill of material it is considered "
+#~ "as a set or pack: the products are replaced by the components between the "
+#~ "sale order to the picking without going through the production order.The "
+#~ "normal BoM will generate one production order per BoM level."
+#~ msgstr ""
+#~ "Benutze Phantom Stückliste für Zukaufpositionen die automatisch über einen "
+#~ "einzigen Fertigungsauftrag berechnet werden müssen und nicht einzeln per "
+#~ "Fertigungsstufe. Falls Sie Phantom als Grundebene einer BoM setzen wird ein "
+#~ "Set oder Paket angenommen: Die Produkte werden ersetzt durch Ihre "
+#~ "Komponenten zwischen Verkaufsauftrag und Versandverpackung ohne einen "
+#~ "Produktionsauftrag zu durchlaufen. Die normale BoM würde einen "
+#~ "Produktionsauftrag pro Fertigungsstufe erzeugen."
+
+#~ msgid "Your procurement request has been sent !"
+#~ msgstr "Ihre Beschaffungsanfrage wurde versendet !"
+
+#~ msgid "Internal Procurement Request"
+#~ msgstr "Interne Beschaffungsanfrage"
+
+#~ msgid "Property Categories"
+#~ msgstr "Kategorien"
+
+#~ msgid "Compute Procurements Only"
+#~ msgstr "Auftragsbezogene Beschaffungsvorschläge"
+
+#~ msgid "Temporary Procurement Exceptions"
+#~ msgstr "Temporäre Fehlerliste"
+
+#~ msgid "Confirmed"
+#~ msgstr "Bestätigt"
+
+#~ msgid "Parameters"
+#~ msgstr "Parameter"
+
+#~ msgid "Workcenters Utilisation"
+#~ msgstr "Arbeitsplatz Auslastung"
+
+#~ msgid ""
+#~ "Efficiency on the production. A factor of 0.9 means a loss of 10% in the "
+#~ "production."
+#~ msgstr ""
+#~ "Effektivität der Produktion. Ein Faktor von 0.9 bedeutet 10% weniger "
+#~ "Leistung gegenüber der 100% Vorgabe."
+
+#~ msgid "If procurement is make to order"
+#~ msgstr "Falls Beschaffung 'von Auftrag'"
+
+#~ msgid "Minimum Stock Rule"
+#~ msgstr "Meldebestandsregelung"
+
+#~ msgid "New Bill of Materials"
+#~ msgstr "Neue Stückliste"
+
+#~ msgid "Property"
+#~ msgstr "Eigenschaft"
+
+#~ msgid "Canceled"
+#~ msgstr "Abgebrochen"
+
+#~ msgid "plus"
+#~ msgstr "Plus"
+
+#~ msgid "Stockable Product Process"
+#~ msgstr "Lagerfähiges Produkt Prozess"
+
+#~ msgid "New Production Order"
+#~ msgstr "Neuer Fertigungsauftrag"
+
+#~ msgid "A Request for Quotation is created and sent to the supplier."
+#~ msgstr "Eine Angebotsanfrage wurde erzeugt und an den Lieferanten versendet."
+
+#~ msgid "Retry"
+#~ msgstr "Wiederhole"
+
+#~ msgid "When any procuere products, it comes into the prpcurement orders"
+#~ msgstr ""
+#~ "Wenn Beschaffungsvorschlag erstellt wird landet dieser in einem "
+#~ "Beschaffungsauftrag."
+
+#~ msgid "Production Orders To Start"
+#~ msgstr "Fertigungsaufträge (Startbereit)"
+
+#~ msgid "Procurement Reason"
+#~ msgstr "Begründung Beschaffung"
+
+#~ msgid "An entry is being made from billing material to routing."
+#~ msgstr "Ein Eintrag wird erzeugt durch Berechnung des eingesetzten Materials"
+
+#~ msgid "The normal working time of the workcenter."
+#~ msgstr "Normale Arbeitszeit des Arbeitsplatzes."
+
+#~ msgid "Order to Max"
+#~ msgstr "Beschaffung bis Max. Menge"
+
+#~ msgid "In procurement order, if product type is service"
+#~ msgstr "In Beschaffungsvorschlag, wenn Produkttyp \"Service\""
+
+#~ msgid "from stock"
+#~ msgstr "vom Lager"
+
+#~ msgid "Close"
+#~ msgstr "Fertig"
+
+#~ msgid "Sale Name"
+#~ msgstr "Verkauf Bezeichnung"
+
+#~ msgid "Create minimum stock rules"
+#~ msgstr "Erzeuge Minimalbestandsregel"
+
+#~ msgid "Warehouse"
+#~ msgstr "Zentrallager"
+
+#~ msgid "Service Product"
+#~ msgstr "Dienstleistungen Produkt"
+
+#~ msgid "Close Move at end"
+#~ msgstr "Beende Warenfluss (Ende)"
+
+#~ msgid "Running"
+#~ msgstr "In Weiterbearbeitung"
+
+#~ msgid "Unscheduled procurements"
+#~ msgstr "Beschaffungsauftragsliste"
+
+#~ msgid "Bill of Material Structure"
+#~ msgstr "Stückliste Struktur"
+
+#~ msgid "Workcenter load"
+#~ msgstr "Arbeitsplatz Auslastung"
+
+#~ msgid "Procurement Details"
+#~ msgstr "Beschaffungsvorschläge Details"
+
+#~ msgid "You can see its bill of material which are used to make product"
+#~ msgstr ""
+#~ "Sie können die Stückliste für die Fertigung dieses Produktes einsehen."
+
+#~ msgid "Bill of Materials Components"
+#~ msgstr "Komponenten"
+
+#~ msgid ""
+#~ "The list of operations (list of workcenters) to produce the finished "
+#~ "product. The routing is mainly used to compute workcenter costs during "
+#~ "operations and to plan futur loads on workcenters based on production "
+#~ "plannification."
+#~ msgstr ""
+#~ "Arbeitsplätze, an denen Fertigprodukte produziert werden. Das \"Routing\" "
+#~ "wird für die Berechnung der Kosten der Arbeitsplätze und für die Auslastung "
+#~ "aufgrund der Produktionsplanung verwendet."
+
+#~ msgid "Procurement Request"
+#~ msgstr "Einkaufs Anforderung"
+
+#~ msgid "Scheduled End"
+#~ msgstr "Geplantes Ende"
+
+#~ msgid "Workcenters load"
+#~ msgstr "Arbeitsplatz Auslastung"
+
+#~ msgid "MRP Management - Reporting"
+#~ msgstr "Reporting Materialbeschaffungsplanung (MRP)"
+
+#~ msgid "Workcenter Loads"
+#~ msgstr "Arbeitsplatz Auslastung"
+
+#~ msgid "Next production orders"
+#~ msgstr "Nächste Produktionsaufträge"
+
+#~ msgid "Product UoM"
+#~ msgstr "Produkt ME"
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index d0402708f5f..cee60e63023 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -350,48 +350,6 @@ def rounding(f, r):
         return f
     return round(f / r) * r
 
-class many2many_domain(fields.many2many):
-    def set(self, cr, obj, id, name, values, user=None, context=None):
-        return super(many2many_domain, self).set(cr, obj, id, name, values, user=user,
-                context=context)
-
-    def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
-        if not context:
-            context = {}
-
-        move_obj = obj.pool.get('stock.move')
-        res = {}
-        for i in ids:
-            res[i] = []
-        valid_move_ids = move_obj.search(cr, user, self._domain) # move ids relative to domain argument
-        if valid_move_ids:
-            cr.execute("SELECT production_id, move_id from mrp_production_move_ids where production_id in %s and move_id in %s",
-                [tuple(ids), tuple(valid_move_ids)])
-            related_move_map = cr.fetchall()
-            related_move_dict = dict((k, list(set([v[1] for v in itr]))) for k, itr in groupby(related_move_map, itemgetter(0)))
-            res.update(related_move_dict)
-
-        return res
-
-class one2many_domain(fields.one2many):
-    def set(self, cr, obj, id, field, values, user=None, context=None):
-        return super(one2many_domain, self).set(cr, obj, id, field, values,
-                                            user=user, context=context)
-
-    def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
-        if not context:
-            context = {}
-
-        move_obj = obj.pool.get('stock.move')
-        res = {}
-        for i in ids:
-            res[i] = []
-        move_ids = move_obj.search(cr, user, self._domain+[('production_id', 'in', tuple(ids))], context=context)
-        related_move_dict = dict([(o.production_id.id, [o.id]) for o in move_obj.browse(cr, user, move_ids, context=context)])
-        res.update(related_move_dict)
-
-        return res
-
 class mrp_production(osv.osv):
     """
     Production Orders / Manufacturing Orders
@@ -467,10 +425,10 @@ class mrp_production(osv.osv):
         'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True,
             help="This is the internal picking list that brings the finished product to the production plan"),
         'move_prod_id': fields.many2one('stock.move', 'Move product', readonly=True),
-        'move_lines': many2many_domain('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products to Consume', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}),
-        'move_lines2': many2many_domain('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Consumed Products', domain=[('state','in', ('done', 'cancel'))]),
-        'move_created_ids': one2many_domain('stock.move', 'production_id', 'Moves Created', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}),
-        'move_created_ids2': one2many_domain('stock.move', 'production_id', 'Moves Created', domain=[('state','in', ('done', 'cancel'))]),
+        'move_lines': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products to Consume', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}),
+        'move_lines2': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Consumed Products', domain=[('state','in', ('done', 'cancel'))]),
+        'move_created_ids': fields.one2many('stock.move', 'production_id', 'Moves Created', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}),
+        'move_created_ids2': fields.one2many('stock.move', 'production_id', 'Moves Created', domain=[('state','in', ('done', 'cancel'))]),
         'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'),
         'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Work Centers Utilisation'),
         'state': fields.selection([('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
@@ -745,7 +703,7 @@ class mrp_production(osv.osv):
                 if rest_qty <= production_qty:
                    production_qty = rest_qty
                 if rest_qty > 0 :
-                    stock_mov_obj.action_consume(cr, uid, [produce_product.id], production_qty, production.location_dest_id.id, context=context)
+                    stock_mov_obj.action_consume(cr, uid, [produce_product.id], production_qty, context=context)
 
         for raw_product in production.move_lines2:
             new_parent_ids = []
diff --git a/addons/multi_company/i18n/pt_BR.po b/addons/multi_company/i18n/pt_BR.po
index 285e124205a..48dd837150b 100644
--- a/addons/multi_company/i18n/pt_BR.po
+++ b/addons/multi_company/i18n/pt_BR.po
@@ -7,45 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-12-08 11:46+0000\n"
-"PO-Revision-Date: 2010-08-03 08:13+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-19 05:23+0000\n"
+"Last-Translator: Douglas Morato <dfamorato@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: multi_company
-#: help:multi_company.default,object_id:0
-msgid "Object affect by this rules"
-msgstr "Objeto afetado por esta regra"
-
-#. module: multi_company
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"O nome do objeto deve começar com x_ e não deve conter caracteres especiais!"
-
-#. module: multi_company
-#: constraint:product.template:0
-msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
-"Erro: A unidade padrão e a unidade de compra devem ser da mesma categoria."
-
-#. module: multi_company
-#: constraint:res.partner:0
-msgid "The VAT doesn't seem to be correct."
-msgstr "O imposto não parece estar correto."
-
-#. module: multi_company
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo inválido na definição da ação"
-
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
 #: model:res.company,overdue_msg:multi_company.res_company_oerp_be
@@ -53,65 +24,27 @@ msgstr "Nome de modelo inválido na definição da ação"
 #: model:res.company,overdue_msg:multi_company.res_company_oerp_in
 #: model:res.company,overdue_msg:multi_company.res_company_oerp_us
 msgid ""
-"Would your payment have been carried out after this mail was sent, please "
-"consider the present one as void. Do not hesitate to contact our accounting "
-"department"
+"\n"
+"Date: %(date)s\n"
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Please find in attachment a reminder of all your unpaid invoices, for a "
+"total amount due of:\n"
+"\n"
+"%(followup_amount).2f %(company_currency)s\n"
+"\n"
+"Thanks,\n"
+"--\n"
+"%(user_signature)s\n"
+"%(company_name)s\n"
+"        "
 msgstr ""
-"Por favor desconsidere esta mensagem, caso o seu pagamento tenha sido "
-"efetuado após o envio deste e-mail. Em caso de dúvida, entre em contato com "
-"nosso departamento contábil"
 
 #. module: multi_company
-#: field:multi_company.default,company_dest_id:0
-msgid "Default Company"
-msgstr "Empresa Padrão"
-
-#. module: multi_company
-#: field:multi_company.default,object_id:0
-msgid "Object"
-msgstr "Objeto"
-
-#. module: multi_company
-#: model:ir.module.module,shortdesc:multi_company.module_meta_information
-#: view:multi_company.default:0
-msgid "Multi Company"
-msgstr "Empresa Múltipla"
-
-#. module: multi_company
-#: model:ir.module.module,description:multi_company.module_meta_information
-msgid ""
-"This module add the possibility to easily manage \n"
-"    the default value for each object\n"
-"    "
-msgstr ""
-"Este módulo acrescenta a possibilidade de se gerenciar facilmente \n"
-"    o valor padrão para cada objeto\n"
-"    "
-
-#. module: multi_company
-#: field:multi_company.default,company_id:0
-msgid "Main Company"
-msgstr "Empresa principal"
-
-#. module: multi_company
-#: view:multi_company.default:0
-msgid "Condition"
-msgstr "Condição"
-
-#. module: multi_company
-#: help:multi_company.default,company_dest_id:0
-msgid "Company to store the current record"
-msgstr "Empresa onde será armazenado o registro atual"
-
-#. module: multi_company
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitetura de exibição"
-
-#. module: multi_company
-#: field:multi_company.default,name:0
-msgid "Name"
-msgstr "Nome"
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nome de modelo inválido na definição da ação"
 
 #. module: multi_company
 #: constraint:product.template:0
@@ -125,77 +58,152 @@ msgid "Odoo Offers"
 msgstr "Promoções Odoo (On Demand Open Object)"
 
 #. module: multi_company
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Erro! Você não pode criar empresas recursivas."
-
-#. module: multi_company
-#: help:multi_company.default,name:0
-msgid "Name it to easily find a record"
-msgstr "Dê um nome a este registro, a fim de localizá-lo facilmente"
-
-#. module: multi_company
-#: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
-msgid "Multi company"
-msgstr "Multi empresa"
-
-#. module: multi_company
-#: model:ir.model,name:multi_company.model_multi_company_default
-msgid "multi_company.default"
-msgstr "multi_company.default"
-
-#. module: multi_company
-#: help:multi_company.default,company_id:0
-msgid "Company where the user is connected"
-msgstr "Empresa onde o usuário está conectado"
-
-#. module: multi_company
-#: model:ir.actions.act_window,name:multi_company.action_inventory_form
-msgid "Default Company per Object"
-msgstr "Empresa Padrão por Objeto"
-
-#. module: multi_company
-#: field:multi_company.default,expression:0
-msgid "Expression"
-msgstr "Expressão"
-
-#. module: multi_company
-#: model:product.template,name:multi_company.product_product_odoo1_product_template
-msgid "Odoo Offer"
-msgstr "Promoções Odoo (On Demand Open Object)"
-
-#. module: multi_company
-#: field:multi_company.default,sequence:0
-msgid "Sequence"
-msgstr "Seqüência"
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Erro: A unidade padrão e a unidade de compra devem ser da mesma categoria."
 
 #. module: multi_company
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
 msgstr "Erro!  Você não pode criar categorias recursivas."
 
+#. module: multi_company
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Erro! Você não pode criar empresas recursivas."
+
+#. module: multi_company
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML inválido para Arquitetura da View"
+
+#. module: multi_company
+#: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
+msgid "Multi-Companies"
+msgstr ""
+
+#. module: multi_company
+#: model:ir.module.module,shortdesc:multi_company.module_meta_information
+#: view:multi_company.default:0
+msgid "Multi Company"
+msgstr "Empresa Múltipla"
+
+#. module: multi_company
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
 #. module: multi_company
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
 msgstr "Erro: Código EAN inválido"
 
 #. module: multi_company
-#: help:multi_company.default,expression:0
-msgid "Expression, must be True to match"
-msgstr "Expressão, deve ser verdadeira para validar"
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
 
 #. module: multi_company
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Returning"
+msgstr ""
+
+#. module: multi_company
+#: model:ir.actions.act_window,name:multi_company.action_inventory_form
 #: model:ir.ui.menu,name:multi_company.menu_action_inventory_form
-msgid "Default company per Object"
-msgstr "Empresa padrão por Objeto"
-
-#. module: multi_company
-#: code:addons/multi_company/multi_company.py:0
-#, python-format
-msgid " (copy)"
-msgstr " (cópia)"
+msgid "Default Company per Object"
+msgstr "Empresa Padrão por Objeto"
 
 #. module: multi_company
 #: view:multi_company.default:0
 msgid "Matching"
 msgstr "Correspondendo a"
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Condition"
+msgstr "Condição"
+
+#. module: multi_company
+#: model:product.template,name:multi_company.product_product_odoo1_product_template
+msgid "Odoo Offer"
+msgstr "Promoções Odoo (On Demand Open Object)"
+
+#~ msgid "Default Company"
+#~ msgstr "Empresa Padrão"
+
+#~ msgid "Object"
+#~ msgstr "Objeto"
+
+#~ msgid "The VAT doesn't seem to be correct."
+#~ msgstr "O imposto não parece estar correto."
+
+#~ msgid "Object affect by this rules"
+#~ msgstr "Objeto afetado por esta regra"
+
+#~ msgid "Multi company"
+#~ msgstr "Multi empresa"
+
+#~ msgid "Main Company"
+#~ msgstr "Empresa principal"
+
+#~ msgid "Name"
+#~ msgstr "Nome"
+
+#~ msgid "Company where the user is connected"
+#~ msgstr "Empresa onde o usuário está conectado"
+
+#~ msgid "Sequence"
+#~ msgstr "Seqüência"
+
+#~ msgid "Expression"
+#~ msgstr "Expressão"
+
+#~ msgid "Default company per Object"
+#~ msgstr "Empresa padrão por Objeto"
+
+#, python-format
+#~ msgid " (copy)"
+#~ msgstr " (cópia)"
+
+#~ msgid "Expression, must be True to match"
+#~ msgstr "Expressão, deve ser verdadeira para validar"
+
+#~ msgid ""
+#~ "Would your payment have been carried out after this mail was sent, please "
+#~ "consider the present one as void. Do not hesitate to contact our accounting "
+#~ "department"
+#~ msgstr ""
+#~ "Por favor desconsidere esta mensagem, caso o seu pagamento tenha sido "
+#~ "efetuado após o envio deste e-mail. Em caso de dúvida, entre em contato com "
+#~ "nosso departamento contábil"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objeto deve começar com x_ e não deve conter caracteres especiais!"
+
+#~ msgid "Name it to easily find a record"
+#~ msgstr "Dê um nome a este registro, a fim de localizá-lo facilmente"
+
+#~ msgid "Company to store the current record"
+#~ msgstr "Empresa onde será armazenado o registro atual"
+
+#~ msgid "multi_company.default"
+#~ msgstr "multi_company.default"
+
+#~ msgid ""
+#~ "This module add the possibility to easily manage \n"
+#~ "    the default value for each object\n"
+#~ "    "
+#~ msgstr ""
+#~ "Este módulo acrescenta a possibilidade de se gerenciar facilmente \n"
+#~ "    o valor padrão para cada objeto\n"
+#~ "    "
diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po
index da9bb9f8b4a..d9911c1fedf 100644
--- a/addons/product/i18n/mn.po
+++ b/addons/product/i18n/mn.po
@@ -7,98 +7,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 09:28+0000\n"
-"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-18 06:22+0000\n"
+"Last-Translator: sugi <Unknown>\n"
 "Language-Team: Mongolian <mn@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: 2010-09-30 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: product
-#: view:product.pricelist.item:0
-msgid "Max. Margin"
-msgstr ""
-
-#. module: product
-#: view:product.pricelist.item:0
-msgid "Base Price"
-msgstr "Суурь үнэ"
-
-#. module: product
-#: help:product.template,standard_price:0
-msgid ""
-"The cost of the product for accounting stock valuation. It can serves as a "
-"base price for supplier price."
-msgstr ""
-
-#. module: product
-#: selection:product.template,type:0
-msgid "Service"
-msgstr "Үйлчилгээ"
-
-#. module: product
-#: help:product.template,purchase_ok:0
-msgid ""
-"Determine if the product is visible in the list of products within a "
-"selection from a purchase order line."
-msgstr "Худалдан авах захиалгын жагсаалтад энэ бараа харагдах эсэхий заана."
-
-#. module: product
-#: help:product.supplierinfo,name:0
-msgid "Supplier of this product"
-msgstr "Энэ бүтээгдэхүүний нийлүүлэгч"
-
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
 msgid "DDR 512MB PC400"
 msgstr "DDR 512MB PC400"
 
 #. module: product
-#: model:product.template,name:product.product_product_0_product_template
-msgid "Onsite Senior Intervention"
+#: field:product.packaging,rows:0
+msgid "Number of Layers"
 msgstr ""
 
 #. module: product
-#: help:product.supplierinfo,qty:0
+#: code:addons/product/pricelist.py:0
+#: constraint:product.pricelist.item:0
+#, python-format
 msgid ""
-"The minimal quantity to purchase for this supplier, expressed in the default "
-"unit of measure."
+"Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
+"Item!"
 msgstr ""
-"Энэ нийлүүлэгчээс худалдан авалт хийх хамгийн бага хэмжээ, үндсэн хэмжих "
-"нэгжээр илэрхийлэгдсэн."
-
-#. module: product
-#: field:product.template,weight_net:0
-msgid "Net weight"
-msgstr "Цэвэр жин"
-
-#. module: product
-#: help:product.product,incoming_qty:0
-msgid ""
-"Quantities of products that are planned to arrive in selected locations or "
-"all internal if none have been selected."
-msgstr ""
-"Сонгосон эсвэл бүх дотоод байрлал (сонголт байхгүй бол) дээр ирэхээр "
-"төлөвлөгдсөн барааны тоо ширхэг."
-
-#. module: product
-#: help:product.product,virtual_available:0
-msgid ""
-"Futur stock for this product according to the selected location or all "
-"internal if none have been selected. Computed as: Real Stock - Outgoing + "
-"Incoming."
-msgstr ""
-"Сонгосон эсвэл бүх дотоод байрлал (сонголт байхгүй бол) дээрх энэ барааны "
-"ирээдүйн үлдэгдэл. Ирээдүйн үлдэгдэл = Бодид үлдэгдэл  - Гарч байгаа + Ирж "
-"байгаа."
-
-#. module: product
-#: field:product.packaging,width:0
-msgid "Width"
-msgstr "Өргөн"
 
 #. module: product
 #: help:product.pricelist.item,product_tmpl_id:0
@@ -109,25 +45,194 @@ msgstr ""
 "Хэрэв энэ дүрэм зөвхөн барааны загварт үйлчлэх бол уг загварыг сонгоно. Бүх "
 "бараанд хамаатай бол хоосон орхино."
 
-#. module: product
-#: field:product.template,procure_method:0
-msgid "Procure Method"
-msgstr "Нийлүүлэх арга"
-
 #. module: product
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
 
 #. module: product
-#: model:process.process,name:product.process_process_productprocess0
-msgid "Product Process"
-msgstr "Бараа боловсруулах"
+#: model:product.category,name:product.cat1
+msgid "Sellable"
+msgstr "Зарж болох"
 
 #. module: product
-#: help:product.price.type,field:0
-msgid "Associated field in the product form."
-msgstr "Барааны дэлгэц дээр харгалзах талбар."
+#: model:product.template,name:product.product_product_mb2_product_template
+msgid "Mainboard ASUStek A7V8X-X"
+msgstr "ASUStek A7V8X-X эх хавтан"
+
+#. module: product
+#: help:product.template,seller_qty:0
+msgid "This is minimum quantity to purchase from Main Supplier."
+msgstr ""
+
+#. module: product
+#: model:product.uom,name:product.uom_day
+msgid "Day"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+msgid "UoM"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_pc2_product_template
+msgid "Basic+ PC (assembly on order)"
+msgstr "Үндсэн+ PC (захиалгаар угсарна)"
+
+#. module: product
+#: field:product.product,incoming_qty:0
+msgid "Incoming"
+msgstr "Ирж байгаа"
+
+#. module: product
+#: field:product.template,mes_type:0
+msgid "Measure Type"
+msgstr "Хэмжих төрөл"
+
+#. module: product
+#: help:res.partner,property_product_pricelist:0
+msgid ""
+"This pricelist will be used, instead of the default one, for sales to the "
+"current partner"
+msgstr ""
+
+#. module: product
+#: constraint:product.supplierinfo:0
+msgid ""
+"Error: The default UOM and the Supplier Product UOM must be in the same "
+"category."
+msgstr ""
+
+#. module: product
+#: field:product.template,seller_qty:0
+msgid "Supplier Quantity"
+msgstr ""
+
+#. module: product
+#: selection:product.template,mes_type:0
+msgid "Fixed"
+msgstr "Тогтсон"
+
+#. module: product
+#: code:addons/product/pricelist.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: product
+#: model:ir.actions.report.xml,name:product.report_product_pricelist
+#: model:ir.model,name:product.model_product_pricelist
+#: field:product.product,price:0
+#: field:product.product,pricelist_id:0
+#: view:product.supplierinfo:0
+msgid "Pricelist"
+msgstr "Үнийн жагсаалт"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Base Prices"
+msgstr "Суурь үнэ"
+
+#. module: product
+#: field:product.pricelist.item,name:0
+msgid "Rule Name"
+msgstr "Дүрмийн нэр"
+
+#. module: product
+#: field:product.product,code:0
+#: field:product.product,default_code:0
+msgid "Reference"
+msgstr ""
+
+#. module: product
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "Алдаа! Рекурсив ангилал үүсгэж болохгүй."
+
+#. module: product
+#: model:product.template,name:product.product_product_24_product_template
+msgid "Keyboard"
+msgstr "Гар"
+
+#. module: product
+#: model:ir.model,name:product.model_res_partner
+msgid "Partner"
+msgstr "Харилцагч"
+
+#. module: product
+#: help:product.template,supply_method:0
+msgid ""
+"Produce will generate production order or tasks, according to the product "
+"type. Purchase will trigger purchase orders when requested."
+msgstr ""
+"Барааны төрөлд зааснаар Үйлдвэрлэх гэдэг нь үйлдвэрлэх захиалга үүсгэнэ. "
+"Худалдан авах гэдэг нь шаардлагатай үед худалдан авах захиалга үүсгэнэ."
+
+#. module: product
+#: selection:product.template,cost_method:0
+msgid "Average Price"
+msgstr "Дундаж үнэ"
+
+#. module: product
+#: help:product.pricelist.item,name:0
+msgid "Explicit rule name for this pricelist line."
+msgstr "Энэ мөрөнд таарах тодорхой нэр."
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_uom_categ_form_action
+#: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
+msgid "Units of Measure Categories"
+msgstr "Хэмжих нэгжийн ангилал"
+
+#. module: product
+#: model:product.template,name:product.product_product_cpu1_product_template
+msgid "Processor AMD Athlon XP 1800+"
+msgstr "Процессор AMD Athlon XP 1800+"
+
+#. module: product
+#: model:product.template,name:product.product_product_20_product_template
+msgid "HDD on demand"
+msgstr "HDD on demand"
+
+#. module: product
+#: field:product.price_list,price_list:0
+msgid "PriceList"
+msgstr "Үнийн хүснэгт"
+
+#. module: product
+#: field:product.supplierinfo,product_uom:0
+#: view:product.template:0
+msgid "UOM"
+msgstr "Хэмжих нэгж"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_unit
+msgid "PCE"
+msgstr "ш"
+
+#. module: product
+#: view:product.template:0
+msgid "Miscelleanous"
+msgstr "Бусад"
+
+#. module: product
+#: model:product.template,name:product.product_product_worker0_product_template
+msgid "Worker"
+msgstr ""
+
+#. module: product
+#: help:product.template,sale_ok:0
+msgid ""
+"Determines if the product can be visible in the list of product within a "
+"selection from a sale order line."
+msgstr ""
+
+#. module: product
+#: model:product.pricelist.version,name:product.ver0
+msgid "Default Public Pricelist Version"
+msgstr "Үндсэн Үнийн хувилбар"
 
 #. module: product
 #: selection:product.template,cost_method:0
@@ -135,19 +240,399 @@ msgid "Standard Price"
 msgstr "Стандарт үнэ"
 
 #. module: product
-#: help:product.packaging,height:0
-msgid "The height of the package"
-msgstr "Пакетын өндөр"
+#: model:product.pricelist.type,name:product.pricelist_type_sale
+#: field:res.partner,property_product_pricelist:0
+msgid "Sale Pricelist"
+msgstr "Борлуулах үнэ"
+
+#. module: product
+#: view:product.template:0
+#: field:product.template,type:0
+msgid "Product Type"
+msgstr "Барааны төрөл"
+
+#. module: product
+#: view:product.uom:0
+msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:0
+#, python-format
+msgid "Products: "
+msgstr ""
+
+#. module: product
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr "Алдаа: Борлуулах нэгжийн ангилал хэмжих нэгжийнхээс өөр байх ёстой"
+
+#. module: product
+#: field:product.category,parent_id:0
+msgid "Parent Category"
+msgstr "Толгой ангилал"
+
+#. module: product
+#: help:product.product,outgoing_qty:0
+msgid ""
+"Quantities of products that are planned to leave in selected locations or "
+"all internal if none have been selected."
+msgstr ""
+"Сонгосон эсвэл бүх дотоод (сонголт хийгээгүй) байрлалаас гарахаар "
+"төлөвлөгдсөн барааны тоо хэмжээ."
+
+#. module: product
+#: help:product.template,procure_method:0
+msgid ""
+"'Make to Stock': When needed, take from the stock or wait until re-"
+"supplying. 'Make to Order': When needed, purchase or produce for the "
+"procurement request."
+msgstr ""
+"'Агуулахад хийх': хэрэгтэй үед агуулахаас авдаг эсвэл агуулахад ирэхийг "
+"хүлээдэг. 'Захиалга хийх': хэрэгтэй үед худалдан авах эсвэл үйлдвэрлэх "
+"захиалга өгдөг."
+
+#. module: product
+#: model:process.node,note:product.process_node_supplier0
+msgid "Supplier name, price, product code, ..."
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_hdd3_product_template
+msgid "HDD Seagate 7200.8 160GB"
+msgstr "HDD Seagate 7200.8 160GB"
+
+#. module: product
+#: field:product.product,ean13:0
+msgid "EAN13"
+msgstr "Зур.код"
+
+#. module: product
+#: field:product.template,seller_id:0
+msgid "Main Supplier"
+msgstr ""
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_ul_form_action
+#: model:ir.model,name:product.model_product_packaging
+#: model:ir.ui.menu,name:product.menu_product_ul_form_action
+#: view:product.packaging:0
+#: view:product.product:0
+#: view:product.ul:0
+msgid "Packaging"
+msgstr "Савлагаа"
+
+#. module: product
+#: view:product.product:0
+#: field:product.template,categ_id:0
+msgid "Category"
+msgstr "Ангилал"
+
+#. module: product
+#: help:product.pricelist.item,min_quantity:0
+msgid ""
+"The rule only applies if the partner buys/sells more than this quantity."
+msgstr "Харилцагч зөвхөн энэ хэмжээнээс илүүг зарах/авах үед дүрэм үйлчилнэ."
+
+#. module: product
+#: model:product.template,name:product.product_product_woodmm0_product_template
+msgid "Wood 2mm"
+msgstr ""
+
+#. module: product
+#: field:product.price_list,qty1:0
+msgid "Quantity-1"
+msgstr "Тоо-1"
+
+#. module: product
+#: help:product.packaging,ul_qty:0
+msgid "The number of packages by layer"
+msgstr ""
+
+#. module: product
+#: field:product.packaging,qty:0
+msgid "Quantity by Package"
+msgstr "Савлагааны тоо"
+
+#. module: product
+#: code:addons/product/pricelist.py:0
+#, python-format
+msgid ""
+"Could not resolve product category, ' \\n                                    "
+"'you have defined cyclic categories ' \\n                                    "
+"'of products!"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,state:0
+msgid "Status"
+msgstr "Байдал"
+
+#. module: product
+#: help:product.template,categ_id:0
+msgid "Select category for the current product"
+msgstr ""
+
+#. module: product
+#: field:product.product,outgoing_qty:0
+msgid "Outgoing"
+msgstr "Гарч байгаа"
+
+#. module: product
+#: selection:product.uom,uom_type:0
+msgid "Reference UoM for this category"
+msgstr ""
+
+#. module: product
+#: model:product.price.type,name:product.list_price
+msgid "Public Price"
+msgstr "Нийтийн үнэ"
+
+#. module: product
+#: field:product.price_list,qty5:0
+msgid "Quantity-5"
+msgstr "Тоо-5"
+
+#. module: product
+#: model:product.category,name:product.product_category_10
+msgid "IT components"
+msgstr "IT эд ангиуд"
+
+#. module: product
+#: field:product.template,product_manager:0
+msgid "Product Manager"
+msgstr "Барааны менежер"
+
+#. module: product
+#: field:product.supplierinfo,product_name:0
+msgid "Supplier Product Name"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_pc3_product_template
+msgid "Medium PC"
+msgstr "Дундаж PC"
 
 #. module: product
 #: view:product.pricelist:0
-msgid "Products Price List"
-msgstr "Барааны үнийн жагсаалт"
+msgid "Products Price Search"
+msgstr ""
 
 #. module: product
-#: model:product.category,name:product.cat1
-msgid "Sellable"
-msgstr "Зарж болох"
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,description_sale:0
+msgid "Sale Description"
+msgstr "Борлуулах тайлбар"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Storage Localisation"
+msgstr "Хадгалах байрлал"
+
+#. module: product
+#: help:product.packaging,length:0
+msgid "The length of the package"
+msgstr "Пакетын урт"
+
+#. module: product
+#: help:product.template,weight_net:0
+msgid "The net weight in Kg."
+msgstr "Цэвэр жин кг-аар."
+
+#. module: product
+#: help:product.template,state:0
+msgid "Tells the user if he can use the product or not."
+msgstr "Барааг хэрэглэж болох эсэхийг хэрэглэгчид мэдэгдэнэ."
+
+#. module: product
+#: field:pricelist.partnerinfo,min_quantity:0
+#: field:product.supplierinfo,qty:0
+msgid "Quantity"
+msgstr "Тоо хэмжээ"
+
+#. module: product
+#: field:product.packaging,height:0
+msgid "Height"
+msgstr "Өндөр"
+
+#. module: product
+#: help:product.pricelist.version,date_end:0
+msgid "Ending date for this pricelist version to be valid."
+msgstr "Энэ үнийн хүчинтэй хугацааны төгсгөл."
+
+#. module: product
+#: model:product.category,name:product.cat0
+msgid "All products"
+msgstr "Бүх бараа"
+
+#. module: product
+#: model:ir.model,name:product.model_pricelist_partnerinfo
+msgid "pricelist.partnerinfo"
+msgstr "pricelist.partnerinfo"
+
+#. module: product
+#: field:product.price_list,qty2:0
+msgid "Quantity-2"
+msgstr "Тоо-2"
+
+#. module: product
+#: field:product.price_list,qty3:0
+msgid "Quantity-3"
+msgstr "Тоо-3"
+
+#. module: product
+#: view:product.product:0
+msgid "Codes"
+msgstr "Код"
+
+#. module: product
+#: field:product.price_list,qty4:0
+msgid "Quantity-4"
+msgstr "Тоо-4"
+
+#. module: product
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Борлуулалт & Худалдан авалт"
+
+#. module: product
+#: model:product.uom.categ,name:product.uom_categ_wtime
+msgid "Working Time"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_metalcleats0_product_template
+msgid "Metal Cleats"
+msgstr ""
+
+#. module: product
+#: model:ir.model,name:product.model_product_uom_categ
+msgid "Product uom categ"
+msgstr "Барааны хэмжих нэгжийн ангилал"
+
+#. module: product
+#: model:product.ul,name:product.product_ul_box
+msgid "Box 20x20x40"
+msgstr "20x20x40 хайрцаг"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Price Computation"
+msgstr "Үнийн тооцоолол"
+
+#. module: product
+#: field:product.template,purchase_ok:0
+msgid "Can be Purchased"
+msgstr "Худалдаж авч болох"
+
+#. module: product
+#: model:product.template,name:product.product_product_cpu2_product_template
+msgid "High speed processor config"
+msgstr "Өндөр хурдны процессор"
+
+#. module: product
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid ""
+"1 or several supplier(s) can be linked to a product. All information stands "
+"in the product form."
+msgstr ""
+
+#. module: product
+#: help:product.uom,category_id:0
+msgid ""
+"Quantity conversions may happen automatically between Units of Measure in "
+"the same category, according to their respective ratios."
+msgstr ""
+
+#. module: product
+#: help:product.packaging,width:0
+msgid "The width of the package"
+msgstr "Пакетын өргөн"
+
+#. module: product
+#: field:product.product,virtual_available:0
+msgid "Virtual Stock"
+msgstr "Ирээдүйн үлдэгдэл"
+
+#. module: product
+#: selection:product.category,type:0
+msgid "View"
+msgstr ""
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_template_action_tree
+msgid "Product Templates"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_restaurantexpenses0_product_template
+msgid "Restaurant Expenses"
+msgstr ""
+
+#. module: product
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Алдаа: Буруу зураасан код"
+
+#. module: product
+#: field:product.pricelist.item,min_quantity:0
+msgid "Min. Quantity"
+msgstr "Хамгийн бага тоо"
+
+#. module: product
+#: model:ir.model,name:product.model_product_price_type
+msgid "Price Type"
+msgstr ""
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Max. Margin"
+msgstr "Хамгийн их зөрүү"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Base Price"
+msgstr "Суурь үнэ"
+
+#. module: product
+#: model:product.template,name:product.product_product_fan2_product_template
+msgid "Silent fan"
+msgstr "Чимээгүй сэнс"
+
+#. module: product
+#: help:product.supplierinfo,name:0
+msgid "Supplier of this product"
+msgstr "Өрсөлдөгч барааны компани"
+
+#. module: product
+#: help:product.pricelist.version,active:0
+msgid ""
+"When a version is duplicated it is set to non active, so that the dates do "
+"not overlaps with original version. You should change the dates and "
+"reactivate the pricelist"
+msgstr ""
+"Хувилбарууд давхардвал эх хувилбартай огнооны хувьд огтлолцохгүй болгох "
+"үүднээс идэвхигүй төлөвт оруулна. Та үнийн хувилбарын огноог засаж дахин "
+"идэвхжүүлэх ёстой."
+
+#. module: product
+#: model:product.template,name:product.product_product_kitshelfofcm0_product_template
+msgid "KIT Shelf of 100cm"
+msgstr ""
+
+#. module: product
+#: field:product.supplierinfo,name:0
+msgid "Supplier"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_sidepanel0_product_template
+msgid "Side Panel"
+msgstr ""
 
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
@@ -160,53 +645,11 @@ msgid "Price Name"
 msgstr "Үнийн нэр"
 
 #. module: product
-#: field:product.product,price:0
-msgid "Customer Price"
-msgstr "Зарах үнэ"
-
-#. module: product
-#: field:product.template,company_id:0
-msgid "Company"
-msgstr "Компани"
-
-#. module: product
-#: field:product.template,rental:0
-msgid "Rentable Product"
-msgstr "Түрээслэж болох"
-
-#. module: product
-#: field:product.product,lst_price:0
-msgid "List Price"
-msgstr "Нэрлэсэн үнэ"
-
-#. module: product
-#: model:ir.actions.act_window,name:product.product_price_type_action
-#: model:ir.ui.menu,name:product.menu_product_price_type_action
-msgid "Prices Types"
-msgstr "Үнийн төрөл"
-
-#. module: product
-#: selection:product.template,type:0
-msgid "Stockable Product"
-msgstr "Хадгалж болох"
-
-#. module: product
-#: model:product.category,name:product.product_category_services
-msgid "Services"
-msgstr "Үйлчилгээ"
-
-#. module: product
-#: help:product.template,list_price:0
+#: help:product.pricelist,active:0
 msgid ""
-"Base price for computing the customer price. Sometimes called the catalog "
-"price."
+"If the active field is set to true, it will allow you to hide the pricelist "
+"without removing it."
 msgstr ""
-"Хэрэглэгчийн үнийг гаргах суурь үнэ. Заримдаа каталоги үнэ гэж нэрлэгддэг."
-
-#. module: product
-#: field:pricelist.partnerinfo,min_quantity:0
-msgid "Quantity"
-msgstr "Тоо хэмжээ"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu3_product_template
@@ -214,85 +657,24 @@ msgid "Processor AMD Athlon XP 2200+"
 msgstr "Processor AMD Athlon XP 2200+"
 
 #. module: product
-#: help:product.price.type,name:0
-msgid "Name of this kind of price."
-msgstr "Энэ төрлийн үнийн нэр"
-
-#. module: product
-#: help:product.pricelist.version,date_start:0
-msgid "Starting date for this pricelist version to be valid."
-msgstr "Үнийн хувилбар хэрэгжиж эхлэх огноо."
-
-#. module: product
-#: field:product.product,incoming_qty:0
-msgid "Incoming"
-msgstr "Ирж байгаа"
-
-#. module: product
-#: selection:product.template,procure_method:0
-msgid "Make to Stock"
-msgstr "Агуулахад хийх"
+#: model:ir.actions.act_window,name:product.action_product_price_list
+#: model:ir.model,name:product.model_product_price_list
+#: view:product.price_list:0
+#: report:product.pricelist:0
+#: field:product.pricelist.version,pricelist_id:0
+msgid "Price List"
+msgstr "Үнийн жагсаалт"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Weigths"
-msgstr "Жин"
-
-#. module: product
-#: model:product.template,name:product.product_product_fan2_product_template
-msgid "Silent fan"
-msgstr "Чимээгүй сэнс"
-
-#. module: product
-#: help:product.template,supply_method:0
-msgid ""
-"Produce will generate production order or tasks, according to the product "
-"type. Purchase will trigger purchase orders when requested."
+msgid "Suppliers"
 msgstr ""
-"Барааны төрөлд зааснаар Үйлдвэрлэх гэдэг нь үйлдвэрлэх захиалга үүсгэнэ. "
-"Худалдан авах гэдэг нь шаардлагатай үед худалдан авах захиалга үүсгэнэ."
 
 #. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid "You can see the list of suppliers for that product."
-msgstr "Тухайн барааны нийлүүлэгчдийн жагсаалтыг харж болно."
-
-#. module: product
-#: help:product.packaging,rows:0
-msgid "The number of layer on a palet or box"
-msgstr "Палет эсвэл хайраг дэх давхаргын тоо"
-
-#. module: product
-#: model:product.pricelist.type,name:product.pricelist_type_sale
-#: field:res.partner,property_product_pricelist:0
-msgid "Sale Pricelist"
-msgstr "Борлуулах үнэ"
-
-#. module: product
-#: field:product.pricelist.item,base_pricelist_id:0
-msgid "If Other Pricelist"
-msgstr "Хэрэв өөр үнийн жагсаалт бол"
-
-#. module: product
-#: model:ir.actions.act_window,name:product.product_normal_action
-#: model:ir.actions.act_window,name:product.product_normal_action_tree
-#: model:ir.ui.menu,name:product.menu_main_product
-#: model:ir.ui.menu,name:product.menu_products
 #: view:product.product:0
-msgid "Products"
-msgstr "Бараанууд"
-
-#. module: product
-#: help:product.pricelist.item,price_round:0
-msgid ""
-"Sets the price so that it is a multiple of this value.\n"
-"Rounding is applied after the discount and before the surcharge.\n"
-"To have prices that end in 9.99, set rounding 10, surcharge -0.01"
+msgid "To Purchase"
 msgstr ""
-"Энэ утгаар үржүүлж үнийг тогтооно.\n"
-"Үнийн хөнгөлөлт болон нэмэлтийн дараа тоймлолт хийгдэнэ.\n"
-"9.99 үнийг гаргаж авахын тулд тоймлолт нь 10, нэмэлт нь -0.01 байна."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -300,20 +682,85 @@ msgid "New Price ="
 msgstr "Шинэ үнэ"
 
 #. module: product
-#: field:product.product,virtual_available:0
-msgid "Virtual Stock"
-msgstr "Ирээдүйн үлдэгдэл"
+#: help:product.pricelist.item,sequence:0
+msgid "Gives the sequence order when displaying a list of pricelist items."
+msgstr ""
 
 #. module: product
-#: selection:product.template,mes_type:0
-msgid "Fixed"
-msgstr "Тогтсон"
+#: model:product.category,name:product.product_category_accessories
+msgid "Accessories"
+msgstr "Дагалдах"
 
 #. module: product
-#: model:ir.actions.act_window,name:product.product_uom_categ_form_action
-#: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
-msgid "Units of Measure Categories"
-msgstr "Хэмжих нэгжийн ангилал"
+#: field:product.template,sale_delay:0
+msgid "Customer Lead Time"
+msgstr "Хэрэглэгчийн хүлээлт"
+
+#. module: product
+#: model:process.transition,name:product.process_transition_supplierofproduct0
+msgid "Supplier of the product"
+msgstr ""
+
+#. module: product
+#: help:product.template,uos_id:0
+msgid ""
+"Used by companies that manage two units of measure: invoicing and inventory "
+"management. For example, in food industries, you will manage a stock of ham "
+"but invoice in Kg. Keep empty to use the default UOM."
+msgstr ""
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Min. Margin"
+msgstr "Хамгийн бага зөрүү"
+
+#. module: product
+#: field:product.category,child_id:0
+msgid "Child Categories"
+msgstr "Дэд ангиллууд"
+
+#. module: product
+#: field:product.pricelist.version,date_end:0
+msgid "End Date"
+msgstr "Дуусах өдөр"
+
+#. module: product
+#: view:product.price_list:0
+msgid "Print"
+msgstr "Хэвлэх"
+
+#. module: product
+#: view:product.product:0
+#: field:product.ul,type:0
+msgid "Type"
+msgstr "Төрөл"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_pricelist_action2
+#: model:ir.ui.menu,name:product.menu_product_pricelist_action2
+#: model:ir.ui.menu,name:product.menu_product_pricelist_main
+msgid "Pricelists"
+msgstr "Үнийн жагсаалт"
+
+#. module: product
+#: field:product.product,partner_ref:0
+msgid "Customer ref"
+msgstr "Үйлчлүүлэгч"
+
+#. module: product
+#: view:product.product:0
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: product
+#: field:product.pricelist.type,key:0
+msgid "Key"
+msgstr "Түлхүүр"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Rules Test Match"
+msgstr "Тестийн загварын дүрэм журам"
 
 #. module: product
 #: help:product.pricelist.item,product_id:0
@@ -325,88 +772,294 @@ msgstr ""
 "бараанд хамаатай бол хоосон орхино."
 
 #. module: product
-#: model:ir.model,name:product.model_product_pricelist_type
-#: field:product.pricelist,type:0
-#: view:product.pricelist.type:0
-msgid "Pricelist Type"
-msgstr "Үнийн жагсаалтын төрөл"
+#: model:product.template,name:product.product_product_kitchendesignproject0_product_template
+msgid "Kitchen Design Project"
+msgstr ""
+
+#. module: product
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Дэлгэцийн XML алдаатай!"
+
+#. module: product
+#: model:product.uom,name:product.uom_hour
+msgid "Hour"
+msgstr ""
+
+#. module: product
+#: selection:product.template,state:0
+msgid "In Development"
+msgstr "Хөгжүүлэлтийн шатанд"
+
+#. module: product
+#: model:product.template,name:product.product_product_shelfofcm1_product_template
+msgid "Shelf of 200cm"
+msgstr ""
+
+#. module: product
+#: view:product.uom:0
+msgid "Ratio & Precision"
+msgstr ""
+
+#. module: product
+#: model:product.uom,name:product.product_uom_gram
+msgid "g"
+msgstr ""
+
+#. module: product
+#: model:product.category,name:product.product_category_11
+msgid "IT components kits"
+msgstr "IT эд ангиуд"
+
+#. module: product
+#: selection:product.category,type:0
+#: selection:product.template,state:0
+msgid "Normal"
+msgstr ""
+
+#. module: product
+#: model:process.node,name:product.process_node_supplier0
+#: view:product.supplierinfo:0
+msgid "Supplier Information"
+msgstr "Нийлүүлэгчийн мэдээлэл"
+
+#. module: product
+#: field:product.price.type,currency_id:0
+#: report:product.pricelist:0
+#: field:product.pricelist,currency_id:0
+msgid "Currency"
+msgstr "Валют"
+
+#. module: product
+#: model:product.template,name:product.product_product_ram_product_template
+msgid "DDR 256MB PC400"
+msgstr "DDR 256MB PC400"
+
+#. module: product
+#: view:product.category:0
+msgid "Product Categories"
+msgstr "Барааны ангилал"
+
+#. module: product
+#: view:product.uom:0
+msgid "  e.g: 1 * (reference unit) = ratio * (this unit)"
+msgstr ""
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "Base Prices"
-msgstr "Суурь үнэ"
+msgid "Procurement & Locations"
+msgstr "Татан авалт & Байршил"
 
 #. module: product
-#: model:ir.ui.menu,name:product.menu_price
-msgid "Prices Computations"
-msgstr "Үнийн тооцоолол"
+#: field:product.packaging,weight:0
+msgid "Total Package Weight"
+msgstr "Савлагааны нийт жин"
 
 #. module: product
-#: field:product.pricelist.item,name:0
-msgid "Rule Name"
-msgstr "Дүрмийн нэр"
+#: help:product.packaging,code:0
+msgid "The code of the transport unit."
+msgstr "Тээвэрлэх нэгжийн код"
 
 #. module: product
-#: model:ir.ui.menu,name:product.menu_config_product
-msgid "Configuration"
-msgstr "Тохиргоо"
+#: help:product.template,standard_price:0
+msgid ""
+"Product's cost for accounting stock valuation. It is the base price for the "
+"supplier price."
+msgstr ""
 
 #. module: product
-#: field:product.packaging,rows:0
-msgid "Number of Layer"
-msgstr "Давхаргын тоо"
+#: view:product.price.type:0
+msgid "Products Price Type"
+msgstr "Барааны үнийн төрөл"
 
 #. module: product
-#: constraint:product.category:0
-msgid "Error ! You can not create recursive categories."
-msgstr "Алдаа! Рекурсив ангилал үүсгэж болохгүй."
+#: field:product.product,price_extra:0
+msgid "Variant Price Extra"
+msgstr "Үнийн нэмэлт хувилбар"
 
 #. module: product
-#: field:product.template,uom_id:0
-msgid "Default UoM"
-msgstr "Үндсэн хэмжих нэгж"
+#: model:product.template,name:product.product_product_fan_product_template
+msgid "Regular case fan 80mm"
+msgstr "80mm ердийн үүрэн сэнс"
 
 #. module: product
-#: field:product.template,produce_delay:0
-msgid "Manufacturing Lead Time"
-msgstr "Үйлдвэрлэлийн хүлээлт"
+#: model:ir.model,name:product.model_product_supplierinfo
+msgid "Information about a product supplier"
+msgstr "Бараа нийлүүлэгчийн тухай мэдээлэл"
 
 #. module: product
-#: field:product.supplierinfo,pricelist_ids:0
-msgid "Supplier Pricelist"
-msgstr "Нийлүүлэгчийн үнийн жагсаалт"
+#: view:product.product:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+#: field:product.template,description_purchase:0
+msgid "Purchase Description"
+msgstr "Хупалдан авах тайлбар"
+
+#. module: product
+#: constraint:product.pricelist.version:0
+msgid "You cannot have 2 pricelist versions that overlap!"
+msgstr "Үнийн хүснэгтийн хувилбарууд хоорондоо огтлолцож болохгүй!"
+
+#. module: product
+#: help:product.supplierinfo,delay:0
+msgid ""
+"Lead time in days between the confirmation of the purchase order and the "
+"reception of the products in your warehouse. Used by the scheduler for "
+"automatic computation of the purchase order planning."
+msgstr ""
+
+#. module: product
+#: selection:product.template,type:0
+msgid "Stockable Product"
+msgstr "Хадгалж болох"
+
+#. module: product
+#: field:product.packaging,code:0
+msgid "Code"
+msgstr "Код"
+
+#. module: product
+#: view:product.supplierinfo:0
+msgid "Seq"
+msgstr "Д/д"
+
+#. module: product
+#: view:product.price_list:0
+msgid "Calculate Product Price per unit base on pricelist version."
+msgstr ""
+
+#. module: product
+#: model:ir.model,name:product.model_product_ul
+msgid "Shipping Unit"
+msgstr "Тээвэрлэх нэгж"
+
+#. module: product
+#: field:pricelist.partnerinfo,suppinfo_id:0
+msgid "Partner Information"
+msgstr "Харилцагчийн мэдээлэл"
+
+#. module: product
+#: model:ir.model,name:product.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: product
+#: selection:product.ul,type:0
+#: model:product.uom.categ,name:product.product_uom_categ_unit
+msgid "Unit"
+msgstr "Тоологдох"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Information"
+msgstr "Мэдээлэл"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Products Listprices Items"
+msgstr "Барааны үнийн жагсаалтын өгөгдөл"
 
 #. module: product
 #: view:product.packaging:0
+msgid "Other Info"
+msgstr "Бусад мэдээлэл"
+
+#. module: product
+#: field:product.pricelist.version,items_id:0
+msgid "Price List Items"
+msgstr "Үнийн дүрмүүд"
+
+#. module: product
+#: selection:product.uom,uom_type:0
+msgid "Bigger than the reference UoM"
+msgstr ""
+
+#. module: product
+#: model:ir.module.module,shortdesc:product.module_meta_information
+msgid "Products & Pricelists"
+msgstr "Бараа & Үнэ"
+
+#. module: product
 #: view:product.product:0
-msgid "Pallet Dimension"
-msgstr "Палетын хэмжээ"
+msgid "To Sell"
+msgstr ""
 
 #. module: product
-#: field:product.pricelist.item,base:0
-msgid "Based on"
-msgstr "Суурь"
+#: model:product.category,name:product.product_category_services0
+msgid "Marketable Services"
+msgstr ""
 
 #. module: product
-#: model:product.template,name:product.product_product_24_product_template
-msgid "Keyboard"
-msgstr "Гар"
+#: field:product.pricelist.item,price_surcharge:0
+msgid "Price Surcharge"
+msgstr "Үнийн нэмэгдэл"
 
 #. module: product
-#: field:product.supplierinfo,name:0
-msgid "Partner"
-msgstr "Харилцагч"
+#: model:product.template,name:product.product_product_mb1_product_template
+msgid "Mainboard ASUStek A7N8X"
+msgstr "ASUStek A7N8X эх хавтан"
 
 #. module: product
-#: field:product.template,sale_delay:0
-msgid "Customer Lead Time"
-msgstr "Хэрэглэгчийн хүлээлт"
+#: field:product.product,packaging:0
+msgid "Logistical Units"
+msgstr "Логистик нэгж"
 
 #. module: product
-#: model:product.template,name:product.product_product_25_product_template
-msgid "Mouse"
-msgstr "Хулгана"
+#: field:product.category,complete_name:0
+#: field:product.category,name:0
+#: field:product.pricelist.type,name:0
+#: field:product.pricelist.version,name:0
+#: view:product.product:0
+#: field:product.template,name:0
+#: field:product.ul,name:0
+#: field:product.uom,name:0
+#: field:product.uom.categ,name:0
+msgid "Name"
+msgstr "Нэр"
+
+#. module: product
+#: code:addons/product/pricelist.py:0
+#, python-format
+msgid ""
+"No active version for the selected pricelist !\n"
+"' \\n                                'Please create or activate one."
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+msgid "Stockable"
+msgstr ""
+
+#. module: product
+#: model:product.uom,name:product.product_uom_kgm
+msgid "kg"
+msgstr ""
+
+#. module: product
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr ""
+
+#. module: product
+#: model:product.uom,name:product.product_uom_meter
+msgid "m"
+msgstr ""
+
+#. module: product
+#: selection:product.template,state:0
+msgid "Obsolete"
+msgstr "Хуучирсан"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_km
+msgid "km"
+msgstr ""
 
 #. module: product
 #: help:product.template,cost_method:0
@@ -420,9 +1073,116 @@ msgstr ""
 "тооцоолно."
 
 #. module: product
-#: field:product.pricelist,name:0
-msgid "Pricelist Name"
-msgstr "Үнийн жагсаалтын нэр"
+#: help:product.category,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of product categories."
+msgstr ""
+
+#. module: product
+#: field:product.uom,factor:0
+#: field:product.uom,factor_inv:0
+msgid "Ratio"
+msgstr ""
+
+#. module: product
+#: help:product.template,purchase_ok:0
+msgid ""
+"Determine if the product is visible in the list of products within a "
+"selection from a purchase order line."
+msgstr "Худалдан авах захиалгын жагсаалтад энэ бараа харагдах эсэхий заана."
+
+#. module: product
+#: field:product.template,weight_net:0
+msgid "Net weight"
+msgstr "Цэвэр жин"
+
+#. module: product
+#: field:product.packaging,width:0
+msgid "Width"
+msgstr "Өргөн"
+
+#. module: product
+#: help:product.price.type,field:0
+msgid "Associated field in the product form."
+msgstr "Барааны дэлгэц дээр харгалзах талбар."
+
+#. module: product
+#: view:product.product:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: product
+#: field:product.template,procure_method:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: product
+#: report:product.pricelist:0
+msgid "Printing Date"
+msgstr ""
+
+#. module: product
+#: field:product.template,uos_id:0
+msgid "Unit of Sale"
+msgstr "Худалдах нэгж"
+
+#. module: product
+#: help:product.template,seller_delay:0
+msgid ""
+"This is the average delay in days between the purchase order confirmation "
+"and the reception of goods for this product and for the default supplier. It "
+"is used by the scheduler to order requests based on reordering delays."
+msgstr ""
+"Энэ нь худалдан авалтын захиалгын өдрүүд болон тухайн бүтээгдэхүүний "
+"нийлүүлэгчийн хүлээлтийн дундаж юм. Төлөвлөгч нь хүргэлтийн захиалгын шинэ "
+"хүсэлт ирэх бүрд дахин шинэчилдэг."
+
+#. module: product
+#: help:product.template,seller_id:0
+msgid "Main Supplier who has highest priority in Supplier List."
+msgstr ""
+
+#. module: product
+#: model:product.category,name:product.product_category_services
+#: view:product.product:0
+msgid "Services"
+msgstr "Үйлчилгээ"
+
+#. module: product
+#: field:product.pricelist.item,base_pricelist_id:0
+msgid "If Other Pricelist"
+msgstr "Хэрэв өөр үнийн жагсаалт бол"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_normal_action
+#: model:ir.actions.act_window,name:product.product_normal_action_puchased
+#: model:ir.actions.act_window,name:product.product_normal_action_tree
+#: model:ir.ui.menu,name:product.menu_products
+#: view:product.product:0
+msgid "Products"
+msgstr "Бүтээгдэхүүн"
+
+#. module: product
+#: help:product.packaging,rows:0
+msgid "The number of layers on a pallet or box"
+msgstr ""
+
+#. module: product
+#: help:product.pricelist.item,base:0
+msgid "The mode for computing the price for this rule."
+msgstr "Энэ дүрмийн үнэ тооцоолох горим."
+
+#. module: product
+#: view:product.packaging:0
+#: view:product.product:0
+msgid "Pallet Dimension"
+msgstr "Палетын хэмжээ"
+
+#. module: product
+#: code:addons/product/product.py:0
+#, python-format
+msgid " (copy)"
+msgstr ""
 
 #. module: product
 #: field:product.template,seller_ids:0
@@ -430,119 +1190,23 @@ msgid "Partners"
 msgstr "Харилцагч"
 
 #. module: product
-#: selection:product.template,cost_method:0
-msgid "Average Price"
-msgstr "Дундаж үнэ"
-
-#. module: product
-#: model:process.node,note:product.process_node_product0
-msgid "Create new Product"
-msgstr "Шинэ бараа үүсгэх"
-
-#. module: product
-#: help:product.pricelist.item,name:0
-msgid "Explicit rule name for this pricelist line."
-msgstr "Энэ мөрөнд таарах тодорхой нэр."
-
-#. module: product
-#: view:product.pricelist.item:0
-msgid "Min. Margin"
+#: help:product.template,sale_delay:0
+msgid ""
+"This is the average delay in days between the confirmation of the customer "
+"order and the delivery of the finished products. It's the time you promise "
+"to your customers."
 msgstr ""
 
-#. module: product
-#: view:product.pricelist.item:0
-msgid "* ( 1 + "
-msgstr "* ( 1 + "
-
-#. module: product
-#: model:product.template,name:product.product_product_cpu1_product_template
-msgid "Processor AMD Athlon XP 1800+"
-msgstr "Процессор AMD Athlon XP 1800+"
-
-#. module: product
-#: selection:product.template,state:0
-msgid "In Production"
-msgstr "Үйлдвэрлэх шатанд"
-
-#. module: product
-#: field:product.category,child_id:0
-msgid "Child Categories"
-msgstr "Дэд ангиллууд"
-
-#. module: product
-#: model:product.category,name:product.product_category_accessories
-msgid "Accessories"
-msgstr "Дагалдах"
-
-#. module: product
-#: field:product.supplierinfo,sequence:0
-msgid "Priority"
-msgstr "Урьтамж"
-
-#. module: product
-#: model:product.template,name:product.product_product_20_product_template
-msgid "HDD on demand"
-msgstr "HDD on demand"
-
-#. module: product
-#: field:product.uom,factor_inv:0
-#: field:product.uom,factor_inv_data:0
-msgid "Factor"
-msgstr "Фактор"
-
-#. module: product
-#: wizard_button:product.price_list,init,price:0
-msgid "Print"
-msgstr "Хэвлэх"
-
-#. module: product
-#: model:process.node,name:product.process_node_supplier0
-msgid "Supplier Info"
-msgstr "Нийлүүлэгчийн мэдээлэл"
-
-#. module: product
-#: field:product.ul,type:0
-msgid "Type"
-msgstr "Төрөл"
-
-#. module: product
-#: wizard_field:product.price_list,init,price_list:0
-msgid "PriceList"
-msgstr "Үнийн хүснэгт"
-
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
-msgid "UOM"
-msgstr "Хэмжих нэгж"
+msgid "Second UoM"
+msgstr "Хоёрдогч нэгж"
 
 #. module: product
-#: model:product.uom,name:product.product_uom_unit
-msgid "PCE"
-msgstr "Ш"
-
-#. module: product
-#: model:ir.actions.act_window,name:product.product_pricelist_action2
-#: model:ir.ui.menu,name:product.menu_product_pricelist_action2
-#: model:ir.ui.menu,name:product.menu_product_pricelist_main
-msgid "Pricelists"
-msgstr "Үнийн жагсаалт"
-
-#. module: product
-#: field:product.supplierinfo,product_name:0
-msgid "Partner Product Name"
-msgstr "Харилцагчийн барааны нэр"
-
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-msgid "Miscelleanous"
-msgstr "Бусад"
-
-#. module: product
-#: help:product.pricelist.item,base:0
-msgid "The mode for computing the price for this rule."
-msgstr "Энэ дүрмийн үнэ тооцоолох горим."
+#: model:product.template,name:product.product_product_woodlintelm0_product_template
+msgid "Wood Lintel 4m"
+msgstr ""
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -553,14 +1217,9 @@ msgid "Units of Measure"
 msgstr "Хэмжих нэгж"
 
 #. module: product
-#: field:product.product,partner_ref:0
-msgid "Customer ref"
-msgstr "Үйлчлүүлэгч"
-
-#. module: product
-#: field:product.supplierinfo,qty:0
+#: field:product.supplierinfo,min_qty:0
 msgid "Minimal Quantity"
-msgstr "Хамгийн бага тоо"
+msgstr "Хамгийн бага тоо хэмжээ"
 
 #. module: product
 #: model:product.category,name:product.product_category_pc
@@ -568,51 +1227,22 @@ msgid "PC"
 msgstr "PC"
 
 #. module: product
-#: help:product.template,seller_delay:0
+#: help:product.supplierinfo,product_code:0
 msgid ""
-"This is the average delay in days between the purchase order confirmation "
-"and the reception of goods for this product and for the default supplier. It "
-"is used by the scheduler to order requests based on reordering delays."
+"This supplier's product code will be used when printing a request for "
+"quotation. Keep empty to use the internal one."
 msgstr ""
 
 #. module: product
-#: field:product.template,seller_delay:0
-msgid "Supplier Lead Time"
-msgstr "Нийлүүлэгчийн хүлээлт"
-
-#. module: product
-#: model:product.pricelist.version,name:product.ver0
-msgid "Default Public Pricelist Version"
-msgstr "Үндсэн Үнийн хувилбар"
-
-#. module: product
-#: field:product.pricelist.type,key:0
-msgid "Key"
-msgstr "Түлхүүр"
+#: selection:product.template,procure_method:0
+msgid "Make to Stock"
+msgstr "Агуулахад хийх"
 
 #. module: product
 #: field:product.pricelist.item,price_version_id:0
 msgid "Price List Version"
 msgstr "Үнийн хувилбар"
 
-#. module: product
-#: view:product.pricelist.item:0
-msgid "Rules Test Match"
-msgstr ""
-
-#. module: product
-#: help:res.partner,property_product_pricelist:0
-msgid ""
-"This pricelist will be used, instead of the default one,                     "
-"for sales to the current partner"
-msgstr "Харилцагчийн борлуулалтад энэ үнийн жагсаалт ашиглагдана."
-
-#. module: product
-#: model:ir.model,name:product.model_product_pricelist
-#: view:product.supplierinfo:0
-msgid "Pricelist"
-msgstr "Үнийн хүснэгт"
-
 #. module: product
 #: selection:product.template,type:0
 msgid "Consumable"
@@ -628,169 +1258,26 @@ msgstr "Илэрхийлэгдэх валют"
 msgid "The gross weight in Kg."
 msgstr "Бохир жин кг-аар."
 
-#. module: product
-#: selection:product.ul,type:0
-msgid "Box"
-msgstr "Хайрцаг"
-
-#. module: product
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Дэлгэцийн XML алдаатай!"
-
-#. module: product
-#: help:product.template,sale_ok:0
-msgid ""
-"Determine if the product can be visible in the list of product within a "
-"selection from a sale order line."
-msgstr ""
-"Борлуулах захиалгын барааны жагсаалтад энэ бараа харагдах эсэхийг заана."
-
-#. module: product
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr "Алдаа: Борлуулах нэгжийн ангилал хэмжих нэгжийнхээс өөр байх ёстой"
-
-#. module: product
-#: field:product.category,parent_id:0
-msgid "Parent Category"
-msgstr "Эцэг ангилал"
-
-#. module: product
-#: selection:product.template,state:0
-msgid "In Development"
-msgstr "Хөгжүүлэлтийн шатанд"
-
-#. module: product
-#: help:product.pricelist.type,key:0
-msgid ""
-"Used in the code to select specific prices based on the context. Keep "
-"unchanged."
-msgstr "Контекстоос хамааран үнэ сонгоход ашиглагдана. Өөрчлөх хэрэггүй."
-
-#. module: product
-#: help:product.product,outgoing_qty:0
-msgid ""
-"Quantities of products that are planned to leave in selected locations or "
-"all internal if none have been selected."
-msgstr ""
-"Сонгосон эсвэл бүх дотоод (сонголт хийгээгүй) байрлалаас гарахаар "
-"төлөвлөгдсөн барааны тоо хэмжээ."
-
-#. module: product
-#: field:product.packaging,weight:0
-msgid "Total Package Weight"
-msgstr "Нийт пакетын жин"
-
-#. module: product
-#: help:product.template,procure_method:0
-msgid ""
-"'Make to Stock': When needed, take from the stock or wait until re-"
-"supplying. 'Make to Order': When needed, purchase or produce for the "
-"procurement request."
-msgstr ""
-"'Агуулахад хийх': хэрэгтэй үед агуулахаас авдаг эсвэл агуулахад ирэхийг "
-"хүлээдэг. 'Захиалга хийх': хэрэгтэй үед худалдан авах эсвэл үйлдвэрлэх "
-"захиалга өгдөг."
-
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement"
 msgstr "Татан авалт"
 
-#. module: product
-#: model:ir.actions.act_window,name:product.product_category_action
-#: model:ir.ui.menu,name:product.menu_product_category_action
-msgid "Products by Category"
-msgstr "Бараа, ангиллаар"
-
-#. module: product
-#: model:product.template,name:product.product_product_hdd1_product_template
-msgid "HDD Seagate 7200.8 80GB"
-msgstr "HDD Seagate 7200.8 80GB"
-
-#. module: product
-#: help:product.pricelist.version,active:0
-msgid ""
-"When a version is duplicated it is set to non active, so that the dates do "
-"not overlaps with original version. You should change the dates and "
-"reactivate the pricelist"
-msgstr ""
-"Хувилбарууд давхардвал эх хувилбартай огнооны хувьд огтлолцохгүй болгох "
-"үүднээс идэвхигүй төлөвт оруулна. Та үнийн хувилбарын огноог засаж дахин "
-"идэвхжүүлэх ёстой."
-
-#. module: product
-#: model:product.template,name:product.product_product_hdd3_product_template
-msgid "HDD Seagate 7200.8 160GB"
-msgstr "HDD Seagate 7200.8 160GB"
-
-#. module: product
-#: view:product.product:0
-msgid "Product Variant"
-msgstr "Барааны хувилбар"
-
-#. module: product
-#: field:product.packaging,ul:0
-msgid "Type of Package"
-msgstr "Пакетын төрөл"
-
-#. module: product
-#: field:product.template,loc_rack:0
-msgid "Rack"
-msgstr "Раак"
-
 #. module: product
 #: field:product.uom,category_id:0
 msgid "UoM Category"
 msgstr "Хэмжих нэгжийн ангилал"
 
 #. module: product
-#: selection:product.ul,type:0
-msgid "Pack"
-msgstr "Савлагаа"
+#: field:product.template,loc_rack:0
+msgid "Rack"
+msgstr "Раак"
 
 #. module: product
-#: field:product.product,ean13:0
-msgid "EAN13"
-msgstr "Зур.код"
-
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-#: field:product.template,description_sale:0
-msgid "Sale Description"
-msgstr "Борлуулах тайлбар"
-
-#. module: product
-#: field:product.template,uos_id:0
-msgid "Unit of Sale"
-msgstr "Худалдах нэгж"
-
-#. module: product
-#: field:product.template,mes_type:0
-msgid "Measure Type"
-msgstr "Хэмжих төрөл"
-
-#. module: product
-#: model:product.uom.categ,name:product.product_uom_categ_kgm
-msgid "Weight"
-msgstr "Жин"
-
-#. module: product
-#: model:product.template,name:product.product_product_22_product_template
-msgid "Processor on demand"
-msgstr "Processor on demand"
-
-#. module: product
-#: help:product.supplierinfo,product_name:0
-msgid ""
-"Name of the product for this partner, will be used when printing a request "
-"for quotation. Keep empty to use the internal one."
+#: field:product.template,uom_po_id:0
+msgid "Purchase Unit of Measure"
 msgstr ""
-"Үнийн санал асуух үед хэвлэгдэх нийлүүлэгчийн барааны нэр. Хэрэв дотоод нэр "
-"ашиглах бол хоосон орхино."
 
 #. module: product
 #: field:product.template,supply_method:0
@@ -798,68 +1285,28 @@ msgid "Supply method"
 msgstr "Түгээх арга"
 
 #. module: product
-#: model:product.category,name:product.product_category_11
-msgid "IT components kits"
-msgstr "IT эд ангиуд"
-
-#. module: product
-#: view:product.uom.categ:0
-msgid "Units of Measure categories"
-msgstr "Хэмжих нэгжийн ангилал"
-
-#. module: product
-#: field:product.category,sequence:0
-#: field:product.packaging,sequence:0
-#: field:product.pricelist.item,sequence:0
-msgid "Sequence"
-msgstr "Дараалал"
-
-#. module: product
-#: view:product.supplierinfo:0
-msgid "Supplier Information"
-msgstr "Нийлүүлэгчийн мэдээлэл"
-
-#. module: product
-#: model:ir.actions.act_window,name:product.product_ul_form_action
-#: model:ir.model,name:product.model_product_packaging
-#: model:ir.ui.menu,name:product.menu_product_ul_form_action
-#: view:product.packaging:0
 #: view:product.product:0
-#: view:product.ul:0
-msgid "Packaging"
-msgstr "Савлагаа"
-
-#. module: product
-#: field:product.price.type,currency_id:0
-#: field:product.pricelist,currency_id:0
-msgid "Currency"
-msgstr "Валют"
+msgid "Group by..."
+msgstr ""
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu_gen_product_template
 msgid "Regular processor config"
 msgstr "Энгийн процессор"
 
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-msgid "Descriptions"
-msgstr "Тайлбар"
-
-#. module: product
-#: model:process.transition,name:product.process_transition_supplierofproduct0
-msgid "Suppliers of Product"
-msgstr "Барааны нийлүүлэгчид"
-
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
-msgstr "Эхлэл огноо"
+msgstr "Эхлэх огноо"
 
 #. module: product
-#: view:res.partner:0
-msgid "Sales Properties"
-msgstr "Борлуулалтын талбарууд"
+#: help:product.template,produce_delay:0
+msgid ""
+"Average delay in days to produce this product. This is only for the "
+"production order and, if it is a multi-level bill of material, it's only for "
+"the level of this product. Different lead times will be summed for all "
+"levels and purchase orders."
+msgstr ""
 
 #. module: product
 #: help:product.product,qty_available:0
@@ -873,60 +1320,21 @@ msgstr "Сонгосон эсвэл бүх байрлал дээрх бараа
 msgid "Basic PC"
 msgstr "Үндсэн PC"
 
-#. module: product
-#: field:product.template,loc_row:0
-msgid "Row"
-msgstr "Мөр"
-
-#. module: product
-#: field:product.template,categ_id:0
-msgid "Category"
-msgstr "Ангилал"
-
-#. module: product
-#: help:product.pricelist.item,min_quantity:0
-msgid ""
-"The rule only applies if the partner buys/sells more than this quantity."
-msgstr "Харилцагч зөвхөн энэ хэмжээнээс илүүг зарах/авах үед дүрэм үйлчилнэ."
-
-#. module: product
-#: model:product.template,name:product.product_product_ram_product_template
-msgid "DDR 256MB PC400"
-msgstr "DDR 256MB PC400"
-
 #. module: product
 #: field:product.product,qty_available:0
 msgid "Real Stock"
 msgstr "Бодит үлдэгдэл"
 
 #. module: product
-#: view:product.category:0
-msgid "Product Categories"
-msgstr "Барааны ангилал"
-
-#. module: product
-#: help:product.uom,category_id:0
-msgid ""
-"Unit of Measure of a category can be converted between each others in the "
-"same category."
+#: model:product.uom,name:product.product_uom_cm
+msgid "cm"
 msgstr ""
-"Хэмжих нэгж нь тухайн ангилал дотроо өөр нэгж рүү хөрвүүлэгдэж болно."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom
 msgid "Product Unit of Measure"
 msgstr "Барааны хэмжих нэгж"
 
-#. module: product
-#: field:product.template,sale_ok:0
-msgid "Can be sold"
-msgstr "Зарж болох"
-
-#. module: product
-#: model:product.template,name:product.product_product_23_product_template
-msgid "Complete PC With Peripherals"
-msgstr "Иж бүрэн PC"
-
 #. module: product
 #: constraint:product.template:0
 msgid ""
@@ -935,63 +1343,19 @@ msgstr ""
 "Алдаа: Үндсэн нэгж худалдан авах нэгж хоёул нэг ангилалд хамаарах ёстой."
 
 #. module: product
-#: model:product.template,name:product.product_product_mb2_product_template
-msgid "Mainboard ASUStek A7V8X-X"
-msgstr "ASUStek A7V8X-X эх хавтан"
-
-#. module: product
-#: field:product.uom,factor:0
-msgid "Rate"
-msgstr "Харьцаа"
-
-#. module: product
-#: view:product.pricelist.item:0
-msgid "Products Listprices Items"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
 msgstr ""
 
 #. module: product
-#: field:product.uom,rounding:0
-msgid "Rounding Precision"
-msgstr "Тоймлох нарийвчлал"
-
-#. module: product
-#: help:product.packaging,width:0
-msgid "The width of the package"
-msgstr "Пакетын өргөн"
-
-#. module: product
-#: field:product.packaging,qty:0
-msgid "Quantity by Package"
-msgstr "Пакетаархи тоо"
-
-#. module: product
-#: help:product.template,uos_id:0
-msgid ""
-"Used by companies that manages two unit of measure: invoicing and inventory "
-"management. For example, in food industries, you will manage a stock of ham "
-"but invoice in Kg. Keep empty to use the default UOM."
+#: view:product.uom:0
+msgid "Unit of Measure Properties"
 msgstr ""
-"Хоёр хэмжих нэгж ашигладаг компаниудад хэрэглэгдэнэ. Жишээлбэл, хүнсний "
-"үйлдвэрлэлд, агуулахдаа гулуузаар хэмжих боловч хэрэглэгчээс  Кг-аар "
-"нэхэмжлэнэ. Үндсэн хэмжих нэгжийг ашиглах бол хоосон орхино."
 
 #. module: product
-#: view:product.product:0
-#: view:product.template:0
-msgid "Procurement & Locations"
-msgstr "Татан авалт & Байршил"
-
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-#: field:product.template,state:0
-msgid "Status"
-msgstr "Байдал"
-
-#. module: product
-#: field:product.product,outgoing_qty:0
-msgid "Outgoing"
-msgstr "Гарч байгаа"
+#: model:product.template,name:product.product_product_shelf1_product_template
+msgid "Rack 200cm"
+msgstr ""
 
 #. module: product
 #: selection:product.template,supply_method:0
@@ -999,77 +1363,20 @@ msgid "Buy"
 msgstr "Худалдаж авах"
 
 #. module: product
-#: model:ir.model,name:product.model_product_pricelist_version
-#: view:product.pricelist:0
-#: view:product.pricelist.version:0
-msgid "Pricelist Version"
-msgstr "Үнийн хувилбар"
-
-#. module: product
-#: field:product.pricelist.item,price_round:0
-msgid "Price Rounding"
-msgstr "Үнэ тоймлолт"
-
-#. module: product
-#: model:product.price.type,name:product.list_price
-msgid "Public Price"
-msgstr "Нийтийн үнэ"
-
-#. module: product
-#: field:product.pricelist.item,price_max_margin:0
-msgid "Max. Price Margin"
-msgstr ""
-
-#. module: product
-#: view:res.partner:0
-msgid "Sales & Purchases"
-msgstr "Борлуулалт & Худалдан авалт"
-
-#. module: product
-#: model:product.category,name:product.product_category_10
-msgid "IT components"
-msgstr "IT эд ангиуд"
+#: view:product.uom.categ:0
+msgid "Units of Measure categories"
+msgstr "Хэмжих нэгжийн ангилал"
 
 #. module: product
 #: help:product.packaging,weight_ul:0
 msgid "The weight of the empty UL"
+msgstr "The weight of the empty UL"
+
+#. module: product
+#: selection:product.uom,uom_type:0
+msgid "Smaller than the reference UoM"
 msgstr ""
 
-#. module: product
-#: help:product.packaging,code:0
-msgid "The code of the transport unit."
-msgstr "Тээвэрлэх нэгжийн код"
-
-#. module: product
-#: field:product.template,uom_po_id:0
-msgid "Purchase UoM"
-msgstr "Худалдан авах нэгж"
-
-#. module: product
-#: view:product.price.type:0
-msgid "Products Price Type"
-msgstr "Барааны үнийн төрөл"
-
-#. module: product
-#: field:product.template,product_manager:0
-msgid "Product Manager"
-msgstr "Барааны менежер"
-
-#. module: product
-#: field:product.product,price_extra:0
-msgid "Variant Price Extra"
-msgstr ""
-
-#. module: product
-#: model:product.template,name:product.product_product_fan_product_template
-msgid "Regular case fan 80mm"
-msgstr "80mm ердийн үүрэн сэнс"
-
-#. module: product
-#: model:ir.model,name:product.model_product_supplierinfo
-msgid "Information about a product supplier"
-msgstr "Бараа нийлүүлэгчийн тухай мэдээлэл"
-
 #. module: product
 #: field:product.price.type,active:0
 #: field:product.pricelist,active:0
@@ -1082,62 +1389,7 @@ msgstr "Идэвхитэй"
 #. module: product
 #: field:product.product,price_margin:0
 msgid "Variant Price Margin"
-msgstr ""
-
-#. module: product
-#: wizard_view:product.price_list,init:0
-msgid "Price list"
-msgstr "Үнийн жагсаалт"
-
-#. module: product
-#: model:product.template,name:product.product_product_pc3_product_template
-msgid "Medium PC"
-msgstr "Дундаж PC"
-
-#. module: product
-#: model:ir.model,name:product.model_pricelist_partnerinfo
-msgid "pricelist.partnerinfo"
-msgstr "pricelist.partnerinfo"
-
-#. module: product
-#: model:product.price.type,name:product.standard_price
-#: field:product.template,standard_price:0
-msgid "Cost Price"
-msgstr "Өртөг үнэ"
-
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-#: field:product.template,description_purchase:0
-msgid "Purchase Description"
-msgstr "Хупалдан авах тайлбар"
-
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-msgid "Second UoM"
-msgstr "Хоёрдогч нэгж"
-
-#. module: product
-#: model:product.category,name:product.product_category_4
-msgid "Dello Computer"
-msgstr "Dello Компьютер"
-
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-msgid "Storage Localisation"
-msgstr "Хадгалах байрлал"
-
-#. module: product
-#: help:product.packaging,length:0
-msgid "The length of the package"
-msgstr "Пакетын урт"
-
-#. module: product
-#: field:product.pricelist.item,price_min_margin:0
-msgid "Min. Price Margin"
-msgstr ""
+msgstr "Өртөгийн бүхэлчлэл"
 
 #. module: product
 #: help:product.packaging,ean:0
@@ -1145,24 +1397,9 @@ msgid "The EAN code of the package unit."
 msgstr "Пакетын зураасан код."
 
 #. module: product
-#: field:product.template,weight:0
-msgid "Gross weight"
-msgstr "Бохир жин"
-
-#. module: product
-#: help:product.product,packaging:0
-msgid ""
-"Gives the different ways to package the same product. This has no impact on "
-"the packing order and is mainly used if you use the EDI module."
-msgstr ""
-"Нэг барааг өөр өөрөөр багцлах аргууд. Багцлах дараалалд нөлөөлөхгүй бөгөөд "
-"үндсэндээ EDI модульд хэрэглэгддэг."
-
-#. module: product
-#: model:ir.model,name:product.model_product_category
-#: field:product.pricelist.item,categ_id:0
-msgid "Product Category"
-msgstr "Барааны ангилал"
+#: field:product.packaging,weight_ul:0
+msgid "Empty Package Weight"
+msgstr "Хоосон савны жин"
 
 #. module: product
 #: field:product.price.type,field:0
@@ -1171,55 +1408,15 @@ msgstr "Барааны талбар"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_type_action
-#: model:ir.ui.menu,name:product.menu_product_pricelist_type_action
 msgid "Pricelists Types"
 msgstr "Үнийн жагсаалтын төрлүүд"
 
 #. module: product
-#: help:product.template,state:0
-msgid "Tells the user if he can use the product or not."
-msgstr "Барааг хэрэглэж болох эсэхийг хэрэглэгчид мэдэгдэнэ."
-
-#. module: product
-#: field:product.supplierinfo,product_code:0
-msgid "Partner Product Code"
-msgstr "Харилцагчийн барааны код"
-
-#. module: product
-#: model:product.category,name:product.product_category_3
-msgid "Computer Stuff"
-msgstr "Компьютер хэрэгсэл"
-
-#. module: product
-#: field:product.packaging,code:0
-#: field:product.product,code:0
-#: field:product.product,default_code:0
-msgid "Code"
-msgstr "Код"
-
-#. module: product
-#: help:product.uom,factor_inv:0
+#: help:product.uom,factor:0
 msgid ""
-"The coefficient for the formula:\n"
-"coeff (base unit) = 1 (this unit). Factor = 1 / Rate."
+"How many times this UoM is smaller than the reference UoM in this category:\n"
+"1 * (reference unit) = ratio * (this unit)"
 msgstr ""
-"Дараахь томъёоны коэффициент:\n"
-"коэф (суурь нэгж) = 1 (энэ нэгж). Фактор = 1 / Харьцаа."
-
-#. module: product
-#: view:product.supplierinfo:0
-msgid "Seq"
-msgstr "Д/д"
-
-#. module: product
-#: model:product.category,name:product.product_category_8
-msgid "Phone Help"
-msgstr "Утсаар туслах"
-
-#. module: product
-#: selection:product.template,mes_type:0
-msgid "Variable"
-msgstr "Хувьсах"
 
 #. module: product
 #: help:product.template,uom_id:0
@@ -1227,31 +1424,9 @@ msgid "Default Unit of Measure used for all stock operation."
 msgstr "Агуулахын бүх үйлдэлд ашиглах үндсэн хэмжих нэгж."
 
 #. module: product
-#: model:ir.model,name:product.model_product_template
-#: field:product.pricelist.item,product_tmpl_id:0
-#: field:product.product,product_tmpl_id:0
-#: view:product.template:0
-msgid "Product Template"
-msgstr "Барааны загвар"
-
-#. module: product
-#: model:ir.model,name:product.model_product_ul
-msgid "Shipping Unit"
-msgstr "Тээвэрлэх нэгж"
-
-#. module: product
-#: help:product.uom,rounding:0
-msgid ""
-"The computed quantity will be a multiple of this value. Use 1.0 for products "
-"that can not be split."
+#: model:product.category,name:product.product_category_misc0
+msgid "Misc"
 msgstr ""
-"Энэ утгаар үржүүлж тоо ширхэгийг тооцоолно. Хуваалт хийхгүй барааны хувьд "
-"1.0 гэж сонгоно."
-
-#. module: product
-#: field:product.packaging,height:0
-msgid "Height"
-msgstr "Өндөр"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc4_product_template
@@ -1259,53 +1434,15 @@ msgid "Customizable PC"
 msgstr "Угсармал PC"
 
 #. module: product
-#: help:product.pricelist.version,date_end:0
-msgid "Ending date for this pricelist version to be valid."
-msgstr "Энэ үнийн хүчинтэй хугацааны төгсгөл."
-
-#. module: product
-#: field:pricelist.partnerinfo,suppinfo_id:0
-msgid "Partner Information"
-msgstr "Харилцагчийн мэдээлэл"
-
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-#: field:product.template,type:0
-msgid "Product Type"
-msgstr "Барааны төрөл"
+#: field:pricelist.partnerinfo,price:0
+msgid "Unit Price"
+msgstr "Нэгж үнэ"
 
 #. module: product
 #: model:product.category,name:product.product_category_7
 #: model:product.template,name:product.product_product_1_product_template
 msgid "Onsite Intervention"
-msgstr ""
-
-#. module: product
-#: model:product.category,name:product.cat0
-msgid "All products"
-msgstr "Бүх бараа"
-
-#. module: product
-#: wizard_button:product.price_list,init,end:0
-msgid "Cancel"
-msgstr "Болих"
-
-#. module: product
-#: help:product.packaging,qty:0
-msgid "The total number of products you can put by palet or box."
-msgstr "Палет эсвэл хайрцагаар савлаж болох барааны нийт тоо."
-
-#. module: product
-#: model:ir.model,name:product.model_product_pricelist_item
-msgid "Pricelist item"
-msgstr "Үнийн дүрэм"
-
-#. module: product
-#: model:ir.actions.wizard,name:product.report_wizard_price
-#: field:product.pricelist.version,pricelist_id:0
-msgid "Price List"
-msgstr "Үнийн жагсаалт"
+msgstr "Орон нутгийн оролцоо"
 
 #. module: product
 #: model:product.pricelist,name:product.list0
@@ -1313,36 +1450,14 @@ msgid "Public Pricelist"
 msgstr "Нийтийн үнийн жагсаалт"
 
 #. module: product
-#: model:product.template,name:product.product_product_21_product_template
-msgid "RAM on demand"
-msgstr "RAM on demand"
+#: model:product.category,name:product.product_category_marketableproduct0
+msgid "Marketable Products"
+msgstr ""
 
 #. module: product
-#: selection:product.ul,type:0
-#: model:product.uom.categ,name:product.product_uom_categ_unit
-msgid "Unit"
-msgstr "Нэгж"
-
-#. module: product
-#: model:product.template,name:product.product_product_hdd2_product_template
-msgid "HDD Seagate 7200.8 120GB"
-msgstr "HDD Seagate 7200.8 120GB"
-
-#. module: product
-#: wizard_field:product.price_list,init,qty2:0
-msgid "Quantity-2"
-msgstr "Тоо-2"
-
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-msgid "Information"
-msgstr "Мэдээлэл"
-
-#. module: product
-#: view:product.product:0
-msgid "Codes"
-msgstr "Код"
+#: field:product.supplierinfo,product_code:0
+msgid "Supplier Product Code"
+msgstr ""
 
 #. module: product
 #: constraint:ir.model:0
@@ -1353,20 +1468,545 @@ msgstr ""
 "болохгүй!"
 
 #. module: product
-#: wizard_field:product.price_list,init,qty4:0
-msgid "Quantity-4"
-msgstr "Тоо-4"
-
-#. module: product
-#: wizard_field:product.price_list,init,qty5:0
-msgid "Quantity-5"
-msgstr "Тоо-5"
-
-#. module: product
-#: view:product.packaging:0
 #: view:product.product:0
-msgid "Other Info"
-msgstr "Бусад мэдээлэл"
+msgid "Default UOM"
+msgstr ""
+
+#. module: product
+#: selection:product.ul,type:0
+msgid "Pallet"
+msgstr "Палет"
+
+#. module: product
+#: field:product.packaging,ul_qty:0
+msgid "Package by layer"
+msgstr "Савлагааны давхарга"
+
+#. module: product
+#: field:product.template,warranty:0
+msgid "Warranty (months)"
+msgstr "Баталгаа (сар)"
+
+#. module: product
+#: model:ir.model,name:product.model_product_product
+#: model:ir.ui.menu,name:product.prod_config_main
+#: model:process.node,name:product.process_node_product0
+#: model:process.process,name:product.process_process_productprocess0
+#: field:product.packaging,product_id:0
+#: field:product.pricelist.item,product_id:0
+#: view:product.product:0
+#: field:product.supplierinfo,product_id:0
+#: model:res.request.link,name:product.req_link_product
+msgid "Product"
+msgstr "Бараа"
+
+#. module: product
+#: selection:product.template,supply_method:0
+msgid "Produce"
+msgstr "Үйлдвэрлэх"
+
+#. module: product
+#: selection:product.template,procure_method:0
+msgid "Make to Order"
+msgstr "Захиалга хийх"
+
+#. module: product
+#: field:product.product,variants:0
+msgid "Variants"
+msgstr "Хувилбарууд"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_category_action
+#: model:ir.ui.menu,name:product.menu_products_category
+msgid "Products by Category"
+msgstr "Бараа, ангиллаар"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_category_action_form
+#: model:ir.ui.menu,name:product.menu_product_category_action_form
+msgid "Products Categories"
+msgstr "Барааны ангилал"
+
+#. module: product
+#: field:product.template,uos_coeff:0
+msgid "UOM -> UOS Coeff"
+msgstr "UOM -> UOS Коэф"
+
+#. module: product
+#: help:product.supplierinfo,sequence:0
+msgid "Assigns the priority to the list of product supplier."
+msgstr ""
+
+#. module: product
+#: field:product.template,uom_id:0
+msgid "Default Unit Of Measure"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_tow1_product_template
+msgid "ATX Mid-size Tower"
+msgstr "ATX Mid-size Tower"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "Rounding Method"
+msgstr "Тоймлох арга"
+
+#. module: product
+#: model:ir.actions.report.xml,name:product.report_product_label
+msgid "Products Labels"
+msgstr "Барааны шошго"
+
+#. module: product
+#: model:product.ul,name:product.product_ul_big_box
+msgid "Box 30x40x60"
+msgstr "30x40x60 хайрцаг"
+
+#. module: product
+#: selection:product.template,type:0
+msgid "Service"
+msgstr "Үйлчилгээ"
+
+#. module: product
+#: help:product.packaging,height:0
+msgid "The height of the package"
+msgstr "Пакетын өндөр"
+
+#. module: product
+#: view:product.pricelist:0
+msgid "Products Price List"
+msgstr "Барааны үнийн жагсаалт"
+
+#. module: product
+#: field:product.pricelist,company_id:0
+#: field:product.pricelist.item,company_id:0
+#: field:product.pricelist.version,company_id:0
+#: field:product.supplierinfo,company_id:0
+#: field:product.template,company_id:0
+msgid "Company"
+msgstr "Компани"
+
+#. module: product
+#: field:product.product,lst_price:0
+msgid "List Price"
+msgstr "Нэрлэсэн үнэ"
+
+#. module: product
+#: model:ir.actions.act_window,name:product.product_price_type_action
+msgid "Prices Types"
+msgstr "Үнийн төрөл"
+
+#. module: product
+#: help:product.template,list_price:0
+msgid ""
+"Base price for computing the customer price. Sometimes called the catalog "
+"price."
+msgstr ""
+"Хэрэглэгчийн үнийг гаргах суурь үнэ. Заримдаа каталоги үнэ гэж нэрлэгддэг."
+
+#. module: product
+#: code:addons/product/pricelist.py:0
+#, python-format
+msgid "Partner section of the product form"
+msgstr ""
+
+#. module: product
+#: help:product.price.type,name:0
+msgid "Name of this kind of price."
+msgstr "Энэ төрлийн үнийн нэр"
+
+#. module: product
+#: help:product.packaging,qty:0
+msgid "The total number of products you can put by pallet or box."
+msgstr ""
+
+#. module: product
+#: help:product.pricelist.version,date_start:0
+msgid "Starting date for this pricelist version to be valid."
+msgstr "Үнийн хувилбар хэрэгжиж эхлэх огноо."
+
+#. module: product
+#: help:product.template,uom_po_id:0
+msgid ""
+"Default Unit of Measure used for purchase orders. It must be in the same "
+"category than the default unit of measure."
+msgstr ""
+
+#. module: product
+#: model:product.template,description:product.product_product_cpu1_product_template
+msgid "This product is configured with example of push/pull flows"
+msgstr ""
+
+#. module: product
+#: field:product.packaging,length:0
+msgid "Length"
+msgstr "Урт"
+
+#. module: product
+#: model:product.uom.categ,name:product.uom_categ_length
+msgid "Length / Distance"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_0_product_template
+msgid "Onsite Senior Intervention"
+msgstr "Onsite Senior Intervention"
+
+#. module: product
+#: model:ir.model,name:product.model_product_pricelist_type
+#: field:product.pricelist,type:0
+#: view:product.pricelist.type:0
+msgid "Pricelist Type"
+msgstr "Үнийн жагсаалтын төрөл"
+
+#. module: product
+#: model:product.category,name:product.product_category_otherproducts0
+msgid "Other Products"
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+msgid "Characteristics"
+msgstr ""
+
+#. module: product
+#: field:product.template,sale_ok:0
+msgid "Can be Sold"
+msgstr ""
+
+#. module: product
+#: field:product.template,produce_delay:0
+msgid "Manufacturing Lead Time"
+msgstr "Үйлдвэрлэлийн хүлээлт"
+
+#. module: product
+#: field:product.supplierinfo,pricelist_ids:0
+msgid "Supplier Pricelist"
+msgstr "Нийлүүлэгчийн үнийн жагсаалт"
+
+#. module: product
+#: field:product.pricelist.item,base:0
+msgid "Based on"
+msgstr "Суурь"
+
+#. module: product
+#: model:product.category,name:product.product_category_rawmaterial0
+msgid "Raw Materials"
+msgstr ""
+
+#. module: product
+#: help:product.product,virtual_available:0
+msgid ""
+"Future stock for this product according to the selected locations or all "
+"internal if none have been selected. Computed as: Real Stock - Outgoing + "
+"Incoming."
+msgstr ""
+
+#. module: product
+#: field:product.pricelist,name:0
+msgid "Pricelist Name"
+msgstr "Үнийн жагсаалтын нэр"
+
+#. module: product
+#: help:product.supplierinfo,product_uom:0
+msgid "Supplier Product UoM."
+msgstr ""
+
+#. module: product
+#: field:product.uom,rounding:0
+msgid "Rounding Precision"
+msgstr "Тоймлох нарийвчлал"
+
+#. module: product
+#: model:ir.model,name:product.model_product_pricelist_version
+#: view:product.pricelist:0
+#: view:product.pricelist.version:0
+msgid "Pricelist Version"
+msgstr "Үнийн хувилбар"
+
+#. module: product
+#: view:product.pricelist.item:0
+msgid "* ( 1 + "
+msgstr "* ( 1 + "
+
+#. module: product
+#: help:product.packaging,weight:0
+msgid "The weight of a full package, pallet or box."
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_hdd2_product_template
+msgid "HDD Seagate 7200.8 120GB"
+msgstr "HDD Seagate 7200.8 120GB"
+
+#. module: product
+#: model:product.template,name:product.product_product_employee0_product_template
+msgid "Employee"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_shelfofcm0_product_template
+msgid "Shelf of 100cm"
+msgstr ""
+
+#. module: product
+#: model:ir.model,name:product.model_product_category
+#: field:product.pricelist.item,categ_id:0
+msgid "Product Category"
+msgstr "Бүтээгдэхүүний ангилал"
+
+#. module: product
+#: report:product.pricelist:0
+msgid "Price List Name"
+msgstr ""
+
+#. module: product
+#: field:product.supplierinfo,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: product
+#: help:product.uom,active:0
+msgid ""
+"By unchecking the active field you can disable a unit of measure without "
+"deleting it."
+msgstr ""
+
+#. module: product
+#: field:product.template,seller_delay:0
+msgid "Supplier Lead Time"
+msgstr "Нийлүүлэгчийн хүлээлт"
+
+#. module: product
+#: help:product.product,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the product "
+"without removing it."
+msgstr ""
+
+#. module: product
+#: selection:product.ul,type:0
+msgid "Box"
+msgstr "Хайрцаг"
+
+#. module: product
+#: model:product.template,name:product.product_product_rearpanelarm1_product_template
+msgid "Rear Panel SHE200"
+msgstr ""
+
+#. module: product
+#: help:product.pricelist.type,key:0
+msgid ""
+"Used in the code to select specific prices based on the context. Keep "
+"unchanged."
+msgstr "Контекстоос хамааран үнэ сонгоход ашиглагдана. Өөрчлөх хэрэггүй."
+
+#. module: product
+#: model:product.template,name:product.product_product_hdd1_product_template
+msgid "HDD Seagate 7200.8 80GB"
+msgstr "HDD Seagate 7200.8 80GB"
+
+#. module: product
+#: help:product.supplierinfo,qty:0
+msgid "This is a quantity which is converted into Default Uom."
+msgstr ""
+
+#. module: product
+#: field:product.packaging,ul:0
+msgid "Type of Package"
+msgstr "Савлагааны төрөл"
+
+#. module: product
+#: selection:product.ul,type:0
+msgid "Pack"
+msgstr "Савлагаа"
+
+#. module: product
+#: model:product.category,name:product.product_category_4
+msgid "Dello Computer"
+msgstr "Dello Компьютер"
+
+#. module: product
+#: model:product.uom.categ,name:product.product_uom_categ_kgm
+msgid "Weight"
+msgstr "Жин"
+
+#. module: product
+#: model:product.template,name:product.product_product_22_product_template
+msgid "Processor on demand"
+msgstr "Processor on demand"
+
+#. module: product
+#: model:product.template,name:product.product_product_25_product_template
+msgid "Mouse"
+msgstr "Хулгана"
+
+#. module: product
+#: field:product.uom,uom_type:0
+msgid "UoM Type"
+msgstr ""
+
+#. module: product
+#: help:product.template,product_manager:0
+msgid "This is use as task responsible"
+msgstr ""
+
+#. module: product
+#: help:product.uom,rounding:0
+msgid ""
+"The computed quantity will be a multiple of this value. Use 1.0 for a UoM "
+"that cannot be further split, such as a piece."
+msgstr ""
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Descriptions"
+msgstr "Тайлбар"
+
+#. module: product
+#: field:product.template,loc_row:0
+msgid "Row"
+msgstr "Мөр"
+
+#. module: product
+#: model:product.template,name:product.product_product_rearpanelarm0_product_template
+msgid "Rear Panel SHE100"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_23_product_template
+msgid "Complete PC With Peripherals"
+msgstr "Иж бүрэн PC"
+
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Weigths"
+msgstr "Жин"
+
+#. module: product
+#: model:product.template,name:product.product_product_hotelexpenses0_product_template
+msgid "Hotel Expenses"
+msgstr ""
+
+#. module: product
+#: help:product.uom,factor_inv:0
+msgid ""
+"How many times this UoM is bigger than the reference UoM in this category:\n"
+"1 * (this unit) = ratio * (reference unit)"
+msgstr ""
+
+#. module: product
+#: model:product.template,name:product.product_product_shelf0_product_template
+msgid "Rack 100cm"
+msgstr ""
+
+#. module: product
+#: help:product.packaging,sequence:0
+msgid "Gives the sequence order when displaying a list of packaging."
+msgstr ""
+
+#. module: product
+#: field:product.pricelist.item,price_round:0
+msgid "Price Rounding"
+msgstr "Үнэ тоймлолт"
+
+#. module: product
+#: field:product.pricelist.item,price_max_margin:0
+msgid "Max. Price Margin"
+msgstr "Бүхэлчлэх дээд хэмжээ"
+
+#. module: product
+#: help:product.supplierinfo,product_name:0
+msgid ""
+"This supplier's product name will be used when printing a request for "
+"quotation. Keep empty to use the internal one."
+msgstr ""
+
+#. module: product
+#: help:product.supplierinfo,min_qty:0
+msgid ""
+"The minimal quantity to purchase to this supplier, expressed in the default "
+"unit of measure."
+msgstr ""
+
+#. module: product
+#: selection:product.template,mes_type:0
+msgid "Variable"
+msgstr "Хувьсах"
+
+#. module: product
+#: field:product.template,rental:0
+msgid "Can be Rent"
+msgstr ""
+
+#. module: product
+#: model:product.price.type,name:product.standard_price
+#: field:product.template,standard_price:0
+msgid "Cost Price"
+msgstr "Өртөг үнэ"
+
+#. module: product
+#: field:product.pricelist.item,price_min_margin:0
+msgid "Min. Price Margin"
+msgstr "Бүхэлчлэх доод хэмжээ"
+
+#. module: product
+#: field:product.template,weight:0
+msgid "Gross weight"
+msgstr "Бохир жин"
+
+#. module: product
+#: model:product.template,name:product.product_product_assemblysection0_product_template
+msgid "Assembly Section"
+msgstr ""
+
+#. module: product
+#: model:product.category,name:product.product_category_3
+msgid "Computer Stuff"
+msgstr "Компьютер хэрэгсэл"
+
+#. module: product
+#: model:product.category,name:product.product_category_8
+msgid "Phone Help"
+msgstr "Утсаар туслах"
+
+#. module: product
+#: help:product.pricelist.item,price_round:0
+msgid ""
+"Sets the price so that it is a multiple of this value.\n"
+"Rounding is applied after the discount and before the surcharge.\n"
+"To have prices that end in 9.99, set rounding 10, surcharge -0.01"
+msgstr ""
+"Энэ утгаар үржүүлж үнийг тогтооно.\n"
+"Үнийн хөнгөлөлт болон нэмэлтийн дараа тоймлолт хийгдэнэ.\n"
+"9.99 үнийг гаргаж авахын тулд тоймлолт нь 10, нэмэлт нь -0.01 байна."
+
+#. module: product
+#: view:product.price_list:0
+msgid "Close"
+msgstr ""
+
+#. module: product
+#: model:ir.model,name:product.model_product_pricelist_item
+msgid "Pricelist item"
+msgstr "Үнийн дүрэм"
+
+#. module: product
+#: model:product.template,name:product.product_product_21_product_template
+msgid "RAM on demand"
+msgstr "RAM on demand"
+
+#. module: product
+#: view:res.partner:0
+msgid "Sales Properties"
+msgstr "Борлуулалтын талбарууд"
+
+#. module: product
+#: model:product.uom,name:product.product_uom_ton
+msgid "tonne"
+msgstr ""
 
 #. module: product
 #: view:product.product:0
@@ -1375,43 +2015,9 @@ msgid "Delays"
 msgstr "Саатал"
 
 #. module: product
-#: field:product.pricelist.version,items_id:0
-msgid "Price List Items"
-msgstr "Үнийн дүрмүүд"
-
-#. module: product
-#: help:product.supplierinfo,product_code:0
-msgid ""
-"Code of the product for this partner, will be used when printing a request "
-"for quotation. Keep empty to use the internal one."
+#: model:process.node,note:product.process_node_product0
+msgid "Creation of the product"
 msgstr ""
-"Харилцагчийн барааны код, энэ нь үнийн хүсэлт хэвлэхэд хэрэглэгдэнэ. Дотоод "
-"код ашиглах бол хоосон орхино."
-
-#. module: product
-#: selection:product.template,state:0
-msgid "Obsolete"
-msgstr "Хуучирсан"
-
-#. module: product
-#: selection:product.ul,type:0
-msgid "Pallet"
-msgstr "Палет"
-
-#. module: product
-#: field:pricelist.partnerinfo,price:0
-msgid "Unit Price"
-msgstr "Нэгж үнэ"
-
-#. module: product
-#: field:product.template,warranty:0
-msgid "Warranty (months)"
-msgstr "Баталгаа (сар)"
-
-#. module: product
-#: field:product.packaging,ul_qty:0
-msgid "Package by layer"
-msgstr "Пакет, давхаргаар"
 
 #. module: product
 #: help:product.template,type:0
@@ -1424,35 +2030,10 @@ msgstr ""
 "агуулахын бараа гэж үзнэ, хөрөнгийн удирдлагын систем байхгүй тохиолдолд "
 "хэрэглэнэ."
 
-#. module: product
-#: model:process.node,note:product.process_node_supplier0
-msgid "Product suppliers, with their product name, price, etc."
-msgstr "Барааны нийлүүлэгчид, барааны нэр, үнэ зэрэг."
-
-#. module: product
-#: model:ir.model,name:product.model_product_price_type
-msgid "Price type"
-msgstr "Үнийн төрөл"
-
-#. module: product
-#: model:ir.model,name:product.model_product_product
-#: model:process.node,name:product.process_node_product0
-#: field:product.packaging,product_id:0
-#: field:product.pricelist.item,product_id:0
-#: view:product.product:0
-#: field:product.supplierinfo,product_id:0
-#: model:res.request.link,name:product.req_link_product
-msgid "Product"
-msgstr "Бараа"
-
-#. module: product
-#: field:product.template,volume:0
-msgid "Volume"
-msgstr "Эзлэхүүн"
-
 #. module: product
 #: field:pricelist.partnerinfo,name:0
 #: field:product.packaging,name:0
+#: report:product.pricelist:0
 #: view:product.product:0
 #: view:product.template:0
 #: field:product.template,description:0
@@ -1465,7 +2046,6 @@ msgid "EAN"
 msgstr "Зур.код"
 
 #. module: product
-#: view:product.product:0
 #: view:product.template:0
 msgid "Product Description"
 msgstr "Барааны тодорхойлолт"
@@ -1476,69 +2056,18 @@ msgid " ) + "
 msgstr " ) + "
 
 #. module: product
-#: help:product.template,sale_delay:0
+#: help:product.product,incoming_qty:0
 msgid ""
-"This is the average time between the confirmation of the customer order and "
-"the delivery of the finished products. It's the time you promise to your "
-"customers."
+"Quantities of products that are planned to arrive in selected locations or "
+"all internal if none have been selected."
 msgstr ""
-"Хэрэглэгчийн захиалга батлагдсанаас хойш эцсийн бүтээгдэхүүнийг хүргэх "
-"хүртэлх дундаж хугацаа. Ө.х хэрэглэгчид амлалт өгөх хугацаа."
+"Сонгосон эсвэл бүх дотоод байрлал (сонголт байхгүй бол) дээр ирэхээр "
+"төлөвлөгдсөн барааны тоо ширхэг."
 
 #. module: product
-#: model:ir.model,name:product.model_product_uom_categ
-msgid "Product uom categ"
-msgstr "Барааны хэмжих нэгжийн ангилал"
-
-#. module: product
-#: wizard_field:product.price_list,init,qty3:0
-msgid "Quantity-3"
-msgstr "Тоо-3"
-
-#. module: product
-#: model:product.ul,name:product.product_ul_box
-msgid "Box 20x20x40"
-msgstr "20x20x40 хайрцаг"
-
-#. module: product
-#: selection:product.template,supply_method:0
-msgid "Produce"
-msgstr "Үйлдвэрлэх"
-
-#. module: product
-#: selection:product.template,procure_method:0
-msgid "Make to Order"
-msgstr "Захиалга хийх"
-
-#. module: product
-#: field:product.pricelist.item,price_surcharge:0
-msgid "Price Surcharge"
-msgstr "Үнийн нэмэгдэл"
-
-#. module: product
-#: constraint:product.pricelist.version:0
-msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr "Үнийн хүснэгтийн хувилбарууд хоорондоо огтлолцож болохгүй!"
-
-#. module: product
-#: view:product.pricelist.item:0
-msgid "Rounding Method"
-msgstr "Тоймлох арга"
-
-#. module: product
-#: field:product.product,variants:0
-msgid "Variants"
-msgstr "Хувилбарууд"
-
-#. module: product
-#: view:product.pricelist.item:0
-msgid "Price Computation"
-msgstr "Үнийн тооцоолол"
-
-#. module: product
-#: model:product.template,name:product.product_product_mb1_product_template
-msgid "Mainboard ASUStek A7N8X"
-msgstr "ASUStek A7N8X эх хавтан"
+#: field:product.template,volume:0
+msgid "Volume"
+msgstr "Эзлэхүүн"
 
 #. module: product
 #: field:product.template,loc_case:0
@@ -1546,61 +2075,28 @@ msgid "Case"
 msgstr "Үүр"
 
 #. module: product
-#: field:product.pricelist.version,date_end:0
-msgid "End Date"
-msgstr "Төгсгөл огноо"
+#: view:product.product:0
+msgid "Product Variant"
+msgstr "Барааны хувилбар"
 
 #. module: product
-#: model:ir.actions.act_window,name:product.product_category_action_form
-#: model:ir.ui.menu,name:product.menu_product_category_action_form
-msgid "Products Categories"
-msgstr "Барааны ангилал"
-
-#. module: product
-#: field:product.product,packaging:0
-msgid "Logistical Units"
-msgstr "Логистик нэгж"
-
-#. module: product
-#: field:product.category,complete_name:0
-#: field:product.category,name:0
-#: field:product.pricelist.type,name:0
-#: field:product.pricelist.version,name:0
-#: field:product.template,name:0
-#: field:product.ul,name:0
-#: field:product.uom,name:0
-#: field:product.uom.categ,name:0
-msgid "Name"
-msgstr "Нэр"
-
-#. module: product
-#: help:product.template,uos_coeff:0
-msgid ""
-"Coefficient to convert UOM to UOS\n"
-" uom = uos * coeff"
+#: model:product.category,name:product.product_category_shelves0
+msgid "Shelves"
 msgstr ""
-"Хэмжих нэгжийг зарах нэгж рүү хөрвүүлэх коэффициент\n"
-" uom = uos * coeff"
 
 #. module: product
-#: field:product.template,purchase_ok:0
-msgid "Can be Purchased"
-msgstr "Худалдаж авч болох"
+#: code:addons/product/pricelist.py:0
+#, python-format
+msgid "Other Pricelist"
+msgstr ""
 
 #. module: product
-#: field:product.template,uos_coeff:0
-msgid "UOM -> UOS Coeff"
-msgstr "UOM -> UOS Коэф"
-
-#. module: product
-#: model:product.template,name:product.product_product_cpu2_product_template
-msgid "High speed processor config"
-msgstr "Өндөр хурдны процессор"
-
-#. module: product
-#: model:product.template,name:product.product_product_pc2_product_template
-msgid "Basic+ PC (assembly on order)"
-msgstr "Үндсэн+ PC (захиалгаар угсарна)"
+#: model:ir.model,name:product.model_product_template
+#: field:product.pricelist.item,product_tmpl_id:0
+#: field:product.product,product_tmpl_id:0
+#: view:product.template:0
+msgid "Product Template"
+msgstr "Барааны загвар"
 
 #. module: product
 #: field:product.template,cost_method:0
@@ -1613,50 +2109,17 @@ msgstr "Өртөг тооцох арга"
 msgid "Palletization"
 msgstr "Палетжуулах"
 
-#. module: product
-#: view:product.product:0
-#: view:product.template:0
-msgid "Prices & Suppliers"
-msgstr "Үнэ & Нийлүүлэгч"
-
-#. module: product
-#: help:product.packaging,weight:0
-msgid "The weight of a full of products palet or box."
-msgstr "Палет эсвэл хайрцагын бүтэн жин."
-
 #. module: product
 #: selection:product.template,state:0
 msgid "End of Lifecycle"
 msgstr "Дуусах хугацаа"
 
 #. module: product
-#: model:ir.module.module,shortdesc:product.module_meta_information
-msgid "Products & Pricelists"
-msgstr "Бараа & Үнэ"
-
-#. module: product
-#: help:product.uom,factor:0
+#: help:product.product,packaging:0
 msgid ""
-"The coefficient for the formula:\n"
-"1 (base unit) = coeff (this unit). Rate = 1 / Factor."
+"Gives the different ways to package the same product. This has no impact on "
+"the picking order and is mainly used if you use the EDI module."
 msgstr ""
-"Дараахь томъёоны коэффициент:\n"
-"1 (суурь нэгж) = коэфф (энэ нэгж). Харьцаа = 1 / Фактор."
-
-#. module: product
-#: help:product.template,weight_net:0
-msgid "The net weight in Kg."
-msgstr "Цэвэр жин кг-аар."
-
-#. module: product
-#: model:product.template,name:product.product_product_tow1_product_template
-msgid "ATX Mid-size Tower"
-msgstr "ATX Mid-size Tower"
-
-#. module: product
-#: field:product.supplierinfo,delay:0
-msgid "Delivery Delay"
-msgstr "Хүргэлтийн хүлээлт"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_action
@@ -1666,9 +2129,12 @@ msgid "Pricelist Versions"
 msgstr "Үнийн хувилбар"
 
 #. module: product
-#: field:product.packaging,weight_ul:0
-msgid "Empty Package Weight"
-msgstr "Хоосон пакетын жин"
+#: field:product.category,sequence:0
+#: field:product.packaging,sequence:0
+#: field:product.pricelist.item,sequence:0
+#: field:product.supplierinfo,sequence:0
+msgid "Sequence"
+msgstr "Дараалал"
 
 #. module: product
 #: field:product.template,list_price:0
@@ -1676,26 +2142,9 @@ msgid "Sale Price"
 msgstr "Зарах үнэ"
 
 #. module: product
-#: help:product.template,produce_delay:0
-msgid ""
-"Average time to produce this product. This is only for the production order "
-"and, if it is a multi-level bill of material, it's only for the level of "
-"this product. Different delays will be summed for all levels and purchase "
-"orders."
+#: field:product.category,type:0
+msgid "Category Type"
 msgstr ""
-"Барааг үйлдвэрлэх дундаж хугацаа. Зөвхөн үйлдвэрлэлийн захиалгад "
-"зориулагдсан бөгөөд хэрэв нийлмэл орцтой бараа бол зөвхөн энэ барааны "
-"түвшинд л хамаатай. Бусад саатлуудыг нэмж тооцогдоно."
-
-#. module: product
-#: wizard_field:product.price_list,init,qty1:0
-msgid "Quantity-1"
-msgstr "Тоо-1"
-
-#. module: product
-#: field:product.packaging,length:0
-msgid "Length"
-msgstr "Урт"
 
 #. module: product
 #: model:product.category,name:product.cat2
@@ -1703,33 +2152,21 @@ msgid "Private"
 msgstr "Хувийн"
 
 #. module: product
-#: help:product.supplierinfo,delay:0
+#: help:product.template,uos_coeff:0
 msgid ""
-"Delay in days between the confirmation of the purchase order and the "
-"reception of the products in your warehouse. Used by the scheduler for "
-"automatic computation of the purchase order planning."
+"Coefficient to convert UOM to UOS\n"
+" uos = uom * coeff"
 msgstr ""
-"Захиалга батлагдсанаас хойш агуулахад ирэх хугацаа. Систем худалдан авах "
-"захиалгын хуваарь тооцоолоход хэрэглэгдэнэ."
 
 #. module: product
-#: help:product.template,uom_po_id:0
-msgid ""
-"Default Unit of Measure used for purchase orders. It must in the same "
-"category than the default unit of measure."
-msgstr ""
-"Худалдан авалтад хэрэглэх үндсэн хэмжих нэгж. Энэ нь үндсэн хэмжих нэгжийн "
-"ангилалтай адил байх ёстой."
+#: field:product.pricelist.item,price_discount:0
+msgid "Price Discount"
+msgstr "Үнийн хөнгөлөлт"
 
 #. module: product
-#: constraint:product.product:0
-msgid "Error: Invalid ean code"
-msgstr "Алдаа: Буруу зураасан код"
-
-#. module: product
-#: field:product.pricelist.item,min_quantity:0
-msgid "Min. Quantity"
-msgstr "Хамгийн бага тоо"
+#: help:product.template,volume:0
+msgid "The volume in m3."
+msgstr "Эзлэхүүн m3-ээр."
 
 #. module: product
 #: help:product.pricelist.item,categ_id:0
@@ -1740,27 +2177,213 @@ msgstr ""
 "Энэ дүрэм үйлчлэх барааны ангиллыг сонгоно. Хэрэв бүх бараанд хамаатай бол "
 "хоосон орхино."
 
-#. module: product
-#: model:ir.actions.report.xml,name:product.report_product_label
-msgid "Products Labels"
-msgstr "Барааны шошго"
+#~ msgid "Customer Price"
+#~ msgstr "Зарах үнэ"
 
-#. module: product
-#: help:product.template,volume:0
-msgid "The volume in m3."
-msgstr "Эзлэхүүн m3-ээр."
+#~ msgid "Rentable Product"
+#~ msgstr "Түрээслэж болох"
 
-#. module: product
-#: model:product.ul,name:product.product_ul_big_box
-msgid "Box 30x40x60"
-msgstr "30x40x60 хайрцаг"
+#~ msgid "Configuration"
+#~ msgstr "Тохиргоо"
 
-#. module: product
-#: model:product.uom,name:product.product_uom_kgm
-msgid "KGM"
-msgstr "Кг"
+#~ msgid "Number of Layer"
+#~ msgstr "Давхаргын тоо"
 
-#. module: product
-#: field:product.pricelist.item,price_discount:0
-msgid "Price Discount"
-msgstr "Үнийн хөнгөлөлт"
+#~ msgid "Create new Product"
+#~ msgstr "Шинэ бараа үүсгэх"
+
+#~ msgid "Priority"
+#~ msgstr "Урьтамж"
+
+#~ msgid "Supplier Info"
+#~ msgstr "Нийлүүлэгчийн мэдээлэл"
+
+#~ msgid "Partner Product Name"
+#~ msgstr "Харилцагчийн барааны нэр"
+
+#~ msgid "Can be sold"
+#~ msgstr "Зарж болох"
+
+#~ msgid "Price type"
+#~ msgstr "Үнийн төрөл"
+
+#~ msgid "Prices & Suppliers"
+#~ msgstr "Үнэ & Нийлүүлэгч"
+
+#~ msgid "Delivery Delay"
+#~ msgstr "Хүргэлтийн хүлээлт"
+
+#~ msgid "KGM"
+#~ msgstr "Кг"
+
+#~ msgid "Procure Method"
+#~ msgstr "Нийлүүлэх арга"
+
+#~ msgid "The number of layer on a palet or box"
+#~ msgstr "Палет эсвэл хайраг дэх давхаргын тоо"
+
+#~ msgid "Prices Computations"
+#~ msgstr "Үнийн тооцоолол"
+
+#~ msgid "Default UoM"
+#~ msgstr "Үндсэн хэмжих нэгж"
+
+#~ msgid "In Production"
+#~ msgstr "Үйлдвэрлэх шатанд"
+
+#~ msgid "Factor"
+#~ msgstr "Фактор"
+
+#~ msgid ""
+#~ "Name of the product for this partner, will be used when printing a request "
+#~ "for quotation. Keep empty to use the internal one."
+#~ msgstr ""
+#~ "Үнийн санал асуух үед хэвлэгдэх нийлүүлэгчийн барааны нэр. Хэрэв дотоод нэр "
+#~ "ашиглах бол хоосон орхино."
+
+#~ msgid "Suppliers of Product"
+#~ msgstr "Барааны нийлүүлэгчид"
+
+#~ msgid "Rate"
+#~ msgstr "Харьцаа"
+
+#~ msgid "Purchase UoM"
+#~ msgstr "Худалдан авах нэгж"
+
+#~ msgid "Partner Product Code"
+#~ msgstr "Харилцагчийн барааны код"
+
+#~ msgid "The total number of products you can put by palet or box."
+#~ msgstr "Палет эсвэл хайрцагаар савлаж болох барааны нийт тоо."
+
+#~ msgid ""
+#~ "Coefficient to convert UOM to UOS\n"
+#~ " uom = uos * coeff"
+#~ msgstr ""
+#~ "Хэмжих нэгжийг зарах нэгж рүү хөрвүүлэх коэффициент\n"
+#~ " uom = uos * coeff"
+
+#~ msgid "The weight of a full of products palet or box."
+#~ msgstr "Палет эсвэл хайрцагын бүтэн жин."
+
+#~ msgid ""
+#~ "Futur stock for this product according to the selected location or all "
+#~ "internal if none have been selected. Computed as: Real Stock - Outgoing + "
+#~ "Incoming."
+#~ msgstr ""
+#~ "Сонгосон эсвэл бүх дотоод байрлал (сонголт байхгүй бол) дээрх энэ барааны "
+#~ "ирээдүйн үлдэгдэл. Ирээдүйн үлдэгдэл = Бодид үлдэгдэл  - Гарч байгаа + Ирж "
+#~ "байгаа."
+
+#~ msgid ""
+#~ "The minimal quantity to purchase for this supplier, expressed in the default "
+#~ "unit of measure."
+#~ msgstr ""
+#~ "Энэ нийлүүлэгчээс худалдан авалт хийх хамгийн бага хэмжээ, үндсэн хэмжих "
+#~ "нэгжээр илэрхийлэгдсэн."
+
+#~ msgid "You can see the list of suppliers for that product."
+#~ msgstr "Тухайн барааны нийлүүлэгчдийн жагсаалтыг харж болно."
+
+#~ msgid "Product Process"
+#~ msgstr "Бараа боловсруулах"
+
+#~ msgid ""
+#~ "This pricelist will be used, instead of the default one,                     "
+#~ "for sales to the current partner"
+#~ msgstr "Харилцагчийн борлуулалтад энэ үнийн жагсаалт ашиглагдана."
+
+#~ msgid ""
+#~ "Determine if the product can be visible in the list of product within a "
+#~ "selection from a sale order line."
+#~ msgstr ""
+#~ "Борлуулах захиалгын барааны жагсаалтад энэ бараа харагдах эсэхийг заана."
+
+#~ msgid ""
+#~ "Unit of Measure of a category can be converted between each others in the "
+#~ "same category."
+#~ msgstr ""
+#~ "Хэмжих нэгж нь тухайн ангилал дотроо өөр нэгж рүү хөрвүүлэгдэж болно."
+
+#~ msgid ""
+#~ "Used by companies that manages two unit of measure: invoicing and inventory "
+#~ "management. For example, in food industries, you will manage a stock of ham "
+#~ "but invoice in Kg. Keep empty to use the default UOM."
+#~ msgstr ""
+#~ "Хоёр хэмжих нэгж ашигладаг компаниудад хэрэглэгдэнэ. Жишээлбэл, хүнсний "
+#~ "үйлдвэрлэлд, агуулахдаа гулуузаар хэмжих боловч хэрэглэгчээс  Кг-аар "
+#~ "нэхэмжлэнэ. Үндсэн хэмжих нэгжийг ашиглах бол хоосон орхино."
+
+#~ msgid ""
+#~ "The coefficient for the formula:\n"
+#~ "1 (base unit) = coeff (this unit). Rate = 1 / Factor."
+#~ msgstr ""
+#~ "Дараахь томъёоны коэффициент:\n"
+#~ "1 (суурь нэгж) = коэфф (энэ нэгж). Харьцаа = 1 / Фактор."
+
+#~ msgid ""
+#~ "Default Unit of Measure used for purchase orders. It must in the same "
+#~ "category than the default unit of measure."
+#~ msgstr ""
+#~ "Худалдан авалтад хэрэглэх үндсэн хэмжих нэгж. Энэ нь үндсэн хэмжих нэгжийн "
+#~ "ангилалтай адил байх ёстой."
+
+#~ msgid "Product suppliers, with their product name, price, etc."
+#~ msgstr "Барааны нийлүүлэгчид, барааны нэр, үнэ зэрэг."
+
+#~ msgid "Price list"
+#~ msgstr "Үнийн жагсаалт"
+
+#~ msgid ""
+#~ "This is the average time between the confirmation of the customer order and "
+#~ "the delivery of the finished products. It's the time you promise to your "
+#~ "customers."
+#~ msgstr ""
+#~ "Хэрэглэгчийн захиалга батлагдсанаас хойш эцсийн бүтээгдэхүүнийг хүргэх "
+#~ "хүртэлх дундаж хугацаа. Ө.х хэрэглэгчид амлалт өгөх хугацаа."
+
+#~ msgid ""
+#~ "The computed quantity will be a multiple of this value. Use 1.0 for products "
+#~ "that can not be split."
+#~ msgstr ""
+#~ "Энэ утгаар үржүүлж тоо ширхэгийг тооцоолно. Хуваалт хийхгүй барааны хувьд "
+#~ "1.0 гэж сонгоно."
+
+#~ msgid ""
+#~ "The coefficient for the formula:\n"
+#~ "coeff (base unit) = 1 (this unit). Factor = 1 / Rate."
+#~ msgstr ""
+#~ "Дараахь томъёоны коэффициент:\n"
+#~ "коэф (суурь нэгж) = 1 (энэ нэгж). Фактор = 1 / Харьцаа."
+
+#~ msgid ""
+#~ "Code of the product for this partner, will be used when printing a request "
+#~ "for quotation. Keep empty to use the internal one."
+#~ msgstr ""
+#~ "Харилцагчийн барааны код, энэ нь үнийн хүсэлт хэвлэхэд хэрэглэгдэнэ. Дотоод "
+#~ "код ашиглах бол хоосон орхино."
+
+#~ msgid ""
+#~ "Gives the different ways to package the same product. This has no impact on "
+#~ "the packing order and is mainly used if you use the EDI module."
+#~ msgstr ""
+#~ "Нэг барааг өөр өөрөөр багцлах аргууд. Багцлах дараалалд нөлөөлөхгүй бөгөөд "
+#~ "үндсэндээ EDI модульд хэрэглэгддэг."
+
+#~ msgid ""
+#~ "Average time to produce this product. This is only for the production order "
+#~ "and, if it is a multi-level bill of material, it's only for the level of "
+#~ "this product. Different delays will be summed for all levels and purchase "
+#~ "orders."
+#~ msgstr ""
+#~ "Барааг үйлдвэрлэх дундаж хугацаа. Зөвхөн үйлдвэрлэлийн захиалгад "
+#~ "зориулагдсан бөгөөд хэрэв нийлмэл орцтой бараа бол зөвхөн энэ барааны "
+#~ "түвшинд л хамаатай. Бусад саатлуудыг нэмж тооцогдоно."
+
+#~ msgid ""
+#~ "Delay in days between the confirmation of the purchase order and the "
+#~ "reception of the products in your warehouse. Used by the scheduler for "
+#~ "automatic computation of the purchase order planning."
+#~ msgstr ""
+#~ "Захиалга батлагдсанаас хойш агуулахад ирэх хугацаа. Систем худалдан авах "
+#~ "захиалгын хуваарь тооцоолоход хэрэглэгдэнэ."
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index 2ae3ae795e9..ad2478cb7a5 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -86,21 +86,26 @@ class purchase_requisition_partner(osv.osv_memory):
                     uom_id = line.product_id.uom_po_id and line.product_id.uom_po_id.id or False
                     newdate = datetime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S')
                     newdate = newdate - relativedelta(days=company.po_lead)
-                    delay = partner_rec and partner_rec.delay or False
-                    newdate = newdate -(delay or datetime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S') )
+                    delay = partner_rec and partner_rec.delay or 0.0
+                    newdate = newdate -(delay and relativedelta(days=delay) or datetime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S') )
                     partner = partner_rec and partner_rec.name or supplier_data
                     pricelist_id = partner.property_product_pricelist_purchase and partner.property_product_pricelist_purchase.id or False
                     price = pricelist_obj.price_get(cr, uid, [pricelist_id], line.product_id.id, line.product_qty, False, {'uom': uom_id})[pricelist_id]
                     product = prod_obj.browse(cr, uid, line.product_id.id, context=context)
                     location_id = self.pool.get('stock.warehouse').read(cr, uid, [tender.warehouse_id.id], ['lot_input_id'])[0]['lot_input_id'][0]
 
+                    if not newdate:
+                        date_planned = datetime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S')
+                    else:
+                        date_planned = newdate.strftime('%Y-%m-%d %H:%M:%S')
+
                     purchase_order_line= {
                             'name': product.partner_ref,
                             'product_qty': line.product_qty,
                             'product_id': line.product_id.id,
                             'product_uom': uom_id,
                             'price_unit': price,
-                            'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
+                            'date_planned': date_planned,
                             'notes': product.description_purchase,
                     }
                     taxes_ids = line.product_id.product_tmpl_id.supplier_taxes_id
diff --git a/addons/sale/i18n/it.po b/addons/sale/i18n/it.po
index 487bb0b32d1..3716926f3a1 100644
--- a/addons/sale/i18n/it.po
+++ b/addons/sale/i18n/it.po
@@ -6,16 +6,964 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 10:21+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-19 07:51+0000\n"
+"Last-Translator: Lorenzo Battistini <lorenzo.battistini@domsense.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: 2010-09-30 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: sale
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nome del modulo non valido nella definizione dell'azione."
+
+#. module: sale
+#: help:sale.installer,delivery:0
+msgid "Allows you to compute delivery costs on your quotations."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Se non hai disponibile a magazzino tutto il materiale da consegnare in una "
+"sola volta, accetti la spedizione parziale o no?"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging: "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
+msgid "Cancel Order"
+msgstr "Annulla Ordine"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sales_by_partner
+#: view:sale.report:0
+msgid "Sales By Partner"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Payment Before Delivery"
+msgstr "Pagamento prima della consegna"
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sale order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "VAT"
+msgstr "IVA"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "You must first cancel stock moves attached to this sale order line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "All at Once"
+msgstr "Tutto in una volta"
+
+#. module: sale
+#: field:sale.order,project_id:0
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Contabilità Analitica"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Riga Ordine"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Cannot delete a sale order line which is %s !"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_average:0
+msgid "Average Price"
+msgstr "Prezzo Medio"
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Scadenza Pagamento Predefinita"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+msgid "Configure Picking Policy for Sales Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "State"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Sconto (%)"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Prezzo Totale"
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Quantità Ordinate"
+
+#. module: sale
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Spostamenti Inventario"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Rif. Ordine"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sale order is created"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Dates"
+msgstr ""
+
+#. module: sale
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+"Errore: L'Unità di Vendita deve essere in una categoria diversa da quella "
+"dell'Unità di misura"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Sconto (%)"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales_manager
+#: model:ir.ui.menu,name:sale.menu_board_sales_manager
+msgid "Sales Manager Dashboard"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Could not cancel sale order !"
+msgstr "Non è possibile cancellare un ordine di vendita !"
+
+#. module: sale
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Confezionamento"
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nome Negozio"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Vendite in Eccezione"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Set to Draft"
+msgstr "Impost come Bozza"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Procurement Corrected"
+msgstr "Approvvigionamento corretto"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Conditions"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid ""
+"There is no income category account defined in default Properties for "
+"Product Category or Fiscal Position is not defined !"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "EAN: "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+msgid "All Quotations"
+msgstr "Tutti i Preventivi"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Our Salesman"
+msgstr "Il Nostro Venditore"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+msgid "Quantity"
+msgstr "Quantità"
+
+#. module: sale
+#: selection:sale.config.picking_policy,step:0
+msgid "Delivery Order Only"
+msgstr "Solo consegna"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_open_invoice
+msgid "Sale Open Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posizione Fiscale"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "UoM"
+msgstr "Unità di Misura"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid ""
+"You have to select a customer in the sale form !\n"
+"Please set one customer before choosing a product."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Numero di Packages (divisione spedizione)"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced !"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "In corso"
+
+#. module: sale
+#: view:sale.shop:0
+msgid "Accounting"
+msgstr "Contabilità"
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'. You may "
+"have to create it and set it as a default value on this field."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Could not cancel this sale order !"
+msgstr "Non è possibile cancellare questo ordine di vendita !"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,note:0
+#: view:sale.order.line:0
+#: field:sale.order.line,notes:0
+msgid "Notes"
+msgstr "Note"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "The quotation '%s' has been converted to a sale order."
+msgstr ""
+
+#. module: sale
+#: field:product.product,pricelist_purchase:0
+msgid "Purchase Pricelists"
+msgstr "Listini di Acquisto"
+
+#. module: sale
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the the shipping of the "
+"products to the customer"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Invoice Corrected"
+msgstr "Fattura corretta"
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: sale
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Errore: codice EAN non valido"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Totale Imponibile"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sale Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sale order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Ordine di consegna"
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Ripartizione Partner"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid ""
+"There is no income account defined ' \\n                                     "
+"   'for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotale"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Indirizzo di Fatturazione"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Cannot delete Sale Order(s) which are already confirmed !"
+msgstr "Non è possibile cancellare Ordine(i) di vendita già confermato(i) !"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Indirizzo Fatturazione"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sale order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Preventivo / Ordine"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "Numero Righe"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sale Make Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Magazzino"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Ordine N°"
+
+#. module: sale
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Righe Ordine"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Untaxed amount"
+msgstr "Totale Imponibile"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity (UoM)"
+msgstr "Quantità (Unità di misura)"
+
+#. module: sale
+#: help:sale.installer,sale_layout:0
+msgid ""
+"Provides some features to improve the layout of the Sales Order reports."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Righe Consegnate e Non Fatturate"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Totale :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "Azione non valida !"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+"  - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+"  - The 'Shipping & Manual Invoice' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice.\n"
+"  - The 'Invoice on Order After Delivery' choice will generate the draft "
+"invoice based on sale order after all picking lists have been finished.\n"
+"  - The 'Invoice from the picking' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Listino Prezzi"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: sale
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valido per Visualizzazione Architettura!"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,shipped:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "invalid mode for test_state"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Tasse"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Spostamenti Stock"
+
+#. module: sale
+#: view:sale.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,state:0
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Stato Ordine"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s) ?"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
+#: view:sale.report:0
+msgid "Sales By Month"
+msgstr ""
+
+#. module: sale
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Indirizzo Spedizione"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Eccezione"
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
+msgstr "Cronologia"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sale order is confirmed, in the "
+"same time as the procurement order. It represents the assignment of parts to "
+"the sale order. There is 1 pick list by sale order line which evolves with "
+"the availability of parts."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Riferimento"
+
+#. module: sale
+#: help:sale.order,partner_order_id:0
+msgid ""
+"The name and address of the contact who requested the order or quotation."
+msgstr ""
+
+#. module: sale
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Qta'"
+
+#. module: sale
+#: view:sale.order:0
+msgid "References"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Annulla"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist version for current sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,sale_order_dates:0
+msgid "Sales Order Dates"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sale Order Line"
+msgstr "Riga Ordine di vendita"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Crea fattura"
+
+#. module: sale
+#: field:sale.installer,sale_margin:0
+msgid "Margins in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Excluded"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Calcola"
+
+#. module: sale
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_order_id:0
+msgid "Ordering Contact"
+msgstr "Contatto Ordinante"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
+#: view:sale.open.invoice:0
+msgid "Open Invoice"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Prezzo"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_installer
+msgid "Sales Application Configuration"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forza Assegnazione"
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "su Ordine"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Indirizzo Spedizione:"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence Number"
+msgstr ""
+
+#. module: sale
+#: field:product.product,pricelist_sale:0
+msgid "Sale Pricelists"
+msgstr "Listino prezzo vendita"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,delivery:0
+msgid "Delivery Costs"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "The sale order '%s' has been set in draft state."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "The sale order '%s' has been cancelled."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Partial Delivery"
@@ -32,76 +980,54 @@ msgid "Confirm Quotation"
 msgstr "Confirm Quotation"
 
 #. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Ordine di consegna"
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr ""
 
 #. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Ripartizione Partner"
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Ricrea Fattura"
 
 #. module: sale
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome del modulo non valido nella definizione dell'azione."
+#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
+#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
+msgid "Deliveries to Invoice"
+msgstr ""
 
 #. module: sale
 #: selection:sale.order,state:0
+#: selection:sale.report,state:0
 msgid "Waiting Schedule"
 msgstr "In attesa di programmazione"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
 msgstr ""
-"Se non hai disponibile a magazzino tutto il materiale da consegnare in una "
-"sola volta, accetti la spedizione parziale o no?"
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "da Stock"
+#: view:sale.config.picking_policy:0
+#: view:sale.installer:0
+msgid "title"
+msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sale Order"
-msgstr "Procedura per fornire un ordine di vendita"
+#: model:process.node,name:sale.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
-msgid "Quantity"
-msgstr "Quantità"
-
-#. module: sale
-#: wizard_view:sale.advance_payment_inv,create:0
-msgid "You invoice has been successfully created !"
-msgstr "La tua fattura è stata creata con successo!"
+#: selection:sale.order,order_policy:0
+msgid "Invoice from Delivery"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Automatic Declaration"
-msgstr "Definizione Automatica"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-#: model:ir.ui.menu,name:sale.menu_action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Righe Consegnate e Non Fatturate"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Impost come Bozza"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Invoice Exception"
-msgstr "Eccezione Fattura"
+msgid "Order date"
+msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
@@ -110,14 +1036,9 @@ msgid ""
 msgstr "Questa è la lista di Bolle generate per questa Fattura"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Delivery, from the warehouse to the customer."
-msgstr "Consegna, dal magazzino al cliente."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
+#: model:process.node,note:sale.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
@@ -126,62 +1047,37 @@ msgstr "Convalida"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Make Invoice"
-msgstr "Crea fattura"
+msgid "Confirm Order"
+msgstr "Conferma Ordine"
 
 #. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotale"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"Whenever confirm button is clicked, the draft state is moved to manual. that "
-"is, quotation is moved to  sale order."
+#: model:process.transition,name:sale.process_transition_saleprocurement0
+msgid "Create Procurement Order"
 msgstr ""
-"Ogni volta che il pulsante conferma viene cliccato, lo stato di bozza evolve "
-"in manuale, cioè l'imputazione diventa ordine di vendita."
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
-msgid "Cancel Order"
-msgstr "Annulla Ordine"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Spostamenti Inventario"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Manual Designation"
-msgstr "Assegnazione Manuale"
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sale Order"
+msgstr "Ordine di Vendita"
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Note"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-msgid "Invoice after delivery"
-msgstr "Fattura a consegna avvenuta"
-
-#. module: sale
 #: field:sale.order,amount_tax:0
 #: field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Tasse"
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Net Total :"
-msgstr "Totale netto:"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"A sale order generates an invoice, as soon as it is confirmed by the "
+"salesman. Depending on the Invoicing control of the sale order, the invoice "
+"is based on delivered or on ordered quantities."
+msgstr ""
 
 #. module: sale
 #: field:sale.order,order_policy:0
@@ -189,66 +1085,40 @@ msgid "Shipping Policy"
 msgstr "Politiche di Spedizione"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-msgid "Cancelled"
-msgstr "Annullato"
+#: model:ir.model,name:sale.model_stock_move
+msgid "Stock Move"
+msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0
-msgid "Shipping Exception"
-msgstr "Eccezione Spedizione"
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
 
 #. module: sale
-#: field:sale.order,amount_total:0
-msgid "Total"
-msgstr "Totale"
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sale order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the date 'Ordered Date'."
+msgstr ""
 
 #. module: sale
-#: field:sale.order,origin:0
-msgid "Origin"
-msgstr "Origine"
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Indirizzo Fatturazione"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Outgoing Products"
-msgstr "Prodotti in uscita"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Reference"
-msgstr "Riferimento"
-
-#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Tutto in una volta"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid "Procurement is created after confirmation of sale order."
-msgstr "L'approvvigionamento è creato dopo la conferma di vendita ordine."
-
-#. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Contabilità Analitica"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "TVA :"
-msgstr "TVA"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procure Method"
-msgstr "Metodo Approvvigionamento"
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sale order in draft state.       "
+"              \n"
+"* The 'Confirmed' state is set when the related sale order is confirmed.     "
+"                \n"
+"* The 'Exception' state is set when the related sale order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sale order line has been picked.          "
+"           \n"
+"* The 'Cancelled' state is set when a user cancel the sale order related."
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
@@ -256,65 +1126,20 @@ msgid "Extra Info"
 msgstr "Informazioni Aggiuntive"
 
 #. module: sale
-#: rml:sale.order:0
+#: report:sale.order:0
 msgid "Fax :"
 msgstr "Fax"
 
 #. module: sale
-#: field:sale.order.line,price_net:0
-msgid "Net Price"
-msgstr "Prezzo Netto"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree9
-#: model:ir.ui.menu,name:sale.menu_action_order_tree9
-msgid "My sales order in progress"
-msgstr "I Miei Ordini di Vendita in esecuzione"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Quantità (Unità di Vendita)"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you invoice based on ordered or shipped quantities. If the product "
-"is a service, shipped quantities means hours spent on the associated tasks."
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
 msgstr ""
-"L ordine di vendita creerà automaticamente una proposta di fattura (Bozza). "
-"Quantità ordinate e consegnate potrebbero non corrispondere. Devi scegliere "
-"se fatturare sulla base degli ordini o delle spedizioni. Se il prodotto "
-"corrisponde ad un servizio, le quantità spedite corrispondono alle ore "
-"impiegate nelle corrispondenti attività."
 
 #. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confermato"
-
-#. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Scadenza Pagamento Predefinita"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree_all
-#: model:ir.ui.menu,name:sale.menu_action_order_tree_all
-msgid "All Sales Order"
-msgstr "Tutti gli Ordini di Vendita"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Conferma"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Indirizzo Spedizione"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
+msgid "Sales by Product's Category"
+msgstr ""
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -327,351 +1152,85 @@ msgid "Invoice Based on Sales Orders"
 msgstr "Fattura basata su Ordini di Vendita"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sale Shop"
-msgstr "Negozio di Vendita"
+#: model:ir.model,name:sale.model_stock_picking
+msgid "Picking List"
+msgstr ""
 
 #. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Magazzino"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Order N°"
-msgstr "Ordine N°"
-
-#. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
-msgid "Order Lines"
-msgstr "Righe Ordine"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Disc.(%)"
-msgstr "Sconto (%)"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Righe Fattura"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forza Assegnazione"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Totale Imponibile"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
+#: model:process.transition,note:sale.process_transition_confirmquotation0
 msgid ""
-"Packing list is created when 'Assign' is being clicked after confirming the "
-"sale order. This transaction moves the sale order to packing list."
-msgstr ""
-"La lista di cosegma è creata quando 'Assegna' è stato cliccato dopo la "
-"conferma di ordine vendita. Questa transazione sposta l'ordine di vendita "
-"alla lista di consegna."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree8
-#: model:ir.ui.menu,name:sale.menu_action_order_tree8
-msgid "My sales order waiting Invoice"
-msgstr "I Miei Ordini di Vendita in attesa di Fatturazione"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Shipping address :"
-msgstr "Indirizzo Spedizione:"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
-"will automatic create after delivery."
-msgstr ""
-"Quando si seleziona la politica di spedizione = 'Fattura automatica a "
-"consegna avvenuta', sarà creata in  automatico dopo la consegna."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Consegna totale"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Manual Description"
-msgstr "Descrizione Manuale"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Quantità (Unità di misura)"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree1
-#: model:ir.ui.menu,name:sale.menu_action_order_line_tree1
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Righe Ordine di Vendita"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Quantità Ordinate"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sale Order Procurement"
-msgstr "Approvvigionamento Ordine di Vendita"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Packing"
-msgstr "Imballaggio"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Total :"
-msgstr "Totale :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Conferma Ordine"
-
-#. module: sale
-#: field:sale.order,name:0
-msgid "Order Reference"
-msgstr "Rif. Ordine"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-msgid "Done"
-msgstr "Completato"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Listino Prezzi"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_shop_configuration
-msgid "Configuration"
-msgstr "Configurazione"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on Order After Delivery"
-msgstr "Fattura su Ordine a consegna effettuata"
-
-#. module: sale
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Packing"
+"The salesman confirms the quotation. The state of the sale order becomes 'In "
+"progress' or 'Manual in progress'."
 msgstr ""
 
 #. module: sale
-#: field:sale.shop,payment_account_id:0
-msgid "Payment Accounts"
-msgstr "Conto per Pagamenti"
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Error !"
+msgstr "Errore!"
 
 #. module: sale
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
+#: selection:sale.report,month:0
+msgid "July"
 msgstr ""
-"Errore: L'Unità di Vendita deve essere in una categoria diversa da quella "
-"dell'Unità di misura"
 
 #. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Ref"
-msgstr "Rif. Cliente"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales orders"
-msgstr "Ordini di Vendita"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
 #: field:sale.order.line,procurement_id:0
 msgid "Procurement"
 msgstr "Approvvigionamento"
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Payment accounts"
-msgstr "Contabilità Pagamenti"
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Eccezione Spedizione"
 
 #. module: sale
-#: wizard_button:sale.advance_payment_inv,create,end:0
-msgid "Close"
-msgstr "Chiudi"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Draft Invoice"
-msgstr "Bozza Fattura"
-
-#. module: sale
-#: wizard_field:sale.order.line.make_invoice,init,grouped:0
-#: wizard_field:sale.order.make_invoice,init,grouped:0
+#: field:sale.make.invoice,grouped:0
 msgid "Group the invoices"
 msgstr "Raggruppa Fatture"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-#: model:ir.ui.menu,name:sale.menu_action_order_tree5
-msgid "All Quotations"
-msgstr "Tutti i Preventivi"
+#: selection:sale.order,order_policy:0
+msgid "Shipping & Manual Invoice"
+msgstr "Spedizione & Fatturazione Manuale"
 
 #. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Sconto (%)"
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Picking Information !"
+msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "Draft customer invoice, to be reviewed by accountant."
-msgstr "Fattura fornitore in bozza, deve essere revisionata da un contabile."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree3
-#: model:ir.ui.menu,name:sale.menu_action_order_tree3
-msgid "Sales Order To Be Invoiced"
-msgstr "Ordine di Vendita da Fatturare"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Procurement for each line"
-msgstr "Approvvigionamento per ogni riga"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree10
-#: model:ir.ui.menu,name:sale.menu_action_order_tree10
-msgid "My Quotations"
-msgstr "I Miei Preventivi"
-
-#. module: sale
-#: wizard_view:sale.advance_payment_inv,create:0
-msgid "Invoices"
-msgstr "Fatture"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Riga Ordine"
-
-#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Packing Default Policy"
-msgstr "Politica standard di ordine consegna"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Manages the delivery and invoicing progress"
-msgstr "Gestisce la consegna e il processo di fatturazione"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Politica di Spedizione standard"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Confezionamento"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mese"
 
 #. module: sale
 #: model:ir.module.module,shortdesc:sale.module_meta_information
-#: model:ir.ui.menu,name:sale.menu_sale_root
 msgid "Sales Management"
 msgstr "Gestione Vendite"
 
 #. module: sale
-#: field:sale.order.line,order_id:0
-msgid "Order Ref"
-msgstr "Rif. Ordine"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Ricrea Fattura"
-
-#. module: sale
-#: field:sale.order,user_id:0
-msgid "Salesman"
-msgstr "Venditore"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"In sale order , procuerement for each line and it comes into the procurement "
-"order"
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid " Quantity: "
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Taxes :"
-msgstr "Tasse"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Fatturato"
-
-#. module: sale
-#: model:ir.actions.wizard,name:sale.advance_payment
-msgid "Advance Invoice"
-msgstr "Fattura di acconto"
-
-#. module: sale
-#: field:sale.order,state:0
-msgid "Order State"
-msgstr "Stato Ordine"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_action_order_line_tree2
-msgid "Uninvoiced Lines"
-msgstr "Righe non fatturate"
-
-#. module: sale
-#: model:ir.actions.todo,note:sale.config_wizard_step_sale_picking_policy
-msgid ""
-"This Configuration step use to set default picking policy when make sale "
-"order"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
 msgstr ""
-"Questo passo di configurazione serve ad impostare la politica di consegna "
-"standard quando viene fatto un ordine di vendita"
 
 #. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-msgid "Sales Process"
-msgstr "Processo di vendita"
+#: model:process.node,note:sale.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sale order line."
+msgstr ""
 
 #. module: sale
-#: wizard_view:sale.order.line.make_invoice,init:0
-#: wizard_button:sale.order.line.make_invoice,init,invoice:0
-#: wizard_view:sale.order.make_invoice,init:0
-#: wizard_button:sale.order.make_invoice,init,invoice:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
 msgid "Create invoices"
 msgstr "Crea fatture"
 
@@ -684,31 +1243,28 @@ msgstr ""
 "trovarsi nella stessa categoria"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree7
-#: model:ir.ui.menu,name:sale.menu_action_order_tree7
-msgid "My sales in shipping exception"
-msgstr "Le Mie Vendita in Eccezione di Spedizione"
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
 
 #. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Sales Configuration"
-msgstr "Configurazione di vendite"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-#: model:ir.ui.menu,name:sale.menu_action_order_tree2
-msgid "Sales in Exception"
-msgstr "Vendite in Eccezione"
+#: help:sale.config.picking_policy,step:0
+msgid ""
+"By default, OpenERP is able to manage complex routing and paths of products "
+"in your warehouse and partner locations. This will configure the most common "
+"and simple methods to deliver products to the customer in one or two "
+"operations by the worker."
+msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "su Ordine"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Bozza"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -716,80 +1272,18 @@ msgid "Paid"
 msgstr "Pagato"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Procurement Corrected"
-msgstr "Approvvigionamento corretto"
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Spedizione & Fatturazione Manuale"
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sale order"
+msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Sale Procurement"
-msgstr "Vendita appalti"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sale Order Logistic"
-msgstr "Configura la logistica di ordine di vendita"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Totale Imponibile"
-
-#. module: sale
-#: field:sale.order.line,state:0
-msgid "Status"
-msgstr "Stato"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Packing Policy"
-msgstr "Politiche Preparazione Merci"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Vendite Prodotto"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Our Salesman"
-msgstr "Il Nostro Venditore"
-
-#. module: sale
-#: wizard_button:sale.advance_payment_inv,init,create:0
-msgid "Create Advance Invoice"
-msgstr "Crea una fattura di acconto"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid "One procurement for each product."
-msgstr "Un approvvigionamento per ciascun prodotto."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sales Orders"
-msgstr "Ordini di Vendita"
-
-#. module: sale
-#: field:product.product,pricelist_sale:0
-msgid "Sale Pricelists"
-msgstr "Listino prezzo vendita"
-
-#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Consegna Diretta"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Proprietà"
@@ -797,199 +1291,78 @@ msgstr "Proprietà"
 #. module: sale
 #: model:process.node,name:sale.process_node_quotation0
 #: selection:sale.order,state:0
+#: selection:sale.report,state:0
 msgid "Quotation"
 msgstr "Preventivo"
 
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance Product"
-msgstr "Acconto prodotto"
-
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoice0
 msgid ""
-"Invoice is created when 'Create Invoice' is being clicked after confirming "
-"the sale order. This transaction moves the sale order to invoices."
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
 msgstr ""
-"La fattura viene creata cliccando 'Crea fattura' dopo aver confermato "
-"l'ordine di vendita. Questa transazione crea una fattura sulla base "
-"dell'ordine di vendita."
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calcola"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: model:ir.ui.menu,name:sale.menu_action_shop_form
-#: field:sale.order,shop_id:0
-msgid "Shop"
-msgstr "Negozio"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "VAT"
-msgstr "IVA"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-#: model:ir.ui.menu,name:sale.menu_action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Ordini di Vendita in esecuzione"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Assegna"
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Cronologia"
-
-#. module: sale
-#: help:sale.order,order_policy:0
+#: help:sale.config.picking_policy,order_policy:0
 msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the packing order after the payment of this invoice.\n"
-"  - The 'Shipping & Manual Invoice' will create the packing order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-"  - The 'Invoice on Order After Delivery' choice will generate the draft "
-"invoice based on sale order after all packing lists have been finished.\n"
-"  - The 'Invoice from the packing' choice is used to create an invoice "
-"during the packing process."
+"You can generate invoices based on sales orders or based on shippings."
 msgstr ""
-"La politica di spedizione è utilizzata per sincronizzare le operazioni di "
-"fatturazione e consegna\n"
-"  - La scelta 'Pagamento prima della consegna' dapprima genererà la fattura "
-"e poi, dopo il pagamento di questa fattura, genererà il DDT.\n"
-"  - 'Spedizione e fatturazione manuale' genererà direttamente il DDT e "
-"attenderà che l'utente clicchi manualmente sul bottone \"Crea fattura\" per "
-"generare la bozza di fattura.\n"
-"  - 'Fattura su ordine a consegna effettuata' genererà la bozza di fattura "
-"basata sull'ordine di vendita dopo che la merce sia uscita.\n"
-"  - 'Fattura da DDT' è utilizzato per creare una fattura durante il processo "
-"di spedizione."
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Your Reference"
-msgstr "Riferimento"
-
-#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Solo consegna"
 
 #. module: sale
 #: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales order lines"
-msgstr "Righe Ordine di Vendita"
+msgid "Related Invoices"
+msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Sequenza"
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sale order to invoice."
+msgstr ""
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: model:ir.ui.menu,name:sale.menu_config_sale
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:sale.order:0
+#: view:sale.report:0
 msgid "Sales"
 msgstr "Vendite"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Qta'"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Packing OUT is created for stockable products."
-msgstr "L'ordine di consegna è creato per i prodotti a magazzino"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other data"
-msgstr "Altri Dati"
-
-#. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: report:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Prezzo unitario"
 
 #. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Posizione Fiscale"
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Completato"
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Invoice address :"
-msgstr "Indirizzo di Fatturazione"
+#: model:ir.model,name:sale.model_sale_installer
+msgid "sale.installer"
+msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: field:sale.order,invoice_ids:0
+#: model:process.node,name:sale.process_node_invoice0
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Invoice"
 msgstr "Fattura"
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancel0
-#: model:process.transition.action,name:sale.process_transition_action_cancel1
-#: model:process.transition.action,name:sale.process_transition_action_cancel2
-#: wizard_button:sale.advance_payment_inv,init,end:0
-#: view:sale.config.picking_policy:0
-#: view:sale.order.line:0
-#: wizard_button:sale.order.line.make_invoice,init,end:0
-#: wizard_button:sale.order.make_invoice,init,end:0
-msgid "Cancel"
-msgstr "Annulla"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sale order. The exception state is "
-"automatically set when a cancel operation occurs in the invoice validation "
-"(Invoice Exception) or in the packing list process (Shipping Exception). The "
-"'Waiting Schedule' state is set when the invoice is confirmed but waiting "
-"for the scheduler to run on the date 'Date Ordered'."
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Could not cancel sale order line!"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "UoM"
-msgstr "Unità di Misura"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Numero di Packages (divisione spedizione)"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Confirming the packing list moves them to delivery order. This can be done "
-"by clicking on 'Validate' button."
+#: selection:sale.config.picking_policy,step:0
+msgid "Picking List & Delivery Order"
 msgstr ""
-"Confermando l'elenco degli imballaggi vengono spostati agli ordini di "
-"consegna. Questo può essere fatto cliccando sul pulsante 'Convalida'."
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "In Progress"
-msgstr "In corso"
-
-#. module: sale
-#: wizard_view:sale.advance_payment_inv,init:0
-msgid "Advance Payment"
-msgstr "Pagamento Acconto"
 
 #. module: sale
 #: constraint:ir.model:0
@@ -1000,61 +1373,24 @@ msgstr ""
 "speciali!"
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid "Confirm sale order and Create invoice."
-msgstr "Conferma l'ordine di vendita e crea la fattura."
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Packing List & Delivery Order"
-msgstr "Lista di consegna e Ordini in Consegna"
+#: field:sale.order,picking_policy:0
+msgid "Picking Policy"
+msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Eccezione"
+#: model:process.node,note:sale.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Sale Order Lines"
-msgstr "Righe Ordine di Vendita"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.order:0
-msgid "Create Invoice"
-msgstr "Crea fattura"
-
-#. module: sale
-#: wizard_view:sale.order.line.make_invoice,init:0
-#: wizard_view:sale.order.make_invoice,init:0
-msgid "Do you really want to create the invoices ?"
-msgstr "Vuoi veramente creare la Fattura ?"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Invoice based on packing lists"
-msgstr "Fattura basata su lista ordini"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Set Default"
-msgstr "Imposta predefinito"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales order"
-msgstr "Ordine di vendita"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Quotation (A sale order in draft state)"
-msgstr "Preventivo (Un ordine di vendita in stato di bozza)"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "Sale Invoice"
-msgstr "Fattura di vendita"
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Shipping Default Policy"
+msgstr "Politica di Spedizione standard"
 
 #. module: sale
 #: field:sale.order,incoterm:0
@@ -1062,56 +1398,23 @@ msgid "Incoterm"
 msgstr "Incoterm"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,product_id:0
+#: model:ir.model,name:sale.model_product_product
+#: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
 msgid "Product"
 msgstr "Prodotto"
 
 #. module: sale
-#: wizard_button:sale.advance_payment_inv,create,open:0
-msgid "Open Advance Invoice"
-msgstr "Apri la fattura appena creata dell'acconto"
+#: model:ir.ui.menu,name:sale.menu_invoiced
+msgid "Invoicing"
+msgstr ""
 
 #. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Contatto Ordinante"
-
-#. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Descrizione"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Price"
-msgstr "Prezzo"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Deliver"
-msgstr "Consegnare"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Preventivo / Ordine"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Quotation N°"
-msgstr "Preventivo N°"
-
-#. module: sale
-#: field:stock.move,sale_line_id:0
-msgid "Sale Order Line"
-msgstr "Riga Ordine di vendita"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sale order is confirmed"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
@@ -1119,46 +1422,9 @@ msgid "Cancel Assignation"
 msgstr "Annulla Assegnazione"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice from the Packing"
-msgstr "DDT"
-
-#. module: sale
-#: model:ir.actions.wizard,name:sale.wizard_sale_order_line_invoice
-#: model:ir.actions.wizard,name:sale.wizard_sale_order_make_invoice
-msgid "Make invoices"
-msgstr "Crea fatture"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact that requested the order or quotation."
-msgstr "Nome e indirizzo del contatto che ha richiesto il preventivo/ordine"
-
-#. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Cliente"
-
-#. module: sale
-#: field:product.product,pricelist_purchase:0
-msgid "Purchase Pricelists"
-msgstr "Listini di Acquisto"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sale Order"
-msgstr "Ordine di Vendita"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Nome"
+#: model:ir.model,name:sale.model_sale_config_picking_policy
+msgid "sale.config.picking_policy"
+msgstr "sale.config.picking_policy"
 
 #. module: sale
 #: field:sale.order,invoice_quantity:0
@@ -1166,19 +1432,7 @@ msgid "Invoice on"
 msgstr "fattura su"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree_new
-#: model:ir.ui.menu,name:sale.menu_action_order_tree_new
-msgid "New Quotation"
-msgstr "Nuovo preventivo"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total amount"
-msgstr "Importo Totale"
-
-#. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: report:sale.order:0
 msgid "Date Ordered"
 msgstr "Data ordine"
 
@@ -1189,6 +1443,7 @@ msgstr "Unità di Vendita Prodotto"
 
 #. module: sale
 #: selection:sale.order,state:0
+#: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr "Manuale in Progresso"
 
@@ -1198,63 +1453,299 @@ msgid "Product UoM"
 msgstr "Unità di Misura Prodotto"
 
 #. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, Open ERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+#: view:sale.report:0
+msgid "Sales By Salesman"
 msgstr ""
-"Di default, Open ERP è in grado di gestire complessi instradamenti e "
-"percorsi di prodotti all'interno del proprio magazzino e dei partner. Questo "
-"organizzerà il modo più comune e semplice per consegnare prodotti ai clienti "
-"con una o due operazioni dell'operatore."
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sale Order"
+#: view:sale.order:0
+msgid "Logistic"
 msgstr ""
-"Configura le Politiche di Preparazione Merci per gli Ordini di Vendita"
 
 #. module: sale
-#: model:process.node,name:sale.process_node_order0
+#: view:sale.order.line:0
 msgid "Order"
 msgstr "Ordine"
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Payment Terms"
-msgstr "Termini di Pagamento"
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sale order"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Invoice Corrected"
-msgstr "Fattura corretta"
+msgid "States"
+msgstr "Stati"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Riferimento cliente"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Totale"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sale order has been delivered. This field is updated "
+"only after the scheduler have been launched !"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,step:0
+msgid "Steps To Deliver a Sale Order"
+msgstr "Procedura per fornire un ordine di vendita"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Eccezione Fattura"
+
+#. module: sale
+#: help:sale.installer,sale_margin:0
+msgid ""
+"Gives the margin of profitability by calculating the difference between Unit "
+"Price and Cost Price."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this sale order."
+msgstr ""
+"Devi prima cancellare tutte le fatture associate a questo ordine di vendita"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Totale netto:"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Annullato"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Negozio"
+
+#. module: sale
+#: view:sale.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,uom_name:0
+msgid "Default UoM"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Quantità (Unità di Vendita)"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid " Type of ul: "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confermato"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Conferma"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this sale order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Righe Fattura"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Righe Ordine di Vendita"
 
 #. module: sale
 #: field:sale.order.line,delay:0
-msgid "Delivery Delay"
-msgstr "Ritardo Consegna"
+msgid "Delivery Lead Time"
+msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Related invoices"
-msgstr "Fatture correlate"
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configurazione"
 
 #. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nome Negozio"
-
-#. module: sale
-#: field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Termini di pagamento"
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "There is no sale journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
 
 #. module: sale
 #: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Pagamento prima della consegna"
+msgid "Invoice on Order After Delivery"
+msgstr "Fattura su Ordine a consegna effettuata"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+msgid ""
+"For every sale order line, a procurement order is created to supply the sold "
+"product."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Complete Delivery"
+msgstr "Consegna totale"
+
+#. module: sale
+#: view:sale.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: sale
+#: help:sale.config.picking_policy,picking_policy:0
+msgid ""
+"The Shipping Policy is used to configure per order if you want to deliver as "
+"soon as possible when one product is available or you wait that all products "
+"are available.."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source document"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: sale
+#: view:sale.open.invoice:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Fatture"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,config_logo:0
+#: field:sale.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesman"
+msgstr "Venditore"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -1267,295 +1758,679 @@ msgstr ""
 "stesso Ordine di Vendita potrebbe essere stato fatturato in momenti diversi "
 "(Es: per righe)."
 
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Fatturato"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#, python-format
+msgid "Advance Invoice"
+msgstr "Fattura di acconto"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleorderprocurement0
+msgid "Sale Order Requisition"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Bozza"
+
+#. module: sale
+#: field:sale.config.picking_policy,progress:0
+#: field:sale.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+msgid "Product sales"
+msgstr "Vendite Prodotto"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Ordered Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Ordini di Vendita"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Payment Terms"
+msgstr "Termini di Pagamento"
+
+#. module: sale
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "Direct Delivery"
+msgstr "Consegna Diretta"
+
+#. module: sale
+#: field:sale.installer,sale_journal:0
+msgid "Invoicing journals"
+msgstr ""
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Acconto prodotto"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped Qty"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:0
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sale Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sale order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sale Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "Ordini di Vendita in esecuzione"
+
+#. module: sale
+#: field:sale.installer,sale_layout:0
+msgid "Sales Order Layout Improvement"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
+#, python-format
+msgid "Error"
+msgstr "Errore"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_assign0
+msgid "Assign"
+msgstr "Assegna"
+
+#. module: sale
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "da Stock"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sale Shop"
+msgstr "Negozio di Vendita"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales By Customer"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "Close"
+msgstr "Chiudi"
+
+#. module: sale
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Not enough stock !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order Lines"
+msgstr "Righe Ordine di Vendita"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Descrizione"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
+#, python-format
+msgid ""
+"You cannot make an advance on a sale order \\n                             "
+"that is defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: help:sale.installer,sale_order_dates:0
+msgid "Adds commitment, requested and effective dates on Sales Orders."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: sale
+#: help:sale.installer,sale_journal:0
+msgid ""
+"Allows you to group and invoice your delivery orders according to different "
+"invoicing types: daily, weekly, etc."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
-msgid "States"
-msgstr "Stati"
+msgid "Search Sales Order"
+msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Peso"
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Termini di pagamento"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "After confirming order, Create the invoice."
-msgstr "Dopo aver confermato un ordine, crea una fattura."
+#: model:process.transition,note:sale.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sale order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sale order's "
+"parameters. "
+msgstr ""
 
 #. module: sale
-#: constraint:product.product:0
-msgid "Error: Invalid ean code"
-msgstr "Errore: codice EAN non valido"
+#: field:sale.config.picking_policy,picking_policy:0
+msgid "Picking Default Policy"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr "Preventivo N°"
 
 #. module: sale
 #: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Prelevato"
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Contabilità"
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr ""
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Deliveries"
 msgstr "Fattura basata su Consegne"
 
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Spostamenti Stock"
+#~ msgid "In progress"
+#~ msgstr "In corso"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-#: model:ir.ui.menu,name:sale.menu_action_order_tree
-msgid "My Sales Order"
-msgstr "I Miei Ordini di Vendita"
+#~ msgid "Manual in progress"
+#~ msgstr "Progressione Manuale"
 
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sale Order line"
-msgstr "Riga Ordine di Vendita"
+#~ msgid ""
+#~ "This Configuration step use to set default picking policy when make sale "
+#~ "order"
+#~ msgstr ""
+#~ "Questo passo di configurazione serve ad impostare la politica di consegna "
+#~ "standard quando viene fatto un ordine di vendita"
 
-#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Dashboard for sales"
-msgstr "Cruscotto per le vendite"
+#~ msgid ""
+#~ "By default, Open ERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Di default, Open ERP è in grado di gestire complessi instradamenti e "
+#~ "percorsi di prodotti all'interno del proprio magazzino e dei partner. Questo "
+#~ "organizzerà il modo più comune e semplice per consegnare prodotti ai clienti "
+#~ "con una o due operazioni dell'operatore."
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sale Dashboard"
-msgstr "Cruscotto Vendite"
+#~ msgid "You invoice has been successfully created !"
+#~ msgstr "La tua fattura è stata creata con successo!"
 
-#. module: sale
-#: view:board.board:0
-msgid "Sales of the month"
-msgstr "Vendite del Mese"
+#~ msgid "Automatic Declaration"
+#~ msgstr "Definizione Automatica"
 
-#. module: sale
-#: view:board.board:0
-msgid "Sales manager board"
-msgstr "Dashboard Sales Manager"
+#~ msgid "Delivery, from the warehouse to the customer."
+#~ msgstr "Consegna, dal magazzino al cliente."
 
-#. module: sale
-#: view:board.board:0
-msgid "Cases of the month"
-msgstr "Casi del Mese"
+#~ msgid "After confirming order, Create the invoice."
+#~ msgstr "Dopo aver confermato un ordine, crea una fattura."
 
-#. module: sale
-#: view:board.board:0
-msgid "My open quotations"
-msgstr "Le Mie Domande Aperte"
+#~ msgid ""
+#~ "Whenever confirm button is clicked, the draft state is moved to manual. that "
+#~ "is, quotation is moved to  sale order."
+#~ msgstr ""
+#~ "Ogni volta che il pulsante conferma viene cliccato, lo stato di bozza evolve "
+#~ "in manuale, cioè l'imputazione diventa ordine di vendita."
 
-#. module: sale
-#: view:board.board:0
-msgid "Cases statistics"
-msgstr "Statistiche Casi"
+#~ msgid "Manual Designation"
+#~ msgstr "Assegnazione Manuale"
 
-#. module: sale
-#: view:board.board:0
-msgid "Top ten sales of the month"
-msgstr "Le migliori 10 vendite del mese"
+#~ msgid "Invoice after delivery"
+#~ msgstr "Fattura a consegna avvenuta"
 
-#. module: sale
-#: field:report.sale.order.category,price_average:0
-#: field:report.sale.order.product,price_average:0
-msgid "Average Price"
-msgstr "Prezzo Medio"
+#~ msgid "Origin"
+#~ msgstr "Origine"
 
-#. module: sale
-#: model:ir.model,name:sale.model_report_sale_order_created
-msgid "Report of Created Sale Order"
-msgstr "Relazione sugli Ordini di Vendita Creati"
+#~ msgid "Outgoing Products"
+#~ msgstr "Prodotti in uscita"
 
-#. module: sale
-#: view:report.sale.order.category:0
-msgid "Sales Orders by category"
-msgstr "Ordini di Vendita per Categoria"
+#~ msgid "Reference"
+#~ msgstr "Riferimento"
 
-#. module: sale
-#: model:ir.report.custom,name:sale.ir_report_custom_6
-#: model:ir.report.custom,title:sale.ir_report_custom_6
-msgid "Monthly cumulated sales turnover over one year"
-msgstr "Totale cumulativo Vendite Mensili per un anno"
+#~ msgid "Procurement is created after confirmation of sale order."
+#~ msgstr "L'approvvigionamento è creato dopo la conferma di vendita ordine."
 
-#. module: sale
-#: model:ir.model,name:sale.model_report_sale_order_product
-msgid "Sales Orders by Products"
-msgstr "Ordini di Vendita per Prodotto"
+#~ msgid "Procure Method"
+#~ msgstr "Metodo Approvvigionamento"
 
-#. module: sale
-#: model:ir.ui.menu,name:sale.ir_ui_menu1
-msgid "Monthly Sales Turnover Over One Year"
-msgstr "Ammontare Vendite mensili dopo un anno"
+#~ msgid "Net Price"
+#~ msgstr "Prezzo Netto"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_turnover_product_tree
-#: model:ir.model,name:sale.model_report_turnover_per_product
-#: view:report.turnover.per.product:0
-msgid "Turnover Per Product"
-msgstr "Turnover per Prodotto"
+#~ msgid "My sales order in progress"
+#~ msgstr "I Miei Ordini di Vendita in esecuzione"
 
-#. module: sale
-#: model:ir.ui.menu,name:sale.next_id_82
-msgid "All Months"
-msgstr "Tutti i Mesi"
+#~ msgid ""
+#~ "The sale order will automatically create the invoice proposition (draft "
+#~ "invoice). Ordered and delivered quantities may not be the same. You have to "
+#~ "choose if you invoice based on ordered or shipped quantities. If the product "
+#~ "is a service, shipped quantities means hours spent on the associated tasks."
+#~ msgstr ""
+#~ "L ordine di vendita creerà automaticamente una proposta di fattura (Bozza). "
+#~ "Quantità ordinate e consegnate potrebbero non corrispondere. Devi scegliere "
+#~ "se fatturare sulla base degli ordini o delle spedizioni. Se il prodotto "
+#~ "corrisponde ad un servizio, le quantità spedite corrispondono alle ore "
+#~ "impiegate nelle corrispondenti attività."
 
-#. module: sale
-#: field:report.sale.order.category,price_total:0
-#: field:report.sale.order.product,price_total:0
-msgid "Total Price"
-msgstr "Prezzo Totale"
+#~ msgid "All Sales Order"
+#~ msgstr "Tutti gli Ordini di Vendita"
 
-#. module: sale
-#: model:ir.model,name:sale.model_report_sale_order_category
-msgid "Sales Orders by Categories"
-msgstr "Ordini di vendita per Categoria"
+#~ msgid ""
+#~ "Packing list is created when 'Assign' is being clicked after confirming the "
+#~ "sale order. This transaction moves the sale order to packing list."
+#~ msgstr ""
+#~ "La lista di cosegma è creata quando 'Assegna' è stato cliccato dopo la "
+#~ "conferma di ordine vendita. Questa transazione sposta l'ordine di vendita "
+#~ "alla lista di consegna."
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_sale_list
-#: model:ir.ui.menu,name:sale.menu_report_order_sale_list
-msgid "Sales of the Month"
-msgstr "Vendite del mese"
+#~ msgid "My sales order waiting Invoice"
+#~ msgstr "I Miei Ordini di Vendita in attesa di Fatturazione"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_product_tree
-#: model:ir.ui.menu,name:sale.menu_report_order_product
-msgid "Sales by Product (this month)"
-msgstr "Vendite per Prodotto (questo mese)"
+#~ msgid ""
+#~ "When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
+#~ "will automatic create after delivery."
+#~ msgstr ""
+#~ "Quando si seleziona la politica di spedizione = 'Fattura automatica a "
+#~ "consegna avvenuta', sarà creata in  automatico dopo la consegna."
 
-#. module: sale
-#: model:ir.report.custom,name:sale.ir_report_custom_4
-#: model:ir.report.custom,title:sale.ir_report_custom_4
-msgid "Monthly sales turnover over one year"
-msgstr "Ammontare complessivo vendite mensili dopo un anno"
+#~ msgid "Manual Description"
+#~ msgstr "Descrizione Manuale"
 
-#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management - Reporting"
-msgstr "Gestione vendite - Segnalazione"
+#~ msgid "Sale Order Procurement"
+#~ msgstr "Approvvigionamento Ordine di Vendita"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_category_tree_all
-#: model:ir.ui.menu,name:sale.menu_report_order_category_all
-#: view:report.sale.order.category:0
-msgid "Sales by Category of Products"
-msgstr "Vendite per categoria di Prodotto"
+#~ msgid "Packing"
+#~ msgstr "Imballaggio"
 
-#. module: sale
-#: model:ir.ui.menu,name:sale.ir_ui_menu3
-msgid "Monthly Cumulated Sales Turnover Over One Year"
-msgstr "Ammontare cumulativo Vendite mensili dopo un anno"
+#~ msgid "Sales orders"
+#~ msgstr "Ordini di Vendita"
 
-#. module: sale
-#: field:report.sale.order.category,quantity:0
-#: field:report.sale.order.product,quantity:0
-msgid "# of Products"
-msgstr "Numero Prodotti"
+#~ msgid "Payment accounts"
+#~ msgstr "Contabilità Pagamenti"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_product_tree_all
-#: model:ir.ui.menu,name:sale.menu_report_order_product_all
-#: view:report.sale.order.product:0
-msgid "Sales by Product"
-msgstr "Vendite per Prodotto"
+#~ msgid "Draft Invoice"
+#~ msgstr "Bozza Fattura"
 
-#. module: sale
-#: model:ir.ui.menu,name:sale.next_id_81
-msgid "This Month"
-msgstr "Questo Mese"
+#~ msgid "Sales Order To Be Invoiced"
+#~ msgstr "Ordine di Vendita da Fatturare"
 
-#. module: sale
-#: field:report.sale.order.category,category_id:0
-msgid "Categories"
-msgstr "Categorie"
+#~ msgid "Procurement for each line"
+#~ msgstr "Approvvigionamento per ogni riga"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
-msgid "Created Sale Orders"
-msgstr "Creazione Ordine di Vendita"
+#~ msgid "My Quotations"
+#~ msgstr "I Miei Preventivi"
 
-#. module: sale
-#: model:ir.ui.menu,name:sale.next_id_80
-msgid "Reporting"
-msgstr "Reportistica"
+#~ msgid "Packing Default Policy"
+#~ msgstr "Politica standard di ordine consegna"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_turnover_month_tree
-#: model:ir.model,name:sale.model_report_turnover_per_month
-#: view:report.turnover.per.month:0
-msgid "Turnover Per Month"
-msgstr "Turnover per Mese"
+#~ msgid "Manages the delivery and invoicing progress"
+#~ msgstr "Gestisce la consegna e il processo di fatturazione"
 
-#. module: sale
-#: model:ir.ui.menu,name:sale.ir_ui_menu2
-msgid "Daily Sales Turnover Over One Year"
-msgstr "Ammontare Vendite giornaliere dopo un anno"
+#~ msgid "Order Ref"
+#~ msgstr "Rif. Ordine"
 
-#. module: sale
-#: model:ir.ui.menu,name:sale.next_id_83
-msgid "Graphs"
-msgstr "Grafici"
+#~ msgid "My sales in shipping exception"
+#~ msgstr "Le Mie Vendita in Eccezione di Spedizione"
 
-#. module: sale
-#: selection:report.sale.order.category,state:0
-#: selection:report.sale.order.product,state:0
-msgid "Manual in progress"
-msgstr "Progressione Manuale"
+#~ msgid "Sales Configuration"
+#~ msgstr "Configurazione di vendite"
 
-#. module: sale
-#: field:report.turnover.per.month,turnover:0
-#: field:report.turnover.per.product,turnover:0
-msgid "Total Turnover"
-msgstr "Turnover Totale"
+#~ msgid "Sale Procurement"
+#~ msgstr "Vendita appalti"
 
-#. module: sale
-#: selection:report.sale.order.category,state:0
-#: selection:report.sale.order.product,state:0
-msgid "In progress"
-msgstr "In corso"
+#~ msgid "Configure Sale Order Logistic"
+#~ msgstr "Configura la logistica di ordine di vendita"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_category_tree
-#: model:ir.ui.menu,name:sale.menu_report_order_category
-msgid "Sales by Category of Product (this month)"
-msgstr "Vendite per categoria di Prodotto (questo mese)"
+#~ msgid "Status"
+#~ msgstr "Stato"
 
-#. module: sale
-#: model:ir.report.custom,name:sale.ir_report_custom_5
-#: model:ir.report.custom,title:sale.ir_report_custom_5
-msgid "Daily sales turnover over one year"
-msgstr "Ammontare Vendite giornaliere dopo un anno"
+#~ msgid "Packing Policy"
+#~ msgstr "Politiche Preparazione Merci"
 
-#. module: sale
-#: field:report.sale.order.category,name:0
-#: field:report.sale.order.product,name:0
-#: field:report.turnover.per.month,name:0
-msgid "Month"
-msgstr "Mese"
+#~ msgid "Create Advance Invoice"
+#~ msgstr "Crea una fattura di acconto"
 
-#. module: sale
-#: field:report.sale.order.category,count:0
-#: field:report.sale.order.product,count:0
-msgid "# of Lines"
-msgstr "Numero Righe"
+#~ msgid "One procurement for each product."
+#~ msgstr "Un approvvigionamento per ciascun prodotto."
 
-#. module: sale
-#: field:report.sale.order.created,create_date:0
-msgid "Create Date"
-msgstr "Data Creazione"
+#~ msgid ""
+#~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
+#~ "the sale order. This transaction moves the sale order to invoices."
+#~ msgstr ""
+#~ "La fattura viene creata cliccando 'Crea fattura' dopo aver confermato "
+#~ "l'ordine di vendita. Questa transazione crea una fattura sulla base "
+#~ "dell'ordine di vendita."
 
-#. module: sale
-#: view:report.sale.order.created:0
-msgid "Created Sales orders"
-msgstr "Ordini di Vendita Creati"
+#~ msgid "Make Invoice"
+#~ msgstr "Crea fattura"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_so_pipeline
-#: view:sale.order:0
-msgid "Sales by State"
-msgstr "Stao delle Vendite"
+#~ msgid "Sales order lines"
+#~ msgstr "Righe Ordine di Vendita"
+
+#~ msgid "Sequence"
+#~ msgstr "Sequenza"
+
+#~ msgid "Packing OUT is created for stockable products."
+#~ msgstr "L'ordine di consegna è creato per i prodotti a magazzino"
+
+#~ msgid "Other data"
+#~ msgstr "Altri Dati"
+
+#~ msgid ""
+#~ "Confirming the packing list moves them to delivery order. This can be done "
+#~ "by clicking on 'Validate' button."
+#~ msgstr ""
+#~ "Confermando l'elenco degli imballaggi vengono spostati agli ordini di "
+#~ "consegna. Questo può essere fatto cliccando sul pulsante 'Convalida'."
+
+#~ msgid "Advance Payment"
+#~ msgstr "Pagamento Acconto"
+
+#~ msgid "Confirm sale order and Create invoice."
+#~ msgstr "Conferma l'ordine di vendita e crea la fattura."
+
+#~ msgid "Do you really want to create the invoices ?"
+#~ msgstr "Vuoi veramente creare la Fattura ?"
+
+#~ msgid "Invoice based on packing lists"
+#~ msgstr "Fattura basata su lista ordini"
+
+#~ msgid "Set Default"
+#~ msgstr "Imposta predefinito"
+
+#~ msgid "Sales order"
+#~ msgstr "Ordine di vendita"
+
+#~ msgid "Quotation (A sale order in draft state)"
+#~ msgstr "Preventivo (Un ordine di vendita in stato di bozza)"
+
+#~ msgid "Sale Invoice"
+#~ msgstr "Fattura di vendita"
+
+#~ msgid "Open Advance Invoice"
+#~ msgstr "Apri la fattura appena creata dell'acconto"
+
+#~ msgid "Deliver"
+#~ msgstr "Consegnare"
+
+#~ msgid "Make invoices"
+#~ msgstr "Crea fatture"
+
+#~ msgid ""
+#~ "The name and address of the contact that requested the order or quotation."
+#~ msgstr "Nome e indirizzo del contatto che ha richiesto il preventivo/ordine"
+
+#~ msgid "New Quotation"
+#~ msgstr "Nuovo preventivo"
+
+#~ msgid "Total amount"
+#~ msgstr "Importo Totale"
+
+#~ msgid "Configure Picking Policy for Sale Order"
+#~ msgstr ""
+#~ "Configura le Politiche di Preparazione Merci per gli Ordini di Vendita"
+
+#~ msgid "Delivery Delay"
+#~ msgstr "Ritardo Consegna"
+
+#~ msgid "Related invoices"
+#~ msgstr "Fatture correlate"
+
+#~ msgid "My Sales Order"
+#~ msgstr "I Miei Ordini di Vendita"
+
+#~ msgid "Sale Order line"
+#~ msgstr "Riga Ordine di Vendita"
+
+#~ msgid "Draft customer invoice, to be reviewed by accountant."
+#~ msgstr "Fattura fornitore in bozza, deve essere revisionata da un contabile."
+
+#~ msgid "Sales Process"
+#~ msgstr "Processo di vendita"
+
+#~ msgid "Packing List & Delivery Order"
+#~ msgstr "Lista di consegna e Ordini in Consegna"
+
+#~ msgid "Invoice from the Packing"
+#~ msgstr "DDT"
+
+#~ msgid "Uninvoiced Lines"
+#~ msgstr "Righe non fatturate"
+
+#~ msgid ""
+#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+#~ "  - The 'Pay before delivery' choice will first generate the invoice and "
+#~ "then generate the packing order after the payment of this invoice.\n"
+#~ "  - The 'Shipping & Manual Invoice' will create the packing order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice.\n"
+#~ "  - The 'Invoice on Order After Delivery' choice will generate the draft "
+#~ "invoice based on sale order after all packing lists have been finished.\n"
+#~ "  - The 'Invoice from the packing' choice is used to create an invoice "
+#~ "during the packing process."
+#~ msgstr ""
+#~ "La politica di spedizione è utilizzata per sincronizzare le operazioni di "
+#~ "fatturazione e consegna\n"
+#~ "  - La scelta 'Pagamento prima della consegna' dapprima genererà la fattura "
+#~ "e poi, dopo il pagamento di questa fattura, genererà il DDT.\n"
+#~ "  - 'Spedizione e fatturazione manuale' genererà direttamente il DDT e "
+#~ "attenderà che l'utente clicchi manualmente sul bottone \"Crea fattura\" per "
+#~ "generare la bozza di fattura.\n"
+#~ "  - 'Fattura su ordine a consegna effettuata' genererà la bozza di fattura "
+#~ "basata sull'ordine di vendita dopo che la merce sia uscita.\n"
+#~ "  - 'Fattura da DDT' è utilizzato per creare una fattura durante il processo "
+#~ "di spedizione."
+
+#~ msgid "Dashboard for sales"
+#~ msgstr "Cruscotto per le vendite"
+
+#~ msgid "Sale Dashboard"
+#~ msgstr "Cruscotto Vendite"
+
+#~ msgid "Sales of the month"
+#~ msgstr "Vendite del Mese"
+
+#~ msgid "Sales manager board"
+#~ msgstr "Dashboard Sales Manager"
+
+#~ msgid "Cases of the month"
+#~ msgstr "Casi del Mese"
+
+#~ msgid "My open quotations"
+#~ msgstr "Le Mie Domande Aperte"
+
+#~ msgid "Cases statistics"
+#~ msgstr "Statistiche Casi"
+
+#~ msgid "Top ten sales of the month"
+#~ msgstr "Le migliori 10 vendite del mese"
+
+#~ msgid "Report of Created Sale Order"
+#~ msgstr "Relazione sugli Ordini di Vendita Creati"
+
+#~ msgid "Sales Orders by category"
+#~ msgstr "Ordini di Vendita per Categoria"
+
+#~ msgid "Monthly cumulated sales turnover over one year"
+#~ msgstr "Totale cumulativo Vendite Mensili per un anno"
+
+#~ msgid "Sales Orders by Products"
+#~ msgstr "Ordini di Vendita per Prodotto"
+
+#~ msgid "Monthly Sales Turnover Over One Year"
+#~ msgstr "Ammontare Vendite mensili dopo un anno"
+
+#~ msgid "Turnover Per Product"
+#~ msgstr "Turnover per Prodotto"
+
+#~ msgid "All Months"
+#~ msgstr "Tutti i Mesi"
+
+#~ msgid "Sales Orders by Categories"
+#~ msgstr "Ordini di vendita per Categoria"
+
+#~ msgid "Sales of the Month"
+#~ msgstr "Vendite del mese"
+
+#~ msgid "Sales by Product (this month)"
+#~ msgstr "Vendite per Prodotto (questo mese)"
+
+#~ msgid "Monthly sales turnover over one year"
+#~ msgstr "Ammontare complessivo vendite mensili dopo un anno"
+
+#~ msgid "Sales Management - Reporting"
+#~ msgstr "Gestione vendite - Segnalazione"
+
+#~ msgid "Sales by Category of Products"
+#~ msgstr "Vendite per categoria di Prodotto"
+
+#~ msgid "Monthly Cumulated Sales Turnover Over One Year"
+#~ msgstr "Ammontare cumulativo Vendite mensili dopo un anno"
+
+#~ msgid "# of Products"
+#~ msgstr "Numero Prodotti"
+
+#~ msgid "Sales by Product"
+#~ msgstr "Vendite per Prodotto"
+
+#~ msgid "This Month"
+#~ msgstr "Questo Mese"
+
+#~ msgid "Categories"
+#~ msgstr "Categorie"
+
+#~ msgid "Created Sale Orders"
+#~ msgstr "Creazione Ordine di Vendita"
+
+#~ msgid "Reporting"
+#~ msgstr "Reportistica"
+
+#~ msgid "Turnover Per Month"
+#~ msgstr "Turnover per Mese"
+
+#~ msgid "Daily Sales Turnover Over One Year"
+#~ msgstr "Ammontare Vendite giornaliere dopo un anno"
+
+#~ msgid "Graphs"
+#~ msgstr "Grafici"
+
+#~ msgid "Total Turnover"
+#~ msgstr "Turnover Totale"
+
+#~ msgid "Sales by Category of Product (this month)"
+#~ msgstr "Vendite per categoria di Prodotto (questo mese)"
+
+#~ msgid "Daily sales turnover over one year"
+#~ msgstr "Ammontare Vendite giornaliere dopo un anno"
+
+#~ msgid "Create Date"
+#~ msgstr "Data Creazione"
+
+#~ msgid "Created Sales orders"
+#~ msgstr "Ordini di Vendita Creati"
+
+#~ msgid "Sales by State"
+#~ msgstr "Stao delle Vendite"
+
+#~ msgid "Customer Ref"
+#~ msgstr "Rif. Cliente"
+
+#~ msgid "Payment Accounts"
+#~ msgstr "Conto per Pagamenti"
diff --git a/addons/sale/i18n/mn.po b/addons/sale/i18n/mn.po
index d0ac621c5f7..facaa24a115 100644
--- a/addons/sale/i18n/mn.po
+++ b/addons/sale/i18n/mn.po
@@ -7,16 +7,976 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-17 07:57+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-20 03:08+0000\n"
+"Last-Translator: Гоби <Unknown>\n"
 "Language-Team: Mongolian <mn@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: 2010-10-18 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: sale
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
+
+#. module: sale
+#: help:sale.installer,delivery:0
+msgid "Allows you to compute delivery costs on your quotations."
+msgstr "Хүргэлтийн өртөгийг үнэнд тооцоолох боломж олгоно"
+
+#. module: sale
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Хэрэв та бүгдийг нэгэн зэрэг багтаахад хангалтгүй агуулахтай бол хэсэгчилсэн "
+"барааг хүлээж авдаг уу эсвэл авдгүй юу?"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging: "
+msgstr ""
+"%d тооны зүйл сонгосон байна.\n"
+"Гэвч энэ сонгосон савлагаа, багцлалтай тохирохгүй.\n"
+"Савлагаа багцлалтад тохирох тоо хэмжээ нь: "
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Өдөр"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
+msgid "Cancel Order"
+msgstr "Захиалга цуцлах"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sales_by_partner
+#: view:sale.report:0
+msgid "Sales By Partner"
+msgstr "Борлуулалтыг Харилцагчаар"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Payment Before Delivery"
+msgstr "Хүргэлтийн өмнөх төлөлт"
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sale order request."
+msgstr "Энэ борлуулалтын захиалгыг үүсгэсэн баримтын сурвалж"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Анхаар !"
+
+#. module: sale
+#: report:sale.order:0
+msgid "VAT"
+msgstr "НӨАТ"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "You must first cancel stock moves attached to this sale order line."
+msgstr ""
+"Та эхлээд энэ борлуулалтын захиалгад хавсрагдсан барааны шилжилтүүдийг "
+"цуцлах хэрэгтэй."
+
+#. module: sale
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "All at Once"
+msgstr "Нэг мөсөн"
+
+#. module: sale
+#: field:sale.order,project_id:0
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Аналитик Данс"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Татан авалтын Захиалга"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Харилцагч"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Захиалгын шугам"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Cannot delete a sale order line which is %s !"
+msgstr "Борлуулалтын захиалгын %s мөрийг устгаж чадахгүй !"
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+"Борлуулалтын захиалга нь автоматаар нэхэмжлэлийн санал(ноорог нэхэмжлэл)-ыг "
+"үүсгэнэ. Захиалсан болон хүргэж өгсөн тоо хэмжээ нь ялгаатай байж болно. "
+"Тиймээс та захиалсан эсвэл хүргэсэн тоо хэмжээний аль дээр суурилж нэхэмжлэл "
+"үүсгэхийг сонгох хэрэгтэй. Хэрэв бүтээгдэхүүн нь үйлчилгээ бол хүргэсэн тоо "
+"хэмжээ гэдэг нь тухайн даалгаврыг гүйцэтгэхэд зарцуулсан цагаар хэмжигдэнэ."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_average:0
+msgid "Average Price"
+msgstr "Дундаж Үнэ"
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Үндсэн төлбөрийн нөхцөл"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+msgid "Configure Picking Policy for Sales Order"
+msgstr "Борлуулалтын захиалгын сонгох зарчмыг тохируулах"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "State"
+msgstr "Төлөв"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Хөнг.(%)"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Нийт Үнэ"
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Дөрвөлжийг тэмдэглэж ижил захиалагчаар нэхэмжлэлийг бүлэглэнэ."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Захиалсан тоо хэмжээ"
+
+#. module: sale
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Нөөц шилжүүлэх"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Захиалга"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Бусад Мэдээлэл"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sale order is created"
+msgstr "Борлуулалтын захиалга үүсгэгдсэн огноо"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Dates"
+msgstr "Огноо"
+
+#. module: sale
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr "Алдаа: Зарах нэгж хэмжих нэгжээс ялгаатай ангилалтай байх ёстой."
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"Хүргэлтийн зарчим нь 'Сонголтоос нэхэмжлэх' эсвэл 'Хүргэсэн дараа нэхэмжлэх' "
+"байгаа тохиолдолд нэхэмжлэл нь автоматаар үүсгэгдэнэ."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sale order"
+msgstr "Борлуулалтын захиалгаас"
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Хөнгөлөлт (%)"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales_manager
+#: model:ir.ui.menu,name:sale.menu_board_sales_manager
+msgid "Sales Manager Dashboard"
+msgstr "Борлуулалтын Менежерийн Хяналтын Самбар"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Could not cancel sale order !"
+msgstr "Борлуулалтын захиалгыг цуцлаж чадсангүй !"
+
+#. module: sale
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Савлагаа"
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Дэлгүүрийн нэр"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Захиалагч тодорхойлогдоогүй байна !"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Алдаатай борлуулалтууд"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Set to Draft"
+msgstr "Ноороглох"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Procurement Corrected"
+msgstr "Засварласан нийлүүлэлт"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Conditions"
+msgstr "Нөхцөл"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid ""
+"There is no income category account defined in default Properties for "
+"Product Category or Fiscal Position is not defined !"
+msgstr ""
+"Бүтээгдэхүүний Категори эсвэл Санхүүгийн Үеийн анхны шинжүүдэд орлогын данс "
+"тодорхойлогдоогүй байна !"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "8 сар"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "EAN: "
+msgstr "EAN: "
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+msgid "All Quotations"
+msgstr "Бүх ханш"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Our Salesman"
+msgstr "Манай талын худалдагч"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "6 сар"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Борлуулалтын Захиалгын Статистик"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "10 сар"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Үнэ ханш"
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+msgid "Quantity"
+msgstr "Тоо ширхэг"
+
+#. module: sale
+#: selection:sale.config.picking_policy,step:0
+msgid "Delivery Order Only"
+msgstr "Зөвхөн хүргэх захиалга"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_open_invoice
+msgid "Sale Open Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Санхүүгийн байдал"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "UoM"
+msgstr "Хэмжих нэгж"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid ""
+"You have to select a customer in the sale form !\n"
+"Please set one customer before choosing a product."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Савлагааны дугаар"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced !"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Ахиц"
+
+#. module: sale
+#: view:sale.shop:0
+msgid "Accounting"
+msgstr "Данс бүртгэл"
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'. You may "
+"have to create it and set it as a default value on this field."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Утас:"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Could not cancel this sale order !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,note:0
+#: view:sale.order.line:0
+#: field:sale.order.line,notes:0
+msgid "Notes"
+msgstr "Тэмдэглэл"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "The quotation '%s' has been converted to a sale order."
+msgstr ""
+
+#. module: sale
+#: field:product.product,pricelist_purchase:0
+msgid "Purchase Pricelists"
+msgstr "Худалдан авалтын үнийн хүснэгт"
+
+#. module: sale
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the the shipping of the "
+"products to the customer"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Invoice Corrected"
+msgstr "Зассан нэхэмжлэх"
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: sale
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Алдаа: Алдаатай код"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Татваргүй дүн"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sale Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sale order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Захиалга хүлээлт"
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Түнш хуваарилах"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid ""
+"There is no income account defined ' \\n                                     "
+"   'for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Дэд дүн"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Нэхэмжлэх хаяг :"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Cannot delete Sale Order(s) which are already confirmed !"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Нэхэмжлэх хаяг"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sale order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Үнэ бууралт/захиалга"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "Мөрийн тоо"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sale Make Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Агуулах"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Захиалга №"
+
+#. module: sale
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Захиалгын мөрүүд"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Untaxed amount"
+msgstr "Татваргүй дүн"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity (UoM)"
+msgstr "Тоо хэмжээ"
+
+#. module: sale
+#: help:sale.installer,sale_layout:0
+msgid ""
+"Provides some features to improve the layout of the Sales Order reports."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Нийт:"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+"  - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+"  - The 'Shipping & Manual Invoice' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice.\n"
+"  - The 'Invoice on Order After Delivery' choice will generate the draft "
+"invoice based on sale order after all picking lists have been finished.\n"
+"  - The 'Invoice from the picking' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Үнийн хүснэгт"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: sale
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Дэлгэцийн XML алдаатай!"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,shipped:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "invalid mode for test_state"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Татвар:"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Барааны хөдөлгөөн"
+
+#. module: sale
+#: view:sale.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,state:0
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Төлөв"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s) ?"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
+#: view:sale.report:0
+msgid "Sales By Month"
+msgstr ""
+
+#. module: sale
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Хүргэх хаяг"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Алдаа"
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
+msgstr "Түүх"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sale order is confirmed, in the "
+"same time as the procurement order. It represents the assignment of parts to "
+"the sale order. There is 1 pick list by sale order line which evolves with "
+"the availability of parts."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Таны дугаар"
+
+#. module: sale
+#: help:sale.order,partner_order_id:0
+msgid ""
+"The name and address of the contact who requested the order or quotation."
+msgstr ""
+
+#. module: sale
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Тоо"
+
+#. module: sale
+#: view:sale.order:0
+msgid "References"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Цуцлах"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist version for current sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,sale_order_dates:0
+msgid "Sales Order Dates"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sale Order Line"
+msgstr "Борлуулалтын захиалгын шугам"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Шинэ нэхэмжлэл"
+
+#. module: sale
+#: field:sale.installer,sale_margin:0
+msgid "Margins in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Excluded"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Тооцоолох"
+
+#. module: sale
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_order_id:0
+msgid "Ordering Contact"
+msgstr "Захиалга хийсэн"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
+#: view:sale.open.invoice:0
+msgid "Open Invoice"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Үнэ"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_installer
+msgid "Sales Application Configuration"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Захиалга"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,name:0
+msgid "Name"
+msgstr "Нэр"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Хүргэх хаяг :"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence Number"
+msgstr ""
+
+#. module: sale
+#: field:product.product,pricelist_sale:0
+msgid "Sale Pricelists"
+msgstr "Борлуулалтын үнийн хүснэгт"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,delivery:0
+msgid "Delivery Costs"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "The sale order '%s' has been set in draft state."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "The sale order '%s' has been cancelled."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Partial Delivery"
@@ -33,76 +993,54 @@ msgid "Confirm Quotation"
 msgstr "Баталсан тоо хэмжээ"
 
 #. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Захиалга хүлээлт"
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr ""
 
 #. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Түнш хуваарилах"
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Дахин нэхэмжлэл үүсгэх"
 
 #. module: sale
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
+#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
+#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
+msgid "Deliveries to Invoice"
+msgstr ""
 
 #. module: sale
 #: selection:sale.order,state:0
+#: selection:sale.report,state:0
 msgid "Waiting Schedule"
 msgstr "Хүлээх төлөвлөгөө"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
 msgstr ""
-"Хэрэв та бүгдийг нэгэн зэрэг багтаахад хангалтгүй агуулахтай бол хэсэгчилсэн "
-"барааг хүлээж авдаг уу эсвэл авдгүй юу?"
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "Агуулахаас"
+#: view:sale.config.picking_policy:0
+#: view:sale.installer:0
+msgid "title"
+msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sale Order"
-msgstr "Борлуулалтын захиалга хүргэх алхам"
+#: model:process.node,name:sale.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
-msgid "Quantity"
-msgstr "Тоо ширхэг"
-
-#. module: sale
-#: wizard_view:sale.advance_payment_inv,create:0
-msgid "You invoice has been successfully created !"
-msgstr "Таны нэхэмжлэл амжилттай үүслээ !"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Automatic Declaration"
-msgstr "Автомат мэдэгдэл"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-#: model:ir.ui.menu,name:sale.menu_action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
+#: selection:sale.order,order_policy:0
+msgid "Invoice from Delivery"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Ноороглох"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Invoice Exception"
-msgstr "Нэхэмжлэлийн алдаа"
+msgid "Order date"
+msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
@@ -111,15 +1049,10 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Delivery, from the warehouse to the customer."
+#: model:process.node,note:sale.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
 msgstr ""
 
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
 msgid "Validate"
@@ -127,60 +1060,37 @@ msgstr "Батлах"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Make Invoice"
-msgstr "Нэхэмжлэл бэлдэх"
+msgid "Confirm Order"
+msgstr "Захиалга батлах"
 
 #. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Дэд дүн"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"Whenever confirm button is clicked, the draft state is moved to manual. that "
-"is, quotation is moved to  sale order."
+#: model:process.transition,name:sale.process_transition_saleprocurement0
+msgid "Create Procurement Order"
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
-msgid "Cancel Order"
-msgstr "Захиалга цуцлах"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Нөөц шилжүүлэх"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Manual Designation"
-msgstr "Албан тушаал томилох заавар"
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sale Order"
+msgstr "Борлуулах захиалга"
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Тэмдэглэл"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-msgid "Invoice after delivery"
-msgstr "Хүргэлтийн дараах нэхэмжлэл"
-
-#. module: sale
 #: field:sale.order,amount_tax:0
 #: field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Татварууд"
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Net Total :"
-msgstr "Нийт цэвэр:"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"A sale order generates an invoice, as soon as it is confirmed by the "
+"salesman. Depending on the Invoicing control of the sale order, the invoice "
+"is based on delivered or on ordered quantities."
+msgstr ""
 
 #. module: sale
 #: field:sale.order,order_policy:0
@@ -188,66 +1098,40 @@ msgid "Shipping Policy"
 msgstr "Тээвэрлэх арга"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-msgid "Cancelled"
-msgstr "Цуцалсан"
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Shipping Exception"
-msgstr "Тээвэрлэлтийн алдаа"
-
-#. module: sale
-#: field:sale.order,amount_total:0
-msgid "Total"
-msgstr "Нийт"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Origin"
-msgstr "Эх сурвалж"
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Нэхэмжлэх хаяг"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Outgoing Products"
-msgstr "Бүтээгдэхүүнүүдийн зардал"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Reference"
-msgstr "Лавлагаа"
-
-#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Нэг мөсөн"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid "Procurement is created after confirmation of sale order."
-msgstr "Захиалга батлагдсаны дараа татан авалт үүснэ."
-
-#. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Аналитик Данс"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "TVA :"
+#: model:ir.model,name:sale.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,type:0
-msgid "Procure Method"
-msgstr "Нийлүүлэх арга"
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sale order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the date 'Ordered Date'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sale order in draft state.       "
+"              \n"
+"* The 'Confirmed' state is set when the related sale order is confirmed.     "
+"                \n"
+"* The 'Exception' state is set when the related sale order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sale order line has been picked.          "
+"           \n"
+"* The 'Cancelled' state is set when a user cancel the sale order related."
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
@@ -255,65 +1139,20 @@ msgid "Extra Info"
 msgstr "Нэмэлт мэдээлэл"
 
 #. module: sale
-#: rml:sale.order:0
+#: report:sale.order:0
 msgid "Fax :"
 msgstr "Факс:"
 
 #. module: sale
-#: field:sale.order.line,price_net:0
-msgid "Net Price"
-msgstr "Цэвэр үнэ"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree9
-#: model:ir.ui.menu,name:sale.menu_action_order_tree9
-msgid "My sales order in progress"
-msgstr "Миний борлуулалтын захиалгын үйл явц"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Тоо хэмжээ"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you invoice based on ordered or shipped quantities. If the product "
-"is a service, shipped quantities means hours spent on the associated tasks."
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
 msgstr ""
-"Борлуулалтын захиалга нь автоматаар нэхэмжлэлийн баталгааг үүсгэдэг. "
-"Захиалсан болон хүргэж өгсөн тоо хэмжээ нь адилхан биш байх боломжтой. Хэрэв "
-"нэхэмжлэл гаргах бол захиалагдсан эсвэл тээвэрлэгдсэн тоо хэмжээн дээр "
-"суурилан гаргах хэрэгтэй. Хэрэв бүтээгдэхүүн үйлчилгээ бол тээвэрлэгдсэн тоо "
-"хэмжээ нь холбоотой дааллгавар дээр зарцуулсан цаг болно."
 
 #. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Баталсан"
-
-#. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Үндсэн төлбөрийн нөхцөл"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree_all
-#: model:ir.ui.menu,name:sale.menu_action_order_tree_all
-msgid "All Sales Order"
-msgstr "Бүх борлуулалтын захиалга"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Батлах"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Хүргэх хаяг"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
+msgid "Sales by Product's Category"
+msgstr ""
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -326,344 +1165,85 @@ msgid "Invoice Based on Sales Orders"
 msgstr "Захиалга дээр үндэслэсэн нэхэмжлэл"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sale Shop"
-msgstr "Борлуулах дэлгүүр"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Агуулах"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Order N°"
-msgstr "Захиалга №"
-
-#. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
-msgid "Order Lines"
-msgstr "Захиалгын мөрүүд"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Disc.(%)"
-msgstr "Хөнг.(%)"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Нэхэмжлэлийн шугам"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
+#: model:ir.model,name:sale.model_stock_picking
+msgid "Picking List"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Татваргүй дүн"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
+#: model:process.transition,note:sale.process_transition_confirmquotation0
 msgid ""
-"Packing list is created when 'Assign' is being clicked after confirming the "
-"sale order. This transaction moves the sale order to packing list."
+"The salesman confirms the quotation. The state of the sale order becomes 'In "
+"progress' or 'Manual in progress'."
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree8
-#: model:ir.ui.menu,name:sale.menu_action_order_tree8
-msgid "My sales order waiting Invoice"
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Shipping address :"
-msgstr "Хүргэх хаяг :"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
-"will automatic create after delivery."
+#: selection:sale.report,month:0
+msgid "July"
 msgstr ""
-"Тээвэрлэлтийн удирдамж нь  = 'Хүргэлтийн дараах автомат нэхэмжлэл ' гэсэн "
-"сонголттой үед хүргэлтийн дараа автоматаар үүсэх болно."
 
 #. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Хүргэлт дууссан"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Manual Description"
-msgstr "Заавар тайлбар"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Тоо хэмжээ"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree1
-#: model:ir.ui.menu,name:sale.menu_action_order_line_tree1
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Борлуулалтын захиалгын шугам"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Захиалсан тоо хэмжээ"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sale Order Procurement"
-msgstr "Борлуулалтын захиалга нийлүүлэлт"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Packing"
-msgstr "Савлагаа"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Total :"
-msgstr "Нийт:"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Захиалга батлах"
-
-#. module: sale
-#: field:sale.order,name:0
-msgid "Order Reference"
-msgstr "Захиалга"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-msgid "Done"
-msgstr "Дууссан"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Үнийн хүснэгт"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_shop_configuration
-msgid "Configuration"
-msgstr "Тохиргоо"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on Order After Delivery"
-msgstr "Хүргэлтийн дараах захиалгын нэхэмжлэл"
-
-#. module: sale
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Дэлгэцийн XML алдаатай!"
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Packing"
-msgstr "Холбоотой савлагаа"
-
-#. module: sale
-#: field:sale.shop,payment_account_id:0
-msgid "Payment Accounts"
-msgstr "Төлөлтийн данс"
-
-#. module: sale
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr "Алдаа: Зарах нэгж хэмжих нэгжээс ялгаатай ангилалтай байх ёстой."
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Ref"
-msgstr "Харилцагчийн реф."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales orders"
-msgstr "Борлуулалтын захиалга"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
 #: field:sale.order.line,procurement_id:0
 msgid "Procurement"
 msgstr "Татан авалт"
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Payment accounts"
-msgstr "Төлөлтийн дансууд"
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Тээвэрлэлтийн алдаа"
 
 #. module: sale
-#: wizard_button:sale.advance_payment_inv,create,end:0
-msgid "Close"
-msgstr "Хаах"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Draft Invoice"
-msgstr "Ноорог нэхэмжлэл"
-
-#. module: sale
-#: wizard_field:sale.order.line.make_invoice,init,grouped:0
-#: wizard_field:sale.order.make_invoice,init,grouped:0
+#: field:sale.make.invoice,grouped:0
 msgid "Group the invoices"
 msgstr "Нэхэмжлэлийг бүлэглэх"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-#: model:ir.ui.menu,name:sale.menu_action_order_tree5
-msgid "All Quotations"
-msgstr "Бүх ханш"
+#: selection:sale.order,order_policy:0
+msgid "Shipping & Manual Invoice"
+msgstr "Тээвэрлэх болон нэхэмжлэх заавар"
 
 #. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Хөнгөлөлт (%)"
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Picking Information !"
+msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "Draft customer invoice, to be reviewed by accountant."
-msgstr "Ноорог нэхэмжлэл нягтлангаар хянагдах ёстой."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree3
-#: model:ir.ui.menu,name:sale.menu_action_order_tree3
-msgid "Sales Order To Be Invoiced"
-msgstr "Борлуулалтын захаилга нэхэмжлэгдсэн байх"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Procurement for each line"
-msgstr "Мөр бүрээр татан авалт хийх"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree10
-#: model:ir.ui.menu,name:sale.menu_action_order_tree10
-msgid "My Quotations"
-msgstr "Миний ханш"
-
-#. module: sale
-#: wizard_view:sale.advance_payment_inv,create:0
-msgid "Invoices"
-msgstr "Нэхэмжлэлүүд"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Захиалгын шугам"
-
-#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Packing Default Policy"
-msgstr "Савлах заяамал удирдамж"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Manages the delivery and invoicing progress"
-msgstr "Хүргэлт болон нэхэмжлэх үйл ажиллагааг удирдах"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Тээвэрлэлтийн заяамал арга"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Савлагаа"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Сар"
 
 #. module: sale
 #: model:ir.module.module,shortdesc:sale.module_meta_information
-#: model:ir.ui.menu,name:sale.menu_sale_root
 msgid "Sales Management"
 msgstr "Борлуулалтын менежмент"
 
 #. module: sale
-#: field:sale.order.line,order_id:0
-msgid "Order Ref"
-msgstr "Захиалга реф"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Дахин нэхэмжлэл үүсгэх"
-
-#. module: sale
-#: field:sale.order,user_id:0
-msgid "Salesman"
-msgstr "Борлуулагч"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"In sale order , procuerement for each line and it comes into the procurement "
-"order"
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid " Quantity: "
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Taxes :"
-msgstr "Татвар:"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Нэхэмжилсэн"
-
-#. module: sale
-#: model:ir.actions.wizard,name:sale.advance_payment
-msgid "Advance Invoice"
-msgstr "Урьдчилсан нэхэмжлэл"
-
-#. module: sale
-#: field:sale.order,state:0
-msgid "Order State"
-msgstr "Төлөв"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_action_order_line_tree2
-msgid "Uninvoiced Lines"
-msgstr "Нэхэмжлэлгүй мөр"
-
-#. module: sale
-#: model:ir.actions.todo,note:sale.config_wizard_step_sale_picking_policy
-msgid ""
-"This Configuration step use to set default picking policy when make sale "
-"order"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
 msgstr ""
 
 #. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-msgid "Sales Process"
-msgstr "Борлуулах үйл явц"
+#: model:process.node,note:sale.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sale order line."
+msgstr ""
 
 #. module: sale
-#: wizard_view:sale.order.line.make_invoice,init:0
-#: wizard_button:sale.order.line.make_invoice,init,invoice:0
-#: wizard_view:sale.order.make_invoice,init:0
-#: wizard_button:sale.order.make_invoice,init,invoice:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
 msgid "Create invoices"
 msgstr "Нэхэмжлэл үүсгэх"
 
@@ -675,31 +1255,28 @@ msgstr ""
 "Алдаа: Үндсэн нэгж худалдан авах нэгж хоёул нэг ангилалд хамаарах ёстой."
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree7
-#: model:ir.ui.menu,name:sale.menu_action_order_tree7
-msgid "My sales in shipping exception"
-msgstr "Миний борлуулалтын алдаатай тээвэрлэлт"
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
 
 #. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Sales Configuration"
-msgstr "Борлуулалтын тохиргоо"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-#: model:ir.ui.menu,name:sale.menu_action_order_tree2
-msgid "Sales in Exception"
-msgstr "Алдаатай борлуулалтууд"
+#: help:sale.config.picking_policy,step:0
+msgid ""
+"By default, OpenERP is able to manage complex routing and paths of products "
+"in your warehouse and partner locations. This will configure the most common "
+"and simple methods to deliver products to the customer in one or two "
+"operations by the worker."
+msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Захиалга"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Ноорог"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -707,80 +1284,18 @@ msgid "Paid"
 msgstr "Төлсөн"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Procurement Corrected"
-msgstr "Засварласан нийлүүлэлт"
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Тээвэрлэх болон нэхэмжлэх заавар"
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sale order"
+msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Sale Procurement"
-msgstr "Борлуулалт нийлүүлэлт"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sale Order Logistic"
-msgstr "Борлуулалтын захиалгын Ложистик тохиргоо"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Татваргүй дүн"
-
-#. module: sale
-#: field:sale.order.line,state:0
-msgid "Status"
-msgstr "Байдал"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Packing Policy"
-msgstr "Савлах бодлого"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Бүтээгдэхүүний борлуулалт"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Our Salesman"
-msgstr "Манай талын худалдагч"
-
-#. module: sale
-#: wizard_button:sale.advance_payment_inv,init,create:0
-msgid "Create Advance Invoice"
-msgstr "Урьдчилсан нэхэмжлэл үүсгэх"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid "One procurement for each product."
-msgstr "Бүтээгдэхүүн бүр дээр нэг татан авалт"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sales Orders"
-msgstr "Борлуулалтын захиалгууд"
-
-#. module: sale
-#: field:product.product,pricelist_sale:0
-msgid "Sale Pricelists"
-msgstr "Борлуулалтын үнийн хүснэгт"
-
-#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Хүргэлт чиглүүлэх"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Шинж чанар"
@@ -788,184 +1303,79 @@ msgstr "Шинж чанар"
 #. module: sale
 #: model:process.node,name:sale.process_node_quotation0
 #: selection:sale.order,state:0
+#: selection:sale.report,state:0
 msgid "Quotation"
 msgstr "Үнэ бүүралт"
 
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance Product"
-msgstr "Төлсөн бүтээгдэхүүн"
-
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoice0
 msgid ""
-"Invoice is created when 'Create Invoice' is being clicked after confirming "
-"the sale order. This transaction moves the sale order to invoices."
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Тооцоолох"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: model:ir.ui.menu,name:sale.menu_action_shop_form
-#: field:sale.order,shop_id:0
-msgid "Shop"
-msgstr "Дэлгүүр"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "VAT"
-msgstr "НӨАТ"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-#: model:ir.ui.menu,name:sale.menu_action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Борлуулалтын захиалгын өсөлт"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Дамжуулах"
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Түүх"
-
-#. module: sale
-#: help:sale.order,order_policy:0
+#: help:sale.config.picking_policy,order_policy:0
 msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the packing order after the payment of this invoice.\n"
-"  - The 'Shipping & Manual Invoice' will create the packing order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-"  - The 'Invoice on Order After Delivery' choice will generate the draft "
-"invoice based on sale order after all packing lists have been finished.\n"
-"  - The 'Invoice from the packing' choice is used to create an invoice "
-"during the packing process."
+"You can generate invoices based on sales orders or based on shippings."
 msgstr ""
 
-#. module: sale
-#: rml:sale.order:0
-msgid "Your Reference"
-msgstr "Таны дугаар"
-
-#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Зөвхөн хүргэх захиалга"
-
 #. module: sale
 #: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales order lines"
-msgstr "Борлуулалтын захиалгын мөр"
+msgid "Related Invoices"
+msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Дараалал"
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sale order to invoice."
+msgstr ""
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: model:ir.ui.menu,name:sale.menu_config_sale
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:sale.order:0
+#: view:sale.report:0
 msgid "Sales"
 msgstr "Борлуулалт"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Тоо"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Packing OUT is created for stockable products."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other data"
-msgstr "Бусад өгөгдөл"
-
-#. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: report:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Нэгж Үнэ"
 
 #. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Санхүүгийн байдал"
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Дууссан"
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Invoice address :"
-msgstr "Нэхэмжлэх хаяг :"
+#: model:ir.model,name:sale.model_sale_installer
+msgid "sale.installer"
+msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: field:sale.order,invoice_ids:0
+#: model:process.node,name:sale.process_node_invoice0
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Invoice"
 msgstr "Нэхэмжлэл"
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancel0
-#: model:process.transition.action,name:sale.process_transition_action_cancel1
-#: model:process.transition.action,name:sale.process_transition_action_cancel2
-#: wizard_button:sale.advance_payment_inv,init,end:0
-#: view:sale.config.picking_policy:0
-#: view:sale.order.line:0
-#: wizard_button:sale.order.line.make_invoice,init,end:0
-#: wizard_button:sale.order.make_invoice,init,end:0
-msgid "Cancel"
-msgstr "Цуцлах"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sale order. The exception state is "
-"automatically set when a cancel operation occurs in the invoice validation "
-"(Invoice Exception) or in the packing list process (Shipping Exception). The "
-"'Waiting Schedule' state is set when the invoice is confirmed but waiting "
-"for the scheduler to run on the date 'Date Ordered'."
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Could not cancel sale order line!"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "UoM"
-msgstr "Хэмжих нэгж"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Савлагааны дугаар"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Confirming the packing list moves them to delivery order. This can be done "
-"by clicking on 'Validate' button."
+#: selection:sale.config.picking_policy,step:0
+msgid "Picking List & Delivery Order"
 msgstr ""
 
-#. module: sale
-#: selection:sale.order,state:0
-msgid "In Progress"
-msgstr "Ахиц"
-
-#. module: sale
-#: wizard_view:sale.advance_payment_inv,init:0
-msgid "Advance Payment"
-msgstr "Урьдчилгаа төлбөр"
-
 #. module: sale
 #: constraint:ir.model:0
 msgid ""
@@ -975,61 +1385,24 @@ msgstr ""
 "болохгүй!"
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid "Confirm sale order and Create invoice."
-msgstr "Борлуулалтын захиалгыг батлах болон нэхэмжлэл үүсгэх"
-
-#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Packing List & Delivery Order"
-msgstr "Савлагааны жагсаалт ба Хүргэлтийн захаилга"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Алдаа"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sale Order Lines"
-msgstr "Борлуулалтын захиалгын шугамууд"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.order:0
-msgid "Create Invoice"
-msgstr "Шинэ нэхэмжлэл"
-
-#. module: sale
-#: wizard_view:sale.order.line.make_invoice,init:0
-#: wizard_view:sale.order.make_invoice,init:0
-msgid "Do you really want to create the invoices ?"
-msgstr "Нэхэмжлэл үүсгэх үү ?"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Invoice based on packing lists"
+#: view:sale.order.line:0
+msgid "To Do"
 msgstr ""
 
 #. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Set Default"
-msgstr "Үндсэн утга болгох"
+#: field:sale.order,picking_policy:0
+msgid "Picking Policy"
+msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Sales order"
-msgstr "Борлуулалтын захиалга"
+#: model:process.node,note:sale.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Quotation (A sale order in draft state)"
-msgstr "Үнэ бууралт(борлуулалтын захиалга ноорог төлөвтэй)"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "Sale Invoice"
-msgstr "Борлуулалтын нэхэмжлэх"
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Shipping Default Policy"
+msgstr "Тээвэрлэлтийн заяамал арга"
 
 #. module: sale
 #: field:sale.order,incoterm:0
@@ -1037,103 +1410,33 @@ msgid "Incoterm"
 msgstr "Инкотерм"
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,product_id:0
+#: model:ir.model,name:sale.model_product_product
+#: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
 msgid "Product"
 msgstr "Бараа"
 
 #. module: sale
-#: wizard_button:sale.advance_payment_inv,create,open:0
-msgid "Open Advance Invoice"
+#: model:ir.ui.menu,name:sale.menu_invoiced
+msgid "Invoicing"
+msgstr "Нэхэмжлэх"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sale order is confirmed"
 msgstr ""
 
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Захиалга хийсэн"
-
-#. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Тодорхойлолт"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Price"
-msgstr "Үнэ"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Deliver"
-msgstr "Хүргэлт"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Үнэ бууралт/захиалга"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Tel. :"
-msgstr "Утас:"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Quotation N°"
-msgstr "Үнэ бууралт №"
-
-#. module: sale
-#: field:stock.move,sale_line_id:0
-msgid "Sale Order Line"
-msgstr "Борлуулалтын захиалгын шугам"
-
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
 msgid "Cancel Assignation"
 msgstr "Эрх шилжүүлэхийг цуцлах"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice from the Packing"
-msgstr "Савлагааны нэхэмжлэл"
-
-#. module: sale
-#: model:ir.actions.wizard,name:sale.wizard_sale_order_line_invoice
-#: model:ir.actions.wizard,name:sale.wizard_sale_order_make_invoice
-msgid "Make invoices"
-msgstr "Нэхэмжлэл үүсгэх"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact that requested the order or quotation."
-msgstr "Захиалга өгсөн хүний нэр, хаяг."
-
-#. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Худалдан авагч"
-
-#. module: sale
-#: field:product.product,pricelist_purchase:0
-msgid "Purchase Pricelists"
-msgstr "Худалдан авалтын үнийн хүснэгт"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sale Order"
-msgstr "Борлуулах захиалга"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Нэр"
+#: model:ir.model,name:sale.model_sale_config_picking_policy
+msgid "sale.config.picking_policy"
+msgstr "sale.config.picking_policy"
 
 #. module: sale
 #: field:sale.order,invoice_quantity:0
@@ -1141,19 +1444,7 @@ msgid "Invoice on"
 msgstr "Нэхэмжлэх арга"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree_new
-#: model:ir.ui.menu,name:sale.menu_action_order_tree_new
-msgid "New Quotation"
-msgstr "Шинэ ханш"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total amount"
-msgstr "Нийт дүн"
-
-#. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: report:sale.order:0
 msgid "Date Ordered"
 msgstr "Захиалсан огноо"
 
@@ -1164,6 +1455,7 @@ msgstr "Барааны зарах нэгж"
 
 #. module: sale
 #: selection:sale.order,state:0
+#: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr "Үйл явцын заавар"
 
@@ -1173,58 +1465,298 @@ msgid "Product UoM"
 msgstr "Барааны хэмжих нэгж"
 
 #. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, Open ERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+#: view:sale.report:0
+msgid "Sales By Salesman"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sale Order"
+#: view:sale.order:0
+msgid "Logistic"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_order0
+#: view:sale.order.line:0
 msgid "Order"
 msgstr "Захиалга"
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Payment Terms"
-msgstr "Төлбөрийн нөхцөл"
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sale order"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Invoice Corrected"
-msgstr "Зассан нэхэмжлэх"
+msgid "States"
+msgstr "Байрлалууд"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Нийт"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sale order has been delivered. This field is updated "
+"only after the scheduler have been launched !"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,step:0
+msgid "Steps To Deliver a Sale Order"
+msgstr "Борлуулалтын захиалга хүргэх алхам"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Нэхэмжлэлийн алдаа"
+
+#. module: sale
+#: help:sale.installer,sale_margin:0
+msgid ""
+"Gives the margin of profitability by calculating the difference between Unit "
+"Price and Cost Price."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this sale order."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Нийт цэвэр:"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Цуцалсан"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Дэлгүүр"
+
+#. module: sale
+#: view:sale.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,uom_name:0
+msgid "Default UoM"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Тоо хэмжээ"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid " Type of ul: "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Баталсан"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Батлах"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this sale order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Нэхэмжлэлийн шугам"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Борлуулалтын захиалгын шугам"
 
 #. module: sale
 #: field:sale.order.line,delay:0
-msgid "Delivery Delay"
-msgstr "Хүргэлт зогссон"
+msgid "Delivery Lead Time"
+msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Related invoices"
-msgstr "Холбоотой нэхэмжлэл"
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Тохиргоо"
 
 #. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Дэлгүүрийн нэр"
-
-#. module: sale
-#: field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Төлбөрийн нөхцөл"
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "There is no sale journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
 
 #. module: sale
 #: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Хүргэлтийн өмнөх төлөлт"
+msgid "Invoice on Order After Delivery"
+msgstr "Хүргэлтийн дараах захиалгын нэхэмжлэл"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+msgid ""
+"For every sale order line, a procurement order is created to supply the sold "
+"product."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Complete Delivery"
+msgstr "Хүргэлт дууссан"
+
+#. module: sale
+#: view:sale.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: sale
+#: help:sale.config.picking_policy,picking_policy:0
+msgid ""
+"The Shipping Policy is used to configure per order if you want to deliver as "
+"soon as possible when one product is available or you wait that all products "
+"are available.."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source document"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Жин"
+
+#. module: sale
+#: view:sale.open.invoice:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Нэхэмжлэлүүд"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,config_logo:0
+#: field:sale.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesman"
+msgstr "Борлуулагч"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -1234,295 +1766,579 @@ msgid ""
 "example)."
 msgstr ""
 
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Нэхэмжилсэн"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#, python-format
+msgid "Advance Invoice"
+msgstr "Урьдчилсан нэхэмжлэл"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleorderprocurement0
+msgid "Sale Order Requisition"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Ноорог"
+
+#. module: sale
+#: field:sale.config.picking_policy,progress:0
+#: field:sale.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+msgid "Product sales"
+msgstr "Бүтээгдэхүүний борлуулалт"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Ordered Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Борлуулалтын захиалгууд"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Payment Terms"
+msgstr "Төлбөрийн нөхцөл"
+
+#. module: sale
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "Direct Delivery"
+msgstr "Хүргэлт чиглүүлэх"
+
+#. module: sale
+#: field:sale.installer,sale_journal:0
+msgid "Invoicing journals"
+msgstr "Нэхэмжлэлийн журнал"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Төлсөн бүтээгдэхүүн"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped Qty"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:0
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sale Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sale order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sale Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "Борлуулалтын захиалгын өсөлт"
+
+#. module: sale
+#: field:sale.installer,sale_layout:0
+msgid "Sales Order Layout Improvement"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_assign0
+msgid "Assign"
+msgstr "Дамжуулах"
+
+#. module: sale
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "Агуулахаас"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sale Shop"
+msgstr "Борлуулах дэлгүүр"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales By Customer"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "Close"
+msgstr "Хаах"
+
+#. module: sale
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Not enough stock !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order Lines"
+msgstr "Борлуулалтын захиалгын шугамууд"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Тодорхойлолт"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
+#, python-format
+msgid ""
+"You cannot make an advance on a sale order \\n                             "
+"that is defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: help:sale.installer,sale_order_dates:0
+msgid "Adds commitment, requested and effective dates on Sales Orders."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Худалдан авагч"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: sale
+#: help:sale.installer,sale_journal:0
+msgid ""
+"Allows you to group and invoice your delivery orders according to different "
+"invoicing types: daily, weekly, etc."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
-msgid "States"
-msgstr "Байрлалууд"
+msgid "Search Sales Order"
+msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Жин"
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Төлбөрийн нөхцөл"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "After confirming order, Create the invoice."
-msgstr "Баталсны дараа захиалгын нэхэмжлэл үүсгэх"
+#: model:process.transition,note:sale.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sale order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sale order's "
+"parameters. "
+msgstr ""
 
 #. module: sale
-#: constraint:product.product:0
-msgid "Error: Invalid ean code"
-msgstr "Алдаа: Алдаатай код"
+#: field:sale.config.picking_policy,picking_policy:0
+msgid "Picking Default Policy"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr "Үнэ бууралт №"
 
 #. module: sale
 #: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Түүсэн"
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Данс бүртгэл"
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr ""
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Deliveries"
 msgstr ""
 
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Барааны хөдөлгөөн"
+#~ msgid "Total amount"
+#~ msgstr "Нийт дүн"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-#: model:ir.ui.menu,name:sale.menu_action_order_tree
-msgid "My Sales Order"
-msgstr "Миний борлуулалтын захилага"
+#~ msgid "Make Invoice"
+#~ msgstr "Нэхэмжлэл бэлдэх"
 
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sale Order line"
-msgstr "Борлуулалтын захиалгын шугам"
+#~ msgid "Manual Designation"
+#~ msgstr "Албан тушаал томилох заавар"
 
-#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Dashboard for sales"
-msgstr "Борлуулалтын самбар"
+#~ msgid "Invoice after delivery"
+#~ msgstr "Хүргэлтийн дараах нэхэмжлэл"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sale Dashboard"
-msgstr "Борлуулалтын самбар"
+#~ msgid "Origin"
+#~ msgstr "Эх сурвалж"
 
-#. module: sale
-#: view:board.board:0
-msgid "Sales of the month"
-msgstr "Сарын борлуулалт"
+#~ msgid "Outgoing Products"
+#~ msgstr "Бүтээгдэхүүнүүдийн зардал"
 
-#. module: sale
-#: view:board.board:0
-msgid "Sales manager board"
-msgstr "Борлуулалтын менежерийн самбар"
+#~ msgid "Reference"
+#~ msgstr "Лавлагаа"
 
-#. module: sale
-#: view:board.board:0
-msgid "Cases of the month"
-msgstr ""
+#~ msgid "Net Price"
+#~ msgstr "Цэвэр үнэ"
 
-#. module: sale
-#: view:board.board:0
-msgid "My open quotations"
-msgstr ""
+#~ msgid "My sales order in progress"
+#~ msgstr "Миний борлуулалтын захиалгын үйл явц"
 
-#. module: sale
-#: view:board.board:0
-msgid "Cases statistics"
-msgstr "Тохиолдлын тоо бүртгэл"
+#~ msgid "All Sales Order"
+#~ msgstr "Бүх борлуулалтын захиалга"
 
-#. module: sale
-#: view:board.board:0
-msgid "Top ten sales of the month"
-msgstr "Сарын шилдэг 10 борлуулалт"
+#~ msgid "Manual Description"
+#~ msgstr "Заавар тайлбар"
 
-#. module: sale
-#: field:report.sale.order.category,price_average:0
-#: field:report.sale.order.product,price_average:0
-msgid "Average Price"
-msgstr "Дундаж Үнэ"
+#~ msgid "Sale Order Procurement"
+#~ msgstr "Борлуулалтын захиалга нийлүүлэлт"
 
-#. module: sale
-#: model:ir.model,name:sale.model_report_sale_order_created
-msgid "Report of Created Sale Order"
-msgstr "Борлуулалтын захиалга үүссэн мэдээлэл"
+#~ msgid "Packing"
+#~ msgstr "Савлагаа"
 
-#. module: sale
-#: view:report.sale.order.category:0
-msgid "Sales Orders by category"
-msgstr ""
+#~ msgid "Related Packing"
+#~ msgstr "Холбоотой савлагаа"
 
-#. module: sale
-#: model:ir.report.custom,name:sale.ir_report_custom_6
-#: model:ir.report.custom,title:sale.ir_report_custom_6
-msgid "Monthly cumulated sales turnover over one year"
-msgstr "Нэг жил дэх сар тутмын хуримтлуулсан борлуулалтын эргэлт"
+#~ msgid "Payment Accounts"
+#~ msgstr "Төлөлтийн данс"
 
-#. module: sale
-#: model:ir.model,name:sale.model_report_sale_order_product
-msgid "Sales Orders by Products"
-msgstr ""
+#~ msgid "Customer Ref"
+#~ msgstr "Харилцагчийн реф."
 
-#. module: sale
-#: model:ir.ui.menu,name:sale.ir_ui_menu1
-msgid "Monthly Sales Turnover Over One Year"
-msgstr "Нэг жил дэх сар тутмын борлуулалтын эргэлт"
+#~ msgid "Sales orders"
+#~ msgstr "Борлуулалтын захиалга"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_turnover_product_tree
-#: model:ir.model,name:sale.model_report_turnover_per_product
-#: view:report.turnover.per.product:0
-msgid "Turnover Per Product"
-msgstr "Бүтээгдэхүүний дундаж эргэлт"
+#~ msgid "Payment accounts"
+#~ msgstr "Төлөлтийн дансууд"
 
-#. module: sale
-#: model:ir.ui.menu,name:sale.next_id_82
-msgid "All Months"
-msgstr "Бүх сар"
+#~ msgid "Draft Invoice"
+#~ msgstr "Ноорог нэхэмжлэл"
 
-#. module: sale
-#: field:report.sale.order.category,price_total:0
-#: field:report.sale.order.product,price_total:0
-msgid "Total Price"
-msgstr "Нийт Үнэ"
+#~ msgid "Order Ref"
+#~ msgstr "Захиалга реф"
 
-#. module: sale
-#: model:ir.model,name:sale.model_report_sale_order_category
-msgid "Sales Orders by Categories"
-msgstr "Зэрэглэлээр борлуулалтын захиалга"
+#~ msgid "Sales Process"
+#~ msgstr "Борлуулах үйл явц"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_sale_list
-#: model:ir.ui.menu,name:sale.menu_report_order_sale_list
-msgid "Sales of the Month"
-msgstr "Сарын борлуулалт"
+#~ msgid "Sale Procurement"
+#~ msgstr "Борлуулалт нийлүүлэлт"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_product_tree
-#: model:ir.ui.menu,name:sale.menu_report_order_product
-msgid "Sales by Product (this month)"
-msgstr "Бүтээгдэхүүнээр борлуулах(энэ сар)"
+#~ msgid "Status"
+#~ msgstr "Байдал"
 
-#. module: sale
-#: model:ir.report.custom,name:sale.ir_report_custom_4
-#: model:ir.report.custom,title:sale.ir_report_custom_4
-msgid "Monthly sales turnover over one year"
-msgstr "Нэг жил дэх сар тутмын борлуулалтын эргэлт"
+#~ msgid "Packing Policy"
+#~ msgstr "Савлах бодлого"
 
-#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management - Reporting"
-msgstr "Борлуулалтын менежмент-Мэдээ"
+#~ msgid "Create Advance Invoice"
+#~ msgstr "Урьдчилсан нэхэмжлэл үүсгэх"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_category_tree_all
-#: model:ir.ui.menu,name:sale.menu_report_order_category_all
-#: view:report.sale.order.category:0
-msgid "Sales by Category of Products"
-msgstr "Бүтээгдэхүүний зэрэглэлээр борлуулах"
+#~ msgid "Sequence"
+#~ msgstr "Дараалал"
 
-#. module: sale
-#: model:ir.ui.menu,name:sale.ir_ui_menu3
-msgid "Monthly Cumulated Sales Turnover Over One Year"
-msgstr "Нэг жил дэх сар тутмын хуримтлуулсан борлуулалтын эргэлт"
+#~ msgid "Sales order"
+#~ msgstr "Борлуулалтын захиалга"
 
-#. module: sale
-#: field:report.sale.order.category,quantity:0
-#: field:report.sale.order.product,quantity:0
-msgid "# of Products"
-msgstr "Бүтээгдэхүүний #"
+#~ msgid "Quotation (A sale order in draft state)"
+#~ msgstr "Үнэ бууралт(борлуулалтын захиалга ноорог төлөвтэй)"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_product_tree_all
-#: model:ir.ui.menu,name:sale.menu_report_order_product_all
-#: view:report.sale.order.product:0
-msgid "Sales by Product"
-msgstr "Бүтээгдэхүүнээр борлуулах"
+#~ msgid "Sale Invoice"
+#~ msgstr "Борлуулалтын нэхэмжлэх"
 
-#. module: sale
-#: model:ir.ui.menu,name:sale.next_id_81
-msgid "This Month"
-msgstr "Энэ сар"
+#~ msgid "Deliver"
+#~ msgstr "Хүргэлт"
 
-#. module: sale
-#: field:report.sale.order.category,category_id:0
-msgid "Categories"
-msgstr "Зэрэглэлүүд"
+#~ msgid "Delivery Delay"
+#~ msgstr "Хүргэлт зогссон"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
-msgid "Created Sale Orders"
-msgstr "Борлуулалтын захиалга үүссэн"
+#~ msgid "Related invoices"
+#~ msgstr "Холбоотой нэхэмжлэл"
 
-#. module: sale
-#: model:ir.ui.menu,name:sale.next_id_80
-msgid "Reporting"
-msgstr "Мэдээ"
+#~ msgid "After confirming order, Create the invoice."
+#~ msgstr "Баталсны дараа захиалгын нэхэмжлэл үүсгэх"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_turnover_month_tree
-#: model:ir.model,name:sale.model_report_turnover_per_month
-#: view:report.turnover.per.month:0
-msgid "Turnover Per Month"
-msgstr "Сарын дундаж эргэлт"
+#~ msgid "My Sales Order"
+#~ msgstr "Миний борлуулалтын захилага"
 
-#. module: sale
-#: model:ir.ui.menu,name:sale.ir_ui_menu2
-msgid "Daily Sales Turnover Over One Year"
-msgstr "Нэг жил дэх өдөр тутмын борлуулалтын эргэлт"
+#~ msgid "Sale Order line"
+#~ msgstr "Борлуулалтын захиалгын шугам"
 
-#. module: sale
-#: model:ir.ui.menu,name:sale.next_id_83
-msgid "Graphs"
-msgstr "График"
+#~ msgid "Dashboard for sales"
+#~ msgstr "Борлуулалтын самбар"
 
-#. module: sale
-#: selection:report.sale.order.category,state:0
-#: selection:report.sale.order.product,state:0
-msgid "Manual in progress"
-msgstr "Өсөлтийн заавар"
+#~ msgid "Sale Dashboard"
+#~ msgstr "Борлуулалтын самбар"
 
-#. module: sale
-#: field:report.turnover.per.month,turnover:0
-#: field:report.turnover.per.product,turnover:0
-msgid "Total Turnover"
-msgstr "Нийт эргэлт"
+#~ msgid "Sales of the month"
+#~ msgstr "Сарын борлуулалт"
 
-#. module: sale
-#: selection:report.sale.order.category,state:0
-#: selection:report.sale.order.product,state:0
-msgid "In progress"
-msgstr "Өсөлт"
+#~ msgid "Sales manager board"
+#~ msgstr "Борлуулалтын менежерийн самбар"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_category_tree
-#: model:ir.ui.menu,name:sale.menu_report_order_category
-msgid "Sales by Category of Product (this month)"
-msgstr "Бүтээгдэхүүний зэрэглэлээр борлуулах( энэ сар)"
+#~ msgid "Cases statistics"
+#~ msgstr "Тохиолдлын тоо бүртгэл"
 
-#. module: sale
-#: model:ir.report.custom,name:sale.ir_report_custom_5
-#: model:ir.report.custom,title:sale.ir_report_custom_5
-msgid "Daily sales turnover over one year"
-msgstr "Нэг жил дэх өдөр тутмын борлуулалтын эргэлт"
+#~ msgid "Top ten sales of the month"
+#~ msgstr "Сарын шилдэг 10 борлуулалт"
 
-#. module: sale
-#: field:report.sale.order.category,name:0
-#: field:report.sale.order.product,name:0
-#: field:report.turnover.per.month,name:0
-msgid "Month"
-msgstr "Сар"
+#~ msgid "Report of Created Sale Order"
+#~ msgstr "Борлуулалтын захиалга үүссэн мэдээлэл"
 
-#. module: sale
-#: field:report.sale.order.category,count:0
-#: field:report.sale.order.product,count:0
-msgid "# of Lines"
-msgstr "Мөрийн тоо"
+#~ msgid "Monthly cumulated sales turnover over one year"
+#~ msgstr "Нэг жил дэх сар тутмын хуримтлуулсан борлуулалтын эргэлт"
 
-#. module: sale
-#: field:report.sale.order.created,create_date:0
-msgid "Create Date"
-msgstr "Үүсгэх огноо"
+#~ msgid "Monthly Sales Turnover Over One Year"
+#~ msgstr "Нэг жил дэх сар тутмын борлуулалтын эргэлт"
 
-#. module: sale
-#: view:report.sale.order.created:0
-msgid "Created Sales orders"
-msgstr "Борлуулалтын захиалга үүсгэх"
+#~ msgid "Turnover Per Product"
+#~ msgstr "Бүтээгдэхүүний дундаж эргэлт"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_so_pipeline
-#: view:sale.order:0
-msgid "Sales by State"
-msgstr "Байрлалаар борлуулах"
+#~ msgid "All Months"
+#~ msgstr "Бүх сар"
+
+#~ msgid "Sales Orders by Categories"
+#~ msgstr "Зэрэглэлээр борлуулалтын захиалга"
+
+#~ msgid "Sales of the Month"
+#~ msgstr "Сарын борлуулалт"
+
+#~ msgid "Sales by Product (this month)"
+#~ msgstr "Бүтээгдэхүүнээр борлуулах(энэ сар)"
+
+#~ msgid "Monthly sales turnover over one year"
+#~ msgstr "Нэг жил дэх сар тутмын борлуулалтын эргэлт"
+
+#~ msgid "Sales Management - Reporting"
+#~ msgstr "Борлуулалтын менежмент-Мэдээ"
+
+#~ msgid "Sales by Category of Products"
+#~ msgstr "Бүтээгдэхүүний зэрэглэлээр борлуулах"
+
+#~ msgid "Monthly Cumulated Sales Turnover Over One Year"
+#~ msgstr "Нэг жил дэх сар тутмын хуримтлуулсан борлуулалтын эргэлт"
+
+#~ msgid "# of Products"
+#~ msgstr "Бүтээгдэхүүний #"
+
+#~ msgid "Sales by Product"
+#~ msgstr "Бүтээгдэхүүнээр борлуулах"
+
+#~ msgid "This Month"
+#~ msgstr "Энэ сар"
+
+#~ msgid "Categories"
+#~ msgstr "Зэрэглэлүүд"
+
+#~ msgid "Created Sale Orders"
+#~ msgstr "Борлуулалтын захиалга үүссэн"
+
+#~ msgid "Reporting"
+#~ msgstr "Мэдээ"
+
+#~ msgid "Turnover Per Month"
+#~ msgstr "Сарын дундаж эргэлт"
+
+#~ msgid "Daily Sales Turnover Over One Year"
+#~ msgstr "Нэг жил дэх өдөр тутмын борлуулалтын эргэлт"
+
+#~ msgid "Graphs"
+#~ msgstr "График"
+
+#~ msgid "Manual in progress"
+#~ msgstr "Өсөлтийн заавар"
+
+#~ msgid "Total Turnover"
+#~ msgstr "Нийт эргэлт"
+
+#~ msgid "In progress"
+#~ msgstr "Өсөлт"
+
+#~ msgid "Sales by Category of Product (this month)"
+#~ msgstr "Бүтээгдэхүүний зэрэглэлээр борлуулах( энэ сар)"
+
+#~ msgid "Daily sales turnover over one year"
+#~ msgstr "Нэг жил дэх өдөр тутмын борлуулалтын эргэлт"
+
+#~ msgid "Create Date"
+#~ msgstr "Үүсгэх огноо"
+
+#~ msgid "Created Sales orders"
+#~ msgstr "Борлуулалтын захиалга үүсгэх"
+
+#~ msgid "Sales by State"
+#~ msgstr "Байрлалаар борлуулах"
+
+#~ msgid "You invoice has been successfully created !"
+#~ msgstr "Таны нэхэмжлэл амжилттай үүслээ !"
+
+#~ msgid "Procurement is created after confirmation of sale order."
+#~ msgstr "Захиалга батлагдсаны дараа татан авалт үүснэ."
+
+#~ msgid "Procure Method"
+#~ msgstr "Нийлүүлэх арга"
+
+#~ msgid "Draft customer invoice, to be reviewed by accountant."
+#~ msgstr "Ноорог нэхэмжлэл нягтлангаар хянагдах ёстой."
+
+#~ msgid "Sales Configuration"
+#~ msgstr "Борлуулалтын тохиргоо"
+
+#~ msgid "Advance Payment"
+#~ msgstr "Урьдчилгаа төлбөр"
+
+#~ msgid "Other data"
+#~ msgstr "Бусад өгөгдөл"
+
+#~ msgid "Do you really want to create the invoices ?"
+#~ msgstr "Нэхэмжлэл үүсгэх үү ?"
+
+#~ msgid ""
+#~ "The name and address of the contact that requested the order or quotation."
+#~ msgstr "Захиалга өгсөн хүний нэр, хаяг."
+
+#~ msgid "Automatic Declaration"
+#~ msgstr "Автомат мэдэгдэл"
+
+#~ msgid ""
+#~ "The sale order will automatically create the invoice proposition (draft "
+#~ "invoice). Ordered and delivered quantities may not be the same. You have to "
+#~ "choose if you invoice based on ordered or shipped quantities. If the product "
+#~ "is a service, shipped quantities means hours spent on the associated tasks."
+#~ msgstr ""
+#~ "Борлуулалтын захиалга нь автоматаар нэхэмжлэлийн баталгааг үүсгэдэг. "
+#~ "Захиалсан болон хүргэж өгсөн тоо хэмжээ нь адилхан биш байх боломжтой. Хэрэв "
+#~ "нэхэмжлэл гаргах бол захиалагдсан эсвэл тээвэрлэгдсэн тоо хэмжээн дээр "
+#~ "суурилан гаргах хэрэгтэй. Хэрэв бүтээгдэхүүн үйлчилгээ бол тээвэрлэгдсэн тоо "
+#~ "хэмжээ нь холбоотой дааллгавар дээр зарцуулсан цаг болно."
+
+#~ msgid "My Quotations"
+#~ msgstr "Миний ханш"
+
+#~ msgid ""
+#~ "When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
+#~ "will automatic create after delivery."
+#~ msgstr ""
+#~ "Тээвэрлэлтийн удирдамж нь  = 'Хүргэлтийн дараах автомат нэхэмжлэл ' гэсэн "
+#~ "сонголттой үед хүргэлтийн дараа автоматаар үүсэх болно."
+
+#~ msgid "Packing Default Policy"
+#~ msgstr "Савлах заяамал удирдамж"
+
+#~ msgid "Sales Order To Be Invoiced"
+#~ msgstr "Борлуулалтын захаилга нэхэмжлэгдсэн байх"
+
+#~ msgid "Manages the delivery and invoicing progress"
+#~ msgstr "Хүргэлт болон нэхэмжлэх үйл ажиллагааг удирдах"
+
+#~ msgid "Procurement for each line"
+#~ msgstr "Мөр бүрээр татан авалт хийх"
+
+#~ msgid "Uninvoiced Lines"
+#~ msgstr "Нэхэмжлэлгүй мөр"
+
+#~ msgid "One procurement for each product."
+#~ msgstr "Бүтээгдэхүүн бүр дээр нэг татан авалт"
+
+#~ msgid "Configure Sale Order Logistic"
+#~ msgstr "Борлуулалтын захиалгын Ложистик тохиргоо"
+
+#~ msgid "Sales order lines"
+#~ msgstr "Борлуулалтын захиалгын мөр"
+
+#~ msgid "My sales in shipping exception"
+#~ msgstr "Миний борлуулалтын алдаатай тээвэрлэлт"
+
+#~ msgid "Invoice from the Packing"
+#~ msgstr "Савлагааны нэхэмжлэл"
+
+#~ msgid "Confirm sale order and Create invoice."
+#~ msgstr "Борлуулалтын захиалгыг батлах болон нэхэмжлэл үүсгэх"
+
+#~ msgid "Packing List & Delivery Order"
+#~ msgstr "Савлагааны жагсаалт ба Хүргэлтийн захаилга"
+
+#~ msgid "Set Default"
+#~ msgstr "Үндсэн утга болгох"
+
+#~ msgid "New Quotation"
+#~ msgstr "Шинэ ханш"
+
+#~ msgid "Make invoices"
+#~ msgstr "Нэхэмжлэл үүсгэх"
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 1aeb2376daa..931cf286ac4 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -6,16 +6,964 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-17 07:57+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-18 17:55+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: 2010-10-18 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: sale
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Недопустимое имя модели в определении действия."
+
+#. module: sale
+#: help:sale.installer,delivery:0
+msgid "Allows you to compute delivery costs on your quotations."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Если у вас недостаточно места на складе, чтобы доставить все за раз, примите "
+"ли вы частичную доставку?"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging: "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
+msgid "Cancel Order"
+msgstr "Отменить заказа"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sales_by_partner
+#: view:sale.report:0
+msgid "Sales By Partner"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Payment Before Delivery"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sale order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "VAT"
+msgstr "НДС"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "You must first cancel stock moves attached to this sale order line."
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "All at Once"
+msgstr "Все за раз"
+
+#. module: sale
+#: field:sale.order,project_id:0
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Счет аналитики"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Позиция заказа"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Cannot delete a sale order line which is %s !"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Условия платежа по умолчанию"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+msgid "Configure Picking Policy for Sales Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "State"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Дисконт (%)"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Заказанное кол-во"
+
+#. module: sale
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Движение запасов"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Ссылка на заказ"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sale order is created"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Dates"
+msgstr ""
+
+#. module: sale
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr ""
+"Ошибка. Единицы продажи и единицы измерения должны принадлежать к разным "
+"категориям."
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Скидка (%)"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales_manager
+#: model:ir.ui.menu,name:sale.menu_board_sales_manager
+msgid "Sales Manager Dashboard"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Could not cancel sale order !"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Упаковка"
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Set to Draft"
+msgstr "Установить в 'Черновик'"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Procurement Corrected"
+msgstr "Закупка скорректирована"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Conditions"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid ""
+"There is no income category account defined in default Properties for "
+"Product Category or Fiscal Position is not defined !"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "EAN: "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+msgid "All Quotations"
+msgstr "Все предложения"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Our Salesman"
+msgstr "Наш менеджер продаж"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+msgid "Quantity"
+msgstr "Количество"
+
+#. module: sale
+#: selection:sale.config.picking_policy,step:0
+msgid "Delivery Order Only"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "НДС"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_open_invoice
+msgid "Sale Open Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Налоговая позиция"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "UoM"
+msgstr "Ед. изм."
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid ""
+"You have to select a customer in the sale form !\n"
+"Please set one customer before choosing a product."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced !"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: view:sale.shop:0
+msgid "Accounting"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'. You may "
+"have to create it and set it as a default value on this field."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Could not cancel this sale order !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,note:0
+#: view:sale.order.line:0
+#: field:sale.order.line,notes:0
+msgid "Notes"
+msgstr "Примечания"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "The quotation '%s' has been converted to a sale order."
+msgstr ""
+
+#. module: sale
+#: field:product.product,pricelist_purchase:0
+msgid "Purchase Pricelists"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the the shipping of the "
+"products to the customer"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Invoice Corrected"
+msgstr "Счет скорректирован"
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount"
+msgstr ""
+
+#. module: sale
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Ошибка: Неправильный штрих-код"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Сумма до налогов"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sale Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sale order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Заказ на доставку"
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Долевой участник"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid ""
+"There is no income account defined ' \\n                                     "
+"   'for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Подитог"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Cannot delete Sale Order(s) which are already confirmed !"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Адрес выставления счета"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sale order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Предложение / Заказ"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sale Make Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Склад"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Заказ №"
+
+#. module: sale
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Позиции заказа"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Untaxed amount"
+msgstr "Сумма до налогов"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity (UoM)"
+msgstr "Количество  (ед.изм.)"
+
+#. module: sale
+#: help:sale.installer,sale_layout:0
+msgid ""
+"Provides some features to improve the layout of the Sales Order reports."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Позиции, поставленные без выставления счета"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Всего :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+"  - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+"  - The 'Shipping & Manual Invoice' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice.\n"
+"  - The 'Invoice on Order After Delivery' choice will generate the draft "
+"invoice based on sale order after all picking lists have been finished.\n"
+"  - The 'Invoice from the picking' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Прайс-лист"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid"
+msgstr ""
+
+#. module: sale
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Неправильный XML для просмотра архитектуры!"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,shipped:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "invalid mode for test_state"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Налоги :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "  Year  "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,state:0
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Состояние заказа"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s) ?"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
+#: view:sale.report:0
+msgid "Sales By Month"
+msgstr ""
+
+#. module: sale
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Адрес доставки"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
+msgstr "Журнал"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sale order is confirmed, in the "
+"same time as the procurement order. It represents the assignment of parts to "
+"the sale order. There is 1 pick list by sale order line which evolves with "
+"the availability of parts."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Ваша ссылка"
+
+#. module: sale
+#: help:sale.order,partner_order_id:0
+msgid ""
+"The name and address of the contact who requested the order or quotation."
+msgstr ""
+
+#. module: sale
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Кол-во"
+
+#. module: sale
+#: view:sale.order:0
+msgid "References"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Отмена"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist version for current sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,sale_order_dates:0
+msgid "Sales Order Dates"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sale Order Line"
+msgstr "Позиция заказа"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Создать счет"
+
+#. module: sale
+#: field:sale.installer,sale_margin:0
+msgid "Margins in Sales Orders"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Excluded"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Вычислить"
+
+#. module: sale
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_order_id:0
+msgid "Ordering Contact"
+msgstr "Контакт"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
+#: view:sale.open.invoice:0
+msgid "Open Invoice"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Цена"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_installer
+msgid "Sales Application Configuration"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "в заказе"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,name:0
+msgid "Name"
+msgstr "Название"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Адрес доставки :"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence Number"
+msgstr ""
+
+#. module: sale
+#: field:product.product,pricelist_sale:0
+msgid "Sale Pricelists"
+msgstr "Каталоги продаж"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale
+#: field:sale.installer,delivery:0
+msgid "Delivery Costs"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "The sale order '%s' has been set in draft state."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "The sale order '%s' has been cancelled."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Partial Delivery"
@@ -29,79 +977,57 @@ msgstr "Рекреационная поставка"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_confirmquotation0
 msgid "Confirm Quotation"
-msgstr "Подтверждение котировки"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Заказ на доставку"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Долевой участник"
-
-#. module: sale
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Недопустимое имя модели в определении действия."
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Waiting Schedule"
-msgstr "В ожидании расписания"
-
-#. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
-msgstr ""
-"Если у вас недостаточно места на складе, чтобы доставить все за раз, примите "
-"ли вы частичную доставку?"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "из запасов"
-
-#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sale Order"
-msgstr "Шаги по доставке заказа на продажу"
-
-#. module: sale
-#: wizard_field:sale.advance_payment_inv,init,qtty:0
-#: rml:sale.order:0
-msgid "Quantity"
-msgstr "Количество"
-
-#. module: sale
-#: wizard_view:sale.advance_payment_inv,create:0
-msgid "You invoice has been successfully created !"
-msgstr "Ваш счет был успешно создан !"
+msgstr "Подтвердить предложение цен"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
-msgid "Automatic Declaration"
-msgstr "Автоматическое объявление"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-#: model:ir.ui.menu,name:sale.menu_action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Позиции, поставленные без выставления счета"
+#: view:sale.report:0
+msgid "Group By..."
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Установить в 'Черновик'"
+msgid "Recreate Invoice"
+msgstr "Воссоздать счет"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
+#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
+msgid "Deliveries to Invoice"
+msgstr ""
 
 #. module: sale
 #: selection:sale.order,state:0
-msgid "Invoice Exception"
-msgstr "Исключительная ситуация счета"
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "В ожидании расписания"
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+#: view:sale.installer:0
+msgid "title"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice from Delivery"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order date"
+msgstr ""
 
 #. module: sale
 #: help:sale.order,picking_ids:0
@@ -110,14 +1036,9 @@ msgid ""
 msgstr "Это список отборочных листов, созданных для этого счета"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Delivery, from the warehouse to the customer."
-msgstr "Доставка клиенту со склада."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
+#: model:process.node,note:sale.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
@@ -126,59 +1047,36 @@ msgstr "Утвердить"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Make Invoice"
-msgstr "Сделать счет"
+msgid "Confirm Order"
+msgstr "Подтвердить заказ"
 
 #. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Подитог"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"Whenever confirm button is clicked, the draft state is moved to manual. that "
-"is, quotation is moved to  sale order."
+#: model:process.transition,name:sale.process_transition_saleprocurement0
+msgid "Create Procurement Order"
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
-msgid "Cancel Order"
-msgstr "Отменить заказа"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Движение запасов"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Manual Designation"
-msgstr ""
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sale Order"
+msgstr "Заказ"
 
 #. module: sale
 #: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Примечания"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-msgid "Invoice after delivery"
-msgstr "Счет после доставки"
-
-#. module: sale
 #: field:sale.order,amount_tax:0
 #: field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Налоги"
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Net Total :"
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"A sale order generates an invoice, as soon as it is confirmed by the "
+"salesman. Depending on the Invoicing control of the sale order, the invoice "
+"is based on delivered or on ordered quantities."
 msgstr ""
 
 #. module: sale
@@ -187,66 +1085,40 @@ msgid "Shipping Policy"
 msgstr "Политика доставки"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-msgid "Cancelled"
-msgstr "Отменено"
+#: model:ir.model,name:sale.model_stock_move
+msgid "Stock Move"
+msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0
-msgid "Shipping Exception"
-msgstr "Исключительная ситуация доставки"
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
 
 #. module: sale
-#: field:sale.order,amount_total:0
-msgid "Total"
-msgstr "Всего"
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sale order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception) or in the picking list process "
+"(Shipping Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the date 'Ordered Date'."
+msgstr ""
 
 #. module: sale
-#: field:sale.order,origin:0
-msgid "Origin"
-msgstr "Происхождение"
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Адрес выставления счета"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Outgoing Products"
-msgstr "Изделия к отправке"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Reference"
-msgstr "Ссылка"
-
-#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Все за раз"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid "Procurement is created after confirmation of sale order."
-msgstr "Снабжение осуществляется после подтверждения заказа на продажу."
-
-#. module: sale
-#: field:sale.order,project_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Счет аналитики"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "TVA :"
-msgstr "НДС"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procure Method"
-msgstr "Метод закупки"
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sale order in draft state.       "
+"              \n"
+"* The 'Confirmed' state is set when the related sale order is confirmed.     "
+"                \n"
+"* The 'Exception' state is set when the related sale order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sale order line has been picked.          "
+"           \n"
+"* The 'Cancelled' state is set when a user cancel the sale order related."
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
@@ -254,64 +1126,20 @@ msgid "Extra Info"
 msgstr "Доп. информация"
 
 #. module: sale
-#: rml:sale.order:0
+#: report:sale.order:0
 msgid "Fax :"
 msgstr "Факс :"
 
 #. module: sale
-#: field:sale.order.line,price_net:0
-msgid "Net Price"
-msgstr "Цена до налогов"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree9
-#: model:ir.ui.menu,name:sale.menu_action_order_tree9
-msgid "My sales order in progress"
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Количество (UoS)"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you invoice based on ordered or shipped quantities. If the product "
-"is a service, shipped quantities means hours spent on the associated tasks."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
+msgid "Sales by Product's Category"
 msgstr ""
-"Заказ на продажу автоматически создаст черновик счета. Заказанные и "
-"отправленные количества могут не совпадать. Вы должны выбрать на чем основан "
-"счет на заказанном или на отправленном. Если вы продаете услуги, то "
-"отправленное количество это потраченные часы."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Подтвержден"
-
-#. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Условия платежа по умолчанию"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree_all
-#: model:ir.ui.menu,name:sale.menu_action_order_tree_all
-msgid "All Sales Order"
-msgstr "Все заказы на продажу"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Подтвердить"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Адрес доставки"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -324,347 +1152,85 @@ msgid "Invoice Based on Sales Orders"
 msgstr "Счет, основанный на заказе на продажу"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sale Shop"
-msgstr "Магазин"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Склад"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Order N°"
-msgstr "Заказ №"
-
-#. module: sale
-#: field:sale.order,order_line:0
-#: view:sale.order.line:0
-msgid "Order Lines"
-msgstr "Позиции заказа"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Disc.(%)"
-msgstr "Дисконт (%)"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Позиции счета"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
+#: model:ir.model,name:sale.model_stock_picking
+msgid "Picking List"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Сумма до налогов"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
+#: model:process.transition,note:sale.process_transition_confirmquotation0
 msgid ""
-"Packing list is created when 'Assign' is being clicked after confirming the "
-"sale order. This transaction moves the sale order to packing list."
-msgstr ""
-"Упаковочный лист создается при нажатии на \"Назначить\" после подтверждения "
-"заказа на продажу. Это действие создает упаковочный лист из заказа на "
-"продажу."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree8
-#: model:ir.ui.menu,name:sale.menu_action_order_tree8
-msgid "My sales order waiting Invoice"
-msgstr "Мои заказы на продажу, ожидающие счета."
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Shipping address :"
-msgstr "Адрес доставки :"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
-"will automatic create after delivery."
+"The salesman confirms the quotation. The state of the sale order becomes 'In "
+"progress' or 'Manual in progress'."
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Доставка целиком"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Manual Description"
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Количество  (ед.изм.)"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree1
-#: model:ir.ui.menu,name:sale.menu_action_order_line_tree1
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Позиции заказа на продажу"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Заказанное кол-во"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sale Order Procurement"
-msgstr "Заказ на продажу - снабжение"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Packing"
-msgstr "Упаковка"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Total :"
-msgstr "Всего :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Подтвердить заказ"
-
-#. module: sale
-#: field:sale.order,name:0
-msgid "Order Reference"
-msgstr "Ссылка на заказ"
-
-#. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-msgid "Done"
-msgstr "Выполнено"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Прайс-лист"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_shop_configuration
-msgid "Configuration"
-msgstr "Настройки"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on Order After Delivery"
-msgstr "Счет по заказу после доставки"
-
-#. module: sale
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Packing"
+#: selection:sale.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: sale
-#: field:sale.shop,payment_account_id:0
-msgid "Payment Accounts"
-msgstr "Бух. счета платежа"
-
-#. module: sale
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
-"Ошибка. Единицы продажи и единицы измерения должны принадлежать к разным "
-"категориям."
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Ref"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales orders"
-msgstr "Заказы на продажу"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
 #: field:sale.order.line,procurement_id:0
 msgid "Procurement"
 msgstr "Снабжение"
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Payment accounts"
-msgstr "Бух. счета платежа"
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Исключительная ситуация доставки"
 
 #. module: sale
-#: wizard_button:sale.advance_payment_inv,create,end:0
-msgid "Close"
-msgstr "Закрыть"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Draft Invoice"
-msgstr "Черновик счета"
-
-#. module: sale
-#: wizard_field:sale.order.line.make_invoice,init,grouped:0
-#: wizard_field:sale.order.make_invoice,init,grouped:0
+#: field:sale.make.invoice,grouped:0
 msgid "Group the invoices"
 msgstr "Сгруппировать счета"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-#: model:ir.ui.menu,name:sale.menu_action_order_tree5
-msgid "All Quotations"
-msgstr "Все предложения"
+#: selection:sale.order,order_policy:0
+msgid "Shipping & Manual Invoice"
+msgstr "Доставка & счет вручную"
 
 #. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Скидка (%)"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "Draft customer invoice, to be reviewed by accountant."
-msgstr "Черновик счета клиенту будет проверен бухгалтером."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree3
-#: model:ir.ui.menu,name:sale.menu_action_order_tree3
-msgid "Sales Order To Be Invoiced"
-msgstr "Счет будет из заказа на продажу"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Procurement for each line"
-msgstr "Снабжение для каждой позиции"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree10
-#: model:ir.ui.menu,name:sale.menu_action_order_tree10
-msgid "My Quotations"
-msgstr "Мои предложения"
-
-#. module: sale
-#: wizard_view:sale.advance_payment_inv,create:0
-msgid "Invoices"
-msgstr "Счета"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Позиция заказа"
-
-#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Packing Default Policy"
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Picking Information !"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Manages the delivery and invoicing progress"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
 msgstr ""
 
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Упаковка"
-
 #. module: sale
 #: model:ir.module.module,shortdesc:sale.module_meta_information
-#: model:ir.ui.menu,name:sale.menu_sale_root
 msgid "Sales Management"
 msgstr "Управление продажами"
 
 #. module: sale
-#: field:sale.order.line,order_id:0
-msgid "Order Ref"
-msgstr "Ссылка на заказ"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Воссоздать счет"
-
-#. module: sale
-#: field:sale.order,user_id:0
-msgid "Salesman"
-msgstr "Менеджер продаж"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"In sale order , procuerement for each line and it comes into the procurement "
-"order"
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid " Quantity: "
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Taxes :"
-msgstr "Налоги :"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Выставлен счет"
-
-#. module: sale
-#: model:ir.actions.wizard,name:sale.advance_payment
-msgid "Advance Invoice"
-msgstr "Предварительный счет"
-
-#. module: sale
-#: field:sale.order,state:0
-msgid "Order State"
-msgstr "Состояние заказа"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_action_order_line_tree2
-msgid "Uninvoiced Lines"
-msgstr "Позиции без счета"
-
-#. module: sale
-#: model:ir.actions.todo,note:sale.config_wizard_step_sale_picking_policy
-msgid ""
-"This Configuration step use to set default picking policy when make sale "
-"order"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
 msgstr ""
 
 #. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-msgid "Sales Process"
-msgstr "Процесс продаж"
+#: model:process.node,note:sale.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sale order line."
+msgstr ""
 
 #. module: sale
-#: wizard_view:sale.order.line.make_invoice,init:0
-#: wizard_button:sale.order.line.make_invoice,init,invoice:0
-#: wizard_view:sale.order.make_invoice,init:0
-#: wizard_button:sale.order.make_invoice,init,invoice:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
 msgid "Create invoices"
 msgstr "Создать счета"
 
@@ -677,31 +1243,28 @@ msgstr ""
 "категорию."
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree7
-#: model:ir.ui.menu,name:sale.menu_action_order_tree7
-msgid "My sales in shipping exception"
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
 msgstr ""
 
 #. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Sales Configuration"
-msgstr "Настройка продаж"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-#: model:ir.ui.menu,name:sale.menu_action_order_tree2
-msgid "Sales in Exception"
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "в заказе"
+#: help:sale.config.picking_policy,step:0
+msgid ""
+"By default, OpenERP is able to manage complex routing and paths of products "
+"in your warehouse and partner locations. This will configure the most common "
+"and simple methods to deliver products to the customer in one or two "
+"operations by the worker."
+msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Черновик"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -709,80 +1272,18 @@ msgid "Paid"
 msgstr "Оплачено"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Procurement Corrected"
-msgstr "Закупка скорректирована"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Доставка & счет вручную"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Sale Procurement"
-msgstr "Снабжение продаж"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sale Order Logistic"
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Сумма до налогов"
-
-#. module: sale
-#: field:sale.order.line,state:0
-msgid "Status"
-msgstr "Статус"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Packing Policy"
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sale order"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Продажи продукции"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Our Salesman"
-msgstr "Наш менеджер продаж"
-
-#. module: sale
-#: wizard_button:sale.advance_payment_inv,init,create:0
-msgid "Create Advance Invoice"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid "One procurement for each product."
-msgstr "Одна закупка для каждого товара."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sales Orders"
-msgstr "Заказы"
-
-#. module: sale
-#: field:product.product,pricelist_sale:0
-msgid "Sale Pricelists"
-msgstr "Каталоги продаж"
-
-#. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Прямая доставка"
-
-#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
 #: field:sale.order.line,property_ids:0
 msgid "Properties"
 msgstr "Свойства"
@@ -790,182 +1291,77 @@ msgstr "Свойства"
 #. module: sale
 #: model:process.node,name:sale.process_node_quotation0
 #: selection:sale.order,state:0
+#: selection:sale.report,state:0
 msgid "Quotation"
 msgstr "Предложение"
 
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance Product"
-msgstr ""
-
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoice0
 msgid ""
-"Invoice is created when 'Create Invoice' is being clicked after confirming "
-"the sale order. This transaction moves the sale order to invoices."
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Вычислить"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: model:ir.ui.menu,name:sale.menu_action_shop_form
-#: field:sale.order,shop_id:0
-msgid "Shop"
-msgstr "Магазин"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "VAT"
-msgstr "НДС"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-#: model:ir.ui.menu,name:sale.menu_action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Заказы в процессе выполнения"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Назначить"
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Журнал"
-
-#. module: sale
-#: help:sale.order,order_policy:0
+#: help:sale.config.picking_policy,order_policy:0
 msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the packing order after the payment of this invoice.\n"
-"  - The 'Shipping & Manual Invoice' will create the packing order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-"  - The 'Invoice on Order After Delivery' choice will generate the draft "
-"invoice based on sale order after all packing lists have been finished.\n"
-"  - The 'Invoice from the packing' choice is used to create an invoice "
-"during the packing process."
-msgstr ""
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Your Reference"
-msgstr "Ваша ссылка"
-
-#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
+"You can generate invoices based on sales orders or based on shippings."
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales order lines"
-msgstr "Позиции заказа"
+msgid "Related Invoices"
+msgstr ""
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
-msgstr "Последовательность"
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sale order to invoice."
+msgstr ""
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: model:ir.ui.menu,name:sale.menu_config_sale
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:sale.order:0
+#: view:sale.report:0
 msgid "Sales"
 msgstr "Продажи"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Кол-во"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Packing OUT is created for stockable products."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other data"
-msgstr "Прочие данные"
-
-#. module: sale
-#: wizard_field:sale.advance_payment_inv,init,amount:0
-#: rml:sale.order:0
+#: report:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
 msgstr "Цена за ед."
 
 #. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Налоговая позиция"
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Выполнено"
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Invoice address :"
+#: model:ir.model,name:sale.model_sale_installer
+msgid "sale.installer"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: field:sale.order,invoice_ids:0
+#: model:process.node,name:sale.process_node_invoice0
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Invoice"
 msgstr "Счет"
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancel0
-#: model:process.transition.action,name:sale.process_transition_action_cancel1
-#: model:process.transition.action,name:sale.process_transition_action_cancel2
-#: wizard_button:sale.advance_payment_inv,init,end:0
-#: view:sale.config.picking_policy:0
-#: view:sale.order.line:0
-#: wizard_button:sale.order.line.make_invoice,init,end:0
-#: wizard_button:sale.order.make_invoice,init,end:0
-msgid "Cancel"
-msgstr "Отмена"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sale order. The exception state is "
-"automatically set when a cancel operation occurs in the invoice validation "
-"(Invoice Exception) or in the packing list process (Shipping Exception). The "
-"'Waiting Schedule' state is set when the invoice is confirmed but waiting "
-"for the scheduler to run on the date 'Date Ordered'."
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Could not cancel sale order line!"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "UoM"
-msgstr "Ед. изм."
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Confirming the packing list moves them to delivery order. This can be done "
-"by clicking on 'Validate' button."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: sale
-#: wizard_view:sale.advance_payment_inv,init:0
-msgid "Advance Payment"
+#: selection:sale.config.picking_policy,step:0
+msgid "Picking List & Delivery Order"
 msgstr ""
 
 #. module: sale
@@ -977,60 +1373,23 @@ msgstr ""
 "символов !"
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid "Confirm sale order and Create invoice."
+#: view:sale.order.line:0
+msgid "To Do"
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Packing List & Delivery Order"
+#: field:sale.order,picking_policy:0
+msgid "Picking Policy"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
+#: model:process.node,note:sale.process_node_deliveryorder0
+msgid "Document of the move to the customer."
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Sale Order Lines"
-msgstr "Позиции заказа"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.order:0
-msgid "Create Invoice"
-msgstr "Создать счет"
-
-#. module: sale
-#: wizard_view:sale.order.line.make_invoice,init:0
-#: wizard_view:sale.order.make_invoice,init:0
-msgid "Do you really want to create the invoices ?"
-msgstr "Вы действительно хотите создать эти счета?"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Invoice based on packing lists"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Set Default"
-msgstr "Установить по умолчанию"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales order"
-msgstr "Заказ"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Quotation (A sale order in draft state)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "Sale Invoice"
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Shipping Default Policy"
 msgstr ""
 
 #. module: sale
@@ -1039,104 +1398,33 @@ msgid "Incoterm"
 msgstr ""
 
 #. module: sale
-#: wizard_field:sale.advance_payment_inv,init,product_id:0
+#: model:ir.model,name:sale.model_product_product
+#: view:sale.order.line:0
 #: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
 msgid "Product"
 msgstr "Продукция"
 
 #. module: sale
-#: wizard_button:sale.advance_payment_inv,create,open:0
-msgid "Open Advance Invoice"
+#: model:ir.ui.menu,name:sale.menu_invoiced
+msgid "Invoicing"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sale order is confirmed"
 msgstr ""
 
-#. module: sale
-#: rml:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
-msgstr "Описание"
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Price"
-msgstr "Цена"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Deliver"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr ""
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Tel. :"
-msgstr ""
-
-#. module: sale
-#: rml:sale.order:0
-msgid "Quotation N°"
-msgstr ""
-
-#. module: sale
-#: field:stock.move,sale_line_id:0
-msgid "Sale Order Line"
-msgstr "Позиция заказа"
-
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
 msgid "Cancel Assignation"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice from the Packing"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.wizard,name:sale.wizard_sale_order_line_invoice
-#: model:ir.actions.wizard,name:sale.wizard_sale_order_make_invoice
-msgid "Make invoices"
-msgstr "Подготовить счета"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact that requested the order or quotation."
-msgstr ""
-"Имя и адрес контакта, разместившего заказ или запросившего предолжение."
-
-#. module: sale
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Клиент"
-
-#. module: sale
-#: field:product.product,pricelist_purchase:0
-msgid "Purchase Pricelists"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order
-#: view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sale Order"
-msgstr "Заказ"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Название"
+#: model:ir.model,name:sale.model_sale_config_picking_policy
+msgid "sale.config.picking_policy"
+msgstr "sale.config.picking_policy"
 
 #. module: sale
 #: field:sale.order,invoice_quantity:0
@@ -1144,19 +1432,7 @@ msgid "Invoice on"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree_new
-#: model:ir.ui.menu,name:sale.menu_action_order_tree_new
-msgid "New Quotation"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total amount"
-msgstr "Итоговая сумма"
-
-#. module: sale
-#: rml:sale.order:0
-#: field:sale.order,date_order:0
+#: report:sale.order:0
 msgid "Date Ordered"
 msgstr "Дата заказа"
 
@@ -1167,6 +1443,7 @@ msgstr ""
 
 #. module: sale
 #: selection:sale.order,state:0
+#: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr ""
 
@@ -1176,59 +1453,299 @@ msgid "Product UoM"
 msgstr ""
 
 #. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, Open ERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+#: view:sale.report:0
+msgid "Sales By Salesman"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sale Order"
-msgstr "Настроить принцип отбора для заказа на продажу"
+#: view:sale.order:0
+msgid "Logistic"
+msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_order0
+#: view:sale.order.line:0
 msgid "Order"
 msgstr ""
 
 #. module: sale
-#: rml:sale.order:0
-msgid "Payment Terms"
-msgstr "Условия оплаты"
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sale order"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Invoice Corrected"
-msgstr "Счет скорректирован"
+msgid "States"
+msgstr "Cостояния"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Всего"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sale order has been delivered. This field is updated "
+"only after the scheduler have been launched !"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,step:0
+msgid "Steps To Deliver a Sale Order"
+msgstr "Шаги по доставке заказа на продажу"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Исключительная ситуация счета"
+
+#. module: sale
+#: help:sale.installer,sale_margin:0
+msgid ""
+"Gives the margin of profitability by calculating the difference between Unit "
+"Price and Cost Price."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "You must first cancel all invoices attached to this sale order."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Отменено"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Магазин"
+
+#. module: sale
+#: view:sale.report:0
+msgid "   Month   "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,uom_name:0
+msgid "Default UoM"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Количество (UoS)"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid " Type of ul: "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Подтвержден"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Подтвердить"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this sale order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Позиции счета"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Позиции заказа на продажу"
 
 #. module: sale
 #: field:sale.order.line,delay:0
-msgid "Delivery Delay"
-msgstr "Задержка достаки"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Related invoices"
-msgstr "Соответствующие счета"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
+msgid "Delivery Lead Time"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Условия оплаты"
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Настройки"
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "There is no sale journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
 
 #. module: sale
 #: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
+msgid "Invoice on Order After Delivery"
+msgstr "Счет по заказу после доставки"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+msgid ""
+"For every sale order line, a procurement order is created to supply the sold "
+"product."
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Complete Delivery"
+msgstr "Доставка целиком"
+
+#. module: sale
+#: view:sale.report:0
+msgid "    Month-1    "
+msgstr ""
+
+#. module: sale
+#: help:sale.config.picking_policy,picking_policy:0
+msgid ""
+"The Shipping Policy is used to configure per order if you want to deliver as "
+"soon as possible when one product is available or you wait that all products "
+"are available.."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source document"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Вес"
+
+#. module: sale
+#: view:sale.open.invoice:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Счета"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,config_logo:0
+#: field:sale.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesman"
+msgstr "Менеджер продаж"
+
 #. module: sale
 #: help:sale.order,invoice_ids:0
 msgid ""
@@ -1240,36 +1757,268 @@ msgstr ""
 "заказу может быть выставлены несколько счетов (например, по отдельным "
 "позициям)."
 
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Выставлен счет"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#, python-format
+msgid "Advance Invoice"
+msgstr "Предварительный счет"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleorderprocurement0
+msgid "Sale Order Requisition"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Черновик"
+
+#. module: sale
+#: field:sale.config.picking_policy,progress:0
+#: field:sale.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+msgid "Product sales"
+msgstr "Продажи продукции"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Ordered Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Заказы"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Payment Terms"
+msgstr "Условия оплаты"
+
+#. module: sale
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "Direct Delivery"
+msgstr "Прямая доставка"
+
+#. module: sale
+#: field:sale.installer,sale_journal:0
+msgid "Invoicing journals"
+msgstr ""
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped Qty"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:0
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sale Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sale order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sale Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "Заказы в процессе выполнения"
+
+#. module: sale
+#: field:sale.installer,sale_layout:0
+msgid "Sales Order Layout Improvement"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_assign0
+msgid "Assign"
+msgstr "Назначить"
+
+#. module: sale
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "из запасов"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sale Shop"
+msgstr "Магазин"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales By Customer"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "Close"
+msgstr "Закрыть"
+
+#. module: sale
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "Not enough stock !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order Lines"
+msgstr "Позиции заказа"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Описание"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
+#, python-format
+msgid ""
+"You cannot make an advance on a sale order \\n                             "
+"that is defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: help:sale.installer,sale_order_dates:0
+msgid "Adds commitment, requested and effective dates on Sales Orders."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Клиент"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: sale
+#: help:sale.installer,sale_journal:0
+msgid ""
+"Allows you to group and invoice your delivery orders according to different "
+"invoicing types: daily, weekly, etc."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
-msgid "States"
-msgstr "Cостояния"
+msgid "Search Sales Order"
+msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Вес"
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Условия оплаты"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "After confirming order, Create the invoice."
-msgstr "После подтверждения заказа, создать счет."
+#: model:process.transition,note:sale.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sale order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sale order's "
+"parameters. "
+msgstr ""
 
 #. module: sale
-#: constraint:product.product:0
-msgid "Error: Invalid ean code"
-msgstr "Ошибка: Неправильный штрих-код"
+#: field:sale.config.picking_policy,picking_policy:0
+msgid "Picking Default Policy"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr "Предложение №"
 
 #. module: sale
 #: field:sale.order,picked_rate:0
-#: field:sale.order,shipped:0
+#: view:sale.report:0
 msgid "Picked"
 msgstr ""
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
 msgstr ""
 
 #. module: sale
@@ -1277,258 +2026,161 @@ msgstr ""
 msgid "Invoice Based on Deliveries"
 msgstr ""
 
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr ""
+#~ msgid "In progress"
+#~ msgstr "Выполняется"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-#: model:ir.ui.menu,name:sale.menu_action_order_tree
-msgid "My Sales Order"
-msgstr "Мой заказ"
+#~ msgid "Origin"
+#~ msgstr "Происхождение"
 
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sale Order line"
-msgstr "Позиция заказа"
+#~ msgid "Reference"
+#~ msgstr "Ссылка"
 
-#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Dashboard for sales"
-msgstr ""
+#~ msgid "Procure Method"
+#~ msgstr "Метод закупки"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sale Dashboard"
-msgstr ""
+#~ msgid "Net Price"
+#~ msgstr "Цена до налогов"
 
-#. module: sale
-#: view:board.board:0
-msgid "Sales of the month"
-msgstr ""
+#~ msgid "My Quotations"
+#~ msgstr "Мои предложения"
 
-#. module: sale
-#: view:board.board:0
-msgid "Sales manager board"
-msgstr ""
+#~ msgid "Order Ref"
+#~ msgstr "Ссылка на заказ"
 
-#. module: sale
-#: view:board.board:0
-msgid "Cases of the month"
-msgstr ""
+#~ msgid "Status"
+#~ msgstr "Статус"
 
-#. module: sale
-#: view:board.board:0
-msgid "My open quotations"
-msgstr ""
+#~ msgid "Sales order lines"
+#~ msgstr "Позиции заказа"
 
-#. module: sale
-#: view:board.board:0
-msgid "Cases statistics"
-msgstr ""
+#~ msgid "Sequence"
+#~ msgstr "Последовательность"
 
-#. module: sale
-#: view:board.board:0
-msgid "Top ten sales of the month"
-msgstr ""
+#~ msgid "Other data"
+#~ msgstr "Прочие данные"
 
-#. module: sale
-#: field:report.sale.order.category,price_average:0
-#: field:report.sale.order.product,price_average:0
-msgid "Average Price"
-msgstr ""
+#~ msgid "Do you really want to create the invoices ?"
+#~ msgstr "Вы действительно хотите создать эти счета?"
 
-#. module: sale
-#: model:ir.model,name:sale.model_report_sale_order_created
-msgid "Report of Created Sale Order"
-msgstr ""
+#~ msgid "Set Default"
+#~ msgstr "Установить по умолчанию"
 
-#. module: sale
-#: view:report.sale.order.category:0
-msgid "Sales Orders by category"
-msgstr ""
+#~ msgid "Sales order"
+#~ msgstr "Заказ"
 
-#. module: sale
-#: model:ir.report.custom,name:sale.ir_report_custom_6
-#: model:ir.report.custom,title:sale.ir_report_custom_6
-msgid "Monthly cumulated sales turnover over one year"
-msgstr ""
+#~ msgid "Make invoices"
+#~ msgstr "Подготовить счета"
 
-#. module: sale
-#: model:ir.model,name:sale.model_report_sale_order_product
-msgid "Sales Orders by Products"
-msgstr ""
+#~ msgid ""
+#~ "The name and address of the contact that requested the order or quotation."
+#~ msgstr ""
+#~ "Имя и адрес контакта, разместившего заказ или запросившего предолжение."
 
-#. module: sale
-#: model:ir.ui.menu,name:sale.ir_ui_menu1
-msgid "Monthly Sales Turnover Over One Year"
-msgstr ""
+#~ msgid "Total amount"
+#~ msgstr "Итоговая сумма"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_turnover_product_tree
-#: model:ir.model,name:sale.model_report_turnover_per_product
-#: view:report.turnover.per.product:0
-msgid "Turnover Per Product"
-msgstr ""
+#~ msgid "Delivery Delay"
+#~ msgstr "Задержка достаки"
 
-#. module: sale
-#: model:ir.ui.menu,name:sale.next_id_82
-msgid "All Months"
-msgstr ""
+#~ msgid "Related invoices"
+#~ msgstr "Соответствующие счета"
 
-#. module: sale
-#: field:report.sale.order.category,price_total:0
-#: field:report.sale.order.product,price_total:0
-msgid "Total Price"
-msgstr ""
+#~ msgid "My Sales Order"
+#~ msgstr "Мой заказ"
 
-#. module: sale
-#: model:ir.model,name:sale.model_report_sale_order_category
-msgid "Sales Orders by Categories"
-msgstr ""
+#~ msgid "Sale Order line"
+#~ msgstr "Позиция заказа"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_sale_list
-#: model:ir.ui.menu,name:sale.menu_report_order_sale_list
-msgid "Sales of the Month"
-msgstr ""
+#~ msgid "Invoice after delivery"
+#~ msgstr "Счет после доставки"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_product_tree
-#: model:ir.ui.menu,name:sale.menu_report_order_product
-msgid "Sales by Product (this month)"
-msgstr ""
+#~ msgid "Delivery, from the warehouse to the customer."
+#~ msgstr "Доставка клиенту со склада."
 
-#. module: sale
-#: model:ir.report.custom,name:sale.ir_report_custom_4
-#: model:ir.report.custom,title:sale.ir_report_custom_4
-msgid "Monthly sales turnover over one year"
-msgstr ""
+#~ msgid "After confirming order, Create the invoice."
+#~ msgstr "После подтверждения заказа, создать счет."
 
-#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management - Reporting"
-msgstr ""
+#~ msgid "Configure Picking Policy for Sale Order"
+#~ msgstr "Настроить принцип отбора для заказа на продажу"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_category_tree_all
-#: model:ir.ui.menu,name:sale.menu_report_order_category_all
-#: view:report.sale.order.category:0
-msgid "Sales by Category of Products"
-msgstr ""
+#~ msgid "You invoice has been successfully created !"
+#~ msgstr "Ваш счет был успешно создан !"
 
-#. module: sale
-#: model:ir.ui.menu,name:sale.ir_ui_menu3
-msgid "Monthly Cumulated Sales Turnover Over One Year"
-msgstr ""
+#~ msgid "Automatic Declaration"
+#~ msgstr "Автоматическое объявление"
 
-#. module: sale
-#: field:report.sale.order.category,quantity:0
-#: field:report.sale.order.product,quantity:0
-msgid "# of Products"
-msgstr ""
+#~ msgid "Make Invoice"
+#~ msgstr "Сделать счет"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_product_tree_all
-#: model:ir.ui.menu,name:sale.menu_report_order_product_all
-#: view:report.sale.order.product:0
-msgid "Sales by Product"
-msgstr ""
+#~ msgid "Outgoing Products"
+#~ msgstr "Изделия к отправке"
 
-#. module: sale
-#: model:ir.ui.menu,name:sale.next_id_81
-msgid "This Month"
-msgstr ""
+#~ msgid "Procurement is created after confirmation of sale order."
+#~ msgstr "Снабжение осуществляется после подтверждения заказа на продажу."
 
-#. module: sale
-#: field:report.sale.order.category,category_id:0
-msgid "Categories"
-msgstr ""
+#~ msgid ""
+#~ "The sale order will automatically create the invoice proposition (draft "
+#~ "invoice). Ordered and delivered quantities may not be the same. You have to "
+#~ "choose if you invoice based on ordered or shipped quantities. If the product "
+#~ "is a service, shipped quantities means hours spent on the associated tasks."
+#~ msgstr ""
+#~ "Заказ на продажу автоматически создаст черновик счета. Заказанные и "
+#~ "отправленные количества могут не совпадать. Вы должны выбрать на чем основан "
+#~ "счет на заказанном или на отправленном. Если вы продаете услуги, то "
+#~ "отправленное количество это потраченные часы."
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_created_sale_order_dashboard
-msgid "Created Sale Orders"
-msgstr ""
+#~ msgid "All Sales Order"
+#~ msgstr "Все заказы на продажу"
 
-#. module: sale
-#: model:ir.ui.menu,name:sale.next_id_80
-msgid "Reporting"
-msgstr ""
+#~ msgid ""
+#~ "Packing list is created when 'Assign' is being clicked after confirming the "
+#~ "sale order. This transaction moves the sale order to packing list."
+#~ msgstr ""
+#~ "Упаковочный лист создается при нажатии на \"Назначить\" после подтверждения "
+#~ "заказа на продажу. Это действие создает упаковочный лист из заказа на "
+#~ "продажу."
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_turnover_month_tree
-#: model:ir.model,name:sale.model_report_turnover_per_month
-#: view:report.turnover.per.month:0
-msgid "Turnover Per Month"
-msgstr ""
+#~ msgid "My sales order waiting Invoice"
+#~ msgstr "Мои заказы на продажу, ожидающие счета."
 
-#. module: sale
-#: model:ir.ui.menu,name:sale.ir_ui_menu2
-msgid "Daily Sales Turnover Over One Year"
-msgstr ""
+#~ msgid "Sale Order Procurement"
+#~ msgstr "Заказ на продажу - снабжение"
 
-#. module: sale
-#: model:ir.ui.menu,name:sale.next_id_83
-msgid "Graphs"
-msgstr ""
+#~ msgid "Packing"
+#~ msgstr "Упаковка"
 
-#. module: sale
-#: selection:report.sale.order.category,state:0
-#: selection:report.sale.order.product,state:0
-msgid "Manual in progress"
-msgstr ""
+#~ msgid "Payment Accounts"
+#~ msgstr "Бух. счета платежа"
 
-#. module: sale
-#: field:report.turnover.per.month,turnover:0
-#: field:report.turnover.per.product,turnover:0
-msgid "Total Turnover"
-msgstr ""
+#~ msgid "Payment accounts"
+#~ msgstr "Бух. счета платежа"
 
-#. module: sale
-#: selection:report.sale.order.category,state:0
-#: selection:report.sale.order.product,state:0
-msgid "In progress"
-msgstr "Выполняется"
+#~ msgid "Sales orders"
+#~ msgstr "Заказы на продажу"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_category_tree
-#: model:ir.ui.menu,name:sale.menu_report_order_category
-msgid "Sales by Category of Product (this month)"
-msgstr ""
+#~ msgid "Draft customer invoice, to be reviewed by accountant."
+#~ msgstr "Черновик счета клиенту будет проверен бухгалтером."
 
-#. module: sale
-#: model:ir.report.custom,name:sale.ir_report_custom_5
-#: model:ir.report.custom,title:sale.ir_report_custom_5
-msgid "Daily sales turnover over one year"
-msgstr ""
+#~ msgid "Sales Order To Be Invoiced"
+#~ msgstr "Счет будет из заказа на продажу"
 
-#. module: sale
-#: field:report.sale.order.category,name:0
-#: field:report.sale.order.product,name:0
-#: field:report.turnover.per.month,name:0
-msgid "Month"
-msgstr ""
+#~ msgid "Draft Invoice"
+#~ msgstr "Черновик счета"
 
-#. module: sale
-#: field:report.sale.order.category,count:0
-#: field:report.sale.order.product,count:0
-msgid "# of Lines"
-msgstr ""
+#~ msgid "Procurement for each line"
+#~ msgstr "Снабжение для каждой позиции"
 
-#. module: sale
-#: field:report.sale.order.created,create_date:0
-msgid "Create Date"
-msgstr ""
+#~ msgid "Sales Process"
+#~ msgstr "Процесс продаж"
 
-#. module: sale
-#: view:report.sale.order.created:0
-msgid "Created Sales orders"
-msgstr ""
+#~ msgid "Uninvoiced Lines"
+#~ msgstr "Позиции без счета"
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_so_pipeline
-#: view:sale.order:0
-msgid "Sales by State"
-msgstr ""
+#~ msgid "Sales Configuration"
+#~ msgstr "Настройка продаж"
+
+#~ msgid "Sale Procurement"
+#~ msgstr "Снабжение продаж"
+
+#~ msgid "One procurement for each product."
+#~ msgstr "Одна закупка для каждого товара."
diff --git a/addons/stock/i18n/mn.po b/addons/stock/i18n/mn.po
index 33e60ea3573..52c0d43112d 100644
--- a/addons/stock/i18n/mn.po
+++ b/addons/stock/i18n/mn.po
@@ -7,35 +7,59 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-15 08:16+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:47+0000\n"
+"PO-Revision-Date: 2010-10-18 06:21+0000\n"
+"Last-Translator: sugi <Unknown>\n"
 "Language-Team: Mongolian <mn@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: 2010-10-16 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
-#: selection:stock.location,allocation_method:0
-msgid "LIFO"
-msgstr "Сүүлд орсон нь эхэнд гарна"
+#: selection:stock.location,icon:0
+msgid "terp-rating-rated"
+msgstr ""
+
+#. module: stock
+#: field:product.product,track_outgoing:0
+msgid "Track Outgoing Lots"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_ups_upload
+msgid "Stock ups upload"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,chained_location_id:0
 msgid "Chained Location If Fixed"
 msgstr "Хэлхээ байрлал (Тогтмол бол)"
 
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Put in a new pack"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SAVE"
 msgstr "Бараа хадгалах"
 
 #. module: stock
-#: model:stock.location,name:stock.stock_location_15
-msgid "Sub Products"
-msgstr "Дэд бүтээгдэхүүн"
+#: field:stock.move.split.lines,action:0
+msgid "Action"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid ""
+"There is no journal defined '\\n                                'on the "
+"product category: \"%s\" (id: %d)"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -48,10 +72,10 @@ msgid "Invalid model name in the action definition."
 msgstr "Моделийн нэр алдаатай."
 
 #. module: stock
-#: model:ir.module.module,shortdesc:stock.module_meta_information
-#: model:ir.ui.menu,name:stock.menu_stock_root
-msgid "Inventory Management"
-msgstr "Бүртгэлийн менежмент"
+#: model:ir.actions.act_window,name:stock.action_stock_line_date
+#: model:ir.ui.menu,name:stock.menu_report_stock_line_date
+msgid "Last Product Inventories"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -60,8 +84,8 @@ msgstr "STOCK_SORT_ASCENDING"
 
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
-msgid "Revision"
-msgstr "Хяналт"
+msgid "Revision Number"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -69,9 +93,29 @@ msgid "STOCK_MEDIA_FORWARD"
 msgstr "STOCK_MEDIA_FORWARD"
 
 #. module: stock
-#: rml:lot.location:0
-msgid "Total :"
-msgstr "Нийт:"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
+"            product_qty = partial_data.get('product_qty',0.0)\n"
+"            move_product_qty[move.id] = product_qty\n"
+"            product_uom = partial_data.get('product_uom',False)\n"
+"            product_price = partial_data.get('product_price',0.0)\n"
+"            product_currency = partial_data.get('product_currency',False)\n"
+"            prodlot_ids[move.id] = partial_data.get('prodlot_id"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_inventory_control
+msgid "Inventory Control"
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,ref:0
+msgid ""
+"Internal reference number in case it differs from the manufacturer's serial "
+"number"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -79,77 +123,188 @@ msgid "STOCK_ZOOM_100"
 msgstr "STOCK_ZOOM_100"
 
 #. module: stock
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
+#: model:ir.actions.report.xml,name:stock.report_picking_list
+#: view:stock.picking:0
+msgid "Picking list"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+msgid "Outgoing Products delay"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: field:report.stock.inventory,product_qty:0
+#: field:report.stock.move,product_qty:0
+#: field:stock.inventory.line,product_qty:0
+#: field:stock.inventory.line.split,qty:0
+#: report:stock.inventory.move:0
+#: field:stock.move,product_qty:0
+#: field:stock.move.consume,product_qty:0
+#: field:stock.move.scrap,product_qty:0
+#: field:stock.move.split,qty:0
+#: field:stock.move.split.lines,quantity:0
+#: field:stock.move.split.lines.exist,quantity:0
+#: report:stock.picking.list:0
+#: field:stock.report.prodlots,qty:0
+#: field:stock.report.tracklots,name:0
+#: field:stock.split.into,quantity:0
+#, python-format
+msgid "Quantity"
+msgstr "Тоо хэмжээ"
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,day:0
+msgid "Day"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+#: field:stock.inventory.line.split,product_uom:0
+#: view:stock.move:0
+#: field:stock.move.split,product_uom:0
+#: view:stock.picking:0
+#: view:stock.production.lot:0
 msgid "UoM"
 msgstr "Хэмжих нэгж"
 
-#. module: stock
-#: model:ir.actions.wizard,name:stock.return_picking
-msgid "Return packing"
-msgstr "Савлагааг буцаах"
-
 #. module: stock
 #: field:product.category,property_stock_journal:0
+#: view:report.stock.move:0
+#: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Барааны журнал"
 
 #. module: stock
-#: wizard_view:stock.fill_inventory,init:0
-msgid "Fill Inventory for specific location"
-msgstr "Бодит байрлалын нөөцийг дүүргэх"
+#: view:report.stock.move:0
+msgid "Incoming"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.report.xml,name:stock.report_picking_list
+#: help:product.category,property_stock_account_output_categ:0
+msgid ""
+"When doing real-time inventory valuation, counterpart Journal Items for all "
+"outgoing stock moves will be posted in this account. This is the default "
+"value for all products in this category, it can also directly be set on each "
+"product."
+msgstr ""
+
+#. module: stock
+#: help:stock.move,address_id:0
+msgid ""
+"Optional address where goods are to be delivered, specifically used for "
+"allotment"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/report/report_stock.py:0
+#, python-format
+msgid "You cannot delete any record!"
+msgstr ""
+
+#. module: stock
+#: field:product.template,property_stock_inventory:0
+msgid "Inventory Location"
+msgstr "Нөөцийн байрлал"
+
+#. module: stock
+#: help:stock.tracking,serial:0
+msgid "Other reference or serial number"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,origin:0
 #: view:stock.picking:0
-#: field:stock.picking.move.wizard,picking_id:0
-msgid "Packing list"
-msgstr "Савлагааны жагсаалт"
+#: field:stock.picking,origin:0
+msgid "Origin"
+msgstr ""
 
 #. module: stock
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
-msgid "Amount"
-msgstr "Хэмжээ"
+#: model:ir.ui.menu,name:stock.menu_stock_configuration
+msgid "Configuration"
+msgstr "Тохиргоо"
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Products Received"
-msgstr "Бараа хүлээн авах"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree4
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree4
-msgid "Incoming Products"
-msgstr "Бүтээгдэхүүнүүдийн  орлого"
+#: view:stock.tracking:0
+msgid "Pack Identification"
+msgstr ""
 
 #. module: stock
+#: view:stock.move:0
 #: field:stock.picking,name:0
-#: field:stock.tracking,serial:0
+#: view:stock.production.lot:0
 msgid "Reference"
-msgstr "Дугаар"
+msgstr "Маршрутын дугаар"
 
 #. module: stock
-#: wizard_field:stock.invoice_onshipping,init,group:0
+#: help:stock.fill.inventory,set_stock_zero:0
+msgid ""
+"If checked, all product quantities will be set to zero to help ensure a real "
+"physical inventory is done"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split_lines
+msgid "Split lines"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Upstream Traceability"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You cannot cancel picking because stock move is in done state !"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: stock
+#: field:stock.invoice.onshipping,group:0
 msgid "Group by partner"
-msgstr "Харилцагчийн групп"
+msgstr "Түншлэлийн групп"
 
 #. module: stock
-#: field:stock.picking,address_id:0
+#: help:stock.move,state:0
+msgid ""
+"When the stock move is created it is in the 'Draft' state.\n"
+" After that it is set to 'Confirmed' state.\n"
+" If stock is available state is set to 'Available'.\n"
+" When the picking is done the state is 'Done'.                               "
+"   \n"
+"The state is 'Waiting' if the move is waiting for another one."
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_res_partner
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,partner_id:0
+#: view:report.stock.move:0
+#: field:report.stock.move,partner_id:0
+#: view:stock.move:0
+#: field:stock.move,partner_id:0
+#: view:stock.picking:0
+#: field:stock.picking,partner_id:0
 msgid "Partner"
 msgstr "Харилцагч"
 
 #. module: stock
-#: help:product.product,track_incoming:0
-msgid "Force to use a Production Lot during receptions"
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "No invoicing"
 msgstr ""
 
-#. module: stock
-#: field:stock.move,move_history_ids:0
-#: field:stock.move,move_history_ids2:0
-msgid "Move History"
-msgstr "Хөдөлгөөний түүх"
-
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot
 #: field:stock.production.lot.revision,lot_id:0
@@ -158,67 +313,132 @@ msgid "Production lot"
 msgstr "Үйлдвэрлэлийн цуврал"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_NEW"
-msgstr "STOCK_NEW"
+#: help:stock.incoterms,code:0
+msgid "Code for Incoterms"
+msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CANCEL"
-msgstr "STOCK_CANCEL"
+#: field:stock.tracking,move_ids:0
+msgid "Moves for this pack"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Internal Location"
-msgstr "Дотоод байршил"
+msgstr "Дотоод байрлал"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Confirm Inventory"
+msgstr "Нөөц батлах"
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,state:0
+#: view:report.stock.move:0
+#: field:report.stock.move,state:0
+#: view:stock.inventory:0
+#: field:stock.inventory,state:0
+#: field:stock.inventory.line,state:0
+#: view:stock.move:0
+#: field:stock.move,state:0
+#: view:stock.picking:0
+#: field:stock.picking,state:0
+#: report:stock.picking.list:0
+msgid "State"
+msgstr "Төлөв"
 
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_PRINT"
-msgstr "STOCK_PRINT"
-
-#. module: stock
-#: rml:stock.picking.list:0
-msgid "State"
-msgstr "Төлөв"
+msgid "terp-mail-forward"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,stock_real_value:0
 msgid "Real Stock Value"
 msgstr "Жинхэнэ барааны өртөг"
 
+#. module: stock
+#: field:report.stock.move,day_diff2:0
+msgid "Lag (Days)"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_action_traceability
+msgid "Action traceability "
+msgstr ""
+
+#. module: stock
+#: field:stock.location,posy:0
+msgid "Shelves (Y)"
+msgstr "Багана (Y)"
+
 #. module: stock
 #: view:stock.move:0
 msgid "UOM"
 msgstr "Хэмжих нэгж"
 
 #. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
 #: selection:stock.move,state:0
+#: view:stock.picking:0
 #: selection:stock.picking,state:0
+#: view:stock.production.lot:0
 #: field:stock.production.lot,stock_available:0
 msgid "Available"
 msgstr "Бэлэн"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Make Parcel"
-msgstr "Баглаа хийх"
+#: view:stock.picking:0
+#: field:stock.picking,min_date:0
+msgid "Expected Date"
+msgstr ""
 
 #. module: stock
-#: wizard_view:stock.partial_picking,end2:0
-msgid "Packing result"
-msgstr "Савлагааны үр дүн"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_outgoing_product_board
+msgid "Outgoing Product"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_QUIT"
 msgstr "STOCK_QUIT"
 
+#. module: stock
+#: field:report.stock.move,product_qty_in:0
+msgid "In Qty"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:0
+#, python-format
+msgid "No product in this location."
+msgstr ""
+
 #. module: stock
 #: field:stock.warehouse,lot_output_id:0
 msgid "Location Output"
 msgstr "Гаралтын байршил"
 
+#. module: stock
+#: model:ir.actions.act_window,name:stock.split_into
+#: model:ir.model,name:stock.model_stock_split_into
+msgid "Split into"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Today"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,price_currency_id:0
+msgid "Currency for average price"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_TOP"
@@ -235,58 +455,103 @@ msgid "terp-hr"
 msgstr "terp-hr"
 
 #. module: stock
+#: field:report.stock.inventory,location_type:0
 #: field:stock.location,usage:0
 msgid "Location Type"
 msgstr "Төрөл"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-purchase"
-msgstr "terp-purchase"
+#: help:report.stock.move,type:0
+#: help:stock.picking,type:0
+msgid "Shipping type specify, goods coming in or going out."
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_DND"
-msgstr "STOCK_DND"
+msgid "terp-stock_effects-object-colorize"
+msgstr ""
 
 #. module: stock
-#: rml:stock.picking.list:0
+#: selection:stock.location,icon:0
+msgid "STOCK_DELETE"
+msgstr "STOCK_DELETE"
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_move_labels
+msgid "Item Labels"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_move
+msgid "Moves Statistics"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Product Lots Filter"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+#: report:stock.picking.list:0
 msgid "["
 msgstr "["
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Products Sent"
-msgstr "Илгээсэн бүтээгдэхүүнүүд"
+#: help:stock.production.lot,stock_available:0
+msgid ""
+"Current quantity of products with this Production Lot Number available in "
+"company warehouses"
+msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GOTO_FIRST"
-msgstr "STOCK_GOTO_FIRST"
+#: field:stock.move,move_history_ids:0
+msgid "Move History (child moves)"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree6
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree6
+#: field:stock.picking,move_lines:0
 msgid "Internal Moves"
 msgstr "Дотооддоо шилжих"
 
+#. module: stock
+#: field:stock.move,location_dest_id:0
+msgid "Destination Location"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You can not process picking without stock moves"
+msgstr ""
+
 #. module: stock
 #: field:stock.move,product_packaging:0
 msgid "Packaging"
 msgstr "Савлагаа"
 
 #. module: stock
-#: rml:stock.picking.list:0
+#: report:stock.picking.list:0
 msgid "Order(Origin)"
 msgstr "Захиалга(Эх сурвалж)"
 
 #. module: stock
-#: rml:lot.location:0
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
 msgid "Grand Total:"
 msgstr "Нийт:"
 
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_move_report
+#: model:ir.ui.menu,name:stock.menu_action_stock_move_report
+#: view:report.stock.move:0
+msgid "Moves Analysis"
+msgstr ""
+
 #. module: stock
 #: view:stock.location:0
 #: field:stock.location,comment:0
@@ -294,35 +559,49 @@ msgid "Additional Information"
 msgstr "Нэмэлт мэдээлэл"
 
 #. module: stock
-#: selection:stock.invoice_onshipping,init,type:0
-msgid "Customer Refund"
-msgstr "Харилцагч буцааж төлөх"
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Location / Product"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Reception"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FLOPPY"
 msgstr "STOCK_FLOPPY"
 
+#. module: stock
+#: field:stock.tracking,serial:0
+msgid "Additional Reference"
+msgstr ""
+
 #. module: stock
 #: view:stock.production.lot.revision:0
 msgid "Production Lot Revisions"
 msgstr "Барааны серийн хяналт"
 
 #. module: stock
-#: view:stock.location:0
-msgid "Stock location"
-msgstr "Барааны байрлал"
+#: help:product.product,track_outgoing:0
+msgid ""
+"Forces to specify a Production Lot for all moves containing this product and "
+"going to a Customer Location"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,complete_name:0
 #: field:stock.location,name:0
 msgid "Location Name"
-msgstr "Нэр"
+msgstr "Байрлал"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_UNINDENT"
-msgstr "STOCK_UNINDENT"
+#: view:stock.inventory:0
+msgid "Posted Inventory"
+msgstr "Зарласан нөөц"
 
 #. module: stock
 #: view:stock.move:0
@@ -331,21 +610,22 @@ msgid "Move Information"
 msgstr "Хөдөлгөөний мэдээлэл"
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Unreceived Products"
-msgstr "Бараа хүлээн аваагүй"
+#: view:report.stock.move:0
+msgid "Outgoing"
+msgstr ""
 
 #. module: stock
-#: field:stock.inventory,state:0
-#: field:stock.move,state:0
-#: field:stock.picking,state:0
-msgid "Status"
-msgstr "Төлөв"
+#: selection:report.stock.move,month:0
+msgid "August"
+msgstr ""
 
 #. module: stock
-#: model:stock.location,name:stock.stock_location_customers
-msgid "Customers"
-msgstr "Харилцагчид"
+#: model:ir.actions.act_window,name:stock.action_tracking_form
+#: model:ir.model,name:stock.model_stock_tracking
+#: model:ir.ui.menu,name:stock.menu_action_tracking_form
+#: view:stock.tracking:0
+msgid "Packs"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -353,25 +633,18 @@ msgid "STOCK_UNDERLINE"
 msgstr "STOCK_UNDERLINE"
 
 #. module: stock
-#: view:stock.picking.move.wizard:0
-msgid "Move Lines"
-msgstr "Шилжих шугамууд"
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Борлуулалт болон худалдан авалт"
 
 #. module: stock
-#: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+#: selection:report.stock.move,month:0
+msgid "June"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "Bad Lot Assignation !"
-msgstr "Хүчингүй сери олгосон байна!"
-
-#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "You are moving %.2f products but only %.2f available in this lot."
+#: selection:stock.location,icon:0
+msgid "terp-folder-blue"
 msgstr ""
 
 #. module: stock
@@ -382,29 +655,61 @@ msgstr "Нийлүүлэлтийг байрлал"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_production_lot_form
 #: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: field:stock.inventory.line.split,line_exist_ids:0
+#: field:stock.inventory.line.split,line_ids:0
+#: field:stock.move.split,line_exist_ids:0
+#: field:stock.move.split,line_ids:0
 msgid "Production Lots"
 msgstr "Барааны серүүд"
 
 #. module: stock
-#: rml:stock.picking.list:0
+#: selection:stock.location,icon:0
+msgid "terp-project"
+msgstr "terp-project"
+
+#. module: stock
+#: report:stock.picking.list:0
 msgid "Recipient"
 msgstr "Хүлээн авагч"
 
 #. module: stock
-#: model:ir.actions.wizard,name:stock.track_line
-msgid "Track line"
-msgstr "Тээвэрлэлтийн мөр"
+#: model:ir.actions.act_window,name:stock.action_location_tree
+#: model:ir.ui.menu,name:stock.menu_action_location_tree
+msgid "Location Structure"
+msgstr ""
 
 #. module: stock
-#: field:stock.location,child_ids:0
-msgid "Contains"
-msgstr "Агуулагч"
+#: selection:report.stock.move,month:0
+msgid "October"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_line
+msgid "Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_BOLD"
 msgstr "STOCK_BOLD"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-personal+"
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_journal:0
+msgid ""
+"When doing real-time inventory valuation, this is the Accounting Journal in "
+"which entries will be automatically posted when stock moves are processed."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_partial_picking
+msgid "Process Picking"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-graph"
@@ -412,19 +717,35 @@ msgstr "terp-graph"
 
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_PREFERENCES"
-msgstr "STOCK_PREFERENCES"
+msgid "STOCK_FIND_AND_REPLACE"
+msgstr "STOCK_FIND_AND_REPLACE"
 
 #. module: stock
-#: rml:lot.location:0
-#: field:stock.inventory.line,product_qty:0
-#: field:stock.move,product_qty:0
-#: rml:stock.picking.list:0
-#: field:stock.report.prodlots,name:0
-msgid "Quantity"
-msgstr "Тоо хэмжээ"
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Receptions"
+msgstr ""
 
 #. module: stock
+#: help:stock.inventory.line.split,use_exist:0
+#: help:stock.move.split,use_exist:0
+msgid ""
+"Check this option to select existing lots in the list below, otherwise you "
+"should enter new ones line by line."
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-dialog-close"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,move_dest_id:0
+msgid "Destination Move"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
 #: view:stock.picking:0
 msgid "Process Now"
 msgstr "Одооны үйл явц"
@@ -432,18 +753,19 @@ msgstr "Одооны үйл явц"
 #. module: stock
 #: field:stock.location,address_id:0
 msgid "Location Address"
-msgstr "Хаяг"
+msgstr "Байрлалын хаяг"
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is consumed with"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,prodlot_id:0
 msgid "Production lot is used to put a serial number on the production"
 msgstr ""
 
-#. module: stock
-#: model:stock.location,name:stock.stock_location_13
-msgid "Stock Level 1"
-msgstr "Барааны түвшин-1"
-
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_REWIND"
@@ -455,14 +777,24 @@ msgid "Location Input"
 msgstr "Оролтын байршил"
 
 #. module: stock
-#: view:res.partner:0
-msgid "Stock Properties"
-msgstr "Барааны шинж чанар"
+#: selection:stock.location,icon:0
+msgid "terp-personal-"
+msgstr ""
 
 #. module: stock
-#: wizard_button:stock.partial_picking,init,split:0
-msgid "Make Picking"
-msgstr "Агуулахын баримт хийх"
+#: selection:stock.location,icon:0
+msgid "STOCK_CUT"
+msgstr "STOCK_CUT"
+
+#. module: stock
+#: help:stock.picking,date:0
+msgid "Date of Order"
+msgstr ""
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Periodical (manual)"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.location_procurement
@@ -475,78 +807,141 @@ msgid "IT Suppliers"
 msgstr "IT Нийлүүлэгчид"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_move_form3
-#: model:ir.ui.menu,name:stock.menu_action_move_form3
-msgid "Draft Moves"
-msgstr "Ноорог шилжүүлэх"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr ""
 
 #. module: stock
-#: field:report.stock.lines.date,product_id:0
-msgid "Product Id"
-msgstr "Бүтээгдэхүүний дугаар"
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Transit Location for Inter-Companies Transfers"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_NEW"
+msgstr "STOCK_NEW"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_splitinto.py:0
+#, python-format
+msgid ""
+"Total quantity after split exceeds the quantity to split ' \\n               "
+"                     'for this product: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future P&L"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree4
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree4
+#: view:stock.picking:0
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Scrap"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,child_ids:0
+msgid "Contains"
+msgstr "Агуулагч"
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-dolar"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+msgid "Incoming Products Delay"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Qty"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Stock Locations"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: field:stock.move,price_unit:0
+msgid "Unit Price"
+msgstr "Нэгж Үнэ"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split_lines_exist
+msgid "Exist Split lines"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,date_expected:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Pack Search"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-gtk-jump-to-ltr"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,priority:0
+msgid "Urgent"
+msgstr "Яаралтай"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Journal"
+msgstr ""
+
+#. module: stock
+#: field:product.category,property_stock_variation:0
+msgid "Stock Variation Account"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Bad Lot Assignation !"
+msgstr "Хүчингүй сери олгосон байна!"
+
+#. module: stock
+#: help:stock.picking,location_id:0
+msgid ""
+"Keep empty if you produce at the location where the finished products are "
+"needed.Set a location if you produce at a fixed location. This can be a "
+"partner location if you subcontract the manufacturing operations."
+msgstr ""
 
 #. module: stock
 #: view:res.partner:0
-msgid "Sales & Purchases"
-msgstr "Борлуулалт болон худалдан авалт"
-
-#. module: stock
-#: selection:stock.invoice_onshipping,init,type:0
-msgid "Customer Invoice"
-msgstr "Харилцагчийн нэхэмжлэл"
-
-#. module: stock
-#: field:product.template,property_stock_inventory:0
-msgid "Inventory Location"
-msgstr "Нөөцийн байрлал"
-
-#. module: stock
-#: help:product.product,track_production:0
-msgid "Force to use a Production Lot during production order"
+msgid "Inventory Properties"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CUT"
-msgstr "STOCK_CUT"
-
-#. module: stock
-#: help:product.template,property_stock_inventory:0
-msgid ""
-"For the current product (template), this stock location will be used, "
-"instead of the default one, as the source location for stock moves generated "
-"when you do an inventory"
+#: field:report.stock.move,day_diff:0
+msgid "Execution Lead Time (Days)"
 msgstr ""
 
-#. module: stock
-#: help:product.category,property_stock_account_output_categ:0
-msgid "This account will be used to value the output stock"
-msgstr "Энэ данс Агуулахын гаралтыг дүгнэхэд ашиглагдана"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ZOOM_FIT"
-msgstr "STOCK_ZOOM_FIT"
-
-#. module: stock
-#: help:product.category,property_stock_journal:0
-msgid ""
-"This journal will be used for the accounting move generated by stock move"
-msgstr ""
-"Энэ журнал нь Агуулахын шилжилтээр боловсруулагдсан санхүүгийн шилжилтэнд "
-"ашиглагдана"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_calendar_delivery
-#: model:ir.ui.menu,name:stock.menu_picking_calendar_delivery
-msgid "Calendar of Deliveries"
-msgstr "Хүргэлтийн календар"
-
-#. module: stock
-#: field:product.product,track_incoming:0
-msgid "Track Incomming Lots"
-msgstr "Ирэх тээвэрлэлтийн сери"
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_product_location_open
 msgid "Stock by Location"
@@ -558,9 +953,27 @@ msgid "STOCK_SAVE_AS"
 msgstr "STOCK_SAVE_AS"
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_report_prodlots
-msgid "Stock report by production lots"
-msgstr "Барааны цувралаар хийгдсэн агуулахын тайлан"
+#: view:report.stock.move:0
+msgid "Month-1"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-stock_symbol-selection"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,active:0
+msgid ""
+"By unchecking the active field, you may hide a location without deleting it."
+msgstr ""
+
+#. module: stock
+#: help:stock.location,posx:0
+#: help:stock.location,posy:0
+#: help:stock.location,posz:0
+msgid "Optional localization details, for information purpose only"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,stock_virtual:0
@@ -568,9 +981,10 @@ msgid "Virtual Stock"
 msgstr "Виртуаль агуулах"
 
 #. module: stock
+#: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "View"
-msgstr "Дэлгэц"
+msgstr "Харах"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -582,37 +996,35 @@ msgstr "STOCK_DIALOG_ERROR"
 msgid "Left Parent"
 msgstr ""
 
-#. module: stock
-#: field:report.stock.lines.date,create_date:0
-msgid "Latest Date of Inventory"
-msgstr "Бүртгэлийн сүүлийн огноо"
-
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_INDEX"
 msgstr "STOCK_INDEX"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-stage"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_BOTTOM"
 msgstr "STOCK_GOTO_BOTTOM"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_form
-#: model:ir.ui.menu,name:stock.menu_action_picking_form
-msgid "New Reception Packing"
-msgstr "Шинэ савлагаа хүлээн авах"
-
-#. module: stock
-#: wizard_field:stock.move.track,init,quantity:0
+#: field:stock.move.track,quantity:0
 msgid "Quantity per lot"
 msgstr "Цувралын дугаарын дундаж хэмжээ"
 
 #. module: stock
+#: model:ir.actions.act_window,name:stock.act_product_stock_move_open
 #: model:ir.actions.act_window,name:stock.action_move_form2
 #: model:ir.ui.menu,name:stock.menu_action_move_form2
+#: view:stock.inventory:0
 #: view:stock.move:0
 #: view:stock.picking:0
+#: view:stock.production.lot:0
+#: view:stock.tracking:0
 msgid "Stock Moves"
 msgstr "Барааны хөдөлгөөн"
 
@@ -622,9 +1034,57 @@ msgid "Production Location"
 msgstr "Үйлдвэрлэлийн байрлал"
 
 #. module: stock
-#: field:stock.move,tracking_id:0
-msgid "Tracking Lot"
-msgstr "Тээвэрлэлтийн сери"
+#: help:stock.picking,address_id:0
+msgid "Address of partner"
+msgstr ""
+
+#. module: stock
+#: model:res.company,overdue_msg:stock.res_company_tinyshop0
+msgid ""
+"\n"
+"Date: %(date)s\n"
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Please find in attachment a reminder of all your unpaid invoices, for a "
+"total amount due of:\n"
+"\n"
+"%(followup_amount).2f %(company_currency)s\n"
+"\n"
+"Thanks,\n"
+"--\n"
+"%(user_signature)s\n"
+"%(company_name)s\n"
+"        "
+msgstr ""
+
+#. module: stock
+#: help:stock.location,usage:0
+msgid ""
+"* Supplier Location: Virtual location representing the source location for "
+"products coming from your suppliers\n"
+"                       \n"
+"* View: Virtual location used to create a hierarchical structures for your "
+"warehouse, aggregating its child locations ; can't directly contain "
+"products\n"
+"                       \n"
+"* Internal Location: Physical locations inside your own warehouses,\n"
+"                       \n"
+"* Customer Location: Virtual location representing the destination location "
+"for products sent to your customers\n"
+"                       \n"
+"* Inventory: Virtual location serving as counterpart for inventory "
+"operations used to correct stock levels (Physical inventories)\n"
+"                       \n"
+"* Procurement: Virtual location serving as temporary counterpart for "
+"procurement operations when the source (supplier or production) is not known "
+"yet. This location should be empty when the procurement scheduler has "
+"finished running.\n"
+"                       \n"
+"* Production: Virtual counterpart location for production operations: this "
+"location consumes the raw material and produces finished products\n"
+"                      "
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -641,11 +1101,23 @@ msgstr "Зохиогч"
 msgid "STOCK_UNDELETE"
 msgstr "STOCK_UNDELETE"
 
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Delivery Order"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_EXECUTE"
 msgstr "STOCK_EXECUTE"
 
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#, python-format
+msgid "No invoice were created"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_QUESTION"
@@ -654,7 +1126,13 @@ msgstr "STOCK_DIALOG_QUESTION"
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Manual Operation"
-msgstr "Гараар удирдах"
+msgstr "Гар аргаар тохируулах"
+
+#. module: stock
+#: view:stock.location:0
+#: view:stock.move:0
+msgid "Supplier"
+msgstr ""
 
 #. module: stock
 #: field:stock.picking,date_done:0
@@ -662,45 +1140,90 @@ msgid "Date Done"
 msgstr "Биелсэн огноо"
 
 #. module: stock
-#: rml:stock.picking.list:0
+#: report:stock.picking.list:0
 msgid "Expected Shipping Date"
 msgstr "Тээвэрлэлтийг товлосон огноо"
 
 #. module: stock
-#: rml:stock.picking.list:0
-msgid "Shipping Address :"
-msgstr "Усан тээврийн хаяг"
+#: selection:stock.location,icon:0
+msgid "terp-accessories-archiver-minus"
+msgstr ""
 
 #. module: stock
-#: view:stock.tracking:0
-msgid "Tracking/Serial"
-msgstr "Тээвэрлэлт/Сериал"
+#: selection:report.stock.move,month:0
+msgid "March"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_inventory_line_split
+#: model:ir.model,name:stock.model_stock_inventory_line_split
+#: view:stock.inventory:0
+#: view:stock.inventory.line:0
+msgid "Split inventory lines"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Physical Inventory"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SELECT_FONT"
 msgstr "STOCK_SELECT_FONT"
 
+#. module: stock
+#: help:stock.location,chained_company_id:0
+msgid ""
+"The company the Picking List containing the chained move will belong to "
+"(leave empty to use the default company determination rules"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PASTE"
 msgstr "STOCK_PASTE"
 
+#. module: stock
+#: view:stock.move.split:0
+msgid "Lot number"
+msgstr ""
+
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
 msgid "Partner Locations"
 msgstr "Харилцагчийн байршил"
 
 #. module: stock
-#: help:stock.move,tracking_id:0
+#: code:addons/stock/stock.py:0
+#, python-format
 msgid ""
-"Tracking lot is the code that will be put on the logistical unit/pallet"
-msgstr "цувралын замыг тодорхойлох нь хоёрдогч нэгжид байрлах код юм"
+"Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
+"                product_qty = partial_data.get('product_qty',0.0)\n"
+"                move_product_qty[move.id] = product_qty\n"
+"                product_uom = partial_data.get('product_uom',False)\n"
+"                product_price = partial_data.get('product_price',0.0)\n"
+"                product_currency = "
+"partial_data.get('product_currency',False)\n"
+"                prodlot_id = partial_data.get('prodlot_id"
+msgstr ""
 
 #. module: stock
-#: view:stock.tracking:0
-msgid "Tracking Number"
-msgstr "Тээвэрлэлтийн дугаар"
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+msgid "Total quantity"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_ZOOM_FIT"
+msgstr "STOCK_ZOOM_FIT"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.move_consume
+#: view:stock.move.consume:0
+msgid "Consume Move"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_7
@@ -708,42 +1231,148 @@ msgid "European Customers"
 msgstr "Европын харилцагчиид"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock"
-msgstr "terp-stock"
+#: help:stock.location,chained_delay:0
+msgid "Delay between original move and chained move in days"
+msgstr ""
 
 #. module: stock
-#: rml:stock.picking.list:0
+#: selection:stock.location,icon:0
+msgid "terp-calendar"
+msgstr "terp-calendar"
+
+#. module: stock
+#: view:stock.fill.inventory:0
+msgid "Import current product inventory from the following location"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_auto_packing:0
+msgid ""
+"This is used only if you select a chained location type.\n"
+"The 'Automatic Move' value will create a stock move after the current one "
+"that will be validated automatically. With 'Manual Operation', the stock "
+"move has to be validated by a worker. With 'Automatic No Step Added', the "
+"location is replaced in the original move."
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Downstream Traceability"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
 msgid "Packing List:"
 msgstr "Савлагааны жагсаалт"
 
+#. module: stock
+#: help:product.template,property_stock_production:0
+msgid ""
+"For the current product, this stock location will be used, instead of the "
+"default one, as the source location for stock moves generated by production "
+"orders"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,price_unit:0
+msgid ""
+"Technical field used to record the product cost set by the user during a "
+"picking confirmation (when average price costing method is used)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is in draft state."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid ""
+"There is no stock output account defined ' \\n                               "
+"             'for this product: \"%s\" (id: %d)"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_RECORD"
 msgstr "STOCK_MEDIA_RECORD"
 
+#. module: stock
+#: field:stock.location,chained_auto_packing:0
+msgid "Chaining Type"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "To be refunded/invoiced"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_shop0
+msgid "Shop 1"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.inventory,value:0
+#: field:report.stock.move,value:0
+msgid "Total Value"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.standard.price:0
+#: view:stock.fill.inventory:0
+#: view:stock.inventory.merge:0
+#: view:stock.invoice.onshipping:0
+#: view:stock.location.product:0
+#: view:stock.move:0
+#: view:stock.move.track:0
+#: view:stock.picking:0
+#: view:stock.split.into:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Ready"
+msgstr ""
+
 #. module: stock
 #: view:stock.picking:0
 msgid "Calendar View"
 msgstr "Хуанли харах"
 
 #. module: stock
-#: wizard_field:stock.location.products,init,from_date:0
+#: view:stock.picking:0
+msgid "Additional Info"
+msgstr ""
+
+#. module: stock
+#: report:stock.inventory.move:0
+msgid "Stock Inventory"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_YES"
+msgstr "STOCK_YES"
+
+#. module: stock
+#: field:stock.location.product,from_date:0
 msgid "From"
 msgstr "Эхлэл"
 
 #. module: stock
-#: rml:stock.picking.list:0
-msgid "weight"
-msgstr "Жин"
-
-#. module: stock
-#: rml:stock.picking.list:0
-msgid "Non Assigned Products:"
-msgstr "Эрсдэлгүй бүтээгдэхүүнүүд"
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "You may only return pickings that are Confirmed, Available or Done!"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
+#: field:stock.picking,invoice_state:0
 msgid "Invoice Control"
 msgstr "Нэхэмжлэлийн удирдлага"
 
@@ -754,28 +1383,34 @@ msgstr "Барааны серийн дугаарын хяналт"
 
 #. module: stock
 #: view:stock.picking:0
-msgid "Packing Done"
-msgstr "Савласан"
+msgid "Internal Picking List"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Waiting"
 msgstr "Хүлээлт"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree2
-#: model:ir.actions.act_window,name:stock.action_picking_tree7
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree7
-#: model:ir.ui.menu,name:stock.menu_picking_waiting
-msgid "Available Packing"
-msgstr "Боломжит савлагаа"
+#: view:stock.move:0
+#: selection:stock.move.split.lines,action:0
+#: view:stock.picking:0
+msgid "Split"
+msgstr "Хуваах"
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_warehouse
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Агуулах"
+#: view:stock.picking:0
+msgid "Search Stock Picking"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Company is not specified in Location"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -783,7 +1418,8 @@ msgid "terp-report"
 msgstr "terp-report"
 
 #. module: stock
-#: wizard_field:stock.invoice_onshipping,init,type:0
+#: view:report.stock.move:0
+#: field:stock.partial.move,type:0
 msgid "Type"
 msgstr "Төрөл"
 
@@ -792,21 +1428,34 @@ msgstr "Төрөл"
 msgid "Generic IT Suppliers"
 msgstr "Ерөнхий IT нийлүүлэгч"
 
-#. module: stock
-#: model:ir.actions.report.xml,name:stock.report_location_overview_all
-msgid "Location Content (With children)"
-msgstr "Байршилын багтаамж"
-
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FILE"
 msgstr "STOCK_FILE"
 
+#. module: stock
+#: field:stock.inventory,date:0
+#: field:stock.move,create_date:0
+#: field:stock.production.lot,date:0
+#: field:stock.tracking,date:0
+msgid "Creation Date"
+msgstr ""
+
 #. module: stock
 #: field:report.stock.lines.date,id:0
 msgid "Inventory Line Id"
 msgstr "Бүртгэлийн мөрний дугаар"
 
+#. module: stock
+#: help:stock.location,address_id:0
+msgid "Address of  customer or supplier."
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-gdu-smart-failing"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_EDIT"
@@ -818,9 +1467,8 @@ msgid "STOCK_CONNECT"
 msgstr "STOCK_CONNECT"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_all
-#: model:ir.ui.menu,name:stock.menu_action_picking_all
-#: wizard_field:stock.picking.make,init,pickings:0
+#: view:report.stock.move:0
+#: field:report.stock.move,picking_id:0
 msgid "Packing"
 msgstr "Савлагаа"
 
@@ -830,10 +1478,11 @@ msgid "STOCK_GO_DOWN"
 msgstr "STOCK_GO_DOWN"
 
 #. module: stock
+#: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
 #: selection:stock.location,usage:0
 msgid "Customer Location"
-msgstr "Харилцагчийн байрлал"
+msgstr "Хэрэглэгчийн байрлал"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -841,91 +1490,196 @@ msgid "STOCK_OK"
 msgstr "STOCK_OK"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree9
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree9
-msgid "New Internal Packing"
-msgstr "Дотоод шинэ багцлалт"
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-emblem-important"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_replacement
+msgid "Stock Replacement"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "General Informations"
 msgstr "Ерөнхий мэдээлэл"
 
-#. module: stock
-#: selection:stock.location,chained_location_type:0
-msgid "None"
-msgstr "Хоосон"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action3
-#: model:ir.actions.wizard,name:stock.action2
-#: model:ir.actions.wizard,name:stock.action_lot4
-msgid "Downstream traceability"
-msgstr "Доод хөдөлгөөнийг хянах"
-
-#. module: stock
-#: model:stock.location,name:stock.stock_location_14
-msgid "Finished products"
-msgstr "Дууссан бүтээгдэхүүнүүд"
-
-#. module: stock
-#: field:stock.location,location_id:0
-msgid "Parent Location"
-msgstr "Толгой байршил"
-
-#. module: stock
-#: field:stock.inventory,date:0
-msgid "Date create"
-msgstr "Үүсэх огноо"
-
-#. module: stock
-#: wizard_button:inventory.merge.stock.zero,init,merge:0
-msgid "Set to Zero"
-msgstr "Тэглэх"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.act_product_stock_move_open
-msgid "All Stock Moves"
-msgstr "Бүх барааны шилжилт"
-
 #. module: stock
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Алдаатай XML-н архитектур харах"
 
 #. module: stock
+#: view:stock.tracking:0
+msgid "Downstream traceability"
+msgstr "Доод хөдөлгөөнийг хянах"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_company
+msgid "OpenERP S.A."
+msgstr ""
+
+#. module: stock
+#: help:stock.incoterms,active:0
+msgid ""
+"By unchecking the active field, you may hide an INCOTERM without deleting it."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+#: field:stock.picking,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,location_id:0
+msgid "Parent Location"
+msgstr "Толгой байрлал"
+
+#. module: stock
+#: help:stock.picking,state:0
+msgid ""
+"* Draft: not confirmed yet and will not be scheduled until confirmed\n"
+"* Confirmed: still waiting for the availability of products\n"
+"* Available: products reserved, simply waiting for confirmation.\n"
+"* Waiting: waiting for another move to proceed before it becomes "
+"automatically available (e.g. in Make-To-Order flows)\n"
+"* Done: has been processed, can't be modified or cancelled anymore\n"
+"* Cancelled: has been cancelled, can't be confirmed anymore"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,company_id:0
+msgid "Let this field empty if this location is shared between all companies"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Please provide a positive quantity to scrap!"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_delay:0
+msgid "Chaining Lead Time"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#, python-format
+msgid "Cannot deliver products which are already delivered !"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_UNINDENT"
+msgstr "STOCK_UNINDENT"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_invoice_onshipping
+msgid "Stock Invoice Onshipping"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-face-plain"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_supplier:0
 #: selection:stock.location,usage:0
 msgid "Supplier Location"
 msgstr "Нийлүүлэгчийн байрлал"
 
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "were scrapped"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_FIND"
+msgstr "STOCK_FIND"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Partial"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "September"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_HELP"
 msgstr "STOCK_HELP"
 
 #. module: stock
-#: selection:stock.move,priority:0
-msgid "Urgent"
-msgstr "Яаралтай"
+#: help:stock.picking,backorder_id:0
+msgid ""
+"If this picking was split this field links to the picking that contains the "
+"other part that has been processed already."
+msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_account_input_categ:0
-msgid "This account will be used to value the input stock"
-msgstr "Энэ данс нь агуулахын оролтыг дүгнэхийн тулд ашиглагдана"
+#: model:ir.model,name:stock.model_report_stock_inventory
+msgid "Stock Statistics"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#, python-format
+msgid "Currency"
+msgstr ""
+
+#. module: stock
+#: field:product.product,track_production:0
+msgid "Track Manufacturing Lots"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_inventory_merge.py:0
+#, python-format
+msgid ""
+"Please select multiple physical inventories to merge in the list view."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid ""
+"Variation Account is not specified for Product Category: %s' % "
+"(product_obj.categ_id.name)))\n"
+"        move_ids = []\n"
+"        loc_ids = location_obj.search(cr, uid,[('usage','=','internal"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_INFO"
-msgstr "STOCK_DIALOG_INFO"
+msgid "STOCK_UNDO"
+msgstr "STOCK_UNDO"
 
 #. module: stock
-#: field:stock.move,date:0
-#: field:stock.tracking,date:0
-msgid "Date Created"
-msgstr "Үүсгэсэн огноо"
+#: selection:stock.location,icon:0
+msgid "terp-gnome-cpu-frequency-applet+"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.move,type:0
+#: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Sending Goods"
 msgstr "Илгээлт амжилттай"
@@ -935,53 +1689,135 @@ msgstr "Илгээлт амжилттай"
 msgid "Cancel Availability"
 msgstr "Бэлэн байдлыг цуцлах"
 
+#. module: stock
+#: help:stock.move,date_expected:0
+msgid "Scheduled date for the processing of this move"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-gtk-media-pause"
+msgstr ""
+
 #. module: stock
 #: field:stock.inventory,move_ids:0
 msgid "Created Moves"
 msgstr "Шилжилт үүссэн"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-stock_format-scientific"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GO_BACK"
 msgstr "STOCK_GO_BACK"
 
+#. module: stock
+#: model:stock.location,name:stock.stock_location_14
+msgid "Shelf 2"
+msgstr ""
+
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "To Be Invoiced"
 msgstr "Ирээдүйн нэхэмжлэл"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_PRINT"
+msgstr "STOCK_PRINT"
+
+#. module: stock
+#: field:stock.report.tracklots,tracking_id:0
+msgid "Tracking lot"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-go-today"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid ""
+"There is no stock input account defined ' \\n                                "
+"            'for this product: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Back Orders"
+msgstr ""
+
 #. module: stock
 #: view:product.product:0
 #: view:product.template:0
 msgid "Counter-Part Locations Properties"
 msgstr "Тооцоолох хэсгийн байршилын шинж чанар"
 
+#. module: stock
+#: view:stock.location:0
+msgid "Localization"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Delivered Qty"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.track_line
+#: view:stock.inventory.line.split:0
+#: view:stock.move.split:0
+msgid "Split in lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Production Lot Numbers"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_FILL"
 msgstr "STOCK_JUSTIFY_FILL"
 
 #. module: stock
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,date:0
+#: field:report.stock.move,date:0
+#: view:stock.inventory:0
+#: report:stock.inventory.move:0
 #: view:stock.move:0
-#: field:stock.move,date_planned:0
+#: field:stock.move,date:0
+#: field:stock.partial.move,date:0
+#: field:stock.partial.picking,date:0
+#: view:stock.picking:0
 msgid "Date"
-msgstr "Огноо"
+msgstr "Үүсгэсэн огноо"
 
 #. module: stock
-#: view:product.product:0
-msgid "Stocks"
-msgstr "Бараанууд"
-
-#. module: stock
-#: field:stock.location,allocation_method:0
-msgid "Allocation Method"
-msgstr "Хуваарилалтын арга"
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Extended Filters..."
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-administration"
 msgstr "terp-administration"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_CANCEL"
+msgstr "STOCK_CANCEL"
+
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
 msgid "Location Stock"
@@ -993,21 +1829,25 @@ msgid "STOCK_APPLY"
 msgstr "STOCK_APPLY"
 
 #. module: stock
-#: wizard_view:stock.partial_picking,end2:0
-msgid "The packing has been successfully made !"
-msgstr "Багцлалт амжилттай хийгдлээ"
+#: code:addons/stock/wizard/stock_inventory_merge.py:0
+#, python-format
+msgid "Merging is only allowed on draft inventories."
+msgstr ""
 
 #. module: stock
-#: field:stock.move,address_id:0
-#: field:stock.picking.move.wizard,address_id:0
-msgid "Dest. Address"
-msgstr "Дэст Хаяг"
+#: selection:stock.location,icon:0
+msgid "terp-gtk-go-back-rtl"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form
-#: model:ir.ui.menu,name:stock.menu_action_inventory_form
-msgid "Periodical Inventory"
-msgstr "Тогтмол нөөц"
+#: model:ir.ui.menu,name:stock.menu_dashboard_stock
+msgid "Dashboard"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_track
+msgid "Track moves"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1020,39 +1860,65 @@ msgid "STOCK_STRIKETHROUGH"
 msgstr "STOCK_STRIKETHROUGH"
 
 #. module: stock
-#: rml:lot.stock.overview_all:0
 #: field:stock.incoterms,code:0
 msgid "Code"
 msgstr "Код"
 
+#. module: stock
+#: view:stock.inventory.line.split:0
+msgid "Lots Number"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+msgid "Warehouse Dashboard"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "terp-partner"
-msgstr "terp-partner"
+msgid "terp-mail-"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-#: model:ir.ui.menu,name:stock.menu_action_inventory_form_draft
-msgid "Draft Periodical Inventories"
-msgstr "Ноорог тогтмол нөөц"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You can not remove a lot line !"
+msgstr ""
 
 #. module: stock
-#: wizard_button:inventory.merge,init,end:0
-#: wizard_button:inventory.merge.stock.zero,init,end:0
-#: wizard_button:stock.fill_inventory,init,end:0
-#: wizard_button:stock.invoice_onshipping,init,end:0
-#: wizard_button:stock.location.products,init,end:0
+#: model:ir.model,name:stock.model_stock_move_scrap
 #: view:stock.move:0
-#: wizard_button:stock.move.split,init,end:0
-#: wizard_button:stock.move.track,init,end:0
-#: wizard_button:stock.partial_picking,init,end:0
+#: view:stock.move.scrap:0
+#: view:stock.picking:0
+msgid "Scrap Products"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_PREFERENCES"
+msgstr "STOCK_PREFERENCES"
+
+#. module: stock
+#: view:stock.inventory.line.split:0
+#: view:stock.move.consume:0
+#: view:stock.move.scrap:0
+#: view:stock.move.split:0
 #: view:stock.picking:0
-#: wizard_button:stock.picking.make,init,end:0
-#: view:stock.picking.move.wizard:0
-#: wizard_button:stock.return.picking,init,end:0
 msgid "Cancel"
 msgstr "Цуцлах"
 
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_stock_return_picking
+#: model:ir.model,name:stock.model_stock_return_picking
+msgid "Return Picking"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_location_overview_all
+msgid "Inventory (with child locations)"
+msgstr ""
+
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
@@ -1060,18 +1926,26 @@ msgid "Split in production lots"
 msgstr "Бүтээгдэхүүний цувралын дугаар хуваах"
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_inventory
-#: field:stock.inventory,name:0
-#: field:stock.inventory.line,inventory_id:0
-#: selection:stock.location,usage:0
-msgid "Inventory"
-msgstr "Нөөц"
+#: model:ir.model,name:stock.model_stock_inventory_merge
+msgid "Merge Inventory"
+msgstr ""
 
 #. module: stock
 #: view:product.template:0
 msgid "Information"
 msgstr "Мэдээлэл"
 
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Shipping Address :"
+msgstr "Усан тээврийн хаяг"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "Provide the quantities of the returned products."
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MISSING_IMAGE"
@@ -1079,22 +1953,32 @@ msgstr "STOCK_MISSING_IMAGE"
 
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_SPELL_CHECK"
-msgstr "STOCK_SPELL_CHECK"
+msgid "STOCK_REMOVE"
+msgstr "STOCK_REMOVE"
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_tracking
-msgid "Stock Tracking Lots"
-msgstr "Агуулахын тээвэрлэлтийн сери"
+#: selection:stock.location,icon:0
+msgid "terp-call-start"
+msgstr ""
 
 #. module: stock
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
-#: field:stock.move,price_unit:0
-msgid "Unit Price"
-msgstr "Нэгж Үнэ"
+#: view:stock.change.standard.price:0
+msgid "Cost Price"
+msgstr ""
 
 #. module: stock
+#: view:product.product:0
+#: field:product.product,valuation:0
+msgid "Inventory Valuation"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
 #: view:stock.picking:0
 msgid "Process Later"
 msgstr "Дараагийн үйл ажиллагаа"
@@ -1108,6 +1992,11 @@ msgstr ""
 "Заяамалынх нь оронд энэ агуулахын байршилыг тухайн харилцагчаас хүлээж авч "
 "байгаа барааны анхдагч байршил болгож ашиглана"
 
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+msgid "Not from Picking"
+msgstr ""
+
 #. module: stock
 #: field:stock.warehouse,partner_address_id:0
 msgid "Owner Address"
@@ -1119,15 +2008,54 @@ msgid "Right Parent"
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,origin:0
-msgid "Origin Reference"
-msgstr "Эх сурвалжийн лавлагаа"
+#: selection:stock.location,icon:0
+msgid "STOCK_JUSTIFY_LEFT"
+msgstr "STOCK_JUSTIFY_LEFT"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_move_form4
-#: model:ir.ui.menu,name:stock.menu_action_move_form4
-msgid "Available Moves"
-msgstr "Шилжих боломжтой"
+#: field:report.stock.move,day_diff1:0
+msgid "Planned Lead Time (Days)"
+msgstr ""
+
+#. module: stock
+#: field:stock.change.standard.price,new_price:0
+msgid "Price"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Search Inventory"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_report_tracklots
+msgid "Stock report by tracking lots"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"There is no stock input account defined for this product or its category: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "January"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot,ref:0
+msgid "Internal Reference"
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,prefix:0
+msgid ""
+"Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL "
+"[INT_REF]"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1135,269 +2063,23 @@ msgid "STOCK_HARDDISK"
 msgstr "STOCK_HARDDISK"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.act_relate_picking
-msgid "Related Picking"
-msgstr "Холбоотой агуулахын баримт"
+#: model:ir.actions.act_window,name:stock.action_view_stock_fill_inventory
+#: model:ir.model,name:stock.model_stock_fill_inventory
+#: view:stock.fill.inventory:0
+msgid "Import Inventory"
+msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
 #: field:stock.move,name:0
-#: field:stock.picking.move.wizard,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
-msgstr "Нэр"
+msgstr "Маршрутын нэр"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Stock Inventory Lines"
-msgstr "Агуулахын бүртгэлийн мөр"
-
-#. module: stock
-#: wizard_button:stock.location.products,init,open:0
-msgid "Open Products"
-msgstr "Нээлттэй бүтээгдэхүүнүүд"
-
-#. module: stock
-#: rml:stock.picking.list:0
-msgid "]"
-msgstr "]"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Input Packing List"
-msgstr "Савлагаанд орох жагсаалт"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_picking
-#: field:stock.move,picking_id:0
-msgid "Packing List"
-msgstr "Савалгааны жагсаалт"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_COPY"
-msgstr "STOCK_COPY"
-
-#. module: stock
-#: selection:stock.invoice_onshipping,init,type:0
-msgid "Supplier Refund"
-msgstr "Нийлүүлэгчийн буцаалт"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move
-msgid "Stock Move"
-msgstr "Бараа шилжих"
-
-#. module: stock
-#: field:product.category,property_stock_account_output_categ:0
-#: field:product.template,property_stock_account_output:0
-msgid "Stock Output Account"
-msgstr "Агуулахын зарлагын данс"
-
-#. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic No Step Added"
-msgstr "Автомаатаар алхам нэмэгдээгүй"
-
-#. module: stock
-#: wizard_view:stock.location.products,init:0
-msgid "Stock Location Analysis"
-msgstr "Байршлын шинжилгээ"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CDROM"
-msgstr "STOCK_CDROM"
-
-#. module: stock
-#: selection:stock.picking,invoice_state:0
-msgid "Not from Packing"
-msgstr "Савлагаанаас биш"
-
-#. module: stock
-#: view:stock.location:0
-msgid "Chained Locations"
-msgstr "Холбоотой байршлууд"
-
-#. module: stock
-#: model:stock.location,name:stock.location_inventory
-msgid "Inventory loss"
-msgstr "Бүртгэлийн алдаа"
-
-#. module: stock
-#: field:stock.production.lot,ref:0
-msgid "Internal Ref"
-msgstr "Дотоод реф"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_REFRESH"
-msgstr "STOCK_REFRESH"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_STOP"
-msgstr "STOCK_STOP"
-
-#. module: stock
-#: wizard_view:stock.move.track,init:0
-msgid "Tracking a move"
-msgstr "Тээвэрлэлтийн хөдөлгөөн"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_FIND_AND_REPLACE"
-msgstr "STOCK_FIND_AND_REPLACE"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Validate"
-msgstr "Батлах"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_WARNING"
-msgstr "STOCK_DIALOG_WARNING"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ZOOM_IN"
-msgstr "STOCK_ZOOM_IN"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CONVERT"
-msgstr "STOCK_CONVERT"
-
-#. module: stock
-#: field:stock.move,note:0
-#: view:stock.picking:0
-#: field:stock.picking,note:0
-msgid "Notes"
-msgstr "Тэмдэглэл"
-
-#. module: stock
-#: field:stock.picking,move_lines:0
-#: field:stock.picking.move.wizard,move_ids:0
-msgid "Move lines"
-msgstr "Шилжих шугам"
-
-#. module: stock
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
-msgid "Value"
-msgstr "Өртөг"
-
-#. module: stock
-#: field:stock.picking,type:0
-msgid "Shipping Type"
-msgstr "Хөдөлгөөний төрөл"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.act_product_location_open
-msgid "Products"
-msgstr "Бүтээгдэхүүнүүд"
-
-#. module: stock
-#: field:stock.picking,move_type:0
-msgid "Delivery Method"
-msgstr "Хүргэх арга"
-
-#. module: stock
-#: model:ir.actions.wizard,name:stock.partial_picking
-msgid "Partial packing"
-msgstr "Дутуу савлагаа"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-calendar"
-msgstr "terp-calendar"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ITALIC"
-msgstr "STOCK_ITALIC"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_YES"
-msgstr "STOCK_YES"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.act_stock_picking_move_wizard
-msgid "Fill From Unreceived Products"
-msgstr "Ирээгүй бараануудаас бэлтгэх"
-
-#. module: stock
-#: field:stock.move,move_dest_id:0
-msgid "Dest. Move"
-msgstr "Хүргэх хөдөлгөөн"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_new
-#: model:ir.ui.menu,name:stock.menu_action_inventory_form_new
-msgid "New Periodical Inventory"
-msgstr "Үечилсэн бүртгэл"
-
-#. module: stock
-#: field:stock.production.lot,revisions:0
-msgid "Revisions"
-msgstr "Хяналт"
-
-#. module: stock
-#: selection:stock.location,allocation_method:0
-msgid "FIFO"
-msgstr "Эхэнд орсон нь эхэнд гарна."
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree2_delivery
-#: model:ir.ui.menu,name:stock.menu_picking_waiting_delivery
-msgid "Delivery Orders to Process"
-msgstr "Захиалга хүргэлийн үйл явц"
-
-#. module: stock
-#: field:stock.move,priority:0
-msgid "Priority"
-msgstr "Урьтамж"
-
-#. module: stock
-#: wizard_field:inventory.merge.stock.zero,init,location_id:0
-#: model:ir.model,name:stock.model_stock_location
-#: rml:lot.location:0
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
-#: wizard_field:stock.fill_inventory,init,location_id:0
-#: field:stock.inventory.line,location_id:0
-#: field:stock.picking,location_id:0
-#: rml:stock.picking.list:0
-#: field:stock.report.prodlots,location_id:0
-msgid "Location"
-msgstr "Байршил"
-
-#. module: stock
-#: field:stock.picking,invoice_state:0
-msgid "Invoice Status"
-msgstr "Нэхэмжлэх арга"
-
-#. module: stock
-#: rml:lot.location:0
-msgid "Units"
-msgstr "Хэмжих нэгж"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_JUSTIFY_LEFT"
-msgstr "STOCK_JUSTIFY_LEFT"
-
-#. module: stock
-#: view:stock.inventory:0
-msgid "Cancel Inventory"
-msgstr "Бүртгэл цуцлах"
-
-#. module: stock
-#: model:ir.actions.report.xml,name:stock.report_product_history
-msgid "Future Stock Forecast"
-msgstr "Ирээдүйн барааг урьдчилан хэлэх"
+#: view:product.product:0
+msgid "Stocks"
+msgstr "Бараанууд"
 
 #. module: stock
 #: model:ir.module.module,description:stock.module_meta_information
@@ -1414,40 +2096,565 @@ msgid ""
 "* Bar code supported\n"
 "* Rapid detection of mistakes through double entry system\n"
 "* Traceability (upstream/downstream, production lots, serial number, ...)\n"
+"* Dashboard for warehouse that includes:\n"
+"    * Products to receive in delay (date < = today)\n"
+"    * Procurement in exception\n"
+"    * Graph : Number of Receive products vs planned (bar graph on week par "
+"day)\n"
+"    * Graph : Number of Delivery products vs planned (bar graph on week par "
+"day)\n"
 "    "
 msgstr ""
-"OpenERP бүртгэлийн менежментийн модуль нь олон тооны агуулах, олон тооны мөн "
-"тодорхой бүтэцтэй агуулахын байршилыг зохион байгуулж чаддагДавхар нэвтрэх "
-"боломжтой менежментийн ачаар, бүртгэлийн хяналт чадалтай мөн уян хатан "
-"чанартай болсон:төлөвлөгөө болон түүхийг шилжүүлдэг, янз бүрийн бүртгэлийн "
-"аргууд, агуулахын барагцаалал (үнийн стандарт эсвэл дундаж), бүртгэлийн "
-"өөрчлөлттэй зэрэгцсэн тогтвортой байдал, дүрмийг автоматаар дахин шинэчлэх "
-"(агуулахын төвшин), дэмжигдсэн коддавхар нэвтрэлтийн системийн алдааг "
-"илрүүлэх, мөрдөгдөх чанар (өссөн/багассан, барааны цуврал, серийн дугаар)\n"
-"    "
+
+#. module: stock
+#: help:product.template,property_stock_inventory:0
+msgid ""
+"For the current product, this stock location will be used, instead of the "
+"default one, as the source location for stock moves generated when you do an "
+"inventory"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Stockable"
+msgstr ""
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Real Time (automated)"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,tracking_id:0
+msgid "Logistical shipping unit: pallet, box, pack ..."
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-locked"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.standard.price:0
+msgid "_Apply"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+#: report:stock.picking.list:0
+msgid "]"
+msgstr "]"
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+msgid "Total value"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-personal"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_journal_id:0
+msgid ""
+"Inventory Journal in which the chained move will be written, if the Chaining "
+"Type is not Transparent (no journal is used if left empty)"
+msgstr ""
+
+#. module: stock
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_incoming_product_board
+msgid "Incoming Product"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Creation"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-accessories-archiver"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#, python-format
+msgid "Cost"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_COPY"
+msgstr "STOCK_COPY"
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
+#: model:ir.ui.menu,name:stock.menu_warehouse_config
+msgid "Warehouse Management"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move
+msgid "Stock Move"
+msgstr "Бараа шилжих"
+
+#. module: stock
+#: field:product.category,property_stock_account_output_categ:0
+#: field:product.template,property_stock_account_output:0
+#: field:stock.change.standard.price,stock_account_output:0
+msgid "Stock Output Account"
+msgstr "Агуулахын зарлагын данс"
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic No Step Added"
+msgstr "Автомаатаар алхам нэмэгдээгүй"
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Product "
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "Stock Location Analysis"
+msgstr "Байршлын шинжилгээ"
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_CDROM"
+msgstr "STOCK_CDROM"
+
+#. module: stock
+#: help:stock.move,date:0
+msgid ""
+"Move date: scheduled date until move is done, then date of actual move "
+"processing"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.lines.date,date:0
+msgid "Latest Inventory Date"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+#: view:stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+#: view:stock.production.lot:0
+msgid "Group By..."
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Chained Locations"
+msgstr "Хэлхээтэй байрлал"
+
+#. module: stock
+#: model:stock.location,name:stock.location_inventory
+msgid "Inventory loss"
+msgstr "Нөөцийн алдагдал"
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Document"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Input Picking List"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_REFRESH"
+msgstr "STOCK_REFRESH"
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Products: "
+msgstr ""
+
+#. module: stock
+#: help:product.product,track_production:0
+msgid ""
+"Forces to specify a Production Lot for all moves containing this product and "
+"generated by a Manufacturing Order"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_STOP"
+msgstr "STOCK_STOP"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.track_line_old
+#: view:stock.move.track:0
+msgid "Tracking a move"
+msgstr "Тээвэрлэлтийн хөдөлгөөн"
+
+#. module: stock
+#: view:product.product:0
+msgid "Update"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_journal_form
+#: model:ir.ui.menu,name:stock.menu_action_stock_journal_form
+msgid "Stock Journals"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-gtk-go-back-ltr"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,type:0
+msgid "Others"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Could not find any difference between standard price and new price!"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_scrapped
+#: field:stock.move,scrapped:0
+msgid "Scrapped"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Products "
+msgstr ""
+
+#. module: stock
+#: field:product.product,track_incoming:0
+msgid "Track Incoming Lots"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_DIALOG_WARNING"
+msgstr "STOCK_DIALOG_WARNING"
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-mail-replied"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+msgid "Warehouse board"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_inventory_form
+#: model:ir.ui.menu,name:stock.menu_action_inventory_form
+msgid "Physical Inventories"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_CONVERT"
+msgstr "STOCK_CONVERT"
+
+#. module: stock
+#: field:stock.move,note:0
+#: view:stock.picking:0
+#: field:stock.picking,note:0
+msgid "Notes"
+msgstr "Тэмдэглэл"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Value"
+msgstr "Өртөг"
+
+#. module: stock
+#: field:report.stock.move,type:0
+#: field:stock.location,chained_picking_type:0
+#: field:stock.picking,type:0
+msgid "Shipping Type"
+msgstr "Хөдөлгөөний төрөл"
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You can only delete draft moves."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: model:ir.actions.act_window,name:stock.act_product_location_open
+#: model:ir.ui.menu,name:stock.menu_stock_products_menu
+#: view:stock.inventory:0
+#: view:stock.picking:0
+#, python-format
+msgid "Products"
+msgstr "Бүтээгдэхүүнүүд"
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "None"
+msgstr "Хоосон"
+
+#. module: stock
+#: view:stock.change.standard.price:0
+msgid "Change Price"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,move_type:0
+msgid "Delivery Method"
+msgstr "Хүргэх арга"
+
+#. module: stock
+#: help:report.stock.move,location_dest_id:0
+#: help:stock.move,location_dest_id:0
+#: help:stock.picking,location_dest_id:0
+msgid "Location where the system will stock the finished products."
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_variation:0
+msgid ""
+"When real-time inventory valuation is enabled on a product, this account "
+"will hold the current value of the products."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"There is no stock output account defined for this product or its category: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-partner"
+msgstr "terp-partner"
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_ITALIC"
+msgstr "STOCK_ITALIC"
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Operation forbidden"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-stock"
+msgstr "terp-stock"
+
+#. module: stock
+#: help:stock.picking,min_date:0
+msgid "Expected date for the picking to be processed"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "P&L Qty"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-folder-green"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+#: field:stock.production.lot,revisions:0
+msgid "Revisions"
+msgstr "Хяналт"
+
+#. module: stock
+#: help:product.product,valuation:0
+msgid ""
+"If real-time valuation is enabled for a product, the system will "
+"automatically write journal entries corresponding to stock moves.The "
+"inventory variation account set on the product category will represent the "
+"current inventory value, and the stock input and stock output account will "
+"hold the counterpart moves for incoming and outgoing products."
+msgstr ""
+
+#. module: stock
+#: help:report.stock.move,location_id:0
+#: help:stock.move,location_id:0
+msgid ""
+"Sets a location if you produce at a fixed location. This can be a partner "
+"location if you subcontract the manufacturing operations."
+msgstr ""
+
+#. module: stock
+#: view:stock.invoice.onshipping:0
+msgid "Create"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Dates"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,priority:0
+msgid "Priority"
+msgstr "Урьтамж"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Source"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#: model:ir.actions.report.xml,name:stock.report_location_overview
+#: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
+#: model:ir.model,name:stock.model_stock_inventory
+#: selection:report.stock.inventory,location_type:0
+#: field:stock.inventory.line,inventory_id:0
+#: report:stock.inventory.move:0
+#: selection:stock.location,usage:0
+#, python-format
+msgid "Inventory"
+msgstr "Хадгалах"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_picking
+#: field:stock.move,picking_id:0
+msgid "Picking List"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"The combination of serial number and internal reference must be unique !"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#, python-format
+msgid "Currency in which Unit Cost is expressed"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_ups
+msgid "Stock ups"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Cancel Inventory"
+msgstr "Нөөц цуцлах"
+
+#. module: stock
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines.exist,name:0
+msgid "Tracking serial"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/report/report_stock.py:0
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_replacement_result
+msgid "Stock Replacement result"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_location_type:0
 msgid "Fixed Location"
-msgstr "Тогтоосон байрлал"
+msgstr "Тогтмол байрлал"
 
 #. module: stock
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"объектийн нэр нь x_ - ээр эхлэх ёстой ба тусгай тэмдэглэгээ агуулахгүй байх"
+"Объектийн нэр нь x_ - ээр эхлэх ёстой ба тусгай тэмдэглэгээ агуулахгүй байх"
 
 #. module: stock
-#: field:stock.picking,min_date:0
-msgid "Planned Date"
-msgstr "Төлөвлөсөн огноо"
+#: selection:stock.location,icon:0
+msgid "terp-stock_align_left_24"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree
-msgid "Outgoing Products"
-msgstr "Бүтээгдэхүүний зардал"
+#: selection:stock.location,icon:0
+msgid "terp-folder-orange"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-accessories-archiver+"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-purchase"
+msgstr "terp-purchase"
+
+#. module: stock
+#: help:stock.production.lot,name:0
+msgid "Unique serial number, will be displayed as: PREFIX/SERIAL [INT_REF]"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "July"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Consumable"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1455,17 +2662,22 @@ msgid "STOCK_COLOR_PICKER"
 msgstr "STOCK_COLOR_PICKER"
 
 #. module: stock
-#: model:ir.actions.report.xml,name:stock.report_lot_location
-msgid "Lots by location"
-msgstr "Цувралуудын байрлал"
+#: selection:stock.location,icon:0
+msgid "STOCK_DND"
+msgstr "STOCK_DND"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DELETE"
-msgstr "STOCK_DELETE"
+#: model:ir.actions.report.xml,name:stock.report_product_history
+msgid "Stock Level Forecast"
+msgstr ""
 
 #. module: stock
 #: model:account.journal,name:stock.stock_journal
+#: model:ir.model,name:stock.model_stock_journal
+#: field:report.stock.move,stock_journal:0
+#: view:stock.journal:0
+#: field:stock.journal,name:0
+#: field:stock.picking,stock_journal_id:0
 msgid "Stock Journal"
 msgstr "Барааны журнал"
 
@@ -1475,59 +2687,91 @@ msgid "STOCK_CLEAR"
 msgstr "STOCK_CLEAR"
 
 #. module: stock
-#: field:stock.production.lot,date:0
-msgid "Created Date"
-msgstr "Үүсгэсэн огноо"
-
-#. module: stock
+#: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Procurement"
-msgstr "Татан авалт"
+msgstr "Бэлтгэн нийлүүлэх"
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-folder-yellow"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Maxtor Suppliers"
 msgstr "Макстор нийлүүлэгчид"
 
+#. module: stock
+#: code:addons/stock/wizard/stock_change_standard_price.py:0
+#, python-format
+msgid "Active ID is not set in Context"
+msgstr ""
+
 #. module: stock
 #: view:stock.picking:0
 msgid "Force Availability"
 msgstr "боломжийг хурдасгах"
 
 #. module: stock
-#: wizard_view:stock.location.products,init:0
+#: model:ir.actions.act_window,name:stock.move_scrap
+#: view:stock.move.scrap:0
+msgid "Scrap Move"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_reception_picking_move
+#: model:ir.ui.menu,name:stock.menu_action_pdct_in
+#: view:stock.move:0
+msgid "Receive Products"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_out_picking_move
+#: model:ir.actions.act_window,name:stock.action_partial_move
+#: model:ir.ui.menu,name:stock.menu_action_pdct_out
+msgid "Deliver Products"
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
 msgid "View Stock of Products"
 msgstr "Барааны агуулах харах"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mrp"
-msgstr "terp-mrp"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree3_delivery
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree3_delivery
-msgid "Future Delivery Orders"
-msgstr "Ирээлүйн захиалга хүргэлт"
+#: view:stock.picking:0
+msgid "Internal Picking list"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GO_UP"
 msgstr "STOCK_GO_UP"
 
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,month:0
+msgid "Month"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,date_done:0
+msgid "Date of Completion"
+msgstr ""
+
+#. module: stock
+#: help:stock.tracking,active:0
+msgid ""
+"By unchecking the active field, you may hide a pack without deleting it."
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_SORT_DESCENDING"
-msgstr "STOCK_SORT_DESCENDING"
+msgid "terp-dolar_ok!"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_tracking_form
-#: model:ir.ui.menu,name:stock.menu_action_tracking_form
-msgid "Tracking Lots"
-msgstr "Тээвэрлэлтийн серүүд"
-
-#. module: stock
-#: wizard_button:inventory.merge,init,merge:0
+#: view:stock.inventory.merge:0
 msgid "Yes"
 msgstr "Тийм"
 
@@ -1537,31 +2781,54 @@ msgid "Inventories"
 msgstr "Нөөц"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_HOME"
-msgstr "STOCK_HOME"
+#: view:report.stock.move:0
+msgid "Todo"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,company_id:0
+#: view:report.stock.move:0
+#: field:report.stock.move,company_id:0
+#: field:stock.inventory,company_id:0
+#: field:stock.inventory.line,company_id:0
+#: field:stock.location,company_id:0
+#: field:stock.move,company_id:0
+#: field:stock.picking,company_id:0
+#: field:stock.production.lot,company_id:0
+#: field:stock.production.lot.revision,company_id:0
+#: field:stock.warehouse,company_id:0
+msgid "Company"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PROPERTIES"
 msgstr "STOCK_PROPERTIES"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-go-year"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,stock_real:0
 msgid "Real Stock"
 msgstr "Жинхэнэ бараа"
 
 #. module: stock
-#: model:ir.actions.wizard,name:stock.wizard_fill_inventory
-#: wizard_view:stock.fill_inventory,init:0
-#: wizard_button:stock.fill_inventory,init,fill_inventory:0
+#: view:stock.fill.inventory:0
 msgid "Fill Inventory"
-msgstr "Бүртгэлийг бөглөх"
+msgstr "Нөөцийг дүүргэх"
 
 #. module: stock
-#: wizard_view:stock.invoice_onshipping,init:0
-msgid "Create invoices"
-msgstr "Нэхэмжлэл үүсгэх"
+#: help:product.category,property_stock_account_input_categ:0
+msgid ""
+"When doing real-time inventory valuation, counterpart Journal Items for all "
+"incoming stock moves will be posted in this account. This is the default "
+"value for all products in this category, it can also directly be set on each "
+"product."
+msgstr ""
 
 #. module: stock
 #: field:stock.production.lot.revision,date:0
@@ -1569,26 +2836,30 @@ msgid "Revision Date"
 msgstr "Залруулсан огноо"
 
 #. module: stock
-#: rml:stock.picking.list:0
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,prodlot_id:0
+#: view:stock.move:0
+#: field:stock.move.split.lines,lot_id:0
+#: field:stock.move.split.lines.exist,lot_id:0
+#: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Цувралын дугаар"
 
 #. module: stock
-#: wizard_view:inventory.merge.stock.zero,init:0
-msgid "Set Stock to Zero"
-msgstr "Барааг тэглэх"
+#: view:stock.move.split:0
+msgid "Production Lot Number"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-gtk-jump-to-rtl"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
 msgid "Quantity (UOS)"
 msgstr "Тоо хэмжээ"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree5
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree5
-msgid "Packing to Process"
-msgstr "Савлах үйл явц"
-
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_STOP"
@@ -1600,57 +2871,101 @@ msgid "Set Available"
 msgstr "боломжтой болгох"
 
 #. module: stock
-#: model:ir.actions.wizard,name:stock.make_picking
-#: wizard_view:stock.picking.make,init:0
-msgid "Make packing"
-msgstr "Савлагаа хийх"
+#: report:stock.picking.list:0
+msgid "Contact Address :"
+msgstr ""
 
 #. module: stock
-#: field:stock.picking,backorder_id:0
+#: field:stock.move,backorder_id:0
 msgid "Back Order"
 msgstr "Эх захиалга"
 
+#. module: stock
+#: field:stock.production.lot,name:0
+msgid "Serial Number"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DND_MULTIPLE"
 msgstr "STOCK_DND_MULTIPLE"
 
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#, python-format
+msgid "New picking invoices"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_REMOVE"
-msgstr "STOCK_REMOVE"
+msgid "STOCK_SPELL_CHECK"
+msgstr "STOCK_SPELL_CHECK"
 
 #. module: stock
 #: field:stock.incoterms,active:0
 #: field:stock.location,active:0
-#: field:stock.picking,active:0
 #: field:stock.tracking,active:0
 msgid "Active"
 msgstr "Идэвхитэй"
 
+#. module: stock
+#: model:ir.module.module,shortdesc:stock.module_meta_information
+msgid "Inventory Management"
+msgstr "Нөөцийн менежмент"
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-idea"
+msgstr ""
+
 #. module: stock
 #: view:product.template:0
 msgid "Properties"
 msgstr "Шинж чанар"
 
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Error, no partner !"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_splitinto.py:0
+#, python-format
+msgid ""
+"The current move line is already assigned to a pack, please remove it first "
+"if you really want to change it ' \\n            #                        "
+"'for this product: \"%s\" (id: %d)"
+msgstr ""
+
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_incoterms_tree
 #: model:ir.model,name:stock.model_stock_incoterms
-#: model:ir.ui.menu,name:stock.menu_action_incoterms_tree
 #: view:stock.incoterms:0
 msgid "Incoterms"
 msgstr "Инкотерм"
 
 #. module: stock
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
 msgid "Total:"
 msgstr "Нийт:"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_AUTHENTICATION"
-msgstr "STOCK_DIALOG_AUTHENTICATION"
+#: help:stock.incoterms,name:0
+msgid ""
+"Incoterms are series of sales terms.They are used to divide transaction "
+"costs and responsibilities between buyer and seller and reflect state-of-the-"
+"art transportation practices."
+msgstr ""
+
+#. module: stock
+#: help:stock.fill.inventory,recursive:0
+msgid ""
+"If checked, products contained in child locations of selected location will "
+"be included as well."
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1658,34 +2973,61 @@ msgid "STOCK_ZOOM_OUT"
 msgstr "STOCK_ZOOM_OUT"
 
 #. module: stock
-#: wizard_field:stock.move.track,init,tracking_prefix:0
+#: field:stock.move.track,tracking_prefix:0
 msgid "Tracking prefix"
 msgstr "Тээвэрлэлтийн урьдчилсан нөхцөл"
 
 #. module: stock
-#: selection:stock.location,allocation_method:0
-msgid "Nearest"
-msgstr "Орчим"
+#: field:stock.inventory,name:0
+msgid "Inventory Reference"
+msgstr ""
 
 #. module: stock
-#: wizard_field:stock.location.products,init,to_date:0
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Internal picking"
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "Open Product"
+msgstr ""
+
+#. module: stock
+#: field:stock.location.product,to_date:0
 msgid "To"
 msgstr "Төгсгөл"
 
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Process"
+msgstr ""
+
 #. module: stock
 #: field:stock.production.lot.revision,name:0
 msgid "Revision Name"
 msgstr "Хяналтын нэр"
 
+#. module: stock
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Агуулах"
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SELECT_COLOR"
 msgstr "STOCK_SELECT_COLOR"
 
 #. module: stock
-#: view:stock.inventory:0
-msgid "Confirm Inventory"
-msgstr "Бүртгэл батлах"
+#: view:stock.location.product:0
+msgid ""
+"(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to "
+"filter all resources of the day for the 'From' date and 23:59:59 for the "
+"'To' date)"
+msgstr ""
 
 #. module: stock
 #: view:product.category:0
@@ -1698,17 +3040,29 @@ msgid "STOCK_NO"
 msgstr "STOCK_NO"
 
 #. module: stock
-#: model:stock.location,name:stock.stock_location_workshop
-msgid "Workshop"
-msgstr "Ажлын хэсэг"
+#: model:ir.actions.act_window,name:stock.action_picking_tree_out
+msgid "Customers Packings"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,state:0
+#: view:report.stock.move:0
+#: selection:report.stock.move,state:0
 #: selection:stock.inventory,state:0
+#: view:stock.move:0
 #: selection:stock.move,state:0
+#: view:stock.picking:0
 #: selection:stock.picking,state:0
 msgid "Done"
 msgstr "Дууссан"
 
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_change_standard_price
+#: model:ir.model,name:stock.model_stock_change_standard_price
+#: view:stock.change.standard.price:0
+msgid "Change Standard Price"
+msgstr ""
+
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_virtual
 msgid "Virtual Locations"
@@ -1716,24 +3070,36 @@ msgstr "Виртуаль байршил"
 
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_REDO"
-msgstr "STOCK_REDO"
-
-#. module: stock
-#: model:stock.location,name:stock.stock_location_company
-msgid "Tiny sprl"
-msgstr "Tiny sprl"
+msgid "STOCK_GOTO_FIRST"
+msgstr "STOCK_GOTO_FIRST"
 
 #. module: stock
 #: field:stock.inventory,date_done:0
 msgid "Date done"
 msgstr "Бэлэн болсон огноо"
 
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"Please put a partner on the picking list if you want to generate invoice."
+msgstr ""
+
 #. module: stock
 #: selection:stock.move,priority:0
 msgid "Not urgent"
 msgstr "Яаралтай бус"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-stock_format-default"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "To Do"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CLOSE"
@@ -1746,66 +3112,143 @@ msgid "Warehouses"
 msgstr "Агуулах"
 
 #. module: stock
-#: help:product.product,track_outgoing:0
-msgid "Force to use a Production Lot during deliveries"
-msgstr "Тарааж байх үед барааны цувралыг хурдасгах"
+#: field:stock.journal,user_id:0
+msgid "Responsible"
+msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Split move lines in two"
-msgstr "Шилжих шугамыг 2 хуваах"
+#: selection:stock.location,icon:0
+msgid "terp-check"
+msgstr ""
 
 #. module: stock
-#: wizard_field:stock.invoice_onshipping,init,journal_id:0
+#: selection:stock.location,icon:0
+msgid "terp-camera_test"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_inventory_report
+#: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
+#: view:report.stock.inventory:0
+msgid "Inventory Analysis"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_SORT_DESCENDING"
+msgstr "STOCK_SORT_DESCENDING"
+
+#. module: stock
+#: field:stock.invoice.onshipping,journal_id:0
 msgid "Destination Journal"
 msgstr "Журналын зориулалт"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.act_stock_production_lot_2_stock_report_prodlots
+#: model:ir.actions.act_window,name:stock.act_stock_tracking_lot_2_stock_report_tracklots
 #: model:stock.location,name:stock.stock_location_stock
 msgid "Stock"
 msgstr "Бараа"
 
 #. module: stock
-#: rml:lot.location:0
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: model:ir.model,name:stock.model_product_product
+#: model:ir.ui.menu,name:stock.menu_stock_product
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,product_id:0
+#: field:report.stock.lines.date,product_id:0
+#: view:report.stock.move:0
+#: field:report.stock.move,product_id:0
 #: field:stock.inventory.line,product_id:0
+#: field:stock.inventory.line.split,product_id:0
+#: report:stock.inventory.move:0
+#: view:stock.move:0
 #: field:stock.move,product_id:0
+#: field:stock.move.consume,product_id:0
+#: field:stock.move.scrap,product_id:0
+#: field:stock.move.split,product_id:0
+#: view:stock.production.lot:0
 #: field:stock.production.lot,product_id:0
 #: field:stock.report.prodlots,product_id:0
+#: field:stock.report.tracklots,product_id:0
+#, python-format
 msgid "Product"
-msgstr "Бүтээгдэхүүн"
+msgstr "Бараа"
 
 #. module: stock
-#: wizard_button:stock.return.picking,init,return:0
-msgid "Return"
-msgstr "Буцаах"
+#: selection:stock.location,icon:0
+msgid "STOCK_HOME"
+msgstr "STOCK_HOME"
 
 #. module: stock
-#: field:stock.picking,auto_picking:0
-msgid "Auto-Packing"
-msgstr "Автомат савлагаа"
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "Invoicing"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Please provide Proper Quantity !"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You are moving %.2f products but only %.2f available in this lot."
+msgstr ""
 
 #. module: stock
 #: field:stock.move,product_uos:0
 msgid "Product UOS"
 msgstr "UOS бараа"
 
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Received Qty"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posz:0
 msgid "Height (Z)"
 msgstr "Өндөр (Z)"
 
 #. module: stock
-#: field:stock.inventory.line,product_uom:0
-#: field:stock.move,product_uom:0
-msgid "Product UOM"
-msgstr "Барааны Х.Нэгж"
+#: field:stock.ups,weight:0
+msgid "Lot weight"
+msgstr ""
 
 #. module: stock
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
+#: model:ir.model,name:stock.model_stock_move_consume
+#: view:stock.move.consume:0
+msgid "Consume Products"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: field:stock.inventory.line,product_uom:0
+#: field:stock.move.consume,product_uom:0
+#: field:stock.move.scrap,product_uom:0
+#, python-format
+msgid "Product UOM"
+msgstr "Хэмжих нэгж"
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You cannot remove the picking which is in %s state !"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,address_id:0
+msgid "Address"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
 msgid "Variants"
 msgstr "Хувилбарууд"
 
@@ -1824,30 +3267,41 @@ msgstr "Нийлүүлэгчид"
 msgid "STOCK_JUMP_TO"
 msgstr "STOCK_JUMP_TO"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_INDENT"
+msgstr "STOCK_INDENT"
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-tools"
 msgstr "terp-tools"
 
 #. module: stock
-#: model:ir.actions.report.xml,name:stock.report_location_overview
+#: report:lot.stock.overview:0
 msgid "Location Overview"
 msgstr "Байрлалын ерөнхий байдал"
 
 #. module: stock
-#: model:ir.actions.wizard,name:stock.location_product
+#: model:ir.actions.act_window,name:stock.action_view_stock_location_product
+#: model:ir.model,name:stock.model_stock_location_product
 msgid "Products by Location"
 msgstr "Бүтээгдэхүүний байрлал"
 
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_UNDO"
-msgstr "STOCK_UNDO"
+msgid "STOCK_DIALOG_INFO"
+msgstr "STOCK_DIALOG_INFO"
 
 #. module: stock
-#: model:ir.actions.wizard,name:stock.move_split
-msgid "Split move line"
-msgstr "Шилжих шугам хуваах"
+#: field:stock.fill.inventory,recursive:0
+msgid "Include children"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_components
+msgid "Shelf 1"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1855,9 +3309,9 @@ msgid "terp-sale"
 msgstr "terp-sale"
 
 #. module: stock
-#: field:stock.production.lot,name:0
-msgid "Serial"
-msgstr "Сериал"
+#: view:stock.move:0
+msgid "Order"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1865,57 +3319,133 @@ msgid "STOCK_ADD"
 msgstr "STOCK_ADD"
 
 #. module: stock
-#: field:stock.location,chained_delay:0
-msgid "Chained Delay (days)"
-msgstr "Цуваа зогссон(өдрүүд)"
+#: field:stock.tracking,name:0
+msgid "Pack Reference"
+msgstr ""
 
 #. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,location_id:0
 #: field:stock.move,location_id:0
 msgid "Source Location"
 msgstr "Гарах байршил"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-gtk-stop"
+msgstr ""
+
 #. module: stock
 #: view:product.template:0
 msgid "Accounting Entries"
 msgstr "Дансны бичилт"
 
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Unit Of Measure"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PAUSE"
 msgstr "STOCK_MEDIA_PAUSE"
 
+#. module: stock
+#: model:stock.location,name:stock.stock_location_intermediatelocation0
+msgid "Internal Shippings"
+msgstr ""
+
+#. module: stock
+#: field:stock.change.standard.price,enable_stock_in_out_acc:0
+msgid "Enable Related Account"
+msgstr ""
+
 #. module: stock
 #: view:product.product:0
+#: view:stock.inventory.line.split:0
+#: view:stock.move.split:0
 msgid "Lots"
 msgstr "Цувралын дугаарууд"
 
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "New pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Destination"
+msgstr ""
+
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "All at once"
 msgstr "Нэг мөсөн"
 
 #. module: stock
-#: field:product.product,track_outgoing:0
-msgid "Track Outging Lots"
-msgstr "гаралтын цувралын замыг тодорхойлох"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"Quantities, UoMs, Products and Locations cannot be modified on stock moves "
+"that have already been processed (except by the Administrator)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Productions"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "Return lines"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_stock_line_date
 #: model:ir.model,name:stock.model_report_stock_lines_date
-#: model:ir.ui.menu,name:stock.menu_report_stock_line_date
 #: view:report.stock.lines.date:0
 msgid "Dates of Inventories"
 msgstr "Нөөцөлсөн огноо"
 
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total incoming quantity"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,product_qty_out:0
+msgid "Out Qty"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PRINT_PREVIEW"
 msgstr "STOCK_PRINT_PREVIEW"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_FIND"
-msgstr "STOCK_FIND"
+#: field:stock.production.lot,move_ids:0
+msgid "Moves for this production lot"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:0
+#, python-format
+msgid "Message !"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Put in current pack"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1923,77 +3453,113 @@ msgid "Lot Inventory"
 msgstr "Серийн бүртгэл"
 
 #. module: stock
-#: help:stock.location,chained_auto_packing:0
-msgid ""
-"This is used only if you selected a chained location type.\n"
-"The 'Automatic Move' value will create a stock move after the current one "
-"that will be validated automatically. With 'Manual Operation', the stock "
-"move has to be validated by a worker. With 'Automatic No Step Added', the "
-"location is replaced in the original move."
+#: view:stock.move:0
+msgid "Reason"
 msgstr ""
-"энэ нь таныг бэхлэгдсэн байршилын төрлийг сонгох үед ашиглагданаавтомат "
-"шилжилтийн утга нь автоматаар батлагдах одоогийн агуулахын шилжилтийн "
-"дараагийн шилжилтийг үүсгэнэ. гар удирдлагыг ашиглавал агуулахын шилжилт "
-"заавал ажилтнаар баталгаажих хэрэгтэй болно. Алхам нэмэгдээгүй автоматыг "
-"ашиглавал байршил нь одоогийн шилжилтийн байрлалаар солигдоно."
 
 #. module: stock
 #: field:stock.location,icon:0
 msgid "Icon"
-msgstr "Зураг"
+msgstr "Тэмдэг зураг"
 
 #. module: stock
-#: field:stock.tracking,name:0
-msgid "Tracking"
-msgstr "Тээвэрлэлт"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
 
 #. module: stock
-#: wizard_button:stock.move.track,init,track:0
-#: wizard_button:stock.picking.make,init,make:0
+#: selection:stock.location,icon:0
+msgid "STOCK_ZOOM_IN"
+msgstr "STOCK_ZOOM_IN"
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-go-week"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line.split:0
+#: view:stock.move.consume:0
+#: view:stock.move.scrap:0
+#: view:stock.move.split:0
+#: view:stock.move.track:0
+#: view:stock.split.into:0
 msgid "Ok"
 msgstr "Тийм"
 
-#. module: stock
-#: help:product.template,property_stock_account_input:0
-msgid ""
-"This account will be used, instead of the default one, to value input stock"
-msgstr ""
-"Агуулахын оролтыг дүгнэхийн тулд заяамалынх нь оронд энэ данс хэрэглэгдэнэ"
-
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
 msgid "Non European Customers"
 msgstr "Европын харилцагч биш"
 
 #. module: stock
-#: model:stock.location,name:stock.stock_location_components
-msgid "Components"
-msgstr "Бүрэлдэхүүн хэсэг"
+#: code:addons/stock/product.py:0
+#: code:addons/stock/stock.py:0
+#: code:addons/stock/wizard/stock_splitinto.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: stock
-#: wizard_view:inventory.merge,init:0
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"There is no inventory variation account defined on the product category: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.merge:0
 msgid "Do you want to merge theses inventories ?"
 msgstr "Эдгээр нөөцийг нэгтгэхийг та хүсч байна уу?"
 
 #. module: stock
-#: field:stock.picking,max_date:0
-msgid "Max. Planned Date"
-msgstr "төлөвлөгдсөн огнооны хамгийн дээд хязгаар"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.move,state:0
+#: selection:stock.picking,state:0
+msgid "Cancelled"
+msgstr ""
 
 #. module: stock
-#: view:stock.inventory:0
-msgid "Posted Inventory"
-msgstr "Илгээсэн бүртгэл"
+#: field:stock.location,chained_location_type:0
+msgid "Chained Location Type"
+msgstr "Хэлхээ байрлалын төрөл"
 
 #. module: stock
+#: help:stock.picking,move_type:0
+msgid "It specifies goods to be delivered all at once or by direct delivery"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#, python-format
+msgid "This picking list does not require invoicing."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,type:0
+#: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Getting Goods"
 msgstr "Барааг хүлээж авах"
 
 #. module: stock
-#: view:stock.location:0
-msgid "Stock Location"
-msgstr "Барааны байршил"
+#: help:stock.location,chained_location_type:0
+msgid ""
+"Determines whether this location is chained to another location, i.e. any "
+"incoming product in this location \n"
+"should next go to the chained location. The chained location is determined "
+"according to the type :\n"
+"* None: No chaining at all\n"
+"* Customer: The chained location will be taken from the Customer Location "
+"field on the Partner form of the Partner that is specified in the Picking "
+"list of the incoming products.\n"
+"* Fixed Location: The chained location is taken from the next field: Chained "
+"Location if Fixed."
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2001,15 +3567,21 @@ msgid "STOCK_MEDIA_PLAY"
 msgstr "STOCK_MEDIA_PLAY"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree_delivery
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree_delivery
-msgid "Delivery Orders"
-msgstr "Хүргэх захиалгууд"
+#: code:addons/stock/wizard/stock_inventory_merge.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is done."
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_OPEN"
-msgstr "STOCK_OPEN"
+msgstr "Бараа_Нээх"
 
 #. module: stock
 #: help:res.partner,property_stock_customer:0
@@ -2021,59 +3593,92 @@ msgstr ""
 "барааны хүрэх газар болж ашиглагдана"
 
 #. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
 #: selection:stock.move,state:0
+#: view:stock.picking:0
 #: selection:stock.picking,state:0
 msgid "Confirmed"
 msgstr "Баталсан"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_PREVIOUS"
-msgstr "STOCK_MEDIA_PREVIOUS"
+#: model:ir.model,name:stock.model_stock_ups_final
+msgid "Stock ups final"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
 msgid "Confirm"
 msgstr "Бататгах"
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Check Availability"
-msgstr "Бэлэн байдлыг шалгах"
+#: help:stock.location,icon:0
+msgid "Icon show in  hierarchical tree view"
+msgstr ""
 
 #. module: stock
-#: wizard_view:inventory.merge,init:0
-#: model:ir.actions.wizard,name:stock.wizard_merge_inventory
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
+#: view:stock.inventory.merge:0
 msgid "Merge inventories"
 msgstr "Нөөцийг нэгтгэх"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_location_tree
-#: model:ir.ui.menu,name:stock.menu_action_location_tree
-msgid "Stock Locations Structure"
-msgstr "Бараа байрлах бүтэц"
-
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_DISCONNECT"
-msgstr "STOCK_DISCONNECT"
-
-#. module: stock
-#: help:product.template,property_stock_account_output:0
-msgid ""
-"This account will be used, instead of the default one, to value output stock"
+msgid "terp-go-home"
 msgstr ""
-"Агуулахын гаралтыг дүгнэхийн тулд заяамалын оронд энэ данс  ашиглагдана"
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Confirm (Do Not Process Now)"
-msgstr "Батлах(Одоо үйл ажиллагаа хийхгүй)"
+#: field:product.product,location_id:0
+#: view:stock.location:0
+msgid "Stock Location"
+msgstr "Барааны байршил"
 
 #. module: stock
-#: field:stock.tracking,move_ids:0
-msgid "Moves Tracked"
-msgstr "шилжилтийн зам гаргах"
+#: help:stock.location,scrap_location:0
+msgid ""
+"Check this box to allow using this location to put scrapped/damaged goods."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_relate_picking
+msgid "Related Picking"
+msgstr "Холбоотой агуулахын баримт"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total outgoing quantity"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,backorder_id:0
+msgid "Back Order of"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#, python-format
+msgid "Unit Cost for this product line"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_product_category
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,product_categ_id:0
+#: view:report.stock.move:0
+#: field:report.stock.move,categ_id:0
+msgid "Product Category"
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
@@ -2081,34 +3686,128 @@ msgid "Reporting"
 msgstr "Тайлан"
 
 #. module: stock
-#: model:ir.actions.wizard,name:stock.wizard_invoice_onshipping
-#: wizard_button:stock.invoice_onshipping,init,create_invoice:0
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid " for the "
+msgstr ""
+
+#. module: stock
+#: view:stock.split.into:0
+msgid "Quantity to leave in the current pack"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
+#: view:stock.invoice.onshipping:0
 msgid "Create invoice"
 msgstr "Нэхэмжлэл үүсгэх"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_NETWORK"
-msgstr "STOCK_NETWORK"
+msgstr "Бараа_Сүлжээ"
 
 #. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_configuration
-msgid "Configuration"
-msgstr "Тохиргоо"
+#: view:report.stock.lines.date:0
+msgid "Non Inv"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory.line.split,use_exist:0
+#: field:stock.move.split,use_exist:0
+msgid "Existing Lots"
+msgstr ""
+
+#. module: stock
+#: help:stock.change.standard.price,new_price:0
+msgid ""
+"If cost price is increased, stock variation account will be debited and "
+"stock output account will be credited with the value = (difference of amount "
+"* quantity available).\n"
+"If cost price is decreased, stock variation account will be creadited and "
+"stock input account will be debited."
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_journal_id:0
+msgid "Chaining Journal"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_customers
+msgid "Customers"
+msgstr "Харилцагчид"
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is cancelled."
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "terp-project"
-msgstr "terp-project"
+msgid "terp-document-new"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.act_product_product_2_stock_report_prodlots
-#: model:ir.actions.act_window,name:stock.act_stock_location_2_stock_report_prodlots
-#: model:ir.actions.act_window,name:stock.action_stock_report_prodlots_form
-#: model:ir.ui.menu,name:stock.menu_stock_report_prodlots
-#: view:stock.report.prodlots:0
-msgid "Stock by Lots"
-msgstr "Барааны цувралын жагсаалт"
+#: view:stock.inventory.line:0
+msgid "Stock Inventory Lines"
+msgstr "Барааны нөөцийн шугам"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#, python-format
+msgid "Process Document"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Deliveries"
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_account_input:0
+msgid ""
+"When doing real-time inventory valuation, counterpart Journal Items for all "
+"incoming stock moves will be posted in this account. If not set on the "
+"product, the one from the product category is used."
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Additional info"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: field:stock.move,tracking_id:0
+msgid "Pack"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_location
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,location_id:0
+#: field:stock.fill.inventory,location_id:0
+#: field:stock.inventory.line,location_id:0
+#: report:stock.inventory.move:0
+#: view:stock.location:0
+#: view:stock.move:0
+#: field:stock.move.consume,location_id:0
+#: field:stock.move.scrap,location_id:0
+#: field:stock.picking,location_id:0
+#: report:stock.picking.list:0
+#: field:stock.report.prodlots,location_id:0
+#: field:stock.report.tracklots,location_id:0
+msgid "Location"
+msgstr "Агуулахын байрлал"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Date Expected"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,auto_validate:0
@@ -2116,10 +3815,19 @@ msgid "Auto Validate"
 msgstr "Автоматаар батлах"
 
 #. module: stock
-#: field:stock.location,chained_auto_packing:0
+#: model:ir.model,name:stock.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "December"
+msgstr ""
+
+#. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic Move"
-msgstr "Автомат хөдөлгөөн"
+msgstr "Автоматаар хөдөлгөөн хийх"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -2127,10 +3835,26 @@ msgid "Virtual Stock Value"
 msgstr "Бодит бус барааны өртөг"
 
 #. module: stock
-#: selection:stock.move,state:0
-#: selection:stock.picking,state:0
-msgid "Canceled"
-msgstr "Цуцлагдсан"
+#: selection:stock.location,icon:0
+msgid "terp-mail_delete"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,price_currency_id:0
+msgid ""
+"Technical field used to record the currency chosen by the user during a "
+"picking confirmation (when average price costing method is used)"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-go-month"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_products_moves
+msgid "Products Moves"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2142,33 +3866,49 @@ msgstr "STOCK_GOTO_LAST"
 msgid "Invoiced"
 msgstr "Нэхэмжилсэн"
 
+#. module: stock
+#: field:stock.move,address_id:0
+msgid "Destination Address"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIRECTORY"
-msgstr "STOCK_DIRECTORY"
+msgstr "Бараа_Удирдлага"
 
 #. module: stock
-#: help:product.template,property_stock_production:0
-msgid ""
-"For the current product (template), this stock location will be used, "
-"instead of the default one, as the source location for stock moves generated "
-"by production orders"
+#: field:stock.picking,max_date:0
+msgid "Max. Expected Date"
 msgstr ""
-"барааны захиалгаар боловсруулагдсан агуулахын шилжилтийн анхны байрлал "
-"болгохын тулд заяамал агуулахынх нь оронд тухайн бараанд энэ агуулахын "
-"байрлалыг ашиглана"
 
 #. module: stock
-#: view:stock.picking.move.wizard:0
-msgid "Add"
-msgstr "Нэмэх"
+#: field:stock.picking,auto_picking:0
+msgid "Auto-Picking"
+msgstr ""
 
 #. module: stock
+#: model:stock.location,name:stock.stock_location_shop1
+msgid "Shop 2"
+msgstr ""
+
+#. module: stock
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+#: selection:report.stock.move,type:0
+#: view:stock.location:0
+#: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Internal"
 msgstr "Дотоод"
 
 #. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
 #: selection:stock.inventory,state:0
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
@@ -2181,32 +3921,58 @@ msgid "STOCK_JUSTIFY_CENTER"
 msgstr "STOCK_JUSTIFY_CENTER"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree3
-#: model:ir.actions.act_window,name:stock.action_picking_tree8
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree3
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree8
-msgid "Confirmed Packing Waiting Availability"
-msgstr "батлагдсан хүлээлтийн багц"
+#: help:report.stock.inventory,state:0
+msgid ""
+"When the stock move is created it is in the 'Draft' state.\n"
+" After that it is set to 'Confirmed' state.\n"
+" If stock is available state is set to 'Avaiable'.\n"
+" When the picking it done the state is 'Done'.              \n"
+"The state is 'Waiting' if the move is waiting for another one."
+msgstr ""
 
 #. module: stock
-#: field:stock.location,posy:0
-msgid "Shelves (Y)"
-msgstr "Багана (Y)"
+#: field:stock.move.split.lines,use_exist:0
+msgid "Existing Lot"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.wizard,name:stock.wizard_merge_inventory_zero
-msgid "Set Stock to 0"
-msgstr "Барааг тэглэх"
+#: selection:stock.location,icon:0
+msgid "STOCK_MEDIA_PREVIOUS"
+msgstr "STOCK_MEDIA_PREVIOUS"
 
 #. module: stock
-#: view:stock.location:0
-msgid "Localisation"
-msgstr "Байршуулалт"
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "Please specify at least one non-zero quantity!"
+msgstr ""
 
 #. module: stock
-#: wizard_view:inventory.merge.stock.zero,init:0
-msgid "Do you want to set stocks to zero ?"
-msgstr "Барааг тэглэхийг хүсч байна уу?"
+#: report:stock.picking.list:0
+msgid "weight"
+msgstr "Жин"
+
+#. module: stock
+#: help:product.template,property_stock_procurement:0
+msgid ""
+"For the current product, this stock location will be used, instead of the "
+"default one, as the source location for stock moves generated by procurements"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is ready to process."
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,origin:0
+msgid "Reference of the document that produced this picking."
+msgstr ""
+
+#. module: stock
+#: field:stock.fill.inventory,set_stock_zero:0
+msgid "Set to zero"
+msgstr ""
 
 #. module: stock
 #: selection:stock.picking,move_type:0
@@ -2219,14 +3985,56 @@ msgid "STOCK_REVERT_TO_SAVED"
 msgstr "STOCK_REVERT_TO_SAVED"
 
 #. module: stock
-#: field:product.product,track_production:0
-msgid "Track Production Lots"
-msgstr "барааны хэв маягийн багц"
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#, python-format
+msgid "None of these picking lists require invoicing."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "November"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Unplanned Qty"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is scheduled"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_company_id:0
+msgid "Chained Company"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
-msgid "Split in Two"
-msgstr "2 хуваах"
+msgid "Check Availability"
+msgstr "Бэлэн байдлыг шалгах"
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Not Available. Moves are not confirmed."
+msgstr ""
+
+#. module: stock
+#: help:product.product,track_incoming:0
+msgid ""
+"Forces to specify a Production Lot for all moves containing this product and "
+"coming from a Supplier Location"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
@@ -2234,158 +4042,267 @@ msgid "Future Stock Moves"
 msgstr "Ирээдүйд шилжүүлэх бараа"
 
 #. module: stock
-#: help:product.template,property_stock_procurement:0
-msgid ""
-"For the current product (template), this stock location will be used, "
-"instead of the default one, as the source location for stock moves generated "
-"by procurements"
+#: selection:stock.location,icon:0
+msgid "terp-gtk-select-all"
 msgstr ""
-"Татан авалтаар биелэгдсэн агуулахын шилжилтийн анхны байрлал болгох "
-"зорилгоор заяамал агуулахынх нь оронд энэ агуулахын байршил тухайн бараанд "
-"ашиглагдана,"
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_picking_move_wizard
-msgid "stock.picking.move.wizard"
-msgstr "Агуулахын барааг шилжүүлэх визард"
+#: field:stock.move,move_history_ids2:0
+msgid "Move History (parent moves)"
+msgstr ""
 
 #. module: stock
+#: view:stock.move:0
+msgid "Extended options..."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Stock"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: stock
+#: field:stock.ups.final,xmlfile:0
+msgid "XML File"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
 #: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.inventory.line,prod_lot_id:0
+#: report:stock.inventory.move:0
 #: field:stock.move,prodlot_id:0
+#: field:stock.move.split.lines.exist,prodlot_id:0
 #: view:stock.production.lot:0
+#, python-format
 msgid "Production Lot"
 msgstr "Үйлдвэрлэлийн цуврал"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_traceability
-#: model:ir.ui.menu,name:stock.next_id_62
+#: view:stock.move:0
+#: view:stock.picking:0
+#: view:stock.production.lot:0
+#: view:stock.tracking:0
 msgid "Traceability"
 msgstr "Мөрдөгдөх чанар"
 
 #. module: stock
-#: field:stock.picking,date:0
-msgid "Date Order"
-msgstr "Захиалсан огноо"
+#: view:stock.picking:0
+msgid "To invoice"
+msgstr ""
 
 #. module: stock
-#: selection:stock.invoice_onshipping,init,type:0
-msgid "Supplier Invoice"
-msgstr "Нийлүүлэгчийн нэхэмжлэл"
+#: selection:stock.location,icon:0
+msgid "terp-mail-message-new"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
 #: model:ir.ui.menu,name:stock.menu_action_location_form
+#: view:stock.picking:0
 msgid "Locations"
-msgstr "Байршлууд"
-
-#. module: stock
-#: help:stock.move,date_planned:0
-msgid ""
-"Scheduled date for the movement of the products or real date if the move is "
-"done."
-msgstr "Барааг шилжүүлэх төлөвлөгдсөн огноо эсвэл шилжилт хийгдсэн огноо"
+msgstr "Байрлалууд"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "General Information"
 msgstr "Ерөнхий мэдээлэл"
 
+#. module: stock
+#: field:stock.production.lot,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_DISCONNECT"
+msgstr "Бараа_тусгаарлах"
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-product"
 msgstr "terp-product"
 
-#. module: stock
-#: wizard_button:stock.partial_picking,end2,end:0
-msgid "Close"
-msgstr "Хаах"
-
-#. module: stock
-#: model:ir.actions.report.xml,name:stock.report_move_labels
-msgid "Print Item Labels"
-msgstr "Шошго хэвлэх"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Moves"
 msgstr "Шилжих"
 
 #. module: stock
-#: field:stock.move,location_dest_id:0
+#: view:report.stock.move:0
+#: field:report.stock.move,location_dest_id:0
 #: field:stock.picking,location_dest_id:0
 msgid "Dest. Location"
 msgstr "Хүрэх байршил"
 
 #. module: stock
-#: wizard_button:stock.move.split,init,split:0
-msgid "Split"
-msgstr "Хуваах"
+#: help:stock.move,product_packaging:0
+msgid ""
+"It specifies attributes of packaging like type, quantity of packaging,etc."
+msgstr ""
 
 #. module: stock
-#: field:stock.location,account_id:0
-msgid "Inventory Account"
-msgstr "Дансны бүртгэл"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "quantity."
+msgstr ""
 
 #. module: stock
-#: wizard_view:inventory.merge.stock.zero,init:0
-msgid "Set Stocks to Zero"
-msgstr "Барааг  тэглэх"
+#: view:stock.move:0
+msgid "Expected"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,location_type:0
 #: model:stock.location,name:stock.location_production
 #: selection:stock.location,usage:0
 msgid "Production"
-msgstr "Үйлдвэрлэл"
+msgstr "Үйлдвэрлэлийн"
 
 #. module: stock
-#: model:ir.ui.menu,name:stock.menu_traceability_low
-msgid "Low Level"
-msgstr "Нам түвшин"
+#: view:stock.split.into:0
+msgid "Split Move"
+msgstr ""
 
 #. module: stock
-#: rml:stock.picking.list:0
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid ""
+"There are no products to return (only lines in Done state and not fully "
+"returned yet can be returned)!"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split
+msgid "Split in Production lots"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+msgid "Real"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+#: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
 msgid "Description"
 msgstr "Тодорхойлолт"
 
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "May"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_INDENT"
-msgstr "STOCK_INDENT"
+msgid "STOCK_DIALOG_AUTHENTICATION"
+msgstr "STOCK_DIALOG_AUTHENTICATION"
 
 #. module: stock
-#: selection:stock.picking,type:0
-msgid "Delivery"
-msgstr "Хүргэлт"
+#: help:product.template,property_stock_account_output:0
+msgid ""
+"When doing real-time inventory valuation, counterpart Journal Items for all "
+"outgoing stock moves will be posted in this account. If not set on the "
+"product, the one from the product category is used."
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action5
-#: model:ir.actions.wizard,name:stock.action4
-#: model:ir.actions.wizard,name:stock.action_lot2
+#: view:stock.tracking:0
 msgid "Upstream traceability"
 msgstr "Дээд хөдөлгөөнийг хянах"
 
+#. module: stock
+#: report:lot.stock.overview_all:0
+msgid "Location Content"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Produced Qty"
+msgstr ""
+
 #. module: stock
 #: field:product.category,property_stock_account_input_categ:0
 #: field:product.template,property_stock_account_input:0
+#: field:stock.change.standard.price,stock_account_input:0
 msgid "Stock Input Account"
 msgstr "Барааны орлогын данс"
 
 #. module: stock
-#: field:stock.location,chained_location_type:0
-msgid "Chained Location Type"
-msgstr "Хэлхээ байрлалын төрөл"
+#: view:stock.move:0
+msgid "Picking"
+msgstr ""
 
 #. module: stock
+#: model:ir.model,name:stock.model_stock_report_prodlots
+msgid "Stock report by production lots"
+msgstr "Барааны цувралаар хийгдсэн агуулахын тайлан"
+
+#. module: stock
+#: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
+#: view:stock.move:0
 msgid "Customer"
-msgstr "Үйлчлүүлэгч"
+msgstr "Хэрэглэгчийн"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_location_tree_3
-#: model:ir.ui.menu,name:stock.menu_action_location_tree_3
-msgid "Locations' Values"
-msgstr "Байршлын өртөг"
+#: selection:report.stock.move,month:0
+msgid "February"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Production Lot Identification"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,scrap_location:0
+#: view:stock.move.scrap:0
+msgid "Scrap Location"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "April"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:stock.move:0
+msgid "Future"
+msgstr ""
+
+#. module: stock
+#: field:stock.invoice.onshipping,invoice_date:0
+msgid "Invoiced date"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree
+#: view:stock.picking:0
+msgid "Outgoing Deliveries"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_output
@@ -2398,14 +4315,32 @@ msgid "STOCK_JUSTIFY_RIGHT"
 msgstr "STOCK_JUSTIFY_RIGHT"
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_inventory_line
-msgid "Inventory line"
-msgstr "Бүртгэлийн мөр"
+#: selection:stock.location,icon:0
+msgid "terp-mrp"
+msgstr "terp-mrp"
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Others info"
-msgstr "Бусад мэдээлэл"
+#: help:stock.location,chained_picking_type:0
+msgid ""
+"Shipping Type of the Picking List that will contain the chained move (leave "
+"empty to automatically detect the type based on the source and destination "
+"locations)."
+msgstr ""
+
+#. module: stock
+#: selection:stock.move.split.lines,action:0
+msgid "Keep in one lot"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Cost Price:"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,move_dest_id:0
+msgid "Optional: next stock move when chaining them"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2413,12 +4348,457 @@ msgid "STOCK_MEDIA_NEXT"
 msgstr "STOCK_MEDIA_NEXT"
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Move State"
-msgstr "Шилжих төлөв"
+#: selection:stock.location,icon:0
+msgid "STOCK_REDO"
+msgstr "STOCK_REDO"
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,year:0
+msgid "Year"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations
 msgid "Physical Locations"
 msgstr "Физик байршил"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_move
+msgid "Partial Move"
+msgstr ""
+
+#~ msgid "Move History"
+#~ msgstr "Хөдөлгөөний түүх"
+
+#~ msgid "Supplier Refund"
+#~ msgstr "Нийлүүлэгчийн буцаалт"
+
+#~ msgid "Invoice Status"
+#~ msgstr "Нэхэмжлэх арга"
+
+#~ msgid "Created Date"
+#~ msgstr "Үүсгэсэн огноо"
+
+#~ msgid "Create invoices"
+#~ msgstr "Нэхэмжлэл үүсгэх"
+
+#~ msgid "Serial"
+#~ msgstr "Сериал"
+
+#~ msgid "Add"
+#~ msgstr "Нэмэх"
+
+#~ msgid "Supplier Invoice"
+#~ msgstr "Нийлүүлэгчийн нэхэмжлэл"
+
+#~ msgid "Delivery"
+#~ msgstr "Хүргэлт"
+
+#~ msgid "Total :"
+#~ msgstr "Нийт:"
+
+#~ msgid "Return packing"
+#~ msgstr "Савлагааг буцаах"
+
+#~ msgid "Packing list"
+#~ msgstr "Савлагааны жагсаалт"
+
+#~ msgid "Amount"
+#~ msgstr "Хэмжээ"
+
+#~ msgid "Incoming Products"
+#~ msgstr "Бүтээгдэхүүнүүдийн  орлого"
+
+#~ msgid "Make Parcel"
+#~ msgstr "Баглаа хийх"
+
+#~ msgid "Products Sent"
+#~ msgstr "Илгээсэн бүтээгдэхүүнүүд"
+
+#~ msgid "Customer Refund"
+#~ msgstr "Харилцагч буцааж төлөх"
+
+#~ msgid "Stock location"
+#~ msgstr "Барааны байрлал"
+
+#~ msgid "Status"
+#~ msgstr "Төлөв"
+
+#~ msgid "Move Lines"
+#~ msgstr "Шилжих шугамууд"
+
+#~ msgid "Stock Level 1"
+#~ msgstr "Барааны түвшин-1"
+
+#~ msgid "Stock Properties"
+#~ msgstr "Барааны шинж чанар"
+
+#~ msgid "Draft Moves"
+#~ msgstr "Ноорог шилжүүлэх"
+
+#~ msgid "Product Id"
+#~ msgstr "Бүтээгдэхүүний дугаар"
+
+#~ msgid "Customer Invoice"
+#~ msgstr "Харилцагчийн нэхэмжлэл"
+
+#~ msgid "New Reception Packing"
+#~ msgstr "Шинэ савлагаа хүлээн авах"
+
+#~ msgid "Non Assigned Products:"
+#~ msgstr "Эрсдэлгүй бүтээгдэхүүнүүд"
+
+#~ msgid "Finished products"
+#~ msgstr "Дууссан бүтээгдэхүүнүүд"
+
+#~ msgid "Date create"
+#~ msgstr "Үүсэх огноо"
+
+#~ msgid "Set to Zero"
+#~ msgstr "Тэглэх"
+
+#~ msgid "All Stock Moves"
+#~ msgstr "Бүх барааны шилжилт"
+
+#~ msgid "Date Created"
+#~ msgstr "Үүсгэсэн огноо"
+
+#~ msgid "Allocation Method"
+#~ msgstr "Хуваарилалтын арга"
+
+#~ msgid "Periodical Inventory"
+#~ msgstr "Тогтмол нөөц"
+
+#~ msgid "Draft Periodical Inventories"
+#~ msgstr "Ноорог тогтмол нөөц"
+
+#~ msgid "Origin Reference"
+#~ msgstr "Эх сурвалжийн лавлагаа"
+
+#~ msgid "Open Products"
+#~ msgstr "Нээлттэй бүтээгдэхүүнүүд"
+
+#~ msgid "Input Packing List"
+#~ msgstr "Савлагаанд орох жагсаалт"
+
+#~ msgid "Packing List"
+#~ msgstr "Савалгааны жагсаалт"
+
+#~ msgid "Not from Packing"
+#~ msgstr "Савлагаанаас биш"
+
+#~ msgid "Internal Ref"
+#~ msgstr "Дотоод реф"
+
+#~ msgid "Validate"
+#~ msgstr "Батлах"
+
+#~ msgid "Move lines"
+#~ msgstr "Шилжих шугам"
+
+#~ msgid "Partial packing"
+#~ msgstr "Дутуу савлагаа"
+
+#~ msgid "Delivery Orders to Process"
+#~ msgstr "Захиалга хүргэлийн үйл явц"
+
+#~ msgid "Units"
+#~ msgstr "Хэмжих нэгж"
+
+#~ msgid "Future Stock Forecast"
+#~ msgstr "Ирээдүйн барааг урьдчилан хэлэх"
+
+#~ msgid "Planned Date"
+#~ msgstr "Төлөвлөсөн огноо"
+
+#~ msgid "Outgoing Products"
+#~ msgstr "Бүтээгдэхүүний зардал"
+
+#~ msgid "Lots by location"
+#~ msgstr "Цувралуудын байрлал"
+
+#~ msgid "Future Delivery Orders"
+#~ msgstr "Ирээлүйн захиалга хүргэлт"
+
+#~ msgid "Set Stock to Zero"
+#~ msgstr "Барааг тэглэх"
+
+#~ msgid "Packing to Process"
+#~ msgstr "Савлах үйл явц"
+
+#~ msgid "Make packing"
+#~ msgstr "Савлагаа хийх"
+
+#~ msgid "Nearest"
+#~ msgstr "Орчим"
+
+#~ msgid "Workshop"
+#~ msgstr "Ажлын хэсэг"
+
+#~ msgid "Tiny sprl"
+#~ msgstr "Tiny sprl"
+
+#~ msgid "Split move lines in two"
+#~ msgstr "Шилжих шугамыг 2 хуваах"
+
+#~ msgid "Return"
+#~ msgstr "Буцаах"
+
+#~ msgid "Auto-Packing"
+#~ msgstr "Автомат савлагаа"
+
+#~ msgid "Split move line"
+#~ msgstr "Шилжих шугам хуваах"
+
+#~ msgid "Chained Delay (days)"
+#~ msgstr "Цуваа зогссон(өдрүүд)"
+
+#~ msgid "Components"
+#~ msgstr "Бүрэлдэхүүн хэсэг"
+
+#~ msgid "Delivery Orders"
+#~ msgstr "Хүргэх захиалгууд"
+
+#~ msgid "Stock Locations Structure"
+#~ msgstr "Бараа байрлах бүтэц"
+
+#~ msgid "Confirm (Do Not Process Now)"
+#~ msgstr "Батлах(Одоо үйл ажиллагаа хийхгүй)"
+
+#~ msgid "Stock by Lots"
+#~ msgstr "Барааны цувралын жагсаалт"
+
+#~ msgid "Canceled"
+#~ msgstr "Цуцлагдсан"
+
+#~ msgid "Set Stock to 0"
+#~ msgstr "Барааг тэглэх"
+
+#~ msgid "Localisation"
+#~ msgstr "Байршуулалт"
+
+#~ msgid "Do you want to set stocks to zero ?"
+#~ msgstr "Барааг тэглэхийг хүсч байна уу?"
+
+#~ msgid "Split in Two"
+#~ msgstr "2 хуваах"
+
+#~ msgid "Date Order"
+#~ msgstr "Захиалсан огноо"
+
+#~ msgid "Close"
+#~ msgstr "Хаах"
+
+#~ msgid "Print Item Labels"
+#~ msgstr "Шошго хэвлэх"
+
+#~ msgid "Low Level"
+#~ msgstr "Нам түвшин"
+
+#~ msgid "Locations' Values"
+#~ msgstr "Байршлын өртөг"
+
+#~ msgid "Others info"
+#~ msgstr "Бусад мэдээлэл"
+
+#~ msgid "Move State"
+#~ msgstr "Шилжих төлөв"
+
+#~ msgid "LIFO"
+#~ msgstr "Сүүлд орсон нь эхэнд гарна"
+
+#~ msgid "Sub Products"
+#~ msgstr "Дэд бүтээгдэхүүн"
+
+#~ msgid "Revision"
+#~ msgstr "Хяналт"
+
+#~ msgid "Fill Inventory for specific location"
+#~ msgstr "Бодит байрлалын нөөцийг дүүргэх"
+
+#~ msgid "Products Received"
+#~ msgstr "Бараа хүлээн авах"
+
+#~ msgid "Unreceived Products"
+#~ msgstr "Бараа хүлээн аваагүй"
+
+#~ msgid ""
+#~ "OpenERP Inventory Management module can manage multi-warehouses, multi and "
+#~ "structured stock locations.\n"
+#~ "Thanks to the double entry management, the inventory controlling is powerful "
+#~ "and flexible:\n"
+#~ "* Moves history and planning,\n"
+#~ "* Different inventory methods (FIFO, LIFO, ...)\n"
+#~ "* Stock valuation (standard or average price, ...)\n"
+#~ "* Robustness faced with Inventory differences\n"
+#~ "* Automatic reordering rules (stock level, JIT, ...)\n"
+#~ "* Bar code supported\n"
+#~ "* Rapid detection of mistakes through double entry system\n"
+#~ "* Traceability (upstream/downstream, production lots, serial number, ...)\n"
+#~ "    "
+#~ msgstr ""
+#~ "OpenERP бүртгэлийн менежментийн модуль нь олон тооны агуулах, олон тооны мөн "
+#~ "тодорхой бүтэцтэй агуулахын байршилыг зохион байгуулж чаддагДавхар нэвтрэх "
+#~ "боломжтой менежментийн ачаар, бүртгэлийн хяналт чадалтай мөн уян хатан "
+#~ "чанартай болсон:төлөвлөгөө болон түүхийг шилжүүлдэг, янз бүрийн бүртгэлийн "
+#~ "аргууд, агуулахын барагцаалал (үнийн стандарт эсвэл дундаж), бүртгэлийн "
+#~ "өөрчлөлттэй зэрэгцсэн тогтвортой байдал, дүрмийг автоматаар дахин шинэчлэх "
+#~ "(агуулахын төвшин), дэмжигдсэн коддавхар нэвтрэлтийн системийн алдааг "
+#~ "илрүүлэх, мөрдөгдөх чанар (өссөн/багассан, барааны цуврал, серийн дугаар)\n"
+#~ "    "
+
+#~ msgid "Force to use a Production Lot during deliveries"
+#~ msgstr "Тарааж байх үед барааны цувралыг хурдасгах"
+
+#~ msgid "Track Outging Lots"
+#~ msgstr "гаралтын цувралын замыг тодорхойлох"
+
+#~ msgid ""
+#~ "This is used only if you selected a chained location type.\n"
+#~ "The 'Automatic Move' value will create a stock move after the current one "
+#~ "that will be validated automatically. With 'Manual Operation', the stock "
+#~ "move has to be validated by a worker. With 'Automatic No Step Added', the "
+#~ "location is replaced in the original move."
+#~ msgstr ""
+#~ "энэ нь таныг бэхлэгдсэн байршилын төрлийг сонгох үед ашиглагданаавтомат "
+#~ "шилжилтийн утга нь автоматаар батлагдах одоогийн агуулахын шилжилтийн "
+#~ "дараагийн шилжилтийг үүсгэнэ. гар удирдлагыг ашиглавал агуулахын шилжилт "
+#~ "заавал ажилтнаар баталгаажих хэрэгтэй болно. Алхам нэмэгдээгүй автоматыг "
+#~ "ашиглавал байршил нь одоогийн шилжилтийн байрлалаар солигдоно."
+
+#~ msgid "Max. Planned Date"
+#~ msgstr "төлөвлөгдсөн огнооны хамгийн дээд хязгаар"
+
+#~ msgid "Moves Tracked"
+#~ msgstr "шилжилтийн зам гаргах"
+
+#~ msgid ""
+#~ "For the current product (template), this stock location will be used, "
+#~ "instead of the default one, as the source location for stock moves generated "
+#~ "by production orders"
+#~ msgstr ""
+#~ "барааны захиалгаар боловсруулагдсан агуулахын шилжилтийн анхны байрлал "
+#~ "болгохын тулд заяамал агуулахынх нь оронд тухайн бараанд энэ агуулахын "
+#~ "байрлалыг ашиглана"
+
+#~ msgid "Confirmed Packing Waiting Availability"
+#~ msgstr "батлагдсан хүлээлтийн багц"
+
+#~ msgid "Track Production Lots"
+#~ msgstr "барааны хэв маягийн багц"
+
+#~ msgid ""
+#~ "For the current product (template), this stock location will be used, "
+#~ "instead of the default one, as the source location for stock moves generated "
+#~ "by procurements"
+#~ msgstr ""
+#~ "Татан авалтаар биелэгдсэн агуулахын шилжилтийн анхны байрлал болгох "
+#~ "зорилгоор заяамал агуулахынх нь оронд энэ агуулахын байршил тухайн бараанд "
+#~ "ашиглагдана,"
+
+#~ msgid ""
+#~ "Scheduled date for the movement of the products or real date if the move is "
+#~ "done."
+#~ msgstr "Барааг шилжүүлэх төлөвлөгдсөн огноо эсвэл шилжилт хийгдсэн огноо"
+
+#~ msgid "Track line"
+#~ msgstr "Тээвэрлэлтийн мөр"
+
+#~ msgid "This account will be used to value the output stock"
+#~ msgstr "Энэ данс Агуулахын гаралтыг дүгнэхэд ашиглагдана"
+
+#~ msgid ""
+#~ "This journal will be used for the accounting move generated by stock move"
+#~ msgstr ""
+#~ "Энэ журнал нь Агуулахын шилжилтээр боловсруулагдсан санхүүгийн шилжилтэнд "
+#~ "ашиглагдана"
+
+#~ msgid "Calendar of Deliveries"
+#~ msgstr "Хүргэлтийн календар"
+
+#~ msgid "Track Incomming Lots"
+#~ msgstr "Ирэх тээвэрлэлтийн сери"
+
+#~ msgid "Latest Date of Inventory"
+#~ msgstr "Бүртгэлийн сүүлийн огноо"
+
+#~ msgid "Tracking Lot"
+#~ msgstr "Тээвэрлэлтийн сери"
+
+#~ msgid "Tracking/Serial"
+#~ msgstr "Тээвэрлэлт/Сериал"
+
+#~ msgid ""
+#~ "Tracking lot is the code that will be put on the logistical unit/pallet"
+#~ msgstr "цувралын замыг тодорхойлох нь хоёрдогч нэгжид байрлах код юм"
+
+#~ msgid "Tracking Number"
+#~ msgstr "Тээвэрлэлтийн дугаар"
+
+#~ msgid "Packing Done"
+#~ msgstr "Савласан"
+
+#~ msgid "Available Packing"
+#~ msgstr "Боломжит савлагаа"
+
+#~ msgid "Location Content (With children)"
+#~ msgstr "Байршилын багтаамж"
+
+#~ msgid "New Internal Packing"
+#~ msgstr "Дотоод шинэ багцлалт"
+
+#~ msgid "This account will be used to value the input stock"
+#~ msgstr "Энэ данс нь агуулахын оролтыг дүгнэхийн тулд ашиглагдана"
+
+#~ msgid "The packing has been successfully made !"
+#~ msgstr "Багцлалт амжилттай хийгдлээ"
+
+#~ msgid "Dest. Address"
+#~ msgstr "Дэст Хаяг"
+
+#~ msgid "Stock Tracking Lots"
+#~ msgstr "Агуулахын тээвэрлэлтийн сери"
+
+#~ msgid "Available Moves"
+#~ msgstr "Шилжих боломжтой"
+
+#~ msgid "Fill From Unreceived Products"
+#~ msgstr "Ирээгүй бараануудаас бэлтгэх"
+
+#~ msgid "New Periodical Inventory"
+#~ msgstr "Үечилсэн бүртгэл"
+
+#~ msgid "FIFO"
+#~ msgstr "Эхэнд орсон нь эхэнд гарна."
+
+#~ msgid "Tracking Lots"
+#~ msgstr "Тээвэрлэлтийн серүүд"
+
+#~ msgid "Tracking"
+#~ msgstr "Тээвэрлэлт"
+
+#~ msgid ""
+#~ "This account will be used, instead of the default one, to value input stock"
+#~ msgstr ""
+#~ "Агуулахын оролтыг дүгнэхийн тулд заяамалынх нь оронд энэ данс хэрэглэгдэнэ"
+
+#~ msgid ""
+#~ "This account will be used, instead of the default one, to value output stock"
+#~ msgstr ""
+#~ "Агуулахын гаралтыг дүгнэхийн тулд заяамалын оронд энэ данс  ашиглагдана"
+
+#~ msgid "Inventory line"
+#~ msgstr "Бүртгэлийн мөр"
+
+#~ msgid "stock.picking.move.wizard"
+#~ msgstr "Агуулахын барааг шилжүүлэх визард"
+
+#~ msgid "Packing result"
+#~ msgstr "Савлагааны үр дүн"
+
+#~ msgid "Make Picking"
+#~ msgstr "Агуулахын баримт хийх"
+
+#~ msgid "Dest. Move"
+#~ msgstr "Хүргэх хөдөлгөөн"
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index d3060e8fcdf..cab8b4e3fc8 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/i18n/ru.po
@@ -6,34 +6,58 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-17 18:49+0000\n"
+"POT-Creation-Date: 2010-10-18 17:47+0000\n"
+"PO-Revision-Date: 2010-10-18 07:52+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: 2010-10-18 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-10-20 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
-#: selection:stock.location,allocation_method:0
-msgid "LIFO"
-msgstr "LIFO"
+#: selection:stock.location,icon:0
+msgid "terp-rating-rated"
+msgstr ""
+
+#. module: stock
+#: field:product.product,track_outgoing:0
+msgid "Track Outgoing Lots"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_ups_upload
+msgid "Stock ups upload"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,chained_location_id:0
 msgid "Chained Location If Fixed"
 msgstr "Localizações encadeadas se afixado"
 
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Put in a new pack"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SAVE"
 msgstr ""
 
 #. module: stock
-#: model:stock.location,name:stock.stock_location_15
-msgid "Sub Products"
+#: field:stock.move.split.lines,action:0
+msgid "Action"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid ""
+"There is no journal defined '\\n                                'on the "
+"product category: \"%s\" (id: %d)"
 msgstr ""
 
 #. module: stock
@@ -47,10 +71,10 @@ msgid "Invalid model name in the action definition."
 msgstr "Недопустимое имя модели в определении действия"
 
 #. module: stock
-#: model:ir.module.module,shortdesc:stock.module_meta_information
-#: model:ir.ui.menu,name:stock.menu_stock_root
-msgid "Inventory Management"
-msgstr "Управление запасами"
+#: model:ir.actions.act_window,name:stock.action_stock_line_date
+#: model:ir.ui.menu,name:stock.menu_report_stock_line_date
+msgid "Last Product Inventories"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -59,8 +83,8 @@ msgstr ""
 
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
-msgid "Revision"
-msgstr "Ревизия"
+msgid "Revision Number"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -68,9 +92,29 @@ msgid "STOCK_MEDIA_FORWARD"
 msgstr ""
 
 #. module: stock
-#: rml:lot.location:0
-msgid "Total :"
-msgstr "Итого:"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
+"            product_qty = partial_data.get('product_qty',0.0)\n"
+"            move_product_qty[move.id] = product_qty\n"
+"            product_uom = partial_data.get('product_uom',False)\n"
+"            product_price = partial_data.get('product_price',0.0)\n"
+"            product_currency = partial_data.get('product_currency',False)\n"
+"            prodlot_ids[move.id] = partial_data.get('prodlot_id"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_inventory_control
+msgid "Inventory Control"
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,ref:0
+msgid ""
+"Internal reference number in case it differs from the manufacturer's serial "
+"number"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -78,76 +122,187 @@ msgid "STOCK_ZOOM_100"
 msgstr ""
 
 #. module: stock
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
+#: model:ir.actions.report.xml,name:stock.report_picking_list
+#: view:stock.picking:0
+msgid "Picking list"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+msgid "Outgoing Products delay"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: field:report.stock.inventory,product_qty:0
+#: field:report.stock.move,product_qty:0
+#: field:stock.inventory.line,product_qty:0
+#: field:stock.inventory.line.split,qty:0
+#: report:stock.inventory.move:0
+#: field:stock.move,product_qty:0
+#: field:stock.move.consume,product_qty:0
+#: field:stock.move.scrap,product_qty:0
+#: field:stock.move.split,qty:0
+#: field:stock.move.split.lines,quantity:0
+#: field:stock.move.split.lines.exist,quantity:0
+#: report:stock.picking.list:0
+#: field:stock.report.prodlots,qty:0
+#: field:stock.report.tracklots,name:0
+#: field:stock.split.into,quantity:0
+#, python-format
+msgid "Quantity"
+msgstr "Количество"
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,day:0
+msgid "Day"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+#: field:stock.inventory.line.split,product_uom:0
+#: view:stock.move:0
+#: field:stock.move.split,product_uom:0
+#: view:stock.picking:0
+#: view:stock.production.lot:0
 msgid "UoM"
 msgstr "Ед. изм."
 
-#. module: stock
-#: model:ir.actions.wizard,name:stock.return_picking
-msgid "Return packing"
-msgstr "Retornar embalagens"
-
 #. module: stock
 #: field:product.category,property_stock_journal:0
+#: view:report.stock.move:0
+#: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
 msgstr "Складская книга"
 
 #. module: stock
-#: wizard_view:stock.fill_inventory,init:0
-msgid "Fill Inventory for specific location"
+#: view:report.stock.move:0
+msgid "Incoming"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.report.xml,name:stock.report_picking_list
+#: help:product.category,property_stock_account_output_categ:0
+msgid ""
+"When doing real-time inventory valuation, counterpart Journal Items for all "
+"outgoing stock moves will be posted in this account. This is the default "
+"value for all products in this category, it can also directly be set on each "
+"product."
+msgstr ""
+
+#. module: stock
+#: help:stock.move,address_id:0
+msgid ""
+"Optional address where goods are to be delivered, specifically used for "
+"allotment"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/report/report_stock.py:0
+#, python-format
+msgid "You cannot delete any record!"
+msgstr "Вы не можете удалить любую запись!"
+
+#. module: stock
+#: field:product.template,property_stock_inventory:0
+msgid "Inventory Location"
+msgstr "Расположение склада"
+
+#. module: stock
+#: help:stock.tracking,serial:0
+msgid "Other reference or serial number"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,origin:0
 #: view:stock.picking:0
-#: field:stock.picking.move.wizard,picking_id:0
-msgid "Packing list"
-msgstr "Упаковочный лист"
+#: field:stock.picking,origin:0
+msgid "Origin"
+msgstr ""
 
 #. module: stock
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
-msgid "Amount"
-msgstr "Количество"
+#: model:ir.ui.menu,name:stock.menu_stock_configuration
+msgid "Configuration"
+msgstr "Настройки"
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Products Received"
-msgstr "Получено изделий"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree4
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree4
-msgid "Incoming Products"
-msgstr "Поступающие товары"
+#: view:stock.tracking:0
+msgid "Pack Identification"
+msgstr ""
 
 #. module: stock
+#: view:stock.move:0
 #: field:stock.picking,name:0
-#: field:stock.tracking,serial:0
+#: view:stock.production.lot:0
 msgid "Reference"
 msgstr "Ссылка"
 
 #. module: stock
-#: wizard_field:stock.invoice_onshipping,init,group:0
+#: help:stock.fill.inventory,set_stock_zero:0
+msgid ""
+"If checked, all product quantities will be set to zero to help ensure a real "
+"physical inventory is done"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split_lines
+msgid "Split lines"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Upstream Traceability"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You cannot cancel picking because stock move is in done state !"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: stock
+#: field:stock.invoice.onshipping,group:0
 msgid "Group by partner"
 msgstr "Группировать по партнерам"
 
 #. module: stock
-#: field:stock.picking,address_id:0
+#: help:stock.move,state:0
+msgid ""
+"When the stock move is created it is in the 'Draft' state.\n"
+" After that it is set to 'Confirmed' state.\n"
+" If stock is available state is set to 'Available'.\n"
+" When the picking is done the state is 'Done'.                               "
+"   \n"
+"The state is 'Waiting' if the move is waiting for another one."
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_res_partner
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,partner_id:0
+#: view:report.stock.move:0
+#: field:report.stock.move,partner_id:0
+#: view:stock.move:0
+#: field:stock.move,partner_id:0
+#: view:stock.picking:0
+#: field:stock.picking,partner_id:0
 msgid "Partner"
 msgstr "Партнер"
 
 #. module: stock
-#: help:product.product,track_incoming:0
-msgid "Force to use a Production Lot during receptions"
-msgstr "Принудительно назначать серийный номер партии при приёмке"
-
-#. module: stock
-#: field:stock.move,move_history_ids:0
-#: field:stock.move,move_history_ids2:0
-msgid "Move History"
-msgstr "Журнал перемещений"
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "No invoicing"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot
@@ -157,67 +312,132 @@ msgid "Production lot"
 msgstr "Партия изделий"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_NEW"
+#: help:stock.incoterms,code:0
+msgid "Code for Incoterms"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CANCEL"
+#: field:stock.tracking,move_ids:0
+msgid "Moves for this pack"
 msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Internal Location"
 msgstr "Внутреннее местоположение"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_PRINT"
+#: view:stock.inventory:0
+msgid "Confirm Inventory"
 msgstr ""
 
 #. module: stock
-#: rml:stock.picking.list:0
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,state:0
+#: view:report.stock.move:0
+#: field:report.stock.move,state:0
+#: view:stock.inventory:0
+#: field:stock.inventory,state:0
+#: field:stock.inventory.line,state:0
+#: view:stock.move:0
+#: field:stock.move,state:0
+#: view:stock.picking:0
+#: field:stock.picking,state:0
+#: report:stock.picking.list:0
 msgid "State"
 msgstr "Состояние"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-mail-forward"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,stock_real_value:0
 msgid "Real Stock Value"
 msgstr ""
 
+#. module: stock
+#: field:report.stock.move,day_diff2:0
+msgid "Lag (Days)"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_action_traceability
+msgid "Action traceability "
+msgstr ""
+
+#. module: stock
+#: field:stock.location,posy:0
+msgid "Shelves (Y)"
+msgstr "Полки (Y)"
+
 #. module: stock
 #: view:stock.move:0
 msgid "UOM"
 msgstr "Ед. изм."
 
 #. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
 #: selection:stock.move,state:0
+#: view:stock.picking:0
 #: selection:stock.picking,state:0
+#: view:stock.production.lot:0
 #: field:stock.production.lot,stock_available:0
 msgid "Available"
 msgstr "Доступно"
 
 #. module: stock
-#: view:stock.move:0
-msgid "Make Parcel"
-msgstr "Сформировать упаковку"
+#: view:stock.picking:0
+#: field:stock.picking,min_date:0
+msgid "Expected Date"
+msgstr ""
 
 #. module: stock
-#: wizard_view:stock.partial_picking,end2:0
-msgid "Packing result"
-msgstr "Сформировать упаковку"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_outgoing_product_board
+msgid "Outgoing Product"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_QUIT"
 msgstr ""
 
+#. module: stock
+#: field:report.stock.move,product_qty_in:0
+msgid "In Qty"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:0
+#, python-format
+msgid "No product in this location."
+msgstr ""
+
 #. module: stock
 #: field:stock.warehouse,lot_output_id:0
 msgid "Location Output"
 msgstr ""
 
+#. module: stock
+#: model:ir.actions.act_window,name:stock.split_into
+#: model:ir.model,name:stock.model_stock_split_into
+msgid "Split into"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Today"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,price_currency_id:0
+msgid "Currency for average price"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_TOP"
@@ -234,58 +454,103 @@ msgid "terp-hr"
 msgstr ""
 
 #. module: stock
+#: field:report.stock.inventory,location_type:0
 #: field:stock.location,usage:0
 msgid "Location Type"
 msgstr "Тип месторасположения"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-purchase"
+#: help:report.stock.move,type:0
+#: help:stock.picking,type:0
+msgid "Shipping type specify, goods coming in or going out."
 msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_DND"
+msgid "terp-stock_effects-object-colorize"
 msgstr ""
 
 #. module: stock
-#: rml:stock.picking.list:0
+#: selection:stock.location,icon:0
+msgid "STOCK_DELETE"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_move_labels
+msgid "Item Labels"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_move
+msgid "Moves Statistics"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Product Lots Filter"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+#: report:stock.picking.list:0
 msgid "["
 msgstr "["
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Products Sent"
-msgstr "Отправлено изделий"
+#: help:stock.production.lot,stock_available:0
+msgid ""
+"Current quantity of products with this Production Lot Number available in "
+"company warehouses"
+msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_GOTO_FIRST"
+#: field:stock.move,move_history_ids:0
+msgid "Move History (child moves)"
 msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree6
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree6
+#: field:stock.picking,move_lines:0
 msgid "Internal Moves"
 msgstr "Внутренние перемещения"
 
+#. module: stock
+#: field:stock.move,location_dest_id:0
+msgid "Destination Location"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You can not process picking without stock moves"
+msgstr ""
+
 #. module: stock
 #: field:stock.move,product_packaging:0
 msgid "Packaging"
 msgstr "Упаковка"
 
 #. module: stock
-#: rml:stock.picking.list:0
+#: report:stock.picking.list:0
 msgid "Order(Origin)"
 msgstr ""
 
 #. module: stock
-#: rml:lot.location:0
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
 msgid "Grand Total:"
 msgstr "Общий итог"
 
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_move_report
+#: model:ir.ui.menu,name:stock.menu_action_stock_move_report
+#: view:report.stock.move:0
+msgid "Moves Analysis"
+msgstr ""
+
 #. module: stock
 #: view:stock.location:0
 #: field:stock.location,comment:0
@@ -293,24 +558,38 @@ msgid "Additional Information"
 msgstr "Дополнительная информация"
 
 #. module: stock
-#: selection:stock.invoice_onshipping,init,type:0
-msgid "Customer Refund"
-msgstr "Возврат денег клиенту"
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Location / Product"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Reception"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FLOPPY"
 msgstr ""
 
+#. module: stock
+#: field:stock.tracking,serial:0
+msgid "Additional Reference"
+msgstr ""
+
 #. module: stock
 #: view:stock.production.lot.revision:0
 msgid "Production Lot Revisions"
 msgstr "Revisões do lote de producão"
 
 #. module: stock
-#: view:stock.location:0
-msgid "Stock location"
-msgstr "Местоположение запасов"
+#: help:product.product,track_outgoing:0
+msgid ""
+"Forces to specify a Production Lot for all moves containing this product and "
+"going to a Customer Location"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,complete_name:0
@@ -319,8 +598,8 @@ msgid "Location Name"
 msgstr "Название местоположения"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_UNINDENT"
+#: view:stock.inventory:0
+msgid "Posted Inventory"
 msgstr ""
 
 #. module: stock
@@ -330,21 +609,22 @@ msgid "Move Information"
 msgstr "Сведения о перемещении товаров"
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Unreceived Products"
-msgstr "Неполученные изделия"
+#: view:report.stock.move:0
+msgid "Outgoing"
+msgstr ""
 
 #. module: stock
-#: field:stock.inventory,state:0
-#: field:stock.move,state:0
-#: field:stock.picking,state:0
-msgid "Status"
-msgstr "Статус"
+#: selection:report.stock.move,month:0
+msgid "August"
+msgstr ""
 
 #. module: stock
-#: model:stock.location,name:stock.stock_location_customers
-msgid "Customers"
-msgstr "Клиенты"
+#: model:ir.actions.act_window,name:stock.action_tracking_form
+#: model:ir.model,name:stock.model_stock_tracking
+#: model:ir.ui.menu,name:stock.menu_action_tracking_form
+#: view:stock.tracking:0
+msgid "Packs"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -352,25 +632,18 @@ msgid "STOCK_UNDERLINE"
 msgstr ""
 
 #. module: stock
-#: view:stock.picking.move.wizard:0
-msgid "Move Lines"
-msgstr "Строки финансового документа"
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Продажи и закупки"
 
 #. module: stock
-#: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+#: selection:report.stock.move,month:0
+msgid "June"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "Bad Lot Assignation !"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "You are moving %.2f products but only %.2f available in this lot."
+#: selection:stock.location,icon:0
+msgid "terp-folder-blue"
 msgstr ""
 
 #. module: stock
@@ -381,29 +654,61 @@ msgstr "Местоположение снабжения"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_production_lot_form
 #: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: field:stock.inventory.line.split,line_exist_ids:0
+#: field:stock.inventory.line.split,line_ids:0
+#: field:stock.move.split,line_exist_ids:0
+#: field:stock.move.split,line_ids:0
 msgid "Production Lots"
 msgstr "Партии изделий"
 
 #. module: stock
-#: rml:stock.picking.list:0
+#: selection:stock.location,icon:0
+msgid "terp-project"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
 msgid "Recipient"
 msgstr "Получатель"
 
 #. module: stock
-#: model:ir.actions.wizard,name:stock.track_line
-msgid "Track line"
+#: model:ir.actions.act_window,name:stock.action_location_tree
+#: model:ir.ui.menu,name:stock.menu_action_location_tree
+msgid "Location Structure"
 msgstr ""
 
 #. module: stock
-#: field:stock.location,child_ids:0
-msgid "Contains"
-msgstr "Содержит"
+#: selection:report.stock.move,month:0
+msgid "October"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_line
+msgid "Inventory Line"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_BOLD"
 msgstr ""
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-personal+"
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_journal:0
+msgid ""
+"When doing real-time inventory valuation, this is the Accounting Journal in "
+"which entries will be automatically posted when stock moves are processed."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_partial_picking
+msgid "Process Picking"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-graph"
@@ -411,19 +716,35 @@ msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_PREFERENCES"
+msgid "STOCK_FIND_AND_REPLACE"
 msgstr ""
 
 #. module: stock
-#: rml:lot.location:0
-#: field:stock.inventory.line,product_qty:0
-#: field:stock.move,product_qty:0
-#: rml:stock.picking.list:0
-#: field:stock.report.prodlots,name:0
-msgid "Quantity"
-msgstr "Количество"
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Receptions"
+msgstr ""
 
 #. module: stock
+#: help:stock.inventory.line.split,use_exist:0
+#: help:stock.move.split,use_exist:0
+msgid ""
+"Check this option to select existing lots in the list below, otherwise you "
+"should enter new ones line by line."
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-dialog-close"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,move_dest_id:0
+msgid "Destination Move"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
 #: view:stock.picking:0
 msgid "Process Now"
 msgstr "Выполнить сейчас"
@@ -433,16 +754,17 @@ msgstr "Выполнить сейчас"
 msgid "Location Address"
 msgstr "Адрес местоположения"
 
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is consumed with"
+msgstr ""
+
 #. module: stock
 #: help:stock.move,prodlot_id:0
 msgid "Production lot is used to put a serial number on the production"
 msgstr "Партии изделий используются для присвоения серийных номеров"
 
-#. module: stock
-#: model:stock.location,name:stock.stock_location_13
-msgid "Stock Level 1"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_REWIND"
@@ -454,13 +776,23 @@ msgid "Location Input"
 msgstr ""
 
 #. module: stock
-#: view:res.partner:0
-msgid "Stock Properties"
-msgstr "Свойства запасов"
+#: selection:stock.location,icon:0
+msgid "terp-personal-"
+msgstr ""
 
 #. module: stock
-#: wizard_button:stock.partial_picking,init,split:0
-msgid "Make Picking"
+#: selection:stock.location,icon:0
+msgid "STOCK_CUT"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,date:0
+msgid "Date of Order"
+msgstr ""
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Periodical (manual)"
 msgstr ""
 
 #. module: stock
@@ -474,74 +806,139 @@ msgid "IT Suppliers"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_move_form3
-#: model:ir.ui.menu,name:stock.menu_action_move_form3
-msgid "Draft Moves"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
 msgstr ""
 
 #. module: stock
-#: field:report.stock.lines.date,product_id:0
-msgid "Product Id"
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Transit Location for Inter-Companies Transfers"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_NEW"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_splitinto.py:0
+#, python-format
+msgid ""
+"Total quantity after split exceeds the quantity to split ' \\n               "
+"                     'for this product: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future P&L"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree4
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree4
+#: view:stock.picking:0
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Scrap"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,child_ids:0
+msgid "Contains"
+msgstr "Содержит"
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-dolar"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+msgid "Incoming Products Delay"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Qty"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Stock Locations"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: field:stock.move,price_unit:0
+msgid "Unit Price"
+msgstr "Цена за ед."
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split_lines_exist
+msgid "Exist Split lines"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,date_expected:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Pack Search"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-gtk-jump-to-ltr"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,priority:0
+msgid "Urgent"
+msgstr "Срочно"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Journal"
+msgstr ""
+
+#. module: stock
+#: field:product.category,property_stock_variation:0
+msgid "Stock Variation Account"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Bad Lot Assignation !"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,location_id:0
+msgid ""
+"Keep empty if you produce at the location where the finished products are "
+"needed.Set a location if you produce at a fixed location. This can be a "
+"partner location if you subcontract the manufacturing operations."
 msgstr ""
 
 #. module: stock
 #: view:res.partner:0
-msgid "Sales & Purchases"
-msgstr "Продажи и закупки"
-
-#. module: stock
-#: selection:stock.invoice_onshipping,init,type:0
-msgid "Customer Invoice"
-msgstr "Счета клиентам"
-
-#. module: stock
-#: field:product.template,property_stock_inventory:0
-msgid "Inventory Location"
-msgstr "Расположение склада"
-
-#. module: stock
-#: help:product.product,track_production:0
-msgid "Force to use a Production Lot during production order"
-msgstr "Принудительно назначать серийны номера для партий изделий"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CUT"
+msgid "Inventory Properties"
 msgstr ""
 
 #. module: stock
-#: help:product.template,property_stock_inventory:0
-msgid ""
-"For the current product (template), this stock location will be used, "
-"instead of the default one, as the source location for stock moves generated "
-"when you do an inventory"
-msgstr ""
-
-#. module: stock
-#: help:product.category,property_stock_account_output_categ:0
-msgid "This account will be used to value the output stock"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ZOOM_FIT"
-msgstr ""
-
-#. module: stock
-#: help:product.category,property_stock_journal:0
-msgid ""
-"This journal will be used for the accounting move generated by stock move"
-msgstr ""
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_calendar_delivery
-#: model:ir.ui.menu,name:stock.menu_picking_calendar_delivery
-msgid "Calendar of Deliveries"
-msgstr ""
-
-#. module: stock
-#: field:product.product,track_incoming:0
-msgid "Track Incomming Lots"
+#: field:report.stock.move,day_diff:0
+msgid "Execution Lead Time (Days)"
 msgstr ""
 
 #. module: stock
@@ -555,8 +952,26 @@ msgid "STOCK_SAVE_AS"
 msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_report_prodlots
-msgid "Stock report by production lots"
+#: view:report.stock.move:0
+msgid "Month-1"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-stock_symbol-selection"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,active:0
+msgid ""
+"By unchecking the active field, you may hide a location without deleting it."
+msgstr ""
+
+#. module: stock
+#: help:stock.location,posx:0
+#: help:stock.location,posy:0
+#: help:stock.location,posz:0
+msgid "Optional localization details, for information purpose only"
 msgstr ""
 
 #. module: stock
@@ -565,6 +980,7 @@ msgid "Virtual Stock"
 msgstr "Виртуальные запасы"
 
 #. module: stock
+#: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "View"
 msgstr "Вид"
@@ -580,13 +996,13 @@ msgid "Left Parent"
 msgstr ""
 
 #. module: stock
-#: field:report.stock.lines.date,create_date:0
-msgid "Latest Date of Inventory"
+#: selection:stock.location,icon:0
+msgid "STOCK_INDEX"
 msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_INDEX"
+msgid "terp-stage"
 msgstr ""
 
 #. module: stock
@@ -595,21 +1011,19 @@ msgid "STOCK_GOTO_BOTTOM"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_form
-#: model:ir.ui.menu,name:stock.menu_action_picking_form
-msgid "New Reception Packing"
-msgstr ""
-
-#. module: stock
-#: wizard_field:stock.move.track,init,quantity:0
+#: field:stock.move.track,quantity:0
 msgid "Quantity per lot"
 msgstr "Кол-во в партии"
 
 #. module: stock
+#: model:ir.actions.act_window,name:stock.act_product_stock_move_open
 #: model:ir.actions.act_window,name:stock.action_move_form2
 #: model:ir.ui.menu,name:stock.menu_action_move_form2
+#: view:stock.inventory:0
 #: view:stock.move:0
 #: view:stock.picking:0
+#: view:stock.production.lot:0
+#: view:stock.tracking:0
 msgid "Stock Moves"
 msgstr "Движение запасов"
 
@@ -619,8 +1033,56 @@ msgid "Production Location"
 msgstr "Расположение производства"
 
 #. module: stock
-#: field:stock.move,tracking_id:0
-msgid "Tracking Lot"
+#: help:stock.picking,address_id:0
+msgid "Address of partner"
+msgstr ""
+
+#. module: stock
+#: model:res.company,overdue_msg:stock.res_company_tinyshop0
+msgid ""
+"\n"
+"Date: %(date)s\n"
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Please find in attachment a reminder of all your unpaid invoices, for a "
+"total amount due of:\n"
+"\n"
+"%(followup_amount).2f %(company_currency)s\n"
+"\n"
+"Thanks,\n"
+"--\n"
+"%(user_signature)s\n"
+"%(company_name)s\n"
+"        "
+msgstr ""
+
+#. module: stock
+#: help:stock.location,usage:0
+msgid ""
+"* Supplier Location: Virtual location representing the source location for "
+"products coming from your suppliers\n"
+"                       \n"
+"* View: Virtual location used to create a hierarchical structures for your "
+"warehouse, aggregating its child locations ; can't directly contain "
+"products\n"
+"                       \n"
+"* Internal Location: Physical locations inside your own warehouses,\n"
+"                       \n"
+"* Customer Location: Virtual location representing the destination location "
+"for products sent to your customers\n"
+"                       \n"
+"* Inventory: Virtual location serving as counterpart for inventory "
+"operations used to correct stock levels (Physical inventories)\n"
+"                       \n"
+"* Procurement: Virtual location serving as temporary counterpart for "
+"procurement operations when the source (supplier or production) is not known "
+"yet. This location should be empty when the procurement scheduler has "
+"finished running.\n"
+"                       \n"
+"* Production: Virtual counterpart location for production operations: this "
+"location consumes the raw material and produces finished products\n"
+"                      "
 msgstr ""
 
 #. module: stock
@@ -638,11 +1100,23 @@ msgstr "Автор"
 msgid "STOCK_UNDELETE"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Delivery Order"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_EXECUTE"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#, python-format
+msgid "No invoice were created"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_QUESTION"
@@ -653,51 +1127,102 @@ msgstr ""
 msgid "Manual Operation"
 msgstr "Ручное управление"
 
+#. module: stock
+#: view:stock.location:0
+#: view:stock.move:0
+msgid "Supplier"
+msgstr ""
+
 #. module: stock
 #: field:stock.picking,date_done:0
 msgid "Date Done"
 msgstr ""
 
 #. module: stock
-#: rml:stock.picking.list:0
+#: report:stock.picking.list:0
 msgid "Expected Shipping Date"
 msgstr ""
 
 #. module: stock
-#: rml:stock.picking.list:0
-msgid "Shipping Address :"
+#: selection:stock.location,icon:0
+msgid "terp-accessories-archiver-minus"
 msgstr ""
 
 #. module: stock
-#: view:stock.tracking:0
-msgid "Tracking/Serial"
-msgstr "Учетный / серийный"
+#: selection:report.stock.move,month:0
+msgid "March"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_inventory_line_split
+#: model:ir.model,name:stock.model_stock_inventory_line_split
+#: view:stock.inventory:0
+#: view:stock.inventory.line:0
+msgid "Split inventory lines"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Physical Inventory"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SELECT_FONT"
 msgstr ""
 
+#. module: stock
+#: help:stock.location,chained_company_id:0
+msgid ""
+"The company the Picking List containing the chained move will belong to "
+"(leave empty to use the default company determination rules"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PASTE"
 msgstr ""
 
+#. module: stock
+#: view:stock.move.split:0
+msgid "Lot number"
+msgstr ""
+
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
 msgid "Partner Locations"
 msgstr "Метоположения партнера"
 
 #. module: stock
-#: help:stock.move,tracking_id:0
+#: code:addons/stock/stock.py:0
+#, python-format
 msgid ""
-"Tracking lot is the code that will be put on the logistical unit/pallet"
-msgstr "Логистическая единица - это код, присваиваемый упаковке."
+"Do not Found Partial data of Stock Move Line :%s' %(move.id))\n"
+"                product_qty = partial_data.get('product_qty',0.0)\n"
+"                move_product_qty[move.id] = product_qty\n"
+"                product_uom = partial_data.get('product_uom',False)\n"
+"                product_price = partial_data.get('product_price',0.0)\n"
+"                product_currency = "
+"partial_data.get('product_currency',False)\n"
+"                prodlot_id = partial_data.get('prodlot_id"
+msgstr ""
 
 #. module: stock
-#: view:stock.tracking:0
-msgid "Tracking Number"
-msgstr "Номер учета движения"
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+msgid "Total quantity"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_ZOOM_FIT"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.move_consume
+#: view:stock.move.consume:0
+msgid "Consume Move"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_7
@@ -705,42 +1230,148 @@ msgid "European Customers"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-stock"
+#: help:stock.location,chained_delay:0
+msgid "Delay between original move and chained move in days"
 msgstr ""
 
 #. module: stock
-#: rml:stock.picking.list:0
+#: selection:stock.location,icon:0
+msgid "terp-calendar"
+msgstr ""
+
+#. module: stock
+#: view:stock.fill.inventory:0
+msgid "Import current product inventory from the following location"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_auto_packing:0
+msgid ""
+"This is used only if you select a chained location type.\n"
+"The 'Automatic Move' value will create a stock move after the current one "
+"that will be validated automatically. With 'Manual Operation', the stock "
+"move has to be validated by a worker. With 'Automatic No Step Added', the "
+"location is replaced in the original move."
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Downstream Traceability"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
 msgid "Packing List:"
 msgstr "Упаковочный перечень"
 
+#. module: stock
+#: help:product.template,property_stock_production:0
+msgid ""
+"For the current product, this stock location will be used, instead of the "
+"default one, as the source location for stock moves generated by production "
+"orders"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,price_unit:0
+msgid ""
+"Technical field used to record the product cost set by the user during a "
+"picking confirmation (when average price costing method is used)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is in draft state."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid ""
+"There is no stock output account defined ' \\n                               "
+"             'for this product: \"%s\" (id: %d)"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_RECORD"
 msgstr ""
 
+#. module: stock
+#: field:stock.location,chained_auto_packing:0
+msgid "Chaining Type"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "To be refunded/invoiced"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_shop0
+msgid "Shop 1"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.inventory,value:0
+#: field:report.stock.move,value:0
+msgid "Total Value"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.standard.price:0
+#: view:stock.fill.inventory:0
+#: view:stock.inventory.merge:0
+#: view:stock.invoice.onshipping:0
+#: view:stock.location.product:0
+#: view:stock.move:0
+#: view:stock.move.track:0
+#: view:stock.picking:0
+#: view:stock.split.into:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Ready"
+msgstr ""
+
 #. module: stock
 #: view:stock.picking:0
 msgid "Calendar View"
 msgstr "Вид календаря"
 
 #. module: stock
-#: wizard_field:stock.location.products,init,from_date:0
+#: view:stock.picking:0
+msgid "Additional Info"
+msgstr ""
+
+#. module: stock
+#: report:stock.inventory.move:0
+msgid "Stock Inventory"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_YES"
+msgstr ""
+
+#. module: stock
+#: field:stock.location.product,from_date:0
 msgid "From"
 msgstr "От"
 
 #. module: stock
-#: rml:stock.picking.list:0
-msgid "weight"
-msgstr "Вес"
-
-#. module: stock
-#: rml:stock.picking.list:0
-msgid "Non Assigned Products:"
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "You may only return pickings that are Confirmed, Available or Done!"
 msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
+#: field:stock.picking,invoice_state:0
 msgid "Invoice Control"
 msgstr "Управление счетами"
 
@@ -751,28 +1382,34 @@ msgstr "Ревизии партий изделий"
 
 #. module: stock
 #: view:stock.picking:0
-msgid "Packing Done"
+msgid "Internal Picking List"
 msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Waiting"
 msgstr "В ожидании"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree2
-#: model:ir.actions.act_window,name:stock.action_picking_tree7
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree7
-#: model:ir.ui.menu,name:stock.menu_picking_waiting
-msgid "Available Packing"
+#: view:stock.move:0
+#: selection:stock.move.split.lines,action:0
+#: view:stock.picking:0
+msgid "Split"
+msgstr "Разделить"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Search Stock Picking"
 msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_warehouse
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr "Склад"
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Company is not specified in Location"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -780,7 +1417,8 @@ msgid "terp-report"
 msgstr ""
 
 #. module: stock
-#: wizard_field:stock.invoice_onshipping,init,type:0
+#: view:report.stock.move:0
+#: field:stock.partial.move,type:0
 msgid "Type"
 msgstr "Тип"
 
@@ -789,21 +1427,34 @@ msgstr "Тип"
 msgid "Generic IT Suppliers"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.report.xml,name:stock.report_location_overview_all
-msgid "Location Content (With children)"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FILE"
 msgstr ""
 
+#. module: stock
+#: field:stock.inventory,date:0
+#: field:stock.move,create_date:0
+#: field:stock.production.lot,date:0
+#: field:stock.tracking,date:0
+msgid "Creation Date"
+msgstr ""
+
 #. module: stock
 #: field:report.stock.lines.date,id:0
 msgid "Inventory Line Id"
 msgstr ""
 
+#. module: stock
+#: help:stock.location,address_id:0
+msgid "Address of  customer or supplier."
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-gdu-smart-failing"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_EDIT"
@@ -815,9 +1466,8 @@ msgid "STOCK_CONNECT"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_all
-#: model:ir.ui.menu,name:stock.menu_action_picking_all
-#: wizard_field:stock.picking.make,init,pickings:0
+#: view:report.stock.move:0
+#: field:report.stock.move,picking_id:0
 msgid "Packing"
 msgstr "Упаковка"
 
@@ -827,6 +1477,7 @@ msgid "STOCK_GO_DOWN"
 msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
 #: selection:stock.location,usage:0
 msgid "Customer Location"
@@ -838,9 +1489,19 @@ msgid "STOCK_OK"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree9
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree9
-msgid "New Internal Packing"
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-emblem-important"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_replacement
+msgid "Stock Replacement"
 msgstr ""
 
 #. module: stock
@@ -849,20 +1510,31 @@ msgid "General Informations"
 msgstr "Обзая информация"
 
 #. module: stock
-#: selection:stock.location,chained_location_type:0
-msgid "None"
-msgstr "Ничего"
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Неправильный XML для просмотра архитектуры!"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action3
-#: model:ir.actions.wizard,name:stock.action2
-#: model:ir.actions.wizard,name:stock.action_lot4
+#: view:stock.tracking:0
 msgid "Downstream traceability"
 msgstr ""
 
 #. module: stock
-#: model:stock.location,name:stock.stock_location_14
-msgid "Finished products"
+#: model:stock.location,name:stock.stock_location_company
+msgid "OpenERP S.A."
+msgstr ""
+
+#. module: stock
+#: help:stock.incoterms,active:0
+msgid ""
+"By unchecking the active field, you may hide an INCOTERM without deleting it."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+#: field:stock.picking,date:0
+msgid "Order Date"
 msgstr ""
 
 #. module: stock
@@ -871,58 +1543,142 @@ msgid "Parent Location"
 msgstr ""
 
 #. module: stock
-#: field:stock.inventory,date:0
-msgid "Date create"
-msgstr "Дата создания"
-
-#. module: stock
-#: wizard_button:inventory.merge.stock.zero,init,merge:0
-msgid "Set to Zero"
+#: help:stock.picking,state:0
+msgid ""
+"* Draft: not confirmed yet and will not be scheduled until confirmed\n"
+"* Confirmed: still waiting for the availability of products\n"
+"* Available: products reserved, simply waiting for confirmation.\n"
+"* Waiting: waiting for another move to proceed before it becomes "
+"automatically available (e.g. in Make-To-Order flows)\n"
+"* Done: has been processed, can't be modified or cancelled anymore\n"
+"* Cancelled: has been cancelled, can't be confirmed anymore"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.act_product_stock_move_open
-msgid "All Stock Moves"
+#: help:stock.location,company_id:0
+msgid "Let this field empty if this location is shared between all companies"
 msgstr ""
 
 #. module: stock
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Please provide a positive quantity to scrap!"
+msgstr ""
 
 #. module: stock
+#: field:stock.location,chained_delay:0
+msgid "Chaining Lead Time"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#, python-format
+msgid "Cannot deliver products which are already delivered !"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_UNINDENT"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_invoice_onshipping
+msgid "Stock Invoice Onshipping"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-face-plain"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_supplier:0
 #: selection:stock.location,usage:0
 msgid "Supplier Location"
 msgstr "Местоположение поставщика"
 
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "were scrapped"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_FIND"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Partial"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "September"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_HELP"
 msgstr ""
 
 #. module: stock
-#: selection:stock.move,priority:0
-msgid "Urgent"
-msgstr "Срочно"
-
-#. module: stock
-#: help:product.category,property_stock_account_input_categ:0
-msgid "This account will be used to value the input stock"
-msgstr "Данный счет будет использован для оценки входящих запасов"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_INFO"
+#: help:stock.picking,backorder_id:0
+msgid ""
+"If this picking was split this field links to the picking that contains the "
+"other part that has been processed already."
 msgstr ""
 
 #. module: stock
-#: field:stock.move,date:0
-#: field:stock.tracking,date:0
-msgid "Date Created"
-msgstr "Дата создания"
+#: model:ir.model,name:stock.model_report_stock_inventory
+msgid "Stock Statistics"
+msgstr ""
 
 #. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#, python-format
+msgid "Currency"
+msgstr ""
+
+#. module: stock
+#: field:product.product,track_production:0
+msgid "Track Manufacturing Lots"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_inventory_merge.py:0
+#, python-format
+msgid ""
+"Please select multiple physical inventories to merge in the list view."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid ""
+"Variation Account is not specified for Product Category: %s' % "
+"(product_obj.categ_id.name)))\n"
+"        move_ids = []\n"
+"        loc_ids = location_obj.search(cr, uid,[('usage','=','internal"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_UNDO"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-gnome-cpu-frequency-applet+"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,type:0
+#: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Sending Goods"
 msgstr "Отправка товаров"
@@ -932,46 +1688,123 @@ msgstr "Отправка товаров"
 msgid "Cancel Availability"
 msgstr "Отменить доступность"
 
+#. module: stock
+#: help:stock.move,date_expected:0
+msgid "Scheduled date for the processing of this move"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-gtk-media-pause"
+msgstr ""
+
 #. module: stock
 #: field:stock.inventory,move_ids:0
 msgid "Created Moves"
 msgstr "Созданные перемещения товаров"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-stock_format-scientific"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GO_BACK"
 msgstr ""
 
+#. module: stock
+#: model:stock.location,name:stock.stock_location_14
+msgid "Shelf 2"
+msgstr ""
+
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "To Be Invoiced"
 msgstr ""
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_PRINT"
+msgstr ""
+
+#. module: stock
+#: field:stock.report.tracklots,tracking_id:0
+msgid "Tracking lot"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-go-today"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid ""
+"There is no stock input account defined ' \\n                                "
+"            'for this product: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Back Orders"
+msgstr ""
+
 #. module: stock
 #: view:product.product:0
 #: view:product.template:0
 msgid "Counter-Part Locations Properties"
 msgstr ""
 
+#. module: stock
+#: view:stock.location:0
+msgid "Localization"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Delivered Qty"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.track_line
+#: view:stock.inventory.line.split:0
+#: view:stock.move.split:0
+msgid "Split in lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Production Lot Numbers"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_FILL"
 msgstr ""
 
 #. module: stock
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,date:0
+#: field:report.stock.move,date:0
+#: view:stock.inventory:0
+#: report:stock.inventory.move:0
 #: view:stock.move:0
-#: field:stock.move,date_planned:0
+#: field:stock.move,date:0
+#: field:stock.partial.move,date:0
+#: field:stock.partial.picking,date:0
+#: view:stock.picking:0
 msgid "Date"
 msgstr "Дата"
 
 #. module: stock
-#: view:product.product:0
-msgid "Stocks"
-msgstr "Запасы"
-
-#. module: stock
-#: field:stock.location,allocation_method:0
-msgid "Allocation Method"
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Extended Filters..."
 msgstr ""
 
 #. module: stock
@@ -979,6 +1812,11 @@ msgstr ""
 msgid "terp-administration"
 msgstr ""
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_CANCEL"
+msgstr ""
+
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
 msgid "Location Stock"
@@ -990,20 +1828,24 @@ msgid "STOCK_APPLY"
 msgstr ""
 
 #. module: stock
-#: wizard_view:stock.partial_picking,end2:0
-msgid "The packing has been successfully made !"
+#: code:addons/stock/wizard/stock_inventory_merge.py:0
+#, python-format
+msgid "Merging is only allowed on draft inventories."
 msgstr ""
 
 #. module: stock
-#: field:stock.move,address_id:0
-#: field:stock.picking.move.wizard,address_id:0
-msgid "Dest. Address"
-msgstr "Адрес назначения"
+#: selection:stock.location,icon:0
+msgid "terp-gtk-go-back-rtl"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form
-#: model:ir.ui.menu,name:stock.menu_action_inventory_form
-msgid "Periodical Inventory"
+#: model:ir.ui.menu,name:stock.menu_dashboard_stock
+msgid "Dashboard"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_track
+msgid "Track moves"
 msgstr ""
 
 #. module: stock
@@ -1017,39 +1859,65 @@ msgid "STOCK_STRIKETHROUGH"
 msgstr ""
 
 #. module: stock
-#: rml:lot.stock.overview_all:0
 #: field:stock.incoterms,code:0
 msgid "Code"
 msgstr "Код"
 
+#. module: stock
+#: view:stock.inventory.line.split:0
+msgid "Lots Number"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+msgid "Warehouse Dashboard"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "terp-partner"
+msgid "terp-mail-"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-#: model:ir.ui.menu,name:stock.menu_action_inventory_form_draft
-msgid "Draft Periodical Inventories"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You can not remove a lot line !"
 msgstr ""
 
 #. module: stock
-#: wizard_button:inventory.merge,init,end:0
-#: wizard_button:inventory.merge.stock.zero,init,end:0
-#: wizard_button:stock.fill_inventory,init,end:0
-#: wizard_button:stock.invoice_onshipping,init,end:0
-#: wizard_button:stock.location.products,init,end:0
+#: model:ir.model,name:stock.model_stock_move_scrap
 #: view:stock.move:0
-#: wizard_button:stock.move.split,init,end:0
-#: wizard_button:stock.move.track,init,end:0
-#: wizard_button:stock.partial_picking,init,end:0
+#: view:stock.move.scrap:0
+#: view:stock.picking:0
+msgid "Scrap Products"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_PREFERENCES"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line.split:0
+#: view:stock.move.consume:0
+#: view:stock.move.scrap:0
+#: view:stock.move.split:0
 #: view:stock.picking:0
-#: wizard_button:stock.picking.make,init,end:0
-#: view:stock.picking.move.wizard:0
-#: wizard_button:stock.return.picking,init,end:0
 msgid "Cancel"
 msgstr "Отменить"
 
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_stock_return_picking
+#: model:ir.model,name:stock.model_stock_return_picking
+msgid "Return Picking"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_location_overview_all
+msgid "Inventory (with child locations)"
+msgstr ""
+
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
@@ -1057,18 +1925,26 @@ msgid "Split in production lots"
 msgstr "Разделить партию по отдельным серийным номерам"
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_inventory
-#: field:stock.inventory,name:0
-#: field:stock.inventory.line,inventory_id:0
-#: selection:stock.location,usage:0
-msgid "Inventory"
-msgstr "Инвентаризация"
+#: model:ir.model,name:stock.model_stock_inventory_merge
+msgid "Merge Inventory"
+msgstr ""
 
 #. module: stock
 #: view:product.template:0
 msgid "Information"
 msgstr "Информация"
 
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Shipping Address :"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "Provide the quantities of the returned products."
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MISSING_IMAGE"
@@ -1076,22 +1952,32 @@ msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_SPELL_CHECK"
+msgid "STOCK_REMOVE"
 msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_tracking
-msgid "Stock Tracking Lots"
-msgstr "Отслеживание партий"
+#: selection:stock.location,icon:0
+msgid "terp-call-start"
+msgstr ""
 
 #. module: stock
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
-#: field:stock.move,price_unit:0
-msgid "Unit Price"
-msgstr "Цена за ед."
+#: view:stock.change.standard.price:0
+msgid "Cost Price"
+msgstr ""
 
 #. module: stock
+#: view:product.product:0
+#: field:product.product,valuation:0
+msgid "Inventory Valuation"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
 #: view:stock.picking:0
 msgid "Process Later"
 msgstr ""
@@ -1103,6 +1989,11 @@ msgid ""
 "location for goods you receive from the current partner"
 msgstr ""
 
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+msgid "Not from Picking"
+msgstr ""
+
 #. module: stock
 #: field:stock.warehouse,partner_address_id:0
 msgid "Owner Address"
@@ -1114,15 +2005,54 @@ msgid "Right Parent"
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,origin:0
-msgid "Origin Reference"
+#: selection:stock.location,icon:0
+msgid "STOCK_JUSTIFY_LEFT"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_move_form4
-#: model:ir.ui.menu,name:stock.menu_action_move_form4
-msgid "Available Moves"
-msgstr "Доступные перемещения товаров"
+#: field:report.stock.move,day_diff1:0
+msgid "Planned Lead Time (Days)"
+msgstr ""
+
+#. module: stock
+#: field:stock.change.standard.price,new_price:0
+msgid "Price"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Search Inventory"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_report_tracklots
+msgid "Stock report by tracking lots"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"There is no stock input account defined for this product or its category: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "January"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot,ref:0
+msgid "Internal Reference"
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,prefix:0
+msgid ""
+"Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL "
+"[INT_REF]"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1130,269 +2060,23 @@ msgid "STOCK_HARDDISK"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.act_relate_picking
-msgid "Related Picking"
+#: model:ir.actions.act_window,name:stock.action_view_stock_fill_inventory
+#: model:ir.model,name:stock.model_stock_fill_inventory
+#: view:stock.fill.inventory:0
+msgid "Import Inventory"
 msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,name:0
 #: field:stock.move,name:0
-#: field:stock.picking.move.wizard,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
 msgstr "Название"
 
 #. module: stock
-#: view:stock.inventory.line:0
-msgid "Stock Inventory Lines"
-msgstr ""
-
-#. module: stock
-#: wizard_button:stock.location.products,init,open:0
-msgid "Open Products"
-msgstr "Открыть товары"
-
-#. module: stock
-#: rml:stock.picking.list:0
-msgid "]"
-msgstr "]"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Input Packing List"
-msgstr "Lista de embalagens entradas"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_picking
-#: field:stock.move,picking_id:0
-msgid "Packing List"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_COPY"
-msgstr ""
-
-#. module: stock
-#: selection:stock.invoice_onshipping,init,type:0
-msgid "Supplier Refund"
-msgstr "Возврат средств от поставщика"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move
-msgid "Stock Move"
-msgstr "Движение запасов"
-
-#. module: stock
-#: field:product.category,property_stock_account_output_categ:0
-#: field:product.template,property_stock_account_output:0
-msgid "Stock Output Account"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic No Step Added"
-msgstr ""
-
-#. module: stock
-#: wizard_view:stock.location.products,init:0
-msgid "Stock Location Analysis"
-msgstr "Анализ местоположения запасов"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CDROM"
-msgstr ""
-
-#. module: stock
-#: selection:stock.picking,invoice_state:0
-msgid "Not from Packing"
-msgstr ""
-
-#. module: stock
-#: view:stock.location:0
-msgid "Chained Locations"
-msgstr "Localizações encadeadas"
-
-#. module: stock
-#: model:stock.location,name:stock.location_inventory
-msgid "Inventory loss"
-msgstr ""
-
-#. module: stock
-#: field:stock.production.lot,ref:0
-msgid "Internal Ref"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_REFRESH"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_STOP"
-msgstr ""
-
-#. module: stock
-#: wizard_view:stock.move.track,init:0
-msgid "Tracking a move"
-msgstr "Учет движения"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_FIND_AND_REPLACE"
-msgstr ""
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Validate"
-msgstr "Проверить"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_WARNING"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ZOOM_IN"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_CONVERT"
-msgstr ""
-
-#. module: stock
-#: field:stock.move,note:0
-#: view:stock.picking:0
-#: field:stock.picking,note:0
-msgid "Notes"
-msgstr "Примечания"
-
-#. module: stock
-#: field:stock.picking,move_lines:0
-#: field:stock.picking.move.wizard,move_ids:0
-msgid "Move lines"
-msgstr ""
-
-#. module: stock
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
-msgid "Value"
-msgstr "Значение"
-
-#. module: stock
-#: field:stock.picking,type:0
-msgid "Shipping Type"
-msgstr "Тип поставки"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.act_product_location_open
-msgid "Products"
-msgstr "Продукция"
-
-#. module: stock
-#: field:stock.picking,move_type:0
-msgid "Delivery Method"
-msgstr "Метод доставки"
-
-#. module: stock
-#: model:ir.actions.wizard,name:stock.partial_picking
-msgid "Partial packing"
-msgstr "Упаковка по частям"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-calendar"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_ITALIC"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_YES"
-msgstr ""
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.act_stock_picking_move_wizard
-msgid "Fill From Unreceived Products"
-msgstr "Дополнить из неполученной продукции"
-
-#. module: stock
-#: field:stock.move,move_dest_id:0
-msgid "Dest. Move"
-msgstr ""
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_new
-#: model:ir.ui.menu,name:stock.menu_action_inventory_form_new
-msgid "New Periodical Inventory"
-msgstr ""
-
-#. module: stock
-#: field:stock.production.lot,revisions:0
-msgid "Revisions"
-msgstr "Ревизии"
-
-#. module: stock
-#: selection:stock.location,allocation_method:0
-msgid "FIFO"
-msgstr "FIFO"
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree2_delivery
-#: model:ir.ui.menu,name:stock.menu_picking_waiting_delivery
-msgid "Delivery Orders to Process"
-msgstr ""
-
-#. module: stock
-#: field:stock.move,priority:0
-msgid "Priority"
-msgstr "Приоритет"
-
-#. module: stock
-#: wizard_field:inventory.merge.stock.zero,init,location_id:0
-#: model:ir.model,name:stock.model_stock_location
-#: rml:lot.location:0
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
-#: wizard_field:stock.fill_inventory,init,location_id:0
-#: field:stock.inventory.line,location_id:0
-#: field:stock.picking,location_id:0
-#: rml:stock.picking.list:0
-#: field:stock.report.prodlots,location_id:0
-msgid "Location"
-msgstr "Местоположение"
-
-#. module: stock
-#: field:stock.picking,invoice_state:0
-msgid "Invoice Status"
-msgstr "Статус счета"
-
-#. module: stock
-#: rml:lot.location:0
-msgid "Units"
-msgstr ""
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_JUSTIFY_LEFT"
-msgstr ""
-
-#. module: stock
-#: view:stock.inventory:0
-msgid "Cancel Inventory"
-msgstr ""
-
-#. module: stock
-#: model:ir.actions.report.xml,name:stock.report_product_history
-msgid "Future Stock Forecast"
-msgstr ""
+#: view:product.product:0
+msgid "Stocks"
+msgstr "Запасы"
 
 #. module: stock
 #: model:ir.module.module,description:stock.module_meta_information
@@ -1409,9 +2093,519 @@ msgid ""
 "* Bar code supported\n"
 "* Rapid detection of mistakes through double entry system\n"
 "* Traceability (upstream/downstream, production lots, serial number, ...)\n"
+"* Dashboard for warehouse that includes:\n"
+"    * Products to receive in delay (date < = today)\n"
+"    * Procurement in exception\n"
+"    * Graph : Number of Receive products vs planned (bar graph on week par "
+"day)\n"
+"    * Graph : Number of Delivery products vs planned (bar graph on week par "
+"day)\n"
 "    "
 msgstr ""
 
+#. module: stock
+#: help:product.template,property_stock_inventory:0
+msgid ""
+"For the current product, this stock location will be used, instead of the "
+"default one, as the source location for stock moves generated when you do an "
+"inventory"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Stockable"
+msgstr ""
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Real Time (automated)"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,tracking_id:0
+msgid "Logistical shipping unit: pallet, box, pack ..."
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-locked"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.standard.price:0
+msgid "_Apply"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+#: report:stock.picking.list:0
+msgid "]"
+msgstr "]"
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+msgid "Total value"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-personal"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_journal_id:0
+msgid ""
+"Inventory Journal in which the chained move will be written, if the Chaining "
+"Type is not Transparent (no journal is used if left empty)"
+msgstr ""
+
+#. module: stock
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_incoming_product_board
+msgid "Incoming Product"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Creation"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-accessories-archiver"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#, python-format
+msgid "Cost"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_COPY"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
+#: model:ir.ui.menu,name:stock.menu_warehouse_config
+msgid "Warehouse Management"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move
+msgid "Stock Move"
+msgstr "Движение запасов"
+
+#. module: stock
+#: field:product.category,property_stock_account_output_categ:0
+#: field:product.template,property_stock_account_output:0
+#: field:stock.change.standard.price,stock_account_output:0
+msgid "Stock Output Account"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic No Step Added"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Product "
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "Stock Location Analysis"
+msgstr "Анализ местоположения запасов"
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_CDROM"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,date:0
+msgid ""
+"Move date: scheduled date until move is done, then date of actual move "
+"processing"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.lines.date,date:0
+msgid "Latest Inventory Date"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+#: view:stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+#: view:stock.production.lot:0
+msgid "Group By..."
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Chained Locations"
+msgstr "Localizações encadeadas"
+
+#. module: stock
+#: model:stock.location,name:stock.location_inventory
+msgid "Inventory loss"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Document"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Input Picking List"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_REFRESH"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Products: "
+msgstr ""
+
+#. module: stock
+#: help:product.product,track_production:0
+msgid ""
+"Forces to specify a Production Lot for all moves containing this product and "
+"generated by a Manufacturing Order"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_STOP"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.track_line_old
+#: view:stock.move.track:0
+msgid "Tracking a move"
+msgstr "Учет движения"
+
+#. module: stock
+#: view:product.product:0
+msgid "Update"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_journal_form
+#: model:ir.ui.menu,name:stock.menu_action_stock_journal_form
+msgid "Stock Journals"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-gtk-go-back-ltr"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,type:0
+msgid "Others"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Could not find any difference between standard price and new price!"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_scrapped
+#: field:stock.move,scrapped:0
+msgid "Scrapped"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Products "
+msgstr ""
+
+#. module: stock
+#: field:product.product,track_incoming:0
+msgid "Track Incoming Lots"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_DIALOG_WARNING"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-mail-replied"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+msgid "Warehouse board"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_inventory_form
+#: model:ir.ui.menu,name:stock.menu_action_inventory_form
+msgid "Physical Inventories"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_CONVERT"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,note:0
+#: view:stock.picking:0
+#: field:stock.picking,note:0
+msgid "Notes"
+msgstr "Примечания"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Value"
+msgstr "Значение"
+
+#. module: stock
+#: field:report.stock.move,type:0
+#: field:stock.location,chained_picking_type:0
+#: field:stock.picking,type:0
+msgid "Shipping Type"
+msgstr "Тип поставки"
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You can only delete draft moves."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: model:ir.actions.act_window,name:stock.act_product_location_open
+#: model:ir.ui.menu,name:stock.menu_stock_products_menu
+#: view:stock.inventory:0
+#: view:stock.picking:0
+#, python-format
+msgid "Products"
+msgstr "Продукция"
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "None"
+msgstr "Ничего"
+
+#. module: stock
+#: view:stock.change.standard.price:0
+msgid "Change Price"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,move_type:0
+msgid "Delivery Method"
+msgstr "Метод доставки"
+
+#. module: stock
+#: help:report.stock.move,location_dest_id:0
+#: help:stock.move,location_dest_id:0
+#: help:stock.picking,location_dest_id:0
+msgid "Location where the system will stock the finished products."
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_variation:0
+msgid ""
+"When real-time inventory valuation is enabled on a product, this account "
+"will hold the current value of the products."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"There is no stock output account defined for this product or its category: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-partner"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_ITALIC"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Operation forbidden"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-stock"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,min_date:0
+msgid "Expected date for the picking to be processed"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "P&L Qty"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-folder-green"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+#: field:stock.production.lot,revisions:0
+msgid "Revisions"
+msgstr "Ревизии"
+
+#. module: stock
+#: help:product.product,valuation:0
+msgid ""
+"If real-time valuation is enabled for a product, the system will "
+"automatically write journal entries corresponding to stock moves.The "
+"inventory variation account set on the product category will represent the "
+"current inventory value, and the stock input and stock output account will "
+"hold the counterpart moves for incoming and outgoing products."
+msgstr ""
+
+#. module: stock
+#: help:report.stock.move,location_id:0
+#: help:stock.move,location_id:0
+msgid ""
+"Sets a location if you produce at a fixed location. This can be a partner "
+"location if you subcontract the manufacturing operations."
+msgstr ""
+
+#. module: stock
+#: view:stock.invoice.onshipping:0
+msgid "Create"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Dates"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,priority:0
+msgid "Priority"
+msgstr "Приоритет"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Source"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#: model:ir.actions.report.xml,name:stock.report_location_overview
+#: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
+#: model:ir.model,name:stock.model_stock_inventory
+#: selection:report.stock.inventory,location_type:0
+#: field:stock.inventory.line,inventory_id:0
+#: report:stock.inventory.move:0
+#: selection:stock.location,usage:0
+#, python-format
+msgid "Inventory"
+msgstr "Инвентаризация"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_picking
+#: field:stock.move,picking_id:0
+msgid "Picking List"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"The combination of serial number and internal reference must be unique !"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#, python-format
+msgid "Currency in which Unit Cost is expressed"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_ups
+msgid "Stock ups"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Cancel Inventory"
+msgstr ""
+
+#. module: stock
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines.exist,name:0
+msgid "Tracking serial"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/report/report_stock.py:0
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_replacement_result
+msgid "Stock Replacement result"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,chained_location_type:0
 msgid "Fixed Location"
@@ -1426,15 +2620,39 @@ msgstr ""
 "символов !"
 
 #. module: stock
-#: field:stock.picking,min_date:0
-msgid "Planned Date"
+#: selection:stock.location,icon:0
+msgid "terp-stock_align_left_24"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree
-msgid "Outgoing Products"
-msgstr "Изделия к отправке"
+#: selection:stock.location,icon:0
+msgid "terp-folder-orange"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-accessories-archiver+"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-purchase"
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,name:0
+msgid "Unique serial number, will be displayed as: PREFIX/SERIAL [INT_REF]"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "July"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Consumable"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1442,17 +2660,22 @@ msgid "STOCK_COLOR_PICKER"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.report.xml,name:stock.report_lot_location
-msgid "Lots by location"
-msgstr "Партии по местоположениям"
+#: selection:stock.location,icon:0
+msgid "STOCK_DND"
+msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DELETE"
+#: model:ir.actions.report.xml,name:stock.report_product_history
+msgid "Stock Level Forecast"
 msgstr ""
 
 #. module: stock
 #: model:account.journal,name:stock.stock_journal
+#: model:ir.model,name:stock.model_stock_journal
+#: field:report.stock.move,stock_journal:0
+#: view:stock.journal:0
+#: field:stock.journal,name:0
+#: field:stock.picking,stock_journal_id:0
 msgid "Stock Journal"
 msgstr ""
 
@@ -1462,39 +2685,60 @@ msgid "STOCK_CLEAR"
 msgstr ""
 
 #. module: stock
-#: field:stock.production.lot,date:0
-msgid "Created Date"
-msgstr "Дата создания"
-
-#. module: stock
+#: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Procurement"
 msgstr "Снабжение"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-folder-yellow"
+msgstr ""
+
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Maxtor Suppliers"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/wizard/stock_change_standard_price.py:0
+#, python-format
+msgid "Active ID is not set in Context"
+msgstr ""
+
 #. module: stock
 #: view:stock.picking:0
 msgid "Force Availability"
 msgstr "Сделать доступным принудительно"
 
 #. module: stock
-#: wizard_view:stock.location.products,init:0
+#: model:ir.actions.act_window,name:stock.move_scrap
+#: view:stock.move.scrap:0
+msgid "Scrap Move"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_reception_picking_move
+#: model:ir.ui.menu,name:stock.menu_action_pdct_in
+#: view:stock.move:0
+msgid "Receive Products"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_out_picking_move
+#: model:ir.actions.act_window,name:stock.action_partial_move
+#: model:ir.ui.menu,name:stock.menu_action_pdct_out
+msgid "Deliver Products"
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
 msgid "View Stock of Products"
 msgstr "Просмотр товаров на складах"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-mrp"
-msgstr ""
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree3_delivery
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree3_delivery
-msgid "Future Delivery Orders"
+#: view:stock.picking:0
+msgid "Internal Picking list"
 msgstr ""
 
 #. module: stock
@@ -1503,18 +2747,29 @@ msgid "STOCK_GO_UP"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_SORT_DESCENDING"
+#: view:report.stock.move:0
+#: field:report.stock.move,month:0
+msgid "Month"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_tracking_form
-#: model:ir.ui.menu,name:stock.menu_action_tracking_form
-msgid "Tracking Lots"
-msgstr "Учет движения партий"
+#: help:stock.picking,date_done:0
+msgid "Date of Completion"
+msgstr ""
 
 #. module: stock
-#: wizard_button:inventory.merge,init,merge:0
+#: help:stock.tracking,active:0
+msgid ""
+"By unchecking the active field, you may hide a pack without deleting it."
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-dolar_ok!"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.merge:0
 msgid "Yes"
 msgstr "Да"
 
@@ -1524,8 +2779,24 @@ msgid "Inventories"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_HOME"
+#: view:report.stock.move:0
+msgid "Todo"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,company_id:0
+#: view:report.stock.move:0
+#: field:report.stock.move,company_id:0
+#: field:stock.inventory,company_id:0
+#: field:stock.inventory.line,company_id:0
+#: field:stock.location,company_id:0
+#: field:stock.move,company_id:0
+#: field:stock.picking,company_id:0
+#: field:stock.production.lot,company_id:0
+#: field:stock.production.lot.revision,company_id:0
+#: field:stock.warehouse,company_id:0
+msgid "Company"
 msgstr ""
 
 #. module: stock
@@ -1533,22 +2804,29 @@ msgstr ""
 msgid "STOCK_PROPERTIES"
 msgstr ""
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-go-year"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,stock_real:0
 msgid "Real Stock"
 msgstr "Доступные запасы"
 
 #. module: stock
-#: model:ir.actions.wizard,name:stock.wizard_fill_inventory
-#: wizard_view:stock.fill_inventory,init:0
-#: wizard_button:stock.fill_inventory,init,fill_inventory:0
+#: view:stock.fill.inventory:0
 msgid "Fill Inventory"
 msgstr ""
 
 #. module: stock
-#: wizard_view:stock.invoice_onshipping,init:0
-msgid "Create invoices"
-msgstr "Создать счета"
+#: help:product.category,property_stock_account_input_categ:0
+msgid ""
+"When doing real-time inventory valuation, counterpart Journal Items for all "
+"incoming stock moves will be posted in this account. This is the default "
+"value for all products in this category, it can also directly be set on each "
+"product."
+msgstr ""
 
 #. module: stock
 #: field:stock.production.lot.revision,date:0
@@ -1556,13 +2834,23 @@ msgid "Revision Date"
 msgstr ""
 
 #. module: stock
-#: rml:stock.picking.list:0
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,prodlot_id:0
+#: view:stock.move:0
+#: field:stock.move.split.lines,lot_id:0
+#: field:stock.move.split.lines.exist,lot_id:0
+#: report:stock.picking.list:0
 msgid "Lot"
 msgstr "Партия"
 
 #. module: stock
-#: wizard_view:inventory.merge.stock.zero,init:0
-msgid "Set Stock to Zero"
+#: view:stock.move.split:0
+msgid "Production Lot Number"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-gtk-jump-to-rtl"
 msgstr ""
 
 #. module: stock
@@ -1570,12 +2858,6 @@ msgstr ""
 msgid "Quantity (UOS)"
 msgstr "Количество(единицы продажи)"
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree5
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree5
-msgid "Packing to Process"
-msgstr ""
-
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_STOP"
@@ -1587,56 +2869,100 @@ msgid "Set Available"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.wizard,name:stock.make_picking
-#: wizard_view:stock.picking.make,init:0
-msgid "Make packing"
+#: report:stock.picking.list:0
+msgid "Contact Address :"
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,backorder_id:0
+#: field:stock.move,backorder_id:0
 msgid "Back Order"
 msgstr ""
 
+#. module: stock
+#: field:stock.production.lot,name:0
+msgid "Serial Number"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DND_MULTIPLE"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#, python-format
+msgid "New picking invoices"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_REMOVE"
+msgid "STOCK_SPELL_CHECK"
 msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,active:0
 #: field:stock.location,active:0
-#: field:stock.picking,active:0
 #: field:stock.tracking,active:0
 msgid "Active"
 msgstr "Активен"
 
+#. module: stock
+#: model:ir.module.module,shortdesc:stock.module_meta_information
+msgid "Inventory Management"
+msgstr "Управление запасами"
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-idea"
+msgstr ""
+
 #. module: stock
 #: view:product.template:0
 msgid "Properties"
 msgstr "Свойства"
 
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Error, no partner !"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_splitinto.py:0
+#, python-format
+msgid ""
+"The current move line is already assigned to a pack, please remove it first "
+"if you really want to change it ' \\n            #                        "
+"'for this product: \"%s\" (id: %d)"
+msgstr ""
+
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_incoterms_tree
 #: model:ir.model,name:stock.model_stock_incoterms
-#: model:ir.ui.menu,name:stock.menu_action_incoterms_tree
 #: view:stock.incoterms:0
 msgid "Incoterms"
 msgstr "Инкотермс"
 
 #. module: stock
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
 msgid "Total:"
 msgstr "Итого:"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_DIALOG_AUTHENTICATION"
+#: help:stock.incoterms,name:0
+msgid ""
+"Incoterms are series of sales terms.They are used to divide transaction "
+"costs and responsibilities between buyer and seller and reflect state-of-the-"
+"art transportation practices."
+msgstr ""
+
+#. module: stock
+#: help:stock.fill.inventory,recursive:0
+msgid ""
+"If checked, products contained in child locations of selected location will "
+"be included as well."
 msgstr ""
 
 #. module: stock
@@ -1645,33 +2971,60 @@ msgid "STOCK_ZOOM_OUT"
 msgstr ""
 
 #. module: stock
-#: wizard_field:stock.move.track,init,tracking_prefix:0
+#: field:stock.move.track,tracking_prefix:0
 msgid "Tracking prefix"
 msgstr "Префикс учета"
 
 #. module: stock
-#: selection:stock.location,allocation_method:0
-msgid "Nearest"
-msgstr "Ближайший"
+#: field:stock.inventory,name:0
+msgid "Inventory Reference"
+msgstr ""
 
 #. module: stock
-#: wizard_field:stock.location.products,init,to_date:0
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Internal picking"
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "Open Product"
+msgstr ""
+
+#. module: stock
+#: field:stock.location.product,to_date:0
 msgid "To"
 msgstr ""
 
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Process"
+msgstr ""
+
 #. module: stock
 #: field:stock.production.lot.revision,name:0
 msgid "Revision Name"
 msgstr "Наименование ревизии"
 
+#. module: stock
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr "Склад"
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SELECT_COLOR"
 msgstr ""
 
 #. module: stock
-#: view:stock.inventory:0
-msgid "Confirm Inventory"
+#: view:stock.location.product:0
+msgid ""
+"(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to "
+"filter all resources of the day for the 'From' date and 23:59:59 for the "
+"'To' date)"
 msgstr ""
 
 #. module: stock
@@ -1685,17 +3038,29 @@ msgid "STOCK_NO"
 msgstr ""
 
 #. module: stock
-#: model:stock.location,name:stock.stock_location_workshop
-msgid "Workshop"
+#: model:ir.actions.act_window,name:stock.action_picking_tree_out
+msgid "Customers Packings"
 msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,state:0
+#: view:report.stock.move:0
+#: selection:report.stock.move,state:0
 #: selection:stock.inventory,state:0
+#: view:stock.move:0
 #: selection:stock.move,state:0
+#: view:stock.picking:0
 #: selection:stock.picking,state:0
 msgid "Done"
 msgstr "Выполнено"
 
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_change_standard_price
+#: model:ir.model,name:stock.model_stock_change_standard_price
+#: view:stock.change.standard.price:0
+msgid "Change Standard Price"
+msgstr ""
+
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_virtual
 msgid "Virtual Locations"
@@ -1703,24 +3068,36 @@ msgstr "Виртуальные местоположения"
 
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_REDO"
+msgid "STOCK_GOTO_FIRST"
 msgstr ""
 
-#. module: stock
-#: model:stock.location,name:stock.stock_location_company
-msgid "Tiny sprl"
-msgstr "Tiny sprl"
-
 #. module: stock
 #: field:stock.inventory,date_done:0
 msgid "Date done"
 msgstr "Дата выполнения"
 
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"Please put a partner on the picking list if you want to generate invoice."
+msgstr ""
+
 #. module: stock
 #: selection:stock.move,priority:0
 msgid "Not urgent"
 msgstr "Не срочно"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-stock_format-default"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "To Do"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CLOSE"
@@ -1733,45 +3110,90 @@ msgid "Warehouses"
 msgstr "Склады"
 
 #. module: stock
-#: help:product.product,track_outgoing:0
-msgid "Force to use a Production Lot during deliveries"
-msgstr "Принудительно назначать серийный номер партии при перевозке"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Split move lines in two"
+#: field:stock.journal,user_id:0
+msgid "Responsible"
 msgstr ""
 
 #. module: stock
-#: wizard_field:stock.invoice_onshipping,init,journal_id:0
+#: selection:stock.location,icon:0
+msgid "terp-check"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-camera_test"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_inventory_report
+#: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
+#: view:report.stock.inventory:0
+msgid "Inventory Analysis"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_SORT_DESCENDING"
+msgstr ""
+
+#. module: stock
+#: field:stock.invoice.onshipping,journal_id:0
 msgid "Destination Journal"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.act_stock_production_lot_2_stock_report_prodlots
+#: model:ir.actions.act_window,name:stock.act_stock_tracking_lot_2_stock_report_tracklots
 #: model:stock.location,name:stock.stock_location_stock
 msgid "Stock"
 msgstr "Запасы"
 
 #. module: stock
-#: rml:lot.location:0
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: model:ir.model,name:stock.model_product_product
+#: model:ir.ui.menu,name:stock.menu_stock_product
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,product_id:0
+#: field:report.stock.lines.date,product_id:0
+#: view:report.stock.move:0
+#: field:report.stock.move,product_id:0
 #: field:stock.inventory.line,product_id:0
+#: field:stock.inventory.line.split,product_id:0
+#: report:stock.inventory.move:0
+#: view:stock.move:0
 #: field:stock.move,product_id:0
+#: field:stock.move.consume,product_id:0
+#: field:stock.move.scrap,product_id:0
+#: field:stock.move.split,product_id:0
+#: view:stock.production.lot:0
 #: field:stock.production.lot,product_id:0
 #: field:stock.report.prodlots,product_id:0
+#: field:stock.report.tracklots,product_id:0
+#, python-format
 msgid "Product"
 msgstr "Продукция"
 
 #. module: stock
-#: wizard_button:stock.return.picking,init,return:0
-msgid "Return"
+#: selection:stock.location,icon:0
+msgid "STOCK_HOME"
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,auto_picking:0
-msgid "Auto-Packing"
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "Invoicing"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Please provide Proper Quantity !"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You are moving %.2f products but only %.2f available in this lot."
 msgstr ""
 
 #. module: stock
@@ -1779,20 +3201,52 @@ msgstr ""
 msgid "Product UOS"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Received Qty"
+msgstr ""
+
 #. module: stock
 #: field:stock.location,posz:0
 msgid "Height (Z)"
 msgstr "Высота"
 
 #. module: stock
+#: field:stock.ups,weight:0
+msgid "Lot weight"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_consume
+#: view:stock.move.consume:0
+msgid "Consume Products"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
 #: field:stock.inventory.line,product_uom:0
-#: field:stock.move,product_uom:0
+#: field:stock.move.consume,product_uom:0
+#: field:stock.move.scrap,product_uom:0
+#, python-format
 msgid "Product UOM"
 msgstr "Ед.изм. продукции"
 
 #. module: stock
-#: rml:lot.stock.overview:0
-#: rml:lot.stock.overview_all:0
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You cannot remove the picking which is in %s state !"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,address_id:0
+msgid "Address"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
 msgid "Variants"
 msgstr "Варианты"
 
@@ -1811,29 +3265,40 @@ msgstr "Поставщики"
 msgid "STOCK_JUMP_TO"
 msgstr ""
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_INDENT"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-tools"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.report.xml,name:stock.report_location_overview
+#: report:lot.stock.overview:0
 msgid "Location Overview"
 msgstr "Обзор местоположения"
 
 #. module: stock
-#: model:ir.actions.wizard,name:stock.location_product
+#: model:ir.actions.act_window,name:stock.action_view_stock_location_product
+#: model:ir.model,name:stock.model_stock_location_product
 msgid "Products by Location"
 msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_UNDO"
+msgid "STOCK_DIALOG_INFO"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.wizard,name:stock.move_split
-msgid "Split move line"
+#: field:stock.fill.inventory,recursive:0
+msgid "Include children"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_components
+msgid "Shelf 1"
 msgstr ""
 
 #. module: stock
@@ -1842,9 +3307,9 @@ msgid "terp-sale"
 msgstr ""
 
 #. module: stock
-#: field:stock.production.lot,name:0
-msgid "Serial"
-msgstr "Серийный №"
+#: view:stock.move:0
+msgid "Order"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1852,56 +3317,132 @@ msgid "STOCK_ADD"
 msgstr ""
 
 #. module: stock
-#: field:stock.location,chained_delay:0
-msgid "Chained Delay (days)"
+#: field:stock.tracking,name:0
+msgid "Pack Reference"
 msgstr ""
 
 #. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,location_id:0
 #: field:stock.move,location_id:0
 msgid "Source Location"
 msgstr "Местоположение источника"
 
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-gtk-stop"
+msgstr ""
+
 #. module: stock
 #: view:product.template:0
 msgid "Accounting Entries"
 msgstr "Бухгалтерские проводки"
 
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Unit Of Measure"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PAUSE"
 msgstr ""
 
+#. module: stock
+#: model:stock.location,name:stock.stock_location_intermediatelocation0
+msgid "Internal Shippings"
+msgstr ""
+
+#. module: stock
+#: field:stock.change.standard.price,enable_stock_in_out_acc:0
+msgid "Enable Related Account"
+msgstr ""
+
 #. module: stock
 #: view:product.product:0
+#: view:stock.inventory.line.split:0
+#: view:stock.move.split:0
 msgid "Lots"
 msgstr "Партии"
 
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "New pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Destination"
+msgstr ""
+
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "All at once"
 msgstr "Все сразу"
 
 #. module: stock
-#: field:product.product,track_outgoing:0
-msgid "Track Outging Lots"
-msgstr "Отслеживать исходящие партии"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"Quantities, UoMs, Products and Locations cannot be modified on stock moves "
+"that have already been processed (except by the Administrator)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Productions"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "Return lines"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_stock_line_date
 #: model:ir.model,name:stock.model_report_stock_lines_date
-#: model:ir.ui.menu,name:stock.menu_report_stock_line_date
 #: view:report.stock.lines.date:0
 msgid "Dates of Inventories"
 msgstr ""
 
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total incoming quantity"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,product_qty_out:0
+msgid "Out Qty"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PRINT_PREVIEW"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_FIND"
+#: field:stock.production.lot,move_ids:0
+msgid "Moves for this production lot"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:0
+#, python-format
+msgid "Message !"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Put in current pack"
 msgstr ""
 
 #. module: stock
@@ -1910,13 +3451,8 @@ msgid "Lot Inventory"
 msgstr "Inventario do lote"
 
 #. module: stock
-#: help:stock.location,chained_auto_packing:0
-msgid ""
-"This is used only if you selected a chained location type.\n"
-"The 'Automatic Move' value will create a stock move after the current one "
-"that will be validated automatically. With 'Manual Operation', the stock "
-"move has to be validated by a worker. With 'Automatic No Step Added', the "
-"location is replaced in the original move."
+#: view:stock.move:0
+msgid "Reason"
 msgstr ""
 
 #. module: stock
@@ -1925,58 +3461,103 @@ msgid "Icon"
 msgstr "Значок"
 
 #. module: stock
-#: field:stock.tracking,name:0
-msgid "Tracking"
-msgstr "Учет движения"
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
 
 #. module: stock
-#: wizard_button:stock.move.track,init,track:0
-#: wizard_button:stock.picking.make,init,make:0
+#: selection:stock.location,icon:0
+msgid "STOCK_ZOOM_IN"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-go-week"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line.split:0
+#: view:stock.move.consume:0
+#: view:stock.move.scrap:0
+#: view:stock.move.split:0
+#: view:stock.move.track:0
+#: view:stock.split.into:0
 msgid "Ok"
 msgstr "ОК"
 
-#. module: stock
-#: help:product.template,property_stock_account_input:0
-msgid ""
-"This account will be used, instead of the default one, to value input stock"
-msgstr ""
-"Для оценки входящих запасов будет использован данный счет, а не счет по "
-"умолчанию."
-
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
 msgid "Non European Customers"
 msgstr "Неевропейские заказчики"
 
 #. module: stock
-#: model:stock.location,name:stock.stock_location_components
-msgid "Components"
-msgstr "Компоненты"
+#: code:addons/stock/product.py:0
+#: code:addons/stock/stock.py:0
+#: code:addons/stock/wizard/stock_splitinto.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: stock
-#: wizard_view:inventory.merge,init:0
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"There is no inventory variation account defined on the product category: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.merge:0
 msgid "Do you want to merge theses inventories ?"
 msgstr ""
 
 #. module: stock
-#: field:stock.picking,max_date:0
-msgid "Max. Planned Date"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.move,state:0
+#: selection:stock.picking,state:0
+msgid "Cancelled"
 msgstr ""
 
 #. module: stock
-#: view:stock.inventory:0
-msgid "Posted Inventory"
+#: field:stock.location,chained_location_type:0
+msgid "Chained Location Type"
 msgstr ""
 
 #. module: stock
+#: help:stock.picking,move_type:0
+msgid "It specifies goods to be delivered all at once or by direct delivery"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#, python-format
+msgid "This picking list does not require invoicing."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,type:0
+#: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Getting Goods"
 msgstr "Получение товаров"
 
 #. module: stock
-#: view:stock.location:0
-msgid "Stock Location"
-msgstr "Местоположение запасов"
+#: help:stock.location,chained_location_type:0
+msgid ""
+"Determines whether this location is chained to another location, i.e. any "
+"incoming product in this location \n"
+"should next go to the chained location. The chained location is determined "
+"according to the type :\n"
+"* None: No chaining at all\n"
+"* Customer: The chained location will be taken from the Customer Location "
+"field on the Partner form of the Partner that is specified in the Picking "
+"list of the incoming products.\n"
+"* Fixed Location: The chained location is taken from the next field: Chained "
+"Location if Fixed."
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1984,10 +3565,16 @@ msgid "STOCK_MEDIA_PLAY"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree_delivery
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree_delivery
-msgid "Delivery Orders"
-msgstr "Заказы на доставку"
+#: code:addons/stock/wizard/stock_inventory_merge.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is done."
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2002,59 +3589,91 @@ msgid ""
 msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
 #: selection:stock.move,state:0
+#: view:stock.picking:0
 #: selection:stock.picking,state:0
 msgid "Confirmed"
 msgstr "Подтверждено"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_MEDIA_PREVIOUS"
+#: model:ir.model,name:stock.model_stock_ups_final
+msgid "Stock ups final"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
 msgid "Confirm"
 msgstr "Подтвердить"
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Check Availability"
-msgstr "Проверять доступность"
+#: help:stock.location,icon:0
+msgid "Icon show in  hierarchical tree view"
+msgstr ""
 
 #. module: stock
-#: wizard_view:inventory.merge,init:0
-#: model:ir.actions.wizard,name:stock.wizard_merge_inventory
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
+#: view:stock.inventory.merge:0
 msgid "Merge inventories"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_location_tree
-#: model:ir.ui.menu,name:stock.menu_action_location_tree
-msgid "Stock Locations Structure"
-msgstr "Структура местоположений запасов"
-
 #. module: stock
 #: selection:stock.location,icon:0
-msgid "STOCK_DISCONNECT"
+msgid "terp-go-home"
 msgstr ""
 
 #. module: stock
-#: help:product.template,property_stock_account_output:0
+#: field:product.product,location_id:0
+#: view:stock.location:0
+msgid "Stock Location"
+msgstr "Местоположение запасов"
+
+#. module: stock
+#: help:stock.location,scrap_location:0
 msgid ""
-"This account will be used, instead of the default one, to value output stock"
-msgstr ""
-"Для оценки исходящих запасов будет использован данный счет, а не счет по "
-"умолчанию."
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Confirm (Do Not Process Now)"
+"Check this box to allow using this location to put scrapped/damaged goods."
 msgstr ""
 
 #. module: stock
-#: field:stock.tracking,move_ids:0
-msgid "Moves Tracked"
+#: model:ir.actions.act_window,name:stock.act_relate_picking
+msgid "Related Picking"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total outgoing quantity"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,backorder_id:0
+msgid "Back Order of"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#, python-format
+msgid "Unit Cost for this product line"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_product_category
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,product_categ_id:0
+#: view:report.stock.move:0
+#: field:report.stock.move,categ_id:0
+msgid "Product Category"
 msgstr ""
 
 #. module: stock
@@ -2063,8 +3682,19 @@ msgid "Reporting"
 msgstr "Отчетность"
 
 #. module: stock
-#: model:ir.actions.wizard,name:stock.wizard_invoice_onshipping
-#: wizard_button:stock.invoice_onshipping,init,create_invoice:0
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid " for the "
+msgstr ""
+
+#. module: stock
+#: view:stock.split.into:0
+msgid "Quantity to leave in the current pack"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
+#: view:stock.invoice.onshipping:0
 msgid "Create invoice"
 msgstr "Создать счет"
 
@@ -2074,23 +3704,106 @@ msgid "STOCK_NETWORK"
 msgstr ""
 
 #. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_configuration
-msgid "Configuration"
-msgstr "Настройки"
-
-#. module: stock
-#: selection:stock.location,icon:0
-msgid "terp-project"
+#: view:report.stock.lines.date:0
+msgid "Non Inv"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.act_product_product_2_stock_report_prodlots
-#: model:ir.actions.act_window,name:stock.act_stock_location_2_stock_report_prodlots
-#: model:ir.actions.act_window,name:stock.action_stock_report_prodlots_form
-#: model:ir.ui.menu,name:stock.menu_stock_report_prodlots
-#: view:stock.report.prodlots:0
-msgid "Stock by Lots"
-msgstr "Склады с партиями этого товара"
+#: field:stock.inventory.line.split,use_exist:0
+#: field:stock.move.split,use_exist:0
+msgid "Existing Lots"
+msgstr ""
+
+#. module: stock
+#: help:stock.change.standard.price,new_price:0
+msgid ""
+"If cost price is increased, stock variation account will be debited and "
+"stock output account will be credited with the value = (difference of amount "
+"* quantity available).\n"
+"If cost price is decreased, stock variation account will be creadited and "
+"stock input account will be debited."
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_journal_id:0
+msgid "Chaining Journal"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_customers
+msgid "Customers"
+msgstr "Клиенты"
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is cancelled."
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-document-new"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line:0
+msgid "Stock Inventory Lines"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#, python-format
+msgid "Process Document"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Deliveries"
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_account_input:0
+msgid ""
+"When doing real-time inventory valuation, counterpart Journal Items for all "
+"incoming stock moves will be posted in this account. If not set on the "
+"product, the one from the product category is used."
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Additional info"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: field:stock.move,tracking_id:0
+msgid "Pack"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_location
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,location_id:0
+#: field:stock.fill.inventory,location_id:0
+#: field:stock.inventory.line,location_id:0
+#: report:stock.inventory.move:0
+#: view:stock.location:0
+#: view:stock.move:0
+#: field:stock.move.consume,location_id:0
+#: field:stock.move.scrap,location_id:0
+#: field:stock.picking,location_id:0
+#: report:stock.picking.list:0
+#: field:stock.report.prodlots,location_id:0
+#: field:stock.report.tracklots,location_id:0
+msgid "Location"
+msgstr "Местоположение"
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Date Expected"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,auto_validate:0
@@ -2098,7 +3811,16 @@ msgid "Auto Validate"
 msgstr "Автопроверка"
 
 #. module: stock
-#: field:stock.location,chained_auto_packing:0
+#: model:ir.model,name:stock.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "December"
+msgstr ""
+
+#. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic Move"
 msgstr ""
@@ -2109,10 +3831,26 @@ msgid "Virtual Stock Value"
 msgstr ""
 
 #. module: stock
-#: selection:stock.move,state:0
-#: selection:stock.picking,state:0
-msgid "Canceled"
-msgstr "Отменено"
+#: selection:stock.location,icon:0
+msgid "terp-mail_delete"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,price_currency_id:0
+msgid ""
+"Technical field used to record the currency chosen by the user during a "
+"picking confirmation (when average price costing method is used)"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "terp-go-month"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_products_moves
+msgid "Products Moves"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2124,30 +3862,49 @@ msgstr ""
 msgid "Invoiced"
 msgstr "Выставлен счет"
 
+#. module: stock
+#: field:stock.move,address_id:0
+msgid "Destination Address"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIRECTORY"
 msgstr ""
 
 #. module: stock
-#: help:product.template,property_stock_production:0
-msgid ""
-"For the current product (template), this stock location will be used, "
-"instead of the default one, as the source location for stock moves generated "
-"by production orders"
+#: field:stock.picking,max_date:0
+msgid "Max. Expected Date"
 msgstr ""
 
 #. module: stock
-#: view:stock.picking.move.wizard:0
-msgid "Add"
-msgstr "Добавить"
+#: field:stock.picking,auto_picking:0
+msgid "Auto-Picking"
+msgstr ""
 
 #. module: stock
+#: model:stock.location,name:stock.stock_location_shop1
+msgid "Shop 2"
+msgstr ""
+
+#. module: stock
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+#: selection:report.stock.move,type:0
+#: view:stock.location:0
+#: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Internal"
 msgstr "Внутренний"
 
 #. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
 #: selection:stock.inventory,state:0
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
@@ -2160,31 +3917,57 @@ msgid "STOCK_JUSTIFY_CENTER"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree3
-#: model:ir.actions.act_window,name:stock.action_picking_tree8
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree3
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree8
-msgid "Confirmed Packing Waiting Availability"
+#: help:report.stock.inventory,state:0
+msgid ""
+"When the stock move is created it is in the 'Draft' state.\n"
+" After that it is set to 'Confirmed' state.\n"
+" If stock is available state is set to 'Avaiable'.\n"
+" When the picking it done the state is 'Done'.              \n"
+"The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
 
 #. module: stock
-#: field:stock.location,posy:0
-msgid "Shelves (Y)"
-msgstr "Полки (Y)"
+#: field:stock.move.split.lines,use_exist:0
+msgid "Existing Lot"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.wizard,name:stock.wizard_merge_inventory_zero
-msgid "Set Stock to 0"
-msgstr "Установить запасы в 0"
+#: selection:stock.location,icon:0
+msgid "STOCK_MEDIA_PREVIOUS"
+msgstr ""
 
 #. module: stock
-#: view:stock.location:0
-msgid "Localisation"
-msgstr "Локализация"
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "Please specify at least one non-zero quantity!"
+msgstr ""
 
 #. module: stock
-#: wizard_view:inventory.merge.stock.zero,init:0
-msgid "Do you want to set stocks to zero ?"
+#: report:stock.picking.list:0
+msgid "weight"
+msgstr "Вес"
+
+#. module: stock
+#: help:product.template,property_stock_procurement:0
+msgid ""
+"For the current product, this stock location will be used, instead of the "
+"default one, as the source location for stock moves generated by procurements"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is ready to process."
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,origin:0
+msgid "Reference of the document that produced this picking."
+msgstr ""
+
+#. module: stock
+#: field:stock.fill.inventory,set_stock_zero:0
+msgid "Set to zero"
 msgstr ""
 
 #. module: stock
@@ -2198,14 +3981,56 @@ msgid "STOCK_REVERT_TO_SAVED"
 msgstr ""
 
 #. module: stock
-#: field:product.product,track_production:0
-msgid "Track Production Lots"
-msgstr "Отслеживать партии изделий"
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#, python-format
+msgid "None of these picking lists require invoicing."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "November"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Unplanned Qty"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is scheduled"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_company_id:0
+msgid "Chained Company"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
-msgid "Split in Two"
-msgstr "Разделить на два"
+msgid "Check Availability"
+msgstr "Проверять доступность"
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Not Available. Moves are not confirmed."
+msgstr ""
+
+#. module: stock
+#: help:product.product,track_incoming:0
+msgid ""
+"Forces to specify a Production Lot for all moves containing this product and "
+"coming from a Supplier Location"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
@@ -2213,154 +4038,266 @@ msgid "Future Stock Moves"
 msgstr ""
 
 #. module: stock
-#: help:product.template,property_stock_procurement:0
-msgid ""
-"For the current product (template), this stock location will be used, "
-"instead of the default one, as the source location for stock moves generated "
-"by procurements"
+#: selection:stock.location,icon:0
+msgid "terp-gtk-select-all"
 msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_picking_move_wizard
-msgid "stock.picking.move.wizard"
+#: field:stock.move,move_history_ids2:0
+msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
+#: view:stock.move:0
+msgid "Extended options..."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Stock"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: stock
+#: field:stock.ups.final,xmlfile:0
+msgid "XML File"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:0
 #: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.inventory.line,prod_lot_id:0
+#: report:stock.inventory.move:0
 #: field:stock.move,prodlot_id:0
+#: field:stock.move.split.lines.exist,prodlot_id:0
 #: view:stock.production.lot:0
+#, python-format
 msgid "Production Lot"
 msgstr "Партия изделий"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_traceability
-#: model:ir.ui.menu,name:stock.next_id_62
+#: view:stock.move:0
+#: view:stock.picking:0
+#: view:stock.production.lot:0
+#: view:stock.tracking:0
 msgid "Traceability"
 msgstr "Возможность учета движения"
 
 #. module: stock
-#: field:stock.picking,date:0
-msgid "Date Order"
-msgstr "Дата заказа"
+#: view:stock.picking:0
+msgid "To invoice"
+msgstr ""
 
 #. module: stock
-#: selection:stock.invoice_onshipping,init,type:0
-msgid "Supplier Invoice"
+#: selection:stock.location,icon:0
+msgid "terp-mail-message-new"
 msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
 #: model:ir.ui.menu,name:stock.menu_action_location_form
+#: view:stock.picking:0
 msgid "Locations"
 msgstr "Расположения"
 
-#. module: stock
-#: help:stock.move,date_planned:0
-msgid ""
-"Scheduled date for the movement of the products or real date if the move is "
-"done."
-msgstr ""
-
 #. module: stock
 #: view:stock.picking:0
 msgid "General Information"
 msgstr "Общая информация"
 
+#. module: stock
+#: field:stock.production.lot,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,icon:0
+msgid "STOCK_DISCONNECT"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-product"
 msgstr ""
 
-#. module: stock
-#: wizard_button:stock.partial_picking,end2,end:0
-msgid "Close"
-msgstr ""
-
-#. module: stock
-#: model:ir.actions.report.xml,name:stock.report_move_labels
-msgid "Print Item Labels"
-msgstr "Печать этикеток товаров"
-
 #. module: stock
 #: view:stock.move:0
 msgid "Moves"
 msgstr "Перемещения тоаров"
 
 #. module: stock
-#: field:stock.move,location_dest_id:0
+#: view:report.stock.move:0
+#: field:report.stock.move,location_dest_id:0
 #: field:stock.picking,location_dest_id:0
 msgid "Dest. Location"
 msgstr "Местоположение назначения"
 
 #. module: stock
-#: wizard_button:stock.move.split,init,split:0
-msgid "Split"
-msgstr "Разделить"
-
-#. module: stock
-#: field:stock.location,account_id:0
-msgid "Inventory Account"
-msgstr "Счет учета"
-
-#. module: stock
-#: wizard_view:inventory.merge.stock.zero,init:0
-msgid "Set Stocks to Zero"
+#: help:stock.move,product_packaging:0
+msgid ""
+"It specifies attributes of packaging like type, quantity of packaging,etc."
 msgstr ""
 
 #. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "quantity."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Expected"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
 #: model:stock.location,name:stock.location_production
 #: selection:stock.location,usage:0
 msgid "Production"
 msgstr "Производство"
 
 #. module: stock
-#: model:ir.ui.menu,name:stock.menu_traceability_low
-msgid "Low Level"
-msgstr "Низкий уровень"
+#: view:stock.split.into:0
+msgid "Split Move"
+msgstr ""
 
 #. module: stock
-#: rml:stock.picking.list:0
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid ""
+"There are no products to return (only lines in Done state and not fully "
+"returned yet can be returned)!"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split
+msgid "Split in Production lots"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+msgid "Real"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+#: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
 msgid "Description"
 msgstr "Описание"
 
 #. module: stock
-#: selection:stock.location,icon:0
-msgid "STOCK_INDENT"
+#: selection:report.stock.move,month:0
+msgid "May"
 msgstr ""
 
 #. module: stock
-#: selection:stock.picking,type:0
-msgid "Delivery"
-msgstr "Доставка"
+#: selection:stock.location,icon:0
+msgid "STOCK_DIALOG_AUTHENTICATION"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action5
-#: model:ir.actions.wizard,name:stock.action4
-#: model:ir.actions.wizard,name:stock.action_lot2
+#: help:product.template,property_stock_account_output:0
+msgid ""
+"When doing real-time inventory valuation, counterpart Journal Items for all "
+"outgoing stock moves will be posted in this account. If not set on the "
+"product, the one from the product category is used."
+msgstr ""
+
+#. module: stock
+#: view:stock.tracking:0
 msgid "Upstream traceability"
 msgstr ""
 
+#. module: stock
+#: report:lot.stock.overview_all:0
+msgid "Location Content"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Produced Qty"
+msgstr ""
+
 #. module: stock
 #: field:product.category,property_stock_account_input_categ:0
 #: field:product.template,property_stock_account_input:0
+#: field:stock.change.standard.price,stock_account_input:0
 msgid "Stock Input Account"
 msgstr ""
 
 #. module: stock
-#: field:stock.location,chained_location_type:0
-msgid "Chained Location Type"
+#: view:stock.move:0
+msgid "Picking"
 msgstr ""
 
 #. module: stock
+#: model:ir.model,name:stock.model_stock_report_prodlots
+msgid "Stock report by production lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
 #: selection:stock.location,chained_location_type:0
+#: view:stock.move:0
 msgid "Customer"
 msgstr "Клиент"
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_location_tree_3
-#: model:ir.ui.menu,name:stock.menu_action_location_tree_3
-msgid "Locations' Values"
+#: selection:report.stock.move,month:0
+msgid "February"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Production Lot Identification"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,scrap_location:0
+#: view:stock.move.scrap:0
+msgid "Scrap Location"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "April"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:stock.move:0
+msgid "Future"
+msgstr ""
+
+#. module: stock
+#: field:stock.invoice.onshipping,invoice_date:0
+msgid "Invoiced date"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree
+#: view:stock.picking:0
+msgid "Outgoing Deliveries"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "Warning !"
 msgstr ""
 
 #. module: stock
@@ -2374,14 +4311,32 @@ msgid "STOCK_JUSTIFY_RIGHT"
 msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_inventory_line
-msgid "Inventory line"
+#: selection:stock.location,icon:0
+msgid "terp-mrp"
 msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Others info"
-msgstr "Прочая информация"
+#: help:stock.location,chained_picking_type:0
+msgid ""
+"Shipping Type of the Picking List that will contain the chained move (leave "
+"empty to automatically detect the type based on the source and destination "
+"locations)."
+msgstr ""
+
+#. module: stock
+#: selection:stock.move.split.lines,action:0
+msgid "Keep in one lot"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Cost Price:"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,move_dest_id:0
+msgid "Optional: next stock move when chaining them"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2389,15 +4344,236 @@ msgid "STOCK_MEDIA_NEXT"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Move State"
-msgstr "Состояни перемещния товаров"
+#: selection:stock.location,icon:0
+msgid "STOCK_REDO"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,year:0
+msgid "Year"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations
 msgid "Physical Locations"
 msgstr "Физические местоположения"
 
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_move
+msgid "Partial Move"
+msgstr ""
+
+#~ msgid "LIFO"
+#~ msgstr "LIFO"
+
 #~ msgid "Stock Management"
 #~ msgstr "Управление запасами"
+
+#~ msgid "Revision"
+#~ msgstr "Ревизия"
+
+#~ msgid "Return packing"
+#~ msgstr "Retornar embalagens"
+
+#~ msgid "Packing list"
+#~ msgstr "Упаковочный лист"
+
+#~ msgid "Move History"
+#~ msgstr "Журнал перемещений"
+
+#~ msgid "Serial"
+#~ msgstr "Серийный №"
+
+#~ msgid "Stock location"
+#~ msgstr "Местоположение запасов"
+
+#~ msgid "Status"
+#~ msgstr "Статус"
+
+#~ msgid "Stock Properties"
+#~ msgstr "Свойства запасов"
+
+#~ msgid "Tracking/Serial"
+#~ msgstr "Учетный / серийный"
+
+#~ msgid "Tracking Number"
+#~ msgstr "Номер учета движения"
+
+#~ msgid "Date create"
+#~ msgstr "Дата создания"
+
+#~ msgid "This account will be used to value the input stock"
+#~ msgstr "Данный счет будет использован для оценки входящих запасов"
+
+#~ msgid "Date Created"
+#~ msgstr "Дата создания"
+
+#~ msgid "Dest. Address"
+#~ msgstr "Адрес назначения"
+
+#~ msgid "Input Packing List"
+#~ msgstr "Lista de embalagens entradas"
+
+#~ msgid "Validate"
+#~ msgstr "Проверить"
+
+#~ msgid "Fill From Unreceived Products"
+#~ msgstr "Дополнить из неполученной продукции"
+
+#~ msgid "FIFO"
+#~ msgstr "FIFO"
+
+#~ msgid "Invoice Status"
+#~ msgstr "Статус счета"
+
+#~ msgid "Lots by location"
+#~ msgstr "Партии по местоположениям"
+
+#~ msgid "Tracking Lots"
+#~ msgstr "Учет движения партий"
+
+#~ msgid "Create invoices"
+#~ msgstr "Создать счета"
+
+#~ msgid "Nearest"
+#~ msgstr "Ближайший"
+
+#~ msgid "Tiny sprl"
+#~ msgstr "Tiny sprl"
+
+#~ msgid "Tracking"
+#~ msgstr "Учет движения"
+
+#~ msgid ""
+#~ "This account will be used, instead of the default one, to value input stock"
+#~ msgstr ""
+#~ "Для оценки входящих запасов будет использован данный счет, а не счет по "
+#~ "умолчанию."
+
+#~ msgid "Delivery Orders"
+#~ msgstr "Заказы на доставку"
+
+#~ msgid ""
+#~ "This account will be used, instead of the default one, to value output stock"
+#~ msgstr ""
+#~ "Для оценки исходящих запасов будет использован данный счет, а не счет по "
+#~ "умолчанию."
+
+#~ msgid "Add"
+#~ msgstr "Добавить"
+
+#~ msgid "Localisation"
+#~ msgstr "Локализация"
+
+#~ msgid "Split in Two"
+#~ msgstr "Разделить на два"
+
+#~ msgid "Inventory Account"
+#~ msgstr "Счет учета"
+
+#~ msgid "Low Level"
+#~ msgstr "Низкий уровень"
+
+#~ msgid "Delivery"
+#~ msgstr "Доставка"
+
+#~ msgid "Others info"
+#~ msgstr "Прочая информация"
+
+#~ msgid "Packing result"
+#~ msgstr "Сформировать упаковку"
+
+#~ msgid "Products Sent"
+#~ msgstr "Отправлено изделий"
+
+#~ msgid "Unreceived Products"
+#~ msgstr "Неполученные изделия"
+
+#~ msgid "Force to use a Production Lot during production order"
+#~ msgstr "Принудительно назначать серийны номера для партий изделий"
+
+#~ msgid ""
+#~ "Tracking lot is the code that will be put on the logistical unit/pallet"
+#~ msgstr "Логистическая единица - это код, присваиваемый упаковке."
+
+#~ msgid "Stock Tracking Lots"
+#~ msgstr "Отслеживание партий"
+
+#~ msgid "Available Moves"
+#~ msgstr "Доступные перемещения товаров"
+
+#~ msgid "Partial packing"
+#~ msgstr "Упаковка по частям"
+
+#~ msgid "Outgoing Products"
+#~ msgstr "Изделия к отправке"
+
+#~ msgid "Created Date"
+#~ msgstr "Дата создания"
+
+#~ msgid "Force to use a Production Lot during deliveries"
+#~ msgstr "Принудительно назначать серийный номер партии при перевозке"
+
+#~ msgid "Track Outging Lots"
+#~ msgstr "Отслеживать исходящие партии"
+
+#~ msgid "Components"
+#~ msgstr "Компоненты"
+
+#~ msgid "Stock by Lots"
+#~ msgstr "Склады с партиями этого товара"
+
+#~ msgid "Set Stock to 0"
+#~ msgstr "Установить запасы в 0"
+
+#~ msgid "Canceled"
+#~ msgstr "Отменено"
+
+#~ msgid "Date Order"
+#~ msgstr "Дата заказа"
+
+#~ msgid "Track Production Lots"
+#~ msgstr "Отслеживать партии изделий"
+
+#~ msgid "Print Item Labels"
+#~ msgstr "Печать этикеток товаров"
+
+#~ msgid "Move State"
+#~ msgstr "Состояни перемещния товаров"
+
+#~ msgid "Total :"
+#~ msgstr "Итого:"
+
+#~ msgid "Force to use a Production Lot during receptions"
+#~ msgstr "Принудительно назначать серийный номер партии при приёмке"
+
+#~ msgid "Products Received"
+#~ msgstr "Получено изделий"
+
+#~ msgid "Make Parcel"
+#~ msgstr "Сформировать упаковку"
+
+#~ msgid "Amount"
+#~ msgstr "Количество"
+
+#~ msgid "Incoming Products"
+#~ msgstr "Поступающие товары"
+
+#~ msgid "Move Lines"
+#~ msgstr "Строки финансового документа"
+
+#~ msgid "Customer Refund"
+#~ msgstr "Возврат денег клиенту"
+
+#~ msgid "Customer Invoice"
+#~ msgstr "Счета клиентам"
+
+#~ msgid "Supplier Refund"
+#~ msgstr "Возврат средств от поставщика"
+
+#~ msgid "Stock Locations Structure"
+#~ msgstr "Структура местоположений запасов"
+
+#~ msgid "Open Products"
+#~ msgstr "Открыть товары"
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index f6c5f1de554..fe984b10f22 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2215,7 +2215,7 @@ class stock_move(osv.osv):
                     'product_qty': quantity,
                     'product_uos_qty': uos_qty,
                     'state': move.state,
-                    'location_id': location_id
+                    'location_id': location_id or move.location_id.id,
                 }
                 if move.product_id.track_production and location_id:
                     # IF product has checked track for production lot, move lines will be split by 1
@@ -2238,9 +2238,8 @@ class stock_move(osv.osv):
                     update_val = {
                         'product_qty' : quantity_rest,
                         'product_uos_qty' : uos_qty_rest,
-                        'location_id': location_id
+                        'location_id': location_id or move.location_id.id
                     }
-
                     self.write(cr, uid, [move.id], update_val)
 
             product_obj = self.pool.get('product.product')